From 306aca812de9672a395a31d6366beb2cc48ecc76 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 13 Nov 2017 11:47:40 -0600 Subject: ont-albacore: add version 2.1.2 (#6278) --- var/spack/repos/builtin/packages/ont-albacore/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ont-albacore/package.py b/var/spack/repos/builtin/packages/ont-albacore/package.py index 882b6f6925..77f6af8d1d 100644 --- a/var/spack/repos/builtin/packages/ont-albacore/package.py +++ b/var/spack/repos/builtin/packages/ont-albacore/package.py @@ -35,6 +35,7 @@ class OntAlbacore(Package): homepage = "https://nanoporetech.com" url = "https://mirror.oxfordnanoportal.com/software/analysis/ont_albacore-1.2.4-cp35-cp35m-manylinux1_x86_64.whl" + version('2.1.2', '1e60cfb95628829f2a61a85247f1b6af', expand=False) version('1.2.4', '559640bec4693af12e4d923e8d77adf6', expand=False) version('1.1.0', 'fab4502ea1bad99d813aa2629e03e83d', expand=False) extends('python') -- cgit v1.2.3-70-g09d2 From 02335fa849343409564a0a66ecf7dda7bfa9e8b1 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Mon, 13 Nov 2017 10:47:58 -0700 Subject: ucx: initial commit (#6265) --- .../repos/builtin/packages/openmpi/package.py | 8 +++++ var/spack/repos/builtin/packages/ucx/package.py | 35 ++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 var/spack/repos/builtin/packages/ucx/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 5563198649..0dc93a9354 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -195,6 +195,7 @@ class Openmpi(AutotoolsPackage): variant('thread_multiple', default=False, description='Enable MPI_THREAD_MULTIPLE support') variant('cuda', default=False, description='Enable CUDA support') + variant('ucx', default=False, description='Enable UCX support') provides('mpi') provides('mpi@:2.2', when='@1.6.5') @@ -205,6 +206,7 @@ class Openmpi(AutotoolsPackage): depends_on('hwloc +cuda', when='+cuda') depends_on('java', when='+java') depends_on('sqlite', when='+sqlite3@:1.11') + depends_on('ucx', when='+ucx') conflicts('+cuda', when='@:1.6') # CUDA support was added in 1.7 conflicts('fabrics=psm2', when='@:1.8') # PSM2 support was added in 1.10.0 @@ -364,6 +366,12 @@ class Openmpi(AutotoolsPackage): else: config_args.append('--without-cuda') + # UCX support + if '+ucx' in spec: + config_args.append('--with-ucx={0}'.format(spec['ucx'].prefix)) + else: + config_args.append('--without-ucx') + return config_args @run_after('install') diff --git a/var/spack/repos/builtin/packages/ucx/package.py b/var/spack/repos/builtin/packages/ucx/package.py new file mode 100644 index 0000000000..3984b7a7e4 --- /dev/null +++ b/var/spack/repos/builtin/packages/ucx/package.py @@ -0,0 +1,35 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Los Alamos National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Ucx(AutotoolsPackage): + """a communication library implementing high-performance messaging for + MPI/PGAS frameworks""" + + homepage = "http://www.openucx.org" + url = "https://github.com/openucx/ucx/releases/download/v1.2.1/ucx-1.2.1.tar.gz" + + version('1.2.1', '697c2fd7912614fb5a1dadff3bfa485c') -- cgit v1.2.3-70-g09d2 From bde727e1876bd707f9aefece920a13077562ffee Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Mon, 13 Nov 2017 10:48:31 -0700 Subject: mpibash: move to autotools (#6253) --- var/spack/repos/builtin/packages/bash/package.py | 9 +++++++ .../repos/builtin/packages/mpibash/package.py | 31 ++++++++-------------- 2 files changed, 20 insertions(+), 20 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bash/package.py b/var/spack/repos/builtin/packages/bash/package.py index 478edccd99..0ee757b2bd 100644 --- a/var/spack/repos/builtin/packages/bash/package.py +++ b/var/spack/repos/builtin/packages/bash/package.py @@ -49,3 +49,12 @@ class Bash(AutotoolsPackage): def check(self): make('tests') + + @property + def install_targets(self): + args = ['install'] + + if self.spec.satisfies('@4.4:'): + args.append('install-headers') + + return args diff --git a/var/spack/repos/builtin/packages/mpibash/package.py b/var/spack/repos/builtin/packages/mpibash/package.py index f5476328b7..bc89ed5563 100644 --- a/var/spack/repos/builtin/packages/mpibash/package.py +++ b/var/spack/repos/builtin/packages/mpibash/package.py @@ -25,32 +25,23 @@ from spack import * -class Mpibash(Package): +class Mpibash(AutotoolsPackage): """Parallel scripting right from the Bourne-Again Shell (Bash)""" - homepage = "http://www.ccs3.lanl.gov/~pakin/software/mpibash-4.3.html" - version('4.3', '81348932d5da294953e15d4814c74dd1', - url="http://ftp.gnu.org/gnu/bash/bash-4.3.tar.gz") + homepage = "https://github.com/lanl/MPI-Bash" + url = "https://github.com/lanl/MPI-Bash/releases/download/v1.2/mpibash-1.2.tar.gz" - # patch -p1 < ../mpibash-4.3.patch - patch('mpibash-4.3.patch', level=1, when='@4.3') - - # above patch modifies configure.ac - depends_on('autoconf', type='build') + version('1.2', 'b81001fb234ed79c4e5bf2f7efee3529') + depends_on('bash@4.4:') # uses MPI_Exscan which is in MPI-1.2 and later depends_on('mpi@1.2:') depends_on('libcircle') - def install(self, spec, prefix): - # run autoconf to rebuild configure - autoconf = which('autoconf') - autoconf() - - configure("--prefix=" + prefix, - "CC=mpicc") - - make(parallel=False) - - make("install") + def configure_args(self): + args = [ + "--with-bashdir={0}".format(self.spec['bash'].prefix.include.bash), + "CC={0}".format(self.spec['mpi'].mpicc) + ] + return args -- cgit v1.2.3-70-g09d2 From c7d2b4dbd670c170b27e4742de4f6c30f7edba93 Mon Sep 17 00:00:00 2001 From: Douglas Duckworth Date: Mon, 13 Nov 2017 15:29:43 -0500 Subject: relion 2.1 - update variant defaults (#6201) Default precision should be double for CPU. Generally users also want to use GPUs so the +cuda variant is now also enabled by default. --- var/spack/repos/builtin/packages/relion/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/relion/package.py b/var/spack/repos/builtin/packages/relion/package.py index ba006b9b43..16f5c35726 100644 --- a/var/spack/repos/builtin/packages/relion/package.py +++ b/var/spack/repos/builtin/packages/relion/package.py @@ -37,8 +37,8 @@ class Relion(CMakePackage): version('develop', git='https://github.com/3dem/relion.git') variant('gui', default=True, description="build the gui") - variant('cuda', default=False, description="enable compute on gpu") - variant('double', default=False, description="double precision (cpu) code") + variant('cuda', default=True, description="enable compute on gpu") + variant('double', default=True, description="double precision (cpu) code") variant('double-gpu', default=False, description="double precision (gpu) code") variant('build_type', default='RelWithDebInfo', description='The build type to build', -- cgit v1.2.3-70-g09d2 From c042644b538444e0085a3941d4bcdfb035045351 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Mon, 13 Nov 2017 17:25:52 -0600 Subject: r-glue: created new package (#6283) --- var/spack/repos/builtin/packages/r-glue/package.py | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-glue/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-glue/package.py b/var/spack/repos/builtin/packages/r-glue/package.py new file mode 100644 index 0000000000..f7ea03f8eb --- /dev/null +++ b/var/spack/repos/builtin/packages/r-glue/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RGlue(RPackage): + """An implementation of interpreted string literals, inspired by Python's + Literal String Interpolation + and Docstrings and Julia's + Triple-Quoted String Literals .""" + + homepage = "https://github.com/tidyverse/glue" + url = "https://cran.r-project.org/src/contrib/glue_1.2.0.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/glue" + + version('1.2.0', '77d06b6d86abc882fa1c0599e457c5e2') -- cgit v1.2.3-70-g09d2 From 05eb287ed9c084f08e07208b8c235c42a6bf5e62 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Tue, 14 Nov 2017 10:19:49 -0600 Subject: r-bindr: created new package (#6285) --- .../repos/builtin/packages/r-bindr/package.py | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-bindr/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-bindr/package.py b/var/spack/repos/builtin/packages/r-bindr/package.py new file mode 100644 index 0000000000..c3a9dec9df --- /dev/null +++ b/var/spack/repos/builtin/packages/r-bindr/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RBindr(RPackage): + """Provides a simple interface for creating active bindings where the + bound function accepts additional arguments.""" + + homepage = "https://github.com/krlmlr/bindr" + url = "https://cran.r-project.org/src/contrib/bindr_0.1.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/bindr" + + version('0.1', 'f3897a70cbad2d2981272772fa30bb59') -- cgit v1.2.3-70-g09d2 From 392e25b7e6406475399ea924be95ddcb47f495bd Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Tue, 14 Nov 2017 10:20:06 -0600 Subject: r-mnormt: created new package (#6287) --- .../repos/builtin/packages/r-mnormt/package.py | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-mnormt/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-mnormt/package.py b/var/spack/repos/builtin/packages/r-mnormt/package.py new file mode 100644 index 0000000000..aa377f7ef6 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-mnormt/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RMnormt(RPackage): + """Functions are provided for computing the density and the distribution + function of multivariate normal and "t" random variables, and for + generating random vectors sampled from these distributions. + Probabilities are computed via non-Monte Carlo methods; different + routines are used in the case d=1, d=2, d>2, if d denotes the number + of dimensions.""" + + homepage = "http://azzalini.stat.unipd.it/SW/Pkg-mnormt" + url = "https://cran.r-project.org/src/contrib/mnormt_1.5-5.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/mnormt" + + version('1.5-5', '19b5be2e9ed33b92d7a716bfcca6b2c7') -- cgit v1.2.3-70-g09d2 From 137a9e64ac811bfb2bcd136e29cfcbed8d13a72f Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 14 Nov 2017 10:20:20 -0600 Subject: trimgalore: add version 0.4.5 (#6288) --- var/spack/repos/builtin/packages/trimgalore/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trimgalore/package.py b/var/spack/repos/builtin/packages/trimgalore/package.py index e1dca34f43..e124824c16 100644 --- a/var/spack/repos/builtin/packages/trimgalore/package.py +++ b/var/spack/repos/builtin/packages/trimgalore/package.py @@ -33,6 +33,7 @@ class Trimgalore(Package): homepage = "https://github.com/FelixKrueger/TrimGalore" url = "https://github.com/FelixKrueger/TrimGalore/archive/0.4.4.tar.gz" + version('0.4.5', 'c71756042b2a65c34d483533a29dc206') version('0.4.4', 'aae1b807b48e38bae7074470203997bb') depends_on('perl', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 93bca2f3a27e377d1c3f69311f8ade99a2cd0ac3 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Tue, 14 Nov 2017 17:21:05 +0100 Subject: libbson, libmongoc: Update to 1.8.1 (#6290) --- var/spack/repos/builtin/packages/libbson/package.py | 1 + var/spack/repos/builtin/packages/libmongoc/package.py | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libbson/package.py b/var/spack/repos/builtin/packages/libbson/package.py index 39a606cf73..d33ad3a430 100644 --- a/var/spack/repos/builtin/packages/libbson/package.py +++ b/var/spack/repos/builtin/packages/libbson/package.py @@ -32,6 +32,7 @@ class Libbson(AutotoolsPackage): homepage = "https://github.com/mongodb/libbson" url = "https://github.com/mongodb/libbson/releases/download/1.7.0/libbson-1.7.0.tar.gz" + version('1.8.1', '42601455cf7f450b46f62c4e6115c440') version('1.8.0', '8b3c64570eec721f951831958e707a5a') version('1.7.0', 'e196ad77dd8458ebc1166e6135030b63') version('1.6.3', 'b7bdb314197106fcfb4af105a582d343') diff --git a/var/spack/repos/builtin/packages/libmongoc/package.py b/var/spack/repos/builtin/packages/libmongoc/package.py index 5050dd0336..4d292937f7 100644 --- a/var/spack/repos/builtin/packages/libmongoc/package.py +++ b/var/spack/repos/builtin/packages/libmongoc/package.py @@ -31,6 +31,7 @@ class Libmongoc(AutotoolsPackage): homepage = "https://github.com/mongodb/mongo-c-driver" url = "https://github.com/mongodb/mongo-c-driver/releases/download/1.7.0/mongo-c-driver-1.7.0.tar.gz" + version('1.8.1', '52d54a4107a2da20c1a1b28bc1ff9d44') version('1.8.0', '8c271a16ff30f6d4f5e134f699f7360f') version('1.7.0', '21acf3584e92631422bc91e9e3cf4f76') version('1.6.3', '0193610cf1d98aae7008f272a1000972') @@ -61,12 +62,15 @@ class Libmongoc(AutotoolsPackage): args.append('--enable-ssl=no') if spec.satisfies('@1.7.0:'): - # --with-{snappy,zlib}=system are currently broken and cause - # configure to not find the dependencies. We still want to - # explicitly disable them when appropriate. + # --with-{snappy,zlib}=system are broken for versions < 1.8.1 if '+snappy' not in spec: args.append('--with-snappy=no') + elif spec.satisfies('@1.8.1:'): + args.append('--with-snappy=system') + if '+zlib' not in spec: args.append('--with-zlib=no') + elif spec.satisfies('@1.8.1:'): + args.append('--with-zlib=system') return args -- cgit v1.2.3-70-g09d2 From a8f9182ef31ff7bc58ee546ab3ad1167d08d7e70 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Tue, 14 Nov 2017 10:21:21 -0600 Subject: r-forcats: created new package (#6291) --- .../repos/builtin/packages/r-forcats/package.py | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-forcats/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-forcats/package.py b/var/spack/repos/builtin/packages/r-forcats/package.py new file mode 100644 index 0000000000..727384c0b3 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-forcats/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RForcats(RPackage): + """Helpers for reordering factor levels (including moving specified levels + to front, ordering by first appearance, reversing, and randomly + shuffling), and tools for modifying factor levels (including collapsing + rare levels into other, 'anonymising', and manually 'recoding').""" + + homepage = "http://forcats.tidyverse.org/" + url = "https://cran.r-project.org/src/contrib/forcats_0.2.0.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/forcats" + + version('0.2.0', 'e4ba2c0a59dcdfcc02274c519bf3dbfc') + + depends_on('r-tibble', type=('build', 'run')) + depends_on('r-magrittr', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From e31b9971620fb036246e26fc43284a5508bd87f9 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Tue, 14 Nov 2017 17:21:35 +0100 Subject: icu4c: Update to 60.1 (#6295) Previous versions try to include xlocale.h, which fails on glibc >= 2.26. --- var/spack/repos/builtin/packages/icu4c/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/icu4c/package.py b/var/spack/repos/builtin/packages/icu4c/package.py index f8dcb52805..da5b7cc842 100644 --- a/var/spack/repos/builtin/packages/icu4c/package.py +++ b/var/spack/repos/builtin/packages/icu4c/package.py @@ -35,6 +35,7 @@ class Icu4c(AutotoolsPackage): list_url = "http://download.icu-project.org/files/icu4c" list_depth = 2 + version('60.1', '3d164a2d1bcebd1464c6160ebb8315ef') version('58.2', 'fac212b32b7ec7ab007a12dff1f3aea1') version('57.1', '976734806026a4ef8bdd17937c8898b9') -- cgit v1.2.3-70-g09d2 From aa27432a1d2548ae47c6b7316c81f000bd464187 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Tue, 14 Nov 2017 17:22:04 +0100 Subject: ncl: Check for ncl binary after installation (#6298) ncl's build system will happily continue in case of errors, which might result in the ncl binary not being built. --- var/spack/repos/builtin/packages/ncl/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ncl/package.py b/var/spack/repos/builtin/packages/ncl/package.py index 25b903e4c7..7ec9b78fc2 100644 --- a/var/spack/repos/builtin/packages/ncl/package.py +++ b/var/spack/repos/builtin/packages/ncl/package.py @@ -106,6 +106,8 @@ class Ncl(Package): placement='triangle_src', when='+triangle') + sanity_check_is_file = ['bin/ncl'] + def patch(self): # Make configure scripts use Spack's tcsh files = ['Configure'] + glob.glob('config/*') -- cgit v1.2.3-70-g09d2 From 06920292730f612424d88aa78f7acc967186694d Mon Sep 17 00:00:00 2001 From: vishalkenchan Date: Tue, 14 Nov 2017 17:22:34 +0100 Subject: update trilinos checksums (#6301) --- .../repos/builtin/packages/trilinos/package.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index db0b1b3ba6..a0321d2fcf 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -58,17 +58,17 @@ class Trilinos(CMakePackage): git='https://github.com/trilinos/Trilinos.git', tag='master') version('12.12.1', 'ecd4606fa332212433c98bf950a69cc7') version('12.10.1', '667333dbd7c0f031d47d7c5511fd0810') - version('12.8.1', '01c0026f1e2050842857db941060ecd5') - version('12.6.4', 'c2ea7b5aa0d10bcabdb9b9a6e3bac3ea') - version('12.6.3', '8de5cc00981a0ca0defea6199b2fe4c1') - version('12.6.2', 'dc7f9924872778798149ecadd81605a5') - version('12.6.1', '8aecea78546e7558f63ecc9a3b2949da') - version('12.4.2', '4c25a757d86bde3531090bd900a2cea8') - version('12.2.1', '85d011f7f99a776a9c6c2625e8cb721c') - version('12.0.1', 'bcb3fdefd14d05dd6aa65ba4c5b9aa0e') - version('11.14.3', 'dea62e57ebe51a886bee0b10a2176969') - version('11.14.2', 'e7c3cdbbfe3279a8a68838b873ad6d51') - version('11.14.1', 'b7760b142eef66c79ed13de7c9560f81') + version('12.8.1', '9f37f683ee2b427b5540db8a20ed6b15') + version('12.6.4', 'e11fff717d0e4565779f75a47feecbb2') + version('12.6.3', '9ce30b6ab956bfc41730479a9ef05d05') + version('12.6.2', '0237d32feedd979a6fbb139aa5df8500') + version('12.6.1', '14ab8f7e74b66c33d5731cbf68b8cb82') + version('12.4.2', '98880f414752220e60feaeb36b023f60') + version('12.2.1', '8b344a9e9e533126dfd96db58ce69dde') + version('12.0.1', 'b8263f7037f7c688091d0da19d169709') + version('11.14.3', 'ff31ad49d633ab28369c228784055c85') + version('11.14.2', '1fdf15a5b4494f832b414f9c447ab685') + version('11.14.1', '478d0438d935294a7c94347c94a7c8cb') # ###################### Variants ########################## -- cgit v1.2.3-70-g09d2 From 50957bd44fe54836e10045cdede7e1393d732f6f Mon Sep 17 00:00:00 2001 From: koebbe Date: Tue, 14 Nov 2017 10:26:58 -0600 Subject: py-h5py: make sure to depend on the hl variant of hdf5 (#6304) --- var/spack/repos/builtin/packages/py-h5py/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-h5py/package.py b/var/spack/repos/builtin/packages/py-h5py/package.py index 94dd8d6986..3375b762a9 100644 --- a/var/spack/repos/builtin/packages/py-h5py/package.py +++ b/var/spack/repos/builtin/packages/py-h5py/package.py @@ -42,7 +42,7 @@ class PyH5py(PythonPackage): depends_on('py-cython@0.19:', type='build') depends_on('py-pkgconfig', type='build') depends_on('py-setuptools', type='build') - depends_on('hdf5@1.8.4:') + depends_on('hdf5@1.8.4:+hl') depends_on('hdf5+mpi', when='+mpi') depends_on('mpi', when='+mpi') depends_on('py-mpi4py', when='+mpi', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 138e9d08c6009446f6d30a394a8c3bb6ec0608fc Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Tue, 14 Nov 2017 11:32:41 -0700 Subject: Add the latest version of Lmod (#6297) --- var/spack/repos/builtin/packages/lmod/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lmod/package.py b/var/spack/repos/builtin/packages/lmod/package.py index 73cfcd2b88..233f50f53d 100644 --- a/var/spack/repos/builtin/packages/lmod/package.py +++ b/var/spack/repos/builtin/packages/lmod/package.py @@ -38,6 +38,7 @@ class Lmod(AutotoolsPackage): homepage = 'https://www.tacc.utexas.edu/research-development/tacc-projects/lmod' url = 'https://github.com/TACC/Lmod/archive/7.4.11.tar.gz' + version('7.7.13', 'e1d222fa04148707dceb08c82d7e9fa5') version('7.7', '8ac594401716c6d1b40cac22bc1030ca') version('7.6.14', '60726c991038b6337fbb27b6a333a2d4') version('7.4.11', '70c55ba0ba3877b6d8df536ee7ea6d49') -- cgit v1.2.3-70-g09d2 From d9a4e7a038a5e8b7b5c306eb26bb22a6f12ebd4e Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Wed, 15 Nov 2017 04:11:53 +0800 Subject: Update miniconda to 4.3.30. (#6233) --- var/spack/repos/builtin/packages/miniconda2/package.py | 1 + var/spack/repos/builtin/packages/miniconda3/package.py | 1 + 2 files changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/miniconda2/package.py b/var/spack/repos/builtin/packages/miniconda2/package.py index 7433b2d731..ce9fffd589 100644 --- a/var/spack/repos/builtin/packages/miniconda2/package.py +++ b/var/spack/repos/builtin/packages/miniconda2/package.py @@ -33,6 +33,7 @@ class Miniconda2(Package): homepage = "https://conda.io/miniconda.html" url = "https://repo.continuum.io/miniconda/Miniconda2-4.3.11-Linux-x86_64.sh" + version('4.3.30', 'bd1655b4b313f7b2a1f2e15b7b925d03', expand=False) version('4.3.14', '8cb075cf5462480980ef2373ad9fad38', expand=False) version('4.3.11', 'd573980fe3b5cdf80485add2466463f5', expand=False) diff --git a/var/spack/repos/builtin/packages/miniconda3/package.py b/var/spack/repos/builtin/packages/miniconda3/package.py index faaa786b6c..eedf802a27 100644 --- a/var/spack/repos/builtin/packages/miniconda3/package.py +++ b/var/spack/repos/builtin/packages/miniconda3/package.py @@ -33,6 +33,7 @@ class Miniconda3(Package): homepage = "https://conda.io/miniconda.html" url = "https://repo.continuum.io/miniconda/Miniconda3-4.3.11-Linux-x86_64.sh" + version('4.3.30', '0b80a152332a4ce5250f3c09589c7a81', expand=False) version('4.3.14', 'fc6fc37479e3e3fcf3f9ba52cae98991', expand=False) version('4.3.11', '1924c8d9ec0abf09005aa03425e9ab1a', expand=False) -- cgit v1.2.3-70-g09d2 From ec5d366bcd833f1796bbfdf504ee63a1fb829de8 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Wed, 15 Nov 2017 00:41:05 +0100 Subject: likwid: Fix hash for 4.3.0 (#6307) Prefer 4.2.1 for now because 4.3.0's hash changes regularly. --- var/spack/repos/builtin/packages/likwid/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/likwid/package.py b/var/spack/repos/builtin/packages/likwid/package.py index edba82da40..b0af002623 100644 --- a/var/spack/repos/builtin/packages/likwid/package.py +++ b/var/spack/repos/builtin/packages/likwid/package.py @@ -36,8 +36,9 @@ class Likwid(Package): maintainers = ['davydden'] - version('4.3.0', 'f6bdf12513af95bd6eefa9c68644e724') - version('4.2.1', 'c408ddcf0317cdd894af4c580cd74294') + # The hash for 4.3.0 changes regularly + version('4.3.0', '20541515fdc6d68e82628170e0042485') + version('4.2.1', 'c408ddcf0317cdd894af4c580cd74294', preferred=True) version('4.2.0', 'e41ff334b8f032a323d941ce32907a75') version('4.1.2', 'a857ce5bd23e31d96e2963fe81cb38f0') -- cgit v1.2.3-70-g09d2 From 9acf207023fff8ea4f0e2414dc9479fd1111ba6e Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 14 Nov 2017 17:41:27 -0600 Subject: picard: add versions and fix url format (#6309) --- var/spack/repos/builtin/packages/picard/package.py | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/picard/package.py b/var/spack/repos/builtin/packages/picard/package.py index 744479a7f3..5f8b5b39a1 100644 --- a/var/spack/repos/builtin/packages/picard/package.py +++ b/var/spack/repos/builtin/packages/picard/package.py @@ -36,13 +36,20 @@ class Picard(Package): homepage = "http://broadinstitute.github.io/picard/" url = "https://github.com/broadinstitute/picard/releases/download/2.9.2/picard.jar" + _urlfmt = "https://github.com/broadinstitute/picard/releases/download/{0}/picard.jar" + _oldurlfmt = 'https://github.com/broadinstitute/picard/releases/download/{0}/picard-tools-{0}.zip' # They started distributing a single jar file at v2.6.0, prior to # that it was a .zip file with multiple .jar and .so files - version('2.9.2', '0449279a6a89830917e8bcef3a976ef7', expand=False, - url="https://github.com/broadinstitute/picard/releases/download/2.9.2/picard.jar") - version('1.140', '308f95516d94c1f3273a4e7e2b315ec2', - url='https://github.com/broadinstitute/picard/releases/download/1.140/picard-tools-1.140.zip') + version('2.15.0', '3f5751630b1a3449edda47a0712a64e4', expand=False) + version('2.10.0', '96f3c11b1c9be9fc8088bc1b7b9f7538', expand=False) + version('2.9.4', '5ce72af4d5efd02fba7084dcfbb3c7b3', expand=False) + version('2.9.3', '3a33c231bcf3a61870c3d44b3b183924', expand=False) + version('2.9.2', '0449279a6a89830917e8bcef3a976ef7', expand=False) + version('2.9.0', 'b711d492f16dfe0084d33e684dca2202', expand=False) + version('2.8.3', '4a181f55d378cd61d0b127a40dfd5016', expand=False) + version('2.6.0', '91f35f22977d9692ce2718270077dc50', expand=False) + version('1.140', '308f95516d94c1f3273a4e7e2b315ec2') depends_on('java@8:', type='run') @@ -73,3 +80,9 @@ class Picard(Package): """The Picard docs suggest setting this as a convenience.""" run_env.prepend_path('PICARD', join_path(self.prefix, 'bin', 'picard.jar')) + + def url_for_version(self, version): + if version < Version('2.6.0'): + return self._oldurlfmt.format(version) + else: + return self._urlfmt.format(version) -- cgit v1.2.3-70-g09d2 From 2eb7fabe622c71d6848b9b04b3ee82ba02b9c54c Mon Sep 17 00:00:00 2001 From: Benedikt Riedel Date: Wed, 15 Nov 2017 12:32:02 -0600 Subject: Allow openblas to build on a VM (#6258) This adds a "virtual_machine" boolean variant which adds build options that enable building openblas on a VM. --- var/spack/repos/builtin/packages/openblas/package.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openblas/package.py b/var/spack/repos/builtin/packages/openblas/package.py index f85d0e2a02..6258cfa09d 100644 --- a/var/spack/repos/builtin/packages/openblas/package.py +++ b/var/spack/repos/builtin/packages/openblas/package.py @@ -40,7 +40,8 @@ class Openblas(MakefilePackage): version('0.2.17', '664a12807f2a2a7cda4781e3ab2ae0e1') version('0.2.16', 'fef46ab92463bdbb1479dcec594ef6dc') version('0.2.15', 'b1190f3d3471685f17cfd1ec1d252ac9') - version('develop', git='https://github.com/xianyi/OpenBLAS.git', branch='develop') + version('develop', git='https://github.com/xianyi/OpenBLAS.git', + branch='develop') variant( 'shared', @@ -61,6 +62,12 @@ class Openblas(MakefilePackage): multi=False ) + variant( + 'virtual_machine', + default=False, + description="Adding options to build openblas on Linux virtual machine" + ) + # virtual dependency provides('blas') provides('lapack') @@ -119,6 +126,13 @@ class Openblas(MakefilePackage): 'FC={0}'.format(spack_f77), 'MAKE_NO_J=1' ] + + if self.spec.variants['virtual_machine'].value: + make_defs += [ + 'DYNAMIC_ARCH=1', + 'NO_AVX2=1' + ] + if self.spec.variants['cpu_target'].value: make_defs += [ 'TARGET={0}'.format(self.spec.variants['cpu_target'].value) -- cgit v1.2.3-70-g09d2 From e77b11674f88e94de865109aa1812ef3ae54567e Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Wed, 15 Nov 2017 21:01:23 +0100 Subject: Update for 'magics' and 'libemos'. (#6275) --- .../repos/builtin/packages/libemos/package.py | 24 ++-- var/spack/repos/builtin/packages/magics/package.py | 121 ++++++++++++++------- 2 files changed, 95 insertions(+), 50 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libemos/package.py b/var/spack/repos/builtin/packages/libemos/package.py index 8db882d4be..26febde67c 100644 --- a/var/spack/repos/builtin/packages/libemos/package.py +++ b/var/spack/repos/builtin/packages/libemos/package.py @@ -31,31 +31,37 @@ class Libemos(CMakePackage): homepage = "https://software.ecmwf.int/wiki/display/EMOS/Emoslib" url = "https://software.ecmwf.int/wiki/download/attachments/3473472/libemos-4.4.2-Source.tar.gz" + list_url = "https://software.ecmwf.int/wiki/display/EMOS/Releases" + version('4.5.1', 'eec1ef4de841df3c68c08fa94d7939ff') + version('4.5.0', '0ad8962a73e3ca90a8094561adc81276') + version('4.4.9', '24d098cd062d443a544fe17727726285') version('4.4.7', '395dcf21cf06872f772fb6b73d8e67b9') version('4.4.2', 'f15a9aff0f40861f3f046c9088197376') - variant('eccodes', default=False, - description="Use eccodes instead of grib-api for GRIB decoding") + variant('grib', default='eccodes', values=('eccodes', 'grib-api'), + description='Specify GRIB backend') variant('build_type', default='RelWithDebInfo', description='The build type to build', values=('Debug', 'Release', 'RelWithDebInfo', 'Production')) - depends_on('eccodes', when='+eccodes') - depends_on('grib-api', when='~eccodes') + depends_on('eccodes', when='grib=eccodes') + depends_on('grib-api', when='grib=grib-api') depends_on('fftw+float+double') depends_on('cmake@2.8.11:', type='build') + depends_on('pkg-config', type='build') + + conflicts('grib=eccodes', when='@:4.4.1', + msg='Eccodes is supported starting version 4.4.2') def cmake_args(self): - spec = self.spec args = [] - if spec.satisfies('+eccodes'): + if self.spec.variants['grib'].value == 'eccodes': args.append('-DENABLE_ECCODES=ON') - args.append('-DECCODES_PATH=%s' % spec['eccodes'].prefix) else: - args.append('-DENABLE_ECCODES=OFF') - args.append('-DGRIB_API_PATH=%s' % spec['grib-api'].prefix) + if self.spec.satisfies('@4.4.2:'): + args.append('-DENABLE_ECCODES=OFF') # To support long pathnames that spack generates args.append('-DCMAKE_Fortran_FLAGS=-ffree-line-length-none') diff --git a/var/spack/repos/builtin/packages/magics/package.py b/var/spack/repos/builtin/packages/magics/package.py index 540abd6c1d..a3a5c49946 100644 --- a/var/spack/repos/builtin/packages/magics/package.py +++ b/var/spack/repos/builtin/packages/magics/package.py @@ -33,48 +33,86 @@ class Magics(CMakePackage): homepage = "https://software.ecmwf.int/wiki/display/MAGP/Magics" url = "https://software.ecmwf.int/wiki/download/attachments/3473464/Magics-2.29.0-Source.tar.gz" + list_url = "https://software.ecmwf.int/wiki/display/MAGP/Releases" - # Maintainers of Magics do not keep tarballs of minor releases. Once the - # next minor released is published the previous one becomes unavailable. - # That is why the preferred version is the latest stable one. + # The policy on which minor releases remain available and which get deleted + # after a newer version becomes available is unclear. + version('2.34.3', 'b4180bc4114ffd723b80728947f50c17') + version('2.34.1', '1ecc5cc20cb0c3f2f0b9171626f09d53') + version('2.33.0', '8d513fd2244f2974b3517a8b30dd51f6') version('2.32.0', 'e17956fffce9ea826cf994f8d275e0f5') + version('2.31.0', '3564dca9e1b4af096fd631906f5e6c89') + version('2.29.6', '56d2c31ca75162e5e86ef75d355e87f1') version('2.29.4', '91c561f413316fb665b3bb563f3878d1') - version('2.29.0', 'db20a4d3c51a2da5657c31ae3de59709', preferred=True) + version('2.29.0', 'db20a4d3c51a2da5657c31ae3de59709') # The patch reorders includes and adds namespaces where necessary to # resolve ambiguity of invocations of isnan and isinf functions. The # patch is not needed since the version 2.29.1 patch('resolve_isnan_ambiguity.patch', when='@2.29.0') - variant('bufr', default=False, description='Enable BUFR support') + variant('grib', default='eccodes', values=('eccodes', 'grib-api'), + description='Specify GRIB backend') variant('netcdf', default=False, description='Enable NetCDF support') - variant('cairo', default=True, description='Enable cairo support[png/jpeg]') + variant('cairo', default=False, + description='Enable cairo support[png/jpeg]') + variant('python', default=False, description='Enable Python interface') + variant('fortran', default=False, description='Enable Fortran interface') variant('metview', default=False, description='Enable metview support') variant('qt', default=False, description='Enable metview support with qt') - variant('eccodes', default=False, description='Use eccodes instead of grib-api') + variant('bufr', default=False, description='Enable BUFR support') + variant('build_type', default='RelWithDebInfo', description='The build type to build', values=('Debug', 'Release', 'RelWithDebInfo', 'Production')) + # Build dependencies depends_on('cmake@2.8.11:', type='build') depends_on('pkg-config', type='build') - - # Currently python is only necessary to run - # building preprocessing scripts. - depends_on('python', type='build') + depends_on('python@:2', type='build') depends_on('perl', type='build') depends_on('perl-xml-parser', type='build') - depends_on('eccodes', when='+eccodes') - depends_on('grib-api', when='~eccodes') + + # Non-optional dependencies depends_on('proj') depends_on('boost') depends_on('expat') - depends_on('pango', when='+cairo') + + # Magics (at least up to version 2.34.3) should directly and + # unconditionally depend on zlib, which is not reflected neither in the + # installation instructions nor explicitly stated in the cmake script: + # zlib is pulled as a dependency of png. The dependency on png is formally + # optional and depends on an unofficial flag ENABLE_PNG, which is + # redundant, because png is used only when ENABLE_CAIRO=ON. The problem is + # that files that make calls to png library get compiled and linked + # unconditionally, which makes png a non-optional dependency (and + # ENABLE_PNG always has to be set to ON). + depends_on('zlib') + depends_on('libpng') + + # GRIB support is non-optional, regardless of what the instruction says. + depends_on('eccodes', when='grib=eccodes') + depends_on('grib-api', when='grib=grib-api') + + # Optional dependencies depends_on('netcdf-cxx', when='+netcdf') - depends_on('libemos', when='+bufr') + depends_on('pango', when='+cairo') + depends_on('libemos grib=eccodes', when='+bufr grib=eccodes') + depends_on('libemos grib=grib-api', when='+bufr grib=grib-api') depends_on('qt', when='+metview+qt') - conflicts('+eccodes', when='@:2.29.0') + extends('python', when='+python') + # Python 2 is required for running the building scripts. Since we can't + # have two different versions of Python at the same time, we haven't even + # tested if the Python interface supports Python 3. + depends_on('python', when='+python', type=('link', 'run')) + depends_on('py-numpy', when='+python', type=('build', 'run')) + depends_on('swig', when='+python', type='build') + + conflicts('grib=eccodes', when='@:2.29.0', + msg='Eccodes is supported starting version 2.29.1') + conflicts('+python', when='@:2.28', + msg='Python interface is supported starting version 2.29.0') # Replace system python and perl by spack versions: def patch(self): @@ -84,50 +122,51 @@ class Magics(CMakePackage): filter_file('#!/usr/bin/python', '#!/usr/bin/env python', pyfile) def cmake_args(self): - spec = self.spec args = [ '-DENABLE_ODB=OFF', - '-DENABLE_PYTHON=OFF', - '-DBOOST_ROOT=%s' % spec['boost'].prefix, - '-DPROJ4_PATH=%s' % spec['proj'].prefix, - '-DENABLE_TESTS=OFF', + '-DENABLE_SPOT=OFF' ] - if '+bufr' in spec: - args.append('-DENABLE_BUFR=ON') - args.append('-DLIBEMOS_PATH=%s' % spec['libemos'].prefix) + if self.spec.variants['grib'].value == 'eccodes': + args.append('-DENABLE_ECCODES=ON') else: - args.append('-DENABLE_BUFR=OFF') + if self.spec.satisfies('@2.29.1:'): + args.append('-DENABLE_ECCODES=OFF') - if '+netcdf' in spec: + if '+netcdf' in self.spec: args.append('-DENABLE_NETCDF=ON') - args.append('-DNETCDF_PATH=%s' % spec['netcdf-cxx'].prefix) else: args.append('-DENABLE_NETCDF=OFF') - if '+cairo' in spec: + if '+cairo' in self.spec: args.append('-DENABLE_CAIRO=ON') else: args.append('-DENABLE_CAIRO=OFF') - if '+metview' in spec: - if '+qt' in spec: + if '+python' in self.spec: + args.append('-DENABLE_PYTHON=ON') + else: + if self.spec.satisfies('@2.29.0:'): + args.append('-DENABLE_PYTHON=OFF') + + if '+fortran' in self.spec: + args.append('-DENABLE_FORTRAN=ON') + else: + args.append('-DENABLE_FORTRAN=OFF') + + if '+bufr' in self.spec: + args.append('-DENABLE_BUFR=ON') + else: + args.append('-DENABLE_BUFR=OFF') + + if '+metview' in self.spec: + if '+qt' in self.spec: args.append('-DENABLE_METVIEW=ON') - if spec['qt'].version[0] == 5: + if self.spec['qt'].satisfies('@5:'): args.append('-DENABLE_QT5=ON') else: args.append('-DENABLE_METVIEW_NO_QT=ON') else: args.append('-DENABLE_METVIEW=OFF') - if '+eccodes' in spec: - args.append('-DENABLE_ECCODES=ON') - args.append('-DECCODES_PATH=%s' % spec['eccodes'].prefix) - else: - args.append('-DENABLE_ECCODES=OFF') - args.append('-DGRIB_API_PATH=%s' % spec['grib-api'].prefix) - - if (self.compiler.f77 is None) or (self.compiler.fc is None): - args.append('-DENABLE_FORTRAN=OFF') - return args -- cgit v1.2.3-70-g09d2 From 71f12597a7664d483bbeaae98535222b14b2bfd1 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Thu, 16 Nov 2017 04:02:54 +0800 Subject: Update pgi to 17.10 . (#6306) --- var/spack/repos/builtin/packages/pgi/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pgi/package.py b/var/spack/repos/builtin/packages/pgi/package.py index 63592d6cc6..c08b1550e1 100644 --- a/var/spack/repos/builtin/packages/pgi/package.py +++ b/var/spack/repos/builtin/packages/pgi/package.py @@ -39,6 +39,7 @@ class Pgi(Package): homepage = "http://www.pgroup.com/" + version('17.10', '85ad6506e7ada610ab11ddb35d697efa') version('17.4', 'a311d2756ddda657860bad8e5725597b') version('17.3', '6eefc42f85e756cbaba76467ed640902') version('16.10', '9bb6bfb7b1052f9e6a45829ba7a24e47') -- cgit v1.2.3-70-g09d2 From af1b93b3db5574078bd1ab88da76ecf09430b4b9 Mon Sep 17 00:00:00 2001 From: Howard Pritchard Date: Wed, 15 Nov 2017 13:03:07 -0700 Subject: Open MPI: add 2.0.4 release to package file (#6310) Signed-off-by: Howard Pritchard --- var/spack/repos/builtin/packages/openmpi/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 0dc93a9354..880566af2b 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -86,6 +86,7 @@ class Openmpi(AutotoolsPackage): version('2.1.2', 'ff2e55cc529802e7b0738cf87acd3ee4') # libmpi.so.20.10.2 version('2.1.1', 'ae542f5cf013943ffbbeb93df883731b') # libmpi.so.20.10.1 version('2.1.0', '4838a5973115c44e14442c01d3f21d52') # libmpi.so.20.10.0 + version('2.0.4', '7e3c71563787a67dce9acc4d639ef3f8') # libmpi.so.20.0.4 version('2.0.3', '6c09e56ac2230c4f9abd8ba029f03edd') # libmpi.so.20.0.3 version('2.0.2', 'ecd99aa436a1ca69ce936a96d6a3fa48') # libmpi.so.20.0.2 version('2.0.1', '6f78155bd7203039d2448390f3b51c96') # libmpi.so.20.0.1 -- cgit v1.2.3-70-g09d2 From 0d9ab84ebbd85967e0ad3ecd41d196b1ab1e7bae Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Wed, 15 Nov 2017 14:09:11 -0600 Subject: r-dbplyr: created new package (#6311) --- .../repos/builtin/packages/r-dbplyr/package.py | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-dbplyr/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-dbplyr/package.py b/var/spack/repos/builtin/packages/r-dbplyr/package.py new file mode 100644 index 0000000000..03fa2a9413 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-dbplyr/package.py @@ -0,0 +1,48 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RDbplyr(RPackage): + """A 'dplyr' back end for databases that allows you to work with remote + database tables as if they are in-memory data frames. Basic features + works with any database that has a 'DBI' back end; more advanced + features require 'SQL' translation to be provided by the package + author.""" + + homepage = "https://github.com/tidyverse/dbplyr" + url = "https://cran.r-project.org/src/contrib/dbplyr_1.1.0.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/dbplyr" + + version('1.1.0', 'a66a08d1046e3e44bfe17e65ce72a1d0') + + depends_on('r-assertthat', type=('build', 'run')) + depends_on('r-dbi', type=('build', 'run')) + depends_on('r-dplyr', type=('build', 'run')) + depends_on('r-glue', type=('build', 'run')) + depends_on('r-purrr', type=('build', 'run')) + depends_on('r-rlang', type=('build', 'run')) + depends_on('r-tibble', type=('build', 'run')) + depends_on('r-r6', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From cde0570c56cd075f28516ccce6123fa982af1394 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Wed, 15 Nov 2017 14:09:24 -0600 Subject: r-janitor: created new package (#6313) --- .../repos/builtin/packages/r-janitor/package.py | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-janitor/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-janitor/package.py b/var/spack/repos/builtin/packages/r-janitor/package.py new file mode 100644 index 0000000000..30c2c785c1 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-janitor/package.py @@ -0,0 +1,49 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RJanitor(RPackage): + """The main janitor functions can: perfectly format data.frame column + names; provide quick one- and two-variable tabulations (i.e., frequency + tables and crosstabs); and isolate duplicate records. Other janitor + functions nicely format the tabulation results. These + tabulate-and-report functions approximate popular features of SPSS and + Microsoft Excel. This package follows the principles of the "tidyverse" + and works well with the pipe function %>%. janitor was built with + beginning-to-intermediate R users in mind and is optimized for + user-friendliness. Advanced R users can already do everything covered + here, but with janitor they can do it faster and save their thinking + for the fun stuff.""" + + homepage = "https://github.com/sfirke/janitor" + url = "https://cran.r-project.org/src/contrib/janitor_0.3.0.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/janitor" + + version('0.3.0', '76036c54693b91aef19d468107ae066a') + + depends_on('r-dplyr', type=('build', 'run')) + depends_on('r-tidyr', type=('build', 'run')) + depends_on('r-magrittr', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From d1a733bc869979def190774723b6d50da76fddc7 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 15 Nov 2017 21:12:31 +0100 Subject: xtensor, xtl, xsimd (#6315) Adds the QuantStack libs (C++, header-only) needed for xtensor. --- var/spack/repos/builtin/packages/xsimd/package.py | 44 +++++++++++++++++++ .../repos/builtin/packages/xtensor/package.py | 50 ++++++++++++++++++++++ var/spack/repos/builtin/packages/xtl/package.py | 43 +++++++++++++++++++ 3 files changed, 137 insertions(+) create mode 100644 var/spack/repos/builtin/packages/xsimd/package.py create mode 100644 var/spack/repos/builtin/packages/xtensor/package.py create mode 100644 var/spack/repos/builtin/packages/xtl/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/xsimd/package.py b/var/spack/repos/builtin/packages/xsimd/package.py new file mode 100644 index 0000000000..e2000277c0 --- /dev/null +++ b/var/spack/repos/builtin/packages/xsimd/package.py @@ -0,0 +1,44 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Xsimd(CMakePackage): + """C++ wrappers for SIMD intrinsics""" + + homepage = "http://quantstack.net/xsimd" + url = "https://github.com/QuantStack/xsimd/archive/3.1.0.tar.gz" + + version('develop', branch='master', + git='https://github.com/QuantStack/xsimd.git') + version('3.1.0', '29c1c525116cbda28f610e2bf24a827e') + + depends_on('googletest') + + # C++14 support + conflicts('%gcc@:4.8') + conflicts('%clang@:3.6') + # untested: conflicts('%intel@:15') + # untested: conflicts('%pgi@:14') diff --git a/var/spack/repos/builtin/packages/xtensor/package.py b/var/spack/repos/builtin/packages/xtensor/package.py new file mode 100644 index 0000000000..ad559d84f7 --- /dev/null +++ b/var/spack/repos/builtin/packages/xtensor/package.py @@ -0,0 +1,50 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Xtensor(CMakePackage): + """Multi-dimensional arrays with broadcasting and lazy computing""" + + homepage = "http://quantstack.net/xtensor" + url = "https://github.com/QuantStack/xtensor/archive/0.13.1.tar.gz" + + version('develop', branch='master', + git='https://github.com/QuantStack/xtensor.git') + version('0.13.1', '80e7e33f05066d17552bf0f8b582dcc5') + + variant('xsimd', default=True, + description='Enable SIMD intrinsics') + + depends_on('xtl') + depends_on('xtl@0.3.4:', when='@develop') + depends_on('xtl@0.3.3:', when='@0.13.1') + depends_on('xsimd@3.1.0', when='+xsimd') + + # C++14 support + conflicts('%gcc@:4.8') + conflicts('%clang@:3.5') + # untested: conflicts('%intel@:15') + # untested: conflicts('%pgi@:14') diff --git a/var/spack/repos/builtin/packages/xtl/package.py b/var/spack/repos/builtin/packages/xtl/package.py new file mode 100644 index 0000000000..c755798487 --- /dev/null +++ b/var/spack/repos/builtin/packages/xtl/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Xtl(CMakePackage): + """QuantStack tools library""" + + homepage = "https://github.com/QuantStack/xtl" + url = "https://github.com/QuantStack/xtl/archive/0.3.4.tar.gz" + + version('develop', branch='master', + git='https://github.com/QuantStack/xtl.git') + version('0.3.4', 'b76548a55f1e171a9c849e5ed543e8b3') + version('0.3.3', '09b6d9611e460d9280bf1156bcca20f5') + + # C++14 support + conflicts('%gcc@:4.8') + conflicts('%clang@:3.6') + # untested: conflicts('%intel@:15') + # untested: conflicts('%pgi@:14') -- cgit v1.2.3-70-g09d2 From cb5fd6035aa2d1d497ec614df73377c171080333 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Wed, 15 Nov 2017 21:13:15 +0100 Subject: intel: add 2018.1 (#6322) --- var/spack/repos/builtin/packages/intel-daal/package.py | 2 ++ var/spack/repos/builtin/packages/intel-ipp/package.py | 2 ++ var/spack/repos/builtin/packages/intel-mkl/package.py | 2 ++ var/spack/repos/builtin/packages/intel-mpi/package.py | 2 ++ 4 files changed, 8 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/intel-daal/package.py b/var/spack/repos/builtin/packages/intel-daal/package.py index d528f88461..8c618089ed 100644 --- a/var/spack/repos/builtin/packages/intel-daal/package.py +++ b/var/spack/repos/builtin/packages/intel-daal/package.py @@ -33,6 +33,8 @@ class IntelDaal(IntelPackage): homepage = "https://software.intel.com/en-us/daal" + version('2018.1.163', '12a9586734a03a956095440161fd741a', + url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12414/l_daal_2018.1.163.tgz") version('2018.0.128', '5779e670f67c33cc1c6cdcdca5e4636e', url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12072/l_daal_2018.0.128.tgz") version('2017.4.239', 'b47e9b92d948ee312e8a98170a1c0640', diff --git a/var/spack/repos/builtin/packages/intel-ipp/package.py b/var/spack/repos/builtin/packages/intel-ipp/package.py index ae7a1358e1..5f90188ab1 100644 --- a/var/spack/repos/builtin/packages/intel-ipp/package.py +++ b/var/spack/repos/builtin/packages/intel-ipp/package.py @@ -33,6 +33,8 @@ class IntelIpp(IntelPackage): homepage = "https://software.intel.com/en-us/intel-ipp" + version('2018.1.163', '183d4888f3d91f632b617fdd401f04ed', + url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12414/l_ipp_2018.1.163.tgz') version('2018.0.128', 'e64190bc9041b52d9eed7e8ee91bf1de', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12071/l_ipp_2018.0.128.tgz') version('2017.3.196', '47e53bd1a2740041f4d0be7c36b61a18', diff --git a/var/spack/repos/builtin/packages/intel-mkl/package.py b/var/spack/repos/builtin/packages/intel-mkl/package.py index e2c2b8d46a..91f22ecaaf 100644 --- a/var/spack/repos/builtin/packages/intel-mkl/package.py +++ b/var/spack/repos/builtin/packages/intel-mkl/package.py @@ -34,6 +34,8 @@ class IntelMkl(IntelPackage): homepage = "https://software.intel.com/en-us/intel-mkl" + version('2018.1.163', 'f1f7b6ddd7eb57dfe39bd4643446dc1c', + url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12414/l_mkl_2018.1.163.tgz") version('2018.0.128', '0fa23779816a0f2ee23a396fc1af9978', url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12070/l_mkl_2018.0.128.tgz") version('2017.4.239', '3066272dd0ad3da7961b3d782e1fab3b', diff --git a/var/spack/repos/builtin/packages/intel-mpi/package.py b/var/spack/repos/builtin/packages/intel-mpi/package.py index 42b9872b30..0b1e4f622d 100644 --- a/var/spack/repos/builtin/packages/intel-mpi/package.py +++ b/var/spack/repos/builtin/packages/intel-mpi/package.py @@ -33,6 +33,8 @@ class IntelMpi(IntelPackage): homepage = "https://software.intel.com/en-us/intel-mpi-library" + version('2018.1.163', '437ce50224c5bbf98fd578a810c3e401', + url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12414/l_mpi_2018.1.163.tgz') version('2018.0.128', '15b46fc6a3014595de897aa48d3a658b', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12120/l_mpi_2018.0.128.tgz') version('2017.4.239', '460a9ef1b3599d60b4d696e3f0f2a14d', -- cgit v1.2.3-70-g09d2 From 7da8a02cbf7755888971fafdabc7a893b822fc74 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Wed, 15 Nov 2017 16:46:39 -0700 Subject: git grep --files-with-matches github.com/llnl/spack | xargs sed -i '/github.com/s@llnl/spack@spack/spack@' (#6329) --- lib/spack/docs/tutorial/examples/Autotools/0.package.py | 2 +- lib/spack/docs/tutorial/examples/Autotools/1.package.py | 2 +- lib/spack/docs/tutorial/examples/Autotools/autotools_class.py | 2 +- lib/spack/docs/tutorial/examples/Cmake/0.package.py | 2 +- lib/spack/docs/tutorial/examples/Cmake/1.package.py | 2 +- lib/spack/docs/tutorial/examples/Cmake/2.package.py | 2 +- lib/spack/docs/tutorial/examples/Cmake/cmake_class.py | 2 +- lib/spack/docs/tutorial/examples/Makefile/0.package.py | 2 +- lib/spack/docs/tutorial/examples/Makefile/1.package.py | 2 +- lib/spack/docs/tutorial/examples/Makefile/2.package.py | 2 +- lib/spack/docs/tutorial/examples/Makefile/3.package.py | 2 +- lib/spack/docs/tutorial/examples/Makefile/makefile_class.py | 2 +- lib/spack/docs/tutorial/examples/PyPackage/0.package.py | 2 +- lib/spack/docs/tutorial/examples/PyPackage/1.package.py | 2 +- lib/spack/docs/tutorial/examples/PyPackage/python_package_class.py | 2 +- var/spack/repos/builtin/packages/typhonio/package.py | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) (limited to 'var') diff --git a/lib/spack/docs/tutorial/examples/Autotools/0.package.py b/lib/spack/docs/tutorial/examples/Autotools/0.package.py index 44a157b36a..c84ed6de0b 100644 --- a/lib/spack/docs/tutorial/examples/Autotools/0.package.py +++ b/lib/spack/docs/tutorial/examples/Autotools/0.package.py @@ -6,7 +6,7 @@ # Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. # LLNL-CODE-647188 # -# For details, see https://github.com/llnl/spack +# For details, see https://github.com/spack/spack # Please also see the NOTICE and LICENSE files for our notice and the LGPL. # # This program is free software; you can redistribute it and/or modify diff --git a/lib/spack/docs/tutorial/examples/Autotools/1.package.py b/lib/spack/docs/tutorial/examples/Autotools/1.package.py index bc12c70b7f..eaf85322c1 100644 --- a/lib/spack/docs/tutorial/examples/Autotools/1.package.py +++ b/lib/spack/docs/tutorial/examples/Autotools/1.package.py @@ -6,7 +6,7 @@ # Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. # LLNL-CODE-647188 # -# For details, see https://github.com/llnl/spack +# For details, see https://github.com/spack/spack # Please also see the NOTICE and LICENSE files for our notice and the LGPL. # # This program is free software; you can redistribute it and/or modify diff --git a/lib/spack/docs/tutorial/examples/Autotools/autotools_class.py b/lib/spack/docs/tutorial/examples/Autotools/autotools_class.py index 90ff8540bd..8f2af3e21e 100644 --- a/lib/spack/docs/tutorial/examples/Autotools/autotools_class.py +++ b/lib/spack/docs/tutorial/examples/Autotools/autotools_class.py @@ -6,7 +6,7 @@ # Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. # LLNL-CODE-647188 # -# For details, see https://github.com/llnl/spack +# For details, see https://github.com/spack/spack # Please also see the NOTICE and LICENSE files for our notice and the LGPL. # # This program is free software; you can redistribute it and/or modify diff --git a/lib/spack/docs/tutorial/examples/Cmake/0.package.py b/lib/spack/docs/tutorial/examples/Cmake/0.package.py index 724b3fdf94..e4996c80c8 100644 --- a/lib/spack/docs/tutorial/examples/Cmake/0.package.py +++ b/lib/spack/docs/tutorial/examples/Cmake/0.package.py @@ -6,7 +6,7 @@ # Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. # LLNL-CODE-647188 # -# For details, see https://github.com/llnl/spack +# For details, see https://github.com/spack/spack # Please also see the NOTICE and LICENSE files for our notice and the LGPL. # # This program is free software; you can redistribute it and/or modify diff --git a/lib/spack/docs/tutorial/examples/Cmake/1.package.py b/lib/spack/docs/tutorial/examples/Cmake/1.package.py index dcb44260d2..6b88147272 100644 --- a/lib/spack/docs/tutorial/examples/Cmake/1.package.py +++ b/lib/spack/docs/tutorial/examples/Cmake/1.package.py @@ -6,7 +6,7 @@ # Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. # LLNL-CODE-647188 # -# For details, see https://github.com/llnl/spack +# For details, see https://github.com/spack/spack # Please also see the NOTICE and LICENSE files for our notice and the LGPL. # # This program is free software; you can redistribute it and/or modify diff --git a/lib/spack/docs/tutorial/examples/Cmake/2.package.py b/lib/spack/docs/tutorial/examples/Cmake/2.package.py index 126a841ce9..2546b9c799 100644 --- a/lib/spack/docs/tutorial/examples/Cmake/2.package.py +++ b/lib/spack/docs/tutorial/examples/Cmake/2.package.py @@ -6,7 +6,7 @@ # Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. # LLNL-CODE-647188 # -# For details, see https://github.com/llnl/spack +# For details, see https://github.com/spack/spack # Please also see the NOTICE and LICENSE files for our notice and the LGPL. # # This program is free software; you can redistribute it and/or modify diff --git a/lib/spack/docs/tutorial/examples/Cmake/cmake_class.py b/lib/spack/docs/tutorial/examples/Cmake/cmake_class.py index 5b0f5526c9..ca9ec6f803 100644 --- a/lib/spack/docs/tutorial/examples/Cmake/cmake_class.py +++ b/lib/spack/docs/tutorial/examples/Cmake/cmake_class.py @@ -6,7 +6,7 @@ # Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. # LLNL-CODE-647188 # -# For details, see https://github.com/llnl/spack +# For details, see https://github.com/spack/spack # Please also see the NOTICE and LICENSE files for our notice and the LGPL. # # This program is free software; you can redistribute it and/or modify diff --git a/lib/spack/docs/tutorial/examples/Makefile/0.package.py b/lib/spack/docs/tutorial/examples/Makefile/0.package.py index 641b6ccb8f..847d010d8b 100644 --- a/lib/spack/docs/tutorial/examples/Makefile/0.package.py +++ b/lib/spack/docs/tutorial/examples/Makefile/0.package.py @@ -6,7 +6,7 @@ # Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. # LLNL-CODE-647188 # -# For details, see https://github.com/llnl/spack +# For details, see https://github.com/spack/spack # Please also see the NOTICE and LICENSE files for our notice and the LGPL. # # This program is free software; you can redistribute it and/or modify diff --git a/lib/spack/docs/tutorial/examples/Makefile/1.package.py b/lib/spack/docs/tutorial/examples/Makefile/1.package.py index 709bc71afa..feee7750f0 100644 --- a/lib/spack/docs/tutorial/examples/Makefile/1.package.py +++ b/lib/spack/docs/tutorial/examples/Makefile/1.package.py @@ -6,7 +6,7 @@ # Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. # LLNL-CODE-647188 # -# For details, see https://github.com/llnl/spack +# For details, see https://github.com/spack/spack # Please also see the NOTICE and LICENSE files for our notice and the LGPL. # # This program is free software; you can redistribute it and/or modify diff --git a/lib/spack/docs/tutorial/examples/Makefile/2.package.py b/lib/spack/docs/tutorial/examples/Makefile/2.package.py index 10aba473e3..cebb108ac7 100644 --- a/lib/spack/docs/tutorial/examples/Makefile/2.package.py +++ b/lib/spack/docs/tutorial/examples/Makefile/2.package.py @@ -6,7 +6,7 @@ # Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. # LLNL-CODE-647188 # -# For details, see https://github.com/llnl/spack +# For details, see https://github.com/spack/spack # Please also see the NOTICE and LICENSE files for our notice and the LGPL. # # This program is free software; you can redistribute it and/or modify diff --git a/lib/spack/docs/tutorial/examples/Makefile/3.package.py b/lib/spack/docs/tutorial/examples/Makefile/3.package.py index 269ab2c454..f4142e3fb6 100644 --- a/lib/spack/docs/tutorial/examples/Makefile/3.package.py +++ b/lib/spack/docs/tutorial/examples/Makefile/3.package.py @@ -6,7 +6,7 @@ # Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. # LLNL-CODE-647188 # -# For details, see https://github.com/llnl/spack +# For details, see https://github.com/spack/spack # Please also see the NOTICE and LICENSE files for our notice and the LGPL. # # This program is free software; you can redistribute it and/or modify diff --git a/lib/spack/docs/tutorial/examples/Makefile/makefile_class.py b/lib/spack/docs/tutorial/examples/Makefile/makefile_class.py index 5ffb88f43d..286b702fc9 100644 --- a/lib/spack/docs/tutorial/examples/Makefile/makefile_class.py +++ b/lib/spack/docs/tutorial/examples/Makefile/makefile_class.py @@ -6,7 +6,7 @@ # Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. # LLNL-CODE-647188 # -# For details, see https://github.com/llnl/spack +# For details, see https://github.com/spack/spack # Please also see the NOTICE and LICENSE files for our notice and the LGPL. # # This program is free software; you can redistribute it and/or modify diff --git a/lib/spack/docs/tutorial/examples/PyPackage/0.package.py b/lib/spack/docs/tutorial/examples/PyPackage/0.package.py index 48114075a7..99df364510 100644 --- a/lib/spack/docs/tutorial/examples/PyPackage/0.package.py +++ b/lib/spack/docs/tutorial/examples/PyPackage/0.package.py @@ -6,7 +6,7 @@ # Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. # LLNL-CODE-647188 # -# For details, see https://github.com/llnl/spack +# For details, see https://github.com/spack/spack # Please also see the NOTICE and LICENSE files for our notice and the LGPL. # # This program is free software; you can redistribute it and/or modify diff --git a/lib/spack/docs/tutorial/examples/PyPackage/1.package.py b/lib/spack/docs/tutorial/examples/PyPackage/1.package.py index a9cbff00e2..a4313d8cba 100644 --- a/lib/spack/docs/tutorial/examples/PyPackage/1.package.py +++ b/lib/spack/docs/tutorial/examples/PyPackage/1.package.py @@ -6,7 +6,7 @@ # Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. # LLNL-CODE-647188 # -# For details, see https://github.com/llnl/spack +# For details, see https://github.com/spack/spack # Please also see the NOTICE and LICENSE files for our notice and the LGPL. # # This program is free software; you can redistribute it and/or modify diff --git a/lib/spack/docs/tutorial/examples/PyPackage/python_package_class.py b/lib/spack/docs/tutorial/examples/PyPackage/python_package_class.py index 190620d7a2..b07a196fff 100644 --- a/lib/spack/docs/tutorial/examples/PyPackage/python_package_class.py +++ b/lib/spack/docs/tutorial/examples/PyPackage/python_package_class.py @@ -6,7 +6,7 @@ # Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. # LLNL-CODE-647188 # -# For details, see https://github.com/llnl/spack +# For details, see https://github.com/spack/spack # Please also see the NOTICE and LICENSE files for our notice and the LGPL. # # This program is free software; you can redistribute it and/or modify diff --git a/var/spack/repos/builtin/packages/typhonio/package.py b/var/spack/repos/builtin/packages/typhonio/package.py index 35fe269fd6..a60298b6d2 100644 --- a/var/spack/repos/builtin/packages/typhonio/package.py +++ b/var/spack/repos/builtin/packages/typhonio/package.py @@ -6,7 +6,7 @@ # Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. # LLNL-CODE-647188 # -# For details, see https://github.com/llnl/spack/spack +# For details, see https://github.com/spack/spack # Please also see the NOTICE and LICENSE files for our notice and the LGPL. # # This program is free software; you can redistribute it and/or modify -- cgit v1.2.3-70-g09d2 From 697f3ea71d8c0fefbfe3e814a1a1c74f388b74f0 Mon Sep 17 00:00:00 2001 From: baip Date: Wed, 15 Nov 2017 17:49:08 -0600 Subject: cp2k: add dependency on smm and libxc & new version 5.1 (#6194) * cp2k: add libxsmm dependency * cp2k: add libxc dependency * cp2k: add smm variant to select from libxsmm or libsmm * cp2k: add version 5.1 --- var/spack/repos/builtin/packages/cp2k/package.py | 108 +++++++++++++++++------ 1 file changed, 81 insertions(+), 27 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cp2k/package.py b/var/spack/repos/builtin/packages/cp2k/package.py index 53eb29f336..51a88f835a 100644 --- a/var/spack/repos/builtin/packages/cp2k/package.py +++ b/var/spack/repos/builtin/packages/cp2k/package.py @@ -36,33 +36,39 @@ class Cp2k(Package): """ homepage = 'https://www.cp2k.org' url = 'https://sourceforge.net/projects/cp2k/files/cp2k-3.0.tar.bz2' + list_url = 'https://sourceforge.net/projects/cp2k/files/' + version('5.1', 'f25cf301aec471d7059179de4dac3ee7') version('4.1', 'b0534b530592de15ac89828b1541185e') version('3.0', 'c05bc47335f68597a310b1ed75601d35') variant('mpi', default=True, description='Enable MPI support') + variant('smm', default='libxsmm', values=('libxsmm', 'libsmm', 'none'), + description='Library for small matrix multiplications') variant('plumed', default=False, description='Enable PLUMED support') depends_on('python', type='build') depends_on('lapack') depends_on('blas') - depends_on('fftw') - depends_on('libint@:1.2', when='@3.0,4.1') + depends_on('fftw@3:') + depends_on('libint@1.1.4:1.2', when='@3.0:5.999') + depends_on('libxsmm', when='smm=libxsmm') + depends_on('libxc@2.2.2:') depends_on('mpi@2:', when='+mpi') depends_on('scalapack', when='+mpi') + depends_on('elpa@2011.12:2016.13', when='+mpi') + depends_on('pexsi+fortran@0.9.0:0.9.999', when='+mpi@:4.999') + depends_on('pexsi+fortran@0.10.0:', when='+mpi@5.0:') depends_on('plumed+shared+mpi', when='+plumed+mpi') depends_on('plumed+shared~mpi', when='+plumed~mpi') - depends_on('pexsi+fortran', when='+mpi') # Apparently cp2k@4.1 needs an "experimental" version of libwannier.a # which is only available contacting the developer directly. See INSTALL # in the stage of cp2k@4.1 depends_on('wannier90', when='@3.0+mpi') - depends_on('elpa', when='+mpi') - # TODO : add dependency on libsmm, libxsmm # TODO : add dependency on CUDA parallel = False @@ -78,24 +84,31 @@ class Cp2k(Package): with open(makefile, 'w') as mkf: # Optimization flags optflags = { - 'gcc': ['-O2', - '-ffast-math', - '-ftree-vectorize', - '-funroll-loops', - '-mtune=native'], - 'intel': ['-O2', - '-pc64', - '-unroll'] + 'gcc': [ + '-O2', + '-mtune=native', + '-funroll-loops', + '-ffast-math', + '-ftree-vectorize', + ], 'intel': [ + '-O2', + '-pc64', + '-unroll', + ] } dflags = ['-DNDEBUG'] + libxc = spec['libxc:fortran,static'] + cppflags = [ '-D__FFTW3', '-D__LIBINT', '-D__LIBINT_MAX_AM=6', '-D__LIBDERIV_MAX_AM1=5', - spec['fftw'].headers.cpp_flags + '-D__LIBXC', + spec['fftw'].headers.cpp_flags, + libxc.headers.cpp_flags ] if '^mpi@3:' in spec: @@ -109,18 +122,15 @@ class Cp2k(Package): cflags = copy.deepcopy(optflags[self.spec.compiler.name]) cxxflags = copy.deepcopy(optflags[self.spec.compiler.name]) fcflags = copy.deepcopy(optflags[self.spec.compiler.name]) - fcflags.extend([ - '-ffree-form', - '-ffree-line-length-none', - spec['fftw'].headers.cpp_flags - ]) if '%intel' in spec: cflags.append('-fp-model precise') cxxflags.append('-fp-model precise') fcflags.extend(['-fp-model source', '-heap-arrays 64']) + elif '%gcc' in spec: + fcflags.extend(['-ffree-form', '-ffree-line-length-none']) - fftw = find_libraries('libfftw3', root=spec['fftw'].prefix.lib) + fftw = spec['fftw'].libs ldflags = [fftw.search_flags] if 'superlu-dist@4.3' in spec: @@ -160,7 +170,7 @@ class Cp2k(Package): mkf.write('CPP = # {0.compiler.cc} -P\n\n'.format(self)) mkf.write('AR = xiar -r\n\n') else: - mkf.write('CPP = {0.compiler.cc} -E\n\n'.format(self)) + mkf.write('CPP = # {0.compiler.cc} -E\n\n'.format(self)) mkf.write('AR = ar -r\n\n') fc = self.compiler.fc if '~mpi' in spec else self.spec['mpi'].mpifc mkf.write('FC = {0}\n'.format(fc)) @@ -183,18 +193,34 @@ class Cp2k(Package): cppflags.extend([ '-D__parallel', '-D__LIBPEXSI', - '-D__ELPA3', '-D__SCALAPACK' ]) + + elpa = spec['elpa'] + if spec.satisfies('@:4.999'): + if elpa.satisfies('@:2014.5.999'): + cppflags.append('-D__ELPA') + elif elpa.satisfies('@2014.6:2015.10.999'): + cppflags.append('-D__ELPA2') + else: + cppflags.append('-D__ELPA3') + else: + cppflags.append('-D__ELPA={0}{1:02d}'.format( + elpa.version[0], int(elpa.version[1]))) + fcflags.append('-I' + join_path( + elpa.prefix, 'include', + 'elpa-{0}'.format(str(elpa.version)), 'elpa' + )) + if 'wannier90' in spec: cppflags.append('-D__WANNIER90') fcflags.extend([ # spec['elpa:fortran'].headers.cpp_flags '-I' + join_path( - spec['elpa'].prefix, + elpa.prefix, 'include', - 'elpa-{0}'.format(str(spec['elpa'].version)), + 'elpa-{0}'.format(str(elpa.version)), 'modules' ), # spec[pexsi:fortran].headers.cpp_flags @@ -203,7 +229,7 @@ class Cp2k(Package): scalapack = spec['scalapack'].libs ldflags.append(scalapack.search_flags) libs.extend([ - join_path(spec['elpa'].prefix.lib, + join_path(elpa.prefix.lib, 'libelpa.{0}'.format(dso_suffix)), join_path(spec['pexsi'].prefix.lib, 'libpexsi.a'), join_path(spec['superlu-dist'].prefix.lib, @@ -230,9 +256,37 @@ class Cp2k(Package): # LAPACK / BLAS lapack = spec['lapack'].libs blas = spec['blas'].libs - ldflags.append((lapack + blas).search_flags) - libs.extend([str(x) for x in (fftw, lapack, blas)]) + + ldflags.append(libxc.libs.search_flags) + + libs.extend([str(x) for x in (fftw, lapack, blas, libxc.libs)]) + + if 'smm=libsmm' in spec: + lib_dir = join_path('lib', cp2k_architecture, cp2k_version) + mkdirp(lib_dir) + try: + shutil.copy(env['LIBSMM_PATH'], + join_path(lib_dir, 'libsmm.a')) + except KeyError: + raise KeyError('Point environment variable LIBSMM_PATH to ' + 'the absolute path of the libsmm.a file') + except IOError: + raise IOError('The file LIBSMM_PATH pointed to does not ' + 'exist. Note that it must be absolute path.') + cppflags.extend([ + '-D__HAS_smm_dnn', + '-D__HAS_smm_vec', + ]) + libs.append('-lsmm') + elif 'smm=libxsmm' in spec: + cppflags.extend([ + '-D__LIBXSMM', + spec['libxsmm'].headers.cpp_flags, + ]) + libxsmm = spec['libxsmm'].libs + ldflags.append(libxsmm.search_flags) + libs.append(str(libxsmm)) dflags.extend(cppflags) cflags.extend(cppflags) -- cgit v1.2.3-70-g09d2 From 9d1224e5d8e40d88f5f60149aee4b4ab0e9c6d58 Mon Sep 17 00:00:00 2001 From: Stephen Hudson Date: Wed, 15 Nov 2017 17:49:36 -0600 Subject: py-petsc4py: Update version to 3.8.0 and add dependencies (#5792) * py-petsc4py: Update version to 3.8.0 and add dependencies - Added explicit dependency on python and numpy * Kept old version - and corrected minimal python version * Update to 3.8.1 --- var/spack/repos/builtin/packages/py-petsc4py/package.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-petsc4py/package.py b/var/spack/repos/builtin/packages/py-petsc4py/package.py index 383c11fd94..8047af9ecd 100644 --- a/var/spack/repos/builtin/packages/py-petsc4py/package.py +++ b/var/spack/repos/builtin/packages/py-petsc4py/package.py @@ -28,11 +28,16 @@ from spack import * class PyPetsc4py(PythonPackage): """This package provides Python bindings for the PETSc package. """ + homepage = "https://pypi.python.org/pypi/petsc4py" - url = "https://pypi.io/packages/source/p/petsc4py/petsc4py-3.7.0.tar.gz" + url = "https://pypi.io/packages/source/p/petsc4py/petsc4py-3.8.1.tar.gz" + version('3.8.1', '5157220c2b81765c581d2b17c03259f8') + version('3.8.0', '02029be4bdec904854f0e0692005fb06') version('3.7.0', '816a20040a6a477bd637f397c9fb5b6d') + depends_on('python@2.6:2.8,3.3:', type=('build', 'run')) depends_on('py-setuptools', type='build') + depends_on('py-numpy', type=('build', 'run')) depends_on('py-mpi4py', type=('build', 'run')) depends_on('petsc+mpi') -- cgit v1.2.3-70-g09d2 From d89b09493c65ea996cda79830bf8439b7cb4db46 Mon Sep 17 00:00:00 2001 From: David Hows Date: Fri, 17 Nov 2017 03:28:40 +1100 Subject: Minor package fixes (#6334) * Add no-implicit-fallthrough to MsgpackC * Add 0.2.1 of Neovim * Lint --- var/spack/repos/builtin/packages/msgpack-c/package.py | 7 +++++++ var/spack/repos/builtin/packages/neovim/package.py | 8 +++++--- 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/msgpack-c/package.py b/var/spack/repos/builtin/packages/msgpack-c/package.py index bf78e8d931..8e5ac96718 100644 --- a/var/spack/repos/builtin/packages/msgpack-c/package.py +++ b/var/spack/repos/builtin/packages/msgpack-c/package.py @@ -33,3 +33,10 @@ class MsgpackC(CMakePackage): version('1.4.1', 'e2fd3a7419b9bc49e5017fdbefab87e0') depends_on('cmake@2.8.12:', type='build') + + def cmake_args(self): + args = [ + "-DCMAKE_CXX_FLAGS=-Wno-implicit-fallthrough", + "-DCMAKE_C_FLAGS=-Wno-implicit-fallthrough" + ] + return args diff --git a/var/spack/repos/builtin/packages/neovim/package.py b/var/spack/repos/builtin/packages/neovim/package.py index 0f26daf83f..4e779014dd 100644 --- a/var/spack/repos/builtin/packages/neovim/package.py +++ b/var/spack/repos/builtin/packages/neovim/package.py @@ -32,6 +32,7 @@ class Neovim(CMakePackage): homepage = "http://neovim.io" url = "https://github.com/neovim/neovim/archive/v0.2.0.tar.gz" + version('0.2.1', 'f4271f22d2a46fa18dace42849c56a98') version('0.2.0', '9af7f61f9f0b1a2891147a479d185aa2') depends_on('lua@5.1:5.2') @@ -44,10 +45,11 @@ class Neovim(CMakePackage): depends_on('libvterm') depends_on('unibilium') depends_on('msgpack-c') + depends_on('gperf') def cmake_args(self): - # FIXME: Add arguments other than - # FIXME: CMAKE_INSTALL_PREFIX and CMAKE_BUILD_TYPE - # FIXME: If not needed delete this function args = [] + if version >= Version('0.2.1'): + args = ['-DPREFER_LUA=ON'] + return args -- cgit v1.2.3-70-g09d2 From cca06422fa2f7834b54579d23c057bdf49cb6368 Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Thu, 16 Nov 2017 10:28:59 -0600 Subject: r-sva: Create new package. (#6333) --- var/spack/repos/builtin/packages/r-sva/package.py | 41 +++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-sva/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-sva/package.py b/var/spack/repos/builtin/packages/r-sva/package.py new file mode 100644 index 0000000000..288b0dd625 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-sva/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RSva(RPackage): + """Surrogate Variable Analysis.""" + + homepage = "https://www.bioconductor.org/packages/sva/" + url = "https://git.bioconductor.org/packages/sva" + + version('3.24.4', git='https://git.bioconductor.org/packages/sva', commit='ed2ebb6e33374dc9ec50e6ea97cc1d9aef836c73') + + depends_on('r@3.4.0:3.4.9', when='@3.24.4') + depends_on('r-mgcv', type=('build', 'run')) + depends_on('r-genefilter', type=('build', 'run')) + depends_on('r-biocparallel', type=('build', 'run')) + depends_on('r-matrixstats', type=('build', 'run')) + depends_on('r-limma', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From e732a554ff3f456c4ff08c7ac215cac227c6646b Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Thu, 16 Nov 2017 10:30:18 -0600 Subject: r-shortread: Create new package. (#6332) --- .../repos/builtin/packages/r-shortread/package.py | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-shortread/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-shortread/package.py b/var/spack/repos/builtin/packages/r-shortread/package.py new file mode 100644 index 0000000000..b2625916c8 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-shortread/package.py @@ -0,0 +1,55 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RShortread(RPackage): + """This package implements sampling, iteration, and input of FASTQ + files. The package includes functions for filtering and trimming + reads, and for generating a quality assessment report. Data are + represented as DNAStringSet-derived objects, and easily manipulated + for a diversity of purposes. The package also contains legacy support + for early single-end, ungapped alignment formats.""" + + homepage = "https://www.bioconductor.org/packages/ShortRead/" + url = "https://git.bioconductor.org/packages/ShortRead" + + version('1.34.2', git='https://git.bioconductor.org/packages/ShortRead', commit='25daac63b301df66a8ef6e98cc2977522c6786cd') + + depends_on('r@3.4.0:3.4.9', when='@1.34.2') + depends_on('r-latticeextra', type=('build', 'run')) + depends_on('r-lattice', type=('build', 'run')) + depends_on('r-zlibbioc', type=('build', 'run')) + depends_on('r-hwriter', type=('build', 'run')) + depends_on('r-genomicranges', type=('build', 'run')) + depends_on('r-genomeinfodb', type=('build', 'run')) + depends_on('r-iranges', type=('build', 'run')) + depends_on('r-s4vectors', type=('build', 'run')) + depends_on('r-biobase', type=('build', 'run')) + depends_on('r-genomicalignments', type=('build', 'run')) + depends_on('r-rsamtools', type=('build', 'run')) + depends_on('r-biostrings', type=('build', 'run')) + depends_on('r-biocparallel', type=('build', 'run')) + depends_on('r-biocgenerics', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From bb3d5fd3137d8111f303af528aad0afbcd7b4644 Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Thu, 16 Nov 2017 10:40:15 -0600 Subject: r-rhdf5: Create new package. (#6330) --- .../repos/builtin/packages/r-rhdf5/package.py | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-rhdf5/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-rhdf5/package.py b/var/spack/repos/builtin/packages/r-rhdf5/package.py new file mode 100644 index 0000000000..49cfa5d70d --- /dev/null +++ b/var/spack/repos/builtin/packages/r-rhdf5/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RRhdf5(RPackage): + """This R/Bioconductor package provides an interface between HDF5 + and R. HDF5's main features are the ability to store and access very + large and/or complex datasets and a wide variety of metadata on mass + storage (disk) through a completely portable file format. The rhdf5 + package is thus suited for the exchange of large and/or complex + datasets between R and other software package, and for letting R + applications work on datasets that are larger than the available RAM.""" + + homepage = "https://www.bioconductor.org/packages/rhdf5/" + url = "https://git.bioconductor.org/packages/rhdf5" + + version('2.20.0', git='https://git.bioconductor.org/packages/rhdf5', commit='37b5165325062728bbec9167f89f5f4b794f30bc') + + depends_on('r@3.4.0:3.4.9', when='@2.20.0') + depends_on('r-zlibbioc', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From e941f33eafe6348e37b6813a284dbe860c2772d1 Mon Sep 17 00:00:00 2001 From: Audrey Thoma Date: Thu, 16 Nov 2017 10:40:46 -0600 Subject: meraculous: new package (#6292) * meraculous: new package * adding gcc version conflict * Update package.py * Update package.py --- .../repos/builtin/packages/meraculous/package.py | 50 ++++++++++++++++++++++ .../builtin/packages/perl-log-log4perl/package.py | 34 +++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 var/spack/repos/builtin/packages/meraculous/package.py create mode 100644 var/spack/repos/builtin/packages/perl-log-log4perl/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/meraculous/package.py b/var/spack/repos/builtin/packages/meraculous/package.py new file mode 100644 index 0000000000..51d3943943 --- /dev/null +++ b/var/spack/repos/builtin/packages/meraculous/package.py @@ -0,0 +1,50 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Meraculous(CMakePackage): + """Meraculous is a while genome assembler for Next Generation Sequencing + data geared for large genomes.""" + + homepage = "http://jgi.doe.gov/data-and-tools/meraculous/" + url = "https://downloads.sourceforge.net/project/meraculous20/Meraculous-v2.2.4.tar.gz" + + version('2.2.4', '349feb6cb178643a46e4b092c87bad3a') + + depends_on('perl', type=('build', 'run')) + depends_on('boost@1.5.0:') + depends_on('gnuplot@3.7:') + depends_on('perl-log-log4perl', type=('build', 'run')) + + conflicts('%gcc@6.0.0:', when='@2.2.4') + + def patch(self): + edit = FileFilter('CMakeLists.txt') + edit.filter("-static-libstdc\+\+", "") + + def setup_environment(self, spack_env, run_env): + run_env.set('MERACULOUS_ROOT', self.prefix) + run_env.prepend_path('PERL5LIB', self.prefix.lib) diff --git a/var/spack/repos/builtin/packages/perl-log-log4perl/package.py b/var/spack/repos/builtin/packages/perl-log-log4perl/package.py new file mode 100644 index 0000000000..6a0d182d2f --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-log-log4perl/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlLogLog4perl(PerlPackage): + """Log4j implementation for Perl""" + + homepage = "http://search.cpan.org/~mschilli/Log-Log4perl-1.44/lib/Log/Log4perl.pm" + url = "https://github.com/mschilli/log4perl/archive/rel_146.tar.gz" + + version('146', '500abbd978ed326cfe5367dc4f9f3be2') -- cgit v1.2.3-70-g09d2 From ef3c909701cfa0866ef606c85e50ca740711056f Mon Sep 17 00:00:00 2001 From: healther Date: Thu, 16 Nov 2017 18:13:20 +0100 Subject: add package py-numba (#6323) * add package py-numba * Update package.py * Update package.py * Update package.py --- .../repos/builtin/packages/py-llvmlite/package.py | 39 +++++++++++++++++++++ .../repos/builtin/packages/py-numba/package.py | 40 ++++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-llvmlite/package.py create mode 100644 var/spack/repos/builtin/packages/py-numba/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-llvmlite/package.py b/var/spack/repos/builtin/packages/py-llvmlite/package.py new file mode 100644 index 0000000000..c08ddb81a0 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-llvmlite/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyLlvmlite(PythonPackage): + """A lightweight LLVM python binding for writing JIT compilers""" + + homepage = "http://llvmlite.readthedocs.io/en/latest/index.html" + url = "https://pypi.io/packages/source/l/llvmlite/llvmlite-0.20.0.tar.gz" + + version('0.20.0', 'f2aa60d0981842b7930ba001b03679ab') + + depends_on('py-setuptools', type='build') + depends_on('py-enum34', type=('build', 'run'), when='^python@:3.3.99') + depends_on('llvm@4.0:4.99', when='@0.17.0:0.20.99') + depends_on('binutils', type='build') diff --git a/var/spack/repos/builtin/packages/py-numba/package.py b/var/spack/repos/builtin/packages/py-numba/package.py new file mode 100644 index 0000000000..15da8af62b --- /dev/null +++ b/var/spack/repos/builtin/packages/py-numba/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyNumba(PythonPackage): + """NumPy aware dynamic Python compiler using LLVM""" + + homepage = "https://numba.pydata.org/" + url = "https://pypi.io/packages/source/n/numba/numba-0.35.0.tar.gz" + + version('0.35.0', '4f447383406f54aaf18ffaba3a0e79e8') + + depends_on('py-numpy@1.10:', type=('build', 'run')) + depends_on('py-llvmlite@0.20:', type=('build', 'run')) + depends_on('py-argparse', type=('build', 'run')) + depends_on('py-funcsigs', type=('build', 'run'), when='^python@:3.3.99') + depends_on('py-singledispatch', type=('build', 'run'), when='^python@:3.3.99') -- cgit v1.2.3-70-g09d2 From a62f8698c3fd7310601cc1b86b112982cdfff85d Mon Sep 17 00:00:00 2001 From: Matthias Vogelgesang Date: Thu, 16 Nov 2017 09:37:17 -0800 Subject: Add UFO and dependencies (#6337) * Add json-glib * Add ufo-core * Add ufo-filters --- .../repos/builtin/packages/json-glib/package.py | 37 ++++++++++++++++++++ .../repos/builtin/packages/ufo-core/package.py | 40 ++++++++++++++++++++++ .../repos/builtin/packages/ufo-filters/package.py | 38 ++++++++++++++++++++ 3 files changed, 115 insertions(+) create mode 100644 var/spack/repos/builtin/packages/json-glib/package.py create mode 100644 var/spack/repos/builtin/packages/ufo-core/package.py create mode 100644 var/spack/repos/builtin/packages/ufo-filters/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/json-glib/package.py b/var/spack/repos/builtin/packages/json-glib/package.py new file mode 100644 index 0000000000..07b067c22f --- /dev/null +++ b/var/spack/repos/builtin/packages/json-glib/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class JsonGlib(AutotoolsPackage): + """JSON-GLib is a library for reading and parsing JSON using GLib and + GObject data types and API.""" + + homepage = "https://developer.gnome.org/json-glib" + url = "https://ftp.gnome.org/pub/gnome/sources/json-glib/1.2/json-glib-1.2.8.tar.xz" + + version('1.2.8', 'ff31e7d0594df44318e12facda3d086e') + + depends_on('glib') diff --git a/var/spack/repos/builtin/packages/ufo-core/package.py b/var/spack/repos/builtin/packages/ufo-core/package.py new file mode 100644 index 0000000000..1ccc0d73b5 --- /dev/null +++ b/var/spack/repos/builtin/packages/ufo-core/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class UfoCore(CMakePackage): + """The UFO data processing framework is a C library suited to build general + purpose streams data processing on heterogeneous architectures such as + CPUs, GPUs or clusters. This package contains the run-time system and + development files.""" + + homepage = "https://ufo.kit.edu" + url = "https://github.com/ufo-kit/ufo-core/archive/v0.14.0.tar.gz" + + version('0.14.0', '3bd94d10d0f589953aba11821a8295f3') + + depends_on('glib') + depends_on('json-glib') diff --git a/var/spack/repos/builtin/packages/ufo-filters/package.py b/var/spack/repos/builtin/packages/ufo-filters/package.py new file mode 100644 index 0000000000..675c268cac --- /dev/null +++ b/var/spack/repos/builtin/packages/ufo-filters/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class UfoFilters(CMakePackage): + """The UFO data processing framework is a C library suited to build general + purpose streams data processing on heterogeneous architectures such as + CPUs, GPUs or clusters. This package contains filter plugins.""" + + homepage = "https://ufo.kit.edu" + url = "https://github.com/ufo-kit/ufo-filters/archive/v0.14.1.tar.gz" + + version('0.14.1', 'f2a81f5d38cfa71de58cbb5279782297') + + depends_on('ufo-core') -- cgit v1.2.3-70-g09d2 From 17debcb9b228c319ec9b522d98c7248800f8b082 Mon Sep 17 00:00:00 2001 From: Brian Homerding Date: Thu, 16 Nov 2017 17:30:42 -0600 Subject: NuT: Add Installation of lib and demo app (#6341) --- var/spack/repos/builtin/packages/nut/package.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nut/package.py b/var/spack/repos/builtin/packages/nut/package.py index 2ff9f77c9c..6e375bcbd0 100644 --- a/var/spack/repos/builtin/packages/nut/package.py +++ b/var/spack/repos/builtin/packages/nut/package.py @@ -44,8 +44,6 @@ class Nut(CMakePackage): depends_on('random123') - # serial must be built with clang - conflicts('%gcc', when='@serial') conflicts('%intel', when='@serial') conflicts('%pgi', when='@serial') conflicts('%xl', when='@serial') @@ -59,4 +57,9 @@ class Nut(CMakePackage): def install(self, spec, prefix): install('README.md', prefix) mkdirp(prefix.bin) + mkdirp(prefix.lib) install('spack-build/test/nut_unittests', prefix.bin) + install('spack-build/apps/bh-3', prefix.bin) + install('spack-build/lib/libnut.a', prefix.lib) + install_tree('test/data', prefix.data) + install_tree('lib', prefix.include) -- cgit v1.2.3-70-g09d2 From 1f8f593dd63699dda75c6fbfc1e56c92258b7fd0 Mon Sep 17 00:00:00 2001 From: sknigh Date: Fri, 17 Nov 2017 17:57:17 -0800 Subject: Added libhio 1.4.0.0 (#6357) --- var/spack/repos/builtin/packages/libhio/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libhio/package.py b/var/spack/repos/builtin/packages/libhio/package.py index db74e7c546..3dae8b2b1d 100644 --- a/var/spack/repos/builtin/packages/libhio/package.py +++ b/var/spack/repos/builtin/packages/libhio/package.py @@ -33,6 +33,7 @@ class Libhio(AutotoolsPackage): homepage = "https://github.com/hpc/libhio/" url = "https://github.com/hpc/libhio/releases/download/hio.1.3.0.1/libhio-1.3.0.1.tar.gz" + version('1.4.0.0', 'a223effbfd50efd452053e6954e3ccf5') version('1.3.0.1', 'c073541de8dd70aeb8878bd00d6d877f') depends_on("json-c") -- cgit v1.2.3-70-g09d2 From 5c06255b248322f28c5095a21365b18f3d40ed84 Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Fri, 17 Nov 2017 19:57:40 -0600 Subject: r-clusterprofiler: Create new package. (#6356) --- .../builtin/packages/r-clusterprofiler/package.py | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-clusterprofiler/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-clusterprofiler/package.py b/var/spack/repos/builtin/packages/r-clusterprofiler/package.py new file mode 100644 index 0000000000..a0e40e65e1 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-clusterprofiler/package.py @@ -0,0 +1,47 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RClusterprofiler(RPackage): + """This package implements methods to analyze and visualize functional + profiles (GO and KEGG) of gene and gene clusters.""" + + homepage = "https://www.bioconductor.org/packages/clusterProfiler/" + url = "https://git.bioconductor.org/packages/clusterProfiler" + + version('3.4.4', git='https://git.bioconductor.org/packages/clusterProfiler', commit='b86b00e8405fe130e439362651a5567736e2d9d7') + + depends_on('r@3.4.0:3.4.9', when='@3.4.4') + depends_on('r-tidyr', type=('build', 'run')) + depends_on('r-rvcheck', type=('build', 'run')) + depends_on('r-qvalue', type=('build', 'run')) + depends_on('r-plyr', type=('build', 'run')) + depends_on('r-magrittr', type=('build', 'run')) + depends_on('r-gosemsim', type=('build', 'run')) + depends_on('r-go-db', type=('build', 'run')) + depends_on('r-ggplot2', type=('build', 'run')) + depends_on('r-annotationdbi', type=('build', 'run')) + depends_on('r-dose', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From c6046386811e724aed64c8b917e16e0927d00ba0 Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Fri, 17 Nov 2017 19:58:01 -0600 Subject: r-fgsea: Create new package. (#6354) --- .../repos/builtin/packages/r-fgsea/package.py | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-fgsea/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-fgsea/package.py b/var/spack/repos/builtin/packages/r-fgsea/package.py new file mode 100644 index 0000000000..affbe50f07 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-fgsea/package.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RFgsea(RPackage): + """The package implements an algorithm for fast gene set enrichment + analysis. Using the fast algorithm allows to make more permutations + and get more fine grained p-values, which allows to use accurate + stantard approaches to multiple hypothesis correction.""" + + homepage = "https://www.bioconductor.org/packages/fgsea/" + url = "https://git.bioconductor.org/packages/fgsea" + + version('1.2.1', git='https://git.bioconductor.org/packages/fgsea', commit='99b04eef664204d0dca4b9f8027cd7eefb006b72') + + depends_on('r@3.4.0:3.4.9', when='@1.2.1') + depends_on('r-fastmatch', type=('build', 'run')) + depends_on('r-gridextra', type=('build', 'run')) + depends_on('r-ggplot2', type=('build', 'run')) + depends_on('r-biocparallel', type=('build', 'run')) + depends_on('r-data-table', type=('build', 'run')) + depends_on('r-rcpp', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From d836d7e7ead5194371e6754bcdfda24a5ccd89c5 Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Fri, 17 Nov 2017 19:58:23 -0600 Subject: r-do-db: Create new package. (#6353) --- .../repos/builtin/packages/r-do-db/package.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-do-db/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-do-db/package.py b/var/spack/repos/builtin/packages/r-do-db/package.py new file mode 100644 index 0000000000..689c957583 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-do-db/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RDoDb(RPackage): + """A set of annotation maps describing the entire Disease + Ontology assembled using data from DO.""" + + homepage = "https://bioconductor.org/packages/DO.db/" + url = "https://www.bioconductor.org/packages/3.5/data/annotation/src/contrib/DO.db_2.9.tar.gz" + + version('2.9', '63dda6d46d2fe40c52a2e79260a7fb9d') + + depends_on('r-annotationdbi', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From eda91bebd70a9bb80bc4e64ce31f2756a973c502 Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Fri, 17 Nov 2017 19:58:43 -0600 Subject: r-gosemsim: Create new package. (#6352) --- .../repos/builtin/packages/r-gosemsim/package.py | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-gosemsim/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-gosemsim/package.py b/var/spack/repos/builtin/packages/r-gosemsim/package.py new file mode 100644 index 0000000000..b3733bae93 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-gosemsim/package.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RGosemsim(RPackage): + """The semantic comparisons of Gene Ontology (GO) annotations provide + quantitative ways to compute similarities between genes and gene + groups, and have became important basis for many bioinformatics + analysis approaches. GOSemSim is an R package for semantic similarity + computation among GO terms, sets of GO terms, gene products and gene + clusters. GOSemSim implemented five methods proposed by Resnik, + Schlicker, Jiang, Lin and Wang respectively.""" + + homepage = "https://www.bioconductor.org/packages/GOSemSim/" + url = "https://git.bioconductor.org/packages/GOSemSim" + + version('2.2.0', git='https://git.bioconductor.org/packages/GOSemSim', commit='247434790e6c8cf99e5643f569390362b8c87c52') + + depends_on('r@3.4.0:3.4.9', when='@2.2.0') + depends_on('r-annotationdbi', type=('build', 'run')) + depends_on('r-go-db', type=('build', 'run')) + depends_on('r-rcpp', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 9647038f27ed1fc23f4016ae07f9b6c82598e6b0 Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Fri, 17 Nov 2017 19:59:00 -0600 Subject: r-rvcheck: Create new package. (#6351) --- .../repos/builtin/packages/r-rvcheck/package.py | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-rvcheck/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-rvcheck/package.py b/var/spack/repos/builtin/packages/r-rvcheck/package.py new file mode 100644 index 0000000000..d8982f35fb --- /dev/null +++ b/var/spack/repos/builtin/packages/r-rvcheck/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RRvcheck(RPackage): + """Check latest release version of R and R package (both in 'CRAN', + 'Bioconductor' or 'Github').""" + + homepage = "https://cran.r-project.org/package=rvcheck" + url = "https://cran.rstudio.com/src/contrib/rvcheck_0.0.9.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/rvcheck" + + version('0.0.9', '7e9821de754577f94fdcbf7b02a20edc') -- cgit v1.2.3-70-g09d2 From 8bc024d2d982760baa7a01e9900cfdcb6e8533ba Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Sat, 18 Nov 2017 09:59:18 +0800 Subject: Add cluster.2017.5 and cluster.2018.1. (#6349) --- var/spack/repos/builtin/packages/intel-parallel-studio/package.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py index 9828eaf6c0..78a1d7c908 100644 --- a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py +++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py @@ -34,12 +34,16 @@ class IntelParallelStudio(IntelPackage): homepage = "https://software.intel.com/en-us/intel-parallel-studio-xe" + version('cluster.2018.1', '9c007011e0e3fc72747b58756fbf01cd', + url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12374/parallel_studio_xe_2018_update1_cluster_edition.tgz') version('professional.2018.0', '9a233854e9218937bc5f46f02b3c7542', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12062/parallel_studio_xe_2018_professional_edition.tgz') version('cluster.2018.0', 'fa9baeb83dd2e8e4a464e3db38f28d0f', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12058/parallel_studio_xe_2018_cluster_edition.tgz') version('composer.2018.0', '31ba768fba6e7322957b03feaa3add28', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12067/parallel_studio_xe_2018_composer_edition.tgz') + version('cluster.2017.5', 'baeb8e584317fcdf1f60b8208bd4eab5', + url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12138/parallel_studio_xe_2017_update5.tgz') version('professional.2017.4', '27398416078e1e4005afced3e9a6df7e', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11537/parallel_studio_xe_2017_update4.tgz') version('cluster.2017.4', '27398416078e1e4005afced3e9a6df7e', -- cgit v1.2.3-70-g09d2 From 21da747a5d753d9b56fa4a0c5dfd0218a7e45983 Mon Sep 17 00:00:00 2001 From: Javier Cervantes Date: Sat, 18 Nov 2017 02:59:52 +0100 Subject: hepmc: fix hash and urls, add new version 3.0.0 (#6348) --- var/spack/repos/builtin/packages/hepmc/package.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hepmc/package.py b/var/spack/repos/builtin/packages/hepmc/package.py index b5470225b5..a387ff6131 100644 --- a/var/spack/repos/builtin/packages/hepmc/package.py +++ b/var/spack/repos/builtin/packages/hepmc/package.py @@ -33,7 +33,8 @@ class Hepmc(CMakePackage): homepage = "http://hepmc.web.cern.ch/hepmc/" url = "http://hepmc.web.cern.ch/hepmc/releases/hepmc2.06.09.tgz" - version('2.06.09', 'c47627ced4255b40e731b8666848b087') + version('3.0.0', '2212a5e8d693fbf726c28b43ebc6377a') + version('2.06.09', '52518437a64f6b4284e9acc2ecad6212') version('2.06.08', 'a2e889114cafc4f60742029d69abd907') version('2.06.07', '11d7035dccb0650b331f51520c6172e7') version('2.06.06', '102e5503537a3ecd6ea6f466aa5bc4ae') @@ -46,3 +47,10 @@ class Hepmc(CMakePackage): '-Dmomentum:STRING=GEV', '-Dlength:STRING=MM', ] + + def url_for_version(self, version): + if version <= Version("2.06.08"): + url = "http://lcgapp.cern.ch/project/simu/HepMC/download/HepMC-{0}.tar.gz" + else: + url = "http://hepmc.web.cern.ch/hepmc/releases/hepmc{0}.tgz" + return url.format(version) -- cgit v1.2.3-70-g09d2 From b2f0306c6f7a457177b7d03bc10157b681d6eb0a Mon Sep 17 00:00:00 2001 From: Stephen Hudson Date: Fri, 17 Nov 2017 20:00:36 -0600 Subject: Mpi4py update (#6342) --- var/spack/repos/builtin/packages/py-mpi4py/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-mpi4py/package.py b/var/spack/repos/builtin/packages/py-mpi4py/package.py index 7193800506..f8b6b560c0 100644 --- a/var/spack/repos/builtin/packages/py-mpi4py/package.py +++ b/var/spack/repos/builtin/packages/py-mpi4py/package.py @@ -33,13 +33,14 @@ class PyMpi4py(PythonPackage): """ homepage = "https://pypi.python.org/pypi/mpi4py" - url = "https://pypi.io/packages/source/m/mpi4py/mpi4py-1.3.1.tar.gz" + url = "https://pypi.io/packages/source/m/mpi4py/mpi4py-3.0.0.tar.gz" version('develop', git='https://github.com/mpi4py/mpi4py.git', branch='master') + version('3.0.0', 'bfe19f20cef5e92f6e49e50fb627ee70') version('2.0.0', '4f7d8126d7367c239fd67615680990e3') version('1.3.1', 'dbe9d22bdc8ed965c23a7ceb6f32fc3c') depends_on('python@2.7:2.8,3.3:') depends_on('py-setuptools', type='build') depends_on('mpi') - depends_on('py-cython', when='@2.0.1:', type='build') + depends_on('py-cython', when='@3.0.0:', type='build') -- cgit v1.2.3-70-g09d2 From e2fea1e1e6887a0322b1bb6e5ba68f90b4263ce3 Mon Sep 17 00:00:00 2001 From: Michael Kuron Date: Sat, 18 Nov 2017 03:01:15 +0100 Subject: siesta: new package (#6346) * siesta: new package * siesta: use libs instead of ld_flags everywhere --- var/spack/repos/builtin/packages/siesta/package.py | 78 ++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 var/spack/repos/builtin/packages/siesta/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/siesta/package.py b/var/spack/repos/builtin/packages/siesta/package.py new file mode 100644 index 0000000000..bfe225ef71 --- /dev/null +++ b/var/spack/repos/builtin/packages/siesta/package.py @@ -0,0 +1,78 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class Siesta(Package): + """SIESTA performs electronic structure calculations and ab initio molecular + dynamics simulations of molecules and solids.""" + + homepage = "https://departments.icmab.es/leem/siesta/" + url = "https://launchpad.net/siesta/4.0/4.0.1/+download/siesta-4.0.1.tar.gz" + + version('4.0.1', '5cb60ce068f2f6e84fa9184ffca94c08') + + depends_on('mpi') + depends_on('blas') + depends_on('lapack') + depends_on('scalapack') + + phases = ['configure', 'build', 'install'] + + def configure(self, spec, prefix): + sh = which('sh') + configure_args = ['--enable-mpi', + '--with-blas=%s' % spec['blas'].libs, + '--with-lapack=%s' % spec['lapack'].libs, + # need to include BLAS below because Intel MKL's + # BLACS depends on BLAS, otherwise the compiler + # test fails + '--with-blacs=%s' % (spec['scalapack'].libs + + spec['blas'].libs), + '--with-scalapack=%s' % spec['scalapack'].libs, + # need to specify MPIFC explicitly below, otherwise + # Intel's mpiifort is not found + 'MPIFC=%s' % spec['mpi'].mpifc + ] + with working_dir('Obj'): + sh('../Src/configure', *configure_args) + sh('../Src/obj_setup.sh') + with working_dir('Obj_trans', create=True): + sh('../Src/configure', *configure_args) + sh('../Src/obj_setup.sh') + + def build(self, spec, prefix): + with working_dir('Obj'): + make(parallel=False) + with working_dir('Obj_trans'): + make('transiesta', parallel=False) + + def install(self, spec, prefix): + mkdir(prefix.bin) + with working_dir('Obj'): + install('siesta', prefix.bin) + with working_dir('Obj_trans'): + install('transiesta', prefix.bin) -- cgit v1.2.3-70-g09d2 From ebfc7bd7aa460dede55235dd37c8a13f95d017bc Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 18 Nov 2017 07:35:21 -0600 Subject: r-som: Create new package (#6364) --- var/spack/repos/builtin/packages/r-som/package.py | 41 +++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-som/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-som/package.py b/var/spack/repos/builtin/packages/r-som/package.py new file mode 100644 index 0000000000..4ac3c0061d --- /dev/null +++ b/var/spack/repos/builtin/packages/r-som/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RSom(RPackage): + """Self-Organizing Map (with application in gene clustering).""" + + homepage = "https://cran.r-project.org/web/packages/som/index.html" + url = "https://cran.r-project.org/src/contrib/som_0.3-5.1.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/som" + + version('0.3-5.1', '802a5a80902579354ce3420faeeeb756') + version('0.3-5', '72717499794c7aa945a768b742af8895') + version('0.3-4', '1e25572e446409f5e32c5da5f1af98e6') + version('0.3-3', 'd4ac444be24f71d08b99974c2f4b96e5') + version('0.3-2', '4ce28f46df68fbb73905711ba2416fac') + + depends_on('r@3.4.0:3.4.9') -- cgit v1.2.3-70-g09d2 From 1c55a401b1e6fce744a41adbff99a71b7bee43b7 Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 18 Nov 2017 07:35:47 -0600 Subject: r-dtw: Create new package (#6365) --- var/spack/repos/builtin/packages/r-dtw/package.py | 44 +++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-dtw/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-dtw/package.py b/var/spack/repos/builtin/packages/r-dtw/package.py new file mode 100644 index 0000000000..af50941f17 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-dtw/package.py @@ -0,0 +1,44 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RDtw(RPackage): + """A comprehensive implementation of dynamic time warping (DTW) algorithms + in R. DTW computes the optimal (least cumulative distance) alignment + between points of two time series.""" + + homepage = "https://cran.r-project.org/web/packages/dtw/index.html" + url = "https://cran.r-project.org/src/contrib/dtw_1.18-1.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/dtw" + + version('1.18-1', '5e9995a198a62f28045c29461265d536') + version('1.17-1', 'e8be988fe528acd6b44afdf5aa06b745') + version('1.16', '260bd22d9db429394eb39739db4a4686') + version('1.15', 'd3b6fdb0b866ff2e5b178c37bcfc7c55') + version('1.14-3', 'a7b878e8dda7a61df22356d0a81540c5') + + depends_on('r@3.4.0:3.4.9') + depends_on('r-proxy', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 618f4dff6d622097b0d92d746b1b33e7a4a2ab7f Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 18 Nov 2017 07:36:39 -0600 Subject: r-bindrcpp: Create new package (#6366) --- .../repos/builtin/packages/r-bindrcpp/package.py | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-bindrcpp/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-bindrcpp/package.py b/var/spack/repos/builtin/packages/r-bindrcpp/package.py new file mode 100644 index 0000000000..ab355b70e8 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-bindrcpp/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RBindrcpp(RPackage): + """Provides an easy way to fill an environment with active bindings that + call a C++ function.""" + + homepage = "https://github.com/krlmlr/bindrcpp" + url = "https://cran.r-project.org/src/contrib/bindrcpp_0.2.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/bindrcpp" + + version('0.2', '2ed7f19fd9a12587f882d90060e7a343') + + depends_on('r@3.4.0:3.4.9') + depends_on('r-rcpp', type=('build', 'run')) + depends_on('r-bindr', type=('build', 'run')) + depends_on('r-plogr', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 20092adb944615b96e4265d5d23627f91b2d5c58 Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 18 Nov 2017 07:39:55 -0600 Subject: r-vgam: Create new package (#6363) --- var/spack/repos/builtin/packages/r-vgam/package.py | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-vgam/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-vgam/package.py b/var/spack/repos/builtin/packages/r-vgam/package.py new file mode 100644 index 0000000000..bbb0e0fcd1 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-vgam/package.py @@ -0,0 +1,44 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RVgam(RPackage): + """An implementation of about 6 major classes of statistical regression + models.""" + + homepage = "https://cran.r-project.org/web/packages/VGAM/index.html" + url = "https://cran.r-project.org/src/contrib/VGAM_1.0-4.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/VGAM" + + version('1.0-4', '9d30736842db6d9dcec83df49f11d3c1') + version('1.0-3', 'a158cd0a6ff956b4bf21d610df361b18') + version('1.0-2', '813b303d5d956914cf8910db3fa1ba14') + version('1.0-1', '778182585c774036ac3d10240cf63b40') + version('1.0-0', '81da7b3a797b5e26b9e859dc2f373b7b') + + depends_on('r@3.4.0:3.4.9') + depends_on('r-mass', type=('build', 'run')) + depends_on('r-mgcv', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From cf3df2a321762bff061715742144900ca08cdd79 Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Sat, 18 Nov 2017 13:54:14 -0600 Subject: r-dose: Create new package. (#6355) --- var/spack/repos/builtin/packages/r-dose/package.py | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-dose/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-dose/package.py b/var/spack/repos/builtin/packages/r-dose/package.py new file mode 100644 index 0000000000..354120079d --- /dev/null +++ b/var/spack/repos/builtin/packages/r-dose/package.py @@ -0,0 +1,52 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RDose(RPackage): + """This package implements five methods proposed by Resnik, Schlicker, + Jiang, Lin and Wang respectively for measuring semantic similarities + among DO terms and gene products. Enrichment analyses including + hypergeometric model and gene set enrichment analysis are also + implemented for discovering disease associations of high-throughput + biological data.""" + + homepage = "https://www.bioconductor.org/packages/DOSE/" + url = "https://git.bioconductor.org/packages/DOSE" + + version('3.2.0', git='https://git.bioconductor.org/packages/DOSE', commit='71f563fc39d02dfdf65184c94e0890a63b96b86b') + + depends_on('r@3.4.0:3.4.9', when='@3.2.0') + depends_on('r-scales', type=('build', 'run')) + depends_on('r-s4vectors', type=('build', 'run')) + depends_on('r-reshape2', type=('build', 'run')) + depends_on('r-qvalue', type=('build', 'run')) + depends_on('r-igraph', type=('build', 'run')) + depends_on('r-gosemsim', type=('build', 'run')) + depends_on('r-ggplot2', type=('build', 'run')) + depends_on('r-fgsea', type=('build', 'run')) + depends_on('r-do-db', type=('build', 'run')) + depends_on('r-biocparallel', type=('build', 'run')) + depends_on('r-annotationdbi', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From acbdf516f7bd2364ba13d18cb8c42da7c43005eb Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sun, 19 Nov 2017 07:45:25 -0600 Subject: Add a new package for rlwrap (#6371) --- var/spack/repos/builtin/packages/rlwrap/package.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 var/spack/repos/builtin/packages/rlwrap/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/rlwrap/package.py b/var/spack/repos/builtin/packages/rlwrap/package.py new file mode 100644 index 0000000000..33ca41aa42 --- /dev/null +++ b/var/spack/repos/builtin/packages/rlwrap/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Rlwrap(AutotoolsPackage): + """rlwrap is a 'readline wrapper', a small utility that uses the GNU + readline library to allow the editing of keyboard input for any command.""" + + homepage = "https://github.com/hanslub42/rlwrap" + url = "https://github.com/hanslub42/rlwrap/releases/download/v0.43/rlwrap-0.43.tar.gz" + + version('0.43', 'b993e83d3a292464de70719b32f83a34') + + depends_on('readline@4.2:') -- cgit v1.2.3-70-g09d2 From 34da07db9b0384c0ae7fa7fcbd11ce64232678f4 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Sun, 19 Nov 2017 20:39:13 +0100 Subject: dealii: add cuda_arch variant via CudaPackage (#6070) --- lib/spack/spack/build_systems/cuda.py | 88 ++++++++++++++++++++++ var/spack/repos/builtin/packages/dealii/package.py | 29 ++++--- 2 files changed, 108 insertions(+), 9 deletions(-) create mode 100644 lib/spack/spack/build_systems/cuda.py (limited to 'var') diff --git a/lib/spack/spack/build_systems/cuda.py b/lib/spack/spack/build_systems/cuda.py new file mode 100644 index 0000000000..874b30f679 --- /dev/null +++ b/lib/spack/spack/build_systems/cuda.py @@ -0,0 +1,88 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack.package import Package +from spack.directives import depends_on, variant, conflicts +import platform + + +class CudaPackage(Package): + """Auxiliary class which contains CUDA variant, dependencies and conflicts + and is meant to unify and facilitate its usage. + """ + + # FIXME: keep cuda and cuda_arch separate to make usage easier untill + # Spack has depends_on(cuda, when='cuda_arch!=None') or alike + variant('cuda', default=False, + description='Build with CUDA') + # see http://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html#gpu-feature-list + # https://developer.nvidia.com/cuda-gpus + variant('cuda_arch', default=None, + description='CUDA architecture', + values=('20', '30', '32', '35', '50', '52', '53', '60', '61', + '62', '70'), + multi=True) + + # see http://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html#nvcc-examples + # and http://llvm.org/docs/CompileCudaWithLLVM.html#compiling-cuda-code + @staticmethod + def cuda_flags(arch_list): + return [('--generate-code arch=compute_{0},code=sm_{0} ' + '--generate-code arch=compute_{0},code=compute_{0}').format(s) + for s in arch_list] + + depends_on("cuda@7:", when='+cuda') + + # CUDA version vs Architecture + depends_on("cuda@8:", when='cuda_arch=60') + depends_on("cuda@8:", when='cuda_arch=61') + depends_on("cuda@8:", when='cuda_arch=62') + depends_on("cuda@9:", when='cuda_arch=70') + + depends_on('cuda@:8.99', when='cuda_arch=20') + + # Compiler conflicts: + # https://gist.github.com/ax3l/9489132 + conflicts('%gcc@5:', when='+cuda ^cuda@:7.5') + conflicts('%gcc@6:', when='+cuda ^cuda@:8.99') + conflicts('%gcc@7:', when='+cuda ^cuda@:9.99') + if (platform.system() != "Darwin"): + conflicts('%clang@:3.4,3.7:', when='+cuda ^cuda@7.5') + conflicts('%clang@:3.7,4:', when='+cuda ^cuda@8:9') + conflicts('%intel@:14,16:', when='+cuda ^cuda@7.5') + conflicts('%intel@:14,17:', when='+cuda ^cuda@8.0.44') + conflicts('%intel@:14,18:', when='+cuda ^cuda@8.0.61:9') + + # Make sure cuda_arch can not be used without +cuda + conflicts('~cuda', when='cuda_arch=20') + conflicts('~cuda', when='cuda_arch=30') + conflicts('~cuda', when='cuda_arch=32') + conflicts('~cuda', when='cuda_arch=35') + conflicts('~cuda', when='cuda_arch=50') + conflicts('~cuda', when='cuda_arch=52') + conflicts('~cuda', when='cuda_arch=53') + conflicts('~cuda', when='cuda_arch=60') + conflicts('~cuda', when='cuda_arch=61') + conflicts('~cuda', when='cuda_arch=62') + conflicts('~cuda', when='cuda_arch=70') diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 8f3e5d80ea..1616b63a51 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -23,10 +23,11 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * +from spack.build_systems.cuda import CudaPackage import os -class Dealii(CMakePackage): +class Dealii(CMakePackage, CudaPackage): """C++ software library providing well-documented tools to build finite element codes for a broad variety of PDEs.""" homepage = "https://www.dealii.org" @@ -84,8 +85,6 @@ class Dealii(CMakePackage): variant('build_type', default='DebugRelease', description='The build type to build', values=('Debug', 'Release', 'DebugRelease')) - variant('cuda', default=False, - description='Build with CUDA') # required dependencies, light version depends_on("blas") @@ -157,7 +156,6 @@ class Dealii(CMakePackage): conflicts('+adol-c', when='@:8.5.1') conflicts('+gsl', when='@:8.4.2') conflicts('+python', when='@:8.4.2') - conflicts('+cuda', when='%gcc@6:') for p in ['+arpack', '+hdf5', '+netcdf', '+p4est', '+petsc', '+slepc', '+trilinos']: conflicts(p, when='~mpi') @@ -227,12 +225,25 @@ class Dealii(CMakePackage): ]) # CUDA - # FIXME -DDEAL_II_CUDA_FLAGS="-arch=sm_60" if '+cuda' in spec: - options.extend([ - '-DDEAL_II_WITH_CUDA=ON', - '-DDEAL_II_WITH_CXX14=OFF' - ]) + options.append( + '-DDEAL_II_WITH_CUDA=ON' + ) + if not spec.satisfies('^cuda@9:'): + options.append('-DDEAL_II_WITH_CXX14=OFF') + cuda_arch = spec.variants['cuda_arch'].value + if cuda_arch is not None: + if len(cuda_arch) > 1: + raise InstallError( + 'deal.II only supports compilation for a single GPU!' + ) + flags = '-arch=sm_{0}'.format(cuda_arch[0]) + # FIXME: there are some compiler errors in dealii + # with flags below. Stick with -arch=sm_xy for now. + # flags = ' '.join(self.cuda_flags(cuda_arch)) + options.append( + '-DDEAL_II_CUDA_FLAGS={0}'.format(flags) + ) else: options.extend([ '-DDEAL_II_WITH_CUDA=OFF', -- cgit v1.2.3-70-g09d2 From 4e878c21cdf7bf0778c04cae87011416b88193ae Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Mon, 20 Nov 2017 19:17:22 +0100 Subject: elpa: add 2017.05.002 and 2017.05.003 (#5306) * elpa: add 2017.05.002 and 2017.05.03 * add a variant for optimization flags --- var/spack/repos/builtin/packages/elpa/package.py | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/elpa/package.py b/var/spack/repos/builtin/packages/elpa/package.py index 3761f26cc0..d0ef891ad1 100644 --- a/var/spack/repos/builtin/packages/elpa/package.py +++ b/var/spack/repos/builtin/packages/elpa/package.py @@ -22,7 +22,6 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## - from spack import * @@ -32,12 +31,15 @@ class Elpa(AutotoolsPackage): homepage = 'http://elpa.mpcdf.mpg.de/' url = 'http://elpa.mpcdf.mpg.de/elpa-2015.11.001.tar.gz' + version('2017.05.003', '7c8e5e58cafab212badaf4216695700f') + version('2017.05.002', 'd0abc1ac1f493f93bf5e30ec8ab155dc') version('2016.11.001.pre', '5656fd066cf0dcd071dbcaf20a639b37') version('2016.05.004', 'c0dd3a53055536fc3a2a221e78d8b376', preferred=True) version('2016.05.003', '88a9f3f3bfb63e16509dd1be089dcf2c') version('2015.11.001', 'de0f35b7ee7c971fd0dca35c900b87e6') variant('openmp', default=False, description='Activates OpenMP support') + variant('optflags', default=True, description='Build with optimization flags') depends_on('mpi') depends_on('blas') @@ -53,9 +55,7 @@ class Elpa(AutotoolsPackage): # override default implementation which returns static lib @property def libs(self): - libname = 'libelpa_openmp' if '+openmp' in self.spec else 'libelpa' - return find_libraries( libname, root=self.prefix, shared=True, recurse=True ) @@ -63,8 +63,6 @@ class Elpa(AutotoolsPackage): build_directory = 'spack-build' def setup_environment(self, spack_env, run_env): - # TODO: set optimum flags for platform+compiler combo, see - # https://github.com/hfp/xconfigure/tree/master/elpa spec = self.spec spack_env.set('CC', spec['mpi'].mpicc) @@ -76,7 +74,20 @@ class Elpa(AutotoolsPackage): spack_env.set('SCALAPACK_LDFLAGS', spec['scalapack'].libs.joined()) def configure_args(self): + # TODO: set optimum flags for platform+compiler combo, see + # https://github.com/hfp/xconfigure/tree/master/elpa + # also see: + # https://src.fedoraproject.org/cgit/rpms/elpa.git/ + # https://packages.qa.debian.org/e/elpa.html options = [] + # without -march=native there is configure error for 2017.05.02 + # Could not compile test program, try with --disable-sse, or + # adjust the C compiler or CFLAGS + if '+optflags' in self.spec: + options.extend([ + 'FCFLAGS=-O2 -march=native -ffree-line-length-none', + 'CFLAGS=-O2 -march=native' + ]) if '+openmp' in self.spec: - options.append("--enable-openmp") + options.append('--enable-openmp') return options -- cgit v1.2.3-70-g09d2 From 012acdc7a280b307bbb110449dcfee5d05a77e38 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 20 Nov 2017 12:56:33 -0600 Subject: r-chemometrics: Create new package (#6379) --- .../builtin/packages/r-chemometrics/package.py | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-chemometrics/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-chemometrics/package.py b/var/spack/repos/builtin/packages/r-chemometrics/package.py new file mode 100644 index 0000000000..6ddbe5e44d --- /dev/null +++ b/var/spack/repos/builtin/packages/r-chemometrics/package.py @@ -0,0 +1,50 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RChemometrics(RPackage): + """R companion to the book "Introduction to Multivariate Statistical Analysis + in Chemometrics" written by K. Varmuza and P. Filzmoser (2009).""" + + homepage = "https://cran.r-project.org/web/packages/chemometrics/index.html" + url = "https://cran.r-project.org/src/contrib/chemometrics_1.4.2.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/chemometrics" + + version('1.4.2', '8137b0ca4004add9cc2ea81d2c54427f') + version('1.4.1', '1e5a89442bb4a61db0da884eedd74fc2') + version('1.3.9', '2b619791896db1513ca3d714acb68af3') + version('1.3.8', '7fad828bd094b5485fbf20bdf7d3d0d1') + version('1.3.7', 'a9e2f32efb1545421dd96185fd849184') + + depends_on('r@3.4.0:3.4.9') + depends_on('r-rpart', type=('build', 'run')) + depends_on('r-mclust', type=('build', 'run')) + depends_on('r-lars', type=('build', 'run')) + depends_on('r-robustbase', type=('build', 'run')) + depends_on('r-e1071', type=('build', 'run')) + depends_on('r-pls', type=('build', 'run')) + depends_on('r-som', type=('build', 'run')) + depends_on('r-pcapp', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 1d69dbe7ae4ad94b0ced7f667fa4a74c5d105211 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 20 Nov 2017 12:56:47 -0600 Subject: r-diffusionmap: Create new package (#6378) --- .../builtin/packages/r-diffusionmap/package.py | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-diffusionmap/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-diffusionmap/package.py b/var/spack/repos/builtin/packages/r-diffusionmap/package.py new file mode 100644 index 0000000000..9cc6c2cf84 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-diffusionmap/package.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RDiffusionmap(RPackage): + """Allows to display a progress bar in the R console for long running + computations taking place in c++ code, and support for interrupting those + computations even in multithreaded code, typically using OpenMP.""" + + homepage = "https://cran.r-project.org/web/packages/diffusionMap/index.html" + url = "https://cran.r-project.org/src/contrib/diffusionMap_1.1-0.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/diffusionMap" + + version('1.1-0', 'cc7d728087ba08d9299ae3a64a8d8919') + version('1.0-0', 'bca462e6efe45c5eaa48d38621f0bd6f') + version('0.0-2', 'b599f47ebf30127e34ce2219dc3e43ae') + version('0.0-1', '20c2cc2fffb5237d5c0216207016c2a1') + + depends_on('r@3.4.0:3.4.9') + depends_on('r-matrix', type=('build', 'run')) + depends_on('r-scatterplot3d', type=('build', 'run')) + depends_on('r-igraph', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 9040f34abaf873033f17abfa1fa349c3009eff49 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 20 Nov 2017 12:57:04 -0600 Subject: r-tclust: Create new package (#6380) --- .../repos/builtin/packages/r-tclust/package.py | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-tclust/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-tclust/package.py b/var/spack/repos/builtin/packages/r-tclust/package.py new file mode 100644 index 0000000000..64d2bd5840 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-tclust/package.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RTclust(RPackage): + """Provides functions for robust trimmed clustering.""" + + homepage = "https://cran.r-project.org/web/packages/tclust/index.html" + url = "https://cran.r-project.org/src/contrib/tclust_1.3-1.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/tclust" + + version('1.3-1', '5415d74682588d4a6fb8ce166fc75661') + version('1.2-7', 'e32cd02819682cc944c7baaac3b6f2b7') + version('1.2-3', '922abc1abd8da4c6ac9830e1f2f71e84') + version('1.1-03', 'f1cc9278bdb068acce4623a9d98b7b62') + version('1.1-02', '6f206501b0341fb5623208d145984f5a') + + depends_on('r@3.4.0:3.4.9') + depends_on('r-cluster', type=('build', 'run')) + depends_on('r-mclust', type=('build', 'run')) + depends_on('r-mvtnorm', type=('build', 'run')) + depends_on('r-sn', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 83db25967ebad11613e50496e53bbb803e52e2b4 Mon Sep 17 00:00:00 2001 From: BenBrands Date: Mon, 20 Nov 2017 19:57:34 +0100 Subject: Atlas: add 3.11.39 (#6375) --- var/spack/repos/builtin/packages/atlas/package.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/atlas/package.py b/var/spack/repos/builtin/packages/atlas/package.py index 7f5652bad4..56144386cd 100644 --- a/var/spack/repos/builtin/packages/atlas/package.py +++ b/var/spack/repos/builtin/packages/atlas/package.py @@ -37,6 +37,12 @@ class Atlas(Package): """ homepage = "http://math-atlas.sourceforge.net/" + version('3.11.39', '5f3252fa980f5f060f93edd4669321e2', + url='http://sourceforge.net/projects/math-atlas/files/Developer%20%28unstable%29/3.11.39/atlas3.11.39.tar.bz2') + + version('3.11.34', '0b6c5389c095c4c8785fd0f724ec6825', + url='http://sourceforge.net/projects/math-atlas/files/Developer%20%28unstable%29/3.11.34/atlas3.11.34.tar.bz2') + version('3.10.3', 'd6ce4f16c2ad301837cfb3dade2f7cef', url='https://sourceforge.net/projects/math-atlas/files/Stable/3.10.3/atlas3.10.3.tar.bz2') @@ -50,9 +56,6 @@ class Atlas(Package): destination='spack-resource-lapack', when='@3:') - version('3.11.34', '0b6c5389c095c4c8785fd0f724ec6825', - url='http://sourceforge.net/projects/math-atlas/files/Developer%20%28unstable%29/3.11.34/atlas3.11.34.tar.bz2') - variant('shared', default=True, description='Builds shared library') variant( -- cgit v1.2.3-70-g09d2 From 93d5a91a566a67913b75724242555b1e0e78a6aa Mon Sep 17 00:00:00 2001 From: BenBrands Date: Mon, 20 Nov 2017 19:57:53 +0100 Subject: dealii: fix HDF5 dependency (#6374) --- var/spack/repos/builtin/packages/dealii/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 1616b63a51..c1ea4fc0cc 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -126,7 +126,7 @@ class Dealii(CMakePackage, CudaPackage): depends_on("doxygen+graphviz", when='+doc') depends_on("graphviz", when='+doc') depends_on("gsl", when='@8.5.0:+gsl') - depends_on("hdf5+mpi", when='+hdf5+mpi') + depends_on("hdf5+mpi+hl", when='+hdf5+mpi') depends_on("cuda@8:", when='+cuda') depends_on("cmake@3.9:", when='+cuda') # FIXME: concretizer bug. The two lines mimic what comes from PETSc -- cgit v1.2.3-70-g09d2 From 30b794254f9573e4d960e0211370b06e83a10f25 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 20 Nov 2017 15:08:25 -0600 Subject: py-pysam: add version 0.13 (#6382) --- var/spack/repos/builtin/packages/py-pysam/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pysam/package.py b/var/spack/repos/builtin/packages/py-pysam/package.py index 7c3cccd21a..177eee30fb 100644 --- a/var/spack/repos/builtin/packages/py-pysam/package.py +++ b/var/spack/repos/builtin/packages/py-pysam/package.py @@ -32,6 +32,7 @@ class PyPysam(PythonPackage): homepage = "https://pypi.python.org/pypi/pysam" url = "https://pypi.io/packages/source/p/pysam/pysam-0.11.2.2.tar.gz" + version('0.13', 'a9b502dd1a7e6403e35e6972211688a2') version('0.11.2.2', '56230cd5f55b503845915b76c22d620a') depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From 17e0b81463e3c4c9b62f95f40912b270652a8e63 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 20 Nov 2017 15:18:17 -0600 Subject: r-ggridges: Create new package (#6376) --- .../repos/builtin/packages/r-ggridges/package.py | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-ggridges/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-ggridges/package.py b/var/spack/repos/builtin/packages/r-ggridges/package.py new file mode 100644 index 0000000000..d94a2c8068 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-ggridges/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RGgridges(RPackage): + """Ridgeline plots provide a convenient way of visualizing changes in + distributions over time or space.""" + + homepage = "https://cran.r-project.org/web/packages/ggridges/index.html" + url = "https://cran.r-project.org/src/contrib/ggridges_0.4.1.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/ggridges" + + version('0.4.1', '21d53b3f7263beb17f629f0ebfb7b67a') + version('0.4.0', 'da94ed1ee856a7fa5fb87712c84ec4c9') + + depends_on('r@3.4.0:3.4.9') + depends_on('r-ggplot2', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 035cce2b816b3ad1261a5085deaba91dabd1a96f Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 20 Nov 2017 22:50:25 -0600 Subject: py-biopython: add version 1.70 (#6389) --- var/spack/repos/builtin/packages/py-biopython/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-biopython/package.py b/var/spack/repos/builtin/packages/py-biopython/package.py index 4fcfeaf81d..8550a161ca 100644 --- a/var/spack/repos/builtin/packages/py-biopython/package.py +++ b/var/spack/repos/builtin/packages/py-biopython/package.py @@ -34,6 +34,7 @@ class PyBiopython(PythonPackage): homepage = "http://biopython.org/wiki/Main_Page" url = "http://biopython.org/DIST/biopython-1.65.tar.gz" + version('1.70', 'feff7a3e2777e43f9b13039b344e06ff') version('1.65', '143e7861ade85c0a8b5e2bbdd1da1f67') depends_on('py-mx', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 70ce7e209906e80b53248944410e6aea0202a0a0 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 20 Nov 2017 22:50:47 -0600 Subject: meme: add version 4.12.0 (#6388) --- var/spack/repos/builtin/packages/meme/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/meme/package.py b/var/spack/repos/builtin/packages/meme/package.py index 224410e85e..0ed2d3edd0 100644 --- a/var/spack/repos/builtin/packages/meme/package.py +++ b/var/spack/repos/builtin/packages/meme/package.py @@ -33,6 +33,7 @@ class Meme(AutotoolsPackage): homepage = "http://meme-suite.org" url = "http://meme-suite.org/meme-software/4.11.4/meme_4.11.4.tar.gz" + version('4.12.0', '40d282cc33f7dedb06b24b9f34ac15c1') version('4.11.4', '371f513f82fa0888205748e333003897') variant('mpi', default=True, description='Enable MPI support') -- cgit v1.2.3-70-g09d2 From 8b2abfb28be0f118595413b8a72bf546f1100e1a Mon Sep 17 00:00:00 2001 From: Audrey Thoma Date: Mon, 20 Nov 2017 22:51:35 -0600 Subject: masurca: new package (#6386) --- .../repos/builtin/packages/masurca/package.py | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 var/spack/repos/builtin/packages/masurca/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/masurca/package.py b/var/spack/repos/builtin/packages/masurca/package.py new file mode 100644 index 0000000000..519ba29e11 --- /dev/null +++ b/var/spack/repos/builtin/packages/masurca/package.py @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import distutils.dir_util + + +class Masurca(Package): + """MaSuRCA is whole genome assembly software. It combines the efficiency + of the de Bruijn graph and Overlap-Layout-Consensus (OLC) + approaches.""" + + homepage = "http://www.genome.umd.edu/masurca.html" + url = "ftp://ftp.genome.umd.edu/pub/MaSuRCA/latest/MaSuRCA-3.2.3.tar.gz" + + version('3.2.3', 'd9b4419adfe6b64e42ce986253a50ff5') + + depends_on('perl', type=('build', 'run')) + depends_on('boost') + depends_on('zlib') + + def install(self, spec, prefix): + installer = Executable('./install.sh') + installer() + distutils.dir_util.copy_tree(".", prefix) -- cgit v1.2.3-70-g09d2 From cd5e6a14bb0a67d6558b691f6b55f7918c4d4970 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 20 Nov 2017 22:52:39 -0600 Subject: r-fnn: Create new package (#6384) --- var/spack/repos/builtin/packages/r-fnn/package.py | 45 +++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-fnn/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-fnn/package.py b/var/spack/repos/builtin/packages/r-fnn/package.py new file mode 100644 index 0000000000..30c31cf219 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-fnn/package.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RFnn(RPackage): + """Cover-tree and kd-tree fast k-nearest neighbor search algorithms and + related applications including KNN classification, regression and + information measures are implemented.""" + + homepage = "https://cran.r-project.org/web/packages/FNN/index.html" + url = "https://cran.r-project.org/src/contrib/FNN_1.1.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/FNN" + + version('1.1', '8ba8f5b8be271785593e13eae7b8c393') + version('1.0', 'e9a47dc69d1ba55165be0877b8443fe0') + version('0.6-4', '1c105df9763ceb7b13989cdbcb542fcc') + version('0.6-3', 'f0f0184e50f9f30a36ed5cff24d6cff2') + version('0.6-2', '20648ba934ea32b1b00dafb75e1a830c') + + depends_on('r@3.4.0:3.4.9') + depends_on('r-mvtnorm', type=('build', 'run')) + depends_on('r-chemometrics', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 0743c5bde6822115633f9fc698207b585aa784e4 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 20 Nov 2017 22:52:58 -0600 Subject: r-crosstalk: Create new package (#6383) --- .../repos/builtin/packages/r-crosstalk/package.py | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-crosstalk/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-crosstalk/package.py b/var/spack/repos/builtin/packages/r-crosstalk/package.py new file mode 100644 index 0000000000..db83adcf9c --- /dev/null +++ b/var/spack/repos/builtin/packages/r-crosstalk/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RCrosstalk(RPackage): + """Provides building blocks for allowing HTML widgets to communicate with + each other, with Shiny or without (i.e. static .html files).""" + + homepage = "https://cran.r-project.org/web/packages/crosstalk/index.html" + url = "https://cran.r-project.org/src/contrib/crosstalk_1.0.0.tar.gz" + + version('1.0.0', 'c13c21b81af2154be3f08870fd3a7077') + + depends_on('r@3.4.0:3.4.9') + depends_on('r-htmltools', type=('build', 'run')) + depends_on('r-jsonlite', type=('build', 'run')) + depends_on('r-lazyeval', type=('build', 'run')) + depends_on('r-ggplot2', type=('build', 'run')) + depends_on('r-shiny', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From ef8429c99ccf2c87fd70bc365f63d4f60bb55dd8 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Tue, 21 Nov 2017 02:26:44 -0600 Subject: r-modelr: created new package (#6289) --- .../repos/builtin/packages/r-modelr/package.py | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-modelr/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-modelr/package.py b/var/spack/repos/builtin/packages/r-modelr/package.py new file mode 100644 index 0000000000..4be6963878 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-modelr/package.py @@ -0,0 +1,44 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RModelr(RPackage): + """Functions for modelling that help you seamlessly integrate modelling + into a pipeline of data manipulation and visualisation.""" + + homepage = "https://github.com/hadley/modelr" + url = "https://cran.r-project.org/src/contrib/modelr_0.1.1.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/modelr" + + version('0.1.1', 'ce5fd088fb7850228ab1e34d241a975d') + + depends_on('r-magrittr', type=('build', 'run')) + depends_on('r-purrr', type=('build', 'run')) + depends_on('r-lazyeval', type=('build', 'run')) + depends_on('r-tibble', type=('build', 'run')) + depends_on('r-broom', type=('build', 'run')) + depends_on('r-dplyr', type=('build', 'run')) + depends_on('r-tidyr', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From b7189ecf9eb86194b324a8036c801c4e72b921ed Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Tue, 21 Nov 2017 02:40:10 -0600 Subject: r-psych: created new package (#6286) --- .../repos/builtin/packages/r-psych/package.py | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-psych/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-psych/package.py b/var/spack/repos/builtin/packages/r-psych/package.py new file mode 100644 index 0000000000..da3e57329c --- /dev/null +++ b/var/spack/repos/builtin/packages/r-psych/package.py @@ -0,0 +1,55 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RPsych(RPackage): + """A general purpose toolbox for personality, psychometric theory and + experimental psychology. Functions are primarily for multivariate + analysis and scale construction using factor analysis, principal + component analysis, cluster analysis and reliability analysis, although + others provide basic descriptive statistics. Item Response Theory is + done using factor analysis of tetrachoric and polychoric correlations. + Functions for analyzing data at multiple levels include within and + between group statistics, including correlations and factor analysis. + Functions for simulating and testing particular item and test structures + are included. Several functions serve as a useful front end for + structural equation modeling. Graphical displays of path diagrams, + factor analysis and structural equation models are created using basic + graphics. Some of the functions are written to support a book on + psychometric theory as well as publications in personality research. + For more information, see the web + page.""" + + homepage = "http://personality-project.org/r/psych" + url = "https://cran.r-project.org/src/contrib/psych_1.7.8.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/psych" + + version('1.7.8', 'db37f2f85ff5470ee40bbc0a58ebe22b') + + depends_on('r-mnormt', type=('build', 'run')) + depends_on('r-foreign', type=('build', 'run')) + depends_on('r-lattice', type=('build', 'run')) + depends_on('r-nlme', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From e3abc7bfa4f7101662ccbb59e1b85f5892d1442a Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Tue, 21 Nov 2017 02:54:43 -0600 Subject: r-haven: created new package (#6293) --- .../repos/builtin/packages/r-haven/package.py | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-haven/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-haven/package.py b/var/spack/repos/builtin/packages/r-haven/package.py new file mode 100644 index 0000000000..d477e42920 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-haven/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RHaven(RPackage): + """Import foreign statistical formats into R via the embedded 'ReadStat' C + library, .""" + + homepage = "http://haven.tidyverse.org/" + url = "https://cran.r-project.org/src/contrib/haven_1.1.0.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/haven" + + version('1.1.0', '8edd4b7683f8c36b5bb68582ac1b8733') + + depends_on('r-rcpp', type=('build', 'run')) + depends_on('r-readr', type=('build', 'run')) + depends_on('r-hms', type=('build', 'run')) + depends_on('r-tibble', type=('build', 'run')) + depends_on('r-forcats', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 5250c8eb0af734571ec6e93ec589c02e628e895b Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Tue, 21 Nov 2017 03:49:09 -0600 Subject: r-broom: new package (#6282) --- .../repos/builtin/packages/r-broom/package.py | 49 ++++++++++++++++++++++ .../repos/builtin/packages/r-dplyr/package.py | 6 ++- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 var/spack/repos/builtin/packages/r-broom/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-broom/package.py b/var/spack/repos/builtin/packages/r-broom/package.py new file mode 100644 index 0000000000..4ca426a3ab --- /dev/null +++ b/var/spack/repos/builtin/packages/r-broom/package.py @@ -0,0 +1,49 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RBroom(RPackage): + """Convert statistical analysis objects from R into tidy data frames, so + that they can more easily be combined, reshaped and otherwise processed + with tools like 'dplyr', 'tidyr' and 'ggplot2'. The package provides + three S3 generics: tidy, which summarizes a model's statistical + findings such as coefficients of a regression; augment, which adds + columns to the original data such as predictions, residuals and cluster + assignments; and glance, which provides a one-row summary of + model-level statistics.""" + + homepage = "http://github.com/tidyverse/broom" + url = "https://cran.r-project.org/src/contrib/broom_0.4.2.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/broom" + version('0.4.2', '6eabab1f2eaec10f93cf9aa56d6a61de') + + depends_on('r-plyr', type=('build', 'run')) + depends_on('r-dplyr', type=('build', 'run')) + depends_on('r-tidyr', type=('build', 'run')) + depends_on('r-psych', type=('build', 'run')) + depends_on('r-stringr', type=('build', 'run')) + depends_on('r-reshape2', type=('build', 'run')) + depends_on('r-nlme', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-dplyr/package.py b/var/spack/repos/builtin/packages/r-dplyr/package.py index bb2ecc4155..15f04bbe93 100644 --- a/var/spack/repos/builtin/packages/r-dplyr/package.py +++ b/var/spack/repos/builtin/packages/r-dplyr/package.py @@ -31,7 +31,7 @@ class RDplyr(RPackage): homepage = "https://github.com/hadley/dplyr" url = "https://cran.rstudio.com/src/contrib/dplyr_0.7.3.tar.gz" - list_url = homepage + list_url = "https://cran.r-project.org/src/contrib/Archive/dplyr" version('0.7.3', 'f9760b796917747e9dcd927ebb531c7d') version('0.5.0', '1fcafcacca70806eea2e6d465cdb94ef') @@ -43,4 +43,8 @@ class RDplyr(RPackage): depends_on('r-magrittr', type=('build', 'run')) depends_on('r-lazyeval', type=('build', 'run')) depends_on('r-dbi', type=('build', 'run')) + depends_on('r-bindrcpp', type=('build', 'run')) + depends_on('r-glue', type=('build', 'run')) + depends_on('r-pkgconfig', type=('build', 'run')) + depends_on('r-plogr', type=('build', 'run')) depends_on('r-bh', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From f0c0243cd4a6891947d103ec72879907676d4f07 Mon Sep 17 00:00:00 2001 From: "Michael F. Herbst" Date: Tue, 21 Nov 2017 16:03:36 +0100 Subject: Fix to allow installing pocl 0.14 again (#6372) * Resolve issue 4669 * Use prefix path magic attribute --- var/spack/repos/builtin/packages/pocl/package.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pocl/package.py b/var/spack/repos/builtin/packages/pocl/package.py index ec4ef09bbe..38c794062b 100644 --- a/var/spack/repos/builtin/packages/pocl/package.py +++ b/var/spack/repos/builtin/packages/pocl/package.py @@ -91,8 +91,7 @@ class Pocl(CMakePackage): @run_after('install') def symlink_opencl(self): - with working_dir(self.build_directory): - os.symlink("OpenCL", join_path(self.prefix.include, "CL")) + os.symlink("CL", self.prefix.include.OpenCL) @run_after('install') @on_package_attributes(run_tests=True) -- cgit v1.2.3-70-g09d2 From c4613b8e1f798f0c2fd1c09b98c4dcaf843d95b5 Mon Sep 17 00:00:00 2001 From: Audrey Thoma Date: Tue, 21 Nov 2017 09:04:08 -0600 Subject: mira: new package (#6385) --- var/spack/repos/builtin/packages/mira/package.py | 52 ++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 var/spack/repos/builtin/packages/mira/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mira/package.py b/var/spack/repos/builtin/packages/mira/package.py new file mode 100644 index 0000000000..2a67276588 --- /dev/null +++ b/var/spack/repos/builtin/packages/mira/package.py @@ -0,0 +1,52 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Mira(AutotoolsPackage): + """MIRA is a multi-pass DNA sequence data assembler/mapper for whole genome + and EST/RNASeq projects.""" + + homepage = "http://sourceforge.net/projects/mira-assembler/" + url = "https://downloads.sourceforge.net/project/mira-assembler/MIRA/stable/mira-4.0.2.tar.bz2" + + version('4.0.2', '1921b426910653a34a6dbb37346f28ea') + + depends_on('boost@1.46:') + depends_on('expat@2.0.1:') + depends_on('gperftools') + + conflicts('%gcc@6:', when='@:4.0.2') + + def patch(self): + with working_dir(join_path('src', 'progs')): + edit = FileFilter('quirks.C') + edit.filter('#include ', + '#include \n#include ') + + def configure_args(self): + args = ['--with-boost=%s' % self.spec['boost'].prefix, + '--with-expat=%s' % self.spec['expat'].prefix] + return args -- cgit v1.2.3-70-g09d2 From 003f83db50e192f2f6382c0d8f95307441e770e7 Mon Sep 17 00:00:00 2001 From: David Poliakoff Date: Tue, 21 Nov 2017 07:04:43 -0800 Subject: gotcha: new package (#6391) * Initial stab at a package for Gotcha * Commit with no boilerplate * Flake8 --- var/spack/repos/builtin/packages/gotcha/package.py | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 var/spack/repos/builtin/packages/gotcha/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gotcha/package.py b/var/spack/repos/builtin/packages/gotcha/package.py new file mode 100644 index 0000000000..051b678d75 --- /dev/null +++ b/var/spack/repos/builtin/packages/gotcha/package.py @@ -0,0 +1,47 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Gotcha(CMakePackage): + """C software library for shared library function wrapping, + enables tools to intercept calls into shared libraries""" + + homepage = "http://github.com/LLNL/gotcha" + url = "http://github.com/LLNL/gotcha" + + variant('test', default=False, description='Build tests for Gotcha') + + version('develop', git='https://github.com/LLNL/gotcha.git', + branch="develop") + version('master', git='https://github.com/LLNL/gotcha.git', + branch="master") + version('0.0.2', git='https://github.com/LLNL/gotcha.git', tag="0.0.2") + + def configure_args(self): + spec = self.spec + return [ + '-DGOTCHA_ENABLE_TESTS=%s' % ('ON' if '+test' in spec else 'OFF') + ] -- cgit v1.2.3-70-g09d2 From 27b9d2614c8e6cd6c48e38e6e949bad3ac17743f Mon Sep 17 00:00:00 2001 From: BenBrands Date: Tue, 21 Nov 2017 16:04:53 +0100 Subject: CMake: add 3.10.0 (#6393) --- var/spack/repos/builtin/packages/cmake/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index 150936d1cb..74801dd1c5 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -33,6 +33,7 @@ class Cmake(Package): list_url = 'https://cmake.org/files/' list_depth = 1 + version('3.10.0', 'f3f8e70ca3055f3cd288f89ff233057e') version('3.9.4', '33769e001bdcd788f565bf378692e5ae') version('3.9.0', '180e23b4c9b55915d271b315297f6951') version('3.8.2', 'b5dff61f6a7f1305271ab3f6ae261419') -- cgit v1.2.3-70-g09d2 From d7259048039c47675c559d4c8db32a6a9d22b81f Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 21 Nov 2017 14:42:28 -0600 Subject: r-sdmtools: Create new package (#6397) --- .../repos/builtin/packages/r-sdmtools/package.py | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-sdmtools/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-sdmtools/package.py b/var/spack/repos/builtin/packages/r-sdmtools/package.py new file mode 100644 index 0000000000..a5768981d9 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-sdmtools/package.py @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RSdmtools(RPackage): + """Species Distribution Modelling Tools: Tools for processing data + associated with species distribution modelling exercises + + This packages provides a set of tools for post processing the outcomes of + species distribution modeling exercises.""" + + homepage = "https://cran.r-project.org/web/packages/SDMTools/index.html" + url = "https://cran.r-project.org/src/contrib/SDMTools_1.1-221.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/SDMTools" + + version('1.1-221', '3604da1783d0c6081b62b29d35a32c3c') + version('1.1-20', '27cc8de63cfdd86d4ba9983012121c58') + version('1.1-13', '0d6a14d985988a81b9ff06c635675143') + version('1.1-12', 'a13d75e4024d908a57ea462112d8a437') + version('1.1-11', 'cb890ee06eb862f97141b73c7390a0a9') + + depends_on('r@3.4.0:3.4.9') + depends_on('r-utils', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From d6a5310df590d06d5bbec0c0a703a686163edfbf Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 21 Nov 2017 14:42:44 -0600 Subject: r-cppprogress: Create new package (#6398) --- .../builtin/packages/r-rcppprogress/package.py | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-rcppprogress/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-rcppprogress/package.py b/var/spack/repos/builtin/packages/r-rcppprogress/package.py new file mode 100644 index 0000000000..b19c323b4e --- /dev/null +++ b/var/spack/repos/builtin/packages/r-rcppprogress/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RRcppprogress(RPackage): + """Allows to display a progress bar in the R console for long running + computations taking place in c++ code, and support for interrupting + those computations even in multithreaded code, typically using OpenMP.""" + + homepage = "https://cran.r-project.org/web/packages/RcppProgress/index.html" + url = "https://cran.r-project.org/src/contrib/RcppProgress_0.3.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/RcppProgress" + + version('0.3', '3cd527af84bc6fcb3c77422e0ff09dba') + version('0.2.1', 'c9cd69759ff457acfee0b52353f9af1b') + version('0.2', '9522c962ecddd4895b5636e7a499bda5') + version('0.1', '34afefe0580ca42b6353533fe758d5bf') + + depends_on('r@3.4.0:3.4.9') + depends_on('r-rcpp', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 60b50a7bd26b5d3dd160f1103b3281558f41675e Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 21 Nov 2017 14:43:02 -0600 Subject: r-ica: Create new package (#6400) --- var/spack/repos/builtin/packages/r-ica/package.py | 39 +++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-ica/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-ica/package.py b/var/spack/repos/builtin/packages/r-ica/package.py new file mode 100644 index 0000000000..eae23428b8 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-ica/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RIca(RPackage): + """Independent Component Analysis (ICA) using various algorithms: FastICA, + Information-Maximization (Infomax), and Joint Approximate Diagonalization + of Eigenmatrices (JADE).""" + + homepage = "https://cran.r-project.org/web/packages/ica/index.html" + url = "https://cran.r-project.org/src/contrib/ica_1.0-1.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/ica" + + depends_on('r@3.4.0:3.4.9') + version('1.0-1', '15c8d5afeec2804beec55dd14abc585d') + version('1.0-0', '3ade2b3b00eb39c348d802f24d2afd1d') -- cgit v1.2.3-70-g09d2 From 5a72d30816b0a65471df66db29548b34c8a6c37a Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 21 Nov 2017 14:44:25 -0600 Subject: r-ggjoy: Create new package (#6399) --- .../repos/builtin/packages/r-ggjoy/package.py | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-ggjoy/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-ggjoy/package.py b/var/spack/repos/builtin/packages/r-ggjoy/package.py new file mode 100644 index 0000000000..610a474570 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-ggjoy/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RGgjoy(RPackage): + """Joyplots provide a convenient way of visualizing changes in distributions + over time or space.""" + + homepage = "https://cran.r-project.org/web/packages/ggjoy/index.html" + url = "https://cran.r-project.org/src/contrib/ggjoy_0.4.0.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/ggjoy" + + version('0.4.0', 'c63782e2395a9cfc435d08e078e6596b') + version('0.3.0', '59bd34a846270d43f2eeb1e90b03a127') + version('0.2.0', '8584cd154e228f8505b324e91d2e50d7') + + depends_on('r@3.4.0:3.4.9') + depends_on('r-ggplot2', type=('build', 'run')) + depends_on('r-ggridges', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 9e013ee036546d77537067bbe01d05854f274e83 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 21 Nov 2017 14:45:12 -0600 Subject: r-pbapply: Create new package (#6377) --- .../repos/builtin/packages/r-pbapply/package.py | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-pbapply/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-pbapply/package.py b/var/spack/repos/builtin/packages/r-pbapply/package.py new file mode 100644 index 0000000000..4d6da2ed77 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-pbapply/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RPbapply(RPackage): + """A lightweight package that adds progress bar to vectorized R + apply functions.""" + + homepage = "https://cran.r-project.org/web/packages/pbapply/index.html" + url = "https://cran.r-project.org/src/contrib/pbapply_1.3-3.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/pbapply" + + version('1.3-3', '570db6795179a1439c174be881c77d18') + version('1.3-2', 'd72a777bfe4a28ba4e1585e31680f82e') + version('1.3-1', '13d64dead441426aa96a3bf3fde29daf') + version('1.3-0', 'a3f93cd05054657a01893a3817fa1f08') + version('1.2-2', '23e2bfe531c704b79308b0b5fbe1ace8') + + depends_on('r@3.4.0:3.4.9') -- cgit v1.2.3-70-g09d2 From a0df5ae3e08af516a94b0bb4652289c18c36adb1 Mon Sep 17 00:00:00 2001 From: Audrey Thoma Date: Tue, 21 Nov 2017 16:58:20 -0600 Subject: phantompeakqualtools: new package (#6403) --- .../packages/phantompeakqualtools/package.py | 44 +++++++++++++++++++ .../packages/r-phantompeakqualtools/package.py | 49 ++++++++++++++++++++++ 2 files changed, 93 insertions(+) create mode 100644 var/spack/repos/builtin/packages/phantompeakqualtools/package.py create mode 100644 var/spack/repos/builtin/packages/r-phantompeakqualtools/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/phantompeakqualtools/package.py b/var/spack/repos/builtin/packages/phantompeakqualtools/package.py new file mode 100644 index 0000000000..6e82b9ec9e --- /dev/null +++ b/var/spack/repos/builtin/packages/phantompeakqualtools/package.py @@ -0,0 +1,44 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Phantompeakqualtools(RPackage): + """This package computes informative enrichment and quality measures for + ChIP-seq/DNase-seq/FAIRE-seq/MNase-seq data.""" + + homepage = "https://github.com/kundajelab/phantompeakqualtools" + url = "https://github.com/kundajelab/phantompeakqualtools/archive/1.2.tar.gz" + + version('1.2', 'e94943a42132b9ff2886f006ab34c121') + + depends_on('awk') + depends_on('samtools') + depends_on('r', type=('build', 'run')) + depends_on('r-phantompeakqualtools', type=('build', 'run')) + + def install(self, spec, prefix): + mkdirp(prefix.bin) + install('run_spp.R', prefix.bin) diff --git a/var/spack/repos/builtin/packages/r-phantompeakqualtools/package.py b/var/spack/repos/builtin/packages/r-phantompeakqualtools/package.py new file mode 100644 index 0000000000..d32f402974 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-phantompeakqualtools/package.py @@ -0,0 +1,49 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RPhantompeakqualtools(RPackage): + """Computes informative enrichment and quality measures for + ChIP-seq/DNase-seq/FAIRE-seq/MNase-seq data. This is a modified version + of r-spp to be used in conjunction with the phantompeakqualtools + package.""" + + homepage = "https://github.com/kundajelab/phantompeakqualtools" + url = "https://github.com/kundajelab/phantompeakqualtools/raw/master/spp_1.14.tar.gz" + + version('1.14', '4de207d570999170c1bf45bcba8c6d2d') + + depends_on('boost@1.41.0:') + depends_on('r-catools', type=('build', 'run')) + depends_on('r-snow', type=('build', 'run')) + depends_on('r-snowfall', type=('build', 'run')) + depends_on('r-bitops', type=('build', 'run')) + depends_on('r-rsamtools', type=('build', 'run')) + + conflicts('%gcc@6:') + + def setup_environment(self, spack_env, run_env): + spack_env.set('BOOST_ROOT', self.spec['boost'].prefix) -- cgit v1.2.3-70-g09d2 From d4ab511f73639d52ce8827e4f6144f69ac0263ff Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Tue, 21 Nov 2017 23:59:04 +0100 Subject: Script for 'eccodes' is compatible with Python 3. (#6402) --- var/spack/repos/builtin/packages/eccodes/package.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/eccodes/package.py b/var/spack/repos/builtin/packages/eccodes/package.py index 3843ce2ddc..0f1e127aed 100644 --- a/var/spack/repos/builtin/packages/eccodes/package.py +++ b/var/spack/repos/builtin/packages/eccodes/package.py @@ -80,11 +80,8 @@ class Eccodes(CMakePackage): options = ['NETCDF', 'PNG', 'AEC', 'ECCODES_THREADS', 'ECCODES_OMP_THREADS', 'MEMFS', 'PYTHON', 'FORTRAN'] - args = map(lambda var, opt: - "-DENABLE_%s=%s" % - (opt, 'ON' if var in self.spec else 'OFF'), - variants, - options) + args = ["-DENABLE_%s=%s" % (opt, 'ON' if var in self.spec else 'OFF') + for var, opt in zip(variants, options)] if self.spec.variants['jp2k'].value == 'none': args.append('-DENABLE_JPG=OFF') -- cgit v1.2.3-70-g09d2 From 0fc6611dc2483270b85ad6e299babafbdb27d973 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Wed, 22 Nov 2017 15:06:59 +0100 Subject: Changed every `docs` variant into `doc` as decided in #2663 (#6412) fixes #2663 --- var/spack/repos/builtin/packages/flux/package.py | 2 +- var/spack/repos/builtin/packages/py-brian2/package.py | 2 +- var/spack/repos/builtin/packages/py-elephant/package.py | 2 +- var/spack/repos/builtin/packages/py-pythonqwt/package.py | 2 +- var/spack/repos/builtin/packages/py-qtconsole/package.py | 2 +- var/spack/repos/builtin/packages/star-ccm-plus/package.py | 2 +- var/spack/repos/builtin/packages/typhonio/package.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/flux/package.py b/var/spack/repos/builtin/packages/flux/package.py index 6bca4c541c..ddc58bb600 100644 --- a/var/spack/repos/builtin/packages/flux/package.py +++ b/var/spack/repos/builtin/packages/flux/package.py @@ -36,7 +36,7 @@ class Flux(AutotoolsPackage): version('master', branch='master', git='https://github.com/flux-framework/flux-core') - variant('docs', default=True, description='Build flux manpages') + variant('doc', default=True, description='Build flux manpages') depends_on("zeromq@4.0.4:") depends_on("czmq@2.2:") diff --git a/var/spack/repos/builtin/packages/py-brian2/package.py b/var/spack/repos/builtin/packages/py-brian2/package.py index bf28c5cda2..e340e3ffae 100644 --- a/var/spack/repos/builtin/packages/py-brian2/package.py +++ b/var/spack/repos/builtin/packages/py-brian2/package.py @@ -34,7 +34,7 @@ class PyBrian2(PythonPackage): version('2.0.1', 'df5990e9a71f7344887bc02f54dfd0f0') version('2.0rc3', '3100c5e4eb9eb83a06ff0413a7d43152') - variant('docs', default=False, description='Build the documentation') + variant('doc', default=False, description='Build the documentation') # depends on py-setuptools@6: for windows, if spack targets windows, # this will need to be added here diff --git a/var/spack/repos/builtin/packages/py-elephant/package.py b/var/spack/repos/builtin/packages/py-elephant/package.py index 3cc36b8769..c52cc40e05 100644 --- a/var/spack/repos/builtin/packages/py-elephant/package.py +++ b/var/spack/repos/builtin/packages/py-elephant/package.py @@ -34,7 +34,7 @@ class PyElephant(PythonPackage): version('0.3.0', '84e69e6628fd617af469780c30d2da6c') - variant('docs', default=False, description='Build the documentation') + variant('doc', default=False, description='Build the documentation') variant('pandas', default=True, description='Build with pandas') depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-pythonqwt/package.py b/var/spack/repos/builtin/packages/py-pythonqwt/package.py index 9f4c09b537..7328f64f4a 100644 --- a/var/spack/repos/builtin/packages/py-pythonqwt/package.py +++ b/var/spack/repos/builtin/packages/py-pythonqwt/package.py @@ -33,7 +33,7 @@ class PyPythonqwt(PythonPackage): version('0.5.5', 'a60c7da9fbca667337d14aca094b6fda') - variant('docs', default=False, description="Build documentation.") + variant('doc', default=False, description="Build documentation.") depends_on('py-setuptools', type='build') depends_on('py-numpy@1.3:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-qtconsole/package.py b/var/spack/repos/builtin/packages/py-qtconsole/package.py index 07acca339b..20306e07c4 100644 --- a/var/spack/repos/builtin/packages/py-qtconsole/package.py +++ b/var/spack/repos/builtin/packages/py-qtconsole/package.py @@ -33,7 +33,7 @@ class PyQtconsole(PythonPackage): version('4.2.1', 'c08ebebc7a60629ebadf685361ca0798') - variant('docs', default=False, description='Build documentation') + variant('doc', default=False, description='Build documentation') depends_on('py-setuptools', type='build') depends_on('py-ipykernel@4.1:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/star-ccm-plus/package.py b/var/spack/repos/builtin/packages/star-ccm-plus/package.py index cc230fe028..c74479acc1 100644 --- a/var/spack/repos/builtin/packages/star-ccm-plus/package.py +++ b/var/spack/repos/builtin/packages/star-ccm-plus/package.py @@ -35,7 +35,7 @@ class StarCcmPlus(Package): version('11.06.010_02', 'd349c6ac8293d8e6e7a53533d695588f') - variant('docs', default=False, description='Install the documentation') + variant('doc', default=False, description='Install the documentation') # Licensing license_required = True diff --git a/var/spack/repos/builtin/packages/typhonio/package.py b/var/spack/repos/builtin/packages/typhonio/package.py index a60298b6d2..09396eb890 100644 --- a/var/spack/repos/builtin/packages/typhonio/package.py +++ b/var/spack/repos/builtin/packages/typhonio/package.py @@ -40,7 +40,7 @@ class Typhonio(CMakePackage): values=('Debug', 'Release')) variant('fortran', default=False, description='Enable Fortran support') variant('shared', default=False, description='Build shared libraries') - variant('docs', default=False, description='Build user guide and doxygen documentation') + variant('doc', default=False, description='Build user guide and doxygen documentation') depends_on('mpi') depends_on('hdf5') -- cgit v1.2.3-70-g09d2 From 8b63cc6ad6ca1a908064bd4bc73f53dd9d2fe91e Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Wed, 22 Nov 2017 22:34:21 -0700 Subject: Using MPI environment compiler variables for pnetcdf. (#6424) --- var/spack/repos/builtin/packages/parallel-netcdf/package.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/parallel-netcdf/package.py b/var/spack/repos/builtin/packages/parallel-netcdf/package.py index 4d49ae6f8b..734b61390b 100644 --- a/var/spack/repos/builtin/packages/parallel-netcdf/package.py +++ b/var/spack/repos/builtin/packages/parallel-netcdf/package.py @@ -53,6 +53,10 @@ class ParallelNetcdf(AutotoolsPackage): spec = self.spec args = ['--with-mpi={0}'.format(spec['mpi'].prefix)] + args.append('MPICC={0}'.format(spec['mpi'].mpicc)) + args.append('MPICXX={0}'.format(spec['mpi'].mpicxx)) + args.append('MPIF77={0}'.format(spec['mpi'].mpifc)) + args.append('MPIF90={0}'.format(spec['mpi'].mpifc)) args.append('SEQ_CC={0}'.format(spack_cc)) if '+pic' in spec: -- cgit v1.2.3-70-g09d2 From 630d7e19db65f2756f488c76a70e4098241411ac Mon Sep 17 00:00:00 2001 From: Chien-Chang Feng Date: Thu, 23 Nov 2017 15:25:35 +0900 Subject: py-yt: Yt-project is moved. Add new version. (#6409) --- var/spack/repos/builtin/packages/py-yt/package.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-yt/package.py b/var/spack/repos/builtin/packages/py-yt/package.py index 6c8aa1797f..472acb8255 100644 --- a/var/spack/repos/builtin/packages/py-yt/package.py +++ b/var/spack/repos/builtin/packages/py-yt/package.py @@ -35,8 +35,10 @@ class PyYt(PythonPackage): interdisciplinary community. """ homepage = "http://yt-project.org" - url = "https://bitbucket.org/yt_analysis/yt" + url = "https://github.com/yt-project/yt.git" + version("3.4.0", "413b835f1b0e2a0bd26f1044ff7dbc94", + url="https://github.com/yt-project/yt/archive/yt-3.4.0.tar.gz") version("3.3.5", "2ad314ff3d3261e41825d15db027b0e7", url="https://bitbucket.org/yt_analysis/yt/get/yt-3.3.5.tar.gz") version("3.3.4", "3a84e56dfd82f9dd923f3fb8490e679c", @@ -51,8 +53,8 @@ class PyYt(PythonPackage): tag="yt-3.0.2", commit="511887af4c995a78fe606e58ce8162c88380ecdc") version("2.6.3", hg="https://bitbucket.org/yt_analysis/yt", tag="yt-2.6.3", commit="816186f16396a16853810ac9ebcde5057d8d5b1a") - version("development", hg="https://bitbucket.org/yt_analysis/yt", - branch="yt") + version("develop", git="https://github.com/yt-project/yt.git", + branch="master") variant("astropy", default=True, description="enable astropy support") variant("h5py", default=True, description="enable h5py support") -- cgit v1.2.3-70-g09d2 From bdd8bb1fd9758fb875175619ab9dcc6d1c61495a Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 23 Nov 2017 02:00:32 -0600 Subject: r-ranger: Create new package (#6422) --- .../repos/builtin/packages/r-ranger/package.py | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-ranger/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-ranger/package.py b/var/spack/repos/builtin/packages/r-ranger/package.py new file mode 100644 index 0000000000..599d9b6209 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-ranger/package.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RRanger(RPackage): + """A fast implementation of Random Forests, particularly suited for high + dimensional data.""" + + homepage = "https://cran.r-project.org/web/packages/ranger/index.html" + url = "https://cran.r-project.org/src/contrib/ranger_0.8.0.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/ranger" + + version('0.8.0', '1501380f418e784a6159bc1fb06fd32c') + version('0.7.0', 'c7fbcbab7c195bc8e65b1ceb3baeb87f') + version('0.6.0', '047ad26289c9b528b7476aa4811b4111') + version('0.5.0', 'd45001c8ff58d3078de7353971219927') + version('0.4.0', 'd404d8a9142372e3c77482b6b7dc469b') + + depends_on('r@3.4.0:3.4.9') + depends_on('r-matrix', type=('build', 'run')) + depends_on('r-rcpp', type=('build', 'run')) + depends_on('r-rcppeigen', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 6fd100908113401a56aa66e7bd3b2ac4e7fc61c3 Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 23 Nov 2017 02:01:10 -0600 Subject: r-mixtools: Create new package (#6421) --- .../repos/builtin/packages/r-mixtools/package.py | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-mixtools/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-mixtools/package.py b/var/spack/repos/builtin/packages/r-mixtools/package.py new file mode 100644 index 0000000000..91b270cece --- /dev/null +++ b/var/spack/repos/builtin/packages/r-mixtools/package.py @@ -0,0 +1,44 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RMixtools(RPackage): + """mixtools: Tools for Analyzing Finite Mixture Models + + Analyzes finite mixture models for various parametric and semiparametric + settings.""" + + homepage = "https://cran.r-project.org/web/packages/mixtools/index.html" + url = "https://cran.r-project.org/src/contrib/mixtools_1.1.0.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/mixtools" + + version('1.1.0', 'c7d59110dd42964d40593a05b98acd5f') + version('1.0.4', 'c0e6ec44d16ec8914797fb74a651d3e5') + + depends_on('r@3.4.0:3.4.9') + depends_on('r-mass', type=('build', 'run')) + depends_on('r-segmented', type=('build', 'run')) + depends_on('r-survival', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 951679376e1ffbfaf626625158ea9fafecec36d8 Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Thu, 23 Nov 2017 03:03:02 -0500 Subject: zoltan: add optional dependency on parmetis (#6387) --- var/spack/repos/builtin/packages/zoltan/package.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/zoltan/package.py b/var/spack/repos/builtin/packages/zoltan/package.py index eb393d3990..7e40a3a51b 100644 --- a/var/spack/repos/builtin/packages/zoltan/package.py +++ b/var/spack/repos/builtin/packages/zoltan/package.py @@ -53,9 +53,14 @@ class Zoltan(Package): variant('fortran', default=True, description='Enable Fortran support.') variant('mpi', default=True, description='Enable MPI support.') + variant('parmetis', default=False, description='Enable ParMETIS support.') depends_on('mpi', when='+mpi') + depends_on('parmetis@4:', when='+parmetis') + + conflicts('+parmetis', when='~mpi') + def install(self, spec, prefix): # FIXME: The older Zoltan versions fail to compile the F90 MPI wrappers # because of some complicated generic type problem. @@ -80,6 +85,13 @@ class Zoltan(Package): if spec.satisfies('%gcc'): config_args.append('--with-libs={0}'.format('-lgfortran')) + if '+parmetis' in spec: + config_args.append('--with-parmetis') + config_args.append('--with-parmetis-libdir={0}' + .format(spec['parmetis'].prefix.lib)) + config_args.append('--with-parmetis-incdir={0}' + .format(spec['parmetis'].prefix.include)) + if '+mpi' in spec: config_args.append('CC={0}'.format(spec['mpi'].mpicc)) config_args.append('CXX={0}'.format(spec['mpi'].mpicxx)) -- cgit v1.2.3-70-g09d2 From e2cf933ec12a1a153da08aeadeff8b8c9483e7df Mon Sep 17 00:00:00 2001 From: sknigh Date: Thu, 23 Nov 2017 03:44:55 -0800 Subject: gcc environment module will set CC, CXX, FC, F77, and F90 flags (#3954) --- var/spack/repos/builtin/packages/gcc/package.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py index df7060e742..34a7864882 100644 --- a/var/spack/repos/builtin/packages/gcc/package.py +++ b/var/spack/repos/builtin/packages/gcc/package.py @@ -290,3 +290,10 @@ class Gcc(AutotoolsPackage): out.write('-rpath {0}:{1} '.format( self.prefix.lib, self.prefix.lib64)) set_install_permissions(specs_file) + + def setup_environment(self, spack_env, run_env): + run_env.set('CC', join_path(self.spec.prefix.bin, 'gcc')) + run_env.set('CXX', join_path(self.spec.prefix.bin, 'g++')) + run_env.set('FC', join_path(self.spec.prefix.bin, 'gfortran')) + run_env.set('F77', join_path(self.spec.prefix.bin, 'gfortran')) + run_env.set('F90', join_path(self.spec.prefix.bin, 'gfortran')) -- cgit v1.2.3-70-g09d2 From ddf10fa3223b0985d0ad01bd17f89ce2bb3e0c55 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Thu, 23 Nov 2017 15:16:44 +0100 Subject: dealii: limit CMake to 3.9 as 3.10.0 is not supported yet (#6427) --- var/spack/repos/builtin/packages/dealii/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index c1ea4fc0cc..8ed2035e2e 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -129,6 +129,9 @@ class Dealii(CMakePackage, CudaPackage): depends_on("hdf5+mpi+hl", when='+hdf5+mpi') depends_on("cuda@8:", when='+cuda') depends_on("cmake@3.9:", when='+cuda') + # currently deal.II does not build with Cmake 3.10, see + # https://github.com/dealii/dealii/issues/5510 + depends_on("cmake@:3.9.99") # FIXME: concretizer bug. The two lines mimic what comes from PETSc # but we should not need it depends_on("metis@5:+int64+real64", when='+metis+int64') -- cgit v1.2.3-70-g09d2 From 1dba6435bdd2842202af409227eb2202485350fd Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 23 Nov 2017 08:17:18 -0600 Subject: r-plotly: Create new package (#6423) --- .../repos/builtin/packages/r-plotly/package.py | 53 ++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-plotly/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-plotly/package.py b/var/spack/repos/builtin/packages/r-plotly/package.py new file mode 100644 index 0000000000..9780cf8ef7 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-plotly/package.py @@ -0,0 +1,53 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RPlotly(RPackage): + """Easily translate 'ggplot2' graphs to an interactive web-based version + and/or create custom web-based visualizations directly from R.""" + + homepage = "https://cran.r-project.org/web/packages/plotly/index.html" + url = "https://cran.r-project.org/src/contrib/plotly_4.7.1.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/plotly" + + version('4.7.1', '4799c8b429291d4c52fb904380806548') + version('4.7.0', '5bd52d515c01af7ff291c30a6cf23bec') + version('4.6.0', '27ff3de288bacfaad6e6694752ea2929') + version('4.5.6', 'e6e00177fa64dc6b1a199facfd73f585') + version('4.5.2', '7eb11b24a9faa9a572657fd89ed72fa5') + + depends_on('r@3.4.0:3.4.9') + depends_on('r-ggplot2', type=('build', 'run')) + depends_on('r-httr', type=('build', 'run')) + depends_on('r-base64enc', type=('build', 'run')) + depends_on('r-htmltools', type=('build', 'run')) + depends_on('r-tidyr', type=('build', 'run')) + depends_on('r-dplyr', type=('build', 'run')) + depends_on('r-htmlwidgets', type=('build', 'run')) + depends_on('r-data-table', type=('build', 'run')) + depends_on('r-hexbin', type=('build', 'run')) + depends_on('r-purrr', type=('build', 'run')) + depends_on('r-crosstalk', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From a955f6353059be1dac3cadfc297f32fa834172f8 Mon Sep 17 00:00:00 2001 From: "Michael F. Herbst" Date: Thu, 23 Nov 2017 15:24:55 +0100 Subject: Add bohrium to spack (#6395) * Add bohrium package.py * Changes suggested by @davydden * Add +cuda guard * Specify required environment setup --- .../repos/builtin/packages/bohrium/package.py | 182 +++++++++++++++++++++ 1 file changed, 182 insertions(+) create mode 100644 var/spack/repos/builtin/packages/bohrium/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bohrium/package.py b/var/spack/repos/builtin/packages/bohrium/package.py new file mode 100644 index 0000000000..fa7e499525 --- /dev/null +++ b/var/spack/repos/builtin/packages/bohrium/package.py @@ -0,0 +1,182 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +from spack.build_systems.cuda import CudaPackage + + +class Bohrium(CMakePackage, CudaPackage): + """Library for automatic acceleration of array operations""" + + homepage = "http://bh107.org" + url = "https://github.com/bh107/bohrium/archive/v0.8.9.tar.gz" + maintainers = ['mfherbst'] + + # + # Versions + # + version("develop", git="https://github.com/bh107/bohrium.git", + branch="master") + + # + # Variants + # + variant("cuda", default=True, + description="Build with CUDA code generator") + variant('opencl', default=True, + description="Build with OpenCL code generator") + variant('openmp', default=True, + description="Build with OpenMP code generator") + + variant('node', default=True, + description="Build the node vector engine manager") + variant('proxy', default=True, + description="Build the proxy vector engine manager") + variant('python', default=True, + description="Build the numpy-like bridge " + "to enable use from python") + variant('cbridge', default=True, + description="Build the bridge interface towards plain C") + + variant('blas', default=True, + description="Build with BLAS extension methods") + variant('lapack', default=True, + description="Build with LAPACK extension methods") + + # + # Conflicts and extensions + # + conflicts('%intel') + conflicts('%clang@:3.5') + extends('python', when="+python") + + # Bohrium needs at least one vector engine and + # at least one vector engine manager + conflicts('~node~proxy') + conflicts('~openmp~opencl~cuda') + + # + # Dependencies + # + depends_on('cmake@2.8:', type="build") + depends_on('boost+system+serialization+filesystem+regex') + + # cuda dependencies managed by CudaPackage class + depends_on('opencl', when="+opencl") + + # NOTE The lapacke interface and hence netlib-lapack + # is the strictly required lapack provider + # for bohrium right now. + depends_on("netlib-lapack+lapacke", when="+lapack") + depends_on("blas", when="+blas") + + depends_on('python', type="build", when="~python") + depends_on('python', when="+python") + depends_on('py-numpy', when="+python") + depends_on('swig', type="build", when="+python") + depends_on('py-cython', type="build", when="+python") + + depends_on('zlib', when="+proxy") + + # + # Settings and cmake cache + # + def cmake_args(self): + spec = self.spec + + cuda_arch = spec.variants['cuda_arch'].value + if "+cuda" in spec and len(cuda_arch) >= 1 and cuda_arch[0]: + # TODO Add cuda_arch support to Bohrium once the basic setup + # via Spack works. + raise InstallError( + "Bohrium does not support setting the CUDA architecture yet." + ) + + args = [ + "-DPYTHON_EXECUTABLE:FILEPATH=" + spec['python'].command.path, + # Hard-disable Jupyter, since this would override a config + # file in the user's home directory in some cases during + # the configuration stage. + "-DJUPYTER_FOUND=FALSE", + "-DJUPYTER_EXECUTABLE=FALSE", + # + # Vector engine managers + "-DVEM_NODE=" + str("+node" in spec), + "-DVEM_PROXY=" + str("+proxy" in spec), + # + # Vector engines + "-DVE_OPENMP=" + str("+openmp" in spec), + "-DVE_OPENCL=" + str("+opencl" in spec), + "-DVE_CUDA=" + str("+cuda" in spec), + # + # Bridges and interfaces + "-DBRIDGE_BHXX=ON", + "-DBRIDGE_C=" + str("+cbridge" in spec or "+python" in spec), + "-DBRIDGE_NPBACKEND=" + str("+python" in spec), + "-DNO_PYTHON3=ON", # Only build python version we provide + ] + + # + # Extension methods + # + if "+blas" in spec: + args += [ + "-DEXT_BLAS=ON", + "-DCBLAS_FOUND=True", + "-DCBLAS_LIBRARIES=" + ";".join(spec["blas"].libs), + "-DCBLAS_INCLUDES=" + spec["blas"].prefix.include, + ] + else: + args += ["-DEXT_BLAS=OFF", "-DDCBLAS_FOUND=False"] + + if "+lapack" in spec: + args += [ + "-DEXT_LAPACK=ON", + "-DLAPACKE_FOUND=True", + "-DLAPACKE_LIBRARIES=" + ";".join(spec["lapack"].libs), + "-DLAPACKE_INCLUDE_DIR=" + spec["lapack"].prefix.include, + ] + else: + args += ["-DEXT_LAPACK=OFF", "-DLAPACKE_FOUND=False"] + + # TODO Other extension methods are not ready yet, because of missing + # packages or because they are untested, so disable in order + # to prevent their setup: + args += [ + "-DEXT_LAPACK=" + str("+lapack" in spec), + "-DEXT_CLBLAS=OFF", # clBLAS not in Spack yet + "-DEXT_TDMA=OFF", # untested + "-DEXT_VISUALIZER=OFF", # untested + "-DEXT_OPENCV=OFF", # untested + ] + + return args + + # + # Environment setup + # + def setup_environment(self, spack_env, run_env): + # Bohrium needs an extra include dir apart from + # the self.prefix.include dir + run_env.prepend_path("CPATH", self.prefix.include.bohrium) -- cgit v1.2.3-70-g09d2 From 7a2b3b2588a97655ca76efc20b7f10b0777800de Mon Sep 17 00:00:00 2001 From: Ondřej Čertík Date: Thu, 23 Nov 2017 07:28:35 -0700 Subject: Add a patch for Intel 18.0.1 (#6392) --- .../builtin/packages/openblas/openblas_icc_fortran2.patch | 14 ++++++++++++++ var/spack/repos/builtin/packages/openblas/package.py | 1 + 2 files changed, 15 insertions(+) create mode 100644 var/spack/repos/builtin/packages/openblas/openblas_icc_fortran2.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openblas/openblas_icc_fortran2.patch b/var/spack/repos/builtin/packages/openblas/openblas_icc_fortran2.patch new file mode 100644 index 0000000000..64785d4f45 --- /dev/null +++ b/var/spack/repos/builtin/packages/openblas/openblas_icc_fortran2.patch @@ -0,0 +1,14 @@ +diff --git a/f_check b/f_check +index 79febfb..c9da6ed 100644 +--- a/f_check ++++ b/f_check +@@ -359,9 +359,6 @@ print MAKEFILE "NOFORTRAN=1\n" if $nofortran == 1; + + print CONFFILE "#define BUNDERSCORE\t$bu\n" if $bu ne ""; + print CONFFILE "#define NEEDBUNDERSCORE\t1\n" if $bu ne ""; +-print CONFFILE "#define NEED2UNDERSCORES\t1\n" if $need2bu ne ""; +- +-print MAKEFILE "NEED2UNDERSCORES=1\n" if $need2bu ne ""; + + if (($linker_l ne "") || ($linker_a ne "")) { + print MAKEFILE "FEXTRALIB=$linker_L $linker_l $linker_a\n"; diff --git a/var/spack/repos/builtin/packages/openblas/package.py b/var/spack/repos/builtin/packages/openblas/package.py index 6258cfa09d..4019b09935 100644 --- a/var/spack/repos/builtin/packages/openblas/package.py +++ b/var/spack/repos/builtin/packages/openblas/package.py @@ -79,6 +79,7 @@ class Openblas(MakefilePackage): patch('openblas_icc.patch', when='@:0.2.19%intel') patch('openblas_icc_openmp.patch', when='%intel@16.0:') patch('openblas_icc_fortran.patch', when='%intel@16.0:') + patch('openblas_icc_fortran2.patch', when='%intel@18.0:') # Fixes compilation error on POWER8 with GCC 7 # https://github.com/xianyi/OpenBLAS/pull/1098 -- cgit v1.2.3-70-g09d2 From cd7d812be9c692285c42522abd0597b402760b61 Mon Sep 17 00:00:00 2001 From: Audrey Thoma Date: Thu, 23 Nov 2017 09:04:02 -0600 Subject: express: new package (#6281) --- .../repos/builtin/packages/express/package.py | 63 ++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 var/spack/repos/builtin/packages/express/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/express/package.py b/var/spack/repos/builtin/packages/express/package.py new file mode 100644 index 0000000000..687213b75b --- /dev/null +++ b/var/spack/repos/builtin/packages/express/package.py @@ -0,0 +1,63 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import os.path +import glob + + +class Express(CMakePackage): + """eXpress is a streaming tool for quantifying the abundances of a set of + target sequences from sampled subsequences.""" + + homepage = "http://bio.math.berkeley.edu/eXpress/" + url = "https://github.com/adarob/eXpress" + + version('2015-11-29', commit='f845cab2c7f2d9247b35143e4aa05869cfb10e79', + git='https://github.com/adarob/eXpress.git') + + depends_on('boost') + depends_on('bamtools') + depends_on('zlib') + + conflicts('%gcc@6.0.0:', when='@2015-11-29') + + def patch(self): + with working_dir('src'): + files = glob.iglob('*.*') + for file in files: + if os.path.isfile(file): + edit = FileFilter(file) + edit.filter('#include Date: Thu, 23 Nov 2017 16:04:41 +0100 Subject: New version and patch for 'sqlite'. (#6303) --- var/spack/repos/builtin/packages/sqlite/package.py | 9 ++++ .../packages/sqlite/remove_overflow_builtins.patch | 48 ++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 var/spack/repos/builtin/packages/sqlite/remove_overflow_builtins.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sqlite/package.py b/var/spack/repos/builtin/packages/sqlite/package.py index de949df998..5c1b825650 100644 --- a/var/spack/repos/builtin/packages/sqlite/package.py +++ b/var/spack/repos/builtin/packages/sqlite/package.py @@ -33,6 +33,8 @@ class Sqlite(AutotoolsPackage): """ homepage = "www.sqlite.org" + version('3.21.0', '7913de4c3126ba3c24689cb7a199ea31', + url='https://www.sqlite.org/2017/sqlite-autoconf-3210000.tar.gz') version('3.20.0', 'e262a28b73cc330e7e83520c8ce14e4d', url='https://www.sqlite.org/2017/sqlite-autoconf-3200000.tar.gz') version('3.18.0', 'a6687a8ae1f66abc8df739aeadecfd0c', @@ -50,6 +52,13 @@ class Sqlite(AutotoolsPackage): # following patch undefines the macro in shell.c patch('sqlite_b0.patch', when='@3.18.0') + # Starting version 3.17.0, SQLite uses compiler built-ins + # __builtin_sub_overflow(), __builtin_add_overflow(), and + # __builtin_mul_overflow(), which are not supported by Intel compiler. + # Starting version 3.21.0 SQLite doesn't use the built-ins if Intel + # compiler is used. + patch('remove_overflow_builtins.patch', when='@3.17.0:3.20%intel') + def get_arch(self): arch = architecture.Arch() arch.platform = architecture.platform() diff --git a/var/spack/repos/builtin/packages/sqlite/remove_overflow_builtins.patch b/var/spack/repos/builtin/packages/sqlite/remove_overflow_builtins.patch new file mode 100644 index 0000000000..a0a5d2e3da --- /dev/null +++ b/var/spack/repos/builtin/packages/sqlite/remove_overflow_builtins.patch @@ -0,0 +1,48 @@ +diff --git a/sqlite3.c b/sqlite3.c +index 4ec1271..8615169 100644 +--- a/sqlite3.c ++++ b/sqlite3.c +@@ -29466,9 +29466,6 @@ SQLITE_PRIVATE int sqlite3SafetyCheckSickOrOk(sqlite3 *db){ + ** overflow, leave *pA unchanged and return 1. + */ + SQLITE_PRIVATE int sqlite3AddInt64(i64 *pA, i64 iB){ +-#if GCC_VERSION>=5004000 +- return __builtin_add_overflow(*pA, iB, pA); +-#else + i64 iA = *pA; + testcase( iA==0 ); testcase( iA==1 ); + testcase( iB==-1 ); testcase( iB==0 ); +@@ -29483,12 +29480,8 @@ SQLITE_PRIVATE int sqlite3AddInt64(i64 *pA, i64 iB){ + } + *pA += iB; + return 0; +-#endif + } + SQLITE_PRIVATE int sqlite3SubInt64(i64 *pA, i64 iB){ +-#if GCC_VERSION>=5004000 +- return __builtin_sub_overflow(*pA, iB, pA); +-#else + testcase( iB==SMALLEST_INT64+1 ); + if( iB==SMALLEST_INT64 ){ + testcase( (*pA)==(-1) ); testcase( (*pA)==0 ); +@@ -29498,12 +29491,8 @@ SQLITE_PRIVATE int sqlite3SubInt64(i64 *pA, i64 iB){ + }else{ + return sqlite3AddInt64(pA, -iB); + } +-#endif + } + SQLITE_PRIVATE int sqlite3MulInt64(i64 *pA, i64 iB){ +-#if GCC_VERSION>=5004000 +- return __builtin_mul_overflow(*pA, iB, pA); +-#else + i64 iA = *pA; + if( iB>0 ){ + if( iA>LARGEST_INT64/iB ) return 1; +@@ -29519,7 +29508,6 @@ SQLITE_PRIVATE int sqlite3MulInt64(i64 *pA, i64 iB){ + } + *pA = iA*iB; + return 0; +-#endif + } + + /* -- cgit v1.2.3-70-g09d2 From 5bbbfe94462c06aa99fd6d4ee802955135d1de9b Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Thu, 23 Nov 2017 16:05:38 +0100 Subject: Introduce virtual dependency pkgconfig (#5198) There are two providers, pkgconf and pkg-config, with the former being the default provider. --- etc/spack/defaults/packages.yaml | 1 + lib/spack/spack/build_systems/autotools.py | 4 ++-- var/spack/repos/builtin/packages/applewmproto/package.py | 2 +- var/spack/repos/builtin/packages/appres/package.py | 2 +- var/spack/repos/builtin/packages/atk/package.py | 2 +- var/spack/repos/builtin/packages/autogen/package.py | 2 +- var/spack/repos/builtin/packages/bdftopcf/package.py | 2 +- var/spack/repos/builtin/packages/beforelight/package.py | 2 +- var/spack/repos/builtin/packages/bigreqsproto/package.py | 2 +- var/spack/repos/builtin/packages/bitmap/package.py | 2 +- var/spack/repos/builtin/packages/cairo/package.py | 2 +- var/spack/repos/builtin/packages/compositeproto/package.py | 2 +- var/spack/repos/builtin/packages/constype/package.py | 2 +- var/spack/repos/builtin/packages/cscope/package.py | 2 +- var/spack/repos/builtin/packages/czmq/package.py | 2 +- var/spack/repos/builtin/packages/damageproto/package.py | 2 +- var/spack/repos/builtin/packages/dmxproto/package.py | 2 +- var/spack/repos/builtin/packages/dri2proto/package.py | 2 +- var/spack/repos/builtin/packages/dri3proto/package.py | 2 +- var/spack/repos/builtin/packages/editres/package.py | 2 +- var/spack/repos/builtin/packages/emacs/package.py | 2 +- var/spack/repos/builtin/packages/encodings/package.py | 2 +- var/spack/repos/builtin/packages/evieext/package.py | 2 +- var/spack/repos/builtin/packages/exonerate/package.py | 2 +- var/spack/repos/builtin/packages/fixesproto/package.py | 2 +- var/spack/repos/builtin/packages/folly/package.py | 2 +- var/spack/repos/builtin/packages/font-adobe-100dpi/package.py | 2 +- var/spack/repos/builtin/packages/font-adobe-75dpi/package.py | 2 +- var/spack/repos/builtin/packages/font-adobe-utopia-100dpi/package.py | 2 +- var/spack/repos/builtin/packages/font-adobe-utopia-75dpi/package.py | 2 +- var/spack/repos/builtin/packages/font-adobe-utopia-type1/package.py | 2 +- var/spack/repos/builtin/packages/font-alias/package.py | 2 +- var/spack/repos/builtin/packages/font-arabic-misc/package.py | 2 +- var/spack/repos/builtin/packages/font-bh-100dpi/package.py | 2 +- var/spack/repos/builtin/packages/font-bh-75dpi/package.py | 2 +- .../builtin/packages/font-bh-lucidatypewriter-100dpi/package.py | 2 +- .../repos/builtin/packages/font-bh-lucidatypewriter-75dpi/package.py | 2 +- var/spack/repos/builtin/packages/font-bh-ttf/package.py | 2 +- var/spack/repos/builtin/packages/font-bh-type1/package.py | 2 +- var/spack/repos/builtin/packages/font-bitstream-100dpi/package.py | 2 +- var/spack/repos/builtin/packages/font-bitstream-75dpi/package.py | 2 +- var/spack/repos/builtin/packages/font-bitstream-speedo/package.py | 2 +- var/spack/repos/builtin/packages/font-bitstream-type1/package.py | 2 +- var/spack/repos/builtin/packages/font-cronyx-cyrillic/package.py | 2 +- var/spack/repos/builtin/packages/font-cursor-misc/package.py | 2 +- var/spack/repos/builtin/packages/font-daewoo-misc/package.py | 2 +- var/spack/repos/builtin/packages/font-dec-misc/package.py | 2 +- var/spack/repos/builtin/packages/font-ibm-type1/package.py | 2 +- var/spack/repos/builtin/packages/font-isas-misc/package.py | 2 +- var/spack/repos/builtin/packages/font-jis-misc/package.py | 2 +- var/spack/repos/builtin/packages/font-micro-misc/package.py | 2 +- var/spack/repos/builtin/packages/font-misc-cyrillic/package.py | 2 +- var/spack/repos/builtin/packages/font-misc-ethiopic/package.py | 2 +- var/spack/repos/builtin/packages/font-misc-meltho/package.py | 2 +- var/spack/repos/builtin/packages/font-misc-misc/package.py | 2 +- var/spack/repos/builtin/packages/font-mutt-misc/package.py | 2 +- var/spack/repos/builtin/packages/font-schumacher-misc/package.py | 2 +- var/spack/repos/builtin/packages/font-screen-cyrillic/package.py | 2 +- var/spack/repos/builtin/packages/font-sony-misc/package.py | 2 +- var/spack/repos/builtin/packages/font-sun-misc/package.py | 2 +- var/spack/repos/builtin/packages/font-util/package.py | 2 +- var/spack/repos/builtin/packages/font-winitzki-cyrillic/package.py | 2 +- var/spack/repos/builtin/packages/font-xfree86-type1/package.py | 2 +- var/spack/repos/builtin/packages/fontconfig/package.py | 2 +- var/spack/repos/builtin/packages/fontsproto/package.py | 2 +- var/spack/repos/builtin/packages/fonttosfnt/package.py | 2 +- var/spack/repos/builtin/packages/freetype/package.py | 2 +- var/spack/repos/builtin/packages/fslsfonts/package.py | 2 +- var/spack/repos/builtin/packages/fstobdf/package.py | 2 +- var/spack/repos/builtin/packages/gccmakedep/package.py | 2 +- var/spack/repos/builtin/packages/gdk-pixbuf/package.py | 2 +- var/spack/repos/builtin/packages/ghostscript/package.py | 2 +- var/spack/repos/builtin/packages/glib/package.py | 2 +- var/spack/repos/builtin/packages/glproto/package.py | 2 +- var/spack/repos/builtin/packages/gnuplot/package.py | 2 +- var/spack/repos/builtin/packages/gnutls/package.py | 2 +- var/spack/repos/builtin/packages/gobject-introspection/package.py | 2 +- var/spack/repos/builtin/packages/gource/package.py | 2 +- var/spack/repos/builtin/packages/graphviz/package.py | 2 +- var/spack/repos/builtin/packages/gtkplus/package.py | 2 +- var/spack/repos/builtin/packages/guile/package.py | 2 +- var/spack/repos/builtin/packages/harfbuzz/package.py | 2 +- var/spack/repos/builtin/packages/hoomd-blue/package.py | 2 +- var/spack/repos/builtin/packages/hpx5/package.py | 2 +- var/spack/repos/builtin/packages/hwloc/package.py | 2 +- var/spack/repos/builtin/packages/iceauth/package.py | 2 +- var/spack/repos/builtin/packages/icedtea/package.py | 2 +- var/spack/repos/builtin/packages/ico/package.py | 2 +- var/spack/repos/builtin/packages/imake/package.py | 2 +- var/spack/repos/builtin/packages/inputproto/package.py | 2 +- var/spack/repos/builtin/packages/intel-gpu-tools/package.py | 2 +- var/spack/repos/builtin/packages/ipopt/package.py | 2 +- var/spack/repos/builtin/packages/julia/package.py | 2 +- var/spack/repos/builtin/packages/kbproto/package.py | 2 +- var/spack/repos/builtin/packages/lbxproxy/package.py | 2 +- var/spack/repos/builtin/packages/libapplewm/package.py | 2 +- var/spack/repos/builtin/packages/libbeagle/package.py | 2 +- var/spack/repos/builtin/packages/libcanberra/package.py | 2 +- var/spack/repos/builtin/packages/libdmx/package.py | 2 +- var/spack/repos/builtin/packages/libdrm/package.py | 2 +- var/spack/repos/builtin/packages/libemos/package.py | 2 +- var/spack/repos/builtin/packages/libfontenc/package.py | 2 +- var/spack/repos/builtin/packages/libfs/package.py | 2 +- var/spack/repos/builtin/packages/libgd/package.py | 2 +- var/spack/repos/builtin/packages/libhio/package.py | 2 +- var/spack/repos/builtin/packages/libice/package.py | 2 +- var/spack/repos/builtin/packages/liblbxutil/package.py | 2 +- var/spack/repos/builtin/packages/liboldx/package.py | 2 +- var/spack/repos/builtin/packages/libpciaccess/package.py | 2 +- var/spack/repos/builtin/packages/libpipeline/package.py | 2 +- var/spack/repos/builtin/packages/libpsl/package.py | 2 +- var/spack/repos/builtin/packages/libsm/package.py | 2 +- var/spack/repos/builtin/packages/libvorbis/package.py | 2 +- var/spack/repos/builtin/packages/libwindowswm/package.py | 2 +- var/spack/repos/builtin/packages/libx11/package.py | 2 +- var/spack/repos/builtin/packages/libxau/package.py | 2 +- var/spack/repos/builtin/packages/libxaw/package.py | 2 +- var/spack/repos/builtin/packages/libxaw3d/package.py | 2 +- var/spack/repos/builtin/packages/libxcb/package.py | 2 +- var/spack/repos/builtin/packages/libxcomposite/package.py | 2 +- var/spack/repos/builtin/packages/libxcursor/package.py | 2 +- var/spack/repos/builtin/packages/libxdamage/package.py | 2 +- var/spack/repos/builtin/packages/libxdmcp/package.py | 2 +- var/spack/repos/builtin/packages/libxevie/package.py | 2 +- var/spack/repos/builtin/packages/libxext/package.py | 2 +- var/spack/repos/builtin/packages/libxfixes/package.py | 2 +- var/spack/repos/builtin/packages/libxfont/package.py | 2 +- var/spack/repos/builtin/packages/libxfont2/package.py | 2 +- var/spack/repos/builtin/packages/libxfontcache/package.py | 2 +- var/spack/repos/builtin/packages/libxft/package.py | 2 +- var/spack/repos/builtin/packages/libxinerama/package.py | 2 +- var/spack/repos/builtin/packages/libxkbfile/package.py | 2 +- var/spack/repos/builtin/packages/libxkbui/package.py | 2 +- var/spack/repos/builtin/packages/libxml2/package.py | 2 +- var/spack/repos/builtin/packages/libxmu/package.py | 2 +- var/spack/repos/builtin/packages/libxp/package.py | 2 +- var/spack/repos/builtin/packages/libxpm/package.py | 2 +- var/spack/repos/builtin/packages/libxpresent/package.py | 2 +- var/spack/repos/builtin/packages/libxprintapputil/package.py | 2 +- var/spack/repos/builtin/packages/libxprintutil/package.py | 2 +- var/spack/repos/builtin/packages/libxrandr/package.py | 2 +- var/spack/repos/builtin/packages/libxrender/package.py | 2 +- var/spack/repos/builtin/packages/libxres/package.py | 2 +- var/spack/repos/builtin/packages/libxscrnsaver/package.py | 2 +- var/spack/repos/builtin/packages/libxshmfence/package.py | 2 +- var/spack/repos/builtin/packages/libxt/package.py | 2 +- var/spack/repos/builtin/packages/libxtrap/package.py | 2 +- var/spack/repos/builtin/packages/libxtst/package.py | 2 +- var/spack/repos/builtin/packages/libxv/package.py | 2 +- var/spack/repos/builtin/packages/libxvmc/package.py | 2 +- var/spack/repos/builtin/packages/libxxf86dga/package.py | 2 +- var/spack/repos/builtin/packages/libxxf86misc/package.py | 2 +- var/spack/repos/builtin/packages/libxxf86vm/package.py | 2 +- var/spack/repos/builtin/packages/listres/package.py | 2 +- var/spack/repos/builtin/packages/lndir/package.py | 2 +- var/spack/repos/builtin/packages/luit/package.py | 2 +- var/spack/repos/builtin/packages/magics/package.py | 2 +- var/spack/repos/builtin/packages/makedepend/package.py | 2 +- var/spack/repos/builtin/packages/mesa/package.py | 2 +- var/spack/repos/builtin/packages/mkfontdir/package.py | 2 +- var/spack/repos/builtin/packages/mkfontscale/package.py | 2 +- var/spack/repos/builtin/packages/mozjs/package.py | 2 +- var/spack/repos/builtin/packages/nauty/package.py | 2 +- var/spack/repos/builtin/packages/ncurses/package.py | 2 +- var/spack/repos/builtin/packages/node-js/package.py | 2 +- var/spack/repos/builtin/packages/oclock/package.py | 2 +- var/spack/repos/builtin/packages/octave/package.py | 2 +- var/spack/repos/builtin/packages/openbabel/package.py | 2 +- var/spack/repos/builtin/packages/openexr/package.py | 2 +- var/spack/repos/builtin/packages/pango/package.py | 2 +- var/spack/repos/builtin/packages/pixman/package.py | 2 +- var/spack/repos/builtin/packages/pkg-config/package.py | 2 ++ var/spack/repos/builtin/packages/pkgconf/package.py | 5 ++++- var/spack/repos/builtin/packages/pocl/package.py | 2 +- var/spack/repos/builtin/packages/presentproto/package.py | 2 +- var/spack/repos/builtin/packages/printproto/package.py | 2 +- var/spack/repos/builtin/packages/proxymngr/package.py | 2 +- var/spack/repos/builtin/packages/py-h5py/package.py | 2 +- var/spack/repos/builtin/packages/py-matplotlib/package.py | 2 +- var/spack/repos/builtin/packages/py-pkgconfig/package.py | 2 +- var/spack/repos/builtin/packages/py-py2cairo/package.py | 2 +- var/spack/repos/builtin/packages/randrproto/package.py | 2 +- var/spack/repos/builtin/packages/recordproto/package.py | 2 +- var/spack/repos/builtin/packages/rendercheck/package.py | 2 +- var/spack/repos/builtin/packages/renderproto/package.py | 2 +- var/spack/repos/builtin/packages/resourceproto/package.py | 2 +- var/spack/repos/builtin/packages/root/package.py | 2 +- var/spack/repos/builtin/packages/rr/package.py | 2 +- var/spack/repos/builtin/packages/rstart/package.py | 2 +- var/spack/repos/builtin/packages/rtags/package.py | 2 +- var/spack/repos/builtin/packages/scripts/package.py | 2 +- var/spack/repos/builtin/packages/scrnsaverproto/package.py | 2 +- var/spack/repos/builtin/packages/sessreg/package.py | 2 +- var/spack/repos/builtin/packages/setxkbmap/package.py | 2 +- var/spack/repos/builtin/packages/shared-mime-info/package.py | 2 +- var/spack/repos/builtin/packages/showfont/package.py | 2 +- var/spack/repos/builtin/packages/slurm/package.py | 2 +- var/spack/repos/builtin/packages/smproxy/package.py | 2 +- var/spack/repos/builtin/packages/the-silver-searcher/package.py | 2 +- var/spack/repos/builtin/packages/transset/package.py | 2 +- var/spack/repos/builtin/packages/twm/package.py | 2 +- var/spack/repos/builtin/packages/videoproto/package.py | 2 +- var/spack/repos/builtin/packages/viewres/package.py | 2 +- var/spack/repos/builtin/packages/wget/package.py | 2 +- var/spack/repos/builtin/packages/wx/package.py | 2 +- var/spack/repos/builtin/packages/x11perf/package.py | 2 +- var/spack/repos/builtin/packages/xauth/package.py | 2 +- var/spack/repos/builtin/packages/xbacklight/package.py | 2 +- var/spack/repos/builtin/packages/xbiff/package.py | 2 +- var/spack/repos/builtin/packages/xbitmaps/package.py | 2 +- var/spack/repos/builtin/packages/xcalc/package.py | 2 +- var/spack/repos/builtin/packages/xcb-demo/package.py | 2 +- var/spack/repos/builtin/packages/xcb-util-cursor/package.py | 2 +- var/spack/repos/builtin/packages/xcb-util-errors/package.py | 2 +- var/spack/repos/builtin/packages/xcb-util-image/package.py | 2 +- var/spack/repos/builtin/packages/xcb-util-keysyms/package.py | 2 +- var/spack/repos/builtin/packages/xcb-util-renderutil/package.py | 2 +- var/spack/repos/builtin/packages/xcb-util-wm/package.py | 2 +- var/spack/repos/builtin/packages/xcb-util/package.py | 2 +- var/spack/repos/builtin/packages/xclipboard/package.py | 2 +- var/spack/repos/builtin/packages/xclock/package.py | 2 +- var/spack/repos/builtin/packages/xcmiscproto/package.py | 2 +- var/spack/repos/builtin/packages/xcmsdb/package.py | 2 +- var/spack/repos/builtin/packages/xcompmgr/package.py | 2 +- var/spack/repos/builtin/packages/xconsole/package.py | 2 +- var/spack/repos/builtin/packages/xcursor-themes/package.py | 2 +- var/spack/repos/builtin/packages/xcursorgen/package.py | 2 +- var/spack/repos/builtin/packages/xdbedizzy/package.py | 2 +- var/spack/repos/builtin/packages/xditview/package.py | 2 +- var/spack/repos/builtin/packages/xdm/package.py | 2 +- var/spack/repos/builtin/packages/xdpyinfo/package.py | 2 +- var/spack/repos/builtin/packages/xdriinfo/package.py | 2 +- var/spack/repos/builtin/packages/xedit/package.py | 2 +- var/spack/repos/builtin/packages/xev/package.py | 2 +- var/spack/repos/builtin/packages/xextproto/package.py | 2 +- var/spack/repos/builtin/packages/xeyes/package.py | 2 +- var/spack/repos/builtin/packages/xf86dga/package.py | 2 +- var/spack/repos/builtin/packages/xf86driproto/package.py | 2 +- var/spack/repos/builtin/packages/xf86vidmodeproto/package.py | 2 +- var/spack/repos/builtin/packages/xfd/package.py | 2 +- var/spack/repos/builtin/packages/xfindproxy/package.py | 2 +- var/spack/repos/builtin/packages/xfontsel/package.py | 2 +- var/spack/repos/builtin/packages/xfs/package.py | 2 +- var/spack/repos/builtin/packages/xfsinfo/package.py | 2 +- var/spack/repos/builtin/packages/xfwp/package.py | 2 +- var/spack/repos/builtin/packages/xgamma/package.py | 2 +- var/spack/repos/builtin/packages/xgc/package.py | 2 +- var/spack/repos/builtin/packages/xhost/package.py | 2 +- var/spack/repos/builtin/packages/xineramaproto/package.py | 2 +- var/spack/repos/builtin/packages/xinit/package.py | 2 +- var/spack/repos/builtin/packages/xinput/package.py | 2 +- var/spack/repos/builtin/packages/xkbcomp/package.py | 2 +- var/spack/repos/builtin/packages/xkbevd/package.py | 2 +- var/spack/repos/builtin/packages/xkbprint/package.py | 2 +- var/spack/repos/builtin/packages/xkbutils/package.py | 2 +- var/spack/repos/builtin/packages/xkeyboard-config/package.py | 2 +- var/spack/repos/builtin/packages/xkill/package.py | 2 +- var/spack/repos/builtin/packages/xload/package.py | 2 +- var/spack/repos/builtin/packages/xlogo/package.py | 2 +- var/spack/repos/builtin/packages/xlsatoms/package.py | 2 +- var/spack/repos/builtin/packages/xlsclients/package.py | 2 +- var/spack/repos/builtin/packages/xlsfonts/package.py | 2 +- var/spack/repos/builtin/packages/xmag/package.py | 2 +- var/spack/repos/builtin/packages/xman/package.py | 2 +- var/spack/repos/builtin/packages/xmessage/package.py | 2 +- var/spack/repos/builtin/packages/xmh/package.py | 2 +- var/spack/repos/builtin/packages/xmodmap/package.py | 2 +- var/spack/repos/builtin/packages/xmore/package.py | 2 +- var/spack/repos/builtin/packages/xorg-cf-files/package.py | 2 +- var/spack/repos/builtin/packages/xorg-docs/package.py | 2 +- var/spack/repos/builtin/packages/xorg-gtest/package.py | 2 +- var/spack/repos/builtin/packages/xorg-server/package.py | 2 +- var/spack/repos/builtin/packages/xorg-sgml-doctools/package.py | 2 +- var/spack/repos/builtin/packages/xphelloworld/package.py | 2 +- var/spack/repos/builtin/packages/xplsprinters/package.py | 2 +- var/spack/repos/builtin/packages/xpr/package.py | 2 +- var/spack/repos/builtin/packages/xprehashprinterlist/package.py | 2 +- var/spack/repos/builtin/packages/xprop/package.py | 2 +- var/spack/repos/builtin/packages/xproto/package.py | 2 +- var/spack/repos/builtin/packages/xrandr/package.py | 2 +- var/spack/repos/builtin/packages/xrdb/package.py | 2 +- var/spack/repos/builtin/packages/xrefresh/package.py | 2 +- var/spack/repos/builtin/packages/xrx/package.py | 2 +- var/spack/repos/builtin/packages/xscope/package.py | 2 +- var/spack/repos/builtin/packages/xset/package.py | 2 +- var/spack/repos/builtin/packages/xsetmode/package.py | 2 +- var/spack/repos/builtin/packages/xsetpointer/package.py | 2 +- var/spack/repos/builtin/packages/xsetroot/package.py | 2 +- var/spack/repos/builtin/packages/xsm/package.py | 2 +- var/spack/repos/builtin/packages/xstdcmap/package.py | 2 +- var/spack/repos/builtin/packages/xterm/package.py | 2 +- var/spack/repos/builtin/packages/xtrans/package.py | 2 +- var/spack/repos/builtin/packages/xtrap/package.py | 2 +- var/spack/repos/builtin/packages/xvidtune/package.py | 2 +- var/spack/repos/builtin/packages/xvinfo/package.py | 2 +- var/spack/repos/builtin/packages/xwd/package.py | 2 +- var/spack/repos/builtin/packages/xwininfo/package.py | 2 +- var/spack/repos/builtin/packages/xwud/package.py | 2 +- var/spack/repos/builtin/packages/zeromq/package.py | 2 +- 299 files changed, 304 insertions(+), 298 deletions(-) (limited to 'var') diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml index 2cfdd399df..92a5eef139 100644 --- a/etc/spack/defaults/packages.yaml +++ b/etc/spack/defaults/packages.yaml @@ -31,6 +31,7 @@ packages: opencl: [pocl] openfoam: [openfoam-com, openfoam-org, foam-extend] pil: [py-pillow] + pkgconfig: [pkgconf, pkg-config] scalapack: [netlib-scalapack] szip: [libszip, libaec] tbb: [intel-tbb] diff --git a/lib/spack/spack/build_systems/autotools.py b/lib/spack/spack/build_systems/autotools.py index 8f2af3e21e..f39eed6997 100644 --- a/lib/spack/spack/build_systems/autotools.py +++ b/lib/spack/spack/build_systems/autotools.py @@ -221,10 +221,10 @@ class AutotoolsPackage(PackageBase): # This line is what is needed most of the time # --install, --verbose, --force autoreconf_args = ['-ivf'] - if 'pkg-config' in spec: + if 'pkgconfig' in spec: autoreconf_args += [ '-I', - join_path(spec['pkg-config'].prefix, 'share', 'aclocal'), + join_path(spec['pkgconfig'].prefix, 'share', 'aclocal'), ] autoreconf_args += self.autoreconf_extra_args m.autoreconf(*autoreconf_args) diff --git a/var/spack/repos/builtin/packages/applewmproto/package.py b/var/spack/repos/builtin/packages/applewmproto/package.py index 170df5d570..d610805884 100644 --- a/var/spack/repos/builtin/packages/applewmproto/package.py +++ b/var/spack/repos/builtin/packages/applewmproto/package.py @@ -37,5 +37,5 @@ class Applewmproto(AutotoolsPackage): version('1.4.2', 'ecc8a4424a893ce120f5652dba62e9e6') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/appres/package.py b/var/spack/repos/builtin/packages/appres/package.py index 87f5c2ff96..9a6b7bb795 100644 --- a/var/spack/repos/builtin/packages/appres/package.py +++ b/var/spack/repos/builtin/packages/appres/package.py @@ -40,5 +40,5 @@ class Appres(AutotoolsPackage): depends_on('libxt') depends_on('xproto@7.0.17:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/atk/package.py b/var/spack/repos/builtin/packages/atk/package.py index 93ce88bb8a..3b37d740a8 100644 --- a/var/spack/repos/builtin/packages/atk/package.py +++ b/var/spack/repos/builtin/packages/atk/package.py @@ -37,7 +37,7 @@ class Atk(AutotoolsPackage): version('2.14.0', 'ecb7ca8469a5650581b1227d78051b8b') depends_on('glib') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('gobject-introspection') def url_for_version(self, version): diff --git a/var/spack/repos/builtin/packages/autogen/package.py b/var/spack/repos/builtin/packages/autogen/package.py index 4198ab1589..8851dc9dec 100644 --- a/var/spack/repos/builtin/packages/autogen/package.py +++ b/var/spack/repos/builtin/packages/autogen/package.py @@ -40,7 +40,7 @@ class Autogen(AutotoolsPackage): variant('xml', default=True, description='Enable XML support') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('guile@1.8:2.0') depends_on('libxml2', when='+xml') diff --git a/var/spack/repos/builtin/packages/bdftopcf/package.py b/var/spack/repos/builtin/packages/bdftopcf/package.py index a85bcf5307..e02e64f71c 100644 --- a/var/spack/repos/builtin/packages/bdftopcf/package.py +++ b/var/spack/repos/builtin/packages/bdftopcf/package.py @@ -40,7 +40,7 @@ class Bdftopcf(AutotoolsPackage): depends_on('libxfont') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('xproto', type='build') depends_on('fontsproto', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/beforelight/package.py b/var/spack/repos/builtin/packages/beforelight/package.py index 457c547a16..2da9d6429a 100644 --- a/var/spack/repos/builtin/packages/beforelight/package.py +++ b/var/spack/repos/builtin/packages/beforelight/package.py @@ -40,5 +40,5 @@ class Beforelight(AutotoolsPackage): depends_on('libxscrnsaver') depends_on('libxt') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/bigreqsproto/package.py b/var/spack/repos/builtin/packages/bigreqsproto/package.py index e271e12777..502dabfd32 100644 --- a/var/spack/repos/builtin/packages/bigreqsproto/package.py +++ b/var/spack/repos/builtin/packages/bigreqsproto/package.py @@ -36,5 +36,5 @@ class Bigreqsproto(AutotoolsPackage): version('1.1.2', '9b83369ac7a5eb2bf54c8f34db043a0e') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/bitmap/package.py b/var/spack/repos/builtin/packages/bitmap/package.py index 2ea4613a53..caa64480f4 100644 --- a/var/spack/repos/builtin/packages/bitmap/package.py +++ b/var/spack/repos/builtin/packages/bitmap/package.py @@ -41,5 +41,5 @@ class Bitmap(AutotoolsPackage): depends_on('xbitmaps', type='build') depends_on('xproto@7.0.25:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/cairo/package.py b/var/spack/repos/builtin/packages/cairo/package.py index ec04e5ed38..98ae87acdb 100644 --- a/var/spack/repos/builtin/packages/cairo/package.py +++ b/var/spack/repos/builtin/packages/cairo/package.py @@ -45,7 +45,7 @@ class Cairo(AutotoolsPackage): depends_on("glib") depends_on("pixman") depends_on("freetype") - depends_on("pkg-config", type="build") + depends_on("pkgconfig", type="build") depends_on("fontconfig@2.10.91:") # Require newer version of fontconfig. def configure_args(self): diff --git a/var/spack/repos/builtin/packages/compositeproto/package.py b/var/spack/repos/builtin/packages/compositeproto/package.py index b4a041e7a2..120c76b408 100644 --- a/var/spack/repos/builtin/packages/compositeproto/package.py +++ b/var/spack/repos/builtin/packages/compositeproto/package.py @@ -36,5 +36,5 @@ class Compositeproto(AutotoolsPackage): version('0.4.2', '2dea7c339432b3363faf2d29c208e7b5') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/constype/package.py b/var/spack/repos/builtin/packages/constype/package.py index 731217b527..1fa0800b48 100644 --- a/var/spack/repos/builtin/packages/constype/package.py +++ b/var/spack/repos/builtin/packages/constype/package.py @@ -37,5 +37,5 @@ class Constype(AutotoolsPackage): version('1.0.4', '2333b9ac9fd32e58b05afa651c4590a3') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/cscope/package.py b/var/spack/repos/builtin/packages/cscope/package.py index d7e7d29935..31a826be5c 100644 --- a/var/spack/repos/builtin/packages/cscope/package.py +++ b/var/spack/repos/builtin/packages/cscope/package.py @@ -37,6 +37,6 @@ class Cscope(AutotoolsPackage): depends_on('flex', type='build') depends_on('bison', type='build') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') build_targets = ['CURSES_LIBS=-lncursesw'] diff --git a/var/spack/repos/builtin/packages/czmq/package.py b/var/spack/repos/builtin/packages/czmq/package.py index 799b577398..bd97d331d0 100644 --- a/var/spack/repos/builtin/packages/czmq/package.py +++ b/var/spack/repos/builtin/packages/czmq/package.py @@ -36,7 +36,7 @@ class Czmq(AutotoolsPackage): depends_on('libtool', type='build') depends_on('automake', type='build') depends_on('autoconf', type='build') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('zeromq') def configure_args(self): diff --git a/var/spack/repos/builtin/packages/damageproto/package.py b/var/spack/repos/builtin/packages/damageproto/package.py index 06d8815bb4..4b40a5f72b 100644 --- a/var/spack/repos/builtin/packages/damageproto/package.py +++ b/var/spack/repos/builtin/packages/damageproto/package.py @@ -36,5 +36,5 @@ class Damageproto(AutotoolsPackage): version('1.2.1', 'bf8c47b7f48625230cff155180f8ddce') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/dmxproto/package.py b/var/spack/repos/builtin/packages/dmxproto/package.py index b668dc9b58..c3bd1919fc 100644 --- a/var/spack/repos/builtin/packages/dmxproto/package.py +++ b/var/spack/repos/builtin/packages/dmxproto/package.py @@ -37,5 +37,5 @@ class Dmxproto(AutotoolsPackage): version('2.3.1', '7c52af95aac192e8de31bd9a588ce121') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/dri2proto/package.py b/var/spack/repos/builtin/packages/dri2proto/package.py index 00c4cc812d..bfd4326d42 100644 --- a/var/spack/repos/builtin/packages/dri2proto/package.py +++ b/var/spack/repos/builtin/packages/dri2proto/package.py @@ -37,5 +37,5 @@ class Dri2proto(AutotoolsPackage): version('2.8', '19ea18f63d8ae8053c9fa84b60365b77') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/dri3proto/package.py b/var/spack/repos/builtin/packages/dri3proto/package.py index 5f4604789d..257acf8514 100644 --- a/var/spack/repos/builtin/packages/dri3proto/package.py +++ b/var/spack/repos/builtin/packages/dri3proto/package.py @@ -37,5 +37,5 @@ class Dri3proto(AutotoolsPackage): version('1.0', '25e84a49a076862277ee12aebd49ff5f') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/editres/package.py b/var/spack/repos/builtin/packages/editres/package.py index 1bba68d305..ccd38d114f 100644 --- a/var/spack/repos/builtin/packages/editres/package.py +++ b/var/spack/repos/builtin/packages/editres/package.py @@ -38,5 +38,5 @@ class Editres(AutotoolsPackage): depends_on('libxt') depends_on('libxmu') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/emacs/package.py b/var/spack/repos/builtin/packages/emacs/package.py index 4b0d7a9689..1a7c8143a9 100644 --- a/var/spack/repos/builtin/packages/emacs/package.py +++ b/var/spack/repos/builtin/packages/emacs/package.py @@ -44,7 +44,7 @@ class Emacs(AutotoolsPackage): description="Select an X toolkit (gtk, athena)" ) - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('ncurses') depends_on('zlib') diff --git a/var/spack/repos/builtin/packages/encodings/package.py b/var/spack/repos/builtin/packages/encodings/package.py index f356b052fc..ae1f5f0c04 100644 --- a/var/spack/repos/builtin/packages/encodings/package.py +++ b/var/spack/repos/builtin/packages/encodings/package.py @@ -36,7 +36,7 @@ class Encodings(Package): depends_on('font-util') depends_on('mkfontscale', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/evieext/package.py b/var/spack/repos/builtin/packages/evieext/package.py index a88764516e..0307f86b3b 100644 --- a/var/spack/repos/builtin/packages/evieext/package.py +++ b/var/spack/repos/builtin/packages/evieext/package.py @@ -36,5 +36,5 @@ class Evieext(AutotoolsPackage): version('1.1.1', '018a7d24d0c7926d594246320bcb6a86') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/exonerate/package.py b/var/spack/repos/builtin/packages/exonerate/package.py index 2dae693b72..86e3d2af7b 100644 --- a/var/spack/repos/builtin/packages/exonerate/package.py +++ b/var/spack/repos/builtin/packages/exonerate/package.py @@ -33,7 +33,7 @@ class Exonerate(Package): version('2.4.0', '126fbade003b80b663a1d530c56f1904') - depends_on('pkg-config', type="build") + depends_on('pkgconfig', type="build") depends_on('glib') parallel = False diff --git a/var/spack/repos/builtin/packages/fixesproto/package.py b/var/spack/repos/builtin/packages/fixesproto/package.py index b98437b9ff..93de50db17 100644 --- a/var/spack/repos/builtin/packages/fixesproto/package.py +++ b/var/spack/repos/builtin/packages/fixesproto/package.py @@ -37,5 +37,5 @@ class Fixesproto(AutotoolsPackage): version('5.0', '1b3115574cadd4cbea1f197faa7c1de4') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/folly/package.py b/var/spack/repos/builtin/packages/folly/package.py index 9dca4bd6cf..1c19de1ea6 100644 --- a/var/spack/repos/builtin/packages/folly/package.py +++ b/var/spack/repos/builtin/packages/folly/package.py @@ -50,7 +50,7 @@ class Folly(AutotoolsPackage): depends_on('autoconf', type='build') depends_on('automake', type='build') depends_on('libtool', type='build') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') # TODO: folly requires gcc 4.9+ and a version of boost compiled with # TODO: C++14 support (but there's no neat way to check that these diff --git a/var/spack/repos/builtin/packages/font-adobe-100dpi/package.py b/var/spack/repos/builtin/packages/font-adobe-100dpi/package.py index 8efdebb802..a156aa21c4 100644 --- a/var/spack/repos/builtin/packages/font-adobe-100dpi/package.py +++ b/var/spack/repos/builtin/packages/font-adobe-100dpi/package.py @@ -38,7 +38,7 @@ class FontAdobe100dpi(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('bdftopcf', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-adobe-75dpi/package.py b/var/spack/repos/builtin/packages/font-adobe-75dpi/package.py index 0b73bd1b9a..6443dddc7c 100644 --- a/var/spack/repos/builtin/packages/font-adobe-75dpi/package.py +++ b/var/spack/repos/builtin/packages/font-adobe-75dpi/package.py @@ -38,7 +38,7 @@ class FontAdobe75dpi(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('bdftopcf', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-adobe-utopia-100dpi/package.py b/var/spack/repos/builtin/packages/font-adobe-utopia-100dpi/package.py index 7a61e04de5..a8c945882b 100644 --- a/var/spack/repos/builtin/packages/font-adobe-utopia-100dpi/package.py +++ b/var/spack/repos/builtin/packages/font-adobe-utopia-100dpi/package.py @@ -38,7 +38,7 @@ class FontAdobeUtopia100dpi(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('bdftopcf', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-adobe-utopia-75dpi/package.py b/var/spack/repos/builtin/packages/font-adobe-utopia-75dpi/package.py index dddd546cad..60390be8a7 100644 --- a/var/spack/repos/builtin/packages/font-adobe-utopia-75dpi/package.py +++ b/var/spack/repos/builtin/packages/font-adobe-utopia-75dpi/package.py @@ -38,7 +38,7 @@ class FontAdobeUtopia75dpi(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('bdftopcf', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-adobe-utopia-type1/package.py b/var/spack/repos/builtin/packages/font-adobe-utopia-type1/package.py index 0d03c12822..c7df91f595 100644 --- a/var/spack/repos/builtin/packages/font-adobe-utopia-type1/package.py +++ b/var/spack/repos/builtin/packages/font-adobe-utopia-type1/package.py @@ -37,7 +37,7 @@ class FontAdobeUtopiaType1(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('mkfontscale', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-alias/package.py b/var/spack/repos/builtin/packages/font-alias/package.py index 15a14bf2cb..04d14bf53c 100644 --- a/var/spack/repos/builtin/packages/font-alias/package.py +++ b/var/spack/repos/builtin/packages/font-alias/package.py @@ -35,7 +35,7 @@ class FontAlias(Package): depends_on('font-util') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-arabic-misc/package.py b/var/spack/repos/builtin/packages/font-arabic-misc/package.py index 20ca7a2df0..d62f1f904f 100644 --- a/var/spack/repos/builtin/packages/font-arabic-misc/package.py +++ b/var/spack/repos/builtin/packages/font-arabic-misc/package.py @@ -38,7 +38,7 @@ class FontArabicMisc(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('bdftopcf', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-bh-100dpi/package.py b/var/spack/repos/builtin/packages/font-bh-100dpi/package.py index 3472783671..0a1101a2d3 100644 --- a/var/spack/repos/builtin/packages/font-bh-100dpi/package.py +++ b/var/spack/repos/builtin/packages/font-bh-100dpi/package.py @@ -38,7 +38,7 @@ class FontBh100dpi(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('bdftopcf', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-bh-75dpi/package.py b/var/spack/repos/builtin/packages/font-bh-75dpi/package.py index bb5268208c..00d09bc67f 100644 --- a/var/spack/repos/builtin/packages/font-bh-75dpi/package.py +++ b/var/spack/repos/builtin/packages/font-bh-75dpi/package.py @@ -38,7 +38,7 @@ class FontBh75dpi(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('bdftopcf', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-100dpi/package.py b/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-100dpi/package.py index 6fe18e703b..6fa2c93439 100644 --- a/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-100dpi/package.py +++ b/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-100dpi/package.py @@ -38,7 +38,7 @@ class FontBhLucidatypewriter100dpi(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('bdftopcf', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-75dpi/package.py b/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-75dpi/package.py index f44596b882..5417f18e55 100644 --- a/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-75dpi/package.py +++ b/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-75dpi/package.py @@ -38,7 +38,7 @@ class FontBhLucidatypewriter75dpi(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('bdftopcf', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-bh-ttf/package.py b/var/spack/repos/builtin/packages/font-bh-ttf/package.py index 83ad928c8b..c16ffce576 100644 --- a/var/spack/repos/builtin/packages/font-bh-ttf/package.py +++ b/var/spack/repos/builtin/packages/font-bh-ttf/package.py @@ -38,7 +38,7 @@ class FontBhTtf(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('bdftopcf', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-bh-type1/package.py b/var/spack/repos/builtin/packages/font-bh-type1/package.py index 594efb0460..65d091cedb 100644 --- a/var/spack/repos/builtin/packages/font-bh-type1/package.py +++ b/var/spack/repos/builtin/packages/font-bh-type1/package.py @@ -38,7 +38,7 @@ class FontBhType1(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('mkfontscale', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-bitstream-100dpi/package.py b/var/spack/repos/builtin/packages/font-bitstream-100dpi/package.py index a5722733da..92f095f9bf 100644 --- a/var/spack/repos/builtin/packages/font-bitstream-100dpi/package.py +++ b/var/spack/repos/builtin/packages/font-bitstream-100dpi/package.py @@ -38,7 +38,7 @@ class FontBitstream100dpi(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('bdftopcf', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-bitstream-75dpi/package.py b/var/spack/repos/builtin/packages/font-bitstream-75dpi/package.py index 8dcf9dfe2c..b8a42e82df 100644 --- a/var/spack/repos/builtin/packages/font-bitstream-75dpi/package.py +++ b/var/spack/repos/builtin/packages/font-bitstream-75dpi/package.py @@ -38,7 +38,7 @@ class FontBitstream75dpi(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('bdftopcf', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-bitstream-speedo/package.py b/var/spack/repos/builtin/packages/font-bitstream-speedo/package.py index e2ae5fea3c..5cc6b37f06 100644 --- a/var/spack/repos/builtin/packages/font-bitstream-speedo/package.py +++ b/var/spack/repos/builtin/packages/font-bitstream-speedo/package.py @@ -38,7 +38,7 @@ class FontBitstreamSpeedo(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('mkfontscale', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-bitstream-type1/package.py b/var/spack/repos/builtin/packages/font-bitstream-type1/package.py index c6699b7521..c37a11ba86 100644 --- a/var/spack/repos/builtin/packages/font-bitstream-type1/package.py +++ b/var/spack/repos/builtin/packages/font-bitstream-type1/package.py @@ -38,7 +38,7 @@ class FontBitstreamType1(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('mkfontscale', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-cronyx-cyrillic/package.py b/var/spack/repos/builtin/packages/font-cronyx-cyrillic/package.py index 829f28ee1e..f0e2e90c1b 100644 --- a/var/spack/repos/builtin/packages/font-cronyx-cyrillic/package.py +++ b/var/spack/repos/builtin/packages/font-cronyx-cyrillic/package.py @@ -38,7 +38,7 @@ class FontCronyxCyrillic(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('bdftopcf', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-cursor-misc/package.py b/var/spack/repos/builtin/packages/font-cursor-misc/package.py index 34479c7fc6..6d4c6f7a31 100644 --- a/var/spack/repos/builtin/packages/font-cursor-misc/package.py +++ b/var/spack/repos/builtin/packages/font-cursor-misc/package.py @@ -38,7 +38,7 @@ class FontCursorMisc(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('bdftopcf', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-daewoo-misc/package.py b/var/spack/repos/builtin/packages/font-daewoo-misc/package.py index 9c346c3b8b..c12ee9363b 100644 --- a/var/spack/repos/builtin/packages/font-daewoo-misc/package.py +++ b/var/spack/repos/builtin/packages/font-daewoo-misc/package.py @@ -38,7 +38,7 @@ class FontDaewooMisc(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('bdftopcf', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-dec-misc/package.py b/var/spack/repos/builtin/packages/font-dec-misc/package.py index 22c52a95da..a88e2ffc7e 100644 --- a/var/spack/repos/builtin/packages/font-dec-misc/package.py +++ b/var/spack/repos/builtin/packages/font-dec-misc/package.py @@ -38,7 +38,7 @@ class FontDecMisc(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('bdftopcf', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-ibm-type1/package.py b/var/spack/repos/builtin/packages/font-ibm-type1/package.py index a8d06ef092..6261a19093 100644 --- a/var/spack/repos/builtin/packages/font-ibm-type1/package.py +++ b/var/spack/repos/builtin/packages/font-ibm-type1/package.py @@ -38,7 +38,7 @@ class FontIbmType1(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('mkfontscale', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-isas-misc/package.py b/var/spack/repos/builtin/packages/font-isas-misc/package.py index 86353f22ce..f704c7cafa 100644 --- a/var/spack/repos/builtin/packages/font-isas-misc/package.py +++ b/var/spack/repos/builtin/packages/font-isas-misc/package.py @@ -38,7 +38,7 @@ class FontIsasMisc(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('bdftopcf', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-jis-misc/package.py b/var/spack/repos/builtin/packages/font-jis-misc/package.py index 18723cc129..1ee1616818 100644 --- a/var/spack/repos/builtin/packages/font-jis-misc/package.py +++ b/var/spack/repos/builtin/packages/font-jis-misc/package.py @@ -38,7 +38,7 @@ class FontJisMisc(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('bdftopcf', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-micro-misc/package.py b/var/spack/repos/builtin/packages/font-micro-misc/package.py index 664cc158a7..fa9951d8d0 100644 --- a/var/spack/repos/builtin/packages/font-micro-misc/package.py +++ b/var/spack/repos/builtin/packages/font-micro-misc/package.py @@ -38,7 +38,7 @@ class FontMicroMisc(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('bdftopcf', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-misc-cyrillic/package.py b/var/spack/repos/builtin/packages/font-misc-cyrillic/package.py index 52d2e0ca33..dc0bb59fbb 100644 --- a/var/spack/repos/builtin/packages/font-misc-cyrillic/package.py +++ b/var/spack/repos/builtin/packages/font-misc-cyrillic/package.py @@ -38,7 +38,7 @@ class FontMiscCyrillic(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('bdftopcf', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-misc-ethiopic/package.py b/var/spack/repos/builtin/packages/font-misc-ethiopic/package.py index ed10f2ecad..060e78dea1 100644 --- a/var/spack/repos/builtin/packages/font-misc-ethiopic/package.py +++ b/var/spack/repos/builtin/packages/font-misc-ethiopic/package.py @@ -38,7 +38,7 @@ class FontMiscEthiopic(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('mkfontscale', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-misc-meltho/package.py b/var/spack/repos/builtin/packages/font-misc-meltho/package.py index beef19e00a..f5d1f47b78 100644 --- a/var/spack/repos/builtin/packages/font-misc-meltho/package.py +++ b/var/spack/repos/builtin/packages/font-misc-meltho/package.py @@ -38,7 +38,7 @@ class FontMiscMeltho(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('mkfontscale', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-misc-misc/package.py b/var/spack/repos/builtin/packages/font-misc-misc/package.py index b818cd6a84..2850cdcc90 100644 --- a/var/spack/repos/builtin/packages/font-misc-misc/package.py +++ b/var/spack/repos/builtin/packages/font-misc-misc/package.py @@ -38,7 +38,7 @@ class FontMiscMisc(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('bdftopcf', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-mutt-misc/package.py b/var/spack/repos/builtin/packages/font-mutt-misc/package.py index 0f303923b0..3d55447064 100644 --- a/var/spack/repos/builtin/packages/font-mutt-misc/package.py +++ b/var/spack/repos/builtin/packages/font-mutt-misc/package.py @@ -38,7 +38,7 @@ class FontMuttMisc(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('bdftopcf', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-schumacher-misc/package.py b/var/spack/repos/builtin/packages/font-schumacher-misc/package.py index 66e8002877..d9cb52d0a2 100644 --- a/var/spack/repos/builtin/packages/font-schumacher-misc/package.py +++ b/var/spack/repos/builtin/packages/font-schumacher-misc/package.py @@ -38,7 +38,7 @@ class FontSchumacherMisc(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('bdftopcf', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-screen-cyrillic/package.py b/var/spack/repos/builtin/packages/font-screen-cyrillic/package.py index 71c2230d1f..3efa22c1cf 100644 --- a/var/spack/repos/builtin/packages/font-screen-cyrillic/package.py +++ b/var/spack/repos/builtin/packages/font-screen-cyrillic/package.py @@ -38,7 +38,7 @@ class FontScreenCyrillic(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('bdftopcf', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-sony-misc/package.py b/var/spack/repos/builtin/packages/font-sony-misc/package.py index ccea5883ac..0b7af22dd6 100644 --- a/var/spack/repos/builtin/packages/font-sony-misc/package.py +++ b/var/spack/repos/builtin/packages/font-sony-misc/package.py @@ -38,7 +38,7 @@ class FontSonyMisc(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('bdftopcf', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-sun-misc/package.py b/var/spack/repos/builtin/packages/font-sun-misc/package.py index 26e0c935ed..8febf7d802 100644 --- a/var/spack/repos/builtin/packages/font-sun-misc/package.py +++ b/var/spack/repos/builtin/packages/font-sun-misc/package.py @@ -37,7 +37,7 @@ class FontSunMisc(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('bdftopcf', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-util/package.py b/var/spack/repos/builtin/packages/font-util/package.py index 4f55412457..38a7dd27eb 100644 --- a/var/spack/repos/builtin/packages/font-util/package.py +++ b/var/spack/repos/builtin/packages/font-util/package.py @@ -33,5 +33,5 @@ class FontUtil(AutotoolsPackage): version('1.3.1', 'd153a9af216e4498fa171faea2c82514') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/font-winitzki-cyrillic/package.py b/var/spack/repos/builtin/packages/font-winitzki-cyrillic/package.py index dade47b7d2..2c4de3dde3 100644 --- a/var/spack/repos/builtin/packages/font-winitzki-cyrillic/package.py +++ b/var/spack/repos/builtin/packages/font-winitzki-cyrillic/package.py @@ -38,7 +38,7 @@ class FontWinitzkiCyrillic(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('bdftopcf', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/font-xfree86-type1/package.py b/var/spack/repos/builtin/packages/font-xfree86-type1/package.py index 2a4dfea233..f84feedec8 100644 --- a/var/spack/repos/builtin/packages/font-xfree86-type1/package.py +++ b/var/spack/repos/builtin/packages/font-xfree86-type1/package.py @@ -38,7 +38,7 @@ class FontXfree86Type1(Package): depends_on('fontconfig', type='build') depends_on('mkfontdir', type='build') depends_on('mkfontscale', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/fontconfig/package.py b/var/spack/repos/builtin/packages/fontconfig/package.py index 8cfd5c0d54..f9ed9c583d 100644 --- a/var/spack/repos/builtin/packages/fontconfig/package.py +++ b/var/spack/repos/builtin/packages/fontconfig/package.py @@ -37,7 +37,7 @@ class Fontconfig(AutotoolsPackage): depends_on('freetype') depends_on('gperf', type='build', when='@2.12.2:') depends_on('libxml2') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('font-util') def configure_args(self): diff --git a/var/spack/repos/builtin/packages/fontsproto/package.py b/var/spack/repos/builtin/packages/fontsproto/package.py index c243f9de97..527b3fe405 100644 --- a/var/spack/repos/builtin/packages/fontsproto/package.py +++ b/var/spack/repos/builtin/packages/fontsproto/package.py @@ -33,5 +33,5 @@ class Fontsproto(AutotoolsPackage): version('2.1.3', '0415f0360e33f3202af67c6c46782251') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/fonttosfnt/package.py b/var/spack/repos/builtin/packages/fonttosfnt/package.py index 145e619c54..30da56fd33 100644 --- a/var/spack/repos/builtin/packages/fonttosfnt/package.py +++ b/var/spack/repos/builtin/packages/fonttosfnt/package.py @@ -37,5 +37,5 @@ class Fonttosfnt(AutotoolsPackage): depends_on('libfontenc') depends_on('xproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/freetype/package.py b/var/spack/repos/builtin/packages/freetype/package.py index 1ad65a9750..25bb29b454 100644 --- a/var/spack/repos/builtin/packages/freetype/package.py +++ b/var/spack/repos/builtin/packages/freetype/package.py @@ -40,7 +40,7 @@ class Freetype(AutotoolsPackage): depends_on('libpng') depends_on('bzip2') - depends_on('pkg-config@0.24:', type='build') + depends_on('pkgconfig', type='build') def configure_args(self): return ['--with-harfbuzz=no'] diff --git a/var/spack/repos/builtin/packages/fslsfonts/package.py b/var/spack/repos/builtin/packages/fslsfonts/package.py index ce5b04f0ee..14331a79fa 100644 --- a/var/spack/repos/builtin/packages/fslsfonts/package.py +++ b/var/spack/repos/builtin/packages/fslsfonts/package.py @@ -36,5 +36,5 @@ class Fslsfonts(AutotoolsPackage): depends_on('libfs') depends_on('xproto@7.0.25:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/fstobdf/package.py b/var/spack/repos/builtin/packages/fstobdf/package.py index dd51473d41..627826f8d7 100644 --- a/var/spack/repos/builtin/packages/fstobdf/package.py +++ b/var/spack/repos/builtin/packages/fstobdf/package.py @@ -40,5 +40,5 @@ class Fstobdf(AutotoolsPackage): depends_on('libfs') depends_on('xproto@7.0.25:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/gccmakedep/package.py b/var/spack/repos/builtin/packages/gccmakedep/package.py index a8ece20f43..0be991e041 100644 --- a/var/spack/repos/builtin/packages/gccmakedep/package.py +++ b/var/spack/repos/builtin/packages/gccmakedep/package.py @@ -33,4 +33,4 @@ class Gccmakedep(AutotoolsPackage): version('1.0.3', '127ddb6131eb4a56fdf6644a63ade788') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') diff --git a/var/spack/repos/builtin/packages/gdk-pixbuf/package.py b/var/spack/repos/builtin/packages/gdk-pixbuf/package.py index 63d24d64c4..8397883b3f 100644 --- a/var/spack/repos/builtin/packages/gdk-pixbuf/package.py +++ b/var/spack/repos/builtin/packages/gdk-pixbuf/package.py @@ -38,7 +38,7 @@ class GdkPixbuf(AutotoolsPackage): version('2.31.2', '6be6bbc4f356d4b79ab4226860ab8523') - depends_on("pkg-config", type="build") + depends_on("pkgconfig", type="build") depends_on("gettext") depends_on("glib") depends_on("jpeg") diff --git a/var/spack/repos/builtin/packages/ghostscript/package.py b/var/spack/repos/builtin/packages/ghostscript/package.py index 991f77199e..937b509166 100644 --- a/var/spack/repos/builtin/packages/ghostscript/package.py +++ b/var/spack/repos/builtin/packages/ghostscript/package.py @@ -35,7 +35,7 @@ class Ghostscript(AutotoolsPackage): version('9.21', '5f213281761d2750fcf27476c404d17f') version('9.18', '33a47567d7a591c00a253caddd12a88a') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('freetype@2.4.2:') depends_on('jpeg') diff --git a/var/spack/repos/builtin/packages/glib/package.py b/var/spack/repos/builtin/packages/glib/package.py index 5997987fa6..50c0559bce 100644 --- a/var/spack/repos/builtin/packages/glib/package.py +++ b/var/spack/repos/builtin/packages/glib/package.py @@ -42,7 +42,7 @@ class Glib(AutotoolsPackage): variant('libmount', default=False, description='Build with libmount support') - depends_on('pkg-config@0.16:+internal_glib', type='build') + depends_on('pkgconfig', type='build') depends_on('libffi') depends_on('zlib') depends_on('gettext') diff --git a/var/spack/repos/builtin/packages/glproto/package.py b/var/spack/repos/builtin/packages/glproto/package.py index eaaabc884b..a8d51af7d1 100644 --- a/var/spack/repos/builtin/packages/glproto/package.py +++ b/var/spack/repos/builtin/packages/glproto/package.py @@ -36,5 +36,5 @@ class Glproto(AutotoolsPackage): version('1.4.17', 'd69554c1b51a83f2c6976a640819911b') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/gnuplot/package.py b/var/spack/repos/builtin/packages/gnuplot/package.py index 1af9cbfb08..12e2f13f20 100644 --- a/var/spack/repos/builtin/packages/gnuplot/package.py +++ b/var/spack/repos/builtin/packages/gnuplot/package.py @@ -66,7 +66,7 @@ class Gnuplot(AutotoolsPackage): # required dependencies depends_on('readline') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('libxpm') depends_on('libiconv') diff --git a/var/spack/repos/builtin/packages/gnutls/package.py b/var/spack/repos/builtin/packages/gnutls/package.py index 7f41eb3204..6c4a47f814 100644 --- a/var/spack/repos/builtin/packages/gnutls/package.py +++ b/var/spack/repos/builtin/packages/gnutls/package.py @@ -49,7 +49,7 @@ class Gnutls(AutotoolsPackage): depends_on('zlib', when='+zlib') depends_on('gettext') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') build_directory = 'spack-build' diff --git a/var/spack/repos/builtin/packages/gobject-introspection/package.py b/var/spack/repos/builtin/packages/gobject-introspection/package.py index ec71e3cddd..2c2ff6078c 100644 --- a/var/spack/repos/builtin/packages/gobject-introspection/package.py +++ b/var/spack/repos/builtin/packages/gobject-introspection/package.py @@ -44,7 +44,7 @@ class GobjectIntrospection(Package): depends_on("cairo") depends_on("bison", type="build") depends_on("flex", type="build") - depends_on("pkg-config@0.9.0:", type="build") + depends_on("pkgconfig", type="build") # GobjectIntrospection does not build with sed from darwin: depends_on('sed', when='platform=darwin', type='build') diff --git a/var/spack/repos/builtin/packages/gource/package.py b/var/spack/repos/builtin/packages/gource/package.py index 3d9ddd1ff6..ee01fc3364 100644 --- a/var/spack/repos/builtin/packages/gource/package.py +++ b/var/spack/repos/builtin/packages/gource/package.py @@ -37,7 +37,7 @@ class Gource(AutotoolsPackage): depends_on('autoconf', type='build') depends_on('libtool', type='build') depends_on('glm', type='build') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('freetype@2.0:') depends_on('pcre') diff --git a/var/spack/repos/builtin/packages/graphviz/package.py b/var/spack/repos/builtin/packages/graphviz/package.py index 0ec35f09e8..5bcd78adc2 100644 --- a/var/spack/repos/builtin/packages/graphviz/package.py +++ b/var/spack/repos/builtin/packages/graphviz/package.py @@ -106,7 +106,7 @@ class Graphviz(AutotoolsPackage): depends_on('freetype') depends_on('expat') depends_on('libtool') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('java', when='+java') depends_on('python@2:2.8', when='+python') diff --git a/var/spack/repos/builtin/packages/gtkplus/package.py b/var/spack/repos/builtin/packages/gtkplus/package.py index 033c325eb6..a1501cb4a9 100644 --- a/var/spack/repos/builtin/packages/gtkplus/package.py +++ b/var/spack/repos/builtin/packages/gtkplus/package.py @@ -36,7 +36,7 @@ class Gtkplus(AutotoolsPackage): variant('X', default=False, description="Enable an X toolkit") - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on("atk") depends_on("gdk-pixbuf") diff --git a/var/spack/repos/builtin/packages/guile/package.py b/var/spack/repos/builtin/packages/guile/package.py index 81b61510be..328f02f005 100644 --- a/var/spack/repos/builtin/packages/guile/package.py +++ b/var/spack/repos/builtin/packages/guile/package.py @@ -45,7 +45,7 @@ class Guile(AutotoolsPackage): depends_on('bdw-gc@7.0:') depends_on('libffi') depends_on('readline', when='+readline') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') build_directory = 'spack-build' diff --git a/var/spack/repos/builtin/packages/harfbuzz/package.py b/var/spack/repos/builtin/packages/harfbuzz/package.py index 492a4694a8..f35f2f853f 100644 --- a/var/spack/repos/builtin/packages/harfbuzz/package.py +++ b/var/spack/repos/builtin/packages/harfbuzz/package.py @@ -33,7 +33,7 @@ class Harfbuzz(AutotoolsPackage): version('1.4.6', '21a78b81cd20cbffdb04b59ac7edfb410e42141869f637ae1d6778e74928d293') version('0.9.37', 'bfe733250e34629a188d82e3b971bc1e') - depends_on("pkg-config", type="build") + depends_on("pkgconfig", type="build") depends_on("glib") depends_on("icu4c") depends_on("freetype") diff --git a/var/spack/repos/builtin/packages/hoomd-blue/package.py b/var/spack/repos/builtin/packages/hoomd-blue/package.py index 547a15ae6b..7a9933424a 100644 --- a/var/spack/repos/builtin/packages/hoomd-blue/package.py +++ b/var/spack/repos/builtin/packages/hoomd-blue/package.py @@ -71,7 +71,7 @@ class HoomdBlue(CMakePackage): depends_on('python@2.7:') depends_on('py-numpy@1.7:', type=('build', 'run')) depends_on('cmake@2.8.0:', type='build') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('mpi', when='+mpi') depends_on('cuda@7.0:', when='+cuda') depends_on('doxygen@1.8.5:', when='+doc', type='build') diff --git a/var/spack/repos/builtin/packages/hpx5/package.py b/var/spack/repos/builtin/packages/hpx5/package.py index dfc112fb24..f489a1bf9f 100644 --- a/var/spack/repos/builtin/packages/hpx5/package.py +++ b/var/spack/repos/builtin/packages/hpx5/package.py @@ -76,7 +76,7 @@ class Hpx5(AutotoolsPackage): depends_on("mpi", when='+photon') depends_on("opencl", when='+opencl') # depends_on("papi") - depends_on("pkg-config", type='build') + depends_on("pkgconfig", type='build') configure_directory = "hpx" build_directory = "spack-build" diff --git a/var/spack/repos/builtin/packages/hwloc/package.py b/var/spack/repos/builtin/packages/hwloc/package.py index 7961d930db..2af1cba322 100644 --- a/var/spack/repos/builtin/packages/hwloc/package.py +++ b/var/spack/repos/builtin/packages/hwloc/package.py @@ -62,7 +62,7 @@ class Hwloc(AutotoolsPackage): depends_on('cuda', when='+cuda') depends_on('libpciaccess', when='+pci') depends_on('libxml2', when='+libxml2') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') def url_for_version(self, version): return "http://www.open-mpi.org/software/hwloc/v%s/downloads/hwloc-%s.tar.gz" % (version.up_to(2), version) diff --git a/var/spack/repos/builtin/packages/iceauth/package.py b/var/spack/repos/builtin/packages/iceauth/package.py index a2f919be54..6f15312ebc 100644 --- a/var/spack/repos/builtin/packages/iceauth/package.py +++ b/var/spack/repos/builtin/packages/iceauth/package.py @@ -38,5 +38,5 @@ class Iceauth(AutotoolsPackage): depends_on('libice') depends_on('xproto@7.0.22:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/icedtea/package.py b/var/spack/repos/builtin/packages/icedtea/package.py index 9bc7da3102..c8c992d0f5 100644 --- a/var/spack/repos/builtin/packages/icedtea/package.py +++ b/var/spack/repos/builtin/packages/icedtea/package.py @@ -42,7 +42,7 @@ class Icedtea(AutotoolsPackage): variant('shenandoah', default=False, description="Build with the shenandoah gc. Only for version 3+") - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('gmake', type='build') depends_on('cups') depends_on('jdk', type='build') diff --git a/var/spack/repos/builtin/packages/ico/package.py b/var/spack/repos/builtin/packages/ico/package.py index 7f627f5921..1e07bfa18c 100644 --- a/var/spack/repos/builtin/packages/ico/package.py +++ b/var/spack/repos/builtin/packages/ico/package.py @@ -39,5 +39,5 @@ class Ico(AutotoolsPackage): depends_on('libx11@0.99.1:') depends_on('xproto@7.0.22:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/imake/package.py b/var/spack/repos/builtin/packages/imake/package.py index f3da05200b..01b8c28d98 100644 --- a/var/spack/repos/builtin/packages/imake/package.py +++ b/var/spack/repos/builtin/packages/imake/package.py @@ -34,4 +34,4 @@ class Imake(AutotoolsPackage): version('1.0.7', '186ca7b8ff0de8752f2a2d0426542363') depends_on('xproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') diff --git a/var/spack/repos/builtin/packages/inputproto/package.py b/var/spack/repos/builtin/packages/inputproto/package.py index f60b08cacf..24ad2d20ab 100644 --- a/var/spack/repos/builtin/packages/inputproto/package.py +++ b/var/spack/repos/builtin/packages/inputproto/package.py @@ -36,5 +36,5 @@ class Inputproto(AutotoolsPackage): version('2.3.2', '6450bad6f8d5ebe354b01b734d1fd7ca') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/intel-gpu-tools/package.py b/var/spack/repos/builtin/packages/intel-gpu-tools/package.py index 5238e57e32..9a96f34450 100644 --- a/var/spack/repos/builtin/packages/intel-gpu-tools/package.py +++ b/var/spack/repos/builtin/packages/intel-gpu-tools/package.py @@ -49,7 +49,7 @@ class IntelGpuTools(AutotoolsPackage): depends_on('flex', type='build') depends_on('bison', type='build') depends_on('python@3:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') # xrandr ? diff --git a/var/spack/repos/builtin/packages/ipopt/package.py b/var/spack/repos/builtin/packages/ipopt/package.py index a9502a3e85..a536442dc3 100644 --- a/var/spack/repos/builtin/packages/ipopt/package.py +++ b/var/spack/repos/builtin/packages/ipopt/package.py @@ -47,7 +47,7 @@ class Ipopt(Package): depends_on("blas") depends_on("lapack") - depends_on("pkg-config", type='build') + depends_on("pkgconfig", type='build') depends_on("mumps+double~mpi") depends_on('coinhsl', when='+coinhsl') depends_on('metis@4.0:4.999', when='+metis') diff --git a/var/spack/repos/builtin/packages/julia/package.py b/var/spack/repos/builtin/packages/julia/package.py index fa6aaf3f95..6382475f97 100644 --- a/var/spack/repos/builtin/packages/julia/package.py +++ b/var/spack/repos/builtin/packages/julia/package.py @@ -66,7 +66,7 @@ class Julia(Package): # Build-time dependencies: # depends_on("awk") depends_on("m4", type="build") - # depends_on("pkg-config") + # depends_on("pkgconfig") # Combined build-time and run-time dependencies: # (Yes, these are run-time dependencies used by Julia's package manager.) diff --git a/var/spack/repos/builtin/packages/kbproto/package.py b/var/spack/repos/builtin/packages/kbproto/package.py index fa210e9101..7f767a8c8b 100644 --- a/var/spack/repos/builtin/packages/kbproto/package.py +++ b/var/spack/repos/builtin/packages/kbproto/package.py @@ -36,5 +36,5 @@ class Kbproto(AutotoolsPackage): version('1.0.7', '19acc5f02ae80381e216f443134e0bbb') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/lbxproxy/package.py b/var/spack/repos/builtin/packages/lbxproxy/package.py index 6b5c4d0bc7..b5b4ef0fd7 100644 --- a/var/spack/repos/builtin/packages/lbxproxy/package.py +++ b/var/spack/repos/builtin/packages/lbxproxy/package.py @@ -48,5 +48,5 @@ class Lbxproxy(AutotoolsPackage): depends_on('xtrans', type='build') depends_on('xproxymanagementprotocol', type='build') depends_on('bigreqsproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libapplewm/package.py b/var/spack/repos/builtin/packages/libapplewm/package.py index 146596081f..49eb23c9f4 100644 --- a/var/spack/repos/builtin/packages/libapplewm/package.py +++ b/var/spack/repos/builtin/packages/libapplewm/package.py @@ -40,7 +40,7 @@ class Libapplewm(AutotoolsPackage): depends_on('xextproto', type='build') depends_on('applewmproto@1.4:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') # Crashes with this error message on Linux: diff --git a/var/spack/repos/builtin/packages/libbeagle/package.py b/var/spack/repos/builtin/packages/libbeagle/package.py index 4d064a063b..68df3093ad 100644 --- a/var/spack/repos/builtin/packages/libbeagle/package.py +++ b/var/spack/repos/builtin/packages/libbeagle/package.py @@ -40,7 +40,7 @@ class Libbeagle(AutotoolsPackage): depends_on('m4', type='build') depends_on('subversion', type='build') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') def url_for_version(self, version): url = "https://github.com/beagle-dev/beagle-lib/archive/beagle_release_{0}.tar.gz" diff --git a/var/spack/repos/builtin/packages/libcanberra/package.py b/var/spack/repos/builtin/packages/libcanberra/package.py index f7b8a78659..58fd706c29 100644 --- a/var/spack/repos/builtin/packages/libcanberra/package.py +++ b/var/spack/repos/builtin/packages/libcanberra/package.py @@ -55,7 +55,7 @@ class Libcanberra(AutotoolsPackage): depends_on('libvorbis') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') def configure_args(self): args = ['--enable-static'] diff --git a/var/spack/repos/builtin/packages/libdmx/package.py b/var/spack/repos/builtin/packages/libdmx/package.py index c89323935f..383d82492b 100644 --- a/var/spack/repos/builtin/packages/libdmx/package.py +++ b/var/spack/repos/builtin/packages/libdmx/package.py @@ -39,5 +39,5 @@ class Libdmx(AutotoolsPackage): depends_on('xextproto', type='build') depends_on('dmxproto@2.2.99.1:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libdrm/package.py b/var/spack/repos/builtin/packages/libdrm/package.py index 521e097dc8..0038ab853c 100644 --- a/var/spack/repos/builtin/packages/libdrm/package.py +++ b/var/spack/repos/builtin/packages/libdrm/package.py @@ -39,7 +39,7 @@ class Libdrm(Package): version('2.4.59', '105ac7af1afcd742d402ca7b4eb168b6') version('2.4.33', '86e4e3debe7087d5404461e0032231c8') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('libpciaccess@0.10:', when=(sys.platform != 'darwin')) depends_on('libpthread-stubs') diff --git a/var/spack/repos/builtin/packages/libemos/package.py b/var/spack/repos/builtin/packages/libemos/package.py index 26febde67c..c14e7e10b7 100644 --- a/var/spack/repos/builtin/packages/libemos/package.py +++ b/var/spack/repos/builtin/packages/libemos/package.py @@ -49,7 +49,7 @@ class Libemos(CMakePackage): depends_on('grib-api', when='grib=grib-api') depends_on('fftw+float+double') depends_on('cmake@2.8.11:', type='build') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') conflicts('grib=eccodes', when='@:4.4.1', msg='Eccodes is supported starting version 4.4.2') diff --git a/var/spack/repos/builtin/packages/libfontenc/package.py b/var/spack/repos/builtin/packages/libfontenc/package.py index c5bc0478b2..e54d02543c 100644 --- a/var/spack/repos/builtin/packages/libfontenc/package.py +++ b/var/spack/repos/builtin/packages/libfontenc/package.py @@ -36,5 +36,5 @@ class Libfontenc(AutotoolsPackage): depends_on('zlib') depends_on('xproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libfs/package.py b/var/spack/repos/builtin/packages/libfs/package.py index 95d5708d2f..a7a6c1f855 100644 --- a/var/spack/repos/builtin/packages/libfs/package.py +++ b/var/spack/repos/builtin/packages/libfs/package.py @@ -39,5 +39,5 @@ class Libfs(AutotoolsPackage): depends_on('xproto@7.0.17:', type='build') depends_on('fontsproto', type='build') depends_on('xtrans', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libgd/package.py b/var/spack/repos/builtin/packages/libgd/package.py index 22eb66d1c3..7a33123884 100644 --- a/var/spack/repos/builtin/packages/libgd/package.py +++ b/var/spack/repos/builtin/packages/libgd/package.py @@ -50,7 +50,7 @@ class Libgd(AutotoolsPackage): depends_on('libtool', type='build') depends_on('m4', type='build') depends_on('gettext', type='build') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('libiconv') depends_on('libpng') diff --git a/var/spack/repos/builtin/packages/libhio/package.py b/var/spack/repos/builtin/packages/libhio/package.py index 3dae8b2b1d..cde2940149 100644 --- a/var/spack/repos/builtin/packages/libhio/package.py +++ b/var/spack/repos/builtin/packages/libhio/package.py @@ -38,4 +38,4 @@ class Libhio(AutotoolsPackage): depends_on("json-c") depends_on("bzip2") - depends_on("pkg-config", type="build") + depends_on("pkgconfig", type="build") diff --git a/var/spack/repos/builtin/packages/libice/package.py b/var/spack/repos/builtin/packages/libice/package.py index 4ffc67ed9c..bb8c222456 100644 --- a/var/spack/repos/builtin/packages/libice/package.py +++ b/var/spack/repos/builtin/packages/libice/package.py @@ -35,5 +35,5 @@ class Libice(AutotoolsPackage): depends_on('xproto', type='build') depends_on('xtrans', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/liblbxutil/package.py b/var/spack/repos/builtin/packages/liblbxutil/package.py index 90be9b3cdd..b202ac97d1 100644 --- a/var/spack/repos/builtin/packages/liblbxutil/package.py +++ b/var/spack/repos/builtin/packages/liblbxutil/package.py @@ -35,7 +35,7 @@ class Liblbxutil(AutotoolsPackage): depends_on('xextproto@7.0.99.1:', type='build') depends_on('xproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') # There is a bug in the library that causes the following messages: diff --git a/var/spack/repos/builtin/packages/liboldx/package.py b/var/spack/repos/builtin/packages/liboldx/package.py index f03e0bfe88..3032f75456 100644 --- a/var/spack/repos/builtin/packages/liboldx/package.py +++ b/var/spack/repos/builtin/packages/liboldx/package.py @@ -35,5 +35,5 @@ class Liboldx(AutotoolsPackage): depends_on('libx11') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libpciaccess/package.py b/var/spack/repos/builtin/packages/libpciaccess/package.py index 7c4efde8ca..7497cf73f0 100644 --- a/var/spack/repos/builtin/packages/libpciaccess/package.py +++ b/var/spack/repos/builtin/packages/libpciaccess/package.py @@ -35,5 +35,5 @@ class Libpciaccess(AutotoolsPackage): version('0.13.4', 'cc1fad87da60682af1d5fa43a5da45a4') depends_on('libtool', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libpipeline/package.py b/var/spack/repos/builtin/packages/libpipeline/package.py index a242862b34..82bcd388c7 100644 --- a/var/spack/repos/builtin/packages/libpipeline/package.py +++ b/var/spack/repos/builtin/packages/libpipeline/package.py @@ -34,7 +34,7 @@ class Libpipeline(AutotoolsPackage): version('1.4.2', '30cec7bcd6fee723adea6a54389f3da2') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') # TODO: Add a 'test' deptype # See https://github.com/spack/spack/issues/1279 # depends_on('check', type='test') diff --git a/var/spack/repos/builtin/packages/libpsl/package.py b/var/spack/repos/builtin/packages/libpsl/package.py index 75722c63fd..f0aa8572c4 100644 --- a/var/spack/repos/builtin/packages/libpsl/package.py +++ b/var/spack/repos/builtin/packages/libpsl/package.py @@ -36,7 +36,7 @@ class Libpsl(AutotoolsPackage): depends_on('icu4c') depends_on('gettext', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('python@2.7:', type='build') depends_on('valgrind~mpi~boost', type='test') diff --git a/var/spack/repos/builtin/packages/libsm/package.py b/var/spack/repos/builtin/packages/libsm/package.py index 602f5daa56..a8937074fb 100644 --- a/var/spack/repos/builtin/packages/libsm/package.py +++ b/var/spack/repos/builtin/packages/libsm/package.py @@ -37,5 +37,5 @@ class Libsm(AutotoolsPackage): depends_on('xproto', type='build') depends_on('xtrans', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libvorbis/package.py b/var/spack/repos/builtin/packages/libvorbis/package.py index 6a3561fb1a..b472f5a886 100644 --- a/var/spack/repos/builtin/packages/libvorbis/package.py +++ b/var/spack/repos/builtin/packages/libvorbis/package.py @@ -38,7 +38,7 @@ class Libvorbis(AutotoolsPackage): depends_on('libogg') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') # `make check` crashes when run in parallel parallel = False diff --git a/var/spack/repos/builtin/packages/libwindowswm/package.py b/var/spack/repos/builtin/packages/libwindowswm/package.py index ffbff1f652..32a7165d54 100644 --- a/var/spack/repos/builtin/packages/libwindowswm/package.py +++ b/var/spack/repos/builtin/packages/libwindowswm/package.py @@ -43,5 +43,5 @@ class Libwindowswm(AutotoolsPackage): depends_on('xextproto', type='build') depends_on('windowswmproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libx11/package.py b/var/spack/repos/builtin/packages/libx11/package.py index 9658fab352..9840c8b634 100644 --- a/var/spack/repos/builtin/packages/libx11/package.py +++ b/var/spack/repos/builtin/packages/libx11/package.py @@ -41,6 +41,6 @@ class Libx11(AutotoolsPackage): depends_on('xtrans', type='build') depends_on('kbproto', type=('build', 'link')) depends_on('inputproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') depends_on('perl', type='build') diff --git a/var/spack/repos/builtin/packages/libxau/package.py b/var/spack/repos/builtin/packages/libxau/package.py index 64f9a3a526..a588bd6ae5 100644 --- a/var/spack/repos/builtin/packages/libxau/package.py +++ b/var/spack/repos/builtin/packages/libxau/package.py @@ -36,5 +36,5 @@ class Libxau(AutotoolsPackage): version('1.0.8', 'a85cd601d82bc79c0daa280917572e20') depends_on('xproto', type=('build', 'link')) - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxaw/package.py b/var/spack/repos/builtin/packages/libxaw/package.py index 7470ce2f72..f1e8b1c25a 100644 --- a/var/spack/repos/builtin/packages/libxaw/package.py +++ b/var/spack/repos/builtin/packages/libxaw/package.py @@ -42,5 +42,5 @@ class Libxaw(AutotoolsPackage): depends_on('xproto', type='build') depends_on('xextproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxaw3d/package.py b/var/spack/repos/builtin/packages/libxaw3d/package.py index 13137d622f..7087604822 100644 --- a/var/spack/repos/builtin/packages/libxaw3d/package.py +++ b/var/spack/repos/builtin/packages/libxaw3d/package.py @@ -40,5 +40,5 @@ class Libxaw3d(AutotoolsPackage): depends_on('libxext') depends_on('libxpm') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxcb/package.py b/var/spack/repos/builtin/packages/libxcb/package.py index cbca3bfd39..7cc1a068d0 100644 --- a/var/spack/repos/builtin/packages/libxcb/package.py +++ b/var/spack/repos/builtin/packages/libxcb/package.py @@ -45,7 +45,7 @@ class Libxcb(AutotoolsPackage): depends_on('xcb-proto', type='build') # TODO: uncomment once build deps can be resolved separately # depends_on('python@2:2.8', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def patch(self): diff --git a/var/spack/repos/builtin/packages/libxcomposite/package.py b/var/spack/repos/builtin/packages/libxcomposite/package.py index b408a08394..840659b337 100644 --- a/var/spack/repos/builtin/packages/libxcomposite/package.py +++ b/var/spack/repos/builtin/packages/libxcomposite/package.py @@ -38,5 +38,5 @@ class Libxcomposite(AutotoolsPackage): depends_on('libxfixes') depends_on('compositeproto@0.4:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxcursor/package.py b/var/spack/repos/builtin/packages/libxcursor/package.py index ec6b4d28f1..b9ec94d06a 100644 --- a/var/spack/repos/builtin/packages/libxcursor/package.py +++ b/var/spack/repos/builtin/packages/libxcursor/package.py @@ -38,5 +38,5 @@ class Libxcursor(AutotoolsPackage): depends_on('libx11') depends_on('fixesproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxdamage/package.py b/var/spack/repos/builtin/packages/libxdamage/package.py index 948e266aba..0a69b62971 100644 --- a/var/spack/repos/builtin/packages/libxdamage/package.py +++ b/var/spack/repos/builtin/packages/libxdamage/package.py @@ -39,5 +39,5 @@ class Libxdamage(AutotoolsPackage): depends_on('damageproto@1.1:', type='build') depends_on('fixesproto', type='build') depends_on('xextproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxdmcp/package.py b/var/spack/repos/builtin/packages/libxdmcp/package.py index 093aa90dd3..fa6368dae4 100644 --- a/var/spack/repos/builtin/packages/libxdmcp/package.py +++ b/var/spack/repos/builtin/packages/libxdmcp/package.py @@ -34,5 +34,5 @@ class Libxdmcp(AutotoolsPackage): version('1.1.2', 'ab0d6a38f0344a05d698ec7d48cfa5a8') depends_on('xproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxevie/package.py b/var/spack/repos/builtin/packages/libxevie/package.py index 0ad59c24ee..e7e5c5aeac 100644 --- a/var/spack/repos/builtin/packages/libxevie/package.py +++ b/var/spack/repos/builtin/packages/libxevie/package.py @@ -39,5 +39,5 @@ class Libxevie(AutotoolsPackage): depends_on('xproto', type='build') depends_on('xextproto', type='build') depends_on('evieext', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxext/package.py b/var/spack/repos/builtin/packages/libxext/package.py index 2ecdad7be5..3ea058b95e 100644 --- a/var/spack/repos/builtin/packages/libxext/package.py +++ b/var/spack/repos/builtin/packages/libxext/package.py @@ -37,5 +37,5 @@ class Libxext(AutotoolsPackage): depends_on('xproto@7.0.13:', type='build') depends_on('xextproto@7.1.99:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxfixes/package.py b/var/spack/repos/builtin/packages/libxfixes/package.py index 5c18e389f1..3c8d10189e 100644 --- a/var/spack/repos/builtin/packages/libxfixes/package.py +++ b/var/spack/repos/builtin/packages/libxfixes/package.py @@ -39,5 +39,5 @@ class Libxfixes(AutotoolsPackage): depends_on('xproto', type='build') depends_on('fixesproto@5.0:', type='build') depends_on('xextproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxfont/package.py b/var/spack/repos/builtin/packages/libxfont/package.py index 4d08c4db71..618c26baa1 100644 --- a/var/spack/repos/builtin/packages/libxfont/package.py +++ b/var/spack/repos/builtin/packages/libxfont/package.py @@ -44,5 +44,5 @@ class Libxfont(AutotoolsPackage): depends_on('xtrans', type='build') depends_on('xproto', type='build') depends_on('fontsproto@2.1.3:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxfont2/package.py b/var/spack/repos/builtin/packages/libxfont2/package.py index b2a6a793cd..e7c943b5c9 100644 --- a/var/spack/repos/builtin/packages/libxfont2/package.py +++ b/var/spack/repos/builtin/packages/libxfont2/package.py @@ -44,5 +44,5 @@ class Libxfont2(AutotoolsPackage): depends_on('xtrans', type='build') depends_on('xproto', type='build') depends_on('fontsproto@2.1.3:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxfontcache/package.py b/var/spack/repos/builtin/packages/libxfontcache/package.py index d113cda057..d93afbb967 100644 --- a/var/spack/repos/builtin/packages/libxfontcache/package.py +++ b/var/spack/repos/builtin/packages/libxfontcache/package.py @@ -38,5 +38,5 @@ class Libxfontcache(AutotoolsPackage): depends_on('xextproto', type='build') depends_on('fontcacheproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxft/package.py b/var/spack/repos/builtin/packages/libxft/package.py index 63f9236302..7cb66d6d9b 100644 --- a/var/spack/repos/builtin/packages/libxft/package.py +++ b/var/spack/repos/builtin/packages/libxft/package.py @@ -42,5 +42,5 @@ class Libxft(AutotoolsPackage): depends_on('libx11') depends_on('libxrender@0.8.2:') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxinerama/package.py b/var/spack/repos/builtin/packages/libxinerama/package.py index 74ec63f266..d66688e66a 100644 --- a/var/spack/repos/builtin/packages/libxinerama/package.py +++ b/var/spack/repos/builtin/packages/libxinerama/package.py @@ -38,5 +38,5 @@ class Libxinerama(AutotoolsPackage): depends_on('xextproto', type='build') depends_on('xineramaproto@1.1.99.1:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxkbfile/package.py b/var/spack/repos/builtin/packages/libxkbfile/package.py index c345a8a362..807039897a 100644 --- a/var/spack/repos/builtin/packages/libxkbfile/package.py +++ b/var/spack/repos/builtin/packages/libxkbfile/package.py @@ -36,5 +36,5 @@ class Libxkbfile(AutotoolsPackage): depends_on('libx11') depends_on('kbproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxkbui/package.py b/var/spack/repos/builtin/packages/libxkbui/package.py index eb34053918..57cf85b6dd 100644 --- a/var/spack/repos/builtin/packages/libxkbui/package.py +++ b/var/spack/repos/builtin/packages/libxkbui/package.py @@ -37,5 +37,5 @@ class Libxkbui(AutotoolsPackage): depends_on('libxt') depends_on('libxkbfile') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxml2/package.py b/var/spack/repos/builtin/packages/libxml2/package.py index 87bbb965b8..4cef51f8b5 100644 --- a/var/spack/repos/builtin/packages/libxml2/package.py +++ b/var/spack/repos/builtin/packages/libxml2/package.py @@ -44,7 +44,7 @@ class Libxml2(AutotoolsPackage): depends_on('zlib') depends_on('xz') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') def configure_args(self): spec = self.spec diff --git a/var/spack/repos/builtin/packages/libxmu/package.py b/var/spack/repos/builtin/packages/libxmu/package.py index bb3f168d6a..9e6f39c408 100644 --- a/var/spack/repos/builtin/packages/libxmu/package.py +++ b/var/spack/repos/builtin/packages/libxmu/package.py @@ -41,5 +41,5 @@ class Libxmu(AutotoolsPackage): depends_on('libx11') depends_on('xextproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxp/package.py b/var/spack/repos/builtin/packages/libxp/package.py index f18d4b89c9..ed5e8e2198 100644 --- a/var/spack/repos/builtin/packages/libxp/package.py +++ b/var/spack/repos/builtin/packages/libxp/package.py @@ -39,5 +39,5 @@ class Libxp(AutotoolsPackage): depends_on('xextproto', type='build') depends_on('printproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxpm/package.py b/var/spack/repos/builtin/packages/libxpm/package.py index 11ede1fe88..6d507a7e84 100644 --- a/var/spack/repos/builtin/packages/libxpm/package.py +++ b/var/spack/repos/builtin/packages/libxpm/package.py @@ -42,7 +42,7 @@ class Libxpm(AutotoolsPackage): depends_on('libx11') depends_on('xproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def setup_environment(self, spack_env, run_env): diff --git a/var/spack/repos/builtin/packages/libxpresent/package.py b/var/spack/repos/builtin/packages/libxpresent/package.py index 286bf89fb8..7e5585eb0d 100644 --- a/var/spack/repos/builtin/packages/libxpresent/package.py +++ b/var/spack/repos/builtin/packages/libxpresent/package.py @@ -39,5 +39,5 @@ class Libxpresent(AutotoolsPackage): depends_on('xproto', type='build') depends_on('presentproto@1.0:', type='build') depends_on('xextproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxprintapputil/package.py b/var/spack/repos/builtin/packages/libxprintapputil/package.py index a6d2838d4d..6715d2a8f5 100644 --- a/var/spack/repos/builtin/packages/libxprintapputil/package.py +++ b/var/spack/repos/builtin/packages/libxprintapputil/package.py @@ -39,5 +39,5 @@ class Libxprintapputil(AutotoolsPackage): depends_on('libxau') depends_on('printproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxprintutil/package.py b/var/spack/repos/builtin/packages/libxprintutil/package.py index 9bd765e1b6..3e795b9140 100644 --- a/var/spack/repos/builtin/packages/libxprintutil/package.py +++ b/var/spack/repos/builtin/packages/libxprintutil/package.py @@ -39,5 +39,5 @@ class Libxprintutil(AutotoolsPackage): depends_on('libxau') depends_on('printproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxrandr/package.py b/var/spack/repos/builtin/packages/libxrandr/package.py index 2ee8f76acb..a7a44028fb 100644 --- a/var/spack/repos/builtin/packages/libxrandr/package.py +++ b/var/spack/repos/builtin/packages/libxrandr/package.py @@ -40,5 +40,5 @@ class Libxrandr(AutotoolsPackage): depends_on('randrproto@1.5:', type='build') depends_on('xextproto', type='build') depends_on('renderproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxrender/package.py b/var/spack/repos/builtin/packages/libxrender/package.py index 49ed107daa..c931530d1c 100644 --- a/var/spack/repos/builtin/packages/libxrender/package.py +++ b/var/spack/repos/builtin/packages/libxrender/package.py @@ -37,5 +37,5 @@ class Libxrender(AutotoolsPackage): depends_on('libx11@1.6:') depends_on('renderproto@0.9:', type=('build', 'link')) - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxres/package.py b/var/spack/repos/builtin/packages/libxres/package.py index eb691f8835..2bf708d4e9 100644 --- a/var/spack/repos/builtin/packages/libxres/package.py +++ b/var/spack/repos/builtin/packages/libxres/package.py @@ -38,5 +38,5 @@ class Libxres(AutotoolsPackage): depends_on('xextproto', type='build') depends_on('resourceproto@1.0:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxscrnsaver/package.py b/var/spack/repos/builtin/packages/libxscrnsaver/package.py index ec68e8d395..9bb6bc1e08 100644 --- a/var/spack/repos/builtin/packages/libxscrnsaver/package.py +++ b/var/spack/repos/builtin/packages/libxscrnsaver/package.py @@ -38,5 +38,5 @@ class Libxscrnsaver(AutotoolsPackage): depends_on('xextproto', type='build') depends_on('scrnsaverproto@1.2:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxshmfence/package.py b/var/spack/repos/builtin/packages/libxshmfence/package.py index fea8c64fdd..6b8e5e2c95 100644 --- a/var/spack/repos/builtin/packages/libxshmfence/package.py +++ b/var/spack/repos/builtin/packages/libxshmfence/package.py @@ -38,5 +38,5 @@ class Libxshmfence(AutotoolsPackage): version('1.2', 'f0b30c0fc568b22ec524859ee28556f1') depends_on('xproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxt/package.py b/var/spack/repos/builtin/packages/libxt/package.py index b3e2ac4e63..4cb68c2cd2 100644 --- a/var/spack/repos/builtin/packages/libxt/package.py +++ b/var/spack/repos/builtin/packages/libxt/package.py @@ -39,5 +39,5 @@ class Libxt(AutotoolsPackage): depends_on('xproto', type='build') depends_on('kbproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxtrap/package.py b/var/spack/repos/builtin/packages/libxtrap/package.py index 83405cf48d..3d6dee29fc 100644 --- a/var/spack/repos/builtin/packages/libxtrap/package.py +++ b/var/spack/repos/builtin/packages/libxtrap/package.py @@ -48,5 +48,5 @@ class Libxtrap(AutotoolsPackage): depends_on('trapproto', type='build') depends_on('xextproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxtst/package.py b/var/spack/repos/builtin/packages/libxtst/package.py index 9b6b4093ba..e79e6a8fb8 100644 --- a/var/spack/repos/builtin/packages/libxtst/package.py +++ b/var/spack/repos/builtin/packages/libxtst/package.py @@ -50,5 +50,5 @@ class Libxtst(AutotoolsPackage): depends_on('xextproto@7.0.99.3:', type='build') depends_on('inputproto', type='build') depends_on('fixesproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxv/package.py b/var/spack/repos/builtin/packages/libxv/package.py index e29ec91b84..7691006e12 100644 --- a/var/spack/repos/builtin/packages/libxv/package.py +++ b/var/spack/repos/builtin/packages/libxv/package.py @@ -39,5 +39,5 @@ class Libxv(AutotoolsPackage): depends_on('xextproto', type='build') depends_on('videoproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxvmc/package.py b/var/spack/repos/builtin/packages/libxvmc/package.py index 42e56618a4..5c6c8f95dd 100644 --- a/var/spack/repos/builtin/packages/libxvmc/package.py +++ b/var/spack/repos/builtin/packages/libxvmc/package.py @@ -39,5 +39,5 @@ class Libxvmc(AutotoolsPackage): depends_on('xextproto', type='build') depends_on('videoproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxxf86dga/package.py b/var/spack/repos/builtin/packages/libxxf86dga/package.py index f92ff7fb63..e2a52e7ee8 100644 --- a/var/spack/repos/builtin/packages/libxxf86dga/package.py +++ b/var/spack/repos/builtin/packages/libxxf86dga/package.py @@ -39,5 +39,5 @@ class Libxxf86dga(AutotoolsPackage): depends_on('xproto', type='build') depends_on('xextproto', type='build') depends_on('xf86dgaproto@2.0.99.2:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxxf86misc/package.py b/var/spack/repos/builtin/packages/libxxf86misc/package.py index 8b161008f8..29aa52eadf 100644 --- a/var/spack/repos/builtin/packages/libxxf86misc/package.py +++ b/var/spack/repos/builtin/packages/libxxf86misc/package.py @@ -39,5 +39,5 @@ class Libxxf86misc(AutotoolsPackage): depends_on('xproto', type='build') depends_on('xextproto', type='build') depends_on('xf86miscproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/libxxf86vm/package.py b/var/spack/repos/builtin/packages/libxxf86vm/package.py index 6b2cf951ed..6045c890aa 100644 --- a/var/spack/repos/builtin/packages/libxxf86vm/package.py +++ b/var/spack/repos/builtin/packages/libxxf86vm/package.py @@ -39,5 +39,5 @@ class Libxxf86vm(AutotoolsPackage): depends_on('xproto', type='build') depends_on('xextproto', type='build') depends_on('xf86vidmodeproto@2.2.99.1:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/listres/package.py b/var/spack/repos/builtin/packages/listres/package.py index 783b4f48d6..0da87ced95 100644 --- a/var/spack/repos/builtin/packages/listres/package.py +++ b/var/spack/repos/builtin/packages/listres/package.py @@ -39,5 +39,5 @@ class Listres(AutotoolsPackage): depends_on('libxmu') depends_on('xproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/lndir/package.py b/var/spack/repos/builtin/packages/lndir/package.py index 071ce420d8..317552527e 100644 --- a/var/spack/repos/builtin/packages/lndir/package.py +++ b/var/spack/repos/builtin/packages/lndir/package.py @@ -35,4 +35,4 @@ class Lndir(AutotoolsPackage): version('1.0.3', '7173b2e4832658d319c2980a7c834205') depends_on('xproto@7.0.17:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') diff --git a/var/spack/repos/builtin/packages/luit/package.py b/var/spack/repos/builtin/packages/luit/package.py index 47eb6be44c..aac3ff00e3 100644 --- a/var/spack/repos/builtin/packages/luit/package.py +++ b/var/spack/repos/builtin/packages/luit/package.py @@ -39,7 +39,7 @@ class Luit(Package): depends_on('libfontenc') depends_on('libx11') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/magics/package.py b/var/spack/repos/builtin/packages/magics/package.py index a3a5c49946..0f4c611b22 100644 --- a/var/spack/repos/builtin/packages/magics/package.py +++ b/var/spack/repos/builtin/packages/magics/package.py @@ -68,7 +68,7 @@ class Magics(CMakePackage): # Build dependencies depends_on('cmake@2.8.11:', type='build') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('python@:2', type='build') depends_on('perl', type='build') depends_on('perl-xml-parser', type='build') diff --git a/var/spack/repos/builtin/packages/makedepend/package.py b/var/spack/repos/builtin/packages/makedepend/package.py index 41edb6ed69..862d18dc5b 100644 --- a/var/spack/repos/builtin/packages/makedepend/package.py +++ b/var/spack/repos/builtin/packages/makedepend/package.py @@ -34,4 +34,4 @@ class Makedepend(AutotoolsPackage): version('1.0.5', 'efb2d7c7e22840947863efaedc175747') depends_on('xproto@7.0.17:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') diff --git a/var/spack/repos/builtin/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py index af8c20ae52..9b91f8f332 100644 --- a/var/spack/repos/builtin/packages/mesa/package.py +++ b/var/spack/repos/builtin/packages/mesa/package.py @@ -54,7 +54,7 @@ class Mesa(AutotoolsPackage): description="Use llvm for rendering pipes.") # General dependencies - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('flex@2.5.35:', type='build') depends_on('bison@2.4.1:', type='build') depends_on('binutils', type='build') diff --git a/var/spack/repos/builtin/packages/mkfontdir/package.py b/var/spack/repos/builtin/packages/mkfontdir/package.py index f1f12b514e..19ec4c3f86 100644 --- a/var/spack/repos/builtin/packages/mkfontdir/package.py +++ b/var/spack/repos/builtin/packages/mkfontdir/package.py @@ -37,5 +37,5 @@ class Mkfontdir(AutotoolsPackage): depends_on('mkfontscale', type='run') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/mkfontscale/package.py b/var/spack/repos/builtin/packages/mkfontscale/package.py index 9e8945f045..02e0bf23c6 100644 --- a/var/spack/repos/builtin/packages/mkfontscale/package.py +++ b/var/spack/repos/builtin/packages/mkfontscale/package.py @@ -38,5 +38,5 @@ class Mkfontscale(AutotoolsPackage): depends_on('freetype') depends_on('xproto@7.0.25:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/mozjs/package.py b/var/spack/repos/builtin/packages/mozjs/package.py index b0e98772af..8343706f93 100644 --- a/var/spack/repos/builtin/packages/mozjs/package.py +++ b/var/spack/repos/builtin/packages/mozjs/package.py @@ -40,7 +40,7 @@ class Mozjs(AutotoolsPackage): url="http://ftp.mozilla.org/pub/js/js185-1.0.0.tar.gz") depends_on('perl@5.6:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('python@2.7.3:2.8', type='build') depends_on('nspr', when='@:27') depends_on('libffi@3.0.9:') diff --git a/var/spack/repos/builtin/packages/nauty/package.py b/var/spack/repos/builtin/packages/nauty/package.py index ef032ad7c9..cf9e40a959 100644 --- a/var/spack/repos/builtin/packages/nauty/package.py +++ b/var/spack/repos/builtin/packages/nauty/package.py @@ -74,7 +74,7 @@ class Nauty(AutotoolsPackage): depends_on('autoconf', type='build', when='@2.6r7') depends_on('automake', type='build', when='@2.6r7') depends_on('libtool', type='build', when='@2.6r7') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('help2man', type='build') depends_on('zlib') depends_on('gmp') diff --git a/var/spack/repos/builtin/packages/ncurses/package.py b/var/spack/repos/builtin/packages/ncurses/package.py index 06ffc0b650..9787568bb6 100644 --- a/var/spack/repos/builtin/packages/ncurses/package.py +++ b/var/spack/repos/builtin/packages/ncurses/package.py @@ -45,7 +45,7 @@ class Ncurses(AutotoolsPackage): variant('symlinks', default=False, description='Enables symlinks. Needed on AFS filesystem.') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') patch('patch_gcc_5.txt', when='@6.0%gcc@5.0:') patch('sed_pgi.patch', when='@:6.0') diff --git a/var/spack/repos/builtin/packages/node-js/package.py b/var/spack/repos/builtin/packages/node-js/package.py index 0b7e942400..1e8deef7d2 100644 --- a/var/spack/repos/builtin/packages/node-js/package.py +++ b/var/spack/repos/builtin/packages/node-js/package.py @@ -46,7 +46,7 @@ class NodeJs(Package): variant('zlib', default=True, description='Build with Spacks zlib instead of the bundled version') depends_on('libtool', type='build', when=sys.platform != 'darwin') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('python@2.7:2.8', type='build') # depends_on('bash-completion', when="+bash-completion") depends_on('icu4c', when='+icu4c') diff --git a/var/spack/repos/builtin/packages/oclock/package.py b/var/spack/repos/builtin/packages/oclock/package.py index 2d3a40457f..d74aff3f73 100644 --- a/var/spack/repos/builtin/packages/oclock/package.py +++ b/var/spack/repos/builtin/packages/oclock/package.py @@ -40,5 +40,5 @@ class Oclock(AutotoolsPackage): depends_on('libxt') depends_on('libxkbfile') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/octave/package.py b/var/spack/repos/builtin/packages/octave/package.py index 79dc74b518..ede501a77d 100644 --- a/var/spack/repos/builtin/packages/octave/package.py +++ b/var/spack/repos/builtin/packages/octave/package.py @@ -76,7 +76,7 @@ class Octave(AutotoolsPackage): # Octave does not configure with sed from darwin: depends_on('sed', when=sys.platform == 'darwin', type='build') depends_on('pcre') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') # Strongly recommended dependencies depends_on('readline', when='+readline') diff --git a/var/spack/repos/builtin/packages/openbabel/package.py b/var/spack/repos/builtin/packages/openbabel/package.py index b88693d531..05e6e0c784 100644 --- a/var/spack/repos/builtin/packages/openbabel/package.py +++ b/var/spack/repos/builtin/packages/openbabel/package.py @@ -42,7 +42,7 @@ class Openbabel(CMakePackage): depends_on('python', type=('build', 'run'), when='+python') depends_on('cmake@2.4.8:', type='build') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('cairo') # required to support PNG depiction depends_on('eigen@3.0:') # required if using the language bindings depends_on('libxml2') # required to read/write CML files, XML formats diff --git a/var/spack/repos/builtin/packages/openexr/package.py b/var/spack/repos/builtin/packages/openexr/package.py index ad463bc792..2d81b9419d 100644 --- a/var/spack/repos/builtin/packages/openexr/package.py +++ b/var/spack/repos/builtin/packages/openexr/package.py @@ -43,7 +43,7 @@ class Openexr(Package): variant('debug', default=False, description='Builds a debug version of the libraries') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('ilmbase') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/pango/package.py b/var/spack/repos/builtin/packages/pango/package.py index 26ba05df6a..c4989063c4 100644 --- a/var/spack/repos/builtin/packages/pango/package.py +++ b/var/spack/repos/builtin/packages/pango/package.py @@ -41,7 +41,7 @@ class Pango(AutotoolsPackage): variant('X', default=False, description="Enable an X toolkit") - depends_on("pkg-config", type="build") + depends_on("pkgconfig", type="build") depends_on("harfbuzz") depends_on("cairo") depends_on("cairo~X", when='~X') diff --git a/var/spack/repos/builtin/packages/pixman/package.py b/var/spack/repos/builtin/packages/pixman/package.py index 4191550803..b81660900d 100644 --- a/var/spack/repos/builtin/packages/pixman/package.py +++ b/var/spack/repos/builtin/packages/pixman/package.py @@ -37,7 +37,7 @@ class Pixman(AutotoolsPackage): version('0.34.0', 'e80ebae4da01e77f68744319f01d52a3') version('0.32.6', '3a30859719a41bd0f5cccffbfefdd4c2') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('libpng') def configure_args(self): diff --git a/var/spack/repos/builtin/packages/pkg-config/package.py b/var/spack/repos/builtin/packages/pkg-config/package.py index 22a8833a11..44e03c7401 100644 --- a/var/spack/repos/builtin/packages/pkg-config/package.py +++ b/var/spack/repos/builtin/packages/pkg-config/package.py @@ -36,6 +36,8 @@ class PkgConfig(AutotoolsPackage): version('0.29.1', 'f739a28cae4e0ca291f82d1d41ef107d') version('0.28', 'aa3c86e67551adc3ac865160e34a2a0d') + provides('pkgconfig') + variant('internal_glib', default=True, description='Builds with internal glib') diff --git a/var/spack/repos/builtin/packages/pkgconf/package.py b/var/spack/repos/builtin/packages/pkgconf/package.py index 7b4b570945..fa1bdf3566 100644 --- a/var/spack/repos/builtin/packages/pkgconf/package.py +++ b/var/spack/repos/builtin/packages/pkgconf/package.py @@ -32,10 +32,13 @@ class Pkgconf(AutotoolsPackage): maintaining compatibility.""" homepage = "http://pkgconf.org/" - url = "https://distfiles.dereferenced.org/pkgconf/pkgconf-1.3.8.tar.xz" + url = "https://distfiles.dereferenced.org/pkgconf/pkgconf-1.3.10.tar.xz" + version('1.3.10', '9b63707bf6f8da6efb3868101d7525fe') version('1.3.8', '484ba3360d983ce07416843d5bc916a8') + provides('pkgconfig') + @run_after('install') def link_pkg_config(self): symlink('pkgconf', '{0}/pkg-config'.format(self.prefix.bin)) diff --git a/var/spack/repos/builtin/packages/pocl/package.py b/var/spack/repos/builtin/packages/pocl/package.py index 38c794062b..c4a7f7ca83 100644 --- a/var/spack/repos/builtin/packages/pocl/package.py +++ b/var/spack/repos/builtin/packages/pocl/package.py @@ -62,7 +62,7 @@ class Pocl(CMakePackage): # enabled by default, and also because they fail to build for us # (see #1616) depends_on("llvm +clang") - depends_on("pkg-config", type="build") + depends_on("pkgconfig", type="build") # These are the supported LLVM versions depends_on("llvm @3.7:3.9", when="@master") diff --git a/var/spack/repos/builtin/packages/presentproto/package.py b/var/spack/repos/builtin/packages/presentproto/package.py index e31490a07c..4b72c9fdef 100644 --- a/var/spack/repos/builtin/packages/presentproto/package.py +++ b/var/spack/repos/builtin/packages/presentproto/package.py @@ -33,5 +33,5 @@ class Presentproto(AutotoolsPackage): version('1.0', '57eaf4bb58e86476ec89cfb42d675961') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/printproto/package.py b/var/spack/repos/builtin/packages/printproto/package.py index c3d0e28e8f..a02d43ec10 100644 --- a/var/spack/repos/builtin/packages/printproto/package.py +++ b/var/spack/repos/builtin/packages/printproto/package.py @@ -34,5 +34,5 @@ class Printproto(AutotoolsPackage): version('1.0.5', '5afeb3a7de8a14b417239a14ea724268') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/proxymngr/package.py b/var/spack/repos/builtin/packages/proxymngr/package.py index cc38d6ae55..7bd539642b 100644 --- a/var/spack/repos/builtin/packages/proxymngr/package.py +++ b/var/spack/repos/builtin/packages/proxymngr/package.py @@ -42,5 +42,5 @@ class Proxymngr(AutotoolsPackage): depends_on('xproto@7.0.17:', type='build') depends_on('xproxymanagementprotocol', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/py-h5py/package.py b/var/spack/repos/builtin/packages/py-h5py/package.py index 3375b762a9..a5c1f6619c 100644 --- a/var/spack/repos/builtin/packages/py-h5py/package.py +++ b/var/spack/repos/builtin/packages/py-h5py/package.py @@ -40,7 +40,7 @@ class PyH5py(PythonPackage): # Build dependencies depends_on('py-cython@0.19:', type='build') - depends_on('py-pkgconfig', type='build') + depends_on('py-pkgconfigig', type='build') depends_on('py-setuptools', type='build') depends_on('hdf5@1.8.4:+hl') depends_on('hdf5+mpi', when='+mpi') diff --git a/var/spack/repos/builtin/packages/py-matplotlib/package.py b/var/spack/repos/builtin/packages/py-matplotlib/package.py index cd9abd2bc1..acdee085bb 100644 --- a/var/spack/repos/builtin/packages/py-matplotlib/package.py +++ b/var/spack/repos/builtin/packages/py-matplotlib/package.py @@ -86,7 +86,7 @@ class PyMatplotlib(PythonPackage): depends_on('image-magick', when='+animation') # --------- Optional dependencies - depends_on('pkg-config', type='build') # why not... + depends_on('pkgconfig', type='build') # why not... depends_on('pil', when='+image', type=('build', 'run')) depends_on('py-ipython', when='+ipython', type=('build', 'run')) depends_on('ghostscript', when='+latex', type='run') diff --git a/var/spack/repos/builtin/packages/py-pkgconfig/package.py b/var/spack/repos/builtin/packages/py-pkgconfig/package.py index eb3be23871..501da31cdd 100644 --- a/var/spack/repos/builtin/packages/py-pkgconfig/package.py +++ b/var/spack/repos/builtin/packages/py-pkgconfig/package.py @@ -36,7 +36,7 @@ class PyPkgconfig(PythonPackage): depends_on('python@2.6:') depends_on('py-setuptools', type='build') - depends_on('pkg-config', type=('build', 'run')) + depends_on('pkgconfig', type=('build', 'run')) # TODO: Add a 'test' deptype # depends_on('py-nose@1.0:', type='test') diff --git a/var/spack/repos/builtin/packages/py-py2cairo/package.py b/var/spack/repos/builtin/packages/py-py2cairo/package.py index 30e363885d..6921d86dd1 100644 --- a/var/spack/repos/builtin/packages/py-py2cairo/package.py +++ b/var/spack/repos/builtin/packages/py-py2cairo/package.py @@ -38,7 +38,7 @@ class PyPy2cairo(WafPackage): depends_on('python', type=('build', 'run')) depends_on('cairo@1.10.0:') depends_on('pixman') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') # TODO: Add a 'test' deptype # depends_on('py-pytest', type='test') diff --git a/var/spack/repos/builtin/packages/randrproto/package.py b/var/spack/repos/builtin/packages/randrproto/package.py index 24f6aaed41..407686421d 100644 --- a/var/spack/repos/builtin/packages/randrproto/package.py +++ b/var/spack/repos/builtin/packages/randrproto/package.py @@ -37,5 +37,5 @@ class Randrproto(AutotoolsPackage): version('1.5.0', '863d6ee3e0b2708f75d968470ed31eb9') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/recordproto/package.py b/var/spack/repos/builtin/packages/recordproto/package.py index dcbc0326e8..0f44b7408b 100644 --- a/var/spack/repos/builtin/packages/recordproto/package.py +++ b/var/spack/repos/builtin/packages/recordproto/package.py @@ -36,5 +36,5 @@ class Recordproto(AutotoolsPackage): version('1.14.2', '868235e1e150e68916d5a316ebc4ccc4') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/rendercheck/package.py b/var/spack/repos/builtin/packages/rendercheck/package.py index 65fcc7a312..3bf4d7915e 100644 --- a/var/spack/repos/builtin/packages/rendercheck/package.py +++ b/var/spack/repos/builtin/packages/rendercheck/package.py @@ -38,5 +38,5 @@ class Rendercheck(AutotoolsPackage): depends_on('libx11') depends_on('xproto@7.0.17:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/renderproto/package.py b/var/spack/repos/builtin/packages/renderproto/package.py index a6c91ab06b..350e9a3a3f 100644 --- a/var/spack/repos/builtin/packages/renderproto/package.py +++ b/var/spack/repos/builtin/packages/renderproto/package.py @@ -36,5 +36,5 @@ class Renderproto(AutotoolsPackage): version('0.11.1', '9b103359123e375bb7760f7dbae3dece') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/resourceproto/package.py b/var/spack/repos/builtin/packages/resourceproto/package.py index 4e58ae7f00..fd1f13a999 100644 --- a/var/spack/repos/builtin/packages/resourceproto/package.py +++ b/var/spack/repos/builtin/packages/resourceproto/package.py @@ -36,5 +36,5 @@ class Resourceproto(AutotoolsPackage): version('1.2.0', '33091d5358ec32dd7562a1aa225a70aa') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index a003d3d5e2..a19ed55a29 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -53,7 +53,7 @@ class Root(CMakePackage): variant('graphviz', default=False, description='Enable graphviz support') depends_on('cmake@3.4.3:', type='build') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('binutils') depends_on('zlib') diff --git a/var/spack/repos/builtin/packages/rr/package.py b/var/spack/repos/builtin/packages/rr/package.py index 245744a6fa..419e92f4bd 100644 --- a/var/spack/repos/builtin/packages/rr/package.py +++ b/var/spack/repos/builtin/packages/rr/package.py @@ -39,7 +39,7 @@ class Rr(CMakePackage): depends_on('zlib') # depends_on('capnproto', when='@4.6:') # not yet in spack # depends_on('libcapnp') # needed for future releases - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('py-pexpect', type='build') # actually tests # rr needs architecture Nehalem and beyond, how can spack diff --git a/var/spack/repos/builtin/packages/rstart/package.py b/var/spack/repos/builtin/packages/rstart/package.py index 2a0cf59e81..01eda5d9a9 100644 --- a/var/spack/repos/builtin/packages/rstart/package.py +++ b/var/spack/repos/builtin/packages/rstart/package.py @@ -39,5 +39,5 @@ class Rstart(AutotoolsPackage): version('1.0.5', '32db3625cb5e841e17d6bc696f21edfb') depends_on('xproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/rtags/package.py b/var/spack/repos/builtin/packages/rtags/package.py index 8e1a962209..b0a5b7487f 100644 --- a/var/spack/repos/builtin/packages/rtags/package.py +++ b/var/spack/repos/builtin/packages/rtags/package.py @@ -38,7 +38,7 @@ class Rtags(CMakePackage): depends_on("openssl") depends_on("lua@5.3:") depends_on("bash-completion") - depends_on("pkg-config", type='build') + depends_on("pkgconfig", type='build') patch("add_string_iterator_erase_compile_check.patch", when='@2.12') diff --git a/var/spack/repos/builtin/packages/scripts/package.py b/var/spack/repos/builtin/packages/scripts/package.py index ddd184b44f..579140fb65 100644 --- a/var/spack/repos/builtin/packages/scripts/package.py +++ b/var/spack/repos/builtin/packages/scripts/package.py @@ -35,5 +35,5 @@ class Scripts(AutotoolsPackage): depends_on('libx11') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/scrnsaverproto/package.py b/var/spack/repos/builtin/packages/scrnsaverproto/package.py index 71fe86abbc..7411a8ae21 100644 --- a/var/spack/repos/builtin/packages/scrnsaverproto/package.py +++ b/var/spack/repos/builtin/packages/scrnsaverproto/package.py @@ -36,5 +36,5 @@ class Scrnsaverproto(AutotoolsPackage): version('1.2.2', '21704f1bad472d94abd22fea5704bb48') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/sessreg/package.py b/var/spack/repos/builtin/packages/sessreg/package.py index af3f001e70..da6805b65c 100644 --- a/var/spack/repos/builtin/packages/sessreg/package.py +++ b/var/spack/repos/builtin/packages/sessreg/package.py @@ -36,7 +36,7 @@ class Sessreg(AutotoolsPackage): version('1.1.0', '5d7eb499043c7fdd8d53c5ba43660312') depends_on('xproto@7.0.25:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def patch(self): diff --git a/var/spack/repos/builtin/packages/setxkbmap/package.py b/var/spack/repos/builtin/packages/setxkbmap/package.py index 5a8a5ea345..d64497c269 100644 --- a/var/spack/repos/builtin/packages/setxkbmap/package.py +++ b/var/spack/repos/builtin/packages/setxkbmap/package.py @@ -38,5 +38,5 @@ class Setxkbmap(AutotoolsPackage): depends_on('libxkbfile') depends_on('libx11') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/shared-mime-info/package.py b/var/spack/repos/builtin/packages/shared-mime-info/package.py index 80880eebc1..d6d9b520ab 100644 --- a/var/spack/repos/builtin/packages/shared-mime-info/package.py +++ b/var/spack/repos/builtin/packages/shared-mime-info/package.py @@ -40,7 +40,7 @@ class SharedMimeInfo(AutotoolsPackage): depends_on('libxml2') depends_on('intltool', type='build') depends_on('gettext', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') def setup_dependent_environment(self, spack_env, run_env, dependent_spec): spack_env.prepend_path("XDG_DATA_DIRS", diff --git a/var/spack/repos/builtin/packages/showfont/package.py b/var/spack/repos/builtin/packages/showfont/package.py index 769c77f076..f18c482925 100644 --- a/var/spack/repos/builtin/packages/showfont/package.py +++ b/var/spack/repos/builtin/packages/showfont/package.py @@ -37,5 +37,5 @@ class Showfont(AutotoolsPackage): depends_on('libfs') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/slurm/package.py b/var/spack/repos/builtin/packages/slurm/package.py index ac0d6f2610..60879b1fe7 100644 --- a/var/spack/repos/builtin/packages/slurm/package.py +++ b/var/spack/repos/builtin/packages/slurm/package.py @@ -64,7 +64,7 @@ class Slurm(AutotoolsPackage): depends_on('lz4') depends_on('munge') depends_on('openssl') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('readline') depends_on('zlib') diff --git a/var/spack/repos/builtin/packages/smproxy/package.py b/var/spack/repos/builtin/packages/smproxy/package.py index 571b25d4b6..8a685c38b5 100644 --- a/var/spack/repos/builtin/packages/smproxy/package.py +++ b/var/spack/repos/builtin/packages/smproxy/package.py @@ -39,5 +39,5 @@ class Smproxy(AutotoolsPackage): depends_on('libxt') depends_on('libxmu') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/the-silver-searcher/package.py b/var/spack/repos/builtin/packages/the-silver-searcher/package.py index 31b269e286..0ca0a246ca 100644 --- a/var/spack/repos/builtin/packages/the-silver-searcher/package.py +++ b/var/spack/repos/builtin/packages/the-silver-searcher/package.py @@ -38,4 +38,4 @@ class TheSilverSearcher(AutotoolsPackage): depends_on('pcre') depends_on('xz') depends_on('zlib') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') diff --git a/var/spack/repos/builtin/packages/transset/package.py b/var/spack/repos/builtin/packages/transset/package.py index 52f83c6edf..aff1273225 100644 --- a/var/spack/repos/builtin/packages/transset/package.py +++ b/var/spack/repos/builtin/packages/transset/package.py @@ -36,5 +36,5 @@ class Transset(AutotoolsPackage): depends_on('libx11') depends_on('xproto@7.0.17:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/twm/package.py b/var/spack/repos/builtin/packages/twm/package.py index b467420c82..adaa2d863e 100644 --- a/var/spack/repos/builtin/packages/twm/package.py +++ b/var/spack/repos/builtin/packages/twm/package.py @@ -46,5 +46,5 @@ class Twm(AutotoolsPackage): depends_on('xproto@7.0.17:', type='build') depends_on('bison', type='build') depends_on('flex', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/videoproto/package.py b/var/spack/repos/builtin/packages/videoproto/package.py index 21a40f98ff..f6fe4c1157 100644 --- a/var/spack/repos/builtin/packages/videoproto/package.py +++ b/var/spack/repos/builtin/packages/videoproto/package.py @@ -36,5 +36,5 @@ class Videoproto(AutotoolsPackage): version('2.3.3', 'd984100603ee2420072f27bb491f4b7d') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/viewres/package.py b/var/spack/repos/builtin/packages/viewres/package.py index 0929dace52..c48b020841 100644 --- a/var/spack/repos/builtin/packages/viewres/package.py +++ b/var/spack/repos/builtin/packages/viewres/package.py @@ -38,5 +38,5 @@ class Viewres(AutotoolsPackage): depends_on('libxmu') depends_on('libxt') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/wget/package.py b/var/spack/repos/builtin/packages/wget/package.py index 03e0c86cf3..70144b3ac1 100644 --- a/var/spack/repos/builtin/packages/wget/package.py +++ b/var/spack/repos/builtin/packages/wget/package.py @@ -60,7 +60,7 @@ class Wget(AutotoolsPackage): depends_on('pcre', when='+pcre') depends_on('perl@5.12.0:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') # TODO: Add a 'test' deptype # depends_on('valgrind', type='test') diff --git a/var/spack/repos/builtin/packages/wx/package.py b/var/spack/repos/builtin/packages/wx/package.py index fc42b5153f..082e608bfc 100644 --- a/var/spack/repos/builtin/packages/wx/package.py +++ b/var/spack/repos/builtin/packages/wx/package.py @@ -44,7 +44,7 @@ class Wx(AutotoolsPackage): version('develop', git='https://github.com/wxWidgets/wxWidgets.git', branch='master') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('gtkplus') @when('@:3.0.2') diff --git a/var/spack/repos/builtin/packages/x11perf/package.py b/var/spack/repos/builtin/packages/x11perf/package.py index b5a2e9344b..2dd9beff29 100644 --- a/var/spack/repos/builtin/packages/x11perf/package.py +++ b/var/spack/repos/builtin/packages/x11perf/package.py @@ -39,5 +39,5 @@ class X11perf(AutotoolsPackage): depends_on('libxft') depends_on('xproto@7.0.17:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xauth/package.py b/var/spack/repos/builtin/packages/xauth/package.py index ac02ba48b9..f0a28b552d 100644 --- a/var/spack/repos/builtin/packages/xauth/package.py +++ b/var/spack/repos/builtin/packages/xauth/package.py @@ -40,7 +40,7 @@ class Xauth(AutotoolsPackage): depends_on('libxmu') depends_on('xproto@7.0.17:') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') # TODO: add package for cmdtest test dependency diff --git a/var/spack/repos/builtin/packages/xbacklight/package.py b/var/spack/repos/builtin/packages/xbacklight/package.py index 2f4057ee80..1e29a9151e 100644 --- a/var/spack/repos/builtin/packages/xbacklight/package.py +++ b/var/spack/repos/builtin/packages/xbacklight/package.py @@ -39,5 +39,5 @@ class Xbacklight(AutotoolsPackage): depends_on('libxcb') depends_on('xcb-util') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xbiff/package.py b/var/spack/repos/builtin/packages/xbiff/package.py index 7d85e59fbf..257b2d6510 100644 --- a/var/spack/repos/builtin/packages/xbiff/package.py +++ b/var/spack/repos/builtin/packages/xbiff/package.py @@ -41,5 +41,5 @@ class Xbiff(AutotoolsPackage): depends_on('libx11') depends_on('xbitmaps', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xbitmaps/package.py b/var/spack/repos/builtin/packages/xbitmaps/package.py index 6282ce7041..30a7c787bc 100644 --- a/var/spack/repos/builtin/packages/xbitmaps/package.py +++ b/var/spack/repos/builtin/packages/xbitmaps/package.py @@ -34,5 +34,5 @@ class Xbitmaps(AutotoolsPackage): version('1.1.1', '288bbe310db67280a9e2e5ebc5602595') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xcalc/package.py b/var/spack/repos/builtin/packages/xcalc/package.py index 5218ecac99..fd29564876 100644 --- a/var/spack/repos/builtin/packages/xcalc/package.py +++ b/var/spack/repos/builtin/packages/xcalc/package.py @@ -39,5 +39,5 @@ class Xcalc(AutotoolsPackage): depends_on('libx11') depends_on('xproto@7.0.17:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xcb-demo/package.py b/var/spack/repos/builtin/packages/xcb-demo/package.py index 7a2c2f65f4..921ee90711 100644 --- a/var/spack/repos/builtin/packages/xcb-demo/package.py +++ b/var/spack/repos/builtin/packages/xcb-demo/package.py @@ -38,7 +38,7 @@ class XcbDemo(AutotoolsPackage): depends_on('xcb-util-image') depends_on('xcb-util-wm') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') # FIXME: crashes with the following error message # X11/XCB/xcb.h: No such file or directory diff --git a/var/spack/repos/builtin/packages/xcb-util-cursor/package.py b/var/spack/repos/builtin/packages/xcb-util-cursor/package.py index 64faa37207..33e616ccd8 100644 --- a/var/spack/repos/builtin/packages/xcb-util-cursor/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-cursor/package.py @@ -42,4 +42,4 @@ class XcbUtilCursor(AutotoolsPackage): depends_on('xcb-util-renderutil') depends_on('xcb-util-image') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') diff --git a/var/spack/repos/builtin/packages/xcb-util-errors/package.py b/var/spack/repos/builtin/packages/xcb-util-errors/package.py index 07aa424ddc..d38272f317 100644 --- a/var/spack/repos/builtin/packages/xcb-util-errors/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-errors/package.py @@ -41,4 +41,4 @@ class XcbUtilErrors(AutotoolsPackage): depends_on('libxcb@1.4:') depends_on('xcb-proto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') diff --git a/var/spack/repos/builtin/packages/xcb-util-image/package.py b/var/spack/repos/builtin/packages/xcb-util-image/package.py index a9f2f2263a..2f051f67cd 100644 --- a/var/spack/repos/builtin/packages/xcb-util-image/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-image/package.py @@ -42,4 +42,4 @@ class XcbUtilImage(AutotoolsPackage): depends_on('xcb-util') depends_on('xproto@7.0.8:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') diff --git a/var/spack/repos/builtin/packages/xcb-util-keysyms/package.py b/var/spack/repos/builtin/packages/xcb-util-keysyms/package.py index 3901624e9a..ae6f7afeb3 100644 --- a/var/spack/repos/builtin/packages/xcb-util-keysyms/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-keysyms/package.py @@ -41,4 +41,4 @@ class XcbUtilKeysyms(AutotoolsPackage): depends_on('libxcb@1.4:') depends_on('xproto@7.0.8:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') diff --git a/var/spack/repos/builtin/packages/xcb-util-renderutil/package.py b/var/spack/repos/builtin/packages/xcb-util-renderutil/package.py index e9a325e83c..dd8760d98f 100644 --- a/var/spack/repos/builtin/packages/xcb-util-renderutil/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-renderutil/package.py @@ -40,4 +40,4 @@ class XcbUtilRenderutil(AutotoolsPackage): depends_on('libxcb@1.4:') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') diff --git a/var/spack/repos/builtin/packages/xcb-util-wm/package.py b/var/spack/repos/builtin/packages/xcb-util-wm/package.py index 5d9a5e3932..bc37618fef 100644 --- a/var/spack/repos/builtin/packages/xcb-util-wm/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-wm/package.py @@ -40,4 +40,4 @@ class XcbUtilWm(AutotoolsPackage): depends_on('libxcb@1.4:') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') diff --git a/var/spack/repos/builtin/packages/xcb-util/package.py b/var/spack/repos/builtin/packages/xcb-util/package.py index c8ac0d40ab..50d8fcc2d9 100644 --- a/var/spack/repos/builtin/packages/xcb-util/package.py +++ b/var/spack/repos/builtin/packages/xcb-util/package.py @@ -40,4 +40,4 @@ class XcbUtil(AutotoolsPackage): depends_on('libxcb@1.4:') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') diff --git a/var/spack/repos/builtin/packages/xclipboard/package.py b/var/spack/repos/builtin/packages/xclipboard/package.py index bad81a9a96..8ce7684640 100644 --- a/var/spack/repos/builtin/packages/xclipboard/package.py +++ b/var/spack/repos/builtin/packages/xclipboard/package.py @@ -43,5 +43,5 @@ class Xclipboard(AutotoolsPackage): depends_on('libxkbfile') depends_on('xproto@7.0.17:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xclock/package.py b/var/spack/repos/builtin/packages/xclock/package.py index 47614e50e1..c9ee8d71c4 100644 --- a/var/spack/repos/builtin/packages/xclock/package.py +++ b/var/spack/repos/builtin/packages/xclock/package.py @@ -44,5 +44,5 @@ class Xclock(AutotoolsPackage): depends_on('libxt') depends_on('xproto@7.0.17:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xcmiscproto/package.py b/var/spack/repos/builtin/packages/xcmiscproto/package.py index 92c1b886a5..f18e8175de 100644 --- a/var/spack/repos/builtin/packages/xcmiscproto/package.py +++ b/var/spack/repos/builtin/packages/xcmiscproto/package.py @@ -36,5 +36,5 @@ class Xcmiscproto(AutotoolsPackage): version('1.2.2', 'ded6cd23fb2800df93ebf2b3f3b01119') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xcmsdb/package.py b/var/spack/repos/builtin/packages/xcmsdb/package.py index b59a254262..623f8a1241 100644 --- a/var/spack/repos/builtin/packages/xcmsdb/package.py +++ b/var/spack/repos/builtin/packages/xcmsdb/package.py @@ -38,5 +38,5 @@ class Xcmsdb(AutotoolsPackage): depends_on('libx11') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xcompmgr/package.py b/var/spack/repos/builtin/packages/xcompmgr/package.py index dc8aa398b1..9de6cb38d3 100644 --- a/var/spack/repos/builtin/packages/xcompmgr/package.py +++ b/var/spack/repos/builtin/packages/xcompmgr/package.py @@ -41,5 +41,5 @@ class Xcompmgr(AutotoolsPackage): depends_on('libxrender') depends_on('libxext') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xconsole/package.py b/var/spack/repos/builtin/packages/xconsole/package.py index 2c130091d3..f04a10fb8d 100644 --- a/var/spack/repos/builtin/packages/xconsole/package.py +++ b/var/spack/repos/builtin/packages/xconsole/package.py @@ -40,5 +40,5 @@ class Xconsole(AutotoolsPackage): depends_on('libx11') depends_on('xproto@7.0.17:') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xcursor-themes/package.py b/var/spack/repos/builtin/packages/xcursor-themes/package.py index 112d63c274..abda96d3d4 100644 --- a/var/spack/repos/builtin/packages/xcursor-themes/package.py +++ b/var/spack/repos/builtin/packages/xcursor-themes/package.py @@ -38,7 +38,7 @@ class XcursorThemes(Package): depends_on('libxcursor') depends_on('xcursorgen', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/xcursorgen/package.py b/var/spack/repos/builtin/packages/xcursorgen/package.py index c2b808b0af..de34fbcf33 100644 --- a/var/spack/repos/builtin/packages/xcursorgen/package.py +++ b/var/spack/repos/builtin/packages/xcursorgen/package.py @@ -37,5 +37,5 @@ class Xcursorgen(AutotoolsPackage): depends_on('libxcursor') depends_on('libpng@1.2.0:') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xdbedizzy/package.py b/var/spack/repos/builtin/packages/xdbedizzy/package.py index 9e21e54ca6..7afa4dc7ba 100644 --- a/var/spack/repos/builtin/packages/xdbedizzy/package.py +++ b/var/spack/repos/builtin/packages/xdbedizzy/package.py @@ -37,5 +37,5 @@ class Xdbedizzy(AutotoolsPackage): depends_on('libx11') depends_on('libxext') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xditview/package.py b/var/spack/repos/builtin/packages/xditview/package.py index 5111de58af..d11f01e3eb 100644 --- a/var/spack/repos/builtin/packages/xditview/package.py +++ b/var/spack/repos/builtin/packages/xditview/package.py @@ -38,5 +38,5 @@ class Xditview(AutotoolsPackage): depends_on('libxt') depends_on('libx11') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xdm/package.py b/var/spack/repos/builtin/packages/xdm/package.py index 8f1b544f6d..4804e47288 100644 --- a/var/spack/repos/builtin/packages/xdm/package.py +++ b/var/spack/repos/builtin/packages/xdm/package.py @@ -44,5 +44,5 @@ class Xdm(AutotoolsPackage): depends_on('libxt') depends_on('libxext') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xdpyinfo/package.py b/var/spack/repos/builtin/packages/xdpyinfo/package.py index ab5935b474..969d1b9762 100644 --- a/var/spack/repos/builtin/packages/xdpyinfo/package.py +++ b/var/spack/repos/builtin/packages/xdpyinfo/package.py @@ -47,5 +47,5 @@ class Xdpyinfo(AutotoolsPackage): depends_on('recordproto', type='build') depends_on('inputproto', type='build') depends_on('fixesproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xdriinfo/package.py b/var/spack/repos/builtin/packages/xdriinfo/package.py index 86645072c0..50245b444a 100644 --- a/var/spack/repos/builtin/packages/xdriinfo/package.py +++ b/var/spack/repos/builtin/packages/xdriinfo/package.py @@ -42,5 +42,5 @@ class Xdriinfo(AutotoolsPackage): depends_on('pcre') depends_on('glproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xedit/package.py b/var/spack/repos/builtin/packages/xedit/package.py index 752fbf61d5..77d7609313 100644 --- a/var/spack/repos/builtin/packages/xedit/package.py +++ b/var/spack/repos/builtin/packages/xedit/package.py @@ -38,5 +38,5 @@ class Xedit(AutotoolsPackage): depends_on('libxt@1.0:') depends_on('libx11') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xev/package.py b/var/spack/repos/builtin/packages/xev/package.py index fbccb0e103..06bac3a08a 100644 --- a/var/spack/repos/builtin/packages/xev/package.py +++ b/var/spack/repos/builtin/packages/xev/package.py @@ -43,5 +43,5 @@ class Xev(AutotoolsPackage): depends_on('libx11') depends_on('xproto@7.0.17:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xextproto/package.py b/var/spack/repos/builtin/packages/xextproto/package.py index d02c1935c2..4c6b03390c 100644 --- a/var/spack/repos/builtin/packages/xextproto/package.py +++ b/var/spack/repos/builtin/packages/xextproto/package.py @@ -33,7 +33,7 @@ class Xextproto(AutotoolsPackage): version('7.3.0', '37b700baa8c8ea7964702d948dd13821') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') parallel = False diff --git a/var/spack/repos/builtin/packages/xeyes/package.py b/var/spack/repos/builtin/packages/xeyes/package.py index 232f46212b..dc287c7e74 100644 --- a/var/spack/repos/builtin/packages/xeyes/package.py +++ b/var/spack/repos/builtin/packages/xeyes/package.py @@ -39,5 +39,5 @@ class Xeyes(AutotoolsPackage): depends_on('libxmu') depends_on('libxrender@0.4:') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xf86dga/package.py b/var/spack/repos/builtin/packages/xf86dga/package.py index 3768fced15..882ac79e70 100644 --- a/var/spack/repos/builtin/packages/xf86dga/package.py +++ b/var/spack/repos/builtin/packages/xf86dga/package.py @@ -36,5 +36,5 @@ class Xf86dga(AutotoolsPackage): depends_on('libx11') depends_on('libxxf86dga@1.1:') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xf86driproto/package.py b/var/spack/repos/builtin/packages/xf86driproto/package.py index 4877440649..b71d709bd5 100644 --- a/var/spack/repos/builtin/packages/xf86driproto/package.py +++ b/var/spack/repos/builtin/packages/xf86driproto/package.py @@ -37,5 +37,5 @@ class Xf86driproto(AutotoolsPackage): version('2.1.1', '3ba16a48d8d9f9f746f9bd281ba8fb3f') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xf86vidmodeproto/package.py b/var/spack/repos/builtin/packages/xf86vidmodeproto/package.py index f8ce028474..1f6a4f36c9 100644 --- a/var/spack/repos/builtin/packages/xf86vidmodeproto/package.py +++ b/var/spack/repos/builtin/packages/xf86vidmodeproto/package.py @@ -36,5 +36,5 @@ class Xf86vidmodeproto(AutotoolsPackage): version('2.3.1', '99016d0fe355bae0bb23ce00fb4d4a2c') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xfd/package.py b/var/spack/repos/builtin/packages/xfd/package.py index 024f8ce141..3ba1d3313a 100644 --- a/var/spack/repos/builtin/packages/xfd/package.py +++ b/var/spack/repos/builtin/packages/xfd/package.py @@ -42,5 +42,5 @@ class Xfd(AutotoolsPackage): depends_on('libxt') depends_on('xproto@7.0.17:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xfindproxy/package.py b/var/spack/repos/builtin/packages/xfindproxy/package.py index fc12753133..e0d9ffbc4c 100644 --- a/var/spack/repos/builtin/packages/xfindproxy/package.py +++ b/var/spack/repos/builtin/packages/xfindproxy/package.py @@ -43,5 +43,5 @@ class Xfindproxy(AutotoolsPackage): depends_on('xproto', type='build') depends_on('xproxymanagementprotocol', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xfontsel/package.py b/var/spack/repos/builtin/packages/xfontsel/package.py index 2a615216d5..c575b81b00 100644 --- a/var/spack/repos/builtin/packages/xfontsel/package.py +++ b/var/spack/repos/builtin/packages/xfontsel/package.py @@ -40,5 +40,5 @@ class Xfontsel(AutotoolsPackage): depends_on('libxt') depends_on('libx11') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xfs/package.py b/var/spack/repos/builtin/packages/xfs/package.py index 6846c320e2..8204d58e9f 100644 --- a/var/spack/repos/builtin/packages/xfs/package.py +++ b/var/spack/repos/builtin/packages/xfs/package.py @@ -39,5 +39,5 @@ class Xfs(AutotoolsPackage): depends_on('xproto@7.0.17:', type='build') depends_on('fontsproto', type='build') depends_on('xtrans', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xfsinfo/package.py b/var/spack/repos/builtin/packages/xfsinfo/package.py index 8f8ec13247..54fec32ba8 100644 --- a/var/spack/repos/builtin/packages/xfsinfo/package.py +++ b/var/spack/repos/builtin/packages/xfsinfo/package.py @@ -40,5 +40,5 @@ class Xfsinfo(AutotoolsPackage): depends_on('libfs') depends_on('xproto@7.0.17:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xfwp/package.py b/var/spack/repos/builtin/packages/xfwp/package.py index b0c8fa9158..1d9cb0d1b4 100644 --- a/var/spack/repos/builtin/packages/xfwp/package.py +++ b/var/spack/repos/builtin/packages/xfwp/package.py @@ -37,7 +37,7 @@ class Xfwp(AutotoolsPackage): depends_on('xproto', type='build') depends_on('xproxymanagementprotocol', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') # FIXME: fails with the error message: diff --git a/var/spack/repos/builtin/packages/xgamma/package.py b/var/spack/repos/builtin/packages/xgamma/package.py index b417a47c1c..1d114e170b 100644 --- a/var/spack/repos/builtin/packages/xgamma/package.py +++ b/var/spack/repos/builtin/packages/xgamma/package.py @@ -38,5 +38,5 @@ class Xgamma(AutotoolsPackage): depends_on('libxxf86vm') depends_on('xproto@7.0.17:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xgc/package.py b/var/spack/repos/builtin/packages/xgc/package.py index 0b507332da..24b9143da8 100644 --- a/var/spack/repos/builtin/packages/xgc/package.py +++ b/var/spack/repos/builtin/packages/xgc/package.py @@ -39,5 +39,5 @@ class Xgc(AutotoolsPackage): depends_on('flex', type='build') depends_on('bison', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xhost/package.py b/var/spack/repos/builtin/packages/xhost/package.py index 072a5a29b1..ff7f72fb4c 100644 --- a/var/spack/repos/builtin/packages/xhost/package.py +++ b/var/spack/repos/builtin/packages/xhost/package.py @@ -39,5 +39,5 @@ class Xhost(AutotoolsPackage): depends_on('libxau') depends_on('xproto@7.0.22:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xineramaproto/package.py b/var/spack/repos/builtin/packages/xineramaproto/package.py index b05e26254b..027f2b00de 100644 --- a/var/spack/repos/builtin/packages/xineramaproto/package.py +++ b/var/spack/repos/builtin/packages/xineramaproto/package.py @@ -36,5 +36,5 @@ class Xineramaproto(AutotoolsPackage): version('1.2.1', 'e0e148b11739e144a546b8a051b17dde') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xinit/package.py b/var/spack/repos/builtin/packages/xinit/package.py index 03487e44a2..b3586a6367 100644 --- a/var/spack/repos/builtin/packages/xinit/package.py +++ b/var/spack/repos/builtin/packages/xinit/package.py @@ -38,5 +38,5 @@ class Xinit(AutotoolsPackage): depends_on('libx11') depends_on('xproto@7.0.17:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xinput/package.py b/var/spack/repos/builtin/packages/xinput/package.py index 2a441d545d..2438750be3 100644 --- a/var/spack/repos/builtin/packages/xinput/package.py +++ b/var/spack/repos/builtin/packages/xinput/package.py @@ -43,5 +43,5 @@ class Xinput(AutotoolsPackage): depends_on('fixesproto', type='build') depends_on('randrproto', type='build') depends_on('xineramaproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xkbcomp/package.py b/var/spack/repos/builtin/packages/xkbcomp/package.py index 2385bb75e9..119b2cc740 100644 --- a/var/spack/repos/builtin/packages/xkbcomp/package.py +++ b/var/spack/repos/builtin/packages/xkbcomp/package.py @@ -43,5 +43,5 @@ class Xkbcomp(AutotoolsPackage): depends_on('xproto@7.0.17:', type='build') depends_on('bison', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xkbevd/package.py b/var/spack/repos/builtin/packages/xkbevd/package.py index 8ca91494b1..3d0339d2b1 100644 --- a/var/spack/repos/builtin/packages/xkbevd/package.py +++ b/var/spack/repos/builtin/packages/xkbevd/package.py @@ -37,5 +37,5 @@ class Xkbevd(AutotoolsPackage): depends_on('libx11') depends_on('bison', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xkbprint/package.py b/var/spack/repos/builtin/packages/xkbprint/package.py index 8d5205843f..5f87e6b32a 100644 --- a/var/spack/repos/builtin/packages/xkbprint/package.py +++ b/var/spack/repos/builtin/packages/xkbprint/package.py @@ -38,5 +38,5 @@ class Xkbprint(AutotoolsPackage): depends_on('libx11') depends_on('xproto@7.0.17:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xkbutils/package.py b/var/spack/repos/builtin/packages/xkbutils/package.py index c4f604407a..f129c7992b 100644 --- a/var/spack/repos/builtin/packages/xkbutils/package.py +++ b/var/spack/repos/builtin/packages/xkbutils/package.py @@ -40,5 +40,5 @@ class Xkbutils(AutotoolsPackage): depends_on('xproto@7.0.17:', type='build') depends_on('inputproto', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xkeyboard-config/package.py b/var/spack/repos/builtin/packages/xkeyboard-config/package.py index 5995a7eae7..b324cee133 100644 --- a/var/spack/repos/builtin/packages/xkeyboard-config/package.py +++ b/var/spack/repos/builtin/packages/xkeyboard-config/package.py @@ -38,7 +38,7 @@ class XkeyboardConfig(AutotoolsPackage): depends_on('libx11@1.4.3:') depends_on('libxslt', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('intltool@0.30:', type='build') depends_on('xproto@7.0.20:', type='build') diff --git a/var/spack/repos/builtin/packages/xkill/package.py b/var/spack/repos/builtin/packages/xkill/package.py index 37ee488071..5b25a1c0e0 100644 --- a/var/spack/repos/builtin/packages/xkill/package.py +++ b/var/spack/repos/builtin/packages/xkill/package.py @@ -39,5 +39,5 @@ class Xkill(AutotoolsPackage): depends_on('libxmu') depends_on('xproto@7.0.22:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xload/package.py b/var/spack/repos/builtin/packages/xload/package.py index cda2ab21a7..e4bb88b7f2 100644 --- a/var/spack/repos/builtin/packages/xload/package.py +++ b/var/spack/repos/builtin/packages/xload/package.py @@ -40,5 +40,5 @@ class Xload(AutotoolsPackage): depends_on('libx11') depends_on('xproto@7.0.17:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xlogo/package.py b/var/spack/repos/builtin/packages/xlogo/package.py index aca6a47df8..66f55481e5 100644 --- a/var/spack/repos/builtin/packages/xlogo/package.py +++ b/var/spack/repos/builtin/packages/xlogo/package.py @@ -43,5 +43,5 @@ class Xlogo(AutotoolsPackage): depends_on('libxrender') depends_on('libxt') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xlsatoms/package.py b/var/spack/repos/builtin/packages/xlsatoms/package.py index b85fac8660..1856a27890 100644 --- a/var/spack/repos/builtin/packages/xlsatoms/package.py +++ b/var/spack/repos/builtin/packages/xlsatoms/package.py @@ -36,5 +36,5 @@ class Xlsatoms(AutotoolsPackage): depends_on('libxcb', when='@1.1:') depends_on('libx11', when='@:1.0') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xlsclients/package.py b/var/spack/repos/builtin/packages/xlsclients/package.py index 6deb2c88e8..7330238af7 100644 --- a/var/spack/repos/builtin/packages/xlsclients/package.py +++ b/var/spack/repos/builtin/packages/xlsclients/package.py @@ -37,5 +37,5 @@ class Xlsclients(AutotoolsPackage): depends_on('libxcb@1.6:', when='@1.1:') depends_on('libx11', when='@:1.0') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xlsfonts/package.py b/var/spack/repos/builtin/packages/xlsfonts/package.py index 15761e2d9f..15a0a5a620 100644 --- a/var/spack/repos/builtin/packages/xlsfonts/package.py +++ b/var/spack/repos/builtin/packages/xlsfonts/package.py @@ -37,5 +37,5 @@ class Xlsfonts(AutotoolsPackage): depends_on('libx11') depends_on('xproto@7.0.17:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xmag/package.py b/var/spack/repos/builtin/packages/xmag/package.py index 5a8ae6e961..1ca15ded60 100644 --- a/var/spack/repos/builtin/packages/xmag/package.py +++ b/var/spack/repos/builtin/packages/xmag/package.py @@ -38,5 +38,5 @@ class Xmag(AutotoolsPackage): depends_on('libxt') depends_on('libx11') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xman/package.py b/var/spack/repos/builtin/packages/xman/package.py index df11504f69..f24d9f0eb0 100644 --- a/var/spack/repos/builtin/packages/xman/package.py +++ b/var/spack/repos/builtin/packages/xman/package.py @@ -38,5 +38,5 @@ class Xman(AutotoolsPackage): depends_on('libxt') depends_on('xproto@7.0.17:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xmessage/package.py b/var/spack/repos/builtin/packages/xmessage/package.py index dee5d86e21..54becc288f 100644 --- a/var/spack/repos/builtin/packages/xmessage/package.py +++ b/var/spack/repos/builtin/packages/xmessage/package.py @@ -38,5 +38,5 @@ class Xmessage(AutotoolsPackage): depends_on('libxaw') depends_on('libxt') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xmh/package.py b/var/spack/repos/builtin/packages/xmh/package.py index 65873360c2..7924db060c 100644 --- a/var/spack/repos/builtin/packages/xmh/package.py +++ b/var/spack/repos/builtin/packages/xmh/package.py @@ -41,5 +41,5 @@ class Xmh(AutotoolsPackage): depends_on('libx11') depends_on('xbitmaps@1.1.0:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xmodmap/package.py b/var/spack/repos/builtin/packages/xmodmap/package.py index 62582df6f2..66608fc353 100644 --- a/var/spack/repos/builtin/packages/xmodmap/package.py +++ b/var/spack/repos/builtin/packages/xmodmap/package.py @@ -40,5 +40,5 @@ class Xmodmap(AutotoolsPackage): depends_on('libx11') depends_on('xproto@7.0.25:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xmore/package.py b/var/spack/repos/builtin/packages/xmore/package.py index 0b76828999..56aaa83929 100644 --- a/var/spack/repos/builtin/packages/xmore/package.py +++ b/var/spack/repos/builtin/packages/xmore/package.py @@ -36,5 +36,5 @@ class Xmore(AutotoolsPackage): depends_on('libxaw') depends_on('libxt') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xorg-cf-files/package.py b/var/spack/repos/builtin/packages/xorg-cf-files/package.py index edeba12f0e..3c0abedce5 100644 --- a/var/spack/repos/builtin/packages/xorg-cf-files/package.py +++ b/var/spack/repos/builtin/packages/xorg-cf-files/package.py @@ -36,4 +36,4 @@ class XorgCfFiles(AutotoolsPackage): version('1.0.6', 'c0ce98377c70d95fb48e1bd856109bf8') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') diff --git a/var/spack/repos/builtin/packages/xorg-docs/package.py b/var/spack/repos/builtin/packages/xorg-docs/package.py index bb67538f0a..614d39da3d 100644 --- a/var/spack/repos/builtin/packages/xorg-docs/package.py +++ b/var/spack/repos/builtin/packages/xorg-docs/package.py @@ -36,7 +36,7 @@ class XorgDocs(AutotoolsPackage): version('1.7.1', 'ca689ccbf8ebc362afbe5cc5792a4abd') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') depends_on('xorg-sgml-doctools@1.8:', type='build') depends_on('xmlto', type='build') diff --git a/var/spack/repos/builtin/packages/xorg-gtest/package.py b/var/spack/repos/builtin/packages/xorg-gtest/package.py index 594ba2a3bd..914cd54e46 100644 --- a/var/spack/repos/builtin/packages/xorg-gtest/package.py +++ b/var/spack/repos/builtin/packages/xorg-gtest/package.py @@ -38,7 +38,7 @@ class XorgGtest(AutotoolsPackage): depends_on('libxi') depends_on('xorg-server') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') # TODO: may be missing evemu package? diff --git a/var/spack/repos/builtin/packages/xorg-server/package.py b/var/spack/repos/builtin/packages/xorg-server/package.py index 6b616bfe43..0b3994943d 100644 --- a/var/spack/repos/builtin/packages/xorg-server/package.py +++ b/var/spack/repos/builtin/packages/xorg-server/package.py @@ -47,7 +47,7 @@ class XorgServer(AutotoolsPackage): depends_on('flex', type='build') depends_on('bison', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') # TODO: add missing dependencies diff --git a/var/spack/repos/builtin/packages/xorg-sgml-doctools/package.py b/var/spack/repos/builtin/packages/xorg-sgml-doctools/package.py index 1adc06dc41..86e462ab42 100644 --- a/var/spack/repos/builtin/packages/xorg-sgml-doctools/package.py +++ b/var/spack/repos/builtin/packages/xorg-sgml-doctools/package.py @@ -35,5 +35,5 @@ class XorgSgmlDoctools(AutotoolsPackage): version('1.11', '51cf4c6b476e2b98a068fea6975b9b21') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xphelloworld/package.py b/var/spack/repos/builtin/packages/xphelloworld/package.py index 10f9be36df..0697553a68 100644 --- a/var/spack/repos/builtin/packages/xphelloworld/package.py +++ b/var/spack/repos/builtin/packages/xphelloworld/package.py @@ -44,5 +44,5 @@ class Xphelloworld(AutotoolsPackage): # It looks like xprint support was removed from libxaw at some point. # But even the oldest version of libxaw doesn't build libxaw8. - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xplsprinters/package.py b/var/spack/repos/builtin/packages/xplsprinters/package.py index 0757de82ba..581a875c8b 100644 --- a/var/spack/repos/builtin/packages/xplsprinters/package.py +++ b/var/spack/repos/builtin/packages/xplsprinters/package.py @@ -37,5 +37,5 @@ class Xplsprinters(AutotoolsPackage): depends_on('libxprintutil') depends_on('libx11') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xpr/package.py b/var/spack/repos/builtin/packages/xpr/package.py index 5d246e957a..e826713961 100644 --- a/var/spack/repos/builtin/packages/xpr/package.py +++ b/var/spack/repos/builtin/packages/xpr/package.py @@ -38,5 +38,5 @@ class Xpr(AutotoolsPackage): depends_on('libx11') depends_on('xproto@7.0.17:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xprehashprinterlist/package.py b/var/spack/repos/builtin/packages/xprehashprinterlist/package.py index 65701b180f..94414a48de 100644 --- a/var/spack/repos/builtin/packages/xprehashprinterlist/package.py +++ b/var/spack/repos/builtin/packages/xprehashprinterlist/package.py @@ -36,5 +36,5 @@ class Xprehashprinterlist(AutotoolsPackage): depends_on('libxp') depends_on('libx11') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xprop/package.py b/var/spack/repos/builtin/packages/xprop/package.py index 359ed6d6f1..1bf5331964 100644 --- a/var/spack/repos/builtin/packages/xprop/package.py +++ b/var/spack/repos/builtin/packages/xprop/package.py @@ -37,5 +37,5 @@ class Xprop(AutotoolsPackage): depends_on('libx11') depends_on('xproto@7.0.17:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xproto/package.py b/var/spack/repos/builtin/packages/xproto/package.py index 2396e2966f..5414b11c56 100644 --- a/var/spack/repos/builtin/packages/xproto/package.py +++ b/var/spack/repos/builtin/packages/xproto/package.py @@ -41,7 +41,7 @@ class Xproto(AutotoolsPackage): version('7.0.31', '04b925bf9e472c80f9212615cd684f1e') version('7.0.29', '16a78dd2c5ad73011105c96235f6a0af') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/xrandr/package.py b/var/spack/repos/builtin/packages/xrandr/package.py index 4aeb34d020..cb59ad7355 100644 --- a/var/spack/repos/builtin/packages/xrandr/package.py +++ b/var/spack/repos/builtin/packages/xrandr/package.py @@ -39,5 +39,5 @@ class Xrandr(AutotoolsPackage): depends_on('libx11') depends_on('xproto@7.0.17:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xrdb/package.py b/var/spack/repos/builtin/packages/xrdb/package.py index 075e04e9dc..c2de7822d2 100644 --- a/var/spack/repos/builtin/packages/xrdb/package.py +++ b/var/spack/repos/builtin/packages/xrdb/package.py @@ -37,5 +37,5 @@ class Xrdb(AutotoolsPackage): depends_on('libx11') depends_on('xproto@7.0.17:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xrefresh/package.py b/var/spack/repos/builtin/packages/xrefresh/package.py index 76a094779e..c1e6d8e96a 100644 --- a/var/spack/repos/builtin/packages/xrefresh/package.py +++ b/var/spack/repos/builtin/packages/xrefresh/package.py @@ -36,5 +36,5 @@ class Xrefresh(AutotoolsPackage): depends_on('libx11') depends_on('xproto@7.0.17:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xrx/package.py b/var/spack/repos/builtin/packages/xrx/package.py index fba6a88df1..2aae39beac 100644 --- a/var/spack/repos/builtin/packages/xrx/package.py +++ b/var/spack/repos/builtin/packages/xrx/package.py @@ -47,5 +47,5 @@ class Xrx(AutotoolsPackage): depends_on('xtrans', type='build') depends_on('xproxymanagementprotocol', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xscope/package.py b/var/spack/repos/builtin/packages/xscope/package.py index c851fcf5f3..d00f970185 100644 --- a/var/spack/repos/builtin/packages/xscope/package.py +++ b/var/spack/repos/builtin/packages/xscope/package.py @@ -35,5 +35,5 @@ class Xscope(AutotoolsPackage): depends_on('xproto@7.0.17:', type='build') depends_on('xtrans', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xset/package.py b/var/spack/repos/builtin/packages/xset/package.py index 8488ded70c..8a349afb00 100644 --- a/var/spack/repos/builtin/packages/xset/package.py +++ b/var/spack/repos/builtin/packages/xset/package.py @@ -37,5 +37,5 @@ class Xset(AutotoolsPackage): depends_on('libx11') depends_on('xproto@7.0.17:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xsetmode/package.py b/var/spack/repos/builtin/packages/xsetmode/package.py index e4d9b1a6a0..57cc644a7c 100644 --- a/var/spack/repos/builtin/packages/xsetmode/package.py +++ b/var/spack/repos/builtin/packages/xsetmode/package.py @@ -36,5 +36,5 @@ class Xsetmode(AutotoolsPackage): depends_on('libxi') depends_on('libx11') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xsetpointer/package.py b/var/spack/repos/builtin/packages/xsetpointer/package.py index 296dae801b..672a172c86 100644 --- a/var/spack/repos/builtin/packages/xsetpointer/package.py +++ b/var/spack/repos/builtin/packages/xsetpointer/package.py @@ -37,5 +37,5 @@ class Xsetpointer(AutotoolsPackage): depends_on('libx11') depends_on('inputproto@1.4:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xsetroot/package.py b/var/spack/repos/builtin/packages/xsetroot/package.py index 1468aa7e2e..428294dbce 100644 --- a/var/spack/repos/builtin/packages/xsetroot/package.py +++ b/var/spack/repos/builtin/packages/xsetroot/package.py @@ -39,5 +39,5 @@ class Xsetroot(AutotoolsPackage): depends_on('xbitmaps', type='build') depends_on('xproto@7.0.17:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xsm/package.py b/var/spack/repos/builtin/packages/xsm/package.py index 0bbd3ec805..c35213ee7e 100644 --- a/var/spack/repos/builtin/packages/xsm/package.py +++ b/var/spack/repos/builtin/packages/xsm/package.py @@ -39,5 +39,5 @@ class Xsm(AutotoolsPackage): depends_on('libsm') depends_on('libxaw') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xstdcmap/package.py b/var/spack/repos/builtin/packages/xstdcmap/package.py index 9b8d4a1641..d4521dbc56 100644 --- a/var/spack/repos/builtin/packages/xstdcmap/package.py +++ b/var/spack/repos/builtin/packages/xstdcmap/package.py @@ -40,5 +40,5 @@ class Xstdcmap(AutotoolsPackage): depends_on('libx11') depends_on('xproto@7.0.17:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xterm/package.py b/var/spack/repos/builtin/packages/xterm/package.py index 8c24931d7a..320f3490c8 100644 --- a/var/spack/repos/builtin/packages/xterm/package.py +++ b/var/spack/repos/builtin/packages/xterm/package.py @@ -52,4 +52,4 @@ class Xterm(AutotoolsPackage): depends_on('libxau') depends_on('bzip2') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') diff --git a/var/spack/repos/builtin/packages/xtrans/package.py b/var/spack/repos/builtin/packages/xtrans/package.py index 186e3587e6..08739749f8 100644 --- a/var/spack/repos/builtin/packages/xtrans/package.py +++ b/var/spack/repos/builtin/packages/xtrans/package.py @@ -36,5 +36,5 @@ class Xtrans(AutotoolsPackage): version('1.3.5', '6e4eac1b7c6591da0753052e1eccfb58') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xtrap/package.py b/var/spack/repos/builtin/packages/xtrap/package.py index ef297e9e6d..3bbeef6d70 100644 --- a/var/spack/repos/builtin/packages/xtrap/package.py +++ b/var/spack/repos/builtin/packages/xtrap/package.py @@ -36,5 +36,5 @@ class Xtrap(AutotoolsPackage): depends_on('libx11') depends_on('libxtrap') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xvidtune/package.py b/var/spack/repos/builtin/packages/xvidtune/package.py index 573c027627..b8075b8f9f 100644 --- a/var/spack/repos/builtin/packages/xvidtune/package.py +++ b/var/spack/repos/builtin/packages/xvidtune/package.py @@ -40,5 +40,5 @@ class Xvidtune(AutotoolsPackage): depends_on('libxmu') depends_on('libx11') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xvinfo/package.py b/var/spack/repos/builtin/packages/xvinfo/package.py index 358573dcbe..77637f43bb 100644 --- a/var/spack/repos/builtin/packages/xvinfo/package.py +++ b/var/spack/repos/builtin/packages/xvinfo/package.py @@ -38,5 +38,5 @@ class Xvinfo(AutotoolsPackage): depends_on('libx11') depends_on('xproto@7.0.25:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xwd/package.py b/var/spack/repos/builtin/packages/xwd/package.py index 0b992365be..47abe79692 100644 --- a/var/spack/repos/builtin/packages/xwd/package.py +++ b/var/spack/repos/builtin/packages/xwd/package.py @@ -37,5 +37,5 @@ class Xwd(AutotoolsPackage): depends_on('libxkbfile') depends_on('xproto@7.0.17:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xwininfo/package.py b/var/spack/repos/builtin/packages/xwininfo/package.py index bba7088166..3022b8539d 100644 --- a/var/spack/repos/builtin/packages/xwininfo/package.py +++ b/var/spack/repos/builtin/packages/xwininfo/package.py @@ -38,5 +38,5 @@ class Xwininfo(AutotoolsPackage): depends_on('libx11') depends_on('xproto@7.0.17:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xwud/package.py b/var/spack/repos/builtin/packages/xwud/package.py index b4b92cd214..3ad6c41283 100644 --- a/var/spack/repos/builtin/packages/xwud/package.py +++ b/var/spack/repos/builtin/packages/xwud/package.py @@ -37,5 +37,5 @@ class Xwud(AutotoolsPackage): depends_on('libx11') depends_on('xproto@7.0.17:', type='build') - depends_on('pkg-config@0.9.0:', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/zeromq/package.py b/var/spack/repos/builtin/packages/zeromq/package.py index f48e868891..dbf1f921b7 100644 --- a/var/spack/repos/builtin/packages/zeromq/package.py +++ b/var/spack/repos/builtin/packages/zeromq/package.py @@ -47,7 +47,7 @@ class Zeromq(AutotoolsPackage): depends_on('autoconf', type='build', when='@develop') depends_on('automake', type='build', when='@develop') depends_on('libtool', type='build', when='@develop') - depends_on('pkg-config', type='build', when='@develop') + depends_on('pkgconfig', type='build', when='@develop') @when('@develop') def autoreconf(self, spec, prefix): -- cgit v1.2.3-70-g09d2 From 2a2670175d4d118b0f72588770b0e2f52f5ce0e8 Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Thu, 23 Nov 2017 11:17:17 -0800 Subject: boost@1.54 alse needs the call_once patch (#6434) --- var/spack/repos/builtin/packages/boost/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index 6134456188..df8628ccfa 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -158,7 +158,7 @@ class Boost(Package): patch('xl_1_62_0_le.patch', when='@1.62.0%xl') # Patch fix from https://svn.boost.org/trac/boost/ticket/10125 - patch('call_once_variadic.patch', when='@1.55.0:1.55.9999%gcc@5.0:5.9') + patch('call_once_variadic.patch', when='@1.54.0:1.55.9999%gcc@5.0:5.9') # Patch fix for PGI compiler patch('boost_1.63.0_pgi.patch', when='@1.63.0%pgi') -- cgit v1.2.3-70-g09d2 From ff4a4fcd9eee2c1eced7fe4e3ec22522e8c1d1d1 Mon Sep 17 00:00:00 2001 From: Michael Kuron Date: Thu, 23 Nov 2017 21:39:32 +0100 Subject: siesta: add netcdf support (#6431) --- .../repos/builtin/packages/siesta/configure.patch | 21 +++++++++++++++++++++ var/spack/repos/builtin/packages/siesta/package.py | 6 ++++++ 2 files changed, 27 insertions(+) create mode 100644 var/spack/repos/builtin/packages/siesta/configure.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/siesta/configure.patch b/var/spack/repos/builtin/packages/siesta/configure.patch new file mode 100644 index 0000000000..8371c9e9bb --- /dev/null +++ b/var/spack/repos/builtin/packages/siesta/configure.patch @@ -0,0 +1,21 @@ +--- a/Src/configure 2017-11-23 12:42:40.909339915 +0100 ++++ b/Src/configure 2017-11-23 12:42:59.911416449 +0100 +@@ -6000,7 +6000,7 @@ + withval="$with_netcdf" + + fi; +-if test x$with_netcdf != xno; then ++if test "x$with_netcdf" != xno; then + + tw_netcdf_ok=no + ac_ext=${FC_SRCEXT-f} +@@ -6069,7 +6069,7 @@ + LIBS="$save_LIBS" + fi + if test $tw_netcdf_ok = yes; then +- DEFS="$DEFS CDF";NETCDF_INTERFACE="libnetcdf_f90.a" ++ DEFS="$DEFS CDF"; + else + NETCDF_LIBS="";tw_netcdf_ok=no;if test ! -z "$with_netcdf"; then { { echo "$as_me:$LINENO: error: Could not find NetCDF library." >&5 + echo "$as_me: error: Could not find NetCDF library." >&2;} + diff --git a/var/spack/repos/builtin/packages/siesta/package.py b/var/spack/repos/builtin/packages/siesta/package.py index bfe225ef71..536aac44b0 100644 --- a/var/spack/repos/builtin/packages/siesta/package.py +++ b/var/spack/repos/builtin/packages/siesta/package.py @@ -35,10 +35,14 @@ class Siesta(Package): version('4.0.1', '5cb60ce068f2f6e84fa9184ffca94c08') + patch('configure.patch') + depends_on('mpi') depends_on('blas') depends_on('lapack') depends_on('scalapack') + depends_on('netcdf') + depends_on('netcdf-fortran') phases = ['configure', 'build', 'install'] @@ -53,6 +57,8 @@ class Siesta(Package): '--with-blacs=%s' % (spec['scalapack'].libs + spec['blas'].libs), '--with-scalapack=%s' % spec['scalapack'].libs, + '--with-netcdf=%s' % (spec['netcdf-fortran'].libs + + spec['netcdf'].libs), # need to specify MPIFC explicitly below, otherwise # Intel's mpiifort is not found 'MPIFC=%s' % spec['mpi'].mpifc -- cgit v1.2.3-70-g09d2 From cde5fdde20970d3cd29c55300bff77e68faec120 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Fri, 24 Nov 2017 07:15:01 +0100 Subject: Openblas needs FC, not F77 (#6435) fixes #5591 --- var/spack/repos/builtin/packages/openblas/package.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openblas/package.py b/var/spack/repos/builtin/packages/openblas/package.py index 4019b09935..7c5513f482 100644 --- a/var/spack/repos/builtin/packages/openblas/package.py +++ b/var/spack/repos/builtin/packages/openblas/package.py @@ -98,10 +98,11 @@ class Openblas(MakefilePackage): # As of 06/2016 there is no mechanism to specify that packages which # depends on Blas/Lapack need C or/and Fortran symbols. For now # require both. - if self.compiler.f77 is None: + if self.compiler.fc is None: raise InstallError( 'OpenBLAS requires both C and Fortran compilers!' ) + # Add support for OpenMP if (self.spec.satisfies('threads=openmp') and self.spec.satisfies('%clang')): @@ -116,7 +117,7 @@ class Openblas(MakefilePackage): @property def make_defs(self): - # Configure fails to pick up fortran from FC=/abs/path/to/f77, but + # Configure fails to pick up fortran from FC=/abs/path/to/fc, but # works fine with FC=/abs/path/to/gfortran. # When mixing compilers make sure that # $SPACK_ROOT/lib/spack/env/ have symlinks with reasonable @@ -124,7 +125,7 @@ class Openblas(MakefilePackage): make_defs = [ 'CC={0}'.format(spack_cc), - 'FC={0}'.format(spack_f77), + 'FC={0}'.format(spack_fc), 'MAKE_NO_J=1' ] -- cgit v1.2.3-70-g09d2 From 70adbaeebaf35689a77c272648a150932a11b836 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Fri, 24 Nov 2017 16:40:48 +0800 Subject: Octave depends on qt+opengl. (#6437) --- var/spack/repos/builtin/packages/octave/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/octave/package.py b/var/spack/repos/builtin/packages/octave/package.py index ede501a77d..90c7cf00f5 100644 --- a/var/spack/repos/builtin/packages/octave/package.py +++ b/var/spack/repos/builtin/packages/octave/package.py @@ -99,7 +99,7 @@ class Octave(AutotoolsPackage): depends_on('qhull', when='+qhull') depends_on('qrupdate', when='+qrupdate') # depends_on('qscintilla', when='+qscintilla) # TODO: add package - depends_on('qt', when='+qt') + depends_on('qt+opengl', when='+qt') depends_on('suite-sparse', when='+suitesparse') depends_on('zlib', when='+zlib') -- cgit v1.2.3-70-g09d2 From 77bfda4da6f30f06762d749e0d83854d3a34dc6d Mon Sep 17 00:00:00 2001 From: Robert Cimrman Date: Fri, 24 Nov 2017 12:21:09 +0100 Subject: sfepy: Create new package (#6439) --- .../repos/builtin/packages/py-sfepy/package.py | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-sfepy/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-sfepy/package.py b/var/spack/repos/builtin/packages/py-sfepy/package.py new file mode 100644 index 0000000000..2f2732be55 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-sfepy/package.py @@ -0,0 +1,50 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PySfepy(PythonPackage): + """SfePy (http://sfepy.org) is a software for solving systems of coupled + partial differential equations (PDEs) by the finite element method in 1D, + 2D and 3D. It can be viewed both as black-box PDE solver, and as a Python + package which can be used for building custom applications. + """ + + homepage = "http://sfepy.org" + url = "https://github.com/sfepy/sfepy/archive/release_2017.3.tar.gz" + + version('2017.3', '65ab606a9fe80fccf17a7eb5ab8fd025') + + variant('petsc', default=False, description='Enable PETSc support') + + depends_on('py-numpy', type=('build', 'run')) + depends_on('py-setuptools', type='build') + depends_on('py-six', type='run') + depends_on('py-scipy', type='run') + depends_on('py-matplotlib', type='run') + depends_on('py-sympy', type='run') + depends_on('hdf5+hl', type='run') + depends_on('py-pytables', type='run') + depends_on('py-petsc4py', type='run', when='+petsc') -- cgit v1.2.3-70-g09d2 From be095fdb2163575803020cefcfa0d86cff1d990f Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 25 Nov 2017 02:24:53 -0600 Subject: r-lars: Create new package (#6453) --- var/spack/repos/builtin/packages/r-lars/package.py | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-lars/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-lars/package.py b/var/spack/repos/builtin/packages/r-lars/package.py new file mode 100644 index 0000000000..907c6bdc87 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-lars/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RLars(RPackage): + """Efficient procedures for fitting an entire lasso sequence with the cost + of a single least squares fit.""" + + homepage = "https://cran.r-project.org/web/packages/lars/index.html" + url = "https://cran.r-project.org/src/contrib/lars_1.2.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/lars" + + depends_on('r@3.4.0:3.4.9') + version('1.2', '2571bae325f6cba1ad0202ea61695b8c') + version('1.1', 'e94f6902aade09b13ec25ba2381384e5') + version('0.9-8', 'e6f9fffab2d83898f6d3d811f04d177f') -- cgit v1.2.3-70-g09d2 From 7c174f11ec9fbdde81c8536d74b86bfaf46d5af0 Mon Sep 17 00:00:00 2001 From: healther Date: Sat, 25 Nov 2017 09:30:06 +0100 Subject: add new version to node-js (#6444) --- var/spack/repos/builtin/packages/node-js/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/node-js/package.py b/var/spack/repos/builtin/packages/node-js/package.py index 1e8deef7d2..90de2f2147 100644 --- a/var/spack/repos/builtin/packages/node-js/package.py +++ b/var/spack/repos/builtin/packages/node-js/package.py @@ -34,6 +34,7 @@ class NodeJs(Package): homepage = "https://nodejs.org/" url = "https://nodejs.org/download/release/v6.3.0/node-v6.3.0.tar.gz" + version('8.9.1', '7482b2523f72000d1b6060c38945026b') version('7.1.0', '1db5df2cb025f9c70e83d9cf21c4266a') version('6.3.0', '8c14e5c89d66d4d060c91b3ba15dfd31') version('6.2.2', '1120e8bf191fdaee42206d031935210d') -- cgit v1.2.3-70-g09d2 From 086a1cfe7e60ea092bb1f79de0097922ce914049 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Sun, 26 Nov 2017 02:34:05 +0800 Subject: r: add version 3.4.2. (#6455) --- var/spack/repos/builtin/packages/r/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py index 603a372861..ebed6e7fe7 100644 --- a/var/spack/repos/builtin/packages/r/package.py +++ b/var/spack/repos/builtin/packages/r/package.py @@ -38,6 +38,7 @@ class R(AutotoolsPackage): extendable = True + version('3.4.2', '1cd6d37850188e7f190f1eb94a24ca1f') version('3.4.1', '3a79c01dc0527c62e80ffb1c489297ea') version('3.4.0', '75083c23d507b9c16d5c6afbd7a827e7') version('3.3.3', '0ac211ec15e813a24f8f4a5a634029a4') -- cgit v1.2.3-70-g09d2 From 0d91f51a27b418f8ec7d57241e8d40f25854ea97 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Sun, 26 Nov 2017 02:34:24 +0800 Subject: Python: add 3.6.3 . (#6454) --- var/spack/repos/builtin/packages/python/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index c77756a78f..37ef38697e 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -46,6 +46,7 @@ class Python(AutotoolsPackage): list_url = "https://www.python.org/downloads/" list_depth = 1 + version('3.6.3', 'e9180c69ed9a878a4a8a3ab221e32fa9') version('3.6.2', 'e1a36bfffdd1d3a780b1825daf16e56c') version('3.6.1', '2d0fc9f3a5940707590e07f03ecb08b9') version('3.6.0', '3f7062ccf8be76491884d0e47ac8b251') -- cgit v1.2.3-70-g09d2 From 0c7cf0c7a4d4e04c1b2063045cbe416b5be5da81 Mon Sep 17 00:00:00 2001 From: healther Date: Sat, 25 Nov 2017 19:37:38 +0100 Subject: add package py-traceback2 (#6450) --- .../builtin/packages/py-traceback2/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-traceback2/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-traceback2/package.py b/var/spack/repos/builtin/packages/py-traceback2/package.py new file mode 100644 index 0000000000..ff897cbeb7 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-traceback2/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyTraceback2(PythonPackage): + """Backports of the traceback module""" + + homepage = "https://github.com/testing-cabal/traceback2" + url = "https://pypi.io/packages/source/t/traceback2/traceback2-1.4.0.tar.gz" + + version('1.4.0', '9e9723f4d70bfc6308fa992dd193c400') + + depends_on('py-setuptools', type='build') + depends_on('py-linecache2', type=('build', 'run')) + depends_on('py-pbr', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 65fd350eb40c5bd3aac432e6f2b7071a59b8ff0e Mon Sep 17 00:00:00 2001 From: healther Date: Sat, 25 Nov 2017 19:38:10 +0100 Subject: add package py-setuptools-scm (#6449) --- .../builtin/packages/py-setuptools-scm/package.py | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-setuptools-scm/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-setuptools-scm/package.py b/var/spack/repos/builtin/packages/py-setuptools-scm/package.py new file mode 100644 index 0000000000..b4b19e7d38 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-setuptools-scm/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PySetuptoolsScm(PythonPackage): + """the blessed package to manage your versions by scm tags""" + + homepage = "https://github.com/pypa/setuptools_scm" + url = "https://pypi.io/packages/source/s/setuptools_scm/setuptools_scm-1.15.6.tar.gz" + + version('1.15.6', 'f17493d53f0d842bb0152f214775640b') + + depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From ca90372f744b4119cbd6935c3cd5306d0e0c0b96 Mon Sep 17 00:00:00 2001 From: healther Date: Sat, 25 Nov 2017 19:38:42 +0100 Subject: add missing dependency to py-unittest2 (#6447) --- var/spack/repos/builtin/packages/py-unittest2/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-unittest2/package.py b/var/spack/repos/builtin/packages/py-unittest2/package.py index bdac19d855..8aa4a3e705 100644 --- a/var/spack/repos/builtin/packages/py-unittest2/package.py +++ b/var/spack/repos/builtin/packages/py-unittest2/package.py @@ -36,3 +36,6 @@ class PyUnittest2(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-enum34', when='^python@:3.3', type=('build', 'run')) + depends_on('py-traceback2', type=('build', 'run')) + depends_on('py-six', type=('build', 'run')) + depends_on('py-argparse', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 86e771bdb36d1e21c67747735cecf92a8e6f0425 Mon Sep 17 00:00:00 2001 From: healther Date: Sat, 25 Nov 2017 19:39:16 +0100 Subject: add missing dependency to py-scikit-image (#6446) --- var/spack/repos/builtin/packages/py-scikit-image/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-scikit-image/package.py b/var/spack/repos/builtin/packages/py-scikit-image/package.py index 40cbf740fe..7d0c0dceb2 100644 --- a/var/spack/repos/builtin/packages/py-scikit-image/package.py +++ b/var/spack/repos/builtin/packages/py-scikit-image/package.py @@ -43,3 +43,4 @@ class PyScikitImage(PythonPackage): depends_on('py-scipy', type=('build', 'run')) depends_on('py-matplotlib', type=('build', 'run')) depends_on('py-setuptools', type='build') + depends_on('py-cython@0.23.4:', type='build') -- cgit v1.2.3-70-g09d2 From ed685b0262c51ca30ce1da69dcc1ee4e141f6f52 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Sat, 25 Nov 2017 19:40:12 +0100 Subject: gearshifft: enable OpenCL (#6441) With pocl builds fixed, we can now also use the OpenCL implementations in gearshifft :) --- var/spack/repos/builtin/packages/gearshifft/package.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gearshifft/package.py b/var/spack/repos/builtin/packages/gearshifft/package.py index 8b6f5c8a31..a2c3942347 100644 --- a/var/spack/repos/builtin/packages/gearshifft/package.py +++ b/var/spack/repos/builtin/packages/gearshifft/package.py @@ -35,8 +35,8 @@ class Gearshifft(CMakePackage): variant('cufft', default=True, description='Compile gearshifft_cufft') - # variant('clfft', default=True, - # description='Compile gearshifft_clfft') + variant('clfft', default=True, + description='Compile gearshifft_clfft') variant('fftw', default=True, description='Compile gearshifft_fftw') variant('openmp', default=True, @@ -48,8 +48,8 @@ class Gearshifft(CMakePackage): depends_on('cmake@2.8.0:', type='build') depends_on('boost@1.56.0:') depends_on('cuda@8.0:', when='+cufft') - # depends_on('opencl@1.2:', when='+clfft') - # depends_on('clfft@2.12.0:', when='+clfft') + depends_on('opencl@1.2:', when='+clfft') + depends_on('clfft@2.12.0:', when='+clfft') depends_on('fftw@3.3.4:~mpi~openmp', when='+fftw~openmp') depends_on('fftw@3.3.4:~mpi+openmp', when='+fftw+openmp') @@ -67,8 +67,8 @@ class Gearshifft(CMakePackage): '-DGEARSHIFFT_FFTW_OPENMP:BOOL={0}'.format(( 'ON' if '+openmp' in spec else 'OFF')), '-DGEARSHIFFT_CUFFT:BOOL={0}'.format(( - 'ON' if '+cufft' in spec else 'OFF')) - # '-DGEARSHIFFT_CLFFT:BOOL={0}'.format(( - # 'ON' if '+clfft' in spec else 'OFF')) + 'ON' if '+cufft' in spec else 'OFF')), + '-DGEARSHIFFT_CLFFT:BOOL={0}'.format(( + 'ON' if '+clfft' in spec else 'OFF')) ]) return args -- cgit v1.2.3-70-g09d2 From 835b1ff03d517c4a621237d3cd1682df1322e0e8 Mon Sep 17 00:00:00 2001 From: healther Date: Sat, 25 Nov 2017 19:40:53 +0100 Subject: add missing build dependency to py-execnet (#6443) --- var/spack/repos/builtin/packages/py-execnet/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-execnet/package.py b/var/spack/repos/builtin/packages/py-execnet/package.py index c2b3d38b6b..f5e55a4c21 100644 --- a/var/spack/repos/builtin/packages/py-execnet/package.py +++ b/var/spack/repos/builtin/packages/py-execnet/package.py @@ -36,4 +36,5 @@ class PyExecnet(PythonPackage): version('1.4.1', '0ff84b6c79d0dafb7e2971629c4d127a') depends_on('py-setuptools', type='build') + depends_on('py-setuptools-scm', type='build') depends_on('py-apipkg@1.4:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 8c5c46a7a2e2e7347af37462b7419c578ec7b371 Mon Sep 17 00:00:00 2001 From: healther Date: Sat, 25 Nov 2017 19:41:45 +0100 Subject: add missing dependencies to py-pylint (#6445) --- var/spack/repos/builtin/packages/py-pylint/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pylint/package.py b/var/spack/repos/builtin/packages/py-pylint/package.py index fb6cb2946e..75a7c4357b 100644 --- a/var/spack/repos/builtin/packages/py-pylint/package.py +++ b/var/spack/repos/builtin/packages/py-pylint/package.py @@ -38,7 +38,9 @@ class PyPylint(PythonPackage): depends_on('py-six', type=('build', 'run')) depends_on('py-astroid', type=('build', 'run')) depends_on('py-logilab-common', type=('build', 'run')) + depends_on('py-pytest-runner', type=('build', 'run')) depends_on('py-setuptools', type='build') + depends_on('py-setuptools-scm@1.15.0:', type='build') # TODO: Add a 'test' deptype # depends_on('py-nose', type='test') -- cgit v1.2.3-70-g09d2 From d7344d29878bef0adc5dd229eaba02513e9a21da Mon Sep 17 00:00:00 2001 From: healther Date: Sat, 25 Nov 2017 19:42:16 +0100 Subject: add package py-linecache2 (#6448) --- .../builtin/packages/py-linecache2/package.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-linecache2/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-linecache2/package.py b/var/spack/repos/builtin/packages/py-linecache2/package.py new file mode 100644 index 0000000000..ed781e6b6d --- /dev/null +++ b/var/spack/repos/builtin/packages/py-linecache2/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyLinecache2(PythonPackage): + """Backports of the linecache module""" + + homepage = "https://github.com/testing-cabal/linecache2" + url = "https://pypi.io/packages/source/l/linecache2/linecache2-1.0.0.tar.gz" + + version('1.0.0', '7b25d0289ec36bff1f9e63c4329ce65c') + + depends_on('py-setuptools', type='build') + depends_on('py-pbr', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 25d7ef495c2706f79c98b77fbf9ddda82293467e Mon Sep 17 00:00:00 2001 From: "Michael F. Herbst" Date: Sat, 25 Nov 2017 19:46:32 +0100 Subject: Expand bohrium package (#6438) * GCC greater 4.7 required * Add variant with opencv extmethods * Fix and export the config path --- .../repos/builtin/packages/bohrium/package.py | 74 +++++++++++++++++----- 1 file changed, 57 insertions(+), 17 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bohrium/package.py b/var/spack/repos/builtin/packages/bohrium/package.py index fa7e499525..a4202688d2 100644 --- a/var/spack/repos/builtin/packages/bohrium/package.py +++ b/var/spack/repos/builtin/packages/bohrium/package.py @@ -22,8 +22,9 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## -from spack import * from spack.build_systems.cuda import CudaPackage +from spack import * +import os class Bohrium(CMakePackage, CudaPackage): @@ -63,12 +64,15 @@ class Bohrium(CMakePackage, CudaPackage): description="Build with BLAS extension methods") variant('lapack', default=True, description="Build with LAPACK extension methods") + variant('opencv', default=True, + description="Build with OpenCV extension methods") # # Conflicts and extensions # conflicts('%intel') conflicts('%clang@:3.5') + conflicts('%gcc@:4.7') extends('python', when="+python") # Bohrium needs at least one vector engine and @@ -88,8 +92,14 @@ class Bohrium(CMakePackage, CudaPackage): # NOTE The lapacke interface and hence netlib-lapack # is the strictly required lapack provider # for bohrium right now. - depends_on("netlib-lapack+lapacke", when="+lapack") - depends_on("blas", when="+blas") + depends_on('netlib-lapack+lapacke', when="+lapack") + depends_on('blas', when="+blas") + + # Make sure an appropriate opencv is used + depends_on('opencv', when="+opencv") + depends_on('opencv+cuda', when="+opencv+cuda") + depends_on('opencv+openmp', when="+opencv+openmp") + depends_on('opencv+openmp+cuda', when="+opencv+openmp+cuda") depends_on('python', type="build", when="~python") depends_on('python', when="+python") @@ -99,12 +109,18 @@ class Bohrium(CMakePackage, CudaPackage): depends_on('zlib', when="+proxy") + @property + def config_file(self): + """Return the path of the Bohrium system-wide configuration file""" + return join_path(self.prefix.etc.bohrium, "config.ini") + # # Settings and cmake cache # def cmake_args(self): spec = self.spec + # Sanity check cuda_arch = spec.variants['cuda_arch'].value if "+cuda" in spec and len(cuda_arch) >= 1 and cuda_arch[0]: # TODO Add cuda_arch support to Bohrium once the basic setup @@ -114,22 +130,22 @@ class Bohrium(CMakePackage, CudaPackage): ) args = [ + # Choose a particular python version "-DPYTHON_EXECUTABLE:FILEPATH=" + spec['python'].command.path, + # # Hard-disable Jupyter, since this would override a config # file in the user's home directory in some cases during # the configuration stage. "-DJUPYTER_FOUND=FALSE", "-DJUPYTER_EXECUTABLE=FALSE", # + # Force the configuration file to appear at a sensible place + "-DFORCE_CONFIG_PATH=" + os.path.dirname(self.config_file), + # # Vector engine managers "-DVEM_NODE=" + str("+node" in spec), "-DVEM_PROXY=" + str("+proxy" in spec), # - # Vector engines - "-DVE_OPENMP=" + str("+openmp" in spec), - "-DVE_OPENCL=" + str("+opencl" in spec), - "-DVE_CUDA=" + str("+cuda" in spec), - # # Bridges and interfaces "-DBRIDGE_BHXX=ON", "-DBRIDGE_C=" + str("+cbridge" in spec or "+python" in spec), @@ -137,6 +153,23 @@ class Bohrium(CMakePackage, CudaPackage): "-DNO_PYTHON3=ON", # Only build python version we provide ] + # + # Vector engines + # + args += [ + "-DVE_OPENCL=" + str("+opencl" in spec), + "-DVE_CUDA=" + str("+cuda" in spec), + ] + + if "+openmp" in spec: + args += [ + "-DVE_OPENMP=ON", + "-DOPENMP_FOUND=True", + "-DVE_OPENMP_COMPILER_CMD=" + self.compiler.cc, + ] + else: + args += ["-DVE_OPENMP=OFF", "-DOPENMP_FOUND=False"] + # # Extension methods # @@ -160,17 +193,23 @@ class Bohrium(CMakePackage, CudaPackage): else: args += ["-DEXT_LAPACK=OFF", "-DLAPACKE_FOUND=False"] - # TODO Other extension methods are not ready yet, because of missing - # packages or because they are untested, so disable in order - # to prevent their setup: + if "+opencv" in spec: + args += [ + "-DEXT_OPENCV=ON", + "-DOpenCV_FOUND=True", + "-DOpenCV_INCLUDE_DIRS=" + spec["opencv"].prefix.include, + "-DOpenCV_LIBS=" + ";".join(spec["opencv"].prefix.libs), + ] + else: + args += ["-DEXT_OPENCV=OFF", "-DOpenCV_FOUND=False"] + + # TODO Other extension methods are not ready yet, + # because of missing packages in Spack args += [ - "-DEXT_LAPACK=" + str("+lapack" in spec), - "-DEXT_CLBLAS=OFF", # clBLAS not in Spack yet - "-DEXT_TDMA=OFF", # untested - "-DEXT_VISUALIZER=OFF", # untested - "-DEXT_OPENCV=OFF", # untested + "-DEXT_CLBLAS=OFF", # clBLAS missing + # Bohrium visualizer extension method + "-DEXT_VISUALIZER=OFF", # freeglut missing ] - return args # @@ -180,3 +219,4 @@ class Bohrium(CMakePackage, CudaPackage): # Bohrium needs an extra include dir apart from # the self.prefix.include dir run_env.prepend_path("CPATH", self.prefix.include.bohrium) + run_env.set("BH_CONFIG", self.config_file) -- cgit v1.2.3-70-g09d2 From 1f2867415a26299fb51c8ceae45677b1c3f65a38 Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Sat, 25 Nov 2017 10:49:02 -0800 Subject: added intel 18.0.1 compilers (#6381) --- var/spack/repos/builtin/packages/intel-parallel-studio/package.py | 4 ++++ var/spack/repos/builtin/packages/intel/package.py | 2 ++ 2 files changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py index 78a1d7c908..ff0315a42a 100644 --- a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py +++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py @@ -34,8 +34,12 @@ class IntelParallelStudio(IntelPackage): homepage = "https://software.intel.com/en-us/intel-parallel-studio-xe" + version('professional.2018.1', '91669ff7afbfd07868a429a122c90357', + url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12375/parallel_studio_xe_2018_update1_professional_edition.tgz') version('cluster.2018.1', '9c007011e0e3fc72747b58756fbf01cd', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12374/parallel_studio_xe_2018_update1_cluster_edition.tgz') + version('composer.2018.1', '28cb807126d713350f4aa6f9f167448a', + url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12381/parallel_studio_xe_2018_update1_composer_edition.tgz') version('professional.2018.0', '9a233854e9218937bc5f46f02b3c7542', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12062/parallel_studio_xe_2018_professional_edition.tgz') version('cluster.2018.0', 'fa9baeb83dd2e8e4a464e3db38f28d0f', diff --git a/var/spack/repos/builtin/packages/intel/package.py b/var/spack/repos/builtin/packages/intel/package.py index d67550caa6..a2ef5ccefb 100644 --- a/var/spack/repos/builtin/packages/intel/package.py +++ b/var/spack/repos/builtin/packages/intel/package.py @@ -33,6 +33,8 @@ class Intel(IntelPackage): homepage = "https://software.intel.com/en-us/intel-parallel-studio-xe" + version('18.0.1', '28cb807126d713350f4aa6f9f167448a', + url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12381/parallel_studio_xe_2018_update1_composer_edition.tgz') version('18.0.0', '31ba768fba6e7322957b03feaa3add28', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12067/parallel_studio_xe_2018_composer_edition.tgz') version('17.0.4', 'd03d351809e182c481dc65e07376d9a2', -- cgit v1.2.3-70-g09d2 From a465bf3becfb3335fd4bde867e014ddd53160b91 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Sat, 25 Nov 2017 19:55:08 +0100 Subject: pocl: fix link to libtool (#6440) libtool is also needed for linking, otherwise downstream dependencies such as clfft will fail linking against pocl's libOpenCL.so with errors such as: ``` >> 182 /usr/bin/ld: warning: libltdl.so.7, needed by /usr/local/opt/spack/linux-ubuntu16.04-x86_64/gcc-5.4.0/pocl-0.14-rwo73qzkcxfupndxoz3pcl2s34o5pt6i/lib/libOpenCL.so, not found (try using -rpath or -rpath-link) >> 183 /usr/local/opt/spack/linux-ubuntu16.04-x86_64/gcc-5.4.0/pocl-0.14-rwo73qzkcxfupndxoz3pcl2s34o5pt6i/lib/libOpenCL.so: undefined reference to `lt_dlinit' >> 184 /usr/local/opt/spack/linux-ubuntu16.04-x86_64/gcc-5.4.0/pocl-0.14-rwo73qzkcxfupndxoz3pcl2s34o5pt6i/lib/libOpenCL.so: undefined reference to `lt_dlerror' >> 185 /usr/local/opt/spack/linux-ubuntu16.04-x86_64/gcc-5.4.0/pocl-0.14-rwo73qzkcxfupndxoz3pcl2s34o5pt6i/lib/libOpenCL.so: undefined reference to `lt_dlopen' >> 186 /usr/local/opt/spack/linux-ubuntu16.04-x86_64/gcc-5.4.0/pocl-0.14-rwo73qzkcxfupndxoz3pcl2s34o5pt6i/lib/libOpenCL.so: undefined reference to `lt_dlsym' >> 187 collect2: error: ld returned 1 exit status ``` --- var/spack/repos/builtin/packages/pocl/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pocl/package.py b/var/spack/repos/builtin/packages/pocl/package.py index c4a7f7ca83..3ac7182966 100644 --- a/var/spack/repos/builtin/packages/pocl/package.py +++ b/var/spack/repos/builtin/packages/pocl/package.py @@ -57,7 +57,7 @@ class Pocl(CMakePackage): depends_on("cmake @2.8.12:", type="build") depends_on("hwloc") - depends_on("libtool", type=("build", "run")) + depends_on("libtool", type=("build", "link", "run")) # We don't request LLVM's shared libraries because these are not # enabled by default, and also because they fail to build for us # (see #1616) -- cgit v1.2.3-70-g09d2 From 9b5e3434ad03560f04b3914391d04ae34c84658f Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 25 Nov 2017 13:50:13 -0600 Subject: r-sn: Create new package (#6433) * r-sn: Create new package * r-sn: fix whitespace and depends_on --- var/spack/repos/builtin/packages/r-sn/package.py | 46 ++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-sn/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-sn/package.py b/var/spack/repos/builtin/packages/r-sn/package.py new file mode 100644 index 0000000000..6f20f23e5b --- /dev/null +++ b/var/spack/repos/builtin/packages/r-sn/package.py @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RSn(RPackage): + """Build and manipulate probability distributions of the skew-normal + family and some related ones, notably the skew-t family, and provide + related statistical methods for data fitting and diagnostics, in the + univariate and the multivariate case.""" + + homepage = "https://cran.r-project.org/web/packages/sn/index.html" + url = "https://cran.r-project.org/src/contrib/sn_1.5-0.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/sn" + + version('1.5-0', 'a3349773be950199d7f4c17954be56d1') + version('1.4-0', 'cfa604317ea54224b06abd1cec179375') + version('1.3-0', '84d02ba2ab5ca6f3644626013e7ce36d') + version('1.2-4', 'bf3a47b05016326e910fdb4cc4967e4d') + version('1.2-3', '290ae511d974a6beb4c3c79c0106858f') + + depends_on('r@3.4.0:3.4.9') + depends_on('r-mnormt', type=('build', 'run')) + depends_on('r-numderiv', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 178381edf9720b1edcf7a0fd3c5542b3c7f6bff9 Mon Sep 17 00:00:00 2001 From: "Michael F. Herbst" Date: Sun, 26 Nov 2017 05:00:18 +0100 Subject: Implement opencv libs property (#6457) --- var/spack/repos/builtin/packages/opencv/package.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index e76f763ffb..c7082bb194 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -229,3 +229,10 @@ class Opencv(CMakePackage): ]) return args + + @property + def libs(self): + shared = "+shared" in self.spec + return find_libraries( + "libopencv_*", root=self.prefix, shared=shared, recurse=True + ) -- cgit v1.2.3-70-g09d2 From 41eb496021a1bbd4523bc3b40450fc6f128c972e Mon Sep 17 00:00:00 2001 From: "Michael F. Herbst" Date: Sun, 26 Nov 2017 05:01:30 +0100 Subject: New Package: Add libcint to spack (#6456) * Add libcint to spack * Clearifying comment --- .../repos/builtin/packages/libcint/package.py | 74 ++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 var/spack/repos/builtin/packages/libcint/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libcint/package.py b/var/spack/repos/builtin/packages/libcint/package.py new file mode 100644 index 0000000000..75991a7b48 --- /dev/null +++ b/var/spack/repos/builtin/packages/libcint/package.py @@ -0,0 +1,74 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Libcint(CMakePackage): + """Library for analytical Gaussian integrals for quantum chemistry.""" + + homepage = "https://github.com/sunqm/libcint" + url = "https://github.com/sunqm/libcint/archive/v3.0.4.tar.gz" + maintainers = ['mfherbst'] + + # + # Versions + # + version('3.0.4', '55607a61313225ef4434d3e96624a008') + + # + # Variants + # + variant('f12', default=True, + description="Enable explicitly correlated f12 integrals.") + variant('coulomb_erf', default=True, + description="Enable attenuated coulomb operator integrals.") + variant('test', default=False, description="Build test programs") + variant('shared', default=True, + description="Build the shared library") + + # + # Dependencies and conflicts + # + depends_on('cmake@2.6:', type="build") + depends_on('blas') + depends_on('python', type=("build", "test"), when="+test") + depends_on('py-numpy', type=("build", "test"), when="+test") + + # Libcint tests only work with a shared libcint library + conflicts('+test~shared') + + # + # Settings and cmake cache + # + def cmake_args(self): + spec = self.spec + args = [ + "-DWITH_COULOMB_ERF=" + str("+coulomb_erf" in spec), + "-DWITH_F12=" + str("+f12" in spec), + "-DBUILD_SHARED_LIBS=" + str("+shared" in spec), + "-DENABLE_TEST=" + str("+test" in spec), + "-DENABLE_EXAMPLE=OFF", # Requires fortran compiler + ] + return args -- cgit v1.2.3-70-g09d2 From 09eeb991a2ac0d749ffdbfe2f1cc415dd5d5dc85 Mon Sep 17 00:00:00 2001 From: peetsv <32349688+peetsv@users.noreply.github.com> Date: Sun, 26 Nov 2017 15:14:18 -0800 Subject: dialign-tx adding patch for gcc@5.4.0 (#6413) --- .../dialign-tx/dialign-1-0-2-gcc-5-4-0.patch | 80 ++++++++++++++++++++++ .../repos/builtin/packages/dialign-tx/package.py | 2 + 2 files changed, 82 insertions(+) create mode 100644 var/spack/repos/builtin/packages/dialign-tx/dialign-1-0-2-gcc-5-4-0.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dialign-tx/dialign-1-0-2-gcc-5-4-0.patch b/var/spack/repos/builtin/packages/dialign-tx/dialign-1-0-2-gcc-5-4-0.patch new file mode 100644 index 0000000000..5a82f97e7b --- /dev/null +++ b/var/spack/repos/builtin/packages/dialign-tx/dialign-1-0-2-gcc-5-4-0.patch @@ -0,0 +1,80 @@ +--- a/source/alig.c 2008-12-06 04:10:05.000000000 -0800 ++++ b/source/alig.c 2017-11-21 10:58:31.000000000 -0800 +@@ -520,7 +520,7 @@ + * datastructure (i.e. frontiers). The given diag must be consistent + * to the given alignment ! + */ +-inline char align_diag(struct alignment *algn, struct scr_matrix *smatrix, struct diag* dg) { ++char align_diag(struct alignment *algn, struct scr_matrix *smatrix, struct diag* dg) { + + char alignedSomething = 0; + int i,j,k; +diff -Naur a/source/assemble.c b/source/assemble.c +--- a/source/assemble.c 2008-12-06 04:10:05.000000000 -0800 ++++ b/source/assemble.c 2017-11-21 10:57:55.000000000 -0800 +@@ -10,7 +10,7 @@ + + extern void error(char *message); + extern void merror(char *msg1, char *msg2); +-extern inline void calc_weight(struct diag* dg, struct scr_matrix* smatrix, ++extern void calc_weight(struct diag* dg, struct scr_matrix* smatrix, + struct prob_dist *pdist); + extern inline void calc_ov_weight(struct diag* dg, struct diag_col *dcol, struct scr_matrix* smatrix, + struct prob_dist *pdist); +@@ -37,7 +37,7 @@ + extern inline struct algn_pos *find_eqc(struct algn_pos **ap, int seqnum, int pos); + extern struct alignment* copy_alignment( struct alignment *o_algn, struct alignment *algn, char doDgc); + //extern char adapt_diag(struct alignment *algn, struct scr_matrix *smatrix, struct diag* dg); +-extern inline char align_diag(struct alignment *algn, struct scr_matrix *smatrix, struct diag* dg); ++extern char align_diag(struct alignment *algn, struct scr_matrix *smatrix, struct diag* dg); + //extern inline struct diag_cont* enter_sorted(struct diag_cont* backlog_diags, struct diag_cont *cand); + //extern inline char fit_fpos_diag(struct alignment *algn, struct diag* dg); + +@@ -574,7 +574,7 @@ + * returns a value <0 if there is an non-conflicting overlap + * returns 0 in all other non-conflicting cases + */ +-inline char confl_diag(struct alignment *algn, char *layer, struct diag *dg1, struct diag *dg2) { ++static inline char confl_diag(struct alignment *algn, char *layer, struct diag *dg1, struct diag *dg2) { + // if(dg1->multi_dg || dg2->multi_dg) error(" confl_diag(): cannot accept multi dgs!"); + int s1_1 = dg1->seq_p1.num; + int s1_2 = dg1->seq_p2.num; +diff -Naur a/source/diag.c b/source/diag.c +--- a/source/diag.c 2008-12-06 04:10:05.000000000 -0800 ++++ b/source/diag.c 2017-11-21 10:55:43.000000000 -0800 +@@ -183,7 +183,7 @@ + * omitScore = 0: normal + * omitScore = 1: no score calculation + */ +-inline void real_calc_weight(struct diag* dg, struct scr_matrix* smatrix, ++static inline void real_calc_weight(struct diag* dg, struct scr_matrix* smatrix, + struct prob_dist *pdist, char omitScore, long double **tmp_dist, struct alignment *algn ) { + + if(dg->multi_dg) { +@@ -302,7 +302,7 @@ + } + } + +-inline void calc_weight(struct diag* dg, struct scr_matrix* smatrix, ++void calc_weight(struct diag* dg, struct scr_matrix* smatrix, + struct prob_dist *pdist) { + real_calc_weight(dg, smatrix, pdist, 0,NULL,NULL); + } +@@ -312,7 +312,7 @@ + /** + * calculates the overlap weight for the given diag + */ +-inline void calc_ov_weight(struct diag* dg, struct diag_col *dcol, struct scr_matrix* smatrix, ++static inline void calc_ov_weight(struct diag* dg, struct diag_col *dcol, struct scr_matrix* smatrix, + struct prob_dist *pdist) { + int sn1 = dg->seq_p1.num; + int sn2 = dg->seq_p2.num; +@@ -958,7 +958,7 @@ + * The pointer returned (and the ones included in the struct) + * has to be deallocted explicitely from memory. + */ +-inline struct simple_diag_col* find_diags_dialign(struct scr_matrix *smatrix, ++static inline struct simple_diag_col* find_diags_dialign(struct scr_matrix *smatrix, + struct prob_dist *pdist, struct seq* seq1, + struct seq* seq2, struct alignment *algn, + long double **tmp_dist, int round) { diff --git a/var/spack/repos/builtin/packages/dialign-tx/package.py b/var/spack/repos/builtin/packages/dialign-tx/package.py index 009793216f..182069a013 100644 --- a/var/spack/repos/builtin/packages/dialign-tx/package.py +++ b/var/spack/repos/builtin/packages/dialign-tx/package.py @@ -50,3 +50,5 @@ class DialignTx(MakefilePackage): install('dialign-tx', prefix.bin) # t-coffee recognizes as dialign-t install('dialign-tx', join_path(prefix.bin, 'dialign-t')) + + patch('dialign-1-0-2-gcc-5-4-0.patch', when='%gcc@5.4.0') -- cgit v1.2.3-70-g09d2 From 0bb789eb23e6540e877b81a461c3d7af8e442287 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 27 Nov 2017 02:20:49 -0600 Subject: r-rcpp: fix list_url to install archived versions (#6462) --- var/spack/repos/builtin/packages/r-rcpp/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-rcpp/package.py b/var/spack/repos/builtin/packages/r-rcpp/package.py index 9e6df80506..de84491e0c 100644 --- a/var/spack/repos/builtin/packages/r-rcpp/package.py +++ b/var/spack/repos/builtin/packages/r-rcpp/package.py @@ -38,7 +38,7 @@ class RRcpp(RPackage): homepage = "http://dirk.eddelbuettel.com/code/rcpp.html" url = "https://cran.rstudio.com/src/contrib/Rcpp_0.12.13.tar.gz" - list_url = homepage + list_url = "https://cran.rstudio.com/src/contrib/Archive/Rcpp" version('0.12.13', '5186d119132bfe07f66da74c50b190a4') version('0.12.12', '97b36a3b567e3438067c4a7d0075fd90') -- cgit v1.2.3-70-g09d2 From fcf331f17626cdaf7d64a8b43a2dee8b971d7c7e Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 27 Nov 2017 02:30:52 -0600 Subject: r-tsne: Create new package (#6461) --- var/spack/repos/builtin/packages/r-tsne/package.py | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-tsne/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-tsne/package.py b/var/spack/repos/builtin/packages/r-tsne/package.py new file mode 100644 index 0000000000..951692cf63 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-tsne/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RTsne(RPackage): + """A "pure R" implementation of the t-SNE algorithm.""" + + homepage = "https://cran.r-project.org/web/packages/tsne/index.html" + url = "https://cran.r-project.org/src/contrib/tsne_0.1-3.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/tnse" + + version('0.1-3', '00974d4b3fd5f1100d0ebd24e03b0af9') + version('0.1-2', 'd96d8dce6ffeda68e2b25ec1ff52ea61') + version('0.1-1', '8197e5c61dec916b7a31b74e658b632d') + + depends_on('r@3.4.0:3.4.9') -- cgit v1.2.3-70-g09d2 From eacaa1551ee0f66ade48296bd79046ab07028595 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Mon, 27 Nov 2017 10:15:47 +0100 Subject: r-rcpp: adds new versions, fixes failing download in Travis CI (#6464) --- var/spack/repos/builtin/packages/r-rcpp/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-rcpp/package.py b/var/spack/repos/builtin/packages/r-rcpp/package.py index de84491e0c..b95626020a 100644 --- a/var/spack/repos/builtin/packages/r-rcpp/package.py +++ b/var/spack/repos/builtin/packages/r-rcpp/package.py @@ -40,6 +40,7 @@ class RRcpp(RPackage): url = "https://cran.rstudio.com/src/contrib/Rcpp_0.12.13.tar.gz" list_url = "https://cran.rstudio.com/src/contrib/Archive/Rcpp" + version('0.12.14', '89a3dbad0aa3e345b9d0b862fa1fc56a') version('0.12.13', '5186d119132bfe07f66da74c50b190a4') version('0.12.12', '97b36a3b567e3438067c4a7d0075fd90') version('0.12.11', 'ea1710213cbb1d91b1d0318e6fa9aa37') -- cgit v1.2.3-70-g09d2 From 45e15621620bb22ce1b54a38db6002153cac0696 Mon Sep 17 00:00:00 2001 From: Choong Jun Jin Date: Mon, 27 Nov 2017 15:50:26 +0200 Subject: fixed glog compilation for < 0.3.5 (#6463) --- var/spack/repos/builtin/packages/glog/package.py | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/glog/package.py b/var/spack/repos/builtin/packages/glog/package.py index cc62b1250e..57adf51fde 100644 --- a/var/spack/repos/builtin/packages/glog/package.py +++ b/var/spack/repos/builtin/packages/glog/package.py @@ -25,16 +25,30 @@ from spack import * -class Glog(CMakePackage): +class Glog(Package): """C++ implementation of the Google logging module.""" homepage = "https://github.com/google/glog" - url = "https://github.com/google/glog/archive/v0.3.4.tar.gz" + url = "https://github.com/google/glog/archive/v0.3.5.tar.gz" + version('0.3.5', '5df6d78b81e51b90ac0ecd7ed932b0d4') version('0.3.4', 'df92e05c9d02504fb96674bc776a41cb') version('0.3.3', 'c1f86af27bd9c73186730aa957607ed0') depends_on('gflags') + depends_on('cmake', when="@0.3.5:") - def cmake_args(self): - return ['-DBUILD_SHARED_LIBS=TRUE'] + def install(self, spec, prefix): + configure('--prefix=%s' % prefix) + make + make('install') + + @when('@0.3.5:') + def install(self, spec, prefix): + cmake_args = ['-DBUILD_SHARED_LIBS=TRUE'] + cmake_args.extend(std_cmake_args) + + with working_dir('spack-build', create=True): + cmake('..', *cmake_args) + make + make('install') -- cgit v1.2.3-70-g09d2 From 557309618f80020ce88562a48d209cf7aca2af6f Mon Sep 17 00:00:00 2001 From: Adam Fidel Date: Mon, 27 Nov 2017 07:50:49 -0600 Subject: New Package: GAP Benchmark Suite (#6452) --- var/spack/repos/builtin/packages/gapbs/package.py | 57 +++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 var/spack/repos/builtin/packages/gapbs/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gapbs/package.py b/var/spack/repos/builtin/packages/gapbs/package.py new file mode 100644 index 0000000000..48826abaef --- /dev/null +++ b/var/spack/repos/builtin/packages/gapbs/package.py @@ -0,0 +1,57 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Gapbs(MakefilePackage): + """The GAP Benchmark Suite is intended to help graph processing research by + standardizing evaluations. Fewer differences between graph processing + evaluations will make it easier to compare different research efforts and + quantify improvements. The benchmark not only specifies graph kernels, + input graphs, and evaluation methodologies, but it also provides an + optimized baseline implementation (this repo). These baseline + implementations are representative of state-of-the-art performance, and + thus new contributions should outperform them to demonstrate an + improvement.""" + + homepage = "http://gap.cs.berkeley.edu/benchmark.html" + url = "https://github.com/sbeamer/gapbs/archive/v1.0.tar.gz" + + version('1.0', 'ac2efa793f44e58553449f42b9779f3ff2d47634') + + variant('serial', default=False, description='Version with no parallelism') + + def build(self, spec, prefix): + cxx_flags = ['-O3', self.compiler.cxx11_flag] + + if '-serial' in spec: + cxx_flags.append(self.compiler.openmp_flag) + + make('CXX_FLAGS=' + ' '.join(cxx_flags)) + + def install(self, spec, prefix): + mkdirp(prefix.bin) + for app in ["bc", "bfs", "cc", "converter", "pr", "sssp", "tc"]: + install(app, prefix.bin) -- cgit v1.2.3-70-g09d2 From 23bedc276c0608650ecf4f1b253a72bdf91342da Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Mon, 27 Nov 2017 13:38:10 -0600 Subject: plasma: extract plasma changes from xsdk-0.3.0 (#6280) * plasma: extract plasma changes from xsdk-0.3.0 * plasma: cleanup per review - netlib-lapack: add support for spec['lapack:c'].libs, spec['blas:c'].libs - add getblaslapacklibs() to eliminate duplicate code in edit() and build_targets() - eliminate string manipulation of ld_flags - remove gfortran check (will check later) - remove build() (will check later) * netlib-lapack: fix tuple per review * netlib-lapack: use spec[lapack:c,fortran] --- .../builtin/packages/netlib-lapack/package.py | 36 +++++++++++++++++-- .../plasma/add_netlib_lapacke_detection.patch | 11 ++++++ var/spack/repos/builtin/packages/plasma/package.py | 41 +++++++++++++++++----- 3 files changed, 77 insertions(+), 11 deletions(-) create mode 100644 var/spack/repos/builtin/packages/plasma/add_netlib_lapacke_detection.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/netlib-lapack/package.py b/var/spack/repos/builtin/packages/netlib-lapack/package.py index 8166b75bf5..f6dfcd40a1 100644 --- a/var/spack/repos/builtin/packages/netlib-lapack/package.py +++ b/var/spack/repos/builtin/packages/netlib-lapack/package.py @@ -73,15 +73,47 @@ class NetlibLapack(Package): @property def blas_libs(self): shared = True if '+shared' in self.spec else False + query_parameters = self.spec.last_query.extra_parameters + query2libraries = { + tuple(): ['libblas'], + ('c', 'fortran'): [ + 'libcblas', + 'libblas', + ], + ('c',): [ + 'libcblas', + ], + ('fortran',): [ + 'libblas', + ] + } + key = tuple(sorted(query_parameters)) + libraries = query2libraries[key] return find_libraries( - 'libblas', root=self.prefix, shared=shared, recurse=True + libraries, root=self.prefix, shared=shared, recurse=True ) @property def lapack_libs(self): shared = True if '+shared' in self.spec else False + query_parameters = self.spec.last_query.extra_parameters + query2libraries = { + tuple(): ['liblapack'], + ('c', 'fortran'): [ + 'liblapacke', + 'liblapack', + ], + ('c',): [ + 'liblapacke', + ], + ('fortran',): [ + 'liblapack', + ] + } + key = tuple(sorted(query_parameters)) + libraries = query2libraries[key] return find_libraries( - 'liblapack', root=self.prefix, shared=shared, recurse=True + libraries, root=self.prefix, shared=shared, recurse=True ) def install_one(self, spec, prefix, shared): diff --git a/var/spack/repos/builtin/packages/plasma/add_netlib_lapacke_detection.patch b/var/spack/repos/builtin/packages/plasma/add_netlib_lapacke_detection.patch new file mode 100644 index 0000000000..403dc8d40b --- /dev/null +++ b/var/spack/repos/builtin/packages/plasma/add_netlib_lapacke_detection.patch @@ -0,0 +1,11 @@ +--- a/include/core_lapack.h 2017-01-13 13:59:46.000000000 -0500 ++++ b/include/core_lapack.h 2017-10-30 16:37:54.481966195 -0400 +@@ -27,7 +27,7 @@ + // Netlib cblas.h does: enum CBLAS_ORDER {...}; + // OpenBLAS cblas.h does: typedef enum CBLAS_ORDER {...} CBLAS_ORDER; + // We use (CBLAS_ORDER), so add these typedefs for Netlib. +- #ifndef OPENBLAS_VERSION ++ #if ! defined(OPENBLAS_VERSION) && ! defined(F77_HEADER_INCLUDED) + typedef enum CBLAS_ORDER CBLAS_ORDER; + typedef enum CBLAS_TRANSPOSE CBLAS_TRANSPOSE; + typedef enum CBLAS_UPLO CBLAS_UPLO; diff --git a/var/spack/repos/builtin/packages/plasma/package.py b/var/spack/repos/builtin/packages/plasma/package.py index 46b662d63d..4565350303 100644 --- a/var/spack/repos/builtin/packages/plasma/package.py +++ b/var/spack/repos/builtin/packages/plasma/package.py @@ -27,18 +27,25 @@ class Plasma(MakefilePackage): version("develop", hg="https://luszczek@bitbucket.org/icl/plasma") + variant('shared', default=True, description="Build shared library (disables static library)") + depends_on("blas") depends_on("lapack") conflicts("atlas") # does not have LAPACKE interface - conflicts("netlib-lapack@:2.999") # missing LAPACKE features + + # missing LAPACKE features and/or CBLAS headers + conflicts("netlib-lapack@:3.5.999") + # clashes with OpenBLAS declarations and has a problem compiling on its own conflicts("cblas") + conflicts("openblas-with-lapack") # incomplete LAPACK implementation conflicts("veclibfort") - # only GCC 7+ and higher have sufficient support for OpenMP 4+ tasks+deps - conflicts("%gcc@:6.999") + # only GCC 4.9+ and higher have sufficient support for OpenMP 4+ tasks+deps + conflicts("%gcc@:4.8.99") + conflicts("%cce") conflicts("%clang") conflicts("%intel") @@ -48,6 +55,16 @@ class Plasma(MakefilePackage): conflicts("%xl_r") patch("remove_absolute_mkl_include.patch", when="@17.1") + patch("add_netlib_lapacke_detection.patch", when="@17.1") + + def getblaslapacklibs(self): + if '^netlib-lapack' in self.spec: + bl_attr = ':c,fortran' + else: + bl_attr = '' + return self.spec['lapack' + bl_attr].libs + \ + self.spec['blas' + bl_attr].libs + \ + find_system_libraries(['libm']) def edit(self, spec, prefix): # copy "make.inc.mkl-gcc" provided by default into "make.inc" @@ -55,7 +72,10 @@ class Plasma(MakefilePackage): make_inc = FileFilter("make.inc") - if not spec.satisfies("^mkl"): + if '~shared' in self.spec: + make_inc.filter("-fPIC", "") # not using fPIC + + if "^mkl" not in spec: make_inc.filter("-DPLASMA_WITH_MKL", "") # not using MKL header_flags = "" @@ -63,7 +83,7 @@ class Plasma(MakefilePackage): for dep in ("blas", "lapack"): try: # in case the dependency does not provide header flags header_flags += " " + spec[dep].headers.cpp_flags - except AttributeError: + except Exception: pass make_inc.filter("CFLAGS +[+]=", "CFLAGS += " + header_flags + " ") @@ -74,6 +94,9 @@ class Plasma(MakefilePackage): # make sure CC variable comes from build environment make_inc.filter("CC *[?]*= * .*cc", "") + make_inc.filter("LIBS *[?]*= * .*", "LIBS = " + + self.getblaslapacklibs().ld_flags) + @property def build_targets(self): targets = list() @@ -81,10 +104,10 @@ class Plasma(MakefilePackage): # use $CC set by Spack targets.append("CC = {0}".format(self.compiler.cc)) - if self.spec.satisfies("^mkl"): - targets.append("MKLROOT = {0}/mkl".format(env["MKLROOT"])) + if "^mkl" in self.spec: + targets.append("MKLROOT = {0}".format(env["MKLROOT"])) - # pass BLAS library flags - targets.append("LIBS = {0}".format(self.spec["blas"].libs.ld_flags)) + targets.append("LIBS = {0}".format( + self.getblaslapacklibs().ld_flags)) return targets -- cgit v1.2.3-70-g09d2 From ebd796110de7c6209540a8e5001c37b578165bef Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 27 Nov 2017 14:54:36 -0600 Subject: r-pcapp: Create new package (#6468) --- .../repos/builtin/packages/r-pcapp/package.py | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-pcapp/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-pcapp/package.py b/var/spack/repos/builtin/packages/r-pcapp/package.py new file mode 100644 index 0000000000..2274cead3f --- /dev/null +++ b/var/spack/repos/builtin/packages/r-pcapp/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RPcapp(RPackage): + """Provides functions for robust PCA by projection pursuit.""" + + homepage = "https://cran.r-project.org/web/packages/pcaPP/index.html" + url = "https://cran.r-project.org/src/contrib/pcaPP_1.9-72.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/pcaPP" + + version('1.9-72', '87c08f8ecab69311bba395c026bbc91c') + version('1.9-70', '3fcc809ec1cdc910f10e9ebf372888e8') + version('1.9-61', '1bd5bc3aff968b168493e8c523d726ea') + version('1.9-60', '23dd468abb9fedc11e40166446df1017') + version('1.9-50', 'be44f173404fd6e86ba0a5515711bfa3') + + depends_on('r@3.4.0:3.4.9') + depends_on('r-mvtnorm', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From dbb329637b1c7fdb1183bd5dd9ade65301b5e66d Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 27 Nov 2017 14:54:53 -0600 Subject: r-rtsne: Create new package (#6470) * r-rtsne: Create new package * r-rtsne: add rcpp dependency --- .../repos/builtin/packages/r-rtsne/package.py | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-rtsne/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-rtsne/package.py b/var/spack/repos/builtin/packages/r-rtsne/package.py new file mode 100644 index 0000000000..f1ac7aad78 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-rtsne/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RRtsne(RPackage): + """An R wrapper around the fast T-distributed Stochastic Neighbor + Embedding implementation.""" + + homepage = "https://CRAN.R-project.org/package=Rtsne" + url = "https://cran.r-project.org/src/contrib/Rtsne_0.13.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/Rtsne" + + version('0.13', 'ea1d2ef2bda16735bbf219ffda5b0661') + version('0.11', '9a1eaa9b71d67cc27a55780e6e9df733') + version('0.10', 'c587e1b76fdcea2629424f74c6e92340') + + depends_on('r@3.4.0:3.4.9') + depends_on('r-rcpp', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 3d4e51fad25be6d4c654684d700d6c175a1b73c7 Mon Sep 17 00:00:00 2001 From: "Michael F. Herbst" Date: Mon, 27 Nov 2017 21:55:29 +0100 Subject: Add two test examples to bohrium (#6459) --- .../repos/builtin/packages/bohrium/cxxadd.cpp | 24 ++++++ .../repos/builtin/packages/bohrium/package.py | 85 +++++++++++++++++++--- var/spack/repos/builtin/packages/bohrium/pyadd.py | 10 +++ 3 files changed, 110 insertions(+), 9 deletions(-) create mode 100644 var/spack/repos/builtin/packages/bohrium/cxxadd.cpp create mode 100644 var/spack/repos/builtin/packages/bohrium/pyadd.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bohrium/cxxadd.cpp b/var/spack/repos/builtin/packages/bohrium/cxxadd.cpp new file mode 100644 index 0000000000..94c9287807 --- /dev/null +++ b/var/spack/repos/builtin/packages/bohrium/cxxadd.cpp @@ -0,0 +1,24 @@ +#include + +int main() { + const size_t dim = 3; + bhxx::BhArray a({dim}); + bhxx::BhArray b({dim}); + bhxx::BhArray c({dim}); + + bhxx::identity(a, 1); + bhxx::identity(b, 2); + bhxx::add(c, a, b); + + bhxx::Runtime::instance().sync(c.base); + bhxx::Runtime::instance().flush(); + + for (auto it = c.data(); it < c.data() + dim; ++it) { + if (*it != 3) { + std::cout << "Failure, values not as expected." << std::endl; + return 1; + } + } + std::cout << "Success!" << std::endl; + return 0; +} diff --git a/var/spack/repos/builtin/packages/bohrium/package.py b/var/spack/repos/builtin/packages/bohrium/package.py index a4202688d2..f54cb8a34d 100644 --- a/var/spack/repos/builtin/packages/bohrium/package.py +++ b/var/spack/repos/builtin/packages/bohrium/package.py @@ -24,6 +24,9 @@ ############################################################################## from spack.build_systems.cuda import CudaPackage from spack import * +from spack.package_test import compare_output +from spack.util.executable import Executable +import llnl.util.tty as tty import os @@ -96,14 +99,14 @@ class Bohrium(CMakePackage, CudaPackage): depends_on('blas', when="+blas") # Make sure an appropriate opencv is used - depends_on('opencv', when="+opencv") - depends_on('opencv+cuda', when="+opencv+cuda") - depends_on('opencv+openmp', when="+opencv+openmp") - depends_on('opencv+openmp+cuda', when="+opencv+openmp+cuda") + depends_on('opencv+imgproc', when="+opencv") + depends_on('opencv+imgproc+cuda', when="+opencv+cuda") + depends_on('opencv+imgproc+openmp', when="+opencv+openmp") + depends_on('opencv+imgproc+openmp+cuda', when="+opencv+openmp+cuda") depends_on('python', type="build", when="~python") - depends_on('python', when="+python") - depends_on('py-numpy', when="+python") + depends_on('python', type=("build", "link", "test"), when="+python") + depends_on('py-numpy', type=("build", "test", "run"), when="+python") depends_on('swig', type="build", when="+python") depends_on('py-cython', type="build", when="+python") @@ -177,7 +180,7 @@ class Bohrium(CMakePackage, CudaPackage): args += [ "-DEXT_BLAS=ON", "-DCBLAS_FOUND=True", - "-DCBLAS_LIBRARIES=" + ";".join(spec["blas"].libs), + "-DCBLAS_LIBRARIES=" + spec["blas"].libs.joined(";"), "-DCBLAS_INCLUDES=" + spec["blas"].prefix.include, ] else: @@ -187,7 +190,7 @@ class Bohrium(CMakePackage, CudaPackage): args += [ "-DEXT_LAPACK=ON", "-DLAPACKE_FOUND=True", - "-DLAPACKE_LIBRARIES=" + ";".join(spec["lapack"].libs), + "-DLAPACKE_LIBRARIES=" + spec["lapack"].libs.joined(";"), "-DLAPACKE_INCLUDE_DIR=" + spec["lapack"].prefix.include, ] else: @@ -198,7 +201,7 @@ class Bohrium(CMakePackage, CudaPackage): "-DEXT_OPENCV=ON", "-DOpenCV_FOUND=True", "-DOpenCV_INCLUDE_DIRS=" + spec["opencv"].prefix.include, - "-DOpenCV_LIBS=" + ";".join(spec["opencv"].prefix.libs), + "-DOpenCV_LIBS=" + spec["opencv"].libs.joined(";"), ] else: args += ["-DEXT_OPENCV=OFF", "-DOpenCV_FOUND=False"] @@ -220,3 +223,67 @@ class Bohrium(CMakePackage, CudaPackage): # the self.prefix.include dir run_env.prepend_path("CPATH", self.prefix.include.bohrium) run_env.set("BH_CONFIG", self.config_file) + + # + # Quick tests + # + @run_after('install') + @on_package_attributes(run_tests=True) + def check_install(self): + spec = self.spec + test_env = {} + + # Make sure the correct config is found + test_env["BH_CONFIG"] = self.config_file + + # Remove the lib/spackenv directory from the PATH variable when + # executing the tests, becauses it messes with the JIT compilation + # inside Bohrium + paths = os.environ['PATH'].split(':') + paths = [p for p in paths if "spack/env" not in p] + test_env["PATH"] = ":".join(paths) + + # Add the PYTHONPATH to bohrium to the PYTHONPATH environment + pythonpaths = [p for p in os.environ["PYTHONPATH"].split(":")] + pythonpaths.append(join_path(self.prefix, + spec['python'].package.site_packages_dir)) + test_env["PYTHONPATH"] = ":".join(pythonpaths) + + # Collect the stacks which should be available: + stacks = ["default"] + if "+openmp" in spec: + stacks.append("openmp") + if "+cuda" in spec: + stacks.append("cuda") + if "+opencl" in spec: + stacks.append("opencl") + + # C++ compiler and compiler flags + cxx = Executable(self.compiler.cxx) + cxx_flags = ["-I", self.prefix.include, + "-I", self.prefix.include.bohrium, + "-L", self.prefix.lib, "-lbh", "-lbhxx"] + + # Compile C++ test program + file_cxxadd = join_path(os.path.dirname(self.module.__file__), + "cxxadd.cpp") + cxx("-o", "test_cxxadd", file_cxxadd, *cxx_flags) + test_cxxadd = Executable("./test_cxxadd") + + # Build python test commandline + file_pyadd = join_path(os.path.dirname(self.module.__file__), + "pyadd.py") + test_pyadd = Executable(spec['python'].command.path + " " + file_pyadd) + + # Run tests for each available stack + for bh_stack in stacks: + tty.info("Testing with bohrium stack '" + bh_stack + "'") + test_env["BH_STACK"] = bh_stack + + cpp_output = test_cxxadd(output=str, env=test_env) + compare_output(cpp_output, "Success!\n") + + # Python test (if +python) + if "+python" in spec: + py_output = test_pyadd(output=str, env=test_env) + compare_output(py_output, "Success!\n") diff --git a/var/spack/repos/builtin/packages/bohrium/pyadd.py b/var/spack/repos/builtin/packages/bohrium/pyadd.py new file mode 100644 index 0000000000..fc9f6968df --- /dev/null +++ b/var/spack/repos/builtin/packages/bohrium/pyadd.py @@ -0,0 +1,10 @@ +#!/usr/bin/env python +import bohrium as bh +a = bh.array([1, 2, 3]) +b = bh.array([3, 4, 5]) +c = a + b + +if bh.all(c == bh.array([4, 6, 8])): + print("Success!") +else: + print("Failure, values not as expected.") -- cgit v1.2.3-70-g09d2 From 1268bc8f45cca7b4f991c3c18772bd667dd500be Mon Sep 17 00:00:00 2001 From: Quinn Date: Mon, 27 Nov 2017 15:40:02 -0600 Subject: Adding list_url to r-hms package (#6473) --- var/spack/repos/builtin/packages/r-hms/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-hms/package.py b/var/spack/repos/builtin/packages/r-hms/package.py index ec1cd6dd39..cf3a4a88c3 100644 --- a/var/spack/repos/builtin/packages/r-hms/package.py +++ b/var/spack/repos/builtin/packages/r-hms/package.py @@ -31,5 +31,6 @@ class RHms(RPackage): homepage = "https://cran.rstudio.com/web/packages/hms/index.html" url = "https://cran.rstudio.com/src/contrib/hms_0.3.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/hms" version('0.3', '92c4a0cf0c402a35145b5bb57212873e') -- cgit v1.2.3-70-g09d2 From e2abebe8a5b07141cefa3a881f148fe986ea6cae Mon Sep 17 00:00:00 2001 From: Mark Berrill Date: Mon, 27 Nov 2017 16:43:03 -0500 Subject: Adding new package amp (#6471) --- var/spack/repos/builtin/packages/amp/package.py | 162 ++++++++++++++++++++++++ 1 file changed, 162 insertions(+) create mode 100644 var/spack/repos/builtin/packages/amp/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/amp/package.py b/var/spack/repos/builtin/packages/amp/package.py new file mode 100644 index 0000000000..d855e250ed --- /dev/null +++ b/var/spack/repos/builtin/packages/amp/package.py @@ -0,0 +1,162 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Amp(CMakePackage): + """The Advanced Multi-Physics (AMP) package is an open source parallel + object-oriented computational framework that is designed with single + and multi-domain multi-physics applications in mind. AMP can be used + to build powerful and flexible multi-physics simulation algorithms + from lightweight operator, solver, linear algebra, material database, + discretization, and meshing components. The AMP design is meant to + enable existing investments in application codes to be leveraged without + having to adopt dramatically different data structures while developing + new computational science applications. Application components are + represented as discrete mathematical operators that only require a + minimal interface and through operator composition the incremental + development of complex parallel applications is enabled. AMP is meant + to allow application domain scientists, computer scientists and + mathematicians to simulate, collaborate, and conduct research on + various aspects of massively parallel simulation algorithms.""" + homepage = "https://bitbucket.org/AdvancedMultiPhysics/amp" + + # ###################### Versions ########################## + version("develop", hg="https://bitbucket.org/AdvancedMultiPhysics/amp") + + # ###################### Variants ########################## + + # ###################### Dependencies ########################## + + # Everything should be compiled position independent (-fpic) + depends_on('blas') + depends_on('lapack') + depends_on('boost', when='+boost') + depends_on('petsc', when='+petsc') + depends_on('trilinos', when='+trilinos') + depends_on('hdf5', when='+hdf5') + depends_on('hdf5', when='+silo') + depends_on('silo', when='+silo') + depends_on('zlib', when="+zlib") + + # MPI related dependencies + depends_on('mpi', when='+mpi') + + def cmake_args(self): + spec = self.spec + + options = [] + + # #################### Base Settings ####################### + + options.extend([ + '-DTPL_URL=https://bitbucket.org/AdvancedMultiPhysics/tpl-builder', + '-DAMP_DATA_URL=https://bitbucket.org/AdvancedMultiPhysics/amp/downloads/AMP-Data.tar.gz', + '-DAMP_ENABLE_TESTS:BOOL=OFF', + '-DAMP_ENABLE_EXAMPLES:BOOL=OFF', + '-DAMP_ENABLE_CXX11:BOOL=ON', + '-DCXX_STD=11', + '-DBUILD_SHARED_LIBS:BOOL=%s' % ( + 'ON' if '+shared' in spec else 'OFF'), + ]) + + # #################### Compiler Settings ####################### + + if '+mpi' in spec: + options.extend([ + '-DCMAKE_C_COMPILER=%s' % spec['mpi'].mpicc, + '-DCMAKE_CXX_COMPILER=%s' % spec['mpi'].mpicxx, + '-DCMAKE_Fortran_COMPILER=%s' % spec['mpi'].mpifc, + '-DUSE_MPI=0', + '-DMPI_COMPILER=1', + '-DMPIEXEC=$s' % spec['mpi'].prefix.bin, + ]) + else: + options.extend([ + '-DCMAKE_C_COMPILER=%s' % self.compiler.cc, + '-DCMAKE_CXX_COMPILER=%s' % self.compiler.cxx, + '-DCMAKE_Fortran_COMPILER=%s' % self.compiler.fc, + '-DUSE_MPI=0', + ]) + + # ################## Third Party Libraries ##################### + + tpl_list = "LAPACK" + blas = spec['blas'].libs + lapack = spec['lapack'].libs + options.extend([ + '-DTPL_LAPACK_INSTALL_DIR=%s' % spec['lapack'].prefix, + '-DTPL_BLAS_LIBRARY_NAMES=%s' % ';'.join(blas.names), + '-DTPL_BLAS_LIBRARY_DIRS=%s' % ';'.join(blas.directories), + '-DTPL_LAPACK_LIBRARY_NAMES=%s' % ';'.join(lapack.names), + '-DTPL_LAPACK_LIBRARY_DIRS=%s' % ';'.join(lapack.directories), + ]) + if '+boost' in spec: + tpl_list = tpl_list + ";BOOST" + options.extend(['-DTPL_BOOST_INSTALL_DIR=%s' % + spec['boost'].prefix, ]) + if '+zlib' in spec: + tpl_list = tpl_list + ";ZLIB" + options.extend(['-DTPL_ZLIB_INSTALL_DIR=%s' % + spec['zlib'].prefix, ]) + if '+hdf5' in spec: + tpl_list = tpl_list + ";HDF5" + options.extend(['-DTPL_HDF5_INSTALL_DIR=%s' % + spec['hdf5'].prefix, ]) + if '+silo' in spec: + tpl_list = tpl_list + ";SILO" + options.extend(['-DTPL_SILO_INSTALL_DIR=%s' % + spec['silo'].prefix, ]) + if '+netcdf' in spec: + tpl_list = tpl_list + ";NETCDF" + options.extend(['-DTPL_NETCDF_INSTALL_DIR=%s' % + spec['netcdf'].prefix, ]) + if '+hypre' in spec: + tpl_list = tpl_list + ";HYPRE" + options.extend(['-DTPL_HYPRE_INSTALL_DIR=%s' % + spec['hypre'].prefix, ]) + if '+petsc' in spec: + tpl_list = tpl_list + ";PETSC" + options.extend(['-DTPL_PETSC_INSTALL_DIR=%s' % + spec['petsc'].prefix, ]) + if '+trilinos' in spec: + tpl_list = tpl_list + ";TRILINOS" + options.extend(['-DTPL_TRILINOS_INSTALL_DIR=%s' % + spec['trilinos'].prefix, ]) + if '+libmesh' in spec: + tpl_list = tpl_list + ";LIBMESH" + options.extend(['-DTPL_LIBMESH_INSTALL_DIR=%s' % + spec['libmesh'].prefix, ]) + if '+sundials' in spec: + tpl_list = tpl_list + ";SUNDIALS" + options.extend(['-DTPL_SUNDIALS_INSTALL_DIR=%s' % + spec['sundials'].prefix, ]) + if '+amp-timer' in spec: + tpl_list = tpl_list + ";TIMER" + options.extend(['-DTPL_TIMER_INSTALL_DIR=%s' % + spec['amp-timer'].prefix, ]) + options.extend(['-DTPL_LIST=%s' % tpl_list, ]) + + return options -- cgit v1.2.3-70-g09d2 From 52f46d2beeee93c0a7f12e304855843d0e6d03cc Mon Sep 17 00:00:00 2001 From: peetsv <32349688+peetsv@users.noreply.github.com> Date: Mon, 27 Nov 2017 15:45:43 -0800 Subject: ViennaRNA: adding version 2.4.3 + disable swig (#6408) * Adding version 2.4.3 to ViennaRNA * Replaced tab indent with spaces Flake8 error correction * no swig for viennarna v2.4.3 only * correcting version/argument conditional syntax error --- var/spack/repos/builtin/packages/viennarna/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/viennarna/package.py b/var/spack/repos/builtin/packages/viennarna/package.py index c3fad661db..79c8ff28bc 100644 --- a/var/spack/repos/builtin/packages/viennarna/package.py +++ b/var/spack/repos/builtin/packages/viennarna/package.py @@ -32,8 +32,9 @@ class Viennarna(AutotoolsPackage): """ homepage = "https://www.tbi.univie.ac.at/RNA/" - url = "https://www.tbi.univie.ac.at/RNA/download/sourcecode/2_3_x/ViennaRNA-2.3.5.tar.gz" + url = "https://www.tbi.univie.ac.at/RNA/download/sourcecode/2_4_x/ViennaRNA-2.4.3.tar.gz" + version('2.4.3', '41be2fd36a5323a35ed50debfc7bd118') version('2.3.5', '4542120adae9b7abb605e2304c2a1326') variant('sse', default=True, description='Enable SSE in order to substantially speed up execution') @@ -54,6 +55,8 @@ class Viennarna(AutotoolsPackage): args = self.enable_or_disable('sse') args += self.with_or_without('python') args += self.with_or_without('perl') + if self.spec.satisfies('@2.4.3:'): + args.append('--without-swig') if 'python@3:' in self.spec: args.append('--with-python3') -- cgit v1.2.3-70-g09d2 From cd8da5a441e3a83e2e2ba9b8ab1705928e276742 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Tue, 28 Nov 2017 00:08:08 -0600 Subject: Xsdk 0.3.0 (#6277) * xsdk: Added MFEM rc package. * xsdk: add version entry for xsdk-0.3.0-rc1 - and set it as preferred version * xsdk: remove 'xsdk' from version - recommended by Todd. Now the usage is: 'spack install xsdk@0.3.0-rc1' instead of the previous usage: 'spack install xsdk@xsdk-0.2.0' * xsdk: add petsc@3.8.0 as a dependency for xsdk-0.3.0-rc1 * mfem: fix dependency to use the corrected xsdk version * Updated the mfem version tags. * mfem: fix merge * fix flake8 warning * Modified xSDK scripts * fixing the default package.yaml * fix bad revert * revert changes to superlu-dist so that the 5.2.1 update can be merged * update xsdk to use superlu-dist-5.2.1 * update alquimia for xsdk * fix whitespace * update hypre for xsdk * update sundials for xsdk * update sundials for xsdk * Fix checking for MKL and extend range of GCC versions * pflotran: update to release branch * plasma: fix spec -> self.spec * Changes to enable mfem hooks into hypre, superlu-dist, and petsc. Sundials hooks may come in the future. * adding plasma with comment * Bumped the version of mfem up to handle integration with sundials3.0.0. Also enabled hypre in sundials. * Turn on the plasma package definition for testing * Fix conflict declaration to obey ordering rules * xsdk: udate superlu-dist dependency to v5.2.2 * plasma: change gcc dependency to workarround potential spack bug #5778 * trilinos: update hdf5 dependency to use 'hdf5+hl' Without this change - I get the following error [triggered by 161dca6d5 c9810f808 changes] $ ./bin/spack install trilinos+hdf5 ==> Error: An unsatisfiable variant constraint has been detected for spec: hdf5@1.10.1%gcc@7~cxx~debug~fortran~hl+mpi+pic+shared~szip~threadsafe arch=linux-fedora27-x86_64 while trying to concretize the partial spec: netcdf+mpi ^m4 ^mpich@3.3a2%gcc@7 device=ch3 +hydra netmod=tcp +pmi+romio~verbs arch=linux-fedora27-x86_64 ^zlib@1.2.11%gcc@7+optimize+pic+shared arch=linux-fedora27-x86_64 netcdf requires hdf5 variant +hl, but spec asked for ~hl * plasma: add in -lm dependency per #6046 * update sundials version to 3.0.0 * Add fixes to support Netlib LAPACK * mfem does not use cmake for builds [anymore] - so remove code corresponding to this dependency. This enables mfem build on OSX [with xcode/clang compilers] * mfem: update to v3.3.2-rc4 * add patch for building sundials on mac * xsdk: enable plasma for gcc-4.9+ - same as what plasma/package.py does. * magma: Fix for cuda-9.0 as it does not support sm20 nvcc fatal : Unsupported gpu architecture 'compute_20' * add in code for 'spack install xsdk+cuda' - which installs magma * fix flake8 warning * fix flake8 warnings * Updated to the latest MFEM RC. * alquimia: fix to use petsc-3.8.0+ versions * petsc: update to version 3.8.1 * petsc: add in conflict between petsc-3.8.0 & mkl * xsdk: update petsc to 3.8.1 to get MKL build fix * petsc: fix superlu_dist dependency * petsc: when hdf5 depends on zlib - petsc+hdf5 should also be configured with zlib * petsc: fix dependency [of zlib to be on hdf5 - and not on petsc] * petsc: fix pkgconfig error - with incorrect library link order that can break mfem examples with static build * petsc: use the fact that hdf5/package.py has a hard dependency on zlib [so no need to check for this dependency in code] recommended-by: @davydden * petsc: change hdf5 dependency to 'hdf5+hl' as petsc configure is looing for -lhdf5_hl https://github.com/spack/spack/issues/5846 * plasma: also detect -lgfortran * update sundials version to 3.1.0 * alquimia: xsdk-0.3.0-rc -> xsdk-0.3.0 * petsc: update to version 3.8.2 Includes pkgconfig fix [for mfem static build failure] * Revert "petsc: fix pkgconfig error - with incorrect library link order that can break mfem examples with static build" This reverts commit d1afa8c20d4313fdc42a27e5380573b035b32998. * xsdk: update to use petsc-3.8.2 * Fixed a problem with MFEM trying to use mpicxx instead of the spack defined compiler. * Minor changes to the mfem build and pointing at mfem's release branch that is currently undergoing internal testing. * Enabling shared build for Plasma * plasma: do not look for libgfortran on cray - spack finds the wrong one from the frontend '-L/usr/lib64/gcc/x86_64-suse-linux/4.3 -L/usr/lib64 -lgfortran' * Some changes to the mfem package that are in the process of being pulled into spack/develop. * xsdk: switch from 0.3.0-rc1 to 0.3.0 * fix flake8 warnings * plasma: extract plasma changes from xsdk-0.3.0 * plasma: cleanup per review - netlib-lapack: add support for spec['lapack:c'].libs, spec['blas:c'].libs - add getblaslapacklibs() to eliminate duplicate code in edit() and build_targets() - eliminate string manipulation of ld_flags - remove gfortran check (will check later) - remove build() (will check later) * netlib-lapack: fix tuple per review * netlib-lapack: use spec[lapack:c,fortran] --- .../repos/builtin/packages/alquimia/package.py | 3 +++ .../repos/builtin/packages/pflotran/package.py | 2 ++ var/spack/repos/builtin/packages/xsdk/package.py | 21 +++++++++++++++++++-- 3 files changed, 24 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/alquimia/package.py b/var/spack/repos/builtin/packages/alquimia/package.py index 983bab23f7..55b1a8642a 100644 --- a/var/spack/repos/builtin/packages/alquimia/package.py +++ b/var/spack/repos/builtin/packages/alquimia/package.py @@ -31,6 +31,7 @@ class Alquimia(CMakePackage): homepage = "https://github.com/LBL-EESA/alquimia-dev" + version('xsdk-0.3.0', git='https://github.com/LBL-EESA/alquimia-dev.git', tag='xsdk-0.3.0') version('xsdk-0.2.0', git='https://github.com/LBL-EESA/alquimia-dev.git', tag='xsdk-0.2.0') version('develop', git='https://github.com/LBL-EESA/alquimia-dev.git') @@ -39,8 +40,10 @@ class Alquimia(CMakePackage): depends_on('mpi') depends_on('hdf5') + depends_on('pflotran@xsdk-0.3.0', when='@xsdk-0.3.0') depends_on('pflotran@xsdk-0.2.0', when='@xsdk-0.2.0') depends_on('pflotran@develop', when='@develop') + depends_on('petsc@3.8.0:', when='@xsdk-0.3.0') depends_on('petsc@xsdk-0.2.0', when='@xsdk-0.2.0') depends_on('petsc@develop', when='@develop') diff --git a/var/spack/repos/builtin/packages/pflotran/package.py b/var/spack/repos/builtin/packages/pflotran/package.py index e04e33a1db..a57a040107 100644 --- a/var/spack/repos/builtin/packages/pflotran/package.py +++ b/var/spack/repos/builtin/packages/pflotran/package.py @@ -35,10 +35,12 @@ class Pflotran(AutotoolsPackage): version('develop', git='https://bitbucket.org/pflotran/pflotran') version('xsdk-0.2.0', git='https://bitbucket.org/pflotran/pflotran', tag='master') + version('xsdk-0.3.0', git='https://bitbucket.org/pflotran/pflotran', branch='release/xsdk-0.3.0') depends_on('mpi') depends_on('hdf5@1.8.12:+mpi+fortran') depends_on('petsc@develop+hdf5+metis', when='@develop') depends_on('petsc@xsdk-0.2.0+hdf5+metis', when='@xsdk-0.2.0') + depends_on('petsc@3.8.0:+hdf5+metis', when='@xsdk-0.3.0') parallel = False diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py index 901613f77d..e6eaead178 100644 --- a/var/spack/repos/builtin/packages/xsdk/package.py +++ b/var/spack/repos/builtin/packages/xsdk/package.py @@ -40,37 +40,54 @@ class Xsdk(Package): url = 'https://bitbucket.org/saws/saws/get/master.tar.gz' version('develop', 'a52dc710c744afa0b71429b8ec9425bc') + version('0.3.0', 'a52dc710c744afa0b71429b8ec9425bc', preferred=True) version('xsdk-0.2.0', 'a52dc710c744afa0b71429b8ec9425bc') + variant('debug', default=False, description='Compile in debug mode') + variant('cuda', default=False, description='Enable CUDA dependent packages') + + depends_on('hypre@2.12.1~internal-superlu', when='@0.3.0') depends_on('hypre@xsdk-0.2.0~internal-superlu', when='@xsdk-0.2.0') depends_on('hypre@develop~internal-superlu', when='@develop') + depends_on('mfem@3.3.2+mpi+hypre+superlu-dist+petsc+sundials+examples+miniapps', when='@0.3.0') + depends_on('mfem@3.3.2+mpi+hypre+superlu-dist+petsc+sundials+examples+miniapps', when='@develop') + + depends_on('superlu-dist@5.2.2', when='@0.3.0') depends_on('superlu-dist@xsdk-0.2.0', when='@xsdk-0.2.0') depends_on('superlu-dist@develop', when='@develop') + depends_on('trilinos@12.12.1+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse~tpetra~ifpack2~zoltan2~amesos2~exodus', + when='@0.3.0') depends_on('trilinos@xsdk-0.2.0+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse~tpetra~ifpack2~zoltan2~amesos2~exodus', when='@xsdk-0.2.0') depends_on('trilinos@develop+xsdkflags+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse~tpetra~ifpack2~zoltan2~amesos2~exodus', when='@develop') + depends_on('petsc@3.8.2+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps~boost+double~int64', + when='@0.3.0') depends_on('petsc@xsdk-0.2.0+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps~boost+double~int64', when='@xsdk-0.2.0') depends_on('petsc@develop+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps~boost+double~int64', when='@develop') + depends_on('pflotran@xsdk-0.3.0', when='@0.3.0') depends_on('pflotran@xsdk-0.2.0', when='@xsdk-0.2.0') depends_on('pflotran@develop', when='@develop') + depends_on('alquimia@xsdk-0.3.0', when='@0.3.0') depends_on('alquimia@xsdk-0.2.0', when='@xsdk-0.2.0') depends_on('alquimia@develop', when='@develop') + depends_on('sundials@3.1.0~int64+hypre', when='@0.3.0') + depends_on('plasma', when='@0.3.0 %gcc@4.9:') + depends_on('magma', when='@0.3.0 +cuda') + # xSDKTrilinos depends on the version of Trilinos built with # +tpetra which is turned off for faster xSDK # depends_on('xsdktrilinos@xsdk-0.2.0', when='@xsdk-0.2.0') # depends_on('xsdktrilinos@develop', when='@develop') - variant('debug', default=False, description='Compile in debug mode') - # How do we propagate debug flag to all depends on packages ? # If I just do spack install xsdk+debug will that propogate it down? -- cgit v1.2.3-70-g09d2 From 63a23b93c5e12a8dc9789490cf91ac9e48e02229 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Tue, 28 Nov 2017 02:21:12 -0600 Subject: r-cli: new package (#6476) --- var/spack/repos/builtin/packages/r-cli/package.py | 40 +++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-cli/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-cli/package.py b/var/spack/repos/builtin/packages/r-cli/package.py new file mode 100644 index 0000000000..657b910147 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-cli/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RCli(RPackage): + """A suite of tools designed to build attractive command line interfaces + ('CLIs'). Includes tools for drawing rules, boxes, trees, and + 'Unicode' symbols with 'ASCII' alternatives.""" + + homepage = "https://github.com/r-lib/cli#readme" + url = "https://cran.r-project.org/src/contrib/cli_1.0.0.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/cli" + + version('1.0.0', 'e6c4169541d394d6d435c4b430b1dd77') + + depends_on('r-assertthat', type=('build', 'run')) + depends_on('r-crayon', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 7f43411e59a4974f877849a311115ba7ebc2cdba Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 28 Nov 2017 02:26:06 -0600 Subject: Adding list_url to several R module packages (#6474) --- var/spack/repos/builtin/packages/r-dbi/package.py | 2 +- var/spack/repos/builtin/packages/r-dorng/package.py | 2 +- var/spack/repos/builtin/packages/r-downloader/package.py | 2 +- var/spack/repos/builtin/packages/r-futile-logger/package.py | 2 +- var/spack/repos/builtin/packages/r-getoptlong/package.py | 2 +- var/spack/repos/builtin/packages/r-ggvis/package.py | 2 +- var/spack/repos/builtin/packages/r-glmnet/package.py | 2 +- var/spack/repos/builtin/packages/r-htmltools/package.py | 2 +- var/spack/repos/builtin/packages/r-httpuv/package.py | 2 +- var/spack/repos/builtin/packages/r-hwriter/package.py | 2 +- var/spack/repos/builtin/packages/r-jsonlite/package.py | 2 +- var/spack/repos/builtin/packages/r-lattice/package.py | 2 +- var/spack/repos/builtin/packages/r-locfit/package.py | 2 +- var/spack/repos/builtin/packages/r-matrix/package.py | 2 +- var/spack/repos/builtin/packages/r-matrixstats/package.py | 2 +- var/spack/repos/builtin/packages/r-memoise/package.py | 2 +- var/spack/repos/builtin/packages/r-mpm/package.py | 2 +- var/spack/repos/builtin/packages/r-nor1mix/package.py | 2 +- var/spack/repos/builtin/packages/r-pkgconfig/package.py | 2 +- var/spack/repos/builtin/packages/r-r6/package.py | 2 +- var/spack/repos/builtin/packages/r-rcurl/package.py | 2 +- var/spack/repos/builtin/packages/r-shiny/package.py | 2 +- var/spack/repos/builtin/packages/r-tibble/package.py | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-dbi/package.py b/var/spack/repos/builtin/packages/r-dbi/package.py index 5aac25d2fb..00b38984e1 100644 --- a/var/spack/repos/builtin/packages/r-dbi/package.py +++ b/var/spack/repos/builtin/packages/r-dbi/package.py @@ -32,6 +32,6 @@ class RDbi(RPackage): homepage = "http://rstats-db.github.io/DBI" url = "https://cran.rstudio.com/src/contrib/DBI_0.7.tar.gz" - list_url = homepage + list_url = "https://cran.r-project.org/src/contrib/Archive/DBI" version('0.4-1', 'c7ee8f1c5037c2284e99c62698d0f087') version('0.7', '66065dd687d758b72d638adb6a8cab2e') diff --git a/var/spack/repos/builtin/packages/r-dorng/package.py b/var/spack/repos/builtin/packages/r-dorng/package.py index 8c69ee810e..7ac9556d9b 100644 --- a/var/spack/repos/builtin/packages/r-dorng/package.py +++ b/var/spack/repos/builtin/packages/r-dorng/package.py @@ -36,7 +36,7 @@ class RDorng(RPackage): homepage = "https://cran.rstudio.com/web/packages/doRNG/index.html" url = "https://cran.rstudio.com/src/contrib/doRNG_1.6.6.tar.gz" - list_url = homepage + list_url = "https://cran.r-project.org/src/contrib/Archive/doRNG" version('1.6.6', 'ffb26024c58c8c99229470293fbf35cf') diff --git a/var/spack/repos/builtin/packages/r-downloader/package.py b/var/spack/repos/builtin/packages/r-downloader/package.py index a86650fd9f..d71c17e304 100644 --- a/var/spack/repos/builtin/packages/r-downloader/package.py +++ b/var/spack/repos/builtin/packages/r-downloader/package.py @@ -35,7 +35,7 @@ class RDownloader(RPackage): homepage = "https://cran.rstudio.com/web/packages/downloader/index.html" url = "https://cran.rstudio.com/src/contrib/downloader_0.4.tar.gz" - list_url = homepage + list_url = "https://cran.r-project.org/src/contrib/Archive/downloader" version('0.4', 'f26daf8fbeb29a1882bf102f62008594') diff --git a/var/spack/repos/builtin/packages/r-futile-logger/package.py b/var/spack/repos/builtin/packages/r-futile-logger/package.py index 25229e9581..93d735f027 100644 --- a/var/spack/repos/builtin/packages/r-futile-logger/package.py +++ b/var/spack/repos/builtin/packages/r-futile-logger/package.py @@ -32,7 +32,7 @@ class RFutileLogger(RPackage): homepage = "https://cran.rstudio.com/web/packages/futile.logger/index.html" url = "https://cran.rstudio.com/src/contrib/futile.logger_1.4.3.tar.gz" - list_url = homepage + list_url = "https://cran.r-project.org/src/contrib/Archive/futile.logger" version('1.4.3', 'ba0e8d2dfb5a970b51c21907bbf8bfc2') diff --git a/var/spack/repos/builtin/packages/r-getoptlong/package.py b/var/spack/repos/builtin/packages/r-getoptlong/package.py index 5d6fe4f5dd..b4c4a8f4e6 100644 --- a/var/spack/repos/builtin/packages/r-getoptlong/package.py +++ b/var/spack/repos/builtin/packages/r-getoptlong/package.py @@ -33,7 +33,7 @@ class RGetoptlong(RPackage): homepage = "https://cran.rstudio.com/web/packages/GetoptLong/index.html" url = "https://cran.rstudio.com/src/contrib/GetoptLong_0.1.6.tar.gz" - list_url = homepage + list_url = "https://cran.r-project.org/src/contrib/Archive/GetoptLong" version('0.1.6', 'e4b964d0817cb6c6a707297b21405749') diff --git a/var/spack/repos/builtin/packages/r-ggvis/package.py b/var/spack/repos/builtin/packages/r-ggvis/package.py index 2f62ee23db..c0dab6b8e4 100644 --- a/var/spack/repos/builtin/packages/r-ggvis/package.py +++ b/var/spack/repos/builtin/packages/r-ggvis/package.py @@ -32,7 +32,7 @@ class RGgvis(RPackage): homepage = "http://ggvis.rstudio.com/" url = "https://cran.rstudio.com/src/contrib/ggvis_0.4.3.tar.gz" - list_url = homepage + list_url = "https://cran.r-project.org/src/contrib/Archive/ggvis" version('0.4.3', '30297d464278a7974fb125bcc7d84e77') version('0.4.2', '039f45e5c7f1e0652779163d7d99f922') diff --git a/var/spack/repos/builtin/packages/r-glmnet/package.py b/var/spack/repos/builtin/packages/r-glmnet/package.py index f34331b310..4e531165be 100644 --- a/var/spack/repos/builtin/packages/r-glmnet/package.py +++ b/var/spack/repos/builtin/packages/r-glmnet/package.py @@ -35,7 +35,7 @@ class RGlmnet(RPackage): homepage = "https://cran.rstudio.com/web/packages/glmnet/index.html" url = "https://cran.rstudio.com/src/contrib/glmnet_2.0-13.tar.gz" - list_url = homepage + list_url = "https://cran.r-project.org/src/contrib/Archive/glmnet" version('2.0-13', '1dd5636388df5c3a29207d0bf1253343') version('2.0-5', '049b18caa29529614cd684db3beaec2a') diff --git a/var/spack/repos/builtin/packages/r-htmltools/package.py b/var/spack/repos/builtin/packages/r-htmltools/package.py index 3ed8a19f22..865c2f79ae 100644 --- a/var/spack/repos/builtin/packages/r-htmltools/package.py +++ b/var/spack/repos/builtin/packages/r-htmltools/package.py @@ -30,7 +30,7 @@ class RHtmltools(RPackage): homepage = "https://github.com/rstudio/htmltools" url = "https://cran.rstudio.com/src/contrib/htmltools_0.3.6.tar.gz" - list_url = homepage + list_url = "https://cran.r-project.org/src/contrib/Archive/htmltools" version('0.3.6', '336419c2143f958862e01ef1bbc9c253') version('0.3.5', '5f001aff4a39e329f7342dcec5139724') diff --git a/var/spack/repos/builtin/packages/r-httpuv/package.py b/var/spack/repos/builtin/packages/r-httpuv/package.py index 1b5f45961f..59ba283621 100644 --- a/var/spack/repos/builtin/packages/r-httpuv/package.py +++ b/var/spack/repos/builtin/packages/r-httpuv/package.py @@ -36,7 +36,7 @@ class RHttpuv(RPackage): homepage = "https://github.com/rstudio/httpuv" url = "https://cran.rstudio.com/src/contrib/httpuv_1.3.5.tar.gz" - list_url = homepage + list_url = "https://cran.r-project.org/src/contrib/Archive/httpuv" version('1.3.5', '48d894ff0067148f41a651634fbb2012') version('1.3.3', 'c78ae068cf59e949b9791be987bb4489') diff --git a/var/spack/repos/builtin/packages/r-hwriter/package.py b/var/spack/repos/builtin/packages/r-hwriter/package.py index 8c67f4bb1a..df8a2129db 100644 --- a/var/spack/repos/builtin/packages/r-hwriter/package.py +++ b/var/spack/repos/builtin/packages/r-hwriter/package.py @@ -31,5 +31,5 @@ class RHwriter(RPackage): homepage = "https://cran.rstudio.com/web/packages/hwriter/index.html" url = "https://cran.rstudio.com/src/contrib/hwriter_1.3.2.tar.gz" - list_url = homepage + list_url = "https://cran.r-project.org/src/contrib/Archive/hwriter" version('1.3.2', '9eef49df2eb68bbf3a16b5860d933517') diff --git a/var/spack/repos/builtin/packages/r-jsonlite/package.py b/var/spack/repos/builtin/packages/r-jsonlite/package.py index 5ed0d42616..13f3bcd0e2 100644 --- a/var/spack/repos/builtin/packages/r-jsonlite/package.py +++ b/var/spack/repos/builtin/packages/r-jsonlite/package.py @@ -39,7 +39,7 @@ class RJsonlite(RPackage): homepage = "https://github.com/jeroenooms/jsonlite" url = "https://cran.rstudio.com/src/contrib/jsonlite_1.5.tar.gz" - list_url = homepage + list_url = "https://cran.r-project.org/src/contrib/Archive/jsonlite" version('1.5', '2a81c261a702fccbbd5d2b32df108f76') version('1.2', '80cd2678ae77254be470f5931db71c51') diff --git a/var/spack/repos/builtin/packages/r-lattice/package.py b/var/spack/repos/builtin/packages/r-lattice/package.py index 49714423a1..170e99aa9d 100644 --- a/var/spack/repos/builtin/packages/r-lattice/package.py +++ b/var/spack/repos/builtin/packages/r-lattice/package.py @@ -33,7 +33,7 @@ class RLattice(RPackage): homepage = "http://lattice.r-forge.r-project.org/" url = "https://cran.rstudio.com/src/contrib/lattice_0.20-35.tar.gz" - list_url = homepage + list_url = "https://cran.r-project.org/src/contrib/Archive/lattice" version('0.20-35', '07f1814623b3da6278ca61554ff7bfe6') version('0.20-34', 'c2a648b22d4206ae7526fb70b8e90fed') diff --git a/var/spack/repos/builtin/packages/r-locfit/package.py b/var/spack/repos/builtin/packages/r-locfit/package.py index 5153b3450f..99b7af6fcf 100644 --- a/var/spack/repos/builtin/packages/r-locfit/package.py +++ b/var/spack/repos/builtin/packages/r-locfit/package.py @@ -30,7 +30,7 @@ class RLocfit(RPackage): homepage = "https://cran.rstudio.com/web/packages/locfit/index.html" url = "https://cran.rstudio.com/src/contrib/locfit_1.5-9.1.tar.gz" - list_url = homepage + list_url = "https://cran.r-project.org/src/contrib/Archive/locfit" version('1.5-9.1', '38af7791c9cda78e2804020e65ac7fb4') diff --git a/var/spack/repos/builtin/packages/r-matrix/package.py b/var/spack/repos/builtin/packages/r-matrix/package.py index cf9a8649dd..c2911c4211 100644 --- a/var/spack/repos/builtin/packages/r-matrix/package.py +++ b/var/spack/repos/builtin/packages/r-matrix/package.py @@ -31,7 +31,7 @@ class RMatrix(RPackage): homepage = "http://matrix.r-forge.r-project.org/" url = "https://cran.rstudio.com/src/contrib/Matrix_1.2-11.tar.gz" - list_url = homepage + list_url = "https://cran.r-project.org/src/contrib/Archive/Matrix" version('1.2-11', 'a8c1a893f36d7ea918ddbf8cb8d10b43') version('1.2-8', '4a6406666bf97d3ec6b698eea5d9c0f5') version('1.2-6', 'f545307fb1284861e9266c4e9712c55e') diff --git a/var/spack/repos/builtin/packages/r-matrixstats/package.py b/var/spack/repos/builtin/packages/r-matrixstats/package.py index a04eaf6d47..177275267b 100644 --- a/var/spack/repos/builtin/packages/r-matrixstats/package.py +++ b/var/spack/repos/builtin/packages/r-matrixstats/package.py @@ -35,6 +35,6 @@ class RMatrixstats(RPackage): homepage = "https://cran.rstudio.com/web/packages/matrixStats/index.html" url = "https://cran.rstudio.com/src/contrib/matrixStats_0.52.2.tar.gz" - list_url = homepage + list_url = "https://cran.r-project.org/src/contrib/Archive/matrixStats" version('0.52.2', '41b987d3ae96ee6895875c413adcba3c') diff --git a/var/spack/repos/builtin/packages/r-memoise/package.py b/var/spack/repos/builtin/packages/r-memoise/package.py index 867ee78a39..6bc766f0cd 100644 --- a/var/spack/repos/builtin/packages/r-memoise/package.py +++ b/var/spack/repos/builtin/packages/r-memoise/package.py @@ -31,7 +31,7 @@ class RMemoise(RPackage): homepage = "https://github.com/hadley/memoise" url = "https://cran.rstudio.com/src/contrib/memoise_1.1.0.tar.gz" - list_url = homepage + list_url = "https://cran.r-project.org/src/contrib/Archive/memoise" version('1.1.0', '493209ee04673f0fcab473c3dd80fb8c') version('1.0.0', 'd31145292e2a88ae9a504cab1602e4ac') diff --git a/var/spack/repos/builtin/packages/r-mpm/package.py b/var/spack/repos/builtin/packages/r-mpm/package.py index e2f59227a0..78b21ab11b 100644 --- a/var/spack/repos/builtin/packages/r-mpm/package.py +++ b/var/spack/repos/builtin/packages/r-mpm/package.py @@ -32,7 +32,7 @@ class RMpm(RPackage): homepage = "https://cran.rstudio.com/web/packages/mpm/index.html" url = "https://cran.rstudio.com/src/contrib/mpm_1.0-22.tar.gz" - list_url = homepage + list_url = "https://cran.r-project.org/src/contrib/Archive/mpm" version('1.0-22', '91885c421cafd89ce8893ccf827165a2') depends_on('r-kernsmooth', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-nor1mix/package.py b/var/spack/repos/builtin/packages/r-nor1mix/package.py index ceb9852d7e..f02a70cc9b 100644 --- a/var/spack/repos/builtin/packages/r-nor1mix/package.py +++ b/var/spack/repos/builtin/packages/r-nor1mix/package.py @@ -34,6 +34,6 @@ class RNor1mix(RPackage): homepage = "https://CRAN.R-project.org/package=nor1mix" url = "https://cran.rstudio.com/src/contrib/nor1mix_1.2-3.tar.gz" - list_url = homepage + list_url = "https://cran.r-project.org/src/contrib/Archive/nor1mix" version('1.2-3', '60eb5cc1ea6b366f53042087a080b105') diff --git a/var/spack/repos/builtin/packages/r-pkgconfig/package.py b/var/spack/repos/builtin/packages/r-pkgconfig/package.py index d5045721a9..56263cb210 100644 --- a/var/spack/repos/builtin/packages/r-pkgconfig/package.py +++ b/var/spack/repos/builtin/packages/r-pkgconfig/package.py @@ -32,5 +32,5 @@ class RPkgconfig(RPackage): homepage = "https://cran.rstudio.com/web/packages/pkgconfig/index.html" url = "https://cran.rstudio.com/src/contrib/pkgconfig_2.0.1.tar.gz" - list_url = homepage + list_url = "https://cran.r-project.org/src/contrib/Archive/pkgconfig" version('2.0.1', 'a20fd9588e37995995fa62dc4828002e') diff --git a/var/spack/repos/builtin/packages/r-r6/package.py b/var/spack/repos/builtin/packages/r-r6/package.py index 627c09ee4b..f424b1c8e1 100644 --- a/var/spack/repos/builtin/packages/r-r6/package.py +++ b/var/spack/repos/builtin/packages/r-r6/package.py @@ -35,7 +35,7 @@ class RR6(RPackage): homepage = "https://github.com/wch/R6/" url = "https://cran.rstudio.com/src/contrib/R6_2.2.2.tar.gz" - list_url = homepage + list_url = "https://cran.r-project.org/src/contrib/Archive/R6" version('2.2.2', '635b58c65bff624a1fab69c6b1989801') version('2.2.0', '659d83b2d3f7a308a48332b4cfbdab49') diff --git a/var/spack/repos/builtin/packages/r-rcurl/package.py b/var/spack/repos/builtin/packages/r-rcurl/package.py index 75a1b3ab17..21159c3a61 100644 --- a/var/spack/repos/builtin/packages/r-rcurl/package.py +++ b/var/spack/repos/builtin/packages/r-rcurl/package.py @@ -54,7 +54,7 @@ class RRcurl(RPackage): homepage = "https://cran.rstudio.com/web/packages/RCurl/index.html" url = "https://cran.rstudio.com/src/contrib/RCurl_1.95-4.8.tar.gz" - list_url = homepage + list_url = "https://cran.r-project.org/src/contrib/Archive/RCurl" version('1.95-4.8', '9c8aaff986eb2792c89dd3ae54d21580') diff --git a/var/spack/repos/builtin/packages/r-shiny/package.py b/var/spack/repos/builtin/packages/r-shiny/package.py index c75e22ea31..1d42d8df23 100644 --- a/var/spack/repos/builtin/packages/r-shiny/package.py +++ b/var/spack/repos/builtin/packages/r-shiny/package.py @@ -33,7 +33,7 @@ class RShiny(RPackage): homepage = "http://shiny.rstudio.com/" url = "https://cran.rstudio.com/src/contrib/shiny_1.0.5.tar.gz" - list_url = homepage + list_url = "https://cran.r-project.org/src/contrib/Archive/shiny" version('1.0.5', '419dd5d3ea0bd87a07f8f0b1ef14fc13') version('0.13.2', 'cb5bff7a28ad59ec2883cd0912ca9611') diff --git a/var/spack/repos/builtin/packages/r-tibble/package.py b/var/spack/repos/builtin/packages/r-tibble/package.py index 67751d6381..66b9f9235a 100644 --- a/var/spack/repos/builtin/packages/r-tibble/package.py +++ b/var/spack/repos/builtin/packages/r-tibble/package.py @@ -31,7 +31,7 @@ class RTibble(RPackage): homepage = "https://github.com/tidyverse/tibble" url = "https://cran.rstudio.com/src/contrib/tibble_1.3.4.tar.gz" - list_url = homepage + list_url = "https://cran.r-project.org/src/contrib/Archive/tibble" version('1.3.4', '298e81546f999fb0968625698511b8d3') version('1.2', 'bdbc3d67aa16860741add6d6ec20ea13') version('1.1', '2fe9f806109d0b7fadafb1ffafea4cb8') -- cgit v1.2.3-70-g09d2 From 6edd782d39fd64fceca86c8edb224ae3f2378083 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 28 Nov 2017 02:27:14 -0600 Subject: r-seurat: Create new package (#6477) --- .../repos/builtin/packages/r-seurat/package.py | 73 ++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-seurat/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-seurat/package.py b/var/spack/repos/builtin/packages/r-seurat/package.py new file mode 100644 index 0000000000..5930430b6d --- /dev/null +++ b/var/spack/repos/builtin/packages/r-seurat/package.py @@ -0,0 +1,73 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RSeurat(RPackage): + """Seurat is an R package designed for QC, analysis, and exploration of + single cell RNA-seq data.""" + + homepage = "http://satijalab.org/seurat/" + url = "https://cran.r-project.org/src/contrib/Seurat_2.1.0.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/Seurat" + + version('2.1.0', '46427837bb739883f9b7addd08fccee5') + version('2.0.1', 'a77794891e93b9fa1ef41735fe8424ea') + + depends_on('r@3.4.0:3.4.9') + depends_on('r-ggplot2', type=('build', 'run')) + depends_on('r-gplots', type=('build', 'run')) + depends_on('r-reshape2', type=('build', 'run')) + depends_on('r-ape', type=('build', 'run')) + depends_on('r-tidyr', type=('build', 'run')) + depends_on('r-caret', type=('build', 'run')) + depends_on('r-gdata', type=('build', 'run')) + depends_on('r-glue', type=('build', 'run')) + depends_on('r-pkgconfig', type=('build', 'run')) + depends_on('r-plogr', type=('build', 'run')) + depends_on('r-gridextra', type=('build', 'run')) + depends_on('r-cowplot', type=('build', 'run')) + depends_on('r-rocr', type=('build', 'run')) + depends_on('r-hmisc', type=('build', 'run')) + depends_on('r-nmf', type=('build', 'run')) + depends_on('r-irlba', type=('build', 'run')) + depends_on('r-igraph', type=('build', 'run')) + depends_on('r-fpc', type=('build', 'run')) + depends_on('r-rcppprogress', type=('build', 'run')) + depends_on('r-lars', type=('build', 'run')) + depends_on('r-dtw', type=('build', 'run')) + depends_on('r-mixtools', type=('build', 'run')) + depends_on('r-ica', type=('build', 'run')) + depends_on('r-diffusionmap', type=('build', 'run')) + depends_on('r-tsne', type=('build', 'run')) + depends_on('r-rtsne', type=('build', 'run')) + depends_on('r-ranger', type=('build', 'run')) + depends_on('r-pbapply', type=('build', 'run')) + depends_on('r-ggjoy', type=('build', 'run')) + depends_on('r-plotly', type=('build', 'run')) + depends_on('r-sdmtools', type=('build', 'run')) + depends_on('r-tclust', type=('build', 'run')) + depends_on('r-fnn', type=('build', 'run')) + depends_on('r-vgam', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 8d64e192dc17bd09e21ec952ff73fab8efaf5db6 Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Tue, 28 Nov 2017 02:27:36 -0600 Subject: r-topgo: Create new package. (#6479) --- .../repos/builtin/packages/r-topgo/package.py | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-topgo/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-topgo/package.py b/var/spack/repos/builtin/packages/r-topgo/package.py new file mode 100644 index 0000000000..2eee5ac588 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-topgo/package.py @@ -0,0 +1,48 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RTopgo(RPackage): + """topGO package provides tools for testing GO terms while accounting + for the topology of the GO graph. Different test statistics and + different methods for eliminating local similarities and dependencies + between GO terms can be implemented and applied.""" + + homepage = "https://www.bioconductor.org/packages/topGO/" + url = "https://git.bioconductor.org/packages/topGO" + + version('2.28.0', git='https://git.bioconductor.org/packages/topGO', commit='066a975d460046cce33fb27e74e6a0ebc33fd716') + + depends_on('r@3.4.0:3.4.9') + depends_on('r-dbi', type=('build', 'run')) + depends_on('r-matrixstats', type=('build', 'run')) + depends_on('r-lattice', type=('build', 'run')) + depends_on('r-sparsem', type=('build', 'run')) + depends_on('r-annotationdbi', type=('build', 'run')) + depends_on('r-go-db', type=('build', 'run')) + depends_on('r-biobase', type=('build', 'run')) + depends_on('r-graph', type=('build', 'run')) + depends_on('r-biocgenerics', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 5cdf94233b618b69088f3f707a7fc201d408ec5f Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Tue, 28 Nov 2017 02:28:42 -0600 Subject: r-rcppcctz: created new package (#6480) --- .../repos/builtin/packages/r-rcppcctz/package.py | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-rcppcctz/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-rcppcctz/package.py b/var/spack/repos/builtin/packages/r-rcppcctz/package.py new file mode 100644 index 0000000000..070d47806a --- /dev/null +++ b/var/spack/repos/builtin/packages/r-rcppcctz/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RRcppcctz(RPackage): + """'Rcpp' Access to the 'CCTZ' timezone library is provided. 'CCTZ' is a + C++ library for translating between absolute and civil times using the + rules of a time zone. The 'CCTZ' source code, released under the + Apache 2.0 License, is included in this package. See + for more details.""" + + homepage = "https://github.com/eddelbuettel/rcppcctz" + url = "https://cran.r-project.org/src/contrib/RcppCCTZ_0.2.3.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/RcppCCTZ" + + version('0.2.3', '7635014a1cc696a3f00a7619fb5d7008') + + depends_on('r-rcpp', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From bec8ddcf8193cd24c1a7cf995a44ff90023fb043 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Tue, 28 Nov 2017 02:29:29 -0600 Subject: r-classint: created new package (#6481) --- .../repos/builtin/packages/r-classint/package.py | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-classint/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-classint/package.py b/var/spack/repos/builtin/packages/r-classint/package.py new file mode 100644 index 0000000000..472579e65e --- /dev/null +++ b/var/spack/repos/builtin/packages/r-classint/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RClassint(RPackage): + """Selected commonly used methods for choosing univariate class intervals + for mapping or other graphics purposes.""" + + homepage = "https://cran.r-project.org/package=classInt" + url = "https://cran.r-project.org/src/contrib/classInt_0.1-24.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/classInt" + + version('0.1-24', '45f1bde3ec7601ce17c99189be5c0fd5') + + depends_on('r-e1071', type=('build', 'run')) + depends_on('r-class', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From fdb2386ba7bd0ec323bfd519b7cb2ac2a7617085 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Tue, 28 Nov 2017 13:42:27 +0100 Subject: pi-scipy: add 1.0.0 (#6486) --- var/spack/repos/builtin/packages/py-scipy/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-scipy/package.py b/var/spack/repos/builtin/packages/py-scipy/package.py index 3aced0bf4a..ad828d18ed 100644 --- a/var/spack/repos/builtin/packages/py-scipy/package.py +++ b/var/spack/repos/builtin/packages/py-scipy/package.py @@ -49,6 +49,7 @@ class PyScipy(PythonPackage): 'scipy.special._precompute' ] + version('1.0.0', '53fa34bd3733a9a4216842b6000f7316') # See https://github.com/spack/spack/issues/2737 version('0.19.1', '6b4d91b62f1926282b127194a06b72b3', url="https://pypi.io/packages/source/s/scipy/scipy-0.19.1.tar.gz") -- cgit v1.2.3-70-g09d2 From ddb55c2b2620202140b2ab8f94645b971ee75cfa Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Tue, 28 Nov 2017 13:42:59 +0100 Subject: py-numpy: add 1.13.3 (#6484) --- var/spack/repos/builtin/packages/py-numpy/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-numpy/package.py b/var/spack/repos/builtin/packages/py-numpy/package.py index f5126e36a0..5c22b39100 100644 --- a/var/spack/repos/builtin/packages/py-numpy/package.py +++ b/var/spack/repos/builtin/packages/py-numpy/package.py @@ -48,6 +48,7 @@ class PyNumpy(PythonPackage): # FIXME: numpy._build_utils and numpy.core.code_generators failed to import # FIXME: Is this expected? + version('1.13.3', '300a6f0528122128ac07c6deb5c95917') version('1.13.1', '2c3c0f4edf720c3a7b525dacc825b9ae') version('1.13.0', 'fd044f0b8079abeaf5e6d2e93b2c1d03') version('1.12.1', 'c75b072a984028ac746a6a332c209a91') -- cgit v1.2.3-70-g09d2 From acd80b16a8a4faf8b73de44d14e83d49cfca51d1 Mon Sep 17 00:00:00 2001 From: becker33 Date: Tue, 28 Nov 2017 10:33:45 -0800 Subject: update scr package for cray (#6407) * update scr package for cray * added info on scr version 1.2.0 --- var/spack/repos/builtin/packages/scr/package.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/scr/package.py b/var/spack/repos/builtin/packages/scr/package.py index 1f49f34969..24b3de7102 100644 --- a/var/spack/repos/builtin/packages/scr/package.py +++ b/var/spack/repos/builtin/packages/scr/package.py @@ -40,6 +40,8 @@ class Scr(CMakePackage): # url = "https://github.com/LLNL/scr/releases/download/v1.1.8/scr-1.1.8.tar.gz" # version('1.1.8', '6a0f11ad18e27fcfc00a271ff587b06e') + url = "https://github.com/LLNL/scr/archive/v1.2.0.tar.gz" + version('1.2.0', '060e9e9c7604c1765f3991f9cd6e9d2d') version('master', git='https://github.com/llnl/scr.git', branch='master') depends_on('pdsh+static_modules', type=('build', 'run')) @@ -89,6 +91,8 @@ class Scr(CMakePackage): variant('cntl_base', default='/tmp', description='Compile time default location for control directory.') + conflicts('platform=bgq') + def get_abs_path_rel_prefix(self, path): # Return path if absolute, otherwise prepend prefix if os.path.isabs(path): @@ -100,6 +104,9 @@ class Scr(CMakePackage): spec = self.spec args = [] + if 'platform=cray' in spec: + args.append('-DSCR_LINK_STATIC=ON') + args.append('-DENABLE_FORTRAN={0}'.format('+fortran' in spec)) conf_path = self.get_abs_path_rel_prefix( -- cgit v1.2.3-70-g09d2 From 64b121fa870152336ee266766dbc6fbeef5f6242 Mon Sep 17 00:00:00 2001 From: healther Date: Tue, 28 Nov 2017 22:54:40 +0100 Subject: add package: py-backports-functools-lru-cache (#6488) --- .../py-backports-functools-lru-cache/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py b/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py new file mode 100644 index 0000000000..e512c0bbb7 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyBackportsFunctoolsLruCache(PythonPackage): + """Backport of functools.lru_cache from Python 3.3""" + + homepage = "https://bitbucket.org/jaraco/backports.functools_lru_cache" + url = "https://pypi.io/packages/source/b/backports.functools_lru_cache/backports.functools_lru_cache-1.0.1.zip" + + version('1.0.1', 'c789ef439d189330b99872746a6d9e85') + + depends_on('py-setuptools', type='build') + depends_on('py-setuptools-scm@1.15.0:', type='build') + depends_on('python@2.6.0:3.3.99', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 82adc403adba75647f7442726f5579bb88e5daab Mon Sep 17 00:00:00 2001 From: healther Date: Wed, 29 Nov 2017 00:42:47 +0100 Subject: add package py-isort (#6491) --- .../repos/builtin/packages/py-isort/package.py | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-isort/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-isort/package.py b/var/spack/repos/builtin/packages/py-isort/package.py new file mode 100644 index 0000000000..98f434b012 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-isort/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyIsort(PythonPackage): + """A Python utility / library to sort Python imports.""" + + homepage = "https://github.com/timothycrosley/isort" + url = "https://pypi.io/packages/source/i/isort/isort-4.2.15.tar.gz" + + version('4.2.15', '34915a2ce60e6fe3dbcbf5982deef9b4') + + depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From cab07d2562c69ac5ba7c84c43f565489e67ed558 Mon Sep 17 00:00:00 2001 From: healther Date: Wed, 29 Nov 2017 00:43:00 +0100 Subject: add package py-editdistance (#6492) --- .../builtin/packages/py-editdistance/package.py | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-editdistance/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-editdistance/package.py b/var/spack/repos/builtin/packages/py-editdistance/package.py new file mode 100644 index 0000000000..8224b18514 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-editdistance/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyEditdistance(PythonPackage): + """Fast implementation of the edit distance (Levenshtein distance).""" + + homepage = "http://www.example.com://github.com/aflc/editdistance" + url = "https://pypi.io/packages/source/e/editdistance/editdistance-0.4.tar.gz" + + version('0.4', '27434720ca0930a9b6974b182b6237bc') + + depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From 2190ae43a5724b891bacf241d417a1340cabbac1 Mon Sep 17 00:00:00 2001 From: healther Date: Wed, 29 Nov 2017 00:43:43 +0100 Subject: Fix astroid dependency and mark broken version (#6493) --- var/spack/repos/builtin/packages/py-astroid/package.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-astroid/package.py b/var/spack/repos/builtin/packages/py-astroid/package.py index 63be8ae470..c0bb2b6464 100644 --- a/var/spack/repos/builtin/packages/py-astroid/package.py +++ b/var/spack/repos/builtin/packages/py-astroid/package.py @@ -29,12 +29,17 @@ class PyAstroid(PythonPackage): homepage = "https://www.astroid.org/" url = "https://github.com/PyCQA/astroid/archive/astroid-1.4.5.tar.gz" + # version('1.5.3', '6f65e4ea8290ec032320460905afb828') # has broken unit tests version('1.4.5', '7adfc55809908297ef430efe4ea20ac3') version('1.4.4', '8ae6f63f6a2b260bb7f647dafccbc796') version('1.4.3', '4647159de7d4d0c4b1de23ecbfb8e246') version('1.4.2', '677f7965840f375af51b0e86403bee6a') version('1.4.1', 'ed70bfed5e4b25be4292e7fe72da2c02') - depends_on('py-logilab-common', type=('build', 'run')) - depends_on('py-setuptools', type='build') - depends_on('py-six', type=('build', 'run')) + depends_on('py-lazy-object-proxy') + depends_on('py-six') + depends_on('py-wrapt') + depends_on('py-enum34@1.1.3:', when='^python@:3.3.99') + depends_on('py-singledispatch', when='^python@:3.3.99') + depends_on('py-backports-functools-lru-cache', when='^python@:3.2.99') + depends_on('py-setuptools@17.1:') -- cgit v1.2.3-70-g09d2 From 8013996661875e1da41727a465ab06fef2789d97 Mon Sep 17 00:00:00 2001 From: healther Date: Wed, 29 Nov 2017 00:45:08 +0100 Subject: add conflicts to py-enum34 (#6496) --- var/spack/repos/builtin/packages/py-enum34/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-enum34/package.py b/var/spack/repos/builtin/packages/py-enum34/package.py index 35808b0094..89174f28ee 100644 --- a/var/spack/repos/builtin/packages/py-enum34/package.py +++ b/var/spack/repos/builtin/packages/py-enum34/package.py @@ -34,6 +34,7 @@ class PyEnum34(PythonPackage): version('1.1.6', '5f13a0841a61f7fc295c514490d120d0') depends_on('python') + conflicts('python@3.4:') # This dependency breaks concretization # See https://github.com/spack/spack/issues/2793 -- cgit v1.2.3-70-g09d2 From f7fda19f5d7af1023fbfdf5901ea1ed607c5719c Mon Sep 17 00:00:00 2001 From: healther Date: Wed, 29 Nov 2017 00:46:23 +0100 Subject: remove breaking version and cleanup of dependencies (#6494) --- .../repos/builtin/packages/py-pylint/package.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pylint/package.py b/var/spack/repos/builtin/packages/py-pylint/package.py index 75a7c4357b..8b0c8a641e 100644 --- a/var/spack/repos/builtin/packages/py-pylint/package.py +++ b/var/spack/repos/builtin/packages/py-pylint/package.py @@ -30,17 +30,21 @@ class PyPylint(PythonPackage): homepage = "https://pypi.python.org/pypi/pylint" url = "https://pypi.io/packages/source/p/pylint/pylint-1.7.2.tar.gz" - version('1.7.2', '27ee752cdcfacb05bf4940947e6b35c6') + # version('1.7.2', '27ee752cdcfacb05bf4940947e6b35c6') # see dependencies + version('1.6.5', '31da2185bf59142479e4fa16d8a9e347') version('1.4.3', '5924c1c7ca5ca23647812f5971d0ea44') version('1.4.1', 'df7c679bdcce5019389038847e4de622') extends('python', ignore=r'bin/pytest') - depends_on('py-six', type=('build', 'run')) depends_on('py-astroid', type=('build', 'run')) - depends_on('py-logilab-common', type=('build', 'run')) - depends_on('py-pytest-runner', type=('build', 'run')) - depends_on('py-setuptools', type='build') - depends_on('py-setuptools-scm@1.15.0:', type='build') - - # TODO: Add a 'test' deptype - # depends_on('py-nose', type='test') + # note there is no working version of astroid for this + depends_on('py-astroid@1.5.1:', type=('build', 'run'), when='@1.7:') + depends_on('py-six', type=('build', 'run')) + depends_on('py-isort@4.2.5:') + depends_on('py-mccabe') + depends_on('py-editdistance') + depends_on('py-setuptools@17.1:', type='build') + # depends_on('py-setuptools-scm@1.15.0:', type='build') + depends_on('py-configparser', when='^python@:2.8') + depends_on('py-backports-functools-lru-cache', when='^python@:2.8') + depends_on('py-singledispatch', when='^python@:3.3.99') -- cgit v1.2.3-70-g09d2 From 9adcb0b4b1995dfce976090af92c91d82e00acf9 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Wed, 29 Nov 2017 00:47:12 +0100 Subject: libmongoc: Fix pkg-config file not containing snappy and zlib paths (#6467) --- var/spack/repos/builtin/packages/libmongoc/package.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libmongoc/package.py b/var/spack/repos/builtin/packages/libmongoc/package.py index 4d292937f7..8df14af2c3 100644 --- a/var/spack/repos/builtin/packages/libmongoc/package.py +++ b/var/spack/repos/builtin/packages/libmongoc/package.py @@ -42,12 +42,24 @@ class Libmongoc(AutotoolsPackage): variant('snappy', default=True, description='Enable Snappy support.') variant('zlib', default=True, description='Enable zlib support.') + patch('https://github.com/mongodb/mongo-c-driver/pull/466.patch', sha256='713a872217d11aba04a774785a2824d26b566543c270a1fa386114f5200fda20', when='@1.8.1') + + depends_on('autoconf', type='build', when='@1.8.1') + depends_on('automake', type='build', when='@1.8.1') + depends_on('libtool', type='build', when='@1.8.1') + depends_on('m4', type='build', when='@1.8.1') + depends_on('libbson') depends_on('openssl', when='+ssl') depends_on('snappy', when='+snappy') depends_on('zlib', when='+zlib') + @property + def force_autoreconf(self): + # Run autoreconf due to build system patch + return self.spec.satisfies('@1.8.1') + def configure_args(self): spec = self.spec -- cgit v1.2.3-70-g09d2 From b5f3ecf3fac20f8f64e3a96a80f30c8db78846fd Mon Sep 17 00:00:00 2001 From: Yan Grange Date: Wed, 29 Nov 2017 00:51:35 +0100 Subject: Update globus package version and hash (#6482) --- var/spack/repos/builtin/packages/globus-toolkit/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/globus-toolkit/package.py b/var/spack/repos/builtin/packages/globus-toolkit/package.py index 05944b2dd5..eb24a17208 100644 --- a/var/spack/repos/builtin/packages/globus-toolkit/package.py +++ b/var/spack/repos/builtin/packages/globus-toolkit/package.py @@ -30,6 +30,6 @@ class GlobusToolkit(AutotoolsPackage): grids""" homepage = "http://toolkit.globus.org" - url = "http://toolkit.globus.org/ftppub/gt6/installers/src/globus_toolkit-6.0.1470089956.tar.gz" + url = "http://toolkit.globus.org/ftppub/gt6/installers/src/globus_toolkit-6.0.1506371041.tar.gz" - version('6.0.1470089956', 'b77fe3cc5a5844df995688b0e630d077') + version('6.0.1506371041', 'e17146f68e03b3482aaea3874d4087a5') -- cgit v1.2.3-70-g09d2 From cc5d5295bda56dad4a9aa8fdc4e58f8da37b829c Mon Sep 17 00:00:00 2001 From: healther Date: Wed, 29 Nov 2017 00:52:18 +0100 Subject: add missing build dependency to py-pytest-runner (#6490) --- var/spack/repos/builtin/packages/py-pytest-runner/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pytest-runner/package.py b/var/spack/repos/builtin/packages/py-pytest-runner/package.py index 771902afd9..b1c8eab201 100644 --- a/var/spack/repos/builtin/packages/py-pytest-runner/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-runner/package.py @@ -36,3 +36,4 @@ class PyPytestRunner(PythonPackage): version('2.11.1', 'bdb73eb18eca2727944a2dcf963c5a81') depends_on('py-setuptools', type='build') + depends_on('py-setuptools-scm@1.15:', type='build') -- cgit v1.2.3-70-g09d2 From 02371d2ace7c366f0b0b6332010323d478bc7652 Mon Sep 17 00:00:00 2001 From: Stephen Hudson Date: Wed, 29 Nov 2017 03:27:08 -0600 Subject: Add new package nlopt (#6499) --- var/spack/repos/builtin/packages/nlopt/package.py | 80 +++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 var/spack/repos/builtin/packages/nlopt/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nlopt/package.py b/var/spack/repos/builtin/packages/nlopt/package.py new file mode 100644 index 0000000000..53b4aedd91 --- /dev/null +++ b/var/spack/repos/builtin/packages/nlopt/package.py @@ -0,0 +1,80 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Nlopt(CMakePackage): + """NLopt is a free/open-source library for nonlinear optimization, + providing a common interface for a number of different free optimization + routines available online as well as original implementations of various + other algorithms.""" + + homepage = "https://nlopt.readthedocs.io" + url = "https://github.com/stevengj/nlopt/releases/download/nlopt-2.4.2/nlopt-2.4.2.tar.gz" + + version('develop', git='https://github.com/stevengj/nlopt.git', branch='master') + version('2.4.2', 'd0b8f139a4acf29b76dbae69ade8ac54') + + variant('shared', default=True, description='Enables the build of shared libraries') + variant('python', default=True, description='Build python wrappers') + variant('guile', default=False, description='Enable Guile support') + variant('octave', default=False, description='Enable GNU Octave support') + variant('cxx', default=False, description='Build the C++ routines') + + # Note: matlab is licenced - spack does not download automatically + variant("matlab", default=False, description="Build the Matlab bindings.") + + depends_on('cmake@3.0:', type='build', when='@develop') + depends_on('python', when='+python') + depends_on('py-numpy', when='+python', type=('build', 'run')) + depends_on('swig', when='+python') + depends_on('guile', when='+guile') + depends_on('octave', when='+octave') + depends_on('matlab', when='+matlab') + + def cmake_args(self): + # Add arguments other than + # CMAKE_INSTALL_PREFIX and CMAKE_BUILD_TYPE + spec = self.spec + args = [] + + # Specify on command line to alter defaults: + # eg: spack install nlopt@develop +guile -octave +cxx + + # Spack should locate python by default - but to point to a build + if '+python' in spec: + args.append("-DPYTHON_EXECUTABLE=%s" % spec['python'].command.path) + + # On is default + if '-shared' in spec: + args.append('-DBUILD_SHARED_LIBS:Bool=OFF') + + if '+cxx' in spec: + args.append('-DNLOPT_CXX:BOOL=ON') + + if '+matlab' in spec: + args.append("-DMatlab_ROOT_DIR=%s" % spec['matlab'].command.path) + + return args -- cgit v1.2.3-70-g09d2 From a09752428169d01226631d4c7d421a7f261e5ceb Mon Sep 17 00:00:00 2001 From: Michael Bentley Date: Thu, 30 Nov 2017 01:05:40 -0700 Subject: Flit package (#6260) Add initial build support for version 2.0-alpha.1 --- var/spack/repos/builtin/packages/flit/package.py | 52 ++++++++++++++++++++++ .../repos/builtin/packages/py-toml/package.py | 41 +++++++++++++++++ 2 files changed, 93 insertions(+) create mode 100644 var/spack/repos/builtin/packages/flit/package.py create mode 100644 var/spack/repos/builtin/packages/py-toml/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/flit/package.py b/var/spack/repos/builtin/packages/flit/package.py new file mode 100644 index 0000000000..a64f9b86d2 --- /dev/null +++ b/var/spack/repos/builtin/packages/flit/package.py @@ -0,0 +1,52 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class Flit(MakefilePackage): + """Floating-point Litmus Tests (FLiT) is a C++ test infrastructure for + detecting variability in floating-point code caused by variations in + compiler code generation, hardware and execution environments.""" + + homepage = "https://pruners.github.io/flit" + url = "https://github.com/PRUNERS/FLiT" + url = "https://github.com/PRUNERS/FLiT/archive/v2.0-alpha.1.tar.gz" + + version('2.0-alpha.1', '62cf7784bcdc15b962c813b11e478159') + # FIXME: fix install and build to handle the old version, which is not + # installable + # version('1.0.0', '27763c89b044c5e3cfe62dd319a36a2b') + conflicts("@:1.999", msg="Only can build version 2.0 and up") + + # Add dependencies + depends_on('python@3:', type='run') + depends_on('py-numpy', type='run') + depends_on('py-matplotlib tk=False', type='run') + depends_on('py-toml', type='run') + + @property + def install_targets(self): + return ['install', 'PREFIX=%s' % self.prefix] diff --git a/var/spack/repos/builtin/packages/py-toml/package.py b/var/spack/repos/builtin/packages/py-toml/package.py new file mode 100644 index 0000000000..50e2bde91d --- /dev/null +++ b/var/spack/repos/builtin/packages/py-toml/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyToml(PythonPackage): + """A Python library for parsing and creating TOML configuration files. + For more information on the TOML standard, see + https://github.com/toml-lang/toml.git""" + + homepage = "https://github.com/uiri/toml.git" + url = "https://github.com/uiri/toml/archive/0.9.3.tar.gz" + + version('0.9.3', '58e3023a17509dcf4f50581bfc70ff23') + + depends_on('py-setuptools', type='build') + depends_on('python@2.6:2.8,3.3:', type=('build', 'run')) + + phases = ['build', 'check', 'install'] -- cgit v1.2.3-70-g09d2 From 86fbcc71407ffca7fc8cf479f98e9c4280fc2bc7 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Thu, 30 Nov 2017 02:12:58 -0600 Subject: r-nanotime: new package (#6519) --- .../repos/builtin/packages/r-nanotime/package.py | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-nanotime/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-nanotime/package.py b/var/spack/repos/builtin/packages/r-nanotime/package.py new file mode 100644 index 0000000000..2d2e43ed01 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-nanotime/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RNanotime(RPackage): + """Full 64-bit resolution date and time support with resolution up to + nanosecond granularity is provided, with easy transition to and from + the standard 'POSIXct' type.""" + + homepage = "https://cran.r-project.org/package=nanotime" + url = "https://cran.r-project.org/src/contrib/nanotime_0.2.0.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/nanotime" + + version('0.2.0', '796b1f7d0bb43e2f3d98e3cc6f4b0657') + + depends_on('r-bit64', type=('build', 'run')) + depends_on('r-rcppcctz', type=('build', 'run')) + depends_on('r-zoo', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From f9c820c39f8f6a8f626e93a9cfa1a99e2053a67d Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Thu, 30 Nov 2017 02:13:31 -0600 Subject: r-phyloseq: Create new package. (#6518) --- .../repos/builtin/packages/r-phyloseq/package.py | 53 ++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-phyloseq/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-phyloseq/package.py b/var/spack/repos/builtin/packages/r-phyloseq/package.py new file mode 100644 index 0000000000..8976ec7e27 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-phyloseq/package.py @@ -0,0 +1,53 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RPhyloseq(RPackage): + """phyloseq provides a set of classes and tools to facilitate the import, + storage, analysis, and graphical display of microbiome census data.""" + + homepage = "https://www.bioconductor.org/packages/phyloseq/" + url = "https://git.bioconductor.org/packages/phyloseq" + + version('1.20.0', git='https://git.bioconductor.org/packages/phyloseq', commit='107d1d5e3437a6e33982c06a548d3cc91df2a7e0') + + depends_on('r@3.4.0:3.4.9', when='@1.20.0') + depends_on('r-biocgenerics', type=('build', 'run')) + depends_on('r-ade4', type=('build', 'run')) + depends_on('r-ape', type=('build', 'run')) + depends_on('r-biomformat', type=('build', 'run')) + depends_on('r-biostrings', type=('build', 'run')) + depends_on('r-cluster', type=('build', 'run')) + depends_on('r-data-table', type=('build', 'run')) + depends_on('r-foreach', type=('build', 'run')) + depends_on('r-ggplot2', type=('build', 'run')) + depends_on('r-igraph', type=('build', 'run')) + depends_on('r-multtest', type=('build', 'run')) + depends_on('r-plyr', type=('build', 'run')) + depends_on('r-reshape2', type=('build', 'run')) + depends_on('r-scales', type=('build', 'run')) + depends_on('r-vegan', type=('build', 'run')) + depends_on('r-biobase', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 5382279fa6f9277d80333533a9afa60c8aeb5e81 Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Thu, 30 Nov 2017 02:14:12 -0600 Subject: r-biomformat: Create new package. (#6517) --- .../repos/builtin/packages/r-biomformat/package.py | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-biomformat/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-biomformat/package.py b/var/spack/repos/builtin/packages/r-biomformat/package.py new file mode 100644 index 0000000000..fe290c1fd9 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-biomformat/package.py @@ -0,0 +1,48 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RBiomformat(RPackage): + """This is an R package for interfacing with the BIOM format. This + package includes basic tools for reading biom-format files, accessing + and subsetting data tables from a biom object (which is more complex + than a single table), as well as limited support for writing a + biom-object back to a biom-format file. The design of this API is + intended to match the python API and other tools included with the + biom-format project, but with a decidedly "R flavor" that should be + familiar to R users. This includes S4 classes and methods, as well + as extensions of common core functions/methods.""" + + homepage = "https://www.bioconductor.org/packages/biomformat/" + url = "https://git.bioconductor.org/packages/biomformat" + + version('1.4.0', git='https://git.bioconductor.org/packages/biomformat', commit='83b4b1883bc56ea93a0a6ca90fc1b18712ef0f1a') + + depends_on('r-plyr', type=('build', 'run')) + depends_on('r-jsonlite', type=('build', 'run')) + depends_on('r-matrix', type=('build', 'run')) + depends_on('r-rhdf5', type=('build', 'run')) + depends_on('r@3.4.0:3.4.9', when='@1.4.0') -- cgit v1.2.3-70-g09d2 From 130c56dbaae110b40fe51d0934e3f6875c84aa20 Mon Sep 17 00:00:00 2001 From: healther Date: Thu, 30 Nov 2017 09:17:28 +0100 Subject: add package py-lazy-object-proxy (#6489) --- .../packages/py-lazy-object-proxy/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-lazy-object-proxy/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-lazy-object-proxy/package.py b/var/spack/repos/builtin/packages/py-lazy-object-proxy/package.py new file mode 100644 index 0000000000..5b3cd2f852 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-lazy-object-proxy/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyLazyObjectProxy(PythonPackage): + """A fast and thorough lazy object proxy.""" + + homepage = "https://github.com/ionelmc/python-lazy-object-proxy" + url = "https://pypi.io/packages/source/l/lazy-object-proxy/lazy-object-proxy-1.3.1.tar.gz" + + version('1.3.1', 'e128152b76eb5b9ba759504936139fd0') + + conflicts('^python@3.0:3.2.99') + + depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From 3dafbe901a2a2ade232f3221dd27786ee6f42097 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 30 Nov 2017 02:18:54 -0600 Subject: Fix CGAL checksum and switch to more stable URL (#6511) --- var/spack/repos/builtin/packages/cgal/package.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cgal/package.py b/var/spack/repos/builtin/packages/cgal/package.py index 8961ee48bc..fe591b2b8a 100644 --- a/var/spack/repos/builtin/packages/cgal/package.py +++ b/var/spack/repos/builtin/packages/cgal/package.py @@ -33,12 +33,13 @@ class Cgal(CMakePackage): molecular biology, medical imaging, computer graphics, and robotics. """ homepage = 'http://www.cgal.org/' - url = 'https://github.com/CGAL/cgal/archive/releases/CGAL-4.7.tar.gz' + url = 'https://github.com/CGAL/cgal/releases/download/releases/CGAL-4.11/CGAL-4.11.tar.xz' - version('4.9.1', 'df6517df3320bf6c9de2e1b0361738b9') - version('4.9', '7b628db3e5614347f776c046b7666089') - version('4.7', '4826714810f3b4c65cac96b90fb03b67') - version('4.6.3', 'e8ee2ecc8d2b09b94a121c09257b576d') + version('4.11', '0e9566046e402f8dc514caef11155864') + version('4.9.1', '820ef17ffa7ed87af6cc9918a961d966') + version('4.9', 'ee31343dbc4bf7b5b7501ec1650e9233') + version('4.7', '623d91fb2ab0a35049dc6098a0f235cc') + version('4.6.3', '6953897544d41ffcc63ffe58b32a688f') variant('shared', default=True, description='Enables the build of shared libraries') -- cgit v1.2.3-70-g09d2 From 4a55f810518a759f6155e1a712e88665845ae64a Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Thu, 30 Nov 2017 22:26:05 -0600 Subject: r-units: new package (#6531) --- .../repos/builtin/packages/r-units/package.py | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-units/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-units/package.py b/var/spack/repos/builtin/packages/r-units/package.py new file mode 100644 index 0000000000..66f91ec56b --- /dev/null +++ b/var/spack/repos/builtin/packages/r-units/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RUnits(RPackage): + """Support for measurement units in R vectors, matrices and arrays: + automatic propagation, conversion, derivation and simplification of + units; raising errors in case of unit incompatibility. Compatible with + the POSIXct, Date and difftime classes. Uses the UNIDATA udunits + library and unit database for unit compatibility checking and + conversion.""" + + homepage = "https://github.com/edzer/units/" + url = "https://cran.r-project.org/src/contrib/units_0.4-6.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/units" + + version('0.4-6', '0bb90dde5dad7608fa6feb1599381bf2') + + depends_on('r-udunits2', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From e0264404b6aad46b4821d8aa4c42c5b31212bde1 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Fri, 1 Dec 2017 04:16:35 -0600 Subject: r-udunits2: new package r-udunits2 (#6533) --- .../repos/builtin/packages/r-udunits2/package.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-udunits2/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-udunits2/package.py b/var/spack/repos/builtin/packages/r-udunits2/package.py new file mode 100644 index 0000000000..7bc2521b51 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-udunits2/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RUdunits2(RPackage): + """Provides simple bindings to Unidata's udunits library.""" + + homepage = "https://github.com/pacificclimate/Rudunits2" + url = "https://cran.r-project.org/src/contrib/udunits2_0.13.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/udunits2" + + version('0.13', 'c8717808c740ef70eed7aea93c7c4c7d') + + depends_on('udunits2') -- cgit v1.2.3-70-g09d2 From bd94be818a48eb5566ca4dcaa4c180e673029cc4 Mon Sep 17 00:00:00 2001 From: Paschalis Korosoglou Date: Fri, 1 Dec 2017 15:25:23 +0200 Subject: Added variant static for hwloc (#6538) --- var/spack/repos/builtin/packages/hwloc/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hwloc/package.py b/var/spack/repos/builtin/packages/hwloc/package.py index 2af1cba322..e8d78a223e 100644 --- a/var/spack/repos/builtin/packages/hwloc/package.py +++ b/var/spack/repos/builtin/packages/hwloc/package.py @@ -58,6 +58,7 @@ class Hwloc(AutotoolsPackage): variant('libxml2', default=True, description="Build with libxml2") variant('pci', default=(sys.platform != 'darwin'), description="Support analyzing devices on PCI bus") + variant('static', default=False, description="Build static libraries") depends_on('cuda', when='+cuda') depends_on('libpciaccess', when='+pci') @@ -73,6 +74,7 @@ class Hwloc(AutotoolsPackage): "--enable-cuda" if '+cuda' in spec else "--disable-cuda", "--enable-libxml2" if '+libxml2' in spec else "--disable-libxml2", "--enable-pci" if '+pci' in spec else "--disable-pci", + "--enable-static" if '+static' in spec else "--disable-static", # Disable OpenCL, since hwloc might pick up an OpenCL # library at build time that is then not found at run time # (Alternatively, we could require OpenCL as dependency.) -- cgit v1.2.3-70-g09d2 From fa32f8f91499bdf1601ef18b294b9ff3f4159f31 Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 1 Dec 2017 12:00:45 -0600 Subject: py-dendropy: Create new package (#6528) --- .../repos/builtin/packages/py-dendropy/package.py | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-dendropy/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-dendropy/package.py b/var/spack/repos/builtin/packages/py-dendropy/package.py new file mode 100644 index 0000000000..d638745d10 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-dendropy/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyDendropy(PythonPackage): + """DendroPy is a Python library for phylogenetic computing. It provides + classes and functions for the simulation, processing, and manipulation of + phylogenetic trees and character matrices, and supports the reading and + writing of phylogenetic data in a range of formats, such as NEXUS, NEWICK, + NeXML, Phylip, FASTA, etc.""" + + homepage = "https://www.dendropy.org" + url = "https://pypi.io/packages/source/d/dendropy/DendroPy-4.3.0.tar.gz" + + version('4.3.0', '56c37eb7db69686c8ef3467562f4e7c5') + version('3.12.0', '6971ac9a8508b4198fd357fab0affc84') + + depends_on('python@2.7:,3.4:') + depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From d5c96dbd94119d10bd8fcf506ba389d56b5e0fca Mon Sep 17 00:00:00 2001 From: Stephen Hudson Date: Fri, 1 Dec 2017 12:01:08 -0600 Subject: Add new package py-libensemble (#6525) --- .../builtin/packages/py-libensemble/package.py | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-libensemble/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-libensemble/package.py b/var/spack/repos/builtin/packages/py-libensemble/package.py new file mode 100644 index 0000000000..ef6cf08ca0 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-libensemble/package.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class PyLibensemble(PythonPackage): + """Library for managing ensemble-like collections of computations.""" + + homepage = "https://libensemble.readthedocs.io" + url = "https://pypi.io/packages/source/l/libensemble/libensemble-0.1.0.tar.gz" + + version('develop', git='https://github.com/Libensemble/libensemble.git', branch='master') + version('0.1.0', '0c3d45dd139429de1a5273e5bd8e46ec') + + depends_on('python@2.7:2.8,3.3:') + depends_on('py-setuptools', type='build') + depends_on('mpi') + depends_on('py-mpi4py@2.0:', type=('build', 'run')) + depends_on('py-numpy', type=('build', 'run')) + depends_on('py-scipy', type=('build', 'run')) + depends_on('py-petsc4py@3.5:', type=('build', 'run')) + depends_on('nlopt', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From d6863a29402fba46f4a583f6bda7bdc91b6bb12b Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Fri, 1 Dec 2017 19:09:37 +0100 Subject: ADIOS: 1.13.0 (#6539) New release of ADIOS: 1.13.0. --- var/spack/repos/builtin/packages/adios/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/adios/package.py b/var/spack/repos/builtin/packages/adios/package.py index 1b0b88d167..12b40955b7 100644 --- a/var/spack/repos/builtin/packages/adios/package.py +++ b/var/spack/repos/builtin/packages/adios/package.py @@ -37,6 +37,7 @@ class Adios(AutotoolsPackage): version('develop', git='https://github.com/ornladios/ADIOS.git', branch='master') + version('1.13.0', '68af36b821debbdf4748b20320a990ce') version('1.12.0', '84a1c71b6698009224f6f748c5257fc9') version('1.11.1', '5639bfc235e50bf17ba9dafb14ea4185') version('1.11.0', '5eead5b2ccf962f5e6d5f254d29d5238') -- cgit v1.2.3-70-g09d2 From 80048ae4a98b81ad645a7186c7d713662e57fd9c Mon Sep 17 00:00:00 2001 From: sknigh Date: Fri, 1 Dec 2017 12:46:39 -0800 Subject: Paraview expects qt to have opengl (#6520) --- var/spack/repos/builtin/packages/paraview/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index 8bf43b6132..4be48a1b50 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -54,7 +54,8 @@ class Paraview(CMakePackage): depends_on('py-numpy', when='+python', type='run') depends_on('py-matplotlib', when='+python', type='run') depends_on('mpi', when='+mpi') - depends_on('qt', when='@5.3.0:+qt') + depends_on('qt+opengl', when='@5.3.0:+qt+opengl2') + depends_on('qt~opengl', when='@5.3.0:+qt~opengl2') depends_on('qt@:4', when='@:5.2.0+qt') depends_on('mesa+swrender', when='+osmesa') -- cgit v1.2.3-70-g09d2 From 6918ee3767289581595fac81b22695f57eaa86bb Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 2 Dec 2017 13:45:10 -0600 Subject: salmon: Add version 0.9.1 (#6516) --- var/spack/repos/builtin/packages/salmon/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/salmon/package.py b/var/spack/repos/builtin/packages/salmon/package.py index a323aa1dab..b4e1a4229f 100644 --- a/var/spack/repos/builtin/packages/salmon/package.py +++ b/var/spack/repos/builtin/packages/salmon/package.py @@ -32,8 +32,10 @@ class Salmon(CMakePackage): homepage = "http://combine-lab.github.io/salmon/" url = "https://github.com/COMBINE-lab/salmon/archive/v0.8.2.tar.gz" + version('0.9.1', '1277b8ed65d2c6982ed176a496a2a1e3') version('0.8.2', 'ee512697bc44b13661a16d4e14cf0a00') + depends_on('tbb') depends_on('boost') def cmake_args(self): -- cgit v1.2.3-70-g09d2 From 07fcd0d115f83b61f7f7521f75104776069d4d82 Mon Sep 17 00:00:00 2001 From: Nils Deppe Date: Sat, 2 Dec 2017 18:02:43 -0500 Subject: Add Kvasir MPL (#6529) --- .../repos/builtin/packages/kvasir-mpl/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/kvasir-mpl/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/kvasir-mpl/package.py b/var/spack/repos/builtin/packages/kvasir-mpl/package.py new file mode 100644 index 0000000000..33972c405d --- /dev/null +++ b/var/spack/repos/builtin/packages/kvasir-mpl/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class KvasirMpl(Package): + """Kvasir metaprogramming library""" + + homepage = "https://github.com/kvasir-io/mpl" + + version('develop', git='https://github.com/kvasir-io/mpl.git', + branch='development') + + def install(self, spec, prefix): + install_tree('src', prefix.include) -- cgit v1.2.3-70-g09d2 From 13dade60dd19ffa95a93c14e3f6d90abf76a60f7 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Sun, 3 Dec 2017 10:19:55 +0100 Subject: gcc: remove all variant (#5283) --- var/spack/repos/builtin/packages/gcc/package.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py index 34a7864882..09d60abf55 100644 --- a/var/spack/repos/builtin/packages/gcc/package.py +++ b/var/spack/repos/builtin/packages/gcc/package.py @@ -62,12 +62,17 @@ class Gcc(AutotoolsPackage): version('4.6.4', 'b407a3d1480c11667f293bfb1f17d1a4') version('4.5.4', '27e459c2566b8209ab064570e1b378f7') - # Builds all default languages by default. - # Ada, Go, Jit, and Objective-C++ are not default languages. + # We specifically do not add 'all' variant here because: + # (i) Ada, Go, Jit, and Objective-C++ are not default languages. # In that respect, the name 'all' is rather misleading. + # (ii) Languages other than c,c++,fortran are prone to configure bug in GCC + # For example, 'java' appears to ignore custom location of zlib + # (iii) meaning of 'all' changes with GCC version, i.e. 'java' is not part + # of gcc7. Correctly specifying conflicts() and depends_on() in such a + # case is a PITA. variant('languages', - default='all', - values=('all', 'ada', 'brig', 'c', 'c++', 'fortran', + default='c,c++,fortran', + values=('ada', 'brig', 'c', 'c++', 'fortran', 'go', 'java', 'jit', 'lto', 'objc', 'obj-c++'), multi=True, description='Compilers and runtime libraries to build') @@ -91,7 +96,6 @@ class Gcc(AutotoolsPackage): depends_on('gnat', when='languages=ada') depends_on('binutils~libiberty', when='+binutils') depends_on('zip', type='build', when='languages=java') - depends_on('zip', type='build', when='@:6 languages=all') # TODO: integrate these libraries. # depends_on('ppl') -- cgit v1.2.3-70-g09d2 From 79751729c9537f7f5ff4f583d3294e2359b7fb7b Mon Sep 17 00:00:00 2001 From: Paschalis Korosoglou Date: Mon, 4 Dec 2017 01:19:32 +0200 Subject: Rename variant static to shared (#6543) --- var/spack/repos/builtin/packages/hwloc/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hwloc/package.py b/var/spack/repos/builtin/packages/hwloc/package.py index e8d78a223e..a29f927ba1 100644 --- a/var/spack/repos/builtin/packages/hwloc/package.py +++ b/var/spack/repos/builtin/packages/hwloc/package.py @@ -58,7 +58,7 @@ class Hwloc(AutotoolsPackage): variant('libxml2', default=True, description="Build with libxml2") variant('pci', default=(sys.platform != 'darwin'), description="Support analyzing devices on PCI bus") - variant('static', default=False, description="Build static libraries") + variant('shared', default=True, description="Build shared libraries") depends_on('cuda', when='+cuda') depends_on('libpciaccess', when='+pci') @@ -74,7 +74,7 @@ class Hwloc(AutotoolsPackage): "--enable-cuda" if '+cuda' in spec else "--disable-cuda", "--enable-libxml2" if '+libxml2' in spec else "--disable-libxml2", "--enable-pci" if '+pci' in spec else "--disable-pci", - "--enable-static" if '+static' in spec else "--disable-static", + "--enable-shared" if '+shared' in spec else "--disable-shared", # Disable OpenCL, since hwloc might pick up an OpenCL # library at build time that is then not found at run time # (Alternatively, we could require OpenCL as dependency.) -- cgit v1.2.3-70-g09d2 From 1e702bfab0ac8414a56ff46c7a9c898dd85bcf20 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Sun, 3 Dec 2017 17:20:32 -0600 Subject: r-fftwtools: new package (#6532) --- .../repos/builtin/packages/r-fftwtools/package.py | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-fftwtools/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-fftwtools/package.py b/var/spack/repos/builtin/packages/r-fftwtools/package.py new file mode 100644 index 0000000000..ff8f6111a8 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-fftwtools/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RFftwtools(RPackage): + """Provides a wrapper for several 'FFTW' functions. This package provides + access to the two-dimensional 'FFT', the multivariate 'FFT', and the + one-dimensional real to complex 'FFT' using the 'FFTW3' library. The + package includes the functions fftw() and mvfftw() which are designed + to mimic the functionality of the R functions fft() and mvfft(). + The 'FFT' functions have a parameter that allows them to not return + the redundant complex conjugate when the input is real data.""" + + homepage = "https://github.com/krahim/fftwtools" + url = "https://cran.r-project.org/src/contrib/fftwtools_0.9-8.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/fftwtools" + + version('0.9-8', '2d1258fbaf0940b57ed61c8d6cd6694d') + + depends_on('fftw') -- cgit v1.2.3-70-g09d2 From 10ad2bc1bff79557607ad006b9dfcacf2865c025 Mon Sep 17 00:00:00 2001 From: Eric Date: Sun, 3 Dec 2017 17:21:27 -0600 Subject: py-multiqc: Add version 1.3 (#6554) --- var/spack/repos/builtin/packages/py-multiqc/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-multiqc/package.py b/var/spack/repos/builtin/packages/py-multiqc/package.py index f2b9377b1e..4d9ec344db 100644 --- a/var/spack/repos/builtin/packages/py-multiqc/package.py +++ b/var/spack/repos/builtin/packages/py-multiqc/package.py @@ -33,6 +33,7 @@ class PyMultiqc(PythonPackage): homepage = "https://multiqc.info" url = "https://pypi.io/packages/source/m/multiqc/multiqc-1.0.tar.gz" + version('1.3', '78fef8a89c0bd40d559b10c1f736bbcd') version('1.0', '0b7310b3f75595e5be8099fbed2d2515') depends_on('python@2.7:') -- cgit v1.2.3-70-g09d2 From 688710777559ed0787c6755855c3ec640ed96888 Mon Sep 17 00:00:00 2001 From: Benedikt Riedel Date: Sun, 3 Dec 2017 17:22:44 -0600 Subject: Adding zlib dependence to xrootd to resolve #6545 (#6550) --- var/spack/repos/builtin/packages/xrootd/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/xrootd/package.py b/var/spack/repos/builtin/packages/xrootd/package.py index 94ee3eda46..2514997f88 100644 --- a/var/spack/repos/builtin/packages/xrootd/package.py +++ b/var/spack/repos/builtin/packages/xrootd/package.py @@ -39,3 +39,4 @@ class Xrootd(CMakePackage): version('4.3.0', '39c2fab9f632f35e12ff607ccaf9e16c') depends_on('cmake@2.6:', type='build') + depends_on('zlib') -- cgit v1.2.3-70-g09d2 From f564e0230196936fb4313ea531b4b349ad754368 Mon Sep 17 00:00:00 2001 From: Chien-Chang Feng Date: Mon, 4 Dec 2017 15:50:35 +0900 Subject: py-h5py: fixed a typo in the name of a dependency (#6540) --- var/spack/repos/builtin/packages/py-h5py/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-h5py/package.py b/var/spack/repos/builtin/packages/py-h5py/package.py index a5c1f6619c..3375b762a9 100644 --- a/var/spack/repos/builtin/packages/py-h5py/package.py +++ b/var/spack/repos/builtin/packages/py-h5py/package.py @@ -40,7 +40,7 @@ class PyH5py(PythonPackage): # Build dependencies depends_on('py-cython@0.19:', type='build') - depends_on('py-pkgconfigig', type='build') + depends_on('py-pkgconfig', type='build') depends_on('py-setuptools', type='build') depends_on('hdf5@1.8.4:+hl') depends_on('hdf5+mpi', when='+mpi') -- cgit v1.2.3-70-g09d2 From e9c66a76f00057f9900e8678765c474dc2a79823 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Mon, 4 Dec 2017 08:02:05 +0100 Subject: dealii: add scalapack and various cleanups (#6552) --- var/spack/repos/builtin/packages/dealii/package.py | 139 ++++++++++----------- .../repos/builtin/packages/netcdf-cxx/package.py | 7 ++ .../repos/builtin/packages/netcdf-cxx4/package.py | 7 ++ 3 files changed, 81 insertions(+), 72 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 8ed2035e2e..7dc23d75fc 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -24,7 +24,6 @@ ############################################################################## from spack import * from spack.build_systems.cuda import CudaPackage -import os class Dealii(CMakePackage, CudaPackage): @@ -70,6 +69,8 @@ class Dealii(CMakePackage, CudaPackage): description='Compile with P4est (only with MPI)') variant('petsc', default=True, description='Compile with Petsc (only with MPI)') + variant('scalapack', default=False, + description='Compile with ScaLAPACK (only with MPI)') variant('sundials', default=False, description='Compile with Sundials') variant('slepc', default=True, @@ -87,79 +88,83 @@ class Dealii(CMakePackage, CudaPackage): values=('Debug', 'Release', 'DebugRelease')) # required dependencies, light version - depends_on("blas") + depends_on('blas') # Boost 1.58 is blacklisted, see # https://github.com/dealii/dealii/issues/1591 # Require at least 1.59 + # There are issues with 1.65.1 but not with 1.65.0: + # https://github.com/dealii/dealii/issues/5262 # +python won't affect @:8.4.2 # FIXME: once concretizer can unite unconditional and # conditional dependencies, simplify to: - # depends_on("boost@1.59.0+thread+system+serialization+iostreams") - # depends_on("boost+mpi", when='+mpi') - # depends_on("boost+python", when='+python') - depends_on("boost@1.59.0:1.63,1.66:+thread+system+serialization+iostreams", + # depends_on('boost@1.59.0+thread+system+serialization+iostreams') + # depends_on('boost+mpi', when='+mpi') + # depends_on('boost+python', when='+python') + depends_on('boost@1.59.0:1.63,1.65.0,1.66:+thread+system+serialization+iostreams', when='@:8.4.2~mpi') - depends_on("boost@1.59.0:1.63,1.66:+thread+system+serialization+iostreams+mpi", + depends_on('boost@1.59.0:1.63,1.65.0,1.66:+thread+system+serialization+iostreams+mpi', when='@:8.4.2+mpi') # since @8.5.0: (and @develop) python bindings are introduced: - depends_on("boost@1.59.0:1.63,1.66:+thread+system+serialization+iostreams", + depends_on('boost@1.59.0:1.63,1.65.0,1.66:+thread+system+serialization+iostreams', when='@8.5.0:~mpi~python') - depends_on("boost@1.59.0:1.63,1.66:+thread+system+serialization+iostreams+mpi", + depends_on('boost@1.59.0:1.63,1.65.0,1.66:+thread+system+serialization+iostreams+mpi', when='@8.5.0:+mpi~python') - depends_on("boost@1.59.0:1.63,1.66:+thread+system+serialization+iostreams+python", + depends_on('boost@1.59.0:1.63,1.65.0,1.66:+thread+system+serialization+iostreams+python', when='@8.5.0:~mpi+python') - depends_on("boost@1.59.0:1.63,1.66:+thread+system+serialization+iostreams+mpi+python", + depends_on('boost@1.59.0:1.63,1.65.0,1.66:+thread+system+serialization+iostreams+mpi+python', when='@8.5.0:+mpi+python') # bzip2 is not needed since 9.0 - depends_on("bzip2", when='@:8.99') - depends_on("lapack") - depends_on("muparser") - depends_on("suite-sparse") - depends_on("tbb") - depends_on("zlib") + depends_on('bzip2', when='@:8.99') + depends_on('lapack') + depends_on('muparser') + depends_on('suite-sparse') + depends_on('tbb') + depends_on('zlib') # optional dependencies - depends_on("mpi", when="+mpi") - depends_on("adol-c@2.6.4:", when='@9.0:+adol-c') - depends_on("arpack-ng+mpi", when='+arpack+mpi') - depends_on("assimp", when='@9.0:+assimp') - depends_on("doxygen+graphviz", when='+doc') - depends_on("graphviz", when='+doc') - depends_on("gsl", when='@8.5.0:+gsl') - depends_on("hdf5+mpi+hl", when='+hdf5+mpi') - depends_on("cuda@8:", when='+cuda') - depends_on("cmake@3.9:", when='+cuda') + depends_on('mpi', when='+mpi') + depends_on('adol-c@2.6.4:', when='@9.0:+adol-c') + depends_on('arpack-ng+mpi', when='+arpack+mpi') + depends_on('assimp', when='@9.0:+assimp') + depends_on('doxygen+graphviz', when='+doc') + depends_on('graphviz', when='+doc') + depends_on('gsl', when='@8.5.0:+gsl') + depends_on('hdf5+mpi+hl', when='+hdf5+mpi') + depends_on('cuda@8:', when='+cuda') + depends_on('cmake@3.9:', when='+cuda') # currently deal.II does not build with Cmake 3.10, see # https://github.com/dealii/dealii/issues/5510 - depends_on("cmake@:3.9.99") + depends_on('cmake@:3.9.99') # FIXME: concretizer bug. The two lines mimic what comes from PETSc # but we should not need it - depends_on("metis@5:+int64+real64", when='+metis+int64') - depends_on("metis@5:~int64+real64", when='+metis~int64') - depends_on("nanoflann", when="@9.0:+nanoflann") - depends_on("netcdf+mpi", when="+netcdf+mpi") - depends_on("netcdf-cxx", when='+netcdf+mpi') - depends_on("oce", when='+oce') - depends_on("p4est", when='+p4est+mpi') - depends_on("petsc+mpi~int64", when='+petsc+mpi~int64') - depends_on("petsc+mpi+int64", when='+petsc+mpi+int64') - depends_on("petsc@:3.6.4", when='@:8.4.1+petsc+mpi') + depends_on('metis@5:+int64+real64', when='+metis+int64') + depends_on('metis@5:~int64+real64', when='+metis~int64') + depends_on('nanoflann', when='@9.0:+nanoflann') + depends_on('netcdf+mpi', when='+netcdf+mpi') + depends_on('netcdf-cxx', when='+netcdf+mpi') + depends_on('oce', when='+oce') + depends_on('p4est', when='+p4est+mpi') + depends_on('petsc+mpi~int64', when='+petsc+mpi~int64') + depends_on('petsc+mpi+int64', when='+petsc+mpi+int64') + depends_on('petsc@:3.6.4', when='@:8.4.1+petsc+mpi') depends_on('python', when='@8.5.0:+python') - depends_on("slepc", when='+slepc+petsc+mpi') - depends_on("slepc@:3.6.3", when='@:8.4.1+slepc+petsc+mpi') - depends_on("slepc~arpack", when='+slepc+petsc+mpi+int64') - depends_on("sundials~pthread", when='@9.0:+sundials') - depends_on("trilinos+amesos+aztec+epetra+ifpack+ml+muelu+sacado+teuchos", when='+trilinos+mpi~int64') - depends_on("trilinos+amesos+aztec+epetra+ifpack+ml+muelu+sacado+teuchos~hypre", when="+trilinos+mpi+int64") + depends_on('scalapack', when='@9.0:+scalapack') + depends_on('slepc', when='+slepc+petsc+mpi') + depends_on('slepc@:3.6.3', when='@:8.4.1+slepc+petsc+mpi') + depends_on('slepc~arpack', when='+slepc+petsc+mpi+int64') + depends_on('sundials~pthread', when='@9.0:+sundials') + depends_on('trilinos+amesos+aztec+epetra+ifpack+ml+muelu+rol+sacado+teuchos', when='+trilinos+mpi~int64') + depends_on('trilinos+amesos+aztec+epetra+ifpack+ml+muelu+rol+sacado+teuchos~hypre', when='+trilinos+mpi+int64') # check that the combination of variants makes sense conflicts('+assimp', when='@:8.5.1') conflicts('+nanoflann', when='@:8.5.1') + conflicts('+scalapack', when='@:8.5.1') conflicts('+sundials', when='@:8.5.1') conflicts('+adol-c', when='@:8.5.1') conflicts('+gsl', when='@:8.4.2') conflicts('+python', when='@:8.4.2') - for p in ['+arpack', '+hdf5', '+netcdf', '+p4est', '+petsc', + for p in ['+arpack', '+hdf5', '+netcdf', '+p4est', '+petsc', '+scalapack', '+slepc', '+trilinos']: conflicts(p, when='~mpi') @@ -269,7 +274,7 @@ class Dealii(CMakePackage, CudaPackage): # variables: for library in ( 'gsl', 'hdf5', 'p4est', 'petsc', 'slepc', 'trilinos', 'metis', - 'sundials', 'nanoflann'): + 'sundials', 'nanoflann', 'assimp'): if library in spec: options.extend([ '-D%s_DIR=%s' % (library.upper(), spec[library].prefix), @@ -309,36 +314,12 @@ class Dealii(CMakePackage, CudaPackage): '-DDEAL_II_WITH_ARPACK=OFF' ]) - # Assimp - if '+assimp' in spec: - options.extend([ - '-DDEAL_II_WITH_ASSIMP=ON', - '-DASSIMP_DIR=%s' % spec['assimp'].prefix - ]) - else: - options.extend([ - '-DDEAL_II_WITH_ASSIMP=OFF' - ]) - # since Netcdf is spread among two, need to do it by hand: if '+netcdf' in spec and '+mpi' in spec: - # take care of lib64 vs lib installed lib locations: - if os.path.isdir(spec['netcdf-cxx'].prefix.lib): - netcdfcxx_lib_dir = spec['netcdf-cxx'].prefix.lib - else: - netcdfcxx_lib_dir = spec['netcdf-cxx'].prefix.lib64 - if os.path.isdir(spec['netcdf'].prefix.lib): - netcdf_lib_dir = spec['netcdf'].prefix.lib - else: - netcdf_lib_dir = spec['netcdf'].prefix.lib64 - + netcdf = spec['netcdf-cxx'].libs + spec['netcdf'].libs options.extend([ '-DNETCDF_FOUND=true', - '-DNETCDF_LIBRARIES=%s;%s' % ( - join_path(netcdfcxx_lib_dir, - 'libnetcdf_c++.%s' % dso_suffix), - join_path(netcdf_lib_dir, - 'libnetcdf.%s' % dso_suffix)), + '-DNETCDF_LIBRARIES=%s' % netcdf.joined(';'), '-DNETCDF_INCLUDE_DIRS=%s;%s' % ( spec['netcdf-cxx'].prefix.include, spec['netcdf'].prefix.include), @@ -348,6 +329,20 @@ class Dealii(CMakePackage, CudaPackage): '-DDEAL_II_WITH_NETCDF=OFF' ]) + if '+scalapack' in spec: + scalapack = spec['scalapack'].libs + options.extend([ + '-DSCALAPACK_FOUND=true', + '-DSCALAPACK_INCLUDE_DIRS=%s' % ( + spec['scalapack'].prefix.include), + '-DSCALAPACK_LIBRARIES=%s' % scalapack.joined(';'), + '-DDEAL_II_WITH_SCALAPACK=ON' + ]) + else: + options.extend([ + '-DDEAL_II_WITH_SCALAPACK=OFF' + ]) + # Open Cascade if '+oce' in spec: options.extend([ diff --git a/var/spack/repos/builtin/packages/netcdf-cxx/package.py b/var/spack/repos/builtin/packages/netcdf-cxx/package.py index 916c8f301a..f3bb4e6135 100644 --- a/var/spack/repos/builtin/packages/netcdf-cxx/package.py +++ b/var/spack/repos/builtin/packages/netcdf-cxx/package.py @@ -37,3 +37,10 @@ class NetcdfCxx(AutotoolsPackage): version('4.2', 'd32b20c00f144ae6565d9e98d9f6204c') depends_on('netcdf') + + @property + def libs(self): + shared = True + return find_libraries( + 'libnetcdf_c++', root=self.prefix, shared=shared, recurse=True + ) diff --git a/var/spack/repos/builtin/packages/netcdf-cxx4/package.py b/var/spack/repos/builtin/packages/netcdf-cxx4/package.py index 0e15d67bc1..3c68538f0b 100644 --- a/var/spack/repos/builtin/packages/netcdf-cxx4/package.py +++ b/var/spack/repos/builtin/packages/netcdf-cxx4/package.py @@ -40,3 +40,10 @@ class NetcdfCxx4(AutotoolsPackage): depends_on('libtool', type='build') force_autoreconf = True + + @property + def libs(self): + shared = True + return find_libraries( + 'libnetcdf_c++4', root=self.prefix, shared=shared, recurse=True + ) -- cgit v1.2.3-70-g09d2 From 6968777af7a5079cf18da37c2043e77b8f884c8f Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 4 Dec 2017 11:38:30 -0600 Subject: bamtools: Add version 2.5.0 (#6553) --- var/spack/repos/builtin/packages/bamtools/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bamtools/package.py b/var/spack/repos/builtin/packages/bamtools/package.py index a45cf38b80..036d6ed407 100644 --- a/var/spack/repos/builtin/packages/bamtools/package.py +++ b/var/spack/repos/builtin/packages/bamtools/package.py @@ -32,6 +32,7 @@ class Bamtools(CMakePackage): homepage = "https://github.com/pezmaster31/bamtools" url = "https://github.com/pezmaster31/bamtools/archive/v2.4.0.tar.gz" + version('2.5.0', 'dd4185bdba6e3adf2c24b7f93a57233d') version('2.4.1', '41cadf513f2744256851accac2bc7baa') version('2.4.0', '6139d00c1b1fe88fe15d094d8a74d8b9') version('2.3.0', 'd327df4ba037d6eb8beef65d7da75ebc') -- cgit v1.2.3-70-g09d2 From 9ad3b1a74749a3358175dbd41b1da7dfa9cb142e Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Mon, 4 Dec 2017 23:29:35 +0100 Subject: libpng: CPPFLAGS for -I (#6563) Recent versions of `libpng` (e.g. 1.6.34) warn/abort that includes for `zlib` need to be passed properly via `CPPFLAGS`. This fixes it. --- var/spack/repos/builtin/packages/libpng/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libpng/package.py b/var/spack/repos/builtin/packages/libpng/package.py index a328bd44f8..cbab3c68a3 100644 --- a/var/spack/repos/builtin/packages/libpng/package.py +++ b/var/spack/repos/builtin/packages/libpng/package.py @@ -57,7 +57,7 @@ class Libpng(AutotoolsPackage): # not honored, see # https://sourceforge.net/p/libpng/bugs/210/#33f1 # '--with-zlib=' + self.spec['zlib'].prefix, - 'CFLAGS={0}'.format(self.spec['zlib'].headers.include_flags), + 'CPPFLAGS={0}'.format(self.spec['zlib'].headers.include_flags), 'LDFLAGS={0}'.format(self.spec['zlib'].libs.search_flags) ] return args -- cgit v1.2.3-70-g09d2 From b2c6306b94317f542c638f39c5cfa1b65fa8e840 Mon Sep 17 00:00:00 2001 From: Paschalis Korosoglou Date: Tue, 5 Dec 2017 02:39:34 +0200 Subject: Added package r version 3.4.3 (#6565) --- var/spack/repos/builtin/packages/r/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py index ebed6e7fe7..8235e8bd24 100644 --- a/var/spack/repos/builtin/packages/r/package.py +++ b/var/spack/repos/builtin/packages/r/package.py @@ -34,10 +34,11 @@ class R(AutotoolsPackage): Please consult the R project homepage for further information.""" homepage = "https://www.r-project.org" - url = "https://cloud.r-project.org/src/base/R-3/R-3.4.0.tar.gz" + url = "https://cloud.r-project.org/src/base/R-3/R-3.4.3.tar.gz" extendable = True + version('3.4.3', 'bc55db54f992fda9049201ca62d2a584') version('3.4.2', '1cd6d37850188e7f190f1eb94a24ca1f') version('3.4.1', '3a79c01dc0527c62e80ffb1c489297ea') version('3.4.0', '75083c23d507b9c16d5c6afbd7a827e7') -- cgit v1.2.3-70-g09d2 From 90c7bc7a24bc5a7e38bafc51f9cd558a19625665 Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Tue, 5 Dec 2017 01:44:53 +0100 Subject: OpenJPEG: all version tuples have the same length. (#6526) --- .../repos/builtin/packages/openjpeg/package.py | 27 ++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openjpeg/package.py b/var/spack/repos/builtin/packages/openjpeg/package.py index 1998885502..b8e4855337 100644 --- a/var/spack/repos/builtin/packages/openjpeg/package.py +++ b/var/spack/repos/builtin/packages/openjpeg/package.py @@ -35,11 +35,30 @@ class Openjpeg(CMakePackage): ITU-T as a JPEG 2000 Reference Software. """ - homepage = "https://github.com/uclouvain/openjpeg" - url = "https://github.com/uclouvain/openjpeg/archive/version.2.1.tar.gz" + homepage = 'https://github.com/uclouvain/openjpeg' + url = 'https://github.com/uclouvain/openjpeg/archive/v2.3.0.tar.gz' + list_url = 'https://github.com/uclouvain/openjpeg/releases' - version('2.1', '3e1c451c087f8462955426da38aa3b3d') + version('2.3.0', '6a1f8aaa1fe55d2088e3a9c942e0f698') + version('2.2.0', '269bb0b175476f3addcc0d03bd9a97b6') + version('2.1.2', '40a7bfdcc66280b3c1402a0eb1a27624') + version('2.1.1', '0cc4b2aee0a9b6e9e21b7abcd201a3ec') + version('2.1.0', '3e1c451c087f8462955426da38aa3b3d') version('2.0.1', '105876ed43ff7dbb2f90b41b5a43cfa5') - version('2.0', 'cdf266530fee8af87454f15feb619609') + version('2.0.0', 'cdf266530fee8af87454f15feb619609') version('1.5.2', '545f98923430369a6b046ef3632ef95c') version('1.5.1', 'd774e4b5a0db5f0f171c4fc0aabfa14e') + + def url_for_version(self, version): + if version >= Version('2.1.1'): + return super(Openjpeg, self).url_for_version(version) + + # Before version 2.2.0, release tarballs of the versions like x.y.0 + # did not have the ".0" in their names: + if version[2] == 0: + version = version.up_to(2) + + url_fmt = \ + 'https://github.com/uclouvain/openjpeg/archive/version.{0}.tar.gz' + + return url_fmt.format(version) -- cgit v1.2.3-70-g09d2 From 09e68c5c8a295a4018e5839af2087cdfce7fb97a Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Tue, 5 Dec 2017 12:49:22 +0100 Subject: c-blosc: 1.12.1 (#6571) Adds a newer release of c-blosc, adds the new flags for external library builds, adds missing dependencies. --- var/spack/repos/builtin/packages/c-blosc/package.py | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/c-blosc/package.py b/var/spack/repos/builtin/packages/c-blosc/package.py index 8bc5a76ef7..51c2f6d3ce 100644 --- a/var/spack/repos/builtin/packages/c-blosc/package.py +++ b/var/spack/repos/builtin/packages/c-blosc/package.py @@ -33,6 +33,7 @@ class CBlosc(CMakePackage): homepage = "http://www.blosc.org" url = "https://github.com/Blosc/c-blosc/archive/v1.11.1.tar.gz" + version('1.12.1', '6fa4ecb7ef70803a190dd386bf4a2e93') version('1.11.1', 'e236550640afa50155f3881f2d300206') version('1.9.2', 'dd2d83069d74b36b8093f1c6b49defc5') version('1.9.1', '7d708d3daadfacf984a87b71b1734ce2') @@ -45,6 +46,8 @@ class CBlosc(CMakePackage): depends_on('cmake@2.8.10:', type='build') depends_on('snappy') depends_on('zlib') + depends_on('zstd') + depends_on('lz4') def cmake_args(self): args = [] @@ -54,6 +57,12 @@ class CBlosc(CMakePackage): else: args.append('-DDEACTIVATE_AVX2=ON') + if self.spec.satisfies('@1.12.0:'): + args.append('-DPREFER_EXTERNAL_SNAPPY=ON') + args.append('-DPREFER_EXTERNAL_ZLIB=ON') + args.append('-DPREFER_EXTERNAL_ZSTD=ON') + args.append('-DPREFER_EXTERNAL_LZ4=ON') + return args @run_after('install') -- cgit v1.2.3-70-g09d2 From e47d89a2abdf20cccf8514324caab42c6de60a47 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Tue, 5 Dec 2017 12:50:22 +0100 Subject: ADIOS 1.13.0: Newer SZ Versions (#6561) The latest release of ADIOS needs a newer version of SZ due to an upstream library naming change. --- var/spack/repos/builtin/packages/adios/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/adios/package.py b/var/spack/repos/builtin/packages/adios/package.py index 12b40955b7..e64561826f 100644 --- a/var/spack/repos/builtin/packages/adios/package.py +++ b/var/spack/repos/builtin/packages/adios/package.py @@ -91,7 +91,8 @@ class Adios(AutotoolsPackage): depends_on('zlib', when='+zlib') depends_on('bzip2', when='+bzip2') depends_on('szip', when='+szip') - depends_on('sz@:1.4.10', when='+sz') + depends_on('sz@:1.4.10', when='@:1.12.0 +sz') + depends_on('sz@1.4.11.0:', when='@1.13.0: +sz') depends_on('zfp@:0.5.0', when='+zfp') # optional transports & file converters depends_on('hdf5@1.8:+hl+mpi', when='+hdf5') -- cgit v1.2.3-70-g09d2 From 5a908a1c8afc86818de3c07141c8a0b51c14ff2c Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Tue, 5 Dec 2017 15:28:44 +0100 Subject: ADIOS 1.13.0: LZ4 & blosc support (#6572) Add additional transform libraries to ADIOS. Also modifies existing transforms to the versions they were introduced (otherwise this was resulting in unknown configure flags). --- var/spack/repos/builtin/packages/adios/package.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/adios/package.py b/var/spack/repos/builtin/packages/adios/package.py index e64561826f..8241eed34d 100644 --- a/var/spack/repos/builtin/packages/adios/package.py +++ b/var/spack/repos/builtin/packages/adios/package.py @@ -66,6 +66,10 @@ class Adios(AutotoolsPackage): description='Enable ZFP transform support') variant('sz', default=True, description='Enable SZ transform support') + variant('lz4', default=True, + description='Enable LZ4 transform support') + variant('blosc', default=True, + description='Enable Blosc transform support') # transports and serial file converters variant('hdf5', default=False, description='Enable parallel HDF5 transport and serial bp2h5 ' + @@ -94,6 +98,8 @@ class Adios(AutotoolsPackage): depends_on('sz@:1.4.10', when='@:1.12.0 +sz') depends_on('sz@1.4.11.0:', when='@1.13.0: +sz') depends_on('zfp@:0.5.0', when='+zfp') + depends_on('lz4', when='+lz4') + depends_on('c-blosc@1.12.0:', when='+blosc') # optional transports & file converters depends_on('hdf5@1.8:+hl+mpi', when='+hdf5') depends_on('netcdf', when='+netcdf') @@ -155,7 +161,16 @@ class Adios(AutotoolsPackage): extra_args += self.with_or_without('infiniband') # Transforms - variants = ['zlib', 'bzip2', 'szip', 'zfp', 'sz'] + variants = ['zlib', 'bzip2', 'szip'] + if spec.satisfies('@1.11.0:'): + variants += ['zfp'] + if spec.satisfies('@1.12.0:'): + variants += ['sz', 'lz4'] + if spec.satisfies('@1.13.0:'): + extra_args += self.with_or_without( + 'blosc', + activation_value=lambda x: spec['c-blosc'].prefix + ) # External I/O libraries variants += ['hdf5', 'netcdf'] -- cgit v1.2.3-70-g09d2 From 67d7f3fc03c6bc031f73b53348b140e7f24567c1 Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Tue, 5 Dec 2017 10:33:55 -0700 Subject: Add opennurbs package (#6570) * Adding OpenNurbs package. * Fixing flake8 error. * Removing unused os import from opennurbs. --- .../repos/builtin/packages/opennurbs/package.py | 75 ++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 var/spack/repos/builtin/packages/opennurbs/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/opennurbs/package.py b/var/spack/repos/builtin/packages/opennurbs/package.py new file mode 100644 index 0000000000..cffae11b28 --- /dev/null +++ b/var/spack/repos/builtin/packages/opennurbs/package.py @@ -0,0 +1,75 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import glob + + +class Opennurbs(Package): + """OpenNURBS is an open-source NURBS-based geometric modeling library + and toolset, with meshing and display / output functions. + """ + + homepage = "https://github.com/OpenNURBS/OpenNURBS" + url = "https://github.com/OpenNURBS/OpenNURBS.git" + + maintainers = ['jrood-nrel'] + + version('develop', + git='https://github.com/OpenNURBS/OpenNURBS.git', + branch='develop') + + version('percept', '59163fd085a24c7a4c2170c70bb60fea', + url='https://github.com/PerceptTools/percept/raw/master/build-cmake/opennurbs-percept.tar.gz') + + variant('shared', default=True, + description="Build shared libraries") + + # CMake installation method + def install(self, spec, prefix): + cmake_args = [ + '-DBUILD_SHARED_LIBS:BOOL=%s' % ( + 'ON' if '+shared' in spec else 'OFF') + ] + + cmake_args.extend(std_cmake_args) + + with working_dir('spack-build', create=True): + cmake('..', *cmake_args) + make() + make('install') + + # Pre-cmake installation method + @when('@percept') + def install(self, spec, prefix): + make(parallel=False) + + # Install manually + mkdir(prefix.lib) + mkdir(prefix.include) + install('libopenNURBS.a', prefix.lib) + install_tree('zlib', join_path(prefix.include, 'zlib')) + headers = glob.glob(join_path('.', '*.h')) + for h in headers: + install(h, prefix.include) -- cgit v1.2.3-70-g09d2 From 9e64fa53ed54eba1423ae754e34b3503c9d12dae Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Tue, 5 Dec 2017 22:27:56 +0100 Subject: Add Maintainer (#6575) Add myself as maintainer to the packages we contributed and/or maintain the mainline from. --- .mailmap | 1 + var/spack/repos/builtin/packages/adios/package.py | 1 + var/spack/repos/builtin/packages/adios2/package.py | 1 + var/spack/repos/builtin/packages/cuda-memtest/package.py | 1 + var/spack/repos/builtin/packages/gearshifft/package.py | 1 + var/spack/repos/builtin/packages/isaac-server/package.py | 1 + var/spack/repos/builtin/packages/isaac/package.py | 1 + var/spack/repos/builtin/packages/jansson/package.py | 1 + var/spack/repos/builtin/packages/libsplash/package.py | 1 + var/spack/repos/builtin/packages/libwebsockets/package.py | 1 + var/spack/repos/builtin/packages/mallocmc/package.py | 1 + var/spack/repos/builtin/packages/pngwriter/package.py | 1 + var/spack/repos/builtin/packages/xsimd/package.py | 1 + var/spack/repos/builtin/packages/xtensor/package.py | 1 + var/spack/repos/builtin/packages/xtl/package.py | 1 + 15 files changed, 15 insertions(+) (limited to 'var') diff --git a/.mailmap b/.mailmap index df0a82a197..41575ebb1f 100644 --- a/.mailmap +++ b/.mailmap @@ -3,6 +3,7 @@ Adam Moody Adam T. Moody Alfredo Gimenez Alfredo Gimenez Alfredo Gimenez Alfredo Adolfo Gimenez Andrew Williams Andrew Williams +Axel Huebl Axel Huebl Ben Boeckel Ben Boeckel Ben Boeckel Ben Boeckel Benedikt Hegner Benedikt Hegner diff --git a/var/spack/repos/builtin/packages/adios/package.py b/var/spack/repos/builtin/packages/adios/package.py index 8241eed34d..2efb487ac2 100644 --- a/var/spack/repos/builtin/packages/adios/package.py +++ b/var/spack/repos/builtin/packages/adios/package.py @@ -34,6 +34,7 @@ class Adios(AutotoolsPackage): homepage = "http://www.olcf.ornl.gov/center-projects/adios/" url = "https://github.com/ornladios/ADIOS/archive/v1.12.0.tar.gz" + maintainers = ['ax3l'] version('develop', git='https://github.com/ornladios/ADIOS.git', branch='master') diff --git a/var/spack/repos/builtin/packages/adios2/package.py b/var/spack/repos/builtin/packages/adios2/package.py index a222477c2d..8752a18271 100644 --- a/var/spack/repos/builtin/packages/adios2/package.py +++ b/var/spack/repos/builtin/packages/adios2/package.py @@ -30,6 +30,7 @@ class Adios2(CMakePackage): homepage = "https://www.olcf.ornl.gov/center-projects/adios/" url = "https://github.com/ornladios/ADIOS2/archive/v2.0.0.tar.gz" + maintainers = ['ax3l'] version('develop', branch='master', git='https://github.com/ornladios/ADIOS2.git') diff --git a/var/spack/repos/builtin/packages/cuda-memtest/package.py b/var/spack/repos/builtin/packages/cuda-memtest/package.py index d7a4e2a04a..aef9ed892b 100644 --- a/var/spack/repos/builtin/packages/cuda-memtest/package.py +++ b/var/spack/repos/builtin/packages/cuda-memtest/package.py @@ -36,6 +36,7 @@ class CudaMemtest(CMakePackage): homepage = "https://github.com/ComputationalRadiationPhysics/cuda_memtest" url = "https://github.com/ComputationalRadiationPhysics/cuda_memtest.git" + maintainers = ['ax3l'] version('master', branch='dev', git='https://github.com/ComputationalRadiationPhysics/cuda_memtest.git') diff --git a/var/spack/repos/builtin/packages/gearshifft/package.py b/var/spack/repos/builtin/packages/gearshifft/package.py index a2c3942347..c1a74ce34d 100644 --- a/var/spack/repos/builtin/packages/gearshifft/package.py +++ b/var/spack/repos/builtin/packages/gearshifft/package.py @@ -30,6 +30,7 @@ class Gearshifft(CMakePackage): homepage = "https://github.com/mpicbg-scicomp/gearshifft" url = "https://github.com/mpicbg-scicomp/gearshifft/archive/v0.2.0.tar.gz" + maintainers = ['ax3l'] version('0.2.1-lw', 'c3208b767b24255b488a83e5d9e517ea') diff --git a/var/spack/repos/builtin/packages/isaac-server/package.py b/var/spack/repos/builtin/packages/isaac-server/package.py index 3bfad09f98..9ae45137ec 100644 --- a/var/spack/repos/builtin/packages/isaac-server/package.py +++ b/var/spack/repos/builtin/packages/isaac-server/package.py @@ -30,6 +30,7 @@ class IsaacServer(CMakePackage): homepage = "http://computationalradiationphysics.github.io/isaac/" url = "https://github.com/ComputationalRadiationPhysics/isaac/archive/v1.3.0.tar.gz" + maintainers = ['ax3l'] version('develop', branch='dev', git='https://github.com/ComputationalRadiationPhysics/isaac.git') diff --git a/var/spack/repos/builtin/packages/isaac/package.py b/var/spack/repos/builtin/packages/isaac/package.py index 4c05faeb26..72bbaed8a7 100644 --- a/var/spack/repos/builtin/packages/isaac/package.py +++ b/var/spack/repos/builtin/packages/isaac/package.py @@ -30,6 +30,7 @@ class Isaac(CMakePackage): homepage = "http://computationalradiationphysics.github.io/isaac/" url = "https://github.com/ComputationalRadiationPhysics/isaac/archive/v1.3.0.tar.gz" + maintainers = ['ax3l'] version('develop', branch='dev', git='https://github.com/ComputationalRadiationPhysics/isaac.git') diff --git a/var/spack/repos/builtin/packages/jansson/package.py b/var/spack/repos/builtin/packages/jansson/package.py index e3e2d56cff..7379c6ef19 100644 --- a/var/spack/repos/builtin/packages/jansson/package.py +++ b/var/spack/repos/builtin/packages/jansson/package.py @@ -31,6 +31,7 @@ class Jansson(CMakePackage): homepage = "http://www.digip.org/jansson/" url = "https://github.com/akheron/jansson/archive/v2.9.tar.gz" + maintainers = ['ax3l'] version('2.9', 'd2db25c437b359fc5a065ed938962237') diff --git a/var/spack/repos/builtin/packages/libsplash/package.py b/var/spack/repos/builtin/packages/libsplash/package.py index b710dae58c..283de4f954 100644 --- a/var/spack/repos/builtin/packages/libsplash/package.py +++ b/var/spack/repos/builtin/packages/libsplash/package.py @@ -36,6 +36,7 @@ class Libsplash(CMakePackage): homepage = "https://github.com/ComputationalRadiationPhysics/libSplash" url = "https://github.com/ComputationalRadiationPhysics/libSplash/archive/v1.4.0.tar.gz" + maintainers = ['ax3l'] version('develop', branch='dev', git='https://github.com/ComputationalRadiationPhysics/libSplash.git') diff --git a/var/spack/repos/builtin/packages/libwebsockets/package.py b/var/spack/repos/builtin/packages/libwebsockets/package.py index 0b02793554..88b2e66ad7 100644 --- a/var/spack/repos/builtin/packages/libwebsockets/package.py +++ b/var/spack/repos/builtin/packages/libwebsockets/package.py @@ -30,6 +30,7 @@ class Libwebsockets(CMakePackage): homepage = "https://github.com/warmcat/libwebsockets" url = "https://github.com/warmcat/libwebsockets/archive/v2.1.0.tar.gz" + maintainers = ['ax3l'] version('2.2.1', '1f641cde2ab3687db3d553f68fe0f620') version('2.1.1', '674684ffb90d4a0bcf7a075eb7b90192') diff --git a/var/spack/repos/builtin/packages/mallocmc/package.py b/var/spack/repos/builtin/packages/mallocmc/package.py index ed8ba9bdeb..d110a6a17f 100644 --- a/var/spack/repos/builtin/packages/mallocmc/package.py +++ b/var/spack/repos/builtin/packages/mallocmc/package.py @@ -39,6 +39,7 @@ class Mallocmc(CMakePackage): homepage = "https://github.com/ComputationalRadiationPhysics/mallocMC" url = "https://github.com/ComputationalRadiationPhysics/mallocMC/archive/2.2.0crp.tar.gz" + maintainers = ['ax3l'] version('develop', branch='dev', git='https://github.com/ComputationalRadiationPhysics/mallocMC.git') diff --git a/var/spack/repos/builtin/packages/pngwriter/package.py b/var/spack/repos/builtin/packages/pngwriter/package.py index 896b660ac6..e170989693 100644 --- a/var/spack/repos/builtin/packages/pngwriter/package.py +++ b/var/spack/repos/builtin/packages/pngwriter/package.py @@ -37,6 +37,7 @@ class Pngwriter(CMakePackage): homepage = "http://pngwriter.sourceforge.net/" url = "https://github.com/pngwriter/pngwriter/archive/0.5.6.tar.gz" + maintainers = ['ax3l'] version('develop', branch='dev', git='https://github.com/pngwriter/pngwriter.git') diff --git a/var/spack/repos/builtin/packages/xsimd/package.py b/var/spack/repos/builtin/packages/xsimd/package.py index e2000277c0..ec177fe4a0 100644 --- a/var/spack/repos/builtin/packages/xsimd/package.py +++ b/var/spack/repos/builtin/packages/xsimd/package.py @@ -30,6 +30,7 @@ class Xsimd(CMakePackage): homepage = "http://quantstack.net/xsimd" url = "https://github.com/QuantStack/xsimd/archive/3.1.0.tar.gz" + maintainers = ['ax3l'] version('develop', branch='master', git='https://github.com/QuantStack/xsimd.git') diff --git a/var/spack/repos/builtin/packages/xtensor/package.py b/var/spack/repos/builtin/packages/xtensor/package.py index ad559d84f7..b8a0a2b75c 100644 --- a/var/spack/repos/builtin/packages/xtensor/package.py +++ b/var/spack/repos/builtin/packages/xtensor/package.py @@ -30,6 +30,7 @@ class Xtensor(CMakePackage): homepage = "http://quantstack.net/xtensor" url = "https://github.com/QuantStack/xtensor/archive/0.13.1.tar.gz" + maintainers = ['ax3l'] version('develop', branch='master', git='https://github.com/QuantStack/xtensor.git') diff --git a/var/spack/repos/builtin/packages/xtl/package.py b/var/spack/repos/builtin/packages/xtl/package.py index c755798487..77661865a1 100644 --- a/var/spack/repos/builtin/packages/xtl/package.py +++ b/var/spack/repos/builtin/packages/xtl/package.py @@ -30,6 +30,7 @@ class Xtl(CMakePackage): homepage = "https://github.com/QuantStack/xtl" url = "https://github.com/QuantStack/xtl/archive/0.3.4.tar.gz" + maintainers = ['ax3l'] version('develop', branch='master', git='https://github.com/QuantStack/xtl.git') -- cgit v1.2.3-70-g09d2 From 01ba69c635061fe03ca4a7fa49569fa2d7457456 Mon Sep 17 00:00:00 2001 From: nshtg Date: Tue, 5 Dec 2017 22:29:20 +0100 Subject: Update gnupg to 2.2.3 (#6573) Updated dependencies: * libassuan 2.4.5 * libgcrypt 1.8.1 * npth 1.5 --- var/spack/repos/builtin/packages/gnupg/package.py | 3 ++- var/spack/repos/builtin/packages/libassuan/package.py | 3 ++- var/spack/repos/builtin/packages/libgcrypt/package.py | 3 ++- var/spack/repos/builtin/packages/npth/package.py | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gnupg/package.py b/var/spack/repos/builtin/packages/gnupg/package.py index 756f8404bc..854e7477ca 100644 --- a/var/spack/repos/builtin/packages/gnupg/package.py +++ b/var/spack/repos/builtin/packages/gnupg/package.py @@ -30,8 +30,9 @@ class Gnupg(AutotoolsPackage): standard as defined by RFC4880 """ homepage = "https://gnupg.org/index.html" - url = "https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.1.21.tar.bz2" + url = "https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.3.tar.bz2" + version('2.2.3', '6911c0127e4231ce52d60f26029dba68') version('2.1.21', '685ebf4c3a7134ba0209c96b18b2f064') depends_on('libgcrypt') diff --git a/var/spack/repos/builtin/packages/libassuan/package.py b/var/spack/repos/builtin/packages/libassuan/package.py index 8a56551ff5..167f063e70 100644 --- a/var/spack/repos/builtin/packages/libassuan/package.py +++ b/var/spack/repos/builtin/packages/libassuan/package.py @@ -30,8 +30,9 @@ class Libassuan(AutotoolsPackage): protocol.""" homepage = "https://gnupg.org/software/libassuan/index.html" - url = "https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.4.3.tar.bz2" + url = "https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.4.5.tar.bz2" + version('2.4.5', '4f22bdb70d424cfb41b64fd73b7e1e45') version('2.4.3', '8e01a7c72d3e5d154481230668e6eb5a') depends_on('libgpg-error') diff --git a/var/spack/repos/builtin/packages/libgcrypt/package.py b/var/spack/repos/builtin/packages/libgcrypt/package.py index 053f62f9fc..6e5949fa76 100644 --- a/var/spack/repos/builtin/packages/libgcrypt/package.py +++ b/var/spack/repos/builtin/packages/libgcrypt/package.py @@ -32,8 +32,9 @@ class Libgcrypt(AutotoolsPackage): key algorithms, large integer functions, random numbers and a lot of supporting functions. """ homepage = "http://www.gnu.org/software/libgcrypt/" - url = "https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.7.6.tar.bz2" + url = "https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.8.1.tar.bz2" + version('1.8.1', 'b21817f9d850064d2177285f1073ec55') version('1.7.6', '54e180679a7ae4d090f8689ca32b654c') version('1.6.2', 'b54395a93cb1e57619943c082da09d5f') diff --git a/var/spack/repos/builtin/packages/npth/package.py b/var/spack/repos/builtin/packages/npth/package.py index c99c01ebb2..fef115413b 100644 --- a/var/spack/repos/builtin/packages/npth/package.py +++ b/var/spack/repos/builtin/packages/npth/package.py @@ -30,6 +30,7 @@ class Npth(AutotoolsPackage): non-preemptive threads implementation.""" homepage = "https://gnupg.org/software/npth/index.html" - url = "https://gnupg.org/ftp/gcrypt/npth/npth-1.4.tar.bz2" + url = "https://gnupg.org/ftp/gcrypt/npth/npth-1.5.tar.bz2" + version('1.5', '9ba2dc4302d2f32c66737c43ed191b1b') version('1.4', '76cef5542e0db6a339cf960641ed86f8') -- cgit v1.2.3-70-g09d2 From 5c43090ceb2140568618c532feffb0aabd0a9738 Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Tue, 5 Dec 2017 14:33:36 -0700 Subject: Update CGNS and add CGNS capability to Trilinos (#6568) * Update CGNS to be able to be used in Trilinos. * Updating Trilinos to be able to use CGNS. * Fixing wrong cmake defines in trilinos for enabling cgns and cleaning up cgns package. * Changing cgns parallel variant to mpi. Removing explicit dependence on parallel-netcdf in trilinos. --- var/spack/repos/builtin/packages/cgns/package.py | 52 +++++++++++++++------- .../repos/builtin/packages/trilinos/package.py | 21 +++++++-- 2 files changed, 55 insertions(+), 18 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cgns/package.py b/var/spack/repos/builtin/packages/cgns/package.py index c9d46dc8e9..c50523344b 100644 --- a/var/spack/repos/builtin/packages/cgns/package.py +++ b/var/spack/repos/builtin/packages/cgns/package.py @@ -33,31 +33,53 @@ class Cgns(CMakePackage): homepage = "http://cgns.github.io/" url = "https://github.com/CGNS/CGNS/archive/v3.3.0.tar.gz" + version('3.3.1', '65c55998270c3e125e28ec5c3742e15d') version('3.3.0', '64e5e8d97144c1462bee9ea6b2a81d7f') variant('hdf5', default=True, description='Enable HDF5 interface') + variant('fortran', default=False, description='Enable Fortran interface') + variant('scoping', default=True, description='Enable scoping') + variant('mpi', default=True, description='Enable parallel cgns') - depends_on('cmake@2.8:', type='build') - depends_on('hdf5', when='+hdf5') - - parallel = False + depends_on('hdf5', when='+hdf5~mpi') + depends_on('hdf5+mpi', when='+hdf5+mpi') + depends_on('mpi', when='+mpi') def cmake_args(self): spec = self.spec - cmake_args = [] + options = [] - if self.compiler.f77 and self.compiler.fc: - cmake_args.append('-DCGNS_ENABLE_FORTRAN=ON') - else: - cmake_args.append('-DCGNS_ENABLE_FORTRAN=OFF') + options.extend([ + '-DCGNS_ENABLE_FORTRAN:BOOL=%s' % ( + 'ON' if '+fortran' in spec else 'OFF'), + '-DCGNS_ENABLE_SCOPING:BOOL=%s' % ( + 'ON' if '+scoping' in spec else 'OFF'), + '-DCGNS_ENABLE_PARALLEL:BOOL=%s' % ( + 'ON' if '+mpi' in spec else 'OFF'), + '-DCGNS_ENABLE_TESTS:BOOL=OFF', + '-DCGNS_BUILD_CGNSTOOLS:BOOL=OFF' + ]) - if '+hdf5' in spec: - cmake_args.extend([ - '-DCGNS_ENABLE_HDF5=ON', - '-DHDF5_DIR=%s' % spec['hdf5'].prefix + if '+mpi' in spec: + options.extend([ + '-DCMAKE_C_COMPILER=%s' % spec['mpi'].mpicc, + '-DCMAKE_CXX_COMPILER=%s' % spec['mpi'].mpicxx, + '-DCMAKE_Fortran_COMPILER=%s' % spec['mpi'].mpifc ]) + if '+hdf5' in spec: + options.extend([ + '-DCGNS_ENABLE_HDF5:BOOL=ON', + '-DHDF5_NEED_ZLIB:BOOL=ON', + '-DHDF5_INCLUDE_DIR:PATH=%s' % spec['hdf5'].prefix.include, + '-DHDF5_LIBRARY_DIR:PATH=%s' % spec['hdf5'].prefix.lib + ]) + if '+mpi' in spec: + options.extend([ + '-DHDF5_NEED_MPI:BOOL=ON', + '-DHDF5_ENABLE_PARALLEL:BOOL=ON' + ]) else: - cmake_args.append('-DCGNS_ENABLE_HDF5=OFF') + options.extend(['-DCGNS_ENABLE_HDF5=OFF']) - return cmake_args + return options diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index a0321d2fcf..9ece60a57f 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -124,7 +124,7 @@ class Trilinos(CMakePackage): description='Compile with Amesos') variant('amesos2', default=True, description='Compile with Amesos2') - variant('anasazi', default=True, + variant('anasazi', default=True, description='Compile with Anasazi') variant('ifpack', default=True, description='Compile with Ifpack') @@ -162,8 +162,10 @@ class Trilinos(CMakePackage): description='Enable Shards') variant('intrepid', default=False, description='Enable Intrepid') - variant('intrepid2', default=False, + variant('intrepid2', default=False, description='Enable Intrepid2') + variant('cgns', default=False, + description='Enable CGNS') resource(name='dtk', git='https://github.com/ornl-cees/DataTransferKit', @@ -206,6 +208,7 @@ class Trilinos(CMakePackage): depends_on('netcdf+mpi', when="~pnetcdf") depends_on('netcdf+mpi+parallel-netcdf', when="+pnetcdf@master,12.12.1:") depends_on('parmetis', when='+metis') + depends_on('cgns', when='+cgns') # Trilinos' Tribits config system is limited which makes it very tricky to # link Amesos with static MUMPS, see # https://trilinos.org/docs/dev/packages/amesos2/doc/html/classAmesos2_1_1MUMPS.html @@ -340,7 +343,8 @@ class Trilinos(CMakePackage): '-DTrilinos_ENABLE_STKTopology:BOOL=ON', '-DTrilinos_ENABLE_STKUnit_tests:BOOL=ON', '-DTrilinos_ENABLE_STKUnit_test_utils:BOOL=ON', - '-DTrilinos_ENABLE_STKClassic:BOOL=OFF' + '-DTrilinos_ENABLE_STKClassic:BOOL=OFF', + '-DTrilinos_ENABLE_STKExprEval:BOOL=ON' ]) if '+dtk' in spec: @@ -539,6 +543,17 @@ class Trilinos(CMakePackage): '-DTPL_ENABLE_Zlib:BOOL=OFF' ]) + if '+cgns' in spec: + options.extend([ + '-DTPL_ENABLE_CGNS:BOOL=ON', + '-DCGNS_INCLUDE_DIRS:PATH=%s' % spec['cgns'].prefix.include, + '-DCGNS_LIBRARY_DIRS:PATH=%s' % spec['cgns'].prefix.lib + ]) + else: + options.extend([ + '-DTPL_ENABLE_GGNS:BOOL=OFF' + ]) + # ################# Miscellaneous Stuff ###################### # OpenMP -- cgit v1.2.3-70-g09d2 From a97824df986b570abe3320002d6aaacfecb90007 Mon Sep 17 00:00:00 2001 From: Audrey Thoma Date: Wed, 6 Dec 2017 00:58:08 -0600 Subject: mrbayes: url now points to github + removed the deprecated sourceforge url (#6578) --- var/spack/repos/builtin/packages/mrbayes/package.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mrbayes/package.py b/var/spack/repos/builtin/packages/mrbayes/package.py index 9361c3cc0e..1bb13800cb 100644 --- a/var/spack/repos/builtin/packages/mrbayes/package.py +++ b/var/spack/repos/builtin/packages/mrbayes/package.py @@ -32,9 +32,10 @@ class Mrbayes(AutotoolsPackage): of model parameters.""" homepage = "http://mrbayes.sourceforge.net" - url = "https://downloads.sourceforge.net/project/mrbayes/mrbayes/3.2.6/mrbayes-3.2.6.tar.gz" + url = "https://github.com/NBISweden/MrBayes" - version('3.2.6', '95f9822f24be47b976bf87540b55d1fe') + version('2017-11-22', commit='8a9adb11bcc538cb95d91d57568dff383f924503', + git='https://github.com/NBISweden/MrBayes.git') variant('mpi', default=True, description='Enable MPI parallel support') variant('beagle', default=True, description='Enable BEAGLE library for speed benefits') @@ -48,8 +49,6 @@ class Mrbayes(AutotoolsPackage): depends_on('libbeagle', when='+beagle') depends_on('mpi', when='+mpi') - configure_directory = 'src' - def configure_args(self): args = [] if '~beagle' in self.spec: -- cgit v1.2.3-70-g09d2 From 24d60a95c03f2484fff44fc1857fa926e18c647a Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 6 Dec 2017 01:04:06 -0600 Subject: picard: Add version 2.16.0 (#6579) --- var/spack/repos/builtin/packages/picard/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/picard/package.py b/var/spack/repos/builtin/packages/picard/package.py index 5f8b5b39a1..e96b2a7c1e 100644 --- a/var/spack/repos/builtin/packages/picard/package.py +++ b/var/spack/repos/builtin/packages/picard/package.py @@ -41,6 +41,7 @@ class Picard(Package): # They started distributing a single jar file at v2.6.0, prior to # that it was a .zip file with multiple .jar and .so files + version('2.16.0', 'fed8928b03bb36e355656f349e579083', expand=False) version('2.15.0', '3f5751630b1a3449edda47a0712a64e4', expand=False) version('2.10.0', '96f3c11b1c9be9fc8088bc1b7b9f7538', expand=False) version('2.9.4', '5ce72af4d5efd02fba7084dcfbb3c7b3', expand=False) -- cgit v1.2.3-70-g09d2 From 9a4dd413bbdf185bdaea27813267900ea352f4d8 Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Thu, 7 Dec 2017 02:28:11 +0100 Subject: Package 'libszip': update checksum and list_depth. (#6587) --- var/spack/repos/builtin/packages/libszip/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libszip/package.py b/var/spack/repos/builtin/packages/libszip/package.py index 2f4b570fec..e33d4f5089 100644 --- a/var/spack/repos/builtin/packages/libszip/package.py +++ b/var/spack/repos/builtin/packages/libszip/package.py @@ -36,11 +36,11 @@ class Libszip(AutotoolsPackage): homepage = "https://support.hdfgroup.org/doc_resource/SZIP/" url = "https://support.hdfgroup.org/ftp/lib-external/szip/2.1.1/src/szip-2.1.1.tar.gz" list_url = "https://support.hdfgroup.org/ftp/lib-external/szip" - list_depth = 2 + list_depth = 3 provides('szip') - version('2.1.1', 'dd579cf0f26d44afd10a0ad7291fc282') + version('2.1.1', '5addbf2a5b1bf928b92c47286e921f72') version('2.1', '902f831bcefb69c6b635374424acbead') def configure_args(self): -- cgit v1.2.3-70-g09d2 From 96c95db793a91497de9e5626f8587d22de2b257f Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Wed, 6 Dec 2017 19:29:04 -0600 Subject: r-org-hs-eg-db: Create new package. (#6581) --- .../builtin/packages/r-org-hs-eg-db/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-org-hs-eg-db/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-org-hs-eg-db/package.py b/var/spack/repos/builtin/packages/r-org-hs-eg-db/package.py new file mode 100644 index 0000000000..64c788396e --- /dev/null +++ b/var/spack/repos/builtin/packages/r-org-hs-eg-db/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class ROrgHsEgDb(RPackage): + """Genome wide annotation for Human, primarily based on mapping + using Entrez Gene identifiers.""" + + homepage = "http://www.example.co://www.bioconductor.org/packages/org.Hs.eg.db/i" + url = "https://www.bioconductor.org/packages/3.5/data/annotation/src/contrib/org.Hs.eg.db_3.4.1.tar.gz" + + version('3.4.1', '0a987ef7d6167df70e91e6f48145e41c') + + depends_on('r@3.4.0:3.4.9', when='@3.4.1') + depends_on('r-annotationdbi', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From c2ea795b08386d36e97ce1a8a55153c65512e153 Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Wed, 6 Dec 2017 19:29:22 -0600 Subject: r-kegggraph: Create new package. (#6580) --- .../repos/builtin/packages/r-kegggraph/package.py | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-kegggraph/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-kegggraph/package.py b/var/spack/repos/builtin/packages/r-kegggraph/package.py new file mode 100644 index 0000000000..98aee6069f --- /dev/null +++ b/var/spack/repos/builtin/packages/r-kegggraph/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RKegggraph(RPackage): + """KEGGGraph is an interface between KEGG pathway and graph object as + well as a collection of tools to analyze, dissect and visualize these + graphs. It parses the regularly updated KGML (KEGG XML) files into graph + models maintaining all essential pathway attributes. The package offers + functionalities including parsing, graph operation, visualization and + etc.""" + + homepage = "https://www.bioconductor.org/packages/KEGGgraph/" + url = "https://git.bioconductor.org/packages/KEGGgraph" + + version('1.38.1', git='https://git.bioconductor.org/packages/KEGGgraph', commit='dd31665beb36d5aad8ed09ed56c603633b6b2292') + + depends_on('r-graph', type=('build', 'run')) + depends_on('r-xml', type=('build', 'run')) + depends_on('r@3.4.0:3.4.9', when='@1.38.1') -- cgit v1.2.3-70-g09d2 From 3a4329c77d706b4a4d4fbf72519d88383d551e0d Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Wed, 6 Dec 2017 19:29:45 -0600 Subject: r-pathview: Create new package. (#6582) --- .../repos/builtin/packages/r-pathview/package.py | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-pathview/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-pathview/package.py b/var/spack/repos/builtin/packages/r-pathview/package.py new file mode 100644 index 0000000000..13c6a27c9e --- /dev/null +++ b/var/spack/repos/builtin/packages/r-pathview/package.py @@ -0,0 +1,51 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RPathview(RPackage): + """Pathview is a tool set for pathway based data integration and + visualization. It maps and renders a wide variety of biological data on + relevant pathway graphs. All users need is to supply their data and + specify the target pathway. Pathview automatically downloads the pathway + graph data, parses the data file, maps user data to the pathway, and + render pathway graph with the mapped data. In addition, Pathview also + seamlessly integrates with pathway and gene set (enrichment) analysis + tools for large-scale and fully automated analysis.""" + + homepage = "https://www.bioconductor.org/packages/pathview/" + url = "https://git.bioconductor.org/packages/pathview" + + version('1.16.7', git='https://git.bioconductor.org/packages/pathview', commit='fc560ed15ef7393a73d35e714716cc24dc835339') + + depends_on('r-keggrest', type=('build', 'run')) + depends_on('r-png', type=('build', 'run')) + depends_on('r-annotationdbi', type=('build', 'run')) + depends_on('r-graph', type=('build', 'run')) + depends_on('r-rgraphviz', type=('build', 'run')) + depends_on('r-xml', type=('build', 'run')) + depends_on('r-kegggraph', type=('build', 'run')) + depends_on('r-org-hs-eg-db', type=('build', 'run')) + depends_on('r@3.4.0:3.4.9', when='@1.16.7') -- cgit v1.2.3-70-g09d2 From f49c186f4f4e7e6be4894518d80b1601adceb2e6 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Thu, 7 Dec 2017 08:33:08 +0100 Subject: wxWidgets: Fix builds (#6560) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - depends on GTK+ with X enabled (btw, non-X backends are deprecated/removed in GTK+) - patch for 3.0.1-3.0.2: missing include caused multiple `error: call of overloaded ‘abs(XYPOSITION)’ is ambiguous` (seen in GCC 6.3.0); fixed in 3.0.3+ --- var/spack/repos/builtin/packages/wx/math_include.patch | 12 ++++++++++++ var/spack/repos/builtin/packages/wx/package.py | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 var/spack/repos/builtin/packages/wx/math_include.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/wx/math_include.patch b/var/spack/repos/builtin/packages/wx/math_include.patch new file mode 100644 index 0000000000..152f095d18 --- /dev/null +++ b/var/spack/repos/builtin/packages/wx/math_include.patch @@ -0,0 +1,12 @@ +diff --git a/src/stc/scintilla/src/Editor.cxx b/src/stc/scintilla/src/Editor.cxx +index cd72953ae7..8c19154313 100644 +--- a/src/stc/scintilla/src/Editor.cxx ++++ b/src/stc/scintilla/src/Editor.cxx +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + + #include + #include diff --git a/var/spack/repos/builtin/packages/wx/package.py b/var/spack/repos/builtin/packages/wx/package.py index 082e608bfc..4aa1e2f16a 100644 --- a/var/spack/repos/builtin/packages/wx/package.py +++ b/var/spack/repos/builtin/packages/wx/package.py @@ -44,8 +44,10 @@ class Wx(AutotoolsPackage): version('develop', git='https://github.com/wxWidgets/wxWidgets.git', branch='master') + patch('math_include.patch', when='@3.0.1:3.0.2') + depends_on('pkgconfig', type='build') - depends_on('gtkplus') + depends_on('gtkplus+X') @when('@:3.0.2') def build(self, spec, prefix): -- cgit v1.2.3-70-g09d2 From 69e76a0a89d2d47f2e9cef1a0b3cc80dbdcd89ca Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Fri, 8 Dec 2017 01:09:35 -0700 Subject: Update openfast package to explicity pass MPI implementation during cmake configure. (#6590) --- var/spack/repos/builtin/packages/openfast/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openfast/package.py b/var/spack/repos/builtin/packages/openfast/package.py index 74d1881de9..cf37e24a81 100644 --- a/var/spack/repos/builtin/packages/openfast/package.py +++ b/var/spack/repos/builtin/packages/openfast/package.py @@ -81,6 +81,9 @@ class Openfast(CMakePackage): if '+cxx' in spec: options.extend([ + '-DMPI_CXX_COMPILER:PATH=%s' % spec['mpi'].mpicxx, + '-DMPI_C_COMPILER:PATH=%s' % spec['mpi'].mpicc, + '-DMPI_Fortran_COMPILER:PATH=%s' % spec['mpi'].mpifc, '-DHDF5_ROOT:PATH=%s' % spec['hdf5'].prefix, '-DYAML_ROOT:PATH=%s' % spec['yaml-cpp'].prefix, ]) -- cgit v1.2.3-70-g09d2 From a110a86ad6772e942328d3481aaff4950a3aeba3 Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Fri, 8 Dec 2017 09:33:30 +0100 Subject: Update for 'grib-api'. (#6605) --- .../packages/grib-api/cmake_install_rpath.patch | 11 ++ .../builtin/packages/grib-api/disable_numpy.patch | 12 ++ .../packages/grib-api/enable_only_jasper.patch | 34 ++++++ .../packages/grib-api/enable_only_openjpeg.patch | 28 +++++ .../repos/builtin/packages/grib-api/package.py | 121 ++++++++++++++++----- 5 files changed, 181 insertions(+), 25 deletions(-) create mode 100644 var/spack/repos/builtin/packages/grib-api/cmake_install_rpath.patch create mode 100644 var/spack/repos/builtin/packages/grib-api/disable_numpy.patch create mode 100644 var/spack/repos/builtin/packages/grib-api/enable_only_jasper.patch create mode 100644 var/spack/repos/builtin/packages/grib-api/enable_only_openjpeg.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/grib-api/cmake_install_rpath.patch b/var/spack/repos/builtin/packages/grib-api/cmake_install_rpath.patch new file mode 100644 index 0000000000..7e2b250883 --- /dev/null +++ b/var/spack/repos/builtin/packages/grib-api/cmake_install_rpath.patch @@ -0,0 +1,11 @@ +--- a/cmake/ecbuild_append_to_rpath.cmake ++++ b/cmake/ecbuild_append_to_rpath.cmake +@@ -31,7 +31,7 @@ function( _path_append var path ) + else() + list( FIND ${var} ${path} _found ) + if( _found EQUAL "-1" ) +- set( ${var} "${${var}}:${path}" PARENT_SCOPE ) ++ set( ${var} "${${var}};${path}" PARENT_SCOPE ) + endif() + endif() + endfunction() diff --git a/var/spack/repos/builtin/packages/grib-api/disable_numpy.patch b/var/spack/repos/builtin/packages/grib-api/disable_numpy.patch new file mode 100644 index 0000000000..c056388da8 --- /dev/null +++ b/var/spack/repos/builtin/packages/grib-api/disable_numpy.patch @@ -0,0 +1,12 @@ +--- a/python/CMakeLists.txt ++++ b/python/CMakeLists.txt +@@ -6,7 +6,8 @@ if( HAVE_PYTHON ) + #endif() + + # check for Numpy +- find_package( NumPy ) ++ # find_package( NumPy ) ++ set(NUMPY_FOUND FALSE) + + ############################################################################### + # swig python interface diff --git a/var/spack/repos/builtin/packages/grib-api/enable_only_jasper.patch b/var/spack/repos/builtin/packages/grib-api/enable_only_jasper.patch new file mode 100644 index 0000000000..06e9790f59 --- /dev/null +++ b/var/spack/repos/builtin/packages/grib-api/enable_only_jasper.patch @@ -0,0 +1,34 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -106,18 +106,7 @@ set( HAVE_LIBOPENJPEG 0 ) + + if( ENABLE_JPG ) + +- # Note: This is a deprecated feature but we need it to find Jasper at ECMWF. +- # ecbuild_add_extra_search_paths modifies CMAKE_PREFIX_PATH +- # which can affect future package discovery if not undone by the caller. +- # The current CMAKE_PREFIX_PATH is backed up as _CMAKE_PREFIX_PATH +- # +- set(CMAKE_WARN_DEPRECATED OFF) # Suppress deprecation message +- ecbuild_add_extra_search_paths( jasper ) + find_package( Jasper ) +- set(CMAKE_PREFIX_PATH ${_CMAKE_PREFIX_PATH}) # Restore CMAKE_PREFIX_PATH +- set(CMAKE_WARN_DEPRECATED ON) # Remove suppression +- +- find_package( OpenJPEG ) + + if( JASPER_FOUND ) + list( APPEND GRIB_API_TPLS Jasper ) +@@ -125,12 +114,6 @@ if( ENABLE_JPG ) + set( HAVE_LIBJASPER 1 ) + endif() + +- if( OPENJPEG_FOUND ) +- list( APPEND GRIB_API_TPLS OpenJPEG ) +- set( HAVE_JPEG 1 ) +- set( HAVE_LIBOPENJPEG 1 ) +- endif() +- + endif() + + diff --git a/var/spack/repos/builtin/packages/grib-api/enable_only_openjpeg.patch b/var/spack/repos/builtin/packages/grib-api/enable_only_openjpeg.patch new file mode 100644 index 0000000000..a440477029 --- /dev/null +++ b/var/spack/repos/builtin/packages/grib-api/enable_only_openjpeg.patch @@ -0,0 +1,28 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -106,25 +106,8 @@ set( HAVE_LIBOPENJPEG 0 ) + + if( ENABLE_JPG ) + +- # Note: This is a deprecated feature but we need it to find Jasper at ECMWF. +- # ecbuild_add_extra_search_paths modifies CMAKE_PREFIX_PATH +- # which can affect future package discovery if not undone by the caller. +- # The current CMAKE_PREFIX_PATH is backed up as _CMAKE_PREFIX_PATH +- # +- set(CMAKE_WARN_DEPRECATED OFF) # Suppress deprecation message +- ecbuild_add_extra_search_paths( jasper ) +- find_package( Jasper ) +- set(CMAKE_PREFIX_PATH ${_CMAKE_PREFIX_PATH}) # Restore CMAKE_PREFIX_PATH +- set(CMAKE_WARN_DEPRECATED ON) # Remove suppression +- + find_package( OpenJPEG ) + +- if( JASPER_FOUND ) +- list( APPEND GRIB_API_TPLS Jasper ) +- set( HAVE_JPEG 1 ) +- set( HAVE_LIBJASPER 1 ) +- endif() +- + if( OPENJPEG_FOUND ) + list( APPEND GRIB_API_TPLS OpenJPEG ) + set( HAVE_JPEG 1 ) diff --git a/var/spack/repos/builtin/packages/grib-api/package.py b/var/spack/repos/builtin/packages/grib-api/package.py index 5da851c1ba..3e23a7e4fd 100644 --- a/var/spack/repos/builtin/packages/grib-api/package.py +++ b/var/spack/repos/builtin/packages/grib-api/package.py @@ -30,51 +30,122 @@ class GribApi(CMakePackage): C, FORTRAN and Python programs developed for encoding and decoding WMO FM-92 GRIB edition 1 and edition 2 messages.""" - homepage = "https://software.ecmwf.int/wiki/display/GRIB/Home" - url = "https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-1.17.0-Source.tar.gz" + homepage = 'https://software.ecmwf.int/wiki/display/GRIB/Home' + url = 'https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-1.17.0-Source.tar.gz?api=v2' + list_url = 'https://software.ecmwf.int/wiki/display/GRIB/Releases' + maintainers = ['skosukhin'] + + version('1.24.0', 'dcc549069cdeeaa1959732c36ab3136f') version('1.21.0', 'eb64c5eb72e6e90841237cba9d644016') version('1.17.0', 'bca7114d2c3100501a08190a146818d2') version('1.16.0', '8c7fdee03344e4379d400ae20976a460') - variant('netcdf', default=False, description='Enable netcdf encoding/decoding using netcdf library') - variant('jpeg', default=True, description='Enable jpeg 2000 for grib 2 decoding/encoding') - variant('png', default=False, description='Enable png for decoding/encoding') + variant('netcdf', default=False, + description='Enable netcdf encoding/decoding using netcdf library') + variant('jp2k', default='openjpeg', values=('openjpeg', 'jasper', 'none'), + description='Specify JPEG2000 decoding/encoding backend') + variant('png', default=False, + description='Enable png for decoding/encoding') + variant('aec', default=False, + description='Enable Adaptive Entropy Coding for decoding/encoding') + variant('pthreads', default=False, + description='Enable POSIX threads') + variant('openmp', default=False, + description='Enable OpenMP threads') + variant('python', default=False, + description='Enable the Python interface') + variant('numpy', default=False, + description='Enable numpy support in the Python interface') + variant('fortran', default=False, description='Enable the Fortran support') + variant('examples', default=True, + description='Build the examples (part of the full test suite)') + variant('test', default=True, description='Enable the tests') variant('build_type', default='RelWithDebInfo', description='The build type to build', values=('Debug', 'Release', 'RelWithDebInfo', 'Production')) - depends_on('libpng', when='+png') + # The building script tries to find an optional package valgrind when + # tests are enabled but the testing scripts don't use it. + # depends_on('valgrind', type='test', when='+test') + depends_on('netcdf', when='+netcdf') - depends_on('jasper', when='+jpeg') - depends_on('cmake@2.8.11:', type='build') + depends_on('openjpeg@1.5.0:1.5.999', when='jp2k=openjpeg') + depends_on('jasper', when='jp2k=jasper') + depends_on('libpng', when='+png') + depends_on('libaec', when='+aec') + depends_on('python@2.5:2.999', when='+python', + type=('build', 'link', 'run')) + depends_on('py-numpy', when='+python+numpy', type=('build', 'run')) + extends('python', when='+python') - def cmake_args(self): - spec = self.spec - args = ['-DBUILD_SHARED_LIBS=BOTH'] + conflicts('+openmp', when='+pthreads', + msg='Cannot enable both POSIX threads and OMP') + conflicts('+numpy', when='~python', + msg='Numpy variant is valid only when the Python interface is ' + 'enabled') + + # The following enforces linking against the specified JPEG2000 backend. + patch('enable_only_openjpeg.patch', when='jp2k=openjpeg') + patch('enable_only_jasper.patch', when='jp2k=jasper') + + # Disable NumPy even if it's available. + patch('disable_numpy.patch', when='+python~numpy') + + # CMAKE_INSTALL_RPATH must be a semicolon-separated list. + patch('cmake_install_rpath.patch') + + @run_before('cmake') + def check_fortran(self): + if '+fortran' in self.spec and self.compiler.fc is None: + raise InstallError( + 'Fortran interface requires a Fortran compiler!') - # We will add python support later. - args.append('-DENABLE_PYTHON=OFF') + def cmake_args(self): + var_opt_list = [('+pthreads', 'GRIB_THREADS'), + ('+openmp', 'GRIB_OMP_THREADS'), + ('+python', 'PYTHON'), + ('+fortran', 'FORTRAN'), + ('+examples', 'EXAMPLES'), + ('+test', 'TESTS')] - # Disable FORTRAN interface if we don't have it. - if (self.compiler.f77 is None) or (self.compiler.fc is None): - args.append('-DENABLE_FORTRAN=OFF') + args = ['-DENABLE_%s=%s' % (opt, 'ON' if var in self.spec else 'OFF') + for var, opt in var_opt_list] - if '+netcdf' in spec: - args.append('-DENABLE_NETCDF=ON') - args.append('-DNETCDF_PATH=%s' % spec['netcdf'].prefix) + if '+netcdf' in self.spec: + args.extend(['-DENABLE_NETCDF=ON', + # Prevent overriding by environment variable + # HDF5_ROOT. + '-DHDF5_ROOT=' + self.spec['hdf5'].prefix, + # Prevent possible overriding by environment variables + # NETCDF_ROOT, NETCDF_DIR, and NETCDF_PATH. + '-DNETCDF_PATH=' + self.spec['netcdf'].prefix]) else: args.append('-DENABLE_NETCDF=OFF') - if '+jpeg' in spec: - args.append('-DENABLE_JPG=ON') - args.append('-DJASPER_PATH=%s' % spec['jasper'].prefix) - else: + if self.spec.variants['jp2k'].value == 'none': args.append('-DENABLE_JPG=OFF') + else: + args.append('-DENABLE_JPG=ON') - if '+png' in spec: - args.append('-DENABLE_PNG=ON') + if self.spec.variants['jp2k'].value == 'openjpeg': + args.append('-DOPENJPEG_PATH=' + self.spec['openjpeg'].prefix) + + if '+png' in self.spec: + args.extend(['-DENABLE_PNG=ON', + '-DZLIB_ROOT=' + self.spec['zlib'].prefix]) else: args.append('-DENABLE_PNG=OFF') + if '+aec' in self.spec: + args.extend(['-DENABLE_AEC=ON', + # Prevent overriding by environment variables + # AEC_DIR and AEC_PATH. + '-DAEC_DIR=' + self.spec['libaec'].prefix]) + else: + args.append('-DENABLE_AEC=OFF') + + if '^python' in self.spec: + args.append('-DPYTHON_EXECUTABLE:FILEPATH=' + python.path) + return args -- cgit v1.2.3-70-g09d2 From a593553d48e51c67cdcde73c07c9ce0babb2e647 Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Fri, 8 Dec 2017 09:34:37 +0100 Subject: Update for 'eccodes'. (#6604) --- .mailmap | 1 + .../packages/eccodes/cmake_install_rpath.patch | 11 +++ .../packages/eccodes/enable_only_jasper.patch | 24 ++++--- .../packages/eccodes/enable_only_openjpeg.patch | 2 - .../repos/builtin/packages/eccodes/package.py | 81 ++++++++++++++++++---- 5 files changed, 97 insertions(+), 22 deletions(-) create mode 100644 var/spack/repos/builtin/packages/eccodes/cmake_install_rpath.patch (limited to 'var') diff --git a/.mailmap b/.mailmap index 41575ebb1f..f6f781e891 100644 --- a/.mailmap +++ b/.mailmap @@ -49,6 +49,7 @@ Robert D. French Robert D. French Robert D. French Robert.French Robert D. French robertdfrench Saravan Pantham Saravan Pantham +Sergey Kosukhin Sergey Kosukhin Stephen Herbein Stephen Herbein Todd Gamblin George Todd Gamblin Todd Gamblin Todd Gamblin diff --git a/var/spack/repos/builtin/packages/eccodes/cmake_install_rpath.patch b/var/spack/repos/builtin/packages/eccodes/cmake_install_rpath.patch new file mode 100644 index 0000000000..7e2b250883 --- /dev/null +++ b/var/spack/repos/builtin/packages/eccodes/cmake_install_rpath.patch @@ -0,0 +1,11 @@ +--- a/cmake/ecbuild_append_to_rpath.cmake ++++ b/cmake/ecbuild_append_to_rpath.cmake +@@ -31,7 +31,7 @@ function( _path_append var path ) + else() + list( FIND ${var} ${path} _found ) + if( _found EQUAL "-1" ) +- set( ${var} "${${var}}:${path}" PARENT_SCOPE ) ++ set( ${var} "${${var}};${path}" PARENT_SCOPE ) + endif() + endif() + endfunction() diff --git a/var/spack/repos/builtin/packages/eccodes/enable_only_jasper.patch b/var/spack/repos/builtin/packages/eccodes/enable_only_jasper.patch index 9f7dc22ac5..ad09c75199 100644 --- a/var/spack/repos/builtin/packages/eccodes/enable_only_jasper.patch +++ b/var/spack/repos/builtin/packages/eccodes/enable_only_jasper.patch @@ -1,17 +1,25 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bf4d78b..ea2f3e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -162,8 +162,6 @@ if( ENABLE_JPG ) - set(CMAKE_PREFIX_PATH ${_CMAKE_PREFIX_PATH}) # Restore CMAKE_PREFIX_PATH - set(CMAKE_WARN_DEPRECATED ON) # Remove suppression +@@ -151,18 +151,7 @@ set( HAVE_LIBOPENJPEG 0 ) -- find_package( OpenJPEG ) + if( ENABLE_JPG ) + +- # Note: This is a deprecated feature but we need it to find Jasper at ECMWF. +- # ecbuild_add_extra_search_paths modifies CMAKE_PREFIX_PATH +- # which can affect future package discovery if not undone by the caller. +- # The current CMAKE_PREFIX_PATH is backed up as _CMAKE_PREFIX_PATH +- # +- set(CMAKE_WARN_DEPRECATED OFF) # Suppress deprecation message +- ecbuild_add_extra_search_paths( jasper ) + find_package( Jasper ) +- set(CMAKE_PREFIX_PATH ${_CMAKE_PREFIX_PATH}) # Restore CMAKE_PREFIX_PATH +- set(CMAKE_WARN_DEPRECATED ON) # Remove suppression - +- find_package( OpenJPEG ) + if( JASPER_FOUND ) list( APPEND ECCODES_TPLS Jasper ) - set( HAVE_JPEG 1 ) -@@ -172,12 +170,6 @@ if( ENABLE_JPG ) +@@ -172,12 +161,6 @@ if( ENABLE_JPG ) string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" JASPER_VERSION_MAJOR "${JASPER_VERSION_STRING}") endif() diff --git a/var/spack/repos/builtin/packages/eccodes/enable_only_openjpeg.patch b/var/spack/repos/builtin/packages/eccodes/enable_only_openjpeg.patch index 7bf8b7b59f..29a6dff454 100644 --- a/var/spack/repos/builtin/packages/eccodes/enable_only_openjpeg.patch +++ b/var/spack/repos/builtin/packages/eccodes/enable_only_openjpeg.patch @@ -1,5 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bf4d78b..3ae50ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -151,27 +151,8 @@ set( HAVE_LIBOPENJPEG 0 ) diff --git a/var/spack/repos/builtin/packages/eccodes/package.py b/var/spack/repos/builtin/packages/eccodes/package.py index 0f1e127aed..ca86024f13 100644 --- a/var/spack/repos/builtin/packages/eccodes/package.py +++ b/var/spack/repos/builtin/packages/eccodes/package.py @@ -30,9 +30,11 @@ class Eccodes(CMakePackage): """ecCodes is a package developed by ECMWF for processing meteorological data in GRIB (1/2), BUFR (3/4) and GTS header formats.""" - homepage = "https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home" - url = "https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-2.2.0-Source.tar.gz?api=v2" - list_url = "https://software.ecmwf.int/wiki/display/ECC/Releases" + homepage = 'https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home' + url = 'https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-2.2.0-Source.tar.gz?api=v2' + list_url = 'https://software.ecmwf.int/wiki/display/ECC/Releases' + + maintainers = ['skosukhin'] version('2.5.0', '5a7e92c58418d855082fa573efd352aa') version('2.2.0', 'b27e6f0a3eea5b92dac37372e4c45a62') @@ -53,17 +55,28 @@ class Eccodes(CMakePackage): description='Enable memory based access to definitions/samples') variant('python', default=False, description='Enable the Python interface') - variant('fortran', default=True, description='Enable the Fortran support') + variant('fortran', default=False, description='Enable the Fortran support') + variant('examples', default=True, + description='Build the examples (part of the full test suite)') + variant('test', default=True, description='Enable the tests') variant('build_type', default='RelWithDebInfo', description='The build type to build', values=('Debug', 'Release', 'RelWithDebInfo', 'Production')) + # The building script tries to find an optional package valgrind when + # tests are enabled but the testing scripts don't use it. + # depends_on('valgrind', type='test', when='+test') + depends_on('netcdf', when='+netcdf') - depends_on('openjpeg', when='jp2k=openjpeg') + depends_on('openjpeg@1.5.0:1.5.999,2.1.0:2.1.999', when='jp2k=openjpeg') depends_on('jasper', when='jp2k=jasper') depends_on('libpng', when='+png') depends_on('libaec', when='+aec') - depends_on('python@:2', when='+python') + # Can be built with Python2 or Python3. + depends_on('python', when='+memfs', type='build') + # The interface works only for Python2. + depends_on('python@2.6:2.999', when='+python', + type=('build', 'link', 'run')) depends_on('py-numpy', when='+python', type=('build', 'run')) extends('python', when='+python') @@ -74,18 +87,62 @@ class Eccodes(CMakePackage): patch('enable_only_openjpeg.patch', when='jp2k=openjpeg') patch('enable_only_jasper.patch', when='jp2k=jasper') + # CMAKE_INSTALL_RPATH must be a semicolon-separated list. + patch('cmake_install_rpath.patch') + + @run_before('cmake') + def check_fortran(self): + if '+fortran' in self.spec and self.compiler.fc is None: + raise InstallError( + 'Fortran interface requires a Fortran compiler!') + def cmake_args(self): - variants = ['+netcdf', '+png', '+aec', '+pthreads', - '+openmp', '+memfs', '+python', '+fortran'] - options = ['NETCDF', 'PNG', 'AEC', 'ECCODES_THREADS', - 'ECCODES_OMP_THREADS', 'MEMFS', 'PYTHON', 'FORTRAN'] + var_opt_list = [('+pthreads', 'ECCODES_THREADS'), + ('+openmp', 'ECCODES_OMP_THREADS'), + ('+memfs', 'MEMFS'), + ('+python', 'PYTHON'), + ('+fortran', 'FORTRAN'), + ('+examples', 'EXAMPLES'), + ('+test', 'TESTS'), + ('+test', 'EXTRA_TESTS')] + + args = ['-DENABLE_%s=%s' % (opt, 'ON' if var in self.spec else 'OFF') + for var, opt in var_opt_list] - args = ["-DENABLE_%s=%s" % (opt, 'ON' if var in self.spec else 'OFF') - for var, opt in zip(variants, options)] + if '+netcdf' in self.spec: + args.extend(['-DENABLE_NETCDF=ON', + # Prevent overriding by environment variable + # HDF5_ROOT. + '-DHDF5_ROOT=' + self.spec['hdf5'].prefix, + # Prevent possible overriding by environment variables + # NETCDF_ROOT, NETCDF_DIR, and NETCDF_PATH. + '-DNETCDF_PATH=' + self.spec['netcdf'].prefix]) + else: + args.append('-DENABLE_NETCDF=OFF') if self.spec.variants['jp2k'].value == 'none': args.append('-DENABLE_JPG=OFF') else: args.append('-DENABLE_JPG=ON') + if self.spec.variants['jp2k'].value == 'openjpeg': + args.append('-DOPENJPEG_PATH=' + self.spec['openjpeg'].prefix) + + if '+png' in self.spec: + args.extend(['-DENABLE_PNG=ON', + '-DZLIB_ROOT=' + self.spec['zlib'].prefix]) + else: + args.append('-DENABLE_PNG=OFF') + + if '+aec' in self.spec: + args.extend(['-DENABLE_AEC=ON', + # Prevent overriding by environment variables + # AEC_DIR and AEC_PATH. + '-DAEC_DIR=' + self.spec['libaec'].prefix]) + else: + args.append('-DENABLE_AEC=OFF') + + if '^python' in self.spec: + args.append('-DPYTHON_EXECUTABLE:FILEPATH=' + python.path) + return args -- cgit v1.2.3-70-g09d2 From 147a12dd061917a74f346e0e578c66708203853e Mon Sep 17 00:00:00 2001 From: "Kelly (KT) Thompson" Date: Fri, 8 Dec 2017 01:55:06 -0700 Subject: Provide a patch to allow hdf5@1.10.1 to build with intel/18.0.1. (#6583) This is known issue. See: https://software.intel.com/en-us/forums/intel-fortran-compiler-for-linux-and-mac-os-x/topic/747951. --- ...bal-mult-obj-same-equivalence-same-common-block.patch | 16 ++++++++++++++++ var/spack/repos/builtin/packages/hdf5/package.py | 6 ++++++ 2 files changed, 22 insertions(+) create mode 100644 var/spack/repos/builtin/packages/hdf5/h5f90global-mult-obj-same-equivalence-same-common-block.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hdf5/h5f90global-mult-obj-same-equivalence-same-common-block.patch b/var/spack/repos/builtin/packages/hdf5/h5f90global-mult-obj-same-equivalence-same-common-block.patch new file mode 100644 index 0000000000..8bf5c142e9 --- /dev/null +++ b/var/spack/repos/builtin/packages/hdf5/h5f90global-mult-obj-same-equivalence-same-common-block.patch @@ -0,0 +1,16 @@ +diff --git a/fortran/src/H5f90global.F90 b/fortran/src/H5f90global.F90 +index dd2b171..629418a 100644 +--- a/fortran/src/H5f90global.F90 ++++ b/fortran/src/H5f90global.F90 +@@ -142,10 +142,7 @@ MODULE H5GLOBAL + + INTEGER(HID_T), DIMENSION(PREDEF_TYPES_LEN) :: predef_types + EQUIVALENCE (predef_types(1), H5T_NATIVE_INTEGER_KIND(1)) +- EQUIVALENCE (predef_types(2), H5T_NATIVE_INTEGER_KIND(2)) +- EQUIVALENCE (predef_types(3), H5T_NATIVE_INTEGER_KIND(3)) +- EQUIVALENCE (predef_types(4), H5T_NATIVE_INTEGER_KIND(4)) +- EQUIVALENCE (predef_types(5), H5T_NATIVE_INTEGER_KIND(5)) ++ ! EQUIVALENCE predef_types(2:5) are unnecessary and violate the standard + EQUIVALENCE (predef_types(6), H5T_NATIVE_INTEGER) + EQUIVALENCE (predef_types(7), H5T_NATIVE_REAL) + EQUIVALENCE (predef_types(8), H5T_NATIVE_DOUBLE) diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index 5a15b33d98..6477d9cee2 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -90,6 +90,12 @@ class Hdf5(AutotoolsPackage): # described in #2 we allow for such combination. # conflicts('+mpi+cxx') + # There are known build failures with intel@18.0.1. This issue is + # discussed and patch is provided at + # https://software.intel.com/en-us/forums/intel-fortran-compiler-for-linux-and-mac-os-x/topic/747951. + patch('h5f90global-mult-obj-same-equivalence-same-common-block.patch', + when='@1.10.1%intel@18') + def url_for_version(self, version): url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-{0}/hdf5-{1}/src/hdf5-{1}.tar.gz" return url.format(version.up_to(2), version) -- cgit v1.2.3-70-g09d2 From 91eca9143e1e2326c7e88613842780fd6dc538d0 Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 8 Dec 2017 03:13:13 -0600 Subject: bedtools2: Add version 2.27.0 (#6606) --- var/spack/repos/builtin/packages/bedtools2/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bedtools2/package.py b/var/spack/repos/builtin/packages/bedtools2/package.py index 5956491f1b..0f48c83cbf 100644 --- a/var/spack/repos/builtin/packages/bedtools2/package.py +++ b/var/spack/repos/builtin/packages/bedtools2/package.py @@ -34,6 +34,7 @@ class Bedtools2(Package): homepage = "https://github.com/arq5x/bedtools2" url = "https://github.com/arq5x/bedtools2/archive/v2.26.0.tar.gz" + version('2.27.0', '052f22eb214ef2e7e7981b3c01167302') version('2.26.0', '52227e7efa6627f0f95d7d734973233d') version('2.25.0', '534fb4a7bf0d0c3f05be52a0160d8e3d') version('2.23.0', '4fa3671b3a3891eefd969ad3509222e3') -- cgit v1.2.3-70-g09d2 From 636ed371d825b3bc65e68fc3cfe255683ad21026 Mon Sep 17 00:00:00 2001 From: nshtg Date: Fri, 8 Dec 2017 10:15:40 +0100 Subject: Update fish to 2.7.0 (#6608) --- var/spack/repos/builtin/packages/fish/package.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fish/package.py b/var/spack/repos/builtin/packages/fish/package.py index 922aca5eb8..97b3d151ea 100644 --- a/var/spack/repos/builtin/packages/fish/package.py +++ b/var/spack/repos/builtin/packages/fish/package.py @@ -30,10 +30,11 @@ class Fish(AutotoolsPackage): the rest of the family. """ - homepage = "http://fishshell.com/" - url = "http://fishshell.com/files/2.2.0/fish-2.2.0.tar.gz" - list_url = "http://fishshell.com/" + homepage = "https://fishshell.com/" + url = "https://fishshell.com/files/2.7.0/fish-2.7.0.tar.gz" + list_url = "https://fishshell.com/" depends_on('ncurses') + version('2.7.0', '3a76b7cae92f9f88863c35c832d2427fb66082f98e92a02203dc900b8fa87bcb') version('2.2.0', 'a76339fd14ce2ec229283c53e805faac48c3e99d9e3ede9d82c0554acfc7b77a') -- cgit v1.2.3-70-g09d2 From 62d5bb41a844f6e14d034446e2b4bd9d0c3cba99 Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 8 Dec 2017 03:22:46 -0600 Subject: py-reportlab: Create new package (#6612) --- .../repos/builtin/packages/py-reportlab/package.py | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-reportlab/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-reportlab/package.py b/var/spack/repos/builtin/packages/py-reportlab/package.py new file mode 100644 index 0000000000..7d4ebe1b54 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-reportlab/package.py @@ -0,0 +1,35 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyReportlab(PythonPackage): + """The ReportLab Toolkit. An Open Source Python library for generating + PDFs and graphics.""" + + homepage = "https://pypi.python.org/pypi/reportlab" + url = "https://pypi.io/packages/source/r/reportlab/reportlab-3.4.0.tar.gz" + + version('3.4.0', '3f2522cf3b69cd84426c216619bbff53') -- cgit v1.2.3-70-g09d2 From 26e109027b96113836d334b20f6887ebea1ecb27 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Fri, 8 Dec 2017 10:24:44 +0100 Subject: qrupdate: fix blas/lapack and compilation of macOS (#6614) --- .../repos/builtin/packages/qrupdate/package.py | 29 ++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/qrupdate/package.py b/var/spack/repos/builtin/packages/qrupdate/package.py index 0856a4efb0..3f655f5dbf 100644 --- a/var/spack/repos/builtin/packages/qrupdate/package.py +++ b/var/spack/repos/builtin/packages/qrupdate/package.py @@ -22,10 +22,12 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## +import os +import sys from spack import * -class Qrupdate(Package): +class Qrupdate(MakefilePackage): """qrupdate is a Fortran library for fast updates of QR and Cholesky decompositions.""" @@ -37,7 +39,30 @@ class Qrupdate(Package): depends_on("blas") depends_on("lapack") + def edit(self, spec, prefix): + # BSD "install" does not understand GNU -D flag. + # We will create the parent directory ourselves. + makefile = FileFilter('src/Makefile') + if (sys.platform == 'darwin'): + makefile.filter('-D', '') + return + def install(self, spec, prefix): + lapack_blas = spec['lapack'].libs + spec['blas'].libs # Build static and dynamic libraries - make("lib", "solib") + make('lib', 'solib', + 'BLAS={0}'.format(lapack_blas.ld_flags), + 'LAPACK={0}'.format(lapack_blas.ld_flags)) + # "INSTALL" confuses "make install" on case-insensitive filesystems + if os.path.isfile("INSTALL"): + os.remove("INSTALL") + # create lib folder: + if (sys.platform == 'darwin'): + mkdirp(prefix.lib) make("install", "PREFIX=%s" % prefix) + + @run_after('install') + def fix_darwin_install(self): + # The shared libraries are not installed correctly on Darwin: + if (sys.platform == 'darwin'): + fix_darwin_install_name(self.spec.prefix.lib) -- cgit v1.2.3-70-g09d2 From 6f34c68aff6e24193039f9448196615015b21dc7 Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 8 Dec 2017 03:26:18 -0600 Subject: subread: Add version 1.6.0 (#6615) --- var/spack/repos/builtin/packages/subread/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/subread/package.py b/var/spack/repos/builtin/packages/subread/package.py index 86c5efe42e..e2f26377b8 100644 --- a/var/spack/repos/builtin/packages/subread/package.py +++ b/var/spack/repos/builtin/packages/subread/package.py @@ -33,6 +33,7 @@ class Subread(MakefilePackage): homepage = "http://subread.sourceforge.net/" url = "https://downloads.sourceforge.net/project/subread/subread-1.5.2/subread-1.5.2-source.tar.gz" + version('1.6.0', 'ed7e32c56bda1e769703e0a4db5a89a7') version('1.5.2', '817d2a46d87fcef885c8832475b8b247') depends_on('zlib') -- cgit v1.2.3-70-g09d2 From 17692d6c051d15d57073e9cbad05b2c6b4c46f84 Mon Sep 17 00:00:00 2001 From: nshtg Date: Fri, 8 Dec 2017 10:29:50 +0100 Subject: Update vim to 8.0.1376 (#6599) --- var/spack/repos/builtin/packages/vim/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/vim/package.py b/var/spack/repos/builtin/packages/vim/package.py index d216cb0aed..ae99824e30 100644 --- a/var/spack/repos/builtin/packages/vim/package.py +++ b/var/spack/repos/builtin/packages/vim/package.py @@ -35,8 +35,9 @@ class Vim(AutotoolsPackage): """ homepage = "http://www.vim.org" - url = "https://github.com/vim/vim/archive/v8.0.0134.tar.gz" + url = "https://github.com/vim/vim/archive/v8.0.1376.tar.gz" + version('8.0.1376', '62855881a2d96d48956859d74cfb8a3b') version('8.0.0503', '82b77bd5cb38b70514bed47cfe033b8c') version('8.0.0454', '4030bf677bdfbd14efb588e4d9a24128') version('8.0.0134', 'c74668d25c2acc85d655430dd60886cd') -- cgit v1.2.3-70-g09d2 From df184c707a8230a84e657251a7b4f0806ff6afcc Mon Sep 17 00:00:00 2001 From: Benedikt Riedel Date: Fri, 8 Dec 2017 03:33:08 -0600 Subject: Adding openssl dependency to xrootd. Closes #6601 (#6618) --- var/spack/repos/builtin/packages/xrootd/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/xrootd/package.py b/var/spack/repos/builtin/packages/xrootd/package.py index 2514997f88..16a1787883 100644 --- a/var/spack/repos/builtin/packages/xrootd/package.py +++ b/var/spack/repos/builtin/packages/xrootd/package.py @@ -40,3 +40,4 @@ class Xrootd(CMakePackage): depends_on('cmake@2.6:', type='build') depends_on('zlib') + depends_on('openssl') -- cgit v1.2.3-70-g09d2 From 20fc7d56d7e4c258b793cdcf0afb01e4630187a4 Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Fri, 8 Dec 2017 02:34:49 -0700 Subject: Candle benchmarks update (#6619) Added a dependency on HDF5 support for the CANDLE benchmarks. --- var/spack/repos/builtin/packages/candle-benchmarks/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/candle-benchmarks/package.py b/var/spack/repos/builtin/packages/candle-benchmarks/package.py index 7e5650c6f3..e2ba9bc310 100644 --- a/var/spack/repos/builtin/packages/candle-benchmarks/package.py +++ b/var/spack/repos/builtin/packages/candle-benchmarks/package.py @@ -44,6 +44,7 @@ class CandleBenchmarks(Package): depends_on('opencv@3.2.0: +core +highgui +imgproc +jpeg +png +tiff +zlib +python -dnn') depends_on('py-mdanalysis', type=('build', 'run')) depends_on('py-mpi4py', type=('build', 'run')) + depends_on('py-h5py', type=('build', 'run')) # see #3244, but use external for now # depends_on('tensorflow') -- cgit v1.2.3-70-g09d2 From 96476a32e545184908f64aac41b23987255138e2 Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Fri, 8 Dec 2017 03:36:57 -0600 Subject: py-htseq: Create new package. (#6623) --- .../repos/builtin/packages/py-htseq/package.py | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-htseq/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-htseq/package.py b/var/spack/repos/builtin/packages/py-htseq/package.py new file mode 100644 index 0000000000..8cbab45bb5 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-htseq/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyHtseq(PythonPackage): + """HTSeq is a Python package that provides infrastructure to process + data from high-throughput sequencing assays.""" + + homepage = "http://htseq.readthedocs.io/en/release_0.9.1/overview.html" + url = "https://github.com/simon-anders/htseq/archive/release_0.9.1.tar.gz" + + version('0.9.1', '269e7de5d39fc31f609cccd4a4740e61') + + depends_on('py-setuptools', type='build') + depends_on('py-numpy', type=('build', 'run')) + depends_on('py-pysam', type=('build', 'run')) + depends_on('py-matplotlib', type=('build', 'run')) + depends_on('py-cython', type=('build', 'run')) + depends_on('swig', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 23d56a75abd852a9daf15db61b38bb5804026b75 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Fri, 8 Dec 2017 10:37:54 +0100 Subject: dealii: update boost dependency (#6586) (i) blacklst 1.65.0 due to issues on Ubuntu with gcc 5.4.0 (ii) add a patch for 1.65.1 to fix serialization (iii) simplify boost's depends_on() --- .../packages/dealii/boost_1.65.1_singleton.patch | 43 ++++++++++++++++++++++ var/spack/repos/builtin/packages/dealii/package.py | 36 +++++++----------- 2 files changed, 57 insertions(+), 22 deletions(-) create mode 100644 var/spack/repos/builtin/packages/dealii/boost_1.65.1_singleton.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dealii/boost_1.65.1_singleton.patch b/var/spack/repos/builtin/packages/dealii/boost_1.65.1_singleton.patch new file mode 100644 index 0000000000..fffd85aa1a --- /dev/null +++ b/var/spack/repos/builtin/packages/dealii/boost_1.65.1_singleton.patch @@ -0,0 +1,43 @@ +diff --git a/boost/serialization/singleton.hpp b/boost/serialization/singleton.hpp +index b50afed..e891d55 100644 +--- a/boost/serialization/singleton.hpp ++++ b/boost/serialization/singleton.hpp +@@ -91,7 +91,7 @@ class BOOST_SYMBOL_VISIBLE singleton_module : + public boost::noncopyable + { + private: +- BOOST_SERIALIZATION_DECL BOOST_DLLEXPORT static bool & get_lock() BOOST_USED; ++ BOOST_DLLEXPORT static bool & get_lock() BOOST_USED; + public: + BOOST_DLLEXPORT static void lock(){ + get_lock() = true; +@@ -115,7 +115,7 @@ private: + // use a wrapper so that types T with protected constructors + // can be used + class singleton_wrapper : public T {}; +- static singleton_wrapper t; ++ static singleton_wrapper* t = new singleton_wrapper; + // refer to instance, causing it to be instantiated (and + // initialized at startup on working compilers) + BOOST_ASSERT(! is_destroyed()); +@@ -125,7 +125,9 @@ private: + // our usage/implementation of "locking" and introduce uncertainty into + // the sequence of object initializaition. + use(& m_instance); +- return static_cast(t); ++ if (!t) ++ t = new singleton_wrapper; ++ return static_cast(*t); + } + static bool & get_is_destroyed(){ + static bool is_destroyed; +@@ -147,6 +149,9 @@ public: + get_is_destroyed() = false; + } + BOOST_DLLEXPORT ~singleton() { ++ if (!get_is_destroyed()) { ++ delete &(get_instance()); ++ } + get_is_destroyed() = true; + } + }; diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 7dc23d75fc..bed9d53afa 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -89,30 +89,22 @@ class Dealii(CMakePackage, CudaPackage): # required dependencies, light version depends_on('blas') - # Boost 1.58 is blacklisted, see + # Boost 1.58 is blacklisted, require at least 1.59, see # https://github.com/dealii/dealii/issues/1591 - # Require at least 1.59 - # There are issues with 1.65.1 but not with 1.65.0: + # There are issues with 1.65.1 and 1.65.0: # https://github.com/dealii/dealii/issues/5262 - # +python won't affect @:8.4.2 - # FIXME: once concretizer can unite unconditional and - # conditional dependencies, simplify to: - # depends_on('boost@1.59.0+thread+system+serialization+iostreams') - # depends_on('boost+mpi', when='+mpi') - # depends_on('boost+python', when='+python') - depends_on('boost@1.59.0:1.63,1.65.0,1.66:+thread+system+serialization+iostreams', - when='@:8.4.2~mpi') - depends_on('boost@1.59.0:1.63,1.65.0,1.66:+thread+system+serialization+iostreams+mpi', - when='@:8.4.2+mpi') - # since @8.5.0: (and @develop) python bindings are introduced: - depends_on('boost@1.59.0:1.63,1.65.0,1.66:+thread+system+serialization+iostreams', - when='@8.5.0:~mpi~python') - depends_on('boost@1.59.0:1.63,1.65.0,1.66:+thread+system+serialization+iostreams+mpi', - when='@8.5.0:+mpi~python') - depends_on('boost@1.59.0:1.63,1.65.0,1.66:+thread+system+serialization+iostreams+python', - when='@8.5.0:~mpi+python') - depends_on('boost@1.59.0:1.63,1.65.0,1.66:+thread+system+serialization+iostreams+mpi+python', - when='@8.5.0:+mpi+python') + # we take the patch from https://github.com/boostorg/serialization/pull/79 + # more precisely its variation https://github.com/dealii/dealii/pull/5572#issuecomment-349742019 + depends_on('boost@1.59.0:1.63,1.65.1+thread+system+serialization+iostreams', + patches=patch('boost_1.65.1_singleton.patch', + level=1, + when='@1.65.1'), + when='~python') + depends_on('boost@1.59.0:1.63,1.65.1+thread+system+serialization+iostreams+python', + patches=patch('boost_1.65.1_singleton.patch', + level=1, + when='@1.65.1'), + when='+python') # bzip2 is not needed since 9.0 depends_on('bzip2', when='@:8.99') depends_on('lapack') -- cgit v1.2.3-70-g09d2 From 1c72a5da3ab5c1c7a9d996b91db676524ab962b7 Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 8 Dec 2017 03:38:37 -0600 Subject: py-cogent: Create new package (#6624) --- .../repos/builtin/packages/py-cogent/package.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-cogent/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-cogent/package.py b/var/spack/repos/builtin/packages/py-cogent/package.py new file mode 100644 index 0000000000..ac71abfadb --- /dev/null +++ b/var/spack/repos/builtin/packages/py-cogent/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyCogent(PythonPackage): + """A toolkit for statistical analysis of biological sequences.""" + + homepage = "http://pycogent.org" + url = "https://pypi.io/packages/source/c/cogent/cogent-1.9.tar.gz" + + version('1.9', '7d9f28cd17664c1cd18c568fc53060d6') + + depends_on('py-setuptools', type='build') + depends_on('py-numpy', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 1bdea989783bbf7108504eb246f14ecac1a02125 Mon Sep 17 00:00:00 2001 From: Paschalis Korosoglou Date: Fri, 8 Dec 2017 12:18:25 +0200 Subject: r-rhtslib: added build dependency on autoconf (#6627) --- var/spack/repos/builtin/packages/r-rhtslib/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-rhtslib/package.py b/var/spack/repos/builtin/packages/r-rhtslib/package.py index 4af0093830..0c52ea832e 100644 --- a/var/spack/repos/builtin/packages/r-rhtslib/package.py +++ b/var/spack/repos/builtin/packages/r-rhtslib/package.py @@ -39,3 +39,4 @@ class RRhtslib(RPackage): depends_on('r@3.4.0:3.4.9', when='@1.8.0') depends_on('r-zlibbioc', type=('build', 'run')) + depends_on('autoconf@2.67:', type='build') -- cgit v1.2.3-70-g09d2 From bd92cc0a1af4196406949a4b8ab76b438a8204b9 Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Fri, 8 Dec 2017 13:36:20 +0100 Subject: Package 'openjpeg': set INSTALL_NAME_DIR on MacOS for old versions. (#6603) --- var/spack/repos/builtin/packages/openjpeg/macos.patch | 13 +++++++++++++ var/spack/repos/builtin/packages/openjpeg/package.py | 5 +++++ 2 files changed, 18 insertions(+) create mode 100644 var/spack/repos/builtin/packages/openjpeg/macos.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openjpeg/macos.patch b/var/spack/repos/builtin/packages/openjpeg/macos.patch new file mode 100644 index 0000000000..f736b92b47 --- /dev/null +++ b/var/spack/repos/builtin/packages/openjpeg/macos.patch @@ -0,0 +1,13 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -151,6 +151,10 @@ IF(NOT OPENJPEG_INSTALL_PACKAGE_DIR) + SET(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}") + ENDIF(NOT OPENJPEG_INSTALL_PACKAGE_DIR) + ++IF(APPLE) ++ LIST(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}") ++ENDIF() ++ + #----------------------------------------------------------------------------- + # Big endian test: + INCLUDE (${CMAKE_ROOT}/Modules/TestBigEndian.cmake) diff --git a/var/spack/repos/builtin/packages/openjpeg/package.py b/var/spack/repos/builtin/packages/openjpeg/package.py index b8e4855337..751722dec5 100644 --- a/var/spack/repos/builtin/packages/openjpeg/package.py +++ b/var/spack/repos/builtin/packages/openjpeg/package.py @@ -49,6 +49,11 @@ class Openjpeg(CMakePackage): version('1.5.2', '545f98923430369a6b046ef3632ef95c') version('1.5.1', 'd774e4b5a0db5f0f171c4fc0aabfa14e') + # The problem with install name of the library on MacOs was fixed starting + # version 2.1.1: https://github.com/uclouvain/openjpeg/commit/b9a247b559e62e55f5561624cf4a19aee3c8afdc + # The solution works for the older versions (at least starting 1.5.1) too. + patch('macos.patch', when='@:2.1.0 platform=darwin') + def url_for_version(self, version): if version >= Version('2.1.1'): return super(Openjpeg, self).url_for_version(version) -- cgit v1.2.3-70-g09d2 From 2343e5185d07d56a992db69cd2815f667ae7bd86 Mon Sep 17 00:00:00 2001 From: Tzanio Kolev Date: Fri, 8 Dec 2017 09:12:33 -0800 Subject: Updated hash for v1.0 tag of Laghos (#6626) --- var/spack/repos/builtin/packages/laghos/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/laghos/package.py b/var/spack/repos/builtin/packages/laghos/package.py index 0e889782e6..e14f0591a1 100644 --- a/var/spack/repos/builtin/packages/laghos/package.py +++ b/var/spack/repos/builtin/packages/laghos/package.py @@ -37,7 +37,7 @@ class Laghos(MakefilePackage): git = "https://github.com/CEED/Laghos" url = "https://github.com/CEED/Laghos/archive/v1.0.tar.gz" - version('1.0', '107c2f693936723e764a4d404d33d44a') + version('1.0', '4c091e115883c79bed81c557ef16baff') version('develop', git=git, branch='master') depends_on('mpi') -- cgit v1.2.3-70-g09d2 From 195407509177a4da5ae9c0012a325681d32497e4 Mon Sep 17 00:00:00 2001 From: nshtg Date: Fri, 8 Dec 2017 18:13:22 +0100 Subject: Update tmux to 2.6 (#6597) --- var/spack/repos/builtin/packages/tmux/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/tmux/package.py b/var/spack/repos/builtin/packages/tmux/package.py index 52c6c530d1..5ca850a1cc 100644 --- a/var/spack/repos/builtin/packages/tmux/package.py +++ b/var/spack/repos/builtin/packages/tmux/package.py @@ -34,8 +34,9 @@ class Tmux(AutotoolsPackage): """ homepage = "http://tmux.github.io" - url = "https://github.com/tmux/tmux/releases/download/2.2/tmux-2.2.tar.gz" + url = "https://github.com/tmux/tmux/releases/download/2.6/tmux-2.6.tar.gz" + version('2.6', 'd541ff392249f94c4f3635793556f827') version('2.5', '4a5d73d96d8f11b0bdf9b6f15ab76d15') version('2.4', '6165d3aca811a3225ef8afbd1afcf1c5') version('2.3', 'fcfd1611d705d8b31df3c26ebc93bd3e') -- cgit v1.2.3-70-g09d2 From fd764b99466287f6495e70ac9ad86f624d6a97dd Mon Sep 17 00:00:00 2001 From: nshtg Date: Fri, 8 Dec 2017 18:13:41 +0100 Subject: Update openSSH to 7.6p1 (#6598) --- var/spack/repos/builtin/packages/openssh/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openssh/package.py b/var/spack/repos/builtin/packages/openssh/package.py index aab102efbd..2edaedb437 100644 --- a/var/spack/repos/builtin/packages/openssh/package.py +++ b/var/spack/repos/builtin/packages/openssh/package.py @@ -35,8 +35,9 @@ class Openssh(AutotoolsPackage): """ homepage = "https://www.openssh.com/" - url = "https://mirrors.sonic.net/pub/OpenBSD/OpenSSH/portable/openssh-7.5p1.tar.gz" + url = "https://mirrors.sonic.net/pub/OpenBSD/OpenSSH/portable/openssh-7.6p1.tar.gz" + version('7.6p1', '06a88699018e5fef13d4655abfed1f63') version('7.5p1', '652fdc7d8392f112bef11cacf7e69e23') version('7.4p1', 'b2db2a83caf66a208bb78d6d287cdaa3') version('7.3p1', 'dfadd9f035d38ce5d58a3bf130b86d08') -- cgit v1.2.3-70-g09d2 From 173236dacfd8d656fcc9b832d43412d0ef2797a8 Mon Sep 17 00:00:00 2001 From: nshtg Date: Fri, 8 Dec 2017 18:13:58 +0100 Subject: Update openSSL to 1.0.2m/1.1.0g (#6596) --- var/spack/repos/builtin/packages/openssl/package.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openssl/package.py b/var/spack/repos/builtin/packages/openssl/package.py index 72f35ac4d5..63600732d3 100644 --- a/var/spack/repos/builtin/packages/openssl/package.py +++ b/var/spack/repos/builtin/packages/openssl/package.py @@ -36,16 +36,18 @@ class Openssl(Package): homepage = "http://www.openssl.org" # URL must remain http:// so Spack can bootstrap curl - url = "http://www.openssl.org/source/openssl-1.0.1h.tar.gz" + url = "http://www.openssl.org/source/openssl-1.0.2m.tar.gz" list_url = "https://www.openssl.org/source/old/" list_depth = 1 + version('1.1.0g', 'ba5f1b8b835b88cadbce9b35ed9531a6') version('1.1.0e', '51c42d152122e474754aea96f66928c6') version('1.1.0d', '711ce3cd5f53a99c0e12a7d5804f0f63') version('1.1.0c', '601e8191f72b18192a937ecf1a800f3f') # Note: Version 1.0.2 is the "long-term support" version that will # remain supported until 2019. - version('1.0.2k', 'f965fc0bf01bf882b31314b61391ae65', preferred=True) + version('1.0.2m', '10e9e37f492094b9ef296f68f24a7666', preferred=True) + version('1.0.2k', 'f965fc0bf01bf882b31314b61391ae65') version('1.0.2j', '96322138f0b69e61b7212bc53d5e912b') version('1.0.2i', '678374e63f8df456a697d3e5e5a931fb') version('1.0.2h', '9392e65072ce4b614c1392eefc1f23d0') -- cgit v1.2.3-70-g09d2 From 85c42244749db6a1b361da816e1ebd175014b29a Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Fri, 8 Dec 2017 11:18:11 -0600 Subject: r-tigris: Create new package. (#6591) --- .../repos/builtin/packages/r-tigris/package.py | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-tigris/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-tigris/package.py b/var/spack/repos/builtin/packages/r-tigris/package.py new file mode 100644 index 0000000000..fd7fc50490 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-tigris/package.py @@ -0,0 +1,48 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RTigris(RPackage): + """Download TIGER/Line shapefiles from the United States Census Bureau + and load into R as 'SpatialDataFrame' or 'sf' objects.""" + + homepage = "https://cran.r-project.org/package=tigris" + url = "https://cran.rstudio.com/src/contrib/tigris_0.5.3.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/tigris" + + version('0.5.3', 'c11cb459bf134d3deb1a641a60c86413') + + depends_on('r-stringr', type=('build', 'run')) + depends_on('r-magrittr', type=('build', 'run')) + depends_on('r-rgdal', type=('build', 'run')) + depends_on('r-rgeos', type=('build', 'run')) + depends_on('r-sp', type=('build', 'run')) + depends_on('r-rappdirs', type=('build', 'run')) + depends_on('r-maptools', type=('build', 'run')) + depends_on('r-httr', type=('build', 'run')) + depends_on('r-uuid', type=('build', 'run')) + depends_on('r-sf', type=('build', 'run')) + depends_on('r-dplyr', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From cc20ad0eecd7ef5ffb61c30559bd2acf27f9cd48 Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Fri, 8 Dec 2017 11:18:29 -0600 Subject: r-rgdal: Create new package. (#6593) --- .../repos/builtin/packages/r-rgdal/package.py | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-rgdal/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-rgdal/package.py b/var/spack/repos/builtin/packages/r-rgdal/package.py new file mode 100644 index 0000000000..3ac6469d98 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-rgdal/package.py @@ -0,0 +1,47 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RRgdal(RPackage): + """Provides bindings to the 'Geospatial' Data Abstraction Library + ('GDAL') (>= 1.6.3) and access to projection/transformation operations + from the 'PROJ.4' library. The 'GDAL' and 'PROJ.4' libraries are + external to the package, and, when installing the package from source, + must be correctly installed first. Both 'GDAL' raster and 'OGR' vector + map data can be imported into R, and 'GDAL' raster data and 'OGR' + vector data exported. Use is made of classes defined in the 'sp' package. + Windows and Mac Intel OS X binaries (including 'GDAL', 'PROJ.4' and + 'Expat') are provided on 'CRAN'.""" + + homepage = "https://cran.r-project.org/package=rgdal" + url = "https://cran.rstudio.com/src/contrib/rgdal_1.2-16.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/rgdal" + + version('1.2-16', 'de83bf08519a53de68a7632ecb7f2dc9') + + depends_on('r-sp', type=('build', 'run')) + depends_on('gdal') + depends_on('proj') -- cgit v1.2.3-70-g09d2 From 3474dd5d406b47c6d29e296b3c2f0fe622e4d7ba Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Fri, 8 Dec 2017 11:18:45 -0600 Subject: r-tidycensus: Create new package. (#6595) --- .../repos/builtin/packages/r-tidycensus/package.py | 53 ++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-tidycensus/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-tidycensus/package.py b/var/spack/repos/builtin/packages/r-tidycensus/package.py new file mode 100644 index 0000000000..e02b796b24 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-tidycensus/package.py @@ -0,0 +1,53 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RTidycensus(RPackage): + """An integrated R interface to the decennial US Census and American + Community Survey APIs and the US Census Bureau's geographic boundary + files. Allows R users to return Census and ACS data as tidyverse-ready + data frames, and optionally returns a list-column with feature + geometry for many geographies.""" + + homepage = "https://cran.r-project.org/package=tidycensus" + url = "https://cran.rstudio.com/src/contrib/tidycensus_0.3.1.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/tidycensus" + + version('0.3.1', '420d046b5a408d321e775c3d410e7699') + + depends_on('r-httr', type=('build', 'run')) + depends_on('r-sf', type=('build', 'run')) + depends_on('r-dplyr', type=('build', 'run')) + depends_on('r-tigris', type=('build', 'run')) + depends_on('r-stringr', type=('build', 'run')) + depends_on('r-jsonlite', type=('build', 'run')) + depends_on('r-purrr', type=('build', 'run')) + depends_on('r-rvest', type=('build', 'run')) + depends_on('r-tidyr', type=('build', 'run')) + depends_on('r-rappdirs', type=('build', 'run')) + depends_on('r-readr', type=('build', 'run')) + depends_on('r-xml2', type=('build', 'run')) + depends_on('r-units', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From e283a79da6a697b09e0ca0efcefb877fcf99048a Mon Sep 17 00:00:00 2001 From: nshtg Date: Fri, 8 Dec 2017 18:19:40 +0100 Subject: Update zsh to 5.4.2 (#6609) --- var/spack/repos/builtin/packages/zsh/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/zsh/package.py b/var/spack/repos/builtin/packages/zsh/package.py index 53b3c7d536..6bcf4fddc3 100644 --- a/var/spack/repos/builtin/packages/zsh/package.py +++ b/var/spack/repos/builtin/packages/zsh/package.py @@ -32,8 +32,9 @@ class Zsh(AutotoolsPackage): """ homepage = "http://www.zsh.org" - url = "http://downloads.sourceforge.net/project/zsh/zsh/5.1.1/zsh-5.1.1.tar.gz" + url = "http://downloads.sourceforge.net/project/zsh/zsh/5.4.2/zsh-5.4.2.tar.gz" + version('5.4.2', checksum='dfe156fd69b0d8d1745ecf6d6e02e047') version('5.3.1', checksum='d583fbca0c2410bf9542ce8a651c26ca') version('5.1.1', checksum='8ba28a9ef82e40c3a271602f18343b2f') -- cgit v1.2.3-70-g09d2 From 5e8139cbd143b651c79f85a34793645ac5132a58 Mon Sep 17 00:00:00 2001 From: Paschalis Korosoglou Date: Fri, 8 Dec 2017 19:20:14 +0200 Subject: Fix in download url for package libaio (#6616) --- var/spack/repos/builtin/packages/libaio/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libaio/package.py b/var/spack/repos/builtin/packages/libaio/package.py index 2a617c0518..4e96dc51f1 100644 --- a/var/spack/repos/builtin/packages/libaio/package.py +++ b/var/spack/repos/builtin/packages/libaio/package.py @@ -29,7 +29,7 @@ class Libaio(Package): """This is the linux native Asynchronous I/O interface library.""" homepage = "http://lse.sourceforge.net/io/aio.html" - url = "https://ftp.de.debian.org/debian/pool/main/liba/libaio/libaio_0.3.110.orig.tar.gz" + url = "https://debian.inf.tu-dresden.de/debian/pool/main/liba/libaio/libaio_0.3.110.orig.tar.gz" version('0.3.110', '2a35602e43778383e2f4907a4ca39ab8') -- cgit v1.2.3-70-g09d2 From 353ea0704062b7a0fda9739ca2e778a1a52a9e2f Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Fri, 8 Dec 2017 18:21:28 +0100 Subject: Add: Py-Plotly (#6628) * Add: Py-Plotly The requirements of py-plotlit are rather strict fixed to specific versions, so I did not add an "upper versions" `:` to the constrains. See https://github.com/plotly/plotly.py/blob/master/requirements.txt * Py-Requests, Py-Six, Py-Pytz: Older Versions Add two older versions of requests, pytz and six for plotly. --- .../repos/builtin/packages/py-plotly/package.py | 39 ++++++++++++++++++++++ .../repos/builtin/packages/py-pytz/package.py | 1 + .../repos/builtin/packages/py-requests/package.py | 1 + var/spack/repos/builtin/packages/py-six/package.py | 1 + 4 files changed, 42 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-plotly/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-plotly/package.py b/var/spack/repos/builtin/packages/py-plotly/package.py new file mode 100644 index 0000000000..7b1634be81 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-plotly/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPlotly(PythonPackage): + """An interactive, browser-based graphing library for Python""" + + homepage = "https://plot.ly/python/" + url = "https://github.com/plotly/plotly.py/archive/v2.2.0.tar.gz" + + version('2.2.0', '835802cdc6743439ff993447dfe47a0e') + + depends_on('py-setuptools', type='build') + depends_on('py-requests@2.3.0', type=('build', 'run')) + depends_on('py-six@1.8.0', type=('build', 'run')) + depends_on('py-pytz@2014.9', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pytz/package.py b/var/spack/repos/builtin/packages/py-pytz/package.py index d946e767e9..561872d041 100644 --- a/var/spack/repos/builtin/packages/py-pytz/package.py +++ b/var/spack/repos/builtin/packages/py-pytz/package.py @@ -38,6 +38,7 @@ class PyPytz(PythonPackage): version('2016.10', 'cc9f16ba436efabdcef3c4d32ae4919c') version('2016.6.1', 'b6c28a3b968bc1d8badfb61b93874e03') version('2014.10', 'eb1cb941a20c5b751352c52486aa1dd7') + version('2014.9', 'd42bda2f4c1e873e02fbd1e4acfd1b8c') version('2015.4', '417a47b1c432d90333e42084a605d3d8') version('2016.3', 'abae92c3301b27bd8a9f56b14f52cb29') diff --git a/var/spack/repos/builtin/packages/py-requests/package.py b/var/spack/repos/builtin/packages/py-requests/package.py index 329c07758c..f35d26ed89 100644 --- a/var/spack/repos/builtin/packages/py-requests/package.py +++ b/var/spack/repos/builtin/packages/py-requests/package.py @@ -45,6 +45,7 @@ class PyRequests(PythonPackage): version('2.14.2', '4c3c169ed67466088a2a6947784fe444') version('2.13.0', '921ec6b48f2ddafc8bb6160957baf444') version('2.11.1', 'ad5f9c47b5c5dfdb28363ad7546b0763') + version('2.3.0', '7449ffdc8ec9ac37bbcd286003c80f00') depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-six/package.py b/var/spack/repos/builtin/packages/py-six/package.py index 2f0bda16c6..03bb484007 100644 --- a/var/spack/repos/builtin/packages/py-six/package.py +++ b/var/spack/repos/builtin/packages/py-six/package.py @@ -35,6 +35,7 @@ class PySix(PythonPackage): version('1.10.0', '34eed507548117b2ab523ab14b2f8b55') version('1.9.0', '476881ef4012262dfc8adc645ee786c4') + version('1.8.0', '1626eb24cc889110c38f7e786ec69885') extends('python', ignore=r'bin/pytest') -- cgit v1.2.3-70-g09d2 From 5bf19a9d84f3478eab79b6b24206cba6d4c4be96 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Fri, 8 Dec 2017 18:21:46 +0100 Subject: Fix AstroPy: Missing Markupsafe (#6630) `py-markupsafe` was missing during `spack install` as a build error. --- var/spack/repos/builtin/packages/py-astropy/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-astropy/package.py b/var/spack/repos/builtin/packages/py-astropy/package.py index e40fee11c6..c85de6e68c 100644 --- a/var/spack/repos/builtin/packages/py-astropy/package.py +++ b/var/spack/repos/builtin/packages/py-astropy/package.py @@ -50,6 +50,7 @@ class PyAstropy(PythonPackage): depends_on('py-pytz', type=('build', 'run')) depends_on('py-scikit-image', type=('build', 'run')) depends_on('py-pandas', type=('build', 'run')) + depends_on('py-markupsafe', type=('build', 'run')) # System dependencies depends_on('cfitsio') -- cgit v1.2.3-70-g09d2 From bb8e7ee023d678e68d1da3018bf6d1d3d36d55bd Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 8 Dec 2017 11:22:16 -0600 Subject: Perl-statistics-descriptive: Create new package (#6588) --- .../perl-statistics-descriptive/package.py | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-statistics-descriptive/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-statistics-descriptive/package.py b/var/spack/repos/builtin/packages/perl-statistics-descriptive/package.py new file mode 100644 index 0000000000..877212b124 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-statistics-descriptive/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlStatisticsDescriptive(PerlPackage): + """Module of basic descriptive statistical functions.""" + + homepage = "http://search.cpan.org/~shlomif/Statistics-Descriptive-3.0612/lib/Statistics/Descriptive.pm" + url = "http://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0612.tar.gz" + + version('3.0612', 'e38cfbc1e3962d099b62a14a57a175f1') -- cgit v1.2.3-70-g09d2 From 4c02e7e9f4e018f9a47aec9f604df21bfe1ab4fa Mon Sep 17 00:00:00 2001 From: healther Date: Fri, 8 Dec 2017 18:22:52 +0100 Subject: add restriction to py-setuptools dependency on py-flake8 (#6589) --- var/spack/repos/builtin/packages/py-flake8/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-flake8/package.py b/var/spack/repos/builtin/packages/py-flake8/package.py index c4926ae64f..43ebf00865 100644 --- a/var/spack/repos/builtin/packages/py-flake8/package.py +++ b/var/spack/repos/builtin/packages/py-flake8/package.py @@ -40,7 +40,7 @@ class PyFlake8(PythonPackage): # Most Python packages only require py-setuptools as a build dependency. # However, py-flake8 requires py-setuptools during runtime as well. - depends_on('py-setuptools', type=('build', 'run')) + depends_on('py-setuptools@30:', type=('build', 'run')) # pyflakes >= 0.8.1, != 1.2.0, != 1.2.1, != 1.2.2, < 1.3.0 depends_on('py-pyflakes@0.8.1:1.1.0,1.2.3:1.2.3', when='@3.0.4', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From d6db53209539190a3a33062da899fef3a6a8c51c Mon Sep 17 00:00:00 2001 From: Thilina Rathnayake Date: Fri, 8 Dec 2017 11:29:58 -0600 Subject: Update the Nekbone package (#6508) --- .../repos/builtin/packages/nekbone/package.py | 57 ++++++++++++++-------- 1 file changed, 36 insertions(+), 21 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nekbone/package.py b/var/spack/repos/builtin/packages/nekbone/package.py index 3d419b9156..4531012110 100644 --- a/var/spack/repos/builtin/packages/nekbone/package.py +++ b/var/spack/repos/builtin/packages/nekbone/package.py @@ -22,7 +22,6 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## - from spack import * @@ -33,32 +32,48 @@ class Nekbone(Package): the spectral element method.""" homepage = "https://github.com/Nek5000/Nekbone" - url = "https://github.com/Nek5000/Nekbone/tarball/v17.0" tags = ['proxy-app', 'ecp-proxy-app'] - version('17.0', 'cc339684547614a0725959e41839fec1') + version('17.0', 'cc339684547614a0725959e41839fec1', git='https://github.com/Nek5000/Nekbone.git') version('develop', git='https://github.com/Nek5000/Nekbone.git') - depends_on('mpi') + # Variants + variant('mpi', default=True, description='Build with MPI') - def install(self, spec, prefix): + # dependencies + depends_on('mpi', when='+mpi') + + @run_before('install') + def fortran_check(self): + if not self.compiler.fc: + msg = 'Nekbone can not be built without a Fortran compiler.' + raise RuntimeError(msg) - working_dirs = ['example1', 'example2', 'example3', 'nek_comm', - 'nek_delay', 'nek_mgrid'] + def install(self, spec, prefix): mkdir(prefix.bin) - for wdir in working_dirs: - with working_dir('test/' + wdir): - makenec = FileFilter('makenek') - makenec.filter('CC.*', 'CC=' + self.spec['mpi'].mpicc) - makenec.filter('FF77.*', 'FF77=' + self.spec['mpi'].mpif77) - makenek = Executable('./makenek') - path = join_path(prefix.bin, wdir) - makenek('ex1', '../../src') - mkdir(path) - install('nekbone', path) - install('nekpmpi', path) - install('data.rea', path) - install('SIZE', path) - install('README', path) + FC = self.compiler.fc + CC = self.compiler.cc + if '+mpi' in spec: + FC = spec['mpi'].mpif77 + CC = spec['mpi'].mpicc + + # Install Nekbone in prefix.bin + install_tree("../Nekbone", prefix.bin.Nekbone) + + # Install scripts in prefix.bin + nekpmpi = 'test/example1/nekpmpi' + makenek = 'test/example1/makenek' + + install(makenek, prefix.bin) + install(nekpmpi, prefix.bin) + + with working_dir(prefix.bin): + filter_file(r'^SOURCE_ROOT\s*=.*', 'SOURCE_ROOT=\"' + + prefix.bin.Nekbone + '/src\"', 'makenek') + filter_file(r'^CC\s*=.*', 'CC=\"' + CC + '\"', 'makenek') + filter_file(r'^F77\s*=.*', 'F77=\"' + FC + '\"', 'makenek') + + if '+mpi' not in spec: + filter_file(r'^#IFMPI=\"false\"', 'IFMPI=\"false\"', 'makenek') -- cgit v1.2.3-70-g09d2 From c1bc1be2a75b62ea01d8c2e16ab46c379069c50f Mon Sep 17 00:00:00 2001 From: Thilina Rathnayake Date: Fri, 8 Dec 2017 11:30:42 -0600 Subject: Add NekCEM package to spack (#6509) --- var/spack/repos/builtin/packages/nekcem/package.py | 90 ++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 var/spack/repos/builtin/packages/nekcem/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nekcem/package.py b/var/spack/repos/builtin/packages/nekcem/package.py new file mode 100644 index 0000000000..b38c17084b --- /dev/null +++ b/var/spack/repos/builtin/packages/nekcem/package.py @@ -0,0 +1,90 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import os + + +class Nekcem(Package): + """Spectral-element solver for Maxwell's equations, drift-diffusion + equations, and more.""" + + # Links to homepage and git + homepage = "https://nekcem.mcs.anl.gov" + url = "https://github.com/NekCEM/NekCEM/archive/development.zip" + + # Variants + variant('mpi', default=True, description='Build with MPI') + + # We only have a development version + version('develop', git='https://github.com/NekCEM/NekCEM.git') + + # dependencies + depends_on('mpi', when='+mpi') + depends_on('python@2.7:') + depends_on('blas') + depends_on('lapack') + + @run_before('install') + def fortran_check(self): + if not self.compiler.fc: + msg = 'NekCEM can not be built without a Fortran compiler.' + raise RuntimeError(msg) + + def install(self, spec, prefix): + binDir = 'bin' + nek = 'nek' + cNek = 'configurenek' + mNek = 'makenek' + + FC = self.compiler.fc + CC = self.compiler.cc + + if '+mpi' in spec: + FC = spec['mpi'].mpif77 + CC = spec['mpi'].mpicc + + with working_dir(binDir): + filter_file(r'^FC\s*=.*', 'FC=\"' + FC + '\"', 'makenek') + filter_file(r'^CC\s*=.*', 'CC=\"' + CC + '\"', 'makenek') + filter_file(r'^NEK\s*=.*', 'NEK=\"' + prefix.bin.NekCEM + + '\"', 'makenek') + + blasLapack = spec['lapack'].libs + spec['blas'].libs + ldFlags = blasLapack.ld_flags + # Temporary workaround, we should use LDFLAGS when + # configurenek in Nekcem is fixed. + # See issue: https://github.com/NekCEM/NekCEM/issues/200 + filter_file(r'^EXTRALDFLAGS\s*=.*', 'EXTRALDFLAGS=\"' + ldFlags + + '\"', 'makenek') + + # Install NekCEM in prefix/bin + install_tree('../NekCEM', prefix.bin.NekCEM) + # Create symlinks to makenek, nek and configurenek scripts + os.symlink(os.path.join(prefix.bin.NekCEM, binDir, mNek), + os.path.join(prefix.bin, mNek)) + os.symlink(os.path.join(prefix.bin.NekCEM, binDir, cNek), + os.path.join(prefix.bin, cNek)) + os.symlink(os.path.join(prefix.bin.NekCEM, binDir, nek), + os.path.join(prefix.bin, nek)) -- cgit v1.2.3-70-g09d2 From e279299b9be8109a446e45eafb82bfedc6cdbd77 Mon Sep 17 00:00:00 2001 From: Chris Green Date: Fri, 8 Dec 2017 13:52:00 -0600 Subject: Relax restriction on lua version. (#5886) --- var/spack/repos/builtin/packages/lmod/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lmod/package.py b/var/spack/repos/builtin/packages/lmod/package.py index 233f50f53d..66bd5fab81 100644 --- a/var/spack/repos/builtin/packages/lmod/package.py +++ b/var/spack/repos/builtin/packages/lmod/package.py @@ -53,7 +53,7 @@ class Lmod(AutotoolsPackage): version('6.3.7', '0fa4d5a24c41cae03776f781aa2dedc1') version('6.0.1', '91abf52fe5033bd419ffe2842ebe7af9') - depends_on('lua@5.2:') + depends_on('lua@5.1:') depends_on('lua-luaposix', type=('build', 'run')) depends_on('lua-luafilesystem', type=('build', 'run')) depends_on('tcl', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 95a384f05107cc80e0da7d5e7a5b75380ebf76f3 Mon Sep 17 00:00:00 2001 From: Cyrus Harrison Date: Fri, 8 Dec 2017 13:43:12 -0800 Subject: updates to conduit and ascent packages (new PR) (#6584) * optional path to use spacks py-site-pkgs, install host-cfg for provenance * add more comments and address review requests * only use st-pkgs-dir when +python * ascent does not need doxygen * capture mpiexec if it exists * added missing import * flake8 fix * default adios variant to False * ascent develop now reqs conduit master * optional path to use spacks py-site-pkgs, install host-cfg for provenance * add more comments and address review requests * only use st-pkgs-dir when +python * ascent does not need doxygen * capture mpiexec if it exists * added missing import * flake8 fix * default adios variant to False * ascent develop now reqs conduit master * conduit: use hdf5 1.8 for wider output compat --- var/spack/repos/builtin/packages/ascent/package.py | 52 +++++++++++++++------- .../repos/builtin/packages/conduit/package.py | 49 ++++++++++++++------ var/spack/repos/builtin/packages/vtkh/package.py | 5 ++- 3 files changed, 76 insertions(+), 30 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ascent/package.py b/var/spack/repos/builtin/packages/ascent/package.py index 854bf1e909..eda0f93c1c 100644 --- a/var/spack/repos/builtin/packages/ascent/package.py +++ b/var/spack/repos/builtin/packages/ascent/package.py @@ -78,7 +78,7 @@ class Ascent(Package): variant("tbb", default=True, description="Build tbb support") variant("cuda", default=False, description="Build cuda support") - variant("adios", default=True, description="Build Adios filter support") + variant("adios", default=False, description="Build Adios filter support") # variants for dev-tools (docs, etc) variant("doc", default=False, description="Build Conduit's documentation") @@ -88,7 +88,7 @@ class Ascent(Package): ########################################################################### depends_on("cmake", when="+cmake") - depends_on("conduit") + depends_on("conduit@master") ####################### # Python @@ -125,7 +125,13 @@ class Ascent(Package): Build and install Conduit. """ with working_dir('spack-build', create=True): - host_cfg_fname = self.create_host_config(spec, prefix) + py_site_pkgs_dir = None + if "+python" in spec: + py_site_pkgs_dir = site_packages_dir + + host_cfg_fname = self.create_host_config(spec, + prefix, + py_site_pkgs_dir) cmake_args = [] # if we have a static build, we need to avoid any of # spack's default cmake settings related to rpaths @@ -140,12 +146,26 @@ class Ascent(Package): cmake(*cmake_args) make() make("install") - # TODO also copy host_cfg_fname into install + # install copy of host config for provenance + install(host_cfg_fname, prefix) - def create_host_config(self, spec, prefix): + def create_host_config(self, spec, prefix, py_site_pkgs_dir=None): """ This method creates a 'host-config' file that specifies all of the options used to configure and build ascent. + + For more details about 'host-config' files see: + http://ascent.readthedocs.io/en/latest/BuildingAscent.html + + Note: + The `py_site_pkgs_dir` arg exists to allow a package that + subclasses this package provide a specific site packages + dir when calling this function. `py_site_pkgs_dir` should + be an absolute path or `None`. + + This is necessary because the spack `site_packages_dir` + var will not exist in the base class. For more details + on this issue see: https://github.com/spack/spack/issues/6261 """ ####################### @@ -184,9 +204,9 @@ class Ascent(Package): raise RuntimeError(msg) cmake_exe = cmake_exe.path - host_cfg_fname = "%s-%s-%s.cmake" % (socket.gethostname(), - sys_type, - spec.compiler) + host_cfg_fname = "%s-%s-%s-ascent.cmake" % (socket.gethostname(), + sys_type, + spec.compiler) cfg = open(host_cfg_fname, "w") cfg.write("##################################\n") @@ -246,10 +266,10 @@ class Ascent(Package): cfg.write("# python from spack \n") cfg.write(cmake_cache_entry("PYTHON_EXECUTABLE", spec['python'].command.path)) - # install module to standard style site packages dir - # so we can support spack activate - cfg.write(cmake_cache_entry("PYTHON_MODULE_INSTALL_PREFIX", - site_packages_dir)) + # only set dest python site packages dir if passed + if py_site_pkgs_dir: + cfg.write(cmake_cache_entry("PYTHON_MODULE_INSTALL_PREFIX", + py_site_pkgs_dir)) else: cfg.write(cmake_cache_entry("ENABLE_PYTHON", "OFF")) @@ -260,10 +280,6 @@ class Ascent(Package): sphinx_build_exe = join_path(spec['py-sphinx'].prefix.bin, "sphinx-build") cfg.write(cmake_cache_entry("SPHINX_EXECUTABLE", sphinx_build_exe)) - - cfg.write("# doxygen from uberenv\n") - doxygen_exe = spec['doxygen'].command.path - cfg.write(cmake_cache_entry("DOXYGEN_EXECUTABLE", doxygen_exe)) else: cfg.write(cmake_cache_entry("ENABLE_DOCS", "OFF")) @@ -280,6 +296,10 @@ class Ascent(Package): spec['mpi'].mpicxx)) cfg.write(cmake_cache_entry("MPI_Fortran_COMPILER", spec['mpi'].mpifc)) + mpiexe_bin = join_path(spec['mpi'].prefix.bin, 'mpiexec') + if os.path.isfile(mpiexe_bin): + cfg.write(cmake_cache_entry("MPIEXEC", + mpiexe_bin)) else: cfg.write(cmake_cache_entry("ENABLE_MPI", "OFF")) diff --git a/var/spack/repos/builtin/packages/conduit/package.py b/var/spack/repos/builtin/packages/conduit/package.py index 6793a391c3..2ce7edc8cd 100644 --- a/var/spack/repos/builtin/packages/conduit/package.py +++ b/var/spack/repos/builtin/packages/conduit/package.py @@ -108,9 +108,10 @@ class Conduit(Package): # experienced on BGQ. When on, the static build tries # to link against shared libs. # - # we are not using hdf5's mpi or fortran features. - depends_on("hdf5~cxx~mpi~fortran", when="+hdf5+shared") - depends_on("hdf5~shared~cxx~mpi~fortran", when="+hdf5~shared") + # Use HDF5 1.8, for wider output compatibly + # variants reflect we are not using hdf5's mpi or fortran features. + depends_on("hdf5@1.8.19:1.8.999~cxx~mpi~fortran", when="+hdf5+shared") + depends_on("hdf5@1.8.19:1.8.999~shared~cxx~mpi~fortran", when="+hdf5~shared") # we are not using silo's fortran features depends_on("silo~fortran", when="+silo+shared") @@ -148,7 +149,13 @@ class Conduit(Package): Build and install Conduit. """ with working_dir('spack-build', create=True): - host_cfg_fname = self.create_host_config(spec, prefix) + py_site_pkgs_dir = None + if "+python" in spec: + py_site_pkgs_dir = site_packages_dir + + host_cfg_fname = self.create_host_config(spec, + prefix, + py_site_pkgs_dir) cmake_args = [] # if we have a static build, we need to avoid any of # spack's default cmake settings related to rpaths @@ -163,14 +170,26 @@ class Conduit(Package): cmake(*cmake_args) make() make("install") + # install copy of host config for provenance + install(host_cfg_fname, prefix) - def create_host_config(self, spec, prefix): + def create_host_config(self, spec, prefix, py_site_pkgs_dir=None): """ This method creates a 'host-config' file that specifies all of the options used to configure and build conduit. - For more details see about 'host-config' files see: + For more details about 'host-config' files see: http://software.llnl.gov/conduit/building.html + + Note: + The `py_site_pkgs_dir` arg exists to allow a package that + subclasses this package provide a specific site packages + dir when calling this function. `py_site_pkgs_dir` should + be an absolute path or `None`. + + This is necessary because the spack `site_packages_dir` + var will not exist in the base class. For more details + on this issue see: https://github.com/spack/spack/issues/6261 """ ####################### @@ -209,9 +228,9 @@ class Conduit(Package): raise RuntimeError(msg) cmake_exe = cmake_exe.path - host_cfg_fname = "%s-%s-%s.cmake" % (socket.gethostname(), - sys_type, - spec.compiler) + host_cfg_fname = "%s-%s-%s-conduit.cmake" % (socket.gethostname(), + sys_type, + spec.compiler) cfg = open(host_cfg_fname, "w") cfg.write("##################################\n") @@ -256,10 +275,10 @@ class Conduit(Package): cfg.write("# python from spack \n") cfg.write(cmake_cache_entry("PYTHON_EXECUTABLE", spec['python'].command.path)) - # install module to standard style site packages dir - # so we can support spack activate - cfg.write(cmake_cache_entry("PYTHON_MODULE_INSTALL_PREFIX", - site_packages_dir)) + # only set dest python site packages dir if passed + if py_site_pkgs_dir: + cfg.write(cmake_cache_entry("PYTHON_MODULE_INSTALL_PREFIX", + py_site_pkgs_dir)) else: cfg.write(cmake_cache_entry("ENABLE_PYTHON", "OFF")) @@ -290,6 +309,10 @@ class Conduit(Package): spec['mpi'].mpicxx)) cfg.write(cmake_cache_entry("MPI_Fortran_COMPILER", spec['mpi'].mpifc)) + mpiexe_bin = join_path(spec['mpi'].prefix.bin, 'mpiexec') + if os.path.isfile(mpiexe_bin): + cfg.write(cmake_cache_entry("MPIEXEC", + mpiexe_bin)) else: cfg.write(cmake_cache_entry("ENABLE_MPI", "OFF")) diff --git a/var/spack/repos/builtin/packages/vtkh/package.py b/var/spack/repos/builtin/packages/vtkh/package.py index 9073c1f6f3..35883547b1 100644 --- a/var/spack/repos/builtin/packages/vtkh/package.py +++ b/var/spack/repos/builtin/packages/vtkh/package.py @@ -24,6 +24,7 @@ ############################################################################## from spack import * +import os class Vtkh(Package): @@ -67,7 +68,9 @@ class Vtkh(Package): mpicxx = spec['mpi'].mpicxx cmake_args.extend(["-DMPI_C_COMPILER={0}".format(mpicc), "-DMPI_CXX_COMPILER={0}".format(mpicxx)]) - + mpiexe_bin = join_path(spec['mpi'].prefix.bin, 'mpiexec') + if os.path.isfile(mpiexe_bin): + cmake_args.append("-DMPIEXEC={0}".format(mpiexe_bin)) # tbb support if "+tbb" in spec: cmake_args.append("-DTBB_DIR={0}".format(spec["tbb"].prefix)) -- cgit v1.2.3-70-g09d2 From f41a263a28bd51ee40ffaf639683170a4b09764e Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sun, 10 Dec 2017 14:43:49 -0600 Subject: Fix reference to self.versions in neovim package (#6639) --- var/spack/repos/builtin/packages/neovim/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/neovim/package.py b/var/spack/repos/builtin/packages/neovim/package.py index 4e779014dd..9cf00c7899 100644 --- a/var/spack/repos/builtin/packages/neovim/package.py +++ b/var/spack/repos/builtin/packages/neovim/package.py @@ -49,7 +49,7 @@ class Neovim(CMakePackage): def cmake_args(self): args = [] - if version >= Version('0.2.1'): + if self.version >= Version('0.2.1'): args = ['-DPREFER_LUA=ON'] return args -- cgit v1.2.3-70-g09d2 From 53b2ec356bef25150b51e062e66f9cb4f245fad9 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Sun, 10 Dec 2017 19:51:54 -0600 Subject: disable plasma in xsdk 0.3.0 (#6621) --- var/spack/repos/builtin/packages/xsdk/package.py | 1 - 1 file changed, 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py index e6eaead178..60bd0b2255 100644 --- a/var/spack/repos/builtin/packages/xsdk/package.py +++ b/var/spack/repos/builtin/packages/xsdk/package.py @@ -80,7 +80,6 @@ class Xsdk(Package): depends_on('alquimia@develop', when='@develop') depends_on('sundials@3.1.0~int64+hypre', when='@0.3.0') - depends_on('plasma', when='@0.3.0 %gcc@4.9:') depends_on('magma', when='@0.3.0 +cuda') # xSDKTrilinos depends on the version of Trilinos built with -- cgit v1.2.3-70-g09d2 From e83c3d1b6a8f25cfc4623edd98c24a54b0e064d1 Mon Sep 17 00:00:00 2001 From: Johann Klähn Date: Mon, 11 Dec 2017 19:34:06 +0100 Subject: bazel: include SPACK_DEBUG_LOG_ID in environment (#6562) Fixes #6521. Bazel's build system filters environment variables, including those set by Spack for use by its compiler wrapper. This updates the patch to include the SPACK_DEBUG_LOG_ID variable added in #5837. --- var/spack/repos/builtin/packages/bazel/fix_env_handling.patch | 7 ++++++- var/spack/repos/builtin/packages/bazel/link.patch | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bazel/fix_env_handling.patch b/var/spack/repos/builtin/packages/bazel/fix_env_handling.patch index 9be9f97d69..14deccf950 100644 --- a/var/spack/repos/builtin/packages/bazel/fix_env_handling.patch +++ b/var/spack/repos/builtin/packages/bazel/fix_env_handling.patch @@ -1,7 +1,7 @@ diff -pu bazel-0.3.1/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java bazel-0.3.1/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java --- bazel-0.3.1/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java 2016-09-14 11:56:01.565756979 +0200 +++ bazel-0.3.1/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java 2016-09-14 12:04:13.292839801 +0200 -@@ -92,5 +92,115 @@ public class BazelConfiguration extends +@@ -92,5 +92,120 @@ public class BazelConfiguration extends if (tmpdir != null) { builder.put("TMPDIR", tmpdir); } @@ -16,6 +16,11 @@ diff -pu bazel-0.3.1/src/main/java/com/google/devtools/build/lib/bazel/rules/Baz + builder.put("SPACK_ENV_PATH", spack_env_path); + } + ++ String spack_debug_log_id = System.getenv("SPACK_DEBUG_LOG_ID"); ++ if (spack_debug_log_id != null) { ++ builder.put("SPACK_DEBUG_LOG_ID", spack_debug_log_id); ++ } ++ + String spack_debug_log_dir = System.getenv("SPACK_DEBUG_LOG_DIR"); + if (spack_debug_log_dir != null) { + builder.put("SPACK_DEBUG_LOG_DIR", spack_debug_log_dir); diff --git a/var/spack/repos/builtin/packages/bazel/link.patch b/var/spack/repos/builtin/packages/bazel/link.patch index 69d100f62c..5c8824b87d 100644 --- a/var/spack/repos/builtin/packages/bazel/link.patch +++ b/var/spack/repos/builtin/packages/bazel/link.patch @@ -1,6 +1,6 @@ --- bazel-0.3.1/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java 2016-07-29 10:22:16.000000000 +0200 +++ bazel-0.3.1/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java 2016-10-13 15:21:35.036617890 +0200 -@@ -214,6 +214,130 @@ +@@ -214,6 +214,135 @@ .getParentDirectory() .getPathString()); } @@ -28,6 +28,11 @@ + result.put("SPACK_ENV_PATH", spack_env_path); + } + ++ String spack_debug_log_id = System.getenv("SPACK_DEBUG_LOG_ID"); ++ if (spack_debug_log_id != null) { ++ result.put("SPACK_DEBUG_LOG_ID", spack_debug_log_id); ++ } ++ + String spack_debug_log_dir = System.getenv("SPACK_DEBUG_LOG_DIR"); + if (spack_debug_log_dir != null) { + result.put("SPACK_DEBUG_LOG_DIR", spack_debug_log_dir); -- cgit v1.2.3-70-g09d2 From e19aa807349cd29a4787ce3f0a256ea3cbfd502f Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Tue, 12 Dec 2017 05:14:24 +0800 Subject: intel-parallel-studio: restrict patch to versions > 2016 (#6523) Fixes #6522 Patch psxevars.sh and psxevars.csh only when year > 2016. pxevars.csh does not exist for versions before 2017. psxevars.sh does not appear to require this patch for versions before 2017. --- .../repos/builtin/packages/intel-parallel-studio/package.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py index ff0315a42a..fefda18e18 100644 --- a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py +++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py @@ -435,15 +435,16 @@ class IntelParallelStudio(IntelPackage): @run_after('install') def fix_psxevars(self): - """Newer versions of Intel Parallel Studio have a bug in the + """Newer versions (>2016) of Intel Parallel Studio have a bug in the ``psxevars.sh`` script.""" bindir = glob.glob(join_path( self.prefix, 'parallel_studio*', 'bin'))[0] - filter_file('^SCRIPTPATH=.*', 'SCRIPTPATH={0}'.format(self.prefix), - os.path.join(bindir, 'psxevars.sh'), - os.path.join(bindir, 'psxevars.csh')) + if self.version[1] > 2016: + filter_file('^SCRIPTPATH=.*', 'SCRIPTPATH={0}'.format(self.prefix), + os.path.join(bindir, 'psxevars.sh'), + os.path.join(bindir, 'psxevars.csh')) def setup_dependent_environment(self, spack_env, run_env, dependent_spec): if '+mpi' in self.spec: -- cgit v1.2.3-70-g09d2 From 6fec473e9e29b907b289a5055ae69933fa153d32 Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Mon, 11 Dec 2017 17:26:13 -0700 Subject: Py h5py update (#6635) --- var/spack/repos/builtin/packages/py-h5py/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-h5py/package.py b/var/spack/repos/builtin/packages/py-h5py/package.py index 3375b762a9..0c2b733697 100644 --- a/var/spack/repos/builtin/packages/py-h5py/package.py +++ b/var/spack/repos/builtin/packages/py-h5py/package.py @@ -32,6 +32,8 @@ class PyH5py(PythonPackage): homepage = "https://pypi.python.org/pypi/h5py" url = "https://pypi.io/packages/source/h/h5py/h5py-2.4.0.tar.gz" + version('2.7.1', 'da630aebe3ab9fa218ac405a218e95e0') + version('2.7.0', 'f62937f40f68d3b128b3941be239dd93') version('2.6.0', 'ec476211bd1de3f5ac150544189b0bf4') version('2.5.0', '6e4301b5ad5da0d51b0a1e5ac19e3b74') version('2.4.0', '80c9a94ae31f84885cc2ebe1323d6758') -- cgit v1.2.3-70-g09d2 From 74938f58d26db29889e59b76c78eb313f605e825 Mon Sep 17 00:00:00 2001 From: nshtg Date: Tue, 12 Dec 2017 01:26:37 +0100 Subject: openssl: Update to 1.0.2n (#6641) From 07.12.2017, fixes CVE-2017-3737 --- var/spack/repos/builtin/packages/openssl/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openssl/package.py b/var/spack/repos/builtin/packages/openssl/package.py index 63600732d3..c04bb664e7 100644 --- a/var/spack/repos/builtin/packages/openssl/package.py +++ b/var/spack/repos/builtin/packages/openssl/package.py @@ -46,7 +46,8 @@ class Openssl(Package): version('1.1.0c', '601e8191f72b18192a937ecf1a800f3f') # Note: Version 1.0.2 is the "long-term support" version that will # remain supported until 2019. - version('1.0.2m', '10e9e37f492094b9ef296f68f24a7666', preferred=True) + version('1.0.2n', '13bdc1b1d1ff39b6fd42a255e74676a4', preferred=True) + version('1.0.2m', '10e9e37f492094b9ef296f68f24a7666') version('1.0.2k', 'f965fc0bf01bf882b31314b61391ae65') version('1.0.2j', '96322138f0b69e61b7212bc53d5e912b') version('1.0.2i', '678374e63f8df456a697d3e5e5a931fb') -- cgit v1.2.3-70-g09d2 From 25aa21a7a7cc6908f0c00fc01743f20723383260 Mon Sep 17 00:00:00 2001 From: nshtg Date: Tue, 12 Dec 2017 01:26:53 +0100 Subject: git: Update to 2.15.1 (#6642) --- var/spack/repos/builtin/packages/git/package.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index 293f85974f..550d269771 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -43,6 +43,11 @@ class Git(AutotoolsPackage): # https://www.kernel.org/pub/software/scm/git/git-manpages-{version}.tar.xz releases = [ + { + 'version': '2.15.1', + 'md5': 'da59fc6baa55ab44684011e369af397d', + 'md5_manpages': '2cb428071c08c7df513cfc103610536e', + }, { 'version': '2.14.1', 'md5': 'e965a37b3d277f2e7e78f5b04de28e2a', -- cgit v1.2.3-70-g09d2 From 45e8e4b4fb69bc9c25319c5e9f08a86715fda0c2 Mon Sep 17 00:00:00 2001 From: nshtg Date: Tue, 12 Dec 2017 01:27:09 +0100 Subject: libsodium: Update to 1.0.15 (#6643) --- var/spack/repos/builtin/packages/libsodium/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libsodium/package.py b/var/spack/repos/builtin/packages/libsodium/package.py index e62319e439..7221b4f52f 100644 --- a/var/spack/repos/builtin/packages/libsodium/package.py +++ b/var/spack/repos/builtin/packages/libsodium/package.py @@ -32,6 +32,7 @@ class Libsodium(AutotoolsPackage): url = "https://download.libsodium.org/libsodium/releases/libsodium-1.0.13.tar.gz" list_url = "https://download.libsodium.org/libsodium/releases/old" + version('1.0.15', '070373e73a0b10bd96f412e1732ebc42') version('1.0.13', 'f38aac160a4bd05f06f743863e54e499') version('1.0.12', 'c308e3faa724b630b86cc0aaf887a5d4') version('1.0.11', 'b58928d035064b2a46fb564937b83540') -- cgit v1.2.3-70-g09d2 From e831ecbf3a1a653bfc6ea66cdb0178d4c679e964 Mon Sep 17 00:00:00 2001 From: nshtg Date: Tue, 12 Dec 2017 01:27:40 +0100 Subject: Add new package minisign (#6644) A dead simple tool to sign files and verify signatures. See https://jedisct1.github.io/minisign --- .../repos/builtin/packages/minisign/package.py | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100755 var/spack/repos/builtin/packages/minisign/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/minisign/package.py b/var/spack/repos/builtin/packages/minisign/package.py new file mode 100755 index 0000000000..3cefd86c4d --- /dev/null +++ b/var/spack/repos/builtin/packages/minisign/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Minisign(CMakePackage): + """Minisign is a dead simple tool to sign files and verify signatures.""" + + homepage = "https://jedisct1.github.io/minisign/" + url = "https://github.com/jedisct1/minisign/archive/0.7.tar.gz" + + version('0.7', 'd634202555c4f499e8ef9d6848d6f4ca') + + depends_on('libsodium') -- cgit v1.2.3-70-g09d2 From 80284617a5ab56a70056664287abaee8086dbea9 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Tue, 12 Dec 2017 11:31:08 -0600 Subject: xsdk: update xsdk@develop to use sundials, plasma, magma (#6649) Also update xsdk@0.3.0 to use a fixed version of magma --- var/spack/repos/builtin/packages/xsdk/package.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py index 60bd0b2255..0d47ddb7ba 100644 --- a/var/spack/repos/builtin/packages/xsdk/package.py +++ b/var/spack/repos/builtin/packages/xsdk/package.py @@ -80,7 +80,12 @@ class Xsdk(Package): depends_on('alquimia@develop', when='@develop') depends_on('sundials@3.1.0~int64+hypre', when='@0.3.0') - depends_on('magma', when='@0.3.0 +cuda') + depends_on('sundials@3.1.0~int64+hypre', when='@develop') + + depends_on('plasma@17.1', when='@develop %gcc@4.9:') + + depends_on('magma@2.2.0', when='@0.3.0 +cuda') + depends_on('magma@2.2.0', when='@develop +cuda') # xSDKTrilinos depends on the version of Trilinos built with # +tpetra which is turned off for faster xSDK -- cgit v1.2.3-70-g09d2 From e80a27d71397586b861ecef383dd5616ad7a2ec5 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Tue, 12 Dec 2017 17:25:48 -0700 Subject: swfft: inject CC/CXX (#6666) --- var/spack/repos/builtin/packages/swfft/package.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/swfft/package.py b/var/spack/repos/builtin/packages/swfft/package.py index aeb7e00293..ce0b027c9e 100644 --- a/var/spack/repos/builtin/packages/swfft/package.py +++ b/var/spack/repos/builtin/packages/swfft/package.py @@ -43,6 +43,17 @@ class Swfft(MakefilePackage): tags = ['proxy-app', 'ecp-proxy-app'] + @property + def build_targets(self): + targets = [] + spec = self.spec + + targets.append('DFFT_MPI_CC=%s' % spec['mpi'].mpicc) + targets.append('DFFT_MPI_CXX=%s' % spec['mpi'].mpicxx) + targets.append('DFFT_MPI_F90=%s' % spec['mpi'].mpifc) + + return targets + def install(self, spec, prefix): mkdir(prefix.bin) install('build/CheckDecomposition', prefix.bin) -- cgit v1.2.3-70-g09d2 From 27be66420a884fd8f000accf361349e244aad25d Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Tue, 12 Dec 2017 17:26:02 -0700 Subject: laghos: inject CXX (#6664) --- var/spack/repos/builtin/packages/laghos/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/laghos/package.py b/var/spack/repos/builtin/packages/laghos/package.py index e14f0591a1..3b6e23307c 100644 --- a/var/spack/repos/builtin/packages/laghos/package.py +++ b/var/spack/repos/builtin/packages/laghos/package.py @@ -53,6 +53,7 @@ class Laghos(MakefilePackage): 'share/mfem/config.mk')) targets.append('TEST_MK=%s' % join_path(spec['mfem'].prefix, 'share/mfem/test.mk')) + targets.append('CXX=%s' % spec['mpi'].mpicxx) return targets -- cgit v1.2.3-70-g09d2 From 45784af7f261502bd158a5b1fc5736bdb4490481 Mon Sep 17 00:00:00 2001 From: Audrey Thoma Date: Tue, 12 Dec 2017 20:35:13 -0600 Subject: new packages: biopieces and dependencies (#6478) This also adds the tcl, tk, and libx11 dependencies to ruby. All other changes are new packages. --- .../repos/builtin/packages/biopieces/package.py | 90 ++++++++++++++++++++++ .../builtin/packages/perl-bit-vector/package.py | 36 +++++++++ .../builtin/packages/perl-carp-clan/package.py | 37 +++++++++ .../packages/perl-class-inspector/package.py | 34 ++++++++ .../builtin/packages/perl-dbd-mysql/package.py | 38 +++++++++ .../builtin/packages/perl-encode-locale/package.py | 34 ++++++++ .../packages/perl-file-copy-recursive/package.py | 34 ++++++++ .../builtin/packages/perl-file-listing/package.py | 36 +++++++++ .../packages/perl-file-sharedir-install/package.py | 36 +++++++++ .../packages/perl-file-slurp-tiny/package.py | 34 ++++++++ .../builtin/packages/perl-html-parser/package.py | 36 +++++++++ .../builtin/packages/perl-html-tagset/package.py | 34 ++++++++ .../builtin/packages/perl-http-cookies/package.py | 37 +++++++++ .../builtin/packages/perl-http-daemon/package.py | 37 +++++++++ .../builtin/packages/perl-http-date/package.py | 34 ++++++++ .../builtin/packages/perl-http-message/package.py | 41 ++++++++++ .../packages/perl-http-negotiate/package.py | 36 +++++++++ .../builtin/packages/perl-inline-c/package.py | 40 ++++++++++ .../repos/builtin/packages/perl-inline/package.py | 36 +++++++++ .../repos/builtin/packages/perl-io-html/package.py | 34 ++++++++ .../packages/perl-io-sessiondata/package.py | 34 ++++++++ .../builtin/packages/perl-io-socket-ssl/package.py | 51 ++++++++++++ .../packages/perl-lwp-mediatypes/package.py | 34 ++++++++ .../packages/perl-lwp-protocol-https/package.py | 40 ++++++++++ .../repos/builtin/packages/perl-lwp/package.py | 45 +++++++++++ .../builtin/packages/perl-mozilla-ca/package.py | 34 ++++++++ .../builtin/packages/perl-net-http/package.py | 36 +++++++++ .../builtin/packages/perl-net-ssleay/package.py | 52 +++++++++++++ .../packages/perl-parse-recdescent/package.py | 36 +++++++++ .../repos/builtin/packages/perl-pegex/package.py | 37 +++++++++ .../builtin/packages/perl-soap-lite/package.py | 42 ++++++++++ .../repos/builtin/packages/perl-svg/package.py | 35 +++++++++ .../builtin/packages/perl-task-weaken/package.py | 34 ++++++++ .../packages/perl-test-requiresinternet/package.py | 34 ++++++++ .../builtin/packages/perl-time-hires/package.py | 34 ++++++++ .../builtin/packages/perl-try-tiny/package.py | 34 ++++++++ .../repos/builtin/packages/perl-uri/package.py | 36 +++++++++ .../repos/builtin/packages/perl-version/package.py | 36 +++++++++ .../packages/perl-www-robotrules/package.py | 36 +++++++++ .../packages/perl-xml-parser-lite/package.py | 36 +++++++++ .../builtin/packages/perl-yaml-libyaml/package.py | 34 ++++++++ .../repos/builtin/packages/ruby-gnuplot/package.py | 41 ++++++++++ .../repos/builtin/packages/ruby-narray/package.py | 43 +++++++++++ .../builtin/packages/ruby-rubyinline/package.py | 39 ++++++++++ .../packages/ruby-terminal-table/package.py | 39 ++++++++++ var/spack/repos/builtin/packages/ruby/package.py | 30 ++++---- .../builtin/packages/scan-for-matches/package.py | 41 ++++++++++ 47 files changed, 1784 insertions(+), 13 deletions(-) create mode 100644 var/spack/repos/builtin/packages/biopieces/package.py create mode 100644 var/spack/repos/builtin/packages/perl-bit-vector/package.py create mode 100644 var/spack/repos/builtin/packages/perl-carp-clan/package.py create mode 100644 var/spack/repos/builtin/packages/perl-class-inspector/package.py create mode 100644 var/spack/repos/builtin/packages/perl-dbd-mysql/package.py create mode 100644 var/spack/repos/builtin/packages/perl-encode-locale/package.py create mode 100644 var/spack/repos/builtin/packages/perl-file-copy-recursive/package.py create mode 100644 var/spack/repos/builtin/packages/perl-file-listing/package.py create mode 100644 var/spack/repos/builtin/packages/perl-file-sharedir-install/package.py create mode 100644 var/spack/repos/builtin/packages/perl-file-slurp-tiny/package.py create mode 100644 var/spack/repos/builtin/packages/perl-html-parser/package.py create mode 100644 var/spack/repos/builtin/packages/perl-html-tagset/package.py create mode 100644 var/spack/repos/builtin/packages/perl-http-cookies/package.py create mode 100644 var/spack/repos/builtin/packages/perl-http-daemon/package.py create mode 100644 var/spack/repos/builtin/packages/perl-http-date/package.py create mode 100644 var/spack/repos/builtin/packages/perl-http-message/package.py create mode 100644 var/spack/repos/builtin/packages/perl-http-negotiate/package.py create mode 100644 var/spack/repos/builtin/packages/perl-inline-c/package.py create mode 100644 var/spack/repos/builtin/packages/perl-inline/package.py create mode 100644 var/spack/repos/builtin/packages/perl-io-html/package.py create mode 100644 var/spack/repos/builtin/packages/perl-io-sessiondata/package.py create mode 100644 var/spack/repos/builtin/packages/perl-io-socket-ssl/package.py create mode 100644 var/spack/repos/builtin/packages/perl-lwp-mediatypes/package.py create mode 100644 var/spack/repos/builtin/packages/perl-lwp-protocol-https/package.py create mode 100644 var/spack/repos/builtin/packages/perl-lwp/package.py create mode 100644 var/spack/repos/builtin/packages/perl-mozilla-ca/package.py create mode 100644 var/spack/repos/builtin/packages/perl-net-http/package.py create mode 100644 var/spack/repos/builtin/packages/perl-net-ssleay/package.py create mode 100644 var/spack/repos/builtin/packages/perl-parse-recdescent/package.py create mode 100644 var/spack/repos/builtin/packages/perl-pegex/package.py create mode 100644 var/spack/repos/builtin/packages/perl-soap-lite/package.py create mode 100644 var/spack/repos/builtin/packages/perl-svg/package.py create mode 100644 var/spack/repos/builtin/packages/perl-task-weaken/package.py create mode 100644 var/spack/repos/builtin/packages/perl-test-requiresinternet/package.py create mode 100644 var/spack/repos/builtin/packages/perl-time-hires/package.py create mode 100644 var/spack/repos/builtin/packages/perl-try-tiny/package.py create mode 100644 var/spack/repos/builtin/packages/perl-uri/package.py create mode 100644 var/spack/repos/builtin/packages/perl-version/package.py create mode 100644 var/spack/repos/builtin/packages/perl-www-robotrules/package.py create mode 100644 var/spack/repos/builtin/packages/perl-xml-parser-lite/package.py create mode 100644 var/spack/repos/builtin/packages/perl-yaml-libyaml/package.py create mode 100644 var/spack/repos/builtin/packages/ruby-gnuplot/package.py create mode 100644 var/spack/repos/builtin/packages/ruby-narray/package.py create mode 100644 var/spack/repos/builtin/packages/ruby-rubyinline/package.py create mode 100644 var/spack/repos/builtin/packages/ruby-terminal-table/package.py create mode 100644 var/spack/repos/builtin/packages/scan-for-matches/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/biopieces/package.py b/var/spack/repos/builtin/packages/biopieces/package.py new file mode 100644 index 0000000000..f461b80764 --- /dev/null +++ b/var/spack/repos/builtin/packages/biopieces/package.py @@ -0,0 +1,90 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import distutils.dir_util + + +class Biopieces(Package): + """The Biopieces are a collection of bioinformatics tools that can be + pieced together in a very easy and flexible manner to perform both + simple and complex tasks.""" + + homepage = "http://maasha.github.io/biopieces/" + url = "https://github.com/maasha/biopieces/archive/2.0.tar.gz" + + version('2016-04-12', commit='982f80f7c55e2cae67737d80fe35a4e784762856', + git='https://github.com/maasha/biopieces.git', submodules=True) + + depends_on('perl', type=('build', 'run')) + depends_on('perl-module-build', type=('build', 'run')) + depends_on('perl-bit-vector', type=('build', 'run')) + depends_on('perl-svg', type=('build', 'run')) + depends_on('perl-term-readkey', type=('build', 'run')) + depends_on('perl-time-hires', type=('build', 'run')) + depends_on('perl-dbi', type=('build', 'run')) + depends_on('perl-xml-parser', type=('build', 'run')) + depends_on('perl-carp-clan', type=('build', 'run')) + depends_on('perl-class-inspector', type=('build', 'run')) + depends_on('perl-html-parser', type=('build', 'run')) + depends_on('perl-lwp', type=('build', 'run')) + depends_on('perl-soap-lite', type=('build', 'run')) + depends_on('perl-uri', type=('build', 'run')) + depends_on('perl-inline', type=('build', 'run')) + depends_on('perl-inline-c', type=('build', 'run')) + depends_on('perl-parse-recdescent', type=('build', 'run')) + depends_on('perl-version', type=('build', 'run')) + depends_on('perl-dbfile', type=('build', 'run')) + depends_on('perl-dbd-mysql', type=('build', 'run')) + + depends_on('ruby@1.9:') + depends_on('ruby-gnuplot') + depends_on('ruby-narray') + depends_on('ruby-rubyinline') + depends_on('ruby-terminal-table') + + depends_on('python@2.6:', type=('build', 'run')) + depends_on('blast-plus') + depends_on('muscle') + depends_on('mummer') + depends_on('blat') + depends_on('vmatch') + depends_on('bowtie') + depends_on('bwa') + depends_on('usearch') + depends_on('velvet') + depends_on('idba') + depends_on('ray') + depends_on('scan-for-matches') + + def install(self, spec, prefix): + distutils.dir_util.copy_tree(".", prefix) + + def setup_environment(self, spack_env, run_env): + # Note: user will need to set environment variables on their own, + # dependent on where they will want data to be located: + # BP_DATA - Contains genomic data etc. + # BP_TMP - Required temporary directory + # BP_LOG - Required log directory + run_env.prepend_path('BP_DIR', prefix) diff --git a/var/spack/repos/builtin/packages/perl-bit-vector/package.py b/var/spack/repos/builtin/packages/perl-bit-vector/package.py new file mode 100644 index 0000000000..e72fd29957 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-bit-vector/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlBitVector(PerlPackage): + """Efficient bit vector, set of integers and "big int" math library""" + + homepage = "http://search.cpan.org/~stbey/Bit-Vector-7.4/Vector.pod" + url = "http://search.cpan.org/CPAN/authors/id/S/ST/STBEY/Bit-Vector-7.4.tar.gz" + + version('7.4', 'bf67f144e5be5327ed79d4c69e6e0086') + + depends_on('perl-carp-clan', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/perl-carp-clan/package.py b/var/spack/repos/builtin/packages/perl-carp-clan/package.py new file mode 100644 index 0000000000..b515647c75 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-carp-clan/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlCarpClan(PerlPackage): + """Report errors from perspective of caller of a "clan" of modules""" + + homepage = "http://search.cpan.org/~kentnl/Carp-Clan-6.06/lib/Carp/Clan.pod" + url = "http://search.cpan.org/CPAN/authors/id/K/KE/KENTNL/Carp-Clan-6.06.tar.gz" + + version('6.06', 'c562a35c48f43665fab735cdc7fe3cb2') + + depends_on('perl-test-exception', type=('build', 'run')) + depends_on('perl-sub-uplevel', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/perl-class-inspector/package.py b/var/spack/repos/builtin/packages/perl-class-inspector/package.py new file mode 100644 index 0000000000..f619c3122e --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-class-inspector/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlClassInspector(PerlPackage): + """Get information about a class and its structure""" + + homepage = "http://search.cpan.org/~plicease/Class-Inspector-1.32/lib/Class/Inspector.pm" + url = "http://search.cpan.org/CPAN/authors/id/P/PL/PLICEASE/Class-Inspector-1.32.tar.gz" + + version('1.32', 'db471d6ecf47fa054726553319b7c34f') diff --git a/var/spack/repos/builtin/packages/perl-dbd-mysql/package.py b/var/spack/repos/builtin/packages/perl-dbd-mysql/package.py new file mode 100644 index 0000000000..a5a8d27413 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-dbd-mysql/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlDbdMysql(PerlPackage): + """MySQL driver for the Perl5 Database Interface (DBI)""" + + homepage = "http://search.cpan.org/~michielb/DBD-mysql-4.043/lib/DBD/mysql.pm" + url = "http://search.cpan.org/CPAN/authors/id/M/MI/MICHIELB/DBD-mysql-4.043.tar.gz" + + version('4.043', '4a00dd7f1c057931147c65dfc4901c36') + + depends_on('perl-test-deep', type=('build', 'run')) + depends_on('perl-dbi', type=('build', 'run')) + depends_on('mariadb@:10.1.23') diff --git a/var/spack/repos/builtin/packages/perl-encode-locale/package.py b/var/spack/repos/builtin/packages/perl-encode-locale/package.py new file mode 100644 index 0000000000..6f525362ad --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-encode-locale/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlEncodeLocale(PerlPackage): + """Determine the locale encoding""" + + homepage = "http://search.cpan.org/~gaas/Encode-Locale-1.05/lib/Encode/Locale.pm" + url = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Encode-Locale-1.05.tar.gz" + + version('1.05', 'fcfdb8e4ee34bcf62aed429b4a23db27') diff --git a/var/spack/repos/builtin/packages/perl-file-copy-recursive/package.py b/var/spack/repos/builtin/packages/perl-file-copy-recursive/package.py new file mode 100644 index 0000000000..75ed115c1f --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-file-copy-recursive/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlFileCopyRecursive(PerlPackage): + """Perl extension for recursively copying files and directories""" + + homepage = "http://search.cpan.org/~dmuey/File-Copy-Recursive-0.38/Recursive.pm" + url = "http://search.cpan.org/CPAN/authors/id/D/DM/DMUEY/File-Copy-Recursive-0.38.tar.gz" + + version('0.38', 'e76dc75ab456510d67c6c3a95183f72f') diff --git a/var/spack/repos/builtin/packages/perl-file-listing/package.py b/var/spack/repos/builtin/packages/perl-file-listing/package.py new file mode 100644 index 0000000000..5fafd76a5c --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-file-listing/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlFileListing(PerlPackage): + """Parse directory listing""" + + homepage = "http://search.cpan.org/~gaas/File-Listing-6.04/lib/File/Listing.pm" + url = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/File-Listing-6.04.tar.gz" + + version('6.04', '83f636b477741f3a014585bb9cc079a6') + + depends_on('perl-http-date', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/perl-file-sharedir-install/package.py b/var/spack/repos/builtin/packages/perl-file-sharedir-install/package.py new file mode 100644 index 0000000000..c02de14ada --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-file-sharedir-install/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlFileSharedirInstall(PerlPackage): + """Install shared files""" + + homepage = "http://search.cpan.org/~ether/File-ShareDir-Install-0.11/lib/File/ShareDir/Install.pm" + url = "http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/File-ShareDir-Install-0.11.tar.gz" + + version('0.11', '61107e6ce6eee42bf29525b1a4d029e0') + + depends_on('perl-module-build', type='build') diff --git a/var/spack/repos/builtin/packages/perl-file-slurp-tiny/package.py b/var/spack/repos/builtin/packages/perl-file-slurp-tiny/package.py new file mode 100644 index 0000000000..89177aef8c --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-file-slurp-tiny/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlFileSlurpTiny(PerlPackage): + """A simple, sane and efficient file slurper""" + + homepage = "http://search.cpan.org/~leont/File-Slurp-Tiny-0.004/lib/File/Slurp/Tiny.pm" + url = "http://search.cpan.org/CPAN/authors/id/L/LE/LEONT/File-Slurp-Tiny-0.004.tar.gz" + + version('0.004', '7575b81543281ea57cdb7e5eb3f73264') diff --git a/var/spack/repos/builtin/packages/perl-html-parser/package.py b/var/spack/repos/builtin/packages/perl-html-parser/package.py new file mode 100644 index 0000000000..8eb86dc002 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-html-parser/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlHtmlParser(PerlPackage): + """HTML parser class""" + + homepage = "http://search.cpan.org/~gaas/HTML-Parser-3.72/Parser.pm" + url = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTML-Parser-3.72.tar.gz" + + version('3.72', 'eb7505e5f626913350df9dd4a03d54a8') + + depends_on('perl-html-tagset', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/perl-html-tagset/package.py b/var/spack/repos/builtin/packages/perl-html-tagset/package.py new file mode 100644 index 0000000000..bc41572d7c --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-html-tagset/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlHtmlTagset(PerlPackage): + """Data tables useful in parsing HTML""" + + homepage = "http://search.cpan.org/~petdance/HTML-Tagset-3.20/Tagset.pm" + url = "http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/HTML-Tagset-3.20.tar.gz" + + version('3.20', 'd2bfa18fe1904df7f683e96611e87437') diff --git a/var/spack/repos/builtin/packages/perl-http-cookies/package.py b/var/spack/repos/builtin/packages/perl-http-cookies/package.py new file mode 100644 index 0000000000..112bb88974 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-http-cookies/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlHttpCookies(PerlPackage): + """HTTP cookie jars""" + + homepage = "http://search.cpan.org/~oalders/HTTP-Cookies-6.04/lib/HTTP/Cookies.pm" + url = "http://search.cpan.org/CPAN/authors/id/O/OA/OALDERS/HTTP-Cookies-6.04.tar.gz" + + version('6.04', '7bf1e277bd5c886bc18d21eb8423b65f') + + depends_on('perl-uri', type=('build', 'run')) + depends_on('perl-http-message', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/perl-http-daemon/package.py b/var/spack/repos/builtin/packages/perl-http-daemon/package.py new file mode 100644 index 0000000000..ff1de570e5 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-http-daemon/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlHttpDaemon(PerlPackage): + """A simple http server class""" + + homepage = "http://search.cpan.org/~gaas/HTTP-Daemon-6.01/lib/HTTP/Daemon.pm" + url = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTTP-Daemon-6.01.tar.gz" + + version('6.01', 'ed0ae02d25d7f1e89456d4d69732adc2') + + depends_on('perl-lwp-mediatypes', type=('build', 'run')) + depends_on('perl-http-message', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/perl-http-date/package.py b/var/spack/repos/builtin/packages/perl-http-date/package.py new file mode 100644 index 0000000000..928f7a568f --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-http-date/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlHttpDate(PerlPackage): + """Date conversion routines""" + + homepage = "http://search.cpan.org/~gaas/HTTP-Date-6.02/lib/HTTP/Date.pm" + url = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTTP-Date-6.02.tar.gz" + + version('6.02', '52b7a0d5982d61be1edb217751d7daba') diff --git a/var/spack/repos/builtin/packages/perl-http-message/package.py b/var/spack/repos/builtin/packages/perl-http-message/package.py new file mode 100644 index 0000000000..626afd4c0b --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-http-message/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlHttpMessage(PerlPackage): + """HTTP style message (base class)""" + + homepage = "http://search.cpan.org/~oalders/HTTP-Message-6.13/lib/HTTP/Status.pm" + url = "http://search.cpan.org/CPAN/authors/id/O/OA/OALDERS/HTTP-Message-6.13.tar.gz" + + version('6.13', '4c1b7c6ee114c1cff69379ec9651d9ac') + + depends_on('perl-lwp-mediatypes', type=('build', 'run')) + depends_on('perl-encode-locale', type=('build', 'run')) + depends_on('perl-io-html', type=('build', 'run')) + depends_on('perl-try-tiny', type=('build', 'run')) + depends_on('perl-uri', type=('build', 'run')) + depends_on('perl-http-date', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/perl-http-negotiate/package.py b/var/spack/repos/builtin/packages/perl-http-negotiate/package.py new file mode 100644 index 0000000000..f18654d36d --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-http-negotiate/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlHttpNegotiate(PerlPackage): + """Choose a variant to serve""" + + homepage = "http://search.cpan.org/~gaas/HTTP-Negotiate-6.01/lib/HTTP/Negotiate.pm" + url = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTTP-Negotiate-6.01.tar.gz" + + version('6.01', '1236195250e264d7436e7bb02031671b') + + depends_on('perl-http-message', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/perl-inline-c/package.py b/var/spack/repos/builtin/packages/perl-inline-c/package.py new file mode 100644 index 0000000000..af480c7de6 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-inline-c/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlInlineC(PerlPackage): + """C Language Support for Inline""" + + homepage = "http://search.cpan.org/~tinita/Inline-C-0.78/lib/Inline/C.pod" + url = "http://search.cpan.org/CPAN/authors/id/T/TI/TINITA/Inline-C-0.78.tar.gz" + + version('0.78', '710a454b5337b1cbf3f2ae5c8c45b413') + + depends_on('perl-yaml-libyaml', type=('build', 'run')) + depends_on('perl-parse-recdescent', type=('build', 'run')) + depends_on('perl-inline', type=('build', 'run')) + depends_on('perl-pegex', type=('build', 'run')) + depends_on('perl-file-copy-recursive', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/perl-inline/package.py b/var/spack/repos/builtin/packages/perl-inline/package.py new file mode 100644 index 0000000000..4759b44288 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-inline/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlInline(PerlPackage): + """Write Perl Subroutines in Other Programming Languages""" + + homepage = "http://search.cpan.org/~ingy/Inline-0.80/lib/Inline.pod" + url = "http://search.cpan.org/CPAN/authors/id/I/IN/INGY/Inline-0.80.tar.gz" + + version('0.80', '510bbac46e727bcaf240b7feac2646c9') + + depends_on('perl-test-warn', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/perl-io-html/package.py b/var/spack/repos/builtin/packages/perl-io-html/package.py new file mode 100644 index 0000000000..4ad080e790 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-io-html/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlIoHtml(PerlPackage): + """Open an HTML file with automatic charset detection.""" + + homepage = "http://search.cpan.org/~cjm/IO-HTML-1.001/lib/IO/HTML.pm" + url = "http://search.cpan.org/CPAN/authors/id/C/CJ/CJM/IO-HTML-1.001.tar.gz" + + version('1.001', '3f8958718844dc96b9f6946f21d70d22') diff --git a/var/spack/repos/builtin/packages/perl-io-sessiondata/package.py b/var/spack/repos/builtin/packages/perl-io-sessiondata/package.py new file mode 100644 index 0000000000..887a75d7be --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-io-sessiondata/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlIoSessiondata(PerlPackage): + """A wrapper around a single IO::Socket object""" + + homepage = "http://search.cpan.org/~phred/IO-SessionData-1.03/" + url = "http://search.cpan.org/CPAN/authors/id/P/PH/PHRED/IO-SessionData-1.03.tar.gz" + + version('1.03', '790f9e05465c774cf9a6299500463104') diff --git a/var/spack/repos/builtin/packages/perl-io-socket-ssl/package.py b/var/spack/repos/builtin/packages/perl-io-socket-ssl/package.py new file mode 100644 index 0000000000..bc39f15f69 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-io-socket-ssl/package.py @@ -0,0 +1,51 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import inspect + + +class PerlIoSocketSsl(PerlPackage): + """SSL sockets with IO::Socket interface""" + + homepage = "http://search.cpan.org/~sullr/IO-Socket-SSL-2.052/lib/IO/Socket/SSL.pod" + url = "http://search.cpan.org/CPAN/authors/id/S/SU/SULLR/IO-Socket-SSL-2.052.tar.gz" + + version('2.052', '26c9bcdfb4ba8763ef89264f21326a48') + + depends_on('perl-net-ssleay', type=('build', 'run')) + + def configure(self, spec, prefix): + self.build_method = 'Makefile.PL' + self.build_executable = inspect.getmodule(self).make + # Should I do external tests? + config_answers = ['n\n'] + config_answers_filename = 'spack-config.in' + + with open(config_answers_filename, 'w') as f: + f.writelines(config_answers) + + with open(config_answers_filename, 'r') as f: + inspect.getmodule(self).perl('Makefile.PL', 'INSTALL_BASE={0}'. + format(prefix), input=f) diff --git a/var/spack/repos/builtin/packages/perl-lwp-mediatypes/package.py b/var/spack/repos/builtin/packages/perl-lwp-mediatypes/package.py new file mode 100644 index 0000000000..15c98c7eeb --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-lwp-mediatypes/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlLwpMediatypes(PerlPackage): + """Guess media type for a file or a URL""" + + homepage = "http://search.cpan.org/~gaas/LWP-MediaTypes-6.02/lib/LWP/MediaTypes.pm" + url = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/LWP-MediaTypes-6.02.tar.gz" + + version('6.02', '8c5f25fb64b974d22aff424476ba13c9') diff --git a/var/spack/repos/builtin/packages/perl-lwp-protocol-https/package.py b/var/spack/repos/builtin/packages/perl-lwp-protocol-https/package.py new file mode 100644 index 0000000000..adbe8a761f --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-lwp-protocol-https/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlLwpProtocolHttps(PerlPackage): + """ Provide https support for LWP::UserAgent""" + + homepage = "http://search.cpan.org/~gaas/LWP-Protocol-https-6.04/lib/LWP/Protocol/https.pm" + url = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/LWP-Protocol-https-6.04.tar.gz" + + version('6.04', '1b422a7d3b5fed1eb4d748fdc9fd79a4') + + depends_on('perl-test-requiresinternet', type=('build', 'run')) + depends_on('perl-io-socket-ssl', type=('build', 'run')) + depends_on('perl-net-http', type=('build', 'run')) + depends_on('perl-mozilla-ca', type=('build', 'run')) + depends_on('perl-lwp', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/perl-lwp/package.py b/var/spack/repos/builtin/packages/perl-lwp/package.py new file mode 100644 index 0000000000..90b5c13f16 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-lwp/package.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlLwp(PerlPackage): + """The World-Wide Web library for Perl""" + + homepage = "http://search.cpan.org/~oalders/libwww-perl-6.29/lib/LWP.pm" + url = "http://search.cpan.org/CPAN/authors/id/O/OA/OALDERS/libwww-perl-6.29.tar.gz" + + version('6.29', 'efec8d563ffd3652333356aa722c2b56') + + depends_on('perl-test-requiresinternet', type=('build', 'run')) + depends_on('perl-http-message', type=('build', 'run')) + depends_on('perl-file-listing', type=('build', 'run')) + depends_on('perl-http-daemon', type=('build', 'run')) + depends_on('perl-html-parser', type=('build', 'run')) + depends_on('perl-http-cookies', type=('build', 'run')) + depends_on('perl-www-robotrules', type=('build', 'run')) + depends_on('perl-test-fatal', type=('build', 'run')) + depends_on('perl-http-negotiate', type=('build', 'run')) + depends_on('perl-net-http', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/perl-mozilla-ca/package.py b/var/spack/repos/builtin/packages/perl-mozilla-ca/package.py new file mode 100644 index 0000000000..d7f80c8675 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-mozilla-ca/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlMozillaCa(PerlPackage): + """Mozilla's CA cert bundle in PEM format""" + + homepage = "http://search.cpan.org/~abh/Mozilla-CA-20160104/lib/Mozilla/CA.pm" + url = "http://search.cpan.org/CPAN/authors/id/A/AB/ABH/Mozilla-CA-20160104.tar.gz" + + version('20160104', '1b91edb15953a8188f011ab5ff433300') diff --git a/var/spack/repos/builtin/packages/perl-net-http/package.py b/var/spack/repos/builtin/packages/perl-net-http/package.py new file mode 100644 index 0000000000..a4070eb11a --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-net-http/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlNetHttp(PerlPackage): + """Low-level HTTP connection (client)""" + + homepage = "http://search.cpan.org/~oalders/Net-HTTP-6.17/lib/Net/HTTP.pm" + url = "http://search.cpan.org/CPAN/authors/id/O/OA/OALDERS/Net-HTTP-6.17.tar.gz" + + version('6.17', '068fa02fd3c8a5b63316025b5a24844c') + + depends_on('perl-uri', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/perl-net-ssleay/package.py b/var/spack/repos/builtin/packages/perl-net-ssleay/package.py new file mode 100644 index 0000000000..b8bddb256c --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-net-ssleay/package.py @@ -0,0 +1,52 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import inspect + + +class PerlNetSsleay(PerlPackage): + """Perl extension for using OpenSSL""" + + homepage = "http://search.cpan.org/~mikem/Net-SSLeay-1.82/lib/Net/SSLeay.pod" + url = "http://search.cpan.org/CPAN/authors/id/M/MI/MIKEM/Net-SSLeay-1.82.tar.gz" + + version('1.82', '2170469d929d5173bacffd0cb2d7fafa') + + depends_on('openssl') + + def configure(self, spec, prefix): + self.build_method = 'Makefile.PL' + self.build_executable = inspect.getmodule(self).make + # Do you want to run external tests? + config_answers = ['\n'] + config_answers_filename = 'spack-config.in' + + with open(config_answers_filename, 'w') as f: + f.writelines(config_answers) + + with open(config_answers_filename, 'r') as f: + inspect.getmodule(self).perl('Makefile.PL', 'INSTALL_BASE={0}'. + format(prefix), 'OPENSSL_PREFIX=%s' % + self.spec['openssl'].prefix, input=f) diff --git a/var/spack/repos/builtin/packages/perl-parse-recdescent/package.py b/var/spack/repos/builtin/packages/perl-parse-recdescent/package.py new file mode 100644 index 0000000000..6bbb75d261 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-parse-recdescent/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlParseRecdescent(PerlPackage): + """Generate Recursive-Descent Parsers""" + + homepage = "http://search.cpan.org/~jtbraun/Parse-RecDescent-1.967015/lib/Parse/RecDescent.pm" + url = "http://search.cpan.org/CPAN/authors/id/J/JT/JTBRAUN/Parse-RecDescent-1.967015.tar.gz" + + version('1.967015', '7a36d45d62a9b68603edcdbd276006cc') + + depends_on('perl-module-build', type='build') diff --git a/var/spack/repos/builtin/packages/perl-pegex/package.py b/var/spack/repos/builtin/packages/perl-pegex/package.py new file mode 100644 index 0000000000..cde3bf5eef --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-pegex/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlPegex(PerlPackage): + """Acmeist PEG Parser Framework""" + + homepage = "http://search.cpan.org/~ingy/Pegex-0.64/lib/Pegex.pod" + url = "http://search.cpan.org/CPAN/authors/id/I/IN/INGY/Pegex-0.64.tar.gz" + + version('0.64', 'db86d4f1ddc36c4c7860ce060e77976f') + + depends_on('perl-file-sharedir-install', type=('build', 'run')) + depends_on('perl-yaml-libyaml', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/perl-soap-lite/package.py b/var/spack/repos/builtin/packages/perl-soap-lite/package.py new file mode 100644 index 0000000000..9f2cb8eb53 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-soap-lite/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlSoapLite(PerlPackage): + """Perl's Web Services Toolkit""" + + homepage = "http://search.cpan.org/~phred/SOAP-Lite-1.20/lib/SOAP/Lite.pm" + url = "http://search.cpan.org/CPAN/authors/id/P/PH/PHRED/SOAP-Lite-1.20.tar.gz" + + version('1.22', '86c31341311498a08c6309e62168f655') + + depends_on('perl-io-sessiondata', type=('build', 'run')) + depends_on('perl-lwp-protocol-https', type=('build', 'run')) + depends_on('perl-task-weaken', type=('build', 'run')) + depends_on('perl-xml-parser-lite', type=('build', 'run')) + depends_on('perl-xml-parser', type=('build', 'run')) + depends_on('perl-test-warn', type=('build', 'run')) + depends_on('perl-class-inspector', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/perl-svg/package.py b/var/spack/repos/builtin/packages/perl-svg/package.py new file mode 100644 index 0000000000..09c1d50f38 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-svg/package.py @@ -0,0 +1,35 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlSvg(PerlPackage): + """Perl extension for generating Scalable Vector Graphics (SVG) documents. + """ + + homepage = "http://search.cpan.org/~manwar/SVG-2.78/lib/SVG.pm" + url = "http://search.cpan.org/CPAN/authors/id/M/MA/MANWAR/SVG-2.78.tar.gz" + + version('2.78', 'b247c216ab11fae24533d0ce556e2e75') diff --git a/var/spack/repos/builtin/packages/perl-task-weaken/package.py b/var/spack/repos/builtin/packages/perl-task-weaken/package.py new file mode 100644 index 0000000000..ce0184c7ba --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-task-weaken/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlTaskWeaken(PerlPackage): + """Ensure that a platform has weaken support""" + + homepage = "http://search.cpan.org/~adamk/Task-Weaken-1.04/lib/Task/Weaken.pm" + url = "http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Task-Weaken-1.04.tar.gz" + + version('1.04', 'affd0c395515bb95d29968404d7fe6de') diff --git a/var/spack/repos/builtin/packages/perl-test-requiresinternet/package.py b/var/spack/repos/builtin/packages/perl-test-requiresinternet/package.py new file mode 100644 index 0000000000..96deb0ff36 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-test-requiresinternet/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlTestRequiresinternet(PerlPackage): + """Easily test network connectivity""" + + homepage = "http://search.cpan.org/~mallen/Test-RequiresInternet-0.05/lib/Test/RequiresInternet.pm" + url = "http://search.cpan.org/CPAN/authors/id/M/MA/MALLEN/Test-RequiresInternet-0.05.tar.gz" + + version('0.05', '0ba9f1cff4cf90ed2618c2eddfd525d8') diff --git a/var/spack/repos/builtin/packages/perl-time-hires/package.py b/var/spack/repos/builtin/packages/perl-time-hires/package.py new file mode 100644 index 0000000000..19f00986f0 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-time-hires/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlTimeHires(PerlPackage): + """High resolution alarm, sleep, gettimeofday, interval timers""" + + homepage = "http://search.cpan.org/~jhi/Time-HiRes-1.9746/HiRes.pm" + url = "http://search.cpan.org/CPAN/authors/id/J/JH/JHI/Time-HiRes-1.9746.tar.gz" + + version('1.9746', '728dc2c2715313a056792191d7d0726c') diff --git a/var/spack/repos/builtin/packages/perl-try-tiny/package.py b/var/spack/repos/builtin/packages/perl-try-tiny/package.py new file mode 100644 index 0000000000..05e127dd51 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-try-tiny/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlTryTiny(PerlPackage): + """Minimal try/catch with proper preservation of $@""" + + homepage = "http://search.cpan.org/~ether/Try-Tiny-0.28/lib/Try/Tiny.pm" + url = "http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/Try-Tiny-0.28.tar.gz" + + version('0.28', 'e2f8af601a62981aab30df15a6f47475') diff --git a/var/spack/repos/builtin/packages/perl-uri/package.py b/var/spack/repos/builtin/packages/perl-uri/package.py new file mode 100644 index 0000000000..33efe6b75f --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-uri/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlUri(PerlPackage): + """Uniform Resource Identifiers (absolute and relative)""" + + homepage = "http://search.cpan.org/~ether/URI-1.72/lib/URI.pm" + url = "http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/URI-1.72.tar.gz" + + version('1.72', 'cd56d81ed429efaa97e7f3ff08851b48') + + depends_on('perl-test-needs', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/perl-version/package.py b/var/spack/repos/builtin/packages/perl-version/package.py new file mode 100644 index 0000000000..5660a9466c --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-version/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlVersion(PerlPackage): + """Parse and manipulate Perl version strings""" + + homepage = "http://search.cpan.org/~bdfoy/Perl-Version-1.013/lib/Perl/Version.pm" + url = "http://search.cpan.org/CPAN/authors/id/B/BD/BDFOY/Perl-Version-1.013.tar.gz" + + version('1.013_03', 'b2c94c8b33ccfa1635c760fcfa1c5358') + + depends_on('perl-file-slurp-tiny', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/perl-www-robotrules/package.py b/var/spack/repos/builtin/packages/perl-www-robotrules/package.py new file mode 100644 index 0000000000..3859e205bd --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-www-robotrules/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlWwwRobotrules(PerlPackage): + """Database of robots.txt-derived permissions""" + + homepage = "http://deps.cpantesters.org/?module=WWW%3A%3ARobotRules;perl=latest" + url = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/WWW-RobotRules-6.02.tar.gz" + + version('6.02', 'b7186e8b8b3701e70c22abf430742403') + + depends_on('perl-uri', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/perl-xml-parser-lite/package.py b/var/spack/repos/builtin/packages/perl-xml-parser-lite/package.py new file mode 100644 index 0000000000..53dcc0d09c --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-xml-parser-lite/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlXmlParserLite(PerlPackage): + """Lightweight pure-perl XML Parser (based on regexps)""" + + homepage = "http://search.cpan.org/~phred/XML-Parser-Lite-0.721/lib/XML/Parser/Lite.pm" + url = "http://search.cpan.org/CPAN/authors/id/P/PH/PHRED/XML-Parser-Lite-0.721.tar.gz" + + version('0.721', 'ad8a87b9bf413aa540c7cb724d650808') + + depends_on('perl-test-requires', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/perl-yaml-libyaml/package.py b/var/spack/repos/builtin/packages/perl-yaml-libyaml/package.py new file mode 100644 index 0000000000..72175fbc34 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-yaml-libyaml/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlYamlLibyaml(PerlPackage): + """Perl YAML Serialization using XS and libyaml """ + + homepage = "http://search.cpan.org/~tinita/YAML-LibYAML/" + url = "http://search.cpan.org/CPAN/authors/id/T/TI/TINITA/YAML-LibYAML-0.67.tar.gz" + + version('0.67', '5a787150db680e3ab3f753f2e54640ab') diff --git a/var/spack/repos/builtin/packages/ruby-gnuplot/package.py b/var/spack/repos/builtin/packages/ruby-gnuplot/package.py new file mode 100644 index 0000000000..fd0a589cc2 --- /dev/null +++ b/var/spack/repos/builtin/packages/ruby-gnuplot/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RubyGnuplot(Package): + """Utility library to aid in interacting with gnuplot from ruby""" + + homepage = "https://rubygems.org/gems/gnuplot/versions/2.6.2" + url = "https://rubygems.org/downloads/gnuplot-2.6.2.gem" + + version('2.6.2', 'ff36a37cf71b9cd6273fcd14bbfd82df', expand=False) + + depends_on('gnuplot+X') + + extends('ruby') + + def install(self, spec, prefix): + gem('install', 'gnuplot-{0}.gem'.format(self.version)) diff --git a/var/spack/repos/builtin/packages/ruby-narray/package.py b/var/spack/repos/builtin/packages/ruby-narray/package.py new file mode 100644 index 0000000000..e25bc8d4bf --- /dev/null +++ b/var/spack/repos/builtin/packages/ruby-narray/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RubyNarray(Package): + """Numo::NArray is an Numerical N-dimensional Array class for fast + processing and easy manipulation of multi-dimensional numerical data, + similar to numpy.ndaray.""" + + homepage = "https://rubygems.org/gems/narray" + url = "https://github.com/ruby-numo/narray" + + version('0.9.0.9', '9cadbbccf1e01b6d1bc143c19d598cad1c420869', + git='https://github.com/ruby-numo/narray.git') + + extends('ruby') + + def install(self, spec, prefix): + gem('build', 'numo-narray.gemspec') + gem('install', 'numo-narray-{0}.gem'.format(self.version)) diff --git a/var/spack/repos/builtin/packages/ruby-rubyinline/package.py b/var/spack/repos/builtin/packages/ruby-rubyinline/package.py new file mode 100644 index 0000000000..bc571a3cae --- /dev/null +++ b/var/spack/repos/builtin/packages/ruby-rubyinline/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RubyRubyinline(Package): + """Inline allows you to write foreign code within your ruby code.""" + + homepage = "https://rubygems.org/gems/RubyInline" + url = "https://rubygems.org/downloads/RubyInline-3.12.4.gem" + + version('3.12.4', '3058f4c48e62baef811b127f4925ee70', expand=False) + + extends('ruby') + + def install(self, spec, prefix): + gem('install', 'RubyInline-{0}.gem'.format(self.version)) diff --git a/var/spack/repos/builtin/packages/ruby-terminal-table/package.py b/var/spack/repos/builtin/packages/ruby-terminal-table/package.py new file mode 100644 index 0000000000..48e3dbf3bf --- /dev/null +++ b/var/spack/repos/builtin/packages/ruby-terminal-table/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RubyTerminalTable(Package): + """Simple, feature rich ascii table generation library""" + + homepage = "https://rubygems.org/gems/terminal-table" + url = "https://rubygems.org/downloads/terminal-table-1.8.0.gem" + + version('1.8.0', 'd78db9d71f70aaadd7e689641078e7e7', expand=False) + + extends('ruby') + + def install(self, spec, prefix): + gem('install', 'terminal-table-{0}.gem'.format(self.version)) diff --git a/var/spack/repos/builtin/packages/ruby/package.py b/var/spack/repos/builtin/packages/ruby/package.py index 1e3934df76..c28766ef60 100644 --- a/var/spack/repos/builtin/packages/ruby/package.py +++ b/var/spack/repos/builtin/packages/ruby/package.py @@ -25,32 +25,36 @@ from spack import * -class Ruby(Package): +class Ruby(AutotoolsPackage): """A dynamic, open source programming language with a focus on simplicity and productivity.""" homepage = "https://www.ruby-lang.org/" url = "http://cache.ruby-lang.org/pub/ruby/2.2/ruby-2.2.0.tar.gz" + version('2.2.0', 'cd03b28fd0b555970f5c4fd481700852') + + variant('openssl', default=False, description="Enable OpenSSL support") + variant('readline', default=False, description="Enable Readline support") + extendable = True - version('2.2.0', 'cd03b28fd0b555970f5c4fd481700852') depends_on('libffi') depends_on('zlib') - variant('openssl', default=False, description="Enable OpenSSL support") + depends_on('libx11') + depends_on('tcl') + depends_on('tk') depends_on('openssl', when='+openssl') - variant('readline', default=False, description="Enable Readline support") depends_on('readline', when='+readline') - def install(self, spec, prefix): - options = ["--prefix=%s" % prefix] - if '+openssl' in spec: - options.append("--with-openssl-dir=%s" % spec['openssl'].prefix) - if '+readline' in spec: - options.append("--with-readline-dir=%s" % spec['readline'].prefix) - configure(*options) - make() - make("install") + def configure_args(self): + args = [] + if '+openssl' in self.spec: + args.append("--with-openssl-dir=%s" % spec['openssl'].prefix) + if '+readline' in self.spec: + args.append("--with-readline-dir=%s" % spec['readline'].prefix) + args.append('--with-tk=%s' % self.spec['tk'].prefix) + return args def setup_dependent_environment(self, spack_env, run_env, dependent_spec): # TODO: do this only for actual extensions. diff --git a/var/spack/repos/builtin/packages/scan-for-matches/package.py b/var/spack/repos/builtin/packages/scan-for-matches/package.py new file mode 100644 index 0000000000..34ec80ae52 --- /dev/null +++ b/var/spack/repos/builtin/packages/scan-for-matches/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class ScanForMatches(Package): + """scan_for_matches is a utility written in C for locating patterns in DNA + or protein FASTA files.""" + + homepage = "http://blog.theseed.org/servers/2010/07/scan-for-matches.html" + url = "http://www.theseed.org/servers/downloads/scan_for_matches.tgz" + + version('2010-7-16', 'f64c9cfb385984ded2a7ad9ad2253d83') + + def install(self, spec, prefix): + cc = Executable(self.compiler.cc) + cc('-O', '-o', 'scan_for_matches', 'ggpunit.c', 'scan_for_matches.c') + mkdirp(prefix.bin) + install('scan_for_matches', prefix.bin) -- cgit v1.2.3-70-g09d2 From c5cb8ae159dae41818d53fdb12caa9ba05af17c1 Mon Sep 17 00:00:00 2001 From: David Orman Date: Wed, 13 Dec 2017 01:57:06 -0600 Subject: picard: added version 2.13.2 (#6669) --- var/spack/repos/builtin/packages/picard/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/picard/package.py b/var/spack/repos/builtin/packages/picard/package.py index e96b2a7c1e..8879f4232a 100644 --- a/var/spack/repos/builtin/packages/picard/package.py +++ b/var/spack/repos/builtin/packages/picard/package.py @@ -43,6 +43,7 @@ class Picard(Package): # that it was a .zip file with multiple .jar and .so files version('2.16.0', 'fed8928b03bb36e355656f349e579083', expand=False) version('2.15.0', '3f5751630b1a3449edda47a0712a64e4', expand=False) + version('2.13.2', '3d7b33fd1f43ad2129e6ec7883af56f5', expand=False) version('2.10.0', '96f3c11b1c9be9fc8088bc1b7b9f7538', expand=False) version('2.9.4', '5ce72af4d5efd02fba7084dcfbb3c7b3', expand=False) version('2.9.3', '3a33c231bcf3a61870c3d44b3b183924', expand=False) -- cgit v1.2.3-70-g09d2 From 5fa9e613213942bad9578a68a3df7b5fddc57cb2 Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 13 Dec 2017 01:57:29 -0600 Subject: SPAdes: add version 3.11.1 (#6668) --- var/spack/repos/builtin/packages/spades/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/spades/package.py b/var/spack/repos/builtin/packages/spades/package.py index 0748ef0618..330fe0597e 100644 --- a/var/spack/repos/builtin/packages/spades/package.py +++ b/var/spack/repos/builtin/packages/spades/package.py @@ -32,6 +32,7 @@ class Spades(CMakePackage): homepage = "http://cab.spbu.ru/software/spades/" url = "http://cab.spbu.ru/files/release3.10.1/SPAdes-3.10.1.tar.gz" + version('3.11.1', '478677b560e2f98db025e8efd5245cdf') version('3.10.1', 'dcab7d145af81b59cc867562f27536c3') depends_on('python', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 2e4c9e47a8b57106be228465b49af3a4c0131d9d Mon Sep 17 00:00:00 2001 From: peetsv <32349688+peetsv@users.noreply.github.com> Date: Wed, 13 Dec 2017 00:01:45 -0800 Subject: py-pysam: adding old version 0.7.7 (#6675) --- var/spack/repos/builtin/packages/py-pysam/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pysam/package.py b/var/spack/repos/builtin/packages/py-pysam/package.py index 177eee30fb..1ec5fe311f 100644 --- a/var/spack/repos/builtin/packages/py-pysam/package.py +++ b/var/spack/repos/builtin/packages/py-pysam/package.py @@ -34,6 +34,7 @@ class PyPysam(PythonPackage): version('0.13', 'a9b502dd1a7e6403e35e6972211688a2') version('0.11.2.2', '56230cd5f55b503845915b76c22d620a') + version('0.7.7', 'eaf9f37cbccc5e2708754d045909c1a0') depends_on('py-setuptools', type='build') depends_on('py-cython@0.21:', type='build') -- cgit v1.2.3-70-g09d2 From 836bf65250fafbb14bc0710fdc93f1fe0208c58a Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 13 Dec 2017 14:43:40 +0100 Subject: CUDA: 9.1 (#6663) Add the latest CUDA release, 9.1 --- var/spack/repos/builtin/packages/cuda/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cuda/package.py b/var/spack/repos/builtin/packages/cuda/package.py index e54501d8fe..e67cdc34f6 100644 --- a/var/spack/repos/builtin/packages/cuda/package.py +++ b/var/spack/repos/builtin/packages/cuda/package.py @@ -38,6 +38,8 @@ class Cuda(Package): homepage = "http://www.nvidia.com/object/cuda_home_new.html" + version('9.1.85', '67a5c3933109507df6b68f80650b4b4a', expand=False, + url="https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_9.1.85_387.26_linux") version('9.0.176', '7a00187b2ce5c5e350e68882f42dd507', expand=False, url="https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run") version('8.0.61', '33e1bd980e91af4e55f3ef835c103f9b', expand=False, @@ -50,7 +52,7 @@ class Cuda(Package): url="http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.14_linux_64.run") def install(self, spec, prefix): - runfile = glob(join_path(self.stage.path, 'cuda*run'))[0] + runfile = glob(join_path(self.stage.path, 'cuda*_linux*'))[0] chmod = which('chmod') chmod('+x', runfile) runfile = which(runfile) @@ -59,6 +61,7 @@ class Cuda(Package): # compilers. For example, on CentOS 6, you must use GCC 4.4.7 or # older. See: # http://docs.nvidia.com/cuda/cuda-installation-guide-linux/#system-requirements + # https://gist.github.com/ax3l/9489132 # for details. runfile( -- cgit v1.2.3-70-g09d2 From c0aa12111befbc6a5779be6a0111f7b80027082d Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Wed, 13 Dec 2017 16:01:51 +0100 Subject: tasmanian: add new package (#6659) --- .../repos/builtin/packages/tasmanian/package.py | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 var/spack/repos/builtin/packages/tasmanian/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/tasmanian/package.py b/var/spack/repos/builtin/packages/tasmanian/package.py new file mode 100644 index 0000000000..3815da686f --- /dev/null +++ b/var/spack/repos/builtin/packages/tasmanian/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Tasmanian(CMakePackage): + """The Toolkit for Adaptive Stochastic Modeling and Non-Intrusive + ApproximatioN is a robust library for high dimensional integration and + interpolation as well as parameter calibration.""" + + homepage = "http://tasmanian.ornl.gov" + url = "http://tasmanian.ornl.gov/documents/Tasmanian_v5.0.zip" + + version('5.0', '4bf131841d786033863d271739be0f7a') -- cgit v1.2.3-70-g09d2 From 5a66065dfaf9a68303cf05d70ea323848506af34 Mon Sep 17 00:00:00 2001 From: Douglas Duckworth Date: Wed, 13 Dec 2017 13:30:38 -0500 Subject: relion: add version and cuda arch variant (#6317) Add preferred version 2.0.3. Added beta version. Added conflict with gcc versions >= 5 when building with cuda@8 (which is currently the only supported cuda version). Added cuda architecture variant. Added comment about current lack of cuda@9 support. --- var/spack/repos/builtin/packages/relion/package.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/relion/package.py b/var/spack/repos/builtin/packages/relion/package.py index 16f5c35726..c20d2637a6 100644 --- a/var/spack/repos/builtin/packages/relion/package.py +++ b/var/spack/repos/builtin/packages/relion/package.py @@ -34,10 +34,19 @@ class Relion(CMakePackage): homepage = "http://http://www2.mrc-lmb.cam.ac.uk/relion" url = "https://github.com/3dem/relion" + version('2.1-beta-1', git='https://github.com/3dem/relion.git', + commit='e7607a869687b636d3c39e0d5b6a9cba930fc3b2') + version('2.0.3', git='https://github.com/3dem/relion.git', + preferred='true') + version('develop', git='https://github.com/3dem/relion.git') variant('gui', default=True, description="build the gui") variant('cuda', default=True, description="enable compute on gpu") + variant('cuda_arch', default=None, description='CUDA architecture', + values=('20', '30', '32', '35', '50', '52', '53', '60', '61', '62' + '70'), + multi=True) variant('double', default=True, description="double precision (cpu) code") variant('double-gpu', default=False, description="double precision (gpu) code") variant('build_type', default='RelWithDebInfo', @@ -48,7 +57,11 @@ class Relion(CMakePackage): depends_on('mpi') depends_on('fftw+float+double') depends_on('fltk', when='+gui') + # cuda 9 not yet supported + # https://github.com/3dem/relion/issues/296 depends_on('cuda@8.0:8.99', when='+cuda') + # use gcc < 5 when compiled with cuda 8 + conflicts('%gcc@5:', when='+cuda') def cmake_args(self): args = [ @@ -61,6 +74,12 @@ class Relion(CMakePackage): if '+cuda' in self.spec: args += [ '-DCUDA=on', - '-DCUFFT=on', + ] + + carch = self.spec.variants['cuda_arch'].value + + if carch is not None: + args += [ + '-DCUDA_ARCH=%s' % (carch), ] return args -- cgit v1.2.3-70-g09d2 From ce832fca59b9864f104526b8c3c2379553718c43 Mon Sep 17 00:00:00 2001 From: Scott Wittenburg Date: Thu, 14 Dec 2017 00:58:42 -0700 Subject: libharu: Make dependencies on zlib and libpng explicit (#6682) --- var/spack/repos/builtin/packages/libharu/package.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libharu/package.py b/var/spack/repos/builtin/packages/libharu/package.py index 3542582df8..7e0e049f98 100644 --- a/var/spack/repos/builtin/packages/libharu/package.py +++ b/var/spack/repos/builtin/packages/libharu/package.py @@ -40,12 +40,25 @@ class Libharu(AutotoolsPackage): version('master', branch='master', git='https://github.com/libharu/libharu.git') + depends_on('libpng') + depends_on('zlib') + def autoreconf(self, spec, prefix): """execute their autotools wrapper script""" if os.path.exists('./buildconf.sh'): bash = which('bash') bash('./buildconf.sh', '--force') + def configure_args(self): + """Point to spack-installed zlib and libpng""" + spec = self.spec + args = [] + + args.append('--with-zlib={0}'.format(spec['zlib'].prefix)) + args.append('--with-png={0}'.format(spec['libpng'].prefix)) + + return args + def url_for_version(self, version): url = 'https://github.com/libharu/libharu/archive/RELEASE_{0}.tar.gz' return url.format(version.underscored) -- cgit v1.2.3-70-g09d2 From b447c2ba51f57826980703e4efa1a7a15e98faed Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Thu, 14 Dec 2017 12:46:25 -0700 Subject: Add TIOGA package and optional dependency of Nalu on TIOGA (#6638) --- var/spack/repos/builtin/packages/nalu/package.py | 10 +++++ var/spack/repos/builtin/packages/tioga/package.py | 54 +++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 var/spack/repos/builtin/packages/tioga/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nalu/package.py b/var/spack/repos/builtin/packages/nalu/package.py index 36dd317009..4a7ca67897 100644 --- a/var/spack/repos/builtin/packages/nalu/package.py +++ b/var/spack/repos/builtin/packages/nalu/package.py @@ -39,6 +39,8 @@ class Nalu(CMakePackage): variant('openfast', default=False, description='Compile with OpenFAST support') + variant('tioga', default=False, + description='Compile with Tioga support') version('master', git='https://github.com/NaluCFD/Nalu.git', branch='master') @@ -47,6 +49,7 @@ class Nalu(CMakePackage): depends_on('yaml-cpp+pic~shared@0.5.3:') depends_on('trilinos~shared+exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist+superlu+hdf5+zlib+pnetcdf+shards@master,12.12.1:') depends_on('openfast+cxx', when='+openfast') + depends_on('tioga', when='+tioga') def cmake_args(self): spec = self.spec @@ -60,7 +63,14 @@ class Nalu(CMakePackage): if '+openfast' in spec: options.extend([ + '-DENABLE_OPENFAST:BOOL=ON', '-DOpenFAST_DIR:PATH=%s' % spec['openfast'].prefix ]) + if '+tioga' in spec: + options.extend([ + '-DENABLE_TIOGA:BOOL=ON', + '-DTIOGA_DIR:PATH=%s' % spec['tioga'].prefix + ]) + return options diff --git a/var/spack/repos/builtin/packages/tioga/package.py b/var/spack/repos/builtin/packages/tioga/package.py new file mode 100644 index 0000000000..7d770e3437 --- /dev/null +++ b/var/spack/repos/builtin/packages/tioga/package.py @@ -0,0 +1,54 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Tioga(CMakePackage): + """Topology Independent Overset Grid Assembly (TIOGA)""" + + homepage = "https://github.com/jsitaraman/tioga" + url = "https://github.com/jsitaraman/tioga.git" + + # The master branch doesn't support CMake + version('develop', git="https://github.com/jsitaraman/tioga.git", + branch='nalu-api') + + variant('shared', default=False, + description="Enable building shared libraries") + + depends_on('mpi') + + # Tioga has the fortran module file problem with parallel builds + parallel = False + + def cmake_args(self): + spec = self.spec + + options = [ + '-DBUILD_SHARED_LIBS:BOOL=%s' % ( + 'ON' if '+shared' in spec else 'OFF') + ] + + return options -- cgit v1.2.3-70-g09d2 From 6c1fa37e3d3e0819c780ebb56414be5693b45272 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Thu, 14 Dec 2017 21:38:33 +0100 Subject: fftw: added version 3.3.7 (#6678) --- var/spack/repos/builtin/packages/fftw/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fftw/package.py b/var/spack/repos/builtin/packages/fftw/package.py index e2fc311166..b6e7916355 100644 --- a/var/spack/repos/builtin/packages/fftw/package.py +++ b/var/spack/repos/builtin/packages/fftw/package.py @@ -37,6 +37,7 @@ class Fftw(AutotoolsPackage): url = "http://www.fftw.org/fftw-3.3.4.tar.gz" list_url = "http://www.fftw.org/download.html" + version('3.3.7', '0d5915d7d39b3253c1cc05030d79ac47') version('3.3.6-pl2', '927e481edbb32575397eb3d62535a856') version('3.3.5', '6cc08a3b9c7ee06fdd5b9eb02e06f569') version('3.3.4', '2edab8c06b24feeb3b82bbb3ebf3e7b3') -- cgit v1.2.3-70-g09d2 From 1aed3f7c01bc6590618af5be79f0033a9cd44761 Mon Sep 17 00:00:00 2001 From: Douglas Duckworth Date: Thu, 14 Dec 2017 16:43:32 -0500 Subject: added breakdancer (#6319) --- .../repos/builtin/packages/breakdancer/package.py | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 var/spack/repos/builtin/packages/breakdancer/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/breakdancer/package.py b/var/spack/repos/builtin/packages/breakdancer/package.py new file mode 100644 index 0000000000..4d8a2b80ca --- /dev/null +++ b/var/spack/repos/builtin/packages/breakdancer/package.py @@ -0,0 +1,47 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Breakdancer(CMakePackage): + """BreakDancer-1.3.6, released under GPLv3, is a Cpp package that provides + genome-wide detection of structural variants from next generation + paired-end sequencing reads. It includes two complementary programs. + BreakDancerMax predicts five types of structural variants: insertions, + deletions, inversions, inter- and intra-chromosomal translocations from + next-generation short paired-end sequencing reads using read pairs that are + mapped with unexpected separation distances or orientation. + BreakDancerMini focuses on detecting small indels (usually between 10bp and + 100bp) using normally mapped read pairs..""" + + homepage = "http://gmt.genome.wustl.edu/packages/breakdancer" + url = "https://github.com/genome/breakdancer.git" + + version('master', git='https://github.com/genome/breakdancer.git', + submodules='true') + + depends_on('zlib') + + parallel = False -- cgit v1.2.3-70-g09d2 From 7369ba21bf436025780a5bc6676a9fbe173e3cbb Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Thu, 14 Dec 2017 19:11:47 -0700 Subject: new package: Percept (#6636) This also adds the 'exception' boost library to the set of default libraries built by boost. --- var/spack/repos/builtin/packages/boost/package.py | 3 + .../builtin/packages/percept/fix_cmakelists.patch | 54 ++++++++++++++++ .../builtin/packages/percept/fix_header.patch | 19 ++++++ .../repos/builtin/packages/percept/package.py | 75 ++++++++++++++++++++++ 4 files changed, 151 insertions(+) create mode 100644 var/spack/repos/builtin/packages/percept/fix_cmakelists.patch create mode 100644 var/spack/repos/builtin/packages/percept/fix_header.patch create mode 100644 var/spack/repos/builtin/packages/percept/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index df8628ccfa..91b83ac0b4 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -91,6 +91,7 @@ class Boost(Package): default_install_libs = set(['atomic', 'chrono', 'date_time', + 'exception', 'filesystem', 'graph', 'iostreams', @@ -339,6 +340,8 @@ class Boost(Package): withLibs.remove('chrono') if not spec.satisfies('@1.43.0:'): withLibs.remove('random') + if not spec.satisfies('@1.39.0:'): + withLibs.remove('exception') if '+graph' in spec and '+mpi' in spec: withLibs.append('graph_parallel') diff --git a/var/spack/repos/builtin/packages/percept/fix_cmakelists.patch b/var/spack/repos/builtin/packages/percept/fix_cmakelists.patch new file mode 100644 index 0000000000..a3ce6b1d95 --- /dev/null +++ b/var/spack/repos/builtin/packages/percept/fix_cmakelists.patch @@ -0,0 +1,54 @@ +--- percept.orig/CMakeLists.txt 2017-12-08 09:16:41.572819000 -0700 ++++ percept/CMakeLists.txt 2017-12-08 09:17:25.028818000 -0700 +@@ -97,13 +97,6 @@ + SET (INSTALL_PERCEPT TRUE) + ENDIF() + +-IF (INSTALL_PERCEPT) +- set(BINARY_INSTALL_DIR bin) +- set(INCLUDE_INSTALL_DIR include) +- set(LIB_INSTALL_DIR lib) +- INCLUDE(CMakePackageConfigHelpers) +-ENDIF () +- + MESSAGE("Setting and checking of compilers:") + SET(CMAKE_CXX_COMPILER ${Trilinos_CXX_COMPILER} ) + SET(CMAKE_C_COMPILER ${Trilinos_C_COMPILER} ) +@@ -269,6 +262,8 @@ + FILE (GLOB ADAPT_SOURCE src/adapt/main/*.cpp) + MESSAGE("-- ADAPT_SOURCE = ${ADAPT_SOURCE}") + ++file(GLOB TRANSFER_SOURCE src/percept/mesh_transfer/*.cpp) ++ + FILE (GLOB PERCEPT_UTEST_SOURCE test/unit_tests/*.cpp) + MESSAGE("-- PERCEPT_UTEST_SOURCE = ${PERCEPT_UTEST_SOURCE}") + +@@ -330,8 +325,11 @@ + TARGET_LINK_LIBRARIES(${percept_lib_name} ${Trilinos_LIBRARIES} ${YAML_LIBRARY} ${OPENNURBS_LIBRARY} ${BOOST_LIBRARIES}) + # TARGET_LINK_LIBRARIES(${percept_lib_name} ${GTEST_LIBRARY}) + ++ add_executable(mesh_transfer ${TRANSFER_SOURCE}) ++ target_link_libraries(mesh_transfer ${percept_lib_name}) ++ + SET_PROPERTY( +- TARGET ${percept_lib_name} ${adapt_ex_name} ${percept_utest_name} ${percept_rtest_name} ++ TARGET ${percept_lib_name} mesh_transfer ${adapt_ex_name} ${percept_utest_name} ${percept_rtest_name} + PROPERTY COMPILE_DEFINITIONS STK_PERCEPT_LITE=0 STK_PERCEPT_HAS_GEOMETRY STK_PERCEPT_USE_INTREPID + ) + +@@ -342,5 +340,15 @@ + + ENDIF() + ++IF (INSTALL_PERCEPT) ++ install(TARGETS ${percept_ex_name} ${adapt_ex_name} ++ ${percept_htest_name} ${percept_rtest_name} ${percept_utest_name} ++ mesh_transfer percept ++ RUNTIME DESTINATION bin ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib) ++ #install(DIRECTORY include/ DESTINATION include) ++ include(CMakePackageConfigHelpers) ++ENDIF () + + MESSAGE("\nAnd CMake says...:") diff --git a/var/spack/repos/builtin/packages/percept/fix_header.patch b/var/spack/repos/builtin/packages/percept/fix_header.patch new file mode 100644 index 0000000000..feca6d022c --- /dev/null +++ b/var/spack/repos/builtin/packages/percept/fix_header.patch @@ -0,0 +1,19 @@ +--- percept.orig/src/percept/MeshType.hpp 2017-12-08 09:16:42.080818000 -0700 ++++ percept/src/percept/MeshType.hpp 2017-12-08 09:17:25.568819000 -0700 +@@ -11,6 +11,7 @@ + #include + + #include ++#include + #include + #include + #include +@@ -62,7 +63,7 @@ + typedef Kokkos::LayoutRight SecondaryDataLayout; + #endif + +- #elif KOKKOS_HAVE_OPENMP ++ #elif defined(KOKKOS_HAVE_OPENMP) + typedef Kokkos::OpenMP ExecSpace; + typedef Kokkos::OpenMP MemSpace; + typedef Kokkos::LayoutLeft DataLayout; diff --git a/var/spack/repos/builtin/packages/percept/package.py b/var/spack/repos/builtin/packages/percept/package.py new file mode 100644 index 0000000000..1719a7c1fe --- /dev/null +++ b/var/spack/repos/builtin/packages/percept/package.py @@ -0,0 +1,75 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Percept(CMakePackage): + """Parallel mesh refinement and adaptivity tools for the finite + element method. + """ + + homepage = "https://github.com/PerceptTools/percept" + url = "https://github.com/PerceptTools/percept.git" + + # This package file was created at percept + # commit dc1c8ec0175213146ac139946beca185a84c22e8 + version('develop', + git='https://github.com/PerceptTools/percept.git', branch='master') + + depends_on('googletest') + depends_on('opennurbs@percept') + depends_on('boost+graph+mpi') + depends_on('yaml-cpp+pic~shared@0.5.3:') + # Percept was initially tested against Trilinos 12.12.1 + depends_on('trilinos~shared+exodus+tpetra+epetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist+superlu+hdf5+zlib+pnetcdf+aztec+sacado~openmp+shards+intrepid+cgns@master,12.12.1:') + + patch('fix_cmakelists.patch') + patch('fix_header.patch') + + def cmake_args(self): + spec = self.spec + options = [] + + options.extend([ + '-DSTK_PERCEPT_LITE:BOOL=OFF', + '-DSTK_ADAPT_HAVE_YAML_CPP:BOOL=ON', + '-DTrilinos_DIR:PATH=%s' % + spec['trilinos'].prefix, + '-DYAML_DIR:PATH=%s' % + spec['yaml-cpp'].prefix, + '-DBOOST_DIR:PATH=%s' % + spec['boost'].prefix, + '-DOPENNURBS_DIR:PATH=%s' % + spec['opennurbs'].prefix, + '-DOPENNURBS_INCLUDE_DIR:PATH=%s' % + spec['opennurbs'].prefix.include, + '-DOPENNURBS_LIBRARY_DIR:PATH=%s' % + spec['opennurbs'].prefix.lib, + '-DPERCEPT_TPLS_INSTALL_DIR:PATH=%s' % + spec['googletest'].prefix, + '-DENABLE_INSTALL:BOOL=ON' + ]) + + return options -- cgit v1.2.3-70-g09d2 From 176b518d4b9e91c6b4c05f2fd6242945456a847a Mon Sep 17 00:00:00 2001 From: David Orman Date: Fri, 15 Dec 2017 13:00:55 -0600 Subject: new package: gatk (#6674) --- var/spack/repos/builtin/packages/gatk/gatk.sh | 4 ++ var/spack/repos/builtin/packages/gatk/package.py | 87 ++++++++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100755 var/spack/repos/builtin/packages/gatk/gatk.sh create mode 100644 var/spack/repos/builtin/packages/gatk/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gatk/gatk.sh b/var/spack/repos/builtin/packages/gatk/gatk.sh new file mode 100755 index 0000000000..2bd68247a6 --- /dev/null +++ b/var/spack/repos/builtin/packages/gatk/gatk.sh @@ -0,0 +1,4 @@ +#!/bin/sh +# convenience wrapper for the gatk jar file +java -jar GenomeAnalysisTK.jar "$@" + diff --git a/var/spack/repos/builtin/packages/gatk/package.py b/var/spack/repos/builtin/packages/gatk/package.py new file mode 100644 index 0000000000..728fae94da --- /dev/null +++ b/var/spack/repos/builtin/packages/gatk/package.py @@ -0,0 +1,87 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +# +# This is a template package file for Spack. We've put "FIXME" +# next to all the things you'll want to change. Once you've handled +# them, you can save this file and test your package like this: +# +# spack install gatk +# +# You can edit this file again by typing: +# +# spack edit gatk +# +# See the Spack documentation for more information on packaging. +# If you submit this package back to Spack as a pull request, +# please first remove this boilerplate and all FIXME comments. +# +from spack import * +from shutil import copyfile +import glob +import os.path +import re + + +class Gatk(Package): + """Genome Analysis Toolkit + Variant Discovery in High-Throughput Sequencing Data + """ + homepage = "http://broadinstitute.github.io/gatk/" + url = "https://software.broadinstitute.org/gatk/download/auth?package=GATK" + _urlfmt = "https://github.com/broadgsa/gatk-protected/archive/{0}.tar.gz" + + version('3.8-0', '0581308d2a25f10d11d3dfd0d6e4d28e', extension='tar.gz', + url="https://software.broadinstitute.org/gatk/download/auth?package=GATK") + + depends_on('java@8:', type='run') + + def install(self, spec, prefix): + mkdirp(prefix.bin) + # The list of files to install varies with release... + # ... but skip the spack-{build.env}.out files. + files = [x for x in glob.glob("*") if not re.match("^spack-", x)] + for f in files: + install(f, prefix.bin) + + # Set up a helper script to call java on the jar file, + # explicitly codes the path for java and the jar file. + script_sh = join_path(os.path.dirname(__file__), "gatk.sh") + script = join_path(prefix.bin, "gatk") + copyfile(script_sh, script) + set_executable(script) + + # Munge the helper script to explicitly point to java and the + # jar file. + java = join_path(self.spec['java'].prefix, 'bin', 'java') + kwargs = {'ignore_absent': False, 'backup': False, 'string': False} + filter_file('^java', java, script, **kwargs) + filter_file('GenomeAnalysisTK.jar', join_path(prefix.bin, + 'GenomeAnalysisTK.jar'), + script, **kwargs) + + def setup_environment(self, spack_env, run_env): + run_env.prepend_path('GATK', + join_path(self.prefix, 'bin', + 'GenomeAnalysisTK.jar')) -- cgit v1.2.3-70-g09d2 From f78418d8bbdcd40d468ad177c1f31cdfb7302705 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Sun, 17 Dec 2017 03:33:28 +0100 Subject: moltemplate: add new package (#6702) --- .../builtin/packages/py-moltemplate/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-moltemplate/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-moltemplate/package.py b/var/spack/repos/builtin/packages/py-moltemplate/package.py new file mode 100644 index 0000000000..f9d6b67d76 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-moltemplate/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyMoltemplate(PythonPackage): + """Moltemplate is a general cross-platform text-based molecule builder for + LAMMPS.""" + + homepage = "http://moltemplate.org" + url = "https://github.com/jewettaij/moltemplate/archive/v2.5.8.tar.gz" + + version('2.5.8', '9e127a254a206222e8a31684780f8dba') + + depends_on('python@2.7:', type=('build', 'run')) + depends_on('py-setuptools', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 34cf796b54de4465ff329d52b9b5bf2b43b41e4f Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Sat, 16 Dec 2017 20:34:30 -0600 Subject: mefit: Create new package. (#6700) --- var/spack/repos/builtin/packages/mefit/package.py | 47 +++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 var/spack/repos/builtin/packages/mefit/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mefit/package.py b/var/spack/repos/builtin/packages/mefit/package.py new file mode 100644 index 0000000000..7f4c555bd8 --- /dev/null +++ b/var/spack/repos/builtin/packages/mefit/package.py @@ -0,0 +1,47 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import distutils.dir_util + + +class Mefit(Package): + """This pipeline will merge overlapping paired-end reads, calculate + merge statistics, and filter reads for quality.""" + + homepage = "https://github.com/nisheth/MeFiT" + url = "https://github.com/nisheth/MeFiT.git" + + version('1.0', git='https://github.com/nisheth/MeFiT.git', commit='0733326d8917570bbf70ff5c0f710bf66c13db09') + + depends_on('py-numpy') + depends_on('py-htseq') + depends_on('jellyfish') + depends_on('casper %gcc@4.8.5') + + def install(self, spec, prefix): + distutils.dir_util.copy_tree(".", prefix) + + def setup_environment(self, spack_env, run_env): + run_env.prepend_path('PATH', self.prefix) -- cgit v1.2.3-70-g09d2 From 554d4045fad6fe1de1e735f93a829e85f91b51d4 Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 16 Dec 2017 20:34:53 -0600 Subject: DeNovoGear: Create new package (#6699) --- .../repos/builtin/packages/denovogear/package.py | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 var/spack/repos/builtin/packages/denovogear/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/denovogear/package.py b/var/spack/repos/builtin/packages/denovogear/package.py new file mode 100644 index 0000000000..64a1d0f619 --- /dev/null +++ b/var/spack/repos/builtin/packages/denovogear/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Denovogear(CMakePackage): + """DeNovoGear is a software package to detect de novo mutations using + next-generation sequencing data. It supports the analysis of many + differential experimental designs and uses advanced statistical models + to reduce the false positve rate.""" + + homepage = "https://github.com/denovogear/denovogear" + url = "https://github.com/denovogear/denovogear/archive/v1.1.1.tar.gz" + + version('1.1.1', 'da30e46851c3a774653e57f98fe62e5f') + version('1.1.0', '7d441d56462efb7ff5d3a6f6bddfd8b9') + + depends_on('cmake@3.1:', type=('build')) + depends_on('boost@1.47:1.60', type=('build')) + depends_on('htslib@1.2:', type=('build')) + depends_on('eigen', type=('build')) -- cgit v1.2.3-70-g09d2 From 5539c94e67323f76bb7f491356cc1ad176b59b42 Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 16 Dec 2017 20:35:48 -0600 Subject: PANDAseq: Create new package (#6694) --- .../repos/builtin/packages/pandaseq/package.py | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 var/spack/repos/builtin/packages/pandaseq/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pandaseq/package.py b/var/spack/repos/builtin/packages/pandaseq/package.py new file mode 100644 index 0000000000..86a0fbb0c8 --- /dev/null +++ b/var/spack/repos/builtin/packages/pandaseq/package.py @@ -0,0 +1,48 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Pandaseq(AutotoolsPackage): + """PANDASEQ is a program to align Illumina reads, optionally with PCR + primers embedded in the sequence, and reconstruct an overlapping + sequence.""" + + homepage = "https://github.com/neufeld/pandaseq" + url = "https://github.com/neufeld/pandaseq/archive/v2.11.tar.gz" + + version('2.11', 'a8ae0e938bac592fc07dfa668147d80b') + version('2.10', '5b5b04c9b693a999f10a9c9bd643f068') + + depends_on('autoconf', type='build') + depends_on('automake', type='build') + depends_on('libtool', type='build') + depends_on('m4', type='build') + depends_on('zlib', type='build') + depends_on('pkg-config', type='build') + + def autoreconf(self, spec, prefix): + bash = which('bash') + bash('./autogen.sh') -- cgit v1.2.3-70-g09d2 From 5d0e7abcc5f1f2e76d13242fc488c5160271c034 Mon Sep 17 00:00:00 2001 From: peetsv <32349688+peetsv@users.noreply.github.com> Date: Sat, 16 Dec 2017 18:36:11 -0800 Subject: MetaSV: adding new package (#6691) --- var/spack/repos/builtin/packages/metasv/package.py | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/metasv/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/metasv/package.py b/var/spack/repos/builtin/packages/metasv/package.py new file mode 100644 index 0000000000..da513ae1b0 --- /dev/null +++ b/var/spack/repos/builtin/packages/metasv/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Metasv(PythonPackage): + """An accurate and integrative structural-variant caller + for next generation sequencing""" + + homepage = "http://bioinform.github.io/metasv/" + url = "https://github.com/bioinform/metasv/archive/0.5.4.tar.gz" + + version('0.5.4', 'de2e21ac4f86bc4d1830bdfff95d8391') + + depends_on('py-pybedtools@0.6.9', type=('build', 'run')) + depends_on('py-pysam@0.7.7', type=('build', 'run')) + depends_on('py-pyvcf@0.6.7', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 87420dccee42dfc51aa1844fb28ae6e2ecfc6333 Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 16 Dec 2017 20:36:35 -0600 Subject: bedtools2: Add version 2.27.1 (#6693) --- var/spack/repos/builtin/packages/bedtools2/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bedtools2/package.py b/var/spack/repos/builtin/packages/bedtools2/package.py index 0f48c83cbf..f6a921dc43 100644 --- a/var/spack/repos/builtin/packages/bedtools2/package.py +++ b/var/spack/repos/builtin/packages/bedtools2/package.py @@ -34,6 +34,7 @@ class Bedtools2(Package): homepage = "https://github.com/arq5x/bedtools2" url = "https://github.com/arq5x/bedtools2/archive/v2.26.0.tar.gz" + version('2.27.1', '8e0afcab95a824e42a6e99c5436a8438') version('2.27.0', '052f22eb214ef2e7e7981b3c01167302') version('2.26.0', '52227e7efa6627f0f95d7d734973233d') version('2.25.0', '534fb4a7bf0d0c3f05be52a0160d8e3d') -- cgit v1.2.3-70-g09d2 From 61dbd3182d6c48f9c32ad67360cf32e9d248d937 Mon Sep 17 00:00:00 2001 From: Paschalis Korosoglou Date: Sun, 17 Dec 2017 04:37:20 +0200 Subject: Add clanguage variant for petsc (#6689) --- var/spack/repos/builtin/packages/petsc/package.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index 838369f4e4..bdc3d30c92 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -83,6 +83,9 @@ class Petsc(Package): description='Activates support for Trilinos (only parallel)') variant('int64', default=False, description='Compile with 64bit indices') + variant('clanguage', default='C', values=('C', 'C++'), + description='Specify C (recommended) or C++ to compile PETSc', + multi=False) # 3.8.0 has a build issue with MKL - so list this conflict explicitly conflicts('^intel-mkl', when='@3.8.0') @@ -199,6 +202,11 @@ class Petsc(Package): if 'trilinos' in spec: options.append('--with-cxx-dialect=C++11') + if self.spec.satisfies('clanguage=C++'): + options.append('--with-clanguage=C++') + else: + options.append('--with-clanguage=C') + # Help PETSc pick up Scalapack from MKL: if 'scalapack' in spec: scalapack = spec['scalapack'].libs -- cgit v1.2.3-70-g09d2 From a69cfd5f78d7e33ddb708e057b8068110fffec88 Mon Sep 17 00:00:00 2001 From: Paschalis Korosoglou Date: Sun, 17 Dec 2017 04:37:35 +0200 Subject: Add petsc version 3.8.3 (#6688) --- var/spack/repos/builtin/packages/petsc/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index bdc3d30c92..c6aa7af2a5 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -42,6 +42,7 @@ class Petsc(Package): version('develop', git='https://bitbucket.org/petsc/petsc.git', tag='master') version('xsdk-0.2.0', git='https://bitbucket.org/petsc/petsc.git', tag='xsdk-0.2.0') + version('3.8.3', '322cbcf2a0f7b7bad562643b05d66f11') version('3.8.2', '00666e1c4cbfa8dd6eebf91ff8180f79') version('3.8.1', '3ed75c1147800fc156fe1f1e515a68a7') version('3.8.0', '02680f1f78a0d4c5a9de80a366793eb8') -- cgit v1.2.3-70-g09d2 From d3545ed1b3c5d81e26b1b23b25bbfcc810602114 Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 16 Dec 2017 20:38:02 -0600 Subject: py-pandas: add versions 0.19.2 and 0.21.1 (#6687) --- var/spack/repos/builtin/packages/py-pandas/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pandas/package.py b/var/spack/repos/builtin/packages/py-pandas/package.py index b6d8403502..afa7075ee5 100644 --- a/var/spack/repos/builtin/packages/py-pandas/package.py +++ b/var/spack/repos/builtin/packages/py-pandas/package.py @@ -38,6 +38,8 @@ class PyPandas(PythonPackage): homepage = "http://pandas.pydata.org/" url = "https://pypi.io/packages/source/p/pandas/pandas-0.19.0.tar.gz" + version('0.21.1', '42ae7f81b81a86c3f91f663b66c525f7') + version('0.19.2', '26df3ef7cd5686fa284321f4f48b38cd') version('0.19.0', 'bc9bb7188e510b5d44fbdd249698a2c3') version('0.18.0', 'f143762cd7a59815e348adf4308d2cf6') version('0.16.1', 'fac4f25748f9610a3e00e765474bdea8') -- cgit v1.2.3-70-g09d2 From d08dc0c019a4b860d2162135075f51686b7e9e8d Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 16 Dec 2017 20:38:36 -0600 Subject: py-tetoolkit: Create new package (#6673) --- .../repos/builtin/packages/py-tetoolkit/package.py | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-tetoolkit/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-tetoolkit/package.py b/var/spack/repos/builtin/packages/py-tetoolkit/package.py new file mode 100644 index 0000000000..3467489182 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-tetoolkit/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyTetoolkit(PythonPackage): + """TEToolkit is a software package that utilizes both unambiguously + (uniquely) and ambiguously (multi-) mapped reads to perform + differential enrichment analyses from high throughput sequencing + experiments.""" + + homepage = "http://hammelllab.labsites.cshl.edu/software" + url = "https://pypi.io/packages/source/T/TEToolkit/TEToolkit-1.5.1.tar.gz" + + version('1.5.1', '05745b2d5109911e95593e423446a831') + + depends_on('py-setuptools') + depends_on('python@2.7:', type=('build', 'run')) + depends_on('py-pysam', type=('build', 'run')) + depends_on('r-deseq', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From dac09dd5fb56e9d7da554eeb98dcf86b1fde45fc Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 16 Dec 2017 20:38:59 -0600 Subject: py-bx-python: Create new package (#6672) --- .../repos/builtin/packages/py-bx-python/package.py | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-bx-python/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-bx-python/package.py b/var/spack/repos/builtin/packages/py-bx-python/package.py new file mode 100644 index 0000000000..764396839b --- /dev/null +++ b/var/spack/repos/builtin/packages/py-bx-python/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyBxPython(PythonPackage): + """The bx-python project is a python library and associated set of scripts + to allow for rapid implementation of genome scale analyses.""" + + homepage = "https://github.com/bxlab/bx-python" + url = "https://github.com/bxlab/bx-python/archive/v0.7.4.tar.gz" + + version('0.7.4', 'a47b8cc55c104ac97440c6cc62be8697') + + depends_on('py-setuptools', type='build') + depends_on('py-numpy', type=('build', 'run')) + depends_on('py-six', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 3467c207c8ee96bbbfbc911ac97cc03b89acbee5 Mon Sep 17 00:00:00 2001 From: David Böhme Date: Sat, 16 Dec 2017 18:39:52 -0800 Subject: Caliper update, add version 1.6.0 (#6680) --- var/spack/repos/builtin/packages/caliper/package.py | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/caliper/package.py b/var/spack/repos/builtin/packages/caliper/package.py index e3fff54e6f..540f31a44b 100644 --- a/var/spack/repos/builtin/packages/caliper/package.py +++ b/var/spack/repos/builtin/packages/caliper/package.py @@ -39,6 +39,7 @@ class Caliper(CMakePackage): url = "" version('master', git='https://github.com/LLNL/Caliper.git') + version('1.6.0', git='https://github.com/LLNL/Caliper.git', tag='v1.6.0') variant('mpi', default=True, description='Enable MPI wrappers') @@ -50,14 +51,20 @@ class Caliper(CMakePackage): # pthread_self() signature is incompatible with PAPI_thread_init() on Mac variant('papi', default=sys.platform != 'darwin', description='Enable PAPI service') + variant('libpfm', default=sys.platform == 'linux2', + description='Enable libpfm (perf_events) service') # gotcha doesn't work on Mac variant('gotcha', default=sys.platform != 'darwin', description='Enable GOTCHA support') + variant('sosflow', default=False, + description='Enable SOSflow support') depends_on('dyninst', when='+dyninst') depends_on('papi', when='+papi') + depends_on('libpfm4', when='+libpfm') depends_on('mpi', when='+mpi') depends_on('libunwind', when='+callpath') + depends_on('sosflow', when='+sosflow') depends_on('cmake', type='build') depends_on('python', type='build') @@ -67,17 +74,23 @@ class Caliper(CMakePackage): args = [ '-DBUILD_TESTING=Off', - '-DWITH_DOCS=Off', - '-DWITH_TEST_APPS=Off', + '-DBUILD_DOCS=Off', '-DWITH_DYNINST=%s' % ('On' if '+dyninst' in spec else 'Off'), '-DWITH_CALLPATH=%s' % ('On' if '+callpath' in spec else 'Off'), '-DWITH_GOTCHA=%s' % ('On' if '+gotcha' in spec else 'Off'), '-DWITH_PAPI=%s' % ('On' if '+papi' in spec else 'Off'), - '-DWITH_MPI=%s' % ('On' if '+mpi' in spec else 'Off') + '-DWITH_LIBPFM=%s' % ('On' if '+libpfm' in spec else 'Off'), + '-DWITH_SOSFLOW=%s' % ('On' if '+sosflow' in spec else 'Off'), + '-DWITH_MPI=%s' % ('On' if '+mpi' in spec else 'Off'), + '-DWITH_MPIT=%s' % ('On' if spec.satisfies('^mpi@3:') else 'Off') ] if '+papi' in spec: - args.append('-DPAPI_PREFIX=%s' % spec['papi'].prefix) + args.append('-DPAPI_PREFIX=%s' % spec['papi'].prefix) + if '+libpfm' in spec: + args.append('-DLIBPFM_INSTALL=%s' % spec['libpfm4'].prefix) + if '+sosflow' in spec: + args.append('-DSOS_PREFIX=%s' % spec['sosflow'].prefix) if '+mpi' in spec: args.append('-DMPI_C_COMPILER=%s' % spec['mpi'].mpicc) -- cgit v1.2.3-70-g09d2 From d4cc1ac86be32f4b459f186ba47a3d0e3f4465b6 Mon Sep 17 00:00:00 2001 From: Jack Morrison <32687739+jack-morrison@users.noreply.github.com> Date: Sat, 16 Dec 2017 21:42:03 -0500 Subject: Hadoop: Replace broken url (#6671) --- var/spack/repos/builtin/packages/hadoop/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hadoop/package.py b/var/spack/repos/builtin/packages/hadoop/package.py index 66deb7c5d2..ebc8e4604f 100644 --- a/var/spack/repos/builtin/packages/hadoop/package.py +++ b/var/spack/repos/builtin/packages/hadoop/package.py @@ -32,9 +32,9 @@ class Hadoop(Package): """ homepage = "http://hadoop.apache.org/" - url = "http://mirrors.ocf.berkeley.edu/apache/hadoop/common/hadoop-2.6.4/hadoop-2.6.4.tar.gz" + url = "http://mirrors.ocf.berkeley.edu/apache/hadoop/common/hadoop-2.9.0/hadoop-2.9.0.tar.gz" - version('2.6.4', '37019f13d7dcd819727be158440b9442') + version('2.9.0', 'b443ead81aa2bd5086f99e62e66a8f64') depends_on('java', type='run') -- cgit v1.2.3-70-g09d2 From 7b8d889d31265ec30f7af0665717ae7de9d00351 Mon Sep 17 00:00:00 2001 From: David Orman Date: Sat, 16 Dec 2017 20:43:02 -0600 Subject: bwa: added version 0.7.16a and checksum (#6658) --- var/spack/repos/builtin/packages/bwa/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bwa/package.py b/var/spack/repos/builtin/packages/bwa/package.py index 7f260fcdc9..7730a7b98e 100644 --- a/var/spack/repos/builtin/packages/bwa/package.py +++ b/var/spack/repos/builtin/packages/bwa/package.py @@ -33,6 +33,8 @@ class Bwa(Package): version('0.7.17', '82cba7ef695538e6a38b9d4156837381', url="https://github.com/lh3/bwa/releases/download/v0.7.17/bwa-0.7.17.tar.bz2") + version('0.7.16a', 'c5115c9a5ea0406848500e4b23a7708c', + url="https://github.com/lh3/bwa/releases/download/v0.7.16/bwa-0.7.16a.tar.bz2") version('0.7.15', 'fcf470a46a1dbe2f96a1c5b87c530554', url="https://github.com/lh3/bwa/releases/download/v0.7.15/bwa-0.7.15.tar.bz2") version('0.7.13', 'f094f609438511766c434178a3635ab4', -- cgit v1.2.3-70-g09d2 From 6c81cf1a789b7ed5a7b2af917bf3f37f2140b0e2 Mon Sep 17 00:00:00 2001 From: fpruvost Date: Sun, 17 Dec 2017 03:43:46 +0100 Subject: build lapacke with tmg (#6654) --- var/spack/repos/builtin/packages/netlib-lapack/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/netlib-lapack/package.py b/var/spack/repos/builtin/packages/netlib-lapack/package.py index f6dfcd40a1..3763d7aed5 100644 --- a/var/spack/repos/builtin/packages/netlib-lapack/package.py +++ b/var/spack/repos/builtin/packages/netlib-lapack/package.py @@ -121,7 +121,10 @@ class NetlibLapack(Package): '-DBUILD_SHARED_LIBS:BOOL=%s' % ('ON' if shared else 'OFF'), '-DCMAKE_BUILD_TYPE:STRING=%s' % ( 'Debug' if '+debug' in spec else 'Release'), - '-DLAPACKE:BOOL=%s' % ('ON' if '+lapacke' in spec else 'OFF')] + '-DLAPACKE:BOOL=%s' % ( + 'ON' if '+lapacke' in spec else 'OFF'), + '-DLAPACKE_WITH_TMG:BOOL=%s' % ( + 'ON' if '+lapacke' in spec else 'OFF')] if spec.satisfies('@3.6.0:'): cmake_args.extend(['-DCBLAS=ON']) # always build CBLAS -- cgit v1.2.3-70-g09d2 From 7d800a0fc2d94cad14e825faa27e1f5b2d2cbed8 Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 16 Dec 2017 20:47:11 -0600 Subject: breseq: Create new package (#6648) --- var/spack/repos/builtin/packages/breseq/package.py | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 var/spack/repos/builtin/packages/breseq/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/breseq/package.py b/var/spack/repos/builtin/packages/breseq/package.py new file mode 100644 index 0000000000..d0b8c43706 --- /dev/null +++ b/var/spack/repos/builtin/packages/breseq/package.py @@ -0,0 +1,44 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Breseq(AutotoolsPackage): + """breseq is a computational pipeline for finding mutations relative to a + reference sequence in short-read DNA re-sequencing data for haploid + microbial-sized genomes.""" + + homepage = "http://barricklab.org/breseq" + url = "https://github.com/barricklab/breseq/archive/v0.31.1.tar.gz" + + version('0.31.1', 'a4e602d5481f8692833ba3d5a3cd0394') + + depends_on('autoconf', type='build') + depends_on('automake', type='build') + depends_on('libtool', type='build') + depends_on('m4', type='build') + + depends_on('bedtools2', type='run') + depends_on('r', type='run') -- cgit v1.2.3-70-g09d2 From 2a639097b04df5f35452ef19996e1638a46bc2ac Mon Sep 17 00:00:00 2001 From: nshtg Date: Sun, 17 Dec 2017 03:47:59 +0100 Subject: Add new package signify (#6645) OpenBSD tool to sign and verify signatures on files. See https://github.com/aperezdc/signify --- .../repos/builtin/packages/signify/package.py | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100755 var/spack/repos/builtin/packages/signify/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/signify/package.py b/var/spack/repos/builtin/packages/signify/package.py new file mode 100755 index 0000000000..f2786c0352 --- /dev/null +++ b/var/spack/repos/builtin/packages/signify/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Signify(MakefilePackage): + """OpenBSD tool to signs and verify signatures on files.""" + + homepage = "https://github.com/aperezdc/signify" + url = "https://github.com/aperezdc/signify/archive/v23.tar.gz" + + version('23', '0552295572a172740ae8427eb018ede8') + + depends_on('libbsd@0.8:') + + def setup_environment(self, spack_env, run_env): + spack_env.set('PREFIX', self.prefix) -- cgit v1.2.3-70-g09d2 From 576ef5e2b34b5524bcfd2cf86a695632bb7b8e5a Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Sun, 17 Dec 2017 03:48:56 +0100 Subject: Package 'cdo': get rid of unnecessary dependency on MPI C++ library. (#6632) --- var/spack/repos/builtin/packages/cdo/package.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cdo/package.py b/var/spack/repos/builtin/packages/cdo/package.py index ccf0769ff1..97463d1205 100644 --- a/var/spack/repos/builtin/packages/cdo/package.py +++ b/var/spack/repos/builtin/packages/cdo/package.py @@ -34,6 +34,8 @@ class Cdo(AutotoolsPackage): url = 'https://code.mpimet.mpg.de/attachments/download/12760/cdo-1.7.2.tar.gz' list_url = 'https://code.mpimet.mpg.de/projects/cdo/files' + maintainers = ['skosukhin'] + version('1.9.1', 'e60a89f268ba24cee5c461f2c217829e') version('1.9.0', '2d88561b3b4a880df0422a62e5027e40') version('1.8.2', '6a2e2f99b7c67ee9a512c40a8d4a7121') @@ -133,8 +135,13 @@ class Cdo(AutotoolsPackage): config_args += self.enable_or_disable('openmp') - # Workaround for a problem in CDO + # Starting version 1.9.0 CDO is a C++ program but it uses the C + # interface of HDF5 without the parallel features. To avoid + # unnecessary dependencies on mpi's cxx library, we need to set the + # following flags. This works for OpenMPI, MPICH, MVAPICH, Intel MPI, + # IBM Spectrum MPI, bullx MPI, and Cray MPI. if self.spec.satisfies('@1.9:+hdf5^hdf5+mpi'): - config_args.append('CXX=' + self.spec['mpi'].mpicxx) + config_args.append( + 'CPPFLAGS=-DOMPI_SKIP_MPICXX -DMPICH_SKIP_MPICXX') return config_args -- cgit v1.2.3-70-g09d2 From 0cff0fba73b944ecf2c19fbe89eed237fd8b7621 Mon Sep 17 00:00:00 2001 From: healther Date: Sun, 17 Dec 2017 19:00:58 +0100 Subject: fix post install method for py3 in mercurial (#6497) * fix post install method for py3 in mercurial * Update package.py * Update package.py * use print_str instead of manual print detection * Update package.py * use only depends_on * Update package.py * Update package.py State py3 compatibility for @4.3: according to setup.py from the 4.3.tar.gz from pypi --- var/spack/repos/builtin/packages/mercurial/package.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mercurial/package.py b/var/spack/repos/builtin/packages/mercurial/package.py index 4ecd3332a9..198a8005be 100644 --- a/var/spack/repos/builtin/packages/mercurial/package.py +++ b/var/spack/repos/builtin/packages/mercurial/package.py @@ -39,6 +39,7 @@ class Mercurial(PythonPackage): 'mercurial.httpclient', 'mercurial.pure' ] + version('4.4.1', '37974a416d1d9525e1375c92025b16d9') version('4.1.2', '934c99808bdc8385e074b902d59b0d93') version('3.9.1', '3759dd10edb8c1a6dfb8ff0ce82658ce') version('3.9', 'e2b355da744e94747daae3a5339d28a0') @@ -47,7 +48,8 @@ class Mercurial(PythonPackage): version('3.8.2', 'c38daa0cbe264fc621dc3bb05933b0b3') version('3.8.1', '172a8c588adca12308c2aca16608d7f4') - depends_on('python@2.6:2.8') + depends_on('python@2.6:2.8', when='@:4.2.99') + depends_on('python@2.7:2.8,3.5:3.5.999,3.6.2:', when='@4.3:') depends_on('py-docutils', type='build') depends_on('py-pygments', type=('build', 'run')) depends_on('py-certifi', type=('build', 'run')) @@ -84,8 +86,8 @@ class Mercurial(PythonPackage): hgrc_filename = join_path(etc_dir, 'hgrc') # Use certifi to find the location of the CA certificate - certificate = python('-c', 'import certifi; print certifi.where()', - output=str) + print_str = self.spec['python'].package.print_string('certifi.where()') + certificate = python('-c', 'import certifi; ' + print_str) if not certificate: tty.warn('CA certificate not found. You may not be able to ' -- cgit v1.2.3-70-g09d2 From d3519af7de84fa72dee0618c7754f7ebeaa23142 Mon Sep 17 00:00:00 2001 From: Douglas Duckworth Date: Mon, 18 Dec 2017 13:38:20 -0500 Subject: relion - added new stable version 2.1 (#6706) --- var/spack/repos/builtin/packages/relion/package.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/relion/package.py b/var/spack/repos/builtin/packages/relion/package.py index c20d2637a6..03fa8fc9a0 100644 --- a/var/spack/repos/builtin/packages/relion/package.py +++ b/var/spack/repos/builtin/packages/relion/package.py @@ -34,11 +34,8 @@ class Relion(CMakePackage): homepage = "http://http://www2.mrc-lmb.cam.ac.uk/relion" url = "https://github.com/3dem/relion" - version('2.1-beta-1', git='https://github.com/3dem/relion.git', - commit='e7607a869687b636d3c39e0d5b6a9cba930fc3b2') - version('2.0.3', git='https://github.com/3dem/relion.git', - preferred='true') - + version('2.1', git='https://github.com/3dem/relion.git', tag='2.1') + version('2.0.3', git='https://github.com/3dem/relion.git', tag='2.0.3') version('develop', git='https://github.com/3dem/relion.git') variant('gui', default=True, description="build the gui") -- cgit v1.2.3-70-g09d2 From 36fa57477958820301845f04cc71f1dbd8d29327 Mon Sep 17 00:00:00 2001 From: Benedikt Riedel Date: Mon, 18 Dec 2017 17:23:56 -0600 Subject: globus-toolkit: add version and openssl dependency (#6617) --- var/spack/repos/builtin/packages/globus-toolkit/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/globus-toolkit/package.py b/var/spack/repos/builtin/packages/globus-toolkit/package.py index eb24a17208..8ad63395c6 100644 --- a/var/spack/repos/builtin/packages/globus-toolkit/package.py +++ b/var/spack/repos/builtin/packages/globus-toolkit/package.py @@ -33,3 +33,6 @@ class GlobusToolkit(AutotoolsPackage): url = "http://toolkit.globus.org/ftppub/gt6/installers/src/globus_toolkit-6.0.1506371041.tar.gz" version('6.0.1506371041', 'e17146f68e03b3482aaea3874d4087a5') + version('6.0.1493989444', '9e9298b61d045e65732e12c9727ceaa8') + + depends_on('openssl') -- cgit v1.2.3-70-g09d2 From f7a5a271380838641bedd0193c8578520f2efd00 Mon Sep 17 00:00:00 2001 From: peetsv <32349688+peetsv@users.noreply.github.com> Date: Mon, 18 Dec 2017 19:37:09 -0800 Subject: IGV: new package (#6710) --- var/spack/repos/builtin/packages/igv/package.py | 54 +++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 var/spack/repos/builtin/packages/igv/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/igv/package.py b/var/spack/repos/builtin/packages/igv/package.py new file mode 100644 index 0000000000..7198024ab6 --- /dev/null +++ b/var/spack/repos/builtin/packages/igv/package.py @@ -0,0 +1,54 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import glob + + +class Igv(Package): + """The Integrative Genomics Viewer (IGV) is a high-performance + visualization tool for interactive exploration of large, + integrated genomic datasets.""" + + homepage = "http://software.broadinstitute.org/software/igv/" + + version('2.4.5', '4c45e1b281d8e3d8630aa485c5df6949', + url='http://data.broadinstitute.org/igv/projects/downloads/2.4/IGVSource_2.4.5.zip') + version('2.3.50', '7fdb903a59d556fad25e668b38e860f8', + url='http://data.broadinstitute.org/igv/projects/downloads/2.3/IGVSource_2.3.50.zip') + + depends_on('jdk@8:', type=('build', 'run'), when='@2.4:') + depends_on('jdk@7u0:7u999', type=('build', 'run'), when='@2.3:2.3.999') + depends_on('ant', type='build') + + def install(self, spec, prefix): + ant = self.spec['ant'].command + ant('all') + mkdirp(prefix.bin) + install('igv.sh', prefix.bin) + install('igv.jar', prefix.bin) + mkdirp(prefix.lib) + files = [x for x in glob.glob("lib/*jar")] + for f in files: + install(f, prefix.lib) -- cgit v1.2.3-70-g09d2 From b3e9192d180b7ded17fb0b957056be586adc33b0 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 19 Dec 2017 03:47:49 +0000 Subject: openfoam-org: new version (#6686) Add new version with a patch. --- .../builtin/packages/openfoam-org/50-etc.patch | 24 ++++++++++++++++++++++ .../repos/builtin/packages/openfoam-org/package.py | 7 +++++-- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 var/spack/repos/builtin/packages/openfoam-org/50-etc.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openfoam-org/50-etc.patch b/var/spack/repos/builtin/packages/openfoam-org/50-etc.patch new file mode 100644 index 0000000000..ee28dfcd1b --- /dev/null +++ b/var/spack/repos/builtin/packages/openfoam-org/50-etc.patch @@ -0,0 +1,24 @@ +--- OpenFOAM-5.x.org/etc/bashrc 2017-07-25 18:43:40.000000000 +0200 ++++ OpenFOAM-5.x/etc/bashrc 2017-12-11 13:36:09.479818186 +0100 +@@ -42,15 +42,17 @@ + # + # Please set to the appropriate path if the default is not correct. + # +-[ ${BASH_SOURCE:-$0} ] && \ +-export FOAM_INST_DIR=$(cd $(dirname ${BASH_SOURCE:-$0})/../.. && pwd -P) || \ +-export FOAM_INST_DIR=$HOME/$WM_PROJECT +-# export FOAM_INST_DIR=~$WM_PROJECT ++rc="${BASH_SOURCE:-${ZSH_NAME:+$0}}" ++[ -n "$rc" ] && FOAM_INST_DIR=$(\cd $(dirname $rc)/../.. && \pwd -P) || \ ++FOAM_INST_DIR=$HOME/$WM_PROJECT + # export FOAM_INST_DIR=/opt/$WM_PROJECT + # export FOAM_INST_DIR=/usr/local/$WM_PROJECT + # + # END OF (NORMAL) USER EDITABLE PART + ################################################################################ ++: # Extra safety - if the user commented out all fallback values ++export FOAM_INST_DIR ++unset rc + + # The default environment variables below can be overridden in a prefs.sh file + # located in ~/.OpenFOAM/$WM_PROJECT_VERSION, ~/.OpenFOAM, diff --git a/var/spack/repos/builtin/packages/openfoam-org/package.py b/var/spack/repos/builtin/packages/openfoam-org/package.py index c176adcbe5..e37c22b6ed 100644 --- a/var/spack/repos/builtin/packages/openfoam-org/package.py +++ b/var/spack/repos/builtin/packages/openfoam-org/package.py @@ -81,7 +81,9 @@ class OpenfoamOrg(Package): baseurl = "https://github.com/OpenFOAM" url = "https://github.com/OpenFOAM/OpenFOAM-4.x/archive/version-4.1.tar.gz" - version('4.1', '318a446c4ae6366c7296b61184acd37c', + version('5.0', 'cd8c5bdd3ff39c34f61747c8e55f59d1', + url=baseurl + '/OpenFOAM-5.x/archive/version-5.0.tar.gz') + version('4.1', 'afd7d8e66e7db0ffaf519b14f1a8e1d4', url=baseurl + '/OpenFOAM-4.x/archive/version-4.1.tar.gz') version('develop', git='https://github.com/OpenFOAM/OpenFOAM-dev.git') @@ -107,8 +109,9 @@ class OpenfoamOrg(Package): assets = ['bin/foamEtcFile'] # Version-specific patches + patch('50-etc.patch', when='@5.0:') patch('41-etc.patch', when='@4.1') - patch('41-site.patch', when='@4.1') + patch('41-site.patch', when='@4.1:') # Some user config settings config = { -- cgit v1.2.3-70-g09d2 From e8de22ce4664fcb6e8a4a45f6345c4e36e670b6f Mon Sep 17 00:00:00 2001 From: peetsv <32349688+peetsv@users.noreply.github.com> Date: Mon, 18 Dec 2017 23:19:33 -0800 Subject: lftp: adding version 4.6.4 (#6721) --- var/spack/repos/builtin/packages/lftp/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lftp/package.py b/var/spack/repos/builtin/packages/lftp/package.py index 47b4706776..fe3487f4c6 100644 --- a/var/spack/repos/builtin/packages/lftp/package.py +++ b/var/spack/repos/builtin/packages/lftp/package.py @@ -34,6 +34,7 @@ class Lftp(AutotoolsPackage): version('4.8.1', '419b27c016d968a0226b2e5df1454c22') version('4.7.7', 'ddc71b3b11a1af465e829075ae14b3ff') + version('4.6.4', 'f84ecfc368b7afcc56fe7d3da2457d12') depends_on('expat') depends_on('libiconv') -- cgit v1.2.3-70-g09d2 From 548c225d458e383e7f032a158812035be3e45454 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Tue, 19 Dec 2017 08:28:55 +0100 Subject: dealii: add GMSH, add CMAKE_FIND_APPBUNDLE to CMakePackage (#6723) * dealii: add GMSH dependency * CMakePackage: add CMAKE_FIND_APPBUNDLE to prevent picking up binaries from /Applications --- lib/spack/spack/build_systems/cmake.py | 5 ++++- var/spack/repos/builtin/packages/dealii/package.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/lib/spack/spack/build_systems/cmake.py b/lib/spack/spack/build_systems/cmake.py index 13d12d97eb..4f8162e655 100644 --- a/lib/spack/spack/build_systems/cmake.py +++ b/lib/spack/spack/build_systems/cmake.py @@ -140,7 +140,10 @@ class CMakePackage(PackageBase): ] if platform.mac_ver()[0]: - args.append('-DCMAKE_FIND_FRAMEWORK:STRING=LAST') + args.extend([ + '-DCMAKE_FIND_FRAMEWORK:STRING=LAST', + '-DCMAKE_FIND_APPBUNDLE:STRING=LAST' + ]) # Set up CMake rpath args.append('-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=FALSE') diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index bed9d53afa..e26da2bf8a 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -57,6 +57,7 @@ class Dealii(CMakePackage, CudaPackage): description='Compile with Adol-c') variant('doc', default=False, description='Compile with documentation') + variant('gmsh', default=False, description='Compile with GMSH') variant('gsl', default=True, description='Compile with GSL') variant('hdf5', default=True, description='Compile with HDF5 (only with MPI)') @@ -120,6 +121,7 @@ class Dealii(CMakePackage, CudaPackage): depends_on('assimp', when='@9.0:+assimp') depends_on('doxygen+graphviz', when='+doc') depends_on('graphviz', when='+doc') + depends_on('gmsh', when='@9.0:+gmsh', type=('build', 'run')) depends_on('gsl', when='@8.5.0:+gsl') depends_on('hdf5+mpi+hl', when='+hdf5+mpi') depends_on('cuda@8:', when='+cuda') @@ -150,6 +152,7 @@ class Dealii(CMakePackage, CudaPackage): # check that the combination of variants makes sense conflicts('+assimp', when='@:8.5.1') + conflicts('+gmsh', when='@:8.5.1') conflicts('+nanoflann', when='@:8.5.1') conflicts('+scalapack', when='@:8.5.1') conflicts('+sundials', when='@:8.5.1') @@ -266,7 +269,7 @@ class Dealii(CMakePackage, CudaPackage): # variables: for library in ( 'gsl', 'hdf5', 'p4est', 'petsc', 'slepc', 'trilinos', 'metis', - 'sundials', 'nanoflann', 'assimp'): + 'sundials', 'nanoflann', 'assimp', 'gmsh'): if library in spec: options.extend([ '-D%s_DIR=%s' % (library.upper(), spec[library].prefix), -- cgit v1.2.3-70-g09d2 From d69d692203a3eae1bd68b2cf014f9407409f4284 Mon Sep 17 00:00:00 2001 From: junkudo Date: Mon, 18 Dec 2017 23:30:39 -0800 Subject: CoinHSL : Prevent CoinHSL from building in parallel (#6715) CoinHSL does not seem to be able to be built in parallel. This commit forces serial compilation. --- var/spack/repos/builtin/packages/coinhsl/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/coinhsl/package.py b/var/spack/repos/builtin/packages/coinhsl/package.py index a97c0274d3..adc2a29512 100644 --- a/var/spack/repos/builtin/packages/coinhsl/package.py +++ b/var/spack/repos/builtin/packages/coinhsl/package.py @@ -45,3 +45,6 @@ class Coinhsl(AutotoolsPackage): url = "file://{0}/coinhsl-archive-2014.01.17.tar.gz".format(os.getcwd()) version('2014.01.17', '9eb3dd40ed034814ed8dfee75b281180c1d9d2ae') + + # CoinHSL fails to build in parallel + parallel = False -- cgit v1.2.3-70-g09d2 From 69f959ec0bc2b65bfe54e4751df7b1f76ad25950 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Tue, 19 Dec 2017 08:31:23 +0100 Subject: gmsh: add 3.0.6 (#6718) --- var/spack/repos/builtin/packages/gmsh/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gmsh/package.py b/var/spack/repos/builtin/packages/gmsh/package.py index 94794ed8a5..aef49a3ea6 100644 --- a/var/spack/repos/builtin/packages/gmsh/package.py +++ b/var/spack/repos/builtin/packages/gmsh/package.py @@ -38,6 +38,7 @@ class Gmsh(CMakePackage): homepage = 'http://gmsh.info' url = 'http://gmsh.info/src/gmsh-2.11.0-source.tgz' + version('3.0.6', '9700bcc440d7a6b16a49cbfcdcdc31db33efe60e1f5113774316b6fa4186987b') version('3.0.1', '830b5400d9f1aeca79c3745c5c9fdaa2900cdb2fa319b664a5d26f7e615c749f') version('2.16.0', 'e829eaf32ea02350a385202cc749341f2a3217c464719384b18f653edd028eea') version('2.15.0', '992a4b580454105f719f5bc05441d3d392ab0b4b80d4ea07b61ca3bdc974070a') -- cgit v1.2.3-70-g09d2 From d4c84be91b43a6b3c703580a5d781547555e0b01 Mon Sep 17 00:00:00 2001 From: Peter Doak Date: Tue, 19 Dec 2017 02:36:54 -0500 Subject: Emacs: added gnutls variant (tested on Centos 7) (#6711) --- var/spack/repos/builtin/packages/emacs/package.py | 4 ++++ var/spack/repos/builtin/packages/ncurses/package.py | 8 ++++++++ 2 files changed, 12 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/emacs/package.py b/var/spack/repos/builtin/packages/emacs/package.py index 1a7c8143a9..21b6b1b17b 100644 --- a/var/spack/repos/builtin/packages/emacs/package.py +++ b/var/spack/repos/builtin/packages/emacs/package.py @@ -43,6 +43,7 @@ class Emacs(AutotoolsPackage): values=('gtk', 'athena'), description="Select an X toolkit (gtk, athena)" ) + variant('tls', default=False, description="Build Emacs with gnutls") depends_on('pkgconfig', type='build') @@ -55,6 +56,9 @@ class Emacs(AutotoolsPackage): depends_on('libx11', when='+X') depends_on('libxaw', when='+X toolkit=athena') depends_on('gtkplus+X', when='+X toolkit=gtk') + depends_on('gnutls', when='+tls') + depends_on('libxpm ^gettext+libunistring', when='+tls') + depends_on('ncurses+termlib', when='+tls') def configure_args(self): spec = self.spec diff --git a/var/spack/repos/builtin/packages/ncurses/package.py b/var/spack/repos/builtin/packages/ncurses/package.py index 9787568bb6..d237dc3306 100644 --- a/var/spack/repos/builtin/packages/ncurses/package.py +++ b/var/spack/repos/builtin/packages/ncurses/package.py @@ -44,6 +44,8 @@ class Ncurses(AutotoolsPackage): variant('symlinks', default=False, description='Enables symlinks. Needed on AFS filesystem.') + variant('termlib', default=False, + description='Enables termlib needs for gnutls in emacs.') depends_on('pkgconfig', type='build') @@ -71,6 +73,12 @@ class Ncurses(AutotoolsPackage): if '+symlinks' in self.spec: opts.append('--enable-symlinks') + if '+termlib' in self.spec: + opts.extend(('--with-termlib', + '--enable-termcap', + '--enable-getcap', + '--enable-tcap-names')) + prefix = '--prefix={0}'.format(prefix) configure = Executable('../configure') -- cgit v1.2.3-70-g09d2 From d0a10edb67dbdb43aa250744d386a380a6647746 Mon Sep 17 00:00:00 2001 From: peetsv <32349688+peetsv@users.noreply.github.com> Date: Tue, 19 Dec 2017 00:07:33 -0800 Subject: nextflow: adding version 0.21.0 (#6722) --- var/spack/repos/builtin/packages/nextflow/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nextflow/package.py b/var/spack/repos/builtin/packages/nextflow/package.py index 715964bdc1..96993816a8 100644 --- a/var/spack/repos/builtin/packages/nextflow/package.py +++ b/var/spack/repos/builtin/packages/nextflow/package.py @@ -37,6 +37,8 @@ class Nextflow(Package): expand=False) version('0.23.3', '71fb69275b6788af1c6f1165f40d362e', expand=False) + version('0.21.0', '38e5e335cb33f05ba358e1f883c8386c', + expand=False) version('0.20.1', '0e4e0e3eca1c2c97f9b4bffd944b923a', expand=False) version('0.17.3', '5df00105fb1ce6fd0ba019ae735d9617', -- cgit v1.2.3-70-g09d2 From 720ad57bcdeafc518d4ca8266ec238c673ff8692 Mon Sep 17 00:00:00 2001 From: Jack Morrison <32687739+jack-morrison@users.noreply.github.com> Date: Tue, 19 Dec 2017 03:54:18 -0500 Subject: Added GDB verison 8.0 (#6704) --- var/spack/repos/builtin/packages/gdb/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gdb/package.py b/var/spack/repos/builtin/packages/gdb/package.py index dedefe5191..29b17dfe74 100644 --- a/var/spack/repos/builtin/packages/gdb/package.py +++ b/var/spack/repos/builtin/packages/gdb/package.py @@ -34,6 +34,7 @@ class Gdb(Package): homepage = "https://www.gnu.org/software/gdb" url = "http://ftp.gnu.org/gnu/gdb/gdb-7.10.tar.gz" + version('8.0', '9bb49d134916e73b2c01d01bf20363df') version('7.12.1', '06c8f40521ed65fe36ebc2be29b56942') version('7.11', 'f585059252836a981ea5db9a5f8ce97f') version('7.10.1', 'b93a2721393e5fa226375b42d567d90b') -- cgit v1.2.3-70-g09d2 From 599094abbd1f356246e879587af8f80dfbf8be60 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Tue, 19 Dec 2017 15:39:12 +0100 Subject: suite-sparse: add 5.1.0 (#6727) --- var/spack/repos/builtin/packages/suite-sparse/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/suite-sparse/package.py b/var/spack/repos/builtin/packages/suite-sparse/package.py index 429a7f0706..acf1e732f8 100644 --- a/var/spack/repos/builtin/packages/suite-sparse/package.py +++ b/var/spack/repos/builtin/packages/suite-sparse/package.py @@ -32,6 +32,7 @@ class SuiteSparse(Package): homepage = 'http://faculty.cse.tamu.edu/davis/suitesparse.html' url = 'http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.5.1.tar.gz' + version('5.1.0', '9c34d7c07ad5ce1624b8187faa132046') version('4.5.5', '0a5b38af0016f009409a9606d2f1b555') version('4.5.4', 'f6ab689442e64a1624a47aa220072d1b') version('4.5.3', '8ec57324585df3c6483ad7f556afccbd') -- cgit v1.2.3-70-g09d2 From 98f220b304bf49531b20480918d3bbf37b7832be Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Tue, 19 Dec 2017 15:39:27 +0100 Subject: hypre: add 2.13.0 (#6726) --- var/spack/repos/builtin/packages/hypre/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hypre/package.py b/var/spack/repos/builtin/packages/hypre/package.py index 8472d64337..d6b9645a4c 100644 --- a/var/spack/repos/builtin/packages/hypre/package.py +++ b/var/spack/repos/builtin/packages/hypre/package.py @@ -35,6 +35,7 @@ class Hypre(Package): homepage = "http://computation.llnl.gov/project/linear_solvers/software.php" url = "http://computation.llnl.gov/project/linear_solvers/download/hypre-2.10.0b.tar.gz" + version('2.13.0', '4b688a5c15b6b5e3de5e045ae081b89b', url='https://github.com/LLNL/hypre/archive/v2.13.0.tar.gz') version('2.12.1', 'c6fcb6d7e57cec1c7ce4a44da885068c', url='https://github.com/LLNL/hypre/archive/v2.12.1.tar.gz') version('2.11.2', 'd507943a1a3ce5681c3308e2f3a6dd34') version('2.11.1', '3f02ef8fd679239a6723f60b7f796519') -- cgit v1.2.3-70-g09d2 From e462d39afeaa88deb7a5469c633a758c02894ee4 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Tue, 19 Dec 2017 15:39:42 +0100 Subject: intel-tbb: add 2018.2 (#6725) --- var/spack/repos/builtin/packages/intel-tbb/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/intel-tbb/package.py b/var/spack/repos/builtin/packages/intel-tbb/package.py index 05185ce297..f4ed13f07f 100644 --- a/var/spack/repos/builtin/packages/intel-tbb/package.py +++ b/var/spack/repos/builtin/packages/intel-tbb/package.py @@ -35,6 +35,8 @@ class IntelTbb(Package): homepage = "http://www.threadingbuildingblocks.org/" # Only version-specific URL's work for TBB + version('2018.2', '0b8dfe30917a54e40828eeb0ed7562ae', + url='https://github.com/01org/tbb/archive/2018_U2.tar.gz') version('2018.1', 'b2f2fa09adf44a22f4024049907f774b', url='https://github.com/01org/tbb/archive/2018_U1.tar.gz') version('2018.0', 'e54de69981905ad69eb9cf0226b9bf5f9a4ba065', -- cgit v1.2.3-70-g09d2 From 0ef741d2911d7e35d895681732c79fbfa422f76f Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Tue, 19 Dec 2017 15:40:30 +0100 Subject: slepc: add 3.8.2 (#6724) --- var/spack/repos/builtin/packages/slepc/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/slepc/package.py b/var/spack/repos/builtin/packages/slepc/package.py index ac8df77d50..578859c179 100644 --- a/var/spack/repos/builtin/packages/slepc/package.py +++ b/var/spack/repos/builtin/packages/slepc/package.py @@ -34,6 +34,7 @@ class Slepc(Package): homepage = "http://www.grycap.upv.es/slepc" url = "http://slepc.upv.es/download/distrib/slepc-3.6.2.tar.gz" + version('3.8.2', '1e7d20d20eb26da307d36017461fe4a55f40e947e232739179dbe6412e22ed13') version('3.8.0', 'c58ccc4e852d1da01112466c48efa41f0839649f3a265925788237d76cd3d963') version('3.7.4', '2fb782844e3bc265a8d181c3c3e2632a4ca073111c874c654f1365d33ca2eb8a') version('3.7.3', '3ef9bcc645a10c1779d56b3500472ceb66df692e389d635087d30e7c46424df9') -- cgit v1.2.3-70-g09d2 From 241ea772293f18c7c9f18b0fe7053c58e2ed3509 Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Tue, 19 Dec 2017 11:06:39 -0800 Subject: sqlite package: apply B0 patch to additional versions (#6728) --- var/spack/repos/builtin/packages/sqlite/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sqlite/package.py b/var/spack/repos/builtin/packages/sqlite/package.py index 5c1b825650..350bbf9886 100644 --- a/var/spack/repos/builtin/packages/sqlite/package.py +++ b/var/spack/repos/builtin/packages/sqlite/package.py @@ -50,7 +50,7 @@ class Sqlite(AutotoolsPackage): # defines a macro B0. Sqlite has a shell.c source file that declares a # variable named B0 and will fail to compile when the macro is found. The # following patch undefines the macro in shell.c - patch('sqlite_b0.patch', when='@3.18.0') + patch('sqlite_b0.patch', when='@3.18.0:3.21.0') # Starting version 3.17.0, SQLite uses compiler built-ins # __builtin_sub_overflow(), __builtin_add_overflow(), and -- cgit v1.2.3-70-g09d2 From ea5f8c7382aee5c7f39650e2dce0851cf6f3fc40 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Wed, 20 Dec 2017 13:27:50 +0100 Subject: octave: add optim and struct packages (#6733) --- .../repos/builtin/packages/octave-optim/package.py | 50 ++++++++++++++++++++++ .../builtin/packages/octave-struct/package.py | 48 +++++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 var/spack/repos/builtin/packages/octave-optim/package.py create mode 100644 var/spack/repos/builtin/packages/octave-struct/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/octave-optim/package.py b/var/spack/repos/builtin/packages/octave-optim/package.py new file mode 100644 index 0000000000..2c676f28dc --- /dev/null +++ b/var/spack/repos/builtin/packages/octave-optim/package.py @@ -0,0 +1,50 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import os + + +class OctaveOptim(Package): + """Non-linear optimization toolkit for Octave.""" + + homepage = "https://octave.sourceforge.io/optim/" + url = "https://downloads.sourceforge.net/octave/optim-1.5.2.tar.gz" + + version('1.5.2', 'd3d77982869ea7c1807b13b24e044d44') + + depends_on('octave-struct@1.0.12:') + + extends('octave@3.6.0:') + + def install(self, spec, prefix): + os.environ.pop('CC', '') + os.environ.pop('CXX', '') + os.environ.pop('FC', '') + octave('--quiet', + '--norc', + '--built-in-docstrings-file=/dev/null', + '--texi-macros-file=/dev/null', + '--eval', 'pkg prefix %s; pkg install %s' % + (prefix, self.stage.archive_file)) diff --git a/var/spack/repos/builtin/packages/octave-struct/package.py b/var/spack/repos/builtin/packages/octave-struct/package.py new file mode 100644 index 0000000000..8a342507aa --- /dev/null +++ b/var/spack/repos/builtin/packages/octave-struct/package.py @@ -0,0 +1,48 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import os + + +class OctaveStruct(Package): + """Additional structure manipulation functions for Octave.""" + + homepage = "https://octave.sourceforge.io/struct/" + url = "https://downloads.sourceforge.net/octave/struct-1.0.14.tar.gz" + + version('1.0.14', '3589d5eb8000f18426e2178587eb82f4') + + extends('octave@2.9.7:') + + def install(self, spec, prefix): + os.environ.pop('CC', '') + os.environ.pop('CXX', '') + os.environ.pop('FC', '') + octave('--quiet', + '--norc', + '--built-in-docstrings-file=/dev/null', + '--texi-macros-file=/dev/null', + '--eval', 'pkg prefix %s; pkg install %s' % + (prefix, self.stage.archive_file)) -- cgit v1.2.3-70-g09d2 From 6ea4614dbd3e7cbc447c98a2d9717523b213095f Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 20 Dec 2017 06:28:37 -0600 Subject: picard: Add version 2.17.0 (#6729) --- var/spack/repos/builtin/packages/picard/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/picard/package.py b/var/spack/repos/builtin/packages/picard/package.py index 8879f4232a..c5047bab1b 100644 --- a/var/spack/repos/builtin/packages/picard/package.py +++ b/var/spack/repos/builtin/packages/picard/package.py @@ -41,6 +41,7 @@ class Picard(Package): # They started distributing a single jar file at v2.6.0, prior to # that it was a .zip file with multiple .jar and .so files + version('2.17.0', '72cc527f1e4ca6a799ae0117af60b54e', expand=False) version('2.16.0', 'fed8928b03bb36e355656f349e579083', expand=False) version('2.15.0', '3f5751630b1a3449edda47a0712a64e4', expand=False) version('2.13.2', '3d7b33fd1f43ad2129e6ec7883af56f5', expand=False) -- cgit v1.2.3-70-g09d2 From 235c3c10250112155715b475dc1b8864c6452b3d Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 20 Dec 2017 08:39:12 +0100 Subject: ENH: improved openfoam module creation (issue #4942) - post-install module settings for openfoam-com and foam-extend. --- .../repos/builtin/packages/foam-extend/package.py | 77 ++++++++++++++++++-- .../repos/builtin/packages/openfoam-com/package.py | 81 ++++++++++++++++++---- .../repos/builtin/packages/openfoam-org/package.py | 7 +- 3 files changed, 146 insertions(+), 19 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/foam-extend/package.py b/var/spack/repos/builtin/packages/foam-extend/package.py index c6861da8d3..6a45f92399 100644 --- a/var/spack/repos/builtin/packages/foam-extend/package.py +++ b/var/spack/repos/builtin/packages/foam-extend/package.py @@ -58,10 +58,12 @@ import shutil import os from spack import * +from spack.environment import EnvironmentModifications from spack.pkg.builtin.openfoam_com import OpenfoamArch from spack.pkg.builtin.openfoam_com import add_extra_files from spack.pkg.builtin.openfoam_com import write_environ from spack.pkg.builtin.openfoam_com import rewrite_environ_files +import llnl.util.tty as tty class FoamExtend(Package): @@ -140,14 +142,77 @@ class FoamExtend(Package): # def setup_environment(self, spack_env, run_env): - run_env.set('FOAM_INST_DIR', os.path.dirname(self.projectdir)), - run_env.set('FOAM_PROJECT_DIR', self.projectdir) - run_env.set('WM_PROJECT_DIR', self.projectdir) - for d in ['wmake', self.archbin]: # bin already added automatically - run_env.prepend_path('PATH', join_path(self.projectdir, d)) + """Add environment variables to the generated module file. + These environment variables come from running: + + .. code-block:: console + + $ . $WM_PROJECT_DIR/etc/bashrc + """ + + # NOTE: Spack runs setup_environment twice. + # 1) pre-build to set up the build environment + # 2) post-install to determine runtime environment variables + # The etc/bashrc is only available (with corrrect content) + # post-installation. + + bashrc = join_path(self.projectdir, 'etc', 'bashrc') + minimal = True + if os.path.isfile(bashrc): + # post-install: source the installed bashrc + try: + mods = EnvironmentModifications.from_sourcing_file( + bashrc, + clean=True, # Remove duplicate entries + blacklist=[ # Blacklist these + # Inadvertent changes + # ------------------- + 'PS1', # Leave unaffected + 'MANPATH', # Leave unaffected + + # Unneeded bits + # ------------- + 'FOAM_INST_DIR', # Possibly incorrect + 'FOAM_(APP|ETC|SRC|SOLVERS|UTILITIES)', + 'FOAM_TEST_.*_DIR', + 'WM_NCOMPPROCS', + # 'FOAM_TUTORIALS', # can be useful + + # Lots of third-party cruft + # ------------------------- + '[A-Z].*_(BIN|LIB|INCLUDE)_DIR', + '[A-Z].*_SYSTEM', + 'WM_THIRD_PARTY_.*', + '(BISON|FLEX|CMAKE|ZLIB)_DIR', + '(METIS|PARMETIS|PARMGRIDGEN|SCOTCH)_DIR', + + # User-specific + # ------------- + 'FOAM_RUN', + '(FOAM|WM)_.*USER_.*', + ], + whitelist=[ # Whitelist these + 'MPI_ARCH_PATH', # Can be needed for compilation + 'PYTHON_BIN_DIR', + ]) + + run_env.extend(mods) + minimal = False + tty.info('foam-extend env: {0}'.format(bashrc)) + except Exception: + minimal = True + + if minimal: + # pre-build or minimal environment + tty.info('foam-extend minimal env {0}'.format(self.prefix)) + run_env.set('FOAM_INST_DIR', os.path.dirname(self.projectdir)), + run_env.set('FOAM_PROJECT_DIR', self.projectdir) + run_env.set('WM_PROJECT_DIR', self.projectdir) + for d in ['wmake', self.archbin]: # bin added automatically + run_env.prepend_path('PATH', join_path(self.projectdir, d)) def setup_dependent_environment(self, spack_env, run_env, dependent_spec): - """Provide location of the OpenFOAM project. + """Location of the OpenFOAM project. This is identical to the WM_PROJECT_DIR value, but we avoid that variable since it would mask the normal OpenFOAM cleanup of previous versions. diff --git a/var/spack/repos/builtin/packages/openfoam-com/package.py b/var/spack/repos/builtin/packages/openfoam-com/package.py index d184365720..2554e6c47f 100644 --- a/var/spack/repos/builtin/packages/openfoam-com/package.py +++ b/var/spack/repos/builtin/packages/openfoam-com/package.py @@ -64,6 +64,7 @@ import shutil import os from spack import * +from spack.environment import EnvironmentModifications import llnl.util.tty as tty @@ -150,8 +151,9 @@ def _write_environ_file(output, environ, formatter): Also descends into sub-dict and sub-list, but drops the key. """ with open(output, 'w') as outfile: - outfile.write('# SPACK settings\n\n') + outfile.write('# spack generated\n') _write_environ_entries(outfile, environ, formatter) + outfile.write('# spack\n') def write_environ(environ, **kwargs): @@ -260,6 +262,7 @@ class OpenfoamCom(Package): in 2004. """ + maintainers = ['olesenm'] homepage = "http://www.openfoam.com/" baseurl = "https://sourceforge.net/projects/openfoamplus/files/" gitrepo = "https://develop.openfoam.com/Development/OpenFOAM-plus.git" @@ -367,13 +370,72 @@ class OpenfoamCom(Package): # def setup_environment(self, spack_env, run_env): - run_env.set('FOAM_PROJECT_DIR', self.projectdir) - run_env.set('WM_PROJECT_DIR', self.projectdir) - for d in ['wmake', self.archbin]: # bin already added automatically - run_env.prepend_path('PATH', join_path(self.projectdir, d)) + """Add environment variables to the generated module file. + These environment variables come from running: + + .. code-block:: console + + $ . $WM_PROJECT_DIR/etc/bashrc + """ + + # NOTE: Spack runs setup_environment twice. + # 1) pre-build to set up the build environment + # 2) post-install to determine runtime environment variables + # The etc/bashrc is only available (with corrrect content) + # post-installation. + + bashrc = join_path(self.projectdir, 'etc', 'bashrc') + minimal = True + if os.path.isfile(bashrc): + # post-install: source the installed bashrc + try: + mods = EnvironmentModifications.from_sourcing_file( + bashrc, + clean=True, # Remove duplicate entries + blacklist=[ # Blacklist these + # Inadvertent changes + # ------------------- + 'PS1', # Leave unaffected + 'MANPATH', # Leave unaffected + + # Unneeded bits + # ------------- + 'FOAM_SETTINGS', # Do not use with modules + 'FOAM_INST_DIR', # Old + 'FOAM_(APP|ETC|SRC|SOLVERS|UTILITIES)', + # 'FOAM_TUTORIALS', # can be useful + 'WM_OSTYPE', # Purely optional value + + # Third-party cruft - only used for orig compilation + # ----------------- + '[A-Z].*_ARCH_PATH', + '(KAHIP|METIS|SCOTCH)_VERSION', + + # User-specific + # ------------- + 'FOAM_RUN', + '(FOAM|WM)_.*USER_.*', + ], + whitelist=[ # Whitelist these + 'MPI_ARCH_PATH', # Can be needed for compilation + ]) + + run_env.extend(mods) + minimal = False + tty.info('OpenFOAM bashrc env: {0}'.format(bashrc)) + except Exception: + minimal = True + + if minimal: + # pre-build or minimal environment + tty.info('OpenFOAM minimal env {0}'.format(self.prefix)) + run_env.set('FOAM_PROJECT_DIR', self.projectdir) + run_env.set('WM_PROJECT_DIR', self.projectdir) + for d in ['wmake', self.archbin]: # bin added automatically + run_env.prepend_path('PATH', join_path(self.projectdir, d)) def setup_dependent_environment(self, spack_env, run_env, dependent_spec): - """Provide location of the OpenFOAM project. + """Location of the OpenFOAM project directory. This is identical to the WM_PROJECT_DIR value, but we avoid that variable since it would mask the normal OpenFOAM cleanup of previous versions. @@ -468,6 +530,7 @@ class OpenfoamCom(Package): ], 'scotch': {}, 'metis': {}, + 'ensight': {}, # Disable settings 'paraview': [], 'gperftools': [], # Currently unused } @@ -613,12 +676,6 @@ class OpenfoamCom(Package): ]: os.symlink(f, os.path.basename(f)) - def openfoam_run_environment(self, projdir): - # This seems to bomb out with an ImportError 'site'! - # mods = EnvironmentModifications.from_sourcing_files( - # join_path(projdir, 'etc/bashrc')) - pass - # ----------------------------------------------------------------------------- diff --git a/var/spack/repos/builtin/packages/openfoam-org/package.py b/var/spack/repos/builtin/packages/openfoam-org/package.py index e37c22b6ed..ddae24939b 100644 --- a/var/spack/repos/builtin/packages/openfoam-org/package.py +++ b/var/spack/repos/builtin/packages/openfoam-org/package.py @@ -137,13 +137,18 @@ class OpenfoamOrg(Package): # def setup_environment(self, spack_env, run_env): + # This should be similar to the openfoam-com package, + # but sourcing the etc/bashrc here seems to exit with an error. + # ... this needs to be examined in more detail. + # + # Minimal environment only. run_env.set('FOAM_PROJECT_DIR', self.projectdir) run_env.set('WM_PROJECT_DIR', self.projectdir) for d in ['wmake', self.archbin]: # bin already added automatically run_env.prepend_path('PATH', join_path(self.projectdir, d)) def setup_dependent_environment(self, spack_env, run_env, dependent_spec): - """Provide location of the OpenFOAM project. + """Location of the OpenFOAM project directory. This is identical to the WM_PROJECT_DIR value, but we avoid that variable since it would mask the normal OpenFOAM cleanup of previous versions. -- cgit v1.2.3-70-g09d2 From ef2e51571d792f25595b0b28887c38e41057dd71 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 20 Dec 2017 08:39:18 +0100 Subject: ENH: better handling of mpich for openfoam packages - define MPICH_SKIP_MPICXX, link libmpich instead of libmpi (as per disussion in PR #4990) ENH: more flexible editing/patching of openfoam env files CONFIG: comment out requirement for openmpi+thread_multiple - was originally slated for the 1712 release and beyond, but there are reportedly unstable version/network combinations. Leave as comment for future reference, since it may be arise again. STYLE: renamed openfoam-site.patch as 1706-site.patch (and reformatted) - to preserve against impending changes in the layout of config.{csh,sh}/settings --- .../builtin/packages/openfoam-com/1706-site.patch | 22 ++++++ .../packages/openfoam-com/openfoam-site.patch | 35 --------- .../repos/builtin/packages/openfoam-com/package.py | 86 +++++++++++++--------- 3 files changed, 74 insertions(+), 69 deletions(-) create mode 100644 var/spack/repos/builtin/packages/openfoam-com/1706-site.patch delete mode 100644 var/spack/repos/builtin/packages/openfoam-com/openfoam-site.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openfoam-com/1706-site.patch b/var/spack/repos/builtin/packages/openfoam-com/1706-site.patch new file mode 100644 index 0000000000..6dab9b555b --- /dev/null +++ b/var/spack/repos/builtin/packages/openfoam-com/1706-site.patch @@ -0,0 +1,22 @@ +--- OpenFOAM-plus.orig/etc/config.sh/settings 2016-12-23 15:22:59.000000000 +0100 ++++ OpenFOAM-plus/etc/config.sh/settings 2017-04-04 12:21:31.295498985 +0200 +@@ -157,7 +157,7 @@ + export FOAM_EXT_LIBBIN=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/lib + + # Site-specific directory +-siteDir="${WM_PROJECT_SITE:-$WM_PROJECT_INST_DIR/site}" ++siteDir="${WM_PROJECT_SITE:-$WM_PROJECT_DIR/site}" #SPACK: not in parent directory + + # Shared site executables/libraries + # Similar naming convention as ~OpenFOAM expansion +--- OpenFOAM-plus.orig/etc/config.csh/settings 2016-12-23 15:22:59.000000000 +0100 ++++ OpenFOAM-plus/etc/config.csh/settings 2017-03-23 12:23:52.737891912 +0100 +@@ -156,7 +156,7 @@ + if ( $?WM_PROJECT_SITE ) then + set siteDir=$WM_PROJECT_SITE + else +- set siteDir=$WM_PROJECT_INST_DIR/site ++ set siteDir=$WM_PROJECT_DIR/site #SPACK: not in parent directory + endif + + # Shared site executables/libraries diff --git a/var/spack/repos/builtin/packages/openfoam-com/openfoam-site.patch b/var/spack/repos/builtin/packages/openfoam-com/openfoam-site.patch deleted file mode 100644 index a1f5d8a08a..0000000000 --- a/var/spack/repos/builtin/packages/openfoam-com/openfoam-site.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -uw OpenFOAM-plus.orig/etc/config.sh/settings OpenFOAM-plus/etc/config.sh/settings ---- OpenFOAM-plus.orig/etc/config.sh/settings 2017-04-04 17:34:29.875873400 +0200 -+++ OpenFOAM-plus/etc/config.sh/settings 2017-04-04 17:38:40.174992466 +0200 -@@ -154,10 +154,10 @@ - export FOAM_LIBBIN=$WM_PROJECT_DIR/platforms/$WM_OPTIONS/lib - - # External (ThirdParty) libraries --export FOAM_EXT_LIBBIN=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/lib -+unset FOAM_EXT_LIBBIN #SPACK: none - - # Site-specific directory --siteDir="${WM_PROJECT_SITE:-$WM_PROJECT_INST_DIR/site}" -+siteDir="${WM_PROJECT_SITE:-$WM_PROJECT_DIR/site}" #SPACK: not in parent directory - - # Shared site executables/libraries - # Similar naming convention as ~OpenFOAM expansion -diff -uw OpenFOAM-plus.orig/etc/config.csh/settings OpenFOAM-plus/etc/config.csh/settings ---- OpenFOAM-plus.orig/etc/config.csh/settings 2017-04-04 17:34:28.255879107 +0200 -+++ OpenFOAM-plus/etc/config.csh/settings 2017-04-04 17:39:22.214844670 +0200 -@@ -151,13 +151,13 @@ - setenv FOAM_LIBBIN $WM_PROJECT_DIR/platforms/$WM_OPTIONS/lib - - # External (ThirdParty) libraries --setenv FOAM_EXT_LIBBIN $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/lib -+unsetenv FOAM_EXT_LIBBIN #SPACK: none - - # Site-specific directory - if ( $?WM_PROJECT_SITE ) then - set siteDir=$WM_PROJECT_SITE - else -- set siteDir=$WM_PROJECT_INST_DIR/site -+ set siteDir=$WM_PROJECT_DIR/site #SPACK: not in parent directory - endif - - # Shared site executables/libraries diff --git a/var/spack/repos/builtin/packages/openfoam-com/package.py b/var/spack/repos/builtin/packages/openfoam-com/package.py index 2554e6c47f..1a01d45ce4 100644 --- a/var/spack/repos/builtin/packages/openfoam-com/package.py +++ b/var/spack/repos/builtin/packages/openfoam-com/package.py @@ -165,12 +165,12 @@ def write_environ(environ, **kwargs): posix[=None] If set, the name of the POSIX file to rewrite. cshell[=None] If set, the name of the C-shell file to rewrite. """ - posix = kwargs.get('posix', None) - if posix: - _write_environ_file(posix, environ, format_export) - cshell = kwargs.get('cshell', None) - if cshell: - _write_environ_file(cshell, environ, format_setenv) + rcfile = kwargs.get('posix', None) + if rcfile: + _write_environ_file(rcfile, environ, format_export) + rcfile = kwargs.get('cshell', None) + if rcfile: + _write_environ_file(rcfile, environ, format_setenv) def rewrite_environ_files(environ, **kwargs): @@ -179,22 +179,29 @@ def rewrite_environ_files(environ, **kwargs): posix[=None] If set, the name of the POSIX file to rewrite. cshell[=None] If set, the name of the C-shell file to rewrite. """ - posix = kwargs.get('posix', None) - if posix and os.path.isfile(posix): + rcfile = kwargs.get('posix', None) + if rcfile and os.path.isfile(rcfile): for k, v in environ.items(): - filter_file( - r'^(\s*export\s+%s)=.*$' % k, - r'\1=%s' % v, - posix, - backup=False) - cshell = kwargs.get('cshell', None) - if cshell and os.path.isfile(cshell): + regex = r'^(\s*export\s+{0})=.*$'.format(k) + if not v: + replace = r'unset {0} #SPACK: unset'.format(k) + elif v.startswith('#'): + replace = r'unset {0} {1}'.format(k, v) + else: + replace = r'\1={0}'.format(v) + filter_file(regex, replace, rcfile, backup=False) + + rcfile = kwargs.get('cshell', None) + if rcfile and os.path.isfile(rcfile): for k, v in environ.items(): - filter_file( - r'^(\s*setenv\s+%s)\s+.*$' % k, - r'\1 %s' % v, - cshell, - backup=False) + regex = r'^(\s*setenv\s+{0})\s+.*$'.format(k) + if not v: + replace = r'unsetenv {0} #SPACK: unset'.format(k) + elif v.startswith('#'): + replace = r'unsetenv {0} {1}'.format(k, v) + else: + replace = r'\1 {0}'.format(v) + filter_file(regex, replace, rcfile, backup=False) def foamAddPath(*args): @@ -222,8 +229,8 @@ def pkglib(package, pre=None): def mplib_content(spec, pre=None): - """The mpi settings to have wmake - use spack information with minimum modifications to OpenFOAM. + """The mpi settings (from spack) for the OpenFOAM wmake includes, which + allows later reuse within OpenFOAM. Optional parameter 'pre' to provide alternative prefix """ @@ -231,6 +238,11 @@ def mplib_content(spec, pre=None): bin = mpi_spec.prefix.bin inc = mpi_spec.prefix.include lib = pkglib(mpi_spec) + + libname = 'mpi' + if 'mpich' in mpi_spec.name: + libname = 'mpich' + if pre: bin = join_path(pre, os.path.basename(bin)) inc = join_path(pre, os.path.basename(inc)) @@ -244,9 +256,9 @@ def mplib_content(spec, pre=None): 'include': inc, 'bindir': bin, 'libdir': lib, - 'FLAGS': '-DOMPI_SKIP_MPICXX -DMPICH_IGNORE_CXX_SEEK', + 'FLAGS': '-DOMPI_SKIP_MPICXX -DMPICH_SKIP_MPICXX', 'PINC': '-I{0}'.format(inc), - 'PLIBS': '-L{0} -lmpi'.format(lib), + 'PLIBS': '-L{0} -l{1}'.format(lib, libname), } return info @@ -296,8 +308,9 @@ class OpenfoamCom(Package): provides('openfoam') depends_on('mpi') - # After 1712 require openmpi+thread_multiple for collated output - conflicts('^openmpi~thread_multiple', when='@1712:') + # After 1712, could suggest openmpi+thread_multiple for collated output + # but particular mixes of mpi versions and InfiniBand may not work so well + # conflicts('^openmpi~thread_multiple', when='@1712:') depends_on('zlib') depends_on('fftw') @@ -339,11 +352,7 @@ class OpenfoamCom(Package): patch('1612-mgridgen-lib.patch', when='@1612') patch('1612-scotch-metis-lib.patch', when='@1612') patch('1612-zoltan-lib.patch', when='@1612') - - # This patch is reasonably version-invariant - # 1) default site directly under WM_PROJECT_DIR - # 2) no FOAM_EXT_LIBBIN required - patch('openfoam-site.patch', when='@1706:') + patch('1706-site.patch', when='@1706') # Some user config settings # default: 'compile-option': 'RpathOpt', @@ -474,13 +483,22 @@ class OpenfoamCom(Package): # Filtering: bashrc,cshrc (using a patch is less flexible) edits = { 'WM_THIRD_PARTY_DIR': - r'$WM_PROJECT_DIR/ThirdParty #SPACK: No separate third-party', + r'$WM_PROJECT_DIR/ThirdParty #SPACK: No separate third-party', } - rewrite_environ_files( # Adjust etc/bashrc and etc/cshrc + rewrite_environ_files( # etc/{bashrc,cshrc} edits, posix=join_path('etc', 'bashrc'), cshell=join_path('etc', 'cshrc')) + # Filtering: settings + edits = { + 'FOAM_EXT_LIBBIN': '#SPACK: No separate third-party', # ie, unset + } + rewrite_environ_files( # etc/config.{csh,sh}/settings + edits, + posix=join_path('etc', 'config.sh', 'settings'), + cshell=join_path('etc', 'config.csh', 'settings')) + def configure(self, spec, prefix): """Make adjustments to the OpenFOAM configuration files in their various locations: etc/bashrc, etc/config.sh/FEATURE and customizations that @@ -490,7 +508,7 @@ class OpenfoamCom(Package): # Filtering bashrc, cshrc edits = {} edits.update(self.foam_arch.foam_dict()) - rewrite_environ_files( # Adjust etc/bashrc and etc/cshrc + rewrite_environ_files( # etc/{bashrc,cshrc} edits, posix=join_path('etc', 'bashrc'), cshell=join_path('etc', 'cshrc')) -- cgit v1.2.3-70-g09d2 From f2e061debfe99ddfc5a4f08bb2d0ea9fae14e21d Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 20 Dec 2017 21:10:24 -0600 Subject: Feature/fasttree (#6227) * fasttree: new package * fasttree: better version handling * fixing line length for flake8 --- .../repos/builtin/packages/fasttree/package.py | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 var/spack/repos/builtin/packages/fasttree/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fasttree/package.py b/var/spack/repos/builtin/packages/fasttree/package.py new file mode 100644 index 0000000000..d1b0163004 --- /dev/null +++ b/var/spack/repos/builtin/packages/fasttree/package.py @@ -0,0 +1,50 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Fasttree(Package): + """FastTree infers approximately-maximum-likelihood phylogenetic + trees from alignments of nucleotide or protein sequences. + FastTree can handle alignments with up to a million of sequences + in a reasonable amount of time and memory.""" + + homepage = "http://www.microbesonline.org/fasttree" + url = "http://www.microbesonline.org/fasttree/FastTree-2.1.10.c" + + version('2.1.10', '1c2c6425a638ec0c61ef064cda687987', expand=False, url='http://www.microbesonline.org/fasttree/FastTree-2.1.10.c') + + phases = ['build', 'install'] + + def build(self, spec, prefix): + cc = Executable(spack_cc) + cc('-O3', self.compiler.openmp_flag, + '-DOPENMP', '-finline-functions', '-funroll-loops', '-Wall', + '-oFastTreeMP', 'FastTree-' + format(spec.version.dotted) + '.c', + '-lm') + + def install(self, spec, prefix): + mkdir(prefix.bin) + install('FastTreeMP', prefix.bin) -- cgit v1.2.3-70-g09d2 From d1786779c4fa91cb728b6ea80984e7a4ffe94a4c Mon Sep 17 00:00:00 2001 From: peetsv <32349688+peetsv@users.noreply.github.com> Date: Thu, 21 Dec 2017 21:56:58 -0800 Subject: gmap-gsnap: adding version 2014_12_28 (#6720) --- var/spack/repos/builtin/packages/gmap-gsnap/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gmap-gsnap/package.py b/var/spack/repos/builtin/packages/gmap-gsnap/package.py index 7db09fb72d..c7c70c7c92 100644 --- a/var/spack/repos/builtin/packages/gmap-gsnap/package.py +++ b/var/spack/repos/builtin/packages/gmap-gsnap/package.py @@ -34,3 +34,4 @@ class GmapGsnap(AutotoolsPackage): url = "http://research-pub.gene.com/gmap/src/gmap-gsnap-2017-06-16.tar.gz" version('2017-06-16', 'fcc91b8bdd4bf12ae3124de0c00db0c0') + version('2014-12-28', '1ab07819c9e5b5b8970716165ccaa7da') -- cgit v1.2.3-70-g09d2 From 937f68c3598e1f07f8154126bebc28e25263ab89 Mon Sep 17 00:00:00 2001 From: Andrey Prokopenko Date: Fri, 22 Dec 2017 01:32:10 -0500 Subject: clang,flang: update CC, CXX environment in installation module (#6737) --- var/spack/repos/builtin/packages/flang/package.py | 5 +++++ var/spack/repos/builtin/packages/llvm/package.py | 4 ++++ 2 files changed, 9 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/flang/package.py b/var/spack/repos/builtin/packages/flang/package.py index fb84e9841d..1b9d746087 100644 --- a/var/spack/repos/builtin/packages/flang/package.py +++ b/var/spack/repos/builtin/packages/flang/package.py @@ -80,3 +80,8 @@ class Flang(CMakePackage): out.close() chmod = which('chmod') chmod('+x', flang) + + def setup_environment(self, spack_env, run_env): + run_env.set('FC', join_path(self.spec.prefix.bin, 'flang')) + run_env.set('F77', join_path(self.spec.prefix.bin, 'flang')) + run_env.set('F90', join_path(self.spec.prefix.bin, 'flang')) diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index 48f767aa17..64045c2684 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -365,6 +365,10 @@ class Llvm(CMakePackage): def setup_environment(self, spack_env, run_env): spack_env.append_flags('CXXFLAGS', self.compiler.cxx11_flag) + if '+clang' in self.spec: + run_env.set('CC', join_path(self.spec.prefix.bin, 'clang')) + run_env.set('CXX', join_path(self.spec.prefix.bin, 'clang++')) + def cmake_args(self): spec = self.spec -- cgit v1.2.3-70-g09d2 From f764ac4573e512e9ccec6a6f7b3a0d0bf8c59c1b Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Fri, 22 Dec 2017 15:55:04 +0100 Subject: dealii: support 64bit BLAS (#6758) --- var/spack/repos/builtin/packages/dealii/package.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index e26da2bf8a..593b9511ea 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -151,6 +151,9 @@ class Dealii(CMakePackage, CudaPackage): depends_on('trilinos+amesos+aztec+epetra+ifpack+ml+muelu+rol+sacado+teuchos~hypre', when='+trilinos+mpi+int64') # check that the combination of variants makes sense + conflicts('^openblas+ilp64', when='@:8.5.1') + conflicts('^intel-mkl+ilp64', when='@:8.5.1') + conflicts('^intel-parallel-studio+mkl+ilp64', when='@:8.5.1') conflicts('+assimp', when='@:8.5.1') conflicts('+gmsh', when='@:8.5.1') conflicts('+nanoflann', when='@:8.5.1') @@ -190,6 +193,11 @@ class Dealii(CMakePackage, CudaPackage): '-DDEAL_II_ALLOW_BUNDLED=OFF' ]) + if (spec.satisfies('^openblas+ilp64') or + spec.satisfies('^intel-mkl+ilp64') or + spec.satisfies('^intel-parallel-studio+mkl+ilp64')): + options.append('-DLAPACK_WITH_64BIT_BLAS_INDICES=ON') + if spec.satisfies('@:8.99'): options.extend([ # Cmake may still pick up system's bzip2, fix this: @@ -270,7 +278,7 @@ class Dealii(CMakePackage, CudaPackage): for library in ( 'gsl', 'hdf5', 'p4est', 'petsc', 'slepc', 'trilinos', 'metis', 'sundials', 'nanoflann', 'assimp', 'gmsh'): - if library in spec: + if ('+' + library) in spec: options.extend([ '-D%s_DIR=%s' % (library.upper(), spec[library].prefix), '-DDEAL_II_WITH_%s:BOOL=ON' % library.upper() -- cgit v1.2.3-70-g09d2 From 24743b7e5a42359bf86286db71f364434a09ac31 Mon Sep 17 00:00:00 2001 From: "Nichols A. Romero" Date: Fri, 22 Dec 2017 18:47:49 -0600 Subject: QMCPACK package: update blas/lapack detection (#6753) * Fix detection of blas and lapack: provide libraries/includes as arguments to CMake rather than using CMake's auto-detection. This includes a patch to QMCPACK's CMake files to refer to Spack-built blas/lapack implementations. This also includes special-case logic for the intel-mkl implementation of blas/lapack * Break up unit tests and short tests. Only hard failure if the unit tests fail, if short tests fail issue a warning only. * Add QMCPACK 3.3.0, get rid of 3.0.0 --- .../repos/builtin/packages/qmcpack/cmake.diff | 55 +++++++++++ .../repos/builtin/packages/qmcpack/package.py | 107 ++++++++++++++------- 2 files changed, 125 insertions(+), 37 deletions(-) create mode 100644 var/spack/repos/builtin/packages/qmcpack/cmake.diff (limited to 'var') diff --git a/var/spack/repos/builtin/packages/qmcpack/cmake.diff b/var/spack/repos/builtin/packages/qmcpack/cmake.diff new file mode 100644 index 0000000000..4eb93f4198 --- /dev/null +++ b/var/spack/repos/builtin/packages/qmcpack/cmake.diff @@ -0,0 +1,55 @@ +diff --git a/CMake/FindMKL.cmake b/CMake/FindMKL.cmake +index a457eaba0..66dc43ce6 100644 +--- a/CMake/FindMKL.cmake ++++ b/CMake/FindMKL.cmake +@@ -7,21 +7,21 @@ FILE( WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src_mkl.cxx" + "#include \n #include \n int main() { return 0; }\n" ) + try_compile(HAVE_MKL ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src_mkl.cxx +- CMAKE_FLAGS "${CMAKE_CXX_FLAGS} -mkl" ) ++ CMAKE_FLAGS "${CMAKE_CXX_FLAGS} -mkl" "-DINCLUDE_DIRECTORIES=${LAPACK_INCLUDE_DIRS}") + + # Check for mkl_vml_functions.h + FILE( WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src_mkl_vml.cxx" + "#include \n #include \n int main() { return 0; }\n" ) + try_compile(HAVE_MKL_VML ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src_mkl_vml.cxx +- CMAKE_FLAGS "${CMAKE_CXX_FLAGS} -mkl" ) ++ CMAKE_FLAGS "${CMAKE_CXX_FLAGS} -mkl" "-DINCLUDE_DIRECTORIES=${LAPACK_INCLUDE_DIRS}") + + # Check for fftw3 + FILE( WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src_mkl_fftw3.cxx" + "#include \n #include \n int main() { return 0; }\n" ) + try_compile(HAVE_MKL_FFTW3 ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src_mkl_fftw3.cxx +- CMAKE_FLAGS "${CMAKE_CXX_FLAGS} -mkl" ) ++ CMAKE_FLAGS "${CMAKE_CXX_FLAGS} -mkl" "-DINCLUDE_DIRECTORIES=${LAPACK_INCLUDE_DIRS}") + + IF ( HAVE_MKL ) + SET( MKL_FOUND 1 ) +diff --git a/CMake/FindVectorMath.cmake b/CMake/FindVectorMath.cmake +index c0c919746..f5c511253 100644 +--- a/CMake/FindVectorMath.cmake ++++ b/CMake/FindVectorMath.cmake +@@ -19,7 +19,7 @@ IF ( NOT HAVE_VECTOR_MATH ) + "#include \n #include \n int main() { return 0; }\n" ) + try_compile(HAVE_MKL_VML ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src_mkl_vml.cxx +- CMAKE_FLAGS "${CMAKE_CXX_FLAGS}" ) ++ CMAKE_FLAGS "${CMAKE_CXX_FLAGS}" "-DINCLUDE_DIRECTORIES=${LAPACK_INCLUDE_DIRS}") + IF (HAVE_MKL_VML) + # enable VML only when MKL libraries have been picked up + IF (MKL_FOUND) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 570d8a01f..56d939786 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -464,6 +464,8 @@ ELSE(CMAKE_TOOLCHAIN_FILE) + MESSAGE(STATUS "LAPACK libraries: ${LAPACK_LIBRARIES}") + MESSAGE(STATUS "LAPACK linker flags: ${LAPACK_LINKER_FLAGS}") + SET(LAPACK_LIBRARY ${LAPACK_LIBRARIES} ${LAPACK_LINKER_FLAGS}) ++ MESSAGE(STATUS "LAPACK_INCLUDE_DIRS: ${LAPACK_INCLUDE_DIRS}") ++ INCLUDE_DIRECTORIES(${LAPACK_INCLUDE_DIRS}) + ELSE() + MESSAGE(FATAL_ERROR "Could not find required libraries LAPACK &/or BLAS") + ENDIF() diff --git a/var/spack/repos/builtin/packages/qmcpack/package.py b/var/spack/repos/builtin/packages/qmcpack/package.py index 360ae0a51d..a2080a13c4 100644 --- a/var/spack/repos/builtin/packages/qmcpack/package.py +++ b/var/spack/repos/builtin/packages/qmcpack/package.py @@ -23,6 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * +import llnl.util.tty as tty class Qmcpack(CMakePackage): @@ -33,13 +34,14 @@ class Qmcpack(CMakePackage): homepage = "http://www.qmcpack.org/" url = "https://github.com/QMCPACK/qmcpack.git" - # This download method is untrusted, and is not recommended - # by the Spack manual. However, it is easier to maintain - # because github hashes can occasionally change + # This download method is untrusted, and is not recommended by the + # Spack manual. However, it is easier to maintain because github hashes + # can occasionally change. + # NOTE: 12/19/2017 QMCPACK 3.0.0 does not build properly with Spack. + version('3.3.0', git=url, tag='v3.3.0') version('3.2.0', git=url, tag='v3.2.0') version('3.1.1', git=url, tag='v3.1.1') version('3.1.0', git=url, tag='v3.1.0') - version('3.0.0', git=url, tag='v3.0.0') version('develop', git=url) # These defaults match those in the QMCPACK manual @@ -57,7 +59,7 @@ class Qmcpack(CMakePackage): 'Array-of-Structure code. Only for CPU code' 'and only in mixed precision') variant('timers', default=False, - description='Build with support for timers') + description='Build with support for timers') variant('da', default=False, description='Install with support for basic data analysis tools') variant('gui', default=False, @@ -72,7 +74,9 @@ class Qmcpack(CMakePackage): conflicts('^openblas+ilp64') conflicts('^intel-mkl+ilp64') - # Dependencies match those in the QMCPACK manual + # Dependencies match those in the QMCPACK manual. + # FIXME: once concretizer can unite unconditional and conditional + # dependencies the some of the '~mpi' will not be necessary. depends_on('cmake@3.4.3:', type='build') depends_on('mpi', when='+mpi') depends_on('libxml2') @@ -92,7 +96,7 @@ class Qmcpack(CMakePackage): # blas and lapack patching fails often and so are disabled at this time depends_on('py-numpy~blas~lapack', type='run', when='+da') - # GUI is optional fpr data anlysis + # GUI is optional for data anlysis # py-matplotlib leads to a long complex DAG for dependencies depends_on('py-matplotlib', type='run', when='+gui') @@ -108,6 +112,10 @@ class Qmcpack(CMakePackage): patches=patch(patch_url, sha256=patch_checksum), when='~mpi') + # This is Spack specific patch, we may need to enhance QMCPACK's CMake + # in the near future. + patch('cmake.diff') + def patch(self): # FindLibxml2QMC.cmake doesn't check the environment by default # for libxml2, so we fix that. @@ -116,22 +124,23 @@ class Qmcpack(CMakePackage): 'CMake/FindLibxml2QMC.cmake') def cmake_args(self): + spec = self.spec args = [] - if '+mpi' in self.spec: - mpi = self.spec['mpi'] + if '+mpi' in spec: + mpi = spec['mpi'] args.append('-DCMAKE_C_COMPILER={0}'.format(mpi.mpicc)) args.append('-DCMAKE_CXX_COMPILER={0}'.format(mpi.mpicxx)) args.append('-DMPI_BASE_DIR:PATH={0}'.format(mpi.prefix)) # Currently FFTW_HOME and LIBXML2_HOME are used by CMake. # Any CMake warnings about other variables are benign. - xml2_prefix = self.spec['libxml2'].prefix + xml2_prefix = spec['libxml2'].prefix args.append('-DLIBXML2_HOME={0}'.format(xml2_prefix)) args.append('-DLibxml2_INCLUDE_DIRS={0}'.format(xml2_prefix.include)) args.append('-DLibxml2_LIBRARY_DIRS={0}'.format(xml2_prefix.lib)) - fftw_prefix = self.spec['fftw'].prefix + fftw_prefix = spec['fftw'].prefix args.append('-DFFTW_HOME={0}'.format(fftw_prefix)) args.append('-DFFTW_INCLUDE_DIRS={0}'.format(fftw_prefix.include)) args.append('-DFFTW_LIBRARY_DIRS={0}'.format(fftw_prefix.lib)) @@ -140,15 +149,15 @@ class Qmcpack(CMakePackage): args.append('-DHDF5_ROOT={0}'.format(self.spec['hdf5'].prefix)) # Default is MPI, serial version is convenient for cases, e.g. laptops - if '+mpi' in self.spec: + if '+mpi' in spec: args.append('-DQMC_MPI=1') - elif '~mpi' in self.spec: + elif '~mpi' in spec: args.append('-DQMC_MPI=0') # Default is real-valued single particle orbitals - if '+complex' in self.spec: + if '+complex' in spec: args.append('-DQMC_COMPLEX=1') - elif '~complex' in self.spec: + elif '~complex' in spec: args.append('-DQMC_COMPLEX=0') # When '-DQMC_CUDA=1', CMake automatically sets: @@ -157,45 +166,57 @@ class Qmcpack(CMakePackage): # There is a double-precision CUDA path, but it is not as well # tested. - if '+cuda' in self.spec: + if '+cuda' in spec: args.append('-DQMC_CUDA=1') - elif '~cuda' in self.spec: + elif '~cuda' in spec: args.append('-DQMC_CUDA=0') # Mixed-precision versues double-precision CPU and GPU code - if '+mixed' in self.spec: + if '+mixed' in spec: args.append('-DQMC_MIXED_PRECISION=1') - elif '~mixed' in self.spec: + elif '~mixed' in spec: args.append('-DQMC_MIXED_PRECISION=0') # New Structure-of-Array (SOA) code, much faster than default # Array-of-Structure (AOS) code. # No support for local atomic orbital basis. - if '+soa' in self.spec: + if '+soa' in spec: args.append('-DENABLE_SOA=1') - elif '~soa' in self.spec: + elif '~soa' in spec: args.append('-DENABLE_SOA=0') # Manual Timers - if '+timers' in self.spec: + if '+timers' in spec: args.append('-DENABLE_TIMERS=1') - elif '~timers' in self.spec: + elif '~timers' in spec: args.append('-DENABLE_TIMERS=0') - # # Proper MKL detection not working. - # # Include MKL flags - # if 'intel-mkl' in self.spec: - # args.append('-DBLA_VENDOR=Intel10_64lp_seq') - # args.append('-DQMC_INCLUDE={0}'.format(join_path(env['MKLROOT'],'include'))) + # Proper detection of optimized BLAS and LAPACK. + # Based on the code from the deal II Spack package: + # https://github.com/spack/spack/blob/develop/var/spack/repos/builtin/packages/dealii/package.py + # + # Basically, we override CMake's auto-detection mechanism + # and use the Spack's interface instead + lapack_blas = spec['lapack'].libs + spec['blas'].libs + args.extend([ + '-DLAPACK_FOUND=true', + '-DLAPACK_LIBRARIES=%s' % lapack_blas.joined(';') + ]) + + # Additionally, we need to pass the BLAS+LAPACK include directory for + # header files. Intel MKL requires special case due to differences in + # Darwin vs. Linux $MKLROOT naming schemes + if 'intel-mkl' in self.spec: + args.append( + '-DLAPACK_INCLUDE_DIRS=%s' % + format(join_path(env['MKLROOT'], 'include'))) + else: + args.append( + '-DLAPACK_INCLUDE_DIRS=%s;%s' % ( + self.spec['lapack'].prefix.include, + self.spec['blas'].prefix.include)) return args - # def setup_environment(self, spack_env, run_env): - # # Add MKLROOT/lib to the CMAKE_PREFIX_PATH to enable CMake to find - # # MKL libraries. MKLROOT environment variable must be defined for - # # this to work properly. - # if 'intel-mkl' in self.spec: - # spack_env.append_path('CMAKE_PREFIX_PATH',format(join_path(env['MKLROOT'],'lib'))) - def install(self, spec, prefix): """Make the install targets""" @@ -228,7 +249,19 @@ class Qmcpack(CMakePackage): def check(self): """Run ctest after building binary. It can take over 24 hours to run all the regression tests, here we - only run the unit tests and short tests.""" + only run the unit tests and short tests. If the unit tests fail, + the QMCPACK installation aborts. On the other hand, the short tests + are too strict and often fail, but are still useful to run. In the + future, the short tests will be more reasonable in terms of quality + assurance (i.e. they will not be so strict), but will be sufficient to + validate QMCPACK in production.""" + with working_dir(self.build_directory): ctest('-L', 'unit') - ctest('-R', 'short') + try: + ctest('-R', 'short') + except ProcessError: + warn = 'Unit tests passed, but short tests have failed.\n' + warn += 'Please review failed tests before proceeding\n' + warn += 'with production calculations.\n' + tty.msg(warn) -- cgit v1.2.3-70-g09d2 From da93c9b870435b40015c18abe7332e854b442077 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Sat, 30 Dec 2017 21:29:27 +0100 Subject: Add: lines-are-beautiful (#6784) Adds the C++ File API library "lines-are-beautiful" for the reMarkable e-ink tablet. --- var/spack/repos/builtin/packages/rmlab/package.py | 49 +++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 var/spack/repos/builtin/packages/rmlab/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/rmlab/package.py b/var/spack/repos/builtin/packages/rmlab/package.py new file mode 100644 index 0000000000..2fa927a1ac --- /dev/null +++ b/var/spack/repos/builtin/packages/rmlab/package.py @@ -0,0 +1,49 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Rmlab(CMakePackage): + """C++ File API for the reMarkable tablet + """ + + homepage = "https://github.com/ax3l/lines-are-beautiful" + url = "https://plasma.ninja/blog/devices/remarkable/binary/format/2017/12/26/reMarkable-lines-file-format.html" + maintainers = ['ax3l'] + + version('develop', branch='develop', + git='https://github.com/ax3l/lines-are-beautiful.git') + + variant('png', default=True, + description='Enable PNG conversion support') + + # modern CMake + depends_on('cmake@3.7.0:', type='build') + # C++11 + conflicts('%gcc@:4.7') + conflicts('%intel@:15') + conflicts('%pgi@:14') + + depends_on('pngwriter@0.6.0:', when='+png') -- cgit v1.2.3-70-g09d2 From c3b003e6984f15807fe8675d90eab19679566363 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 2 Jan 2018 12:55:07 -0600 Subject: bamtools: Add version 2.5.1 (#6770) --- var/spack/repos/builtin/packages/bamtools/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bamtools/package.py b/var/spack/repos/builtin/packages/bamtools/package.py index 036d6ed407..fc40938990 100644 --- a/var/spack/repos/builtin/packages/bamtools/package.py +++ b/var/spack/repos/builtin/packages/bamtools/package.py @@ -32,6 +32,7 @@ class Bamtools(CMakePackage): homepage = "https://github.com/pezmaster31/bamtools" url = "https://github.com/pezmaster31/bamtools/archive/v2.4.0.tar.gz" + version('2.5.1', '98e90632058f85bd5eed6088b3ff912e') version('2.5.0', 'dd4185bdba6e3adf2c24b7f93a57233d') version('2.4.1', '41cadf513f2744256851accac2bc7baa') version('2.4.0', '6139d00c1b1fe88fe15d094d8a74d8b9') -- cgit v1.2.3-70-g09d2 From caa39d08d455872e9a2339ca60ef49b37cfdbd23 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 2 Jan 2018 12:58:03 -0600 Subject: package r-rcurl: boilerplate cleanup (#6771) --- var/spack/repos/builtin/packages/r-rcurl/package.py | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-rcurl/package.py b/var/spack/repos/builtin/packages/r-rcurl/package.py index 21159c3a61..a60499330c 100644 --- a/var/spack/repos/builtin/packages/r-rcurl/package.py +++ b/var/spack/repos/builtin/packages/r-rcurl/package.py @@ -22,21 +22,6 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## -# -# This is a template package file for Spack. We've put "FIXME" -# next to all the things you'll want to change. Once you've handled -# them, you can save this file and test your package like this: -# -# spack install r-rcurl -# -# You can edit this file again by typing: -# -# spack edit r-rcurl -# -# See the Spack documentation for more information on packaging. -# If you submit this package back to Spack as a pull request, -# please first remove this boilerplate and all FIXME comments. -# from spack import * -- cgit v1.2.3-70-g09d2 From e8b1e79fbf17e9fde21ca73519f6b3b540fd3d85 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 2 Jan 2018 12:59:21 -0600 Subject: package py-biopython: remove py-mx dependency (#6772) --- var/spack/repos/builtin/packages/py-biopython/package.py | 1 - 1 file changed, 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-biopython/package.py b/var/spack/repos/builtin/packages/py-biopython/package.py index 8550a161ca..ff50a0fb80 100644 --- a/var/spack/repos/builtin/packages/py-biopython/package.py +++ b/var/spack/repos/builtin/packages/py-biopython/package.py @@ -37,5 +37,4 @@ class PyBiopython(PythonPackage): version('1.70', 'feff7a3e2777e43f9b13039b344e06ff') version('1.65', '143e7861ade85c0a8b5e2bbdd1da1f67') - depends_on('py-mx', type=('build', 'run')) depends_on('py-numpy', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 9ac9017589b3d693580f48ff687ff0a9c9edf490 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 2 Jan 2018 13:10:55 -0600 Subject: new package: py-rseqc (#6773) --- .../repos/builtin/packages/py-rseqc/package.py | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-rseqc/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-rseqc/package.py b/var/spack/repos/builtin/packages/py-rseqc/package.py new file mode 100644 index 0000000000..bfeac28577 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-rseqc/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyRseqc(PythonPackage): + """RSeQC package provides a number of useful modules that can + comprehensively evaluate high throughput sequence data especially RNA-seq + data.""" + + homepage = "http://rseqc.sourceforge.net" + url = "https://pypi.io/packages/source/R/RSeQC/RSeQC-2.6.4.tar.gz" + + version('2.6.4', '935779c452ffc84f3b8b9fb3d485c782') + + depends_on('py-setuptools', type='build') + depends_on('py-bx-python', type=('build', 'run')) + depends_on('py-numpy', type=('build', 'run')) + depends_on('py-pysam', type=('build', 'run')) + depends_on('r', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From b10098dc536375d266d9f3d9eb284d92489ee97e Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Tue, 2 Jan 2018 13:34:24 -0600 Subject: Cython only needed for develop version of mpi4py (#6780) --- var/spack/repos/builtin/packages/py-mpi4py/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-mpi4py/package.py b/var/spack/repos/builtin/packages/py-mpi4py/package.py index f8b6b560c0..c626da9b84 100644 --- a/var/spack/repos/builtin/packages/py-mpi4py/package.py +++ b/var/spack/repos/builtin/packages/py-mpi4py/package.py @@ -43,4 +43,4 @@ class PyMpi4py(PythonPackage): depends_on('python@2.7:2.8,3.3:') depends_on('py-setuptools', type='build') depends_on('mpi') - depends_on('py-cython', when='@3.0.0:', type='build') + depends_on('py-cython', when='@develop', type='build') -- cgit v1.2.3-70-g09d2 From 8271f0e271f0224606fa51dbe5663821763f82ed Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 2 Jan 2018 14:00:13 -0600 Subject: new package: tantan (#6792) --- var/spack/repos/builtin/packages/tantan/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/tantan/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/tantan/package.py b/var/spack/repos/builtin/packages/tantan/package.py new file mode 100644 index 0000000000..b99f2c3116 --- /dev/null +++ b/var/spack/repos/builtin/packages/tantan/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Tantan(MakefilePackage): + """tantan is a tool to mask simple regions (low complexity and + short-period tandem repeats) in DNA, RNA, and protein sequences.""" + + homepage = "http://cbrc3.cbrc.jp/~martin/tantan" + url = "http://cbrc3.cbrc.jp/~martin/tantan/tantan-13.zip" + + version('13', '90a30284a7d0cd04d797527d47bc8bd0') + + def install(self, spec, prefix): + make('prefix={0}'.format(self.prefix), 'install') -- cgit v1.2.3-70-g09d2 From e483f9297af5272d41fe197f1c58b3fe475ee13d Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 2 Jan 2018 14:03:45 -0600 Subject: new package: DIAMOND (#6793) --- .../repos/builtin/packages/diamond/package.py | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 var/spack/repos/builtin/packages/diamond/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/diamond/package.py b/var/spack/repos/builtin/packages/diamond/package.py new file mode 100644 index 0000000000..feb0fe6a81 --- /dev/null +++ b/var/spack/repos/builtin/packages/diamond/package.py @@ -0,0 +1,35 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Diamond(CMakePackage): + """DIAMOND is a sequence aligner for protein and translated DNA searches, + designed for high performance analysis of big sequence data.""" + + homepage = "https://ab.inf.uni-tuebingen.de/software/diamond" + url = "https://github.com/bbuchfink/diamond/archive/v0.9.14.tar.gz" + + version('0.9.14', 'b9e1d0bc57f07afa05dbfbb53c31aae2') -- cgit v1.2.3-70-g09d2 From 5dd5dc01c2aa7720f4e06765e5a51812fc395bb5 Mon Sep 17 00:00:00 2001 From: Milton Woods Date: Wed, 3 Jan 2018 07:18:08 +1100 Subject: new package: Pfunit: unit testing framework for Fortran (#6795) --- var/spack/repos/builtin/packages/pfunit/package.py | 97 ++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 var/spack/repos/builtin/packages/pfunit/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pfunit/package.py b/var/spack/repos/builtin/packages/pfunit/package.py new file mode 100644 index 0000000000..57e473112b --- /dev/null +++ b/var/spack/repos/builtin/packages/pfunit/package.py @@ -0,0 +1,97 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +# +from spack import * +import glob + + +class Pfunit(CMakePackage): + """pFUnit is a unit testing framework enabling JUnit-like testing of + serial and MPI-parallel software written in Fortran.""" + + homepage = "http://pfunit.sourceforge.net/" + url = "https://downloads.sourceforge.net/project/pfunit/Source/pFUnit.tar.gz" + giturl = "https://git.code.sf.net/p/pfunit/code" + + version('3.2.9', git=giturl, + commit='3c1d47f594a7e756f21be59074cb730d1a1e9a79') + version('develop', git=giturl, branch='master') + + variant('mpi', default=False, description='Enable MPI') + variant('openmp', default=False, description='Enable OpenMP') + + depends_on('python', type=('build', 'run')) + depends_on('py-unittest2', type=('run')) + depends_on('mpi', when='+mpi') + + def patch(self): + # The package tries to put .mod files in directory ./mod; + # spack needs to put them in a standard location: + for file in glob.glob('*/CMakeLists.txt'): + filter_file(r'.*/mod($|[^\w].*)', '', file) + + def cmake_args(self): + spec = self.spec + args = ['-DCMAKE_Fortran_MODULE_DIRECTORY=%s' % spec.prefix.include] + if spec.satisfies('+mpi'): + args.extend(['-DMPI=YES', '-DMPI_USE_MPIEXEC=YES', + '-DMPI_Fortran_COMPILER=%s' % spec['mpi'].mpifc]) + else: + args.append('-DMPI=NO') + if spec.satisfies('+openmp'): + args.append('-DOPENMP=YES') + else: + args.append('-DOPENMP=NO') + return args + + def check(self): + """Searches the CMake-generated Makefile for the target ``test`` + and runs it if found. + """ + args = ['tests'] + if self.spec.satisfies('+mpi'): + args.append('MPI=YES') + if self.spec.satisfies('+openmp'): + args.append('OPENMP=YES') + with working_dir(self.build_directory): + make(*args) + + def compiler_vendor(self): + vendors = {'%gcc': 'GNU', '%clang': 'GNU', '%intel': 'Intel', + '%pgi': 'PGI', '%nag': 'NAG'} + for key, value in vendors.items(): + if self.spec.satisfies(key): + return value + raise InstallError('Unsupported compiler.') + + def setup_environment(self, spack_env, run_env): + spack_env.set('PFUNIT', self.spec.prefix) + run_env.set('PFUNIT', self.spec.prefix) + spack_env.set('F90_VENDOR', self.compiler_vendor()) + run_env.set('F90_VENDOR', self.compiler_vendor()) + + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): + spack_env.set('PFUNIT', self.spec.prefix) + spack_env.set('F90_VENDOR', self.compiler_vendor()) -- cgit v1.2.3-70-g09d2 From 2812644ed7e6d3106c3a3e04019225437797b69f Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Tue, 2 Jan 2018 14:06:25 -0700 Subject: paraview package: Explicitly specify MPI compilers in Cmake (#6738) --- var/spack/repos/builtin/packages/paraview/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index 4be48a1b50..bf16bf361f 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -151,7 +151,10 @@ class Paraview(CMakePackage): if '+mpi' in spec: cmake_args.extend([ '-DPARAVIEW_USE_MPI:BOOL=ON', - '-DMPIEXEC:FILEPATH=%s/bin/mpiexec' % spec['mpi'].prefix + '-DMPIEXEC:FILEPATH=%s/bin/mpiexec' % spec['mpi'].prefix, + '-DMPI_CXX_COMPILER:PATH=%s' % spec['mpi'].mpicxx, + '-DMPI_C_COMPILER:PATH=%s' % spec['mpi'].mpicc, + '-DMPI_Fortran_COMPILER:PATH=%s' % spec['mpi'].mpifc ]) if 'darwin' in spec.architecture: -- cgit v1.2.3-70-g09d2 From 285538a78d9b9e748491ea9d9cbc099c73682593 Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Tue, 2 Jan 2018 14:14:22 -0700 Subject: Tioga package: Explicitly list MPI compilers for Cmake (#6741) --- var/spack/repos/builtin/packages/tioga/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/tioga/package.py b/var/spack/repos/builtin/packages/tioga/package.py index 7d770e3437..2901f3e7ca 100644 --- a/var/spack/repos/builtin/packages/tioga/package.py +++ b/var/spack/repos/builtin/packages/tioga/package.py @@ -48,7 +48,10 @@ class Tioga(CMakePackage): options = [ '-DBUILD_SHARED_LIBS:BOOL=%s' % ( - 'ON' if '+shared' in spec else 'OFF') + 'ON' if '+shared' in spec else 'OFF'), + '-DMPI_CXX_COMPILER:PATH=%s' % spec['mpi'].mpicxx, + '-DMPI_C_COMPILER:PATH=%s' % spec['mpi'].mpicc, + '-DMPI_Fortran_COMPILER:PATH=%s' % spec['mpi'].mpifc ] return options -- cgit v1.2.3-70-g09d2 From 08ea9808c6df888744bdea5ec6f76f4b41cde2ba Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Tue, 2 Jan 2018 19:24:28 -0600 Subject: adding specific version url for augustus 3.3 due to old folder structure (#6813) --- var/spack/repos/builtin/packages/augustus/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/augustus/package.py b/var/spack/repos/builtin/packages/augustus/package.py index d79cde02c5..258bc55085 100644 --- a/var/spack/repos/builtin/packages/augustus/package.py +++ b/var/spack/repos/builtin/packages/augustus/package.py @@ -32,7 +32,8 @@ class Augustus(MakefilePackage): homepage = "http://bioinf.uni-greifswald.de/augustus/" url = "http://bioinf.uni-greifswald.de/augustus/binaries/augustus-3.3.tar.gz" - version('3.3', '9ebe494df78ebf6a43091cfc8551050c') + version('3.3', '9ebe494df78ebf6a43091cfc8551050c', + url='http://bioinf.uni-greifswald.de/augustus/binaries/augustus-3.3.tar.gz') version('3.2.3', 'b8c47ea8d0c45aa7bb9a82626c8ff830', url='http://bioinf.uni-greifswald.de/augustus/binaries/old/augustus-3.2.3.tar.gz') -- cgit v1.2.3-70-g09d2 From 7db7b5b5964eda045c032c829b879030bc3b4ce1 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 2 Jan 2018 19:25:08 -0600 Subject: MinCED: Create new package (#6815) --- var/spack/repos/builtin/packages/minced/package.py | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 var/spack/repos/builtin/packages/minced/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/minced/package.py b/var/spack/repos/builtin/packages/minced/package.py new file mode 100644 index 0000000000..b30d427088 --- /dev/null +++ b/var/spack/repos/builtin/packages/minced/package.py @@ -0,0 +1,44 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Minced(Package): + """MinCED is a program to find Clustered Regularly Interspaced Short + Palindromic Repeats (CRISPRs) in full genomes or environmental datasets + such as metagenomes, in which sequence size can be anywhere from 100 to + 800 bp.""" + + homepage = "https://github.com/ctSkennerton/minced" + url = "https://github.com/ctSkennerton/minced/archive/0.2.0.tar.gz" + + version('0.2.0', '32544f5a523f10fece6a127699e11245') + + depends_on('java', type=('build', 'run')) + + def install(self, spec, prefix): + make() + install('minced', prefix) + install('minced.jar', prefix) -- cgit v1.2.3-70-g09d2 From 958abe5b298f255df5e4aef94b12d647f1319650 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 2 Jan 2018 19:27:42 -0600 Subject: py-pyani: Create new package (#6811) --- .../repos/builtin/packages/py-pyani/package.py | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-pyani/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pyani/package.py b/var/spack/repos/builtin/packages/py-pyani/package.py new file mode 100644 index 0000000000..fb7520342b --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pyani/package.py @@ -0,0 +1,55 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPyani(PythonPackage): + """pyani is a Python3 module that provides support for calculating + average nucleotide identity (ANI) and related measures for whole genome + comparisons, and rendering relevant graphical summary output. Where + available, it takes advantage of multicore systems, and can integrate + with SGE/OGE-type job schedulers for the sequence comparisons.""" + + homepage = "http://widdowquinn.github.io/pyani" + url = "https://pypi.io/packages/source/p/pyani/pyani-0.2.7.tar.gz" + + version('0.2.7', '239ba630d375a81c35b7c60fb9bec6fa') + version('0.2.6', 'd5524b9a3c62c36063ed474ea95785c9') + + depends_on('python@3.5:') + depends_on('py-setuptools', type='build') + depends_on('py-matplotlib', type=('build', 'run')) + depends_on('py-seaborn', type=('build', 'run')) + + # Required for ANI analysis + depends_on('py-biopython', type=('build', 'run')) + depends_on('py-pandas', type=('build', 'run')) + depends_on('py-scipy', type=('build', 'run')) + + # Required for ANIb analysis + depends_on('blast-plus~python', type='run') + + # Required for ANIm analysis + depends_on('mummer', type='run') -- cgit v1.2.3-70-g09d2 From 2aaba189edf3ca388d178aa7750d3281fa21f087 Mon Sep 17 00:00:00 2001 From: stefanosoffia Date: Wed, 3 Jan 2018 02:29:47 +0100 Subject: Updated 'nginx' from v1.12.0 to v1.13.8. (#6810) This fixes build issues with most recent gcc versions. See issue #6252. --- var/spack/repos/builtin/packages/nginx/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nginx/package.py b/var/spack/repos/builtin/packages/nginx/package.py index a9b5e93bfb..f0375b82c7 100644 --- a/var/spack/repos/builtin/packages/nginx/package.py +++ b/var/spack/repos/builtin/packages/nginx/package.py @@ -33,6 +33,7 @@ class Nginx(AutotoolsPackage): homepage = "https://nginx.org/en/" url = "https://nginx.org/download/nginx-1.12.0.tar.gz" + version('1.13.8', 'df4be9294365782dc1349ca33ce8c4ac') version('1.12.0', '995eb0a140455cf0cfc497e5bd7f94b3') depends_on('openssl') -- cgit v1.2.3-70-g09d2 From 7f319b9f84e441cbe893fd2cc68ecd77cfcfd987 Mon Sep 17 00:00:00 2001 From: Sinan Date: Tue, 2 Jan 2018 17:36:59 -0800 Subject: create perl-file-which package (#6800) * create perl-file-which package * trivial edits for package.py so trivial edits for package.py so that flake8 will not complain --- .../builtin/packages/perl-file-which/package.py | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-file-which/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-file-which/package.py b/var/spack/repos/builtin/packages/perl-file-which/package.py new file mode 100644 index 0000000000..c4650db77a --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-file-which/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlFileWhich(PerlPackage): + """Perl implementation of the which utility as an API""" + + homepage = "http://cpansearch.perl.org/src/PLICEASE/File-Which-1.22/lib/File/Which.pm" + url = "http://search.cpan.org/CPAN/authors/id/P/PL/PLICEASE/File-Which-1.22.tar.gz" + + version('1.22', 'face60fafd220dc83fa581ef6f96d480') -- cgit v1.2.3-70-g09d2 From fef93d2221b370b54d33ae432f97a33f6e7b70e4 Mon Sep 17 00:00:00 2001 From: peetsv <32349688+peetsv@users.noreply.github.com> Date: Tue, 2 Jan 2018 17:42:09 -0800 Subject: perl-xml-libxml: adding perl module (#6783) * perl-xml-libxml: adding perl module * line length change --- .../builtin/packages/perl-xml-libxml/package.py | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-xml-libxml/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-xml-libxml/package.py b/var/spack/repos/builtin/packages/perl-xml-libxml/package.py new file mode 100644 index 0000000000..3ec6493f7f --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-xml-libxml/package.py @@ -0,0 +1,35 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlXmlLibxml(PerlPackage): + """This module is an interface to libxml2, providing XML and HTML parsers + with DOM, SAX and XMLReader interfaces""" + + homepage = "http://search.cpan.org/~shlomif/XML-LibXML-2.0132/LibXML.pod" + url = "http://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0132.tar.gz" + + version('2.0132', '43546fd9a3974f19323f9fb04861ece9') -- cgit v1.2.3-70-g09d2 From e1e24ff80e9ff9b21fdbf6f594a55a984fabf243 Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Tue, 2 Jan 2018 18:42:47 -0700 Subject: Adding option to build Nalu with Hypre support. (#6782) --- var/spack/repos/builtin/packages/nalu/package.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nalu/package.py b/var/spack/repos/builtin/packages/nalu/package.py index 4a7ca67897..b7b9ea4666 100644 --- a/var/spack/repos/builtin/packages/nalu/package.py +++ b/var/spack/repos/builtin/packages/nalu/package.py @@ -41,15 +41,18 @@ class Nalu(CMakePackage): description='Compile with OpenFAST support') variant('tioga', default=False, description='Compile with Tioga support') + variant('hypre', default=False, + description='Compile with Hypre support') version('master', git='https://github.com/NaluCFD/Nalu.git', branch='master') - # Currently Nalu only builds static libraries; To be fixed soon + # Currently Nalu only builds with certain libraries statically depends_on('yaml-cpp+pic~shared@0.5.3:') depends_on('trilinos~shared+exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist+superlu+hdf5+zlib+pnetcdf+shards@master,12.12.1:') depends_on('openfast+cxx', when='+openfast') depends_on('tioga', when='+tioga') + depends_on('hypre+mpi+int64~shared', when='+hypre') def cmake_args(self): spec = self.spec @@ -73,4 +76,10 @@ class Nalu(CMakePackage): '-DTIOGA_DIR:PATH=%s' % spec['tioga'].prefix ]) + if '+hypre' in spec: + options.extend([ + '-DENABLE_HYPRE:BOOL=ON', + '-DHYPRE_DIR:PATH=%s' % spec['hypre'].prefix + ]) + return options -- cgit v1.2.3-70-g09d2 From 6922ea588962bc1bbcdcdc93ae44e630553e29af Mon Sep 17 00:00:00 2001 From: Milton Woods Date: Wed, 3 Jan 2018 12:43:55 +1100 Subject: Esmf fixes for Cray, OSX and mpich (#6768) * esmf: put .mod files in the spack compiler search path * esmf: allow building with Cray mpi * esmf: create run-path dependent libraries on osx * esmf: link fortran interface libraries when building with mpich --- .../packages/esmf/darwin_dylib_install_name.patch | 18 ++++++++++++++++++ var/spack/repos/builtin/packages/esmf/package.py | 16 +++++++++++++--- 2 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 var/spack/repos/builtin/packages/esmf/darwin_dylib_install_name.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/esmf/darwin_dylib_install_name.patch b/var/spack/repos/builtin/packages/esmf/darwin_dylib_install_name.patch new file mode 100644 index 0000000000..0f363b378c --- /dev/null +++ b/var/spack/repos/builtin/packages/esmf/darwin_dylib_install_name.patch @@ -0,0 +1,18 @@ +--- a/build/common.mk 2017-11-25 17:16:31.000000000 +1100 ++++ b/build/common.mk 2017-11-25 17:26:20.000000000 +1100 +@@ -3415,11 +3415,11 @@ + mkdir tmp_$$NEXTLIB ;\ + cd tmp_$$NEXTLIB ;\ + $(ESMF_AREXTRACT) ../$$NEXTLIB.a ;\ +- echo $(ESMF_SL_LIBLINKER) $(ESMF_SL_LIBOPTS) -o $(ESMF_LDIR)/$$NEXTLIB.$(ESMF_SL_SUFFIX) *.o $(ESMF_SL_LIBLIBS) ;\ +- $(ESMF_SL_LIBLINKER) $(ESMF_SL_LIBOPTS) -o $(ESMF_LDIR)/$$NEXTLIB.$(ESMF_SL_SUFFIX) *.o $(ESMF_SL_LIBLIBS) ;\ ++ echo $(ESMF_SL_LIBLINKER) $(ESMF_SL_LIBOPTS) -Wl,-install_name -Wl,@rpath/$$NEXTLIB.$(ESMF_SL_SUFFIX) -o $(ESMF_LDIR)/$$NEXTLIB.$(ESMF_SL_SUFFIX) *.o $(ESMF_SL_LIBLIBS) ;\ ++ $(ESMF_SL_LIBLINKER) $(ESMF_SL_LIBOPTS) -Wl,-install_name -Wl,@rpath/$$NEXTLIB.$(ESMF_SL_SUFFIX) -o $(ESMF_LDIR)/$$NEXTLIB.$(ESMF_SL_SUFFIX) *.o $(ESMF_SL_LIBLIBS) ;\ + echo Converting $$NEXTLIB.a to $$NEXTLIB\_fullylinked.$(ESMF_SL_SUFFIX) ;\ +- echo $(ESMF_SL_LIBLINKER) $(ESMF_SL_LIBOPTS) -o $(ESMF_LDIR)/$$NEXTLIB\_fullylinked.$(ESMF_SL_SUFFIX) *.o $(ESMF_CXXLINKOPTS) $(ESMF_CXXLINKPATHS) $(ESMF_CXXLINKRPATHS) $(ESMF_CXXLINKLIBS) ;\ +- $(ESMF_SL_LIBLINKER) $(ESMF_SL_LIBOPTS) -o $(ESMF_LDIR)/$$NEXTLIB\_fullylinked.$(ESMF_SL_SUFFIX) *.o $(ESMF_CXXLINKOPTS) $(ESMF_CXXLINKPATHS) $(ESMF_CXXLINKRPATHS) $(ESMF_CXXLINKLIBS) ;\ ++ echo $(ESMF_SL_LIBLINKER) $(ESMF_SL_LIBOPTS) -Wl,-install_name -Wl,@rpath/$$NEXTLIB\_fullylinked.$(ESMF_SL_SUFFIX) -o $(ESMF_LDIR)/$$NEXTLIB\_fullylinked.$(ESMF_SL_SUFFIX) *.o $(ESMF_CXXLINKOPTS) $(ESMF_CXXLINKPATHS) $(ESMF_CXXLINKRPATHS) $(ESMF_CXXLINKLIBS) ;\ ++ $(ESMF_SL_LIBLINKER) $(ESMF_SL_LIBOPTS) -Wl,-install_name -Wl,@rpath/$$NEXTLIB\_fullylinked.$(ESMF_SL_SUFFIX) -o $(ESMF_LDIR)/$$NEXTLIB\_fullylinked.$(ESMF_SL_SUFFIX) *.o $(ESMF_CXXLINKOPTS) $(ESMF_CXXLINKPATHS) $(ESMF_CXXLINKRPATHS) $(ESMF_CXXLINKLIBS) ;\ + cd .. ;\ + $(ESMF_RM) -r tmp_$$NEXTLIB ;\ + fi ;\ diff --git a/var/spack/repos/builtin/packages/esmf/package.py b/var/spack/repos/builtin/packages/esmf/package.py index 394e316751..cabe108dd9 100644 --- a/var/spack/repos/builtin/packages/esmf/package.py +++ b/var/spack/repos/builtin/packages/esmf/package.py @@ -69,6 +69,10 @@ class Esmf(MakefilePackage): # https://sourceforge.net/p/esmf/esmf/ci/34de0ccf556ba75d35c9687dae5d9f666a1b2a18/ patch('mvapich2.patch', when='@:7.0.99') + # Allow different directories for creation and + # installation of dynamic libraries on OSX: + patch('darwin_dylib_install_name.patch', when='platform=darwin') + # Make script from mvapich2.patch executable @run_before('build') @when('@:7.0.99') @@ -104,7 +108,7 @@ class Esmf(MakefilePackage): # bin/binO/Linux.gfortran.64.default.default os.environ['ESMF_INSTALL_BINDIR'] = 'bin' os.environ['ESMF_INSTALL_LIBDIR'] = 'lib' - os.environ['ESMF_INSTALL_MODDIR'] = 'mod' + os.environ['ESMF_INSTALL_MODDIR'] = 'include' ############ # Compiler # @@ -149,11 +153,17 @@ class Esmf(MakefilePackage): # ESMF_COMM must be set to indicate which MPI implementation # is used to build the ESMF library. if '+mpi' in spec: - if '^mvapich2' in spec: + if 'platform=cray' in self.spec: + os.environ['ESMF_COMM'] = 'mpi' + elif '^mvapich2' in spec: os.environ['ESMF_COMM'] = 'mvapich2' elif '^mpich' in spec: - # FIXME: mpich or mpich2? + # esmf@7.0.1 does not include configs for mpich3, + # so we start with the configs for mpich2: os.environ['ESMF_COMM'] = 'mpich2' + # The mpich 3 series split apart the Fortran and C bindings, + # so we link the Fortran libraries when building C programs: + os.environ['ESMF_CXXLINKLIBS'] = '-lmpifort' elif '^openmpi' in spec: os.environ['ESMF_COMM'] = 'openmpi' elif '^intel-parallel-studio+mpi' in spec: -- cgit v1.2.3-70-g09d2 From 353870fe50dc2ee6f3978978d5974aaffcca84fc Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Tue, 2 Jan 2018 19:57:54 -0600 Subject: jags: lapack fix (#6764) * jags: fixing openblas thows a lapack error when compiling. atlas works. other lapack providers may work. also adding tags * changing blas/lapack reference * removing openblas conflict * jags: whitespace cleanup for flake8 --- var/spack/repos/builtin/packages/jags/package.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/jags/package.py b/var/spack/repos/builtin/packages/jags/package.py index 248f4019d6..4e9d77735d 100644 --- a/var/spack/repos/builtin/packages/jags/package.py +++ b/var/spack/repos/builtin/packages/jags/package.py @@ -30,6 +30,8 @@ class Jags(AutotoolsPackage): Bayesian hierarchical models using Markov Chain Monte Carlo (MCMC) simulation not wholly unlike BUGS""" + tags = ['mcmc', 'Gibbs sampler'] + homepage = "http://mcmc-jags.sourceforge.net/" url = "https://downloads.sourceforge.net/project/mcmc-jags/JAGS/4.x/Source/JAGS-4.2.0.tar.gz" @@ -39,6 +41,6 @@ class Jags(AutotoolsPackage): depends_on('lapack') def configure_args(self): - args = ['--with-blas=-L%s' % self.spec['blas'].prefix.lib, - '--with-lapack=-L%s' % self.spec['lapack'].prefix.lib] + args = ['--with-blas=%s' % self.spec['blas'].libs.ld_flags, + '--with-lapack=%s' % self.spec['lapack'].libs.ld_flags] return args -- cgit v1.2.3-70-g09d2 From cc74da5aab95e35a8e9828d0df0595c456634c0e Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Wed, 3 Jan 2018 02:58:38 +0100 Subject: mesa: disable binutils on macOS (#6763) --- var/spack/repos/builtin/packages/mesa/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py index 9b91f8f332..7d10632806 100644 --- a/var/spack/repos/builtin/packages/mesa/package.py +++ b/var/spack/repos/builtin/packages/mesa/package.py @@ -21,7 +21,7 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## - +import sys from spack import * @@ -57,7 +57,7 @@ class Mesa(AutotoolsPackage): depends_on('pkgconfig', type='build') depends_on('flex@2.5.35:', type='build') depends_on('bison@2.4.1:', type='build') - depends_on('binutils', type='build') + depends_on('binutils', type='build', when=(sys.platform != 'darwin')) depends_on('python@2.6.4:', type='build') depends_on('py-mako@0.3.4:', type='build') depends_on('gettext') -- cgit v1.2.3-70-g09d2 From 3d257e82806981a5c8e96eb07584c3aa3940a6f1 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Wed, 3 Jan 2018 02:59:14 +0100 Subject: likwid: add stable 4.3.0 (#6761) --- var/spack/repos/builtin/packages/likwid/package.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/likwid/package.py b/var/spack/repos/builtin/packages/likwid/package.py index b0af002623..f9510273d8 100644 --- a/var/spack/repos/builtin/packages/likwid/package.py +++ b/var/spack/repos/builtin/packages/likwid/package.py @@ -36,9 +36,8 @@ class Likwid(Package): maintainers = ['davydden'] - # The hash for 4.3.0 changes regularly - version('4.3.0', '20541515fdc6d68e82628170e0042485') - version('4.2.1', 'c408ddcf0317cdd894af4c580cd74294', preferred=True) + version('4.3.0', '7f8f6981d7d341fce2621554323f8c8b') + version('4.2.1', 'c408ddcf0317cdd894af4c580cd74294') version('4.2.0', 'e41ff334b8f032a323d941ce32907a75') version('4.1.2', 'a857ce5bd23e31d96e2963fe81cb38f0') -- cgit v1.2.3-70-g09d2 From a92268d62ac47a37391df02ef0c077965b1dda0b Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Tue, 2 Jan 2018 19:01:23 -0700 Subject: Lbann update (#6751) * Added a package for the MDAnalysis toolkit. * Updated the LBANN recipe to use the revised cmake environment being rolled out. * Flake8 errors --- var/spack/repos/builtin/packages/lbann/package.py | 61 ++++++++++++++++++++++- 1 file changed, 59 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index 5e65566cb2..8cfd6e4c62 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -34,12 +34,17 @@ class Lbann(CMakePackage): url = "https://github.com/LLNL/lbann/archive/v0.91.tar.gz" version('develop', git='https://github.com/LLNL/lbann.git', branch="develop") + version('0.93', '1913a25a53d4025fa04c16f14afdaa55') + version('0.92', 'c0eb1595a7c74640e96f280beb497564') version('0.91', '83b0ec9cd0b7625d41dfb06d2abd4134') variant('gpu', default=False, description='Builds with support for GPUs via CUDA and cuDNN') + variant('nccl', default=False, description='Builds with support for NCCL communication lib') variant('opencv', default=True, description='Builds with support for image processing routines with OpenCV') variant('seq_init', default=False, description='Force serial initialization of weight matrices.') - variant('dtype', default=4, description='Size (bits) of floating point representation for weights') + variant('dtype', default='float', + description='Type for floating point representation of weights', + values=('float', 'double')) variant('build_type', default='Release', description='The build type to build', values=('Debug', 'Release')) @@ -55,7 +60,55 @@ class Lbann(CMakePackage): depends_on('opencv@3.2.0: +openmp +core +highgui +imgproc +jpeg +png +tiff +zlib ~eigen', when='+opencv') depends_on('protobuf@3.0.2:') depends_on('cnpy') + depends_on('nccl', when='+gpu +nccl') + @when('@0.94:') + def cmake_args(self): + spec = self.spec + # Environment variables + CPPFLAGS = [] + CPPFLAGS.append('-DLBANN_SET_EL_RNG') + + args = [ + '-DCMAKE_INSTALL_MESSAGE=LAZY', + '-DCMAKE_CXX_FLAGS=%s' % ' '.join(CPPFLAGS), + '-DLBANN_WITH_TOPO_AWARE:BOOL=%s' % ('+gpu +nccl' in spec), + '-DLBANN_SEQUENTIAL_INITIALIZATION:BOOL=%s' % + ('+seq_init' in spec), + '-DLBANN_WITH_TBINF=OFF', + '-DLBANN_WITH_VTUNE=OFF', + '-DElemental_DIR={0}/CMake/elemental'.format( + spec['elemental'].prefix), + '-DCNPY_DIR={0}'.format(spec['cnpy'].prefix), + '-DLBANN_DATATYPE={0}'.format(spec.variants['dtype'].value), + '-DLBANN_VERBOSE=0', + '-DLBANN_VERSION=spack'] + + if '+opencv' in spec: + args.extend(['-DOpenCV_DIR:STRING={0}'.format( + spec['opencv'].prefix)]) + + if '+gpu' in spec: + args.extend([ + '-DLBANN_WITH_CUDA:BOOL=%s' % ('+gpu' in spec), + '-DLBANN_WITH_SOFTMAX_CUDA:BOOL=%s' % ('+gpu' in spec), + '-DCUDA_TOOLKIT_ROOT_DIR={0}'.format( + spec['cuda'].prefix)]) + args.extend([ + '-DLBANN_WITH_CUDNN:BOOL=%s' % ('+gpu' in spec), + '-DcuDNN_DIR={0}'.format( + spec['cudnn'].prefix)]) + args.extend(['-DCUB_DIR={0}'.format( + spec['cub'].prefix)]) + if '+nccl' in spec: + args.extend([ + '-DLBANN_WITH_NCCL:BOOL=%s' % ('+gpu +nccl' in spec), + '-DNCCL_DIR={0}'.format( + spec['nccl'].prefix)]) + + return args + + @when('@:0.93') def cmake_args(self): spec = self.spec # Environment variables @@ -76,11 +129,15 @@ class Lbann(CMakePackage): '-DELEMENTAL_MATH_LIBS={0}'.format( spec['elemental'].libs), '-DSEQ_INIT:BOOL=%s' % ('+seq_init' in spec), - '-DDATATYPE={0}'.format(int(spec.variants['dtype'].value)), '-DVERBOSE=0', '-DLBANN_HOME=.', '-DLBANN_VER=spack'] + if spec.variants['dtype'].value == 'float': + args.extend(['-DDATATYPE=4']) + elif spec.variants['dtype'].value == 'double': + args.extend(['-DDATATYPE=8']) + if '+opencv' in spec: args.extend(['-DOpenCV_DIR:STRING={0}'.format( spec['opencv'].prefix)]) -- cgit v1.2.3-70-g09d2 From fd6b9ac3af077bd35a66dfd5aaf0fe48375304ff Mon Sep 17 00:00:00 2001 From: Feiyi Wang Date: Tue, 2 Jan 2018 19:02:03 -0700 Subject: py-xattr: a python interface to access extended file attribute (#6747) * py-xattr: a python interface to access extended file attribute * py-xattr: style fix --- .../repos/builtin/packages/py-xattr/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-xattr/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-xattr/package.py b/var/spack/repos/builtin/packages/py-xattr/package.py new file mode 100644 index 0000000000..0eb256b436 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-xattr/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyXattr(PythonPackage): + """A python interface to access extended file attributes, + sans libattr dependency""" + + homepage = "http://pyxattr.k1024.org/" + + version('develop', git='https://github.com/fwang2/pyxattr.git', + branch='dev') + + depends_on('python@2.7:') + depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From 4b5fe75bc38b9e4f45d077aabb6909daca31a70f Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Wed, 3 Jan 2018 03:03:27 +0100 Subject: add OctavePackage (#6746) * add OctavePackage 1. remove import CudaPackage which is not needed anymore 2. mention CudaPackage and OctavePackage in packaging guide 3. adjust OctavePackageTemplate 4. add clue file for Octave build 5. sanity check on self.prefix * use setup_environment --- lib/spack/docs/packaging_guide.rst | 7 +++ lib/spack/spack/__init__.py | 4 ++ lib/spack/spack/build_systems/octave.py | 71 ++++++++++++++++++++++ lib/spack/spack/cmd/create.py | 12 +--- .../repos/builtin/packages/bohrium/package.py | 1 - var/spack/repos/builtin/packages/dealii/package.py | 1 - .../repos/builtin/packages/octave-optim/package.py | 15 +---- .../builtin/packages/octave-splines/package.py | 11 +--- .../builtin/packages/octave-struct/package.py | 15 +---- 9 files changed, 88 insertions(+), 49 deletions(-) create mode 100644 lib/spack/spack/build_systems/octave.py (limited to 'var') diff --git a/lib/spack/docs/packaging_guide.rst b/lib/spack/docs/packaging_guide.rst index 09bd2632b3..b46caa82e9 100644 --- a/lib/spack/docs/packaging_guide.rst +++ b/lib/spack/docs/packaging_guide.rst @@ -2240,6 +2240,10 @@ The classes that are currently provided by Spack are: | :py:class:`.CMakePackage` | Specialized class for packages | | | built using CMake | +-------------------------------+----------------------------------+ + | :py:class:`.CudaPackage` | A helper class for packages that | + | | use CUDA. It is intended to be | + | | used in combination with others | + +-------------------------------+----------------------------------+ | :py:class:`.QMakePackage` | Specialized class for packages | | | build using QMake | +-------------------------------+----------------------------------+ @@ -2252,6 +2256,9 @@ The classes that are currently provided by Spack are: | :py:class:`.RPackage` | Specialized class for | | | :py:class:`.R` extensions | +-------------------------------+----------------------------------+ + | :py:class:`.OctavePackage` | Specialized class for | + | | :py:class:`.Octave` packages | + +-------------------------------+----------------------------------+ | :py:class:`.PythonPackage` | Specialized class for | | | :py:class:`.Python` extensions | +-------------------------------+----------------------------------+ diff --git a/lib/spack/spack/__init__.py b/lib/spack/spack/__init__.py index 03eee6daf6..f52dc8c2a7 100644 --- a/lib/spack/spack/__init__.py +++ b/lib/spack/spack/__init__.py @@ -184,9 +184,11 @@ from spack.build_systems.makefile import MakefilePackage from spack.build_systems.aspell_dict import AspellDictPackage from spack.build_systems.autotools import AutotoolsPackage from spack.build_systems.cmake import CMakePackage +from spack.build_systems.cuda import CudaPackage from spack.build_systems.qmake import QMakePackage from spack.build_systems.scons import SConsPackage from spack.build_systems.waf import WafPackage +from spack.build_systems.octave import OctavePackage from spack.build_systems.python import PythonPackage from spack.build_systems.r import RPackage from spack.build_systems.perl import PerlPackage @@ -201,9 +203,11 @@ __all__ += [ 'AspellDictPackage', 'AutotoolsPackage', 'CMakePackage', + 'CudaPackage', 'QMakePackage', 'SConsPackage', 'WafPackage', + 'OctavePackage', 'PythonPackage', 'RPackage', 'PerlPackage', diff --git a/lib/spack/spack/build_systems/octave.py b/lib/spack/spack/build_systems/octave.py new file mode 100644 index 0000000000..af4651d1e1 --- /dev/null +++ b/lib/spack/spack/build_systems/octave.py @@ -0,0 +1,71 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +import inspect + +from spack.directives import depends_on, extends +from spack.package import PackageBase, run_after + + +class OctavePackage(PackageBase): + """Specialized class for Octave packages. See + https://www.gnu.org/software/octave/doc/v4.2.0/Installing-and-Removing-Packages.html + for more information. + + This class provides the following phases that can be overridden: + + 1. :py:meth:`~.OctavePackage.install` + + """ + # Default phases + phases = ['install'] + + # To be used in UI queries that require to know which + # build-system class we are using + build_system_class = 'OctavePackage' + + extends('octave') + depends_on('octave', type=('build', 'run')) + + def setup_environment(self, spack_env, run_env): + """Set up the compile and runtime environments for a package.""" + # octave does not like those environment variables to be set: + spack_env.unset('CC') + spack_env.unset('CXX') + spack_env.unset('FC') + + def install(self, spec, prefix): + """Install the package from the archive file""" + inspect.getmodule(self).octave( + '--quiet', + '--norc', + '--built-in-docstrings-file=/dev/null', + '--texi-macros-file=/dev/null', + '--eval', 'pkg prefix %s; pkg install %s' % + (prefix, self.stage.archive_file)) + + # Testing + + # Check that self.prefix is there after installation + run_after('install')(PackageBase.sanity_check_prefix) diff --git a/lib/spack/spack/cmd/create.py b/lib/spack/spack/cmd/create.py index 2e67b7648b..897355e807 100644 --- a/lib/spack/spack/cmd/create.py +++ b/lib/spack/spack/cmd/create.py @@ -332,21 +332,14 @@ class PerlbuildPackageTemplate(PerlmakePackageTemplate): class OctavePackageTemplate(PackageTemplate): """Provides appropriate overrides for octave packages""" + base_class_name = 'OctavePackage' + dependencies = """\ extends('octave') # FIXME: Add additional dependencies if required. # depends_on('octave-foo', type=('build', 'run'))""" - body = """\ - def install(self, spec, prefix): - # FIXME: Add logic to build and install here. - octave('--quiet', '--norc', - '--built-in-docstrings-file=/dev/null', - '--texi-macros-file=/dev/null', - '--eval', 'pkg prefix {0}; pkg install {1}'.format( - prefix, self.stage.archive_file))""" - def __init__(self, name, *args): # If the user provided `--name octave-splines`, don't rename it # octave-octave-splines @@ -464,6 +457,7 @@ class BuildSystemGuesser: (r'/Makefile\.PL$', 'perlmake'), (r'/.*\.pro$', 'qmake'), (r'/(GNU)?[Mm]akefile$', 'makefile'), + (r'/DESCRIPTION$', 'octave'), ] # Peek inside the compressed file. diff --git a/var/spack/repos/builtin/packages/bohrium/package.py b/var/spack/repos/builtin/packages/bohrium/package.py index f54cb8a34d..91551e72c5 100644 --- a/var/spack/repos/builtin/packages/bohrium/package.py +++ b/var/spack/repos/builtin/packages/bohrium/package.py @@ -22,7 +22,6 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## -from spack.build_systems.cuda import CudaPackage from spack import * from spack.package_test import compare_output from spack.util.executable import Executable diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 593b9511ea..c64552478f 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from spack.build_systems.cuda import CudaPackage class Dealii(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/octave-optim/package.py b/var/spack/repos/builtin/packages/octave-optim/package.py index 2c676f28dc..0091e66496 100644 --- a/var/spack/repos/builtin/packages/octave-optim/package.py +++ b/var/spack/repos/builtin/packages/octave-optim/package.py @@ -23,10 +23,9 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -import os -class OctaveOptim(Package): +class OctaveOptim(OctavePackage): """Non-linear optimization toolkit for Octave.""" homepage = "https://octave.sourceforge.io/optim/" @@ -35,16 +34,4 @@ class OctaveOptim(Package): version('1.5.2', 'd3d77982869ea7c1807b13b24e044d44') depends_on('octave-struct@1.0.12:') - extends('octave@3.6.0:') - - def install(self, spec, prefix): - os.environ.pop('CC', '') - os.environ.pop('CXX', '') - os.environ.pop('FC', '') - octave('--quiet', - '--norc', - '--built-in-docstrings-file=/dev/null', - '--texi-macros-file=/dev/null', - '--eval', 'pkg prefix %s; pkg install %s' % - (prefix, self.stage.archive_file)) diff --git a/var/spack/repos/builtin/packages/octave-splines/package.py b/var/spack/repos/builtin/packages/octave-splines/package.py index c9a5f7b01d..79341807c6 100644 --- a/var/spack/repos/builtin/packages/octave-splines/package.py +++ b/var/spack/repos/builtin/packages/octave-splines/package.py @@ -25,20 +25,11 @@ from spack import * -class OctaveSplines(Package): +class OctaveSplines(OctavePackage): """Additional spline functions.""" homepage = "http://octave.sourceforge.net/splines/index.html" url = "http://downloads.sourceforge.net/octave/splines-1.3.1.tar.gz" version('1.3.1', 'f9665d780c37aa6a6e17d1f424c49bdeedb89d1192319a4e39c08784122d18f9') - extends('octave@3.6.0:') - - def install(self, spec, prefix): - octave('--quiet', - '--norc', - '--built-in-docstrings-file=/dev/null', - '--texi-macros-file=/dev/null', - '--eval', 'pkg prefix %s; pkg install %s' % - (prefix, self.stage.archive_file)) diff --git a/var/spack/repos/builtin/packages/octave-struct/package.py b/var/spack/repos/builtin/packages/octave-struct/package.py index 8a342507aa..0af7f572fd 100644 --- a/var/spack/repos/builtin/packages/octave-struct/package.py +++ b/var/spack/repos/builtin/packages/octave-struct/package.py @@ -23,26 +23,13 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -import os -class OctaveStruct(Package): +class OctaveStruct(OctavePackage): """Additional structure manipulation functions for Octave.""" homepage = "https://octave.sourceforge.io/struct/" url = "https://downloads.sourceforge.net/octave/struct-1.0.14.tar.gz" version('1.0.14', '3589d5eb8000f18426e2178587eb82f4') - extends('octave@2.9.7:') - - def install(self, spec, prefix): - os.environ.pop('CC', '') - os.environ.pop('CXX', '') - os.environ.pop('FC', '') - octave('--quiet', - '--norc', - '--built-in-docstrings-file=/dev/null', - '--texi-macros-file=/dev/null', - '--eval', 'pkg prefix %s; pkg install %s' % - (prefix, self.stage.archive_file)) -- cgit v1.2.3-70-g09d2 From 59cd2db8f37863eed4ab4213041dabc41c944a0d Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Tue, 2 Jan 2018 20:05:04 -0600 Subject: gatk: boilerplate cleanup (#6744) --- var/spack/repos/builtin/packages/gatk/package.py | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gatk/package.py b/var/spack/repos/builtin/packages/gatk/package.py index 728fae94da..550d89fe4c 100644 --- a/var/spack/repos/builtin/packages/gatk/package.py +++ b/var/spack/repos/builtin/packages/gatk/package.py @@ -22,21 +22,6 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## -# -# This is a template package file for Spack. We've put "FIXME" -# next to all the things you'll want to change. Once you've handled -# them, you can save this file and test your package like this: -# -# spack install gatk -# -# You can edit this file again by typing: -# -# spack edit gatk -# -# See the Spack documentation for more information on packaging. -# If you submit this package back to Spack as a pull request, -# please first remove this boilerplate and all FIXME comments. -# from spack import * from shutil import copyfile import glob -- cgit v1.2.3-70-g09d2 From 8221265c3ceeb83386e32da254e6e03807be27d1 Mon Sep 17 00:00:00 2001 From: Feiyi Wang Date: Tue, 2 Jan 2018 19:08:58 -0700 Subject: py-scandir: a better directory iterator, backport to 2.7 (#6739) --- .../repos/builtin/packages/py-scandir/package.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-scandir/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-scandir/package.py b/var/spack/repos/builtin/packages/py-scandir/package.py new file mode 100644 index 0000000000..81f9d6875f --- /dev/null +++ b/var/spack/repos/builtin/packages/py-scandir/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyScandir(PythonPackage): + """scandir, a better directory iterator and faster os.walk().""" + + homepage = "https://github.com/benhoyt/scandir" + url = "https://pypi.io/packages/source/s/scandir/scandir-1.6.tar.gz" + + version('1.6', '0180ddb97c96cbb2d4f25d2ae11c64ac') + + depends_on('python@2.7:') + depends_on('py-setuptools', type=('build')) -- cgit v1.2.3-70-g09d2 From 8ed1c8453995580d1af2bed75162e06bb3ef836f Mon Sep 17 00:00:00 2001 From: Feiyi Wang Date: Tue, 2 Jan 2018 19:10:49 -0700 Subject: py-lrudict: a LRU-based cache dictionary (#6734) * add py-lrudict * style fix * style fix: add blank lines --- .../repos/builtin/packages/py-lrudict/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-lrudict/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-lrudict/package.py b/var/spack/repos/builtin/packages/py-lrudict/package.py new file mode 100644 index 0000000000..5ce967579f --- /dev/null +++ b/var/spack/repos/builtin/packages/py-lrudict/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class PyLrudict(PythonPackage): + """ A fast LRU cache""" + + homepage = "https://github.com/amitdev/lru-dict" + url = "https://pypi.io/packages/source/l/lru-dict/lru-dict-1.1.6.tar.gz" + + version('1.1.6', 'b33f54f1257ab541f4df4bacc7509f5a') + + depends_on('python@2.7:') + depends_on('py-setuptools', type=('build')) -- cgit v1.2.3-70-g09d2 From ea6b6ef1ff406bf7eb8d99d0877ebd3d3514741d Mon Sep 17 00:00:00 2001 From: Jimmy Tang Date: Wed, 3 Jan 2018 02:14:39 +0000 Subject: Install all the cli tools from all the sub-directories (#6705) * Install all the cli tools from all the sub-directories * Satisfy pep8 --- var/spack/repos/builtin/packages/kaldi/package.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/kaldi/package.py b/var/spack/repos/builtin/packages/kaldi/package.py index bb2481d879..58360df08f 100644 --- a/var/spack/repos/builtin/packages/kaldi/package.py +++ b/var/spack/repos/builtin/packages/kaldi/package.py @@ -96,8 +96,13 @@ class Kaldi(Package): # Does not use Autotools make() mkdirp(prefix.bin) - for root, dirs, files in os.walk('bin'): + for root, dirs, files in os.walk('.'): for name in files: + if name.endswith(".so") or name.endswith(".cc") \ + or name.endswith(".pptx"): + continue + if "configure" is name: + continue if os.access(join(root, name), os.X_OK): install(join(root, name), prefix.bin) -- cgit v1.2.3-70-g09d2 From 2c5c7a37cb5ca00b9f9e84012dad660ad9441b99 Mon Sep 17 00:00:00 2001 From: Michael Kuron Date: Wed, 3 Jan 2018 03:32:37 +0100 Subject: atom-dft: new package plus dependencies (#6653) * atom-dft: new package plus dependencies * Indentation fix * Use the compiler wrappers * Pass variables instead of using FileFilter --- .../repos/builtin/packages/atom-dft/package.py | 53 +++++++++++++++++++++ .../repos/builtin/packages/libgridxc/package.py | 49 ++++++++++++++++++++ var/spack/repos/builtin/packages/xmlf90/package.py | 54 ++++++++++++++++++++++ 3 files changed, 156 insertions(+) create mode 100644 var/spack/repos/builtin/packages/atom-dft/package.py create mode 100644 var/spack/repos/builtin/packages/libgridxc/package.py create mode 100644 var/spack/repos/builtin/packages/xmlf90/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/atom-dft/package.py b/var/spack/repos/builtin/packages/atom-dft/package.py new file mode 100644 index 0000000000..d6e8d5ab15 --- /dev/null +++ b/var/spack/repos/builtin/packages/atom-dft/package.py @@ -0,0 +1,53 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * +import shutil + + +class AtomDft(MakefilePackage): + """ATOM is a program for DFT calculations in atoms and pseudopotential + generation.""" + + homepage = "https://departments.icmab.es/leem/siesta/Pseudopotentials/" + url = "https://departments.icmab.es/leem/siesta/Pseudopotentials/Code/atom-4.2.6.tgz" + + version('4.2.6', 'c0c80cf349f951601942ed6c7cb0256b') + + depends_on('libgridxc') + depends_on('xmlf90') + + def edit(self, spec, prefix): + shutil.copyfile('arch.make.sample', 'arch.make') + + @property + def build_targets(self): + return ['XMLF90_ROOT=%s' % self.spec['xmlf90'].prefix, + 'GRIDXC_ROOT=%s' % self.spec['libgridxc'].prefix, + 'FC=fc'] + + def install(self, spec, prefix): + mkdir(prefix.bin) + install('atm', prefix.bin) diff --git a/var/spack/repos/builtin/packages/libgridxc/package.py b/var/spack/repos/builtin/packages/libgridxc/package.py new file mode 100644 index 0000000000..63b119a408 --- /dev/null +++ b/var/spack/repos/builtin/packages/libgridxc/package.py @@ -0,0 +1,49 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * +import shutil + + +class Libgridxc(Package): + """A library to compute the exchange and correlation energy and potential + in spherical (i.e. an atom) or periodic systems.""" + + homepage = "https://launchpad.net/libgridxc" + url = "https://launchpad.net/libgridxc/trunk/0.7/+download/libgridxc-0.7.6.tgz" + + version('0.7.6', 'a593f845d7565a168f1cf515a0a89879') + + phases = ['configure', 'install'] + + def configure(self, spec, prefix): + sh = which('sh') + with working_dir('build', create=True): + sh('../src/config.sh') + shutil.copyfile('../extra/fortran.mk', 'fortran.mk') + + def install(self, spec, prefix): + with working_dir('build'): + make('PREFIX=%s' % self.prefix, 'FC=fc') diff --git a/var/spack/repos/builtin/packages/xmlf90/package.py b/var/spack/repos/builtin/packages/xmlf90/package.py new file mode 100644 index 0000000000..07f554eeca --- /dev/null +++ b/var/spack/repos/builtin/packages/xmlf90/package.py @@ -0,0 +1,54 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class Xmlf90(AutotoolsPackage): + """xmlf90 is a suite of libraries to handle XML in Fortran.""" + + homepage = "https://launchpad.net/xmlf90" + url = "https://launchpad.net/xmlf90/trunk/1.5/+download/xmlf90-1.5.2.tgz" + + version('1.5.2', '324fdcba7dafce83db26e72aab9f6656') + + depends_on('autoconf@2.69:', type='build') + depends_on('automake@1.14:', type='build') + depends_on('libtool@2.4.2:', type='build') + depends_on('m4', type='build') + + def autoreconf(self, spec, prefix): + sh = which('sh') + sh('autogen.sh') + + def configure_args(self): + if self.spec.satisfies('%gcc'): + return ['FCFLAGS=-ffree-line-length-none'] + return [] + + @run_after('install') + def fix_mk(self): + install(join_path(self.prefix, 'share', 'org.siesta-project', + 'xmlf90.mk'), prefix) -- cgit v1.2.3-70-g09d2 From d2c3b3884bc4ab1399c3cd1a3b26c9f0f42a1852 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 2 Jan 2018 21:15:40 -0600 Subject: rsem: update version 1.3.0 md5sum (#6650) --- var/spack/repos/builtin/packages/rsem/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/rsem/package.py b/var/spack/repos/builtin/packages/rsem/package.py index 2d29610b20..13d5585d00 100644 --- a/var/spack/repos/builtin/packages/rsem/package.py +++ b/var/spack/repos/builtin/packages/rsem/package.py @@ -32,7 +32,7 @@ class Rsem(MakefilePackage): homepage = "http://deweylab.github.io/RSEM/" url = "https://github.com/deweylab/RSEM/archive/v1.3.0.tar.gz" - version('1.3.0', '9728161625d339d022130e2428604bf5') + version('1.3.0', '273fd755e23d349cc38a079b81bb03b6') depends_on('r', type=('build', 'run')) depends_on('perl', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 3c637105321a8d005e4c0324da7f84a4895aed66 Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Tue, 2 Jan 2018 20:27:34 -0700 Subject: Intel mkl dnn (#6268) * Added a package for the MDAnalysis toolkit. * Added a package for the Intel MKL-DNN project. * Fixed flake8 errors. * Fixed Flake8 --- .../builtin/packages/intel-mkl-dnn/package.py | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/intel-mkl-dnn/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/intel-mkl-dnn/package.py b/var/spack/repos/builtin/packages/intel-mkl-dnn/package.py new file mode 100644 index 0000000000..7dd6c4dc3b --- /dev/null +++ b/var/spack/repos/builtin/packages/intel-mkl-dnn/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class IntelMklDnn(CMakePackage): + """Intel(R) Math Kernel Library for Deep Neural Networks + (Intel(R) MKL-DNN).""" + + homepage = "https://01.org/mkl-dnn" + url = "https://github.com/01org/mkl-dnn/archive/v0.11.tar.gz" + + version('0.11', 'a060a42753f633a146c3db699eeee666') + version('0.10', '3855ad02452a6906e3a9adc9cecef49c') + version('0.9', 'dfb89d8f9d0bce55e878df32544cb0ea') + + depends_on('intel-mkl') -- cgit v1.2.3-70-g09d2 From 5d2f752c1b0a514c0971bd19b08eee51c2425553 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 3 Jan 2018 04:37:59 +0100 Subject: New Package: py-adios (#5686) The ADIOS1 numpy bindings depend on an installed, fully loaded ADIOS C library + its config tools to build properly. --- .../repos/builtin/packages/py-adios/package.py | 78 ++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-adios/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-adios/package.py b/var/spack/repos/builtin/packages/py-adios/package.py new file mode 100644 index 0000000000..209e6d60fe --- /dev/null +++ b/var/spack/repos/builtin/packages/py-adios/package.py @@ -0,0 +1,78 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyAdios(PythonPackage): + """NumPy bindings of ADIOS1""" + + homepage = "https://www.olcf.ornl.gov/center-projects/adios/" + url = "https://github.com/ornladios/ADIOS/archive/v1.12.0.tar.gz" + maintainers = ['ax3l'] + + version('develop', git='https://github.com/ornladios/ADIOS.git', + branch='master') + version('1.13.0', '68af36b821debbdf4748b20320a990ce') + version('1.12.0', '84a1c71b6698009224f6f748c5257fc9') + version('1.11.1', '5639bfc235e50bf17ba9dafb14ea4185') + version('1.11.0', '5eead5b2ccf962f5e6d5f254d29d5238') + version('1.10.0', 'eff450a4c0130479417cfd63186957f3') + version('1.9.0', '310ff02388bbaa2b1c1710ee970b5678') + + variant('mpi', default=True, + description='Enable MPI support') + + for v in ['1.9.0', '1.10.0', '1.11.0', '1.11.1', '1.12.0', '1.13.0', + 'develop']: + depends_on('adios@{0} ~mpi'.format(v), + when='@{0} ~mpi'.format(v), + type=['build', 'link', 'run']) + depends_on('adios@{0} +mpi'.format(v), + when='@{0} +mpi'.format(v), + type=['build', 'link', 'run']) + + depends_on('py-numpy', type=['build', 'run']) + depends_on('mpi', when='+mpi') + depends_on('py-mpi4py', type=['run'], when='+mpi') + depends_on('py-cython', type=['build']) + + phases = ['build_clib', 'install'] + build_directory = 'wrappers/numpy' + + def setup_file(self): + """Returns the name of the setup file to use.""" + if '+mpi' in self.spec: + return 'setup_mpi.py' + else: + return 'setup.py' + + def build_clib(self, spec, prefix): + # calls: make [MPI=y] python + args = '' + if '+mpi' in self.spec: + args = 'MPI=y ' + args += 'python' + with working_dir(self.build_directory): + make(args) -- cgit v1.2.3-70-g09d2 From d466d8f3d3fcbf0c096b5401f06c95b1ae6078d1 Mon Sep 17 00:00:00 2001 From: Douglas Duckworth Date: Tue, 2 Jan 2018 22:47:21 -0500 Subject: singularity - added master branch (#6631) * singularity - added master branch as this has latest fixes - 2.4 does not compile on centos 6 without use of this branch * renamed to develop * added master branch properly --- var/spack/repos/builtin/packages/singularity/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/singularity/package.py b/var/spack/repos/builtin/packages/singularity/package.py index 810a811d39..9ab3faf7b5 100644 --- a/var/spack/repos/builtin/packages/singularity/package.py +++ b/var/spack/repos/builtin/packages/singularity/package.py @@ -34,6 +34,7 @@ class Singularity(AutotoolsPackage): version('2.4', 'd357ce68ef2f8149edd84155731531465dbe74148c37719f87f168fc39384377') version('2.3.1', '292ff7fe3db09c854b8accf42f763f62') + version('develop', git='https://github.com/singularityware/singularity.git', branch='master') depends_on('m4', type='build') depends_on('autoconf', type='build') -- cgit v1.2.3-70-g09d2 From 2ed914aa1bfe65fe798583c3149f2a58ec267843 Mon Sep 17 00:00:00 2001 From: stefanosoffia Date: Wed, 3 Jan 2018 16:46:57 +0100 Subject: Flex v2.6.4 conflicts with gcc@7.2.0 (#6819) --- var/spack/repos/builtin/packages/flex/package.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/flex/package.py b/var/spack/repos/builtin/packages/flex/package.py index 8d5ffe11c3..a4a9718e04 100644 --- a/var/spack/repos/builtin/packages/flex/package.py +++ b/var/spack/repos/builtin/packages/flex/package.py @@ -53,6 +53,10 @@ class Flex(AutotoolsPackage): depends_on('automake', type='build', when='@:2.6.0') depends_on('libtool', type='build', when='@:2.6.0') + # Build issue for v2.6.4 when gcc 7.2.0 is used. + # See issue #219; https://github.com/westes/flex/issues/219 + conflicts('%gcc@7.2.0:', when='@2.6.4') + def url_for_version(self, version): url = "https://github.com/westes/flex" if version >= Version('2.6.1'): -- cgit v1.2.3-70-g09d2 From e623bbb6794f86f298aef8b63e1d5d2331527e9f Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Wed, 3 Jan 2018 16:58:19 +0100 Subject: suite-sparse: support 64bit BLAS (#6767) * suite-sparse: support 64bit BLAS * use double quotes instead of escaped quotes --- var/spack/repos/builtin/packages/suite-sparse/package.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/suite-sparse/package.py b/var/spack/repos/builtin/packages/suite-sparse/package.py index acf1e732f8..fd93cd6ca7 100644 --- a/var/spack/repos/builtin/packages/suite-sparse/package.py +++ b/var/spack/repos/builtin/packages/suite-sparse/package.py @@ -99,6 +99,12 @@ class SuiteSparse(Package): 'LAPACK=%s' % spec['lapack'].libs.ld_flags, ] + # 64bit blas in UMFPACK: + if (spec.satisfies('^openblas+ilp64') or + spec.satisfies('^intel-mkl+ilp64') or + spec.satisfies('^intel-parallel-studio+mkl+ilp64')): + make_args.append('UMFPACK_CONFIG=-DLONGBLAS="long long"') + # SuiteSparse defaults to using '-fno-common -fexceptions' in # CFLAGS, but not all compilers use the same flags for these # optimizations -- cgit v1.2.3-70-g09d2 From ec2c0b3e6590f546f3bbbb4ea9d433ac6bbd2215 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Thu, 4 Jan 2018 00:02:45 +0800 Subject: Add libtiff@3. (#6818) --- var/spack/repos/builtin/packages/libtiff/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libtiff/package.py b/var/spack/repos/builtin/packages/libtiff/package.py index a28d553429..329dfece29 100644 --- a/var/spack/repos/builtin/packages/libtiff/package.py +++ b/var/spack/repos/builtin/packages/libtiff/package.py @@ -34,6 +34,7 @@ class Libtiff(AutotoolsPackage): version('4.0.7', '77ae928d2c6b7fb46a21c3a29325157b') version('4.0.6', 'd1d2e940dea0b5ad435f21f03d96dd72') version('4.0.3', '051c1068e6a0627f461948c365290410') + version('3.9.7', '626102f448ba441d42e3212538ad67d2') depends_on('jpeg') depends_on('zlib') -- cgit v1.2.3-70-g09d2 From ce317674bf8b7c3fcad30e92c58f517c1bb49342 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Thu, 4 Jan 2018 00:03:35 +0800 Subject: Add a new version and runtime dependency for MotionCor2. (#6817) * Update motioncor2 to 1.0.4 and add libtiff dependency. * Add comments for libtiff dependency in MotionCor2. --- var/spack/repos/builtin/packages/motioncor2/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/motioncor2/package.py b/var/spack/repos/builtin/packages/motioncor2/package.py index 304e369d99..cd4db241f0 100644 --- a/var/spack/repos/builtin/packages/motioncor2/package.py +++ b/var/spack/repos/builtin/packages/motioncor2/package.py @@ -38,11 +38,14 @@ class Motioncor2(Package): homepage = "http://msg.ucsf.edu/em/software" url = "http://msg.ucsf.edu/MotionCor2/MotionCor2-1.0.2.tar.gz" + version('1.0.4', '5fc0a35d9518b2df17104187dab63fc6') version('1.0.2', 'f2f4c5b09170ab8480ca657f14cdba2b') version('1.0.1', '73d94a80abdef9bf37bbc80fbbe76622') version('1.0.0', '490f4df8daa9f5ddb9eec3962ba3ddf5') depends_on('cuda@8.0:8.99', type='run') + # libtiff.so.3 is required + depends_on('libtiff@3.0:3.99', type='run') def install(self, spec, prefix): mkdirp(prefix.bin) -- cgit v1.2.3-70-g09d2 From 34c9f08c2cf0b091c36c65f70661557dbc03c337 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Thu, 4 Jan 2018 00:14:51 +0800 Subject: fltk depends on libx11. (#6816) --- var/spack/repos/builtin/packages/fltk/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fltk/package.py b/var/spack/repos/builtin/packages/fltk/package.py index 62fe84bb44..a46b580814 100644 --- a/var/spack/repos/builtin/packages/fltk/package.py +++ b/var/spack/repos/builtin/packages/fltk/package.py @@ -42,6 +42,8 @@ class Fltk(Package): version('1.3.3', '9ccdb0d19dc104b87179bd9fd10822e3') + depends_on('libx11') + patch('font.patch', when='@1.3.3') variant('shared', default=True, -- cgit v1.2.3-70-g09d2 From 2f551908b8c80d60f0a3f369e94b73b4c41e9738 Mon Sep 17 00:00:00 2001 From: Sinan Date: Wed, 3 Jan 2018 08:17:15 -0800 Subject: package/r-rjags: create new package (#6804) * package/r-rjags: create new package * fix typo fix typo * package/r-rjags small fix to pass flake8 tests * package/r-rjags: more fixes to satisfy flake8 tests --- .../repos/builtin/packages/r-rjags/package.py | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-rjags/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-rjags/package.py b/var/spack/repos/builtin/packages/r-rjags/package.py new file mode 100644 index 0000000000..ec56d8c3af --- /dev/null +++ b/var/spack/repos/builtin/packages/r-rjags/package.py @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class RRjags(RPackage): + """Interface to the JAGS MCMC library. + Usage: $ spack load r-rjags """ + + homepage = "https://cran.r-project.org/web/packages/rjags/index.html" + url = "https://cran.r-project.org/src/contrib/rjags_4-6.tar.gz" + + version('4-6', 'c26b7cc8e8ddcdb55e14cba28df39f4c') + + depends_on('jags', type=('link')) + depends_on('r-coda', type=('build', 'run')) + + def configure_args(self): + args = ['--with-jags-lib=%s' % self.spec['jags'].prefix.lib, + '--with-jags-include=%s' % self.spec['jags'].prefix.include, + '--with-jags-modules=%s/JAGS/modules-4' + % self.spec['jags'].prefix.lib] + return args -- cgit v1.2.3-70-g09d2 From f07ce6094e24f172add50ebfd786e71ee6ba7d28 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 3 Jan 2018 19:30:10 +0000 Subject: package openfoam-com: add version 1712 and update patches (#6820) * combine all patches for 1612 into a single file, with additional comments to explain the rational. * Add kahip decomposition variant. * Add support for ARM64 architecture. * filter instead of patching etc/config.*/settings. This eliminates patch files for 1706, perhaps for the future as well. * URLs at or before version 1612 have a different structure, so provide a url_for_version implementation to handle this --- .../builtin/packages/openfoam-com/1612-bin.patch | 503 ------------ .../builtin/packages/openfoam-com/1612-build.patch | 17 - .../builtin/packages/openfoam-com/1612-etc.patch | 41 - .../packages/openfoam-com/1612-mgridgen-lib.patch | 41 - .../builtin/packages/openfoam-com/1612-mpi.patch | 36 - .../openfoam-com/1612-scotch-metis-lib.patch | 48 -- .../builtin/packages/openfoam-com/1612-site.patch | 42 - .../packages/openfoam-com/1612-spack-patches.patch | 876 +++++++++++++++++++++ .../packages/openfoam-com/1612-zoltan-lib.patch | 84 -- .../builtin/packages/openfoam-com/1706-site.patch | 22 - .../repos/builtin/packages/openfoam-com/package.py | 68 +- .../packages/openfoam-org/assets/bin/foamEtcFile | 84 +- 12 files changed, 956 insertions(+), 906 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/openfoam-com/1612-bin.patch delete mode 100644 var/spack/repos/builtin/packages/openfoam-com/1612-build.patch delete mode 100644 var/spack/repos/builtin/packages/openfoam-com/1612-etc.patch delete mode 100644 var/spack/repos/builtin/packages/openfoam-com/1612-mgridgen-lib.patch delete mode 100644 var/spack/repos/builtin/packages/openfoam-com/1612-mpi.patch delete mode 100644 var/spack/repos/builtin/packages/openfoam-com/1612-scotch-metis-lib.patch delete mode 100644 var/spack/repos/builtin/packages/openfoam-com/1612-site.patch create mode 100644 var/spack/repos/builtin/packages/openfoam-com/1612-spack-patches.patch delete mode 100644 var/spack/repos/builtin/packages/openfoam-com/1612-zoltan-lib.patch delete mode 100644 var/spack/repos/builtin/packages/openfoam-com/1706-site.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openfoam-com/1612-bin.patch b/var/spack/repos/builtin/packages/openfoam-com/1612-bin.patch deleted file mode 100644 index b9e87a7ec8..0000000000 --- a/var/spack/repos/builtin/packages/openfoam-com/1612-bin.patch +++ /dev/null @@ -1,503 +0,0 @@ ---- OpenFOAM-v1612+.orig/bin/foamEtcFile 2016-12-23 15:22:59.000000000 +0100 -+++ OpenFOAM-v1612+/bin/foamEtcFile 2017-03-23 10:08:37.296887070 +0100 -@@ -4,7 +4,7 @@ - # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - # \\ / O peration | - # \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation --# \\/ M anipulation | -+# \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd. - #------------------------------------------------------------------------------- - # License - # This file is part of OpenFOAM. -@@ -26,7 +26,7 @@ - # foamEtcFile - # - # Description --# Locate user/group/shipped file with semantics similar to the -+# Locate user/group/other files with semantics similar to the - # ~OpenFOAM/fileName expansion. - # - # The -mode option can be used to allow chaining from -@@ -34,40 +34,53 @@ - # - # For example, within the user ~/.OpenFOAM//prefs.sh: - # \code --# foamPrefs=`$WM_PROJECT_DIR/bin/foamEtcFile -m go prefs.sh` \ --# && _foamSource $foamPrefs -+# eval $(foamEtcFile -sh -mode=go prefs.sh) - # \endcode - # -+# Environment -+# - WM_PROJECT: (unset defaults to OpenFOAM) -+# - WM_PROJECT_SITE: (unset defaults to PREFIX/site) -+# - WM_PROJECT_VERSION: (unset defaults to detect from path) -+# - # Note --# This script must exist in $FOAM_INST_DIR/OpenFOAM-/bin/ --# or $FOAM_INST_DIR/openfoam/bin/ (for the debian version) -+# This script must exist in one of these locations: -+# - $WM_PROJECT_INST_DIR/OpenFOAM-/bin -+# - $WM_PROJECT_INST_DIR/openfoam-/bin -+# - $WM_PROJECT_INST_DIR/OpenFOAM+/bin -+# - $WM_PROJECT_INST_DIR/openfoam+/bin -+# - $WM_PROJECT_INST_DIR/openfoam/bin (debian version) - # - #------------------------------------------------------------------------------- -+unset optQuiet optSilent - usage() { - [ "${optQuiet:-$optSilent}" = true ] && exit 1 -- - exec 1>&2 - while [ "$#" -ge 1 ]; do echo "$1"; shift; done - cat< any combination of u(user), g(group), o(other) -- -prefix specify an alternative installation prefix -- -quiet suppress all normal output -- -silent suppress all stderr output -- -version specify an alternative OpenFOAM version -- in the form Maj.Min.Rev (eg, 1.7.0) -- -help print the usage -+ -a, -all Return all files (otherwise stop after the first match) -+ -l, -list List directories or files to be checked -+ -list-test List (existing) directories or files to be checked -+ -mode=MODE Any combination of u(user), g(group), o(other) -+ -prefix=DIR Specify an alternative installation prefix -+ -version=VER Specify alternative OpenFOAM version (eg, 3.0, 1612, ...) -+ -csh | -sh Produce output suitable for a csh or sh 'eval' -+ -csh-verbose | -sh-verbose -+ As per -csh | -sh, with additional verbosity -+ -q, -quiet Suppress all normal output -+ -s, -silent Suppress stderr, except -csh-verbose, -sh-verbose output -+ -help Print the usage - -- Locate user/group/shipped file with semantics similar to the -+ Locate user/group/other file with semantics similar to the - ~OpenFOAM/fileName expansion. - -- The options can also be specified as a single character -- (eg, '-q' instead of '-quiet'), but must not be grouped. -+ Single character options must not be grouped. Equivalent options: -+ -mode=MODE, -mode MODE, -m MODE -+ -prefix=DIR, -prefix DIR, -p DIR -+ -version=VER, -version VER, -v VER - - Exit status - 0 when the file is found. Print resolved path to stdout. -@@ -78,61 +91,117 @@ - exit 1 - } - --#------------------------------------------------------------------------------- -+# Report error and exit -+die() -+{ -+ [ "${optQuiet:-$optSilent}" = true ] && exit 1 -+ exec 1>&2 -+ echo -+ echo "Error encountered:" -+ while [ "$#" -ge 1 ]; do echo " $1"; shift; done -+ echo -+ echo "See 'foamEtcFile -help' for usage" -+ echo -+ exit 1 -+} - --# the bin dir: --binDir="${0%/*}" -+#------------------------------------------------------------------------------- -+binDir="${0%/*}" # The bin dir -+projectDir="${binDir%/bin}" # The project dir -+prefixDir="${projectDir%/*}" # The prefix dir (same as $WM_PROJECT_INST_DIR) - --# the project dir: -+# Could not resolve projectDir, prefixDir? (eg, called as ./bin/foamEtcFile) -+if [ "$prefixDir" = "$projectDir" ] -+then -+ binDir="$(cd $binDir && pwd -L)" - projectDir="${binDir%/bin}" -- --# the prefix dir (same as $FOAM_INST_DIR): - prefixDir="${projectDir%/*}" -+fi -+projectDirName="${projectDir##*/}" # The project directory name - --# the name used for the project directory --projectDirName="${projectDir##*/}" -+projectName="${WM_PROJECT:-OpenFOAM}" # The project name -+projectVersion="$WM_PROJECT_VERSION" # Empty? - will be treated later - --# version number used for debian packaging --unset versionNum - -+#------------------------------------------------------------------------------- -+ -+# Guess project version or simply get the stem part of the projectDirName. -+# Handle standard and debian naming conventions. - # --# handle standard and debian naming convention -+# - projectVersion: update unless already set - # --case "$projectDirName" in --OpenFOAM-*) # standard naming convention OpenFOAM- -- version="${projectDirName##OpenFOAM-}" -- ;; -+# Helper variables: -+# - dirBase (for reassembling name) == projectDirName without the version -+# - versionNum (debian packaging) -+unset dirBase versionNum -+guessVersion() -+{ -+ local version - --openfoam[0-9]* | openfoam-dev) # debian naming convention 'openfoam' -- versionNum="${projectDirName##openfoam}" -- case "$versionNum" in -- ??) # convert 2 digit version number to decimal delineated -- version=$(echo "$versionNum" | sed -e 's@\(.\)\(.\)@\1.\2@') -- ;; -- ???) # convert 3 digit version number to decimal delineated -- version=$(echo "$versionNum" | sed -e 's@\(.\)\(.\)\(.\)@\1.\2.\3@') -- ;; -- ????) # convert 4 digit version number to decimal delineated -- version=$(echo "$versionNum" | sed -e 's@\(.\)\(.\)\(.\)\(.\)@\1.\2.\3.\4@') -- ;; -- *) # failback - use current environment setting -- version="$WM_PROJECT_VERSION" -+ case "$projectDirName" in -+ (OpenFOAM-* | openfoam-*) -+ # Standard naming: OpenFOAM- or openfoam- -+ dirBase="${projectDirName%%-*}-" -+ version="${projectDirName#*-}" -+ version="${version%%*-}" # Extra safety, eg openfoam-version-packager -+ ;; -+ -+ (OpenFOAM+* | openfoam+*) -+ # Alternative naming: OpenFOAM+ or openfoam+ -+ dirBase="${projectDirName%%+*}+" -+ version="${projectDirName#*+}" -+ version="${version%%*-}" # Extra safety, eg openfoam-version-packager -+ ;; -+ -+ (openfoam[0-9]*) -+ # Debian naming: openfoam -+ dirBase="openfoam" -+ version="${projectDirName#openfoam}" -+ versionNum="$version" -+ -+ # Convert digits version number to decimal delineated -+ case "${#versionNum}" in (2|3|4) -+ version=$(echo "$versionNum" | sed -e 's@\([0-9]\)@\1.@g') -+ version="${version%.}" - ;; - esac -+ -+ # Ignore special treatment if no decimals were inserted. -+ [ "${#version}" -gt "${#versionNum}" ] || unset versionNum - ;; - --*) -- echo "Error : unknown/unsupported naming convention" -- exit 1 -+ (*) -+ die "unknown/unsupported naming convention for '$projectDirName'" - ;; - esac - -+ # Set projectVersion if required -+ : ${projectVersion:=$version} -+} -+ -+ -+# Set projectVersion and update versionNum, projectDirName accordingly -+setVersion() -+{ -+ projectVersion="$1" -+ -+ # Need dirBase when reassembling projectDirName -+ [ -n "$dirBase" ] || guessVersion -+ -+ # Debian: update x.y.z -> xyz version -+ if [ -n "$versionNum" ] -+ then -+ versionNum=$(echo "$projectVersion" | sed -e 's@\.@@g') -+ fi -+ -+ projectDirName="$dirBase${versionNum:-$projectVersion}" -+} -+ - --# default mode is 'ugo' --mode=ugo --unset optAll optList optQuiet optSilent -+optMode=ugo # Default mode is always 'ugo' -+unset optAll optList optShell optVersion - --# parse options -+# Parse options - while [ "$#" -gt 0 ] - do - case "$1" in -@@ -141,27 +210,45 @@ - ;; - -a | -all) - optAll=true -+ unset optShell - ;; - -l | -list) - optList=true -+ unset optShell -+ ;; -+ -list-test) -+ optList='test' -+ unset optShell -+ ;; -+ -csh | -sh | -csh-verbose | -sh-verbose) -+ optShell="${1#-}" -+ unset optAll -+ ;; -+ -mode=[ugo]*) -+ optMode="${1#*=}" -+ ;; -+ -prefix=/*) -+ prefixDir="${1#*=}" -+ prefixDir="${prefixDir%/}" -+ ;; -+ -version=*) -+ optVersion="${1#*=}" - ;; - -m | -mode) -- [ "$#" -ge 2 ] || usage "'$1' option requires an argument" -- mode="$2" -- -- # sanity check: -- case "$mode" in -- *u* | *g* | *o* ) -+ optMode="$2" -+ shift -+ # Sanity check. Handles missing argument too. -+ case "$optMode" in -+ ([ugo]*) - ;; -- *) -- usage "'$1' option with invalid mode '$mode'" -+ (*) -+ die "invalid mode '$optMode'" - ;; - esac -- shift - ;; - -p | -prefix) -- [ "$#" -ge 2 ] || usage "'$1' option requires an argument" -- prefixDir="$2" -+ [ "$#" -ge 2 ] || die "'$1' option requires an argument" -+ prefixDir="${2%/}" - shift - ;; - -q | -quiet) -@@ -171,13 +258,8 @@ - optSilent=true - ;; - -v | -version) -- [ "$#" -ge 2 ] || usage "'$1' option requires an argument" -- version="$2" -- # convert x.y.z -> xyz version (if installation looked like debian) -- if [ -n "$versionNum" ] -- then -- versionNum=$(echo "$version" | sed -e 's@\.@@g') -- fi -+ [ "$#" -ge 2 ] || die "'$1' option requires an argument" -+ optVersion="$2" - shift - ;; - --) -@@ -185,7 +267,7 @@ - break - ;; - -*) -- usage "unknown option: '$*'" -+ die "unknown option: '$1'" - ;; - *) - break -@@ -195,11 +277,28 @@ - done - - --# debugging: --# echo "Installed locations:" --# for i in projectDir prefixDir projectDirName version versionNum -+#------------------------------------------------------------------------------- -+ -+if [ -n "$optVersion" ] -+then -+ setVersion $optVersion -+elif [ -z "$projectVersion" ] -+then -+ guessVersion -+fi -+ -+# Updates: -+# - projectDir for changes via -prefix or -version -+# - projectSite for changes via -prefix -+projectDir="$prefixDir/$projectDirName" -+projectSite="${WM_PROJECT_SITE:-$prefixDir/site}" -+ -+ -+# Debugging: -+# echo "Installed locations:" 1>&2 -+# for i in projectDir prefixDir projectDirName projectVersion - # do --# eval echo "$i=\$$i" -+# eval echo "$i=\$$i" 1>&2 - # done - - -@@ -210,30 +309,18 @@ - - # Define the various places to be searched: - unset dirList --case "$mode" in --*u*) # user -- userDir="$HOME/.${WM_PROJECT:-OpenFOAM}" -- dirList="$dirList $userDir/$version $userDir" -+case "$optMode" in (*u*) # (U)ser -+ dirList="$dirList $HOME/.$projectName/$projectVersion $HOME/.$projectName" - ;; - esac - --case "$mode" in --*g*) # group (site) -- siteDir="${WM_PROJECT_SITE:-$prefixDir/site}" -- dirList="$dirList $siteDir/$version $siteDir" -+case "$optMode" in (*g*) # (G)roup == site -+ dirList="$dirList $projectSite/$projectVersion $projectSite" - ;; - esac - --case "$mode" in --*o*) # other (shipped) -- if [ -n "$versionNum" ] -- then -- # debian packaging -- dirList="$dirList $prefixDir/openfoam$versionNum/etc" -- else -- # standard packaging -- dirList="$dirList $prefixDir/${WM_PROJECT:-OpenFOAM}-$version/etc" -- fi -+case "$optMode" in (*o*) # (O)ther == shipped -+ dirList="$dirList $projectDir/etc" - ;; - esac - set -- $dirList -@@ -244,50 +331,87 @@ - # - - exitCode=0 --if [ "$optList" = true ] -+if [ -n "$optList" ] - then - -- # list directories, or potential file locations -- [ "$nArgs" -le 1 ] || usage -+ # List directories, or potential file locations -+ [ "$nArgs" -le 1 ] || \ -+ die "-list expects 0 or 1 filename, but $nArgs provided" -+ -+ # A silly combination, but -quiet does have precedence -+ [ -n "$optQuiet" ] && exit 0 - -- # a silly combination, but -quiet does have precedence -- [ "$optQuiet" = true ] && exit 0 -+ # Test for directory or file too? -+ if [ "$optList" = "test" ] -+ then -+ exitCode=2 # Fallback to a general error (file not found) - -+ if [ "$nArgs" -eq 1 ] -+ then - for dir - do -- if [ "$nArgs" -eq 1 ] -+ resolved="$dir/$fileName" -+ if [ -f "$resolved" ] - then -- echo "$dir/$fileName" -+ echo "$resolved" -+ exitCode=0 # OK -+ fi -+ done - else -+ for dir -+ do -+ if [ -d "$dir" ] -+ then - echo "$dir" -+ exitCode=0 # OK - fi - done -+ fi -+ else -+ for dir -+ do -+ echo "$dir${fileName:+/}$fileName" -+ done -+ fi - - else - -- [ "$nArgs" -eq 1 ] || usage -+ [ "$nArgs" -eq 1 ] || die "One filename expected - $nArgs provided" - -- # general error, eg file not found -- exitCode=2 -+ exitCode=2 # Fallback to a general error (file not found) - - for dir - do - if [ -f "$dir/$fileName" ] - then - exitCode=0 -- if [ "$optQuiet" = true ] -- then -+ [ -n "$optQuiet" ] && break -+ -+ case "$optShell" in -+ (*verbose) -+ echo "Using: $dir/$fileName" 1>&2 -+ ;; -+ esac -+ -+ case "$optShell" in -+ csh*) -+ echo "source $dir/$fileName" - break -- else -+ ;; -+ sh*) -+ echo ". $dir/$fileName" -+ break -+ ;; -+ *) - echo "$dir/$fileName" -- [ "$optAll" = true ] || break -- fi -+ [ -n "$optAll" ] || break -+ ;; -+ esac - fi - done - - fi - -- - exit $exitCode - - #------------------------------------------------------------------------------ diff --git a/var/spack/repos/builtin/packages/openfoam-com/1612-build.patch b/var/spack/repos/builtin/packages/openfoam-com/1612-build.patch deleted file mode 100644 index 26e2d8f085..0000000000 --- a/var/spack/repos/builtin/packages/openfoam-com/1612-build.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- OpenFOAM-v1612+.orig/Allwmake 2016-12-23 15:22:59.000000000 +0100 -+++ OpenFOAM-v1612+/Allwmake 2017-03-29 09:08:15.503865203 +0200 -@@ -17,6 +17,14 @@ - exit 1 - } - -+#------------------------------------------------------------------------------ -+echo "========================================" -+date "+%Y-%m-%d %H:%M:%S %z" 2>/dev/null || echo "date is unknown" -+echo "Starting ${WM_PROJECT_DIR##*/} ${0##*}" -+echo " $WM_COMPILER $WM_COMPILER_TYPE compiler" -+echo " ${WM_OPTIONS}, with ${WM_MPLIB} ${FOAM_MPI}" -+echo -+ - # Compile wmake support applications - (cd wmake/src && make) - diff --git a/var/spack/repos/builtin/packages/openfoam-com/1612-etc.patch b/var/spack/repos/builtin/packages/openfoam-com/1612-etc.patch deleted file mode 100644 index dd8146e953..0000000000 --- a/var/spack/repos/builtin/packages/openfoam-com/1612-etc.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- OpenFOAM-v1612+.orig/etc/bashrc 2016-12-23 15:22:59.000000000 +0100 -+++ OpenFOAM-v1612+/etc/bashrc 2017-03-22 16:05:05.751237072 +0100 -@@ -42,7 +42,8 @@ - # - # Please set to the appropriate path if the default is not correct. - # --[ $BASH_SOURCE ] && FOAM_INST_DIR=$(\cd ${BASH_SOURCE%/*/*/*} && \pwd -P) || \ -+rc="${BASH_SOURCE:-${ZSH_NAME:+$0}}" -+[ -n "$rc" ] && FOAM_INST_DIR=$(\cd $(dirname $rc)/../.. && \pwd -L) || \ - FOAM_INST_DIR=$HOME/$WM_PROJECT - # FOAM_INST_DIR=~$WM_PROJECT - # FOAM_INST_DIR=/opt/$WM_PROJECT -@@ -135,8 +136,10 @@ - # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - . $WM_PROJECT_DIR/etc/config.sh/functions - --# Add in preset user or site preferences: --_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile prefs.sh` -+# Override definitions via prefs, with 'other' first so the sys-admin -+# can provide base values independent of WM_PROJECT_SITE -+_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile -mode o prefs.sh` -+_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile -mode ug prefs.sh` - - # Evaluate command-line parameters and record settings for later - # these can be used to set/unset values, or specify alternative pref files -diff -uw OpenFOAM-v1612+.orig/etc/cshrc OpenFOAM-v1612+/etc/cshrc ---- OpenFOAM-v1612+.orig/etc/cshrc 2016-12-23 15:22:59.000000000 +0100 -+++ OpenFOAM-v1612+/etc/cshrc 2017-03-22 16:04:51.839291067 +0100 -@@ -148,8 +148,10 @@ - # Source files, possibly with some verbosity - alias _foamSource 'if ($?FOAM_VERBOSE && $?prompt) echo "Sourcing: \!*"; if (\!* != "") source \!*' - --# Add in preset user or site preferences: --_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile prefs.csh` -+# Override definitions via prefs, with 'other' first so the sys-admin -+# can provide base values independent of WM_PROJECT_SITE -+_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile -mode o prefs.csh` -+_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile -mode ug prefs.csh` - - # Evaluate command-line parameters and record settings for later - # these can be used to set/unset values, or specify alternative pref files diff --git a/var/spack/repos/builtin/packages/openfoam-com/1612-mgridgen-lib.patch b/var/spack/repos/builtin/packages/openfoam-com/1612-mgridgen-lib.patch deleted file mode 100644 index 8dc0b995ff..0000000000 --- a/var/spack/repos/builtin/packages/openfoam-com/1612-mgridgen-lib.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- OpenFOAM-v1612+.orig/src/fvAgglomerationMethods/Allwmake 2017-01-02 09:56:17.578558265 +0100 -+++ OpenFOAM-v1612+/src/fvAgglomerationMethods/Allwmake 2017-04-18 18:58:38.236795902 +0200 -@@ -4,9 +4,13 @@ - # Parse arguments for library compilation - . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments - --export ParMGridGen=$WM_THIRD_PARTY_DIR/ParMGridGen-1.0 -+unset MGRIDGEN_ARCH_PATH -+if settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/mgridgen) -+then -+ . $settings -+fi - --if [ -e "$FOAM_LIBBIN/libMGridGen.so" ] -+if [ -e "$MGRIDGEN_ARCH_PATH/include/mgridgen.h" ] - then - wmake $targetType MGridGenGamgAgglomeration - fi ---- OpenFOAM-v1612+.orig/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options 2017-01-02 09:56:17.578558265 +0100 -+++ OpenFOAM-v1612+/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options 2017-04-18 18:59:16.860662811 +0200 -@@ -1,15 +1,9 @@ --/* Needs ParMGridGen environment variable set. (see Allwmake script) */ -- --TYPE_REAL= --#if defined(WM_SP) --TYPE_REAL=-DTYPE_REAL --#endif -- - EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ -- -I$(ParMGridGen)/MGridGen/Lib/lnInclude \ -- -I$(ParMGridGen)/MGridGen/IMlib/lnInclude \ -- $(TYPE_REAL) -+ -I$(MGRIDGEN_ARCH_PATH)/include - - LIB_LIBS = \ -- -L$(FOAM_EXT_LIBBIN) -lMGridGen -+ -L$(FOAM_EXT_LIBBIN) \ -+ -L$(MGRIDGEN_ARCH_PATH)/lib \ -+ -L$(MGRIDGEN_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \ -+ -lmgrid diff --git a/var/spack/repos/builtin/packages/openfoam-com/1612-mpi.patch b/var/spack/repos/builtin/packages/openfoam-com/1612-mpi.patch deleted file mode 100644 index b3663b0a49..0000000000 --- a/var/spack/repos/builtin/packages/openfoam-com/1612-mpi.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- OpenFOAM-v1612+.orig/etc/config.sh/mpi 2016-12-23 15:22:59.000000000 +0100 -+++ OpenFOAM-v1612+/etc/config.sh/mpi 2017-03-29 13:55:57.507980699 +0200 -@@ -75,8 +75,15 @@ - _foamAddMan $MPI_ARCH_PATH/share/man - ;; - -+USERMPI) -+ # Use an arbitrary, user-specified mpi implementation -+ export FOAM_MPI=mpi-user -+ _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/mpi-user` -+ ;; -+ - SYSTEMMPI) - export FOAM_MPI=mpi-system -+ _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/mpi-system` - - if [ -z "$MPI_ROOT" ] - then ---- OpenFOAM-v1612+.orig/etc/config.csh/mpi 2016-12-23 15:22:59.000000000 +0100 -+++ OpenFOAM-v1612+/etc/config.csh/mpi 2017-03-29 13:56:36.347835938 +0200 -@@ -71,8 +71,15 @@ - _foamAddMan $MPI_ARCH_PATH/share/man - breaksw - -+case USERMPI: -+ # Use an arbitrary, user-specified mpi implementation -+ setenv FOAM_MPI mpi-user -+ _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/mpi-user` -+ breaksw -+ - case SYSTEMMPI: - setenv FOAM_MPI mpi-system -+ _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/mpi-system` - - if ( ! ($?MPI_ROOT) ) then - echo diff --git a/var/spack/repos/builtin/packages/openfoam-com/1612-scotch-metis-lib.patch b/var/spack/repos/builtin/packages/openfoam-com/1612-scotch-metis-lib.patch deleted file mode 100644 index b7530e6320..0000000000 --- a/var/spack/repos/builtin/packages/openfoam-com/1612-scotch-metis-lib.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- OpenFOAM-v1612+.orig/src/parallel/decompose/Allwmake 2017-03-21 16:34:44.599021283 +0100 -+++ OpenFOAM-v1612+/src/parallel/decompose/Allwmake 2017-03-21 16:28:57.243969660 +0100 -@@ -36,6 +36,7 @@ - - # Library - [ -r $FOAM_EXT_LIBBIN/libmetis.so ] || \ -+ [ -r $METIS_ARCH_PATH/lib/libmetis.so ] || \ - [ -r $METIS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmetis.so ] || \ - [ "${METIS_ARCH_PATH##*-}" = system ] || { - echo "$warning (missing library)" -@@ -90,6 +91,7 @@ - - # Library - [ -r $FOAM_EXT_LIBBIN/libscotch.so ] || \ -+ [ -r $SCOTCH_ARCH_PATH/lib/libscotch.so ] || \ - [ -r $SCOTCH_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libscotch.so ] || \ - [ "${SCOTCH_ARCH_PATH##*-}" = system ] || { - echo "$warning (missing library)" ---- OpenFOAM-v1612+.orig/src/parallel/decompose/metisDecomp/Make/options 2017-03-21 16:34:25.383075328 +0100 -+++ OpenFOAM-v1612+/src/parallel/decompose/metisDecomp/Make/options 2017-03-21 16:30:15.727758338 +0100 -@@ -8,6 +8,7 @@ - * to support central, non-thirdparty installations - */ - LIB_LIBS = \ -+ -L$(METIS_ARCH_PATH)/lib \ - -L$(METIS_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \ - -L$(FOAM_EXT_LIBBIN) \ - -lmetis ---- OpenFOAM-v1612+.orig/src/parallel/decompose/ptscotchDecomp/Make/options 2017-03-21 16:34:34.607049385 +0100 -+++ OpenFOAM-v1612+/src/parallel/decompose/ptscotchDecomp/Make/options 2017-03-21 16:30:00.479799399 +0100 -@@ -16,6 +16,7 @@ - * to support central, non-thirdparty installations - */ - LIB_LIBS = \ -+ -L$(SCOTCH_ARCH_PATH)/lib \ - -L$(SCOTCH_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \ - -L$(FOAM_EXT_LIBBIN) \ - -L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) \ ---- OpenFOAM-v1612+.orig/src/parallel/decompose/scotchDecomp/Make/options 2017-03-21 16:34:39.159036582 +0100 -+++ OpenFOAM-v1612+/src/parallel/decompose/scotchDecomp/Make/options 2017-03-21 16:29:46.719836452 +0100 -@@ -16,6 +16,7 @@ - * to support central, non-thirdparty installations - */ - LIB_LIBS = \ -+ -L$(SCOTCH_ARCH_PATH)/lib \ - -L$(SCOTCH_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \ - -L$(FOAM_EXT_LIBBIN) \ - -lscotch \ diff --git a/var/spack/repos/builtin/packages/openfoam-com/1612-site.patch b/var/spack/repos/builtin/packages/openfoam-com/1612-site.patch deleted file mode 100644 index d988c2f9b8..0000000000 --- a/var/spack/repos/builtin/packages/openfoam-com/1612-site.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -uw OpenFOAM-v1612+.orig/etc/config.sh/settings OpenFOAM-v1612+/etc/config.sh/settings ---- OpenFOAM-v1612+.orig/etc/config.sh/settings 2016-12-23 15:22:59.000000000 +0100 -+++ OpenFOAM-v1612+/etc/config.sh/settings 2017-03-23 12:22:52.002101020 +0100 -@@ -141,7 +141,7 @@ - #------------------------------------------------------------------------------ - - # Location of the jobControl directory --export FOAM_JOB_DIR=$WM_PROJECT_INST_DIR/jobControl -+export FOAM_JOB_DIR=$HOME/.OpenFOAM/jobControl #SPACK: non-central location - - # wmake configuration - export WM_DIR=$WM_PROJECT_DIR/wmake -@@ -157,7 +157,7 @@ - export FOAM_EXT_LIBBIN=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/lib - - # Site-specific directory --siteDir="${WM_PROJECT_SITE:-$WM_PROJECT_INST_DIR/site}" -+siteDir="${WM_PROJECT_SITE:-$WM_PROJECT_DIR/site}" #SPACK: not in parent directory - - # Shared site executables/libraries - # Similar naming convention as ~OpenFOAM expansion -diff -uw OpenFOAM-v1612+.orig/etc/config.csh/settings OpenFOAM-v1612+/etc/config.csh/settings ---- OpenFOAM-v1612+.orig/etc/config.csh/settings 2016-12-23 15:22:59.000000000 +0100 -+++ OpenFOAM-v1612+/etc/config.csh/settings 2017-03-23 12:23:52.737891912 +0100 -@@ -137,7 +137,7 @@ - #------------------------------------------------------------------------------ - - # Location of the jobControl directory --setenv FOAM_JOB_DIR $WM_PROJECT_INST_DIR/jobControl -+setenv FOAM_JOB_DIR=$HOME/.OpenFOAM/jobControl #SPACK: non-central location - - # wmake configuration - setenv WM_DIR $WM_PROJECT_DIR/wmake -@@ -156,7 +156,7 @@ - if ( $?WM_PROJECT_SITE ) then - set siteDir=$WM_PROJECT_SITE - else -- set siteDir=$WM_PROJECT_INST_DIR/site -+ set siteDir=$WM_PROJECT_DIR/site #SPACK: not in parent directory - endif - - # Shared site executables/libraries diff --git a/var/spack/repos/builtin/packages/openfoam-com/1612-spack-patches.patch b/var/spack/repos/builtin/packages/openfoam-com/1612-spack-patches.patch new file mode 100644 index 0000000000..00679c4c1d --- /dev/null +++ b/var/spack/repos/builtin/packages/openfoam-com/1612-spack-patches.patch @@ -0,0 +1,876 @@ +############################################################################# +# This patch for OpenFOAM-1612 comprises the following changes: +# +# bin/foamEtcFile +# - Adjust to cope with spack naming (eg, openfoam-com-1612-abcxzy). +# Lets us avoid a needless directory layer. +# +# etc/bashrc +# - improved robustness when sourcing. +# - source top-level prefs.sh first (for sysadmin changes) +# +# etc/config.*/settings +# - write job control information to the user directory +# - site/ directory under the OpenFOAM project dir, not its parent dir +# +# etc/config.*/mpi +# - added USERMPI as place for spack mpi information +# +# mgridgen, zoltan: +# - make location configurable +# +# metis, scotch: +# - also check lib path (not just lib64) +# +# All issues patched here are addressed in OpenFOAM-1706 and later. +# +# ESI-OpenCFD www.openfoam.com +# +############################################################################# +--- OpenFOAM-v1612+.orig/bin/foamEtcFile 2016-12-23 15:22:59.000000000 +0100 ++++ OpenFOAM-plus/bin/foamEtcFile 2017-12-18 17:48:35.043291205 +0100 +@@ -4,164 +4,235 @@ + # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + # \\ / O peration | + # \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation +-# \\/ M anipulation | ++# \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd. + #------------------------------------------------------------------------------- + # License +-# This file is part of OpenFOAM. +-# +-# OpenFOAM is free software: you can redistribute it and/or modify it +-# under the terms of the GNU General Public License as published by +-# the Free Software Foundation, either version 3 of the License, or +-# (at your option) any later version. +-# +-# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT +-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +-# for more details. +-# +-# You should have received a copy of the GNU General Public License +-# along with OpenFOAM. If not, see . ++# This file is part of OpenFOAM, licensed under GNU General Public License ++# . + # + # Script + # foamEtcFile + # + # Description +-# Locate user/group/shipped file with semantics similar to the +-# ~OpenFOAM/fileName expansion. ++# Locate user/group/other file as per '#includeEtc'. ++# ++# The -mode option can be used to allow chaining from personal settings ++# to site-wide settings. + # +-# The -mode option can be used to allow chaining from +-# personal settings to site-wide settings. ++# For example, within the user ~/.OpenFOAM//config.sh/compiler: ++# \code ++# eval $(foamEtcFile -sh -mode=go config.sh/compiler) ++# \endcode + # +-# For example, within the user ~/.OpenFOAM//prefs.sh: ++# The -mode option is similarly used within etc/{bashrc,cshrc} to ensure ++# that system prefs are respected: + # \code +-# foamPrefs=`$WM_PROJECT_DIR/bin/foamEtcFile -m go prefs.sh` \ +-# && _foamSource $foamPrefs ++# eval $(foamEtcFile -sh -mode=o prefs.sh) ++# eval $(foamEtcFile -sh -mode=ug prefs.sh) + # \endcode + # ++# Environment ++# - WM_PROJECT: (unset defaults to OpenFOAM) ++# - WM_PROJECT_SITE: (unset defaults to PREFIX/site) ++# - WM_PROJECT_VERSION: (unset defaults to detect from path) ++# + # Note +-# This script must exist in $FOAM_INST_DIR/OpenFOAM-/bin/ +-# or $FOAM_INST_DIR/openfoam/bin/ (for the debian version) ++# This script must exist in one of these locations: ++# - $WM_PROJECT_INST_DIR/OpenFOAM-/bin ++# - $WM_PROJECT_INST_DIR/openfoam-/bin ++# - $WM_PROJECT_INST_DIR/openfoam/bin (debian version) + # + #------------------------------------------------------------------------------- +-usage() { +- [ "${optQuiet:-$optSilent}" = true ] && exit 1 +- +- exec 1>&2 +- while [ "$#" -ge 1 ]; do echo "$1"; shift; done ++printHelp() { + cat< any combination of u(user), g(group), o(other) +- -prefix specify an alternative installation prefix +- -quiet suppress all normal output +- -silent suppress all stderr output +- -version specify an alternative OpenFOAM version +- in the form Maj.Min.Rev (eg, 1.7.0) +- -help print the usage +- +- Locate user/group/shipped file with semantics similar to the +- ~OpenFOAM/fileName expansion. +- +- The options can also be specified as a single character +- (eg, '-q' instead of '-quiet'), but must not be grouped. +- +- Exit status +- 0 when the file is found. Print resolved path to stdout. +- 1 for miscellaneous errors. +- 2 when the file is not found. ++ -all (-a) Return all files (otherwise stop after the first match) ++ -list (-l) List directories or files to be checked ++ -list-test List (existing) directories or files to be checked ++ -mode=MODE Any combination of u(user), g(group), o(other) ++ -prefix=DIR Specify an alternative installation prefix ++ -version=VER Specify alternative OpenFOAM version (eg, 3.0, 1612, ...) ++ -csh Produce output suitable for a csh or sh 'eval' ++ -csh-verbose As per -csh with additional verbosity ++ -sh Produce output suitable for a csh or sh 'eval' ++ -sh-verbose As per -sh with additional verbosity ++ -quiet (-q) Suppress all normal output ++ -silent (-s) Suppress stderr, except -csh-verbose, -sh-verbose output ++ -help Print the usage ++ ++Locate user/group/other file as per '#includeEtc' ++ ++Do not group single character options. ++Equivalent options: ++ | -mode=MODE | -mode MODE | -m MODE ++ | -prefix=DIR | -prefix DIR | -p DIR ++ | -version=VER | -version VER | -v VER ++ ++Exit status ++ 0 when the file is found. Print resolved path to stdout. ++ 1 for miscellaneous errors. ++ 2 when the file is not found. + + USAGE +- exit 1 ++ exit 0 # A clean exit + } + +-#------------------------------------------------------------------------------- + +-# the bin dir: +-binDir="${0%/*}" ++unset optQuiet optSilent ++# Report error and exit ++die() ++{ ++ [ "${optQuiet:-$optSilent}" = true ] && exit 1 ++ exec 1>&2 ++ echo ++ echo "Error encountered:" ++ while [ "$#" -ge 1 ]; do echo " $1"; shift; done ++ echo ++ echo "See 'foamEtcFile -help' for usage" ++ echo ++ exit 1 ++} + +-# the project dir: +-projectDir="${binDir%/bin}" ++#------------------------------------------------------------------------------- ++binDir="${0%/*}" # The bin dir ++projectDir="${binDir%/bin}" # The project dir ++prefixDir="${projectDir%/*}" # The prefix dir (same as $WM_PROJECT_INST_DIR) + +-# the prefix dir (same as $FOAM_INST_DIR): +-prefixDir="${projectDir%/*}" ++# Could not resolve projectDir, prefixDir? (eg, called as ./bin/foamEtcFile) ++if [ "$prefixDir" = "$projectDir" ] ++then ++ binDir="$(cd $binDir && pwd -L)" ++ projectDir="${binDir%/bin}" ++ prefixDir="${projectDir%/*}" ++fi ++projectDirName="${projectDir##*/}" # The project directory name + +-# the name used for the project directory +-projectDirName="${projectDir##*/}" ++projectVersion="$WM_PROJECT_VERSION" # Empty? - will be treated later ++userDir="$HOME/.OpenFOAM" # Hard-coded as per foamVersion.H + +-# version number used for debian packaging +-unset versionNum ++#------------------------------------------------------------------------------- + ++# Guess project version or simply get the stem part of the projectDirName. ++# Handle standard and debian naming conventions. + # +-# handle standard and debian naming convention ++# - projectVersion: update unless already set + # +-case "$projectDirName" in +-OpenFOAM-*) # standard naming convention OpenFOAM- +- version="${projectDirName##OpenFOAM-}" +- ;; ++# Helper variables: ++# - dirBase (for reassembling name) == projectDirName without the version ++# - versionNum (debian packaging) ++unset dirBase versionNum ++guessVersion() ++{ ++ local version ++ ++ case "$projectDirName" in ++ (OpenFOAM-* | openfoam-*) ++ # Standard naming: OpenFOAM- or openfoam- ++ dirBase="${projectDirName%%-*}-" ++ version="${projectDirName#*-}" ++ version="${version%%*-}" # Extra safety, eg openfoam-version-packager ++ ;; ++ ++ (openfoam[0-9]*) ++ # Debian naming: openfoam ++ dirBase="openfoam" ++ version="${projectDirName#openfoam}" ++ versionNum="$version" ++ ++ # Convert digits version number to decimal delineated ++ case "${#versionNum}" in (2|3|4) ++ version=$(echo "$versionNum" | sed -e 's@\([0-9]\)@\1.@g') ++ version="${version%.}" ++ ;; ++ esac + +-openfoam[0-9]* | openfoam-dev) # debian naming convention 'openfoam' +- versionNum="${projectDirName##openfoam}" +- case "$versionNum" in +- ??) # convert 2 digit version number to decimal delineated +- version=$(echo "$versionNum" | sed -e 's@\(.\)\(.\)@\1.\2@') +- ;; +- ???) # convert 3 digit version number to decimal delineated +- version=$(echo "$versionNum" | sed -e 's@\(.\)\(.\)\(.\)@\1.\2.\3@') ++ # Ignore special treatment if no decimals were inserted. ++ [ "${#version}" -gt "${#versionNum}" ] || unset versionNum + ;; +- ????) # convert 4 digit version number to decimal delineated +- version=$(echo "$versionNum" | sed -e 's@\(.\)\(.\)\(.\)\(.\)@\1.\2.\3.\4@') +- ;; +- *) # failback - use current environment setting +- version="$WM_PROJECT_VERSION" ++ ++ (*) ++ die "unknown/unsupported naming convention for '$projectDirName'" + ;; + esac +- ;; + +-*) +- echo "Error : unknown/unsupported naming convention" +- exit 1 +- ;; +-esac ++ # Set projectVersion if required ++ : ${projectVersion:=$version} ++} + + +-# default mode is 'ugo' +-mode=ugo +-unset optAll optList optQuiet optSilent ++# Set projectVersion and update versionNum, projectDirName accordingly ++setVersion() ++{ ++ projectVersion="$1" + +-# parse options ++ # Need dirBase when reassembling projectDirName ++ [ -n "$dirBase" ] || guessVersion ++ ++ # Debian: update x.y.z -> xyz version ++ if [ -n "$versionNum" ] ++ then ++ versionNum=$(echo "$projectVersion" | sed -e 's@\.@@g') ++ fi ++ ++ projectDirName="$dirBase${versionNum:-$projectVersion}" ++} ++ ++ ++optMode=ugo # Default mode is always 'ugo' ++unset optAll optList optShell optVersion ++ ++# Parse options + while [ "$#" -gt 0 ] + do + case "$1" in +- -h | -help) +- usage ++ -h | -help*) ++ printHelp + ;; + -a | -all) + optAll=true ++ unset optShell + ;; + -l | -list) + optList=true ++ unset optShell ++ ;; ++ -list-test) ++ optList='test' ++ unset optShell ++ ;; ++ -csh | -sh | -csh-verbose | -sh-verbose) ++ optShell="${1#-}" ++ unset optAll ++ ;; ++ -mode=[ugo]*) ++ optMode="${1#*=}" ++ ;; ++ -prefix=/*) ++ prefixDir="${1#*=}" ++ prefixDir="${prefixDir%/}" ++ ;; ++ -version=*) ++ optVersion="${1#*=}" + ;; + -m | -mode) +- [ "$#" -ge 2 ] || usage "'$1' option requires an argument" +- mode="$2" +- +- # sanity check: +- case "$mode" in +- *u* | *g* | *o* ) +- ;; +- *) +- usage "'$1' option with invalid mode '$mode'" +- ;; +- esac ++ optMode="$2" + shift ++ # Sanity check. Handles missing argument too. ++ case "$optMode" in ++ ([ugo]*) ++ ;; ++ (*) ++ die "invalid mode '$optMode'" ++ ;; ++ esac + ;; + -p | -prefix) +- [ "$#" -ge 2 ] || usage "'$1' option requires an argument" +- prefixDir="$2" ++ [ "$#" -ge 2 ] || die "'$1' option requires an argument" ++ prefixDir="${2%/}" + shift + ;; + -q | -quiet) +@@ -171,13 +242,8 @@ + optSilent=true + ;; + -v | -version) +- [ "$#" -ge 2 ] || usage "'$1' option requires an argument" +- version="$2" +- # convert x.y.z -> xyz version (if installation looked like debian) +- if [ -n "$versionNum" ] +- then +- versionNum=$(echo "$version" | sed -e 's@\.@@g') +- fi ++ [ "$#" -ge 2 ] || die "'$1' option requires an argument" ++ optVersion="$2" + shift + ;; + --) +@@ -185,7 +251,7 @@ + break + ;; + -*) +- usage "unknown option: '$*'" ++ die "unknown option: '$1'" + ;; + *) + break +@@ -195,11 +261,28 @@ + done + + +-# debugging: +-# echo "Installed locations:" +-# for i in projectDir prefixDir projectDirName version versionNum ++#------------------------------------------------------------------------------- ++ ++if [ -n "$optVersion" ] ++then ++ setVersion $optVersion ++elif [ -z "$projectVersion" ] ++then ++ guessVersion ++fi ++ ++# Updates: ++# - projectDir for changes via -prefix or -version ++# - groupDir for changes via -prefix ++projectDir="$prefixDir/$projectDirName" ++groupDir="${WM_PROJECT_SITE:-$prefixDir/site}" ++ ++ ++# Debugging: ++# echo "Installed locations:" 1>&2 ++# for i in projectDir prefixDir projectDirName projectVersion + # do +-# eval echo "$i=\$$i" ++# eval echo "$i=\$$i" 1>&2 + # done + + +@@ -210,30 +293,18 @@ + + # Define the various places to be searched: + unset dirList +-case "$mode" in +-*u*) # user +- userDir="$HOME/.${WM_PROJECT:-OpenFOAM}" +- dirList="$dirList $userDir/$version $userDir" ++case "$optMode" in (*u*) # (U)ser ++ dirList="$dirList $userDir/$projectVersion $userDir" + ;; + esac + +-case "$mode" in +-*g*) # group (site) +- siteDir="${WM_PROJECT_SITE:-$prefixDir/site}" +- dirList="$dirList $siteDir/$version $siteDir" ++case "$optMode" in (*g*) # (G)roup == site ++ dirList="$dirList $groupDir/$projectVersion $groupDir" + ;; + esac + +-case "$mode" in +-*o*) # other (shipped) +- if [ -n "$versionNum" ] +- then +- # debian packaging +- dirList="$dirList $prefixDir/openfoam$versionNum/etc" +- else +- # standard packaging +- dirList="$dirList $prefixDir/${WM_PROJECT:-OpenFOAM}-$version/etc" +- fi ++case "$optMode" in (*o*) # (O)ther == shipped ++ dirList="$dirList $projectDir/etc" + ;; + esac + set -- $dirList +@@ -244,50 +315,87 @@ + # + + exitCode=0 +-if [ "$optList" = true ] ++if [ -n "$optList" ] + then + +- # list directories, or potential file locations +- [ "$nArgs" -le 1 ] || usage ++ # List directories, or potential file locations ++ [ "$nArgs" -le 1 ] || \ ++ die "-list expects 0 or 1 filename, but $nArgs provided" + +- # a silly combination, but -quiet does have precedence +- [ "$optQuiet" = true ] && exit 0 ++ # A silly combination, but -quiet does have precedence ++ [ -n "$optQuiet" ] && exit 0 ++ ++ # Test for directory or file too? ++ if [ "$optList" = "test" ] ++ then ++ exitCode=2 # Fallback to a general error (file not found) + +- for dir +- do + if [ "$nArgs" -eq 1 ] + then +- echo "$dir/$fileName" ++ for dir ++ do ++ resolved="$dir/$fileName" ++ if [ -f "$resolved" ] ++ then ++ echo "$resolved" ++ exitCode=0 # OK ++ fi ++ done + else +- echo "$dir" ++ for dir ++ do ++ if [ -d "$dir" ] ++ then ++ echo "$dir" ++ exitCode=0 # OK ++ fi ++ done + fi +- done ++ else ++ for dir ++ do ++ echo "$dir${fileName:+/}$fileName" ++ done ++ fi + + else + +- [ "$nArgs" -eq 1 ] || usage ++ [ "$nArgs" -eq 1 ] || die "One filename expected - $nArgs provided" + +- # general error, eg file not found +- exitCode=2 ++ exitCode=2 # Fallback to a general error (file not found) + + for dir + do + if [ -f "$dir/$fileName" ] + then + exitCode=0 +- if [ "$optQuiet" = true ] +- then ++ [ -n "$optQuiet" ] && break ++ ++ case "$optShell" in ++ (*verbose) ++ echo "Using: $dir/$fileName" 1>&2 ++ ;; ++ esac ++ ++ case "$optShell" in ++ csh*) ++ echo "source $dir/$fileName" + break +- else ++ ;; ++ sh*) ++ echo ". $dir/$fileName" ++ break ++ ;; ++ *) + echo "$dir/$fileName" +- [ "$optAll" = true ] || break +- fi ++ [ -n "$optAll" ] || break ++ ;; ++ esac + fi + done + + fi + +- + exit $exitCode + + #------------------------------------------------------------------------------ +--- OpenFOAM-v1612+.orig/etc/bashrc 2016-12-23 15:22:59.000000000 +0100 ++++ OpenFOAM-v1612+/etc/bashrc 2017-03-22 16:05:05.751237072 +0100 +@@ -42,7 +42,8 @@ + # + # Please set to the appropriate path if the default is not correct. + # +-[ $BASH_SOURCE ] && FOAM_INST_DIR=$(\cd ${BASH_SOURCE%/*/*/*} && \pwd -P) || \ ++rc="${BASH_SOURCE:-${ZSH_NAME:+$0}}" ++[ -n "$rc" ] && FOAM_INST_DIR=$(\cd $(dirname $rc)/../.. && \pwd -L) || \ + FOAM_INST_DIR=$HOME/$WM_PROJECT + # FOAM_INST_DIR=~$WM_PROJECT + # FOAM_INST_DIR=/opt/$WM_PROJECT +@@ -135,8 +136,10 @@ + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + . $WM_PROJECT_DIR/etc/config.sh/functions + +-# Add in preset user or site preferences: +-_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile prefs.sh` ++# Override definitions via prefs, with 'other' first so the sys-admin ++# can provide base values independent of WM_PROJECT_SITE ++_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile -mode o prefs.sh` ++_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile -mode ug prefs.sh` + + # Evaluate command-line parameters and record settings for later + # these can be used to set/unset values, or specify alternative pref files +diff -uw OpenFOAM-v1612+.orig/etc/cshrc OpenFOAM-v1612+/etc/cshrc +--- OpenFOAM-v1612+.orig/etc/cshrc 2016-12-23 15:22:59.000000000 +0100 ++++ OpenFOAM-v1612+/etc/cshrc 2017-03-22 16:04:51.839291067 +0100 +@@ -148,8 +148,10 @@ + # Source files, possibly with some verbosity + alias _foamSource 'if ($?FOAM_VERBOSE && $?prompt) echo "Sourcing: \!*"; if (\!* != "") source \!*' + +-# Add in preset user or site preferences: +-_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile prefs.csh` ++# Override definitions via prefs, with 'other' first so the sys-admin ++# can provide base values independent of WM_PROJECT_SITE ++_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile -mode o prefs.csh` ++_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile -mode ug prefs.csh` + + # Evaluate command-line parameters and record settings for later + # these can be used to set/unset values, or specify alternative pref files +--- OpenFOAM-v1612+.orig/etc/config.sh/settings 2016-12-23 15:22:59.000000000 +0100 ++++ OpenFOAM-v1612+/etc/config.sh/settings 2017-12-21 20:40:50.109036445 +0100 +@@ -141,7 +141,7 @@ + #------------------------------------------------------------------------------ + + # Location of the jobControl directory +-export FOAM_JOB_DIR=$WM_PROJECT_INST_DIR/jobControl ++export FOAM_JOB_DIR="$HOME/.OpenFOAM/jobControl" + + # wmake configuration + export WM_DIR=$WM_PROJECT_DIR/wmake +@@ -198,8 +198,12 @@ + unset siteDir + + _foamAddPath $FOAM_USER_APPBIN:$FOAM_SITE_APPBIN:$FOAM_APPBIN +-# Make sure to pick up dummy versions of external libraries last +-_foamAddLib $FOAM_USER_LIBBIN:$FOAM_SITE_LIBBIN:$FOAM_LIBBIN:$FOAM_EXT_LIBBIN:$FOAM_LIBBIN/dummy ++_foamAddLib $FOAM_LIBBIN/dummy # Dummy versions of external libraries last ++if [ -n "$FOAM_EXT_LIBBIN" ] # External libraries (allowed to be unset) ++then ++ _foamAddLib $FOAM_EXT_LIBBIN ++fi ++_foamAddLib $FOAM_USER_LIBBIN:$FOAM_SITE_LIBBIN:$FOAM_LIBBIN + + # Compiler settings + # ~~~~~~~~~~~~~~~~~ +--- OpenFOAM-v1612+.orig/etc/config.csh/settings 2016-12-23 15:22:59.000000000 +0100 ++++ OpenFOAM-v1612+/etc/config.csh/settings 2017-12-21 20:37:24.301773802 +0100 +@@ -137,7 +137,7 @@ + #------------------------------------------------------------------------------ + + # Location of the jobControl directory +-setenv FOAM_JOB_DIR $WM_PROJECT_INST_DIR/jobControl ++setenv FOAM_JOB_DIR "$HOME/.OpenFOAM/jobControl" + + # wmake configuration + setenv WM_DIR $WM_PROJECT_DIR/wmake +@@ -196,8 +196,11 @@ + unset siteDir + + _foamAddPath ${FOAM_USER_APPBIN}:${FOAM_SITE_APPBIN}:${FOAM_APPBIN} +-# Make sure to pick up dummy versions of external libraries last +-_foamAddLib ${FOAM_USER_LIBBIN}:${FOAM_SITE_LIBBIN}:${FOAM_LIBBIN}:${FOAM_EXT_LIBBIN}:${FOAM_LIBBIN}/dummy ++_foamAddLib $FOAM_LIBBIN/dummy # Dummy versions of external libraries last ++if ( $?FOAM_EXT_LIBBIN ) then # External libraries (allowed to be unset) ++ _foamAddLib $FOAM_EXT_LIBBIN ++endif ++_foamAddLib ${FOAM_USER_LIBBIN}:${FOAM_SITE_LIBBIN}:${FOAM_LIBBIN} + + # Compiler settings + # ~~~~~~~~~~~~~~~~~ +--- OpenFOAM-v1612+.orig/etc/config.sh/mpi 2016-12-23 15:22:59.000000000 +0100 ++++ OpenFOAM-v1612+/etc/config.sh/mpi 2017-03-29 13:55:57.507980699 +0200 +@@ -75,8 +75,15 @@ + _foamAddMan $MPI_ARCH_PATH/share/man + ;; + ++USERMPI) ++ # Use an arbitrary, user-specified mpi implementation ++ export FOAM_MPI=mpi-user ++ _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/mpi-user` ++ ;; ++ + SYSTEMMPI) + export FOAM_MPI=mpi-system ++ _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/mpi-system` + + if [ -z "$MPI_ROOT" ] + then +--- OpenFOAM-v1612+.orig/etc/config.csh/mpi 2016-12-23 15:22:59.000000000 +0100 ++++ OpenFOAM-v1612+/etc/config.csh/mpi 2017-03-29 13:56:36.347835938 +0200 +@@ -71,8 +71,15 @@ + _foamAddMan $MPI_ARCH_PATH/share/man + breaksw + ++case USERMPI: ++ # Use an arbitrary, user-specified mpi implementation ++ setenv FOAM_MPI mpi-user ++ _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/mpi-user` ++ breaksw ++ + case SYSTEMMPI: + setenv FOAM_MPI mpi-system ++ _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/mpi-system` + + if ( ! ($?MPI_ROOT) ) then + echo +--- OpenFOAM-v1612+.orig/src/fvAgglomerationMethods/Allwmake 2017-01-02 09:56:17.578558265 +0100 ++++ OpenFOAM-v1612+/src/fvAgglomerationMethods/Allwmake 2017-04-18 18:58:38.236795902 +0200 +@@ -4,9 +4,13 @@ + # Parse arguments for library compilation + . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments + +-export ParMGridGen=$WM_THIRD_PARTY_DIR/ParMGridGen-1.0 ++unset MGRIDGEN_ARCH_PATH ++if settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/mgridgen) ++then ++ . $settings ++fi + +-if [ -e "$FOAM_LIBBIN/libMGridGen.so" ] ++if [ -e "$MGRIDGEN_ARCH_PATH/include/mgridgen.h" ] + then + wmake $targetType MGridGenGamgAgglomeration + fi +--- OpenFOAM-v1612+.orig/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options 2017-01-02 09:56:17.578558265 +0100 ++++ OpenFOAM-v1612+/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options 2017-04-18 18:59:16.860662811 +0200 +@@ -1,15 +1,9 @@ +-/* Needs ParMGridGen environment variable set. (see Allwmake script) */ +- +-TYPE_REAL= +-#if defined(WM_SP) +-TYPE_REAL=-DTYPE_REAL +-#endif +- + EXE_INC = \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ +- -I$(ParMGridGen)/MGridGen/Lib/lnInclude \ +- -I$(ParMGridGen)/MGridGen/IMlib/lnInclude \ +- $(TYPE_REAL) ++ -I$(MGRIDGEN_ARCH_PATH)/include + + LIB_LIBS = \ +- -L$(FOAM_EXT_LIBBIN) -lMGridGen ++ -L$(FOAM_EXT_LIBBIN) \ ++ -L$(MGRIDGEN_ARCH_PATH)/lib \ ++ -L$(MGRIDGEN_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \ ++ -lmgrid +--- OpenFOAM-v1612+.orig/src/parallel/decompose/Allwmake 2017-03-21 16:34:44.599021283 +0100 ++++ OpenFOAM-v1612+/src/parallel/decompose/Allwmake 2017-03-21 16:28:57.243969660 +0100 +@@ -36,6 +36,7 @@ + + # Library + [ -r $FOAM_EXT_LIBBIN/libmetis.so ] || \ ++ [ -r $METIS_ARCH_PATH/lib/libmetis.so ] || \ + [ -r $METIS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmetis.so ] || \ + [ "${METIS_ARCH_PATH##*-}" = system ] || { + echo "$warning (missing library)" +@@ -90,6 +91,7 @@ + + # Library + [ -r $FOAM_EXT_LIBBIN/libscotch.so ] || \ ++ [ -r $SCOTCH_ARCH_PATH/lib/libscotch.so ] || \ + [ -r $SCOTCH_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libscotch.so ] || \ + [ "${SCOTCH_ARCH_PATH##*-}" = system ] || { + echo "$warning (missing library)" +--- OpenFOAM-v1612+.orig/src/parallel/decompose/metisDecomp/Make/options 2017-03-21 16:34:25.383075328 +0100 ++++ OpenFOAM-v1612+/src/parallel/decompose/metisDecomp/Make/options 2017-03-21 16:30:15.727758338 +0100 +@@ -8,6 +8,7 @@ + * to support central, non-thirdparty installations + */ + LIB_LIBS = \ ++ -L$(METIS_ARCH_PATH)/lib \ + -L$(METIS_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \ + -L$(FOAM_EXT_LIBBIN) \ + -lmetis +--- OpenFOAM-v1612+.orig/src/parallel/decompose/ptscotchDecomp/Make/options 2017-03-21 16:34:34.607049385 +0100 ++++ OpenFOAM-v1612+/src/parallel/decompose/ptscotchDecomp/Make/options 2017-03-21 16:30:00.479799399 +0100 +@@ -16,6 +16,7 @@ + * to support central, non-thirdparty installations + */ + LIB_LIBS = \ ++ -L$(SCOTCH_ARCH_PATH)/lib \ + -L$(SCOTCH_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \ + -L$(FOAM_EXT_LIBBIN) \ + -L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) \ +--- OpenFOAM-v1612+.orig/src/parallel/decompose/scotchDecomp/Make/options 2017-03-21 16:34:39.159036582 +0100 ++++ OpenFOAM-v1612+/src/parallel/decompose/scotchDecomp/Make/options 2017-03-21 16:29:46.719836452 +0100 +@@ -16,6 +16,7 @@ + * to support central, non-thirdparty installations + */ + LIB_LIBS = \ ++ -L$(SCOTCH_ARCH_PATH)/lib \ + -L$(SCOTCH_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \ + -L$(FOAM_EXT_LIBBIN) \ + -lscotch \ +--- OpenFOAM-v1612+.orig/applications/utilities/mesh/manipulation/renumberMesh/Allwmake 2016-12-23 15:22:59.000000000 +0100 ++++ OpenFOAM-v1612+/applications/utilities/mesh/manipulation/renumberMesh/Allwmake 2017-03-28 11:13:35.222727218 +0200 +@@ -4,20 +4,35 @@ + # Parse arguments for compilation (at least for error catching) + . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments + +-export COMPILE_FLAGS='' +-export LINK_FLAGS='' ++unset COMP_FLAGS LINK_FLAGS + + if [ -f "${FOAM_LIBBIN}/libSloanRenumber.so" ] + then +- echo "Found libSloanRenumber.so -- enabling Sloan renumbering support." ++ echo " found libSloanRenumber -- enabling sloan renumbering support." + export LINK_FLAGS="${LINK_FLAGS} -lSloanRenumber" + fi + +-if [ -f "${ZOLTAN_ARCH_PATH}/lib/libzoltan.a" -a -f "${FOAM_LIBBIN}/libzoltanRenumber.so" ] ++if [ -f "${FOAM_LIBBIN}/libzoltanRenumber.so" ] + then +- echo "Found libzoltanRenumber.so -- enabling zoltan renumbering support." +- export COMPILE_FLAGS="-DFOAM_USE_ZOLTAN" +- export LINK_FLAGS="${LINK_FLAGS} -lzoltanRenumber -L${ZOLTAN_ARCH_PATH}/lib -lzoltan" ++ if [ -z "$ZOLTAN_ARCH_PATH" ] ++ then ++ # Optional: get ZOLTAN_ARCH_PATH ++ if settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/zoltan) ++ then ++ . $settings ++ fi ++ fi ++ ++ for libdir in lib "lib${WM_COMPILER_LIB_ARCH}" ++ do ++ if [ -f "$ZOLTAN_ARCH_PATH/$libdir/libzoltan.a" ] ++ then ++ echo " found libzoltanRenumber -- enabling zoltan renumbering support." ++ export COMP_FLAGS="-DFOAM_USE_ZOLTAN" ++ export LINK_FLAGS="${LINK_FLAGS} -lzoltanRenumber -L$ZOLTAN_ARCH_PATH/$libdir -lzoltan" ++ break ++ fi ++ done + fi + + wmake $targetType +--- OpenFOAM-v1612+.orig/src/renumber/Allwmake 2016-12-23 15:22:59.000000000 +0100 ++++ OpenFOAM-v1612+/src/renumber/Allwmake 2017-03-28 11:10:22.195543610 +0200 +@@ -5,14 +5,11 @@ + targetType=libso + . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments + +-## Get ZOLTAN_ARCH_PATH +-#if settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/zoltan) +-#then +-# . $settings +-# echo "using ZOLTAN_ARCH_PATH=$ZOLTAN_ARCH_PATH" +-#else +-# echo "Error: no config.sh/zoltan settings" +-#fi ++# Optional: get ZOLTAN_ARCH_PATH ++if settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/zoltan) ++then ++ . $settings ++fi + + wmake $targetType renumberMethods + +--- OpenFOAM-v1612+.orig/src/renumber/zoltanRenumber/Make/options 2016-12-23 15:22:59.000000000 +0100 ++++ OpenFOAM-v1612+/src/renumber/zoltanRenumber/Make/options 2017-03-28 11:50:46.484343848 +0200 +@@ -4,10 +4,13 @@ + EXE_INC = \ + /* -DFULLDEBUG -g -O0 */ \ + $(PFLAGS) $(PINC) \ ++ ${c++LESSWARN} \ + -I$(FOAM_SRC)/renumber/renumberMethods/lnInclude \ + -I$(ZOLTAN_ARCH_PATH)/include/ \ + -I$(LIB_SRC)/meshTools/lnInclude + + LIB_LIBS = \ +- /* -L$(ZOLTAN_ARCH_PATH)/lib -lzoltan */ \ ++ -L$(ZOLTAN_ARCH_PATH)/lib \ ++ -L$(ZOLTAN_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \ ++ -lzoltan \ + -lmeshTools diff --git a/var/spack/repos/builtin/packages/openfoam-com/1612-zoltan-lib.patch b/var/spack/repos/builtin/packages/openfoam-com/1612-zoltan-lib.patch deleted file mode 100644 index 712e6a7dfd..0000000000 --- a/var/spack/repos/builtin/packages/openfoam-com/1612-zoltan-lib.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- OpenFOAM-v1612+.orig/applications/utilities/mesh/manipulation/renumberMesh/Allwmake 2016-12-23 15:22:59.000000000 +0100 -+++ OpenFOAM-v1612+/applications/utilities/mesh/manipulation/renumberMesh/Allwmake 2017-03-28 11:13:35.222727218 +0200 -@@ -4,20 +4,35 @@ - # Parse arguments for compilation (at least for error catching) - . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments - --export COMPILE_FLAGS='' --export LINK_FLAGS='' -+unset COMP_FLAGS LINK_FLAGS - - if [ -f "${FOAM_LIBBIN}/libSloanRenumber.so" ] - then -- echo "Found libSloanRenumber.so -- enabling Sloan renumbering support." -+ echo " found libSloanRenumber -- enabling sloan renumbering support." - export LINK_FLAGS="${LINK_FLAGS} -lSloanRenumber" - fi - --if [ -f "${ZOLTAN_ARCH_PATH}/lib/libzoltan.a" -a -f "${FOAM_LIBBIN}/libzoltanRenumber.so" ] -+if [ -f "${FOAM_LIBBIN}/libzoltanRenumber.so" ] - then -- echo "Found libzoltanRenumber.so -- enabling zoltan renumbering support." -- export COMPILE_FLAGS="-DFOAM_USE_ZOLTAN" -- export LINK_FLAGS="${LINK_FLAGS} -lzoltanRenumber -L${ZOLTAN_ARCH_PATH}/lib -lzoltan" -+ if [ -z "$ZOLTAN_ARCH_PATH" ] -+ then -+ # Optional: get ZOLTAN_ARCH_PATH -+ if settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/zoltan) -+ then -+ . $settings -+ fi -+ fi -+ -+ for libdir in lib "lib${WM_COMPILER_LIB_ARCH}" -+ do -+ if [ -f "$ZOLTAN_ARCH_PATH/$libdir/libzoltan.a" ] -+ then -+ echo " found libzoltanRenumber -- enabling zoltan renumbering support." -+ export COMP_FLAGS="-DFOAM_USE_ZOLTAN" -+ export LINK_FLAGS="${LINK_FLAGS} -lzoltanRenumber -L$ZOLTAN_ARCH_PATH/$libdir -lzoltan" -+ break -+ fi -+ done - fi - - wmake $targetType ---- OpenFOAM-v1612+.orig/src/renumber/Allwmake 2016-12-23 15:22:59.000000000 +0100 -+++ OpenFOAM-v1612+/src/renumber/Allwmake 2017-03-28 11:10:22.195543610 +0200 -@@ -5,14 +5,11 @@ - targetType=libso - . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments - --## Get ZOLTAN_ARCH_PATH --#if settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/zoltan) --#then --# . $settings --# echo "using ZOLTAN_ARCH_PATH=$ZOLTAN_ARCH_PATH" --#else --# echo "Error: no config.sh/zoltan settings" --#fi -+# Optional: get ZOLTAN_ARCH_PATH -+if settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/zoltan) -+then -+ . $settings -+fi - - wmake $targetType renumberMethods - ---- OpenFOAM-v1612+.orig/src/renumber/zoltanRenumber/Make/options 2016-12-23 15:22:59.000000000 +0100 -+++ OpenFOAM-v1612+/src/renumber/zoltanRenumber/Make/options 2017-03-28 11:50:46.484343848 +0200 -@@ -4,10 +4,13 @@ - EXE_INC = \ - /* -DFULLDEBUG -g -O0 */ \ - $(PFLAGS) $(PINC) \ -+ ${c++LESSWARN} \ - -I$(FOAM_SRC)/renumber/renumberMethods/lnInclude \ - -I$(ZOLTAN_ARCH_PATH)/include/ \ - -I$(LIB_SRC)/meshTools/lnInclude - - LIB_LIBS = \ -- /* -L$(ZOLTAN_ARCH_PATH)/lib -lzoltan */ \ -+ -L$(ZOLTAN_ARCH_PATH)/lib \ -+ -L$(ZOLTAN_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \ -+ -lzoltan \ - -lmeshTools diff --git a/var/spack/repos/builtin/packages/openfoam-com/1706-site.patch b/var/spack/repos/builtin/packages/openfoam-com/1706-site.patch deleted file mode 100644 index 6dab9b555b..0000000000 --- a/var/spack/repos/builtin/packages/openfoam-com/1706-site.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- OpenFOAM-plus.orig/etc/config.sh/settings 2016-12-23 15:22:59.000000000 +0100 -+++ OpenFOAM-plus/etc/config.sh/settings 2017-04-04 12:21:31.295498985 +0200 -@@ -157,7 +157,7 @@ - export FOAM_EXT_LIBBIN=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/lib - - # Site-specific directory --siteDir="${WM_PROJECT_SITE:-$WM_PROJECT_INST_DIR/site}" -+siteDir="${WM_PROJECT_SITE:-$WM_PROJECT_DIR/site}" #SPACK: not in parent directory - - # Shared site executables/libraries - # Similar naming convention as ~OpenFOAM expansion ---- OpenFOAM-plus.orig/etc/config.csh/settings 2016-12-23 15:22:59.000000000 +0100 -+++ OpenFOAM-plus/etc/config.csh/settings 2017-03-23 12:23:52.737891912 +0100 -@@ -156,7 +156,7 @@ - if ( $?WM_PROJECT_SITE ) then - set siteDir=$WM_PROJECT_SITE - else -- set siteDir=$WM_PROJECT_INST_DIR/site -+ set siteDir=$WM_PROJECT_DIR/site #SPACK: not in parent directory - endif - - # Shared site executables/libraries diff --git a/var/spack/repos/builtin/packages/openfoam-com/package.py b/var/spack/repos/builtin/packages/openfoam-com/package.py index 1a01d45ce4..ec070f5103 100644 --- a/var/spack/repos/builtin/packages/openfoam-com/package.py +++ b/var/spack/repos/builtin/packages/openfoam-com/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 Mark Olesen, OpenCFD Ltd. +# Copyright (c) 2017-2018 Mark Olesen, OpenCFD Ltd. # # This file was authored by Mark Olesen # and is released as part of spack under the LGPL license. @@ -276,25 +276,28 @@ class OpenfoamCom(Package): maintainers = ['olesenm'] homepage = "http://www.openfoam.com/" - baseurl = "https://sourceforge.net/projects/openfoamplus/files/" gitrepo = "https://develop.openfoam.com/Development/OpenFOAM-plus.git" + url = "https://sourceforge.net/projects/openfoamplus/files/v1706/OpenFOAM-v1706.tgz" + list_url = "https://sourceforge.net/projects/openfoamplus/files/" + list_depth = 2 - version('1706', '630d30770f7b54d6809efbf94b7d7c8f', - url=baseurl + 'v1706/OpenFOAM-v1706.tgz') - version('1612', 'ca02c491369150ab127cbb88ec60fbdf', - url=baseurl + 'v1612+/OpenFOAM-v1612+.tgz') + version('1712', '6ad92df051f4d52c7d0ec34f4b8eb3bc') + version('1706', '630d30770f7b54d6809efbf94b7d7c8f') + version('1612', 'ca02c491369150ab127cbb88ec60fbdf') version('develop', branch='develop', git=gitrepo) # Needs credentials - variant('int64', default=False, - description='Compile with 64-bit label') variant('float32', default=False, - description='Compile with 32-bit scalar (single-precision)') + description='Use single-precision') + variant('int64', default=False, + description='With 64-bit labels') variant('knl', default=False, description='Use KNL compiler settings') - variant('scotch', default=True, - description='With scotch/ptscotch for decomposition') + variant('kahip', default=True, + description='With kahip decomposition') variant('metis', default=False, - description='With metis for decomposition') + description='With metis decomposition') + variant('scotch', default=True, + description='With scotch/ptscotch decomposition') variant('zoltan', default=False, description='With zoltan renumbering') # TODO?# variant('scalasca', default=False, @@ -322,6 +325,7 @@ class OpenfoamCom(Package): # Require scotch with ptscotch - corresponds to standard OpenFOAM setup depends_on('scotch~metis+mpi~int64', when='+scotch~int64') depends_on('scotch~metis+mpi+int64', when='+scotch+int64') + depends_on('kahip', when='+kahip') depends_on('metis@5:', when='+metis') depends_on('metis+int64', when='+metis+int64') # mgridgen is statically linked @@ -344,15 +348,7 @@ class OpenfoamCom(Package): assets = [] # Version-specific patches - patch('1612-bin.patch', when='@1612') - patch('1612-build.patch', when='@1612') - patch('1612-etc.patch', when='@1612') - patch('1612-site.patch', when='@1612') - patch('1612-mpi.patch', when='@1612') - patch('1612-mgridgen-lib.patch', when='@1612') - patch('1612-scotch-metis-lib.patch', when='@1612') - patch('1612-zoltan-lib.patch', when='@1612') - patch('1706-site.patch', when='@1706') + patch('1612-spack-patches.patch', when='@1612') # Some user config settings # default: 'compile-option': 'RpathOpt', @@ -378,6 +374,15 @@ class OpenfoamCom(Package): # - End of definitions / setup - # + def url_for_version(self, version): + # Prior to 'v1706' and additional '+' in the naming + fmt = self.list_url + if version <= Version('1612'): + fmt += 'v{0}+/OpenFOAM-v{0}+.tgz' + else: + fmt += 'v{0}/OpenFOAM-v{0}.tgz' + return fmt.format(version, version) + def setup_environment(self, spack_env, run_env): """Add environment variables to the generated module file. These environment variables come from running: @@ -478,7 +483,6 @@ class OpenfoamCom(Package): add_extra_files(self, self.common, self.assets) # Avoid WM_PROJECT_INST_DIR for ThirdParty, site or jobControl. - # Use openfoam-site.patch to handle jobControl, site. # # Filtering: bashrc,cshrc (using a patch is less flexible) edits = { @@ -499,6 +503,18 @@ class OpenfoamCom(Package): posix=join_path('etc', 'config.sh', 'settings'), cshell=join_path('etc', 'config.csh', 'settings')) + # The following filtering is non-vital. It simply prevents 'site' dirs + # from the the wrong level (likely non-existent anyhow) from being + # added to PATH, LD_LIBRARY_PATH. + for rcdir in ['config.sh', 'config.csh']: + rcfile = join_path('etc', rcdir, 'settings') + if os.path.isfile(rcfile): + filter_file( + 'WM_PROJECT_INST_DIR/', + 'WM_PROJECT_DIR/', + rcfile, + backup=False) + def configure(self, spec, prefix): """Make adjustments to the OpenFOAM configuration files in their various locations: etc/bashrc, etc/config.sh/FEATURE and customizations that @@ -547,6 +563,7 @@ class OpenfoamCom(Package): ('PATH', foamAddPath(user_mpi['bindir'])), ], 'scotch': {}, + 'kahip': {}, 'metis': {}, 'ensight': {}, # Disable settings 'paraview': [], @@ -560,6 +577,11 @@ class OpenfoamCom(Package): 'SCOTCH_VERSION': 'scotch-{0}'.format(spec['scotch'].version), } + if '+kahip' in spec: + self.etc_config['kahip'] = { + 'KAHIP_ARCH_PATH': spec['kahip'].prefix, + } + if '+metis' in spec: self.etc_config['metis'] = { 'METIS_ARCH_PATH': spec['metis'].prefix, @@ -748,6 +770,8 @@ class OpenfoamArch(object): platform += 'ia64' elif target == 'armv7l': platform += 'ARM7' + elif target == 'aarch64': + platform += 'ARM64' elif target == 'ppc64': platform += 'PPC64' elif target == 'ppc64le': diff --git a/var/spack/repos/builtin/packages/openfoam-org/assets/bin/foamEtcFile b/var/spack/repos/builtin/packages/openfoam-org/assets/bin/foamEtcFile index 294cc26505..e61279b591 100755 --- a/var/spack/repos/builtin/packages/openfoam-org/assets/bin/foamEtcFile +++ b/var/spack/repos/builtin/packages/openfoam-org/assets/bin/foamEtcFile @@ -7,34 +7,28 @@ # \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd. #------------------------------------------------------------------------------- # License -# This file is part of OpenFOAM. -# -# OpenFOAM is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenFOAM. If not, see . +# This file is part of OpenFOAM, licensed under GNU General Public License +# . # # Script # foamEtcFile # # Description -# Locate user/group/other files with semantics similar to the -# ~OpenFOAM/fileName expansion. +# Locate user/group/other file as per '#includeEtc'. +# +# The -mode option can be used to allow chaining from personal settings +# to site-wide settings. # -# The -mode option can be used to allow chaining from -# personal settings to site-wide settings. +# For example, within the user ~/.OpenFOAM//config.sh/compiler: +# \code +# eval $(foamEtcFile -sh -mode=go config.sh/compiler) +# \endcode # -# For example, within the user ~/.OpenFOAM//prefs.sh: +# The -mode option is similarly used within etc/{bashrc,cshrc} to ensure +# that system prefs are respected: # \code -# eval $(foamEtcFile -sh -mode=go prefs.sh) +# eval $(foamEtcFile -sh -mode=o prefs.sh) +# eval $(foamEtcFile -sh -mode=ug prefs.sh) # \endcode # # Environment @@ -46,42 +40,37 @@ # This script must exist in one of these locations: # - $WM_PROJECT_INST_DIR/OpenFOAM-/bin # - $WM_PROJECT_INST_DIR/openfoam-/bin -# - $WM_PROJECT_INST_DIR/OpenFOAM+/bin -# - $WM_PROJECT_INST_DIR/openfoam+/bin # - $WM_PROJECT_INST_DIR/openfoam/bin (debian version) # #------------------------------------------------------------------------------- -unset optQuiet optSilent -usage() { - [ "${optQuiet:-$optSilent}" = true ] && exit 1 - exec 1>&2 - while [ "$#" -ge 1 ]; do echo "$1"; shift; done +printHelp() { cat< or openfoam+ - dirBase="${projectDirName%%+*}+" - version="${projectDirName#*+}" - version="${version%%*-}" # Extra safety, eg openfoam-version-packager - ;; - (openfoam[0-9]*) # Debian naming: openfoam dirBase="openfoam" @@ -205,8 +189,8 @@ unset optAll optList optShell optVersion while [ "$#" -gt 0 ] do case "$1" in - -h | -help) - usage + -h | -help*) + printHelp ;; -a | -all) optAll=true -- cgit v1.2.3-70-g09d2 From 229db0f1c7a6e7d1638e40310b83a780e53b54ce Mon Sep 17 00:00:00 2001 From: Loikki Date: Wed, 3 Jan 2018 21:35:17 +0100 Subject: Update grackle (#6822) --- var/spack/repos/builtin/packages/grackle/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/grackle/package.py b/var/spack/repos/builtin/packages/grackle/package.py index 06689a3c4c..66fedfcb5a 100644 --- a/var/spack/repos/builtin/packages/grackle/package.py +++ b/var/spack/repos/builtin/packages/grackle/package.py @@ -35,9 +35,10 @@ class Grackle(Package): generalized and trimmed down version of the chemistry network of the Enzo simulation code """ - homepage = 'http://grackle.readthedocs.io/en/grackle-2.2/' - url = 'https://bitbucket.org/grackle/grackle/get/grackle-2.0.1.tar.bz2' + homepage = 'http://grackle.readthedocs.io/en/grackle-3.0/' + url = 'https://bitbucket.org/grackle/grackle/get/grackle-3.0.tar.bz2' + version('3.0', 'dc85e664da7e70b65b3ef7164477a959') version('2.2', 'ec49ed1db5a42db21f478285150c2ba3') version('2.0.1', 'a9624ad13a60c592c1a0a4ea8e1ae86d') -- cgit v1.2.3-70-g09d2 From 75f1a91821461db3af8ae861e2f7651c122cca87 Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 4 Jan 2018 08:55:37 -0600 Subject: py-umi-tools: Create new package (#6823) * py-umi-tools: Create new package * py-umi-tools: fix dependencies --- .../repos/builtin/packages/py-umi-tools/package.py | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-umi-tools/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-umi-tools/package.py b/var/spack/repos/builtin/packages/py-umi-tools/package.py new file mode 100644 index 0000000000..0d1a7f21c7 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-umi-tools/package.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyUmiTools(PythonPackage): + """Tools for handling Unique Molecular Identifiers in NGS data sets""" + + homepage = "https://github.com/CGATOxford/UMI-tools" + url = "https://github.com/CGATOxford/UMI-tools/archive/0.5.3.tar.gz" + + version('0.5.3', '08bdebe30f84867d352ff5e1a2fe4d94') + + depends_on('python@2.7:') + depends_on('py-setuptools@1.1:', type='build') + depends_on('py-numpy@1.7:', type=('build', 'run')) + depends_on('py-pandas@0.12:', type=('build', 'run')) + depends_on('py-pysam@0.8.4:', type=('build', 'run')) + depends_on('py-future', type=('build', 'run')) + depends_on('py-six', type=('build', 'run')) + depends_on('py-regex', type=('build', 'run')) + depends_on('py-scipy', type=('build', 'run')) + depends_on('py-matplotlib', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 70d589a14e980b1419e3f01d12ff37936d088905 Mon Sep 17 00:00:00 2001 From: Milton Woods Date: Fri, 5 Jan 2018 01:58:24 +1100 Subject: xios: I/O management for climate models (#6796) * xios: XML-IO-SERVER library for IO management of climate models * xios: install to prefix directory * xios: add a test case * xios: define versions to use cache and mirror directories * xios: use proper svn URL for version 910 * xios: package url must be defined, otherwise uninstall fails * xios: add trunk version to allow building latest revision * xios: enable parallel build * xios: allow installation with mpif90 compiler wrappers * xios: use mpi variants of dependencies * xios: allow user to specify MPI launcher via MPIRUN environment variable * xios: prefer spack versions of blitz and boost (needed for gcc@7) * xios: enable builds with clang+gfortran on OSX * xios: use numeric versions for releases, @develop for trunk * xios: different patches required for @1.0 and @develop * xios: patch function for clang works across revisions * xios: link blitz library * xios: workaround bug 17782 in llvm * xios: whitespace adjustments for flake8 * xios: avoid bare except clause * xios: netcdf-fortran inherits ^netcdf+mpi from xios dependencies --- .../builtin/packages/xios/bld_extern_1.0.patch | 27 +++ .../builtin/packages/xios/bld_extern_1.x.patch | 27 +++ .../builtin/packages/xios/llvm_bug_17782.patch | 11 + var/spack/repos/builtin/packages/xios/package.py | 224 +++++++++++++++++++++ 4 files changed, 289 insertions(+) create mode 100644 var/spack/repos/builtin/packages/xios/bld_extern_1.0.patch create mode 100644 var/spack/repos/builtin/packages/xios/bld_extern_1.x.patch create mode 100644 var/spack/repos/builtin/packages/xios/llvm_bug_17782.patch create mode 100644 var/spack/repos/builtin/packages/xios/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/xios/bld_extern_1.0.patch b/var/spack/repos/builtin/packages/xios/bld_extern_1.0.patch new file mode 100644 index 0000000000..cf2aeaaa4e --- /dev/null +++ b/var/spack/repos/builtin/packages/xios/bld_extern_1.0.patch @@ -0,0 +1,27 @@ +--- a/bld.cfg 2017-12-23 11:41:14.000000000 +1100 ++++ b/bld.cfg 2017-12-23 15:34:53.914024629 +1100 +@@ -24,9 +24,6 @@ + + search_src true + src::zzz . +-src::date $PWD/extern/boost/src/date_time +-src::blitz $PWD/extern/blitz/src +-src::netcdf $PWD/extern/netcdf4 + bld::lib xios + bld::target libxios.a + #bld::target generate_fortran_interface.exe +@@ -37,11 +34,11 @@ + bld::tool::fc %FCOMPILER + bld::tool::fpp %FPP + bld::tool::cpp %CPP +-bld::tool::cppflags %CBASE_INC -I${PWD}/extern/src_netcdf -I${PWD}/extern/boost/include -I${PWD}/extern/rapidxml/include -I${PWD}/extern/blitz/include +-bld::tool::fppflags %BASE_INC -I${PWD}/extern/boost/include -I${PWD}/extern/rapidxml/include ++bld::tool::cppflags %CBASE_INC -I${PWD}/extern/rapidxml/include ++bld::tool::fppflags %BASE_INC -I${PWD}/extern/rapidxml/include + bld::tool::ld %LINKER + bld::tool::ldflags %LD_FLAGS +-bld::tool::cflags %CFLAGS %CBASE_INC -I${PWD}/extern/src_netcdf -I${PWD}/extern/boost/include -I${PWD}/extern/rapidxml/include -I${PWD}/extern/blitz/include ++bld::tool::cflags %CFLAGS %CBASE_INC -I${PWD}/extern/rapidxml/include + bld::tool::fflags %FFLAGS %FBASE_INC + bld::tool::cppkeys %CPP_KEY + bld::tool::fppkeys %CPP_KEY diff --git a/var/spack/repos/builtin/packages/xios/bld_extern_1.x.patch b/var/spack/repos/builtin/packages/xios/bld_extern_1.x.patch new file mode 100644 index 0000000000..fe52da1192 --- /dev/null +++ b/var/spack/repos/builtin/packages/xios/bld_extern_1.x.patch @@ -0,0 +1,27 @@ +--- a/bld.cfg 2017-12-23 15:21:01.458603785 +1100 ++++ b/bld.cfg 2017-12-23 15:36:36.667684136 +1100 +@@ -24,9 +24,6 @@ + + search_src true + src::zzz . +-src::date $PWD/extern/boost/src/date_time +-src::blitz $PWD/extern/blitz/src +-src::netcdf $PWD/extern/netcdf4 + src::remap $PWD/extern/remap/src + bld::lib xios + bld::target libxios.a +@@ -46,11 +43,11 @@ + bld::tool::fc %FCOMPILER + bld::tool::fpp %FPP + bld::tool::cpp %CPP +-bld::tool::cppflags %CBASE_INC -I${PWD}/extern/src_netcdf -I${PWD}/extern/boost/include -I${PWD}/extern/rapidxml/include -I${PWD}/extern/blitz/include +-bld::tool::fppflags %BASE_INC -I${PWD}/extern/boost/include -I${PWD}/extern/rapidxml/include ++bld::tool::cppflags %CBASE_INC -I${PWD}/extern/rapidxml/include ++bld::tool::fppflags %BASE_INC -I${PWD}/extern/rapidxml/include + bld::tool::ld %LINKER + bld::tool::ldflags %LD_FLAGS +-bld::tool::cflags %CFLAGS %CBASE_INC -I${PWD}/extern/src_netcdf -I${PWD}/extern/boost/include -I${PWD}/extern/rapidxml/include -I${PWD}/extern/blitz/include ++bld::tool::cflags %CFLAGS %CBASE_INC -I${PWD}/extern/rapidxml/include + bld::tool::fflags %FFLAGS %FBASE_INC + bld::tool::cppkeys %CPP_KEY + bld::tool::fppkeys %CPP_KEY diff --git a/var/spack/repos/builtin/packages/xios/llvm_bug_17782.patch b/var/spack/repos/builtin/packages/xios/llvm_bug_17782.patch new file mode 100644 index 0000000000..9eb5c21950 --- /dev/null +++ b/var/spack/repos/builtin/packages/xios/llvm_bug_17782.patch @@ -0,0 +1,11 @@ +--- a/src/duration.cpp 2017-12-28 10:45:09.000000000 +1100 ++++ b/src/duration.cpp 2017-12-28 11:01:40.000000000 +1100 +@@ -43,7 +43,7 @@ + StdIStream& operator>>(StdIStream& in , CDuration& duration) + { + duration = NoneDu; +- double v = 1.0; ++ int v = 1; + char c = '/'; + bool invalidUnit = false; + CDuration sentinel = NoneDu; diff --git a/var/spack/repos/builtin/packages/xios/package.py b/var/spack/repos/builtin/packages/xios/package.py new file mode 100644 index 0000000000..a3df5e9ca8 --- /dev/null +++ b/var/spack/repos/builtin/packages/xios/package.py @@ -0,0 +1,224 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +# +from spack import * +import os + + +class Xios(Package): + """XML-IO-SERVER library for IO management of climate models.""" + + homepage = "https://forge.ipsl.jussieu.fr/ioserver/wiki" + url = "https://forge.ipsl.jussieu.fr/ioserver" + + version('1.0', revision=910, + svn='http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS/branchs/xios-1.0') + version('develop', svn='http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS/trunk') + + variant('mode', values=('debug', 'dev', 'prod'), default='dev', + description='Build for debugging, development or production') + # NOTE: oasis coupler could be supported with a variant + + # Use spack versions of blitz and netcdf for compatibility + # with recent compilers and optimised platform libraries: + patch('bld_extern_1.0.patch', when='@:1.0') + patch('bld_extern_1.x.patch', when='@1.1:') + + # Workaround bug #17782 in llvm, where reading a double + # followed by a character is broken (e.g. duration '1d'): + patch('llvm_bug_17782.patch', when='@1.1: %clang') + + depends_on('netcdf+mpi') + depends_on('netcdf-fortran') + depends_on('hdf5+mpi') + depends_on('mpi') + depends_on('boost') + depends_on('blitz') + depends_on('perl', type='build') + depends_on('perl-uri-escape', type='build') + depends_on('gmake', type='build') + + @when('%clang') + def patch(self): + """Fix type references that are ambiguous for clang.""" + for dirpath, dirnames, filenames in os.walk('src'): + for filename in filenames: + filepath = os.path.join(dirpath, filename) + # Use boost definition of type shared_ptr: + filter_file(r'([^:/])shared_ptr<', + r'\1boost::shared_ptr<', filepath) + # Use type long for position in output stream: + filter_file(r'oss.tellp\(\) *- *startPos', + r'(long)oss.tellp() - startPos', filepath) + + def xios_env(self): + file = join_path('arch', 'arch-SPACK.env') + touch(file) + + def xios_path(self): + file = join_path('arch', 'arch-SPACK.path') + spec = self.spec + paths = {'NETCDF_INC_DIR': spec['netcdf'].prefix.include, + 'NETCDF_LIB_DIR': spec['netcdf'].prefix.lib, + 'HDF5_INC_DIR': spec['hdf5'].prefix.include, + 'HDF5_LIB_DIR': spec['hdf5'].prefix.lib} + text = r""" +NETCDF_INCDIR="-I {NETCDF_INC_DIR}" +NETCDF_LIBDIR="-L {NETCDF_LIB_DIR}" +NETCDF_LIB="-lnetcdff -lnetcdf" + +MPI_INCDIR="" +MPI_LIBDIR="" +MPI_LIB="" + +HDF5_INCDIR="-I {HDF5_INC_DIR}" +HDF5_LIBDIR="-L {HDF5_LIB_DIR}" +HDF5_LIB="-lhdf5_hl -lhdf5" + +OASIS_INCDIR="" +OASIS_LIBDIR="" +OASIS_LIB="" +""" + with open(file, 'w') as f: + f.write(text.format(**paths)) + + def xios_fcm(self): + file = join_path('arch', 'arch-SPACK.fcm') + spec = self.spec + param = dict() + param['MPICXX'] = spec['mpi'].mpicxx + param['MPIFC'] = spec['mpi'].mpifc + param['CC'] = self.compiler.cc + param['FC'] = self.compiler.fc + param['BOOST_INC_DIR'] = spec['boost'].prefix.include + param['BOOST_LIB_DIR'] = spec['boost'].prefix.lib + param['BLITZ_INC_DIR'] = spec['blitz'].prefix.include + param['BLITZ_LIB_DIR'] = spec['blitz'].prefix.lib + if spec.satisfies('%clang platform=darwin'): + param['LIBCXX'] = '-lc++' + else: + param['LIBCXX'] = '-lstdc++' + + if any(map(spec.satisfies, ('%gcc', '%intel', '%clang'))): + text = r""" +%CCOMPILER {MPICXX} +%FCOMPILER {MPIFC} +%LINKER {MPIFC} + +%BASE_CFLAGS -ansi -w -D_GLIBCXX_USE_CXX11_ABI=0 \ + -I{BOOST_INC_DIR} -I{BLITZ_INC_DIR} +%PROD_CFLAGS -O3 -DBOOST_DISABLE_ASSERTS +%DEV_CFLAGS -g -O2 +%DEBUG_CFLAGS -g + +%BASE_FFLAGS -D__NONE__ +%PROD_FFLAGS -O3 +%DEV_FFLAGS -g -O2 +%DEBUG_FFLAGS -g + +%BASE_INC -D__NONE__ +%BASE_LD -L{BOOST_LIB_DIR} -L{BLITZ_LIB_DIR} -lblitz {LIBCXX} + +%CPP {CC} -E +%FPP {CC} -E -P -x c +%MAKE gmake +""".format(**param) + elif spec.satisfies('%cce'): + # In the CC compiler prior to cce/8.3.7, + # optimisation must be reduced to avoid a bug, + # as reported by Mike Rezny at the UK Met Office: + if spec.satisfies('%cce@8.3.7:'): + param.update({'CC_OPT_DEV': '-O2', 'CC_OPT_PROD': '-O3'}) + else: + param.update({'CC_OPT_DEV': '-O1', 'CC_OPT_PROD': '-O1'}) + + text = r""" +%CCOMPILER {MPICXX} +%FCOMPILER {MPIFC} +%LINKER {MPIFC} + +%BASE_CFLAGS -DMPICH_SKIP_MPICXX -h msglevel_4 -h zero -h gnu \ + -I{BOOST_INC_DIR} -I{BLITZ_INC_DIR} +%PROD_CFLAGS {CC_OPT_PROD} -DBOOST_DISABLE_ASSERTS +%DEV_CFLAGS {CC_OPT_DEV} +%DEBUG_CFLAGS -g + +%BASE_FFLAGS -em -m 4 -e0 -eZ +%PROD_FFLAGS -O3 +%DEV_FFLAGS -G2 +%DEBUG_FFLAGS -g + +%BASE_INC -D__NONE__ +%BASE_LD -D__NONE__ -L{BOOST_LIB_DIR} -L{BLITZ_LIB_DIR} -lblitz + +%CPP cpp +%FPP cpp -P -CC +%MAKE gmake +""".format(**param) + else: + raise InstallError('Unsupported compiler.') + + with open(file, 'w') as f: + f.write(text) + + def install(self, spec, prefix): + env['CC'] = spec['mpi'].mpicc + env['CXX'] = spec['mpi'].mpicxx + env['F77'] = spec['mpi'].mpif77 + env['FC'] = spec['mpi'].mpifc + + options = ['--full', + '--%s' % spec.variants['mode'].value, + '--arch', 'SPACK', + '--netcdf_lib', 'netcdf4_par', + '--job', str(make_jobs)] + + self.xios_env() + self.xios_path() + self.xios_fcm() + + make_xios = Executable('./make_xios') + make_xios(*options) + + mkdirp(spec.prefix) + install_tree('bin', spec.prefix.bin) + install_tree('lib', spec.prefix.lib) + install_tree('inc', spec.prefix.include) + install_tree('etc', spec.prefix.etc) + install_tree('cfg', spec.prefix.cfg) + + @run_after('install') + @on_package_attributes(run_tests=True) + def check_build(self): + mpirun = os.getenv('MPIRUN') + if mpirun is None: + mpirun = 'mpiexec' + mpiexec = Executable(mpirun) + with working_dir('inputs'): + try: + mpiexec('-n', '2', join_path('..', 'bin', 'test_client.exe')) + except Exception: + raise InstallError( + 'Test failed; defining MPIRUN variable may help.') -- cgit v1.2.3-70-g09d2 From cef711458e5ec7128ba75c6e8945b22f2275c507 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Thu, 4 Jan 2018 16:00:01 +0100 Subject: qt: add 5.10.0, fix macOS build, clean-up comments/TODOs (#6766) * qt: add 5.10.0, fix macOS build, clean-up comments/TODOs * qt: fix pkgconfig files * qt: restore-pc-files.patch * add version constraint to the patch * qt: adjust url_for_version for 5.10.0 --- var/spack/repos/builtin/packages/qt/package.py | 49 ++++++++++++++++++---- .../builtin/packages/qt/restore-pc-files.patch | 15 +++++++ 2 files changed, 57 insertions(+), 7 deletions(-) create mode 100644 var/spack/repos/builtin/packages/qt/restore-pc-files.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index fe29ced8a9..3f3defeb8c 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -36,6 +36,7 @@ class Qt(Package): list_url = 'http://download.qt.io/archive/qt/' list_depth = 3 + version('5.10.0', 'c5e275ab0ed7ee61d0f4b82cd471770d') version('5.9.1', '77b4af61c49a09833d4df824c806acaf') version('5.9.0', '9c8bc8b828c2b56721980368266df9d9') version('5.8.0', 'a9f2494f75f966e2f22358ec367d8f41') @@ -66,6 +67,10 @@ class Qt(Package): variant('opengl', default=False, description="Build with OpenGL support.") + # fix installation of pkgconfig files + # see https://github.com/Homebrew/homebrew-core/pull/5951 + patch('restore-pc-files.patch', when='@5.9: platform=darwin') + patch('qt3krell.patch', when='@3.3.8b+krellpatch') # see https://bugreports.qt.io/browse/QTBUG-57656 @@ -96,12 +101,24 @@ class Qt(Package): depends_on("libmng") depends_on("jpeg") depends_on("icu4c") - depends_on("fontconfig") + depends_on("fontconfig", when=(sys.platform != 'darwin')) # (Unix only) depends_on("freetype") - # FIXME: - # depends_on("freetype", when='@5.8:') and '-system-freetype' - # -system-harfbuzz - # -system-pcre + + # Core options: + # -doubleconversion [system/qt/no] + # -iconv [posix/sun/gnu/no] (Unix only) + # -pcre [system/qt] + + # Gui, printing, widget options: + # -harfbuzz [system/qt/no] + # -xkbcommon-x11 [system/qt/no] + # -system-xkbcommon + + # Database options: + # -sqlite [system/qt] + + # Qt3D options: + # -assimp [system/qt/no] # QtQml depends_on("python", when='@5.7.0:', type='build') @@ -121,6 +138,17 @@ class Qt(Package): # depends_on("pulse", when='+multimedia') # depends_on("flac", when='+multimedia') # depends_on("ogg", when='+multimedia') + # -pulseaudio [auto] (Unix only) + # -alsa [auto] (Unix only) + + # Webengine options: + # -webengine-alsa [auto] (Linux only) + # -webengine-pulseaudio [auto] (Linux only) + # -webengine-embedded-build [auto] (Linux only) + # -webengine-icu [system/qt] (Linux only) + # -webengine-ffmpeg [system/qt] (Linux only) + # -webengine-opus [system/qt] (Linux only) + # -webengine-webp [system/qt] (Linux only) use_xcode = True @@ -146,7 +174,9 @@ class Qt(Package): elif version >= Version('2.1'): url += 'x11-' - if version >= Version('4.0'): + if version >= Version('5.10.0'): + url += 'src-' + elif version >= Version('4.0'): url += 'opensource-src-' elif version >= Version('3'): url += 'free-' @@ -198,6 +228,7 @@ class Qt(Package): @property def common_config_args(self): + # incomplete list is here http://doc.qt.io/qt-5/configure-options.html config_args = [ '-prefix', self.prefix, '-v', @@ -208,12 +239,14 @@ class Qt(Package): '-confirm-license', '-openssl-linked', '-optimized-qmake', - '-fontconfig', '-system-freetype', '-I{0}/freetype2'.format(self.spec['freetype'].prefix.include), '-no-pch' ] + if sys.platform != 'darwin': + config_args.append('-fontconfig') + if '@:5.7.1' in self.spec: config_args.append('-no-openvg') else: @@ -255,6 +288,8 @@ class Qt(Package): '-no-alsa', ]) + # FIXME: else: -system-xcb ? + if '@4' in self.spec and sys.platform == 'darwin': config_args.append('-cocoa') diff --git a/var/spack/repos/builtin/packages/qt/restore-pc-files.patch b/var/spack/repos/builtin/packages/qt/restore-pc-files.patch new file mode 100644 index 0000000000..35fbaddd43 --- /dev/null +++ b/var/spack/repos/builtin/packages/qt/restore-pc-files.patch @@ -0,0 +1,15 @@ +Partially reverts . + +diff --git i/qtbase/mkspecs/features/qt_module.prf w/qtbase/mkspecs/features/qt_module.prf +index bb28af97..36bb6483 100644 +--- i/qtbase/mkspecs/features/qt_module.prf ++++ w/qtbase/mkspecs/features/qt_module.prf +@@ -245,7 +245,7 @@ load(qt_installs) + load(qt_targets) + + # this builds on top of qt_common +-!internal_module:!lib_bundle:if(unix|mingw) { ++!internal_module:if(unix|mingw) { + CONFIG += create_pc + QMAKE_PKGCONFIG_DESTDIR = pkgconfig + host_build: \ -- cgit v1.2.3-70-g09d2 From 414287a52ebb12d7e3aee7d74b4fd2a0d4a3efa7 Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Thu, 4 Jan 2018 09:01:17 -0600 Subject: r-rgeos: Create new package. (#6592) --- .../repos/builtin/packages/r-rgeos/package.py | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-rgeos/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-rgeos/package.py b/var/spack/repos/builtin/packages/r-rgeos/package.py new file mode 100644 index 0000000000..83ccbef223 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-rgeos/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RRgeos(RPackage): + """Interface to Geometry Engine - Open Source ('GEOS') using the C + 'API' for topology operations on geometries. The 'GEOS' library is + external to the package, and, when installing the package from source, + must be correctly installed first. Windows and Mac Intel OS X binaries + are provided on 'CRAN'.""" + + homepage = "https://cran.r-project.org/package=rgeos" + url = "https://cran.rstudio.com/src/contrib/rgeos_0.3-26.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/rgeos" + + version('0.3-26', '7d10a28011b49f68c5817b6fbca132df') + + depends_on('r-sp', type=('build', 'run')) + depends_on('geos') -- cgit v1.2.3-70-g09d2 From 521e9da05345922f01945157ec30921ac87ec11e Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 4 Jan 2018 09:07:29 -0600 Subject: RNA-SeQC: Create new package (#6555) * RNA-SeQC: Create new package * RNA-SeQC: Fix flake8 error * RNA-SeQC: Fix Travis error --- .../repos/builtin/packages/rna-seqc/package.py | 63 ++++++++++++++++++++++ .../repos/builtin/packages/rna-seqc/rna-seqc.sh | 3 ++ 2 files changed, 66 insertions(+) create mode 100644 var/spack/repos/builtin/packages/rna-seqc/package.py create mode 100644 var/spack/repos/builtin/packages/rna-seqc/rna-seqc.sh (limited to 'var') diff --git a/var/spack/repos/builtin/packages/rna-seqc/package.py b/var/spack/repos/builtin/packages/rna-seqc/package.py new file mode 100644 index 0000000000..389a96d428 --- /dev/null +++ b/var/spack/repos/builtin/packages/rna-seqc/package.py @@ -0,0 +1,63 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +from shutil import copyfile +import os.path + + +class RnaSeqc(Package): + """RNA-SeQC is a java program which computes a series of quality control + metrics for RNA-seq data.""" + + homepage = "http://archive.broadinstitute.org/cancer/cga/rna-seqc" + url = "http://www.broadinstitute.org/cancer/cga/tools/rnaseqc/RNA-SeQC_v1.1.8.jar" + + version('1.1.8', '71d7b5d3b3dcc1893cdc7f6819185d41', expand=False) + version('1.1.7', '2d0b8ecac955af2f9bc1b185fdfb6b45', expand=False) + version('1.1.6', 'fa9c9885081ae2e47f285c7c0f596a14', expand=False) + version('1.1.5', '4b875671e906f708cbb8fd9bcf0e958d', expand=False) + version('1.1.4', 'b04d06947c48cb2dc1b0ba29c8232db5', expand=False) + + depends_on('jdk@8:', type='run') + + def install(self, spec, prefix): + mkdirp(prefix.bin) + jar_file = 'RNA-SeQC_v{0}.jar'.format(self.version.dotted) + install(jar_file, prefix.bin) + + # Set up a helper script to call java on the jar file, + # explicitly codes the path for java and the jar file. + script_sh = join_path(os.path.dirname(__file__), "rna-seqc.sh") + script = join_path(prefix.bin, "rna-seqc") + copyfile(script_sh, script) + set_executable(script) + + # Munge the helper script to explicitly point to java and the + # jar file. + java = join_path(self.spec['jdk'].prefix, 'bin', 'java') + kwargs = {'ignore_absent': False, 'backup': False, 'string': False} + filter_file('^java', java, script, **kwargs) + filter_file('RNA-SeQC_v{0}.jar', join_path(prefix.bin, jar_file), + script, **kwargs) diff --git a/var/spack/repos/builtin/packages/rna-seqc/rna-seqc.sh b/var/spack/repos/builtin/packages/rna-seqc/rna-seqc.sh new file mode 100644 index 0000000000..6f3d22cbf9 --- /dev/null +++ b/var/spack/repos/builtin/packages/rna-seqc/rna-seqc.sh @@ -0,0 +1,3 @@ +#!/bin/sh +# convenience wrapper for the rna-seqc jar file +java -jar RNA-SeQC_v{}.jar "$@" -- cgit v1.2.3-70-g09d2 From 8f6935d53f7f272286e154d52fe972e2249958e9 Mon Sep 17 00:00:00 2001 From: serbanmaerean Date: Thu, 4 Jan 2018 10:10:37 -0500 Subject: Set SMPI library path in dependent packages (#6548) * Added magma package * Incorporated Serban's change * Remove deleted files * argparse.py * Sync forked Spack repo in github * Add spectrum-mpi lib path to LD_LIBRAY_PATH in spack_env. As a result of supporting alternate installation directories, spectrum-mpi does not use rpath anymore, so we need to set LD_LIBRARY_PATH in spack_env to allow MPI programs to run during dependent package configuration. * Fix flake8 error (blank line at EOF) --- var/spack/repos/builtin/packages/spectrum-mpi/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/spectrum-mpi/package.py b/var/spack/repos/builtin/packages/spectrum-mpi/package.py index c2b08c0086..fff7c3f2ad 100644 --- a/var/spack/repos/builtin/packages/spectrum-mpi/package.py +++ b/var/spack/repos/builtin/packages/spectrum-mpi/package.py @@ -68,3 +68,5 @@ class SpectrumMpi(Package): spack_env.set('OMPI_CXX', spack_cxx) spack_env.set('OMPI_FC', spack_fc) spack_env.set('OMPI_F77', spack_f77) + + spack_env.prepend_path('LD_LIBRARY_PATH', self.prefix.lib) -- cgit v1.2.3-70-g09d2 From d62555875a9e7f4bc0b2f5ed5e07db91652a7087 Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Thu, 4 Jan 2018 09:37:00 -0600 Subject: r-rgraphviz: Create new package. (#6316) --- .../repos/builtin/packages/r-rgraphviz/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-rgraphviz/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-rgraphviz/package.py b/var/spack/repos/builtin/packages/r-rgraphviz/package.py new file mode 100644 index 0000000000..50633fb2ae --- /dev/null +++ b/var/spack/repos/builtin/packages/r-rgraphviz/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RRgraphviz(RPackage): + """Interfaces R with the AT and T graphviz library for plotting + R graph objects from the graph package.""" + + homepage = "http://bioconductor.org/packages/Rgraphviz/" + url = "https://git.bioconductor.org/packages/Rgraphviz" + + version('2.20.0', git='https://git.bioconductor.org/packages/Rgraphviz', commit='eface6298150667bb22eac672f1a45e52fbf8c90') + + depends_on('r@3.4.0:3.4.9', when='@2.20.0') + depends_on('r-graph', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 9a595ca312ff7cfdf397903614a828e8468343d7 Mon Sep 17 00:00:00 2001 From: Thilina Rathnayake Date: Thu, 4 Jan 2018 09:41:53 -0600 Subject: Adding Nek5000 to Spack (#6153) * Start adding Nek5000 package * Add tools to install: genmap, prenek, postnek * Address comments by @davydden * Use install_tree (thanks @junghans) and polish * Update url * Fix flake formatting errors * Change F77 and CC compilers Apparently spack compilers can't be called outside spack and we have an underscore test in our Nek5000/core/makenek.inc file which calls F77 compiler. * Add support for visit and profiling options * Fix a typo * Fix a typo * Remove the C check * Add visit variant * Update the install of int_tp tool * Let MAXNEL to be set during installation --- .../repos/builtin/packages/nek5000/package.py | 153 +++++++++++++++++++++ .../repos/builtin/packages/nekbone/package.py | 1 + 2 files changed, 154 insertions(+) create mode 100644 var/spack/repos/builtin/packages/nek5000/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nek5000/package.py b/var/spack/repos/builtin/packages/nek5000/package.py new file mode 100644 index 0000000000..4755d28575 --- /dev/null +++ b/var/spack/repos/builtin/packages/nek5000/package.py @@ -0,0 +1,153 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + +import numbers + + +def is_integral(x): + """Any integer value""" + try: + return isinstance(int(x), numbers.Integral) and \ + not isinstance(x, bool) and int(x) > 0 + except ValueError: + return False + + +class Nek5000(Package): + """A fast and scalable high-order solver for computational fluid + dynamics""" + + homepage = "https://nek5000.mcs.anl.gov/" + url = "https://github.com/Nek5000/Nek5000" + + tags = ['cfd', 'flow', 'hpc', 'solver', 'navier-stokes', + 'spectral-elements', 'fluid'] + + version('17.0.0-beta2', git='https://github.com/Nek5000/Nek5000.git', + commit='b95f46c59f017fff2fc19b66aa65a881085a7572') + version('develop', git='https://github.com/Nek5000/Nek5000.git', + branch='master') + + # MPI, Profiling and Visit variants + variant('mpi', default=True, description='Build with MPI.') + variant('profiling', default=True, description='Build with profiling data.') + variant('visit', default=False, description='Build with Visit.') + + # Variant for MAXNEL, we need to read this from user + variant( + 'MAXNEL', + default=150000, + description='Maximum number of elements for Nek5000 tools.', + values=is_integral + ) + + # Variants for Nek tools + variant('genbox', default=True, description='Build genbox tool.') + variant('int_tp', default=True, description='Build int_tp tool.') + variant('n2to3', default=True, description='Build n2to3 tool.') + variant('postnek', default=True, description='Build postnek tool.') + variant('reatore2', default=True, description='Build reatore2 tool.') + variant('genmap', default=True, description='Build genmap tool.') + variant('nekmerge', default=True, description='Build nekmerge tool.') + variant('prenek', default=True, description='Build prenek tool.') + + # Dependencies + depends_on('mpi', when="+mpi") + depends_on('visit', when="+visit") + + @run_before('install') + def fortran_check(self): + if not self.compiler.fc: + msg = 'Cannot build Nek5000 without a Fortran compiler.' + raise RuntimeError(msg) + + def install(self, spec, prefix): + toolsDir = 'tools' + binDir = 'bin' + + F77 = self.compiler.fc + CC = self.compiler.cc + + # Build the tools, maketools copy them to Nek5000/bin by default. + # We will then install Nek5000/bin under prefix after that. + with working_dir(toolsDir): + # Update the maketools script to use correct compilers + if self.version == Version('17.0.0-beta2'): # Old release + filter_file(r'^F77\s*=.*', 'F77=\"' + F77 + '\"', 'maketools') + else: + filter_file(r'^FC\s*=.*', 'FC=\"' + F77 + '\"', 'maketools') + filter_file(r'^CC\s*=.*', 'CC=\"' + CC + '\"', 'maketools') + + maxnel = self.spec.variants['MAXNEL'].value + filter_file(r'^#MAXNEL\s*=.*', 'MAXNEL=' + maxnel, 'maketools') + + makeTools = Executable('./maketools') + + # Build the tools + if '+genbox' in spec: + makeTools('genbox') + if '+int_tp' in spec and self.version == Version('17.0.0-beta2'): + makeTools('int_tp') + if '+n2to3' in spec: + makeTools('n2to3') + if '+postnek' in spec: + makeTools('postnek') + if '+reatore2' in spec: + makeTools('reatore2') + if '+genmap' in spec: + makeTools('genmap') + if '+nekmerge' in spec: + makeTools('nekmerge') + if '+prenek' in spec: + makeTools('prenek') + + with working_dir(binDir): + if '+mpi' in spec: + F77 = spec['mpi'].mpif77 + CC = spec['mpi'].mpicc + else: + filter_file(r'^#MPI=0', 'MPI=0', 'makenek') + + if '+profiling' not in spec: + filter_file(r'^#PROFILING=0', 'PROFILING=0', 'makenek') + + if '+visit' in spec: + filter_file(r'^#VISIT=1', 'VISIT=1', 'makenek') + filter_file(r'^#VISIT_INSTALL=.*', 'VISIT_INSTALL=\"' + + spec['visit'].prefix.bin + '\"', 'makenek') + + # Update the makenek to use correct compilers and + # Nek5000 source. + filter_file(r'^F77\s*=.*', 'F77=\"' + F77 + '\"', 'makenek') + filter_file(r'^CC\s*=.*', 'CC=\"' + CC + '\"', 'makenek') + filter_file(r'SOURCE_ROOT\s*=\"\$H.*', 'SOURCE_ROOT=\"' + + prefix.bin.Nek5000 + '\"', 'makenek') + + # Install Nek5000/bin in prefix/bin + install_tree(binDir, prefix.bin) + + # Copy Nek5000 source to prefix/bin + install_tree('../Nek5000', prefix.bin.Nek5000) diff --git a/var/spack/repos/builtin/packages/nekbone/package.py b/var/spack/repos/builtin/packages/nekbone/package.py index 4531012110..053b80413d 100644 --- a/var/spack/repos/builtin/packages/nekbone/package.py +++ b/var/spack/repos/builtin/packages/nekbone/package.py @@ -32,6 +32,7 @@ class Nekbone(Package): the spectral element method.""" homepage = "https://github.com/Nek5000/Nekbone" + url = "https://github.com/Nek5000/Nekbone/tarball/v17.0" tags = ['proxy-app', 'ecp-proxy-app'] -- cgit v1.2.3-70-g09d2 From dab2dc24a5df9223dca870e13d81c4dceb5b6920 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Thu, 4 Jan 2018 07:45:45 -0800 Subject: make nghttp2 optional for curl, as it does not build for older compilers. (#5977) --- var/spack/repos/builtin/packages/curl/package.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/curl/package.py b/var/spack/repos/builtin/packages/curl/package.py index c12e50b71c..f567623be0 100644 --- a/var/spack/repos/builtin/packages/curl/package.py +++ b/var/spack/repos/builtin/packages/curl/package.py @@ -48,15 +48,18 @@ class Curl(AutotoolsPackage): version('7.43.0', '11bddbb452a8b766b932f859aaeeed39') version('7.42.1', '296945012ce647b94083ed427c1877a8') + variant('nghttp2', default=False, description='build nghttp2 library (requires C++11)') + depends_on('openssl') depends_on('zlib') - depends_on('nghttp2') + depends_on('nghttp2', when='+nghttp2') def configure_args(self): spec = self.spec - return [ + args = [ '--with-zlib={0}'.format(spec['zlib'].prefix), - '--with-ssl={0}'.format(spec['openssl'].prefix), - '--with-http2={0}'.format(spec['nghttp2'].prefix), + '--with-ssl={0}'.format(spec['openssl'].prefix) ] + args += self.with_or_without('nghttp2') + return args -- cgit v1.2.3-70-g09d2 From 3f9ed72f68624cd0fd982a7325554bdf1f3fd250 Mon Sep 17 00:00:00 2001 From: Simone Bnà Date: Thu, 4 Jan 2018 16:47:17 +0100 Subject: Fix build of paraview (#5802) * added variant examples to paraview package.py * qt: added libxt dependency * add variant to use external hdf5, this is needed when compiling with gcc@4.8.5 * paraview: added python dependecies to PYTHONPATH --- var/spack/repos/builtin/packages/paraview/package.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index bf16bf361f..4ac904ffe5 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -49,6 +49,8 @@ class Paraview(CMakePackage): variant('osmesa', default=False, description='Enable OSMesa support') variant('qt', default=False, description='Enable Qt (gui) support') variant('opengl2', default=True, description='Enable OpenGL2 backend') + variant('examples', default=False, description="Build examples") + variant('hdf5', default=False, description="Use external HDF5") depends_on('python@2:2.8', when='+python') depends_on('py-numpy', when='+python', type='run') @@ -59,12 +61,15 @@ class Paraview(CMakePackage): depends_on('qt@:4', when='@:5.2.0+qt') depends_on('mesa+swrender', when='+osmesa') + depends_on('libxt', when='+qt') conflicts('+qt', when='+osmesa') depends_on('bzip2') depends_on('freetype') # depends_on('hdf5+mpi', when='+mpi') # depends_on('hdf5~mpi', when='~mpi') + depends_on('hdf5+hl+mpi', when='+hdf5+mpi') + depends_on('hdf5+hl~mpi', when='+hdf5~mpi') depends_on('jpeg') depends_on('libpng') depends_on('libtiff') @@ -101,6 +106,13 @@ class Paraview(CMakePackage): paraview_version)) run_env.prepend_path('LD_LIBRARY_PATH', join_path(lib_dir, paraview_version)) + if '+python' in self.spec: + run_env.prepend_path('PYTHONPATH', join_path(lib_dir, + paraview_version)) + run_env.prepend_path('PYTHONPATH', join_path(lib_dir, + paraview_version, 'site-packages')) + run_env.prepend_path('PYTHONPATH', join_path(lib_dir, + paraview_version, 'site-packages', 'vtk')) def cmake_args(self): """Populate cmake arguments for ParaView.""" @@ -126,8 +138,9 @@ class Paraview(CMakePackage): '-DVTK_RENDERING_BACKEND:STRING=%s' % rendering, '-DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=%s' % includes, '-DBUILD_TESTING:BOOL=OFF', + '-DBUILD_EXAMPLES:BOOL=%s' % variant_bool('+examples'), '-DVTK_USE_SYSTEM_FREETYPE:BOOL=ON', - '-DVTK_USE_SYSTEM_HDF5:BOOL=OFF', + '-DVTK_USE_SYSTEM_HDF5:BOOL=%s' % variant_bool('+hdf5'), '-DVTK_USE_SYSTEM_JPEG:BOOL=ON', '-DVTK_USE_SYSTEM_LIBXML2:BOOL=ON', '-DVTK_USE_SYSTEM_NETCDF:BOOL=OFF', -- cgit v1.2.3-70-g09d2 From 45188d6d9673706506fc56aabf72bb87a9ed7853 Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Thu, 4 Jan 2018 08:48:22 -0700 Subject: Protobuf intel patch (#5233) * Added a package for the MDAnalysis toolkit. * Added a patch file to get rid of compiler warnings with intel compiler and inlining. Added checksum values for other versions of protobuf. * Added dependency on Intel compiler for intel patch --- .../builtin/packages/protobuf/intel_inline.patch | 25 ++++++++++++++++++++++ .../repos/builtin/packages/protobuf/package.py | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 var/spack/repos/builtin/packages/protobuf/intel_inline.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/protobuf/intel_inline.patch b/var/spack/repos/builtin/packages/protobuf/intel_inline.patch new file mode 100644 index 0000000000..61f1334293 --- /dev/null +++ b/var/spack/repos/builtin/packages/protobuf/intel_inline.patch @@ -0,0 +1,25 @@ +diff -Naur src_a/google/protobuf/stubs/port.h src_b/google/protobuf/stubs/port.h +--- a/src/google/protobuf/stubs/port.h 2017-08-24 18:17:47.149533997 -0700 ++++ b/src/google/protobuf/stubs/port.h 2017-08-24 22:13:12.907241538 -0700 +@@ -167,7 +167,9 @@ + // is not right for you. + + #ifndef GOOGLE_ATTRIBUTE_ALWAYS_INLINE +-#if defined(__GNUC__) && (__GNUC__ > 3 ||(__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) ++#if defined(__INTEL_COMPILER) && (__INTEL_COMPILER > 1700) ++#define GOOGLE_ATTRIBUTE_ALWAYS_INLINE __attribute__ ((always_inline)) ++#elif defined(__GNUC__) && (__GNUC__ > 3 ||(__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) + // For functions we want to force inline. + // Introduced in gcc 3.1. + #define GOOGLE_ATTRIBUTE_ALWAYS_INLINE __attribute__ ((always_inline)) +@@ -178,7 +180,9 @@ + #endif + + #ifndef GOOGLE_ATTRIBUTE_NOINLINE +-#if defined(__GNUC__) && (__GNUC__ > 3 ||(__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) ++#if defined(__INTEL_COMPILER) && (__INTEL_COMPILER > 1700) ++#define GOOGLE_ATTRIBUTE_NOINLINE ++#elif defined(__GNUC__) && (__GNUC__ > 3 ||(__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) + // For functions we want to force not inline. + // Introduced in gcc 3.1. + #define GOOGLE_ATTRIBUTE_NOINLINE __attribute__ ((noinline)) diff --git a/var/spack/repos/builtin/packages/protobuf/package.py b/var/spack/repos/builtin/packages/protobuf/package.py index 038c208864..7453c11cb6 100644 --- a/var/spack/repos/builtin/packages/protobuf/package.py +++ b/var/spack/repos/builtin/packages/protobuf/package.py @@ -48,6 +48,8 @@ class Protobuf(CMakePackage): # first fixed in 3.4.0: https://github.com/google/protobuf/pull/3406 patch('pkgconfig.patch', when='@:3.3.2') + patch('intel_inline.patch', when='@3.2.0: %intel') + def fetch_remote_versions(self): """Ignore additional source artifacts uploaded with releases, only keep known versions -- cgit v1.2.3-70-g09d2 From 395ee97f3b1cdd96ae00bdae6d27d3145c50fc5e Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Thu, 4 Jan 2018 16:51:55 +0100 Subject: openssl: Add perl dependency (#5188) perl is required for the configure script. --- var/spack/repos/builtin/packages/openssl/package.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openssl/package.py b/var/spack/repos/builtin/packages/openssl/package.py index c04bb664e7..abd4f656c8 100644 --- a/var/spack/repos/builtin/packages/openssl/package.py +++ b/var/spack/repos/builtin/packages/openssl/package.py @@ -62,11 +62,7 @@ class Openssl(Package): version('1.0.1h', '8d6d684a9430d5cc98a62a5d8fbda8cf') depends_on('zlib') - - # TODO: 'make test' requires Perl module Test::More version 0.96 - # TODO: uncomment when test dependency types are supported. - # TODO: This is commented in the meantime to avoid dependnecy bloat. - # depends_on('perl@5.14.0:', type='build', when='+tests') + depends_on('perl@5.14.0:', type='build') parallel = False -- cgit v1.2.3-70-g09d2 From d24782c86d84d51ac3ef7404c9e4a4eb6b9eab7e Mon Sep 17 00:00:00 2001 From: Pramod S Kumbhar Date: Thu, 4 Jan 2018 16:55:30 +0100 Subject: Adding NEURON simulator package (#5097) * Adding NEURON package widely used in computational neuroscience community * flake8 fixes * Add rx3d variant * Addressed review comments from Adam * Addressed 2nd review comments * Added check for +mpi on bg-q * Filter spack compiler wrappers in NEURON scripts Add gcc march=native flag to make front-end build robust * Make develop as preferred version due to bug in long filename handlings in <= v7.4 * Avoid use of gcc in cross compiling environment Use arch specific options on cray and bg-q arch * Simplify cross compiling build: - v7.5 added and no longer need develop as preferred version - legacy cray related options removed - cross compiling args reduced - python arguments reduced as neuron finds proper libraries * Simplify bg-q configurations * Cleanup and unify arch options * Make sure to add commonly available packages as dependency * Arch path added to dependent_environment as nrniv needed at runtime * Support for Power 8 architecture * Fix python3 on OS X * flake8 fix * remove unnecessary conflcist directives --- var/spack/repos/builtin/packages/neuron/package.py | 224 +++++++++++++++++++++ 1 file changed, 224 insertions(+) create mode 100644 var/spack/repos/builtin/packages/neuron/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/neuron/package.py b/var/spack/repos/builtin/packages/neuron/package.py new file mode 100644 index 0000000000..245d2d2902 --- /dev/null +++ b/var/spack/repos/builtin/packages/neuron/package.py @@ -0,0 +1,224 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +import os +from spack import * + + +class Neuron(Package): + + """NEURON is a simulation environment for modeling individual + and networks of neurons. NEURON models individual neurons via + the use of sections that are automatically subdivided into individual + compartments, instead of requiring the user to manually create + compartments. The primary scripting language is hoc but a Python + interface is also available.""" + + homepage = "https://www.neuron.yale.edu/" + url = "http://www.neuron.yale.edu/ftp/neuron/versions/v7.5/nrn-7.5.tar.gz" + github = "https://github.com/nrnhines/nrn" + + version('7.5', '1641ae7a7cd02728e5ae4c8aa93b3749') + version('7.4', '2c0bbee8a9e55d60fa26336f4ab7acbf') + version('7.3', '993e539cb8bf102ca52e9fefd644ab61') + version('7.2', '5486709b6366add932e3a6d141c4f7ad') + version('develop', git=github) + + variant('mpi', default=True, description='Enable MPI parallelism') + variant('python', default=True, description='Enable python') + variant('shared', default=False, description='Build shared libraries') + variant('cross-compile', default=False, description='Build for cross-compile environment') + variant('multisend', default=True, description="Enable multi-send spike exchange") + variant('rx3d', default=False, description="Enable cython translated 3-d rxd") + + depends_on('flex', type='build') + depends_on('bison', type='build') + depends_on('automake', type='build') + depends_on('automake', type='build') + depends_on('autoconf', type='build') + depends_on('libtool', type='build') + depends_on('pkg-config', type='build') + + depends_on('mpi', when='+mpi') + depends_on('python@2.6:', when='+python') + depends_on('ncurses', when='~cross-compile') + + def patch(self): + # aclocal need complete include path (especially on os x) + pkgconf_inc = '-I %s/share/aclocal/' % (self.spec['pkg-config'].prefix) + libtool_inc = '-I %s/share/aclocal/' % (self.spec['libtool'].prefix) + newpath = 'aclocal -I m4 %s %s' % (pkgconf_inc, libtool_inc) + filter_file(r'aclocal -I m4', r'%s' % newpath, "build.sh") + + def get_arch_options(self, spec): + options = [] + + if spec.satisfies('+cross-compile'): + options.extend(['cross_compiling=yes', + '--without-memacs', + '--without-nmodl']) + + # need to enable bg-q arch + if 'bgq' in self.spec.architecture: + options.extend(['--enable-bluegeneQ', + '--host=powerpc64']) + + # on os-x disable building carbon 'click' utility + if 'darwin' in self.spec.architecture: + options.append('macdarwin=no') + + return options + + def get_arch_dir(self): + if 'bgq' in self.spec.architecture: + arch = 'powerpc64' + elif 'cray' in self.spec.architecture: + arch = 'x86_64' + elif 'ppc64le' in self.spec.architecture: + arch = 'powerpc64le' + else: + arch = self.spec.architecture.target + + return arch + + def get_python_options(self, spec): + options = [] + + if spec.satisfies('+python'): + python_exec = spec['python'].command.path + py_inc = spec['python'].headers.directories[0] + py_lib = spec['python'].prefix.lib + + if not os.path.isdir(py_lib): + py_lib = spec['python'].prefix.lib64 + + options.extend(['--with-nrnpython=%s' % python_exec, + '--disable-pysetup', + 'PYINCDIR=%s' % py_inc, + 'PYLIBDIR=%s' % py_lib]) + + if spec.satisfies('~cross-compile'): + options.append('PYTHON_BLD=%s' % python_exec) + + else: + options.append('--without-nrnpython') + + return options + + def get_compiler_options(self, spec): + flags = '-O2 -g' + + if 'bgq' in self.spec.architecture: + flags = '-O3 -qtune=qp -qarch=qp -q64 -qstrict -qnohot -g' + + if self.spec.satisfies('%pgi'): + flags += ' ' + self.compiler.pic_flag + + return ['CFLAGS=%s' % flags, + 'CXXFLAGS=%s' % flags] + + def build_nmodl(self, spec, prefix): + # build components for front-end arch in cross compiling environment + options = ['--prefix=%s' % prefix, + '--with-nmodl-only', + '--without-x'] + + if 'bgq' in self.spec.architecture: + flags = '-qarch=ppc64' + options.extend(['CFLAGS=%s' % flags, + 'CXXFLAGS=%s' % flags]) + + if 'cray' in self.spec.architecture: + flags = '-target-cpu=x86_64 -target-network=none' + options.extend(['CFLAGS=%s' % flags, + 'CXXFLAGS=%s' % flags]) + + configure = Executable(join_path(self.stage.source_path, 'configure')) + configure(*options) + make() + make('install') + + def install(self, spec, prefix): + + options = ['--prefix=%s' % prefix, + '--without-iv', + '--without-x', + '--without-readline'] + + if spec.satisfies('+multisend'): + options.append('--with-multisend') + + if spec.satisfies('~rx3d'): + options.append('--disable-rx3d') + + if spec.satisfies('+mpi'): + options.extend(['MPICC=%s' % spec['mpi'].mpicc, + 'MPICXX=%s' % spec['mpi'].mpicxx, + '--with-paranrn']) + else: + options.append('--without-paranrn') + + if spec.satisfies('~shared'): + options.extend(['--disable-shared', + 'linux_nrnmech=no']) + + options.extend(self.get_arch_options(spec)) + options.extend(self.get_python_options(spec)) + options.extend(self.get_compiler_options(spec)) + + build = Executable('./build.sh') + build() + + with working_dir('build', create=True): + if spec.satisfies('+cross-compile'): + self.build_nmodl(spec, prefix) + srcpath = self.stage.source_path + configure = Executable(join_path(srcpath, 'configure')) + configure(*options) + make('VERBOSE=1') + make('install') + + @run_after('install') + def filter_compilers(self): + """run after install to avoid spack compiler wrappers + getting embded into nrnivmodl script""" + + arch = self.get_arch_dir() + nrnmakefile = join_path(self.prefix, arch, 'bin/nrniv_makefile') + + kwargs = { + 'backup': False, + 'string': True + } + + filter_file(env['CC'], self.compiler.cc, nrnmakefile, **kwargs) + filter_file(env['CXX'], self.compiler.cxx, nrnmakefile, **kwargs) + + def setup_environment(self, spack_env, run_env): + arch = self.get_arch_dir() + run_env.prepend_path('PATH', join_path(self.prefix, arch, 'bin')) + + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): + arch = self.get_arch_dir() + spack_env.prepend_path('PATH', join_path(self.prefix, arch, 'bin')) -- cgit v1.2.3-70-g09d2 From a00a09a234886d3bb4e53f873579a56aca11d3ba Mon Sep 17 00:00:00 2001 From: stefanosoffia Date: Thu, 4 Jan 2018 21:45:25 +0100 Subject: Added i3 and its dependencies. (#6805) --- var/spack/repos/builtin/packages/i3/package.py | 53 ++++++++++++++++++++++ var/spack/repos/builtin/packages/libev/package.py | 42 +++++++++++++++++ .../repos/builtin/packages/libxkbcommon/package.py | 51 +++++++++++++++++++++ .../packages/startup-notification/package.py | 39 ++++++++++++++++ .../repos/builtin/packages/xcb-util-xrm/package.py | 48 ++++++++++++++++++++ 5 files changed, 233 insertions(+) create mode 100644 var/spack/repos/builtin/packages/i3/package.py create mode 100644 var/spack/repos/builtin/packages/libev/package.py create mode 100644 var/spack/repos/builtin/packages/libxkbcommon/package.py create mode 100644 var/spack/repos/builtin/packages/startup-notification/package.py create mode 100644 var/spack/repos/builtin/packages/xcb-util-xrm/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/i3/package.py b/var/spack/repos/builtin/packages/i3/package.py new file mode 100644 index 0000000000..44dbbf7111 --- /dev/null +++ b/var/spack/repos/builtin/packages/i3/package.py @@ -0,0 +1,53 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class I3(AutotoolsPackage): + """i3, improved tiling wm. i3 is a tiling window manager, completely + written from scratch. The target platforms are GNU/Linux and BSD operating + systems, our code is Free and Open Source Software (FOSS) under the BSD + license. i3 is primarily targeted at advanced users and developers.""" + + homepage = "https://i3wm.org/" + url = "https://github.com/i3/i3/archive/4.14.1.tar.gz" + + version('4.14.1', 'bdbb6d7bb5a647c8b7b53ed10de84cc5') + + depends_on('autoconf', type='build') + depends_on('automake', type='build') + depends_on('libtool', type='build') + depends_on('m4', type='build') + + depends_on('libev') + depends_on('startup-notification') + depends_on('xcb-util-cursor') + depends_on('xcb-util-keysyms') + depends_on('xcb-util-wm') + depends_on('xcb-util-xrm') + depends_on('libxkbcommon') + depends_on('yajl') + depends_on('cairo+X') + depends_on('pango+X') diff --git a/var/spack/repos/builtin/packages/libev/package.py b/var/spack/repos/builtin/packages/libev/package.py new file mode 100644 index 0000000000..aea5362ce9 --- /dev/null +++ b/var/spack/repos/builtin/packages/libev/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Libev(AutotoolsPackage): + """A full-featured and high-performance event loop that is loosely modelled + after libevent, but without its limitations and bugs.""" + + homepage = "http://software.schmorp.de/pkg/libev.html" + url = "http://dist.schmorp.de/libev/libev-4.24.tar.gz" + list_url = "http://dist.schmorp.de/libev/Attic/" + + version('develop', git='https://github.com/enki/libev') + version('4.24', '94459a5a22db041dec6f98424d6efe54') + + depends_on('autoconf', type='build', when='@develop') + depends_on('automake', type='build', when='@develop') + depends_on('libtool', type='build', when='@develop') + depends_on('m4', type='build', when='@develop') diff --git a/var/spack/repos/builtin/packages/libxkbcommon/package.py b/var/spack/repos/builtin/packages/libxkbcommon/package.py new file mode 100644 index 0000000000..d51f079381 --- /dev/null +++ b/var/spack/repos/builtin/packages/libxkbcommon/package.py @@ -0,0 +1,51 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Libxkbcommon(AutotoolsPackage): + """xkbcommon is a library to handle keyboard descriptions, including + loading them from disk, parsing them and handling their state. It's mainly + meant for client toolkits, window systems, and other system + applications.""" + + homepage = "https://xkbcommon.org/" + url = "https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-0.8.0.tar.gz" + + version('0.8.0', '0d9738fb2ed2dcc6e2c6920d94e135ce') + + depends_on('autoconf', type='build') + depends_on('automake', type='build') + depends_on('libtool', type='build') + depends_on('m4', type='build') + depends_on('bison', type='build') + depends_on('xkbdata') + + def configure_args(self): + spec = self.spec + args = [] + args.append('--with-xkb-config-root={0}' + .format(spec['xkbdata'].prefix)) + return args diff --git a/var/spack/repos/builtin/packages/startup-notification/package.py b/var/spack/repos/builtin/packages/startup-notification/package.py new file mode 100644 index 0000000000..46d677c3fe --- /dev/null +++ b/var/spack/repos/builtin/packages/startup-notification/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class StartupNotification(AutotoolsPackage): + """startup-notification contains a reference implementation of the + freedesktop startup notification protocol.""" + + homepage = "https://www.freedesktop.org/wiki/Software/startup-notification/" + url = "http://www.freedesktop.org/software/startup-notification/releases/startup-notification-0.12.tar.gz" + + version('0.12', '2cd77326d4dcaed9a5a23a1232fb38e9') + + depends_on('libx11') + depends_on('libxcb') + depends_on('xcb-util') diff --git a/var/spack/repos/builtin/packages/xcb-util-xrm/package.py b/var/spack/repos/builtin/packages/xcb-util-xrm/package.py new file mode 100644 index 0000000000..e7e376f79d --- /dev/null +++ b/var/spack/repos/builtin/packages/xcb-util-xrm/package.py @@ -0,0 +1,48 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class XcbUtilXrm(AutotoolsPackage): + """XCB util-xrm module provides the 'xrm' library, i.e. utility functions + for the X resource manager.""" + + homepage = "https://github.com/Airblader/xcb-util-xrm" + url = "https://github.com/Airblader/xcb-util-xrm/archive/v1.2.tar.gz" + + # This GitHub project includes some git submodules, which must be fetched + # in order to build it. + version('1.2', + git='https://github.com/Airblader/xcb-util-xrm', + tag='v1.2', + submodules=True) + + depends_on('autoconf', type='build') + depends_on('automake', type='build') + depends_on('libtool', type='build') + depends_on('m4', type='build') + depends_on('pkgconfig', type='build') + + depends_on('libxcb@1.4:') -- cgit v1.2.3-70-g09d2 From a7f0da53f7f93021709365822c2e1d30a9ae570c Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 4 Jan 2018 16:46:24 -0600 Subject: Revert "openssl: Add perl dependency" (#6831) * Revert "Added i3 and its dependencies. (#6805)" This reverts commit a00a09a234886d3bb4e53f873579a56aca11d3ba. * Revert "Adding NEURON simulator package (#5097)" This reverts commit d24782c86d84d51ac3ef7404c9e4a4eb6b9eab7e. * Revert "openssl: Add perl dependency (#5188)" This reverts commit 395ee97f3b1cdd96ae00bdae6d27d3145c50fc5e. --- var/spack/repos/builtin/packages/openssl/package.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openssl/package.py b/var/spack/repos/builtin/packages/openssl/package.py index abd4f656c8..c04bb664e7 100644 --- a/var/spack/repos/builtin/packages/openssl/package.py +++ b/var/spack/repos/builtin/packages/openssl/package.py @@ -62,7 +62,11 @@ class Openssl(Package): version('1.0.1h', '8d6d684a9430d5cc98a62a5d8fbda8cf') depends_on('zlib') - depends_on('perl@5.14.0:', type='build') + + # TODO: 'make test' requires Perl module Test::More version 0.96 + # TODO: uncomment when test dependency types are supported. + # TODO: This is commented in the meantime to avoid dependnecy bloat. + # depends_on('perl@5.14.0:', type='build', when='+tests') parallel = False -- cgit v1.2.3-70-g09d2 From d438e9da4b7e8600ff2ac8c0819625ffcbfd1951 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Fri, 5 Jan 2018 11:27:59 +0800 Subject: Create a symbolic link to the MotionCor2_x.x.x executable. (#6826) * Create a symbolic link for MotionCor2. * Create a symbolic link for MotionCor2. * Create a symbolic link for MotionCor2. * Create a symbolic link for MotionCor2. --- var/spack/repos/builtin/packages/motioncor2/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/motioncor2/package.py b/var/spack/repos/builtin/packages/motioncor2/package.py index cd4db241f0..e99a052c09 100644 --- a/var/spack/repos/builtin/packages/motioncor2/package.py +++ b/var/spack/repos/builtin/packages/motioncor2/package.py @@ -51,3 +51,5 @@ class Motioncor2(Package): mkdirp(prefix.bin) for files in glob("MotionCor2_*"): install(files, prefix.bin) + with working_dir(prefix.bin): + symlink('MotionCor2_{0}'.format(spec.version), 'MotionCor2') -- cgit v1.2.3-70-g09d2 From d4e4755ec9792d409e2df3dfd6ee92cd106e3e31 Mon Sep 17 00:00:00 2001 From: David Hows Date: Sat, 6 Jan 2018 01:47:36 +1100 Subject: Fix pymongo package (#6832) And update to 3.6 --- var/spack/repos/builtin/packages/py-mongo/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-mongo/package.py b/var/spack/repos/builtin/packages/py-mongo/package.py index aa24299d2b..507ad82631 100644 --- a/var/spack/repos/builtin/packages/py-mongo/package.py +++ b/var/spack/repos/builtin/packages/py-mongo/package.py @@ -29,10 +29,11 @@ class PyMongo(PythonPackage): """Python driver for MongoDB """ homepage = "http://github.com/mongodb/mongo-python-driver" - url = "https://pypi.io/packages/source/p/pymongo/pymongo-3.3.0.tar.gz" + url = "https://pypi.io/packages/source/p/pymongo/pymongo-3.6.0.tar.gz" + version('3.6.0', '2f64fa7691c77535b72050704cc12afb') version('3.3.0', '42cd12a5014fb7d3e1987ca04f5c651f') depends_on('python@2.6:2.8,3.3:') - depends_on('setuptools', type='build') + depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From 322b016230629c2e97f7d3457f72b13ad3e885b3 Mon Sep 17 00:00:00 2001 From: "Kelly (KT) Thompson" Date: Fri, 5 Jan 2018 12:45:21 -0700 Subject: Provide build_type variant for Metis. (#6808) * Provide build_type variant for Metis. + Ideally, we would make Metis a CMakePackage, but `metis@:5` doesn't use CMake. + For now, provide a `build_type=` variant similar what is found in CMakePackage. + There is a potential for duplicate specification of `CMAKE_BUILD_TYPE` if both variants `+debug` and `build_type=` are specified. I am looking for advice on how this can be resolved. * Update metis recipe in response to flake8 and user comments. + Wrap comment lines that used more than 80 columns. + Change `+debug` variant to avoid potential for multiple `-DCMAKE_BUID_TYPE=` arguments provided to cmake. Specifying this variant no longer appends this configure option. However, if `+debug` is specified, require `build_type=Debug` to maintain expected behavior. * For metis, remove +debug variant; use build_type= instead. + Update recipe for metis@4 to extract `build_type=` values and set `OPTFLAGS` accordingly. + For metis@5:, the behavior from the previously supported variant `+debug` can be obtained with the options `+gdb build_type=Debug` * Conflicts added for metis@4 when build_type != Release|Debug. * Use spack function conflicts instead of 'raise InstallError'. --- var/spack/repos/builtin/packages/metis/package.py | 33 +++++++++++++++-------- 1 file changed, 22 insertions(+), 11 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/metis/package.py b/var/spack/repos/builtin/packages/metis/package.py index 20e601fbd8..30f457da6b 100644 --- a/var/spack/repos/builtin/packages/metis/package.py +++ b/var/spack/repos/builtin/packages/metis/package.py @@ -45,12 +45,25 @@ class Metis(Package): version('4.0.3', 'd3848b454532ef18dc83e4fb160d1e10') variant('shared', default=True, description='Enables the build of shared libraries.') - variant('debug', default=False, description='Builds the library in debug mode.') - variant('gdb', default=False, description='Enables gdb support.') - + variant('gdb', default=False, description='Enables gdb support (version 5+).') variant('int64', default=False, description='Sets the bit width of METIS\'s index type to 64.') variant('real64', default=False, description='Sets the bit width of METIS\'s real type to 64.') + # For Metis version 5:, the build system is CMake, provide the + # `build_type` variant. + variant('build_type', default='Release', + description='The build type for the installation (only Debug or' + ' Release allowed for version 4).', + values=('Debug', 'Release', 'RelWithDebInfo', 'MinSizeRel')) + + # Prior to version 5, the (non-cmake) build system only knows about + # 'build_type=Debug|Release'. + conflicts('@:4.999', when='build_type=RelWithDebInfo') + conflicts('@:4.999', when='build_type=MinSizeRel') + conflicts('@:4.999', when='+gdb') + conflicts('@:4.999', when='+int64') + conflicts('@:4.999', when='+real64') + depends_on('cmake@2.8:', when='@5:', type='build') patch('install_gklib_defs_rename.patch', when='@5:') @@ -87,12 +100,8 @@ class Metis(Package): @when('@:4') def install(self, spec, prefix): # Process library spec and options - if any('+{0}'.format(v) in spec for v in ['gdb', 'int64', 'real64']): - raise InstallError('METIS@:4 does not support the following ' - 'variants: gdb, int64, real64.') - options = ['COPTIONS={0}'.format(self.compiler.pic_flag)] - if '+debug' in spec: + if spec.variants['build_type'].value == 'Debug': options.append('OPTFLAGS=-g -O0') make(*options) @@ -185,6 +194,11 @@ class Metis(Package): options.append('-DGKLIB_PATH:PATH=%s/GKlib' % source_directory) options.append('-DCMAKE_INSTALL_NAME_DIR:PATH=%s/lib' % prefix) + # Normally this is available via the 'CMakePackage' object, but metis + # IS-A 'Package' (not a 'CMakePackage') to support non-cmake metis@:5. + build_type = spec.variants['build_type'].value + options.extend(['-DCMAKE_BUILD_TYPE:STRING={0}'.format(build_type)]) + if '+shared' in spec: options.append('-DSHARED:BOOL=ON') else: @@ -196,9 +210,6 @@ class Metis(Package): rpath_options.append(o) for o in rpath_options: options.remove(o) - if '+debug' in spec: - options.extend(['-DDEBUG:BOOL=ON', - '-DCMAKE_BUILD_TYPE:STRING=Debug']) if '+gdb' in spec: options.append('-DGDB:BOOL=ON') -- cgit v1.2.3-70-g09d2 From fc1c7c2db7814cf82fa88ff055dacd6f20e61abb Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Sat, 6 Jan 2018 03:46:48 +0800 Subject: Add a package: ctffind. (#6836) * Add a package: ctffind. * Add a package: ctffind. --- .../repos/builtin/packages/ctffind/package.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 var/spack/repos/builtin/packages/ctffind/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ctffind/package.py b/var/spack/repos/builtin/packages/ctffind/package.py new file mode 100644 index 0000000000..95fe40f93c --- /dev/null +++ b/var/spack/repos/builtin/packages/ctffind/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Ctffind(AutotoolsPackage): + """Fast and accurate defocus estimation from electron micrographs.""" + + homepage = "http://grigoriefflab.janelia.org/ctffind4" + url = "http://grigoriefflab.janelia.org/sites/default/files/ctffind-4.1.8.tar.gz" + + version('4.1.8', '8ae9d9abe363141a3792981b5a2fae94') + + depends_on('wx') + depends_on('fftw@3:') -- cgit v1.2.3-70-g09d2 From ea6ebedd0ec5dc10caba2904a1ca8baaa9ac7414 Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 5 Jan 2018 15:08:22 -0600 Subject: py-pybedtools: Create new package (#6487) * py-pybedtools: Create new package * py-pybedtools: add py-six requirement * py-pybedtools: remove py-cython dependency for release version * py-pybedtools: include minimum version of py-pysam --- .../builtin/packages/py-pybedtools/package.py | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-pybedtools/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pybedtools/package.py b/var/spack/repos/builtin/packages/py-pybedtools/package.py new file mode 100644 index 0000000000..111ba39ee0 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pybedtools/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPybedtools(PythonPackage): + """pybedtools wraps and extends BEDTools and offers + feature-level manipulations from within Python.""" + + homepage = "http://daler.github.io/pybedtools" + url = "https://pypi.io/packages/source/p/pybedtools/pybedtools-0.7.10.tar.gz" + + version('0.7.10', 'f003c67e22c48b77f070538368ece70c') + + depends_on('py-setuptools', type='build') + depends_on('bedtools2', type=('build', 'run')) + depends_on('py-numpy', type=('build', 'run')) + depends_on('py-pandas', type=('build', 'run')) + depends_on('py-pysam@0.8.1:', type=('build', 'run')) + depends_on('py-six', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 4cd9bdedd735ac82e4494abf5def3c031edd4698 Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 5 Jan 2018 15:08:45 -0600 Subject: sailfish: Create new package (#6827) * sailfish: Create new package * sailfish: fix tbb dependency * sailfish: fix dependency type --- .../repos/builtin/packages/sailfish/package.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 var/spack/repos/builtin/packages/sailfish/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sailfish/package.py b/var/spack/repos/builtin/packages/sailfish/package.py new file mode 100644 index 0000000000..d25db48c6f --- /dev/null +++ b/var/spack/repos/builtin/packages/sailfish/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Sailfish(CMakePackage): + """Sailfish is a tool for transcript quantification from RNA-seq data.""" + + homepage = "http://www.cs.cmu.edu/~ckingsf/software/sailfish" + url = "https://github.com/kingsfordgroup/sailfish/archive/v0.10.0.tar.gz" + + version('0.10.1', 'e6dab4cf3a39f346df7c28f40eb58cad') + + depends_on('boost@1.55:') + depends_on('tbb') -- cgit v1.2.3-70-g09d2 From 8813b3fbd383717e8ac4e11a2f67af00c958cb94 Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Sat, 6 Jan 2018 11:01:06 -0700 Subject: Updating OpenFAST to use explicit lapack and blas libraries from Spack. (#6824) * Updating OpenFAST to use explicit lapack and blas libraries from Spack. * Simplifying openfast blas lib logic and fixes flake8 errors. * Changing order of blas and lapack libs in openfast package. --- var/spack/repos/builtin/packages/openfast/package.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openfast/package.py b/var/spack/repos/builtin/packages/openfast/package.py index cf37e24a81..687ca8c3b7 100644 --- a/var/spack/repos/builtin/packages/openfast/package.py +++ b/var/spack/repos/builtin/packages/openfast/package.py @@ -56,7 +56,7 @@ class Openfast(CMakePackage): # Additional dependencies when compiling C++ library depends_on('mpi', when='+cxx') depends_on('yaml-cpp', when='+cxx') - depends_on('hdf5+mpi+cxx', when='+cxx') + depends_on('hdf5+mpi+cxx+hl', when='+cxx') depends_on('zlib', when='+cxx') depends_on('libxml2', when='+cxx') @@ -79,6 +79,13 @@ class Openfast(CMakePackage): 'ON' if '+cxx' in spec else 'OFF'), ]) + # Make sure we use Spack's blas/lapack: + blas_libs = spec['lapack'].libs + spec['blas'].libs + options.extend([ + '-DBLAS_LIBRARIES=%s' % blas_libs.joined(';'), + '-DLAPACK_LIBRARIES=%s' % blas_libs.joined(';') + ]) + if '+cxx' in spec: options.extend([ '-DMPI_CXX_COMPILER:PATH=%s' % spec['mpi'].mpicxx, -- cgit v1.2.3-70-g09d2 From 3c43a2d79c396be5e272585e0a37c112b1589405 Mon Sep 17 00:00:00 2001 From: Milton Woods Date: Sun, 7 Jan 2018 05:02:13 +1100 Subject: py-psyclone: Parallelisation System for climate models (#6797) * py-psyclone: Code generation for the PSyKAl framework from the GungHo project * py-psyclone: add installation tests based on py.test * py-psyclone: define 'develop' version as latest master branch * py-psyclone: extract tagged version 1.5.1 from git repo * py-psyclone: whitespace adjustments for flake8 * py-psyclone: use compatible versions of py-fparser * py-psyclone: use type='test' for selected dependencies --- .../repos/builtin/packages/py-psyclone/package.py | 65 ++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-psyclone/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-psyclone/package.py b/var/spack/repos/builtin/packages/py-psyclone/package.py new file mode 100644 index 0000000000..b00e7059a7 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-psyclone/package.py @@ -0,0 +1,65 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +# +from spack import * + + +class PyPsyclone(PythonPackage): + """Code generation for the PSyKAl framework from the GungHo project, + as used by the LFRic model at the UK Met Office.""" + + homepage = "https://github.com/stfc/PSyclone" + url = "https://github.com/stfc/PSyclone/archive/1.5.1.tar.gz" + giturl = "https://github.com/stfc/PSyclone.git" + + version('1.5.1', git=giturl, + commit='eba7a097175b02f75dec70616cf267b7b3170d78') + version('develop', git=giturl, branch='master') + + depends_on('py-setuptools', type='build') + + depends_on('python', type=('build', 'run')) + depends_on('py-pyparsing', type=('build', 'run')) + + # Test cases fail without compatible versions of py-fparser: + depends_on('py-fparser@0.0.5', type=('build', 'run'), when='@1.5.1') + depends_on('py-fparser', type=('build', 'run'), when='@1.5.2:') + + # Dependencies only required for tests: + depends_on('py-numpy', type='test') + depends_on('py-nose', type='test') + depends_on('py-pytest', type='test') + + @run_after('install') + @on_package_attributes(run_tests=True) + def check_build(self): + # Limit py.test to search inside the build tree: + touch('pytest.ini') + with working_dir('src'): + Executable('py.test')() + + def setup_environment(self, spack_env, run_env): + # Allow testing with installed executables: + spack_env.prepend_path('PATH', self.prefix.bin) -- cgit v1.2.3-70-g09d2 From ce0c77c9913dc731df2c8c8516ec8bc052ba5f73 Mon Sep 17 00:00:00 2001 From: Milton Woods Date: Sun, 7 Jan 2018 05:02:41 +1100 Subject: Blitz 1.0.1 (#6765) * blitz: update to version 1.0.1 * blitz: change URL for release tarballs * blitz: update checksum of @1.0.0 after changing URL --- var/spack/repos/builtin/packages/blitz/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/blitz/package.py b/var/spack/repos/builtin/packages/blitz/package.py index 2cb9d8f5ab..7aa9c45aaf 100644 --- a/var/spack/repos/builtin/packages/blitz/package.py +++ b/var/spack/repos/builtin/packages/blitz/package.py @@ -28,9 +28,10 @@ from spack import * class Blitz(AutotoolsPackage): """N-dimensional arrays for C++""" homepage = "http://github.com/blitzpp/blitz" - url = "https://github.com/blitzpp/blitz/tarball/1.0.0" + url = "https://github.com/blitzpp/blitz/archive/1.0.1.tar.gz" - version('1.0.0', '9f040b9827fe22228a892603671a77af') + version('1.0.1', 'fe43e2cf6c9258bc8b369264dd008971') + version('1.0.0', '971c43e22318bbfe8da016e6ef596234') build_targets = ['lib'] -- cgit v1.2.3-70-g09d2 From 38fabce2aabbf5a131b4ca056187bc5afe092983 Mon Sep 17 00:00:00 2001 From: Michael Kuron Date: Sat, 6 Jan 2018 19:03:54 +0100 Subject: Siesta: only apply patch to <4.1 and fix Intel compiler (#6466) * Siesta: add 3.2 and don't apply patch to 4.1 * siesta: fix bad optimization with Intel compiler * siesta: Fix download URL * siesta: build utilities too * siesta: fix binary name collision * siesta: Cleanup --- .../repos/builtin/packages/siesta/configure.patch | 34 +++++++++++++++++++++- var/spack/repos/builtin/packages/siesta/package.py | 30 +++++++++++++------ 2 files changed, 54 insertions(+), 10 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/siesta/configure.patch b/var/spack/repos/builtin/packages/siesta/configure.patch index 8371c9e9bb..577c77f529 100644 --- a/var/spack/repos/builtin/packages/siesta/configure.patch +++ b/var/spack/repos/builtin/packages/siesta/configure.patch @@ -18,4 +18,36 @@ else NETCDF_LIBS="";tw_netcdf_ok=no;if test ! -z "$with_netcdf"; then { { echo "$as_me:$LINENO: error: Could not find NetCDF library." >&5 echo "$as_me: error: Could not find NetCDF library." >&2;} - +--- a/Util/TBTrans_rep/Makefile 2017-12-08 09:49:02.307877000 +0100 ++++ b/Util/TBTrans_rep/Makefile 2017-12-08 09:49:44.385288000 +0100 +@@ -14,7 +14,7 @@ + # Please see note about Linear-Algebra libraries below + # + +-default: what tbtrans ++default: what tbtrans_rep + + VPATH:=$(shell pwd)/../../Src + OBJDIR=Obj +@@ -91,16 +91,16 @@ + "ARCH_MAKE=../$(ARCH_MAKE)" \ + "INCFLAGS=$(LINALG_INCFLAGS)" "FFLAGS=$(FFLAGS:$(IPO_FLAG)=)" $(LINALG)) + +-tbtrans: FPPFLAGS+=$(DEFS_PREFIX) -DTBTRANS +-tbtrans: DEFS+=$(DEFS_PREFIX) -DTBTRANS +-tbtrans: $(MPI_INTERFACE) $(FDF) $(TBTOBJS) $(SYSOBJ) $(LINALG) +- $(FC) $(FFLAGS) $(LDFLAGS) -o tbtrans \ ++tbtrans_rep: FPPFLAGS+=$(DEFS_PREFIX) -DTBTRANS ++tbtrans_rep: DEFS+=$(DEFS_PREFIX) -DTBTRANS ++tbtrans_rep: $(MPI_INTERFACE) $(FDF) $(TBTOBJS) $(SYSOBJ) $(LINALG) ++ $(FC) $(FFLAGS) $(LDFLAGS) -o tbtrans_rep \ + $(TBTOBJS) $(MPI_INTERFACE) \ + $(FDF) $(LIBS) $(LINALG) || echo "***Please see top of Makefile" + + clean: + @echo "==> Cleaning object, library, and executable files" +- rm -f tbtrans *.o *.a *.mod ++ rm -f tbtrans_rep *.o *.a *.mod + rm -rf ./fdf + rm -rf ./MPI + rm -rf ./Libs diff --git a/var/spack/repos/builtin/packages/siesta/package.py b/var/spack/repos/builtin/packages/siesta/package.py index 536aac44b0..ffb8c12de1 100644 --- a/var/spack/repos/builtin/packages/siesta/package.py +++ b/var/spack/repos/builtin/packages/siesta/package.py @@ -24,6 +24,7 @@ ############################################################################## from spack import * +import os class Siesta(Package): @@ -31,11 +32,11 @@ class Siesta(Package): dynamics simulations of molecules and solids.""" homepage = "https://departments.icmab.es/leem/siesta/" - url = "https://launchpad.net/siesta/4.0/4.0.1/+download/siesta-4.0.1.tar.gz" - version('4.0.1', '5cb60ce068f2f6e84fa9184ffca94c08') + version('4.0.1', '5cb60ce068f2f6e84fa9184ffca94c08', url='https://launchpad.net/siesta/4.0/4.0.1/+download/siesta-4.0.1.tar.gz') + version('3.2-pl-5', '27a300c65eb2a25d107d910d26aaf81a', url='http://departments.icmab.es/leem/siesta/CodeAccess/Code/siesta-3.2-pl-5.tgz') - patch('configure.patch') + patch('configure.patch', when='@:4.0') depends_on('mpi') depends_on('blas') @@ -63,18 +64,24 @@ class Siesta(Package): # Intel's mpiifort is not found 'MPIFC=%s' % spec['mpi'].mpifc ] - with working_dir('Obj'): - sh('../Src/configure', *configure_args) - sh('../Src/obj_setup.sh') - with working_dir('Obj_trans', create=True): - sh('../Src/configure', *configure_args) - sh('../Src/obj_setup.sh') + for d in ['Obj', 'Obj_trans']: + with working_dir(d, create=True): + sh('../Src/configure', *configure_args) + if spec.satisfies('@:4.0%intel'): + with open('arch.make', 'a') as f: + f.write('\natom.o: atom.F\n') + f.write('\t$(FC) -c $(FFLAGS) -O1') + f.write('$(INCFLAGS) $(FPPFLAGS) $<') + sh('../Src/obj_setup.sh') def build(self, spec, prefix): with working_dir('Obj'): make(parallel=False) with working_dir('Obj_trans'): make('transiesta', parallel=False) + with working_dir('Util'): + sh = which('sh') + sh('build_all.sh') def install(self, spec, prefix): mkdir(prefix.bin) @@ -82,3 +89,8 @@ class Siesta(Package): install('siesta', prefix.bin) with working_dir('Obj_trans'): install('transiesta', prefix.bin) + for root, _, files in os.walk('Util'): + for fname in files: + fname = join_path(root, fname) + if os.access(fname, os.X_OK): + install(fname, prefix.bin) -- cgit v1.2.3-70-g09d2 From 298f5562c99ad3ad87da9e0df78bc25e95ce0c02 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Mon, 8 Jan 2018 16:14:38 +0100 Subject: Rmlab: Control PNG (#6846) Control the find_package of the PNG variant explicitly. This avoids picking up an "external" PNGwriter install in case `~png` is picked by changing the default "AUTO" search to explicit "ON" (required) of "OFF" (ignore if exists). --- var/spack/repos/builtin/packages/rmlab/package.py | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/rmlab/package.py b/var/spack/repos/builtin/packages/rmlab/package.py index 2fa927a1ac..d089393ab4 100644 --- a/var/spack/repos/builtin/packages/rmlab/package.py +++ b/var/spack/repos/builtin/packages/rmlab/package.py @@ -47,3 +47,12 @@ class Rmlab(CMakePackage): conflicts('%pgi@:14') depends_on('pngwriter@0.6.0:', when='+png') + + def cmake_args(self): + spec = self.spec + + args = [ + '-DRmlab_USE_PNG={0}'.format( + 'ON' if '+png' in spec else 'OFF') + ] + return args -- cgit v1.2.3-70-g09d2 From eb66aca9aed6582c2efe6877cc9dac24016d282d Mon Sep 17 00:00:00 2001 From: "Kelly (KT) Thompson" Date: Mon, 8 Jan 2018 08:18:42 -0700 Subject: Upgrade recipe for parmetis to be a CMakePackage (#6807) * Upgrade recipe for parmetis to be a CMakePackage + Eliminate `install` method (use the one from CMakePackage). + Move configure options to new method `cmake_args` + Move special install instructions for DarwinOS to a `run_after` method. * Fix run_after section; Remove variant +debug. --- .../repos/builtin/packages/parmetis/package.py | 26 +++++++++------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/parmetis/package.py b/var/spack/repos/builtin/packages/parmetis/package.py index 927a7715e6..dacd218f99 100644 --- a/var/spack/repos/builtin/packages/parmetis/package.py +++ b/var/spack/repos/builtin/packages/parmetis/package.py @@ -27,7 +27,7 @@ from spack import * import sys -class Parmetis(Package): +class Parmetis(CMakePackage): """ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning unstructured graphs, meshes, and for computing fill-reducing orderings of sparse matrices.""" @@ -40,7 +40,6 @@ class Parmetis(Package): version('4.0.2', '0912a953da5bb9b5e5e10542298ffdce') variant('shared', default=True, description='Enables the build of shared libraries.') - variant('debug', default=False, description='Builds the library in debug mode.') variant('gdb', default=False, description='Enables gdb support.') depends_on('cmake@2.8:', type='build') @@ -61,11 +60,10 @@ class Parmetis(Package): url += '/parmetis-{0}.tar.gz'.format(version) return url - def install(self, spec, prefix): - source_directory = self.stage.source_path - build_directory = join_path(source_directory, 'build') + def cmake_args(self): + spec = self.spec - options = std_cmake_args[:] + options = [] options.extend([ '-DGKLIB_PATH:PATH=%s/GKlib' % spec['metis'].prefix.include, '-DMETIS_PATH:PATH=%s' % spec['metis'].prefix, @@ -87,17 +85,13 @@ class Parmetis(Package): for o in rpath_options: options.remove(o) - if '+debug' in spec: - options.extend(['-DDEBUG:BOOL=ON', - '-DCMAKE_BUILD_TYPE:STRING=Debug']) if '+gdb' in spec: options.append('-DGDB:BOOL=ON') - with working_dir(build_directory, create=True): - cmake(source_directory, *options) - make() - make('install') + return options - # The shared library is not installed correctly on Darwin; fix this - if (sys.platform == 'darwin') and ('+shared' in spec): - fix_darwin_install_name(prefix.lib) + @run_after('install') + def darwin_fix(self): + # The shared library is not installed correctly on Darwin; fix this + if (sys.platform == 'darwin') and ('+shared' in self.spec): + fix_darwin_install_name(prefix.lib) -- cgit v1.2.3-70-g09d2 From 747dbcb82b235a1c8eff4aa29a14c8beb2a57fca Mon Sep 17 00:00:00 2001 From: Bryce Allen Date: Mon, 8 Jan 2018 10:25:15 -0600 Subject: fix swift-t packages dependencies (#6530) --- var/spack/repos/builtin/packages/stc/package.py | 1 + var/spack/repos/builtin/packages/turbine/package.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/stc/package.py b/var/spack/repos/builtin/packages/stc/package.py index 7a55b73873..607c34451b 100644 --- a/var/spack/repos/builtin/packages/stc/package.py +++ b/var/spack/repos/builtin/packages/stc/package.py @@ -37,6 +37,7 @@ class Stc(AutotoolsPackage): depends_on('java') depends_on('ant') depends_on('turbine') + depends_on('zsh', type='run') def configure_args(self): args = ['--with-turbine=' + self.spec['turbine'].prefix] diff --git a/var/spack/repos/builtin/packages/turbine/package.py b/var/spack/repos/builtin/packages/turbine/package.py index d12fa0a41c..c7583cc40a 100644 --- a/var/spack/repos/builtin/packages/turbine/package.py +++ b/var/spack/repos/builtin/packages/turbine/package.py @@ -36,7 +36,8 @@ class Turbine(AutotoolsPackage): depends_on('adlbx') depends_on('tcl') - depends_on('zsh', type='run') + depends_on('zsh') + depends_on('swig') def configure_args(self): args = ['--with-c-utils=' + self.spec['exmcutils'].prefix, -- cgit v1.2.3-70-g09d2 From 257d23581cda1b136912dbcfe3c8cee2ba635aab Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Mon, 8 Jan 2018 19:42:51 +0100 Subject: Cleanup: Remove Dbl Brackets (#6848) Remove unnecessary double brackets in ADIOS2 and gearshifft packages. --- var/spack/repos/builtin/packages/adios2/package.py | 36 +++++++++++----------- .../repos/builtin/packages/gearshifft/package.py | 16 +++++----- 2 files changed, 26 insertions(+), 26 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/adios2/package.py b/var/spack/repos/builtin/packages/adios2/package.py index 8752a18271..935313e6d9 100644 --- a/var/spack/repos/builtin/packages/adios2/package.py +++ b/var/spack/repos/builtin/packages/adios2/package.py @@ -97,24 +97,24 @@ class Adios2(CMakePackage): spec = self.spec args = [ - '-DADIOS2_BUILD_SHARED_LIBS:BOOL={0}'.format(( - 'ON' if '+shared' in spec else 'OFF')), + '-DADIOS2_BUILD_SHARED_LIBS:BOOL={0}'.format( + 'ON' if '+shared' in spec else 'OFF'), '-DADIOS2_BUILD_TESTING=OFF', - '-DADIOS2_USE_MPI={0}'.format(( - 'ON' if '+mpi' in spec else 'OFF')), - '-DADIOS2_USE_BZip2={0}'.format(( - 'ON' if '+bzip2' in spec else 'OFF')), - '-DADIOS2_USE_ZFP={0}'.format(( - 'ON' if '+zfp' in spec else 'OFF')), - '-DADIOS2_USE_DataMan={0}'.format(( - 'ON' if '+dataman' in spec else 'OFF')), - '-DADIOS2_USE_ZeroMQ={0}'.format(( - 'ON' if '+dataman' in spec else 'OFF')), - '-DADIOS2_USE_HDF5={0}'.format(( - 'ON' if '+hdf5' in spec else 'OFF')), - '-DADIOS2_USE_ADIOS1={0}'.format(( - 'ON' if '+adios1' in spec else 'OFF')), - '-DADIOS2_USE_Python={0}'.format(( - 'ON' if '+python' in spec else 'OFF')) + '-DADIOS2_USE_MPI={0}'.format( + 'ON' if '+mpi' in spec else 'OFF'), + '-DADIOS2_USE_BZip2={0}'.format( + 'ON' if '+bzip2' in spec else 'OFF'), + '-DADIOS2_USE_ZFP={0}'.format( + 'ON' if '+zfp' in spec else 'OFF'), + '-DADIOS2_USE_DataMan={0}'.format( + 'ON' if '+dataman' in spec else 'OFF'), + '-DADIOS2_USE_ZeroMQ={0}'.format( + 'ON' if '+dataman' in spec else 'OFF'), + '-DADIOS2_USE_HDF5={0}'.format( + 'ON' if '+hdf5' in spec else 'OFF'), + '-DADIOS2_USE_ADIOS1={0}'.format( + 'ON' if '+adios1' in spec else 'OFF'), + '-DADIOS2_USE_Python={0}'.format( + 'ON' if '+python' in spec else 'OFF') ] return args diff --git a/var/spack/repos/builtin/packages/gearshifft/package.py b/var/spack/repos/builtin/packages/gearshifft/package.py index c1a74ce34d..4ea06f6ff4 100644 --- a/var/spack/repos/builtin/packages/gearshifft/package.py +++ b/var/spack/repos/builtin/packages/gearshifft/package.py @@ -63,13 +63,13 @@ class Gearshifft(CMakePackage): '-DGEARSHIFFT_CLFFT:BOOL=OFF' ] args.extend([ - '-DGEARSHIFFT_FFTW:BOOL={0}'.format(( - 'ON' if '+fftw' in spec else 'OFF')), - '-DGEARSHIFFT_FFTW_OPENMP:BOOL={0}'.format(( - 'ON' if '+openmp' in spec else 'OFF')), - '-DGEARSHIFFT_CUFFT:BOOL={0}'.format(( - 'ON' if '+cufft' in spec else 'OFF')), - '-DGEARSHIFFT_CLFFT:BOOL={0}'.format(( - 'ON' if '+clfft' in spec else 'OFF')) + '-DGEARSHIFFT_FFTW:BOOL={0}'.format( + 'ON' if '+fftw' in spec else 'OFF'), + '-DGEARSHIFFT_FFTW_OPENMP:BOOL={0}'.format( + 'ON' if '+openmp' in spec else 'OFF'), + '-DGEARSHIFFT_CUFFT:BOOL={0}'.format( + 'ON' if '+cufft' in spec else 'OFF'), + '-DGEARSHIFFT_CLFFT:BOOL={0}'.format( + 'ON' if '+clfft' in spec else 'OFF') ]) return args -- cgit v1.2.3-70-g09d2 From 8935a0b90bab7c4b20564b72df70e75b27d2179e Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 8 Jan 2018 18:45:58 -0600 Subject: perl-text-unidecode: Create new package (#6854) --- .../packages/perl-text-unidecode/package.py | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-text-unidecode/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-text-unidecode/package.py b/var/spack/repos/builtin/packages/perl-text-unidecode/package.py new file mode 100644 index 0000000000..23ff07bbc0 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-text-unidecode/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlTextUnidecode(PerlPackage): + """plain ASCII transliterations of Unicode text""" + + homepage = "http://search.cpan.org/~sburke/Text-Unidecode/lib/Text/Unidecode.pm" + url = "http://search.cpan.org/CPAN/authors/id/S/SB/SBURKE/Text-Unidecode-1.30.tar.gz" + + version('1.30', '31cca8505bd74ed9d8036cdc84c808ca') -- cgit v1.2.3-70-g09d2 From 6cf530f28d14cb45fbedd0991a5ace53f9e503e5 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 8 Jan 2018 18:46:16 -0600 Subject: perl-time-piece: Create new package (#6853) --- .../builtin/packages/perl-time-piece/package.py | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-time-piece/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-time-piece/package.py b/var/spack/repos/builtin/packages/perl-time-piece/package.py new file mode 100644 index 0000000000..ad137ae4ed --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-time-piece/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlTimePiece(PerlPackage): + """Object Oriented time objects""" + + homepage = "http://search.cpan.org/~esaym/Time-Piece/Piece.pm" + url = "http://search.cpan.org/CPAN/authors/id/E/ES/ESAYM/Time-Piece-1.3203.tar.gz" + + version('1.3203', '515c1306f123a00116a95335cf543501') -- cgit v1.2.3-70-g09d2 From e72c5ee8a30298c75292ae75dc2f149e2de5c718 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 8 Jan 2018 18:46:51 -0600 Subject: perl-swissknife: Create new package (#6851) --- .../builtin/packages/perl-swissknife/package.py | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-swissknife/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-swissknife/package.py b/var/spack/repos/builtin/packages/perl-swissknife/package.py new file mode 100644 index 0000000000..d40595517b --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-swissknife/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlSwissknife(PerlPackage): + """An object-oriented Perl library to handle Swiss-Prot entries""" + + homepage = "http://swissknife.sourceforge.net" + url = "https://downloads.sourceforge.net/project/swissknife/swissknife/1.75/Swissknife_1.75.tar.gz" + + version('1.75', '09d008cb1d1d211ae4eb9f087c213edf') + + depends_on('perl-module-build', type='build') -- cgit v1.2.3-70-g09d2 From c99ad2b4a503dd178af3a98ea3949edb60bf862f Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 8 Jan 2018 19:35:31 -0600 Subject: barrnap: Create new package (#6855) --- .../repos/builtin/packages/barrnap/package.py | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 var/spack/repos/builtin/packages/barrnap/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/barrnap/package.py b/var/spack/repos/builtin/packages/barrnap/package.py new file mode 100644 index 0000000000..5ba0f9debb --- /dev/null +++ b/var/spack/repos/builtin/packages/barrnap/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Barrnap(Package): + """Barrnap predicts the location of ribosomal RNA genes in genomes.""" + + homepage = "https://github.com/tseemann/barrnap" + url = "https://github.com/tseemann/barrnap/archive/0.8.tar.gz" + + version('0.8', 'd02ccb800d60fa824bae946dd4fa2358') + + depends_on('hmmer@3.1b:', type='run') + + def install(self, spec, prefix): + install_tree('bin', prefix.bin) + install_tree('db', prefix.db) -- cgit v1.2.3-70-g09d2 From 785389be58dffd04e1f5890f3aded9070129837d Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 8 Jan 2018 19:35:48 -0600 Subject: perl-digest-md5: Create new package (#6852) --- .../builtin/packages/perl-digest-md5/package.py | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-digest-md5/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-digest-md5/package.py b/var/spack/repos/builtin/packages/perl-digest-md5/package.py new file mode 100644 index 0000000000..6c23ea2a94 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-digest-md5/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlDigestMd5(PerlPackage): + """Perl interface to the MD5 Algorithm""" + + homepage = "http://search.cpan.org/dist/Digest-MD5/MD5.pm" + url = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-MD5-2.55.tar.gz" + + version('2.55', '601519b826ca14c233f13a4578b967ef') -- cgit v1.2.3-70-g09d2 From 697f1061c5eb874ce2cb30dae501c1ed80a89342 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 8 Jan 2018 19:36:04 -0600 Subject: perl-xml-simple: Create new package (#6849) * perl-xml-simple: Create new package * perl-xml-simple: fix homepage url --- .../builtin/packages/perl-xml-simple/package.py | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-xml-simple/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-xml-simple/package.py b/var/spack/repos/builtin/packages/perl-xml-simple/package.py new file mode 100644 index 0000000000..9aae8e63af --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-xml-simple/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlXmlSimple(PerlPackage): + """An API for simple XML files""" + + homepage = "http://search.cpan.org/~grantm/XML-Simple/lib/XML/Simple.pm" + url = "http://search.cpan.org/CPAN/authors/id/G/GR/GRANTM/XML-Simple-2.24.tar.gz" + + version('2.24', '1cd2e8e3421160c42277523d5b2f4dd2') + + depends_on('perl-xml-parser', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From eb42013727a31faacb0cc35b39661cf807405e6a Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Tue, 9 Jan 2018 01:56:00 -0600 Subject: Remove std_cmake_args from VTK definition (#6856) --- var/spack/repos/builtin/packages/vtk/package.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py index 0ab9a1a131..f5b95108c9 100644 --- a/var/spack/repos/builtin/packages/vtk/package.py +++ b/var/spack/repos/builtin/packages/vtk/package.py @@ -64,8 +64,7 @@ class Vtk(CMakePackage): qt_ver = spec['qt'].version.up_to(1) qt_bin = spec['qt'].prefix.bin - cmake_args = std_cmake_args[:] - cmake_args.extend([ + cmake_args = [ '-DBUILD_SHARED_LIBS=ON', '-DVTK_RENDERING_BACKEND:STRING={0}'.format(opengl_ver), '-DVTK_USE_SYSTEM_HDF5=ON', @@ -86,7 +85,7 @@ class Vtk(CMakePackage): '-DVTK_QT_VERSION:STRING={0}'.format(qt_ver), '-DQT_QMAKE_EXECUTABLE:PATH={0}/qmake'.format(qt_bin), '-DVTK_Group_Qt:BOOL=ON', - ]) + ] # NOTE: The following definitions are required in order to allow # VTK to build with qt~webkit versions (see the documentation for @@ -99,7 +98,9 @@ class Vtk(CMakePackage): ]) if spec.satisfies('@:6.1.0'): - cmake_args.append('-DCMAKE_C_FLAGS=-DGLX_GLXEXT_LEGACY') - cmake_args.append('-DCMAKE_CXX_FLAGS=-DGLX_GLXEXT_LEGACY') + cmake_args.extend([ + '-DCMAKE_C_FLAGS=-DGLX_GLXEXT_LEGACY', + '-DCMAKE_CXX_FLAGS=-DGLX_GLXEXT_LEGACY' + ]) return cmake_args -- cgit v1.2.3-70-g09d2 From 43f98dc0d505e7829e5b37a983017a4a7f844d04 Mon Sep 17 00:00:00 2001 From: Federico Ficarelli Date: Tue, 9 Jan 2018 15:43:53 +0100 Subject: Fix missing dependency in ghostscript (#6866) --- var/spack/repos/builtin/packages/ghostscript/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ghostscript/package.py b/var/spack/repos/builtin/packages/ghostscript/package.py index 937b509166..b090909a62 100644 --- a/var/spack/repos/builtin/packages/ghostscript/package.py +++ b/var/spack/repos/builtin/packages/ghostscript/package.py @@ -43,6 +43,7 @@ class Ghostscript(AutotoolsPackage): depends_on('libpng') depends_on('libtiff') depends_on('zlib') + depends_on('libxext') def url_for_version(self, version): baseurl = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs{0}/ghostscript-{1}.tar.gz" -- cgit v1.2.3-70-g09d2 From ffa20d217194a0424bbe2f9383bd878238bbffcb Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Tue, 9 Jan 2018 07:40:09 -0800 Subject: [WIP] Fix git gettext/libintl handling (builds on ubuntu) (#6859) * Fix git on ubuntu, first cut Spack needs to pass information about where the linker can find `libintl`. We're currently using `LDFLAGS` to do so. The `LDFLAGS` info is pasted into the command line upstream of the a file (`libgit.a`) that includes unresolved symbols that need that library. This fails on Ubuntu, although it seems to work on CentOS (see #6841). This change allows git to build on a Ubuntu 16.04.3 droplet. TODO: test on other platforms... * Add a bit of useful commentary --- var/spack/repos/builtin/packages/git/package.py | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index 550d269771..dac49b4500 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -165,13 +165,29 @@ class Git(AutotoolsPackage): depends_on('libtool', type='build') depends_on('m4', type='build') + # See the comment in setup_environment re EXTLIBS. + def patch(self): + filter_file(r'^EXTLIBS =$', + '#EXTLIBS =', + 'Makefile') + def setup_environment(self, spack_env, run_env): - # This is done to avoid failures when git is an external package. + # We use EXTLIBS rather than LDFLAGS so that git's Makefile + # inserts the information into the proper place in the link commands + # (alongside the # other libraries/paths that configure discovers). + # LDFLAGS is inserted *before* libgit.a, which requires libintl. + # EXTFLAGS is inserted *after* libgit.a. + # This depends on the patch method above, which keeps the Makefile + # from stepping on the value that we pass in via the environment. + # + # The test avoids failures when git is an external package. # In that case the node in the DAG gets truncated and git DOES NOT # have a gettext dependency. if 'gettext' in self.spec: - spack_env.append_flags('LDFLAGS', '-L{0} -lintl'.format( + spack_env.append_flags('EXTLIBS', '-L{0} -lintl'.format( self.spec['gettext'].prefix.lib)) + spack_env.append_flags('CFLAGS', '-I{0}'.format( + self.spec['gettext'].prefix.include)) def configure_args(self): spec = self.spec -- cgit v1.2.3-70-g09d2 From 9ef39163d8c94c701aa4aa621866c976bea46100 Mon Sep 17 00:00:00 2001 From: BenBrands Date: Tue, 9 Jan 2018 16:40:27 +0100 Subject: changed url for astyle (#6863) * changed url for astyle * use SourceForge --- var/spack/repos/builtin/packages/astyle/package.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/astyle/package.py b/var/spack/repos/builtin/packages/astyle/package.py index 62e7204168..a9e4e37f33 100644 --- a/var/spack/repos/builtin/packages/astyle/package.py +++ b/var/spack/repos/builtin/packages/astyle/package.py @@ -32,9 +32,9 @@ class Astyle(MakefilePackage): """ homepage = "http://astyle.sourceforge.net/" - # homepage is dead use Gentoo Mirror - # url = "http://downloads.sourceforge.net/project/astyle/astyle/astyle%202.04/astyle_2.04_linux.tar.gz" - url = "http://distfiles.gentoo.org/distfiles/astyle_3.0.1_linux.tar.gz" + url = "https://sourceforge.net/projects/astyle/files/astyle/astyle%203.0.1/astyle_3.0.1_linux.tar.gz" + # Gentoo alternative + # url = "http://distfiles.gentoo.org/distfiles/astyle_3.0.1_linux.tar.gz" maintainers = ['davydden'] -- cgit v1.2.3-70-g09d2 From 2dd0749b5ffdb240924efbfaea682bfb7aae11a4 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Wed, 10 Jan 2018 00:03:31 +0800 Subject: A new package: jbigkit. (#6847) * A new package: jbigkit. * A new package: jbigkit. * Add a new package: jbigkit. --- .../repos/builtin/packages/jbigkit/package.py | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 var/spack/repos/builtin/packages/jbigkit/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/jbigkit/package.py b/var/spack/repos/builtin/packages/jbigkit/package.py new file mode 100644 index 0000000000..4bd1ae3d6c --- /dev/null +++ b/var/spack/repos/builtin/packages/jbigkit/package.py @@ -0,0 +1,54 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Jbigkit(MakefilePackage): + """JBIG-Kit is a software implementation of + the JBIG1 data compression standard.""" + + homepage = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/" + url = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/download/jbigkit-2.1.tar.gz" + + version('2.1', 'ebcf09bed9f14d7fa188d3bd57349522') + version('1.6', 'ce196e45f293d40ba76af3dc981ccfd7') + + build_directory = 'libjbig' + + def edit(self, spec, prefix): + makefile = FileFilter('libjbig/Makefile') + makefile.filter('CC = .*', 'CC = cc') + + def install(self, spec, prefix): + with working_dir(self.build_directory): + mkdir(prefix.include) + for f in ['jbig85.h', 'jbig_ar.h', 'jbig.h']: + install(f, prefix.include) + mkdir(prefix.lib) + for f in ['libjbig85.a', 'libjbig.a']: + install(f, prefix.lib) + mkdir(prefix.bin) + for f in ['tstcodec', 'tstcodec85']: + install(f, prefix.bin) -- cgit v1.2.3-70-g09d2 From 15111177a2a62139d02d9aff257e577fb9cf2fdc Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 9 Jan 2018 12:57:58 -0600 Subject: prodigal: Create new package (#6870) --- .../repos/builtin/packages/prodigal/package.py | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 var/spack/repos/builtin/packages/prodigal/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/prodigal/package.py b/var/spack/repos/builtin/packages/prodigal/package.py new file mode 100644 index 0000000000..b57f712397 --- /dev/null +++ b/var/spack/repos/builtin/packages/prodigal/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Prodigal(MakefilePackage): + """Fast, reliable protein-coding gene prediction for prokaryotic + genomes.""" + + homepage = "https://github.com/hyattpd/Prodigal" + url = "https://github.com/hyattpd/Prodigal/archive/v2.6.3.tar.gz" + + version('2.6.3', '5181809fdb740e9a675cfdbb6c038466') + + def install(self, spec, prefix): + make('INSTALLDIR={0}'.format(self.prefix), 'install') + + def setup_environment(self, spack_env, run_env): + run_env.prepend_path('PATH', prefix) -- cgit v1.2.3-70-g09d2 From f498f52a2d5b14661e908df8fc05d104055ddafa Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Tue, 9 Jan 2018 22:07:05 -0600 Subject: casper: new package (#6873) * casper: create package * jellyfish: added version 2.2.7 * casper: new package * casper: depends on jellyfish 2.2.3 or higher * casper: moved depends_on above install * casper: updated package.py * fixing download url for 1.11.1 * casper: set up environment * casper: add conflicts gcc@7.1.0, cannot install with 7.1.0 * capser: flake8 error corrcted * casper: create package * jellyfish: added version 2.2.7 * casper: new package * casper: depends on jellyfish 2.2.3 or higher * casper: moved depends_on above install * casper: updated package.py * fixing download url for 1.11.1 * casper: set up environment * casper: add conflicts gcc@7.1.0, cannot install with 7.1.0 * capser: flake8 error corrcted --- var/spack/repos/builtin/packages/casper/package.py | 49 ++++++++++++++++++++++ .../repos/builtin/packages/jellyfish/package.py | 7 +++- 2 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 var/spack/repos/builtin/packages/casper/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/casper/package.py b/var/spack/repos/builtin/packages/casper/package.py new file mode 100644 index 0000000000..170bdaecef --- /dev/null +++ b/var/spack/repos/builtin/packages/casper/package.py @@ -0,0 +1,49 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import distutils.dir_util + + +class Casper(MakefilePackage): + """CASPER (Context-Aware Scheme for Paired-End Read) is state-of-the art + merging tool in terms of accuracy and robustness. Using this + sophisticated merging method, we could get elongated reads from the + forward and reverse reads.""" + + homepage = "http://best.snu.ac.kr/casper/index.php?name=main" + url = "http://best.snu.ac.kr/casper/program/casper_v0.8.2.tar.gz" + + version('0.8.2', '9e83d32ff46b876f33eb1d7b545ec9c2') + + depends_on('jellyfish@2.2.3:') + depends_on('boost') + + conflicts('%gcc@7.1.0') + + def install(self, spec, prefix): + distutils.dir_util.copy_tree(".", prefix) + + def setup_environment(self, spack_env, run_env): + run_env.prepend_path('PATH', self.spec.prefix) diff --git a/var/spack/repos/builtin/packages/jellyfish/package.py b/var/spack/repos/builtin/packages/jellyfish/package.py index e6d65838a1..f5e62a828e 100644 --- a/var/spack/repos/builtin/packages/jellyfish/package.py +++ b/var/spack/repos/builtin/packages/jellyfish/package.py @@ -30,9 +30,12 @@ class Jellyfish(AutotoolsPackage): DNA.""" homepage = "http://www.cbcb.umd.edu/software/jellyfish/" - url = "http://www.cbcb.umd.edu/software/jellyfish/jellyfish-1.1.11.tar.gz" + url = "https://github.com/gmarcais/Jellyfish/releases/download/v2.2.7/jellyfish-2.2.7.tar.gz" + list_url = "http://www.cbcb.umd.edu/software/jellyfish/" - version('1.1.11', 'dc994ea8b0896156500ea8c648f24846') + version('2.2.7', 'f741192d9061f28e34cb67c86a1027ab') + version('1.1.11', 'dc994ea8b0896156500ea8c648f24846', + url='http://www.cbcb.umd.edu/software/jellyfish/jellyfish-1.1.11.tar.gz') depends_on('perl', type=('build', 'run')) depends_on('python', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 4d4fc8760d608957163112259bbb5260cd2fcb87 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 10 Jan 2018 06:47:38 -0600 Subject: Fix tests for git package (#6869) --- var/spack/repos/builtin/packages/git/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index dac49b4500..10225f196c 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -208,6 +208,9 @@ class Git(AutotoolsPackage): # Don't link with -lrt; the system has no (and needs no) librt filter_file(r' -lrt$', '', 'Makefile') + def check(self): + make('test') + @run_after('install') def install_completions(self): copy_tree('contrib/completion', self.prefix.share) -- cgit v1.2.3-70-g09d2 From 8555947e05c040cd9a2798f2639f84038c3a58e5 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 10 Jan 2018 06:48:22 -0600 Subject: Explicitly cast Version to str in openfoam-org (#6880) --- var/spack/repos/builtin/packages/openfoam-org/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openfoam-org/package.py b/var/spack/repos/builtin/packages/openfoam-org/package.py index ddae24939b..cbbb45b7f5 100644 --- a/var/spack/repos/builtin/packages/openfoam-org/package.py +++ b/var/spack/repos/builtin/packages/openfoam-org/package.py @@ -207,8 +207,8 @@ class OpenfoamOrg(Package): edits = { 'WM_THIRD_PARTY_DIR': r'$WM_PROJECT_DIR/ThirdParty #SPACK: No separate third-party', - 'WM_VERSION': self.version, # consistency - 'FOAMY_HEX_MESH': '', # This is horrible (unset variable?) + 'WM_VERSION': str(self.version), # consistency + 'FOAMY_HEX_MESH': '', # This is horrible (unset variable?) } rewrite_environ_files( # Adjust etc/bashrc and etc/cshrc edits, -- cgit v1.2.3-70-g09d2 From ac5b5724c6d42f19814dd97c2a3936d90f2a1c24 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Wed, 10 Jan 2018 23:35:00 +0800 Subject: Add a new package: unblur. (#6867) * Add a new package: unblur. * Add a new package: unblur. * Add a new package: unblur. * Add a new package: unblur. Conflicts: var/spack/repos/builtin/packages/unblur/package.py * Add a new package: unblur. --- var/spack/repos/builtin/packages/unblur/package.py | 72 ++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 var/spack/repos/builtin/packages/unblur/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/unblur/package.py b/var/spack/repos/builtin/packages/unblur/package.py new file mode 100644 index 0000000000..0b971d756d --- /dev/null +++ b/var/spack/repos/builtin/packages/unblur/package.py @@ -0,0 +1,72 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Unblur(AutotoolsPackage): + """Unblur is used to align the frames of movies recorded on an electron + microscope to reduce image blurring due to beam-induced motion.""" + + homepage = "http://grigoriefflab.janelia.org/unblur" + url = "http://grigoriefflab.janelia.org/sites/default/files/unblur_1.0.2.tar.gz" + + version('1.0.2', 'b6e367061cd0cef1b62a391a6289f681') + + variant('openmp', default=True, description='Enable OpenMP support') + variant('shared', default=True, description='Dynamic linking') + + depends_on('zlib') + depends_on('jpeg') + depends_on('libtiff') + depends_on('gsl') + depends_on('jbigkit') + depends_on('fftw@3:') + # Requires Intel Fortran compiler + conflicts('%gcc') + conflicts('%pgi') + conflicts('%clang') + conflicts('%cce') + conflicts('%xl') + conflicts('%xl_r') + conflicts('%nag') + + configure_directory = 'src' + + def patch(self): + filter_file(r'<<<<<<<.*', '', 'src/missing') + + def configure_args(self): + spec = self.spec + return ['FC=ifort', + 'F77=ifort', + '--enable-static={0}' + .format('yes' if '~shared' in spec else 'no'), + '--enable-openmp={0}' + .format('yes' if '+openmp' in spec else 'no'), + '--enable-optimisations=yes'] + + def build(self, spec, prefix): + with working_dir('src'): + make(parallel=False) -- cgit v1.2.3-70-g09d2 From 77a29f09f99ba4f0e6f628404bf03876602e27ce Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Wed, 10 Jan 2018 07:44:35 -0800 Subject: emacs: on darwin, do not build Cocoa app (#6882) Building emacs on darwin throws an error when trying to build an Emacs app in the nextstep/Emacs.app path of the build tree. For now, disable building this app. It's possible to enable building the app also; Homebrew offers options to this effect, and also adds Mac-specific options for starting the emacs daemon. However, for the sake of simplicity and getting a workable up-to-date emacs installation on my machine as quickly as possible, this commit focuses on a minimal viable modification. --- var/spack/repos/builtin/packages/emacs/package.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/emacs/package.py b/var/spack/repos/builtin/packages/emacs/package.py index 21b6b1b17b..e654e9c9c7 100644 --- a/var/spack/repos/builtin/packages/emacs/package.py +++ b/var/spack/repos/builtin/packages/emacs/package.py @@ -24,6 +24,8 @@ ############################################################################## from spack import * +import sys + class Emacs(AutotoolsPackage): """The Emacs programmable text editor.""" @@ -72,4 +74,9 @@ class Emacs(AutotoolsPackage): else: args = ['--without-x'] + # On OS X/macOS, do not build "nextstep/Emacs.app", because + # doing so throws an error at build-time + if sys.platform == 'darwin': + args.append('--without-ns') + return args -- cgit v1.2.3-70-g09d2 From b733ce1e5f7dfcb1f984ab786fb412f1baa7ad66 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Wed, 10 Jan 2018 23:45:05 +0800 Subject: bcftools is a AutotoolsPackage. (#6881) --- var/spack/repos/builtin/packages/bcftools/package.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bcftools/package.py b/var/spack/repos/builtin/packages/bcftools/package.py index b1cccc1f21..353b574ff9 100644 --- a/var/spack/repos/builtin/packages/bcftools/package.py +++ b/var/spack/repos/builtin/packages/bcftools/package.py @@ -25,7 +25,7 @@ from spack import * -class Bcftools(Package): +class Bcftools(AutotoolsPackage): """BCFtools is a set of utilities that manipulate variant calls in the Variant Call Format (VCF) and its binary counterpart BCF. All commands work transparently with both VCFs and BCFs, both @@ -43,7 +43,3 @@ class Bcftools(Package): depends_on('htslib@1.4', when='@1.4') depends_on('htslib@1.3.1', when='@1.3.1') depends_on('htslib@1.2', when='@1.2') - - def install(self, spec, prefix): - make("prefix=%s" % prefix, "all") - make("prefix=%s" % prefix, "install") -- cgit v1.2.3-70-g09d2 From c1117f05934f76da72652d574aa240245d4724ff Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 10 Jan 2018 09:45:34 -0600 Subject: opa-psm2: new package (#6874) * opa-psm2: new package * opa-psm2: installs now. think the module file needs work * opa-psm2: module file seems good now * opa-psm2: remove fixme * opa-psm2: flake8 fixes * opa-psm2: removing unnecessary make in install phase --- .../repos/builtin/packages/opa-psm2/package.py | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 var/spack/repos/builtin/packages/opa-psm2/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/opa-psm2/package.py b/var/spack/repos/builtin/packages/opa-psm2/package.py new file mode 100644 index 0000000000..be49f676b0 --- /dev/null +++ b/var/spack/repos/builtin/packages/opa-psm2/package.py @@ -0,0 +1,54 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class OpaPsm2(MakefilePackage): + """ Intel Omni-Path Performance Scaled Messaging 2 (PSM2) library""" + + homepage = "http://github.com/01org/opa-psm2" + url = "https://github.com/01org/opa-psm2/archive/PSM2_10.3-8.tar.gz" + + version('10.3-37', '9bfca04f29b937b3856f893e1f8b1b60') + version('10.3-17', 'e7263eb449939cb87612e2c7623ca21c') + version('10.3-10', '59d36b49eb126f980f3272a9d66a8e98') + version('10.3-8', '07bc5cb2a6bf1189a29cbea836843db2') + version('10.2-260', '71df31b5776be64ff243417ac88eec66') + version('10.2-235', '23539f725a597bf2d35aac47a793a37b') + version('10.2-175', 'c542b8641ad573f08f61d0a6a70f4013') + + depends_on('numactl') + + def setup_environment(self, spack_env, run_env): + spack_env.set('DESTDIR', self.prefix) + run_env.prepend_path('CPATH', + join_path(self.prefix, 'usr', 'include')) + run_env.prepend_path('LIBRARY_PATH', + join_path(self.prefix, 'usr', 'lib64')) + run_env.prepend_path('LD_LIBRARY_PATH', + join_path(self.prefix, 'usr', 'lib64')) + + def install(self, spec, prefix): + make('--environment-overrides', 'install') -- cgit v1.2.3-70-g09d2 From ab4e20a49c989defdbb6951660bb038240977edc Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 10 Jan 2018 09:47:33 -0600 Subject: Older versions of libiconv don't work with newer versions of GCC (#6829) --- var/spack/repos/builtin/packages/libiconv/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libiconv/package.py b/var/spack/repos/builtin/packages/libiconv/package.py index 1e3d29a4df..bf0ee46b2d 100644 --- a/var/spack/repos/builtin/packages/libiconv/package.py +++ b/var/spack/repos/builtin/packages/libiconv/package.py @@ -40,6 +40,8 @@ class Libiconv(AutotoolsPackage): # of C11 any more and thus might not exist. patch('gets.patch', when='@1.14') + conflicts('@1.14', when='%gcc@5:') + def configure_args(self): args = ['--enable-extra-encodings'] -- cgit v1.2.3-70-g09d2 From db42d080f714e1d45b899dcc41b6cf8a341e13f7 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 10 Jan 2018 09:48:15 -0600 Subject: Geant4: fix qt dependency (#6828) --- var/spack/repos/builtin/packages/geant4/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/geant4/package.py b/var/spack/repos/builtin/packages/geant4/package.py index 2b935673c4..d6391eb688 100644 --- a/var/spack/repos/builtin/packages/geant4/package.py +++ b/var/spack/repos/builtin/packages/geant4/package.py @@ -40,7 +40,7 @@ class Geant4(CMakePackage): version('10.02.p01', 'b81f7082a15f6a34b720b6f15c6289cfe4ddbbbdcef0dc52719f71fac95f7f1c') version('10.01.p03', '4fb4175cc0dabcd517443fbdccd97439') - variant('qt', default=True, description='Enable Qt support') + variant('qt', default=False, description='Enable Qt support') depends_on('cmake@3.5:', type='build') @@ -51,7 +51,7 @@ class Geant4(CMakePackage): depends_on("zlib") depends_on("vecgeom") depends_on("xerces-c") - depends_on("qt@4.8:", when="+qt") + depends_on("qt@4.8:4.999", when="+qt") def cmake_args(self): spec = self.spec -- cgit v1.2.3-70-g09d2 From 8a7525064d4d31bd830835d42d81c5724c2c4b4a Mon Sep 17 00:00:00 2001 From: stefanosoffia Date: Wed, 10 Jan 2018 18:02:07 +0100 Subject: Updated i3 dependencies. (#6885) --- var/spack/repos/builtin/packages/cairo/package.py | 1 + var/spack/repos/builtin/packages/gdbm/package.py | 1 + var/spack/repos/builtin/packages/glib/package.py | 1 + var/spack/repos/builtin/packages/i3/package.py | 1 + var/spack/repos/builtin/packages/pango/package.py | 1 + var/spack/repos/builtin/packages/pcre/package.py | 1 + var/spack/repos/builtin/packages/pkgconf/package.py | 1 + 7 files changed, 7 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cairo/package.py b/var/spack/repos/builtin/packages/cairo/package.py index 98ae87acdb..0ced1e221e 100644 --- a/var/spack/repos/builtin/packages/cairo/package.py +++ b/var/spack/repos/builtin/packages/cairo/package.py @@ -31,6 +31,7 @@ class Cairo(AutotoolsPackage): homepage = "http://cairographics.org" url = "http://cairographics.org/releases/cairo-1.14.8.tar.xz" + version('1.14.12', '490025a0ba0622a853010f49fb6343f29fb70b9b') version('1.14.8', 'c6f7b99986f93c9df78653c3e6a3b5043f65145e') version('1.14.0', '53cf589b983412ea7f78feee2e1ba9cea6e3ebae') diff --git a/var/spack/repos/builtin/packages/gdbm/package.py b/var/spack/repos/builtin/packages/gdbm/package.py index 1e4a4831b7..a1529855c3 100644 --- a/var/spack/repos/builtin/packages/gdbm/package.py +++ b/var/spack/repos/builtin/packages/gdbm/package.py @@ -35,6 +35,7 @@ class Gdbm(AutotoolsPackage): homepage = "http://www.gnu.org.ua/software/gdbm/gdbm.html" url = "http://ftp.gnu.org/gnu/gdbm/gdbm-1.13.tar.gz" + version('1.14.1', 'c2ddcb3897efa0f57484af2bd4f4f848') version('1.13', '8929dcda2a8de3fd2367bdbf66769376') version('1.12', '9ce96ff4c99e74295ea19040931c8fb9') version('1.11', '72c832680cf0999caedbe5b265c8c1bd') diff --git a/var/spack/repos/builtin/packages/glib/package.py b/var/spack/repos/builtin/packages/glib/package.py index 50c0559bce..df73bd5eb3 100644 --- a/var/spack/repos/builtin/packages/glib/package.py +++ b/var/spack/repos/builtin/packages/glib/package.py @@ -34,6 +34,7 @@ class Glib(AutotoolsPackage): homepage = "https://developer.gnome.org/glib/" url = "https://ftp.gnome.org/pub/gnome/sources/glib/2.53/glib-2.53.1.tar.xz" + version('2.55.1', '9cbb6b3c7e75ba75575588497c7707b6') version('2.53.1', '3362ef4da713f834ea26904caf3a75f5') version('2.49.7', '397ead3fcf325cb921d54e2c9e7dfd7a') version('2.49.4', 'e2c87c03017b0cd02c4c73274b92b148') diff --git a/var/spack/repos/builtin/packages/i3/package.py b/var/spack/repos/builtin/packages/i3/package.py index 44dbbf7111..cf9380919d 100644 --- a/var/spack/repos/builtin/packages/i3/package.py +++ b/var/spack/repos/builtin/packages/i3/package.py @@ -40,6 +40,7 @@ class I3(AutotoolsPackage): depends_on('automake', type='build') depends_on('libtool', type='build') depends_on('m4', type='build') + depends_on('pkg-config', type='build') depends_on('libev') depends_on('startup-notification') diff --git a/var/spack/repos/builtin/packages/pango/package.py b/var/spack/repos/builtin/packages/pango/package.py index c4989063c4..76d82350a5 100644 --- a/var/spack/repos/builtin/packages/pango/package.py +++ b/var/spack/repos/builtin/packages/pango/package.py @@ -35,6 +35,7 @@ class Pango(AutotoolsPackage): list_url = "http://ftp.gnome.org/pub/gnome/sources/pango/" list_depth = 1 + version('1.41.0', '1f76ef95953dc58ee5d6a53e5f1cb6db913f3e0eb489713ee9266695cae580ba') version('1.40.3', 'abba8b5ce728520c3a0f1535eab19eac3c14aeef7faa5aded90017ceac2711d3') version('1.40.1', 'e27af54172c72b3ac6be53c9a4c67053e16c905e02addcf3a603ceb2005c1a40') version('1.36.8', '18dbb51b8ae12bae0ab7a958e7cf3317c9acfc8a1e1103ec2f147164a0fc2d07') diff --git a/var/spack/repos/builtin/packages/pcre/package.py b/var/spack/repos/builtin/packages/pcre/package.py index 213a49f731..394b1aa5d3 100644 --- a/var/spack/repos/builtin/packages/pcre/package.py +++ b/var/spack/repos/builtin/packages/pcre/package.py @@ -33,6 +33,7 @@ class Pcre(AutotoolsPackage): homepage = "http://www.pcre.org" url = "https://ftp.pcre.org/pub/pcre/pcre-8.40.tar.bz2" + version('8.41', 'c160d22723b1670447341b08c58981c1') version('8.40', '41a842bf7dcecd6634219336e2167d1d') version('8.39', 'e3fca7650a0556a2647821679d81f585') version('8.38', '00aabbfe56d5a48b270f999b508c5ad2') diff --git a/var/spack/repos/builtin/packages/pkgconf/package.py b/var/spack/repos/builtin/packages/pkgconf/package.py index fa1bdf3566..5ed5bf4c7e 100644 --- a/var/spack/repos/builtin/packages/pkgconf/package.py +++ b/var/spack/repos/builtin/packages/pkgconf/package.py @@ -34,6 +34,7 @@ class Pkgconf(AutotoolsPackage): homepage = "http://pkgconf.org/" url = "https://distfiles.dereferenced.org/pkgconf/pkgconf-1.3.10.tar.xz" + version('1.4.0', 'c509c0dad5a70aa4bc3210557b7eafce') version('1.3.10', '9b63707bf6f8da6efb3868101d7525fe') version('1.3.8', '484ba3360d983ce07416843d5bc916a8') -- cgit v1.2.3-70-g09d2 From da01c8a541164efea01660bab5d76e66cae94b3e Mon Sep 17 00:00:00 2001 From: jkelling Date: Wed, 10 Jan 2018 19:28:32 +0100 Subject: package libharu: Add build deps (#6883) ... libtool,autoconf,automake --- var/spack/repos/builtin/packages/libharu/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libharu/package.py b/var/spack/repos/builtin/packages/libharu/package.py index 7e0e049f98..a647883538 100644 --- a/var/spack/repos/builtin/packages/libharu/package.py +++ b/var/spack/repos/builtin/packages/libharu/package.py @@ -40,6 +40,9 @@ class Libharu(AutotoolsPackage): version('master', branch='master', git='https://github.com/libharu/libharu.git') + depends_on('libtool', type=('build')) + depends_on('autoconf', type=('build')) + depends_on('automake', type=('build')) depends_on('libpng') depends_on('zlib') -- cgit v1.2.3-70-g09d2 From d07b83237daaee848f7750b7a70af0f7e86d0813 Mon Sep 17 00:00:00 2001 From: snehring Date: Wed, 10 Jan 2018 20:40:41 -0600 Subject: discovardenovo: adding new package (#6888) --- .../builtin/packages/discovardenovo/package.py | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 var/spack/repos/builtin/packages/discovardenovo/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/discovardenovo/package.py b/var/spack/repos/builtin/packages/discovardenovo/package.py new file mode 100644 index 0000000000..673d75be04 --- /dev/null +++ b/var/spack/repos/builtin/packages/discovardenovo/package.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Discovardenovo(AutotoolsPackage): + """DISCOVAR de novo is a large (and small) de novo genome assembler. + It quickly generates highly accurate and complete assemblies using the + same single library data as used by DISCOVAR. It currently doesn't + support variant calling, for that, please use DISCOVAR instead.""" + + homepage = "https://software.broadinstitute.org/software/discovar/blog/" + url = "ftp://ftp.broadinstitute.org/pub/crd/DiscovarDeNovo/latest_source_code/discovardenovo-52488.tar.gz" + + version('52488', '2b08c77b1b998d85be8048e5efb10358') + + # lots of compiler errors with GCC7, works with 4.8.5 + # and devs claim it works with 4.7 so I'm assuming 4.7-4.8'll work + conflicts('%gcc@5:') + conflicts('%gcc@:4.7.0') + + depends_on('samtools') + depends_on('jemalloc') -- cgit v1.2.3-70-g09d2 From 384b8f43a2fd9b4c5e5b0028b68de8d751aaac8e Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Wed, 10 Jan 2018 23:12:35 -0600 Subject: r-rmarkdown: Update version to 1.7 (#6506) * r-rmarkdown: Update version to 1.7 * r-rmarkdown: add version constraints. --- var/spack/repos/builtin/packages/r-rmarkdown/package.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-rmarkdown/package.py b/var/spack/repos/builtin/packages/r-rmarkdown/package.py index 1910aa043a..49841d213e 100644 --- a/var/spack/repos/builtin/packages/r-rmarkdown/package.py +++ b/var/spack/repos/builtin/packages/r-rmarkdown/package.py @@ -33,12 +33,16 @@ class RRmarkdown(RPackage): url = "https://cran.r-project.org/src/contrib/rmarkdown_1.0.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/rmarkdown" + version('1.7', '477c50840581ba7947b3d905c67a511b') version('1.0', '264aa6a59e9680109e38df8270e14c58') - depends_on('r-knitr', type=('build', 'run')) - depends_on('r-yaml', type=('build', 'run')) - depends_on('r-htmltools', type=('build', 'run')) - depends_on('r-catools', type=('build', 'run')) - depends_on('r-evaluate', type=('build', 'run')) + depends_on('r-knitr@1.14:', type=('build', 'run')) + depends_on('r-yaml@2.1.5:', type=('build', 'run')) + depends_on('r-htmltools@0.3.5:', type=('build', 'run')) + depends_on('r-evaluate@0.8:', type=('build', 'run')) depends_on('r-base64enc', type=('build', 'run')) depends_on('r-jsonlite', type=('build', 'run')) + depends_on('r-rprojroot', type=('build', 'run')) + depends_on('r-mime', type=('build', 'run')) + depends_on('r-stringr@1.2.0:', type=('build', 'run')) + depends_on('r@3.0:') -- cgit v1.2.3-70-g09d2 From d2eecf5774d3e97f0db80273c4728f8204d0db0e Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Wed, 10 Jan 2018 23:12:54 -0600 Subject: r-rprojroot: Create new package. (#6505) * r-rprojroot: Create new package. * r-rprojroot: add version constraints. * r-rprojroot: Add list_url. --- .../repos/builtin/packages/r-rprojroot/package.py | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-rprojroot/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-rprojroot/package.py b/var/spack/repos/builtin/packages/r-rprojroot/package.py new file mode 100644 index 0000000000..75e8930679 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-rprojroot/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RRprojroot(RPackage): + """Robust, reliable and flexible paths to files below a project root. + The 'root' of a project is defined as a directory that matches a + certain criterion, e.g., it contains a certain regular file.""" + + homepage = "https://cran.r-project.org/package=rprojroot" + url = "https://cran.rstudio.com/src/contrib/rprojroot_1.2.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/rprojroot" + + version('1.2', 'c1a0574aaac2a43a72f804abbaea19c3') + + depends_on('r-backports', type=('build', 'run')) + depends_on('r@3.0.0:') -- cgit v1.2.3-70-g09d2 From 88d9e6bd216bee0c78f437bdf15362efbebe2e0b Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Wed, 10 Jan 2018 23:13:12 -0600 Subject: r-bookdown: Create new package. (#6504) * r-bookdown: Create new package. * r-bookdown: add version constraints. --- .../repos/builtin/packages/r-bookdown/package.py | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-bookdown/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-bookdown/package.py b/var/spack/repos/builtin/packages/r-bookdown/package.py new file mode 100644 index 0000000000..c722c9ffac --- /dev/null +++ b/var/spack/repos/builtin/packages/r-bookdown/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RBookdown(RPackage): + """Output formats and utilities for authoring books and technical + documents with R Markdown.""" + + homepage = "https://cran.r-project.org/package=bookdown" + url = "https://cran.rstudio.com/src/contrib/bookdown_0.5.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/bookdown" + + version('0.5', '7bad360948e2b22d28397870b9319f17') + + depends_on('r-yaml@2.1.14:', type=('build', 'run')) + depends_on('r-rmarkdown@1.5:', type=('build', 'run')) + depends_on('r-knitr@1.16:', type=('build', 'run')) + depends_on('r-htmltools@0.3.6:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 637165eef82d40abc240b1dc40edddabecbb6af3 Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Wed, 10 Jan 2018 23:13:31 -0600 Subject: r-biocstyle: Create new package. (#6503) * r-biocstyle: Create new package. * r-biocstyle: add version constraints. --- .../repos/builtin/packages/r-biocstyle/package.py | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-biocstyle/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-biocstyle/package.py b/var/spack/repos/builtin/packages/r-biocstyle/package.py new file mode 100644 index 0000000000..43700bb717 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-biocstyle/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RBiocstyle(RPackage): + """Provides standard formatting styles for Bioconductor PDF and HTML + documents. Package vignettes illustrate use and functionality.""" + + homepage = "https://www.bioconductor.org/packages/BiocStyle/" + url = "https://git.bioconductor.org/packages/BiocStyle" + + version('2.4.1', git='https://git.bioconductor.org/packages/BiocStyle', commit='ef10764b68ac23a3a7a8ec3b6a6436187309c138') + + depends_on('r-bookdown', type=('build', 'run')) + depends_on('r-knitr@1.12:', type=('build', 'run')) + depends_on('r-rmarkdown@1.2:', type=('build', 'run')) + depends_on('r-yaml', type=('build', 'run')) + depends_on('r@3.4.0:3.4.9', when='@2.4.1') -- cgit v1.2.3-70-g09d2 From 5d49fe4b4c3225efc33c5b9ca78db10df45ea673 Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Thu, 11 Jan 2018 07:51:14 -0800 Subject: fix ips 2018 vtune directory name (#6893) --- var/spack/repos/builtin/packages/intel-parallel-studio/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py index fefda18e18..ccfac3c9a9 100644 --- a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py +++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py @@ -341,7 +341,7 @@ class IntelParallelStudio(IntelPackage): # Intel(R) VTune(TM) Amplifier XE if '+vtune' in spec: - components.append('intel-vtune-amplifier-xe') + components.append('intel-vtune-amplifier') return components @@ -397,6 +397,9 @@ class IntelParallelStudio(IntelPackage): if '+vtune' in spec: vtune_dir = 'vtune_amplifier_xe/licenses' + if year >= 2018: + vtune_dir = 'vtune_amplifier/licenses' + directories.append(vtune_dir) return [os.path.join(dir, 'license.lic') for dir in directories] -- cgit v1.2.3-70-g09d2 From 5dd7baa61db49df86190f5773e1153e4f458125b Mon Sep 17 00:00:00 2001 From: stefanosoffia Date: Thu, 11 Jan 2018 17:06:53 +0100 Subject: Updated misc devel tools. (#6897) --- var/spack/repos/builtin/packages/bash-completion/package.py | 1 + var/spack/repos/builtin/packages/bash/package.py | 1 + var/spack/repos/builtin/packages/binutils/package.py | 1 + var/spack/repos/builtin/packages/cmake/package.py | 1 + var/spack/repos/builtin/packages/gdb/package.py | 1 + var/spack/repos/builtin/packages/texinfo/package.py | 1 + var/spack/repos/builtin/packages/valgrind/package.py | 3 ++- 7 files changed, 8 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bash-completion/package.py b/var/spack/repos/builtin/packages/bash-completion/package.py index 2e59e6247e..3aff5bf426 100644 --- a/var/spack/repos/builtin/packages/bash-completion/package.py +++ b/var/spack/repos/builtin/packages/bash-completion/package.py @@ -30,6 +30,7 @@ class BashCompletion(AutotoolsPackage): homepage = "https://github.com/scop/bash-completion" url = "https://github.com/scop/bash-completion/archive/2.3.tar.gz" + version('2.7', 'f72c9e2e877d188c3159956a3496a450e7279b76') version('2.3', '67e50f5f3c804350b43f2b664c33dde811d24292') version('develop', git='https://github.com/scop/bash-completion.git') diff --git a/var/spack/repos/builtin/packages/bash/package.py b/var/spack/repos/builtin/packages/bash/package.py index 0ee757b2bd..dfaf7d4654 100644 --- a/var/spack/repos/builtin/packages/bash/package.py +++ b/var/spack/repos/builtin/packages/bash/package.py @@ -31,6 +31,7 @@ class Bash(AutotoolsPackage): homepage = "https://www.gnu.org/software/bash/" url = "https://ftp.gnu.org/gnu/bash/bash-4.4.tar.gz" + version('4.4.12', '7c112970cbdcadfc331e10eeb5f6aa41') version('4.4', '148888a7c95ac23705559b6f477dfe25') version('4.3', '81348932d5da294953e15d4814c74dd1') diff --git a/var/spack/repos/builtin/packages/binutils/package.py b/var/spack/repos/builtin/packages/binutils/package.py index c3c521bad8..fde3810216 100644 --- a/var/spack/repos/builtin/packages/binutils/package.py +++ b/var/spack/repos/builtin/packages/binutils/package.py @@ -31,6 +31,7 @@ class Binutils(AutotoolsPackage): homepage = "http://www.gnu.org/software/binutils/" url = "https://ftp.gnu.org/gnu/binutils/binutils-2.28.tar.bz2" + version('2.29.1', '9af59a2ca3488823e453bb356fe0f113') version('2.28', '9e8340c96626b469a603c15c9d843727') version('2.27', '2869c9bf3e60ee97c74ac2a6bf4e9d68') version('2.26', '64146a0faa3b411ba774f47d41de239f') diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index 74801dd1c5..f6b6bf07d0 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -33,6 +33,7 @@ class Cmake(Package): list_url = 'https://cmake.org/files/' list_depth = 1 + version('3.10.1', '9a726e5ec69618b172aa4b06d18c3998') version('3.10.0', 'f3f8e70ca3055f3cd288f89ff233057e') version('3.9.4', '33769e001bdcd788f565bf378692e5ae') version('3.9.0', '180e23b4c9b55915d271b315297f6951') diff --git a/var/spack/repos/builtin/packages/gdb/package.py b/var/spack/repos/builtin/packages/gdb/package.py index 29b17dfe74..b5d64c70ee 100644 --- a/var/spack/repos/builtin/packages/gdb/package.py +++ b/var/spack/repos/builtin/packages/gdb/package.py @@ -34,6 +34,7 @@ class Gdb(Package): homepage = "https://www.gnu.org/software/gdb" url = "http://ftp.gnu.org/gnu/gdb/gdb-7.10.tar.gz" + version('8.0.1', 'bb45869f8126a84ea2ba13a8c0e7c90e') version('8.0', '9bb49d134916e73b2c01d01bf20363df') version('7.12.1', '06c8f40521ed65fe36ebc2be29b56942') version('7.11', 'f585059252836a981ea5db9a5f8ce97f') diff --git a/var/spack/repos/builtin/packages/texinfo/package.py b/var/spack/repos/builtin/packages/texinfo/package.py index 47d65bcc80..f9448d9bf0 100644 --- a/var/spack/repos/builtin/packages/texinfo/package.py +++ b/var/spack/repos/builtin/packages/texinfo/package.py @@ -36,6 +36,7 @@ class Texinfo(AutotoolsPackage): homepage = "https://www.gnu.org/software/texinfo/" url = "http://ftp.gnu.org/gnu/texinfo/texinfo-6.0.tar.gz" + version('6.5', '94e8f7149876793030e5518dd8d6e956') version('6.3', '9b08daca9bf8eccae9b0f884aba41f9e') version('6.0', 'e1a2ef5dce5018b53f0f6eed45b247a7') version('5.2', '1b8f98b80a8e6c50422125e07522e8db') diff --git a/var/spack/repos/builtin/packages/valgrind/package.py b/var/spack/repos/builtin/packages/valgrind/package.py index b950e1cffd..dfd30dd9ad 100644 --- a/var/spack/repos/builtin/packages/valgrind/package.py +++ b/var/spack/repos/builtin/packages/valgrind/package.py @@ -38,8 +38,9 @@ class Valgrind(AutotoolsPackage): """ homepage = "http://valgrind.org/" - url = "http://valgrind.org/downloads/valgrind-3.11.0.tar.bz2" + url = "https://sourceware.org/pub/valgrind/valgrind-3.13.0.tar.bz2" + version('3.13.0', '817dd08f1e8a66336b9ff206400a5369') version('3.12.0', '6eb03c0c10ea917013a7622e483d61bb') version('3.11.0', '4ea62074da73ae82e0162d6550d3f129') version('3.10.1', '60ddae962bc79e7c95cfc4667245707f') -- cgit v1.2.3-70-g09d2 From 070bcab7f2655b110447bb3b97e8733d98742e74 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Thu, 11 Jan 2018 17:19:44 +0100 Subject: libbson, libmongoc: Update to 1.9.1 (#6900) --- var/spack/repos/builtin/packages/libbson/package.py | 3 +++ var/spack/repos/builtin/packages/libmongoc/package.py | 3 +++ 2 files changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libbson/package.py b/var/spack/repos/builtin/packages/libbson/package.py index d33ad3a430..98963c1973 100644 --- a/var/spack/repos/builtin/packages/libbson/package.py +++ b/var/spack/repos/builtin/packages/libbson/package.py @@ -32,6 +32,9 @@ class Libbson(AutotoolsPackage): homepage = "https://github.com/mongodb/libbson" url = "https://github.com/mongodb/libbson/releases/download/1.7.0/libbson-1.7.0.tar.gz" + maintainers = ['michaelkuhn'] + + version('1.9.1', 'f91f59fc5a0cbba94d4d32dad1bd0cfd') version('1.8.1', '42601455cf7f450b46f62c4e6115c440') version('1.8.0', '8b3c64570eec721f951831958e707a5a') version('1.7.0', 'e196ad77dd8458ebc1166e6135030b63') diff --git a/var/spack/repos/builtin/packages/libmongoc/package.py b/var/spack/repos/builtin/packages/libmongoc/package.py index 8df14af2c3..4e05b22241 100644 --- a/var/spack/repos/builtin/packages/libmongoc/package.py +++ b/var/spack/repos/builtin/packages/libmongoc/package.py @@ -31,6 +31,9 @@ class Libmongoc(AutotoolsPackage): homepage = "https://github.com/mongodb/mongo-c-driver" url = "https://github.com/mongodb/mongo-c-driver/releases/download/1.7.0/mongo-c-driver-1.7.0.tar.gz" + maintainers = ['michaelkuhn'] + + version('1.9.1', '86f98ace1a5f073eea6875a96761b198') version('1.8.1', '52d54a4107a2da20c1a1b28bc1ff9d44') version('1.8.0', '8c271a16ff30f6d4f5e134f699f7360f') version('1.7.0', '21acf3584e92631422bc91e9e3cf4f76') -- cgit v1.2.3-70-g09d2 From 9e3f8c0d79d6f2c02f63599cf58527d596e1a445 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Fri, 12 Jan 2018 21:50:07 +0800 Subject: A new package: ethminer. (#6908) --- .../repos/builtin/packages/ethminer/package.py | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 var/spack/repos/builtin/packages/ethminer/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ethminer/package.py b/var/spack/repos/builtin/packages/ethminer/package.py new file mode 100644 index 0000000000..48ff980d0a --- /dev/null +++ b/var/spack/repos/builtin/packages/ethminer/package.py @@ -0,0 +1,54 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Ethminer(CMakePackage): + """The ethminer is an Ethereum GPU mining worker.""" + + homepage = "https://github.com/ethereum-mining/ethminer" + url = "https://github.com/ethereum-mining/ethminer/archive/v0.12.0.tar.gz" + + version('0.12.0', '1c7e3df8476a146702a4050ad984ae5a') + + variant('opencl', default=True, description='Enable OpenCL mining.') + variant('cuda', default=False, description='Enable CUDA mining.') + variant('stratum', default=True, + description='Build with Stratum protocol support.') + + depends_on('python') + depends_on('boost') + depends_on('json-c') + depends_on('curl') + depends_on('zlib') + depends_on('cuda', when='+cuda') + depends_on('mesa', when='+opencl') + + def cmake_args(self): + spec = self.spec + return [ + '-DETHASHCL=%s' % ('YES' if '+opencl' in spec else 'NO'), + '-DETHASHCUDA=%s' % ('YES' if '+cuda' in spec else 'NO'), + '-DETHSTRATUM=%s' % ('YES' if '+stratum' in spec else 'NO')] -- cgit v1.2.3-70-g09d2 From 761b8f76d24ad7b5b58945477a35aaece41d5424 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Fri, 12 Jan 2018 15:27:52 -0800 Subject: coinhsl: add version 2014.01.10 (#6909) * coinhsl: add version 2014.01.10 (stable) * coinhsl: make 2014.01.10 preferred version Make Harwell Subroutines Library for IPOPT version 2014.01.10 the preferred version because it is the latest stable version released. * coinhsl: add option to link w/ BLAS libraries --- var/spack/repos/builtin/packages/coinhsl/package.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/coinhsl/package.py b/var/spack/repos/builtin/packages/coinhsl/package.py index adc2a29512..b81feb326a 100644 --- a/var/spack/repos/builtin/packages/coinhsl/package.py +++ b/var/spack/repos/builtin/packages/coinhsl/package.py @@ -45,6 +45,21 @@ class Coinhsl(AutotoolsPackage): url = "file://{0}/coinhsl-archive-2014.01.17.tar.gz".format(os.getcwd()) version('2014.01.17', '9eb3dd40ed034814ed8dfee75b281180c1d9d2ae') + version('2014.01.10', '7c2be60a3913b406904c66ee83acdbd0709f229b652c4e39ee5d0876f6b2e907', + preferred=True) # CoinHSL fails to build in parallel parallel = False + + variant('blas', default=False, description='Link to external BLAS library') + + depends_on('blas', when='+blas') + + def configure_args(self): + spec = self.spec + args = [] + + if spec.satisfies('+blas'): + args.append('--with-blas={0}'.format(spec['blas'].libs.ld_flags)) + + return args -- cgit v1.2.3-70-g09d2 From 278901c02cd51b5d89febbb57d5b04157ea54488 Mon Sep 17 00:00:00 2001 From: scheibelp Date: Fri, 12 Jan 2018 19:02:54 -0800 Subject: Handle test dependencies that are python extensions (#6904) See #6794 This fixes cases where test-only dependencies were omitted from consideration when modifying the environment at build time. This includes an update to the python package definition to add testing-related python extensions to its specialized environment setup. --- lib/spack/spack/build_environment.py | 3 ++- var/spack/repos/builtin/packages/python/package.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py index cb3bc6169e..dcc6e46ec6 100644 --- a/lib/spack/spack/build_environment.py +++ b/lib/spack/spack/build_environment.py @@ -581,7 +581,8 @@ def setup_package(pkg, dirty): # traverse in postorder so package can use vars from its dependencies spec = pkg.spec - for dspec in pkg.spec.traverse(order='post', root=False, deptype='build'): + for dspec in pkg.spec.traverse(order='post', root=False, + deptype=('build', 'test')): # If a user makes their own package repo, e.g. # spack.repos.mystuff.libelf.Libelf, and they inherit from # an existing class like spack.repos.original.libelf.Libelf, diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 37ef38697e..8df3eb86fa 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -509,7 +509,7 @@ class Python(AutotoolsPackage): python_paths = [] for d in dependent_spec.traverse( - deptype=('build', 'run'), deptype_query='run'): + deptype=('build', 'run', 'test')): if d.package.extends(self.spec): python_paths.append(join_path(d.prefix, self.site_packages_dir)) -- cgit v1.2.3-70-g09d2 From 715a1736884525aa175b00a48750c56879bcba04 Mon Sep 17 00:00:00 2001 From: healther Date: Sat, 13 Jan 2018 15:44:43 +0100 Subject: Update py-elephant to 0.4.1 (#6917) --- var/spack/repos/builtin/packages/py-elephant/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-elephant/package.py b/var/spack/repos/builtin/packages/py-elephant/package.py index c52cc40e05..a7b580d03e 100644 --- a/var/spack/repos/builtin/packages/py-elephant/package.py +++ b/var/spack/repos/builtin/packages/py-elephant/package.py @@ -32,6 +32,7 @@ class PyElephant(PythonPackage): homepage = "http://neuralensemble.org/elephant" url = "https://pypi.io/packages/source/e/elephant/elephant-0.3.0.tar.gz" + version('0.4.1', '0e6214c96cae6ce777e4b3cf29bbdaa9') version('0.3.0', '84e69e6628fd617af469780c30d2da6c') variant('doc', default=False, description='Build the documentation') -- cgit v1.2.3-70-g09d2 From e8df0ddce45a3f83fe768303b9653b372136598e Mon Sep 17 00:00:00 2001 From: healther Date: Sat, 13 Jan 2018 15:46:00 +0100 Subject: add patch for gccxml with gcc@5: (#6913) --- .../repos/builtin/packages/gccxml/gcc-5.patch | 57 ++++++++++++++++++++++ var/spack/repos/builtin/packages/gccxml/package.py | 2 + 2 files changed, 59 insertions(+) create mode 100644 var/spack/repos/builtin/packages/gccxml/gcc-5.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gccxml/gcc-5.patch b/var/spack/repos/builtin/packages/gccxml/gcc-5.patch new file mode 100644 index 0000000000..4348d10184 --- /dev/null +++ b/var/spack/repos/builtin/packages/gccxml/gcc-5.patch @@ -0,0 +1,57 @@ +--- a/GCC/gcc/toplev.c ++++ b/GCC/gcc/toplev.c +@@ -537,7 +537,7 @@ read_integral_parameter (const char *p, const char *pname, const int defval) + for floor_log2 and exact_log2; see toplev.h. That construct, however, + conflicts with the ISO C++ One Definition Rule. */ + +-#if GCC_VERSION < 3004 || !defined (__cplusplus) ++#if GCC_VERSION < 3004 + + /* Given X, an unsigned number, return the largest int Y such that 2**Y <= X. + If X is 0, return -1. */ +@@ -589,7 +589,7 @@ exact_log2 (unsigned HOST_WIDE_INT x) + #endif + } + +-#endif /* GCC_VERSION < 3004 || !defined (__cplusplus) */ ++#endif /* GCC_VERSION < 3004 */ + + /* Handler for fatal signals, such as SIGSEGV. These are transformed + into ICE messages, which is much more user friendly. In case the +diff --git a/GCC/gcc/toplev.h b/GCC/gcc/toplev.h +index c935f7e..1edd5e5 100644 +--- a/GCC/gcc/toplev.h ++++ b/GCC/gcc/toplev.h +@@ -151,6 +151,7 @@ extern void decode_d_option (const char *); + /* Return true iff flags are set as if -ffast-math. */ + extern bool fast_math_flags_set_p (void); + ++#if GCC_VERSION < 3004 + /* Return log2, or -1 if not exact. */ + extern int exact_log2 (unsigned HOST_WIDE_INT); + +@@ -158,7 +159,7 @@ extern int exact_log2 (unsigned HOST_WIDE_INT); + extern int floor_log2 (unsigned HOST_WIDE_INT); + + /* Inline versions of the above for speed. */ +-#if GCC_VERSION >= 3004 ++#else /* GCC_VERSION >= 3004 */ + # if HOST_BITS_PER_WIDE_INT == HOST_BITS_PER_LONG + # define CLZ_HWI __builtin_clzl + # define CTZ_HWI __builtin_ctzl +@@ -170,13 +171,13 @@ extern int floor_log2 (unsigned HOST_WIDE_INT); + # define CTZ_HWI __builtin_ctz + # endif + +-extern inline int ++static inline int + floor_log2 (unsigned HOST_WIDE_INT x) + { + return x ? HOST_BITS_PER_WIDE_INT - 1 - (int) CLZ_HWI (x) : -1; + } + +-extern inline int ++static inline int + exact_log2 (unsigned HOST_WIDE_INT x) + { + return x == (x & -x) && x ? (int) CTZ_HWI (x) : -1; diff --git a/var/spack/repos/builtin/packages/gccxml/package.py b/var/spack/repos/builtin/packages/gccxml/package.py index d7f75f8631..fc54b3a91f 100644 --- a/var/spack/repos/builtin/packages/gccxml/package.py +++ b/var/spack/repos/builtin/packages/gccxml/package.py @@ -34,3 +34,5 @@ class Gccxml(CMakePackage): commit='3afa8ba5be6866e603dcabe80aff79856b558e24', preferred=True) patch('darwin-gcc.patch', when='%gcc platform=darwin') + # taken from https://github.com/gccxml/gccxml/issues/11#issuecomment-140334118 + patch('gcc-5.patch', when='%gcc@5:') -- cgit v1.2.3-70-g09d2 From d8b03d1e379c259781995b861fad8aa12c6fbde7 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Sat, 13 Jan 2018 15:50:06 +0100 Subject: glib: Fix python handling (#6910) Newer versions of glib require python. Fix up the python sbangs the same way we already fix up the perl ones. Fixes #6899 --- var/spack/repos/builtin/packages/glib/package.py | 31 ++++++++++++++++++++---- 1 file changed, 26 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/glib/package.py b/var/spack/repos/builtin/packages/glib/package.py index df73bd5eb3..c5e1ae4425 100644 --- a/var/spack/repos/builtin/packages/glib/package.py +++ b/var/spack/repos/builtin/packages/glib/package.py @@ -48,6 +48,7 @@ class Glib(AutotoolsPackage): depends_on('zlib') depends_on('gettext') depends_on('perl', type=('build', 'run')) + depends_on('python', type=('build', 'run'), when='@2.53.4:') depends_on('pcre+utf', when='@2.48:') depends_on('util-linux', when='+libmount') @@ -73,10 +74,30 @@ class Glib(AutotoolsPackage): return args - @run_before('install') + @run_before('configure') + def fix_python_path(self): + if not self.spec.satisfies('@2.53.4:'): + return + + files = ['gobject/glib-genmarshal.in', 'gobject/glib-mkenums.in'] + + filter_file('^#!/usr/bin/env @PYTHON@', + '#!/usr/bin/env python', + *files) + + @run_after('install') def filter_sbang(self): - # Filter sbang before install so Spack's sbang hook can fix it up - perl = join_path(self.spec['perl'].prefix.bin, 'perl') - files = ['gobject/glib-mkenums'] + # Revert sbang, so Spack's sbang hook can fix it up (we have to do + # this after install because otherwise the install target will try + # to rebuild files as filter_file updates the timestamps) + if self.spec.satisfies('@2.53.4:'): + pattern = '^#!/usr/bin/env python' + repl = '#!{0}'.format(self.spec['python'].command.path) + files = ['glib-genmarshal', 'glib-mkenums'] + else: + pattern = '^#! /usr/bin/perl' + repl = '#!{0}'.format(self.spec['perl'].command.path) + files = ['glib-mkenums'] - filter_file('^#! /usr/bin/perl', '#!{0}'.format(perl), *files) + files = [join_path(self.prefix.bin, file) for file in files] + filter_file(pattern, repl, *files, backup=False) -- cgit v1.2.3-70-g09d2 From 25bcabec982fcb9af0cdce34e1b0818755720836 Mon Sep 17 00:00:00 2001 From: healther Date: Sun, 14 Jan 2018 05:05:44 +0100 Subject: Update py-autopep8 to 1.3.3 (#6914) * Update py-autopep8 to 1.3.3 * Update package.py --- var/spack/repos/builtin/packages/py-autopep8/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-autopep8/package.py b/var/spack/repos/builtin/packages/py-autopep8/package.py index 3dff029a8a..d2094056fd 100644 --- a/var/spack/repos/builtin/packages/py-autopep8/package.py +++ b/var/spack/repos/builtin/packages/py-autopep8/package.py @@ -32,12 +32,14 @@ class PyAutopep8(PythonPackage): homepage = "https://github.com/hhatto/autopep8" url = "https://pypi.io/packages/source/a/autopep8/autopep8-1.2.4.tar.gz" + version('1.3.3', '8951f43748406015b663a54ab05d891a') version('1.2.4', 'fcea19c0c5e505b425e2a78afb771f5c') version('1.2.2', '3d97f9c89d14a0975bffd32a2c61c36c') extends('python', ignore='bin/pep8') depends_on('python@2.6:2.8,3.2:') - depends_on('py-pycodestyle@1.5.7:1.7.0', type=('build', 'run')) + depends_on('py-pycodestyle@1.5.7:1.7.0', type=('build', 'run'), when='@:1.2.4') + depends_on('py-pycodestyle@2.3.0:', type=('build', 'run'), when='@1.3:') depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From 8c648a73bcc12fee2c59f222108cf4158eb9aa2a Mon Sep 17 00:00:00 2001 From: healther Date: Sun, 14 Jan 2018 05:07:14 +0100 Subject: py-doxypy conflicts python3 (#6916) * py-doxypy conflicts python3 * change conflicts to depends_on --- var/spack/repos/builtin/packages/py-doxypy/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-doxypy/package.py b/var/spack/repos/builtin/packages/py-doxypy/package.py index eb81b080c0..5eb7e066b0 100644 --- a/var/spack/repos/builtin/packages/py-doxypy/package.py +++ b/var/spack/repos/builtin/packages/py-doxypy/package.py @@ -32,3 +32,5 @@ class PyDoxypy(PythonPackage): url = "https://pypi.io/packages/source/d/doxypy/doxypy-0.3.tar.gz" version('0.3', '3b52289e0962d31b92af8be0eef8cbb2') + + depends_on('python@:2.8') -- cgit v1.2.3-70-g09d2 From c6a7979cfde451d15cf4d85abd5d87f2fab6b0d1 Mon Sep 17 00:00:00 2001 From: healther Date: Sun, 14 Jan 2018 05:07:46 +0100 Subject: Update py-flake8 to 3.5.0 (#6918) --- var/spack/repos/builtin/packages/py-flake8/package.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-flake8/package.py b/var/spack/repos/builtin/packages/py-flake8/package.py index 43ebf00865..f0251e2869 100644 --- a/var/spack/repos/builtin/packages/py-flake8/package.py +++ b/var/spack/repos/builtin/packages/py-flake8/package.py @@ -32,6 +32,7 @@ class PyFlake8(PythonPackage): homepage = "https://github.com/PyCQA/flake8" url = "https://github.com/PyCQA/flake8/archive/3.0.4.tar.gz" + version('3.5.0', '4e312803bbd8e4a1e566ffac887ae647') version('3.0.4', 'cf2a7d8c92070f7b62253404ffb54df7') version('2.5.4', '366dd1de6c300254c830b81e66979f06') @@ -42,16 +43,22 @@ class PyFlake8(PythonPackage): # However, py-flake8 requires py-setuptools during runtime as well. depends_on('py-setuptools@30:', type=('build', 'run')) + # pyflakes >= 1.5.0, < 1.7.0 + depends_on('py-pyflakes@1.5.0:1.6.999', when='@3.5.0', type=('build', 'run')) # pyflakes >= 0.8.1, != 1.2.0, != 1.2.1, != 1.2.2, < 1.3.0 depends_on('py-pyflakes@0.8.1:1.1.0,1.2.3:1.2.3', when='@3.0.4', type=('build', 'run')) # pyflakes >= 0.8.1, < 1.1 depends_on('py-pyflakes@0.8.1:1.0.0', when='@2.5.4', type=('build', 'run')) + # pycodestyle >= 2.3.0, < 2.4.0 + depends_on('py-pycodestyle@2.3.0:2.3.999', when='@3.5.0', type=('build', 'run')) # pycodestyle >= 2.0.0, < 2.1.0 depends_on('py-pycodestyle@2.0.0:2.0.999', when='@3.0.4', type=('build', 'run')) # pep8 >= 1.5.7, != 1.6.0, != 1.6.1, != 1.6.2 depends_on('py-pycodestyle@1.5.7,1.7.0:', when='@2.5.4', type=('build', 'run')) + # mccabe >= 0.6.0, < 0.7.0 + depends_on('py-mccabe@0.6.0:0.6.999', when='@3.5.0', type=('build', 'run')) # mccabe >= 0.5.0, < 0.6.0 depends_on('py-mccabe@0.5.0:0.5.999', when='@3.0.4', type=('build', 'run')) # mccabe >= 0.2.1, < 0.5 -- cgit v1.2.3-70-g09d2 From 176814373c89d647dba4dfe02dd789554a6d339e Mon Sep 17 00:00:00 2001 From: healther Date: Sun, 14 Jan 2018 05:08:05 +0100 Subject: add version 1.26 to py-git-review and fix run_env (#6919) * Update py-git-review to version 1.26.0 * Fix py-git-review package TypeError: object of type 'Version' has no len() --- var/spack/repos/builtin/packages/py-git-review/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-git-review/package.py b/var/spack/repos/builtin/packages/py-git-review/package.py index 596f8016aa..b2df6b0ba7 100644 --- a/var/spack/repos/builtin/packages/py-git-review/package.py +++ b/var/spack/repos/builtin/packages/py-git-review/package.py @@ -31,6 +31,7 @@ class PyGitReview(PythonPackage): homepage = "http://docs.openstack.org/infra/git-review" url = "https://pypi.io/packages/source/g/git-review/git-review-1.25.0.tar.gz" + version('1.26.0', 'dec20e8a259c03fe19c9dd2362c4ec3f') version('1.25.0', '0a061d0e23ee9b93c6212a3fe68fb7ab') version('1.24', '145116fe58a3487c3ad1bf55538fd741') version('1.23', 'b0023ad8c037ab710da81412194c6a3a') @@ -46,4 +47,4 @@ class PyGitReview(PythonPackage): depends_on('tk', type=('run')) def setup_environment(self, spack_env, run_env): - run_env.set('PBR_VERSION', self.spec.version) + run_env.set('PBR_VERSION', str(self.spec.version)) -- cgit v1.2.3-70-g09d2 From a2d7939e27efecd9a61d015334ddfd1a765a09f4 Mon Sep 17 00:00:00 2001 From: healther Date: Sun, 14 Jan 2018 05:08:18 +0100 Subject: Add py-mccabe versions up to 0.6.1 (#6920) --- var/spack/repos/builtin/packages/py-mccabe/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-mccabe/package.py b/var/spack/repos/builtin/packages/py-mccabe/package.py index 9a8e39f4c4..05dacfd6b4 100644 --- a/var/spack/repos/builtin/packages/py-mccabe/package.py +++ b/var/spack/repos/builtin/packages/py-mccabe/package.py @@ -31,6 +31,9 @@ class PyMccabe(PythonPackage): homepage = "https://github.com/PyCQA/mccabe" url = "https://github.com/PyCQA/mccabe/archive/0.5.2.tar.gz" + version('0.6.1', '0360af86f0bce7a839bd3cba517edf9c') + version('0.6.0', '38f46ff70b5d2c02155f8fd4d96fb791') + version('0.5.3', 'a75f57079ce10556fd3c63a5f6b4d706') version('0.5.2', '3cdf2d7faa1464b18905fe9a7063a632') version('0.5.1', '864b364829156701bec797712be8ece0') version('0.5.0', '71c0ce5e5c4676753525154f6c5d3af8') -- cgit v1.2.3-70-g09d2 From 7c4a193b3fccd651ab8ae392941121e6f8ab0afe Mon Sep 17 00:00:00 2001 From: healther Date: Sun, 14 Jan 2018 05:08:38 +0100 Subject: Update py-neo to 0.5.2 (#6921) --- var/spack/repos/builtin/packages/py-neo/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-neo/package.py b/var/spack/repos/builtin/packages/py-neo/package.py index 03a060dec4..865e34c3f1 100644 --- a/var/spack/repos/builtin/packages/py-neo/package.py +++ b/var/spack/repos/builtin/packages/py-neo/package.py @@ -33,6 +33,7 @@ class PyNeo(PythonPackage): homepage = "http://neuralensemble.org/neo" url = "https://pypi.io/packages/source/n/neo/neo-0.4.1.tar.gz" + version('0.5.2', 'e2b55b112ae245f24cc8ad63cfef986c') version('0.4.1', 'f706df3a1bce835cb490b812ac198a6e') depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From b87f9ae5d4e14097dc07be0108c7c534c05bb619 Mon Sep 17 00:00:00 2001 From: healther Date: Sun, 14 Jan 2018 05:08:51 +0100 Subject: Add py-pycodestyle versions up to 2.3.1 (#6922) --- var/spack/repos/builtin/packages/py-pycodestyle/package.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pycodestyle/package.py b/var/spack/repos/builtin/packages/py-pycodestyle/package.py index 3bae7c4296..e0d08f623a 100644 --- a/var/spack/repos/builtin/packages/py-pycodestyle/package.py +++ b/var/spack/repos/builtin/packages/py-pycodestyle/package.py @@ -32,6 +32,10 @@ class PyPycodestyle(PythonPackage): homepage = "https://github.com/PyCQA/pycodestyle" url = "https://github.com/PyCQA/pycodestyle/archive/2.0.0.tar.gz" + version('2.3.1', '4185319f6137833eec9057dbf3293629') + version('2.3.0', '1b2019b3c39c20becadbb7fdec6dcb5a') + version('2.2.0', '6e21aab2e038c3dd38dca585011a6f38') + version('2.1.0', '1e606c687a6cf01d51305417d0e97824') version('2.0.0', '5c3e90001f538bf3b7896d60e92eb6f6') version('1.7.0', '31070a3a6391928893cbf5fa523eb8d9') version('1.6.2', '8df18246d82ddd3d19ffe7518f983955') -- cgit v1.2.3-70-g09d2 From 47b554a9598bb64970730d75ed2baffd4f1f593a Mon Sep 17 00:00:00 2001 From: healther Date: Sun, 14 Jan 2018 05:09:17 +0100 Subject: Add py-pyflakes versions up to 1.6.0 (#6923) --- var/spack/repos/builtin/packages/py-pyflakes/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pyflakes/package.py b/var/spack/repos/builtin/packages/py-pyflakes/package.py index 6f962ae4df..2ccc009bb4 100644 --- a/var/spack/repos/builtin/packages/py-pyflakes/package.py +++ b/var/spack/repos/builtin/packages/py-pyflakes/package.py @@ -31,6 +31,9 @@ class PyPyflakes(PythonPackage): homepage = "https://github.com/PyCQA/pyflakes" url = "https://github.com/PyCQA/pyflakes/archive/1.3.0.tar.gz" + version('1.6.0', '68eff61e54964e6389f8fb1d2122fc5b') + version('1.5.0', '1dee2ca8a0520061aac5a82f3b539fa0') + version('1.4.0', 'ed832ef1cbd59463e5f0f6340254f603') version('1.3.0', 'a76173deb7a84fe860c0b60e2fbcdfe2') version('1.2.3', '2ac2e148a5c46b6bb06c4785be76f7cc') version('1.2.2', 'fe759b9381a6500e67a2ddbbeb5161a4') -- cgit v1.2.3-70-g09d2 From b3c96e2e407cfda9d4a970cf5b82c3dad31096ca Mon Sep 17 00:00:00 2001 From: healther Date: Sun, 14 Jan 2018 05:09:36 +0100 Subject: Update checksum for version 0.5.3 of yaml-cpp (#6924) --- var/spack/repos/builtin/packages/yaml-cpp/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/yaml-cpp/package.py b/var/spack/repos/builtin/packages/yaml-cpp/package.py index aaf6ab0a53..2b7470eded 100644 --- a/var/spack/repos/builtin/packages/yaml-cpp/package.py +++ b/var/spack/repos/builtin/packages/yaml-cpp/package.py @@ -31,7 +31,7 @@ class YamlCpp(CMakePackage): homepage = "https://github.com/jbeder/yaml-cpp" url = "https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.5.3.tar.gz" - version('0.5.3', '4e47733d98266e46a1a73ae0a72954eb') + version('0.5.3', '2bba14e6a7f12c7272f87d044e4a7211') version('develop', git='https://github.com/jbeder/yaml-cpp', branch='master') variant('shared', default=True, -- cgit v1.2.3-70-g09d2 From 589ea856a58a67a90d57522f26f84e22b8dd85a6 Mon Sep 17 00:00:00 2001 From: healther Date: Sun, 14 Jan 2018 05:10:10 +0100 Subject: Add PyNN 0.9.1 (#6926) --- var/spack/repos/builtin/packages/py-pynn/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pynn/package.py b/var/spack/repos/builtin/packages/py-pynn/package.py index 23e9ab13a4..284da28236 100644 --- a/var/spack/repos/builtin/packages/py-pynn/package.py +++ b/var/spack/repos/builtin/packages/py-pynn/package.py @@ -33,6 +33,7 @@ class PyPynn(PythonPackage): homepage = "http://neuralensemble.org/PyNN/" url = "https://pypi.io/packages/source/P/PyNN/PyNN-0.8.3.tar.gz" + version('0.9.1', '3b8a6c63dc59d7ac751029f84dcaf7e6') version('0.8.3', '28c63f898093806a57198e9271ed7b82') version('0.8beta', git='https://github.com/NeuralEnsemble/PyNN.git', commit='ffb0cb1661f2b0f2778db8f71865978fe7a7a6a4') @@ -45,7 +46,9 @@ class PyPynn(PythonPackage): depends_on('py-numpy@1.5:', type=('build', 'run')) depends_on('py-quantities@0.10:', type=('build', 'run')) depends_on('py-lazyarray@0.2.9:', type=('build', 'run')) - depends_on('py-neo@0.3:', type=('build', 'run')) + + depends_on('py-neo@0.3:0.4.1', type=('build', 'run'), when="@:0.8.3") + depends_on('py-neo@0.5.0:', type=('build', 'run'), when="@0.9.0:") # TODO: Add a 'test' deptype # depends_on('py-mock@1.0:', type='test') -- cgit v1.2.3-70-g09d2 From df7876ab54f58b4bbc7969ad00dd7a6a46813d7c Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Sun, 14 Jan 2018 05:10:42 +0100 Subject: Do not construct path to perl command manually (#6927) Instead, use spec['perl'].command.path. --- var/spack/repos/builtin/packages/autoconf/package.py | 5 ++--- var/spack/repos/builtin/packages/canu/package.py | 3 +-- var/spack/repos/builtin/packages/likwid/package.py | 5 +++-- var/spack/repos/builtin/packages/repeatmasker/package.py | 2 +- var/spack/repos/builtin/packages/vcftools/package.py | 3 +-- 5 files changed, 8 insertions(+), 10 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/autoconf/package.py b/var/spack/repos/builtin/packages/autoconf/package.py index f178a6e264..358131d91b 100644 --- a/var/spack/repos/builtin/packages/autoconf/package.py +++ b/var/spack/repos/builtin/packages/autoconf/package.py @@ -55,12 +55,11 @@ class Autoconf(AutotoolsPackage): # We have to do this after install because otherwise the install # target will try to rebuild the binaries (filter_file updates the # timestamps) - perl = join_path(self.spec['perl'].prefix.bin, 'perl') # Revert sbang, so Spack's sbang hook can fix it up filter_file('^#! /usr/bin/env perl', - '#! {0} -w'.format(perl), - '{0}/autom4te'.format(self.prefix.bin), + '#! {0} -w'.format(self.spec['perl'].command.path), + self.prefix.bin.autom4te, backup=False) def _make_executable(self, name): diff --git a/var/spack/repos/builtin/packages/canu/package.py b/var/spack/repos/builtin/packages/canu/package.py index 0198246e72..171dc49f97 100644 --- a/var/spack/repos/builtin/packages/canu/package.py +++ b/var/spack/repos/builtin/packages/canu/package.py @@ -42,9 +42,8 @@ class Canu(MakefilePackage): def patch(self): # Use our perl, not whatever is in the environment - perl = self.spec['perl'].prefix.bin.perl filter_file(r'^#!/usr/bin/env perl', - '#!{0}'.format(perl), + '#!{0}'.format(self.spec['perl'].command.path), 'src/pipelines/canu.pl') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/likwid/package.py b/var/spack/repos/builtin/packages/likwid/package.py index f9510273d8..096f2772f3 100644 --- a/var/spack/repos/builtin/packages/likwid/package.py +++ b/var/spack/repos/builtin/packages/likwid/package.py @@ -64,10 +64,11 @@ class Likwid(Package): @run_before('install') def filter_sbang(self): # Filter sbang before install so Spack's sbang hook can fix it up - perl = join_path(self.spec['perl'].prefix.bin, 'perl') files = ['perl/feedGnuplot'] + glob.glob('filters/*') - filter_file('^#!/usr/bin/perl', '#!{0}'.format(perl), *files) + filter_file('^#!/usr/bin/perl', + '#!{0}'.format(self.spec['perl'].command.path), + *files) def install(self, spec, prefix): if self.compiler.name not in self.supported_compilers: diff --git a/var/spack/repos/builtin/packages/repeatmasker/package.py b/var/spack/repos/builtin/packages/repeatmasker/package.py index c9713c7892..a4c12ad22a 100644 --- a/var/spack/repos/builtin/packages/repeatmasker/package.py +++ b/var/spack/repos/builtin/packages/repeatmasker/package.py @@ -63,7 +63,7 @@ class Repeatmasker(Package): # Repeatmasker? (Y/N) # Add a Search Engine: Done - config_answers = ['\n', '%s\n' % self.spec['perl'].prefix.bin.perl, + config_answers = ['\n', '%s\n' % self.spec['perl'].command.path, '%s\n' % self.stage.source_path, '%s\n' % self.spec['trf'].prefix.bin.trf, '2\n', '%s\n' % self.spec['ncbi-rmblastn'].prefix.bin, diff --git a/var/spack/repos/builtin/packages/vcftools/package.py b/var/spack/repos/builtin/packages/vcftools/package.py index f62702a0eb..4813a804bb 100644 --- a/var/spack/repos/builtin/packages/vcftools/package.py +++ b/var/spack/repos/builtin/packages/vcftools/package.py @@ -55,8 +55,7 @@ class Vcftools(AutotoolsPackage): with working_dir('src/perl'): match = '^#!/usr/bin/env perl' - perl = join_path(self.spec['perl'].prefix.bin, 'perl') - substitute = "#!{perl}".format(perl=perl) + substitute = "#!{perl}".format(perl=self.spec['perl'].command.path) # tab-to-vcf added in 0.1.15 files = ['fill-aa', 'fill-an-ac', 'fill-fs', 'fill-ref-md5', 'tab-to-vcf', 'vcf-annotate', -- cgit v1.2.3-70-g09d2 From e2908af9b4f610427e52a10dc0658b7d5c5a2514 Mon Sep 17 00:00:00 2001 From: Simone Bnà Date: Sun, 14 Jan 2018 05:20:39 +0100 Subject: Catalyst package (#6834) * catalyst: added catalyst package * catalyst: missing libx11 and libxt dependencies * catalyst: added std cmake args * catalyst: override paraview git describe cmake variable * catalyst: fixed flake8 errors --- .../repos/builtin/packages/catalyst/package.py | 167 +++++++++++++++++++++ 1 file changed, 167 insertions(+) create mode 100644 var/spack/repos/builtin/packages/catalyst/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/catalyst/package.py b/var/spack/repos/builtin/packages/catalyst/package.py new file mode 100644 index 0000000000..ca45b232fe --- /dev/null +++ b/var/spack/repos/builtin/packages/catalyst/package.py @@ -0,0 +1,167 @@ +############################################################################## +# Copyright (c) 2018 Simone Bna, CINECA. +# +# This file was authored by Simone Bna +# and is released as part of spack under the LGPL license. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for the LLNL notice and LGPL. +# +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import os +import subprocess +import llnl.util.tty as tty + + +class Catalyst(CMakePackage): + """Catalyst is an in situ use case library, with an adaptable application + programming interface (API), that orchestrates the alliance between + simulation and analysis and/or visualization tasks.""" + + homepage = 'http://www.paraview.org' + url = "http://www.paraview.org/files/v5.4/ParaView-v5.4.1.tar.gz" + _urlfmt = 'http://www.paraview.org/files/v{0}/ParaView-v{1}{2}.tar.gz' + + version('5.4.1', '4030c70477ec5a85aa72d6fc86a30753') + version('5.4.0', 'b92847605bac9036414b644f33cb7163') + version('5.3.0', '68fbbbe733aa607ec13d1db1ab5eba71') + version('5.2.0', '4570d1a2a183026adb65b73c7125b8b0') + version('5.1.2', '44fb32fc8988fcdfbc216c9e40c3e925') + version('5.0.1', 'fdf206113369746e2276b95b257d2c9b') + version('4.4.0', 'fa1569857dd680ebb4d7ff89c2227378') + + variant('python', default=False, description='Enable Python support') + variant('essentials', default=False, description='Enable Essentials support') + variant('extras', default=False, description='Enable Extras support') + variant('rendering', default=False, description='Enable Vtk Rendering support') + + depends_on('git') + depends_on('mpi') + depends_on('python@2:2.8', when='+python') + depends_on('mesa', when='+rendering') + depends_on("libx11", when='+rendering') + depends_on("libxt", when='+rendering') + depends_on('cmake@3.3:', type='build') + + def url_for_version(self, version): + """Handle ParaView version-based custom URLs.""" + if version < Version('5.1.0'): + return self._urlfmt.format(version.up_to(2), version, '-source') + else: + return self._urlfmt.format(version.up_to(2), version, '') + + def do_stage(self, mirror_only=False): + """Unpacks and expands the fetched tarball. + Then, generate the catalyst source files.""" + super(Catalyst, self).do_stage(mirror_only) + + # extract the catalyst part + paraview_dir = os.path.join(self.stage.path, + 'ParaView-v' + str(self.version)) + catalyst_script = os.path.join(paraview_dir, 'Catalyst', 'catalyze.py') + catalyst_source_dir = os.path.abspath(self.root_cmakelists_dir) + + command = ['python', catalyst_script, + '-r', paraview_dir] + + catalyst_edition = os.path.join(paraview_dir, 'Catalyst', + 'Editions', 'Base') + command.append('-i') + command.append(catalyst_edition) + if '+python' in self.spec: + catalyst_edition = os.path.join(paraview_dir, 'Catalyst', + 'Editions', 'Enable-Python') + command.append('-i') + command.append(catalyst_edition) + if '+essentials' in self.spec: + catalyst_edition = os.path.join(paraview_dir, 'Catalyst', + 'Editions', 'Essentials') + command.append('-i') + command.append(catalyst_edition) + if '+extras' in self.spec: + catalyst_edition = os.path.join(paraview_dir, 'Catalyst', + 'Editions', 'Extras') + command.append('-i') + command.append(catalyst_edition) + if '+rendering' in self.spec: + catalyst_edition = os.path.join(paraview_dir, 'Catalyst', + 'Editions', 'Rendering-Base') + command.append('-i') + command.append(catalyst_edition) + + command.append('-o') + command.append(catalyst_source_dir) + + if not os.path.isdir(catalyst_source_dir): + os.mkdir(catalyst_source_dir) + subprocess.check_call(command) + tty.msg("Generated catalyst source in %s" % self.stage.path) + else: + tty.msg("Already generated %s in %s" % (self.name, + self.stage.path)) + + def setup_environment(self, spack_env, run_env): + if os.path.isdir(self.prefix.lib64): + lib_dir = self.prefix.lib64 + else: + lib_dir = self.prefix.lib + paraview_version = 'paraview-%s' % self.spec.version.up_to(2) + run_env.prepend_path('LIBRARY_PATH', join_path(lib_dir, + paraview_version)) + run_env.prepend_path('LD_LIBRARY_PATH', join_path(lib_dir, + paraview_version)) + + @property + def root_cmakelists_dir(self): + """The relative path to the directory containing CMakeLists.txt + + This path is relative to the root of the extracted tarball, + not to the ``build_directory``. Defaults to the current directory. + + :return: directory containing CMakeLists.txt + """ + return os.path.join(self.stage.path, 'Catalyst-v' + str(self.version)) + + @property + def build_directory(self): + """Returns the directory to use when building the package + + :return: directory where to build the package + """ + return join_path(os.path.abspath(self.root_cmakelists_dir), + 'spack-build') + + def cmake_args(self): + """Populate cmake arguments for Catalyst.""" + cmake_args = [ + '-DPARAVIEW_GIT_DESCRIBE=v%s' % str(self.version) + ] + return cmake_args + + def cmake(self, spec, prefix): + """Runs ``cmake`` in the build directory through the cmake.sh script""" + cmake_script_path = os.path.join( + os.path.abspath(self.root_cmakelists_dir), + 'cmake.sh') + with working_dir(self.build_directory, create=True): + subprocess.check_call([cmake_script_path, + os.path.abspath(self.root_cmakelists_dir)] + + self.cmake_args() + self.std_cmake_args) -- cgit v1.2.3-70-g09d2 From d30dc2bf15d3e471d851e570e8fb06828f9b2e60 Mon Sep 17 00:00:00 2001 From: healther Date: Sun, 14 Jan 2018 15:14:55 +0100 Subject: Add version 1.81 of cppcheck (#6912) --- var/spack/repos/builtin/packages/cppcheck/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cppcheck/package.py b/var/spack/repos/builtin/packages/cppcheck/package.py index a9933920a9..55797eccb5 100644 --- a/var/spack/repos/builtin/packages/cppcheck/package.py +++ b/var/spack/repos/builtin/packages/cppcheck/package.py @@ -32,6 +32,7 @@ class Cppcheck(Package): homepage = "http://cppcheck.sourceforge.net/" url = "https://downloads.sourceforge.net/project/cppcheck/cppcheck/1.78/cppcheck-1.78.tar.bz2" + version('1.81', '0c60a1d00652044ef511bdd017689938') version('1.78', 'f02d0ee0a4e71023703c6c5efff6cf9d') version('1.72', '2bd36f91ae0191ef5273bb7f6dc0d72e') version('1.68', 'c015195f5d61a542f350269030150708') -- cgit v1.2.3-70-g09d2 From 0adcb610fecb1dc6b9371d71107bea4cb80c225f Mon Sep 17 00:00:00 2001 From: David Pérez-Suárez Date: Sun, 14 Jan 2018 21:39:10 +0000 Subject: Updated catch to newer version (up to 2.1.0) (#6933) Also updated all the sums from previous versions --- var/spack/repos/builtin/packages/catch/package.py | 48 +++++++++++++---------- 1 file changed, 28 insertions(+), 20 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/catch/package.py b/var/spack/repos/builtin/packages/catch/package.py index 37e8d69aaf..dd324615a7 100644 --- a/var/spack/repos/builtin/packages/catch/package.py +++ b/var/spack/repos/builtin/packages/catch/package.py @@ -28,27 +28,35 @@ from spack import * class Catch(Package): """Catch tests""" - homepage = "https://github.com/philsquared/Catch" - url = "https://github.com/philsquared/Catch/archive/v1.3.0.tar.gz" + homepage = "https://github.com/catchorg/Catch2" + url = "https://github.com/catchorg/Catch2/archive/v1.3.0.tar.gz" - version('1.9.4', '110b9173d7f766487fed5b710836c7216a781568') - version('1.9.3', 'dc0cd0b344d8ccb1190ac3447efcb49c9b43d497') - version('1.9.2', '0580f57edd2b33ec671488dc7b6151f9e360c8c9') - version('1.9.1', '10784fc4c3786dfc3bd222fb3f9b048b6d68f186') - version('1.9.0', '62f07506d4a381d1730d494b71cff0396b9eb3d6') - version('1.8.2', '45a7598a8e5c47bc09fb73eec205ffe0885983dc') - version('1.8.1', 'd4e302f712fb7e75ce6f05b436dbaf21dca40030') - version('1.8.0', '26064092b5682c9c997b04015ed1565f0e198827') - version('1.7.2', '13018db2f0f0395456f695b0d0fbc490662e3467') - version('1.7.1', 'f82e11a5cdfef2d36b5687ff5970d383f9e76490') - version('1.7.0', 'fe39f5b3eb07a5dd0e3f84a1335ceca7de8982e6') - version('1.6.1', '7d46961a3131655b986123f8a1f439a04a0af623') - version('1.6.0', '890a3b21085d796e13c3bfaf4b6c6f1d06e4a52e') - version('1.5.9', '8bc32146a5a2789cd3d3ce2893772e32f412f1b1') - version('1.5.0', 'c87397846ea5126febd39f513b413e32f9ed552b') - version('1.4.0', 'c165406968fbfb46949885da571cd528c62c4d9a') - version('1.3.5', '31553ba6e4bd0cc61e0507d6754847e354699284') - version('1.3.0', 'e13694aaff72817d02af8ed27d077cd261b6e857') + version('2.1.0', '70b44068976d46d48f3cd8796f675691d3bc726b') + version('2.0.1', '5c191a031edebd0525640ed2f38cbf64bacb1803') + version('1.12.0', '8fb0a64144a2c1572dd930254c7bbdf504ecbe2d') + version('1.11.0', '3c03a022d8ba8dbbc931e1ce9fb28faec4890b8d') + version('1.10.0', 'c2033ca00b616e7e703623c68220cf5a8e12bba4') + version('1.9.7', '7ea41b48a23bd83f377f05a9dfde2be230cfc1b4') + version('1.9.6', 'e6ae3a50c6e4da64410979dcd4b2bb3f7ba1c364') + version('1.9.5', '7ba2bb12b5398b8b9ab7a7907f4cd345a55e179a') + version('1.9.4', 'b48fce35161160def587bd0d8f0e95969b20b786') + version('1.9.3', 'c0db82118496a2dd0637aad352f31d9356bffc28') + version('1.9.2', '627fd94d466c0f71ba84010adf82771ed3ce85c7') + version('1.9.1', '331e4a5cd32fe4c36b4bea15e5198346f18b5c3f') + version('1.9.0', '5bb46e99eea39224189a8a0442ec7790c635a7b0') + version('1.8.2', '34b8a2da76befeeaeafc393569538222605dda51') + version('1.8.1', 'd5f4ae9603fe27c313bc5b5b23c233bdce5c57f7') + version('1.8.0', '7fa6bfc50e6dbb6fd1352f41496650d56a86ac1a') + version('1.7.2', '45b0ab04b6da75ce56de25a81f0b0de4c7a62179') + version('1.7.1', '3a55985aacd5a5ff8a87c1490bbf65f0122647dc') + version('1.7.0', '6f9869cc066721d525bb03e8a9423b806c362140') + version('1.6.1', 'e88de5b611c07d5d402142d3dc20b63350fdf76c') + version('1.6.0', '21273cbed050b8d4785231d04812d5addf5b71b7') + version('1.5.9', '341bee0b642f0dc9bb6fb41243a068239468b703') + version('1.5.0', '2d14342c72f12b3f4b975cf6aa8594c8ad43d773') + version('1.4.0', '3b3b76a842508386be40d73849627bbe12fb5b7f') + version('1.3.5', '2cfd78bce21368355c7d3880df88716084df2186') + version('1.3.0', '24cd4e6518273fea20becd47a2e1edbee7ec209a') def install(self, spec, prefix): mkdirp(prefix.include) -- cgit v1.2.3-70-g09d2 From a03674ebbd264570f11eaa2b411ec1002c7c039b Mon Sep 17 00:00:00 2001 From: healther Date: Sun, 14 Jan 2018 22:39:33 +0100 Subject: make vim python3 compatible (#6925) --- var/spack/repos/builtin/packages/vim/package.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/vim/package.py b/var/spack/repos/builtin/packages/vim/package.py index ae99824e30..fb2ba5d437 100644 --- a/var/spack/repos/builtin/packages/vim/package.py +++ b/var/spack/repos/builtin/packages/vim/package.py @@ -96,9 +96,14 @@ class Vim(AutotoolsPackage): configure_args.append("--with-features=" + feature_set) if '+python' in spec: - configure_args.append("--enable-pythoninterp=yes") + if 'python@3:' in self.spec: + configure_args.append("--enable-python3interp=yes") + configure_args.append("--enable-pythoninterp=no") + else: + configure_args.append("--enable-python3interp=no") + configure_args.append("--enable-pythoninterp=yes") else: - configure_args.append("--enable-pythoninterp=no") + configure_args.append("--enable-python3interp=no") if '+ruby' in spec: configure_args.append("--enable-rubyinterp=yes") -- cgit v1.2.3-70-g09d2 From e583d789d69de3c6ca47421845079474487e7c60 Mon Sep 17 00:00:00 2001 From: healther Date: Sun, 14 Jan 2018 22:39:53 +0100 Subject: Update py-backports-functools-lru-cache to 1.4 (#6915) * Update py-backports-functools-lru-cache to 1.4 * fix old url --- .../builtin/packages/py-backports-functools-lru-cache/package.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py b/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py index e512c0bbb7..444365115e 100644 --- a/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py +++ b/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py @@ -28,11 +28,12 @@ from spack import * class PyBackportsFunctoolsLruCache(PythonPackage): """Backport of functools.lru_cache from Python 3.3""" - homepage = "https://bitbucket.org/jaraco/backports.functools_lru_cache" - url = "https://pypi.io/packages/source/b/backports.functools_lru_cache/backports.functools_lru_cache-1.0.1.zip" - - version('1.0.1', 'c789ef439d189330b99872746a6d9e85') + homepage = "https://github.com/jaraco/backports.functools_lru_cache" + url = "https://pypi.io/packages/source/b/backports.functools_lru_cache/backports.functools_lru_cache-1.4.tar.gz" + version('1.4', 'b954e7d5e2ca0f0f66ad2ed12ba800e5') + version('1.0.1', 'c789ef439d189330b99872746a6d9e85', + url="https://pypi.io/packages/source/b/backports.functools_lru_cache/backports.functools_lru_cache-1.0.1.zip") depends_on('py-setuptools', type='build') depends_on('py-setuptools-scm@1.15.0:', type='build') depends_on('python@2.6.0:3.3.99', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 8f6fe9e03066f0a1d01902189768b455def1c802 Mon Sep 17 00:00:00 2001 From: healther Date: Sun, 14 Jan 2018 22:40:22 +0100 Subject: Fix installation of bash-completion (#6911) * Fix installation of bash-completion * use run_before decorator instead of overriding install method --- var/spack/repos/builtin/packages/bash-completion/package.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bash-completion/package.py b/var/spack/repos/builtin/packages/bash-completion/package.py index 3aff5bf426..350cd4df05 100644 --- a/var/spack/repos/builtin/packages/bash-completion/package.py +++ b/var/spack/repos/builtin/packages/bash-completion/package.py @@ -42,6 +42,10 @@ class BashCompletion(AutotoolsPackage): # Other dependencies depends_on('bash@4.1:', type='run') + @run_before('install') + def create_install_directory(self): + mkdirp(join_path(self.prefix.share, 'bash-completion', 'completions')) + @run_after('install') def show_message_to_user(self): prefix = self.prefix -- cgit v1.2.3-70-g09d2 From a11765dbdfc5664125f4a93b1ef318ddfb35d2f8 Mon Sep 17 00:00:00 2001 From: Milton Woods Date: Mon, 15 Jan 2018 08:41:17 +1100 Subject: Qt fixes for RHEL6/7 (#6895) * qt: move licence acceptance from qt3krell.patch to qt3accept.patch * qt: ensure that ptrdiff_t is defined for qt@3.3.8b * qt: disable webglplugin for qt@5.10~opengl * qt: depend on libxext (for qt@3 and @4) * qt: avoid X dependencies on darwin platforms * Revert "qt: avoid X dependencies on darwin platforms" This reverts commit 05ce08de94be1e02d7e2f2dae0c1ae59baa3f65a. * qt: limit range of versions depending on libxext --- var/spack/repos/builtin/packages/qt/package.py | 11 +++++++ .../repos/builtin/packages/qt/qt3accept.patch | 38 ++++++++++++++++++++++ var/spack/repos/builtin/packages/qt/qt3krell.patch | 38 ---------------------- .../repos/builtin/packages/qt/qt3ptrdiff.patch | 20 ++++++++++++ 4 files changed, 69 insertions(+), 38 deletions(-) create mode 100644 var/spack/repos/builtin/packages/qt/qt3accept.patch create mode 100644 var/spack/repos/builtin/packages/qt/qt3ptrdiff.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 3f3defeb8c..1505eff61a 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -71,7 +71,9 @@ class Qt(Package): # see https://github.com/Homebrew/homebrew-core/pull/5951 patch('restore-pc-files.patch', when='@5.9: platform=darwin') + patch('qt3accept.patch', when='@3.3.8b') patch('qt3krell.patch', when='@3.3.8b+krellpatch') + patch('qt3ptrdiff.patch', when='@3.3.8b') # see https://bugreports.qt.io/browse/QTBUG-57656 patch('QTBUG-57656.patch', when='@5.8.0') @@ -125,9 +127,13 @@ class Qt(Package): # OpenGL hardware acceleration depends_on("mesa", when='@4:+opengl') + depends_on("libxcb", when=sys.platform != 'darwin') depends_on("libx11", when=sys.platform != 'darwin') + if sys.platform != 'darwin': + depends_on("libxext", when='@3:4.99') + # Webkit depends_on("flex", when='+webkit', type='build') depends_on("bison", when='+webkit', type='build') @@ -368,6 +374,11 @@ class Qt(Package): '-skip', 'webengine', ]) + if '~opengl' in self.spec and self.spec.satisfies('@5.10:'): + config_args.extend([ + '-skip', 'webglplugin', + ]) + configure('-no-eglfs', '-no-directfb', '-{0}gtk'.format('' if '+gtk' in self.spec else 'no-'), diff --git a/var/spack/repos/builtin/packages/qt/qt3accept.patch b/var/spack/repos/builtin/packages/qt/qt3accept.patch new file mode 100644 index 0000000000..32dfb9df08 --- /dev/null +++ b/var/spack/repos/builtin/packages/qt/qt3accept.patch @@ -0,0 +1,38 @@ +--- qt-x11-free-3.3.8b/configure 2008-01-15 13:09:15.000000000 -0600 ++++ qt-x11-free-3.3.8b-fixes/configure 2015-07-08 15:49:03.379560633 -0500 +@@ -2339,7 +2339,7 @@ + else + echo "Do you accept the terms of the $TheLicense? \c" + fi +- read acceptance ++ acceptance=yes + echo + if [ "$acceptance" = yes ]; then + break +@@ -2397,7 +2397,7 @@ + else + echo "Do you accept the terms of $affix license? \c" + fi +- read acceptance ++ acceptance=yes + echo + if [ "$acceptance" = "yes" ]; then + break +@@ -2443,7 +2443,7 @@ + else + echo "Do you accept the terms of the license? \c" + fi +- read acceptance ++ acceptance=yes + echo + if [ "$acceptance" = "yes" ]; then + break +@@ -2524,7 +2524,7 @@ + else + echo "Do you accept the terms of the $Platform License? \c" + fi +- read acceptance ++ acceptance=yes + echo + if [ "$acceptance" = "yes" ]; then + break diff --git a/var/spack/repos/builtin/packages/qt/qt3krell.patch b/var/spack/repos/builtin/packages/qt/qt3krell.patch index 3333eeacd4..4f1c12e43e 100644 --- a/var/spack/repos/builtin/packages/qt/qt3krell.patch +++ b/var/spack/repos/builtin/packages/qt/qt3krell.patch @@ -28,41 +28,3 @@ #endif template ---- qt-x11-free-3.3.8b/configure 2008-01-15 13:09:15.000000000 -0600 -+++ qt-x11-free-3.3.8b-fixes/configure 2015-07-08 15:49:03.379560633 -0500 -@@ -2339,7 +2339,7 @@ - else - echo "Do you accept the terms of the $TheLicense? \c" - fi -- read acceptance -+ acceptance=yes - echo - if [ "$acceptance" = yes ]; then - break -@@ -2397,7 +2397,7 @@ - else - echo "Do you accept the terms of $affix license? \c" - fi -- read acceptance -+ acceptance=yes - echo - if [ "$acceptance" = "yes" ]; then - break -@@ -2443,7 +2443,7 @@ - else - echo "Do you accept the terms of the license? \c" - fi -- read acceptance -+ acceptance=yes - echo - if [ "$acceptance" = "yes" ]; then - break -@@ -2524,7 +2524,7 @@ - else - echo "Do you accept the terms of the $Platform License? \c" - fi -- read acceptance -+ acceptance=yes - echo - if [ "$acceptance" = "yes" ]; then - break diff --git a/var/spack/repos/builtin/packages/qt/qt3ptrdiff.patch b/var/spack/repos/builtin/packages/qt/qt3ptrdiff.patch new file mode 100644 index 0000000000..5043e4b5a8 --- /dev/null +++ b/var/spack/repos/builtin/packages/qt/qt3ptrdiff.patch @@ -0,0 +1,20 @@ +--- a/src/tools/qmap.h 2008-01-16 06:09:13.000000000 +1100 ++++ b/src/tools/qmap.h 2018-01-07 11:32:38.720893324 +1100 +@@ -52,6 +52,7 @@ + #ifndef QT_NO_STL + #include + #include ++#include + #endif + + //#define QT_CHECK_MAP_RANGE +--- a/src/tools/qvaluelist.h 2008-01-16 06:09:13.000000000 +1100 ++++ b/src/tools/qvaluelist.h 2018-01-07 11:33:03.393206961 +1100 +@@ -50,6 +50,7 @@ + #ifndef QT_NO_STL + #include + #include ++#include + #endif + + //#define QT_CHECK_VALUELIST_RANGE -- cgit v1.2.3-70-g09d2 From f7db5d9cac80432a7016043a1b2781fbaa7f040e Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Sun, 14 Jan 2018 15:41:32 -0600 Subject: r-rappdirs: Create new package. (#6891) * r-rappdirs: Create new package. * r-rappdirs: Add version constraints. --- .../repos/builtin/packages/r-rappdirs/package.py | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-rappdirs/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-rappdirs/package.py b/var/spack/repos/builtin/packages/r-rappdirs/package.py new file mode 100644 index 0000000000..fdda21240f --- /dev/null +++ b/var/spack/repos/builtin/packages/r-rappdirs/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RRappdirs(RPackage): + """An easy way to determine which directories on the users computer + you should use to save data, caches and logs. A port of Python's + 'Appdirs' to R.""" + + homepage = "https://cran.r-project.org/package=rappdirs" + url = "https://cran.rstudio.com/src/contrib/rappdirs_0.3.1.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/rappdirs" + + version('0.3.1', 'fbbdceda2aa49374e61c7d387bf9ea21') + + depends_on('r@2.14:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 43190a6bf64ca13a2916d4d35e9f7572397ecc3d Mon Sep 17 00:00:00 2001 From: Milton Woods Date: Mon, 15 Jan 2018 08:42:17 +1100 Subject: Py-fparser: python parser for Fortran code (#6794) * py-fparser: parser for Fortran 77..2003 code * py-fparser: guard against external pytest.ini * py-fparser: define 'develop' version as latest master branch * py-fparser: fetch tagged versions from git repo * py-fparser: add latest release 0.0.6 * py-fparser: whitespace adjustments for flake8 * py-fparser: inherit python dependency from PythonPackage * py-fparser: rely on spack to resolve sub-dependencies * py-fparser: try type='test' for py-pytest * py-fparser: fetch release tarballs instead of git commits * py-fparser: test deptype is available, remove comment * py-fparser: limit versions that use py-six * py-fparser: version ranges do not need a lower bound --- .../repos/builtin/packages/py-fparser/package.py | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-fparser/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-fparser/package.py b/var/spack/repos/builtin/packages/py-fparser/package.py new file mode 100644 index 0000000000..8ce756b421 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-fparser/package.py @@ -0,0 +1,55 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +# +from spack import * + + +class PyFparser(PythonPackage): + """Parser for Fortran 77..2003 code.""" + + homepage = "https://github.com/stfc/fparser" + url = "https://github.com/stfc/fparser/archive/0.0.5.tar.gz" + giturl = "https://github.com/stfc/fparser.git" + + version('0.0.6', '15553fde76b4685fa8edb0a5472b1b53d308c3b8') + version('0.0.5', '14630afdb8c8bd025e5504c5ab19d133aa8cf8c7') + version('develop', git=giturl, branch='master') + + depends_on('py-setuptools', type='build') + + depends_on('py-numpy', type=('build', 'run'), when='@:0.0.5') + depends_on('py-nose', type='build') + depends_on('py-six', type='build', when='@0.0.6:') + + depends_on('py-pytest', type='test') + + @run_after('install') + @on_package_attributes(run_tests=True) + def check_build(self): + # Ensure that pytest.ini exists inside the source tree, + # otherwise an external pytest.ini can cause havoc: + touch('pytest.ini') + with working_dir('src'): + Executable('py.test')() -- cgit v1.2.3-70-g09d2 From 6093d6df7d3e8828d303e59691d1a8607afdd994 Mon Sep 17 00:00:00 2001 From: Federico Ficarelli Date: Mon, 15 Jan 2018 15:26:14 +0100 Subject: Reworked the graphviz package (#6865) The url in graphviz has been fixed and its version has been updated to the latest available (2.40.1). Added variants for expat, qt, gtk+ and ghostscript. --- .../repos/builtin/packages/graphviz/package.py | 88 +++++++++++++++------- 1 file changed, 61 insertions(+), 27 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/graphviz/package.py b/var/spack/repos/builtin/packages/graphviz/package.py index 5bcd78adc2..33b671aa96 100644 --- a/var/spack/repos/builtin/packages/graphviz/package.py +++ b/var/spack/repos/builtin/packages/graphviz/package.py @@ -23,16 +23,17 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * +import os import sys -import shutil class Graphviz(AutotoolsPackage): """Graph Visualization Software""" homepage = 'http://www.graphviz.org' - url = 'http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.38.0.tar.gz' - version('2.38.0', '5b6a829b2ac94efcd5fa3c223ed6d3ae') + # This commit hash is tag='stable_release_2.40.1' + version('2.40.1', git='https://gitlab.com/graphviz/graphviz.git', + commit='67cd2e5121379a38e0801cc05cce5033f8a2a609') # We try to leave language bindings enabled if they don't cause # build issues or add dependencies. @@ -78,9 +79,16 @@ class Graphviz(AutotoolsPackage): description='Build with pango+cairo support (more output formats)') variant('libgd', default=False, description='Build with libgd support (more output formats)') - variant('gts', default=False, description='Build with GNU Triangulated Surface Library') + variant('expat', default=False, + description='Build with Expat support (enables HTML-like labels)') + variant('ghostscript', default=False, + description='Build with Ghostscript support') + variant('qt', default=False, + description='Build with Qt support') + variant('gtkplus', default=False, + description='Build with GTK+ support') parallel = False @@ -96,28 +104,51 @@ class Graphviz(AutotoolsPackage): '+python', '+r', '+ruby', '+tcl') for b in tested_bindings + untested_bindings: - depends_on('swig', when=b) + depends_on('swig', type='build', when=b) + depends_on('java', when='+java') + depends_on('python@2:2.8', when='+python') + + # +pangocairo depends_on('cairo', when='+pangocairo') depends_on('pango', when='+pangocairo') + depends_on('freetype', when='+pangocairo') + depends_on('glib', when='+pangocairo') + depends_on('fontconfig', when='+pangocairo') + depends_on('libpng', when='+pangocairo') + depends_on('zlib', when='+pangocairo') + # +libgd depends_on('libgd', when='+libgd') + depends_on('fontconfig', when='+libgd') + depends_on('freetype', when='+libgd') + # +gts depends_on('gts', when='+gts') - depends_on('ghostscript') - depends_on('freetype') - depends_on('expat') - depends_on('libtool') - depends_on('pkgconfig', type='build') - - depends_on('java', when='+java') - depends_on('python@2:2.8', when='+python') - - def patch(self): - # Fix a few variable names, gs after 9.18 renamed them - # See http://lists.linuxfromscratch.org/pipermail/blfs-book/2015-October/056960.html - if self.spec.satisfies('^ghostscript@9.18:'): - kwargs = {'ignore_absent': False, 'backup': True, 'string': True} - filter_file(' e_', ' gs_error_', 'plugin/gs/gvloadimage_gs.c', - **kwargs) + # +expat + depends_on('expat', when='+expat') + # +ghostscript + depends_on('ghostscript', when='+ghostscript') + # +qt + depends_on('qt', when='+qt') + # +gtkplus + depends_on('gtkplus', when='+gtkplus') + + # Build dependencies + depends_on('pkg-config', type='build') + # The following are needed when building from git + depends_on('automake', type='build') + depends_on('autoconf', type='build') + depends_on('bison', type='build') + depends_on('flex', type='build') + depends_on('libtool', type='build') + + def autoreconf(self, spec, prefix): + # We need to generate 'configure' when checking out sources from git + # If configure exists nothing needs to be done + if os.path.exists(self.configure_abs_path): + return + # Else bootstrap (disabling auto-configure with NOCONFIG) + bash = which('bash') + bash('./autogen.sh', 'NOCONFIG') def configure_args(self): spec = self.spec @@ -150,11 +181,17 @@ class Graphviz(AutotoolsPackage): else: options.append('--enable-swig=no') - for var in ('+pangocairo', '+libgd', '+gts'): + for var in ('+pangocairo', '+libgd', '+gts', '+expat', '+ghostscript', + '+qt', '+gtkplus'): + feature = var[1:] + if feature == 'gtkplus': + # In spack terms, 'gtk+' is 'gtkplus' while + # the relative configure option is 'gtk' + feature = 'gtk' if var in spec: - options.append('--with-{0}'.format(var[1:])) + options.append('--with-{0}'.format(feature)) else: - options.append('--without-{0}'.format(var[1:])) + options.append('--without-{0}'.format(feature)) # On OSX fix the compiler error: # In file included from tkStubLib.c:15: @@ -163,7 +200,4 @@ class Graphviz(AutotoolsPackage): if sys.platform == 'darwin': options.append('CFLAGS=-I/opt/X11/include') - # A hack to patch config.guess in the libltdl sub directory - shutil.copyfile('./config/config.guess', 'libltdl/config/config.guess') - return options -- cgit v1.2.3-70-g09d2 From 67219a1340f96c7cb1a80bee040abc33f7e72c37 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Mon, 15 Jan 2018 07:00:07 -0800 Subject: ruby: fix +openssl & +readline variants (#6935) * ruby: fix +openssl & +readline variants Fix "unqualified variable spec['openssl']" error in the ruby package that arises when trying to install the `+openssl` variant by referencing the `spec` field in the `Ruby` class. A similar error arises when trying to install the `+readline` variant; this error is also fixed by this patch. * ruby: make +openssl variant default to on Ruby's gem command will fetch gems from HTTPS resources by default (e.g., gem install bundler). Without openssl, request to fetch gems bounce back with the error ``` ERROR: While executing gem ... (Gem::Exception) Unable to require openssl, install OpenSSL and rebuild ruby (preferred) or use non-HTTPS sources ``` Without the ability to install gems -- required for some spack packages -- the ruby installation has limited utility for many users. * ruby: update rubygems ssl cert to fix ssl errors The SSL certificate bundled with Ruby 2.2.0 is outdated, so e.g., `gem install erubis` will fail with an SSL certificate error. This commit installs the updated SSL certificate to the proper directory so that gems can be downloaded and installed from RubyGems. --- var/spack/repos/builtin/packages/ruby/package.py | 35 ++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ruby/package.py b/var/spack/repos/builtin/packages/ruby/package.py index c28766ef60..5c34a2add2 100644 --- a/var/spack/repos/builtin/packages/ruby/package.py +++ b/var/spack/repos/builtin/packages/ruby/package.py @@ -34,7 +34,7 @@ class Ruby(AutotoolsPackage): version('2.2.0', 'cd03b28fd0b555970f5c4fd481700852') - variant('openssl', default=False, description="Enable OpenSSL support") + variant('openssl', default=True, description="Enable OpenSSL support") variant('readline', default=False, description="Enable Readline support") extendable = True @@ -47,12 +47,23 @@ class Ruby(AutotoolsPackage): depends_on('openssl', when='+openssl') depends_on('readline', when='+readline') + resource( + name='rubygems-updated-ssl-cert', + url='https://raw.githubusercontent.com/rubygems/rubygems/master/lib/rubygems/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem', + sha256='df68841998b7fd098a9517fe971e97890be0fc93bbe1b2a1ef63ebdea3111c80', + when='+openssl', + destination='', + placement='rubygems-updated-ssl-cert', + expand=False + ) + def configure_args(self): args = [] if '+openssl' in self.spec: - args.append("--with-openssl-dir=%s" % spec['openssl'].prefix) + args.append("--with-openssl-dir=%s" % self.spec['openssl'].prefix) if '+readline' in self.spec: - args.append("--with-readline-dir=%s" % spec['readline'].prefix) + args.append("--with-readline-dir=%s" + % self.spec['readline'].prefix) args.append('--with-tk=%s' % self.spec['tk'].prefix) return args @@ -80,3 +91,21 @@ class Ruby(AutotoolsPackage): # Ruby extension builds have global ruby and gem functions module.ruby = Executable(join_path(self.spec.prefix.bin, 'ruby')) module.gem = Executable(join_path(self.spec.prefix.bin, 'gem')) + + @run_after('install') + def post_install(self): + """ RubyGems updated their SSL certificates at some point, so + new certificates must be installed after Ruby is installed + in order to download gems; see + http://guides.rubygems.org/ssl-certificate-update/ + for details. + """ + rubygems_updated_cert_path = join_path(self.stage.source_path, + 'rubygems-updated-ssl-cert', + 'GlobalSignRootCA.pem') + rubygems_certs_path = join_path(self.spec.prefix.lib, + 'ruby', + '{0}'.format(self.spec.version.dotted), + 'rubygems', + 'ssl_certs') + install(rubygems_updated_cert_path, rubygems_certs_path) -- cgit v1.2.3-70-g09d2 From 48b127a2253142801d9fcb7c1ffdef24d8790d34 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Mon, 15 Jan 2018 07:31:50 -0800 Subject: ipopt: add version 3.12.8, relax metis version requirements (#6936) * ipopt: add version 3.12.8 * ipopt: allow linking with metis 5 --- var/spack/repos/builtin/packages/ipopt/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ipopt/package.py b/var/spack/repos/builtin/packages/ipopt/package.py index a536442dc3..caa37c3104 100644 --- a/var/spack/repos/builtin/packages/ipopt/package.py +++ b/var/spack/repos/builtin/packages/ipopt/package.py @@ -31,6 +31,7 @@ class Ipopt(Package): homepage = "https://projects.coin-or.org/Ipopt" url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-3.12.4.tgz" + version('3.12.8', '62c6de314220851b8f4d6898b9ae8cf0a8f1e96b68429be1161f8550bb7ddb03') version('3.12.7', '2a36e4a04717a8ed7012ac7d1253ae4ffbc1a8fd') version('3.12.6', 'ed4072427fab786fcf6082fe7e6f6c2ed9b5e6f8') version('3.12.5', '3f63ddfff517235ead17af6cceb426ca858dda37') @@ -50,7 +51,7 @@ class Ipopt(Package): depends_on("pkgconfig", type='build') depends_on("mumps+double~mpi") depends_on('coinhsl', when='+coinhsl') - depends_on('metis@4.0:4.999', when='+metis') + depends_on('metis@4.0:', when='+metis') patch('ipopt_ppc_build.patch', when='arch=ppc64le') -- cgit v1.2.3-70-g09d2 From 498c522a31cff72fda0b46ea66234e623e698aa2 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 15 Jan 2018 14:05:27 -0600 Subject: Add url_for_version to pango package (#6939) --- var/spack/repos/builtin/packages/pango/package.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pango/package.py b/var/spack/repos/builtin/packages/pango/package.py index 76d82350a5..bdc03bbd65 100644 --- a/var/spack/repos/builtin/packages/pango/package.py +++ b/var/spack/repos/builtin/packages/pango/package.py @@ -51,6 +51,10 @@ class Pango(AutotoolsPackage): depends_on("glib") depends_on('gobject-introspection') + def url_for_version(self, version): + url = "http://ftp.gnome.org/pub/GNOME/sources/pango/{0}/pango-{1}.tar.xz" + return url.format(version.up_to(2), version) + def configure_args(self): args = [] if self.spec.satisfies('+X'): -- cgit v1.2.3-70-g09d2 From 9704369f171b421add4d9bc89ea3031225b3ab78 Mon Sep 17 00:00:00 2001 From: junkudo Date: Thu, 18 Jan 2018 10:39:08 -0800 Subject: ipopt package: set compiler flags in configure (#6714) This makes use of the new flag_handler logic from 28d8784a to set compiler flags for ipopt by passing them as arguments to the build system rather than injecting them into the compiler wrappers. This avoids conflicts between flags that are chosen by the build system and flags that are set by the user. --- var/spack/repos/builtin/packages/ipopt/package.py | 24 ++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ipopt/package.py b/var/spack/repos/builtin/packages/ipopt/package.py index caa37c3104..d96f3564fa 100644 --- a/var/spack/repos/builtin/packages/ipopt/package.py +++ b/var/spack/repos/builtin/packages/ipopt/package.py @@ -25,7 +25,7 @@ from spack import * -class Ipopt(Package): +class Ipopt(AutotoolsPackage): """Ipopt (Interior Point OPTimizer, pronounced eye-pea-Opt) is a software package for large-scale nonlinear optimization.""" homepage = "https://projects.coin-or.org/Ipopt" @@ -55,7 +55,14 @@ class Ipopt(Package): patch('ipopt_ppc_build.patch', when='arch=ppc64le') - def install(self, spec, prefix): + flag_handler = AutotoolsPackage.build_system_flags + build_directory = 'spack-build' + + # IPOPT does not build correctly in parallel on OS X + parallel = False + + def configure_args(self): + spec = self.spec # Dependency directories blas_dir = spec['blas'].prefix lapack_dir = spec['lapack'].prefix @@ -69,7 +76,7 @@ class Ipopt(Package): blas_lib = spec['blas'].libs.ld_flags lapack_lib = spec['lapack'].libs.ld_flags - configure_args = [ + args = [ "--prefix=%s" % prefix, "--with-mumps-incdir=%s" % mumps_dir.include, "--with-mumps-lib=%s" % mumps_libcmd, @@ -82,18 +89,13 @@ class Ipopt(Package): ] if 'coinhsl' in spec: - configure_args.extend([ + args.extend([ '--with-hsl-lib=%s' % spec['coinhsl'].libs.ld_flags, '--with-hsl-incdir=%s' % spec['coinhsl'].prefix.include]) if 'metis' in spec: - configure_args.extend([ + args.extend([ '--with-metis-lib=%s' % spec['metis'].libs.ld_flags, '--with-metis-incdir=%s' % spec['metis'].prefix.include]) - configure(*configure_args) - - # IPOPT does not build correctly in parallel on OS X - make(parallel=False) - make("test", parallel=False) - make("install", parallel=False) + return args -- cgit v1.2.3-70-g09d2 From 568db965cffe113127bc06a7198873cc6d454873 Mon Sep 17 00:00:00 2001 From: Howard Pritchard Date: Thu, 18 Jan 2018 13:41:16 -0700 Subject: ucx: update for release 1.2.2 (#6990) Signed-off-by: Howard Pritchard --- var/spack/repos/builtin/packages/ucx/package.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ucx/package.py b/var/spack/repos/builtin/packages/ucx/package.py index 3984b7a7e4..c1683d6dda 100644 --- a/var/spack/repos/builtin/packages/ucx/package.py +++ b/var/spack/repos/builtin/packages/ucx/package.py @@ -32,4 +32,8 @@ class Ucx(AutotoolsPackage): homepage = "http://www.openucx.org" url = "https://github.com/openucx/ucx/releases/download/v1.2.1/ucx-1.2.1.tar.gz" + # Current + version('1.2.2', 'ff3fe65e4ebe78408fc3151a9ce5d286') + + # Still supported version('1.2.1', '697c2fd7912614fb5a1dadff3bfa485c') -- cgit v1.2.3-70-g09d2 From 3686c250ed61473a0de456d9c7aed98c3187724b Mon Sep 17 00:00:00 2001 From: becker33 Date: Thu, 18 Jan 2018 17:55:44 -0800 Subject: Fix type issues with setting flag handlers (#6960) The flag_handlers method was being set as a bound method, but when reset in the package.py file it was being set as an unbound method (all python2 issues). This gets the underlying function information, which is the same in either case. The bug was uncovered for parmetis in #6858. This is a partial fix. Included are changes to the parmetis package.py file to make use of flag_handlers. --- lib/spack/spack/build_environment.py | 15 ++++++++++++++- lib/spack/spack/test/flag_handlers.py | 14 +++++++++++++- var/spack/repos/builtin/packages/parmetis/package.py | 11 ++++++++--- 3 files changed, 35 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py index dcc6e46ec6..b2a7e1f6d6 100644 --- a/lib/spack/spack/build_environment.py +++ b/lib/spack/spack/build_environment.py @@ -57,6 +57,7 @@ import os import shutil import sys import traceback +import types from six import iteritems from six import StringIO @@ -165,7 +166,19 @@ def set_compiler_environment_variables(pkg, env): env_flags = {} build_system_flags = {} for flag in spack.spec.FlagMap.valid_compiler_flags(): - injf, envf, bsf = pkg.flag_handler(flag, pkg.spec.compiler_flags[flag]) + # Always convert flag_handler to function type. + # This avoids discrepencies in calling conventions between functions + # and methods, or between bound and unbound methods in python 2. + # We cannot effectively convert everything to a bound method, which + # would be the simpler solution. + if isinstance(pkg.flag_handler, types.FunctionType): + handler = pkg.flag_handler + else: + if sys.version_info >= (3, 0): + handler = pkg.flag_handler.__func__ + else: + handler = pkg.flag_handler.im_func + injf, envf, bsf = handler(pkg, flag, pkg.spec.compiler_flags[flag]) inject_flags[flag] = injf or [] env_flags[flag] = envf or [] build_system_flags[flag] = bsf or [] diff --git a/lib/spack/spack/test/flag_handlers.py b/lib/spack/spack/test/flag_handlers.py index 0b785a948f..80dad9c35e 100644 --- a/lib/spack/spack/test/flag_handlers.py +++ b/lib/spack/spack/test/flag_handlers.py @@ -36,7 +36,7 @@ def temp_env(): os.environ = old_env -def add_O3_to_build_system_cflags(name, flags): +def add_O3_to_build_system_cflags(pkg, name, flags): build_system_flags = [] if name == 'cflags': build_system_flags.append('-O3') @@ -61,6 +61,18 @@ class TestFlagHandlers(object): assert 'SPACK_CPPFLAGS' not in os.environ assert 'CPPFLAGS' not in os.environ + def test_unbound_method(self, temp_env): + # Other tests test flag_handlers set as bound methods and functions. + # This tests an unbound method in python2 (no change in python3). + s = spack.spec.Spec('mpileaks cppflags=-g') + s.concretize() + pkg = spack.repo.get(s) + pkg.flag_handler = pkg.__class__.inject_flags + spack.build_environment.setup_package(pkg, False) + + assert os.environ['SPACK_CPPFLAGS'] == '-g' + assert 'CPPFLAGS' not in os.environ + def test_inject_flags(self, temp_env): s = spack.spec.Spec('mpileaks cppflags=-g') s.concretize() diff --git a/var/spack/repos/builtin/packages/parmetis/package.py b/var/spack/repos/builtin/packages/parmetis/package.py index dacd218f99..86fee57abb 100644 --- a/var/spack/repos/builtin/packages/parmetis/package.py +++ b/var/spack/repos/builtin/packages/parmetis/package.py @@ -53,6 +53,13 @@ class Parmetis(CMakePackage): # https://bitbucket.org/petsc/pkg-parmetis/commits/82409d68aa1d6cbc70740d0f35024aae17f7d5cb/raw/ # NOQA: E501 patch('pkg-parmetis-82409d68aa1d6cbc70740d0f35024aae17f7d5cb.patch') + def flag_handler(self, name, flags): + if name == 'cflags': + if '%pgi' in self.spec: + my_flags = flags + ['-c11'] + return (None, None, my_flags) + return (None, None, flags) + def url_for_version(self, version): url = 'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis' if version < Version('3.2.0'): @@ -68,9 +75,7 @@ class Parmetis(CMakePackage): '-DGKLIB_PATH:PATH=%s/GKlib' % spec['metis'].prefix.include, '-DMETIS_PATH:PATH=%s' % spec['metis'].prefix, '-DCMAKE_C_COMPILER:STRING=%s' % spec['mpi'].mpicc, - '-DCMAKE_CXX_COMPILER:STRING=%s' % spec['mpi'].mpicxx, - '-DCMAKE_C_FLAGS:STRING=%s' % ( - '-c11' if '%pgi' in spec else ''), + '-DCMAKE_CXX_COMPILER:STRING=%s' % spec['mpi'].mpicxx ]) if '+shared' in spec: -- cgit v1.2.3-70-g09d2 From a102177db7f69974e61e9eaf3a5619c7c3960590 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Fri, 19 Jan 2018 09:38:21 -0700 Subject: miniqmc: initial commit (#6991) --- .../repos/builtin/packages/miniqmc/package.py | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 var/spack/repos/builtin/packages/miniqmc/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/miniqmc/package.py b/var/spack/repos/builtin/packages/miniqmc/package.py new file mode 100644 index 0000000000..4d7364e899 --- /dev/null +++ b/var/spack/repos/builtin/packages/miniqmc/package.py @@ -0,0 +1,52 @@ +############################################################################## +# Copyright (c) 2018, Los Alamos National Security, LLC +# Produced at the Los Alamos National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Miniqmc(CMakePackage): + """a simplified real space QMC code for algorithm development, + performance portability testing, and computer science experiments + """ + + homepage = "https://github.com/QMCPACK/miniqmc" + url = "https://github.com/QMCPACK/miniqmc/archive/0.2.0.tar.gz" + + version('0.2.0', 'b96bacaf48b8e9c0de05d04a95066bc1') + + tags = ['proxy-app'] + + depends_on('mpi') + depends_on('lapack') + + def cmake_args(self): + args = [ + '-DCMAKE_CXX_COMPILER=%s' % self.spec['mpi'].mpicxx, + '-DCMAKE_C_COMPILER=%s' % self.spec['mpi'].mpicc + ] + return args + + def install(self, spec, prefix): + install_tree(join_path('spack-build', 'bin'), prefix.bin) + install_tree(join_path('spack-build', 'lib'), prefix.lib) -- cgit v1.2.3-70-g09d2 From 48ae4c22b24d04ed4004dababde53d37c931adf7 Mon Sep 17 00:00:00 2001 From: Geoffrey Malcolm Oxberry Date: Tue, 16 Jan 2018 03:29:00 -0800 Subject: vtk@:6.1.0 : fix NetCDF C++ bindings detection VTK 6.1.0 and earlier do not use paths stored in `NETCDF_CXX_ROOT` to detect the presence of NetCDF C++ headers and libraries. Consequently, VTK 6.1.0 does not build. This commit fixes this bug by setting the advanced variables `NETCDF_CXX_INCLUDE_DIR` and `NETCDF_CXX_LIBRARY` at the command line to specify the directory containing headers and the full library path for the NetCDF C++ bindings. --- var/spack/repos/builtin/packages/vtk/package.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py index f5b95108c9..bce6cc2475 100644 --- a/var/spack/repos/builtin/packages/vtk/package.py +++ b/var/spack/repos/builtin/packages/vtk/package.py @@ -103,4 +103,15 @@ class Vtk(CMakePackage): '-DCMAKE_CXX_FLAGS=-DGLX_GLXEXT_LEGACY' ]) + # VTK 6.1.0 (and possibly earlier) does not use + # NETCDF_CXX_ROOT to detect NetCDF C++ bindings, so + # NETCDF_CXX_INCLUDE_DIR and NETCDF_CXX_LIBRARY must be + # used instead to detect these bindings + netcdf_cxx_lib = spec['netcdf-cxx'].libs.joined() + cmake_args.extend([ + '-DNETCDF_CXX_INCLUDE_DIR={0}'.format( + spec['netcdf-cxx'].prefix.include), + '-DNETCDF_CXX_LIBRARY={0}'.format(netcdf_cxx_lib), + ]) + return cmake_args -- cgit v1.2.3-70-g09d2 From 7c4c6e72ad55d5618e90ab831a93e7d2553bb8c5 Mon Sep 17 00:00:00 2001 From: Geoffrey Malcolm Oxberry Date: Tue, 16 Jan 2018 03:34:41 -0800 Subject: vtk@:6.1.0 : disable Obj-C gc for XCode >= 5.1 Apple removed support for Objective-C garbage collection in binaries in XCode 5.1, but VTK 6.1.0 and earlier set flags for garbage collection, resulting in a compile-time bug when compiling VTK using any recent version of XCode (i.e., Apple Clang). This commit fixes this bug by removing the garbage collection flags via setting the variable `VTK_REQUIRED_OBJCXX_FLAGS` to the empty string. This variable has the same value (i.e., the empty string) in the root-level CMakeLists.txt file for VTK 6.2.0 and later. --- var/spack/repos/builtin/packages/vtk/package.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py index bce6cc2475..caf11b1fc7 100644 --- a/var/spack/repos/builtin/packages/vtk/package.py +++ b/var/spack/repos/builtin/packages/vtk/package.py @@ -114,4 +114,16 @@ class Vtk(CMakePackage): '-DNETCDF_CXX_LIBRARY={0}'.format(netcdf_cxx_lib), ]) + # Garbage collection is unsupported in Xcode starting with + # version 5.1; if the Apple clang version of the compiler + # is 5.1.0 or later, unset the required Objective-C flags + # to remove the garbage collection flags. Versions of VTK + # after 6.1.0 set VTK_REQUIRED_OBJCXX_FLAGS to the empty + # string. This fix was recommended on the VTK mailing list + # in March 2014 (see + # https://public.kitware.com/pipermail/vtkusers/2014-March/083368.html) + if (self.compiler.is_apple and + self.compiler.version >= Version('5.1.0')): + cmake_args.extend(['-DVTK_REQUIRED_OBJCXX_FLAGS=""']) + return cmake_args -- cgit v1.2.3-70-g09d2 From cf736ae9116314f01ab1ba9ca49bd6268fb28f61 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Sat, 20 Jan 2018 05:53:50 -0800 Subject: qt@4 : update corewlan patch for OS X 10.1[23] (#6943) Update the qt4 CoreWLAN patch to apply to macOS/OS X 10.12 and 10.13, which both still use the CoreWLAN framework in their SDKs (although it's apparently deprecated?!). Without this patch update, `spack install qt@4.8.6` fails on macOS/OS X 10.12 because the linker cannot find headers from the CoreWLAN framework. --- var/spack/repos/builtin/packages/qt/qt4-corewlan-new-osx.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/qt/qt4-corewlan-new-osx.patch b/var/spack/repos/builtin/packages/qt/qt4-corewlan-new-osx.patch index 370edf7fa5..a4b652e401 100644 --- a/var/spack/repos/builtin/packages/qt/qt4-corewlan-new-osx.patch +++ b/var/spack/repos/builtin/packages/qt/qt4-corewlan-new-osx.patch @@ -1,16 +1,16 @@ diff -Nr -U5 qt-everywhere-opensource-src-4.8.6/src/plugins/bearer/corewlan/corewlan.pro qt-everywhere-opensource-src-4.8.6.corewlan-new-osx/src/plugins/bearer/corewlan/corewlan.pro --- qt-everywhere-opensource-src-4.8.6/src/plugins/bearer/corewlan/corewlan.pro 2014-04-10 14:37:12.000000000 -0400 +++ qt-everywhere-opensource-src-4.8.6.corewlan-new-osx/src/plugins/bearer/corewlan/corewlan.pro 2015-12-02 12:21:34.608585392 -0500 -@@ -3,11 +3,11 @@ - +@@ -3,9 +3,9 @@ + QT = core network LIBS += -framework Foundation -framework SystemConfiguration - + contains(QT_CONFIG, corewlan) { - isEmpty(QMAKE_MAC_SDK)|contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10\.[67]\.sdk") { -+ isEmpty(QMAKE_MAC_SDK)|contains(QMAKE_MAC_SDK, ".*MacOSX10\.([6789]|1[01])\.sdk") { ++ isEmpty(QMAKE_MAC_SDK)|contains(QMAKE_MAC_SDK, ".*MacOSX10\.([6789]|1[0123])\.sdk") { LIBS += -framework CoreWLAN -framework Security } } - + HEADERS += qcorewlanengine.h \ -- cgit v1.2.3-70-g09d2 From 62d53b2a5be7053cec83e417d099112fe02eb810 Mon Sep 17 00:00:00 2001 From: Bruno Turcksin Date: Sat, 20 Jan 2018 11:10:25 -0500 Subject: Add boost 1.66.0 (#7000) --- var/spack/repos/builtin/packages/boost/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index 91b83ac0b4..9730f7a4d2 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -46,6 +46,8 @@ class Boost(Package): branch='develop', submodules=True) + version('1.66.0', 'b6b284acde2ad7ed49b44e856955d7b1ea4e9459', + url='https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2') version('1.65.1', '41d7542ce40e171f3f7982aff008ff0d', url='https://dl.bintray.com/boostorg/release/1.65.1/source/boost_1_65_1.tar.bz2') version('1.65.0', '5512d3809801b0a1b9dd58447b70915d', -- cgit v1.2.3-70-g09d2 From 40ab8fe31f04215c2552031c421813d6e455e67c Mon Sep 17 00:00:00 2001 From: Ondřej Čertík Date: Sat, 20 Jan 2018 09:20:00 -0700 Subject: Add Abinit 8.6.3 (#6959) --- var/spack/repos/builtin/packages/abinit/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/abinit/package.py b/var/spack/repos/builtin/packages/abinit/package.py index 59040cd0d8..2769118593 100644 --- a/var/spack/repos/builtin/packages/abinit/package.py +++ b/var/spack/repos/builtin/packages/abinit/package.py @@ -47,8 +47,9 @@ class Abinit(AutotoolsPackage): """ homepage = 'http://www.abinit.org' - url = 'http://ftp.abinit.org/abinit-8.0.8b.tar.gz' + url = 'https://www.abinit.org/sites/default/files/packages/abinit-8.6.3.tar.gz' + version('8.6.3', '6c34d2cec0cf0008dd25b8ec1b6d3ee8') version('8.2.2', '5f25250e06fdc0815c224ffd29858860') # Versions before 8.0.8b are not supported. version('8.0.8b', 'abc9e303bfa7f9f43f95598f87d84d5d') -- cgit v1.2.3-70-g09d2 From 0dee143c72767f2ecbe7e9a613bc465558a83dcb Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Sun, 21 Jan 2018 01:38:31 +0800 Subject: A new package: lumpy-sv. (#7009) --- .../repos/builtin/packages/lumpy-sv/package.py | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 var/spack/repos/builtin/packages/lumpy-sv/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lumpy-sv/package.py b/var/spack/repos/builtin/packages/lumpy-sv/package.py new file mode 100644 index 0000000000..a2ffca2b8e --- /dev/null +++ b/var/spack/repos/builtin/packages/lumpy-sv/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class LumpySv(MakefilePackage): + """A probabilistic framework for structural variant discovery.""" + + homepage = "https://github.com/arq5x/lumpy-sv" + url = "https://github.com/arq5x/lumpy-sv/archive/0.2.13.tar.gz" + + version('0.2.13', '36929d29fc3a171d3abbe1d93f9f3b50') + + depends_on('htslib') + + def edit(self, spec, prefix): + makefile = FileFilter('Makefile') + makefile.filter('export CXX .*', '') + + def install(self, spec, prefix): + install_tree('bin', prefix.bin) -- cgit v1.2.3-70-g09d2 From e3b8d6ef08a27fa709376c1a2ea592b539fdc655 Mon Sep 17 00:00:00 2001 From: peetsv <32349688+peetsv@users.noreply.github.com> Date: Sat, 20 Jan 2018 09:39:29 -0800 Subject: sniffles: add version 1.0.7 (#7004) --- var/spack/repos/builtin/packages/sniffles/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sniffles/package.py b/var/spack/repos/builtin/packages/sniffles/package.py index caa6591a5e..80850e13e3 100644 --- a/var/spack/repos/builtin/packages/sniffles/package.py +++ b/var/spack/repos/builtin/packages/sniffles/package.py @@ -31,6 +31,7 @@ class Sniffles(CMakePackage): homepage = "https://github.com/fritzsedlazeck/Sniffles/wiki" url = "https://github.com/fritzsedlazeck/Sniffles/archive/v1.0.5.tar.gz" + version('1.0.7', '83bd93c5ab5dad3a6dc776f11d3a880e') version('1.0.5', 'c2f2350d00418ba4d82c074e7f0b1832') # the build process doesn't actually install anything, do it by hand -- cgit v1.2.3-70-g09d2 From 21926440716a66b09b40149bfeb9c3a495fe8c9a Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 20 Jan 2018 12:09:23 -0600 Subject: perl-list-moreutils: Create new package (#6997) --- .../packages/perl-list-moreutils/package.py | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-list-moreutils/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-list-moreutils/package.py b/var/spack/repos/builtin/packages/perl-list-moreutils/package.py new file mode 100644 index 0000000000..8fa21b9392 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-list-moreutils/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlListMoreutils(PerlPackage): + """Provide the stuff missing in List::Util""" + + homepage = "http://search.cpan.org/~rehsack/List-MoreUtils/lib/List/MoreUtils.pm" + url = "http://search.cpan.org/CPAN/authors/id/R/RE/REHSACK/List-MoreUtils-0.428.tar.gz" + + version('0.428', '493032a211cdff1fcf45f59ebd680407') -- cgit v1.2.3-70-g09d2 From b83936a1f9fc0b3225bd899317df6047b7b64d2b Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Sat, 20 Jan 2018 10:11:18 -0800 Subject: ipopt: add version 3.12.9 (#6982) --- var/spack/repos/builtin/packages/ipopt/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ipopt/package.py b/var/spack/repos/builtin/packages/ipopt/package.py index d96f3564fa..43879c2cad 100644 --- a/var/spack/repos/builtin/packages/ipopt/package.py +++ b/var/spack/repos/builtin/packages/ipopt/package.py @@ -31,6 +31,7 @@ class Ipopt(AutotoolsPackage): homepage = "https://projects.coin-or.org/Ipopt" url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-3.12.4.tgz" + version('3.12.9', '8ff3fe1a8560896fc5559839a87c2530cac4ed231b0806e487bfd3cf2d294ab8') version('3.12.8', '62c6de314220851b8f4d6898b9ae8cf0a8f1e96b68429be1161f8550bb7ddb03') version('3.12.7', '2a36e4a04717a8ed7012ac7d1253ae4ffbc1a8fd') version('3.12.6', 'ed4072427fab786fcf6082fe7e6f6c2ed9b5e6f8') -- cgit v1.2.3-70-g09d2 From 7fc654b6a3e473ca5a0bf669141d6288bfb78c8a Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Sat, 20 Jan 2018 12:18:07 -0600 Subject: r-getopt: new package (#6973) --- .../repos/builtin/packages/r-getopt/package.py | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-getopt/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-getopt/package.py b/var/spack/repos/builtin/packages/r-getopt/package.py new file mode 100644 index 0000000000..9b4881c879 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-getopt/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RGetopt(RPackage): + """Package designed to be used with Rscript to write "#!" shebang scripts + that accept short and long flags/options. Many users will prefer using + instead the packages optparse or argparse which add extra features like + automatically generated help option and usage, support for default + values, positional argument support, etc.""" + + homepage = "https://github.com/trevorld/getopt" + url = "https://cran.r-project.org/src/contrib/getopt_1.20.1.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/getopt" + + version('1.20.1', '323cf2846e306f49236b8174bc3d4e47') -- cgit v1.2.3-70-g09d2 From 2fc3e23e476002618dd32804a6a111264039dbb9 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Sat, 20 Jan 2018 19:42:21 +0100 Subject: gtkplus: Update to 2.24.32 (#6964) --- var/spack/repos/builtin/packages/gtkplus/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gtkplus/package.py b/var/spack/repos/builtin/packages/gtkplus/package.py index a1501cb4a9..cd9b420517 100644 --- a/var/spack/repos/builtin/packages/gtkplus/package.py +++ b/var/spack/repos/builtin/packages/gtkplus/package.py @@ -31,6 +31,7 @@ class Gtkplus(AutotoolsPackage): homepage = "http://www.gtk.org" url = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.31.tar.xz" + version('2.24.32', 'b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e') version('2.24.31', '68c1922732c7efc08df4656a5366dcc3afdc8791513400dac276009b40954658') version('2.24.25', '38af1020cb8ff3d10dda2c8807f11e92af9d2fa4045de61c62eedb7fbc7ea5b3') -- cgit v1.2.3-70-g09d2 From 9d84e7eb5c2847c029f0c5bb020eab169293c1cd Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Sat, 20 Jan 2018 12:09:31 -0800 Subject: llvm: add version 5.0.1 (#6957) --- var/spack/repos/builtin/packages/llvm/package.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index 64045c2684..3f4562e951 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -170,6 +170,21 @@ class Llvm(CMakePackage): 'libunwind': 'http://llvm.org/svn/llvm-project/libunwind/trunk', } }, + { + 'version': '5.0.1', + 'md5': '3a4ec6dcbc71579eeaec7cb157fe2168', + 'resources': { + 'compiler-rt': '6329380d643fb5dc5f5abdd0d5eecd70', + 'openmp': '7f9c8f6aecd97df9c18187157ed2f813', + 'polly': '49c49fb61b0e73855fc21a60db9f5ab3', + 'libcxx': 'a9dd49822f2c82cef9a9240d1714a67c', + 'libcxxabi': '60972ef307539aa517c9878d45b43452', + 'cfe': 'e4daa278d8f252585ab73d196484bf11', + 'clang-tools-extra': 'c2bd3733c183b033b49f7a416c6dca36', + 'lldb': 'd64078681215b5935614b6b83b2d1463', + 'libunwind': 'ccf48200065481244d3d09828d54e87f', + } + }, { 'version': '5.0.0', 'md5': '5ce9c5ad55243347ea0fdb4c16754be0', -- cgit v1.2.3-70-g09d2 From 9f0e17a5389e6e09d0198785241ff5d98b42498d Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Sat, 20 Jan 2018 21:36:45 +0100 Subject: flex: restrict GCC conflict to newer Ubuntu releases (#6963) flex 2.6.4 compiles fine with GCC 7 on (at least) Ubuntu 16.04 and Fedora 27. --- var/spack/repos/builtin/packages/flex/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/flex/package.py b/var/spack/repos/builtin/packages/flex/package.py index a4a9718e04..25e895d921 100644 --- a/var/spack/repos/builtin/packages/flex/package.py +++ b/var/spack/repos/builtin/packages/flex/package.py @@ -53,9 +53,9 @@ class Flex(AutotoolsPackage): depends_on('automake', type='build', when='@:2.6.0') depends_on('libtool', type='build', when='@:2.6.0') - # Build issue for v2.6.4 when gcc 7.2.0 is used. + # Build issue for v2.6.4 when gcc 7.2.0 is used on Ubuntu 17.10. # See issue #219; https://github.com/westes/flex/issues/219 - conflicts('%gcc@7.2.0:', when='@2.6.4') + conflicts('%gcc@7.2.0: os=ubuntu17.10', when='@2.6.4') def url_for_version(self, version): url = "https://github.com/westes/flex" -- cgit v1.2.3-70-g09d2 From e98a85c8072e3912bb469abcff48f0250e9e237f Mon Sep 17 00:00:00 2001 From: sknigh Date: Sat, 20 Jan 2018 12:56:55 -0800 Subject: Added added libssh2@1.8.0 (#6951) --- var/spack/repos/builtin/packages/libssh2/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libssh2/package.py b/var/spack/repos/builtin/packages/libssh2/package.py index 030e7aeab5..7bac2c827e 100644 --- a/var/spack/repos/builtin/packages/libssh2/package.py +++ b/var/spack/repos/builtin/packages/libssh2/package.py @@ -31,6 +31,7 @@ class Libssh2(CMakePackage): homepage = "https://www.libssh2.org/" url = "https://www.libssh2.org/download/libssh2-1.7.0.tar.gz" + version('1.8.0', '3d1147cae66e2959ea5441b183de1b1c') version('1.7.0', 'b01662a210e94cccf2f76094db7dac5c') version('1.4.3', '071004c60c5d6f90354ad1b701013a0b') # CentOS7 -- cgit v1.2.3-70-g09d2 From 27bb18bae2458c8d2e5e10814b6796ec119c4832 Mon Sep 17 00:00:00 2001 From: sknigh Date: Sat, 20 Jan 2018 12:57:41 -0800 Subject: Added libgit2@0.26.0 (#6952) --- var/spack/repos/builtin/packages/libgit2/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libgit2/package.py b/var/spack/repos/builtin/packages/libgit2/package.py index 9ea82790ac..adcb9bf3d3 100644 --- a/var/spack/repos/builtin/packages/libgit2/package.py +++ b/var/spack/repos/builtin/packages/libgit2/package.py @@ -35,6 +35,7 @@ class Libgit2(CMakePackage): homepage = "https://libgit2.github.com/" url = "https://github.com/libgit2/libgit2/archive/v0.24.2.tar.gz" + version('0.26.0', '6ea75a8a5745a7b2a14d3ed94486e761') version('0.24.2', '735661b5b73e3c120d13e2bae21e49b3') depends_on('cmake@2.8:', type='build') -- cgit v1.2.3-70-g09d2 From 6170ca863dd8f3cb7c1e0e86f51fcb6a097ce421 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Sat, 20 Jan 2018 21:59:24 +0100 Subject: dealii: update CMake dependency (#7010) --- var/spack/repos/builtin/packages/dealii/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index c64552478f..26450abc2e 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -125,9 +125,9 @@ class Dealii(CMakePackage, CudaPackage): depends_on('hdf5+mpi+hl', when='+hdf5+mpi') depends_on('cuda@8:', when='+cuda') depends_on('cmake@3.9:', when='+cuda') - # currently deal.II does not build with Cmake 3.10, see + # older version of deal.II do not build with Cmake 3.10, see # https://github.com/dealii/dealii/issues/5510 - depends_on('cmake@:3.9.99') + depends_on('cmake@:3.9.99', when='@:8.99') # FIXME: concretizer bug. The two lines mimic what comes from PETSc # but we should not need it depends_on('metis@5:+int64+real64', when='+metis+int64') -- cgit v1.2.3-70-g09d2 From 202c413ae061227de07a67fd44bcb181fd747a4e Mon Sep 17 00:00:00 2001 From: Hans Pabst Date: Sun, 21 Jan 2018 16:14:26 +0100 Subject: LIBXSMM 1.8.2 (#6896) * Included LIBXSMM 1.8 into the list of available versions. * LIBXSMM 1.8.1 * LIBXSMM 1.8.2 (release notes: https://github.com/hfp/libxsmm/releases/tag/1.8.2). * LIBXSMM: Use join_path instead of hard-coding the separator. Install "version.txt" into the documentation directory. Removed installing "README.md" from LIBXSMM's root directory as it overrides README.md provided there. The latter uses correct relative references to the other documentation parts. Note: Apparently, "FC=/path/to/gfortran spack install libxsmm" is currently needed for Spack since does not pick-up the Fortran compiler (but incorrectly uses the C compiler instead). * LIBXSMM: converted Package into MakefilePackage (to address https://github.com/spack/spack/pull/6896#discussion_r160993923). * LIBXSMM: account for changed file set in 1.8.2 onward (addresses https://github.com/spack/spack/pull/6896#pullrequestreview-88670974). * Fixed incorrect behavior of "+header-only", which did not install the "src" folder. Addressed https://github.com/spack/spack/pull/6896#discussion_r162783180 and https://github.com/spack/spack/pull/6896#discussion_r162783221. * Use conflicts msg argument to present a friendly error message. --- .../repos/builtin/packages/libxsmm/package.py | 49 +++++++++++----------- 1 file changed, 25 insertions(+), 24 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libxsmm/package.py b/var/spack/repos/builtin/packages/libxsmm/package.py index ec1fa2f0bc..921fb02151 100644 --- a/var/spack/repos/builtin/packages/libxsmm/package.py +++ b/var/spack/repos/builtin/packages/libxsmm/package.py @@ -26,16 +26,17 @@ from spack import * from glob import glob -class Libxsmm(Package): +class Libxsmm(MakefilePackage): '''Library targeting Intel Architecture for small, dense or sparse matrix multiplications, and small convolutions.''' homepage = 'https://github.com/hfp/libxsmm' - url = 'https://github.com/hfp/libxsmm/archive/1.8.1.tar.gz' + url = 'https://github.com/hfp/libxsmm/archive/1.8.2.tar.gz' version('develop', git='https://github.com/hfp/libxsmm.git') + version('1.8.2', '8f11ece699244c28dcb6742969a2ccd4') version('1.8.1', 'ece51ec767580f4542f509655daa5ec0') version('1.8', '2d513afbdad99e5d04c6c4ab4c9bb25b') version('1.7.1', 'a938335b1c2c90616dc72c2c1a5824ab') @@ -60,6 +61,8 @@ class Libxsmm(Package): description='Unoptimized with call-trace (LIBXSMM_TRACE).') variant('header-only', default=False, description='Produce header-only installation') + conflicts('+header-only', when='@:1.6.2', + msg='Header-only is available since v1.6.2!') @property def libs(self): @@ -70,7 +73,7 @@ class Libxsmm(Package): shared=False, recurse=True) return result - def patch(self): + def edit(self, spec, prefix): kwargs = {'ignore_absent': False, 'backup': False, 'string': True} makefile = FileFilter('Makefile.inc') @@ -83,26 +86,7 @@ class Libxsmm(Package): makefile.filter('FC = ifort', 'FC ?= ifort', **kwargs) makefile.filter('FC = gfortran', 'FC ?= gfortran', **kwargs) - def manual_install(self, prefix): - spec = self.spec - install_tree('include', prefix.include) - if '~header-only' in spec: - install_tree('lib', prefix.lib) - doc_path = prefix.share + '/libxsmm/doc' - mkdirp(doc_path) - for doc_file in glob('documentation/*.md'): - install(doc_file, doc_path) - for doc_file in glob('documentation/*.pdf'): - install(doc_file, doc_path) - install('README.md', doc_path) - install('LICENSE', doc_path) - - def install(self, spec, prefix): - if '+header-only' in spec and '@1.6.2:' not in spec: - raise InstallError( - "The variant +header-only is only available " + - "for versions @1.6.2:") - + def build(self, spec, prefix): # include symbols by default make_args = ['SYM=1'] @@ -118,4 +102,21 @@ class Libxsmm(Package): make_args += ['TRACE=1'] make(*make_args) - self.manual_install(prefix) + + def install(self, spec, prefix): + install_tree('include', prefix.include) + if '+header-only' in spec: + install_tree('src', prefix.src) + else: + install_tree('lib', prefix.lib) + mkdirp(prefix.doc) + for doc_file in glob(join_path('documentation', '*.md')): + install(doc_file, prefix.doc) + for doc_file in glob(join_path('documentation', '*.pdf')): + install(doc_file, prefix.doc) + if '@1.8.2:' in spec: + install('LICENSE.md', prefix.doc) + else: + install('README.md', prefix.doc) + install('LICENSE', prefix.doc) + install('version.txt', prefix.doc) -- cgit v1.2.3-70-g09d2 From 227b58bb67c19b342c4f26ce4903ebc429708735 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Sun, 21 Jan 2018 07:16:23 -0800 Subject: Visit 2.13.0 (#6947) * visit: add version 2.12.3 * visit: add version 2.13.0 * visit: enable building with hdf5+mpi * visit: add qwt dependency Building VisIt requires Qwt, which is not part of Qt. Prior to this commit, this dependency was not included in the VisIt spack package, resulting in a configure-time bug with an error message indicating a missing Qwt dependency. This commit fixes this bug by adding Qwt dependency information. --- var/spack/repos/builtin/packages/visit/package.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/visit/package.py b/var/spack/repos/builtin/packages/visit/package.py index 56dec99eec..7701a9ce73 100644 --- a/var/spack/repos/builtin/packages/visit/package.py +++ b/var/spack/repos/builtin/packages/visit/package.py @@ -31,6 +31,8 @@ class Visit(CMakePackage): homepage = "https://wci.llnl.gov/simulation/computer-codes/visit/" url = "http://portal.nersc.gov/project/visit/releases/2.10.1/visit2.10.1.tar.gz" + version('2.13.0', '716644b8e78a00ff82691619d4d1e7a914965b6535884890b667b97ba08d6a0f') + version('2.12.3', '2dd351a291ee3e79926bc00391ca89b202cfa4751331b0fdee1b960c7922161f') version('2.12.2', '355779b1dbf440cdd548526eecd77b60') version('2.10.3', 'a1082a6f6dab3e2dcb58993603456c2b') version('2.10.2', '253de0837a9d69fb689befc98ea4d068') @@ -39,23 +41,30 @@ class Visit(CMakePackage): depends_on('cmake@3.0:', type='build') depends_on('vtk@6.1.0~opengl2') depends_on('qt@4.8.6') + depends_on('qwt') depends_on('python') depends_on('silo+shared') - depends_on('hdf5~mpi') + depends_on('hdf5') root_cmakelists_dir = 'src' def cmake_args(self): spec = self.spec qt_bin = spec['qt'].prefix.bin - - return [ + args = [ '-DVTK_MAJOR_VERSION={0}'.format(spec['vtk'].version[0]), '-DVTK_MINOR_VERSION={0}'.format(spec['vtk'].version[1]), + '-DVISIT_VTK_DIR:PATH={0}'.format(spec['vtk'].prefix), '-DVISIT_USE_GLEW=OFF', '-DVISIT_LOC_QMAKE_EXE:FILEPATH={0}/qmake-qt4'.format(qt_bin), '-DPYTHON_DIR:PATH={0}'.format(spec['python'].home), '-DVISIT_SILO_DIR:PATH={0}'.format(spec['silo'].prefix), '-DVISIT_HDF5_DIR:PATH={0}'.format(spec['hdf5'].prefix), - '-DVISIT_VTK_DIR:PATH={0}'.format(spec['vtk'].prefix), + '-DVISIT_QWT_DIR:PATH={0}'.format(spec['qwt'].prefix) ] + + if spec.satisfies('^hdf5+mpi', strict=True): + args.append('-DVISIT_HDF5_MPI_DIR:PATH={0}'.format( + spec['hdf5'].prefix)) + + return args -- cgit v1.2.3-70-g09d2 From cd82a9e0502da329b9ac8790aaa46c10cd541289 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 22 Jan 2018 00:08:41 -0600 Subject: perl-perlio-gzip: Create new package (#7018) --- .../builtin/packages/perl-perlio-gzip/package.py | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-perlio-gzip/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-perlio-gzip/package.py b/var/spack/repos/builtin/packages/perl-perlio-gzip/package.py new file mode 100644 index 0000000000..7add6a916b --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-perlio-gzip/package.py @@ -0,0 +1,35 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlPerlioGzip(PerlPackage): + """Perl extension to provide a PerlIO layer to gzip/gunzip""" + + homepage = "http://search.cpan.org/~nwclark/PerlIO-gzip/gzip.pm" + url = "http://search.cpan.org/CPAN/authors/id/N/NW/NWCLARK/PerlIO-gzip-0.19.tar.gz" + + version('0.20', '0393eae5d0b23df6cf40ed44af7d711c') + version('0.19', 'dbcfc1450f6b593b65048b8ced061c98') -- cgit v1.2.3-70-g09d2 From 02b9cf5085452fe8c460ab8224144fe54e794c4a Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 22 Jan 2018 00:09:34 -0600 Subject: perl-app-cmd: Create new package (#7019) --- .../repos/builtin/packages/perl-app-cmd/package.py | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-app-cmd/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-app-cmd/package.py b/var/spack/repos/builtin/packages/perl-app-cmd/package.py new file mode 100644 index 0000000000..50688a5336 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-app-cmd/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlAppCmd(PerlPackage): + """Write command line apps with less suffering""" + + homepage = "http://search.cpan.org/~rjbs/App-Cmd/lib/App/Cmd.pm" + url = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/App-Cmd-0.331.tar.gz" + + version('0.331', 'b43c07d7b4d4e2a6baf32aa92cd00b93') -- cgit v1.2.3-70-g09d2 From 1733dff9771b440732d001ef78df4718cfbebd7b Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 22 Jan 2018 00:10:17 -0600 Subject: perl-array-utils: Create new package (#7020) --- .../builtin/packages/perl-array-utils/package.py | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-array-utils/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-array-utils/package.py b/var/spack/repos/builtin/packages/perl-array-utils/package.py new file mode 100644 index 0000000000..3bbade9525 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-array-utils/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlArrayUtils(PerlPackage): + """Small utils for array manipulation""" + + homepage = "http://search.cpan.org/~zmij/Array-Utils/Utils.pm" + url = "http://search.cpan.org/CPAN/authors/id/Z/ZM/ZMIJ/Array/Array-Utils-0.5.tar.gz" + + version('0.5', 'ac15e6dce2c7c9d1855ecab9eb00aee6') -- cgit v1.2.3-70-g09d2 From cfd68e48a4a9f9b72b6a9ee7f2876fb55e4f60c6 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 22 Jan 2018 00:10:58 -0600 Subject: perl-graph: Create new package (#7022) --- .../repos/builtin/packages/perl-graph/package.py | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-graph/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-graph/package.py b/var/spack/repos/builtin/packages/perl-graph/package.py new file mode 100644 index 0000000000..5a3bb7cf94 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-graph/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlGraph(PerlPackage): + """Graph data structures and algorithms""" + + homepage = "http://search.cpan.org/~jhi/Graph/lib/Graph.pod" + url = "http://search.cpan.org/CPAN/authors/id/J/JH/JHI/Graph-0.9704.tar.gz" + + version('0.9704', '1ab4e49420e56eeb1bc81d842aa8f3af') + + depends_on('perl@5.6.0:') -- cgit v1.2.3-70-g09d2 From 55c3451b87ef5c921c9ff12233b2568f89228cd7 Mon Sep 17 00:00:00 2001 From: "Kelly (KT) Thompson" Date: Sun, 21 Jan 2018 23:12:00 -0700 Subject: Version update for 2.22 (#7023) --- var/spack/repos/builtin/packages/ack/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ack/package.py b/var/spack/repos/builtin/packages/ack/package.py index ec1b6d2a22..b532ce2414 100644 --- a/var/spack/repos/builtin/packages/ack/package.py +++ b/var/spack/repos/builtin/packages/ack/package.py @@ -35,6 +35,7 @@ class Ack(Package): homepage = "http://beyondgrep.com/" url = "http://beyondgrep.com/ack-2.14-single-file" + version('2.22', 'eea9d4daef7c262751f15ca9b3b70317', expand=False) version('2.18', 'e8ebfd7a7ec8476bffd4686bf7b14fd7', expand=False) version('2.16', '7085b5a5c76fda43ff049410870c8535', expand=False) version('2.14', 'e74150a1609d28a70b450ef9cc2ed56b', expand=False) -- cgit v1.2.3-70-g09d2 From d2c344152739999c48420c7382cda9855fba7a71 Mon Sep 17 00:00:00 2001 From: Scott Wittenburg Date: Mon, 22 Jan 2018 11:46:44 -0700 Subject: Update gl/qt options for vtk package (#6551) This provides options for hardware and software rendering with the gl API and updates the vtk package to make use of those options: * Create new "gl" virtual package, provided by mesa * Add external-only "opengl" package, which represents a system install that provides gl * For vtk: prefer system gl implementation by default to get speed up from hardware rendering. When software rendering is specifically requested (+osmesa), try to use the llvmpipe approach, as it is much faster. * Make qt dependency optional for vtk * Add basic support for VTK on osx * qt: Depend on virtual gl package, rather than mesa impl --- etc/spack/defaults/packages.yaml | 1 + var/spack/repos/builtin/packages/mesa/package.py | 4 + var/spack/repos/builtin/packages/opengl/package.py | 58 ++++++++++ var/spack/repos/builtin/packages/qt/package.py | 3 +- var/spack/repos/builtin/packages/vtk/package.py | 124 +++++++++++++++++---- 5 files changed, 168 insertions(+), 22 deletions(-) create mode 100644 var/spack/repos/builtin/packages/opengl/package.py (limited to 'var') diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml index 92a5eef139..4a4df28f46 100644 --- a/etc/spack/defaults/packages.yaml +++ b/etc/spack/defaults/packages.yaml @@ -21,6 +21,7 @@ packages: blas: [openblas] daal: [intel-daal] elf: [elfutils] + gl: [mesa, opengl] golang: [gcc] ipp: [intel-ipp] java: [jdk] diff --git a/var/spack/repos/builtin/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py index 7d10632806..2912f6c789 100644 --- a/var/spack/repos/builtin/packages/mesa/package.py +++ b/var/spack/repos/builtin/packages/mesa/package.py @@ -46,6 +46,10 @@ class Mesa(AutotoolsPackage): version('12.0.6', '1a3d4fea0656c208db59289e4ed33b3f') version('12.0.3', '1113699c714042d8c4df4766be8c57d8') + provides('gl@:4.5', when='@17:') + provides('gl@:4.4', when='@13:') + provides('gl@:4.3', when='@12:') + variant('swrender', default=True, description="Build with (gallium) software rendering.") variant('hwrender', default=False, diff --git a/var/spack/repos/builtin/packages/opengl/package.py b/var/spack/repos/builtin/packages/opengl/package.py new file mode 100644 index 0000000000..9d9e52f959 --- /dev/null +++ b/var/spack/repos/builtin/packages/opengl/package.py @@ -0,0 +1,58 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Opengl(Package): + """Placeholder for external OpenGL libraries from hardware vendors""" + + homepage = "https://www.opengl.org/" + url = "https://www.opengl.org/" + + version('3.2', 'N/A') + + provides('gl@:4.5', when='@4.5:') + provides('gl@:4.4', when='@4.4:') + provides('gl@:4.3', when='@4.3:') + + def install(self, spec, prefix): + msg = """This package is intended to be a placeholder for + system-provided OpenGL libraries from hardware vendors. Please + download and install OpenGL drivers/libraries for your graphics + hardware separately, and then set that up as an external package. + An example of a working packages.yaml: + + packages: + opengl: + paths: + opengl@4.5.0: /opt/opengl + buildable: False + + In that case, /opt/opengl/ should contain these two folders: + + include/GL/ (opengl headers, including "gl.h") + lib (opengl libraries, including "libGL.so")""" + + raise InstallError(msg) diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 1505eff61a..c345e693f1 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -126,8 +126,7 @@ class Qt(Package): depends_on("python", when='@5.7.0:', type='build') # OpenGL hardware acceleration - depends_on("mesa", when='@4:+opengl') - + depends_on("gl@3.2:", when='@4:+opengl') depends_on("libxcb", when=sys.platform != 'darwin') depends_on("libx11", when=sys.platform != 'darwin') diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py index caf11b1fc7..3ed2016a0f 100644 --- a/var/spack/repos/builtin/packages/vtk/package.py +++ b/var/spack/repos/builtin/packages/vtk/package.py @@ -23,6 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## +import os from spack import * @@ -32,24 +33,55 @@ class Vtk(CMakePackage): processing and visualization. """ homepage = "http://www.vtk.org" - url = "http://www.vtk.org/files/release/7.1/VTK-7.1.0.tar.gz" + url = "http://www.vtk.org/files/release/8.0/VTK-8.0.1.tar.gz" list_url = "http://www.vtk.org/download/" + version('8.0.1', '692d09ae8fadc97b59d35cab429b261a') version('7.1.0', 'a7e814c1db503d896af72458c2d0228f') version('7.0.0', '5fe35312db5fb2341139b8e4955c367d') version('6.3.0', '0231ca4840408e9dd60af48b314c5b6d') version('6.1.0', '25e4dfb3bad778722dcaec80cd5dab7d') # VTK7 defaults to OpenGL2 rendering backend - variant('opengl2', default=True, description='Build with OpenGL2 instead of OpenGL as rendering backend') - variant('python', default=False, description='Build the python modules') + variant('opengl2', default=True, description='Enable OpenGL2 backend') + variant('osmesa', default=False, description='Enable OSMesa support') + variant('python', default=False, description='Enable Python support') + variant('qt', default=False, description='Build with support for Qt') patch('gcc.patch', when='@6.1.0') - depends_on('qt') + # At the moment, we cannot build with both osmesa and qt, but as of + # VTK 8.1, that should change + conflicts('+osmesa', when='+qt') + + # The use of the OpenGL2 backend requires at least OpenGL Core Profile + # version 3.2 or higher. + depends_on('gl@3.2:', when='+opengl2') + + # If you didn't ask for osmesa, then hw rendering using vendor-specific + # drivers is faster, but it must be done externally. + depends_on('opengl', when='~osmesa') + + # mesa default is software rendering, make it faster with llvm + depends_on('mesa+llvm', when='+osmesa') + + # VTK will need Qt5OpenGL, and qt needs '-opengl' for that + depends_on('qt+opengl', when='+qt') + + depends_on('expat') + depends_on('freetype') + depends_on('glew') depends_on('hdf5') + depends_on('libjpeg') + depends_on('jsoncpp') + depends_on('libharu') + depends_on('libxml2') + depends_on('lz4') depends_on('netcdf') depends_on('netcdf-cxx') + depends_on('libpng') + depends_on('libtiff') + depends_on('zlib') extends('python', when='+python') @@ -57,18 +89,29 @@ class Vtk(CMakePackage): url = "http://www.vtk.org/files/release/{0}/VTK-{1}.tar.gz" return url.format(version.up_to(2), version) + def setup_environment(self, spack_env, run_env): + # VTK has some trouble finding freetype unless it is set in + # the environment + spack_env.set('FREETYPE_DIR', self.spec['freetype'].prefix) + def cmake_args(self): spec = self.spec opengl_ver = 'OpenGL{0}'.format('2' if '+opengl2' in spec else '') - qt_ver = spec['qt'].version.up_to(1) - qt_bin = spec['qt'].prefix.bin cmake_args = [ '-DBUILD_SHARED_LIBS=ON', '-DVTK_RENDERING_BACKEND:STRING={0}'.format(opengl_ver), - '-DVTK_USE_SYSTEM_HDF5=ON', - '-DVTK_USE_SYSTEM_NETCDF=ON', + + # In general, we disable use of VTK "ThirdParty" libs, preferring + # spack-built versions whenever possible + '-DVTK_USE_SYSTEM_LIBRARIES=ON', + + # However, in a few cases we can't do without them yet + '-DVTK_USE_SYSTEM_GL2PS=OFF', + '-DVTK_USE_SYSTEM_LIBPROJ4=OFF', + '-DVTK_USE_SYSTEM_OGGTHEORA=OFF', + '-DNETCDF_DIR={0}'.format(spec['netcdf'].prefix), '-DNETCDF_C_ROOT={0}'.format(spec['netcdf'].prefix), '-DNETCDF_CXX_ROOT={0}'.format(spec['netcdf-cxx'].prefix), @@ -80,21 +123,62 @@ class Vtk(CMakePackage): # Disable wrappers for other languages. '-DVTK_WRAP_JAVA=OFF', '-DVTK_WRAP_TCL=OFF', - - # Enable Qt support here. - '-DVTK_QT_VERSION:STRING={0}'.format(qt_ver), - '-DQT_QMAKE_EXECUTABLE:PATH={0}/qmake'.format(qt_bin), - '-DVTK_Group_Qt:BOOL=ON', ] - # NOTE: The following definitions are required in order to allow - # VTK to build with qt~webkit versions (see the documentation for - # more info: http://www.vtk.org/Wiki/VTK/Tutorials/QtSetup). - if '~webkit' in spec['qt']: + if 'darwin' in spec.architecture: + cmake_args.extend([ + '-DCMAKE_MACOSX_RPATH=ON' + ]) + + if '+qt' in spec: + qt_ver = spec['qt'].version.up_to(1) + qt_bin = spec['qt'].prefix.bin + qmake_exe = os.path.join(qt_bin, 'qmake') + + cmake_args.extend([ + # Enable Qt support here. + '-DVTK_QT_VERSION:STRING={0}'.format(qt_ver), + '-DQT_QMAKE_EXECUTABLE:PATH={0}'.format(qmake_exe), + '-DVTK_Group_Qt:BOOL=ON', + ]) + + # NOTE: The following definitions are required in order to allow + # VTK to build with qt~webkit versions (see the documentation for + # more info: http://www.vtk.org/Wiki/VTK/Tutorials/QtSetup). + if '~webkit' in spec['qt']: + cmake_args.extend([ + '-DVTK_Group_Qt:BOOL=OFF', + '-DModule_vtkGUISupportQt:BOOL=ON', + '-DModule_vtkGUISupportQtOpenGL:BOOL=ON', + ]) + + if '+osmesa' in spec: + prefix = spec['mesa'].prefix + osmesaIncludeDir = prefix.include + osmesaLibrary = os.path.join(prefix.lib, 'libOSMesa.so') + + useParam = 'VTK_USE_X' + if 'darwin' in spec.architecture: + useParam = 'VTK_USE_COCOA' + + cmake_args.extend([ + '-D{0}:BOOL=OFF'.format(useParam), + '-DVTK_OPENGL_HAS_OSMESA:BOOL=ON', + '-DOSMESA_INCLUDE_DIR:PATH={0}'.format(osmesaIncludeDir), + '-DOSMESA_LIBRARY:FILEPATH={0}'.format(osmesaLibrary), + ]) + else: + prefix = spec['opengl'].prefix + + openglIncludeDir = prefix.include + openglLibrary = os.path.join(prefix.lib, 'libGL.so') + if 'darwin' in spec.architecture: + openglIncludeDir = prefix + openglLibrary = prefix + cmake_args.extend([ - '-DVTK_Group_Qt:BOOL=OFF', - '-DModule_vtkGUISupportQt:BOOL=ON', - '-DModule_vtkGUISupportQtOpenGL:BOOL=ON', + '-DOPENGL_INCLUDE_DIR:PATH={0}'.format(openglIncludeDir), + '-DOPENGL_gl_LIBRARY:FILEPATH={0}'.format(openglLibrary) ]) if spec.satisfies('@:6.1.0'): -- cgit v1.2.3-70-g09d2 From 30aaa374723f0c493d84f0623001ce87174b12a5 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Tue, 23 Jan 2018 02:42:10 -0600 Subject: r-gdsfmt: new package (#7035) --- .../repos/builtin/packages/r-gdsfmt/package.py | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-gdsfmt/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-gdsfmt/package.py b/var/spack/repos/builtin/packages/r-gdsfmt/package.py new file mode 100644 index 0000000000..4f209d4327 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-gdsfmt/package.py @@ -0,0 +1,47 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RGdsfmt(RPackage): + """This package provides a high-level R interface to CoreArray Genomic + Data Structure (GDS) data files, which are portable across platforms + with hierarchical structure to store multiple scalable array-oriented + data sets with metadata information. It is suited for large-scale + datasets, especially for data which are much larger than the available + random-access memory. The gdsfmt package offers the efficient + operations specifically designed for integers of less than 8 bits, + since a diploid genotype, like single-nucleotide polymorphism (SNP), + usually occupies fewer bits than a byte. Data compression and + decompression are available with relatively efficient random access. + It is also allowed to read a GDS file in parallel with multiple R + processes supported by the package parallel.""" + + homepage = "http://bioconductor.org/packages/gdsfmt/" + url = "https://git.bioconductor.org/packages/gdsfmt" + + version('1.14.1', git='https://git.bioconductor.org/packages/gdsfmt', commit='15743647b7eea5b82d3284858b4591fb6e59959d') + + depends_on('r@3.4.0:3.4.9', when='@1.14.1') -- cgit v1.2.3-70-g09d2 From 92b20bfdba8709df8610232b402ef5296eaafa16 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Tue, 23 Jan 2018 02:43:22 -0600 Subject: r-snprelate: new package (#7036) --- .../repos/builtin/packages/r-snprelate/package.py | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-snprelate/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-snprelate/package.py b/var/spack/repos/builtin/packages/r-snprelate/package.py new file mode 100644 index 0000000000..5b026a5831 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-snprelate/package.py @@ -0,0 +1,52 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RSnprelate(RPackage): + """Genome-wide association studies (GWAS) are widely used to investigate + the genetic basis of diseases and traits, but they pose many + computational challenges. We developed an R package SNPRelate to + provide a binary format for single-nucleotide polymorphism (SNP) data + in GWAS utilizing CoreArray Genomic Data Structure (GDS) data files. + The GDS format offers the efficient operations specifically designed + for integers with two bits, since a SNP could occupy only two bits. + SNPRelate is also designed to accelerate two key computations on SNP + data using parallel computing for multi-core symmetric multiprocessing + computer architectures: Principal Component Analysis (PCA) and + relatedness analysis using Identity-By-Descent measures. The SNP GDS + format is also used by the GWASTools package with the support of S4 + classes and generic functions. The extended GDS format is implemented + in the SeqArray package to support the storage of single nucleotide + variations (SNVs), insertion/deletion polymorphism (indel) and + structural variation calls.""" + + homepage = "https://bioconductor.org/packages/SNPRelate" + url = "https://git.bioconductor.org/packages/SNPRelate" + + version('1.12.2', git='https://git.bioconductor.org/packages/SNPRelate', commit='dce2e2b6f36483a9f905bb5df6ae834a9f1136fe') + + depends_on('r@3.4.0:3.4.9', when='@1.12.2') + depends_on('r-gdsfmt@1.8.3:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 02b74519e330ca0765e09fa4d0061b23cb6069e3 Mon Sep 17 00:00:00 2001 From: Marty McFadden Date: Tue, 23 Jan 2018 00:44:40 -0800 Subject: Version update for cfitsio (#7032) --- var/spack/repos/builtin/packages/cfitsio/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cfitsio/package.py b/var/spack/repos/builtin/packages/cfitsio/package.py index 49d71cdcab..ba457bea58 100644 --- a/var/spack/repos/builtin/packages/cfitsio/package.py +++ b/var/spack/repos/builtin/packages/cfitsio/package.py @@ -31,8 +31,9 @@ class Cfitsio(AutotoolsPackage): """ homepage = 'http://heasarc.gsfc.nasa.gov/fitsio/' - url = 'http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio3410.tar.gz' + url = 'http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio3420.tar.gz' + version('3.420', '26e5c0dfb85b8d00f536e706305caa13') version('3.410', '8a4a66fcdd816aae41768baa0b025552') version('3.370', 'abebd2d02ba5b0503c633581e3bfa116') -- cgit v1.2.3-70-g09d2 From e6afb9db77fb4f105db4ffadc871606acf1e2f03 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Tue, 23 Jan 2018 16:47:34 +0800 Subject: A new package: log4cplus. (#7015) --- .../repos/builtin/packages/log4cplus/package.py | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 var/spack/repos/builtin/packages/log4cplus/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/log4cplus/package.py b/var/spack/repos/builtin/packages/log4cplus/package.py new file mode 100644 index 0000000000..e75572cb24 --- /dev/null +++ b/var/spack/repos/builtin/packages/log4cplus/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Log4cplus(CMakePackage): + """log4cplus is a simple to use C++ logging API + providing thread-safe, flexible, and arbitrarily + granular control over log management and configuration.""" + + homepage = "https://sourceforge.net/projects/log4cplus/" + url = "https://nchc.dl.sourceforge.net/project/log4cplus/log4cplus-stable/1.2.0/log4cplus-1.2.0.tar.gz" + + version('1.2.0', 'e250f0f431c0723f8b625323e7b6465d') -- cgit v1.2.3-70-g09d2 From 2e09501fc57f03de166161a968ba7cce598a9d5d Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Tue, 23 Jan 2018 00:59:33 -0800 Subject: netlib-lapack: add versions 3.7.0, 3.7.1, 3.8.0 (#7025) --- var/spack/repos/builtin/packages/netlib-lapack/package.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/netlib-lapack/package.py b/var/spack/repos/builtin/packages/netlib-lapack/package.py index 3763d7aed5..5fbc5e14e1 100644 --- a/var/spack/repos/builtin/packages/netlib-lapack/package.py +++ b/var/spack/repos/builtin/packages/netlib-lapack/package.py @@ -36,6 +36,10 @@ class NetlibLapack(Package): homepage = "http://www.netlib.org/lapack/" url = "http://www.netlib.org/lapack/lapack-3.5.0.tgz" + version('3.8.0', '96591affdbf58c450d45c1daa540dbd2', + url='http://www.netlib.org/lapack/lapack-3.8.0.tar.gz') + version('3.7.1', 'dcdeeed73de152c4643ccc5b1aeb453c') + version('3.7.0', '697bb8d67c7d336a0f339cc9dd0fa72f') version('3.6.1', '421b2cb72e15f237e144428f9c460ee0') version('3.6.0', 'f2f6c67134e851fe189bb3ca1fbb5101') version('3.5.0', 'b1d3e3e425b2e44a06760ff173104bdf') -- cgit v1.2.3-70-g09d2 From d8c105a7b1f882f6a25f6c590d31e94a891220e0 Mon Sep 17 00:00:00 2001 From: Benedikt Riedel Date: Tue, 23 Jan 2018 03:13:08 -0600 Subject: Fix GEANT4 and make more portable and flexible (#6956) * Turning off default Qt support. Restricting Qt version to <= 4.9 else geant4 won't build * Making vecgeom optional * Differentiating between cxx11 and cxx14 support * Making vecgeom optional. Part 2. forgot to move usolids option * Adding explicit CXX11 and CXX14 support * Adding more clhep version to support newer GEANT4 versions * Adding GEANT4 versions 10.03.p03 and 10.04 * Checkpoint. Adding opengl and x11 variant. Lead up to more changes to enable X11 support * Adding dependency on fixesproto for newer versions * Making the X11 dependent pieces work without requiring X11 on the system * Adding motif --- var/spack/repos/builtin/packages/clhep/package.py | 3 ++ var/spack/repos/builtin/packages/geant4/package.py | 54 ++++++++++++++++------ .../builtin/packages/libxcomposite/package.py | 2 +- var/spack/repos/builtin/packages/motif/package.py | 45 ++++++++++++++++++ 4 files changed, 90 insertions(+), 14 deletions(-) create mode 100644 var/spack/repos/builtin/packages/motif/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/clhep/package.py b/var/spack/repos/builtin/packages/clhep/package.py index f1f1d2db96..22fcb659c8 100644 --- a/var/spack/repos/builtin/packages/clhep/package.py +++ b/var/spack/repos/builtin/packages/clhep/package.py @@ -33,6 +33,9 @@ class Clhep(CMakePackage): list_url = "https://proj-clhep.web.cern.ch/proj-clhep/" list_depth = 1 + version('2.4.0.1', 'f06aa2924abbfee0afd5a9beaaa883cf') + version('2.4.0.0', '9af6644e4e04d6807f53956512b7396a') + version('2.3.4.5', '31b4785b40706ff7503bb9ffd412487a') version('2.3.4.4', '8b8a33d0d19213b60d6c22ce5fc93761') version('2.3.4.3', '6941279f70d69492fff1aa955f3f2562') version('2.3.4.2', '1e7a9046c9ad0b347d6812f8031191da') diff --git a/var/spack/repos/builtin/packages/geant4/package.py b/var/spack/repos/builtin/packages/geant4/package.py index d6391eb688..96498905a3 100644 --- a/var/spack/repos/builtin/packages/geant4/package.py +++ b/var/spack/repos/builtin/packages/geant4/package.py @@ -36,21 +36,45 @@ class Geant4(CMakePackage): homepage = "http://geant4.cern.ch/" url = "http://geant4.cern.ch/support/source/geant4.10.01.p03.tar.gz" + version('10.04', 'b84beeb756821d0c61f7c6c93a2b83de') + version('10.03.p03', 'ccae9fd18e3908be78784dc207f2d73b') + version('10.02.p03', '2b887e66f0d41174016160707662a77b') version('10.02.p02', '6aae1d0fc743b0edc358c5c8fbe48657') version('10.02.p01', 'b81f7082a15f6a34b720b6f15c6289cfe4ddbbbdcef0dc52719f71fac95f7f1c') version('10.01.p03', '4fb4175cc0dabcd517443fbdccd97439') variant('qt', default=False, description='Enable Qt support') + variant('vecgeom', default=False, description='Enable vecgeom support') + variant('cxx11', default=True, description='Enable CXX11 support') + variant('cxx14', default=False, description='Enable CXX14 support') + variant('opengl', default=False, description='Optional OpenGL support') + variant('x11', default=False, description='Optional X11 support') + variant('motif', default=False, description='Optional motif support') depends_on('cmake@3.5:', type='build') - depends_on("clhep@2.3.1.1~cxx11+cxx14", when="@10.02.p02") - depends_on("clhep@2.3.1.1~cxx11+cxx14", when="@10.02.p01") - depends_on("clhep@2.2.0.4~cxx11+cxx14", when="@10.01.p03") + # C++11 support + depends_on("clhep@2.4.0.0+cxx11~cxx14", when="@10.04+cxx11~cxx14") + depends_on("clhep@2.3.4.3+cxx11~cxx14", when="@10.03.p03+cxx11~cxx14") + depends_on("clhep@2.3.1.1+cxx11~cxx14", when="@10.02.p01+cxx11~cxx14") + depends_on("clhep@2.3.1.1+cxx11~cxx14", when="@10.02.p01+cxx11~cxx14") + depends_on("clhep@2.2.0.4+cxx11~cxx14", when="@10.01.p03+cxx11~cxx14") + + # C++14 support + depends_on("clhep@2.4.0.0+cxx11~cxx14", when="@10.04~cxx11+cxx14") + depends_on("clhep@2.3.4.3+cxx11~cxx14", when="@10.03.p03~cxx11+cxx14") + depends_on("clhep@2.3.1.1~cxx11+cxx14", when="@10.02.p02~cxx11+cxx14") + depends_on("clhep@2.3.1.1~cxx11+cxx14", when="@10.02.p01~cxx11+cxx14") + depends_on("clhep@2.2.0.4~cxx11+cxx14", when="@10.01.p03~cxx11+cxx14") + depends_on("expat") depends_on("zlib") - depends_on("vecgeom") depends_on("xerces-c") + depends_on("mesa", when='+opengl') + depends_on("libx11", when='+x11') + depends_on("libxmu", when='+x11') + depends_on("motif", when='+motif') + depends_on("vecgeom", when="+vecgeom") depends_on("qt@4.8:4.999", when="+qt") def cmake_args(self): @@ -63,19 +87,19 @@ class Geant4(CMakePackage): '-DGEANT4_INSTALL_DATA=ON', '-DGEANT4_BUILD_TLS_MODEL=global-dynamic', '-DGEANT4_BUILD_MULTITHREADED=ON', - '-DGEANT4_USE_USOLIDS=ON', '-DGEANT4_USE_SYSTEM_EXPAT=ON', '-DGEANT4_USE_SYSTEM_ZLIB=ON', '-DXERCESC_ROOT_DIR:STRING=%s' % - spec['xerces-c'].prefix, - '-DUSolids_DIR=%s' % - join_path(spec['vecgeom'].prefix, 'lib/CMake/USolids')] + spec['xerces-c'].prefix, ] arch = platform.system().lower() if arch is not 'darwin': - options.append('-DGEANT4_USE_OPENGL_X11=ON') - options.append('-DGEANT4_USE_XM=ON') - options.append('-DGEANT4_USE_RAYTRACER_X11=ON') + if "+x11" in spec and "+opengl" in spec: + options.append('-DGEANT4_USE_OPENGL_X11=ON') + if "+motif" in spec and "+opengl" in spec: + options.append('-DGEANT4_USE_XM=ON') + if "+x11" in spec: + options.append('-DGEANT4_USE_RAYTRACER_X11=ON') if '+cxx11' in spec: options.append('-DGEANT4_BUILD_CXXSTD=c++11') @@ -86,8 +110,12 @@ class Geant4(CMakePackage): options.append('-DGEANT4_USE_QT=ON') options.append( '-DQT_QMAKE_EXECUTABLE=%s' % - spec['qt'].prefix + '/bin/qmake' - ) + spec['qt'].prefix.bin.qmake) + + if '+vecgeom' in spec: + options.append('-DGEANT4_USE_USOLIDS=ON') + options.append('-DUSolids_DIR=%s' % spec[ + 'vecgeom'].prefix.lib.CMake.USolids) return options diff --git a/var/spack/repos/builtin/packages/libxcomposite/package.py b/var/spack/repos/builtin/packages/libxcomposite/package.py index 840659b337..b2c5caae12 100644 --- a/var/spack/repos/builtin/packages/libxcomposite/package.py +++ b/var/spack/repos/builtin/packages/libxcomposite/package.py @@ -36,7 +36,7 @@ class Libxcomposite(AutotoolsPackage): depends_on('libx11') depends_on('libxfixes') - + depends_on('fixesproto@0.4:', type='build') depends_on('compositeproto@0.4:', type='build') depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/motif/package.py b/var/spack/repos/builtin/packages/motif/package.py new file mode 100644 index 0000000000..466b1c69a6 --- /dev/null +++ b/var/spack/repos/builtin/packages/motif/package.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Motif(AutotoolsPackage): + """" + Motif - Graphical user interface (GUI) + specification and the widget toolkit + """ + homepage = "http://motif.ics.com/" + url = "http://cfhcable.dl.sourceforge.net/project/motif/Motif 2.3.8 Source Code/motif-2.3.8.tar.gz" + + version('2.3.8', '7572140bb52ba21ec2f0c85b2605e2b1') + + depends_on("flex") + depends_on("libx11") + depends_on("libxt") + depends_on("libxext") + depends_on("libxft") + depends_on("libxcomposite") + depends_on("libxfixes") + depends_on("xbitmaps") -- cgit v1.2.3-70-g09d2 From 3223186729f68de41459d3d497d752b0231b5e33 Mon Sep 17 00:00:00 2001 From: Thilina Rathnayake Date: Tue, 23 Jan 2018 12:42:06 -0600 Subject: new package: gslib (#6328) --- var/spack/repos/builtin/packages/gslib/package.py | 90 +++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 var/spack/repos/builtin/packages/gslib/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gslib/package.py b/var/spack/repos/builtin/packages/gslib/package.py new file mode 100644 index 0000000000..dd179a64cd --- /dev/null +++ b/var/spack/repos/builtin/packages/gslib/package.py @@ -0,0 +1,90 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Gslib(Package): + """Highly scalable Gather-scatter code with AMG and XXT solvers""" + + homepage = "https://github.com/gslib/gslib" + url = "https://github.com/gslib/gslib" + + version('1.0.1', git='https://github.com/gslib/gslib.git', + commit='d16685f24551b7efd69e58d96dc76aec75239ea3') + version('1.0.0', git='https://github.com/gslib/gslib.git', + commit='9533e652320a3b26a72c36487ae265b02072cd48') + + variant('mpi', default=True, description='Build with MPI') + variant('mpiio', default=True, description='Build with MPI I/O') + variant('blas', default=False, description='Build with BLAS') + + depends_on('mpi', when="+mpi") + depends_on('mpi', when="+mpiio") + depends_on('blas', when="+blas") + + conflicts('~mpi', when='+mpiio') + + def install(self, spec, prefix): + srcDir = 'src' + libDir = 'lib' + libname = 'libgs.a' + + if self.version == Version('1.0.1'): + makeFile = 'Makefile' + else: + makeFile = 'src/Makefile' + + CC = self.compiler.cc + + if '+mpiio' not in spec: + filter_file(r'MPIIO.*?=.*1', 'MPIIO = 0', makeFile) + + if '+mpi' in spec: + CC = spec['mpi'].mpicc + else: + filter_file(r'MPI.*?=.*1', 'MPI = 0', makeFile) + filter_file(r'MPIIO.*?=.*1', 'MPIIO = 0', makeFile) + + makeCmd = "CC=" + CC + + if '+blas' in spec: + filter_file(r'BLAS.*?=.*0', 'BLAS = 1', makeFile) + blas = spec['blas'].libs + ldFlags = blas.ld_flags + filter_file(r'\$\(LDFLAGS\)', ldFlags, makeFile) + + if self.version == Version('1.0.1'): + make(makeCmd) + make('install') + install_tree(libDir, prefix.lib) + elif self.version == Version('1.0.0'): + with working_dir(srcDir): + make(makeCmd) + mkdir(prefix.lib) + install(libname, prefix.lib) + + # Should only install the headers (this will + # be fixed in gslib on future releases. + install_tree(srcDir, prefix.include) -- cgit v1.2.3-70-g09d2 From d6a43f180b40e6e7270bb171968ac3f3cbcfb63b Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Tue, 23 Jan 2018 13:49:17 -0800 Subject: argp-standalone@1.3: new package (#7014) Adds a package for the standalone version of the argp argument parsing interface from glibc for unix-style command options. --- .../argp-standalone/argp-fmtstream.h.patch | 11 +++++ .../builtin/packages/argp-standalone/package.py | 50 ++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 var/spack/repos/builtin/packages/argp-standalone/argp-fmtstream.h.patch create mode 100644 var/spack/repos/builtin/packages/argp-standalone/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/argp-standalone/argp-fmtstream.h.patch b/var/spack/repos/builtin/packages/argp-standalone/argp-fmtstream.h.patch new file mode 100644 index 0000000000..b0a518fc67 --- /dev/null +++ b/var/spack/repos/builtin/packages/argp-standalone/argp-fmtstream.h.patch @@ -0,0 +1,11 @@ +--- argp-fmtstream.h.orig 2003-12-11 09:37:05.000000000 +0100 ++++ argp-fmtstream.h 2011-08-12 11:56:43.000000000 +0200 +@@ -192,7 +192,7 @@ + extern int _argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount); + extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount); + +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + /* Inline versions of above routines. */ + + #if !_LIBC \ No newline at end of file diff --git a/var/spack/repos/builtin/packages/argp-standalone/package.py b/var/spack/repos/builtin/packages/argp-standalone/package.py new file mode 100644 index 0000000000..c17b6ee9e9 --- /dev/null +++ b/var/spack/repos/builtin/packages/argp-standalone/package.py @@ -0,0 +1,50 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class ArgpStandalone(AutotoolsPackage): + """Standalone version of the argp interface from glibc for parsing + unix-style arguments. """ + + homepage = "https://www.lysator.liu.se/~nisse/misc" + url = "https://www.lysator.liu.se/~nisse/misc/argp-standalone-1.3.tar.gz" + + version('1.3', '720704bac078d067111b32444e24ba69') + + # Homebrew (https://github.com/Homebrew/homebrew-core) patches + # argp-standalone to work on Darwin; the patchfile below was taken + # from + # https://raw.githubusercontent.com/Homebrew/formula-patches/b5f0ad3/argp-standalone/patch-argp-fmtstream.h + patch('argp-fmtstream.h.patch', 0, 'platform=darwin', '.') + + def install(self, spec, prefix): + make('install') + make('check') + mkdirp(self.spec.prefix.lib) + install('libargp.a', join_path(self.spec.prefix.lib, 'libargp.a')) + mkdirp(self.spec.prefix.include) + install('argp.h', join_path(self.spec.prefix.include, 'argp.h')) -- cgit v1.2.3-70-g09d2 From dceb66741cb186172b9cc7bb2d5c64146c53d4cd Mon Sep 17 00:00:00 2001 From: Federico Ficarelli Date: Tue, 23 Jan 2018 23:01:58 +0100 Subject: Fix +readline handling (#7048) --- var/spack/repos/builtin/packages/slurm/package.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/slurm/package.py b/var/spack/repos/builtin/packages/slurm/package.py index 60879b1fe7..a6f5fc59b5 100644 --- a/var/spack/repos/builtin/packages/slurm/package.py +++ b/var/spack/repos/builtin/packages/slurm/package.py @@ -65,7 +65,7 @@ class Slurm(AutotoolsPackage): depends_on('munge') depends_on('openssl') depends_on('pkgconfig', type='build') - depends_on('readline') + depends_on('readline', when='+readline') depends_on('zlib') depends_on('gtkplus+X', when='+gtk') @@ -89,9 +89,7 @@ class Slurm(AutotoolsPackage): if '~gtk' in spec: args.append('--disable-gtktest') - if '+readline' in spec: - args.append('--with-readline={0}'.format(spec['readline'].prefix)) - else: + if '~readline' in spec: args.append('--without-readline') if '+hdf5' in spec: -- cgit v1.2.3-70-g09d2 From 8bdf7e6baab4ce682d0e779bf3c1b18b0f10425f Mon Sep 17 00:00:00 2001 From: Federico Ficarelli Date: Wed, 24 Jan 2018 00:24:20 +0100 Subject: Fix gtkplus build by hardcoding X11 support (#6971) * Fix gtkplus build by hardcoding X11 support * Remove +X variant from gtkplus dependents --- var/spack/repos/builtin/packages/dia/package.py | 2 +- var/spack/repos/builtin/packages/emacs/package.py | 2 +- var/spack/repos/builtin/packages/gtkplus/package.py | 16 +++++++--------- var/spack/repos/builtin/packages/icedtea/package.py | 4 ++-- var/spack/repos/builtin/packages/py-pygtk/package.py | 2 +- var/spack/repos/builtin/packages/slurm/package.py | 2 +- var/spack/repos/builtin/packages/wx/package.py | 2 +- 7 files changed, 14 insertions(+), 16 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dia/package.py b/var/spack/repos/builtin/packages/dia/package.py index 59abc88b15..03a1ca9df2 100644 --- a/var/spack/repos/builtin/packages/dia/package.py +++ b/var/spack/repos/builtin/packages/dia/package.py @@ -33,7 +33,7 @@ class Dia(Package): version('0.97.3', '0e744a0f6a6c4cb6a089e4d955392c3c') depends_on('intltool', type='build') - depends_on('gtkplus@2.6.0:+X') + depends_on('gtkplus@2.6.0:') depends_on('libxslt') depends_on('python') depends_on('swig') diff --git a/var/spack/repos/builtin/packages/emacs/package.py b/var/spack/repos/builtin/packages/emacs/package.py index e654e9c9c7..73f557f96d 100644 --- a/var/spack/repos/builtin/packages/emacs/package.py +++ b/var/spack/repos/builtin/packages/emacs/package.py @@ -57,7 +57,7 @@ class Emacs(AutotoolsPackage): depends_on('giflib', when='+X') depends_on('libx11', when='+X') depends_on('libxaw', when='+X toolkit=athena') - depends_on('gtkplus+X', when='+X toolkit=gtk') + depends_on('gtkplus', when='+X toolkit=gtk') depends_on('gnutls', when='+tls') depends_on('libxpm ^gettext+libunistring', when='+tls') depends_on('ncurses+termlib', when='+tls') diff --git a/var/spack/repos/builtin/packages/gtkplus/package.py b/var/spack/repos/builtin/packages/gtkplus/package.py index cd9b420517..fa001a4a33 100644 --- a/var/spack/repos/builtin/packages/gtkplus/package.py +++ b/var/spack/repos/builtin/packages/gtkplus/package.py @@ -35,18 +35,16 @@ class Gtkplus(AutotoolsPackage): version('2.24.31', '68c1922732c7efc08df4656a5366dcc3afdc8791513400dac276009b40954658') version('2.24.25', '38af1020cb8ff3d10dda2c8807f11e92af9d2fa4045de61c62eedb7fbc7ea5b3') - variant('X', default=False, description="Enable an X toolkit") - depends_on('pkgconfig', type='build') - depends_on("atk") - depends_on("gdk-pixbuf") - depends_on("glib") - depends_on("pango") - depends_on("pango~X", when='~X') - depends_on("pango+X", when='+X') - depends_on('gobject-introspection', when='+X') + depends_on('atk') + depends_on('gdk-pixbuf') + depends_on('glib') depends_on('shared-mime-info') + # Hardcode X11 support (former +X variant), + # see #6940 for rationale: + depends_on('pango+X') + depends_on('gobject-introspection') patch('no-demos.patch') diff --git a/var/spack/repos/builtin/packages/icedtea/package.py b/var/spack/repos/builtin/packages/icedtea/package.py index c8c992d0f5..39a3084d00 100644 --- a/var/spack/repos/builtin/packages/icedtea/package.py +++ b/var/spack/repos/builtin/packages/icedtea/package.py @@ -58,7 +58,7 @@ class Icedtea(AutotoolsPackage): depends_on('libxcomposite', when='~X', type='build') depends_on('libxau', when='~X', type='build') depends_on('libxdmcp', when='~X', type='build') - depends_on('gtkplus+X', when='~X', type='build') + depends_on('gtkplus', when='~X', type='build') depends_on('libx11', when='+X') depends_on('xproto', when='+X') @@ -71,7 +71,7 @@ class Icedtea(AutotoolsPackage): depends_on('libxcomposite', when='+X') depends_on('libxau', when='+X') depends_on('libxdmcp', when='+X') - depends_on('gtkplus+X', when='+X') + depends_on('gtkplus', when='+X') depends_on('freetype@2:') depends_on('wget', type='build') diff --git a/var/spack/repos/builtin/packages/py-pygtk/package.py b/var/spack/repos/builtin/packages/py-pygtk/package.py index 5a05a3a402..7edda3dec0 100644 --- a/var/spack/repos/builtin/packages/py-pygtk/package.py +++ b/var/spack/repos/builtin/packages/py-pygtk/package.py @@ -38,7 +38,7 @@ class PyPygtk(AutotoolsPackage): depends_on('cairo') depends_on('glib') # for GTK 3.X use pygobject 3.X instead of pygtk - depends_on('gtkplus+X@2.24:2.99') + depends_on('gtkplus@2.24:2.99') depends_on('py-pygobject@2.28:2.99', type=('build', 'run')) depends_on('py-py2cairo', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/slurm/package.py b/var/spack/repos/builtin/packages/slurm/package.py index a6f5fc59b5..06f30730e9 100644 --- a/var/spack/repos/builtin/packages/slurm/package.py +++ b/var/spack/repos/builtin/packages/slurm/package.py @@ -68,7 +68,7 @@ class Slurm(AutotoolsPackage): depends_on('readline', when='+readline') depends_on('zlib') - depends_on('gtkplus+X', when='+gtk') + depends_on('gtkplus', when='+gtk') depends_on('hdf5', when='+hdf5') depends_on('hwloc', when='+hwloc') depends_on('mariadb', when='+mariadb') diff --git a/var/spack/repos/builtin/packages/wx/package.py b/var/spack/repos/builtin/packages/wx/package.py index 4aa1e2f16a..2799dd2e21 100644 --- a/var/spack/repos/builtin/packages/wx/package.py +++ b/var/spack/repos/builtin/packages/wx/package.py @@ -47,7 +47,7 @@ class Wx(AutotoolsPackage): patch('math_include.patch', when='@3.0.1:3.0.2') depends_on('pkgconfig', type='build') - depends_on('gtkplus+X') + depends_on('gtkplus') @when('@:3.0.2') def build(self, spec, prefix): -- cgit v1.2.3-70-g09d2 From a62e1a0451d81241e730d0e93dcb113d31041ebf Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Tue, 23 Jan 2018 18:05:54 -0700 Subject: Lbann update (#6987) * Added new link line flag * Refactored some of the common components out of the different version's build commands. Also corrected the when commands to properly capture non-numeric names such as local. * Added support to the Elemental package for the Hydrogen branch. --- .../repos/builtin/packages/elemental/package.py | 37 +++++++++++++++++++++ var/spack/repos/builtin/packages/lbann/package.py | 38 ++++++++++++---------- 2 files changed, 57 insertions(+), 18 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/elemental/package.py b/var/spack/repos/builtin/packages/elemental/package.py index 14e376628c..19ab7583ab 100644 --- a/var/spack/repos/builtin/packages/elemental/package.py +++ b/var/spack/repos/builtin/packages/elemental/package.py @@ -34,6 +34,8 @@ class Elemental(CMakePackage): homepage = "http://libelemental.org" url = "https://github.com/elemental/Elemental/archive/v0.87.6.tar.gz" + version('hydrogen-develop', git='https://github.com/LLNL/Elemental.git', branch='hydrogen') + version('develop', git='https://github.com/elemental/Elemental.git', branch='master') version('0.87.7', '6c1e7442021c59a36049e37ea69b8075') version('0.87.6', '9fd29783d45b0a0e27c0df85f548abe9') @@ -105,6 +107,7 @@ class Elemental(CMakePackage): 'libEl', root=self.prefix, shared=shared, recurse=True ) + @when('@0.87.6:') def cmake_args(self): spec = self.spec @@ -170,3 +173,37 @@ class Elemental(CMakePackage): '-DPYTHON_SITE_PACKAGES:STRING={0}'.format(site_packages_dir)]) return args + + @when('@:0.87.6') + def cmake_args(self): + spec = self.spec + + if '@:0.87.7' in spec and '%intel@:17.0.2' in spec: + raise UnsupportedCompilerError( + "Elemental {0} has a known bug with compiler: {1} {2}".format( + spec.version, spec.compiler.name, spec.compiler.version)) + + args = [ + '-DCMAKE_INSTALL_MESSAGE:STRING=LAZY', + '-DCMAKE_C_COMPILER=%s' % spec['mpi'].mpicc, + '-DCMAKE_CXX_COMPILER=%s' % spec['mpi'].mpicxx, + '-DCMAKE_Fortran_COMPILER=%s' % spec['mpi'].mpifc, + '-DBUILD_SHARED_LIBS:BOOL=%s' % ('+shared' in spec), + '-DHydrogen_ENABLE_OPENMP:BOOL=%s' % ('+hybrid' in spec), + '-DHydrogen_ENABLE_QUADMATH:BOOL=%s' % ('+quad' in spec), + '-DHydrogen_USE_64BIT_INTS:BOOL=%s' % ('+int64' in spec), + '-DHydrogen_USE_64BIT_BLAS_INTS:BOOL=%s' % ('+int64_blas' in spec), + '-DHydrogen_ENABLE_MPC:BOOL=%s' % ('+mpfr' in spec), + '-DHydrogen_GENERAL_LAPACK_FALLBACK=ON', + ] + + if 'blas=openblas' in spec: + args.extend([ + '-DHydrogen_USE_OpenBLAS:BOOL=%s' % ('blas=openblas' in spec), + '-DOpenBLAS_DIR:STRING={0}'.format( + spec['elemental'].prefix)]) + elif 'blas=mkl' in spec: + args.extend([ + '-DHydrogen_USE_MKL:BOOL=%s' % ('blas=mkl' in spec)]) + + return args diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index 8cfd6e4c62..6cc53ae2df 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -62,16 +62,27 @@ class Lbann(CMakePackage): depends_on('cnpy') depends_on('nccl', when='+gpu +nccl') - @when('@0.94:') - def cmake_args(self): + @property + def common_config_args(self): spec = self.spec # Environment variables CPPFLAGS = [] - CPPFLAGS.append('-DLBANN_SET_EL_RNG') + CPPFLAGS.append('-DLBANN_SET_EL_RNG -ldl') - args = [ + return [ '-DCMAKE_INSTALL_MESSAGE=LAZY', '-DCMAKE_CXX_FLAGS=%s' % ' '.join(CPPFLAGS), + '-DLBANN_VERSION=spack', + '-DCNPY_DIR={0}'.format(spec['cnpy'].prefix), + ] + + # Get any recent versions or non-numeric version + # Note that develop > numeric and non-develop < numeric + @when('@:0.91' or '@0.94:') + def cmake_args(self): + spec = self.spec + args = self.common_config_args + args.extend([ '-DLBANN_WITH_TOPO_AWARE:BOOL=%s' % ('+gpu +nccl' in spec), '-DLBANN_SEQUENTIAL_INITIALIZATION:BOOL=%s' % ('+seq_init' in spec), @@ -79,10 +90,8 @@ class Lbann(CMakePackage): '-DLBANN_WITH_VTUNE=OFF', '-DElemental_DIR={0}/CMake/elemental'.format( spec['elemental'].prefix), - '-DCNPY_DIR={0}'.format(spec['cnpy'].prefix), '-DLBANN_DATATYPE={0}'.format(spec.variants['dtype'].value), - '-DLBANN_VERBOSE=0', - '-DLBANN_VERSION=spack'] + '-DLBANN_VERBOSE=0']) if '+opencv' in spec: args.extend(['-DOpenCV_DIR:STRING={0}'.format( @@ -108,16 +117,11 @@ class Lbann(CMakePackage): return args - @when('@:0.93') + @when('@0.91:0.93') def cmake_args(self): spec = self.spec - # Environment variables - CPPFLAGS = [] - CPPFLAGS.append('-DLBANN_SET_EL_RNG') - - args = [ - '-DCMAKE_INSTALL_MESSAGE=LAZY', - '-DCMAKE_CXX_FLAGS=%s' % ' '.join(CPPFLAGS), + args = self.common_config_args + args.extend([ '-DWITH_CUDA:BOOL=%s' % ('+gpu' in spec), '-DWITH_CUDNN:BOOL=%s' % ('+gpu' in spec), '-DELEMENTAL_USE_CUBLAS:BOOL=%s' % ( @@ -125,13 +129,11 @@ class Lbann(CMakePackage): '-DWITH_TBINF=OFF', '-DWITH_VTUNE=OFF', '-DElemental_DIR={0}'.format(spec['elemental'].prefix), - '-DCNPY_DIR={0}'.format(spec['cnpy'].prefix), '-DELEMENTAL_MATH_LIBS={0}'.format( spec['elemental'].libs), '-DSEQ_INIT:BOOL=%s' % ('+seq_init' in spec), '-DVERBOSE=0', - '-DLBANN_HOME=.', - '-DLBANN_VER=spack'] + '-DLBANN_HOME=.']) if spec.variants['dtype'].value == 'float': args.extend(['-DDATATYPE=4']) -- cgit v1.2.3-70-g09d2 From b5daa51c06095fde57ffe05622bb1079355d3b73 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Tue, 23 Jan 2018 23:28:05 -0800 Subject: netlib-xblas 1.0.248: new package (#7024) * netlib-xblas@1.0.248: new package * netlib-lapack: add xblas option --- .../builtin/packages/netlib-lapack/package.py | 10 +++ .../repos/builtin/packages/netlib-xblas/package.py | 90 ++++++++++++++++++++++ 2 files changed, 100 insertions(+) create mode 100644 var/spack/repos/builtin/packages/netlib-xblas/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/netlib-lapack/package.py b/var/spack/repos/builtin/packages/netlib-lapack/package.py index 5fbc5e14e1..e782799988 100644 --- a/var/spack/repos/builtin/packages/netlib-lapack/package.py +++ b/var/spack/repos/builtin/packages/netlib-lapack/package.py @@ -55,6 +55,8 @@ class NetlibLapack(Package): variant('lapacke', default=True, description='Activates the build of the LAPACKE C interface') + variant('xblas', default=False, + description='Builds extended precision routines using XBLAS') patch('ibm-xl.patch', when='@3:6%xl') patch('ibm-xl.patch', when='@3:6%xl_r') @@ -65,6 +67,7 @@ class NetlibLapack(Package): depends_on('cmake', type='build') depends_on('blas', when='+external-blas') + depends_on('netlib-xblas+fortran+plain_blas', when='+xblas') def patch(self): # Fix cblas CMakeLists.txt -- has wrong case for subdirectory name. @@ -155,6 +158,13 @@ class NetlibLapack(Package): '-DBLAS_LIBRARIES:PATH=%s' % spec['blas'].libs.joined(';') ]) + if spec.satisfies('+xblas'): + xblas_include_dir = spec['netlib-xblas'].prefix.include + xblas_library = spec['netlib-xblas'].libs.joined(';') + cmake_args.extend([ + '-DXBLAS_INCLUDE_DIR={0}'.format(xblas_include_dir), + '-DXBLAS_LIBRARY={0}'.format(xblas_library)]) + cmake_args.extend(std_cmake_args) build_dir = 'spack-build' + ('-shared' if shared else '-static') diff --git a/var/spack/repos/builtin/packages/netlib-xblas/package.py b/var/spack/repos/builtin/packages/netlib-xblas/package.py new file mode 100644 index 0000000000..cde2a94658 --- /dev/null +++ b/var/spack/repos/builtin/packages/netlib-xblas/package.py @@ -0,0 +1,90 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class NetlibXblas(AutotoolsPackage): + """XBLAS is a reference implementation for extra precision BLAS. + + XBLAS is a reference implementation for the dense and banded BLAS + routines, along with extended and mixed precision version. Extended + precision is only used internally; input and output arguments remain + the same as in the existing BLAS. Extra precisions is implemented as + double-double (i.e., 128-bit total, 106-bit significand). Mixed + precision permits some input/output arguments of different types + (mixing real and complex) or precisions (mixing single and + double). This implementation is proof of concept, and no attempt was + made to optimize performance; performance should be as good as + straightforward but careful code written by hand.""" + + homepage = "http://www.netlib.org/xblas" + url = "http://www.netlib.org/xblas/xblas.tar.gz" + + version('1.0.248', '990c680fb5e446bb86c10936e4cd7f88') + + variant('fortran', default=True, + description='Build Fortran interfaces') + variant('plain_blas', default=True, + description='As part of XBLAS, build plain BLAS routines') + + provides('blas', when='+plain_blas') + + @property + def libs(self): + return find_libraries(['libxblas'], root=self.prefix, + shared=False, recurse=True) + + def configure_args(self): + args = [] + + if self.spec.satisfies('~fortran'): + args += ['--disable-fortran'] + + if self.spec.satisfies('~plain_blas'): + args += ['--disable-plain-blas'] + + return args + + def install(self, spec, prefix): + mkdirp(prefix.lib) + install('libxblas.a', prefix.lib) + + if self.spec.satisfies('+plain_blas'): + # XBLAS should be a drop-in BLAS replacement + install('libxblas.a', join_path(prefix.lib, 'libblas.a')) + + headers = ['f2c-bridge.h', + 'blas_dense_proto.h', + 'blas_enum.h', + 'blas_extended.h', + 'blas_extended_private.h', + 'blas_extended_proto.h', + 'blas_fpu.h', + 'blas_malloc.h'] + mkdirp(prefix.include) + for h in headers: + install(join_path('src', h), prefix.include) + + return -- cgit v1.2.3-70-g09d2 From e0082e0564ccb1fc838e3248e6d8306132166364 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Wed, 24 Jan 2018 18:48:28 -0800 Subject: libtool: symlink libtool{ize} to glibtool{ize} (#7060) On Darwin and other BSD systems, the system 'libtool' and 'libtoolize' are BSD libtool and libtoolize, respectively. Some build systems require the GNU versions of these commands, so BSD package systems tend to name the GNU versions 'glibtool' and 'glibtoolize', respectively, to avoid namespace collisions. A problem with the current libtool package is that it installs the GNU libtool commands as 'libtool' and 'libtoolize', respectively, but build systems on BSD platforms will attempt to run 'glibtool' and 'glibtoolize'. The expedient solution to this problem is to symlink 'libtool' to 'glibtool' and 'libtoolize' to 'glibtoolize', because attempting to patch the detection logic one build system at a time seems impractical. --- .../repos/builtin/packages/libtool/package.py | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libtool/package.py b/var/spack/repos/builtin/packages/libtool/package.py index eca530ce0c..9e9005ccc5 100644 --- a/var/spack/repos/builtin/packages/libtool/package.py +++ b/var/spack/repos/builtin/packages/libtool/package.py @@ -46,8 +46,24 @@ class Libtool(AutotoolsPackage): join_path(self.prefix.share, 'aclocal')) def setup_dependent_package(self, module, dependent_spec): - # Automake is very likely to be a build dependency, - # so we add the tools it provides to the dependent module - executables = ['libtoolize', 'libtool'] + # Automake is very likely to be a build dependency, so we add + # the tools it provides to the dependent module. Some build + # systems differentiate between BSD libtool (e.g., Darwin) and + # GNU libtool, so also add 'glibtool' and 'glibtoolize' to the + # list of executables. + executables = ['libtoolize', 'libtool', 'glibtoolize', 'glibtool'] for name in executables: setattr(module, name, self._make_executable(name)) + + @run_after('install') + def post_install(self): + # Some platforms name GNU libtool and GNU libtoolize + # 'glibtool' and 'glibtoolize', respectively, to differentiate + # them from BSD libtool and BSD libtoolize. On these BSD + # platforms, build systems sometimes expect to use the assumed + # GNU commands glibtool and glibtoolize instead of the BSD + # variant; this happens frequently, for instance, on Darwin + symlink(join_path(self.prefix.bin, 'libtoolize'), + join_path(self.prefix.bin, 'glibtoolize')) + symlink(join_path(self.prefix.bin, 'libtoolize'), + join_path(self.prefix.bin, 'glibtoolize')) -- cgit v1.2.3-70-g09d2 From 82d4d58ca70f4cbd112dbae257014439276925ef Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Thu, 25 Jan 2018 13:10:37 -0700 Subject: Lbann package: bug fix (#7066) Fixed a bug in the guard on cub functionality. Reduced the requirements on hwloc to make it simpler to build on Power systems. --- var/spack/repos/builtin/packages/lbann/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index 6cc53ae2df..6a32a53d8b 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -56,7 +56,7 @@ class Lbann(CMakePackage): depends_on('cudnn', when='+gpu') depends_on('cub', when='+gpu') depends_on('mpi') - depends_on('hwloc') + depends_on('hwloc ~pci ~libxml2') depends_on('opencv@3.2.0: +openmp +core +highgui +imgproc +jpeg +png +tiff +zlib ~eigen', when='+opencv') depends_on('protobuf@3.0.2:') depends_on('cnpy') @@ -148,7 +148,7 @@ class Lbann(CMakePackage): args.extend(['-DcuDNN_DIR={0}'.format( spec['cudnn'].prefix)]) - if '+cudnn' in spec: + if '+cub' in spec: args.extend(['-DCUB_DIR={0}'.format( spec['cub'].prefix)]) -- cgit v1.2.3-70-g09d2 From 8bc5916b684d6d9a45961f935ce19d2e1e0c2a87 Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Thu, 25 Jan 2018 13:14:48 -0700 Subject: Protobuf package: allow building shared library (#7067) This adds a +shared variant for building shared libraries in the protobuf package and enables it by default. --- var/spack/repos/builtin/packages/protobuf/package.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/protobuf/package.py b/var/spack/repos/builtin/packages/protobuf/package.py index 7453c11cb6..52bb28b498 100644 --- a/var/spack/repos/builtin/packages/protobuf/package.py +++ b/var/spack/repos/builtin/packages/protobuf/package.py @@ -41,6 +41,9 @@ class Protobuf(CMakePackage): # does not build with CMake: # version('2.5.0', '9c21577a03adc1879aba5b52d06e25cf') + variant('shared', default=True, + description='Enables the build of shared libraries') + depends_on('zlib') conflicts('%gcc@:4.6') # Requires c++11 @@ -62,6 +65,7 @@ class Protobuf(CMakePackage): def cmake_args(self): args = [ + '-DBUILD_SHARED_LIBS=%s' % int('+shared' in self.spec), '-Dprotobuf_BUILD_TESTS:BOOL=OFF', '-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON' ] -- cgit v1.2.3-70-g09d2 From 7cb43e3d057bf73ee1aa90914ced9399e25b9e86 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Fri, 26 Jan 2018 09:52:04 +0100 Subject: Bzip2 now uses 'spack_cc' as a compiler, instead of plain 'cc' (#7074) Looking at build logs, it seems that prior to this commit bzip2 was using 'cc', and relying on the PATH to be set correctly to find Spack wrappers. This commit improves the robustness of the recipe, by using the absolute path of the wrapper. --- var/spack/repos/builtin/packages/bzip2/package.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bzip2/package.py b/var/spack/repos/builtin/packages/bzip2/package.py index d44e97207f..53ed853310 100644 --- a/var/spack/repos/builtin/packages/bzip2/package.py +++ b/var/spack/repos/builtin/packages/bzip2/package.py @@ -51,8 +51,10 @@ class Bzip2(Package): def patch(self): # bzip2 comes with two separate Makefiles for static and dynamic builds # Tell both to use Spack's compiler wrapper instead of GCC - filter_file(r'^CC=gcc', 'CC=cc', 'Makefile') - filter_file(r'^CC=gcc', 'CC=cc', 'Makefile-libbz2_so') + filter_file(r'^CC=gcc', 'CC={0}'.format(spack_cc), 'Makefile') + filter_file( + r'^CC=gcc', 'CC={0}'.format(spack_cc), 'Makefile-libbz2_so' + ) # The Makefiles use GCC flags that are incompatible with PGI if self.compiler.name == 'pgi': -- cgit v1.2.3-70-g09d2 From 1cd03e0f36618188b1a11808df689c58ea8a1422 Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Fri, 26 Jan 2018 11:38:37 -0700 Subject: new package: essl (#6335) Added support for the IBM ESSL math library.Updated Elemental to be able to build with ESSL. --- .../repos/builtin/packages/elemental/package.py | 21 +++++- var/spack/repos/builtin/packages/essl/package.py | 87 ++++++++++++++++++++++ 2 files changed, 106 insertions(+), 2 deletions(-) create mode 100644 var/spack/repos/builtin/packages/essl/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/elemental/package.py b/var/spack/repos/builtin/packages/elemental/package.py index 19ab7583ab..c661e073cb 100644 --- a/var/spack/repos/builtin/packages/elemental/package.py +++ b/var/spack/repos/builtin/packages/elemental/package.py @@ -68,8 +68,8 @@ class Elemental(CMakePackage): variant('build_type', default='Release', description='The build type to build', values=('Debug', 'Release')) - variant('blas', default='openblas', values=('openblas', 'mkl'), - description='Enable the use of OpenBlas/MKL') + variant('blas', default='openblas', values=('openblas', 'mkl', 'essl'), + description='Enable the use of OpenBlas/MKL/ESSL') variant('mpfr', default=False, description='Support GNU MPFR\'s' 'arbitrary-precision floating-point arithmetic') @@ -84,8 +84,13 @@ class Elemental(CMakePackage): depends_on('intel-mkl threads=openmp', when='blas=mkl +openmp_blas ~int64_blas') depends_on('intel-mkl@2017.1 +openmp +ilp64', when='blas=mkl +openmp_blas +int64_blas') + depends_on('essl -cuda', when='blas=essl -openmp_blas ~int64_blas') + depends_on('essl threads=openmp', when='blas=essl +openmp_blas ~int64_blas') + # Note that this forces us to use OpenBLAS until #1712 is fixed depends_on('lapack', when='blas=openblas ~openmp_blas') + depends_on('netlib-lapack +external-blas', when='blas=essl') + depends_on('metis') depends_on('metis +int64', when='+int64') depends_on('mpi') @@ -145,6 +150,15 @@ class Elemental(CMakePackage): libfortran = LibraryList(mpif77('--print-file-name', 'libgfortran.%s' % dso_suffix, output=str)) + elif self.spec.satisfies('%xl') or self.spec.satisfies('%xl_r'): + xl_fort = env['SPACK_F77'] + xl_bin = os.path.dirname(xl_fort) + xl_root = os.path.dirname(xl_bin) + libfortran = LibraryList('{0}/lib/libxlf90_r.{1}.1' + .format(xl_root, dso_suffix)) + else: + libfortran = None + if libfortran: args.append('-DGFORTRAN_LIB=%s' % libfortran.libraries[0]) @@ -205,5 +219,8 @@ class Elemental(CMakePackage): elif 'blas=mkl' in spec: args.extend([ '-DHydrogen_USE_MKL:BOOL=%s' % ('blas=mkl' in spec)]) + elif 'blas=essl' in spec: + args.extend([ + '-DHydrogen_USE_ESSL:BOOL=%s' % ('blas=essl' in spec)]) return args diff --git a/var/spack/repos/builtin/packages/essl/package.py b/var/spack/repos/builtin/packages/essl/package.py new file mode 100644 index 0000000000..946b93518b --- /dev/null +++ b/var/spack/repos/builtin/packages/essl/package.py @@ -0,0 +1,87 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Essl(Package): + """IBM's Engineering and Scientific Subroutine Library (ESSL).""" + + homepage = "https://www.ibm.com/systems/power/software/essl/" + url = "ibm-essl" + + version('5.5') + + variant('ilp64', default=False, description='64 bit integers') + variant( + 'threads', default='openmp', + description='Multithreading support', + values=('openmp', 'none'), + multi=False + ) + variant('cuda', default=False, description='CUDA acceleration') + + provides('blas') + + conflicts('+cuda', when='+ilp64', + msg='ESSL+cuda+ilp64 cannot combine CUDA acceleration' + ' 64 bit integers') + + conflicts('+cuda', when='threads=none', + msg='ESSL+cuda threads=none cannot combine CUDA acceleration' + ' without multithreading support') + + @property + def blas_libs(self): + spec = self.spec + prefix = self.prefix + + if '+ilp64' in spec: + essl_lib = ['libessl6464'] + else: + essl_lib = ['libessl'] + + if spec.satisfies('threads=openmp'): + # ESSL SMP support requires XL or Clang OpenMP library + if '%xl' in spec or '%xl_r' in spec or '%clang' in spec: + if '+ilp64' in spec: + essl_lib = ['libesslsmp6464'] + else: + if '+cuda' in spec: + essl_lib = ['libesslsmpcuda'] + else: + essl_lib = ['libesslsmp'] + + essl_root = prefix.lib64 + essl_libs = find_libraries( + essl_lib, + root=essl_root, + shared=True + ) + + return essl_libs + + def install(self, spec, prefix): + raise InstallError('IBM ESSL is not installable;' + ' it is vendor supplied') -- cgit v1.2.3-70-g09d2 From 970c7e8f454fdaaa5d8826b5d696c05208e5a233 Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Fri, 26 Jan 2018 18:51:38 -0800 Subject: Tell R's configure about tcltk config (#7085) * Tell R's configure about tcltk config Add configure arguments that specify the location of the tcl and tk config scripts. Fixes #7072 * Flake8 cleanup --- var/spack/repos/builtin/packages/r/package.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py index 8235e8bd24..ebd83ec9a8 100644 --- a/var/spack/repos/builtin/packages/r/package.py +++ b/var/spack/repos/builtin/packages/r/package.py @@ -96,11 +96,16 @@ class R(AutotoolsPackage): spec = self.spec prefix = self.prefix + tclConfig_path = join_path(spec['tcl'].prefix.lib, 'tclConfig.sh') + tkConfig_path = join_path(spec['tk'].prefix.lib, 'tkConfig.sh') + config_args = [ '--libdir={0}'.format(join_path(prefix, 'rlib')), '--enable-R-shlib', '--enable-BLAS-shlib', - '--enable-R-framework=no' + '--enable-R-framework=no', + '--with-tcl-config={0}'.format(tclConfig_path), + '--with-tk-config={0}'.format(tkConfig_path), ] if '+external-lapack' in spec: -- cgit v1.2.3-70-g09d2 From 784234ae8e246680ba77c946c1c348460cd2f145 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Sun, 28 Jan 2018 06:36:24 -0800 Subject: libtool, binutils: fix darwin linking (#7073) * libtool: fix linking of libtool on darwin * binutils, libtool: fix conflicts w/ BSD tools, v2 Fix namespace conflicts with BSD tools in a more elegant fashion, using a program prefix, similar to Homebrew. --- var/spack/repos/builtin/packages/binutils/package.py | 6 ++++++ var/spack/repos/builtin/packages/libtool/package.py | 13 ++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/binutils/package.py b/var/spack/repos/builtin/packages/binutils/package.py index fde3810216..8d6777daf3 100644 --- a/var/spack/repos/builtin/packages/binutils/package.py +++ b/var/spack/repos/builtin/packages/binutils/package.py @@ -79,4 +79,10 @@ class Binutils(AutotoolsPackage): if '+libiberty' in spec: configure_args.append('--enable-install-libiberty') + # To avoid namespace collisions with Darwin/BSD system tools, + # prefix executables with "g", e.g., gar, gnm; see Homebrew + # https://github.com/Homebrew/homebrew-core/blob/master/Formula/binutils.rb + if spec.satisfies('platform=darwin'): + configure_args.append('--program-prefix=g') + return configure_args diff --git a/var/spack/repos/builtin/packages/libtool/package.py b/var/spack/repos/builtin/packages/libtool/package.py index 9e9005ccc5..b5d5c9b2b1 100644 --- a/var/spack/repos/builtin/packages/libtool/package.py +++ b/var/spack/repos/builtin/packages/libtool/package.py @@ -50,20 +50,19 @@ class Libtool(AutotoolsPackage): # the tools it provides to the dependent module. Some build # systems differentiate between BSD libtool (e.g., Darwin) and # GNU libtool, so also add 'glibtool' and 'glibtoolize' to the - # list of executables. + # list of executables. See Homebrew: + # https://github.com/Homebrew/homebrew-core/blob/master/Formula/libtool.rb executables = ['libtoolize', 'libtool', 'glibtoolize', 'glibtool'] for name in executables: setattr(module, name, self._make_executable(name)) - @run_after('install') - def post_install(self): + @when('platform=darwin') + def configure_args(self): # Some platforms name GNU libtool and GNU libtoolize # 'glibtool' and 'glibtoolize', respectively, to differentiate # them from BSD libtool and BSD libtoolize. On these BSD # platforms, build systems sometimes expect to use the assumed # GNU commands glibtool and glibtoolize instead of the BSD # variant; this happens frequently, for instance, on Darwin - symlink(join_path(self.prefix.bin, 'libtoolize'), - join_path(self.prefix.bin, 'glibtoolize')) - symlink(join_path(self.prefix.bin, 'libtoolize'), - join_path(self.prefix.bin, 'glibtoolize')) + args = ['--program-prefix=g'] + return args -- cgit v1.2.3-70-g09d2 From 5af9256d4f3d9ad5189ddd7dbe1523fe43138e22 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Sun, 28 Jan 2018 21:07:59 +0100 Subject: Cleaned up JUnit report generation on install (#6977) * Cleaned up JUnit report generation on install The generation of a JUnit report was previously part of the install command. This commit factors the logic into its own module, and uses a template for the generation of the report. It also improves report generation, that now can deal with multiple specs installed at once. Finally, extending the list of supported formats is much easier than before, as it entails just writing a new template. * Polished report generation + added tests for failures and errors The generation of a JUnit report has been polished, so that the stacktrace is correctly displayed with Jenkins JUnit plugin. Standard error is still not used. Added unit tests to cover for installation failures and installation errors. --- lib/spack/spack/cmd/install.py | 240 ++---------------- lib/spack/spack/report.py | 276 +++++++++++++++++++++ lib/spack/spack/test/cmd/install.py | 74 ++++++ templates/reports/junit.xml | 51 ++++ .../repos/builtin.mock/packages/raiser/package.py | 62 +++++ 5 files changed, 477 insertions(+), 226 deletions(-) create mode 100644 lib/spack/spack/report.py create mode 100644 templates/reports/junit.xml create mode 100644 var/spack/repos/builtin.mock/packages/raiser/package.py (limited to 'var') diff --git a/lib/spack/spack/cmd/install.py b/lib/spack/spack/cmd/install.py index 12a33a0370..8b6c04bfcc 100644 --- a/lib/spack/spack/cmd/install.py +++ b/lib/spack/spack/cmd/install.py @@ -23,24 +23,20 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## import argparse -import codecs -import functools import os -import platform import shutil import sys -import time -import xml.dom.minidom -import xml.etree.ElementTree as ET import llnl.util.filesystem as fs import llnl.util.tty as tty + import spack +import spack.build_environment import spack.cmd import spack.cmd.common.arguments as arguments -from spack.build_environment import InstallError -from spack.fetch_strategy import FetchError -from spack.package import PackageBase +import spack.fetch_strategy +import spack.report + description = "build and install packages" section = "build" @@ -120,7 +116,7 @@ packages. If neither are chosen, don't run tests for any packages.""" subparser.add_argument( '--log-format', default=None, - choices=['junit'], + choices=spack.report.valid_formats, help="format to be used for log files" ) subparser.add_argument( @@ -131,186 +127,6 @@ packages. If neither are chosen, don't run tests for any packages.""" arguments.add_common_arguments(subparser, ['yes_to_all']) -# Needed for test cases -class TestResult(object): - PASSED = 0 - FAILED = 1 - SKIPPED = 2 - ERRORED = 3 - - -class TestSuite(object): - def __init__(self, spec): - self.root = ET.Element('testsuite') - self.tests = [] - self.spec = spec - - def append(self, item): - if not isinstance(item, TestCase): - raise TypeError( - 'only TestCase instances may be appended to TestSuite' - ) - self.tests.append(item) # Append the item to the list of tests - - def dump(self, filename): - # Prepare the header for the entire test suite - number_of_errors = sum( - x.result_type == TestResult.ERRORED for x in self.tests - ) - self.root.set('errors', str(number_of_errors)) - number_of_failures = sum( - x.result_type == TestResult.FAILED for x in self.tests - ) - self.root.set('failures', str(number_of_failures)) - self.root.set('tests', str(len(self.tests))) - self.root.set('name', self.spec.short_spec) - self.root.set('hostname', platform.node()) - - for item in self.tests: - self.root.append(item.element) - - with codecs.open(filename, 'wb', 'utf-8') as file: - xml_string = ET.tostring(self.root) - xml_string = xml.dom.minidom.parseString(xml_string).toprettyxml() - file.write(xml_string) - - -class TestCase(object): - - results = { - TestResult.PASSED: None, - TestResult.SKIPPED: 'skipped', - TestResult.FAILED: 'failure', - TestResult.ERRORED: 'error', - } - - def __init__(self, classname, name): - self.element = ET.Element('testcase') - self.element.set('classname', str(classname)) - self.element.set('name', str(name)) - self.result_type = None - - def set_duration(self, duration): - self.element.set('time', str(duration)) - - def set_result(self, result_type, - message=None, error_type=None, text=None): - self.result_type = result_type - result = TestCase.results[self.result_type] - if result is not None and result is not TestResult.PASSED: - subelement = ET.SubElement(self.element, result) - if error_type is not None: - subelement.set('type', error_type) - if message is not None: - subelement.set('message', str(message)) - if text is not None: - subelement.text = text - - -def fetch_text(path): - if not os.path.exists(path): - return '' - - with codecs.open(path, 'rb', 'utf-8') as f: - return '\n'.join( - list(line.strip() for line in f.readlines()) - ) - - -def junit_output(spec, test_suite): - # Cycle once and for all on the dependencies and skip - # the ones that are already installed. This ensures that - # for the same spec, the same number of entries will be - # displayed in the XML report - for x in spec.traverse(order='post'): - package = spack.repo.get(x) - if package.installed: - test_case = TestCase(package.name, x.short_spec) - test_case.set_duration(0.0) - test_case.set_result( - TestResult.SKIPPED, - message='Skipped [already installed]', - error_type='already_installed' - ) - test_suite.append(test_case) - - def decorator(func): - @functools.wraps(func) - def wrapper(self, *args, ** kwargs): - - # Check if the package has been installed already - if self.installed: - return - - test_case = TestCase(self.name, self.spec.short_spec) - # Try to install the package - try: - # If already installed set the spec as skipped - start_time = time.time() - # PackageBase.do_install - func(self, *args, **kwargs) - duration = time.time() - start_time - test_case.set_duration(duration) - test_case.set_result(TestResult.PASSED) - except InstallError: - # Check if the package relies on dependencies that - # did not install - duration = time.time() - start_time - test_case.set_duration(duration) - if [x for x in self.spec.dependencies(('link', 'run')) if not spack.repo.get(x).installed]: # NOQA: ignore=E501 - test_case.set_duration(0.0) - test_case.set_result( - TestResult.SKIPPED, - message='Skipped [failed dependencies]', - error_type='dep_failed' - ) - else: - # An InstallError is considered a failure (the recipe - # didn't work correctly) - text = fetch_text(self.build_log_path) - test_case.set_result( - TestResult.FAILED, - message='Installation failure', - text=text - ) - except FetchError: - # A FetchError is considered an error as - # we didn't even start building - duration = time.time() - start_time - test_case.set_duration(duration) - text = fetch_text(self.build_log_path) - test_case.set_result( - TestResult.FAILED, - message='Unable to fetch package', - text=text - ) - except Exception: - # Anything else is also an error - duration = time.time() - start_time - test_case.set_duration(duration) - text = fetch_text(self.build_log_path) - test_case.set_result( - TestResult.FAILED, - message='Unexpected exception thrown during install', - text=text - ) - except BaseException: - # Anything else is also an error - duration = time.time() - start_time - test_case.set_duration(duration) - text = fetch_text(self.build_log_path) - test_case.set_result( - TestResult.FAILED, - message='Unknown error', - text=text - ) - - # Try to get the log - test_suite.append(test_case) - return wrapper - return decorator - - def default_log_file(spec): """Computes the default filename for the log file and creates the corresponding directory if not present @@ -323,42 +139,19 @@ def default_log_file(spec): def install_spec(cli_args, kwargs, spec): - - saved_do_install = PackageBase.do_install - decorator = lambda fn: fn - - # Check if we were asked to produce some log for dashboards - if cli_args.log_format is not None: - # Compute the filename for logging - log_filename = cli_args.log_file - if not log_filename: - log_filename = default_log_file(spec) - - # Create the test suite in which to log results - test_suite = TestSuite(spec) - - # Temporarily decorate PackageBase.do_install to monitor - # recursive calls. - decorator = junit_output(spec, test_suite) - # Do the actual installation try: - # decorate the install if necessary - PackageBase.do_install = decorator(PackageBase.do_install) - if cli_args.things_to_install == 'dependencies': # Install dependencies as-if they were installed # for root (explicit=False in the DB) kwargs['explicit'] = False for s in spec.dependencies(): - p = spack.repo.get(s) - p.do_install(**kwargs) + s.package.do_install(**kwargs) else: - package = spack.repo.get(spec) kwargs['explicit'] = True - package.do_install(**kwargs) + spec.package.do_install(**kwargs) - except InstallError as e: + except spack.build_environment.InstallError as e: if cli_args.show_log_on_error: e.print_context() if not os.path.exists(e.pkg.build_log_path): @@ -369,13 +162,6 @@ def install_spec(cli_args, kwargs, spec): shutil.copyfileobj(log, sys.stderr) raise - finally: - PackageBase.do_install = saved_do_install - - # Dump test output if asked to - if cli_args.log_format is not None: - test_suite.dump(log_filename) - def install(parser, args, **kwargs): if not args.package and not args.specfiles: @@ -386,7 +172,7 @@ def install(parser, args, **kwargs): tty.die("The -j option must be a positive integer!") if args.no_checksum: - spack.do_checksum = False # TODO: remove this global. + spack.do_checksum = False # TODO: remove this global. # Parse cli arguments and construct a dictionary # that will be passed to Package.do_install API @@ -466,5 +252,7 @@ def install(parser, args, **kwargs): else: - for spec in specs: - install_spec(args, kwargs, spec) + filename = args.log_file or default_log_file(specs[0]) + with spack.report.collect_info(specs, args.log_format, filename): + for spec in specs: + install_spec(args, kwargs, spec) diff --git a/lib/spack/spack/report.py b/lib/spack/spack/report.py new file mode 100644 index 0000000000..6260594620 --- /dev/null +++ b/lib/spack/spack/report.py @@ -0,0 +1,276 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +"""Tools to produce reports of spec installations""" +import collections +import functools +import itertools +import os.path +import time +import traceback + +import llnl.util.lang +import spack.build_environment +import spack.fetch_strategy +import spack.package + +templates = { + 'junit': os.path.join('reports', 'junit.xml') +} + +#: Allowed report formats +valid_formats = list(templates.keys()) + +__all__ = [ + 'valid_formats', + 'collect_info' +] + + +def fetch_package_log(pkg): + try: + with open(pkg.build_log_path, 'r') as f: + return ''.join(f.readlines()) + except Exception: + return 'Cannot open build log for {0}'.format( + pkg.spec.cshort_spec + ) + + +class InfoCollector(object): + """Decorates PackageBase.do_install to collect information + on the installation of certain specs. + + When exiting the context this change will be rolled-back. + + The data collected is available through the ``test_suites`` + attribute once exited, and it's organized as a list where + each item represents the installation of one of the spec. + + Args: + specs (list of Spec): specs whose install information will + be recorded + """ + #: Backup of PackageBase.do_install + _backup_do_install = spack.package.PackageBase.do_install + + def __init__(self, specs): + #: Specs that will be installed + self.specs = specs + #: Context that will be used to stamp the report from + #: the template file + self.test_suites = [] + + def __enter__(self): + # Initialize the test suites with the data that + # is available upfront + for spec in self.specs: + name_fmt = '{0}_{1}' + name = name_fmt.format(spec.name, spec.dag_hash(length=7)) + + suite = { + 'name': name, + 'nerrors': None, + 'nfailures': None, + 'ntests': None, + 'time': None, + 'timestamp': time.strftime( + "%a, %d %b %Y %H:%M:%S", time.gmtime() + ), + 'properties': [], + 'testcases': [] + } + + self.test_suites.append(suite) + + Property = collections.namedtuple('Property', ['name', 'value']) + suite['properties'].append( + Property('architecture', spec.architecture) + ) + suite['properties'].append(Property('compiler', spec.compiler)) + + # Check which specs are already installed and mark them as skipped + for dep in filter(lambda x: x.package.installed, spec.traverse()): + test_case = { + 'name': dep.name, + 'id': dep.dag_hash(), + 'elapsed_time': '0.0', + 'result': 'skipped', + 'message': 'Spec already installed' + } + suite['testcases'].append(test_case) + + def gather_info(do_install): + """Decorates do_install to gather useful information for + a CI report. + + It's defined here to capture the environment and build + this context as the installations proceed. + """ + @functools.wraps(do_install) + def wrapper(pkg, *args, **kwargs): + + # We accounted before for what is already installed + installed_on_entry = pkg.installed + + test_case = { + 'name': pkg.name, + 'id': pkg.spec.dag_hash(), + 'elapsed_time': None, + 'result': None, + 'message': None + } + + start_time = time.time() + value = None + try: + + value = do_install(pkg, *args, **kwargs) + test_case['result'] = 'success' + if installed_on_entry: + return + + except spack.build_environment.InstallError as e: + # An InstallError is considered a failure (the recipe + # didn't work correctly) + test_case['result'] = 'failure' + test_case['stdout'] = fetch_package_log(pkg) + test_case['message'] = e.message or 'Installation failure' + test_case['exception'] = e.traceback + + except (Exception, BaseException) as e: + # Everything else is an error (the installation + # failed outside of the child process) + test_case['result'] = 'error' + test_case['stdout'] = fetch_package_log(pkg) + test_case['message'] = str(e) or 'Unknown error' + test_case['exception'] = traceback.format_exc() + + finally: + test_case['elapsed_time'] = time.time() - start_time + + # Append the case to the correct test suites. In some + # cases it may happen that a spec that is asked to be + # installed explicitly will also be installed as a + # dependency of another spec. In this case append to both + # test suites. + for s in llnl.util.lang.dedupe([pkg.spec.root, pkg.spec]): + name = name_fmt.format(s.name, s.dag_hash(length=7)) + try: + item = next(( + x for x in self.test_suites + if x['name'] == name + )) + item['testcases'].append(test_case) + except StopIteration: + pass + + return value + + return wrapper + + spack.package.PackageBase.do_install = gather_info( + spack.package.PackageBase.do_install + ) + + def __exit__(self, exc_type, exc_val, exc_tb): + + # Restore the original method in PackageBase + spack.package.PackageBase.do_install = InfoCollector._backup_do_install + + for suite in self.test_suites: + suite['ntests'] = len(suite['testcases']) + suite['nfailures'] = len( + [x for x in suite['testcases'] if x['result'] == 'failure'] + ) + suite['nerrors'] = len( + [x for x in suite['testcases'] if x['result'] == 'error'] + ) + suite['time'] = sum([ + float(x['elapsed_time']) for x in suite['testcases'] + ]) + + +class collect_info(object): + """Collects information to build a report while installing + and dumps it on exit. + + If the format name is not ``None``, this context manager + decorates PackageBase.do_install when entering the context + and unrolls the change when exiting. + + Within the context, only the specs that are passed to it + on initialization will be recorded for the report. Data from + other specs will be discarded. + + Examples: + + .. code-block:: python + + # The file 'junit.xml' is written when exiting + # the context + specs = [Spec('hdf5').concretized()] + with collect_info(specs, 'junit', 'junit.xml'): + # A report will be generated for these specs... + for spec in specs: + spec.do_install() + # ...but not for this one + Spec('zlib').concretized().do_install() + + Args: + specs (list of Spec): specs to be installed + format_name (str or None): one of the supported formats + filename (str or None): name of the file where the report wil + be eventually written + + Raises: + ValueError: when ``format_name`` is not in ``valid_formats`` + """ + def __init__(self, specs, format_name, filename): + self.specs = specs + self.format_name = format_name + + # Check that the format is valid + if format_name not in itertools.chain(valid_formats, [None]): + raise ValueError('invalid report type: {0}'.format(format_name)) + + self.filename = filename + self.collector = InfoCollector(specs) if self.format_name else None + + def __enter__(self): + if self.format_name: + # Start the collector and patch PackageBase.do_install + self.collector.__enter__() + + def __exit__(self, exc_type, exc_val, exc_tb): + if self.format_name: + # Close the collector and restore the + # original PackageBase.do_install + self.collector.__exit__(exc_type, exc_val, exc_tb) + + # Write the report + with open(self.filename, 'w') as f: + env = spack.tengine.make_environment() + t = env.get_template(templates[self.format_name]) + f.write(t.render({'test_suites': self.collector.test_suites})) diff --git a/lib/spack/spack/test/cmd/install.py b/lib/spack/spack/test/cmd/install.py index 384a9ec3d0..3720e9bd38 100644 --- a/lib/spack/spack/test/cmd/install.py +++ b/lib/spack/spack/test/cmd/install.py @@ -32,6 +32,7 @@ import llnl.util.filesystem as fs import spack import spack.cmd.install +import spack.package from spack.spec import Spec from spack.main import SpackCommand, SpackCommandError @@ -275,6 +276,79 @@ def test_install_from_file(spec, concretize, error_code, tmpdir): assert install.returncode == error_code +@pytest.mark.disable_clean_stage_check +@pytest.mark.usefixtures( + 'builtin_mock', 'mock_archive', 'mock_fetch', 'config', 'install_mockery' +) +@pytest.mark.parametrize('exc_typename,msg', [ + ('RuntimeError', 'something weird happened'), + ('ValueError', 'spec is not concrete') +]) +def test_junit_output_with_failures(tmpdir, exc_typename, msg): + with tmpdir.as_cwd(): + install( + '--log-format=junit', '--log-file=test.xml', + 'raiser', + 'exc_type={0}'.format(exc_typename), + 'msg="{0}"'.format(msg) + ) + + files = tmpdir.listdir() + filename = tmpdir.join('test.xml') + assert filename in files + + content = filename.open().read() + + # Count failures and errors correctly + assert 'tests="1"' in content + assert 'failures="1"' in content + assert 'errors="0"' in content + + # We want to have both stdout and stderr + assert '' in content + assert msg in content + + +@pytest.mark.disable_clean_stage_check +@pytest.mark.usefixtures( + 'builtin_mock', 'mock_archive', 'mock_fetch', 'config', 'install_mockery' +) +@pytest.mark.parametrize('exc_typename,msg', [ + ('RuntimeError', 'something weird happened'), + ('KeyboardInterrupt', 'Ctrl-C strikes again') +]) +def test_junit_output_with_errors(tmpdir, monkeypatch, exc_typename, msg): + + def just_throw(*args, **kwargs): + from six.moves import builtins + exc_type = getattr(builtins, exc_typename) + raise exc_type(msg) + + monkeypatch.setattr(spack.package.PackageBase, 'do_install', just_throw) + + with tmpdir.as_cwd(): + install( + '--log-format=junit', '--log-file=test.xml', + 'libdwarf', + fail_on_error=False + ) + + files = tmpdir.listdir() + filename = tmpdir.join('test.xml') + assert filename in files + + content = filename.open().read() + + # Count failures and errors correctly + assert 'tests="1"' in content + assert 'failures="0"' in content + assert 'errors="1"' in content + + # We want to have both stdout and stderr + assert '' in content + assert msg in content + + @pytest.mark.usefixtures('noop_install', 'config') @pytest.mark.parametrize('clispecs,filespecs', [ [[], ['mpi']], diff --git a/templates/reports/junit.xml b/templates/reports/junit.xml new file mode 100644 index 0000000000..fe2566bd42 --- /dev/null +++ b/templates/reports/junit.xml @@ -0,0 +1,51 @@ + + + +{% for suite in test_suites %} + + +{% for property in suite.properties %} + +{% endfor %} + +{% for test in suite.testcases %} + +{% if test.result == 'failure' %} + +{{ test.exception }} + +{% elif test.result == 'error' %} + +{{ test.exception }} + +{% elif test.result == 'skipped' %} + +{% endif %} +{% if test.stdout %} + +{{ test.stdout }} + +{% endif %} +{% if test.stderr %} + +{{ test.stderr }} + +{% endif %} + +{% endfor %} +{# Add an error tag? #} + +{% endfor %} + diff --git a/var/spack/repos/builtin.mock/packages/raiser/package.py b/var/spack/repos/builtin.mock/packages/raiser/package.py new file mode 100644 index 0000000000..bd8982e68d --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/raiser/package.py @@ -0,0 +1,62 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from six.moves import builtins + +from spack import * + + +class Raiser(Package): + """A package that can raise a built-in exception + of any kind with any message + """ + + homepage = "http://www.example.com" + url = "http://www.example.com/a-1.0.tar.gz" + + version('1.0', '0123456789abcdef0123456789abcdef') + version('2.0', '2.0_a_hash') + + variant( + 'exc_type', + values=lambda x: isinstance(x, str), + default='RuntimeError', + description='type of the exception to be raised', + multi=False + ) + + variant( + 'msg', + values=lambda x: isinstance(x, str), + default='Unknown Exception', + description='message that will be tied to the exception', + multi=False + ) + + def install(self, spec, prefix): + print('Raiser will raise ') + exc_typename = self.spec.variants['exc_type'].value + exc_type = getattr(builtins, exc_typename) + msg = self.spec.variants['msg'].value + raise exc_type(msg) -- cgit v1.2.3-70-g09d2 From cd084d02ce56a076a21b61bb1c4850dec74e2b4d Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 29 Jan 2018 22:23:59 -0600 Subject: rna-seqc package: JAVA_{ARGS,OPTS} for helper script (#6972) --- var/spack/repos/builtin/packages/rna-seqc/rna-seqc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/rna-seqc/rna-seqc.sh b/var/spack/repos/builtin/packages/rna-seqc/rna-seqc.sh index 6f3d22cbf9..c1d8d7c2e7 100644 --- a/var/spack/repos/builtin/packages/rna-seqc/rna-seqc.sh +++ b/var/spack/repos/builtin/packages/rna-seqc/rna-seqc.sh @@ -1,3 +1,3 @@ #!/bin/sh # convenience wrapper for the rna-seqc jar file -java -jar RNA-SeQC_v{}.jar "$@" +java $JAVA_ARGS $JAVA_OPTS -jar RNA-SeQC_v{}.jar "$@" -- cgit v1.2.3-70-g09d2 From cef4c2fa1cb910c9582ef37a79988d8dc6012748 Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Wed, 31 Jan 2018 06:12:43 -0600 Subject: maq: Create new package. (#7133) --- var/spack/repos/builtin/packages/maq/package.py | 39 +++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/maq/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/maq/package.py b/var/spack/repos/builtin/packages/maq/package.py new file mode 100644 index 0000000000..67ab4ae7fd --- /dev/null +++ b/var/spack/repos/builtin/packages/maq/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Maq(AutotoolsPackage): + """Maq is a software that builds mapping assemblies from short reads + generated by the next-generation sequencing machines.""" + + homepage = "http://maq.sourceforge.net/" + url = "https://downloads.sourceforge.net/project/maq/maq/0.7.1/maq-0.7.1.tar.bz2" + list_url = "https://sourceforge.net/projects/maq/files/maq/" + + version('0.7.1', '51130f6c8257c133719adacdd1433f35') + version('0.5.0', '854e2bee32d5237236d4c68c0ed7c52d') + + conflicts('%gcc@4.7.0:', when='@0.7.1') -- cgit v1.2.3-70-g09d2 From 35746fdde10d647c9b4f33a7eed9257097532f2c Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Wed, 31 Jan 2018 13:36:22 +0100 Subject: rtags: add 2.17 and for now comment-out 2.12 (#7126) --- var/spack/repos/builtin/packages/rtags/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/rtags/package.py b/var/spack/repos/builtin/packages/rtags/package.py index b0a5b7487f..a82a8dd1da 100644 --- a/var/spack/repos/builtin/packages/rtags/package.py +++ b/var/spack/repos/builtin/packages/rtags/package.py @@ -29,9 +29,10 @@ class Rtags(CMakePackage): """RTags is a client/server application that indexes C/C++ code""" homepage = "https://github.com/Andersbakken/rtags/" - url = "https://andersbakken.github.io/rtags-releases/rtags-2.12.tar.gz" + url = "https://andersbakken.github.io/rtags-releases/rtags-2.17.tar.gz" - version('2.12', '84988aaff27915a79d4b4b57299f9a51') + version('2.17', '95b24d7729678645a027d83be114d624') + # version('2.12', '84988aaff27915a79d4b4b57299f9a51') # no available depends_on("llvm@3.3: +clang") depends_on("zlib") -- cgit v1.2.3-70-g09d2 From a5758d97b3948ad1d1482700df0f8dbb3e33b923 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Wed, 31 Jan 2018 04:39:58 -0800 Subject: libarchive@3.3.2: new version (#7113) --- var/spack/repos/builtin/packages/libarchive/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libarchive/package.py b/var/spack/repos/builtin/packages/libarchive/package.py index f06f09b391..1d07f44a7b 100644 --- a/var/spack/repos/builtin/packages/libarchive/package.py +++ b/var/spack/repos/builtin/packages/libarchive/package.py @@ -32,6 +32,7 @@ class Libarchive(AutotoolsPackage): homepage = "http://www.libarchive.org" url = "http://www.libarchive.org/downloads/libarchive-3.1.2.tar.gz" + version('3.3.2', '4583bd6b2ebf7e0e8963d90879eb1b27') version('3.2.1', 'afa257047d1941a565216edbf0171e72') version('3.1.2', 'efad5a503f66329bb9d2f4308b5de98a') version('3.1.1', '1f3d883daf7161a0065e42a15bbf168f') -- cgit v1.2.3-70-g09d2 From 804a6c5e1aedc1c72cbd95c7022963f4cabb589c Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Wed, 31 Jan 2018 04:40:32 -0800 Subject: lz4@1.8.1.2: new version (#7111) --- var/spack/repos/builtin/packages/lz4/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lz4/package.py b/var/spack/repos/builtin/packages/lz4/package.py index 2c8d0977ae..977167dd28 100644 --- a/var/spack/repos/builtin/packages/lz4/package.py +++ b/var/spack/repos/builtin/packages/lz4/package.py @@ -34,6 +34,7 @@ class Lz4(Package): homepage = "http://lz4.github.io/lz4/" url = "https://github.com/lz4/lz4/archive/v1.7.5.tar.gz" + version('1.8.1.2', '343538e69ba752a386c669b1a28111e2') version('1.7.5', 'c9610c5ce97eb431dddddf0073d919b9') version('1.3.1', '42b09fab42331da9d3fb33bd5c560de9') -- cgit v1.2.3-70-g09d2 From ae589c22f297bf64f1417277c71d600a11222584 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Wed, 31 Jan 2018 04:41:12 -0800 Subject: gcc: add version 7.3.0 (#7097) --- var/spack/repos/builtin/packages/gcc/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py index 09d60abf55..1415c87f8d 100644 --- a/var/spack/repos/builtin/packages/gcc/package.py +++ b/var/spack/repos/builtin/packages/gcc/package.py @@ -41,6 +41,7 @@ class Gcc(AutotoolsPackage): list_url = 'http://ftp.gnu.org/gnu/gcc/' list_depth = 1 + version('7.3.0', 'be2da21680f27624f3a87055c4ba5af2') version('7.2.0', 'ff370482573133a7fcdd96cd2f552292') version('7.1.0', '6bf56a2bca9dac9dbbf8e8d1036964a8') version('6.4.0', '11ba51a0cfb8471927f387c8895fe232') -- cgit v1.2.3-70-g09d2 From 148a2f0238effb7ab81d28d2136d6a6bb8a0b12c Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Wed, 31 Jan 2018 04:42:41 -0800 Subject: bmake@20171207: new package (#7099) --- var/spack/repos/builtin/packages/bmake/package.py | 51 +++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 var/spack/repos/builtin/packages/bmake/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bmake/package.py b/var/spack/repos/builtin/packages/bmake/package.py new file mode 100644 index 0000000000..55afa005b1 --- /dev/null +++ b/var/spack/repos/builtin/packages/bmake/package.py @@ -0,0 +1,51 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import re + + +class Bmake(Package): + """bmake: portable BSD make + + bmake is the BSD make(1) utility ported to several non-BSD + systems. It supports GNU's autoconf.""" + + homepage = "http://www.crufty.net/FreeWare/" + url = "ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg/bmake-20171207.tar.gz" + + version('20171207', '5d7f2f85f16c4a6ba34ceea68957447f') + + def install(self, spec, prefix): + # Do not pre-roff cat pages + mk_file = FileFilter('mk/man.mk') + mk_file.filter(re.escape(r'MANTARGET?'), 'MANTARGET') + + # -DWITHOUT_PROG_LINK does not symlink bmake as + # -"bmake-VERSION" + sh = which('sh') + sh('boot-strap', '--prefix={0}'.format(prefix), + '-DWITHOUT_PROG_LINK', '--install') + mkdirp(prefix.man1) + install('bmake.1', join_path(prefix.man1, 'bmake.1')) -- cgit v1.2.3-70-g09d2 From b8b2c67b9cb9167f26cafdfe494c1040e5771ff9 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Wed, 31 Jan 2018 04:44:09 -0800 Subject: opam: new package (#7079) --- var/spack/repos/builtin/packages/opam/package.py | 53 ++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 var/spack/repos/builtin/packages/opam/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/opam/package.py b/var/spack/repos/builtin/packages/opam/package.py new file mode 100644 index 0000000000..ab71d15e7b --- /dev/null +++ b/var/spack/repos/builtin/packages/opam/package.py @@ -0,0 +1,53 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Opam(AutotoolsPackage): + """OPAM: OCaml Package Manager + + OPAM is a source-based package manager for OCaml. It supports + multiple simultaneous compiler installations, flexible package + constraints, and a Git-friendly development workflow.""" + + homepage = "https://opam.ocaml.org/" + url = "https://github.com/ocaml/opam/releases/download/1.2.2/opam-full-1.2.2.tar.gz" + + version('1.2.2', '7d348c2898795e9f325fb80eaaf5eae8') + version('1.2.1', '04e8823a099ab631943952e4c2ab18fc') + + depends_on('ocaml') # Not a strict dependency, but recommended + + parallel = False + + def setup_environment(self, spack_env, run_env): + # Environment variable setting taken from + # https://github.com/Homebrew/homebrew-core/blob/master/Formula/opam.rb + spack_env.set('OCAMLPARAM', 'safe-string=0,_') # OCaml 4.06.0 compat + + def build(self, spec, prefix): + make('lib-ext') + make() + make('man') -- cgit v1.2.3-70-g09d2 From e8b4de7b4ce82da2fcc54bbae52b5649caa62e4e Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Wed, 31 Jan 2018 04:46:17 -0800 Subject: re2c@1.0.3: new package (#7092) --- var/spack/repos/builtin/packages/re2c/package.py | 39 ++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/re2c/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/re2c/package.py b/var/spack/repos/builtin/packages/re2c/package.py new file mode 100644 index 0000000000..19632475f7 --- /dev/null +++ b/var/spack/repos/builtin/packages/re2c/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +# +from spack import * + + +class Re2c(AutotoolsPackage): + """re2c: a free and open-source lexer generator for C and C++""" + + homepage = "http://re2c.org/index.html" + url = "https://github.com/skvadrik/re2c/releases/download/1.0.3/re2c-1.0.3.tar.gz" + + version('1.0.3', '8f575e2bf2efd3c685c87042f279ae4f') + + def configure_args(self): + args = ['--disable-dependency-tracking'] + return args -- cgit v1.2.3-70-g09d2 From ebaa106d7adfa0ee40d5dbf783093e45cdc66010 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Wed, 31 Jan 2018 04:49:17 -0800 Subject: ocaml@4.06.0: new version (#7078) --- var/spack/repos/builtin/packages/ocaml/package.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ocaml/package.py b/var/spack/repos/builtin/packages/ocaml/package.py index e93d811f06..a01949ce2e 100644 --- a/var/spack/repos/builtin/packages/ocaml/package.py +++ b/var/spack/repos/builtin/packages/ocaml/package.py @@ -32,12 +32,17 @@ class Ocaml(Package): homepage = "http://ocaml.org/" url = "http://caml.inria.fr/pub/distrib/ocaml-4.03/ocaml-4.03.0.tar.gz" + version('4.06.0', '66e5439eb63dbb8b8224cba5d1b20947') version('4.03.0', '43812739ea1b4641cf480f57f977c149') depends_on('ncurses') + def url_for_version(self, version): + url = "http://caml.inria.fr/pub/distrib/ocaml-{0}/ocaml-{1}.tar.gz" + return url.format(version.up_to(2), version) + def install(self, spec, prefix): configure('-prefix', '{0}'.format(prefix)) make('world.opt') - make('install') + make('install', 'PREFIX={0}'.format(prefix)) -- cgit v1.2.3-70-g09d2 From 0d5ad7d84311444b175d3b3263751dfa3f19b34e Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 31 Jan 2018 13:59:38 +0100 Subject: openPMD-validator (#7064) Adds the new package for openPMD validator tools. --- .../packages/py-openpmd-validator/package.py | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-openpmd-validator/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-openpmd-validator/package.py b/var/spack/repos/builtin/packages/py-openpmd-validator/package.py new file mode 100644 index 0000000000..e6827ee61c --- /dev/null +++ b/var/spack/repos/builtin/packages/py-openpmd-validator/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyOpenpmdValidator(PythonPackage): + """Validator and Example Scripts for the openPMD markup. + + openPMD is an open standard for particle-mesh data files.""" + + homepage = "http://www.openPMD.org" + url = "https://github.com/openPMD/openPMD-validator/archive/1.0.0.2.tar.gz" + maintainers = ['ax3l'] + + version('1.0.0.2', '2b71b786288c1e7a2134bd6818ad1999') + + depends_on('py-setuptools', type='build') + depends_on('py-numpy@1.6.1:', type=('build', 'run')) + depends_on('py-dateutil@2.3.0:', type=('build', 'run')) + depends_on('py-h5py@2.0.0:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From b59c3bcf021f800fa432fe492b26e6d9224d1e31 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 31 Jan 2018 07:01:49 -0600 Subject: abyss: added missing libtool dependency (#7054) --- var/spack/repos/builtin/packages/abyss/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/abyss/package.py b/var/spack/repos/builtin/packages/abyss/package.py index 4a8aa0fb03..29b8d424a2 100644 --- a/var/spack/repos/builtin/packages/abyss/package.py +++ b/var/spack/repos/builtin/packages/abyss/package.py @@ -44,6 +44,7 @@ class Abyss(AutotoolsPackage): depends_on('boost@:1.50.0,1.53.0:1.59.0', when='@:1.5.2') depends_on('sparsehash') depends_on('sqlite') + depends_on('libtool') conflicts('^intel-mpi') conflicts('^intel-parallel-studio+mpi') -- cgit v1.2.3-70-g09d2 From 770100765f0ebd6943780c6cddb1dfea970dcdd6 Mon Sep 17 00:00:00 2001 From: sknigh Date: Wed, 31 Jan 2018 05:02:21 -0800 Subject: Added v1.4.2 to libfabric package (#7053) --- var/spack/repos/builtin/packages/libfabric/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libfabric/package.py b/var/spack/repos/builtin/packages/libfabric/package.py index 01e139824a..753d7c5bc7 100644 --- a/var/spack/repos/builtin/packages/libfabric/package.py +++ b/var/spack/repos/builtin/packages/libfabric/package.py @@ -33,6 +33,7 @@ class Libfabric(AutotoolsPackage): url = "https://github.com/ofiwg/libfabric/releases/download/v1.5.0/libfabric-1.5.0.tar.gz" version('1.5.0', 'fda3e9b31ebe184f5157288d059672d6') + version('1.4.2', '2009c8e0817060fb99606ddbf6c5ccf8') fabrics = ('psm', 'psm2', -- cgit v1.2.3-70-g09d2 From cb5919b98138a9273237fe41c0d837b29bacf286 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 31 Jan 2018 14:34:52 +0100 Subject: PNGwriter: 0.7.0 (#7026) Adds the latest release of PNGwriter, including Windows and CMake config package support. --- var/spack/repos/builtin/packages/pngwriter/package.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pngwriter/package.py b/var/spack/repos/builtin/packages/pngwriter/package.py index e170989693..efccb3ac9f 100644 --- a/var/spack/repos/builtin/packages/pngwriter/package.py +++ b/var/spack/repos/builtin/packages/pngwriter/package.py @@ -43,9 +43,19 @@ class Pngwriter(CMakePackage): git='https://github.com/pngwriter/pngwriter.git') version('master', branch='master', git='https://github.com/pngwriter/pngwriter.git') + version('0.7.0', 'a68aa0889f120f5bb07848afce278a95') version('0.6.0', '0a19bc55c5f6379fea7343752fd3ffae') version('0.5.6', 'c13bd1fdc0e331a246e6127b5f262136') depends_on('libpng') depends_on('zlib') depends_on('freetype') + + def cmake_args(self): + spec = self.spec + args = [] + + if spec.satisfies('@0.7.0:'): + args += ['-DPNGwriter_USE_FREETYPE:BOOL=ON'] + + return args -- cgit v1.2.3-70-g09d2 From 60cc0b0b903a37612025459eb4952d7568958355 Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 31 Jan 2018 09:52:34 -0600 Subject: py-setuptools-git: Create new package (#7131) --- .../builtin/packages/py-setuptools-git/package.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-setuptools-git/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-setuptools-git/package.py b/var/spack/repos/builtin/packages/py-setuptools-git/package.py new file mode 100644 index 0000000000..232eb774f5 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-setuptools-git/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PySetuptoolsGit(PythonPackage): + """Setuptools revision control system plugin for Git""" + + homepage = "https://pypi.python.org/pypi/setuptools-git" + url = "https://pypi.io/packages/source/s/setuptools-git/setuptools-git-1.2.tar.gz" + + version('1.2', '40b2ef7687a384ea144503c2e5bc67e2') + + depends_on('py-setuptools', type='build') + depends_on('git') -- cgit v1.2.3-70-g09d2 From 06758fe5cbcbf631959ffc459ccaf372345231cf Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Wed, 31 Jan 2018 10:38:53 -0700 Subject: LBANN OS X (#7105) * Added a package for the MDAnalysis toolkit. * Added some flags to fix the build RPATHs and OpenMP for LBANN on OS X. * Fixed Hydrogen branch of Elemental to find OpenMP on OS X. --- var/spack/repos/builtin/packages/cnpy/package.py | 9 +++++++++ var/spack/repos/builtin/packages/elemental/package.py | 10 ++++++++++ var/spack/repos/builtin/packages/lbann/package.py | 16 +++++++++++++++- 3 files changed, 34 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cnpy/package.py b/var/spack/repos/builtin/packages/cnpy/package.py index 7c868b62b4..6677d8800c 100644 --- a/var/spack/repos/builtin/packages/cnpy/package.py +++ b/var/spack/repos/builtin/packages/cnpy/package.py @@ -24,6 +24,8 @@ ############################################################################## from spack import * +import sys + class Cnpy(CMakePackage): """cnpy: library to read/write .npy and .npz files in C/C++.""" @@ -32,3 +34,10 @@ class Cnpy(CMakePackage): url = "https://github.com/rogersce/cnpy" version('master', git='https://github.com/rogersce/cnpy.git', branch="master") + + def cmake_args(self): + args = [] + if sys.platform == 'darwin': + args.extend(['-DCMAKE_MACOSX_RPATH=ON']) + + return args diff --git a/var/spack/repos/builtin/packages/elemental/package.py b/var/spack/repos/builtin/packages/elemental/package.py index c661e073cb..2b6de080f6 100644 --- a/var/spack/repos/builtin/packages/elemental/package.py +++ b/var/spack/repos/builtin/packages/elemental/package.py @@ -23,6 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## import os +import sys from spack import * from spack.spec import UnsupportedCompilerError @@ -211,6 +212,15 @@ class Elemental(CMakePackage): '-DHydrogen_GENERAL_LAPACK_FALLBACK=ON', ] + # Add support for OS X to find OpenMP + if (self.spec.satisfies('%clang')): + if (sys.platform == 'darwin'): + clang = self.compiler.cc + clang_bin = os.path.dirname(clang) + clang_root = os.path.dirname(clang_bin) + args.extend([ + '-DOpenMP_DIR={0}'.format(clang_root)]) + if 'blas=openblas' in spec: args.extend([ '-DHydrogen_USE_OpenBLAS:BOOL=%s' % ('blas=openblas' in spec), diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index 6a32a53d8b..4b1a80c2b5 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -22,6 +22,8 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## +import os +import sys from spack import * @@ -50,7 +52,7 @@ class Lbann(CMakePackage): values=('Debug', 'Release')) depends_on('elemental +openmp_blas +shared +int64') - depends_on('elemental +openmp_blas +shared +int64 build_type=Debug', + depends_on('elemental +openmp_blas +shared +int64 build_type=Debug', when=('build_type=Debug')) depends_on('cuda', when='+gpu') depends_on('cudnn', when='+gpu') @@ -93,6 +95,18 @@ class Lbann(CMakePackage): '-DLBANN_DATATYPE={0}'.format(spec.variants['dtype'].value), '-DLBANN_VERBOSE=0']) + # Add support for OpenMP + if (self.spec.satisfies('%clang')): + if (sys.platform == 'darwin'): + clang = self.compiler.cc + clang_bin = os.path.dirname(clang) + clang_root = os.path.dirname(clang_bin) + args.extend([ + '-DOpenMP_CXX_FLAGS=-fopenmp=libomp', + '-DOpenMP_CXX_LIB_NAMES=libomp', + '-DOpenMP_libomp_LIBRARY={0}/lib/libomp.dylib'.format( + clang_root)]) + if '+opencv' in spec: args.extend(['-DOpenCV_DIR:STRING={0}'.format( spec['opencv'].prefix)]) -- cgit v1.2.3-70-g09d2 From bc0f683e64e50aeac2ba6bc0a6d3ae3dc17ac949 Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Wed, 31 Jan 2018 10:39:53 -0700 Subject: Protobuf fix (#7110) * Fixed a bug where when using shared libraries OS X does not set the RPATH correctly --- var/spack/repos/builtin/packages/protobuf/package.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/protobuf/package.py b/var/spack/repos/builtin/packages/protobuf/package.py index 52bb28b498..445a2aecb7 100644 --- a/var/spack/repos/builtin/packages/protobuf/package.py +++ b/var/spack/repos/builtin/packages/protobuf/package.py @@ -22,6 +22,7 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## +import sys from spack import * import spack.util.web @@ -33,6 +34,11 @@ class Protobuf(CMakePackage): url = "https://github.com/google/protobuf/archive/v3.2.0.tar.gz" root_cmakelists_dir = "cmake" + version('3.5.1.1', '5005003ae6b94773c4bbca87a644b131') + version('3.5.1', '710f1a75983092c9b45ecef207236104') + version('3.5.0.1', 'b3ed2401acf167207277b254fd7f9638') + version('3.5.0', 'd95db321e1a9901fffc51ed8994afd36') + version('3.4.1', '31b19dcfd6567095fdb66a8c07347222') version('3.4.0', '1d077a7d4db3d75681f5c333f2de9b1a') version('3.3.0', 'f0f712e98de3db0c65c0c417f5e7aca8') version('3.2.0', 'efaa08ae635664fb5e7f31421a41a995') @@ -69,4 +75,6 @@ class Protobuf(CMakePackage): '-Dprotobuf_BUILD_TESTS:BOOL=OFF', '-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON' ] + if sys.platform == 'darwin': + args.extend(['-DCMAKE_MACOSX_RPATH=ON']) return args -- cgit v1.2.3-70-g09d2 From fa65725263587781e98486c381e5fc939b9bfcaf Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 31 Jan 2018 12:28:48 -0600 Subject: fr-hit: Create new package (#7132) --- .../repos/builtin/packages/fr-hit/binning.patch | 7 +++ var/spack/repos/builtin/packages/fr-hit/package.py | 65 ++++++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 var/spack/repos/builtin/packages/fr-hit/binning.patch create mode 100644 var/spack/repos/builtin/packages/fr-hit/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fr-hit/binning.patch b/var/spack/repos/builtin/packages/fr-hit/binning.patch new file mode 100644 index 0000000000..4ee81d5d83 --- /dev/null +++ b/var/spack/repos/builtin/packages/fr-hit/binning.patch @@ -0,0 +1,7 @@ +--- a/binning-1.1.1/binning.py 2018-01-30 10:46:27.302198293 -0600 ++++ b/binning-1.1.1/binning.py 2018-01-30 10:50:58.482866704 -0600 +@@ -1,3 +1,4 @@ ++#!/usr/bin/env python + ###################################################### + # Taxonamy binning using FR-HIT output # + ###################################################### diff --git a/var/spack/repos/builtin/packages/fr-hit/package.py b/var/spack/repos/builtin/packages/fr-hit/package.py new file mode 100644 index 0000000000..03974a9642 --- /dev/null +++ b/var/spack/repos/builtin/packages/fr-hit/package.py @@ -0,0 +1,65 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class FrHit(Package): + """An efficient algorithm for fragment recruitment for next generation + sequences against microbial reference genomes.""" + + homepage = "http://weizhong-lab.ucsd.edu/frhit" + url = "http://weizhong-lab.ucsd.edu/frhit/fr-hit-v0.7.1-2013-02-20.tar.gz" + + version('0.7.1-2013-02-20', '3e8ea41ba09ab0c13e9973fe6f493f96') + + depends_on('perl') + depends_on('python@2.7:') + + # The patch adds the python interpreter to the beginning of the script + # allowing it to be run directly without passing the entire path to the + # script to python. + patch('binning.patch') + + def install(self, spec, prefix): + make() + + filter_file( + r'#!/bin/env perl', + '#!/usr/bin/env perl', + 'frhit2pairend.pl' + ) + filter_file( + r'#!/bin/env perl', + '#!/usr/bin/env perl', + 'psl2sam.pl' + ) + + mkdirp(prefix.bin) + install('fr-hit', prefix.bin) + install('frhit2pairend.pl', prefix.bin) + install('psl2sam.pl', prefix.bin) + install('binning-1.1.1/bacteria_gitax.pkl', prefix.bin) + install('binning-1.1.1/binning.py', prefix.bin) + install('binning-1.1.1/tax.pkl', prefix.bin) -- cgit v1.2.3-70-g09d2 From c3034b53e3ca10da5d13417bb4344dd771ac03a7 Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Wed, 31 Jan 2018 12:10:42 -0700 Subject: Adding support for the Accelerate library on OS X (#7068) * Adding support for the Accelerate library on OS X * Fixed guard on variable and added another depends_on statement to make sure that openblas gets selected even when openmp_blas variant is not turned on. --- var/spack/repos/builtin/packages/elemental/package.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/elemental/package.py b/var/spack/repos/builtin/packages/elemental/package.py index 2b6de080f6..ad0bb404c2 100644 --- a/var/spack/repos/builtin/packages/elemental/package.py +++ b/var/spack/repos/builtin/packages/elemental/package.py @@ -69,8 +69,8 @@ class Elemental(CMakePackage): variant('build_type', default='Release', description='The build type to build', values=('Debug', 'Release')) - variant('blas', default='openblas', values=('openblas', 'mkl', 'essl'), - description='Enable the use of OpenBlas/MKL/ESSL') + variant('blas', default='openblas', values=('openblas', 'mkl', 'accelerate', 'essl'), + description='Enable the use of OpenBlas/MKL/Accelerate/ESSL') variant('mpfr', default=False, description='Support GNU MPFR\'s' 'arbitrary-precision floating-point arithmetic') @@ -78,6 +78,7 @@ class Elemental(CMakePackage): # Note that #1712 forces us to enumerate the different blas variants depends_on('blas', when='~openmp_blas ~int64_blas') # Hack to forward variant to openblas package + depends_on('openblas', when='blas=openblas ~openmp_blas ~int64_blas') # Allow Elemental to build internally when using 8-byte ints depends_on('openblas threads=openmp', when='blas=openblas +openmp_blas ~int64_blas') @@ -85,6 +86,8 @@ class Elemental(CMakePackage): depends_on('intel-mkl threads=openmp', when='blas=mkl +openmp_blas ~int64_blas') depends_on('intel-mkl@2017.1 +openmp +ilp64', when='blas=mkl +openmp_blas +int64_blas') + depends_on('veclibfort', when='blas=accelerate') + depends_on('essl -cuda', when='blas=essl -openmp_blas ~int64_blas') depends_on('essl threads=openmp', when='blas=essl +openmp_blas ~int64_blas') @@ -229,6 +232,8 @@ class Elemental(CMakePackage): elif 'blas=mkl' in spec: args.extend([ '-DHydrogen_USE_MKL:BOOL=%s' % ('blas=mkl' in spec)]) + elif 'blas=accelerate' in spec: + args.extend(['-DHydrogen_USE_ACCELERATE:BOOL=TRUE']) elif 'blas=essl' in spec: args.extend([ '-DHydrogen_USE_ESSL:BOOL=%s' % ('blas=essl' in spec)]) -- cgit v1.2.3-70-g09d2 From ec7d069ba531ed46f211de4ea447be1fd49300b2 Mon Sep 17 00:00:00 2001 From: sknigh Date: Wed, 31 Jan 2018 16:10:14 -0800 Subject: Added osu-micro-benchmarks@5.4 (#7149) --- var/spack/repos/builtin/packages/osu-micro-benchmarks/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/osu-micro-benchmarks/package.py b/var/spack/repos/builtin/packages/osu-micro-benchmarks/package.py index 8e5c7be65a..43bb908efa 100644 --- a/var/spack/repos/builtin/packages/osu-micro-benchmarks/package.py +++ b/var/spack/repos/builtin/packages/osu-micro-benchmarks/package.py @@ -36,6 +36,7 @@ class OsuMicroBenchmarks(AutotoolsPackage): homepage = "http://mvapich.cse.ohio-state.edu/benchmarks/" url = "http://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-5.3.tar.gz" + version('5.4', '7e7551879b944d71b7cc60d476d5403b') version('5.3', '42e22b931d451e8bec31a7424e4adfc2') variant('cuda', default=False, description="Enable CUDA support") -- cgit v1.2.3-70-g09d2 From bddc1556e18494d6a1e35805bb8daf5fc8884db9 Mon Sep 17 00:00:00 2001 From: healther Date: Thu, 1 Feb 2018 01:11:25 +0100 Subject: symlink python3 to python (#7103) * symlink python3 to python * otherwise not all autotools are smart enough * Update package.py --- var/spack/repos/builtin/packages/python/package.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 8df3eb86fa..34b6fb2bad 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -203,6 +203,12 @@ class Python(AutotoolsPackage): os.symlink(os.path.join(src, f), os.path.join(dst, f)) + if spec.satisfies('@3:'): + os.symlink(os.path.join(prefix.bin, 'python3'), + os.path.join(prefix.bin, 'python')) + os.symlink(os.path.join(prefix.bin, 'python3-config'), + os.path.join(prefix.bin, 'python-config')) + # TODO: Once better testing support is integrated, add the following tests # https://wiki.python.org/moin/TkInter # -- cgit v1.2.3-70-g09d2 From 7959c5ffd24ac8955d121f4fb9c6b5bbdeeaa4dd Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Wed, 31 Jan 2018 16:12:25 -0800 Subject: libdwarf: fix linking, fix build on Darwin (#7124) * libdwarf: fix linker flags * libdwarf: fix header install names * libdwarf: add zlib dependency Prior to this commit, libdwarf was linked to the system zlib. This commit links it to spack-installed zlib. * libdwarf: fix dynamic library suffix for Darwin --- .../repos/builtin/packages/libdwarf/package.py | 34 ++++++++++++++++++++-- 1 file changed, 31 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libdwarf/package.py b/var/spack/repos/builtin/packages/libdwarf/package.py index 970a4502b4..cead74a9f4 100644 --- a/var/spack/repos/builtin/packages/libdwarf/package.py +++ b/var/spack/repos/builtin/packages/libdwarf/package.py @@ -23,6 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * +import sys # Only build certain parts of dwarf because the other ones break. dwarf_dirs = ['libdwarf', 'dwarfdump2'] @@ -49,6 +50,7 @@ class Libdwarf(Package): version('20130207', '64b42692e947d5180e162e46c689dfbf') version('20130126', 'ded74a5e90edb5a12aac3c29d260c5db') depends_on("elf", type='link') + depends_on('zlib', type='link') parallel = False @@ -77,23 +79,44 @@ class Libdwarf(Package): if spec.satisfies('^libelf'): libelf_inc_dir = join_path(spec['libelf'].prefix, 'include/libelf') - extra_config_args.append('CFLAGS=-I{0}'.format( - libelf_inc_dir)) + extra_config_args.append( + 'CFLAGS=-I{0} -Wl,-L{1} -Wl,-lelf'.format( + libelf_inc_dir, spec['libelf'].prefix.lib)) configure("--prefix=" + prefix, "--enable-shared", *extra_config_args) + filter_file(r'^dwfzlib\s*=\s*-lz', + 'dwfzlib=-L{0} -lz'.format( + self.spec['zlib'].prefix.lib), + 'Makefile') make() + libdwarf_name = 'libdwarf.{0}'.format(dso_suffix) install('libdwarf.a', prefix.lib) - install('libdwarf.so', prefix.lib) + install('libdwarf.so', join_path(prefix.lib, libdwarf_name)) install('libdwarf.h', prefix.include) install('dwarf.h', prefix.include) + # It seems like fix_darwin_install_name can't be used + # here directly; the install name of the library in + # the stage directory must be fixed in order for dyld + # to locate it on Darwin when spack builds dwarfdump + if sys.platform == 'darwin': + install_name_tool = which('install_name_tool') + install_name_tool('-id', + join_path('..', 'libdwarf', + 'libdwarf.so'), + 'libdwarf.so') + if spec.satisfies('@20130126:20130729'): dwarfdump_dir = 'dwarfdump2' else: dwarfdump_dir = 'dwarfdump' with working_dir(dwarfdump_dir): configure("--prefix=" + prefix) + filter_file(r'^dwfzlib\s*=\s*-lz', + 'dwfzlib=-L{0} -lz'.format( + self.spec['zlib'].prefix.lib), + 'Makefile') # This makefile has strings of copy commands that # cause a race in parallel @@ -102,3 +125,8 @@ class Libdwarf(Package): install('dwarfdump', prefix.bin) install('dwarfdump.conf', prefix.lib) install('dwarfdump.1', prefix.man.man1) + + @run_after('install') + def darwin_fix(self): + if sys.platform == 'darwin': + fix_darwin_install_name(self.prefix.lib) -- cgit v1.2.3-70-g09d2 From 514f0bf5c546d666f32c02ea652658dcf3b85c8c Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Wed, 31 Jan 2018 16:12:44 -0800 Subject: lz4 platform=darwin: fix dylib name (#7112) --- var/spack/repos/builtin/packages/lz4/package.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lz4/package.py b/var/spack/repos/builtin/packages/lz4/package.py index 977167dd28..a71b9699ce 100644 --- a/var/spack/repos/builtin/packages/lz4/package.py +++ b/var/spack/repos/builtin/packages/lz4/package.py @@ -23,6 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * +import sys class Lz4(Package): @@ -53,3 +54,8 @@ class Lz4(Package): if self.run_tests: make('test') # requires valgrind to be installed make('install', 'PREFIX={0}'.format(prefix)) + + @run_after('install') + def darwin_fix(self): + if sys.platform == 'darwin': + fix_darwin_install_name(self.prefix.lib) -- cgit v1.2.3-70-g09d2 From 27b033587b8bee27d4b682151f7c1b504cefc0bd Mon Sep 17 00:00:00 2001 From: Feiyi Wang Date: Thu, 1 Feb 2018 11:48:32 -0700 Subject: Efficient array of booleans, C extension (#7135) --- .../repos/builtin/packages/py-bitarray/package.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-bitarray/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-bitarray/package.py b/var/spack/repos/builtin/packages/py-bitarray/package.py new file mode 100644 index 0000000000..a4e928590c --- /dev/null +++ b/var/spack/repos/builtin/packages/py-bitarray/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyBitarray(PythonPackage): + """Efficient array of booleans - C extension""" + + homepage = "https://pypi.python.org/pypi/bitarray" + url = "https://pypi.io/packages/source/b/bitarray/bitarray-0.8.1.tar.gz" + + version('0.8.1', '3825184f54f4d93508a28031b4c65d3b') + + depends_on('python') + depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From 0b6d7f7397642b48c5bb693c8bda3f2039a6de96 Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 2 Feb 2018 12:28:45 -0600 Subject: new package: perl-exporter-tiny (#7030) --- .../builtin/packages/perl-exporter-tiny/package.py | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-exporter-tiny/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-exporter-tiny/package.py b/var/spack/repos/builtin/packages/perl-exporter-tiny/package.py new file mode 100644 index 0000000000..3285fc3b6d --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-exporter-tiny/package.py @@ -0,0 +1,35 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlExporterTiny(PerlPackage): + """An exporter with the features of Sub::Exporter but only core + dependencies""" + + homepage = "http://search.cpan.org/~tobyink/Exporter-Tiny/lib/Exporter/Tiny.pm" + url = "http://search.cpan.org/CPAN/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.000000.tar.gz" + + version('1.000000', '0d413747bdcf880f9ec62de8801ccf5e') -- cgit v1.2.3-70-g09d2 From b6f1e0611c818db1a3208c95e63c025cf0d40f06 Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 3 Feb 2018 02:52:51 -0600 Subject: stringtie: add version 1.3.4a (#7164) --- var/spack/repos/builtin/packages/stringtie/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/stringtie/package.py b/var/spack/repos/builtin/packages/stringtie/package.py index 9e5a690a5d..aa86ea05ba 100644 --- a/var/spack/repos/builtin/packages/stringtie/package.py +++ b/var/spack/repos/builtin/packages/stringtie/package.py @@ -32,6 +32,7 @@ class Stringtie(MakefilePackage): homepage = "https://ccb.jhu.edu/software/stringtie" url = "https://github.com/gpertea/stringtie/archive/v1.3.3b.tar.gz" + version('1.3.4a', '2a191ef6512242a3a5778cf7718bb6af') version('1.3.3b', '11a43260b18e4272182380e922445d88') depends_on('samtools') -- cgit v1.2.3-70-g09d2 From 4c9521b52b045a167efef5406258c51e49f40694 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Sat, 3 Feb 2018 01:05:06 -0800 Subject: clingo@5.2.2: new package (#7091) --- var/spack/repos/builtin/packages/clingo/package.py | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 var/spack/repos/builtin/packages/clingo/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/clingo/package.py b/var/spack/repos/builtin/packages/clingo/package.py new file mode 100644 index 0000000000..55279a55f9 --- /dev/null +++ b/var/spack/repos/builtin/packages/clingo/package.py @@ -0,0 +1,54 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Clingo(CMakePackage): + """Clingo: A grounder and solver for logic programs + + Clingo is part of the Potassco project for Answer Set + Programming (ASP). ASP offers a simple and powerful modeling + language to describe combinatorial problems as logic + programs. The clingo system then takes such a logic program and + computes answer sets representing solutions to the given + problem.""" + + homepage = "https://potassco.org/clingo/" + url = "https://github.com/potassco/clingo/archive/v5.2.2.tar.gz" + + version('5.2.2', 'd46a1567f772eebad85c6300d55d2cc3') + + depends_on('doxygen', type=('build')) + depends_on('python') + + def cmake_args(self): + if not self.compiler.cxx14_flag: + InstallError('clingo requires a C++14-compliant C++ compiler') + + args = ['-DCLINGO_BUILD_WITH_PYTHON=ON', + '-DCLING_BUILD_PY_SHARED=ON', + '-DPYCLINGO_USE_INSTALL_PREFIX=ON', + '-DCLINGO_BUILD_WITH_LUA=OFF'] + return args -- cgit v1.2.3-70-g09d2 From be5fa8f6c20ec04c233e90bdaae34849345a5d21 Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Sat, 3 Feb 2018 04:06:35 -0500 Subject: macOS Fix for GDAL (#7155) --- var/spack/repos/builtin/packages/gdal/package.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gdal/package.py b/var/spack/repos/builtin/packages/gdal/package.py index 044013c88d..6f55b8b0d0 100644 --- a/var/spack/repos/builtin/packages/gdal/package.py +++ b/var/spack/repos/builtin/packages/gdal/package.py @@ -23,9 +23,10 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * +import sys -class Gdal(Package): +class Gdal(AutotoolsPackage): """GDAL is a translator library for raster and vector geospatial data formats that is released under an X/MIT style Open Source license by the Open Source Geospatial Foundation. As a library, @@ -67,9 +68,10 @@ class Gdal(Package): parallel = False - def install(self, spec, prefix): + def configure_args(self): + spec = self.spec + args = [] - args.append("--prefix=%s" % prefix) args.append("--with-liblzma=yes") args.append("--with-zlib=%s" % spec['zlib'].prefix) args.append("--with-python=%s" % spec['python'].command.path) @@ -88,7 +90,10 @@ class Gdal(Package): if '+netcdf' in spec: args.append('--with-netcdf=%s' % spec['netcdf'].prefix) - configure(*args) + return args - make() - make("install") + @run_after('install') + def darwin_fix(self): + # The shared library is not installed correctly on Darwin; fix this + if sys.platform == 'darwin': + fix_darwin_install_name(self.prefix.lib) -- cgit v1.2.3-70-g09d2 From caba978aa6b05e5a1d4bb174c3d01c6a79c3c021 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Sat, 3 Feb 2018 17:07:02 +0800 Subject: A new package: libcroco. (#7154) --- .../repos/builtin/packages/libcroco/package.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 var/spack/repos/builtin/packages/libcroco/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libcroco/package.py b/var/spack/repos/builtin/packages/libcroco/package.py new file mode 100644 index 0000000000..8a967099bc --- /dev/null +++ b/var/spack/repos/builtin/packages/libcroco/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Libcroco(AutotoolsPackage): + """Libcroco is a standalone css2 parsing and manipulation library.""" + + homepage = "https://developer.gnome.org/libcroco" + url = "http://ftp.gnome.org/pub/gnome/sources/libcroco/0.6/libcroco-0.6.12.tar.xz" + + version('0.6.12', 'bc0984fce078ba2ce29f9500c6b9ddce') + + depends_on('glib') + depends_on('libxml2') -- cgit v1.2.3-70-g09d2 From 927af929f4743ee02ca788ab6e7305587d39045d Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Sat, 3 Feb 2018 04:22:03 -0500 Subject: highfive: Update to version 1.5 (#7041) --- var/spack/repos/builtin/packages/highfive/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/highfive/package.py b/var/spack/repos/builtin/packages/highfive/package.py index ad97e716e0..588e445065 100644 --- a/var/spack/repos/builtin/packages/highfive/package.py +++ b/var/spack/repos/builtin/packages/highfive/package.py @@ -32,6 +32,7 @@ class Highfive(CMakePackage): homepage = "https://github.com/BlueBrain/HighFive" url = "https://github.com/BlueBrain/HighFive/archive/v1.2.tar.gz" + version('1.5', '5e631c91d2ea7f3677e99d6bb6db8167') version('1.2', '030728d53519c7e13b5a522d34240301') version('1.1', '986f0bd18c5264709688a536c02d2b2a') version('1.0', 'e44e548560ea92afdb244c223b7655b6') -- cgit v1.2.3-70-g09d2 From 970a4b2815f5ef5eca44c1da6ba03059725bd8d4 Mon Sep 17 00:00:00 2001 From: Thilina Rathnayake Date: Sat, 3 Feb 2018 17:05:14 -0600 Subject: Update Nek5000 package to Version 17 (#7178) and minor polishing --- .../repos/builtin/packages/nek5000/package.py | 26 ++++++++++------------ 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nek5000/package.py b/var/spack/repos/builtin/packages/nek5000/package.py index 4755d28575..aeb7e5b676 100644 --- a/var/spack/repos/builtin/packages/nek5000/package.py +++ b/var/spack/repos/builtin/packages/nek5000/package.py @@ -46,9 +46,9 @@ class Nek5000(Package): tags = ['cfd', 'flow', 'hpc', 'solver', 'navier-stokes', 'spectral-elements', 'fluid'] - version('17.0.0-beta2', git='https://github.com/Nek5000/Nek5000.git', - commit='b95f46c59f017fff2fc19b66aa65a881085a7572') - version('develop', git='https://github.com/Nek5000/Nek5000.git', + version('17.0', git='https://github.com/Nek5000/Nek5000.git', + commit='469daf94d3f9aa3ba9d258d8eee9ebde6893a702') + version('develop', git='https://github.com/Nek5000/Nek5000.git', branch='master') # MPI, Profiling and Visit variants @@ -88,18 +88,15 @@ class Nek5000(Package): toolsDir = 'tools' binDir = 'bin' - F77 = self.compiler.fc + FC = self.compiler.fc CC = self.compiler.cc # Build the tools, maketools copy them to Nek5000/bin by default. # We will then install Nek5000/bin under prefix after that. with working_dir(toolsDir): # Update the maketools script to use correct compilers - if self.version == Version('17.0.0-beta2'): # Old release - filter_file(r'^F77\s*=.*', 'F77=\"' + F77 + '\"', 'maketools') - else: - filter_file(r'^FC\s*=.*', 'FC=\"' + F77 + '\"', 'maketools') - filter_file(r'^CC\s*=.*', 'CC=\"' + CC + '\"', 'maketools') + filter_file(r'^FC\s*=.*', 'FC="{0}"'.format(FC), 'maketools') + filter_file(r'^CC\s*=.*', 'CC="{0}"'.format(CC), 'maketools') maxnel = self.spec.variants['MAXNEL'].value filter_file(r'^#MAXNEL\s*=.*', 'MAXNEL=' + maxnel, 'maketools') @@ -126,7 +123,7 @@ class Nek5000(Package): with working_dir(binDir): if '+mpi' in spec: - F77 = spec['mpi'].mpif77 + FC = spec['mpi'].mpif77 CC = spec['mpi'].mpicc else: filter_file(r'^#MPI=0', 'MPI=0', 'makenek') @@ -141,10 +138,11 @@ class Nek5000(Package): # Update the makenek to use correct compilers and # Nek5000 source. - filter_file(r'^F77\s*=.*', 'F77=\"' + F77 + '\"', 'makenek') - filter_file(r'^CC\s*=.*', 'CC=\"' + CC + '\"', 'makenek') - filter_file(r'SOURCE_ROOT\s*=\"\$H.*', 'SOURCE_ROOT=\"' + - prefix.bin.Nek5000 + '\"', 'makenek') + if self.version >= Version('17.0'): + filter_file(r'^#FC\s*=.*', 'FC="{0}"'.format(FC), 'makenek') + filter_file(r'^#CC\s*=.*', 'CC="{0}"'.format(CC), 'makenek') + filter_file(r'^#SOURCE_ROOT\s*=\"\$H.*', 'SOURCE_ROOT=\"' + + prefix.bin.Nek5000 + '\"', 'makenek') # Install Nek5000/bin in prefix/bin install_tree(binDir, prefix.bin) -- cgit v1.2.3-70-g09d2 From 6c21d0bf312ddb6ce58f0051bcccabfee1c64718 Mon Sep 17 00:00:00 2001 From: Mark Meredith Date: Sun, 4 Feb 2018 03:05:44 -0500 Subject: Update fish url for fish 2.7.1 (#7089) --- var/spack/repos/builtin/packages/fish/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fish/package.py b/var/spack/repos/builtin/packages/fish/package.py index 97b3d151ea..b9a91dd46d 100644 --- a/var/spack/repos/builtin/packages/fish/package.py +++ b/var/spack/repos/builtin/packages/fish/package.py @@ -31,10 +31,11 @@ class Fish(AutotoolsPackage): """ homepage = "https://fishshell.com/" - url = "https://fishshell.com/files/2.7.0/fish-2.7.0.tar.gz" + url = "https://github.com/fish-shell/fish-shell/releases/download/2.7.1/fish-2.7.1.tar.gz" list_url = "https://fishshell.com/" depends_on('ncurses') + version('2.7.1', 'e42bb19c7586356905a58578190be792df960fa81de35effb1ca5a5a981f0c5a') version('2.7.0', '3a76b7cae92f9f88863c35c832d2427fb66082f98e92a02203dc900b8fa87bcb') version('2.2.0', 'a76339fd14ce2ec229283c53e805faac48c3e99d9e3ede9d82c0554acfc7b77a') -- cgit v1.2.3-70-g09d2 From e25406c26b082a49620702ec774ec0e66055b778 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Mon, 5 Feb 2018 11:33:12 -0600 Subject: angsd: new version, and conflict for newer htslib with old version (#7122) --- var/spack/repos/builtin/packages/angsd/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/angsd/package.py b/var/spack/repos/builtin/packages/angsd/package.py index eb3e5e58f5..427deb2d5e 100644 --- a/var/spack/repos/builtin/packages/angsd/package.py +++ b/var/spack/repos/builtin/packages/angsd/package.py @@ -35,9 +35,11 @@ class Angsd(MakefilePackage): homepage = "https://github.com/ANGSD/angsd" url = "https://github.com/ANGSD/angsd/archive/0.919.tar.gz" + version('0.921', '3702db035396db602c7f74728b1a5a1f') version('0.919', '79d342f49c24ac00d35934f2617048d4') depends_on('htslib') + conflicts('^htslib@1.6:', when='@0.919') def setup_environment(self, spack_env, run_env): run_env.set('R_LIBS', prefix.R) -- cgit v1.2.3-70-g09d2 From 49e58992db41b8fe336dc2539599df0396013c9f Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Mon, 5 Feb 2018 21:35:17 -0800 Subject: oclint: new package (#7076) --- .../repos/builtin/packages/oclint/bundle.patch | 16 +++++ var/spack/repos/builtin/packages/oclint/package.py | 83 ++++++++++++++++++++++ 2 files changed, 99 insertions(+) create mode 100644 var/spack/repos/builtin/packages/oclint/bundle.patch create mode 100644 var/spack/repos/builtin/packages/oclint/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/oclint/bundle.patch b/var/spack/repos/builtin/packages/oclint/bundle.patch new file mode 100644 index 0000000000..f40e72bfae --- /dev/null +++ b/var/spack/repos/builtin/packages/oclint/bundle.patch @@ -0,0 +1,16 @@ +--- oclint-scripts/bundle 2017-09-29 10:27:37.000000000 -0700 ++++ oclint-scripts/bundle 2018-01-26 03:49:31.000000000 -0800 +@@ -92,7 +92,7 @@ + + def install_cpp_headers(): + if environment.is_darwin(): +- install_dir = path.build.clang_install_dir ++ install_dir = (path.build.clang_install_dir if not args.llvm_root else args.llvm_root) + clang_cpp_headers_dir = os.path.join(install_dir, 'include', 'c++') + oclint_cpp_headers_dir = os.path.join(bundle_include_dir, 'c++') + path.mkdir_p(bundle_include_dir) +@@ -141,4 +141,3 @@ + + if args.archive: + archive(args.release) +- diff --git a/var/spack/repos/builtin/packages/oclint/package.py b/var/spack/repos/builtin/packages/oclint/package.py new file mode 100644 index 0000000000..114a963bef --- /dev/null +++ b/var/spack/repos/builtin/packages/oclint/package.py @@ -0,0 +1,83 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Oclint(Package): + """OClint: a static analysis tool for C, C++, and Objective-C code + + OCLint is a static code analysis tool for improving quality and + reducing defects by inspecting C, C++ and Objective-C code and + looking for potential problems""" + + homepage = "http://oclint.org/" + url = "https://github.com/oclint/oclint/archive/v0.13.tar.gz" + + version('0.13', '1d0e605eb7815ac15e6a2a82327d2dd8') + + depends_on('python', type=('build')) + depends_on('py-argparse', type=('build')) + depends_on('git', type=('build')) + depends_on('subversion', type=('build')) + depends_on('cmake', type=('build')) + depends_on('ninja', type=('build')) + depends_on('llvm@5.0.0:') + + # Needed to fix a bug in oclint-scripts/bundle script, which + # attempts to install c++ headers in the wrong location + # contributed upstream as + # https://github.com/oclint/oclint/pull/492 + patch('bundle.patch', level=0) + + def install(self, spec, prefix): + # Build from source via directions from + # http://docs.oclint.org/en/stable/intro/build.html, + cd('oclint-scripts') + + # ...but instead of using oclint-scripts/make, execute the + # commands in oclint-scripts/makeWithSystemLLVM so that + # oclint links to spack-installed LLVM + build_script = Executable(join_path('.', 'build')) + bundle_script = Executable(join_path('.', 'bundle')) + + # Add the '-no-analytics' argument to the build script because + # 1) it doesn't detect properly a spack install of OpenSSL, + # and throws an error due to missing OpenSSL headers + # 2) the bespoke build system is a pain to patch as it is + # 3) many sites don't allow software that communicates analytics data + build_script('-release', + '-clean', + '-llvm-root={0}'.format(spec['llvm'].prefix), + '-use-system-compiler', + '-no-analytics', + 'all') + bundle_script('-release', '-llvm-root={0}'.format(spec['llvm'].prefix)) + + # Copy install tree into the correct locations using the + # directory layout described in + cd(join_path('..', 'build')) + install_tree(join_path('oclint-release', 'include'), prefix.include) + install_tree(join_path('oclint-release', 'lib'), prefix.lib) + install_tree(join_path('oclint-release', 'bin'), prefix.bin) -- cgit v1.2.3-70-g09d2 From 167b5dc5d34e38e3601084f797ea7b80cd8ff1fc Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 6 Feb 2018 06:52:37 -0600 Subject: py-localcider: Create new package (#7189) --- .../builtin/packages/py-localcider/package.py | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-localcider/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-localcider/package.py b/var/spack/repos/builtin/packages/py-localcider/package.py new file mode 100644 index 0000000000..54c4b55c1b --- /dev/null +++ b/var/spack/repos/builtin/packages/py-localcider/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyLocalcider(PythonPackage): + """Tools for calculating sequence properties of disordered proteins""" + + homepage = "http://pappulab.github.io/localCIDER" + url = "https://pypi.io/packages/source/l/localcider/localcider-0.1.14.tar.gz" + + version('0.1.14', 'cd3c992595c5cb280374de3750663cfa') + + depends_on('py-setuptools', type='build') + depends_on('py-numpy', type=('build', 'run')) + depends_on('py-matplotlib', type=('build', 'run')) + depends_on('py-scipy', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 26ff36f05f3f1a79c300868f55216cd7785b4f03 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 6 Feb 2018 06:54:05 -0600 Subject: samblaster: Create new package (#7188) --- .../repos/builtin/packages/samblaster/package.py | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 var/spack/repos/builtin/packages/samblaster/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/samblaster/package.py b/var/spack/repos/builtin/packages/samblaster/package.py new file mode 100644 index 0000000000..6f571ecd16 --- /dev/null +++ b/var/spack/repos/builtin/packages/samblaster/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Samblaster(MakefilePackage): + """A tool to mark duplicates and extract discordant and split reads from + sam files.""" + + homepage = "https://github.com/GregoryFaust/samblaster" + url = "https://github.com/GregoryFaust/samblaster/archive/v.0.1.24.tar.gz" + + version('0.1.24', '885d5782cc277865dfb086fc0a20243e') + version('0.1.23', '95d33b6fcceaa38a9bd79014446b4545') + + def install(self, spec, prefix): + mkdirp(prefix.bin) + install('samblaster', prefix.bin) -- cgit v1.2.3-70-g09d2 From 8f5ece9aced7d4945d91cd37872f50873a2d49d0 Mon Sep 17 00:00:00 2001 From: Hans Pabst Date: Tue, 6 Feb 2018 14:31:18 +0100 Subject: LIBXSMM 1.8.3 (#7183) --- var/spack/repos/builtin/packages/libxsmm/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libxsmm/package.py b/var/spack/repos/builtin/packages/libxsmm/package.py index 921fb02151..3cde61147f 100644 --- a/var/spack/repos/builtin/packages/libxsmm/package.py +++ b/var/spack/repos/builtin/packages/libxsmm/package.py @@ -32,10 +32,11 @@ class Libxsmm(MakefilePackage): and small convolutions.''' homepage = 'https://github.com/hfp/libxsmm' - url = 'https://github.com/hfp/libxsmm/archive/1.8.2.tar.gz' + url = 'https://github.com/hfp/libxsmm/archive/1.8.3.tar.gz' version('develop', git='https://github.com/hfp/libxsmm.git') + version('1.8.3', '3415928340929c3a29773934de05c978') version('1.8.2', '8f11ece699244c28dcb6742969a2ccd4') version('1.8.1', 'ece51ec767580f4542f509655daa5ec0') version('1.8', '2d513afbdad99e5d04c6c4ab4c9bb25b') -- cgit v1.2.3-70-g09d2 From 20225edde40a31adc201c16c7eb062305e5330ee Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Thu, 8 Feb 2018 12:36:23 -0500 Subject: comd: more sane default (#7046) Avoid useless deps. --- var/spack/repos/builtin/packages/comd/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/comd/package.py b/var/spack/repos/builtin/packages/comd/package.py index ad7689beee..00a68ddd6f 100644 --- a/var/spack/repos/builtin/packages/comd/package.py +++ b/var/spack/repos/builtin/packages/comd/package.py @@ -48,7 +48,7 @@ class Comd(MakefilePackage): variant('mpi', default=True, description='Build with MPI support') variant('openmp', default=False, description='Build with OpenMP support') variant('precision', default=True, description='Toggle Precesion Options') - variant('graphs', default=True, description='Enable graph visuals') + variant('graphs', default=False, description='Enable graph visuals') depends_on('mpi', when='+mpi') depends_on('graphviz', when='+graphs') -- cgit v1.2.3-70-g09d2 From e98bcaf3f58d71b4356c6925ade3817cba15c99f Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Fri, 9 Feb 2018 12:27:13 +0100 Subject: libSplash: 1.7.0 (#7199) Adds the latest release of libSplash (1.7.0) and newly learned CMake flags for explicit dependency control. Modifies HDF5 dependency: non-MPI splash does (and did) never run with a parallel HDF5, due to it's internal cross-dependencies on MPI. --- .../repos/builtin/packages/libsplash/package.py | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libsplash/package.py b/var/spack/repos/builtin/packages/libsplash/package.py index 283de4f954..0388b31a3f 100644 --- a/var/spack/repos/builtin/packages/libsplash/package.py +++ b/var/spack/repos/builtin/packages/libsplash/package.py @@ -42,6 +42,7 @@ class Libsplash(CMakePackage): git='https://github.com/ComputationalRadiationPhysics/libSplash.git') version('master', branch='master', git='https://github.com/ComputationalRadiationPhysics/libSplash.git') + version('1.7.0', '22dea94734fe4f4c5f4e875ce70900d3') version('1.6.0', 'c05bce95abfe1ae4cd9d9817acf58d94') version('1.5.0', 'c1efec4c20334242c8a3b6bfdc0207e3') version('1.4.0', '2de37bcef6fafa1960391bf44b1b50e0') @@ -51,6 +52,21 @@ class Libsplash(CMakePackage): variant('mpi', default=True, description='Enable parallel I/O (one-file aggregation) support') - depends_on('hdf5@1.8.6:') - depends_on('hdf5+mpi', when='+mpi') + depends_on('cmake@3.10.0:', type='build', when='@1.7.0:') + depends_on('hdf5@1.8.6: ~mpi', when='~mpi') + depends_on('hdf5@1.8.6: +mpi', when='+mpi') depends_on('mpi', when='+mpi') + + def cmake_args(self): + spec = self.spec + args = [] + + if spec.satisfies('@1.7.0:'): + args += [ + '-DSplash_USE_MPI:BOOL={0}'.format( + 'ON' if '+mpi' in spec else 'OFF'), + '-DSplash_USE_PARALLEL:BOOL={0}'.format( + 'ON' if '+mpi' in spec else 'OFF') + ] + + return args -- cgit v1.2.3-70-g09d2 From 9d304ad585e86c29863c4eb01e1fc34a3331b22e Mon Sep 17 00:00:00 2001 From: David Gardner Date: Fri, 9 Feb 2018 06:29:10 -0500 Subject: fix petsc int64 metis dependencies (#7195) --- var/spack/repos/builtin/packages/petsc/package.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index c6aa7af2a5..c99a578fc8 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -113,10 +113,13 @@ class Petsc(Package): # Other dependencies depends_on('boost', when='@:3.5+boost') - depends_on('metis@5:~int64+real64', when='+metis~int64+double') - depends_on('metis@5:+int64', when='+metis+int64~double') - depends_on('metis@5:~int64+real64', when='+metis~int64+double') - depends_on('metis@5:+int64', when='+metis+int64~double') + depends_on('metis@5:~int64+real64', when='@:3.7.99+metis~int64+double') + depends_on('metis@5:~int64', when='@:3.7.99+metis~int64~double') + depends_on('metis@5:+int64+real64', when='@:3.7.99+metis+int64+double') + depends_on('metis@5:+int64', when='@:3.7.99+metis+int64~double') + # petsc-3.8+ uses default (float) metis with any (petsc) precision + depends_on('metis@5:~int64', when='@3.8:+metis~int64') + depends_on('metis@5:+int64', when='@3.8:+metis+int64') depends_on('hdf5+mpi+hl', when='+hdf5+mpi') depends_on('zlib', when='+hdf5') -- cgit v1.2.3-70-g09d2 From 0d34cdd77f69798f3d0a000b5b99f068a45fc926 Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 9 Feb 2018 12:37:16 -0600 Subject: py-checkm-genome: Create new package (#7200) --- .../builtin/packages/py-checkm-genome/package.py | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-checkm-genome/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-checkm-genome/package.py b/var/spack/repos/builtin/packages/py-checkm-genome/package.py new file mode 100644 index 0000000000..355f7e0951 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-checkm-genome/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyCheckmGenome(PythonPackage): + """Assess the quality of microbial genomes recovered from isolates, single + cells, and metagenomes""" + + homepage = "https://ecogenomics.github.io/CheckM" + url = "https://pypi.io/packages/source/c/checkm-genome/checkm-genome-1.0.11.tar.gz" + + version('1.0.11', '3058546ec324e2420cf72f0d2576114b') + + depends_on('hmmer@3.1b1:') + depends_on('prodigal@2.6.1:') + depends_on('py-numpy@1.8.0:', type=('build', 'run')) + depends_on('py-scipy@0.9.0:', type=('build', 'run')) + depends_on('py-matplotlib@1.3.1:', type=('build', 'run')) + depends_on('py-pysam@0.8.3:', type=('build', 'run')) + depends_on('py-dendropy@4.0.0:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 5defe9ab00912259d9eb2ec69e647305d7a8402e Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Fri, 9 Feb 2018 10:48:11 -0800 Subject: git-imerge@1.1.0: new package (#7203) --- .../repos/builtin/packages/git-imerge/package.py | 62 ++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 var/spack/repos/builtin/packages/git-imerge/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/git-imerge/package.py b/var/spack/repos/builtin/packages/git-imerge/package.py new file mode 100644 index 0000000000..21ca1ec817 --- /dev/null +++ b/var/spack/repos/builtin/packages/git-imerge/package.py @@ -0,0 +1,62 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class GitImerge(MakefilePackage): + """git-imerge: Incremental merge & rebase for git + + Perform a merge between two branches incrementally. If + conflicts are encountered, figure out exactly which pairs of + commits conflict, and present the user with one pairwise + conflict at a time for resolution. + + git-imerge has two primary design goals: + + * Reduce the pain of resolving merge conflicts to its + unavoidable minimum, by finding and presenting the smallest + possible conflicts: those between the changes introduced by + one commit from each branch. + + * Allow a merge to be saved, tested, interrupted, published, + and collaborated on while it is in progress.""" + + homepage = "https://github.com/mhagger/git-imerge" + url = "https://github.com/mhagger/git-imerge/archive/v1.1.0.tar.gz" + + version('1.1.0', '94a44dcbe5e764d75770a24517572a76') + version('1.0.0', 'e5e69a22610828cc33bf2cbd31685438') + + depends_on('python@2.6:') + depends_on('py-argparse', when='^python@2.6') + depends_on('git') + + # Package copies a Python script and bash-completion files, so + # there's no need to "build" anything. + def build(self, spec, prefix): + pass + + def install(self, spec, prefix): + make('DESTDIR={0}'.format(prefix), 'PREFIX=', 'install') -- cgit v1.2.3-70-g09d2 From deb1a93f8137d9d14c5bf5b1cf601599c74d1243 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Fri, 9 Feb 2018 10:49:31 -0800 Subject: xbraid@2.2.0: new package (#7205) --- var/spack/repos/builtin/packages/xbraid/package.py | 68 ++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 var/spack/repos/builtin/packages/xbraid/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/xbraid/package.py b/var/spack/repos/builtin/packages/xbraid/package.py new file mode 100644 index 0000000000..05032ce128 --- /dev/null +++ b/var/spack/repos/builtin/packages/xbraid/package.py @@ -0,0 +1,68 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import glob +import os.path + + +class Xbraid(MakefilePackage): + """XBraid: Parallel time integration with Multigrid""" + + homepage = "https://computation.llnl.gov/projects/parallel-time-integration-multigrid/software" + url = "https://computation.llnl.gov/projects/parallel-time-integration-multigrid/download/braid_2.2.0.tar.gz" + + version('2.2.0', '0a9c2fc3eb8f605f73cce78ab0d8a7d9') + + depends_on('mpi') + + def build(self, spec, prefix): + make('libbraid.a') + + # XBraid doesn't have a real install target, so it has to be done + # manually + def install(self, spec, prefix): + # Install headers + mkdirp(prefix.include) + headers = glob.glob('*.h') + for f in headers: + install(f, join_path(prefix.include, os.path.basename(f))) + + # Install library + mkdirp(prefix.lib) + library = 'libbraid.a' + install(library, join_path(prefix.lib, library)) + + # Install other material (e.g., examples, tests, docs) + mkdirp(prefix.share) + install('makefile.inc', prefix.share) + install_tree('examples', prefix.share.examples) + install_tree('drivers', prefix.share.drivers) + + # TODO: Some of the scripts in 'test' are useful, even for + # users; some could be deleted from an installation because + # they're not useful to users + install_tree('test', prefix.share.test) + install_tree('user_utils', prefix.share.user_utils) + install_tree('docs', prefix.share.docs) -- cgit v1.2.3-70-g09d2 From ec162e69b27707f37ab979c2064edfe0c6ad9099 Mon Sep 17 00:00:00 2001 From: Jed Brown Date: Fri, 9 Feb 2018 14:11:03 -0700 Subject: petsc: use spack-built python for configure (#7176) Make sure to use Spack-built python to run petsc configure script (in particular since petsc requires python@2.6:2.8) --- var/spack/repos/builtin/packages/petsc/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index c99a578fc8..15b9b77ba5 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -251,7 +251,7 @@ class Petsc(Package): '--with-superlu_dist=0' ) - configure('--prefix=%s' % prefix, *options) + python('configure', '--prefix=%s' % prefix, *options) # PETSc has its own way of doing parallel make. make('MAKE_NP=%s' % make_jobs, parallel=False) -- cgit v1.2.3-70-g09d2 From 74ffd8b6bece653a2c8f881ad557b1c8484707c0 Mon Sep 17 00:00:00 2001 From: Jed Brown Date: Fri, 9 Feb 2018 20:01:49 -0700 Subject: hpgmg package: add debug option and new version (#7175) This adds a static version of hpgmg (up to now only the latest commit from the master branch was available). This also adds a debug variant and sets optimization flags for ~debug when the compiler is gcc, intel, or clang --- var/spack/repos/builtin/packages/hpgmg/package.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hpgmg/package.py b/var/spack/repos/builtin/packages/hpgmg/package.py index db9b0ce225..a7517a3258 100644 --- a/var/spack/repos/builtin/packages/hpgmg/package.py +++ b/var/spack/repos/builtin/packages/hpgmg/package.py @@ -37,10 +37,11 @@ class Hpgmg(Package): the second coarsening 6 times, etc.""" homepage = "https://bitbucket.org/hpgmg/hpgmg" - url = "https://bitbucket.org/hpgmg/hpgmg/get/master.tar.gz" + url = "https://hpgmg.org/static/hpgmg-0.tar.gz" tags = ['proxy-app'] - version('master', '4a2b139e1764c84ed7fe06334d3f8d8a') + version('a0a5510df23b', 'b9c50f25e541428d4735fb07344d1d0ed9fc821bdde918d8e0defa78c0d9b4f9') + version('develop', git='https://bitbucket.org/hpgmg/hpgmg.git', branch='master') variant( 'fe', default=True, description='Build finite element solver') @@ -48,6 +49,7 @@ class Hpgmg(Package): 'fv', default='mpi', values=('serial', 'mpi', 'none'), description='Build finite volume solver with or without MPI support') variant('cuda', default=False, description='Build with CUDA') + variant('debug', default=False, description='Build in debug mode') depends_on('petsc', when='+fe') depends_on('mpi', when='+fe') @@ -68,10 +70,18 @@ class Hpgmg(Package): if 'mpi' in self.spec: args.append('--CC={0}'.format(self.spec['mpi'].mpicc)) + cflags = [] if 'fv=none' in self.spec: args.append('--no-fv') else: - args.append('--CFLAGS=' + self.compiler.openmp_flag) + cflags.append(self.compiler.openmp_flag) + + if '+debug' in self.spec: + cflags.append('-g') + elif any(map(self.spec.satisfies, ['%gcc', '%clang', '%intel'])): + cflags += ['-O3', '-march=native'] + + args.append('--CFLAGS=' + ' '.join(cflags)) return args -- cgit v1.2.3-70-g09d2 From 912e6610569e50d9fc47b5a1fc51752b300dd83c Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 9 Feb 2018 22:15:58 -0600 Subject: new package: diffsplice (#7187) --- .../repos/builtin/packages/diffsplice/package.py | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 var/spack/repos/builtin/packages/diffsplice/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/diffsplice/package.py b/var/spack/repos/builtin/packages/diffsplice/package.py new file mode 100644 index 0000000000..9e299ab892 --- /dev/null +++ b/var/spack/repos/builtin/packages/diffsplice/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Diffsplice(MakefilePackage): + """A novel tool for discovering and quantitating alternative splicing + variants present in an RNA-seq dataset, without relying on annotated + transcriptome or pre-determined splice pattern.""" + + homepage = "http://www.netlab.uky.edu/p/bioinfo/DiffSplice" + url = "http://protocols.netlab.uky.edu/~yin/download/diffsplice/diffsplice_0.1.1.tgz" + + version('0.1.2beta', 'a1df6e0b50968f2c229d5d7f97327336') + version('0.1.1', 'be90e6c072402d5aae0b4e2cbb8c10ac') + + def install(self, spec, prefix): + mkdirp(prefix.bin) + install('diffsplice', prefix.bin) -- cgit v1.2.3-70-g09d2 From 266a3593ce17b3baabf2708fbf52b3ea927ccdf9 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Sun, 11 Feb 2018 17:56:08 +0100 Subject: Xtensor 0.15.1 (#7215) Add the latest xtensor release and its dependencies. --- var/spack/repos/builtin/packages/xsimd/package.py | 3 ++- var/spack/repos/builtin/packages/xtensor/package.py | 8 +++++--- var/spack/repos/builtin/packages/xtl/package.py | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/xsimd/package.py b/var/spack/repos/builtin/packages/xsimd/package.py index ec177fe4a0..883f15d441 100644 --- a/var/spack/repos/builtin/packages/xsimd/package.py +++ b/var/spack/repos/builtin/packages/xsimd/package.py @@ -34,9 +34,10 @@ class Xsimd(CMakePackage): version('develop', branch='master', git='https://github.com/QuantStack/xsimd.git') + version('4.0.0', '4186ec94985daa3fc284d9d0d4aa03e8') version('3.1.0', '29c1c525116cbda28f610e2bf24a827e') - depends_on('googletest') + depends_on('googletest', type='build') # C++14 support conflicts('%gcc@:4.8') diff --git a/var/spack/repos/builtin/packages/xtensor/package.py b/var/spack/repos/builtin/packages/xtensor/package.py index b8a0a2b75c..4cb2a9c5ca 100644 --- a/var/spack/repos/builtin/packages/xtensor/package.py +++ b/var/spack/repos/builtin/packages/xtensor/package.py @@ -34,15 +34,17 @@ class Xtensor(CMakePackage): version('develop', branch='master', git='https://github.com/QuantStack/xtensor.git') + version('0.15.1', 'c24ecc406003bd1ac22291f1f7cac29a') version('0.13.1', '80e7e33f05066d17552bf0f8b582dcc5') variant('xsimd', default=True, description='Enable SIMD intrinsics') depends_on('xtl') - depends_on('xtl@0.3.4:', when='@develop') - depends_on('xtl@0.3.3:', when='@0.13.1') - depends_on('xsimd@3.1.0', when='+xsimd') + depends_on('xtl@0.4.0:0.4.99', when='@0.15.1:') + depends_on('xtl@0.3.3:0.3.99', when='@0.13.1') + depends_on('xsimd@4.0.0', when='@0.15.1 +xsimd') + depends_on('xsimd@3.1.0', when='@0.13.1 +xsimd') # C++14 support conflicts('%gcc@:4.8') diff --git a/var/spack/repos/builtin/packages/xtl/package.py b/var/spack/repos/builtin/packages/xtl/package.py index 77661865a1..ed6f93d84b 100644 --- a/var/spack/repos/builtin/packages/xtl/package.py +++ b/var/spack/repos/builtin/packages/xtl/package.py @@ -34,6 +34,7 @@ class Xtl(CMakePackage): version('develop', branch='master', git='https://github.com/QuantStack/xtl.git') + version('0.4.0', '48c76b63ab12e497a53fb147c41ae747') version('0.3.4', 'b76548a55f1e171a9c849e5ed543e8b3') version('0.3.3', '09b6d9611e460d9280bf1156bcca20f5') -- cgit v1.2.3-70-g09d2 From f0aa4641f9f3209e18972cbee538c736115bd27d Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Sun, 11 Feb 2018 18:00:22 +0100 Subject: pybind11: 2.2.[1,2] & develop (#7216) Add the latest release of `pybind11` and its `develop` version. --- var/spack/repos/builtin/packages/py-pybind11/package.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pybind11/package.py b/var/spack/repos/builtin/packages/py-pybind11/package.py index aaa54370bf..1de4ee8ec3 100644 --- a/var/spack/repos/builtin/packages/py-pybind11/package.py +++ b/var/spack/repos/builtin/packages/py-pybind11/package.py @@ -37,6 +37,10 @@ class PyPybind11(CMakePackage): homepage = "https://pybind11.readthedocs.io" url = "https://github.com/pybind/pybind11/archive/v2.1.0.tar.gz" + version('develop', branch='master', + git='https://github.com/pybind/pybind11.git') + version('2.2.2', 'fc174e1bbfe7ec069af7eea86ec37b5c') + version('2.2.1', 'bab1d46bbc465af5af3a4129b12bfa3b') version('2.2.0', '978b26aea1c6bfc4f88518ef33771af2') version('2.1.1', '5518988698df937ccee53fb6ba91d12a') version('2.1.0', '3cf07043d677d200720c928569635e12') -- cgit v1.2.3-70-g09d2 From ee70551e10307892d3d02b660e5e7a493ec6c1c5 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Sun, 11 Feb 2018 22:21:45 +0100 Subject: xtensor-python (#7217) pybind11 bindings for seamlessly using xtensor in python --- .../builtin/packages/xtensor-python/package.py | 56 ++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 var/spack/repos/builtin/packages/xtensor-python/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/xtensor-python/package.py b/var/spack/repos/builtin/packages/xtensor-python/package.py new file mode 100644 index 0000000000..4607c04891 --- /dev/null +++ b/var/spack/repos/builtin/packages/xtensor-python/package.py @@ -0,0 +1,56 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class XtensorPython(CMakePackage): + """Python bindings for the xtensor C++ multi-dimensional array library""" + + homepage = "https://xtensor-python.readthedocs.io" + url = "https://github.com/QuantStack/xtensor-python/archive/0.17.0.tar.gz" + maintainers = ['ax3l'] + + version('develop', branch='master', + git='https://github.com/QuantStack/xtensor-python.git') + version('0.17.0', '51d22e42909a81201c3421d9e119eed0') + + depends_on('xtensor@0.15.1:0.15.99', when='@0.17.0:') + depends_on('xtl@0.4.0:0.4.99', when='@0.17.0:') + depends_on('py-pybind11@2.2.1', when='@0.17.0:') + + depends_on('py-numpy') + depends_on('python', type=('build', 'link', 'run')) + + extends('python') + + def cmake_args(self): + spec = self.spec + + python_exe = spec['python'].command.path + + args = [ + '-DPYTHON_EXECUTABLE={0}'.format(python_exe) + ] + return args -- cgit v1.2.3-70-g09d2 From fb7a5b279da36b9dbd6338867168a79011edd0d6 Mon Sep 17 00:00:00 2001 From: Eric Date: Sun, 11 Feb 2018 15:22:34 -0600 Subject: glimmer: Create new package (#7208) --- .../repos/builtin/packages/glimmer/package.py | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 var/spack/repos/builtin/packages/glimmer/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/glimmer/package.py b/var/spack/repos/builtin/packages/glimmer/package.py new file mode 100644 index 0000000000..e4b854efd8 --- /dev/null +++ b/var/spack/repos/builtin/packages/glimmer/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Glimmer(MakefilePackage): + """Glimmer is a system for finding genes in microbial DNA, especially the + genomes of bacteria, archaea, and viruses.""" + + homepage = "https://ccb.jhu.edu/software/glimmer" + + version('3.02b', '344d012ae12596de905866fe9eb7f16c') + + build_directory = 'src' + + def url_for_version(self, version): + url = "https://ccb.jhu.edu/software/glimmer/glimmer{0}.tar.gz" + return url.format(version.joined) + + def install(self, spec, prefix): + install_tree('bin', prefix.bin) -- cgit v1.2.3-70-g09d2 From 7e9a369dec567bcae35cb9fcbae5c19ecbec6860 Mon Sep 17 00:00:00 2001 From: Eric Date: Sun, 11 Feb 2018 15:26:35 -0600 Subject: shortbred: Create new package (#7210) --- .../repos/builtin/packages/shortbred/package.py | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 var/spack/repos/builtin/packages/shortbred/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/shortbred/package.py b/var/spack/repos/builtin/packages/shortbred/package.py new file mode 100644 index 0000000000..aeccfa9378 --- /dev/null +++ b/var/spack/repos/builtin/packages/shortbred/package.py @@ -0,0 +1,51 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Shortbred(Package): + """ShortBRED is a system for profiling protein families of interest at + very high specificity in shotgun meta'omic sequencing data.""" + + homepage = "https://huttenhower.sph.harvard.edu/shortbred" + url = "https://bitbucket.org/biobakery/shortbred/get/0.9.4.tar.gz" + + version('0.9.4', 'ad3dff344cbea3713e78b384afad28fd') + + depends_on('blast-plus@2.2.28:') + depends_on('cdhit@4.6:') + depends_on('muscle@3.8.31:') + depends_on('python@2.7.9:') + depends_on('py-biopython') + depends_on('usearch@6.0.307:') + + def install(self, spec, prefix): + mkdirp(prefix.bin) + install('shortbred_identify.py', prefix.bin) + install('shortbred_quantify.py', prefix.bin) + install_tree('src', prefix.src) + + def setup_environment(self, spack_env, run_env): + run_env.prepend_path('PYTHONPATH', self.prefix) -- cgit v1.2.3-70-g09d2 From b7baeb542d08eff79e543cdfb62171a08cab502c Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Mon, 12 Feb 2018 08:08:45 +0100 Subject: Set a default python that is consistent with the libraries in PYTHONHOME (#7157) fixes #7128 Before this PR packages that were indirectly dependent on python might have failed due to inconsistency between the python found in the environment and the standard libraries set in PYTHONHOME --- var/spack/repos/builtin/packages/python/package.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 34b6fb2bad..a3ad52df89 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -511,7 +511,12 @@ class Python(AutotoolsPackage): """Set PYTHONPATH to include the site-packages directory for the extension and any other python extensions it depends on.""" + # If we set PYTHONHOME, we must also ensure that the corresponding + # python is found in the build environment. This to prevent cases + # where a system provided python is run against the standard libraries + # of a Spack built python. See issue #7128 spack_env.set('PYTHONHOME', self.home) + spack_env.prepend_path('PATH', os.path.dirname(self.command.path)) python_paths = [] for d in dependent_spec.traverse( -- cgit v1.2.3-70-g09d2 From e4ba199fc1d16c28ee1400da12f3c070404f8cdc Mon Sep 17 00:00:00 2001 From: Cyrus Harrison Date: Mon, 12 Feb 2018 10:20:46 -0800 Subject: updates to conduit and ascent packages (#7040) * Remove variants disabling blas and lapack for py-numpy, issues building these have been resolved * For CMake greater than 3.10, FindMPI changed, so use MPIEXE_EXECUTABLE instead of MPIEXE for 3.10 and newer --- var/spack/repos/builtin/packages/ascent/package.py | 14 +++++++++----- var/spack/repos/builtin/packages/conduit/package.py | 14 +++++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ascent/package.py b/var/spack/repos/builtin/packages/ascent/package.py index eda0f93c1c..9cf1f4a7a5 100644 --- a/var/spack/repos/builtin/packages/ascent/package.py +++ b/var/spack/repos/builtin/packages/ascent/package.py @@ -97,9 +97,7 @@ class Ascent(Package): # causes duplicate state issues when running compiled python modules. depends_on("python+shared") extends("python", when="+python") - # TODO: blas and lapack are disabled due to build - # issues Cyrus experienced on OSX 10.11.6 - depends_on("py-numpy~blas~lapack", when="+python", type=('build', 'run')) + depends_on("py-numpy", when="+python", type=('build', 'run')) ####################### # MPI @@ -298,8 +296,14 @@ class Ascent(Package): spec['mpi'].mpifc)) mpiexe_bin = join_path(spec['mpi'].prefix.bin, 'mpiexec') if os.path.isfile(mpiexe_bin): - cfg.write(cmake_cache_entry("MPIEXEC", - mpiexe_bin)) + # starting with cmake 3.10, FindMPI expects MPIEXEC_EXECUTABLE + # vs the older versions which expect MPIEXEC + if self.spec["cmake"].satisfies('@3.10:'): + cfg.write(cmake_cache_entry("MPIEXEC_EXECUTABLE", + mpiexe_bin)) + else: + cfg.write(cmake_cache_entry("MPIEXEC", + mpiexe_bin)) else: cfg.write(cmake_cache_entry("ENABLE_MPI", "OFF")) diff --git a/var/spack/repos/builtin/packages/conduit/package.py b/var/spack/repos/builtin/packages/conduit/package.py index 2ce7edc8cd..7c288d60ac 100644 --- a/var/spack/repos/builtin/packages/conduit/package.py +++ b/var/spack/repos/builtin/packages/conduit/package.py @@ -97,9 +97,7 @@ class Conduit(Package): # causes duplicate state issues when running compiled python modules. depends_on("python+shared") extends("python", when="+python") - # TODO: blas and lapack are disabled due to build - # issues Cyrus experienced on OSX 10.11.6 - depends_on("py-numpy~blas~lapack", when="+python", type=('build', 'run')) + depends_on("py-numpy", when="+python", type=('build', 'run')) ####################### # I/O Packages @@ -311,8 +309,14 @@ class Conduit(Package): spec['mpi'].mpifc)) mpiexe_bin = join_path(spec['mpi'].prefix.bin, 'mpiexec') if os.path.isfile(mpiexe_bin): - cfg.write(cmake_cache_entry("MPIEXEC", - mpiexe_bin)) + # starting with cmake 3.10, FindMPI expects MPIEXEC_EXECUTABLE + # vs the older versions which expect MPIEXEC + if self.spec["cmake"].satisfies('@3.10:'): + cfg.write(cmake_cache_entry("MPIEXEC_EXECUTABLE", + mpiexe_bin)) + else: + cfg.write(cmake_cache_entry("MPIEXEC", + mpiexe_bin)) else: cfg.write(cmake_cache_entry("ENABLE_MPI", "OFF")) -- cgit v1.2.3-70-g09d2 From a403a1ca6842d7123e3a3e7cf6d070d6d6747836 Mon Sep 17 00:00:00 2001 From: David Beckingsale Date: Mon, 12 Feb 2018 13:34:54 -0500 Subject: RAJA package: add versions and CUDA/openmp support (#7201) --- var/spack/repos/builtin/packages/raja/package.py | 30 +++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/raja/package.py b/var/spack/repos/builtin/packages/raja/package.py index 18d2135991..7d019821cf 100644 --- a/var/spack/repos/builtin/packages/raja/package.py +++ b/var/spack/repos/builtin/packages/raja/package.py @@ -29,6 +29,34 @@ class Raja(CMakePackage): """RAJA Parallel Framework.""" homepage = "http://software.llnl.gov/RAJA/" - version('develop', git='https://github.com/LLNL/RAJA.git', branch="master", submodules="True") + version('master', git='https://github.com/LLNL/RAJA.git', branch='master', submodules='True') + version('develop', git='https://github.com/LLNL/RAJA.git', branch='develop', submodules='True') + version('0.5.3', git='https://github.com/LLNL/RAJA.git', tag='v0.5.3', submodules="True") + version('0.5.2', git='https://github.com/LLNL/RAJA.git', tag='v0.5.2', submodules="True") + version('0.5.1', git='https://github.com/LLNL/RAJA.git', tag='v0.5.1', submodules="True") + version('0.5.0', git='https://github.com/LLNL/RAJA.git', tag='v0.5.0', submodules="True") + version('0.4.1', git='https://github.com/LLNL/RAJA.git', tag='v0.4.1', submodules="True") + version('0.4.0', git='https://github.com/LLNL/RAJA.git', tag='v0.4.0', submodules="True") + + variant('cuda', default=False, description='Build with CUDA backend') + variant('openmp', default=True, description='Build OpenMP backend') + + depends_on('cuda', when='+cuda') depends_on('cmake@3.3:', type='build') + + def cmake_args(self): + spec = self.spec + + options = [] + + if '+openmp' in spec: + options.extend([ + '-DENABLE_OPENMP=On']) + + if '+cuda' in spec: + options.extend([ + '-DENABLE_CUDA=On', + '-DCUDA_TOOLKIT_ROOT_DIR=%s' % (spec['cuda'].prefix)]) + + return options -- cgit v1.2.3-70-g09d2 From aa152350583502a47ce9c9c8dc0d15f1d3b31207 Mon Sep 17 00:00:00 2001 From: Luigi Calori Date: Mon, 12 Feb 2018 19:35:18 +0100 Subject: fluxbox lightweight window manager (#7169) --- .../repos/builtin/packages/fluxbox/package.py | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 var/spack/repos/builtin/packages/fluxbox/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fluxbox/package.py b/var/spack/repos/builtin/packages/fluxbox/package.py new file mode 100644 index 0000000000..4e08869ebe --- /dev/null +++ b/var/spack/repos/builtin/packages/fluxbox/package.py @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +# +from spack import * + + +class Fluxbox(AutotoolsPackage): + """Fluxbox is a windowmanager for X that was based on the Blackbox 0.61.1 code. + + It is very light on resources and easy to handle but yet full of features + to make an easy, and extremely fast, desktop experience. + """ + + homepage = "http://fluxbox.org/" + url = "http://sourceforge.net/projects/fluxbox/files/fluxbox/1.3.7/fluxbox-1.3.7.tar.gz" + + version('1.3.7', 'd99d7710f9daf793e0246dae5304b595') + + depends_on('pkg-config', type='build') + depends_on('freetype') + depends_on('libxrender') + depends_on('libxext') + depends_on('expat') + depends_on('libx11') -- cgit v1.2.3-70-g09d2 From 5fef8b69637ff885c1dd3f48a2b05351f57d5def Mon Sep 17 00:00:00 2001 From: Loikki Date: Mon, 12 Feb 2018 23:32:24 +0100 Subject: grackle package: add float option (#7196) --- var/spack/repos/builtin/packages/grackle/package.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/grackle/package.py b/var/spack/repos/builtin/packages/grackle/package.py index 66fedfcb5a..050d0bdf5f 100644 --- a/var/spack/repos/builtin/packages/grackle/package.py +++ b/var/spack/repos/builtin/packages/grackle/package.py @@ -42,6 +42,8 @@ class Grackle(Package): version('2.2', 'ec49ed1db5a42db21f478285150c2ba3') version('2.0.1', 'a9624ad13a60c592c1a0a4ea8e1ae86d') + variant('float', default=False, description='Build with float') + depends_on('libtool', when='@2.2') depends_on('mpi') @@ -84,6 +86,8 @@ class Grackle(Package): make('clean') make('machine-{0}'.format(grackle_architecture)) make('opt-high') + if spec.satisfies("+float"): + make('precision-32') make('show-config') make() mkdirp(prefix.lib) -- cgit v1.2.3-70-g09d2 From de3c047105b49528b2d5531f63d70b4e1fbe81a4 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Mon, 12 Feb 2018 21:35:57 -0600 Subject: new package: Glfmultiples (#7055) --- .../repos/builtin/packages/glfmultiples/package.py | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 var/spack/repos/builtin/packages/glfmultiples/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/glfmultiples/package.py b/var/spack/repos/builtin/packages/glfmultiples/package.py new file mode 100644 index 0000000000..001e842264 --- /dev/null +++ b/var/spack/repos/builtin/packages/glfmultiples/package.py @@ -0,0 +1,49 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Glfmultiples(MakefilePackage): + """glfMultiples is a GLF-based variant caller for next-generation + sequencing data. It takes a set of GLF format genotype likelihood + files as input and generates a VCF-format set of variant calls + as output. """ + + homepage = "https://genome.sph.umich.edu/wiki/GlfMultiples" + url = "http://www.sph.umich.edu/csg/abecasis/downloads/generic-glfMultiples-2010-06-16.tar.gz" + + version('2010-06-16', '64bf6bb7c76543f4c8fabce015a3cb11') + + depends_on('zlib') + + def edit(self, spec, prefix): + makefile = FileFilter('Makefile') + makefile.filter('CXX=.*', 'CXX = ' + env['CXX']) + makefile.filter('CFLAGS=.*', + 'CFLAGS=-O2 -I./libsrc -I./pdf ' + + '-D_FILE_OFFSET_BITS=64 -D__USE_LONG_INT') + + def install(self, spec, prefix): + make('INSTALLDIR=%s' % prefix, 'install') -- cgit v1.2.3-70-g09d2 From 4d97b540a8c268735f4ac730bcd96c7a366b6ee4 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Tue, 13 Feb 2018 11:06:58 +0100 Subject: FFTW: expose optimization handles via variants (SIMD + FMA) (#7038) --- var/spack/repos/builtin/packages/fftw/package.py | 26 ++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fftw/package.py b/var/spack/repos/builtin/packages/fftw/package.py index b6e7916355..b047574f82 100644 --- a/var/spack/repos/builtin/packages/fftw/package.py +++ b/var/spack/repos/builtin/packages/fftw/package.py @@ -66,6 +66,21 @@ class Fftw(AutotoolsPackage): 'pfft_patches', default=False, description='Add extra transpose functions for PFFT compatibility') + variant( + 'simd', + default='sse2,avx,avx2', + values=( + 'sse', 'sse2', 'avx', 'avx2', 'avx512', # Intel + 'avx-128-fma', 'kcvi', # Intel + 'altivec', 'vsx', # IBM + 'neon', # ARM + 'generic-simd128', 'generic-simd256' # Generic + ), + description='Optimizations that are enabled in this build', + multi=True + ) + variant('fma', default=False, description='Activate support for fma') + depends_on('mpi', when='+mpi') depends_on('automake', type='build', when='+pfft_patches') depends_on('autoconf', type='build', when='+pfft_patches') @@ -109,12 +124,11 @@ class Fftw(AutotoolsPackage): options.append('--enable-mpi') # SIMD support - # TODO: add support for more architectures - float_options = [] - double_options = [] - if 'x86_64' in spec.architecture and spec.satisfies('@3:'): - float_options.append('--enable-sse2') - double_options.append('--enable-sse2') + float_options, double_options = [], [] + if spec.satisfies('@3:', strict=True): + for opts in (float_options, double_options): + opts += self.enable_or_disable('simd') + opts += self.enable_or_disable('fma') configure = Executable('../configure') -- cgit v1.2.3-70-g09d2 From 28e129b087145e6a6cf4be40c25e76f8d69290e3 Mon Sep 17 00:00:00 2001 From: alalazo Date: Fri, 9 Jun 2017 21:07:20 +0200 Subject: Added mixins to modularize common behaviors across build-systems. Modifications: * added a mixin to filter compiler wrappers from files * modified hdf5, openmpi, mpich, mvapich2 to use it --- lib/spack/spack/__init__.py | 3 + lib/spack/spack/mixins.py | 82 ++++++++++++++++++++++ lib/spack/spack/package.py | 5 ++ var/spack/repos/builtin/packages/hdf5/package.py | 13 +++- var/spack/repos/builtin/packages/mpich/package.py | 40 +++-------- .../repos/builtin/packages/mvapich2/package.py | 39 +++------- .../repos/builtin/packages/openmpi/package.py | 57 ++++++--------- var/spack/repos/builtin/packages/r/package.py | 24 ++----- 8 files changed, 144 insertions(+), 119 deletions(-) create mode 100644 lib/spack/spack/mixins.py (limited to 'var') diff --git a/lib/spack/spack/__init__.py b/lib/spack/spack/__init__.py index 21af60422c..62ac793d90 100644 --- a/lib/spack/spack/__init__.py +++ b/lib/spack/spack/__init__.py @@ -214,6 +214,9 @@ __all__ += [ 'IntelPackage', ] +from spack.mixins import FilterCompilerWrappersPackageMixin +__all__ += ['FilterCompilerWrappersPackageMixin'] + from spack.version import Version, ver __all__ += ['Version', 'ver'] diff --git a/lib/spack/spack/mixins.py b/lib/spack/spack/mixins.py new file mode 100644 index 0000000000..be3c2c3136 --- /dev/null +++ b/lib/spack/spack/mixins.py @@ -0,0 +1,82 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +import os + +import llnl.util.filesystem + + +class FilterCompilerWrappersPackageMixin(object): + """This mixin class registers a callback that filters a list of files + after installation and substitutes hardcoded paths pointing to the Spack + compiler wrappers with the corresponding 'real' compilers. + """ + + #: compiler wrappers to be filtered (needs to be overridden) + compiler_wrappers = [] + + #: phase after which the callback is invoked (default 'install') + filter_phase = 'install' + + def __init__(self): + + attr_name = '_InstallPhase_{0}'.format(self.filter_phase) + + # Here we want to get the attribute directly from the class (noe from + # the instance), so that we can modify it and add the mixin method + phase = getattr(type(self), attr_name) + + # Due to MRO, we may have taken a method from a parent class + # and modifying it may influence other packages in unwanted manners. + # Solve the problem by copying the phase into the most derived class. + setattr(type(self), attr_name, phase.copy()) + phase = getattr(type(self), attr_name) + + phase.run_after.append( + FilterCompilerWrappersPackageMixin.filter_compilers + ) + + super(FilterCompilerWrappersPackageMixin, self).__init__() + + def filter_compilers(self): + """Substitutes any path referring to a Spack compiler wrapper + with the path of the underlying compiler that has been used. + + If this isn't done, the files will have CC, CXX, F77, and FC set + to Spack's generic cc, c++, f77, and f90. We want them to + be bound to whatever compiler they were built with. + """ + + kwargs = {'ignore_absent': True, 'backup': False, 'string': True} + + if self.compiler_wrappers: + x = llnl.util.filesystem.FileFilter(*self.compiler_wrappers) + + x.filter(os.environ['CC'], self.compiler.cc, **kwargs) + x.filter(os.environ['CXX'], self.compiler.cxx, **kwargs) + x.filter(os.environ['F77'], self.compiler.f77, **kwargs) + x.filter(os.environ['FC'], self.compiler.fc, **kwargs) + + # Remove this linking flag if present (it turns RPATH into RUNPATH) + x.filter('-Wl,--enable-new-dtags', '', **kwargs) diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py index f7cb3b0253..f0172565bb 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -182,6 +182,9 @@ class PackageMeta(spack.directives.DirectiveMetaMixin): PackageMeta.phase_fmt.format(phase_name), None ) + if phase is not None: + break + attr_dict[PackageMeta.phase_fmt.format( phase_name)] = phase.copy() phase = attr_dict[ @@ -618,6 +621,8 @@ class PackageBase(with_metaclass(PackageMeta, object)): self.extra_args = {} + super(PackageBase, self).__init__() + def possible_dependencies(self, transitive=True, visited=None): """Return set of possible transitive dependencies of this package. diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index 6477d9cee2..471326aac7 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -22,12 +22,13 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## -from spack import * import shutil import sys +from spack import * + -class Hdf5(AutotoolsPackage): +class Hdf5(AutotoolsPackage, FilterCompilerWrappersPackageMixin): """HDF5 is a data model, library, and file format for storing and managing data. It supports an unlimited variety of datatypes, and is designed for flexible and efficient I/O and for high volume and complex data. @@ -294,3 +295,11 @@ HDF5 version {version} {version} print('-' * 80) raise RuntimeError("HDF5 install check failed") shutil.rmtree(checkdir) + + @property + def compiler_wrappers(self): + return [ + join_path(self.prefix.bin, 'h5c++'), + join_path(self.prefix.bin, 'h5cc'), + join_path(self.prefix.bin, 'h5fc'), + ] diff --git a/var/spack/repos/builtin/packages/mpich/package.py b/var/spack/repos/builtin/packages/mpich/package.py index 74234f46ae..0efca4f325 100644 --- a/var/spack/repos/builtin/packages/mpich/package.py +++ b/var/spack/repos/builtin/packages/mpich/package.py @@ -26,7 +26,7 @@ from spack import * import os -class Mpich(AutotoolsPackage): +class Mpich(AutotoolsPackage, FilterCompilerWrappersPackageMixin): """MPICH is a high performance and widely portable implementation of the Message Passing Interface (MPI) standard.""" @@ -170,33 +170,11 @@ spack package at this time.''', return config_args - @run_after('install') - def filter_compilers(self): - """Run after install to make the MPI compilers use the - compilers that Spack built the package with. - - If this isn't done, they'll have CC, CXX, F77, and FC set - to Spack's generic cc, c++, f77, and f90. We want them to - be bound to whatever compiler they were built with.""" - - mpicc = join_path(self.prefix.bin, 'mpicc') - mpicxx = join_path(self.prefix.bin, 'mpicxx') - mpif77 = join_path(self.prefix.bin, 'mpif77') - mpif90 = join_path(self.prefix.bin, 'mpif90') - - # Substitute Spack compile wrappers for the real - # underlying compiler - kwargs = { - 'ignore_absent': True, - 'backup': False, - 'string': True - } - filter_file(env['CC'], self.compiler.cc, mpicc, **kwargs) - filter_file(env['CXX'], self.compiler.cxx, mpicxx, **kwargs) - filter_file(env['F77'], self.compiler.f77, mpif77, **kwargs) - filter_file(env['FC'], self.compiler.fc, mpif90, **kwargs) - - # Remove this linking flag if present - # (it turns RPATH into RUNPATH) - for wrapper in (mpicc, mpicxx, mpif77, mpif90): - filter_file('-Wl,--enable-new-dtags', '', wrapper, **kwargs) + @property + def compiler_wrappers(self): + return [ + join_path(self.prefix.bin, 'mpicc'), + join_path(self.prefix.bin, 'mpicxx'), + join_path(self.prefix.bin, 'mpif77'), + join_path(self.prefix.bin, 'mpif90') + ] diff --git a/var/spack/repos/builtin/packages/mvapich2/package.py b/var/spack/repos/builtin/packages/mvapich2/package.py index 4454907b74..1f90981fda 100644 --- a/var/spack/repos/builtin/packages/mvapich2/package.py +++ b/var/spack/repos/builtin/packages/mvapich2/package.py @@ -35,7 +35,7 @@ def _process_manager_validator(values): ) -class Mvapich2(AutotoolsPackage): +class Mvapich2(AutotoolsPackage, FilterCompilerWrappersPackageMixin): """MVAPICH2 is an MPI implementation for Infiniband networks.""" homepage = "http://mvapich.cse.ohio-state.edu/" url = "http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-2.2.tar.gz" @@ -232,32 +232,11 @@ class Mvapich2(AutotoolsPackage): args.extend(self.network_options) return args - @run_after('install') - def filter_compilers(self): - """Run after install to make the MPI compilers use the - compilers that Spack built the package with. - - If this isn't done, they'll have CC, CXX, F77, and FC set - to Spack's generic cc, c++, f77, and f90. We want them to - be bound to whatever compiler they were built with. - """ - bin = self.prefix.bin - mpicc = join_path(bin, 'mpicc') - mpicxx = join_path(bin, 'mpicxx') - mpif77 = join_path(bin, 'mpif77') - mpif90 = join_path(bin, 'mpif90') - mpifort = join_path(bin, 'mpifort') - - # Substitute Spack compile wrappers for the real - # underlying compiler - kwargs = {'ignore_absent': True, 'backup': False, 'string': True} - filter_file(env['CC'], self.compiler.cc, mpicc, **kwargs) - filter_file(env['CXX'], self.compiler.cxx, mpicxx, **kwargs) - filter_file(env['F77'], self.compiler.f77, mpif77, **kwargs) - filter_file(env['FC'], self.compiler.fc, mpif90, **kwargs) - filter_file(env['FC'], self.compiler.fc, mpifort, **kwargs) - - # Remove this linking flag if present - # (it turns RPATH into RUNPATH) - for wrapper in (mpicc, mpicxx, mpif77, mpif90, mpifort): - filter_file('-Wl,--enable-new-dtags', '', wrapper, **kwargs) + @property + def compiler_wrappers(self): + return [ + join_path(self.prefix.bin, 'mpicc'), + join_path(self.prefix.bin, 'mpicxx'), + join_path(self.prefix.bin, 'mpif77'), + join_path(self.prefix.bin, 'mpif90') + ] diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 880566af2b..7362b9be7f 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -64,7 +64,7 @@ def _mxm_dir(): return None -class Openmpi(AutotoolsPackage): +class Openmpi(AutotoolsPackage, FilterCompilerWrappersPackageMixin): """The Open MPI Project is an open source Message Passing Interface implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is @@ -375,43 +375,28 @@ class Openmpi(AutotoolsPackage): return config_args - @run_after('install') - def filter_compilers(self): - """Run after install to make the MPI compilers use the - compilers that Spack built the package with. + @property + def compiler_wrappers(self): - If this isn't done, they'll have CC, CXX and FC set - to Spack's generic cc, c++ and f90. We want them to - be bound to whatever compiler they were built with. - """ - kwargs = {'ignore_absent': True, 'backup': False, 'string': False} - wrapper_basepath = join_path(self.prefix, 'share', 'openmpi') + basepath = join_path(self.prefix, 'share', 'openmpi') wrappers = [ - ('mpicc-vt-wrapper-data.txt', self.compiler.cc), - ('mpicc-wrapper-data.txt', self.compiler.cc), - ('ortecc-wrapper-data.txt', self.compiler.cc), - ('shmemcc-wrapper-data.txt', self.compiler.cc), - ('mpic++-vt-wrapper-data.txt', self.compiler.cxx), - ('mpic++-wrapper-data.txt', self.compiler.cxx), - ('ortec++-wrapper-data.txt', self.compiler.cxx), - ('mpifort-vt-wrapper-data.txt', self.compiler.fc), - ('mpifort-wrapper-data.txt', self.compiler.fc), - ('shmemfort-wrapper-data.txt', self.compiler.fc), - ('mpif90-vt-wrapper-data.txt', self.compiler.fc), - ('mpif90-wrapper-data.txt', self.compiler.fc), - ('mpif77-vt-wrapper-data.txt', self.compiler.f77), - ('mpif77-wrapper-data.txt', self.compiler.f77) + 'mpicc-vt-wrapper-data.txt', + 'mpicc-wrapper-data.txt', + 'ortecc-wrapper-data.txt', + 'shmemcc-wrapper-data.txt', + 'mpic++-vt-wrapper-data.txt', + 'mpic++-wrapper-data.txt', + 'ortec++-wrapper-data.txt', + 'mpifort-vt-wrapper-data.txt', + 'mpifort-wrapper-data.txt', + 'shmemfort-wrapper-data.txt', + 'mpif90-vt-wrapper-data.txt', + 'mpif90-wrapper-data.txt', + 'mpif77-vt-wrapper-data.txt', + 'mpif77-wrapper-data.txt' ] - for wrapper_name, compiler in wrappers: - wrapper = join_path(wrapper_basepath, wrapper_name) - if not os.path.islink(wrapper): - # Substitute Spack compile wrappers for the real - # underlying compiler - match = 'compiler=.*' - substitute = 'compiler={compiler}'.format(compiler=compiler) - filter_file(match, substitute, wrapper, **kwargs) - # Remove this linking flag if present - # (it turns RPATH into RUNPATH) - filter_file('-Wl,--enable-new-dtags', '', wrapper, **kwargs) + abs_wrappers = [join_path(basepath, x) for x in wrappers] + + return [x for x in abs_wrappers if not os.path.islink(x)] diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py index ebd83ec9a8..514fcd9d8b 100644 --- a/var/spack/repos/builtin/packages/r/package.py +++ b/var/spack/repos/builtin/packages/r/package.py @@ -26,7 +26,7 @@ import shutil from spack import * -class R(AutotoolsPackage): +class R(AutotoolsPackage, FilterCompilerWrappersPackageMixin): """R is 'GNU S', a freely available language and environment for statistical computing and graphics which provides a wide variety of statistical and graphical techniques: linear and nonlinear modelling, @@ -129,25 +129,9 @@ class R(AutotoolsPackage): dst_makeconf = join_path(self.etcdir, 'Makeconf.spack') shutil.copy(src_makeconf, dst_makeconf) - @run_after('install') - def filter_compilers(self): - """Run after install to tell the configuration files and Makefiles - to use the compilers that Spack built the package with. - - If this isn't done, they'll have CC and CXX set to Spack's generic - cc and c++. We want them to be bound to whatever compiler - they were built with.""" - - kwargs = {'ignore_absent': True, 'backup': False, 'string': True} - - filter_file(env['CC'], self.compiler.cc, - join_path(self.etcdir, 'Makeconf'), **kwargs) - filter_file(env['CXX'], self.compiler.cxx, - join_path(self.etcdir, 'Makeconf'), **kwargs) - filter_file(env['F77'], self.compiler.f77, - join_path(self.etcdir, 'Makeconf'), **kwargs) - filter_file(env['FC'], self.compiler.fc, - join_path(self.etcdir, 'Makeconf'), **kwargs) + @property + def compiler_wrappers(self): + return [join_path(self.etcdir, 'Makeconf')] # ======================================================================== # Set up environment to make install easy for R extensions. -- cgit v1.2.3-70-g09d2 From 8e0f9038abd7166375245d92e07e0187c1d0edf3 Mon Sep 17 00:00:00 2001 From: alalazo Date: Sun, 11 Jun 2017 08:35:22 +0200 Subject: Improved naming of properties and classes (per Denis comments). --- lib/spack/spack/__init__.py | 4 ++-- lib/spack/spack/mixins.py | 16 +++++++++------- var/spack/repos/builtin/packages/hdf5/package.py | 4 ++-- var/spack/repos/builtin/packages/mpich/package.py | 4 ++-- var/spack/repos/builtin/packages/mvapich2/package.py | 4 ++-- var/spack/repos/builtin/packages/openmpi/package.py | 4 ++-- var/spack/repos/builtin/packages/r/package.py | 4 ++-- 7 files changed, 21 insertions(+), 19 deletions(-) (limited to 'var') diff --git a/lib/spack/spack/__init__.py b/lib/spack/spack/__init__.py index 62ac793d90..83355ad28c 100644 --- a/lib/spack/spack/__init__.py +++ b/lib/spack/spack/__init__.py @@ -214,8 +214,8 @@ __all__ += [ 'IntelPackage', ] -from spack.mixins import FilterCompilerWrappersPackageMixin -__all__ += ['FilterCompilerWrappersPackageMixin'] +import spack.mixins as mixins +__all__ += ['mixins'] from spack.version import Version, ver __all__ += ['Version', 'ver'] diff --git a/lib/spack/spack/mixins.py b/lib/spack/spack/mixins.py index be3c2c3136..0a354362ce 100644 --- a/lib/spack/spack/mixins.py +++ b/lib/spack/spack/mixins.py @@ -27,14 +27,14 @@ import os import llnl.util.filesystem -class FilterCompilerWrappersPackageMixin(object): +class FilterCompilerWrappers(object): """This mixin class registers a callback that filters a list of files after installation and substitutes hardcoded paths pointing to the Spack compiler wrappers with the corresponding 'real' compilers. """ #: compiler wrappers to be filtered (needs to be overridden) - compiler_wrappers = [] + to_be_filtered_for_wrappers = [] #: phase after which the callback is invoked (default 'install') filter_phase = 'install' @@ -43,7 +43,7 @@ class FilterCompilerWrappersPackageMixin(object): attr_name = '_InstallPhase_{0}'.format(self.filter_phase) - # Here we want to get the attribute directly from the class (noe from + # Here we want to get the attribute directly from the class (not from # the instance), so that we can modify it and add the mixin method phase = getattr(type(self), attr_name) @@ -54,10 +54,10 @@ class FilterCompilerWrappersPackageMixin(object): phase = getattr(type(self), attr_name) phase.run_after.append( - FilterCompilerWrappersPackageMixin.filter_compilers + FilterCompilerWrappers.filter_compilers ) - super(FilterCompilerWrappersPackageMixin, self).__init__() + super(FilterCompilerWrappers, self).__init__() def filter_compilers(self): """Substitutes any path referring to a Spack compiler wrapper @@ -70,8 +70,10 @@ class FilterCompilerWrappersPackageMixin(object): kwargs = {'ignore_absent': True, 'backup': False, 'string': True} - if self.compiler_wrappers: - x = llnl.util.filesystem.FileFilter(*self.compiler_wrappers) + if self.to_be_filtered_for_wrappers: + x = llnl.util.filesystem.FileFilter( + *self.to_be_filtered_for_wrappers + ) x.filter(os.environ['CC'], self.compiler.cc, **kwargs) x.filter(os.environ['CXX'], self.compiler.cxx, **kwargs) diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index 471326aac7..5c164e049a 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -28,7 +28,7 @@ import sys from spack import * -class Hdf5(AutotoolsPackage, FilterCompilerWrappersPackageMixin): +class Hdf5(AutotoolsPackage, mixins.FilterCompilerWrappers): """HDF5 is a data model, library, and file format for storing and managing data. It supports an unlimited variety of datatypes, and is designed for flexible and efficient I/O and for high volume and complex data. @@ -297,7 +297,7 @@ HDF5 version {version} {version} shutil.rmtree(checkdir) @property - def compiler_wrappers(self): + def to_be_filtered_for_wrappers(self): return [ join_path(self.prefix.bin, 'h5c++'), join_path(self.prefix.bin, 'h5cc'), diff --git a/var/spack/repos/builtin/packages/mpich/package.py b/var/spack/repos/builtin/packages/mpich/package.py index 0efca4f325..b689fefbdb 100644 --- a/var/spack/repos/builtin/packages/mpich/package.py +++ b/var/spack/repos/builtin/packages/mpich/package.py @@ -26,7 +26,7 @@ from spack import * import os -class Mpich(AutotoolsPackage, FilterCompilerWrappersPackageMixin): +class Mpich(AutotoolsPackage, mixins.FilterCompilerWrappers): """MPICH is a high performance and widely portable implementation of the Message Passing Interface (MPI) standard.""" @@ -171,7 +171,7 @@ spack package at this time.''', return config_args @property - def compiler_wrappers(self): + def to_be_filtered_for_wrappers(self): return [ join_path(self.prefix.bin, 'mpicc'), join_path(self.prefix.bin, 'mpicxx'), diff --git a/var/spack/repos/builtin/packages/mvapich2/package.py b/var/spack/repos/builtin/packages/mvapich2/package.py index 1f90981fda..cc6568883f 100644 --- a/var/spack/repos/builtin/packages/mvapich2/package.py +++ b/var/spack/repos/builtin/packages/mvapich2/package.py @@ -35,7 +35,7 @@ def _process_manager_validator(values): ) -class Mvapich2(AutotoolsPackage, FilterCompilerWrappersPackageMixin): +class Mvapich2(AutotoolsPackage, mixins.FilterCompilerWrappers): """MVAPICH2 is an MPI implementation for Infiniband networks.""" homepage = "http://mvapich.cse.ohio-state.edu/" url = "http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-2.2.tar.gz" @@ -233,7 +233,7 @@ class Mvapich2(AutotoolsPackage, FilterCompilerWrappersPackageMixin): return args @property - def compiler_wrappers(self): + def to_be_filtered_for_wrappers(self): return [ join_path(self.prefix.bin, 'mpicc'), join_path(self.prefix.bin, 'mpicxx'), diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 7362b9be7f..3c0db25ced 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -64,7 +64,7 @@ def _mxm_dir(): return None -class Openmpi(AutotoolsPackage, FilterCompilerWrappersPackageMixin): +class Openmpi(AutotoolsPackage, mixins.FilterCompilerWrappers): """The Open MPI Project is an open source Message Passing Interface implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is @@ -376,7 +376,7 @@ class Openmpi(AutotoolsPackage, FilterCompilerWrappersPackageMixin): return config_args @property - def compiler_wrappers(self): + def to_be_filtered_for_wrappers(self): basepath = join_path(self.prefix, 'share', 'openmpi') diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py index 514fcd9d8b..2f5fc1b3af 100644 --- a/var/spack/repos/builtin/packages/r/package.py +++ b/var/spack/repos/builtin/packages/r/package.py @@ -26,7 +26,7 @@ import shutil from spack import * -class R(AutotoolsPackage, FilterCompilerWrappersPackageMixin): +class R(AutotoolsPackage, mixins.FilterCompilerWrappers): """R is 'GNU S', a freely available language and environment for statistical computing and graphics which provides a wide variety of statistical and graphical techniques: linear and nonlinear modelling, @@ -130,7 +130,7 @@ class R(AutotoolsPackage, FilterCompilerWrappersPackageMixin): shutil.copy(src_makeconf, dst_makeconf) @property - def compiler_wrappers(self): + def to_be_filtered_for_wrappers(self): return [join_path(self.etcdir, 'Makeconf')] # ======================================================================== -- cgit v1.2.3-70-g09d2 From 22def01adf117d38dbe20c8f719fbd2f50fe5393 Mon Sep 17 00:00:00 2001 From: alalazo Date: Mon, 19 Jun 2017 14:16:18 +0200 Subject: mixins: implemented declarative syntax Implemented a declarative syntax for the additional behavior that can get attached to classes. Implemented a function to filter compiler wrappers that uses the mechanism above. --- lib/spack/spack/__init__.py | 4 +- lib/spack/spack/directives.py | 25 ++-- lib/spack/spack/mixins.py | 163 ++++++++++++++++----- lib/spack/spack/package.py | 6 +- var/spack/repos/builtin/packages/hdf5/package.py | 12 +- var/spack/repos/builtin/packages/mpich/package.py | 13 +- .../repos/builtin/packages/mvapich2/package.py | 13 +- .../repos/builtin/packages/openmpi/package.py | 45 +++--- var/spack/repos/builtin/packages/r/package.py | 8 +- 9 files changed, 174 insertions(+), 115 deletions(-) (limited to 'var') diff --git a/lib/spack/spack/__init__.py b/lib/spack/spack/__init__.py index 83355ad28c..ee310c2c3a 100644 --- a/lib/spack/spack/__init__.py +++ b/lib/spack/spack/__init__.py @@ -214,8 +214,8 @@ __all__ += [ 'IntelPackage', ] -import spack.mixins as mixins -__all__ += ['mixins'] +from spack.mixins import filter_compiler_wrappers +__all__ += ['filter_compiler_wrappers'] from spack.version import Version, ver __all__ += ['Version', 'ver'] diff --git a/lib/spack/spack/directives.py b/lib/spack/spack/directives.py index df19e85d54..d26910f1d9 100644 --- a/lib/spack/spack/directives.py +++ b/lib/spack/spack/directives.py @@ -74,7 +74,7 @@ __all__ = [] reserved_names = ['patches'] -class DirectiveMetaMixin(type): +class DirectiveMeta(type): """Flushes the directives that were temporarily stored in the staging area into the package. """ @@ -107,12 +107,12 @@ class DirectiveMetaMixin(type): # Move things to be executed from module scope (where they # are collected first) to class scope - if DirectiveMetaMixin._directives_to_be_executed: + if DirectiveMeta._directives_to_be_executed: attr_dict['_directives_to_be_executed'].extend( - DirectiveMetaMixin._directives_to_be_executed) - DirectiveMetaMixin._directives_to_be_executed = [] + DirectiveMeta._directives_to_be_executed) + DirectiveMeta._directives_to_be_executed = [] - return super(DirectiveMetaMixin, mcs).__new__( + return super(DirectiveMeta, mcs).__new__( mcs, name, bases, attr_dict) def __init__(cls, name, bases, attr_dict): @@ -127,7 +127,7 @@ class DirectiveMetaMixin(type): # Ensure the presence of the dictionaries associated # with the directives - for d in DirectiveMetaMixin._directive_names: + for d in DirectiveMeta._directive_names: setattr(cls, d, {}) # Lazily execute directives @@ -136,9 +136,9 @@ class DirectiveMetaMixin(type): # Ignore any directives executed *within* top-level # directives by clearing out the queue they're appended to - DirectiveMetaMixin._directives_to_be_executed = [] + DirectiveMeta._directives_to_be_executed = [] - super(DirectiveMetaMixin, cls).__init__(name, bases, attr_dict) + super(DirectiveMeta, cls).__init__(name, bases, attr_dict) @staticmethod def directive(dicts=None): @@ -188,7 +188,7 @@ class DirectiveMetaMixin(type): message = "dicts arg must be list, tuple, or string. Found {0}" raise TypeError(message.format(type(dicts))) # Add the dictionary names if not already there - DirectiveMetaMixin._directive_names |= set(dicts) + DirectiveMeta._directive_names |= set(dicts) # This decorator just returns the directive functions def _decorator(decorated_function): @@ -202,7 +202,7 @@ class DirectiveMetaMixin(type): # This allows nested directive calls in packages. The # caller can return the directive if it should be queued. def remove_directives(arg): - directives = DirectiveMetaMixin._directives_to_be_executed + directives = DirectiveMeta._directives_to_be_executed if isinstance(arg, (list, tuple)): # Descend into args that are lists or tuples for a in arg: @@ -228,18 +228,17 @@ class DirectiveMetaMixin(type): if not isinstance(values, collections.Sequence): values = (values, ) - DirectiveMetaMixin._directives_to_be_executed.extend(values) + DirectiveMeta._directives_to_be_executed.extend(values) # wrapped function returns same result as original so # that we can nest directives return result - return _wrapper return _decorator -directive = DirectiveMetaMixin.directive +directive = DirectiveMeta.directive @directive('versions') diff --git a/lib/spack/spack/mixins.py b/lib/spack/spack/mixins.py index 0a354362ce..d757a963b3 100644 --- a/lib/spack/spack/mixins.py +++ b/lib/spack/spack/mixins.py @@ -22,63 +22,150 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## +"""This module contains additional behavior that can be attached to any given +package. +""" +import collections import os import llnl.util.filesystem +import llnl.util.tty as tty -class FilterCompilerWrappers(object): - """This mixin class registers a callback that filters a list of files - after installation and substitutes hardcoded paths pointing to the Spack - compiler wrappers with the corresponding 'real' compilers. +__all__ = [ + 'filter_compiler_wrappers' +] + + +class PackageMixinsMeta(type): + """This metaclass serves the purpose of implementing a declarative syntax + for package mixins. + + Mixins are implemented below in the form of a function. Each one of them + needs to register a callable that takes a single argument to be run + before or after a certain phase. This callable is basically a method that + gets implicitly attached to the package class by calling the mixin. """ - #: compiler wrappers to be filtered (needs to be overridden) - to_be_filtered_for_wrappers = [] + _methods_to_be_added = {} + _add_method_before = collections.defaultdict(list) + _add_method_after = collections.defaultdict(list) - #: phase after which the callback is invoked (default 'install') - filter_phase = 'install' + @staticmethod + def register_method_before(fn, phase): + """Registers a method to be run before a certain phase. - def __init__(self): + Args: + fn: function taking a single argument (self) + phase (str): phase before which fn must run + """ + PackageMixinsMeta._methods_to_be_added[fn.__name__] = fn + PackageMixinsMeta._add_method_before[phase].append(fn) + + @staticmethod + def register_method_after(fn, phase): + """Registers a method to be run after a certain phase. + + Args: + fn: function taking a single argument (self) + phase (str): phase after which fn must run + """ + PackageMixinsMeta._methods_to_be_added[fn.__name__] = fn + PackageMixinsMeta._add_method_after[phase].append(fn) - attr_name = '_InstallPhase_{0}'.format(self.filter_phase) + def __init__(cls, name, bases, attr_dict): - # Here we want to get the attribute directly from the class (not from - # the instance), so that we can modify it and add the mixin method - phase = getattr(type(self), attr_name) + # Add the methods to the class being created + if PackageMixinsMeta._methods_to_be_added: + attr_dict.update(PackageMixinsMeta._methods_to_be_added) + PackageMixinsMeta._methods_to_be_added.clear() - # Due to MRO, we may have taken a method from a parent class - # and modifying it may influence other packages in unwanted manners. - # Solve the problem by copying the phase into the most derived class. - setattr(type(self), attr_name, phase.copy()) - phase = getattr(type(self), attr_name) + attr_fmt = '_InstallPhase_{0}' - phase.run_after.append( - FilterCompilerWrappers.filter_compilers + # Copy the phases that needs it to the most derived classes + # in order not to interfere with other packages in the hierarchy + phases_to_be_copied = list( + PackageMixinsMeta._add_method_before.keys() + ) + phases_to_be_copied += list( + PackageMixinsMeta._add_method_after.keys() ) - super(FilterCompilerWrappers, self).__init__() + for phase in phases_to_be_copied: - def filter_compilers(self): - """Substitutes any path referring to a Spack compiler wrapper - with the path of the underlying compiler that has been used. + attr_name = attr_fmt.format(phase) - If this isn't done, the files will have CC, CXX, F77, and FC set - to Spack's generic cc, c++, f77, and f90. We want them to - be bound to whatever compiler they were built with. - """ + # Here we want to get the attribute directly from the class (not + # from the instance), so that we can modify it and add the mixin + # method to the pipeline. + phase = getattr(cls, attr_name) + + # Due to MRO, we may have taken a method from a parent class + # and modifying it may influence other packages in unwanted + # manners. Solve the problem by copying the phase into the most + # derived class. + setattr(cls, attr_name, phase.copy()) + + # Insert the methods in the appropriate position + # in the installation pipeline. + + for phase in PackageMixinsMeta._add_method_before: + + attr_name = attr_fmt.format(phase) + phase_obj = getattr(cls, attr_name) + fn_list = PackageMixinsMeta._add_method_after[phase] + + for f in fn_list: + phase_obj.run_before.append(f) + + for phase in PackageMixinsMeta._add_method_after: + + attr_name = attr_fmt.format(phase) + phase_obj = getattr(cls, attr_name) + fn_list = PackageMixinsMeta._add_method_after[phase] + + for f in fn_list: + phase_obj.run_after.append(f) + + super(PackageMixinsMeta, cls).__init__(name, bases, attr_dict) + + +def filter_compiler_wrappers(*files, **kwargs): + """Substitutes any path referring to a Spack compiler wrapper with the + path of the underlying compiler that has been used. + + If this isn't done, the files will have CC, CXX, F77, and FC set to + Spack's generic cc, c++, f77, and f90. We want them to be bound to + whatever compiler they were built with. + + Args: + *files: files to be filtered + **kwargs: at present supports the keyword 'after' to specify after + which phase the files should be filtered (defaults to 'install'). + """ + after = kwargs.get('after', 'install') + + def _filter_compiler_wrappers_impl(self): + + tty.debug('Filtering compiler wrappers: {0}'.format(files)) + + # Compute the absolute path of the files to be filtered and + # remove links from the list. + abs_files = llnl.util.filesystem.find(self.prefix, files) + abs_files = [x for x in abs_files if not os.path.islink(x)] kwargs = {'ignore_absent': True, 'backup': False, 'string': True} - if self.to_be_filtered_for_wrappers: - x = llnl.util.filesystem.FileFilter( - *self.to_be_filtered_for_wrappers - ) + x = llnl.util.filesystem.FileFilter(*abs_files) + + x.filter(os.environ['CC'], self.compiler.cc, **kwargs) + x.filter(os.environ['CXX'], self.compiler.cxx, **kwargs) + x.filter(os.environ['F77'], self.compiler.f77, **kwargs) + x.filter(os.environ['FC'], self.compiler.fc, **kwargs) - x.filter(os.environ['CC'], self.compiler.cc, **kwargs) - x.filter(os.environ['CXX'], self.compiler.cxx, **kwargs) - x.filter(os.environ['F77'], self.compiler.f77, **kwargs) - x.filter(os.environ['FC'], self.compiler.fc, **kwargs) + # Remove this linking flag if present (it turns RPATH into RUNPATH) + x.filter('-Wl,--enable-new-dtags', '', **kwargs) - # Remove this linking flag if present (it turns RPATH into RUNPATH) - x.filter('-Wl,--enable-new-dtags', '', **kwargs) + PackageMixinsMeta.register_method_after( + _filter_compiler_wrappers_impl, after + ) diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py index f0172565bb..82af2375af 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -56,6 +56,7 @@ import spack.error import spack.fetch_strategy as fs import spack.hooks import spack.mirror +import spack.mixins import spack.repository import spack.url import spack.util.web @@ -141,7 +142,10 @@ class InstallPhase(object): return other -class PackageMeta(spack.directives.DirectiveMetaMixin): +class PackageMeta( + spack.directives.DirectiveMeta, + spack.mixins.PackageMixinsMeta +): """Conveniently transforms attributes to permit extensible phases Iterates over the attribute 'phases' and creates / updates private diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index 5c164e049a..3c729412ab 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -28,7 +28,7 @@ import sys from spack import * -class Hdf5(AutotoolsPackage, mixins.FilterCompilerWrappers): +class Hdf5(AutotoolsPackage): """HDF5 is a data model, library, and file format for storing and managing data. It supports an unlimited variety of datatypes, and is designed for flexible and efficient I/O and for high volume and complex data. @@ -97,6 +97,8 @@ class Hdf5(AutotoolsPackage, mixins.FilterCompilerWrappers): patch('h5f90global-mult-obj-same-equivalence-same-common-block.patch', when='@1.10.1%intel@18') + filter_compiler_wrappers('h5cc', 'h5c++', 'h5fc') + def url_for_version(self, version): url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-{0}/hdf5-{1}/src/hdf5-{1}.tar.gz" return url.format(version.up_to(2), version) @@ -295,11 +297,3 @@ HDF5 version {version} {version} print('-' * 80) raise RuntimeError("HDF5 install check failed") shutil.rmtree(checkdir) - - @property - def to_be_filtered_for_wrappers(self): - return [ - join_path(self.prefix.bin, 'h5c++'), - join_path(self.prefix.bin, 'h5cc'), - join_path(self.prefix.bin, 'h5fc'), - ] diff --git a/var/spack/repos/builtin/packages/mpich/package.py b/var/spack/repos/builtin/packages/mpich/package.py index b689fefbdb..69dd75e3e1 100644 --- a/var/spack/repos/builtin/packages/mpich/package.py +++ b/var/spack/repos/builtin/packages/mpich/package.py @@ -26,7 +26,7 @@ from spack import * import os -class Mpich(AutotoolsPackage, mixins.FilterCompilerWrappers): +class Mpich(AutotoolsPackage): """MPICH is a high performance and widely portable implementation of the Message Passing Interface (MPI) standard.""" @@ -71,6 +71,8 @@ spack package at this time.''', provides('mpi@:3.0', when='@3:') provides('mpi@:1.3', when='@1:') + filter_compiler_wrappers('mpicc', 'mpicxx', 'mpif77', 'mpif90') + # fix MPI_Barrier segmentation fault # see https://lists.mpich.org/pipermail/discuss/2016-May/004764.html # and https://lists.mpich.org/pipermail/discuss/2016-June/004768.html @@ -169,12 +171,3 @@ spack package at this time.''', config_args.append(device_config) return config_args - - @property - def to_be_filtered_for_wrappers(self): - return [ - join_path(self.prefix.bin, 'mpicc'), - join_path(self.prefix.bin, 'mpicxx'), - join_path(self.prefix.bin, 'mpif77'), - join_path(self.prefix.bin, 'mpif90') - ] diff --git a/var/spack/repos/builtin/packages/mvapich2/package.py b/var/spack/repos/builtin/packages/mvapich2/package.py index cc6568883f..1e3a14f2f3 100644 --- a/var/spack/repos/builtin/packages/mvapich2/package.py +++ b/var/spack/repos/builtin/packages/mvapich2/package.py @@ -35,7 +35,7 @@ def _process_manager_validator(values): ) -class Mvapich2(AutotoolsPackage, mixins.FilterCompilerWrappers): +class Mvapich2(AutotoolsPackage): """MVAPICH2 is an MPI implementation for Infiniband networks.""" homepage = "http://mvapich.cse.ohio-state.edu/" url = "http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-2.2.tar.gz" @@ -107,6 +107,8 @@ class Mvapich2(AutotoolsPackage, mixins.FilterCompilerWrappers): depends_on('libpciaccess', when=(sys.platform != 'darwin')) depends_on('cuda', when='+cuda') + filter_compiler_wrappers('mpicc', 'mpicxx', 'mpif77', 'mpif90') + def url_for_version(self, version): base_url = "http://mvapich.cse.ohio-state.edu/download" if version < Version('2.0'): @@ -231,12 +233,3 @@ class Mvapich2(AutotoolsPackage, mixins.FilterCompilerWrappers): args.extend(self.process_manager_options) args.extend(self.network_options) return args - - @property - def to_be_filtered_for_wrappers(self): - return [ - join_path(self.prefix.bin, 'mpicc'), - join_path(self.prefix.bin, 'mpicxx'), - join_path(self.prefix.bin, 'mpif77'), - join_path(self.prefix.bin, 'mpif90') - ] diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 3c0db25ced..343b69ea7e 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -64,7 +64,7 @@ def _mxm_dir(): return None -class Openmpi(AutotoolsPackage, mixins.FilterCompilerWrappers): +class Openmpi(AutotoolsPackage): """The Open MPI Project is an open source Message Passing Interface implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is @@ -214,6 +214,23 @@ class Openmpi(AutotoolsPackage, mixins.FilterCompilerWrappers): conflicts('fabrics=pmi', when='@:1.5.4') # PMI support was added in 1.5.5 conflicts('fabrics=mxm', when='@:1.5.3') # MXM support was added in 1.5.4 + filter_compiler_wrappers( + 'mpicc-vt-wrapper-data.txt', + 'mpicc-wrapper-data.txt', + 'ortecc-wrapper-data.txt', + 'shmemcc-wrapper-data.txt', + 'mpic++-vt-wrapper-data.txt', + 'mpic++-wrapper-data.txt', + 'ortec++-wrapper-data.txt', + 'mpifort-vt-wrapper-data.txt', + 'mpifort-wrapper-data.txt', + 'shmemfort-wrapper-data.txt', + 'mpif90-vt-wrapper-data.txt', + 'mpif90-wrapper-data.txt', + 'mpif77-vt-wrapper-data.txt', + 'mpif77-wrapper-data.txt' + ) + def url_for_version(self, version): url = "http://www.open-mpi.org/software/ompi/v{0}/downloads/openmpi-{1}.tar.bz2" return url.format(version.up_to(2), version) @@ -374,29 +391,3 @@ class Openmpi(AutotoolsPackage, mixins.FilterCompilerWrappers): config_args.append('--without-ucx') return config_args - - @property - def to_be_filtered_for_wrappers(self): - - basepath = join_path(self.prefix, 'share', 'openmpi') - - wrappers = [ - 'mpicc-vt-wrapper-data.txt', - 'mpicc-wrapper-data.txt', - 'ortecc-wrapper-data.txt', - 'shmemcc-wrapper-data.txt', - 'mpic++-vt-wrapper-data.txt', - 'mpic++-wrapper-data.txt', - 'ortec++-wrapper-data.txt', - 'mpifort-vt-wrapper-data.txt', - 'mpifort-wrapper-data.txt', - 'shmemfort-wrapper-data.txt', - 'mpif90-vt-wrapper-data.txt', - 'mpif90-wrapper-data.txt', - 'mpif77-vt-wrapper-data.txt', - 'mpif77-wrapper-data.txt' - ] - - abs_wrappers = [join_path(basepath, x) for x in wrappers] - - return [x for x in abs_wrappers if not os.path.islink(x)] diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py index 2f5fc1b3af..cb955579a3 100644 --- a/var/spack/repos/builtin/packages/r/package.py +++ b/var/spack/repos/builtin/packages/r/package.py @@ -26,7 +26,7 @@ import shutil from spack import * -class R(AutotoolsPackage, mixins.FilterCompilerWrappers): +class R(AutotoolsPackage): """R is 'GNU S', a freely available language and environment for statistical computing and graphics which provides a wide variety of statistical and graphical techniques: linear and nonlinear modelling, @@ -88,6 +88,8 @@ class R(AutotoolsPackage, mixins.FilterCompilerWrappers): patch('zlib.patch', when='@:3.3.2') + filter_compiler_wrappers('Makeconf') + @property def etcdir(self): return join_path(prefix, 'rlib', 'R', 'etc') @@ -129,10 +131,6 @@ class R(AutotoolsPackage, mixins.FilterCompilerWrappers): dst_makeconf = join_path(self.etcdir, 'Makeconf.spack') shutil.copy(src_makeconf, dst_makeconf) - @property - def to_be_filtered_for_wrappers(self): - return [join_path(self.etcdir, 'Makeconf')] - # ======================================================================== # Set up environment to make install easy for R extensions. # ======================================================================== -- cgit v1.2.3-70-g09d2 From a01a68218c0e476bcc6801532bff694fd40bc968 Mon Sep 17 00:00:00 2001 From: alalazo Date: Mon, 3 Jul 2017 08:50:22 +0200 Subject: mvapich2: ported 2e6a735b0043bebe8c6ff88f21c1bb2de0063135 --- var/spack/repos/builtin/packages/mvapich2/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mvapich2/package.py b/var/spack/repos/builtin/packages/mvapich2/package.py index 1e3a14f2f3..256418da9c 100644 --- a/var/spack/repos/builtin/packages/mvapich2/package.py +++ b/var/spack/repos/builtin/packages/mvapich2/package.py @@ -107,7 +107,7 @@ class Mvapich2(AutotoolsPackage): depends_on('libpciaccess', when=(sys.platform != 'darwin')) depends_on('cuda', when='+cuda') - filter_compiler_wrappers('mpicc', 'mpicxx', 'mpif77', 'mpif90') + filter_compiler_wrappers('mpicc', 'mpicxx', 'mpif77', 'mpif90', 'mpifort') def url_for_version(self, version): base_url = "http://mvapich.cse.ohio-state.edu/download" -- cgit v1.2.3-70-g09d2 From c62b3eef559e9d47ee6fe5136a2edebca5111fad Mon Sep 17 00:00:00 2001 From: alalazo Date: Wed, 2 Aug 2017 15:37:52 +0200 Subject: filter_compiler_path: added the possibility to narrow search path Following a comment from Todd, the search path for the files listed in `filter_compiler_wrappers` can now be narrowed. Anyhow, the function implementation still makes use of `find`, the rationale being that we have already seen packages that install artifacts in e.g. architecture dependent folders. The possibility to have a relative search path might be a good compromise between the previous approach and the one suggested in the review. Also: 'ignore_absent' and 'backup' keyword arguments can be optionally forwarded to `filter_file`. --- lib/spack/spack/mixins.py | 43 +++++++++++++++++----- var/spack/repos/builtin/packages/hdf5/package.py | 2 +- var/spack/repos/builtin/packages/mpich/package.py | 4 +- .../repos/builtin/packages/mvapich2/package.py | 4 +- .../repos/builtin/packages/openmpi/package.py | 3 +- var/spack/repos/builtin/packages/r/package.py | 4 +- 6 files changed, 45 insertions(+), 15 deletions(-) (limited to 'var') diff --git a/lib/spack/spack/mixins.py b/lib/spack/spack/mixins.py index 82e6f8bdad..0a43e76961 100644 --- a/lib/spack/spack/mixins.py +++ b/lib/spack/spack/mixins.py @@ -143,24 +143,47 @@ def filter_compiler_wrappers(*files, **kwargs): whatever compiler they were built with. Args: - *files: files to be filtered - **kwargs: at present supports the keyword 'after' to specify after - which phase the files should be filtered (defaults to 'install'). + *files: files to be filtered relative to the search root (which is, + by default, the installation prefix) + + **kwargs: allowed keyword arguments + + after + specifies after which phase the files should be + filtered (defaults to 'install') + + relative_root + path relative to prefix where to start searching for + the files to be filtered. If not set the install prefix + wil be used as the search root. **It is highly recommended + to set this, as searching from the installation prefix may + affect performance severely in some cases**. + + ignore_absent, backup + these two keyword arguments, if present, will be forwarded + to ``filter_file`` (see its documentation for more information + on their behavior) """ after = kwargs.get('after', 'install') + relative_root = kwargs.get('relative_root', None) + + filter_kwargs = { + 'ignore_absent': kwargs.get('ignore_absent', True), + 'backup': kwargs.get('backup', False), + 'string': True + } def _filter_compiler_wrappers_impl(self): + # Compute the absolute path of the search root + root = os.path.join( + self.prefix, relative_root + ) if relative_root else self.prefix + # Compute the absolute path of the files to be filtered and # remove links from the list. - abs_files = llnl.util.filesystem.find(self.prefix, files) + abs_files = llnl.util.filesystem.find(root, files) abs_files = [x for x in abs_files if not os.path.islink(x)] - filter_kwargs = { - 'ignore_absent': True, - 'backup': False, - 'string': True - } - x = llnl.util.filesystem.FileFilter(*abs_files) x.filter(os.environ['CC'], self.compiler.cc, **filter_kwargs) diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index 3c729412ab..0ead42d41b 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -97,7 +97,7 @@ class Hdf5(AutotoolsPackage): patch('h5f90global-mult-obj-same-equivalence-same-common-block.patch', when='@1.10.1%intel@18') - filter_compiler_wrappers('h5cc', 'h5c++', 'h5fc') + filter_compiler_wrappers('h5cc', 'h5c++', 'h5fc', relative_root='bin') def url_for_version(self, version): url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-{0}/hdf5-{1}/src/hdf5-{1}.tar.gz" diff --git a/var/spack/repos/builtin/packages/mpich/package.py b/var/spack/repos/builtin/packages/mpich/package.py index 69dd75e3e1..5573b71197 100644 --- a/var/spack/repos/builtin/packages/mpich/package.py +++ b/var/spack/repos/builtin/packages/mpich/package.py @@ -71,7 +71,9 @@ spack package at this time.''', provides('mpi@:3.0', when='@3:') provides('mpi@:1.3', when='@1:') - filter_compiler_wrappers('mpicc', 'mpicxx', 'mpif77', 'mpif90') + filter_compiler_wrappers( + 'mpicc', 'mpicxx', 'mpif77', 'mpif90', 'mpifort', relative_root='bin' + ) # fix MPI_Barrier segmentation fault # see https://lists.mpich.org/pipermail/discuss/2016-May/004764.html diff --git a/var/spack/repos/builtin/packages/mvapich2/package.py b/var/spack/repos/builtin/packages/mvapich2/package.py index 256418da9c..8dab2e9d6d 100644 --- a/var/spack/repos/builtin/packages/mvapich2/package.py +++ b/var/spack/repos/builtin/packages/mvapich2/package.py @@ -107,7 +107,9 @@ class Mvapich2(AutotoolsPackage): depends_on('libpciaccess', when=(sys.platform != 'darwin')) depends_on('cuda', when='+cuda') - filter_compiler_wrappers('mpicc', 'mpicxx', 'mpif77', 'mpif90', 'mpifort') + filter_compiler_wrappers( + 'mpicc', 'mpicxx', 'mpif77', 'mpif90', 'mpifort', relative_root='bin' + ) def url_for_version(self, version): base_url = "http://mvapich.cse.ohio-state.edu/download" diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 343b69ea7e..889455aae0 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -228,7 +228,8 @@ class Openmpi(AutotoolsPackage): 'mpif90-vt-wrapper-data.txt', 'mpif90-wrapper-data.txt', 'mpif77-vt-wrapper-data.txt', - 'mpif77-wrapper-data.txt' + 'mpif77-wrapper-data.txt', + relative_root=os.path.join('share', 'openmpi') ) def url_for_version(self, version): diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py index cb955579a3..4b5dd05c33 100644 --- a/var/spack/repos/builtin/packages/r/package.py +++ b/var/spack/repos/builtin/packages/r/package.py @@ -88,7 +88,9 @@ class R(AutotoolsPackage): patch('zlib.patch', when='@:3.3.2') - filter_compiler_wrappers('Makeconf') + filter_compiler_wrappers( + 'Makeconf', relative_root=os.path.join('rlib', 'R', 'etc') + ) @property def etcdir(self): -- cgit v1.2.3-70-g09d2 From efd2a957810511589fc135e10b1bf9aada03c2eb Mon Sep 17 00:00:00 2001 From: alalazo Date: Thu, 3 Aug 2017 17:05:49 +0200 Subject: find has been changed to accept glob expressions Following the discussion with Todd and Adam, find has been modified to accept glob expressions. This should not affect performance as every glob implementation I inspected has 3 cases (no wildcard, wildcard but no directories involved, wildcard and directories involved) and uses fnmatch underneath. Mixins have been changed to do by default a non-recursive search (but a recursive search can still be triggered using the recursive keyword). --- lib/spack/llnl/util/filesystem.py | 41 ++++++++------- lib/spack/spack/mixins.py | 11 +++- lib/spack/spack/spec.py | 10 ++-- .../spack/test/data/directory_search/a/foobar.txt | 0 .../spack/test/data/directory_search/b/bar.txp | 0 .../spack/test/data/directory_search/c/bar.txt | 0 lib/spack/spack/test/llnl/util/file_list.py | 61 +++++++++++++++------- .../repos/builtin/packages/openmpi/package.py | 18 +------ 8 files changed, 80 insertions(+), 61 deletions(-) create mode 100644 lib/spack/spack/test/data/directory_search/a/foobar.txt create mode 100644 lib/spack/spack/test/data/directory_search/b/bar.txp create mode 100644 lib/spack/spack/test/data/directory_search/c/bar.txt (limited to 'var') diff --git a/lib/spack/llnl/util/filesystem.py b/lib/spack/llnl/util/filesystem.py index f8d77e2727..6b92a374c7 100644 --- a/lib/spack/llnl/util/filesystem.py +++ b/lib/spack/llnl/util/filesystem.py @@ -26,7 +26,6 @@ import collections import errno import hashlib import fileinput -import fnmatch import glob import numbers import os @@ -606,7 +605,7 @@ def fix_darwin_install_name(path): break -def find(root, files, recurse=True): +def find(root, files, recursive=True): """Search for ``files`` starting from the ``root`` directory. Like GNU/BSD find but written entirely in Python. @@ -627,7 +626,7 @@ def find(root, files, recurse=True): is equivalent to: - >>> find('/usr/local/bin', 'python', recurse=False) + >>> find('/usr/local/bin', 'python', recursive=False) Accepts any glob characters accepted by fnmatch: @@ -652,7 +651,7 @@ def find(root, files, recurse=True): if isinstance(files, six.string_types): files = [files] - if recurse: + if recursive: return _find_recursive(root, files) else: return _find_non_recursive(root, files) @@ -666,11 +665,14 @@ def _find_recursive(root, search_files): # found in a key, and reconstructing the stable order later. found_files = collections.defaultdict(list) + # Make the path absolute to have os.walk also return an absolute path + root = os.path.abspath(root) + for path, _, list_files in os.walk(root): for search_file in search_files: - for list_file in list_files: - if fnmatch.fnmatch(list_file, search_file): - found_files[search_file].append(join_path(path, list_file)) + matches = glob.glob(os.path.join(path, search_file)) + matches = [os.path.join(path, x) for x in matches] + found_files[search_file].extend(matches) answer = [] for search_file in search_files: @@ -684,10 +686,13 @@ def _find_non_recursive(root, search_files): # can return files in any order (does not preserve stability) found_files = collections.defaultdict(list) - for list_file in os.listdir(root): - for search_file in search_files: - if fnmatch.fnmatch(list_file, search_file): - found_files[search_file].append(join_path(root, list_file)) + # Make the path absolute to have absolute path returned + root = os.path.abspath(root) + + for search_file in search_files: + matches = glob.glob(os.path.join(root, search_file)) + matches = [os.path.join(root, x) for x in matches] + found_files[search_file].extend(matches) answer = [] for search_file in search_files: @@ -878,7 +883,7 @@ class HeaderList(FileList): self._macro_definitions.append(macro) -def find_headers(headers, root, recurse=False): +def find_headers(headers, root, recursive=False): """Returns an iterable object containing a list of full paths to headers if found. @@ -896,7 +901,7 @@ def find_headers(headers, root, recurse=False): Parameters: headers (str or list of str): Header name(s) to search for root (str): The root directory to start searching from - recurses (bool, optional): if False search only root folder, + recursive (bool, optional): if False search only root folder, if True descends top-down from the root. Defaults to False. Returns: @@ -916,7 +921,7 @@ def find_headers(headers, root, recurse=False): # List of headers we are searching with suffixes headers = ['{0}.{1}'.format(header, suffix) for header in headers] - return HeaderList(find(root, headers, recurse)) + return HeaderList(find(root, headers, recursive)) class LibraryList(FileList): @@ -1057,7 +1062,7 @@ def find_system_libraries(libraries, shared=True): for library in libraries: for root in search_locations: - result = find_libraries(library, root, shared, recurse=True) + result = find_libraries(library, root, shared, recursive=True) if result: libraries_found += result break @@ -1065,7 +1070,7 @@ def find_system_libraries(libraries, shared=True): return libraries_found -def find_libraries(libraries, root, shared=True, recurse=False): +def find_libraries(libraries, root, shared=True, recursive=False): """Returns an iterable of full paths to libraries found in a root dir. Accepts any glob characters accepted by fnmatch: @@ -1084,7 +1089,7 @@ def find_libraries(libraries, root, shared=True, recurse=False): root (str): The root directory to start searching from shared (bool, optional): if True searches for shared libraries, otherwise for static. Defaults to True. - recurse (bool, optional): if False search only root folder, + recursive (bool, optional): if False search only root folder, if True descends top-down from the root. Defaults to False. Returns: @@ -1106,4 +1111,4 @@ def find_libraries(libraries, root, shared=True, recurse=False): # List of libraries we are searching with suffixes libraries = ['{0}.{1}'.format(lib, suffix) for lib in libraries] - return LibraryList(find(root, libraries, recurse)) + return LibraryList(find(root, libraries, recursive)) diff --git a/lib/spack/spack/mixins.py b/lib/spack/spack/mixins.py index 0a43e76961..d16f572a4e 100644 --- a/lib/spack/spack/mixins.py +++ b/lib/spack/spack/mixins.py @@ -163,6 +163,11 @@ def filter_compiler_wrappers(*files, **kwargs): these two keyword arguments, if present, will be forwarded to ``filter_file`` (see its documentation for more information on their behavior) + + recursive + this keyword argument, if present, will be forwarded to + ``find`` (see its documentation for more information on the + behavior) """ after = kwargs.get('after', 'install') relative_root = kwargs.get('relative_root', None) @@ -173,6 +178,10 @@ def filter_compiler_wrappers(*files, **kwargs): 'string': True } + find_kwargs = { + 'recursive': kwargs.get('recursive', False) + } + def _filter_compiler_wrappers_impl(self): # Compute the absolute path of the search root root = os.path.join( @@ -181,7 +190,7 @@ def filter_compiler_wrappers(*files, **kwargs): # Compute the absolute path of the files to be filtered and # remove links from the list. - abs_files = llnl.util.filesystem.find(root, files) + abs_files = llnl.util.filesystem.find(root, files, **find_kwargs) abs_files = [x for x in abs_files if not os.path.islink(x)] x = llnl.util.filesystem.FileFilter(*abs_files) diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py index 61f127a66c..341e266493 100644 --- a/lib/spack/spack/spec.py +++ b/lib/spack/spack/spec.py @@ -689,7 +689,7 @@ def _headers_default_handler(descriptor, spec, cls): Raises: RuntimeError: If no headers are found """ - headers = find_headers('*', root=spec.prefix.include, recurse=True) + headers = find_headers('*', root=spec.prefix.include, recursive=True) if headers: return headers @@ -731,22 +731,22 @@ def _libs_default_handler(descriptor, spec, cls): if '+shared' in spec: libs = find_libraries( - name, root=spec.prefix, shared=True, recurse=True + name, root=spec.prefix, shared=True, recursive=True ) elif '~shared' in spec: libs = find_libraries( - name, root=spec.prefix, shared=False, recurse=True + name, root=spec.prefix, shared=False, recursive=True ) else: # Prefer shared libs = find_libraries( - name, root=spec.prefix, shared=True, recurse=True + name, root=spec.prefix, shared=True, recursive=True ) if libs: return libs libs = find_libraries( - name, root=spec.prefix, shared=False, recurse=True + name, root=spec.prefix, shared=False, recursive=True ) if libs: diff --git a/lib/spack/spack/test/data/directory_search/a/foobar.txt b/lib/spack/spack/test/data/directory_search/a/foobar.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/spack/spack/test/data/directory_search/b/bar.txp b/lib/spack/spack/test/data/directory_search/b/bar.txp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/spack/spack/test/data/directory_search/c/bar.txt b/lib/spack/spack/test/data/directory_search/c/bar.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/spack/spack/test/llnl/util/file_list.py b/lib/spack/spack/test/llnl/util/file_list.py index f7d5dde4d3..d92f15c5e1 100644 --- a/lib/spack/spack/test/llnl/util/file_list.py +++ b/lib/spack/spack/test/llnl/util/file_list.py @@ -30,7 +30,7 @@ import pytest import six import spack from llnl.util.filesystem import LibraryList, HeaderList -from llnl.util.filesystem import find_libraries, find_headers +from llnl.util.filesystem import find_libraries, find_headers, find @pytest.fixture() @@ -215,36 +215,40 @@ search_dir = os.path.join(spack.test_path, 'data', 'directory_search') @pytest.mark.parametrize('search_fn,search_list,root,kwargs', [ - (find_libraries, 'liba', search_dir, {'recurse': True}), - (find_libraries, ['liba'], search_dir, {'recurse': True}), - (find_libraries, 'libb', search_dir, {'recurse': True}), - (find_libraries, ['libc'], search_dir, {'recurse': True}), - (find_libraries, ['libc', 'liba'], search_dir, {'recurse': True}), - (find_libraries, ['liba', 'libc'], search_dir, {'recurse': True}), - (find_libraries, ['libc', 'libb', 'liba'], search_dir, {'recurse': True}), - (find_libraries, ['liba', 'libc'], search_dir, {'recurse': True}), + (find_libraries, 'liba', search_dir, {'recursive': True}), + (find_libraries, ['liba'], search_dir, {'recursive': True}), + (find_libraries, 'libb', search_dir, {'recursive': True}), + (find_libraries, ['libc'], search_dir, {'recursive': True}), + (find_libraries, ['libc', 'liba'], search_dir, {'recursive': True}), + (find_libraries, ['liba', 'libc'], search_dir, {'recursive': True}), (find_libraries, ['libc', 'libb', 'liba'], search_dir, - {'recurse': True, 'shared': False} + {'recursive': True} ), - (find_headers, 'a', search_dir, {'recurse': True}), - (find_headers, ['a'], search_dir, {'recurse': True}), - (find_headers, 'b', search_dir, {'recurse': True}), - (find_headers, ['c'], search_dir, {'recurse': True}), - (find_headers, ['c', 'a'], search_dir, {'recurse': True}), - (find_headers, ['a', 'c'], search_dir, {'recurse': True}), - (find_headers, ['c', 'b', 'a'], search_dir, {'recurse': True}), - (find_headers, ['a', 'c'], search_dir, {'recurse': True}), + (find_libraries, ['liba', 'libc'], search_dir, {'recursive': True}), + (find_libraries, + ['libc', 'libb', 'liba'], + search_dir, + {'recursive': True, 'shared': False} + ), + (find_headers, 'a', search_dir, {'recursive': True}), + (find_headers, ['a'], search_dir, {'recursive': True}), + (find_headers, 'b', search_dir, {'recursive': True}), + (find_headers, ['c'], search_dir, {'recursive': True}), + (find_headers, ['c', 'a'], search_dir, {'recursive': True}), + (find_headers, ['a', 'c'], search_dir, {'recursive': True}), + (find_headers, ['c', 'b', 'a'], search_dir, {'recursive': True}), + (find_headers, ['a', 'c'], search_dir, {'recursive': True}), (find_libraries, ['liba', 'libd'], os.path.join(search_dir, 'b'), - {'recurse': False} + {'recursive': False} ), (find_headers, ['b', 'd'], os.path.join(search_dir, 'b'), - {'recurse': False} + {'recursive': False} ), ]) def test_searching_order(search_fn, search_list, root, kwargs): @@ -275,3 +279,20 @@ def test_searching_order(search_fn, search_list, root, kwargs): # List should be empty here assert len(L) == 0 + + +@pytest.mark.parametrize('root,search_list,kwargs,expected', [ + (search_dir, '*/*bar.tx?', {'recursive': False}, [ + os.path.join(search_dir, 'a/foobar.txt'), + os.path.join(search_dir, 'b/bar.txp'), + os.path.join(search_dir, 'c/bar.txt'), + ]), + (search_dir, '*/*bar.tx?', {'recursive': True}, [ + os.path.join(search_dir, 'a/foobar.txt'), + os.path.join(search_dir, 'b/bar.txp'), + os.path.join(search_dir, 'c/bar.txt'), + ]) +]) +def test_find_with_globbing(root, search_list, kwargs, expected): + matches = find(root, search_list, **kwargs) + assert matches == expected diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 889455aae0..3919863558 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -214,23 +214,7 @@ class Openmpi(AutotoolsPackage): conflicts('fabrics=pmi', when='@:1.5.4') # PMI support was added in 1.5.5 conflicts('fabrics=mxm', when='@:1.5.3') # MXM support was added in 1.5.4 - filter_compiler_wrappers( - 'mpicc-vt-wrapper-data.txt', - 'mpicc-wrapper-data.txt', - 'ortecc-wrapper-data.txt', - 'shmemcc-wrapper-data.txt', - 'mpic++-vt-wrapper-data.txt', - 'mpic++-wrapper-data.txt', - 'ortec++-wrapper-data.txt', - 'mpifort-vt-wrapper-data.txt', - 'mpifort-wrapper-data.txt', - 'shmemfort-wrapper-data.txt', - 'mpif90-vt-wrapper-data.txt', - 'mpif90-wrapper-data.txt', - 'mpif77-vt-wrapper-data.txt', - 'mpif77-wrapper-data.txt', - relative_root=os.path.join('share', 'openmpi') - ) + filter_compiler_wrappers('openmpi/*-wrapper-data*', relative_root='share') def url_for_version(self, version): url = "http://www.open-mpi.org/software/ompi/v{0}/downloads/openmpi-{1}.tar.bz2" -- cgit v1.2.3-70-g09d2 From e72b69732eca35dbd4ccaae15b1307eff0a8d538 Mon Sep 17 00:00:00 2001 From: alalazo Date: Thu, 3 Aug 2017 17:21:40 +0200 Subject: Changed keyword argument 'recurse' to 'recursive' --- var/spack/repos/builtin/packages/arpack-ng/package.py | 2 +- var/spack/repos/builtin/packages/atlas/package.py | 2 +- var/spack/repos/builtin/packages/elemental/package.py | 2 +- var/spack/repos/builtin/packages/elpa/package.py | 2 +- var/spack/repos/builtin/packages/hdf5/package.py | 2 +- var/spack/repos/builtin/packages/intel-mpi/package.py | 4 ++-- var/spack/repos/builtin/packages/libxc/package.py | 2 +- var/spack/repos/builtin/packages/ncurses/package.py | 2 +- var/spack/repos/builtin/packages/netcdf-fortran/package.py | 2 +- var/spack/repos/builtin/packages/netlib-lapack/package.py | 4 ++-- var/spack/repos/builtin/packages/netlib-scalapack/package.py | 2 +- var/spack/repos/builtin/packages/openmpi/package.py | 2 +- var/spack/repos/builtin/packages/openspeedshop/package.py | 4 ++-- var/spack/repos/builtin/packages/r/package.py | 2 ++ var/spack/repos/builtin/packages/scotch/package.py | 2 +- var/spack/repos/builtin/packages/veclibfort/package.py | 2 +- var/spack/repos/builtin/packages/zlib/package.py | 2 +- 17 files changed, 21 insertions(+), 19 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/arpack-ng/package.py b/var/spack/repos/builtin/packages/arpack-ng/package.py index a784baf1cc..ed5e1978ed 100644 --- a/var/spack/repos/builtin/packages/arpack-ng/package.py +++ b/var/spack/repos/builtin/packages/arpack-ng/package.py @@ -91,7 +91,7 @@ class ArpackNg(Package): libraries = ['libparpack'] + libraries return find_libraries( - libraries, root=self.prefix, shared=True, recurse=True + libraries, root=self.prefix, shared=True, recursive=True ) @when('@3.4.0:') diff --git a/var/spack/repos/builtin/packages/atlas/package.py b/var/spack/repos/builtin/packages/atlas/package.py index 56144386cd..e3257e6dc2 100644 --- a/var/spack/repos/builtin/packages/atlas/package.py +++ b/var/spack/repos/builtin/packages/atlas/package.py @@ -142,7 +142,7 @@ class Atlas(Package): to_find = ['liblapack'] + interfaces + ['libatlas'] shared = False return find_libraries( - to_find, root=self.prefix, shared=shared, recurse=True + to_find, root=self.prefix, shared=shared, recursive=True ) def install_test(self): diff --git a/var/spack/repos/builtin/packages/elemental/package.py b/var/spack/repos/builtin/packages/elemental/package.py index ad0bb404c2..da5f61e99a 100644 --- a/var/spack/repos/builtin/packages/elemental/package.py +++ b/var/spack/repos/builtin/packages/elemental/package.py @@ -113,7 +113,7 @@ class Elemental(CMakePackage): def libs(self): shared = True if '+shared' in self.spec else False return find_libraries( - 'libEl', root=self.prefix, shared=shared, recurse=True + 'libEl', root=self.prefix, shared=shared, recursive=True ) @when('@0.87.6:') diff --git a/var/spack/repos/builtin/packages/elpa/package.py b/var/spack/repos/builtin/packages/elpa/package.py index d0ef891ad1..d678fb10e5 100644 --- a/var/spack/repos/builtin/packages/elpa/package.py +++ b/var/spack/repos/builtin/packages/elpa/package.py @@ -57,7 +57,7 @@ class Elpa(AutotoolsPackage): def libs(self): libname = 'libelpa_openmp' if '+openmp' in self.spec else 'libelpa' return find_libraries( - libname, root=self.prefix, shared=True, recurse=True + libname, root=self.prefix, shared=True, recursive=True ) build_directory = 'spack-build' diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index 0ead42d41b..abfde6541b 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -163,7 +163,7 @@ class Hdf5(AutotoolsPackage): libraries = query2libraries[key] return find_libraries( - libraries, root=self.prefix, shared=shared, recurse=True + libraries, root=self.prefix, shared=shared, recursive=True ) @run_before('configure') diff --git a/var/spack/repos/builtin/packages/intel-mpi/package.py b/var/spack/repos/builtin/packages/intel-mpi/package.py index 0b1e4f622d..82bfe76125 100644 --- a/var/spack/repos/builtin/packages/intel-mpi/package.py +++ b/var/spack/repos/builtin/packages/intel-mpi/package.py @@ -70,7 +70,7 @@ class IntelMpi(IntelPackage): libraries = ['libmpicxx'] + libraries return find_libraries( - libraries, root=mpi_root, shared=True, recurse=True + libraries, root=mpi_root, shared=True, recursive=True ) @property @@ -78,7 +78,7 @@ class IntelMpi(IntelPackage): # recurse from self.prefix will find too many things for all the # supported sub-architectures like 'mic' mpi_root = self.prefix.compilers_and_libraries.linux.mpi.include64 - return find_headers('mpi', root=mpi_root, recurse=False) + return find_headers('mpi', root=mpi_root, recursive=False) def setup_dependent_environment(self, spack_env, run_env, dependent_spec): spack_env.set('I_MPI_CC', spack_cc) diff --git a/var/spack/repos/builtin/packages/libxc/package.py b/var/spack/repos/builtin/packages/libxc/package.py index d92ba97e73..0149e42b6c 100644 --- a/var/spack/repos/builtin/packages/libxc/package.py +++ b/var/spack/repos/builtin/packages/libxc/package.py @@ -60,7 +60,7 @@ class Libxc(Package): libraries = ['libxcf90'] + libraries return find_libraries( - libraries, root=self.prefix, shared=shared, recurse=True + libraries, root=self.prefix, shared=shared, recursive=True ) def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/ncurses/package.py b/var/spack/repos/builtin/packages/ncurses/package.py index d237dc3306..d1cb7de8bb 100644 --- a/var/spack/repos/builtin/packages/ncurses/package.py +++ b/var/spack/repos/builtin/packages/ncurses/package.py @@ -113,4 +113,4 @@ class Ncurses(AutotoolsPackage): @property def libs(self): return find_libraries( - ['libncurses', 'libncursesw'], root=self.prefix, recurse=True) + ['libncurses', 'libncursesw'], root=self.prefix, recursive=True) diff --git a/var/spack/repos/builtin/packages/netcdf-fortran/package.py b/var/spack/repos/builtin/packages/netcdf-fortran/package.py index f62db6eca0..3646689538 100644 --- a/var/spack/repos/builtin/packages/netcdf-fortran/package.py +++ b/var/spack/repos/builtin/packages/netcdf-fortran/package.py @@ -46,5 +46,5 @@ class NetcdfFortran(AutotoolsPackage): shared = 'shared' in query_parameters return find_libraries( - libraries, root=self.prefix, shared=shared, recurse=True + libraries, root=self.prefix, shared=shared, recursive=True ) diff --git a/var/spack/repos/builtin/packages/netlib-lapack/package.py b/var/spack/repos/builtin/packages/netlib-lapack/package.py index e782799988..27d70e9c7a 100644 --- a/var/spack/repos/builtin/packages/netlib-lapack/package.py +++ b/var/spack/repos/builtin/packages/netlib-lapack/package.py @@ -97,7 +97,7 @@ class NetlibLapack(Package): key = tuple(sorted(query_parameters)) libraries = query2libraries[key] return find_libraries( - libraries, root=self.prefix, shared=shared, recurse=True + libraries, root=self.prefix, shared=shared, recursive=True ) @property @@ -120,7 +120,7 @@ class NetlibLapack(Package): key = tuple(sorted(query_parameters)) libraries = query2libraries[key] return find_libraries( - libraries, root=self.prefix, shared=shared, recurse=True + libraries, root=self.prefix, shared=shared, recursive=True ) def install_one(self, spec, prefix, shared): diff --git a/var/spack/repos/builtin/packages/netlib-scalapack/package.py b/var/spack/repos/builtin/packages/netlib-scalapack/package.py index 614cbeea4b..e58450ca7b 100644 --- a/var/spack/repos/builtin/packages/netlib-scalapack/package.py +++ b/var/spack/repos/builtin/packages/netlib-scalapack/package.py @@ -64,7 +64,7 @@ class NetlibScalapack(CMakePackage): # for 'libnetlib-scalapack.' shared = True if '+shared' in self.spec else False return find_libraries( - 'libscalapack', root=self.prefix, shared=shared, recurse=True + 'libscalapack', root=self.prefix, shared=shared, recursive=True ) def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 3919863558..5d845e84af 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -229,7 +229,7 @@ class Openmpi(AutotoolsPackage): libraries = ['libmpi_cxx'] + libraries return find_libraries( - libraries, root=self.prefix, shared=True, recurse=True + libraries, root=self.prefix, shared=True, recursive=True ) def setup_dependent_environment(self, spack_env, run_env, dependent_spec): diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py index 36e9fb06e4..60d5a1c1b7 100644 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop/package.py @@ -296,7 +296,7 @@ class Openspeedshop(CMakePackage): # performance information dyninst_libdir = find_libraries('libdyninstAPI_RT', root=self.spec['dyninst'].prefix, - shared=True, recurse=True) + shared=True, recursive=True) # Set Dyninst RT library path to support OSS loop resolution code run_env.set('DYNINSTAPI_RT_LIB', dyninst_libdir) @@ -304,7 +304,7 @@ class Openspeedshop(CMakePackage): # Find openspeedshop library path oss_libdir = find_libraries('libopenss-framework', root=self.spec['openspeedshop'].prefix, - shared=True, recurse=True) + shared=True, recursive=True) run_env.prepend_path('LD_LIBRARY_PATH', os.path.dirname(oss_libdir.joined())) diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py index 4b5dd05c33..8f08e52f6a 100644 --- a/var/spack/repos/builtin/packages/r/package.py +++ b/var/spack/repos/builtin/packages/r/package.py @@ -22,7 +22,9 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## +import os import shutil + from spack import * diff --git a/var/spack/repos/builtin/packages/scotch/package.py b/var/spack/repos/builtin/packages/scotch/package.py index 48ae1490c8..7cebeed49d 100644 --- a/var/spack/repos/builtin/packages/scotch/package.py +++ b/var/spack/repos/builtin/packages/scotch/package.py @@ -91,7 +91,7 @@ class Scotch(Package): libraries = ['libesmumps'] + libraries scotchlibs = find_libraries( - libraries, root=self.prefix, recurse=True, shared=shared + libraries, root=self.prefix, recursive=True, shared=shared ) if '+compression' in self.spec: zlibs = self.spec['zlib'].libs diff --git a/var/spack/repos/builtin/packages/veclibfort/package.py b/var/spack/repos/builtin/packages/veclibfort/package.py index e57384fd2c..16b1a1d7fd 100644 --- a/var/spack/repos/builtin/packages/veclibfort/package.py +++ b/var/spack/repos/builtin/packages/veclibfort/package.py @@ -48,7 +48,7 @@ class Veclibfort(Package): def libs(self): shared = True if '+shared' in self.spec else False return find_libraries( - 'libvecLibFort', root=self.prefix, shared=shared, recurse=True + 'libvecLibFort', root=self.prefix, shared=shared, recursive=True ) def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/zlib/package.py b/var/spack/repos/builtin/packages/zlib/package.py index 4898bf2b77..e005e21f36 100644 --- a/var/spack/repos/builtin/packages/zlib/package.py +++ b/var/spack/repos/builtin/packages/zlib/package.py @@ -54,7 +54,7 @@ class Zlib(Package): def libs(self): shared = '+shared' in self.spec return find_libraries( - ['libz'], root=self.prefix, recurse=True, shared=shared + ['libz'], root=self.prefix, recursive=True, shared=shared ) def setup_environment(self, spack_env, run_env): -- cgit v1.2.3-70-g09d2 From d393e3d7027a95f4dff31e5b2cfba32cacf0815c Mon Sep 17 00:00:00 2001 From: Keita Teranishi Date: Tue, 13 Feb 2018 02:20:59 -0800 Subject: Added Nox for Trilinos installation by xSDK (#7219) * Added Nox for Trilinos installation by xSDK * Enable NOX only for Develop copy --- var/spack/repos/builtin/packages/xsdk/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py index 0d47ddb7ba..45bdd3c094 100644 --- a/var/spack/repos/builtin/packages/xsdk/package.py +++ b/var/spack/repos/builtin/packages/xsdk/package.py @@ -61,7 +61,7 @@ class Xsdk(Package): when='@0.3.0') depends_on('trilinos@xsdk-0.2.0+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse~tpetra~ifpack2~zoltan2~amesos2~exodus', when='@xsdk-0.2.0') - depends_on('trilinos@develop+xsdkflags+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse~tpetra~ifpack2~zoltan2~amesos2~exodus', + depends_on('trilinos@12.12.1+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse~tpetra+nox~ifpack2~zoltan2~amesos2~exodus', when='@develop') depends_on('petsc@3.8.2+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps~boost+double~int64', -- cgit v1.2.3-70-g09d2 From 9c7e82a3489241dd7e54b59fa9ace8d28bc1dfd4 Mon Sep 17 00:00:00 2001 From: Veselin Dobrev Date: Tue, 13 Feb 2018 02:22:25 -0800 Subject: Fix for building METIS 4.0.3 with '~shared'. (#7202) --- var/spack/repos/builtin/packages/metis/package.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/metis/package.py b/var/spack/repos/builtin/packages/metis/package.py index 30f457da6b..9c4016625d 100644 --- a/var/spack/repos/builtin/packages/metis/package.py +++ b/var/spack/repos/builtin/packages/metis/package.py @@ -100,7 +100,9 @@ class Metis(Package): @when('@:4') def install(self, spec, prefix): # Process library spec and options - options = ['COPTIONS={0}'.format(self.compiler.pic_flag)] + options = [] + if '+shared' in spec: + options.append('COPTIONS={0}'.format(self.compiler.pic_flag)) if spec.variants['build_type'].value == 'Debug': options.append('OPTFLAGS=-g -O0') make(*options) @@ -144,8 +146,8 @@ class Metis(Package): # Set up and run tests on installation ccompile('-I%s' % prefix.include, '-L%s' % prefix.lib, - self.compiler.cc_rpath_arg + - '%s' % (prefix.lib if '+shared' in spec else ''), + (self.compiler.cc_rpath_arg + prefix.lib + if '+shared' in spec else ''), join_path('Programs', 'io.o'), join_path('Test', 'mtest.c'), '-o', '%s/mtest' % prefix.bin, '-lmetis', '-lm') -- cgit v1.2.3-70-g09d2 From f8a8e2ba1027b525b493e2e1de874e8acc6ec1d0 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Tue, 13 Feb 2018 07:07:18 -0600 Subject: r-rcppblaze: new package (#7209) --- .../repos/builtin/packages/r-matrix/package.py | 4 +- .../repos/builtin/packages/r-rcppblaze/package.py | 65 ++++++++++++++++++++++ 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 var/spack/repos/builtin/packages/r-rcppblaze/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-matrix/package.py b/var/spack/repos/builtin/packages/r-matrix/package.py index c2911c4211..b02dd8bec8 100644 --- a/var/spack/repos/builtin/packages/r-matrix/package.py +++ b/var/spack/repos/builtin/packages/r-matrix/package.py @@ -32,7 +32,9 @@ class RMatrix(RPackage): homepage = "http://matrix.r-forge.r-project.org/" url = "https://cran.rstudio.com/src/contrib/Matrix_1.2-11.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/Matrix" - version('1.2-11', 'a8c1a893f36d7ea918ddbf8cb8d10b43') + + version('1.2-12', '0ade6e374716f08650cc8b8da99a313c') + version('1.2-11', 'b7d2a639aa52228dfde7c3c3ee68b38e') version('1.2-8', '4a6406666bf97d3ec6b698eea5d9c0f5') version('1.2-6', 'f545307fb1284861e9266c4e9712c55e') diff --git a/var/spack/repos/builtin/packages/r-rcppblaze/package.py b/var/spack/repos/builtin/packages/r-rcppblaze/package.py new file mode 100644 index 0000000000..a270c7586a --- /dev/null +++ b/var/spack/repos/builtin/packages/r-rcppblaze/package.py @@ -0,0 +1,65 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RRcppblaze(RPackage): + """'Blaze' is an open-source, high-performance C++ math library for dense + and sparse arithmetic. + + With its state-of-the-art Smart Expression Template implementation + 'Blaze' combines the elegance and ease of use of a domain-specific + language with 'HPC'-grade performance, making it one of the most + intuitive and fastest C++ math libraries available. The 'Blaze' + library offers: - high performance through the integration of + 'BLAS' libraries and manually tuned 'HPC' math kernels - vectorization + by 'SSE', 'SSE2', 'SSE3', 'SSSE3', 'SSE4', 'AVX', 'AVX2', 'AVX-512', + 'FMA', and 'SVML' - parallel execution by 'OpenMP', C++11 threads and + 'Boost' threads ('Boost' threads are disabled in 'RcppBlaze') - the + intuitive and easy to use API of a domain specific language - unified + arithmetic with dense and sparse vectors and matrices - thoroughly + tested matrix and vector arithmetic - completely portable, high quality + C++ source code. The 'RcppBlaze' package includes the header files from + the 'Blaze' library with disabling some functionalities related to link + to the thread and system libraries which make 'RcppBlaze' be a + header-only library. Therefore, users do not need to install 'Blaze' + and the dependency 'Boost'. 'Blaze' is licensed under the New (Revised) + BSD license, while 'RcppBlaze' (the 'Rcpp' bindings/bridge to 'Blaze') + is licensed under the GNU GPL version 2 or later, as is the rest of + 'Rcpp'. Note that since 'Blaze' has committed to 'C++14' commit to + 'C++14' which does not used by most R users from version 3.0, we will + use the version 2.6 of 'Blaze' which is 'C++98' compatible to support + the most compilers and system.""" + + homepage = "https://github.com/Chingchuan-chen/RcppBlaze" + url = "https://cran.rstudio.com/src/contrib/RcppBlaze_0.2.2.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/RcppBlaze" + + version('0.2.2', '22ecae73cf1bebce06ed6387d49f2c77') + + depends_on('r-rcpp@0.11.0:', type=('build', 'run')) + depends_on('r-matrix@1.1-0:', type=('build', 'run')) + depends_on('r-bh@1.54.0-2:', type=('build', 'run')) + depends_on('r@3.0.2:') -- cgit v1.2.3-70-g09d2 From 1f731cd787cafdc35411c6c3a4297f56e8bce53e Mon Sep 17 00:00:00 2001 From: peetsv <32349688+peetsv@users.noreply.github.com> Date: Tue, 13 Feb 2018 12:11:52 -0800 Subject: R package: add version v3.2.5 (#7139) --- var/spack/repos/builtin/packages/r/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py index 8f08e52f6a..393045d3fd 100644 --- a/var/spack/repos/builtin/packages/r/package.py +++ b/var/spack/repos/builtin/packages/r/package.py @@ -48,6 +48,7 @@ class R(AutotoolsPackage): version('3.3.2', '2437014ef40641cdc9673e89c040b7a8') version('3.3.1', 'f50a659738b73036e2f5635adbd229c5') version('3.3.0', '5a7506c8813432d1621c9725e86baf7a') + version('3.2.5', '7b23ee70cfb383be3bd4360e3c71d8c3') version('3.2.3', '1ba3dac113efab69e706902810cc2970') version('3.2.2', '57cef5c2e210a5454da1979562a10e5b') version('3.2.1', 'c2aac8b40f84e08e7f8c9068de9239a3') @@ -64,7 +65,7 @@ class R(AutotoolsPackage): depends_on('blas', when='+external-lapack') depends_on('lapack', when='+external-lapack') - # Concrete dependencies + # Concrete dependencies. depends_on('readline') depends_on('ncurses') depends_on('icu4c') -- cgit v1.2.3-70-g09d2 From 9ea9a4063a441e7a07043aabb24fadcf036359a9 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Wed, 14 Feb 2018 03:26:15 +0100 Subject: fftw package: improved libs implementation (#7212) Add query parameters to retrieve libraries based on precision (e.g. double or quad) and mpi/openmp support. --- var/spack/repos/builtin/packages/fftw/package.py | 33 ++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fftw/package.py b/var/spack/repos/builtin/packages/fftw/package.py index b047574f82..87dc0cbba3 100644 --- a/var/spack/repos/builtin/packages/fftw/package.py +++ b/var/spack/repos/builtin/packages/fftw/package.py @@ -24,6 +24,8 @@ ############################################################################## from spack import * +import llnl.util.lang + class Fftw(AutotoolsPackage): """FFTW is a C subroutine library for computing the discrete Fourier @@ -88,8 +90,35 @@ class Fftw(AutotoolsPackage): @property def libs(self): - result = find_libraries(['libfftw3'], root=self.prefix, recurse=True) - return result + + # Reduce repetitions of entries + query_parameters = list(llnl.util.lang.dedupe( + self.spec.last_query.extra_parameters + )) + + # List of all the suffixes associated with float precisions + precisions = [ + ('float', 'f'), + ('double', ''), + ('long_double', 'l'), + ('quad', 'q') + ] + + # Retrieve the correct suffixes, or use double as a default + suffixes = [v for k, v in precisions if k in query_parameters] or [''] + + # Construct the list of libraries that needs to be found + libraries = [] + for sfx in suffixes: + if 'mpi' in query_parameters and '+mpi' in self.spec: + libraries.append('libfftw3' + sfx + '_mpi') + + if 'openmp' in query_parameters and '+openmp' in self.spec: + libraries.append('libfftw3' + sfx + '_omp') + + libraries.append('libfftw3' + sfx) + + return find_libraries(libraries, root=self.prefix, recurse=True) def autoreconf(self, spec, prefix): if '+pfft_patches' in spec: -- cgit v1.2.3-70-g09d2 From 8c921e946c85e4783ef57757e5b2c6ceb3bca9f9 Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Wed, 14 Feb 2018 01:35:16 -0600 Subject: r-jaspar2018: Create new package. (#7221) --- .../repos/builtin/packages/r-jaspar2018/package.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-jaspar2018/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-jaspar2018/package.py b/var/spack/repos/builtin/packages/r-jaspar2018/package.py new file mode 100644 index 0000000000..832c42cb4a --- /dev/null +++ b/var/spack/repos/builtin/packages/r-jaspar2018/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RJaspar2018(RPackage): + """Data package for JASPAR 2018. To search this databases, + please use the package TFBSTools (>= 1.15.6).""" + + homepage = "http://jaspar.genereg.net/" + url = "https://git.bioconductor.org/packages/JASPAR2018" + + version('1.0.0', git='https://git.bioconductor.org/packages/JASPAR2018', commit='4c84092b3737bb1c57ab56f4321f2f5e4b0efeaa') + + depends_on('r@3.4.0:') -- cgit v1.2.3-70-g09d2 From 501520c8185e6022aac9d86a5ad9fdfce009c3aa Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Wed, 14 Feb 2018 01:36:34 -0600 Subject: r-powerlaw: new package (#7222) --- var/spack/repos/builtin/packages/r-mgcv/package.py | 6 ++++ .../repos/builtin/packages/r-powerlaw/package.py | 40 ++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-powerlaw/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-mgcv/package.py b/var/spack/repos/builtin/packages/r-mgcv/package.py index 0bf7563df1..2268fdb682 100644 --- a/var/spack/repos/builtin/packages/r-mgcv/package.py +++ b/var/spack/repos/builtin/packages/r-mgcv/package.py @@ -35,6 +35,12 @@ class RMgcv(RPackage): url = "https://cran.r-project.org/src/contrib/mgcv_1.8-16.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/mgcv" + version('1.8-22', 'b42079b33b46de784f293a74c824b877') + version('1.8-21', 'aae8262a07c8698ca8d6213065c4983f') + version('1.8-20', '58eb94404aad7ff8a0cf11a2f098f8bf') + version('1.8-19', 'f9a4e29464f4d10b7b2cb9d0bec3fa9e') + version('1.8-18', 'c134fc2db253530233b95f2e36b56a2f') + version('1.8-17', '398582d0f999ac34749f4f5f1d103f75') version('1.8-16', '4c1d85e0f80b017bccb4b63395842911') version('1.8-13', '30607be3aaf44b13bd8c81fc32e8c984') diff --git a/var/spack/repos/builtin/packages/r-powerlaw/package.py b/var/spack/repos/builtin/packages/r-powerlaw/package.py new file mode 100644 index 0000000000..0b05cdd128 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-powerlaw/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RPowerlaw(RPackage): + """An implementation of maximum likelihood estimators for a variety of + heavy tailed distributions, including both the discrete and continuous + power law distributions. Additionally, a goodness-of-fit based approach + is used to estimate the lower cut-off for the scaling region.""" + + homepage = "https://github.com/csgillespie/poweRlaw" + url = "https://cran.rstudio.com/src/contrib/poweRlaw_0.70.1.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/poweRlaw" + + version('0.70.1', '4117cb95c37f72441f320ea12f553065') + + depends_on('r-vgam', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 5bb18c79bfdc08b805d597608658ad4dc5def765 Mon Sep 17 00:00:00 2001 From: peetsv <32349688+peetsv@users.noreply.github.com> Date: Tue, 13 Feb 2018 23:38:06 -0800 Subject: vardictjava: Adding version 1.4.4 (#7223) --- var/spack/repos/builtin/packages/vardictjava/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/vardictjava/package.py b/var/spack/repos/builtin/packages/vardictjava/package.py index 66745a6a58..8e8a29c8a5 100644 --- a/var/spack/repos/builtin/packages/vardictjava/package.py +++ b/var/spack/repos/builtin/packages/vardictjava/package.py @@ -34,6 +34,7 @@ class Vardictjava(Package): url = "https://github.com/AstraZeneca-NGS/VarDictJava/releases/download/v1.5.1/VarDict-1.5.1.tar" version('1.5.1', '8c0387bcc1f7dc696b04e926c48b27e6') + version('1.4.4', '6b2d7e1e5502b875760fc9938a0fe5e0') depends_on('java@8:', type='run') -- cgit v1.2.3-70-g09d2 From 8766daf9de5b9879fca32aedac849d446fe1000e Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Tue, 13 Feb 2018 23:40:47 -0800 Subject: ipopt: fix lmod global name 'prefix' undefined bug (#7224) Running `spack module refresh -m lmod --delete-tree -y` throws the following warning: ```console ==> Warning: Could not write module file [/Users/oxberry1/spack/share/spack/lmod/darwin-sierra-x86_64/openblas/0.2.20-ibhtl5q/clang/5.0.1/ipopt/3.12.9.lua] ==> Warning: --> global name 'prefix' is not defined <-- ``` This warning arises because the variable expansions in `spack.modules.BaseFileWriter` occur at module/package scope. Even though `prefix` is an argument to `install` methods in e.g., `MakefilePackage`, so using this argument within package methods is legal, doing so defeats the introspection logic in `spack.modules.BaseFileWriter`. Replacing `prefix` with `self.prefix` resolves the problem, because the introspection logic in `spack.modules.BaseFileWriter` can use introspection to query IPOPT's prefix. --- var/spack/repos/builtin/packages/ipopt/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ipopt/package.py b/var/spack/repos/builtin/packages/ipopt/package.py index 43879c2cad..da8f798908 100644 --- a/var/spack/repos/builtin/packages/ipopt/package.py +++ b/var/spack/repos/builtin/packages/ipopt/package.py @@ -78,7 +78,7 @@ class Ipopt(AutotoolsPackage): lapack_lib = spec['lapack'].libs.ld_flags args = [ - "--prefix=%s" % prefix, + "--prefix=%s" % self.prefix, "--with-mumps-incdir=%s" % mumps_dir.include, "--with-mumps-lib=%s" % mumps_libcmd, "--enable-shared", -- cgit v1.2.3-70-g09d2 From c7274eb1f51f2f95695a1efc5b3cd9ac9afafdf6 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Tue, 13 Feb 2018 23:41:50 -0800 Subject: gdbm: fix lmod global name 'spack_cc' undefined (#7225) Prior to this commit, running `spack module refresh` with `gdbm` installed throws the warning: ```console ==> Warning: Could not write module file [/Users/oxberry1/spack/share/spack/lmod/darwin-sierra-x86_64/Core/gdbm/1.14.1.lua] ==> Warning: --> global name 'spack_cc' is not defined <-- ``` This warning is repeated for every `gdbm` installation in Spack. The cause of the issue seems to be the same as in spack/spack (#6089): using `spack_cc`, `spack_cxx`, or similar inside `configure_args` causes the warnings to throw when module files are generated. Moving the use of `spack_cc` into `setup_environment` seems to fix the problem, even though it's a bit of a kludge. --- var/spack/repos/builtin/packages/gdbm/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gdbm/package.py b/var/spack/repos/builtin/packages/gdbm/package.py index a1529855c3..9a5f1bd12e 100644 --- a/var/spack/repos/builtin/packages/gdbm/package.py +++ b/var/spack/repos/builtin/packages/gdbm/package.py @@ -45,10 +45,12 @@ class Gdbm(AutotoolsPackage): depends_on("readline") + def setup_environment(self, spack_env, run_env): + spack_env.set('CC', spack_cc) + def configure_args(self): config_args = [ '--enable-libgdbm-compat', - 'CC=%s' % spack_cc ] return config_args -- cgit v1.2.3-70-g09d2 From e981e6bd19c561ec85d63d526a485f80dd54917f Mon Sep 17 00:00:00 2001 From: peetsv <32349688+peetsv@users.noreply.github.com> Date: Tue, 13 Feb 2018 23:46:10 -0800 Subject: py-pybedtools: adding older version 0.6.9 (#7107) --- var/spack/repos/builtin/packages/py-pybedtools/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pybedtools/package.py b/var/spack/repos/builtin/packages/py-pybedtools/package.py index 111ba39ee0..2f75ddceda 100644 --- a/var/spack/repos/builtin/packages/py-pybedtools/package.py +++ b/var/spack/repos/builtin/packages/py-pybedtools/package.py @@ -33,10 +33,12 @@ class PyPybedtools(PythonPackage): url = "https://pypi.io/packages/source/p/pybedtools/pybedtools-0.7.10.tar.gz" version('0.7.10', 'f003c67e22c48b77f070538368ece70c') + version('0.6.9', 'a24e4bcd0c89beb9535295db964f6a4a') depends_on('py-setuptools', type='build') depends_on('bedtools2', type=('build', 'run')) depends_on('py-numpy', type=('build', 'run')) depends_on('py-pandas', type=('build', 'run')) - depends_on('py-pysam@0.8.1:', type=('build', 'run')) + depends_on('py-pysam@0.8.1:', type=('build', 'run'), when='@0.7.0:') + depends_on('py-pysam@0.7.7', type=('build', 'run'), when='@0.6.9') depends_on('py-six', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From cb702ebcb1ed6b33e29c4c3eb78fa8d4664db19e Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Wed, 14 Feb 2018 01:49:09 -0600 Subject: r-tfmpvalue: new package (#7230) --- .../repos/builtin/packages/r-tfmpvalue/package.py | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-tfmpvalue/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-tfmpvalue/package.py b/var/spack/repos/builtin/packages/r-tfmpvalue/package.py new file mode 100644 index 0000000000..87627579a1 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-tfmpvalue/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RTfmpvalue(RPackage): + """In putative Transcription Factor Binding Sites (TFBSs) identification + from sequence/alignments, we are interested in the significance of + certain match score. TFMPvalue provides the accurate calculation of + P-value with score threshold for Position Weight Matrices, or the score + with given P-value. This package is an interface to code originally + made available by Helene Touzet and Jean-Stephane Varre, 2007, + Algorithms Mol Biol:2, 15.""" + + homepage = "https://github.com/ge11232002/TFMPvalue" + url = "https://cran.rstudio.com/src/contrib/TFMPvalue_0.0.6.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/TFMPvalue" + + version('0.0.6', '69fdf4f9b9a0f408a5cee9ce34bea261') + + depends_on('r-rcpp@0.11.1:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From e5bc6e7056c6be30945dff8c8b624cc3f7716d57 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Wed, 14 Feb 2018 00:21:13 -0800 Subject: hypre: add libs method (#7234) --- var/spack/repos/builtin/packages/hypre/package.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hypre/package.py b/var/spack/repos/builtin/packages/hypre/package.py index d6b9645a4c..d17da61a1b 100644 --- a/var/spack/repos/builtin/packages/hypre/package.py +++ b/var/spack/repos/builtin/packages/hypre/package.py @@ -109,3 +109,9 @@ class Hypre(Package): sstruct('-in', 'test/sstruct.in.default', '-solver', '40', '-rhsone') make("install") + + @property + def libs(self): + is_shared = self.spec.satisfies('+shared') + return find_libraries('libHYPRE', root=self.prefix, + shared=is_shared, recursive=True) -- cgit v1.2.3-70-g09d2 From 24beadbdd2e5e222f7a9c32c02fdc46059e8ac77 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Wed, 14 Feb 2018 00:42:05 -0800 Subject: stow: new package (#7235) --- var/spack/repos/builtin/packages/stow/package.py | 46 ++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 var/spack/repos/builtin/packages/stow/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/stow/package.py b/var/spack/repos/builtin/packages/stow/package.py new file mode 100644 index 0000000000..07480bf066 --- /dev/null +++ b/var/spack/repos/builtin/packages/stow/package.py @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Stow(AutotoolsPackage): + """GNU Stow: a symlink farm manager + + GNU Stow is a symlink farm manager which takes distinct + packages of software and/or data located in separate + directories on the filesystem, and makes them appear to be + installed in the same place.""" + + homepage = "https://www.gnu.org/software/stow/" + url = "https://mirrors.kernel.org/gnu/stow/stow-2.2.2.tar.bz2" + + version('2.2.2', 'af1e1de9d973c835bee80c745b5ee849') + version('2.2.0', '5bb56592eff9aaf9dfb6c975b3004240') + version('2.1.3', '533651c25b29c3630f01d0be33849a7c') + version('2.1.2', '0b8154a2165e4004ddc9579e3499af98') + version('2.1.1', '882d2490d05723b4b78029c2973775d3') + version('2.1.0', 'aa3a2389b6cbf3bd555e15c80a0be6ab') + + depends_on('perl@5.6.1:') -- cgit v1.2.3-70-g09d2 From f36e83fa5fd64c1425b6b5b074571193f024d77e Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Wed, 14 Feb 2018 02:42:40 -0600 Subject: r-seqlogo: new package (#7229) --- .../repos/builtin/packages/r-seqlogo/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-seqlogo/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-seqlogo/package.py b/var/spack/repos/builtin/packages/r-seqlogo/package.py new file mode 100644 index 0000000000..c6c77361ee --- /dev/null +++ b/var/spack/repos/builtin/packages/r-seqlogo/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RSeqlogo(RPackage): + """seqLogo takes the position weight matrix of a DNA sequence motif and + plots the corresponding sequence logo as introduced by Schneider and + Stephens (1990).""" + + homepage = "https://bioconductor.org/packages/seqLogo/" + url = "https://git.bioconductor.org/packages/seqLogo" + + version('1.44.0', git='https://git.bioconductor.org/packages/seqLogo', commit='4cac14ff29f413d6de1a9944eb5d21bfe5045fac') + + depends_on('r@3.4.3:3.4.9', when='@1.44.0') -- cgit v1.2.3-70-g09d2 From a7b8d26fa784a8731ef382ca769384da8c2b5187 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Wed, 14 Feb 2018 01:40:56 -0800 Subject: xbraid: add libs method (#7233) XBraid installs `libbraid.a`, but the default `libs` method implementation will search for `libxbraid`, which does not exist. This commit fixes the behavior of the `libs` method for the `xbraid` package by overriding package's `libs` method. --- var/spack/repos/builtin/packages/xbraid/package.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/xbraid/package.py b/var/spack/repos/builtin/packages/xbraid/package.py index 05032ce128..d1d5fa2fed 100644 --- a/var/spack/repos/builtin/packages/xbraid/package.py +++ b/var/spack/repos/builtin/packages/xbraid/package.py @@ -66,3 +66,8 @@ class Xbraid(MakefilePackage): install_tree('test', prefix.share.test) install_tree('user_utils', prefix.share.user_utils) install_tree('docs', prefix.share.docs) + + @property + def libs(self): + return find_libraries('libbraid', root=self.prefix, + shared=False, recursive=True) -- cgit v1.2.3-70-g09d2 From 277ab2d355ce80c6cff14615df9e9a90b7859bf9 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Wed, 14 Feb 2018 13:52:44 -0800 Subject: libtool: symlink correctly on darwin (#7179) To accommodate build systems on Darwin which look for glibtool/ize, #7060 attempted to provide glibtool/ize symlinks for libtool/ize but accidentally created the same symlink twice. #7073 reverted this and replaced libtool/ize with glibtool/ize on Darwin. This led to #7163 since AutotoolsPackages depend on the presence of the 'libtool' binary, so this returns to the approach of #7160 but makes the correct symlinks. --- var/spack/repos/builtin/packages/libtool/package.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libtool/package.py b/var/spack/repos/builtin/packages/libtool/package.py index b5d5c9b2b1..e9daa69ed8 100644 --- a/var/spack/repos/builtin/packages/libtool/package.py +++ b/var/spack/repos/builtin/packages/libtool/package.py @@ -56,13 +56,15 @@ class Libtool(AutotoolsPackage): for name in executables: setattr(module, name, self._make_executable(name)) - @when('platform=darwin') - def configure_args(self): + @run_after('install') + def post_install(self): # Some platforms name GNU libtool and GNU libtoolize # 'glibtool' and 'glibtoolize', respectively, to differentiate # them from BSD libtool and BSD libtoolize. On these BSD # platforms, build systems sometimes expect to use the assumed # GNU commands glibtool and glibtoolize instead of the BSD # variant; this happens frequently, for instance, on Darwin - args = ['--program-prefix=g'] - return args + symlink(join_path(self.prefix.bin, 'libtool'), + join_path(self.prefix.bin, 'glibtool')) + symlink(join_path(self.prefix.bin, 'libtoolize'), + join_path(self.prefix.bin, 'glibtoolize')) -- cgit v1.2.3-70-g09d2 From 001106884befccee29e1ed11aaacad054eb8c483 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 14 Feb 2018 22:54:13 +0100 Subject: ADIOS 2.1.0 (#7240) Adds the first stable API release of ADIOS2, v.2.1.0. Also adds a missing `pybind11` CMake flag for proper Python selection (needed in both the new and previous version). --- var/spack/repos/builtin/packages/adios2/package.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/adios2/package.py b/var/spack/repos/builtin/packages/adios2/package.py index 935313e6d9..07edb5cd42 100644 --- a/var/spack/repos/builtin/packages/adios2/package.py +++ b/var/spack/repos/builtin/packages/adios2/package.py @@ -35,6 +35,7 @@ class Adios2(CMakePackage): version('develop', branch='master', git='https://github.com/ornladios/ADIOS2.git') + version('2.1.0', '431fa5b015349f1838b96b8f5a1cc8f8') version('2.0.0', 'da39655b51745d2c5f3f1e46c5abc4d7') variant('shared', default=True, @@ -117,4 +118,7 @@ class Adios2(CMakePackage): '-DADIOS2_USE_Python={0}'.format( 'ON' if '+python' in spec else 'OFF') ] + if spec.satisfies('+python'): + args.append('-DPYTHON_EXECUTABLE:FILEPATH=%s' + % self.spec['python'].command.path) return args -- cgit v1.2.3-70-g09d2 From 87043679ae60ec54ef9fd61eca865817a46b1b39 Mon Sep 17 00:00:00 2001 From: Howard Pritchard Date: Wed, 14 Feb 2018 17:26:49 -0700 Subject: pmix: add 2.1.0 and more (#7191) Signed-off-by: Howard Pritchard --- var/spack/repos/builtin/packages/pmix/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pmix/package.py b/var/spack/repos/builtin/packages/pmix/package.py index 0763dfbaed..b81753ee7e 100644 --- a/var/spack/repos/builtin/packages/pmix/package.py +++ b/var/spack/repos/builtin/packages/pmix/package.py @@ -48,8 +48,11 @@ class Pmix(AutotoolsPackage): homepage = "https://pmix.github.io/pmix" url = "https://github.com/pmix/pmix/releases/download/v2.0.1/pmix-2.0.1.tar.bz2" + version('2.1.0', 'fc97513b601d78fe7c6bb20c6a21df3c') + version('2.0.2', 'e3ed1deed87c84f9b43da2621c6ad689') version('2.0.1', 'ba3193b485843516e6b4e8641e443b1e') version('2.0.0', '3e047c2ea0ba8ee9925ed92b205fd92e') + version('1.2.4', '242a812e206e7c5948f1f5c9688eb2a7') version('1.2.3', '102b1cc650018b62348b45d572b158e9') version('1.2.2', 'd85c8fd437bd88f984549425ad369e9f') version('1.2.1', 'f090f524681c52001ea2db3b0285596f') -- cgit v1.2.3-70-g09d2 From 1810fac25f195156adf3a1c9d8376fd1adaa94f6 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Thu, 15 Feb 2018 05:59:07 -0800 Subject: mfem: have hypre link line also link lapack+blas (#7165) Spack's hypre package depends on LAPACK and BLAS, so linking to hypre requires linking to the LAPACK and BLAS libraries used to build hypre. --- var/spack/repos/builtin/packages/mfem/package.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mfem/package.py b/var/spack/repos/builtin/packages/mfem/package.py index 3afbd4ca2f..32b561edc8 100644 --- a/var/spack/repos/builtin/packages/mfem/package.py +++ b/var/spack/repos/builtin/packages/mfem/package.py @@ -51,7 +51,7 @@ class Mfem(Package): # If this quick verification procedure fails, additional discussion # will be required to verify the new version. - version('3.3.2', + version('3.3.2', '01a762a5d0a2bc59ce4e2f59009045a4', url='https://goo.gl/Kd7Jk8', extension='.tar.gz', preferred=True) @@ -180,10 +180,13 @@ class Mfem(Package): options += ['MPICXX=%s' % spec['mpi'].mpicxx] if '+hypre' in spec: - options += [ - 'HYPRE_DIR=%s' % spec['hypre'].prefix, - 'HYPRE_OPT=-I%s' % spec['hypre'].prefix.include, - 'HYPRE_LIB=-L%s' % spec['hypre'].prefix.lib + ' -lHYPRE'] + hypre = spec['hypre'] + hypre_flag_list = (hypre.libs + + hypre['lapack'].libs + + hypre['blas'].libs) + options += ['HYPRE_DIR=%s' % hypre.prefix, + 'HYPRE_OPT=-I%s' % hypre.prefix.include, + 'HYPRE_LIB=%s' % hypre_flag_list.ld_flags] if '+lapack' in spec: lapack_lib = (spec['lapack'].libs + spec['blas'].libs).ld_flags # NOQA: ignore=E501 -- cgit v1.2.3-70-g09d2 From 11e064d7d1b5b67f876240e4bc1433a3a6640540 Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 15 Feb 2018 18:23:59 -0600 Subject: new package: pilon (#7033) --- var/spack/repos/builtin/packages/pilon/package.py | 60 +++++++++++++++++++++++ var/spack/repos/builtin/packages/pilon/pilon.sh | 3 ++ 2 files changed, 63 insertions(+) create mode 100644 var/spack/repos/builtin/packages/pilon/package.py create mode 100644 var/spack/repos/builtin/packages/pilon/pilon.sh (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pilon/package.py b/var/spack/repos/builtin/packages/pilon/package.py new file mode 100644 index 0000000000..a075ce9fd8 --- /dev/null +++ b/var/spack/repos/builtin/packages/pilon/package.py @@ -0,0 +1,60 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +from shutil import copyfile +import os.path + + +class Pilon(Package): + """Pilon is an automated genome assembly improvement and variant + detection tool.""" + + homepage = "https://github.com/broadinstitute/pilon" + url = "https://github.com/broadinstitute/pilon/releases/download/v1.22/pilon-1.22.jar" + + version('1.22', '3c45568dc1b878a9a0316410ec62ab04', expand=False) + version('1.13', '9e96b4cf4ea595b1996c7e9ca76498b5', expand=False) + + depends_on('java@1.7:', type='run') + + def install(self, spec, prefix): + mkdirp(prefix.bin) + jar_file = 'pilon-{0}.jar'.format(self.version.dotted) + install(jar_file, prefix.bin) + + # Set up a helper script to call java on the jar file, + # explicitly codes the path for java and the jar file. + script_sh = join_path(os.path.dirname(__file__), "pilon.sh") + script = join_path(prefix.bin, "pilon") + copyfile(script_sh, script) + set_executable(script) + + # Munge the helper script to explicitly point to java and the + # jar file. + java = join_path(self.spec['java'].prefix, 'bin', 'java') + kwargs = {'ignore_absent': False, 'backup': False, 'string': False} + filter_file('^java', java, script, **kwargs) + filter_file('pilon-{0}.jar', join_path(prefix.bin, jar_file), + script, **kwargs) diff --git a/var/spack/repos/builtin/packages/pilon/pilon.sh b/var/spack/repos/builtin/packages/pilon/pilon.sh new file mode 100644 index 0000000000..41a31b3407 --- /dev/null +++ b/var/spack/repos/builtin/packages/pilon/pilon.sh @@ -0,0 +1,3 @@ +#!/bin/sh +# convenience wrapper for the pilon jar file +java -jar pilon.jar "$@" -- cgit v1.2.3-70-g09d2 From 557e6ba2f9478491b87939314b9ef0378c4ed3fe Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 15 Feb 2018 18:27:46 -0600 Subject: new package: igvtools (#6974) --- .../repos/builtin/packages/igvtools/igvtools.sh | 4 ++ .../repos/builtin/packages/igvtools/package.py | 60 ++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 var/spack/repos/builtin/packages/igvtools/igvtools.sh create mode 100644 var/spack/repos/builtin/packages/igvtools/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/igvtools/igvtools.sh b/var/spack/repos/builtin/packages/igvtools/igvtools.sh new file mode 100644 index 0000000000..82023e72b3 --- /dev/null +++ b/var/spack/repos/builtin/packages/igvtools/igvtools.sh @@ -0,0 +1,4 @@ +#!/bin/sh +# convenience wrapper for the igvtools jar file +java $JAVA_ARGS $JAVA_OPTS -jar igvtools.jar "$@" + diff --git a/var/spack/repos/builtin/packages/igvtools/package.py b/var/spack/repos/builtin/packages/igvtools/package.py new file mode 100644 index 0000000000..18274c54be --- /dev/null +++ b/var/spack/repos/builtin/packages/igvtools/package.py @@ -0,0 +1,60 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +from shutil import copyfile +import os + + +class Igvtools(Package): + """IGVTools suite of command-line utilities for preprocessing data + files""" + + homepage = "https://software.broadinstitute.org/software/igv/home" + url = "http://data.broadinstitute.org/igv/projects/downloads/2.3/igvtools_2.3.98.zip" + + version('2.3.98', '17ed12a213cd9cdaeb2f2a5c56d84bc4') + + depends_on('java@8:') + + def install(self, spec, prefix): + mkdirp(prefix.bin) + jar_file = 'igvtools.jar' + install(jar_file, prefix.bin) + install_tree('genomes', prefix.genomes) + + # Set up a helper script to call java on the jar file, + # explicitly codes the path for java and the jar file. + script_sh = join_path(os.path.dirname(__file__), "igvtools.sh") + script = join_path(prefix.bin, "igvtools") + copyfile(script_sh, script) + set_executable(script) + + # Munge the helper script to explicitly point to java and the + # jar file. + java = join_path(self.spec['jdk'].prefix, 'bin', 'java') + kwargs = {'ignore_absent': False, 'backup': False, 'string': False} + filter_file('^java', java, script, **kwargs) + filter_file(jar_file, join_path(prefix.bin, jar_file), + script, **kwargs) -- cgit v1.2.3-70-g09d2 From 8ae50ae8bbdd823c4ac3108c7bc835a543329eb3 Mon Sep 17 00:00:00 2001 From: Pramod S Kumbhar Date: Fri, 16 Feb 2018 02:26:37 +0100 Subject: Use abspath to avoid permission errors(#7241) Fixes #5189 When working with non-normalized paths containing ".." on some file systems, Spack was found to encounter a permission error when writing to the path. This normalizes a path written by the intel-parallel-studio package and also normalizes all paths written by the license install hook (for all packages) to avoid this issue for intel-parallel-studio. --- lib/spack/spack/hooks/licensing.py | 1 + var/spack/repos/builtin/packages/intel-parallel-studio/package.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/lib/spack/spack/hooks/licensing.py b/lib/spack/spack/hooks/licensing.py index 9b5a2728ed..515935e8d4 100644 --- a/lib/spack/spack/hooks/licensing.py +++ b/lib/spack/spack/hooks/licensing.py @@ -157,6 +157,7 @@ def symlink_license(pkg): target = pkg.global_license_file for filename in pkg.license_files: link_name = join_path(pkg.prefix, filename) + link_name = os.path.abspath(link_name) license_dir = os.path.dirname(link_name) if not os.path.exists(license_dir): mkdirp(license_dir) diff --git a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py index ccfac3c9a9..e8ac829757 100644 --- a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py +++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py @@ -433,6 +433,7 @@ class IntelParallelStudio(IntelPackage): for compiler in ['icc', 'icpc', 'ifort']: cfgfilename = os.path.join( self.prefix, self.bin_dir, '{0}.cfg'.format(compiler)) + cfgfilename = os.path.abspath(cfgfilename) with open(cfgfilename, 'w') as f: f.write('-Xlinker -rpath -Xlinker {0}\n'.format(lib_dir)) @@ -443,7 +444,7 @@ class IntelParallelStudio(IntelPackage): bindir = glob.glob(join_path( self.prefix, 'parallel_studio*', 'bin'))[0] - + bindir = os.path.abspath(bindir) if self.version[1] > 2016: filter_file('^SCRIPTPATH=.*', 'SCRIPTPATH={0}'.format(self.prefix), os.path.join(bindir, 'psxevars.sh'), -- cgit v1.2.3-70-g09d2 From 819ceb4f6dc0bd6a3b68df28f54f19ca0ad368ae Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Fri, 16 Feb 2018 13:39:56 +0100 Subject: Package 'cdo': new versions. (#7250) --- var/spack/repos/builtin/packages/cdo/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cdo/package.py b/var/spack/repos/builtin/packages/cdo/package.py index 97463d1205..13aef987a6 100644 --- a/var/spack/repos/builtin/packages/cdo/package.py +++ b/var/spack/repos/builtin/packages/cdo/package.py @@ -36,6 +36,8 @@ class Cdo(AutotoolsPackage): maintainers = ['skosukhin'] + version('1.9.3', '13ae222164413dbd53532b03b072def5') + version('1.9.2', '38e68d34f0b5b44a52c3241be6831423') version('1.9.1', 'e60a89f268ba24cee5c461f2c217829e') version('1.9.0', '2d88561b3b4a880df0422a62e5027e40') version('1.8.2', '6a2e2f99b7c67ee9a512c40a8d4a7121') -- cgit v1.2.3-70-g09d2 From 151f305ddce7ebba78212cfd08c425bf6d9fe009 Mon Sep 17 00:00:00 2001 From: Sinan Date: Fri, 16 Feb 2018 22:27:26 -0800 Subject: add new version (10.2) (#7272) --- var/spack/repos/builtin/packages/postgresql/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/postgresql/package.py b/var/spack/repos/builtin/packages/postgresql/package.py index 1323405b1f..97414f5a97 100644 --- a/var/spack/repos/builtin/packages/postgresql/package.py +++ b/var/spack/repos/builtin/packages/postgresql/package.py @@ -34,6 +34,7 @@ class Postgresql(AutotoolsPackage): homepage = "http://www.postgresql.org/" url = "http://ftp.postgresql.org/pub/source/v9.3.4/postgresql-9.3.4.tar.bz2" + version('10.2', 'e97c3cc72bdf661441f29069299b260a') version('9.3.4', 'd0a41f54c377b2d2fab4a003b0dac762') version('9.5.3', '3f0c388566c688c82b01a0edf1e6b7a0') -- cgit v1.2.3-70-g09d2 From d849740b8b1b4e3e94460360feb8aa2aa4059131 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Sat, 17 Feb 2018 19:37:06 -0700 Subject: Silo: depend on Non-mpi hdf5 (#7275) See #7255 for discussion --- var/spack/repos/builtin/packages/silo/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/silo/package.py b/var/spack/repos/builtin/packages/silo/package.py index 763fc66383..96b2f60b4b 100644 --- a/var/spack/repos/builtin/packages/silo/package.py +++ b/var/spack/repos/builtin/packages/silo/package.py @@ -43,7 +43,7 @@ class Silo(Package): variant('pic', default=True, description='Produce position-independent code (for shared libs)') - depends_on('hdf5') + depends_on('hdf5~mpi') depends_on('qt', when='+silex') patch('remove-mpiposix.patch', when='@4.8:4.10.2') -- cgit v1.2.3-70-g09d2 From dbf849240efa4f68b6bcd92bfe39c70351566c3c Mon Sep 17 00:00:00 2001 From: Veselin Dobrev Date: Sun, 18 Feb 2018 01:19:03 -0800 Subject: netlib-scalapack: add the libs property (#7265) --- var/spack/repos/builtin/packages/netlib-scalapack/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/netlib-scalapack/package.py b/var/spack/repos/builtin/packages/netlib-scalapack/package.py index e58450ca7b..9e9f6fd1c6 100644 --- a/var/spack/repos/builtin/packages/netlib-scalapack/package.py +++ b/var/spack/repos/builtin/packages/netlib-scalapack/package.py @@ -59,7 +59,7 @@ class NetlibScalapack(CMakePackage): depends_on('cmake', when='@2.0.0:', type='build') @property - def scalapack_libs(self): + def libs(self): # Note that the default will be to search # for 'libnetlib-scalapack.' shared = True if '+shared' in self.spec else False -- cgit v1.2.3-70-g09d2 From d9bec1a1f746bad36e3a625c610aff78655cff70 Mon Sep 17 00:00:00 2001 From: Eric Date: Sun, 18 Feb 2018 07:33:59 -0600 Subject: py-quast: Create new package (#7254) --- .../repos/builtin/packages/py-quast/package.py | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-quast/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-quast/package.py b/var/spack/repos/builtin/packages/py-quast/package.py new file mode 100644 index 0000000000..e17c2f9061 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-quast/package.py @@ -0,0 +1,49 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyQuast(PythonPackage): + """Quality Assessment Tool for Genome Assemblies""" + + homepage = "http://cab.spbu.ru/software/quast" + url = "https://github.com/ablab/quast/archive/quast_4.6.1.tar.gz" + + version('4.6.3', '16d77acb2e0f6436b58d9df7b732fb76') + version('4.6.1', '37ccd34e0040c17aa6f990353a92475c') + version('4.6.0', 'c04d62c50ec4d9caa9d7388950b8d144') + + depends_on('boost@1.56.0') + depends_on('perl@5.6.0:') + depends_on('python@2.5:,3.3:') + depends_on('py-setuptools', type='build') + depends_on('py-matplotlib', type=('build', 'run')) + depends_on('java', type=('build', 'run')) + depends_on('perl-time-hires', type=('build', 'run')) + depends_on('gnuplot', type=('build', 'run')) + depends_on('mummer', type=('build', 'run')) + depends_on('bedtools2', type=('build', 'run')) + depends_on('bwa', type=('build', 'run')) + depends_on('glimmer', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 12a670a55643ad7df12e5a57d89b0f0d94bd7f96 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Tue, 20 Feb 2018 00:06:40 -0600 Subject: Augustus update hash (#7286) * augustus: 3.3 package hash changed * augustus: bamtools libraries now seem to be in lib64 --- var/spack/repos/builtin/packages/augustus/package.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/augustus/package.py b/var/spack/repos/builtin/packages/augustus/package.py index 258bc55085..b7686796b5 100644 --- a/var/spack/repos/builtin/packages/augustus/package.py +++ b/var/spack/repos/builtin/packages/augustus/package.py @@ -32,7 +32,7 @@ class Augustus(MakefilePackage): homepage = "http://bioinf.uni-greifswald.de/augustus/" url = "http://bioinf.uni-greifswald.de/augustus/binaries/augustus-3.3.tar.gz" - version('3.3', '9ebe494df78ebf6a43091cfc8551050c', + version('3.3', '93691d9aafc7d3d0e1adf31ec308507f', url='http://bioinf.uni-greifswald.de/augustus/binaries/augustus-3.3.tar.gz') version('3.2.3', 'b8c47ea8d0c45aa7bb9a82626c8ff830', url='http://bioinf.uni-greifswald.de/augustus/binaries/old/augustus-3.2.3.tar.gz') @@ -50,7 +50,7 @@ class Augustus(MakefilePackage): makefile.filter('INCLUDES = *', 'INCLUDES = -I$(BAMTOOLS)/include/bamtools ') makefile.filter('LIBS = -lbamtools -lz', - 'LIBS = $(BAMTOOLS)/lib/bamtools' + 'LIBS = $(BAMTOOLS)/lib64/' '/libbamtools.a -lz') with working_dir(join_path('auxprogs', 'bam2hints')): makefile = FileFilter('Makefile') @@ -59,7 +59,7 @@ class Augustus(MakefilePackage): makefile.filter('INCLUDES = /usr/include/bamtools', 'INCLUDES = $(BAMTOOLS)/include/bamtools') makefile.filter('LIBS = -lbamtools -lz', - 'LIBS = $(BAMTOOLS)/lib/bamtools' + 'LIBS = $(BAMTOOLS)/lib64/' '/libbamtools.a -lz') def install(self, spec, prefix): -- cgit v1.2.3-70-g09d2 From e179883a5b18d8f781ca2c4c98396bf6d57f86df Mon Sep 17 00:00:00 2001 From: snehring Date: Tue, 20 Feb 2018 00:09:05 -0600 Subject: updating package: gmap-gsnap (#7285) * updating package: gmap-gsnap * fixing version order --- var/spack/repos/builtin/packages/gmap-gsnap/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gmap-gsnap/package.py b/var/spack/repos/builtin/packages/gmap-gsnap/package.py index c7c70c7c92..00aec1d322 100644 --- a/var/spack/repos/builtin/packages/gmap-gsnap/package.py +++ b/var/spack/repos/builtin/packages/gmap-gsnap/package.py @@ -33,5 +33,6 @@ class GmapGsnap(AutotoolsPackage): homepage = "http://research-pub.gene.com/gmap/" url = "http://research-pub.gene.com/gmap/src/gmap-gsnap-2017-06-16.tar.gz" + version('2018-02-12', '13152aedeef9ac66be915fc6bf6464f2') version('2017-06-16', 'fcc91b8bdd4bf12ae3124de0c00db0c0') version('2014-12-28', '1ab07819c9e5b5b8970716165ccaa7da') -- cgit v1.2.3-70-g09d2 From 95fe8f7e07011739b8d46e994dd383233835e1b4 Mon Sep 17 00:00:00 2001 From: Veselin Dobrev Date: Mon, 19 Feb 2018 22:11:04 -0800 Subject: sundials: add the 'headers' and 'libs' properties (#7282) * [SUNDIALS] Add the 'headers' and 'libs' properties, plus a couple of small tweaks. * [SUNDIALS] Revert incorrectly changed conflicts() directive. Fix style. --- .../repos/builtin/packages/sundials/package.py | 40 ++++++++++++++++++++-- 1 file changed, 37 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sundials/package.py b/var/spack/repos/builtin/packages/sundials/package.py index 16cbcbe34f..73816b6224 100644 --- a/var/spack/repos/builtin/packages/sundials/package.py +++ b/var/spack/repos/builtin/packages/sundials/package.py @@ -216,9 +216,9 @@ class Sundials(CMakePackage): fortran_flag = self.compiler.pic_flag if spec.satisfies('%clang platform=darwin'): - mpif77 = Executable(self.spec['mpi'].mpif77) - libgfortran = LibraryList(mpif77('--print-file-name', - 'libgfortran.a', output=str)) + f77 = Executable(self.compiler.f77) + libgfortran = LibraryList(f77('--print-file-name', + 'libgfortran.a', output=str)) fortran_flag += ' ' + libgfortran.ld_flags # List of CMake arguments @@ -476,3 +476,37 @@ class Sundials(CMakePackage): for filename in f90_files: filter_file(os.environ['FC'], self.compiler.fc, os.path.join(dirname, filename), **kwargs) + + @property + def headers(self): + """Export the headers and defines of SUNDIALS. + Sample usage: spec['sundials'].headers.cpp_flags + """ + # SUNDIALS headers are inside subdirectories, so we use a fake header + # in the include directory. + hdr = find(self.prefix.include.nvector, 'nvector_serial.h', + recursive=False) + return HeaderList(join_path(self.spec.prefix.include, 'fake.h')) \ + if hdr else None + + @property + def libs(self): + """Export the libraries of SUNDIALS. + Sample usage: spec['sundials'].libs.ld_flags + spec['sundials:arkode,cvode'].libs.ld_flags + """ + query_parameters = self.spec.last_query.extra_parameters + if not query_parameters: + sun_libs = 'libsundials_*[!0-9]' + # Q: should the result be ordered by dependency? + else: + sun_libs = ['libsundials_' + p for p in query_parameters] + search_paths = [[self.prefix.lib, False], [self.prefix.lib64, False], + [self.prefix, True]] + is_shared = '+shared' in self.spec + for path, recursive in search_paths: + libs = find_libraries(sun_libs, root=path, shared=is_shared, + recursive=recursive) + if libs: + return libs + return None # Raise an error -- cgit v1.2.3-70-g09d2 From 2bab19d1213e0aef1a1e2a94af8f563e9d443467 Mon Sep 17 00:00:00 2001 From: "Mark C. Miller" Date: Mon, 19 Feb 2018 22:13:13 -0800 Subject: hdf5: fixing ~/+ fortran builds; updated to version 0.8.0 (#7260) --- var/spack/repos/builtin/packages/h5z-zfp/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/h5z-zfp/package.py b/var/spack/repos/builtin/packages/h5z-zfp/package.py index dff0126f01..34eb81109c 100644 --- a/var/spack/repos/builtin/packages/h5z-zfp/package.py +++ b/var/spack/repos/builtin/packages/h5z-zfp/package.py @@ -34,10 +34,12 @@ class H5zZfp(MakefilePackage): version('develop', git='https://github.com/LLNL/H5Z-ZFP.git', tag='master') version('0.7.0', git='https://github.com/LLNL/H5Z-ZFP.git', commit='58ac811') + version('0.8.0', git='https://github.com/LLNL/H5Z-ZFP.git', commit='af165c4') variant('fortran', default=True, description='Enable Fortran support') - depends_on('hdf5') + depends_on('hdf5+fortran', when='+fortran') + depends_on('hdf5', when='~fortran') depends_on('zfp bsws=8') @property -- cgit v1.2.3-70-g09d2 From c3e8df6c93beea66b6dcb17c3551c64719d0aa96 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 20 Feb 2018 00:13:50 -0600 Subject: perl-text-csv: Create new package (#7258) --- .../builtin/packages/perl-text-csv/package.py | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-text-csv/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-text-csv/package.py b/var/spack/repos/builtin/packages/perl-text-csv/package.py new file mode 100644 index 0000000000..7787a89864 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-text-csv/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlTextCsv(PerlPackage): + """Comma-separated values manipulator (using XS or PurePerl)""" + + homepage = "http://search.cpan.org/~ishigaki/Text-CSV/lib/Text/CSV.pm" + url = "http://search.cpan.org/CPAN/authors/id/I/IS/ISHIGAKI/Text-CSV-1.95.tar.gz" + + version('1.95', '1e076b4b1f8ba6a5003bf93f3c437a9e') -- cgit v1.2.3-70-g09d2 From 0166d09ee2406041ddb29e324bafdf33016f9013 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Tue, 20 Feb 2018 12:33:41 -0600 Subject: new package: Soapdenovo2 (#7047) --- .../repos/builtin/packages/soapdenovo2/package.py | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 var/spack/repos/builtin/packages/soapdenovo2/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/soapdenovo2/package.py b/var/spack/repos/builtin/packages/soapdenovo2/package.py new file mode 100644 index 0000000000..27f512626d --- /dev/null +++ b/var/spack/repos/builtin/packages/soapdenovo2/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Soapdenovo2(MakefilePackage): + """SOAPdenovo is a novel short-read assembly method that can build a de + novo draft assembly for the human-sized genomes. The program is + specially designed to assemble Illumina GA short reads. It creates + new opportunities for building reference sequences and carrying out + accurate analyses of unexplored genomes in a cost effective way.""" + + homepage = "https://github.com/aquaskyline/SOAPdenovo2" + url = "https://github.com/aquaskyline/SOAPdenovo2/archive/r240.tar.gz" + + version('240', '3bc6b63edf87bb47874bb6f126e43cd4') + + def install(self, spec, prefix): + mkdirp(prefix.bin) + install('SOAPdenovo-63mer', prefix.bin) + install('SOAPdenovo-127mer', prefix.bin) -- cgit v1.2.3-70-g09d2 From 3d68b7510b06006be1f2edd16f1df7d6005cf5fe Mon Sep 17 00:00:00 2001 From: peetsv <32349688+peetsv@users.noreply.github.com> Date: Tue, 20 Feb 2018 15:14:06 -0800 Subject: py-pyvcf: versions 0.6.7 and 0.6.8 (#6743) * py-pyvcf: versions 0.6.0 and 0.6.7 * adding dependencies * Changing location of source tarball * updating url to eliminate embedded checksum --- .../repos/builtin/packages/py-pyvcf/package.py | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-pyvcf/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pyvcf/package.py b/var/spack/repos/builtin/packages/py-pyvcf/package.py new file mode 100644 index 0000000000..3b8d3bfd45 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pyvcf/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPyvcf(PythonPackage): + """PyVCF - A Variant Call Format Parser for Python""" + + homepage = "https://github.com/jamescasbon/PyVCF" + url = "https://pypi.io/packages/source/P/PyVCF/PyVCF-0.6.8.tar.gz" + + version('0.6.8', '3cc70aa59e62dab7b4a85bd5a9f2e714') + version('0.6.7', '51b57ce99e0c2f7be2a18d08d8f87734') + + depends_on('py-setuptools', type='build') + depends_on('py-cython', type='build') + depends_on('py-pysam', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 9ab80cc268cd58bf882af408b528e8022f9a5cc7 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Wed, 21 Feb 2018 06:42:51 +0100 Subject: cbench set its environment using `setup_environment` (#7236) The edit phase of cbench was used to set environment variables. Though this works, the variables set this way are not dumped to build.env. This commit fixes the issue by setting those variables in the `setup_environment` function. --- var/spack/repos/builtin/packages/cbench/package.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cbench/package.py b/var/spack/repos/builtin/packages/cbench/package.py index c090907af7..22a85a9734 100644 --- a/var/spack/repos/builtin/packages/cbench/package.py +++ b/var/spack/repos/builtin/packages/cbench/package.py @@ -50,27 +50,27 @@ class Cbench(MakefilePackage): conflicts('%xl') conflicts('%xl_r') - def edit(self, spec, prefix): + def setup_environment(self, build_env, run_env): # The location of the Cbench source tree - env['CBENCHOME'] = self.stage.source_path + build_env.set('CBENCHOME', self.stage.source_path) # The location that will contain all of your tests and their results - env['CBENCHTEST'] = prefix + build_env.set('CBENCHTEST', self.prefix) # The location of the system MPI tree - env['MPIHOME'] = spec['mpi'].prefix + build_env.set('MPIHOME', self.spec['mpi'].prefix) # Pick the compiler collection/chain you want to compile with. # Examples include: intel, gcc, pgi. - env['COMPILERCOLLECTION'] = self.compiler.name + build_env.set('COMPILERCOLLECTION', self.compiler.name) # Linking flags for BLAS/LAPACK and FFTW - env['BLASLIB'] = spec['blas'].libs.ld_flags - env['LAPACKLIB'] = spec['lapack'].libs.ld_flags - env['FFTWLIB'] = spec['fftw'].libs.ld_flags + build_env.set('BLASLIB', self.spec['blas'].libs.ld_flags) + build_env.set('LAPACKLIB', self.spec['lapack'].libs.ld_flags) + build_env.set('FFTWLIB', self.spec['fftw'].libs.ld_flags) # The number of make jobs (commands) to run simultaneously - env['JOBS'] = str(make_jobs) + build_env.set('JOBS', str(make_jobs)) @run_before('build') @on_package_attributes(run_tests=True) -- cgit v1.2.3-70-g09d2 From 17b7f05975b063e0e47f07ee6b1165873b5a8e2f Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Wed, 21 Feb 2018 10:10:14 -0700 Subject: nut: needs cmake-3.0 (#7298) Found in proxyapps/proxy-ci#2 --- var/spack/repos/builtin/packages/nut/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nut/package.py b/var/spack/repos/builtin/packages/nut/package.py index 6e375bcbd0..e8f99c775c 100644 --- a/var/spack/repos/builtin/packages/nut/package.py +++ b/var/spack/repos/builtin/packages/nut/package.py @@ -42,6 +42,7 @@ class Nut(CMakePackage): 'openmp', git='https://github.com/lanl/NuT.git', branch='openmp') + depends_on('cmake@3.0:') depends_on('random123') conflicts('%intel', when='@serial') -- cgit v1.2.3-70-g09d2 From 41aada98211a8f586d7083d400411169076387d1 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Wed, 21 Feb 2018 10:11:50 -0700 Subject: clamr: needs cmake-3.1 (#7297) Found in proxyapps/proxy-ci#2 --- var/spack/repos/builtin/packages/clamr/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/clamr/package.py b/var/spack/repos/builtin/packages/clamr/package.py index 3608c64ca2..e5890a7cb9 100644 --- a/var/spack/repos/builtin/packages/clamr/package.py +++ b/var/spack/repos/builtin/packages/clamr/package.py @@ -46,6 +46,7 @@ class Clamr(CMakePackage): values=('single', 'mixed', 'full'), description='single, mixed, or full double precision values') + depends_on('cmake@3.1:') depends_on('mpi') depends_on('mpe', when='graphics=mpe') -- cgit v1.2.3-70-g09d2 From 82aa76a867f88639d2d2334e15faa52ee6af97af Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Wed, 21 Feb 2018 19:14:34 +0100 Subject: mkl: fix order of libs (#7280) --- var/spack/repos/builtin/packages/intel-mkl/package.py | 2 +- var/spack/repos/builtin/packages/intel-parallel-studio/package.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/intel-mkl/package.py b/var/spack/repos/builtin/packages/intel-mkl/package.py index 91f22ecaaf..6cbf355e56 100644 --- a/var/spack/repos/builtin/packages/intel-mkl/package.py +++ b/var/spack/repos/builtin/packages/intel-mkl/package.py @@ -123,7 +123,7 @@ class IntelMkl(IntelPackage): mkl_root = prefix.mkl.lib mkl_libs = find_libraries( - mkl_integer + ['libmkl_core'] + mkl_threading, + mkl_integer + mkl_threading + ['libmkl_core'], root=mkl_root, shared=shared ) diff --git a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py index e8ac829757..fc399e5d24 100644 --- a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py +++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py @@ -201,7 +201,7 @@ class IntelParallelStudio(IntelPackage): mkl_root = prefix.compilers_and_libraries.linux.mkl.lib.intel64 mkl_libs = find_libraries( - mkl_integer + ['libmkl_core'] + mkl_threading, + mkl_integer + mkl_threading + ['libmkl_core'], root=mkl_root, shared=shared ) -- cgit v1.2.3-70-g09d2 From dba0c9ab6b100ec34d1fc008d068f26f3558d008 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Wed, 21 Feb 2018 15:03:53 -0700 Subject: cohmm: use more sane defaults (#7296) --- var/spack/repos/builtin/packages/cohmm/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cohmm/package.py b/var/spack/repos/builtin/packages/cohmm/package.py index 70e87c70ff..b0e0be10d4 100644 --- a/var/spack/repos/builtin/packages/cohmm/package.py +++ b/var/spack/repos/builtin/packages/cohmm/package.py @@ -41,7 +41,7 @@ class Cohmm(MakefilePackage): branch='sad') variant('openmp', default=True, description='Build with OpenMP Support') - variant('gnuplot', default=True, description='Enable gnu plot Support') + variant('gnuplot', default=False, description='Enable gnu plot Support') depends_on('gnuplot', when='+gnuplot') def edit(self, spec, prefix): -- cgit v1.2.3-70-g09d2 From 72c270419f3cc135c36d497887382ba83b2048ef Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Thu, 22 Feb 2018 12:11:51 +0100 Subject: yambo: added new package (#7301) --- .../repos/builtin/packages/espresso/package.py | 4 +- var/spack/repos/builtin/packages/yambo/package.py | 169 +++++++++++++++++++++ 2 files changed, 171 insertions(+), 2 deletions(-) create mode 100644 var/spack/repos/builtin/packages/yambo/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/espresso/package.py b/var/spack/repos/builtin/packages/espresso/package.py index 23014710a1..e9bd29f762 100644 --- a/var/spack/repos/builtin/packages/espresso/package.py +++ b/var/spack/repos/builtin/packages/espresso/package.py @@ -71,8 +71,8 @@ class Espresso(Package): depends_on('elpa~openmp', when='+elpa~openmp') depends_on('hdf5', when='+hdf5') - patch('dspev_drv_elpa.patch', when='@6.1 ^elpa@2016.05.004') - patch('dspev_drv_elpa.patch', when='@6.1 ^elpa@2016.05.003') + patch('dspev_drv_elpa.patch', when='@6.1+elpa ^elpa@2016.05.004') + patch('dspev_drv_elpa.patch', when='@6.1+elpa ^elpa@2016.05.003') # We can't ask for scalapack or elpa if we don't want MPI conflicts( diff --git a/var/spack/repos/builtin/packages/yambo/package.py b/var/spack/repos/builtin/packages/yambo/package.py new file mode 100644 index 0000000000..246e7f9918 --- /dev/null +++ b/var/spack/repos/builtin/packages/yambo/package.py @@ -0,0 +1,169 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Yambo(AutotoolsPackage): + """Yambo is a FORTRAN/C code for Many-Body calculations in solid + state and molecular physics. + + Yambo relies on the Kohn-Sham wavefunctions generated by two DFT + public codes: abinit, and PWscf. The code was originally developed + in the Condensed Matter Theoretical Group of the Physics Department + at the University of Rome "Tor Vergata" by Andrea Marini. Previous + to its release under the GPL license, yambo was known as SELF. + """ + + homepage = "http://www.yambo-code.org/index.php" + url = "https://github.com/yambo-code/yambo/archive/4.1.3.tar.gz" + + version('4.2.1', '99027014192c0f0f4b5d9b48414ad85d') + version('4.2.0', '0cbb4d7c9790596d163ebe872d95bd30') + + variant('dp', default=False, description='Enable double precision') + variant( + 'profile', + values=('time', 'memory'), + default='', + description='Activate profiling of specific sections', + multi=True + ) + + variant( + 'io', + values=('iotk', 'etsf-io'), + default='', + description='Activate support for different io formats (requires network access)', # noqa + multi=True + ) + + # MPI + OpenMP parallelism + variant('mpi', default=True, description='Enable MPI support') + variant('openmp', default=False, description='Enable OpenMP support') + + depends_on('blas') + depends_on('lapack') + + # MPI dependencies are forced, until we have proper forwarding of variants + # + # Note that yambo is used as an application, and not linked as a library, + # thus there will be no case where another package pulls-in e.g. netcdf+mpi + # and wants to depend on yambo~mpi. + depends_on('mpi', when='+mpi') + depends_on('netcdf+mpi', when='+mpi') + depends_on('hdf5+mpi', when='+mpi') + depends_on('fftw+mpi', when='+mpi') + depends_on('scalapack', when='+mpi') + + depends_on('netcdf~mpi', when='~mpi') + depends_on('hdf5~mpi', when='~mpi') + depends_on('fftw~mpi', when='~mpi') + + depends_on('hdf5+fortran') + depends_on('netcdf') + depends_on('netcdf-fortran') + depends_on('libxc@2.0.3:') + + build_targets = ['all'] + + parallel = False + + # The configure in the package has the string 'cat config/report' + # hard-coded, which causes a failure at configure time due to the + # current working directory in Spack. Fix this by using the absolute + # path to the file. + @run_before('configure') + def filter_configure(self): + report_abspath = join_path(self.build_directory, 'config', 'report') + filter_file('config/report', report_abspath, 'configure') + + def enable_or_disable_time(self, activated): + return '--enable-time-profile' if activated else '--disable-time-profile' # noqa: E501 + + def enable_or_disable_memory(self, activated): + return '--enable-memory-profile' if activated else '--disable-memory-profile' # noqa: E501 + + def enable_or_disable_openmp(self, activated): + return '--enable-open-mp' if activated else '--disable-open-mp' + + def configure_args(self): + + args = [ + # As of version 4.2.1 there are hard-coded paths that make + # the build process fail if the target prefix is not the + # configure directory + '--prefix={0}'.format(self.stage.source_path), + '--disable-keep-objects', + '--with-editor=none' + ] + spec = self.spec + + # Double precision + args.extend(self.enable_or_disable('dp')) + + # Application profiling + args.extend(self.enable_or_disable('profile')) + + # MPI + threading + args.extend(self.enable_or_disable('mpi')) + args.extend(self.enable_or_disable('openmp')) + + # LAPACK + if '+mpi' in spec: + args.append('--with-scalapack-libs={0}'.format( + spec['scalapack'].libs + + spec['lapack'].libs + + spec['blas'].libs + )) + + args.extend([ + '--with-blas-libs={0}'.format(spec['blas'].libs), + '--with-lapack-libs={0}'.format(spec['lapack'].libs) + ]) + + # Netcdf + args.extend([ + '--enable-netcdf-hdf5', + '--enable-hdf5-compression', + '--with-hdf5-libs={0}'.format(spec['hdf5'].libs), + '--with-netcdf-path={0}'.format(spec['netcdf'].prefix), + '--with-netcdff-path={0}'.format(spec['netcdf-fortran'].prefix) + ]) + + args.extend(self.enable_or_disable('io')) + + # Other dependencies + args.append('--with-fft-path={0}'.format(spec['fftw'].prefix)) + args.append('--with-libxc-path={0}'.format(spec['libxc'].prefix)) + + return args + + def install(self, spec, prefix): + # As of version 4.2.1 an 'install' target is advertized, + # but not present + install_tree('bin', prefix.bin) + install_tree('lib', prefix.lib) + install_tree('include', prefix.include) + install_tree('driver', prefix.driver) -- cgit v1.2.3-70-g09d2 From c62f1d4722ce77d1ef3fe304be21c46ad6d3f8a3 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Thu, 22 Feb 2018 06:08:54 -0700 Subject: bml: add version 1.2.3 (#7308) --- var/spack/repos/builtin/packages/bml/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bml/package.py b/var/spack/repos/builtin/packages/bml/package.py index ee4b805d1b..427cafa807 100644 --- a/var/spack/repos/builtin/packages/bml/package.py +++ b/var/spack/repos/builtin/packages/bml/package.py @@ -33,6 +33,7 @@ class Bml(CMakePackage): homepage = "http://lanl.github.io/bml/" url = "https://github.com/lanl/bml/tarball/v1.2.2" + version('1.2.3', '8133137fb56a27fade44d1588449c2ac') version('1.2.2', 'c86959cb0188e9d0a9a2cbad03b2782d') version('1.1.0', '271adecee08aee678be9eeceee06b6fb') version('develop', git='https://github.com/lanl/bml', branch='master') -- cgit v1.2.3-70-g09d2 From 1401d8a308358014835d6b2947bd3a60b62b883d Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Thu, 22 Feb 2018 09:04:49 -0700 Subject: bml: enable MPI by default (#7324) --- var/spack/repos/builtin/packages/bml/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bml/package.py b/var/spack/repos/builtin/packages/bml/package.py index 427cafa807..6db847376d 100644 --- a/var/spack/repos/builtin/packages/bml/package.py +++ b/var/spack/repos/builtin/packages/bml/package.py @@ -39,7 +39,7 @@ class Bml(CMakePackage): version('develop', git='https://github.com/lanl/bml', branch='master') variant('shared', default=True, description='Build shared libs') - variant('mpi', default=False, description='Build with MPI Support') + variant('mpi', default=True, description='Build with MPI Support') conflicts('+mpi', when='@:1.2.2') -- cgit v1.2.3-70-g09d2 From 22d9a7e0ea3406082302f1a6788aed42d3285333 Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Thu, 22 Feb 2018 10:45:37 -0700 Subject: Fixed Theano GPU support (#7325) * Added a package for the MDAnalysis toolkit. * Added a new package for pygpu, which is the python front end of the libgpuarray. Additionally changed the dependency for theano so that it properly picks up the pygpu library. * Added the libcheck package. Fixed flake8 errors in py-pygpu recipe and removed spurious dependency on cudnn for libgpuarray. --- .../repos/builtin/packages/libcheck/package.py | 36 +++++++++++++++ .../repos/builtin/packages/libgpuarray/package.py | 10 ++++- .../repos/builtin/packages/py-pygpu/package.py | 52 ++++++++++++++++++++++ .../repos/builtin/packages/py-theano/package.py | 3 ++ 4 files changed, 99 insertions(+), 2 deletions(-) create mode 100644 var/spack/repos/builtin/packages/libcheck/package.py create mode 100644 var/spack/repos/builtin/packages/py-pygpu/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libcheck/package.py b/var/spack/repos/builtin/packages/libcheck/package.py new file mode 100644 index 0000000000..3a743fadbd --- /dev/null +++ b/var/spack/repos/builtin/packages/libcheck/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Libcheck(CMakePackage): + """A unit testing framework for C.""" + + homepage = "https://libcheck.github.io/check/index.html" + url = "https://github.com/libcheck/check/releases/download/0.12.0/check-0.12.0.tar.gz" + + version('0.12.0', '31b17c6075820a434119592941186f70') + version('0.11.0', '9b90522b31f5628c2e0f55dda348e558') + version('0.10.0', '53c5e5c77d090e103a17f3ed7fd7d8b8') diff --git a/var/spack/repos/builtin/packages/libgpuarray/package.py b/var/spack/repos/builtin/packages/libgpuarray/package.py index 3bc1100c81..885141f833 100644 --- a/var/spack/repos/builtin/packages/libgpuarray/package.py +++ b/var/spack/repos/builtin/packages/libgpuarray/package.py @@ -33,11 +33,17 @@ class Libgpuarray(CMakePackage): homepage = "http://deeplearning.net/software/libgpuarray/" url = "https://github.com/Theano/libgpuarray/archive/v0.6.1.tar.gz" + version('0.7.5', '2534011464555c3e99d14231db965c20') + version('0.7.4', '19f57cd381175162048c8154f5251546') + version('0.7.3', 'cb44aeb8482330974abdb36b0a477e5d') + version('0.7.2', '0f9d7748501bc5c71bf04aae2285ac4e') + version('0.7.1', '7eb5bb6689ddbc386a9d498f5c0027fb') + version('0.7.0', 'f71b066f21ef7666f3a851e96c26f52e') + version('0.6.9', '7f75c39f1436c920ed9c5ffde5631fc0') version('0.6.2', '7f163bd5f48f399cd6e608ee3d528ee4') version('0.6.1', 'cfcd1b54447f9d55b05514df62c70ae2') version('0.6.0', '98a4ec1b4c8f225f0b89c18b899a000b') depends_on('cuda') depends_on('cmake@3:', type='build') - - extends('python') + depends_on('libcheck') diff --git a/var/spack/repos/builtin/packages/py-pygpu/package.py b/var/spack/repos/builtin/packages/py-pygpu/package.py new file mode 100644 index 0000000000..7062343153 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pygpu/package.py @@ -0,0 +1,52 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPygpu(PythonPackage): + """Python packge for the libgpuarray C library.""" + + homepage = "http://deeplearning.net/software/libgpuarray/" + url = "https://github.com/Theano/libgpuarray/archive/v0.6.1.tar.gz" + + version('0.7.5', '2534011464555c3e99d14231db965c20') + version('0.7.4', '19f57cd381175162048c8154f5251546') + version('0.7.3', 'cb44aeb8482330974abdb36b0a477e5d') + version('0.7.2', '0f9d7748501bc5c71bf04aae2285ac4e') + version('0.7.1', '7eb5bb6689ddbc386a9d498f5c0027fb') + version('0.7.0', 'f71b066f21ef7666f3a851e96c26f52e') + version('0.6.9', '7f75c39f1436c920ed9c5ffde5631fc0') + version('0.6.2', '7f163bd5f48f399cd6e608ee3d528ee4') + version('0.6.1', 'cfcd1b54447f9d55b05514df62c70ae2') + version('0.6.0', '98a4ec1b4c8f225f0b89c18b899a000b') + + depends_on('libgpuarray') + # not just build-time, requires pkg_resources + depends_on('py-setuptools', type=('build', 'run')) + depends_on('py-cython@0.25:', type=('build', 'run')) + depends_on('py-nose', type=('build', 'run')) + depends_on('py-numpy', type=('build', 'run')) + depends_on('py-mako', type=('build', 'run')) + depends_on('libcheck') diff --git a/var/spack/repos/builtin/packages/py-theano/package.py b/var/spack/repos/builtin/packages/py-theano/package.py index 4fe8920dd5..4acceaa7a5 100644 --- a/var/spack/repos/builtin/packages/py-theano/package.py +++ b/var/spack/repos/builtin/packages/py-theano/package.py @@ -32,6 +32,7 @@ class PyTheano(PythonPackage): homepage = "http://deeplearning.net/software/theano/" url = "https://pypi.io/packages/source/T/Theano/Theano-0.8.2.tar.gz" + version('1.0.1', 'a38b36c0fdc3126c574163db0a253e69') version('0.8.2', 'f2d0dfe7df141115201077cd933b2c52') version('master', git='https://github.com/Theano/Theano.git', branch='master') @@ -48,6 +49,8 @@ class PyTheano(PythonPackage): depends_on('blas') depends_on('cuda', when='+gpu') + depends_on('cudnn', when='+gpu') + depends_on('py-pygpu', when='+gpu', type=('build', 'run')) depends_on('libgpuarray', when='+gpu') # TODO: Add a 'test' deptype -- cgit v1.2.3-70-g09d2 From 8bd7712da3e8e2464cc7f20c80debe5ff77b638f Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Thu, 22 Feb 2018 10:47:05 -0700 Subject: Added virtualenvwrapper python package (#7270) * Added a package for the MDAnalysis toolkit. * Adding a package for the Python virtualenvwrapper pacakge. Included dependent virtualenv-clone and stevedore packages. Updated py-pbr with a new version to support this. * Added extra necessary dependencies and fixed the file download paths. --- var/spack/repos/builtin/packages/py-pbr/package.py | 2 + .../repos/builtin/packages/py-stevedore/package.py | 39 +++++++++++++++++++ .../packages/py-virtualenv-clone/package.py | 38 ++++++++++++++++++ .../packages/py-virtualenvwrapper/package.py | 45 ++++++++++++++++++++++ 4 files changed, 124 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-stevedore/package.py create mode 100644 var/spack/repos/builtin/packages/py-virtualenv-clone/package.py create mode 100644 var/spack/repos/builtin/packages/py-virtualenvwrapper/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pbr/package.py b/var/spack/repos/builtin/packages/py-pbr/package.py index 4ada322c89..9468080d88 100644 --- a/var/spack/repos/builtin/packages/py-pbr/package.py +++ b/var/spack/repos/builtin/packages/py-pbr/package.py @@ -31,6 +31,8 @@ class PyPbr(PythonPackage): homepage = "https://pypi.python.org/pypi/pbr" url = "https://pypi.io/packages/source/p/pbr/pbr-1.10.0.tar.gz" + version('3.1.1', '4e82c2e07af544c56a5b71c801525b00') + version('2.0.0', 'dfc1c3788eff06acfaade6f1655fa490') version('1.10.0', '8e4968c587268f030e38329feb9c8f17') version('1.8.1', 'c8f9285e1a4ca6f9654c529b158baa3a') diff --git a/var/spack/repos/builtin/packages/py-stevedore/package.py b/var/spack/repos/builtin/packages/py-stevedore/package.py new file mode 100644 index 0000000000..1ca49d7df3 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-stevedore/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyStevedore(PythonPackage): + """Manage Dynamic Plugins for Python Applications.""" + + homepage = "https://docs.openstack.org/stevedore/latest/" + url = "https://pypi.io/packages/source/s/stevedore/stevedore-1.28.0.tar.gz" + + version('1.28.0', 'b736a71431a2ff5831bbff4a6ccec0c1') + + depends_on('python@2.6:') + + depends_on('py-six@1.10.0:', type=('build', 'run')) + depends_on('py-pbr@2.0.0:2.1.0', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-virtualenv-clone/package.py b/var/spack/repos/builtin/packages/py-virtualenv-clone/package.py new file mode 100644 index 0000000000..046518137a --- /dev/null +++ b/var/spack/repos/builtin/packages/py-virtualenv-clone/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyVirtualenvClone(PythonPackage): + """A script for cloning a non-relocatable virtualenv.""" + + homepage = "https://github.com/edwardgeorge/virtualenv-clone" + url = "https://pypi.io/packages/source/v/virtualenv-clone/virtualenv-clone-0.2.6.tar.gz" + + version('0.2.6', 'fb03cd8c7a2be75937a13756d14068fc') + + depends_on('python@2.6:') + # not just build-time, requires pkg_resources + depends_on('py-setuptools', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-virtualenvwrapper/package.py b/var/spack/repos/builtin/packages/py-virtualenvwrapper/package.py new file mode 100644 index 0000000000..0f898aa040 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-virtualenvwrapper/package.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyVirtualenvwrapper(PythonPackage): + """virtualenvwrapper is a set of extensions to Ian Bicking's + virtualenv tool. The extensions include wrappers for creating and + deleting virtual environments and otherwise managing your development + workflow, making it easier to work on more than one project at a time + without introducing conflicts in their dependencies.""" + + homepage = "https://bitbucket.org/virtualenvwrapper/virtualenvwrapper.git" + url = "https://pypi.io/packages/source/v/virtualenvwrapper/virtualenvwrapper-4.8.2.tar.gz" + + version('4.8.2', '8e3af0e0d42733f15c5e36df484a952e') + + depends_on('python@2.6:') + depends_on('py-virtualenv', type=('build', 'run')) + depends_on('py-virtualenv-clone', type=('build', 'run')) + depends_on('py-stevedore', type=('build', 'run')) + # not just build-time, requires pkg_resources + depends_on('py-setuptools', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 2dd93ed5fafa794805594908ec8e800360ad60e4 Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Thu, 22 Feb 2018 10:54:46 -0700 Subject: ECP-CANDLE benchmark script (#7271) * Added a package for the MDAnalysis toolkit. * Added a variant to the candle benchmark to make MPI support optional. * Added py-requests package. --- .../repos/builtin/packages/candle-benchmarks/package.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/candle-benchmarks/package.py b/var/spack/repos/builtin/packages/candle-benchmarks/package.py index e2ba9bc310..4d86e18dd4 100644 --- a/var/spack/repos/builtin/packages/candle-benchmarks/package.py +++ b/var/spack/repos/builtin/packages/candle-benchmarks/package.py @@ -35,16 +35,20 @@ class CandleBenchmarks(Package): version('1.0', '6eced30dc15374bc9f90a86d0396e470') - depends_on('python@2.7:') + variant('mpi', default=True, description='Build with MPI support') + + extends('python@2.7:') depends_on('py-theano +gpu', type=('build', 'run')) depends_on('py-keras', type=('build', 'run')) depends_on('py-matplotlib +image', type=('build', 'run')) depends_on('py-tqdm', type=('build', 'run')) depends_on('py-scikit-learn', type=('build', 'run')) - depends_on('opencv@3.2.0: +core +highgui +imgproc +jpeg +png +tiff +zlib +python -dnn') + depends_on('opencv@3.2.0: +core +highgui +imgproc +jpeg +png +tiff +zlib +python -dnn ~eigen') depends_on('py-mdanalysis', type=('build', 'run')) - depends_on('py-mpi4py', type=('build', 'run')) - depends_on('py-h5py', type=('build', 'run')) + depends_on('py-mpi4py', when='+mpi', type=('build', 'run')) + depends_on('py-h5py~mpi', when='~mpi', type=('build', 'run')) + depends_on('py-h5py+mpi', when='+mpi', type=('build', 'run')) + depends_on('py-requests', type=('build', 'run')) # see #3244, but use external for now # depends_on('tensorflow') -- cgit v1.2.3-70-g09d2 From c4fcc245e2db6fcd60251354417a33a91edbf271 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Thu, 22 Feb 2018 11:27:27 -0700 Subject: remove dead Exact proxies (no fetch possible) (#7312) --- .../builtin/packages/amr-exp-parabolic/package.py | 95 ------------------ .../repos/builtin/packages/cns-nospec/package.py | 109 --------------------- var/spack/repos/builtin/packages/smc/package.py | 83 ---------------- 3 files changed, 287 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/amr-exp-parabolic/package.py delete mode 100644 var/spack/repos/builtin/packages/cns-nospec/package.py delete mode 100644 var/spack/repos/builtin/packages/smc/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/amr-exp-parabolic/package.py b/var/spack/repos/builtin/packages/amr-exp-parabolic/package.py deleted file mode 100644 index 14d393ed27..0000000000 --- a/var/spack/repos/builtin/packages/amr-exp-parabolic/package.py +++ /dev/null @@ -1,95 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -from spack import * -import glob - - -class AmrExpParabolic(MakefilePackage): - """Simplified block-structured adaptive mesh refinement algorithm - in two and three dimensions with subcycling in time. - The algorithm solves a linear advection diffusion equation - with a simple numerical method. This proxy app is intended to - capture the communication pattern of an explicit AMR algorithm - but does not represent an accurate characterization of - floating point effort or - relative costs of communication to computation.""" - - homepage = "https://ccse.lbl.gov/ExaCT/index.html" - url = "https://ccse.lbl.gov/ExaCT/AMR_Exp_Parabolic.tgz" - tags = ['proxy-app'] - - version( - 'release', '330604d9cc755dad8a2cdfaa7ff8f6a4', - url='https://ccse.lbl.gov/ExaCT/AMR_Exp_Parabolic.tgz') - - variant( - 'debug', default=False, description='Turn on debugging') - variant( - 'mpi', default=True, description='Build with MPI support') - variant( - 'openmp', default=False, - description='Build with OpenMP support') - variant( - 'prof', default=False, description='Use profiler') - - depends_on('mpi', when='+mpi') - depends_on('gmake', type='build') - - build_directory = 'MiniApps/AMR_Adv_Diff_F90' - - def edit(self, spec, prefix): - def_file = FileFilter('Tools/F_mk/GMakedefs.mak') - def_file.filter('tdir = t/.*', 'tdir := t/$(suf)') - def_file.filter('hdir = t/.*', 'hdir := t/html') - def_file.filter('include $(BOXLIB_HOME)/Tools/F_mk/GMakeMPI.mak', '#') - - if '+mpi' in spec: - def_file.filter('FC.*:=.*', 'FC = {0}'.format(spec['mpi'].mpifc)) - def_file.filter('F90.*:=.*', 'F90 = {0}'.format(spec['mpi'].mpifc)) - def_file.filter( - 'mpi_include_dir =.*', - 'mpi_include_dir = {0}'.format(spec['mpi'].prefix.include)) - def_file.filter( - 'mpi_lib_dir =.*', - 'mpi_lib_dir = {0}'.format(spec['mpi'].prefix.lib)) - - with working_dir(self.build_directory): - makefile = FileFilter('GNUmakefile') - if '+debug' in spec: - makefile.filter('NDEBUG.*:= t', '#') - if '~mpi' in spec: - makefile.filter('MPI.*:= t', '#') - if '+openmp' in spec: - makefile.filter('OMP.*:=', 'OMP := t') - if '+prof' in spec: - makefile.filter('PROF.*:=', 'PROF := t') - - def install(self, spec, prefix): - mkdirp(prefix.bin) - files = glob.glob(join_path(self.build_directory, '*.exe')) - for f in files: - install(f, prefix.bin) - install('README.txt', prefix) - install('license.txt', prefix) diff --git a/var/spack/repos/builtin/packages/cns-nospec/package.py b/var/spack/repos/builtin/packages/cns-nospec/package.py deleted file mode 100644 index f4b56d7596..0000000000 --- a/var/spack/repos/builtin/packages/cns-nospec/package.py +++ /dev/null @@ -1,109 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -from spack import * -import glob - - -class CnsNospec(MakefilePackage): - """A simple, explicit, stencil-based test code for integrating - the compressible Navier-Stokes equations. The code uses - 8th order finite differences in space and a 3rd order, - low-storage TVD RK algorithm in time.""" - - homepage = "https://ccse.lbl.gov/ExaCT/index.html" - url = "https://ccse.lbl.gov/ExaCT/CNS_Nospec.tgz" - tags = ['proxy-app'] - - version('master', '14ff5be62539d829b30b17281688ee3f') - - variant('mpi', default=True, description='Build with MPI support') - variant('debug', default=False, description='Build with debugging') - variant('omp', default=False, description='Build with OpenMP support') - variant('prof', default=False, description='Build with profiling') - - depends_on('mpi', when='+mpi') - depends_on('gmake', type='build') - - build_directory = 'MiniApps/CNS_NoSpec' - - def edit(self, spec, prefix): - def_file = FileFilter('Tools/F_mk/GMakedefs.mak') - def_file.filter('tdir = t/.*', 'tdir := t/$(suf)') - def_file.filter('hdir = t/.*', 'hdir := t/html') - def_file.filter('include $(BOXLIB_HOME)/Tools/F_mk/GMakeMPI.mak', '#') - - if '+mpi' in spec: - def_file.filter('FC.*:=.*', 'FC = {0}'.format(spec['mpi'].mpifc)) - def_file.filter('F90.*:=.*', 'F90 = {0}'.format(spec['mpi'].mpifc)) - def_file.filter( - 'mpi_include_dir =.*', - 'mpi_include_dir = {0}'.format(spec['mpi'].prefix.include)) - def_file.filter( - 'mpi_lib_dir =.*', - 'mpi_lib_dir = {0}'.format(spec['mpi'].prefix.lib)) - - with working_dir(self.build_directory): - makefile = FileFilter('GNUmakefile') - if '+mpi' in spec: - makefile.filter('MPI .*', 'MPI := t') - if '+debug' in spec: - makefile.filter('NDEBUG.*', '#') - if '+omp' in spec: - makefile.filter('OMP.*', 'OMP := t') - if '+prof' in spec: - makefile.filter('PROF.*', 'PROF := t') - - if self.compiler.name == 'gcc': - makefile.filter('COMP .*', 'COMP = gfortran') - if self.compiler.name == 'intel': - makefile.filter('COMP .*', 'COMP = Intel') - if self.compiler.name == 'pgi': - makefile.filter('COMP .*', 'COMP = PGI') - if self.compiler.name == 'xl': - makefile.filter('COMP .*', 'COMP = IBM') - if self.compiler.name == 'cce': - makefile.filter('COMP .*', 'COMP = Cray') - - @property - def build_targets(self): - spec = self.spec - if '+mpi' in spec: - return ['CC = {0}'.format(spec['mpi'].mpicc), - 'CXX = {0}'.format(spec['mpi'].mpicxx)] - else: - return [] - - def build(self, spec, prefix): - with working_dir(self.build_directory): - gmake() - - def install(self, spec, prefix): - mkdirp(prefix.bin) - files = glob.glob(join_path(self.build_directory, '*.exe')) - for f in files: - install(f, prefix.bin) - install('README.txt', prefix) - install('license.txt', prefix) - install(join_path(self.build_directory, 'README'), prefix) diff --git a/var/spack/repos/builtin/packages/smc/package.py b/var/spack/repos/builtin/packages/smc/package.py deleted file mode 100644 index 353e5f46b9..0000000000 --- a/var/spack/repos/builtin/packages/smc/package.py +++ /dev/null @@ -1,83 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -from spack import * -import glob - - -class Smc(MakefilePackage): - """A minimalist high-order finite difference algorithm - for combustion problems. It includes core discretizations - for advection, diffusive transport and chemical kinetics. - The models for computing diffusive transport coefficients - have been replaced by a simplified approximation - but the full structure of the discretization of - the diffusive terms have been preserved.""" - - homepage = "https://ccse.lbl.gov/ExaCT/index.html" - url = "https://ccse.lbl.gov/ExaCT/SMC.tar.gz" - tags = ['proxy-app'] - - version('master', '94a4ea94abbc5e61397c2a4d1fb56ed6') - - variant( - 'mpi', default=True, - description='Build with MPI support') - variant( - 'openmp', default=True, - description='Build with OpenMP support') - variant( - 'debug', default=False, - description='Build with debugging') -# variant( -# 'mic', default=False, -# description='Compile for Intel Xeon Phi') - variant( - 'k_use_automatic', default=True, - description='Some arrays in kernels.F90 will be automatic') - - depends_on('mpi', when='+mpi') - depends_on('gmake', type='build') - - def edit(self, spec, prefix): - makefile = FileFilter('GNUmakefile') - if '~mpi' in spec: - makefile.filter('MPI := t', '#') - if '~openmp' in spec: - makefile.filter('OMP := t', '#') - if '+debug' in spec: - makefile.filter('NDEBUG :=', '#') - if '~k_use_automatic' in spec: - makefile.filter('K_U.*:= t', '#') - if self.compiler.name == 'intel': - makefile.filter('COMP := .*', 'COMP := Intel') - - def install(self, spec, prefix): - mkdirp(prefix.bin) - files = glob.glob(join_path(self.build_directory, '*.exe')) - for f in files: - install(f, prefix.bin) - install('inputs_SMC', prefix.bin) - install('README', prefix) - install('BoxLib.license.txt', prefix) -- cgit v1.2.3-70-g09d2 From d7b826a0aa8e4e03fbf09896f4a38e12fa387b1f Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Thu, 22 Feb 2018 15:14:39 -0700 Subject: nalu package: update dependency (#7245) Yaml-cpp hasn't tagged a release in over 2 years, yet they have fixed many things and now have the ability to use find_package in CMake. Since we use this feature in Nalu, we require the latest yaml-cpp until they tag a new release. I have also deprecated the now unnecessary ENABLE_INSTALL flag. --- var/spack/repos/builtin/packages/nalu/package.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nalu/package.py b/var/spack/repos/builtin/packages/nalu/package.py index b7b9ea4666..153a29f5ab 100644 --- a/var/spack/repos/builtin/packages/nalu/package.py +++ b/var/spack/repos/builtin/packages/nalu/package.py @@ -48,7 +48,7 @@ class Nalu(CMakePackage): git='https://github.com/NaluCFD/Nalu.git', branch='master') # Currently Nalu only builds with certain libraries statically - depends_on('yaml-cpp+pic~shared@0.5.3:') + depends_on('yaml-cpp+pic~shared@develop') depends_on('trilinos~shared+exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist+superlu+hdf5+zlib+pnetcdf+shards@master,12.12.1:') depends_on('openfast+cxx', when='+openfast') depends_on('tioga', when='+tioga') @@ -60,8 +60,7 @@ class Nalu(CMakePackage): options.extend([ '-DTrilinos_DIR:PATH=%s' % spec['trilinos'].prefix, - '-DYAML_DIR:PATH=%s' % spec['yaml-cpp'].prefix, - '-DENABLE_INSTALL:BOOL=ON' + '-DYAML_DIR:PATH=%s' % spec['yaml-cpp'].prefix ]) if '+openfast' in spec: -- cgit v1.2.3-70-g09d2 From 0d0de091218d8ef73f611d5821d1b515244ffe9e Mon Sep 17 00:00:00 2001 From: Francesco Di Natale Date: Thu, 22 Feb 2018 16:01:18 -0800 Subject: maestrowf: new package (#7300) * Add Maestro Workflow Conductor to Spack * Removal of a trailing whitespace character. --- .../repos/builtin/packages/py-maestrowf/package.py | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-maestrowf/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-maestrowf/package.py b/var/spack/repos/builtin/packages/py-maestrowf/package.py new file mode 100644 index 0000000000..ba2ba952cb --- /dev/null +++ b/var/spack/repos/builtin/packages/py-maestrowf/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyMaestrowf(PythonPackage): + """A general purpose workflow conductor for running multi-step + simulation studies.""" + + homepage = "https://github.com/LLNL/maestrowf/" + url = "https://github.com/LLNL/maestrowf/archive/v1.0.1.tar.gz" + + version('1.0.1', '6838fc8bdc7ca0c1adbb6a0333f005b4') + + depends_on('py-setuptools', type='build') + depends_on('py-pyyaml', type=('build', 'run')) + depends_on('py-six', type=('build', 'run')) + depends_on('py-enum34', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From c2a47512379d00ddaeebb74e4bb0d2918d5c747d Mon Sep 17 00:00:00 2001 From: healther Date: Fri, 23 Feb 2018 14:41:14 +0100 Subject: fix url finding of lru-cache (#7118) Change-Id: I65a93e3d5d1ea52a0be56bbc664c6b5d405e2bf4 --- .../repos/builtin/packages/py-backports-functools-lru-cache/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py b/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py index 444365115e..48e4764e5f 100644 --- a/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py +++ b/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py @@ -31,7 +31,8 @@ class PyBackportsFunctoolsLruCache(PythonPackage): homepage = "https://github.com/jaraco/backports.functools_lru_cache" url = "https://pypi.io/packages/source/b/backports.functools_lru_cache/backports.functools_lru_cache-1.4.tar.gz" - version('1.4', 'b954e7d5e2ca0f0f66ad2ed12ba800e5') + version('1.4', 'b954e7d5e2ca0f0f66ad2ed12ba800e5', + url="https://pypi.io/packages/source/b/backports.functools_lru_cache/backports.functools_lru_cache-1.4.tar.gz") version('1.0.1', 'c789ef439d189330b99872746a6d9e85', url="https://pypi.io/packages/source/b/backports.functools_lru_cache/backports.functools_lru_cache-1.0.1.zip") depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From 7db35ff05c8078e85a9a1097093a4a2a2bdd31bd Mon Sep 17 00:00:00 2001 From: "Nichols A. Romero" Date: Fri, 23 Feb 2018 11:52:46 -0600 Subject: QMCPACK - General Improvements (#6958) * No longer need to patch CMake. Using CMAKE_CXX_FLAGS to include BLAS/LAPACK/MKL header files properly. * Backport two patches to QMCPACK versions prior to 3.3.0: https://github.com/QMCPACK/qmcpack/pull/621, https://github.com/QMCPACK/qmcpack/pull/623 * Insufficient to include lapack_dir in CMAKE_CXX_FLAGS, CMAKE_C_FLAGS is also needed. * Make patched Espresso a default variant instead of a hard dependency. This is easier on computer architectures where Espresso is hard to build. * Fix patching with QE variant. Now using correct form of patch command. * Add QMCPACK v3.4.0 * Backport patch to QMCPACK versions prior to 3.3.0: https://github.com/QMCPACK/qmcpack/pull/643 --- .../repos/builtin/packages/qmcpack/cmake.diff | 55 ---------------------- .../repos/builtin/packages/qmcpack/package.py | 47 ++++++++++++------ 2 files changed, 33 insertions(+), 69 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/qmcpack/cmake.diff (limited to 'var') diff --git a/var/spack/repos/builtin/packages/qmcpack/cmake.diff b/var/spack/repos/builtin/packages/qmcpack/cmake.diff deleted file mode 100644 index 4eb93f4198..0000000000 --- a/var/spack/repos/builtin/packages/qmcpack/cmake.diff +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/CMake/FindMKL.cmake b/CMake/FindMKL.cmake -index a457eaba0..66dc43ce6 100644 ---- a/CMake/FindMKL.cmake -+++ b/CMake/FindMKL.cmake -@@ -7,21 +7,21 @@ FILE( WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src_mkl.cxx" - "#include \n #include \n int main() { return 0; }\n" ) - try_compile(HAVE_MKL ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src_mkl.cxx -- CMAKE_FLAGS "${CMAKE_CXX_FLAGS} -mkl" ) -+ CMAKE_FLAGS "${CMAKE_CXX_FLAGS} -mkl" "-DINCLUDE_DIRECTORIES=${LAPACK_INCLUDE_DIRS}") - - # Check for mkl_vml_functions.h - FILE( WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src_mkl_vml.cxx" - "#include \n #include \n int main() { return 0; }\n" ) - try_compile(HAVE_MKL_VML ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src_mkl_vml.cxx -- CMAKE_FLAGS "${CMAKE_CXX_FLAGS} -mkl" ) -+ CMAKE_FLAGS "${CMAKE_CXX_FLAGS} -mkl" "-DINCLUDE_DIRECTORIES=${LAPACK_INCLUDE_DIRS}") - - # Check for fftw3 - FILE( WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src_mkl_fftw3.cxx" - "#include \n #include \n int main() { return 0; }\n" ) - try_compile(HAVE_MKL_FFTW3 ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src_mkl_fftw3.cxx -- CMAKE_FLAGS "${CMAKE_CXX_FLAGS} -mkl" ) -+ CMAKE_FLAGS "${CMAKE_CXX_FLAGS} -mkl" "-DINCLUDE_DIRECTORIES=${LAPACK_INCLUDE_DIRS}") - - IF ( HAVE_MKL ) - SET( MKL_FOUND 1 ) -diff --git a/CMake/FindVectorMath.cmake b/CMake/FindVectorMath.cmake -index c0c919746..f5c511253 100644 ---- a/CMake/FindVectorMath.cmake -+++ b/CMake/FindVectorMath.cmake -@@ -19,7 +19,7 @@ IF ( NOT HAVE_VECTOR_MATH ) - "#include \n #include \n int main() { return 0; }\n" ) - try_compile(HAVE_MKL_VML ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src_mkl_vml.cxx -- CMAKE_FLAGS "${CMAKE_CXX_FLAGS}" ) -+ CMAKE_FLAGS "${CMAKE_CXX_FLAGS}" "-DINCLUDE_DIRECTORIES=${LAPACK_INCLUDE_DIRS}") - IF (HAVE_MKL_VML) - # enable VML only when MKL libraries have been picked up - IF (MKL_FOUND) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 570d8a01f..56d939786 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -464,6 +464,8 @@ ELSE(CMAKE_TOOLCHAIN_FILE) - MESSAGE(STATUS "LAPACK libraries: ${LAPACK_LIBRARIES}") - MESSAGE(STATUS "LAPACK linker flags: ${LAPACK_LINKER_FLAGS}") - SET(LAPACK_LIBRARY ${LAPACK_LIBRARIES} ${LAPACK_LINKER_FLAGS}) -+ MESSAGE(STATUS "LAPACK_INCLUDE_DIRS: ${LAPACK_INCLUDE_DIRS}") -+ INCLUDE_DIRECTORIES(${LAPACK_INCLUDE_DIRS}) - ELSE() - MESSAGE(FATAL_ERROR "Could not find required libraries LAPACK &/or BLAS") - ENDIF() diff --git a/var/spack/repos/builtin/packages/qmcpack/package.py b/var/spack/repos/builtin/packages/qmcpack/package.py index a2080a13c4..fbb7e2636f 100644 --- a/var/spack/repos/builtin/packages/qmcpack/package.py +++ b/var/spack/repos/builtin/packages/qmcpack/package.py @@ -38,6 +38,7 @@ class Qmcpack(CMakePackage): # Spack manual. However, it is easier to maintain because github hashes # can occasionally change. # NOTE: 12/19/2017 QMCPACK 3.0.0 does not build properly with Spack. + version('3.4.0', git=url, tag='v3.4.0') version('3.3.0', git=url, tag='v3.3.0') version('3.2.0', git=url, tag='v3.2.0') version('3.1.1', git=url, tag='v3.1.1') @@ -64,6 +65,8 @@ class Qmcpack(CMakePackage): description='Install with support for basic data analysis tools') variant('gui', default=False, description='Install with Matplotlib (long installation time)') + variant('qe', default=True, + description='Install with patched Quantum Espresso 5.3.0') # cuda variant implies mixed precision variant by default, but there is # no way to express this in variant syntax, need something like @@ -105,16 +108,28 @@ class Qmcpack(CMakePackage): patch_url = 'https://raw.githubusercontent.com/QMCPACK/qmcpack/develop/external_codes/quantum_espresso/add_pw2qmcpack_to_espresso-5.3.0.diff' patch_checksum = '0d8d7ba805313ddd4c02ee32c96d2f12e7091e9e82e22671d3ad5a24247860c4' depends_on('espresso@5.3.0~elpa', - patches=patch(patch_url, sha256=patch_checksum), - when='+mpi') + patches=patch(patch_url, sha256=patch_checksum, when='+qe'), + when='+qe+mpi') depends_on('espresso@5.3.0~elpa~scalapack~mpi', - patches=patch(patch_url, sha256=patch_checksum), - when='~mpi') + patches=patch(patch_url, sha256=patch_checksum, when='+qe'), + when='+qe~mpi') - # This is Spack specific patch, we may need to enhance QMCPACK's CMake - # in the near future. - patch('cmake.diff') + # Backport several patches from recent versions of QMCPACK + # The test_numerics unit test is broken prior to QMCPACK 3.3.0 + patch_url = 'https://patch-diff.githubusercontent.com/raw/QMCPACK/qmcpack/pull/621.patch' + patch_checksum = 'e2ff7a6f0f006856085d4aab6d31f32f16353e41f760a33a7ef75f3ecce6a5d6' + patch(patch_url, sha256=patch_checksum, when='@3.1.0:3.3.0') + + # FindMKL.cmake has an issues prior to QMCPACK 3.3.0 + patch_url = 'https://patch-diff.githubusercontent.com/raw/QMCPACK/qmcpack/pull/623.patch' + patch_checksum = '3eb9dec05fd1a544318ff84cd8b5926cfc6b46b375c7f3b012ccf0b50cf617b7' + patch(patch_url, sha256=patch_checksum, when='@3.1.0:3.3.0') + + # git-rev files for not git builds issues prior to QMCPACK 3.3.0 + patch_url = 'https://patch-diff.githubusercontent.com/raw/QMCPACK/qmcpack/pull/643.patch' + patch_checksum = 'c066c79901a612cf8848135e0d544efb114534cca70b90bfccc8ed989d3d9dde' + patch(patch_url, sha256=patch_checksum, when='@3.1.0:3.3.0') def patch(self): # FindLibxml2QMC.cmake doesn't check the environment by default @@ -207,14 +222,18 @@ class Qmcpack(CMakePackage): # header files. Intel MKL requires special case due to differences in # Darwin vs. Linux $MKLROOT naming schemes if 'intel-mkl' in self.spec: - args.append( - '-DLAPACK_INCLUDE_DIRS=%s' % - format(join_path(env['MKLROOT'], 'include'))) + lapack_dir = format(join_path(env['MKLROOT'], 'include')) else: - args.append( - '-DLAPACK_INCLUDE_DIRS=%s;%s' % ( - self.spec['lapack'].prefix.include, - self.spec['blas'].prefix.include)) + lapack_dir = ':'.join(( + spec['lapack'].prefix.include, + spec['blas'].prefix.include + )) + + args.extend([ + '-DCMAKE_CXX_FLAGS=-I%s' % lapack_dir, + '-DCMAKE_C_FLAGS=-I%s' % lapack_dir + ]) + return args def install(self, spec, prefix): -- cgit v1.2.3-70-g09d2 From 990f178341506fea78e2d1906fd746d8d42b6c94 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Fri, 23 Feb 2018 23:29:12 +0100 Subject: accfft: added new package (#7213) --- var/spack/repos/builtin/packages/accfft/package.py | 66 ++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 var/spack/repos/builtin/packages/accfft/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/accfft/package.py b/var/spack/repos/builtin/packages/accfft/package.py new file mode 100644 index 0000000000..ff13660ffa --- /dev/null +++ b/var/spack/repos/builtin/packages/accfft/package.py @@ -0,0 +1,66 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Accfft(CMakePackage, CudaPackage): + """AccFFT extends existing FFT libraries for CUDA-enabled + Graphics Processing Units (GPUs) to distributed memory clusters + """ + + homepage = "http://accfft.org" + url = "https://github.com/amirgholami/accfft.git" + + version('develop', git='https://github.com/amirgholami/accfft.git', branch='master') + + variant('pnetcdf', default=True, description='Add support for parallel NetCDF') + variant('shared', default=True, description='Enables the build of shared libraries') + + # See: http://accfft.org/articles/install/#installing-dependencies + depends_on('fftw+float+double~mpi+openmp') + + depends_on('parallel-netcdf', when='+pnetcdf') + + parallel = False + + def cmake_args(self): + spec = self.spec + args = [ + '-DFFTW_ROOT={0}'.format(spec['fftw'].prefix), + '-DFFTW_USE_STATIC_LIBS=false', + '-DBUILD_GPU={0}'.format('true' if '+cuda' in spec else 'false'), + '-DBUILD_SHARED={0}'.format( + 'true' if '+shared' in spec else 'false' + ), + ] + + if '+cuda' in spec: + cuda_arch = [x for x in spec.variants['cuda_arch'].value if x] + if cuda_arch: + args.append('-DCUDA_NVCC_FLAGS={0}'.format( + ' '.join(self.cuda_flags(cuda_arch)) + )) + + return args -- cgit v1.2.3-70-g09d2 From 8157f978b09b71af7b38ea480eb965e5e2bd7282 Mon Sep 17 00:00:00 2001 From: Mike Pozulp Date: Fri, 23 Feb 2018 19:50:23 -0800 Subject: llvm and llvm-lld package updates (#7313) * Combined llvm and llvm-lld: removed the separate llvm-lld package and added llvm-lld as an optional add on to the llvm package (the way several other llvm tools are maintained e.g. lldb) * Added more lld hashes to llvm package * The 'CppBackend' target doesn't exist for version 3.9.0 or later so exclude it for later versions * Was incorrectly specifying 'sparc' as a target for the 'sparc' architecture - needed to specify 'Sparc' * Fix issue #7248 building llvm: don't make the LLVMDemangle target for llvm < 4.0.0 --- .../repos/builtin/packages/llvm-lld/package.py | 48 ---------------------- var/spack/repos/builtin/packages/llvm/package.py | 38 +++++++++++++++-- 2 files changed, 35 insertions(+), 51 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/llvm-lld/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/llvm-lld/package.py b/var/spack/repos/builtin/packages/llvm-lld/package.py deleted file mode 100644 index ff27c21f94..0000000000 --- a/var/spack/repos/builtin/packages/llvm-lld/package.py +++ /dev/null @@ -1,48 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -from spack import * - - -class LlvmLld(CMakePackage): - """lld - The LLVM Linker - lld is a new set of modular code for creating linker tools.""" - homepage = "http://lld.llvm.org" - url = "http://llvm.org/releases/3.4/lld-3.4.src.tar.gz" - - version('3.4', '3b6a17e58c8416c869c14dd37682f78e') - - depends_on('llvm') - depends_on('cmake@2.8:', type='build') - - def cmake_args(self): - if 'CXXFLAGS' in env and env['CXXFLAGS']: - env['CXXFLAGS'] += ' ' + self.compiler.cxx11_flag - else: - env['CXXFLAGS'] = self.compiler.cxx11_flag - - return [ - '-DLLD_PATH_TO_LLVM_BUILD=%s' % self.spec['llvm'].prefix, - '-DLLVM_MAIN_SRC_DIR=%s' % self.spec['llvm'].prefix, - ] diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index 3f4562e951..f1f84cc489 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -50,6 +50,7 @@ class Llvm(CMakePackage): variant('clang', default=True, description="Build the LLVM C/C++/Objective-C compiler frontend") variant('lldb', default=True, description="Build the LLVM debugger") + variant('lld', default=True, description="Build the LLVM linker") variant('internal_unwind', default=True, description="Build the libcxxabi libunwind") variant('polly', default=True, @@ -141,6 +142,12 @@ class Llvm(CMakePackage): 'placement': 'lldb', 'variant': '+lldb', }, + 'lld': { + 'url': base_url % {'pkg': 'lld'}, + 'destination': 'tools', + 'placement': 'lld', + 'variant': '+lld', + }, 'polly': { 'url': base_url % {'pkg': 'polly'}, 'destination': 'tools', @@ -167,6 +174,7 @@ class Llvm(CMakePackage): 'cfe': 'http://llvm.org/svn/llvm-project/cfe/trunk', 'clang-tools-extra': 'http://llvm.org/svn/llvm-project/clang-tools-extra/trunk', 'lldb': 'http://llvm.org/svn/llvm-project/lldb/trunk', + 'lld': 'http://llvm.org/svn/llvm-project/lld/trunk', 'libunwind': 'http://llvm.org/svn/llvm-project/libunwind/trunk', } }, @@ -182,6 +190,7 @@ class Llvm(CMakePackage): 'cfe': 'e4daa278d8f252585ab73d196484bf11', 'clang-tools-extra': 'c2bd3733c183b033b49f7a416c6dca36', 'lldb': 'd64078681215b5935614b6b83b2d1463', + 'lld': 'a873c7fdaac647613d8eed2cb03d82de', 'libunwind': 'ccf48200065481244d3d09828d54e87f', } }, @@ -197,6 +206,7 @@ class Llvm(CMakePackage): 'cfe': '699c448c6d6d0edb693c87beb1cc8c6e', 'clang-tools-extra': '0cda05d1a61becb393eb63746963d7f5', 'lldb': '8de19973d044ca2cfe325d4625a5cfef', + 'lld': 'a39cbecced3263feab9139b47118e062', 'libunwind': '98fb2c677068c6f36727fb1d5397bca3', } }, @@ -212,6 +222,7 @@ class Llvm(CMakePackage): 'cfe': 'a6c7b3e953f8b93e252af5917df7db97', 'clang-tools-extra': 'cfd46027a0ab7eed483dfcc803e86bd9', 'lldb': '908bdd777d3b527a914ba360477b8ab3', + 'lld': '39cd3512cddcfd7d37ef12066c961660', 'libunwind': 'b72ec95fb784e61f15d6196414b92f5e', } }, @@ -227,6 +238,7 @@ class Llvm(CMakePackage): 'cfe': '756e17349fdc708c62974b883bf72d37', 'clang-tools-extra': '99e711337ec3e9a8bb36e8dd62b2cd6e', 'lldb': 'bd41ba7fcca55d2a554409bbccd34d2d', + 'lld': 'e5784656e0f38e3578f10ff7551d3896', 'libunwind': '0c3534eaa11c0cae33a1dcf5f36ce287', } }, @@ -242,6 +254,7 @@ class Llvm(CMakePackage): 'cfe': '45713ec5c417ed9cad614cd283d786a1', 'clang-tools-extra': '1a01d545a064fcbc46a2f05f6880d3d7', 'lldb': '91399402f287d3f637db1207113deecb', + 'lld': '6254dd138e23b098df4ef7840c11e2c8', 'libunwind': 'f273dd0ed638ad0601b23176a36f187b', } }, @@ -257,6 +270,7 @@ class Llvm(CMakePackage): 'cfe': '29e1d86bee422ab5345f5e9fb808d2dc', 'clang-tools-extra': 'f4f663068c77fc742113211841e94d5e', 'lldb': '968d053c3c3d7297983589164c6999e9', + 'lld': 'c23c895c0d855a0dc426af686538a95e', 'libunwind': '3e5c87c723a456be599727a444b1c166', } }, @@ -272,6 +286,7 @@ class Llvm(CMakePackage): 'cfe': '4ff2f8844a786edb0220f490f7896080', 'clang-tools-extra': '6e49f285d0b366cc3cab782d8c92d382', 'lldb': '9e4787b71be8e432fffd31e13ac87623', + 'lld': '68cd069bf99c71ebcfbe01d557c0e14d', 'libunwind': 'd66e2387e1d37a8a0c8fe6a0063a3bab', } }, @@ -287,6 +302,7 @@ class Llvm(CMakePackage): 'cfe': 'cc99e7019bb74e6459e80863606250c5', 'clang-tools-extra': 'c2344f50e0eea0b402f0092a80ddc036', 'lldb': 'a5da35ed9cc8c8817ee854e3dbfba00e', + 'lld': 'de33b5c6c77698ee2f8d024fbffb8df1', 'libunwind': '162ade468607f153cca12be90b5194fa', } }, @@ -302,6 +318,7 @@ class Llvm(CMakePackage): 'cfe': '0acd026b5529164197563d135a8fd83e', 'clang-tools-extra': '5d49ff745037f061a7c86aeb6a24c3d2', 'lldb': 'a106d8a0d21fc84d76953822fbaf3398', + 'lld': '6c3794e30fbe118a601fb694627f34f8', 'libunwind': '814bd52c9247c5d04629658fbcb3ab8c', } }, @@ -317,6 +334,7 @@ class Llvm(CMakePackage): 'cfe': '8f9d27335e7331cf0a4711e952f21f01', 'clang-tools-extra': 'd5a87dacb65d981a427a536f6964642e', 'lldb': 'e5931740400d1dc3e7db4c7ba2ceff68', + 'lld': '91bd593a67293d84dad0bf11845546c2', 'libunwind': '9a75392eb7eb8ed5c0840007e212baf5', } }, @@ -331,6 +349,7 @@ class Llvm(CMakePackage): 'cfe': 'ff862793682f714bb7862325b9c06e20', 'clang-tools-extra': '3ebc1dc41659fcec3db1b47d81575e06', 'lldb': '51e5eb552f777b950bb0ff326e60d5f0', + 'lld': '7143cc4fa88851a9f9b9a03621fbb387', } }, { @@ -344,6 +363,7 @@ class Llvm(CMakePackage): 'cfe': '93f9532f8f7e6f1d8e5c1116907051cb', 'clang-tools-extra': 'f13f31ed3038acadc6fa63fef812a246', 'lldb': 'cc5ea8a414c62c33e760517f8929a204', + 'lld': '173be02b7ff4e5e31fbb0a591a03d7a3', } }, ] @@ -409,6 +429,8 @@ class Llvm(CMakePackage): if '+lldb' not in spec: cmake_args.extend(['-DLLVM_EXTERNAL_LLDB_BUILD:Bool=OFF', '-DLLVM_TOOL_LLDB_BUILD:Bool=OFF']) + if '+lld' not in spec: + cmake_args.append('-DLLVM_TOOL_LLD_BUILD:Bool=OFF') if '+internal_unwind' not in spec: cmake_args.append('-DLLVM_EXTERNAL_LIBUNWIND_BUILD:Bool=OFF') if '+libcxx' in spec: @@ -427,7 +449,15 @@ class Llvm(CMakePackage): cmake_args.append('-DLLVM_LINK_LLVM_DYLIB:Bool=ON') if '+all_targets' not in spec: # all is default on cmake - targets = ['CppBackend', 'NVPTX', 'AMDGPU'] + + if spec.version < Version('3.9.0'): + targets = ['CppBackend', 'NVPTX', 'AMDGPU'] + else: + # Starting in 3.9.0 CppBackend is no longer a target (see + # LLVM_ALL_TARGETS in llvm's top-level CMakeLists.txt for + # the complete list of targets) + targets = ['NVPTX', 'AMDGPU'] + if 'x86' in spec.architecture.target.lower(): targets.append('X86') elif 'arm' in spec.architecture.target.lower(): @@ -435,7 +465,7 @@ class Llvm(CMakePackage): elif 'aarch64' in spec.architecture.target.lower(): targets.append('AArch64') elif 'sparc' in spec.architecture.target.lower(): - targets.append('sparc') + targets.append('Sparc') elif ('ppc' in spec.architecture.target.lower() or 'power' in spec.architecture.target.lower()): targets.append('PowerPC') @@ -452,7 +482,9 @@ class Llvm(CMakePackage): with working_dir(self.build_directory): # When building shared libraries these need to be installed first make('install-LLVMTableGen') - make('install-LLVMDemangle') + if self.spec.version >= Version('4.0.0'): + # LLVMDemangle target was added in 4.0.0 + make('install-LLVMDemangle') make('install-LLVMSupport') @run_after('install') -- cgit v1.2.3-70-g09d2 From dbcf243d37c69c149fda30a60d4e516b8ba08e2b Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Mon, 26 Feb 2018 06:35:17 -0700 Subject: hpgmg: more sane defaults for a proxy (#7330) --- var/spack/repos/builtin/packages/hpgmg/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hpgmg/package.py b/var/spack/repos/builtin/packages/hpgmg/package.py index a7517a3258..162306a06e 100644 --- a/var/spack/repos/builtin/packages/hpgmg/package.py +++ b/var/spack/repos/builtin/packages/hpgmg/package.py @@ -44,7 +44,7 @@ class Hpgmg(Package): version('develop', git='https://bitbucket.org/hpgmg/hpgmg.git', branch='master') variant( - 'fe', default=True, description='Build finite element solver') + 'fe', default=False, description='Build finite element solver') variant( 'fv', default='mpi', values=('serial', 'mpi', 'none'), description='Build finite volume solver with or without MPI support') -- cgit v1.2.3-70-g09d2 From 4b63ecd0751166b3de50f31a70819b1908f9a448 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Mon, 26 Feb 2018 06:35:34 -0700 Subject: ebms: needs mpi-2 (#7320) --- var/spack/repos/builtin/packages/ebms/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ebms/package.py b/var/spack/repos/builtin/packages/ebms/package.py index 252be1bd3d..d9bce0a661 100644 --- a/var/spack/repos/builtin/packages/ebms/package.py +++ b/var/spack/repos/builtin/packages/ebms/package.py @@ -43,7 +43,7 @@ class Ebms(MakefilePackage): variant('mpi', default=True, description='Build with MPI support') - depends_on('mpi', when='+mpi') + depends_on('mpi@2:', when='+mpi') tags = ['proxy-app'] -- cgit v1.2.3-70-g09d2 From 5b3e149f08c24e4d143f7870116dce7ac33e6779 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Mon, 26 Feb 2018 06:35:47 -0700 Subject: branson: needs mpi-2 (#7319) --- var/spack/repos/builtin/packages/branson/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/branson/package.py b/var/spack/repos/builtin/packages/branson/package.py index 7eedf7135e..8546fe396f 100644 --- a/var/spack/repos/builtin/packages/branson/package.py +++ b/var/spack/repos/builtin/packages/branson/package.py @@ -38,7 +38,7 @@ class Branson(CMakePackage): version('develop', git='https://github.com/lanl/branson', branch='develop') version('1.01', 'cf7095a887a8dd7d417267615bd0452a') - depends_on('mpi') + depends_on('mpi@2:') depends_on('boost') depends_on('metis') depends_on('parmetis') -- cgit v1.2.3-70-g09d2 From 3683ab87b5a3927f31e0d0337b314c2a3e515782 Mon Sep 17 00:00:00 2001 From: healther Date: Mon, 26 Feb 2018 19:33:40 +0100 Subject: llvm package: update python dependency (#7100) llvm versions >= 5 can use python 3.x --- var/spack/repos/builtin/packages/llvm/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index f1f84cc489..ae35eb56e9 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -81,7 +81,8 @@ class Llvm(CMakePackage): depends_on('cmake@3.4.3:', type='build') # Universal dependency - depends_on('python@2.7:2.8') # Seems not to support python 3.X.Y + depends_on('python@2.7:2.8', when='@:4.999') + depends_on('python') depends_on('py-lit', type=('build', 'run')) # lldb dependencies -- cgit v1.2.3-70-g09d2 From 072e78dd52c0c6ebc25af01656cd57eb1814397b Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Mon, 26 Feb 2018 20:47:22 +0100 Subject: cpu_features (#7302) Adds Google's new cpu_features library. Install was added recently, so don't take the `0.1.0` release but the current `master` until a new version is published. --- .../repos/builtin/packages/cpu-features/package.py | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 var/spack/repos/builtin/packages/cpu-features/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cpu-features/package.py b/var/spack/repos/builtin/packages/cpu-features/package.py new file mode 100644 index 0000000000..157288a25c --- /dev/null +++ b/var/spack/repos/builtin/packages/cpu-features/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class CpuFeatures(CMakePackage): + """A cross platform C99 library to get cpu features at runtime.""" + + homepage = "https://github.com/google/cpu_features" + url = "https://github.com/google/cpu_features/archive/v0.1.0.tar.gz" + + version('develop', branch='master', + git='https://github.com/google/cpu_features.git') + + depends_on('cmake@3.0.0:', type='build') + + def cmake_args(self): + args = [ + '-DBUILD_TESTING:BOOL=OFF' + ] + return args -- cgit v1.2.3-70-g09d2 From 03cf03e581df145524c081f88ad99b2e5cc255f1 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Tue, 27 Feb 2018 13:00:07 +0100 Subject: spglib: add new package (#7321) --- .../packages/spglib/fix_cmake_install.patch | 25 ++++++++++++++ .../repos/builtin/packages/spglib/fix_cpp.patch | 34 +++++++++++++++++++ var/spack/repos/builtin/packages/spglib/package.py | 39 ++++++++++++++++++++++ 3 files changed, 98 insertions(+) create mode 100644 var/spack/repos/builtin/packages/spglib/fix_cmake_install.patch create mode 100644 var/spack/repos/builtin/packages/spglib/fix_cpp.patch create mode 100644 var/spack/repos/builtin/packages/spglib/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/spglib/fix_cmake_install.patch b/var/spack/repos/builtin/packages/spglib/fix_cmake_install.patch new file mode 100644 index 0000000000..d7451460db --- /dev/null +++ b/var/spack/repos/builtin/packages/spglib/fix_cmake_install.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3296d91..d18d26c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -47,17 +47,17 @@ set(SOURCES ${PROJECT_SOURCE_DIR}/src/arithmetic.c + add_library(symspg SHARED ${SOURCES}) + set_property(TARGET symspg PROPERTY VERSION ${serial}) + set_property(TARGET symspg PROPERTY SOVERSION ${soserial}) +-install(TARGETS symspg LIBRARY DESTINATION ${PROJECT_SOURCE_DIR}/lib) ++install(TARGETS symspg LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) + + # Static link library + add_library(symspg_static STATIC ${SOURCES}) + set_property(TARGET symspg_static PROPERTY VERSION ${serial}) + set_property(TARGET symspg_static PROPERTY SOVERSION ${soserial}) + set_property(TARGET symspg_static PROPERTY OUTPUT_NAME symspg) +-install(TARGETS symspg_static ARCHIVE DESTINATION ${PROJECT_SOURCE_DIR}/lib) ++install(TARGETS symspg_static ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) + + # Header file +-install(FILES ${PROJECT_SOURCE_DIR}/src/spglib.h DESTINATION ${PROJECT_SOURCE_DIR}/include) ++install(FILES ${PROJECT_SOURCE_DIR}/src/spglib.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include) + + # make check + enable_testing() diff --git a/var/spack/repos/builtin/packages/spglib/fix_cpp.patch b/var/spack/repos/builtin/packages/spglib/fix_cpp.patch new file mode 100644 index 0000000000..9ab4c9bffe --- /dev/null +++ b/var/spack/repos/builtin/packages/spglib/fix_cpp.patch @@ -0,0 +1,34 @@ +From a91ea68d6771ed7d6b03bcbffd891489dc77e574 Mon Sep 17 00:00:00 2001 +From: Krishnendu Ghosh +Date: Thu, 22 Feb 2018 14:24:14 -0500 +Subject: [PATCH] added extern "C" + +--- + src/spglib.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/spglib.h b/src/spglib.h +index e1746b1..530dfa4 100644 +--- a/src/spglib.h ++++ b/src/spglib.h +@@ -35,6 +35,9 @@ + #ifndef __spglib_H__ + #define __spglib_H__ + ++#ifdef __cplusplus ++extern "C" { ++#endif + /* SPGCONST is used instead of 'const' so to avoid gcc warning. */ + /* However there should be better way than this way.... */ + #ifndef SPGCONST +@@ -481,4 +484,7 @@ void spg_get_neighboring_grid_points(int relative_grid_points[], + /* Return 0 if failed */ + int spg_niggli_reduce(double lattice[3][3], const double symprec); + ++#ifdef __cplusplus ++} ++#endif + #endif +-- +2.7.4.1.g5468f9e + diff --git a/var/spack/repos/builtin/packages/spglib/package.py b/var/spack/repos/builtin/packages/spglib/package.py new file mode 100644 index 0000000000..45f35a0cdc --- /dev/null +++ b/var/spack/repos/builtin/packages/spglib/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Spglib(CMakePackage): + """C library for finding and handling crystal symmetries.""" + + homepage = "https://atztogo.github.io/spglib/" + url = "https://github.com/atztogo/spglib/archive/v1.10.3.tar.gz" + + patch('fix_cmake_install.patch', when='@:1.10.3') + # patch by Krishnendu Ghosh + patch('fix_cpp.patch', when='@:1.10.3') + + version('1.10.3', 'f6ef0554fa528ffa49d8eaee18a2b7b9') + version('1.10.0', '0ad9330ae8a511d25e2e26cb9bf02808') -- cgit v1.2.3-70-g09d2 From f04837b03ec9ebf29bc1ecd18d8daefe627ae975 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Tue, 27 Feb 2018 05:02:04 -0700 Subject: snbone: fix build gcc-4.8 (#7317) --- var/spack/repos/builtin/packages/snbone/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/snbone/package.py b/var/spack/repos/builtin/packages/snbone/package.py index eb493d9a16..d1d2a63806 100644 --- a/var/spack/repos/builtin/packages/snbone/package.py +++ b/var/spack/repos/builtin/packages/snbone/package.py @@ -50,7 +50,9 @@ class Snbone(MakefilePackage): elif self.compiler.name == 'intel': make('COMPILER=intel', 'LDFLAGS=-lm') else: - make('COMPILER=gfortran', 'LDFLAGS=-lm') + # older gcc need link libs after objs, but + # LDFLAGS is in the front, so use IBMLIB instead + make('COMPILER=gfortran', 'IBMLIB=-lm') def install(self, spec, prefix): mkdirp(prefix.bin.C) -- cgit v1.2.3-70-g09d2 From cba5457d625873a837ac5e579620b5eaa58c7dca Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Tue, 27 Feb 2018 05:02:47 -0700 Subject: minighost: fix mpi build (#7310) --- var/spack/repos/builtin/packages/minighost/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/minighost/package.py b/var/spack/repos/builtin/packages/minighost/package.py index f397306645..4602c7b4ee 100644 --- a/var/spack/repos/builtin/packages/minighost/package.py +++ b/var/spack/repos/builtin/packages/minighost/package.py @@ -56,7 +56,7 @@ class Minighost(MakefilePackage): targets.append('FC={0}'.format(self.spec['mpi'].mpif77)) targets.append('CC={0}'.format(self.spec['mpi'].mpicc)) targets.append( - 'LIBS=-lm -lgfortran -lmpi_usempi -lmpi_mpifh -lmpi') + 'LIBS=-lm -lmpicxx') else: targets.append('PROTOCOL=-D_MG_SERIAL') targets.append('FC=f77') -- cgit v1.2.3-70-g09d2 From 0c85aa09af3e2cf01b954ee4a0e27d3372814488 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Tue, 27 Feb 2018 13:15:59 +0100 Subject: MPark.Variant (#7251) Adds Michael Park's C++11 `std::variant` (a C++17 stdlib feature). --- .../builtin/packages/mpark-variant/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/mpark-variant/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mpark-variant/package.py b/var/spack/repos/builtin/packages/mpark-variant/package.py new file mode 100644 index 0000000000..2cab0222be --- /dev/null +++ b/var/spack/repos/builtin/packages/mpark-variant/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class MparkVariant(CMakePackage): + """C++17 `std::variant` for C++11/14/17""" + + homepage = "https://mpark.github.io/variant" + url = "https://github.com/mpark/variant/archive/v1.3.0.tar.gz" + maintainers = ['ax3l'] + + version('1.3.0', '368b7d6f1a07bd6ee26ff518258dc71c') + + conflicts('%gcc@:4.7') + conflicts('%clang@:3.5') -- cgit v1.2.3-70-g09d2 From ae1759eb16f7ee7280fd8080a4782f5edf3cdb50 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Tue, 27 Feb 2018 04:16:40 -0800 Subject: aspcud@1.9.4: new package (#7094) --- var/spack/repos/builtin/packages/aspcud/package.py | 53 ++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 var/spack/repos/builtin/packages/aspcud/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/aspcud/package.py b/var/spack/repos/builtin/packages/aspcud/package.py new file mode 100644 index 0000000000..89f32c1a31 --- /dev/null +++ b/var/spack/repos/builtin/packages/aspcud/package.py @@ -0,0 +1,53 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Aspcud(CMakePackage): + """Aspcud: Package dependency solver + + Aspcud is a solver for package dependencies. A package universe + and a request to install, remove, or upgrade packages have to + be encoded in the CUDF format. Such a CUDF document can then be + passed to aspcud along with an optimization criteria to obtain + a solution to the given package problem.""" + + homepage = "https://potassco.org/aspcud" + url = "https://github.com/potassco/aspcud/archive/v1.9.4.tar.gz" + + version('1.9.4', '35e5c663a25912e4bdc94f168e827ed2') + + depends_on('boost', type=('build')) + depends_on('cmake', type=('build')) + depends_on('re2c', type=('build')) + depends_on('clingo') + + def cmake_args(self): + spec = self.spec + gringo_path = join_path(spec['clingo'].prefix.bin, 'gringo') + clasp_path = join_path(spec['clingo'].prefix.bin, 'clasp') + args = ['-DASPCUD_GRINGO_PATH={0}'.format(gringo_path), + '-DASPCUD_CLASP_PATH={0}'.format(clasp_path)] + return args -- cgit v1.2.3-70-g09d2 From 2244e43e2b3b89e24d91e7d6b05a7809e4f359e4 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Tue, 27 Feb 2018 11:23:33 -0700 Subject: minighost package: fixed a typo (#7349) --- var/spack/repos/builtin/packages/minighost/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/minighost/package.py b/var/spack/repos/builtin/packages/minighost/package.py index 4602c7b4ee..57e590af30 100644 --- a/var/spack/repos/builtin/packages/minighost/package.py +++ b/var/spack/repos/builtin/packages/minighost/package.py @@ -56,7 +56,7 @@ class Minighost(MakefilePackage): targets.append('FC={0}'.format(self.spec['mpi'].mpif77)) targets.append('CC={0}'.format(self.spec['mpi'].mpicc)) targets.append( - 'LIBS=-lm -lmpicxx') + 'LIBS=-lm -lmpi_cxx') else: targets.append('PROTOCOL=-D_MG_SERIAL') targets.append('FC=f77') -- cgit v1.2.3-70-g09d2 From 5689fd304c6c4df3679c6bb58f8b6e65ea5072a1 Mon Sep 17 00:00:00 2001 From: Robert Pavel Date: Tue, 27 Feb 2018 11:42:35 -0700 Subject: Added initial Spackage for examinimd (#7350) --- .../repos/builtin/packages/examinimd/package.py | 85 ++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 var/spack/repos/builtin/packages/examinimd/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/examinimd/package.py b/var/spack/repos/builtin/packages/examinimd/package.py new file mode 100644 index 0000000000..39fc853d11 --- /dev/null +++ b/var/spack/repos/builtin/packages/examinimd/package.py @@ -0,0 +1,85 @@ +############################################################################## +# Copyright (c) 2018, Los Alamos National Security, LLC +# Produced at the Los Alamos National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class Examinimd(MakefilePackage): + """ExaMiniMD is a proxy application and research vehicle for particle codes, + in particular Molecular Dynamics (MD). Compared to previous MD proxy apps + (MiniMD, COMD), its design is significantly more modular in order to allow + independent investigation of different aspects. To achieve that the main + components such as force calculation, communication, neighbor list + construction and binning are derived classes whose main functionality is + accessed via virtual functions. This allows a developer to write a new + derived class and drop it into the code without touching much of the + rest of the application.""" + + tags = ['proxy-app', 'ecp-proxy-app'] + + homepage = "https://github.com/ECP-copa/ExaMiniMD" + url = "https://github.com/ECP-copa/ExaMiniMD/archive/master.zip" + + version('develop', git='https://github.com/ECP-copa/ExaMiniMD', branch='master') + # TODO: Add proper tagged release when available + + variant('mpi', default=True, description='Build with MPI support') + variant('openmp', default=False, description='Build with OpenMP support') + variant('pthreads', default=False, description='Build with POSIX Threads support') + # TODO: Set up cuda variant when test machine available + + conflicts('+openmp', when='+pthreads') + + depends_on('kokkos') + depends_on('mpi', when='+mpi') + + @property + def build_targets(self): + targets = [] + # Append Kokkos + targets.append('KOKKOS_PATH={0}'.format(self.spec['kokkos'].prefix)) + # Set kokkos device + if 'openmp' in self.spec: + targets.append('KOKKOS_DEVICES=OpenMP') + elif 'pthreads' in self.spec: + targets.append('KOKKOS_DEVICES=Pthread') + else: + targets.append('KOKKOS_DEVICES=Serial') + # Set MPI as needed + if '+mpi' in self.spec: + targets.append('MPI=1') + targets.append('CXX = {0}'.format(self.spec['mpi'].mpicxx)) + else: + targets.append('MPI=0') + targets.append('CXX = {0}'.format('spack_cxx')) + return targets + + def install(self, spec, prefix): + mkdirp(prefix.bin) + install('src/ExaMiniMD', prefix.bin) + install_tree('input', prefix.input) + mkdirp(prefix.doc) + install('README.md', prefix.doc) + install('LICENSE.md', prefix.doc) -- cgit v1.2.3-70-g09d2 From 0e326c96873bc5f18d0ce33c2c68a7b90b8b7130 Mon Sep 17 00:00:00 2001 From: "Mark C. Miller" Date: Tue, 27 Feb 2018 12:49:04 -0800 Subject: updating zfp version (#7304) --- var/spack/repos/builtin/packages/zfp/package.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/zfp/package.py b/var/spack/repos/builtin/packages/zfp/package.py index 704dc9dc72..25d6a53bc2 100644 --- a/var/spack/repos/builtin/packages/zfp/package.py +++ b/var/spack/repos/builtin/packages/zfp/package.py @@ -26,18 +26,15 @@ from spack import * class Zfp(MakefilePackage): - """zfp is an open source C library for compressed floating-point arrays - that supports very high throughput read and write random acces, - target error bounds or bit rates. Although bit-for-bit lossless - compression is not always possible, zfp is usually accurate to - within machine epsilon in near-lossless mode, and is often orders - of magnitude more accurate than other lossy compressors. Versions - of zfp 0.5.1 or newer also support compression of integer data. + """zfp is an open source C/C++ library for high-fidelity, high-throughput + lossy compression of floating-point and integer multi-dimensional + arrays. """ homepage = 'http://computation.llnl.gov/projects/floating-point-compression' - url = 'http://computation.llnl.gov/projects/floating-point-compression/download/zfp-0.5.1.tar.gz' + url = 'http://computation.llnl.gov/projects/floating-point-compression/download/zfp-0.5.2.tar.gz' + version('0.5.2', '2f0a77aa34087219a6e10b8b7d031e77') version('0.5.1', '0ed7059a9b480635e0dd33745e213d17') version('0.5.0', '2ab29a852e65ad85aae38925c5003654') -- cgit v1.2.3-70-g09d2 From f302d642358e28ed7a4efc1a3ccd9dc0bba604fb Mon Sep 17 00:00:00 2001 From: healther Date: Wed, 28 Feb 2018 08:46:02 +0100 Subject: add package verilator (#7332) * add verilator package * try to add environment variable and include folder * manually install existing scripts and patch out spack's CXX wrapper * added some comments * make flake8 happy --- .../repos/builtin/packages/verilator/package.py | 80 ++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 var/spack/repos/builtin/packages/verilator/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/verilator/package.py b/var/spack/repos/builtin/packages/verilator/package.py new file mode 100644 index 0000000000..c2db2e02db --- /dev/null +++ b/var/spack/repos/builtin/packages/verilator/package.py @@ -0,0 +1,80 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Verilator(AutotoolsPackage): + """Verilator is the fastest free Verilog HDL simulator. + + It compiles synthesizable Verilog (not test-bench code!), plus some PSL, + SystemVerilog and Synthesis assertions into C++ or SystemC code. It is + designed for large projects where fast simulation performance is of primary + concern, and is especially well suited to generate executable models of + CPUs for embedded software design teams. + + Please do not download this program if you are expecting a full featured + replacement for NC-Verilog, VCS or another commercial Verilog simulator + or Verilog compiler for a little project! (Try Icarus instead.) However, if + you are looking for a path to migrate synthesizable Verilog to C++ or + SystemC, and writing just a touch of C code and Makefiles doesn't scare you + off, this is the free Verilog compiler for you. + + Verilator supports the synthesis subset of Verilog, plus initial + statements, proper blocking/non-blocking assignments, functions, tasks, + multi-dimensional arrays, and signed numbers. It also supports very simple + forms of SystemVerilog assertions and coverage analysis. Verilator supports + the more important Verilog 2005 constructs, and some SystemVerilog + features, with additional constructs being added as users request them. + + Verilator has been used to simulate many very large multi-million gate + designs with thousands of modules.""" + + homepage = "https://www.veripool.org/projects/verilator" + url = "https://www.veripool.org/ftp/verilator-3.920.tgz" + + version('3.920', '71de7b9ddb27a72e96ed2a04e5ccf933') + + depends_on('bison') + depends_on('flex') + depends_on('perl') + + def setup_environment(self, spack_env, run_env): + run_env.prepend_path('VERILATOR_ROOT', self.prefix) + + # verilator requires access to its shipped scripts (bin) and include + # but the standard make doesn't put it in the correct places + @run_before('install') + def install_include(self): + install_tree('include', prefix.include) + install_tree('bin', prefix.bin) + + # we need to fix the CXX and LINK paths, as they point to the spack + # wrapper scripts which aren't usable without spack + @run_after('install') + def patch_CXX(self): + filter_file(r'^CXX\s*=.*', 'CXX = {0}'.format(self.compiler.cxx), + join_path(self.prefix.include, 'verilated.mk')) + filter_file(r'^LINK\s*=.*', 'LINK = {0}'.format(self.compiler.cxx), + join_path(self.prefix.include, 'verilated.mk')) -- cgit v1.2.3-70-g09d2 From 6c2fe27f419f2b788307fb2d7e80a1f710412362 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Wed, 28 Feb 2018 10:02:33 -0700 Subject: examinimd: fix a typo (#7352) --- var/spack/repos/builtin/packages/examinimd/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/examinimd/package.py b/var/spack/repos/builtin/packages/examinimd/package.py index 39fc853d11..01f0b24dc0 100644 --- a/var/spack/repos/builtin/packages/examinimd/package.py +++ b/var/spack/repos/builtin/packages/examinimd/package.py @@ -82,4 +82,4 @@ class Examinimd(MakefilePackage): install_tree('input', prefix.input) mkdirp(prefix.doc) install('README.md', prefix.doc) - install('LICENSE.md', prefix.doc) + install('LICENSE', prefix.doc) -- cgit v1.2.3-70-g09d2 From 3089207ced6b7a8efdb36c4f6d92272dbda3e984 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Wed, 28 Feb 2018 10:37:01 -0700 Subject: minighost: fix build on Ubuntu (#7354) * minighost: fix build on Ubuntu * minighost: append -lgfortran only for gcc --- var/spack/repos/builtin/packages/minighost/package.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/minighost/package.py b/var/spack/repos/builtin/packages/minighost/package.py index 57e590af30..5142508332 100644 --- a/var/spack/repos/builtin/packages/minighost/package.py +++ b/var/spack/repos/builtin/packages/minighost/package.py @@ -55,16 +55,17 @@ class Minighost(MakefilePackage): targets.append('PROTOCOL=-D_MG_MPI') targets.append('FC={0}'.format(self.spec['mpi'].mpif77)) targets.append('CC={0}'.format(self.spec['mpi'].mpicc)) - targets.append( - 'LIBS=-lm -lmpi_cxx') else: targets.append('PROTOCOL=-D_MG_SERIAL') targets.append('FC=f77') targets.append('CC=cc') - targets.append('LIBS=-lm -lgfortran') if '%gcc' in self.spec: targets.append('COMPILER_SUITE=gnu') + if '+mpi' in self.spec: + targets.append('LIBS=-lm -lmpi_cxx -lgfortran') + else: + targets.append('LIBS=-lm -lgfortran') elif '%cce' in self.spec: targets.append('COMPILER_SUITE=cray') elif '%intel' in self.spec: -- cgit v1.2.3-70-g09d2 From 98949bd79b18d1cd33e67314a893e46a2beb4958 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Wed, 28 Feb 2018 20:15:26 +0100 Subject: change recurse into recursive in a few places (#7342) --- var/spack/repos/builtin/packages/bzip2/package.py | 2 +- var/spack/repos/builtin/packages/fftw/package.py | 2 +- var/spack/repos/builtin/packages/intel-parallel-studio/package.py | 4 ++-- var/spack/repos/builtin/packages/libxsmm/package.py | 4 ++-- var/spack/repos/builtin/packages/netcdf-cxx/package.py | 2 +- var/spack/repos/builtin/packages/netcdf-cxx4/package.py | 2 +- var/spack/repos/builtin/packages/netlib-xblas/package.py | 2 +- var/spack/repos/builtin/packages/opencv/package.py | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bzip2/package.py b/var/spack/repos/builtin/packages/bzip2/package.py index 53ed853310..d9b81324e5 100644 --- a/var/spack/repos/builtin/packages/bzip2/package.py +++ b/var/spack/repos/builtin/packages/bzip2/package.py @@ -45,7 +45,7 @@ class Bzip2(Package): def libs(self): shared = '+shared' in self.spec return find_libraries( - 'libbz2', root=self.prefix, shared=shared, recurse=True + 'libbz2', root=self.prefix, shared=shared, recursive=True ) def patch(self): diff --git a/var/spack/repos/builtin/packages/fftw/package.py b/var/spack/repos/builtin/packages/fftw/package.py index 87dc0cbba3..d33439ee18 100644 --- a/var/spack/repos/builtin/packages/fftw/package.py +++ b/var/spack/repos/builtin/packages/fftw/package.py @@ -118,7 +118,7 @@ class Fftw(AutotoolsPackage): libraries.append('libfftw3' + sfx) - return find_libraries(libraries, root=self.prefix, recurse=True) + return find_libraries(libraries, root=self.prefix, recursive=True) def autoreconf(self, spec, prefix): if '+pfft_patches' in spec: diff --git a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py index fc399e5d24..e49a5a8005 100644 --- a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py +++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py @@ -258,7 +258,7 @@ class IntelParallelStudio(IntelPackage): libraries = ['libmpicxx'] + libraries return find_libraries( - libraries, root=mpi_root, shared=True, recurse=True + libraries, root=mpi_root, shared=True, recursive=True ) @property @@ -266,7 +266,7 @@ class IntelParallelStudio(IntelPackage): # recurse from self.prefix will find too many things for all the # supported sub-architectures like 'mic' mpi_root = self.prefix.compilers_and_libraries.linux.mpi.include64 - return find_headers('mpi', root=mpi_root, recurse=False) + return find_headers('mpi', root=mpi_root, recursive=False) @property def components(self): diff --git a/var/spack/repos/builtin/packages/libxsmm/package.py b/var/spack/repos/builtin/packages/libxsmm/package.py index 3cde61147f..3a3a2087dd 100644 --- a/var/spack/repos/builtin/packages/libxsmm/package.py +++ b/var/spack/repos/builtin/packages/libxsmm/package.py @@ -68,10 +68,10 @@ class Libxsmm(MakefilePackage): @property def libs(self): result = find_libraries(['libxsmm', 'libxsmmf'], root=self.prefix, - recurse=True) + recursive=True) if len(result) == 0: result = find_libraries(['libxsmm', 'libxsmmf'], root=self.prefix, - shared=False, recurse=True) + shared=False, recursive=True) return result def edit(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/netcdf-cxx/package.py b/var/spack/repos/builtin/packages/netcdf-cxx/package.py index f3bb4e6135..a87e3e7644 100644 --- a/var/spack/repos/builtin/packages/netcdf-cxx/package.py +++ b/var/spack/repos/builtin/packages/netcdf-cxx/package.py @@ -42,5 +42,5 @@ class NetcdfCxx(AutotoolsPackage): def libs(self): shared = True return find_libraries( - 'libnetcdf_c++', root=self.prefix, shared=shared, recurse=True + 'libnetcdf_c++', root=self.prefix, shared=shared, recursive=True ) diff --git a/var/spack/repos/builtin/packages/netcdf-cxx4/package.py b/var/spack/repos/builtin/packages/netcdf-cxx4/package.py index 3c68538f0b..7cd2cdca3e 100644 --- a/var/spack/repos/builtin/packages/netcdf-cxx4/package.py +++ b/var/spack/repos/builtin/packages/netcdf-cxx4/package.py @@ -45,5 +45,5 @@ class NetcdfCxx4(AutotoolsPackage): def libs(self): shared = True return find_libraries( - 'libnetcdf_c++4', root=self.prefix, shared=shared, recurse=True + 'libnetcdf_c++4', root=self.prefix, shared=shared, recursive=True ) diff --git a/var/spack/repos/builtin/packages/netlib-xblas/package.py b/var/spack/repos/builtin/packages/netlib-xblas/package.py index cde2a94658..e24f7879d6 100644 --- a/var/spack/repos/builtin/packages/netlib-xblas/package.py +++ b/var/spack/repos/builtin/packages/netlib-xblas/package.py @@ -54,7 +54,7 @@ class NetlibXblas(AutotoolsPackage): @property def libs(self): return find_libraries(['libxblas'], root=self.prefix, - shared=False, recurse=True) + shared=False, recursive=True) def configure_args(self): args = [] diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index c7082bb194..8a16894e68 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -234,5 +234,5 @@ class Opencv(CMakePackage): def libs(self): shared = "+shared" in self.spec return find_libraries( - "libopencv_*", root=self.prefix, shared=shared, recurse=True + "libopencv_*", root=self.prefix, shared=shared, recursive=True ) -- cgit v1.2.3-70-g09d2 From da2d6cccd68d7ca0772c4a0d321ecaada431762e Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 28 Feb 2018 19:41:22 -0600 Subject: new package: py-goatools (#7328) --- .../repos/builtin/packages/py-goatools/package.py | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-goatools/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-goatools/package.py b/var/spack/repos/builtin/packages/py-goatools/package.py new file mode 100644 index 0000000000..921ad82279 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-goatools/package.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyGoatools(PythonPackage): + """Python scripts to find enrichment of GO terms""" + + homepage = "https://github.com/tanghaibao/goatools" + url = "https://pypi.io/packages/source/g/goatools/goatools-0.7.11.tar.gz" + + version('0.7.11', 'f2ab989ec9c4acdd80504b263c3b3188') + + depends_on('py-nose', type=('build', 'run')) + depends_on('py-numpy', type=('build', 'run')) + depends_on('py-pandas', type=('build', 'run')) + depends_on('py-pydot', type=('build', 'run')) + depends_on('py-pyparsing', type=('build', 'run')) + depends_on('py-pytest', type=('build', 'run')) + depends_on('py-scipy', type=('build', 'run')) + depends_on('py-statsmodels', type=('build', 'run')) + depends_on('py-xlrd', type=('build', 'run')) + depends_on('py-xlsxwriter', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From b4b01b82aca0343305a28cc368bf68e343e2fe1c Mon Sep 17 00:00:00 2001 From: Omri Mor Date: Wed, 28 Feb 2018 19:48:57 -0600 Subject: mpich@develop: needs git submodules (#7357) --- var/spack/repos/builtin/packages/mpich/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mpich/package.py b/var/spack/repos/builtin/packages/mpich/package.py index 5573b71197..761c39448c 100644 --- a/var/spack/repos/builtin/packages/mpich/package.py +++ b/var/spack/repos/builtin/packages/mpich/package.py @@ -42,7 +42,7 @@ class Mpich(AutotoolsPackage): version('3.1.1', '40dc408b1e03cc36d80209baaa2d32b7') version('3.1', '5643dd176499bfb7d25079aaff25f2ec') version('3.0.4', '9c5d5d4fe1e17dd12153f40bc5b6dbc0') - version('develop', git='git://github.com/pmodels/mpich') + version('develop', git='git://github.com/pmodels/mpich', submodules=True) variant('hydra', default=True, description='Build the hydra process manager') variant('pmi', default=True, description='Build with PMI support') -- cgit v1.2.3-70-g09d2 From 1ac0bce3e9c8e1650a48e79a8a787c0a8849485f Mon Sep 17 00:00:00 2001 From: healther Date: Thu, 1 Mar 2018 08:13:06 +0100 Subject: help gdb pick up python3 (#7104) * Update gdb to autotools package * Help gdb find python libraries for python 3 --- var/spack/repos/builtin/packages/gdb/package.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gdb/package.py b/var/spack/repos/builtin/packages/gdb/package.py index b5d64c70ee..fa2e176ce6 100644 --- a/var/spack/repos/builtin/packages/gdb/package.py +++ b/var/spack/repos/builtin/packages/gdb/package.py @@ -25,7 +25,7 @@ from spack import * -class Gdb(Package): +class Gdb(AutotoolsPackage): """GDB, the GNU Project debugger, allows you to see what is going on 'inside' another program while it executes -- or what another program was doing at the moment it crashed. @@ -52,10 +52,10 @@ class Gdb(Package): # Optional dependency depends_on('python', when='+python') - def install(self, spec, prefix): - options = ['--prefix=%s' % prefix] - if '+python' in spec: - options.extend(['--with-python']) - configure(*options) - make() - make("install") + def configure_args(self): + args = [] + if '+python' in self.spec: + args.append('--with-python') + args.append('LDFLAGS={0}'.format( + self.spec['python'].libs.ld_flags)) + return args -- cgit v1.2.3-70-g09d2 From 86afd0e851c00a891ce457daedde72154e74f13b Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 1 Mar 2018 14:37:16 -0600 Subject: new package: perl-parallel-forkmanager (#7049) --- .../packages/perl-parallel-forkmanager/package.py | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-parallel-forkmanager/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-parallel-forkmanager/package.py b/var/spack/repos/builtin/packages/perl-parallel-forkmanager/package.py new file mode 100644 index 0000000000..ff324a08f2 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-parallel-forkmanager/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlParallelForkmanager(PerlPackage): + """A simple parallel processing fork manager""" + + homepage = "http://search.cpan.org/~yanick/Parallel-ForkManager/lib/Parallel/ForkManager.pm" + url = "http://search.cpan.org/CPAN/authors/id/Y/YA/YANICK/Parallel-ForkManager-1.19.tar.gz" + + version('1.19', '0e7137dd4b6948e1633b3b9ebe3b87e1') -- cgit v1.2.3-70-g09d2 From 6213463aeb02fdc08013e1fd03b7d6db990897f5 Mon Sep 17 00:00:00 2001 From: junkudo Date: Thu, 1 Mar 2018 15:26:28 -0800 Subject: new package: hiop (#7039) --- var/spack/repos/builtin/packages/hiop/package.py | 75 ++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 var/spack/repos/builtin/packages/hiop/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hiop/package.py b/var/spack/repos/builtin/packages/hiop/package.py new file mode 100644 index 0000000000..157d93e314 --- /dev/null +++ b/var/spack/repos/builtin/packages/hiop/package.py @@ -0,0 +1,75 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Hiop(CMakePackage): + """HiOp is an optimization solver for solving certain mathematical + optimization problems expressed as nonlinear programming problems. + HiOp is a lightweight HPC solver that leverages application's existing + data parallelism to parallelize the optimization iterations by using + specialized linear algebra kernels.""" + + homepage = "https://github.com/LLNL/hiop" + url = "https://github.com/LLNL/hiop" + + version('0.1', git='https://github.com/LLNL/hiop', + tag='v0.1') + + variant('mpi', default=True, + description='Enable/Disable MPI') + + variant('deepchecking', default=True, + description='Ultra safety checks - \ + used for increased robustness and self-diagnostics') + + depends_on('mpi', when='+mpi') + depends_on('lapack') + depends_on('blas') + + flag_handler = CMakePackage.build_system_flags + + def cmake_args(self): + args = [] + spec = self.spec + + if '+mpi' in spec: + args.append("-DWITH_MPI=ON") + else: + args.append("-DWITH_MPI=OFF") + + if '+deepchecking' in spec: + args.append("-DDEEP_CHECKING=ON") + else: + args.append("-DDEEP_CHECKING=OFF") + + lapack_blas_libs = ( + spec['lapack'].libs + spec['blas'].libs).joined(';') + args.extend([ + '-DLAPACK_FOUND=TRUE', + '-DLAPACK_LIBRARIES={0}'.format(lapack_blas_libs) + ]) + + return args -- cgit v1.2.3-70-g09d2 From 189d9ec138393fe6b86cd3b86766a5ddb4d80850 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Fri, 2 Mar 2018 15:42:26 +0900 Subject: Rsync package: Fix Src Link (#7367) Fix the source link to rsync downloads. The old link only contained the latest release, the new link contains all. --- var/spack/repos/builtin/packages/rsync/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/rsync/package.py b/var/spack/repos/builtin/packages/rsync/package.py index 642f702ac0..f375489a8a 100644 --- a/var/spack/repos/builtin/packages/rsync/package.py +++ b/var/spack/repos/builtin/packages/rsync/package.py @@ -28,7 +28,7 @@ from spack import * class Rsync(AutotoolsPackage): """An open source utility that provides fast incremental file transfer.""" homepage = "https://rsync.samba.org" - url = "https://download.samba.org/pub/rsync/rsync-3.1.1.tar.gz" + url = "https://download.samba.org/pub/rsync/src/rsync-3.1.2.tar.gz" version('3.1.2', '0f758d7e000c0f7f7d3792610fad70cb') version('3.1.1', '43bd6676f0b404326eee2d63be3cdcfe') -- cgit v1.2.3-70-g09d2 From 1a77884c0786485670b786051333d7a80e5c1762 Mon Sep 17 00:00:00 2001 From: Eric Müller Date: Mon, 5 Mar 2018 10:01:23 +0100 Subject: fix ruby build on gcc >= 7 (#7387) * pkgconfig fixes a "libffi.a requires -fPIC" build error * the patches solve the mentioned problem on GCC 7.x --- var/spack/repos/builtin/packages/ruby/package.py | 6 ++ .../repos/builtin/packages/ruby/ruby_23_gcc7.patch | 98 ++++++++++++++++++++++ .../repos/builtin/packages/ruby/ruby_24_gcc7.patch | 66 +++++++++++++++ 3 files changed, 170 insertions(+) create mode 100644 var/spack/repos/builtin/packages/ruby/ruby_23_gcc7.patch create mode 100644 var/spack/repos/builtin/packages/ruby/ruby_24_gcc7.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ruby/package.py b/var/spack/repos/builtin/packages/ruby/package.py index 5c34a2add2..a633d9d54f 100644 --- a/var/spack/repos/builtin/packages/ruby/package.py +++ b/var/spack/repos/builtin/packages/ruby/package.py @@ -39,6 +39,7 @@ class Ruby(AutotoolsPackage): extendable = True + depends_on('pkgconfig', type=('build')) depends_on('libffi') depends_on('zlib') depends_on('libx11') @@ -47,6 +48,11 @@ class Ruby(AutotoolsPackage): depends_on('openssl', when='+openssl') depends_on('readline', when='+readline') + # gcc-7-based build requires patches (cf. https://bugs.ruby-lang.org/issues/13150) + patch('ruby_23_gcc7.patch', level=0, when='@2.2.0:2.2.999 %gcc@7:') + patch('ruby_23_gcc7.patch', level=0, when='@2.3.0:2.3.4 %gcc@7:') + patch('ruby_24_gcc7.patch', level=1, when='@2.4.0 %gcc@7:') + resource( name='rubygems-updated-ssl-cert', url='https://raw.githubusercontent.com/rubygems/rubygems/master/lib/rubygems/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem', diff --git a/var/spack/repos/builtin/packages/ruby/ruby_23_gcc7.patch b/var/spack/repos/builtin/packages/ruby/ruby_23_gcc7.patch new file mode 100644 index 0000000000..b7fdd530b7 --- /dev/null +++ b/var/spack/repos/builtin/packages/ruby/ruby_23_gcc7.patch @@ -0,0 +1,98 @@ +diff --git include/ruby/ruby.h include/ruby/ruby.h +index 60cfb1174e..dccfdc763a 100644 +--- include/ruby/ruby.h ++++ include/ruby/ruby.h +@@ -551,27 +551,23 @@ static inline int rb_type(VALUE obj); + ((type) == RUBY_T_FLOAT) ? RB_FLOAT_TYPE_P(obj) : \ + (!RB_SPECIAL_CONST_P(obj) && RB_BUILTIN_TYPE(obj) == (type))) + +-/* RB_GC_GUARD_PTR() is an intermediate macro, and has no effect by +- * itself. don't use it directly */ + #ifdef __GNUC__ +-#define RB_GC_GUARD_PTR(ptr) \ +- __extension__ ({volatile VALUE *rb_gc_guarded_ptr = (ptr); rb_gc_guarded_ptr;}) +-#else +-#ifdef _MSC_VER ++#define RB_GC_GUARD(v) \ ++ (*__extension__ ({ \ ++ volatile VALUE *rb_gc_guarded_ptr = &(v); \ ++ __asm__("" : : "m"(rb_gc_guarded_ptr)); \ ++ rb_gc_guarded_ptr; \ ++ })) ++#elif defined _MSC_VER + #pragma optimize("", off) + static inline volatile VALUE *rb_gc_guarded_ptr(volatile VALUE *ptr) {return ptr;} + #pragma optimize("", on) ++#define RB_GC_GUARD(v) (*rb_gc_guarded_ptr(&(v))) + #else + volatile VALUE *rb_gc_guarded_ptr_val(volatile VALUE *ptr, VALUE val); + #define HAVE_RB_GC_GUARDED_PTR_VAL 1 + #define RB_GC_GUARD(v) (*rb_gc_guarded_ptr_val(&(v),(v))) + #endif +-#define RB_GC_GUARD_PTR(ptr) rb_gc_guarded_ptr(ptr) +-#endif +- +-#ifndef RB_GC_GUARD +-#define RB_GC_GUARD(v) (*RB_GC_GUARD_PTR(&(v))) +-#endif + + #ifdef __GNUC__ + #define RB_UNUSED_VAR(x) x __attribute__ ((unused)) +diff --git marshal.c marshal.c +index c56de4af8d..b7274bf3c4 100644 +--- marshal.c ++++ marshal.c +@@ -1022,7 +1022,7 @@ VALUE + rb_marshal_dump_limited(VALUE obj, VALUE port, int limit) + { + struct dump_arg *arg; +- VALUE wrapper; /* used to avoid memory leak in case of exception */ ++ volatile VALUE wrapper; /* used to avoid memory leak in case of exception */ + + wrapper = TypedData_Make_Struct(rb_cData, struct dump_arg, &dump_arg_data, arg); + arg->dest = 0; +@@ -1051,8 +1051,8 @@ rb_marshal_dump_limited(VALUE obj, VALUE port, int limit) + rb_io_write(arg->dest, arg->str); + rb_str_resize(arg->str, 0); + } +- clear_dump_arg(arg); +- RB_GC_GUARD(wrapper); ++ free_dump_arg(arg); ++ rb_gc_force_recycle(wrapper); + + return port; + } +@@ -2044,7 +2044,7 @@ rb_marshal_load_with_proc(VALUE port, VALUE proc) + { + int major, minor, infection = 0; + VALUE v; +- VALUE wrapper; /* used to avoid memory leak in case of exception */ ++ volatile VALUE wrapper; /* used to avoid memory leak in case of exception */ + struct load_arg *arg; + + v = rb_check_string_type(port); +@@ -2090,8 +2090,8 @@ rb_marshal_load_with_proc(VALUE port, VALUE proc) + + if (!NIL_P(proc)) arg->proc = proc; + v = r_object(arg); +- clear_load_arg(arg); +- RB_GC_GUARD(wrapper); ++ free_load_arg(arg); ++ rb_gc_force_recycle(wrapper); + + return v; + } +diff --git test/ruby/test_marshal.rb test/ruby/test_marshal.rb +index 6ac5c29991..dc2b8b30dc 100644 +--- test/ruby/test_marshal.rb ++++ test/ruby/test_marshal.rb +@@ -645,6 +645,9 @@ def test_continuation + c = Bug9523.new + assert_raise_with_message(RuntimeError, /Marshal\.dump reentered at marshal_dump/) do + Marshal.dump(c) ++ GC.start ++ 1000.times {"x"*1000} ++ GC.start + c.cc.call + end + end diff --git a/var/spack/repos/builtin/packages/ruby/ruby_24_gcc7.patch b/var/spack/repos/builtin/packages/ruby/ruby_24_gcc7.patch new file mode 100644 index 0000000000..4be26af7d6 --- /dev/null +++ b/var/spack/repos/builtin/packages/ruby/ruby_24_gcc7.patch @@ -0,0 +1,66 @@ +diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h +index 6144c672346d..4aa388849ba4 100644 +--- a/include/ruby/ruby.h ++++ b/include/ruby/ruby.h +@@ -536,7 +536,11 @@ static inline int rb_type(VALUE obj); + + #ifdef __GNUC__ + #define RB_GC_GUARD(v) \ +- (*__extension__ ({volatile VALUE *rb_gc_guarded_ptr = &(v); rb_gc_guarded_ptr;})) ++ (*__extension__ ({ \ ++ volatile VALUE *rb_gc_guarded_ptr = &(v); \ ++ __asm__("" : : "m"(rb_gc_guarded_ptr)); \ ++ rb_gc_guarded_ptr; \ ++ })) + #elif defined _MSC_VER + #pragma optimize("", off) + static inline volatile VALUE *rb_gc_guarded_ptr(volatile VALUE *ptr) {return ptr;} +diff --git a/marshal.c b/marshal.c +index a9926acf564e..7e16d0b024c4 100644 +--- a/marshal.c ++++ b/marshal.c +@@ -1026,7 +1026,7 @@ rb_marshal_dump_limited(VALUE obj, VALUE port, int limit) + struct dump_arg *arg; + VALUE wrapper; /* used to avoid memory leak in case of exception */ + +- wrapper = TypedData_Make_Struct(rb_cData, struct dump_arg, &dump_arg_data, arg); ++ wrapper = TypedData_Make_Struct(0, struct dump_arg, &dump_arg_data, arg); + arg->dest = 0; + arg->symbols = st_init_numtable(); + arg->data = rb_init_identtable(); +@@ -2053,7 +2053,7 @@ rb_marshal_load_with_proc(VALUE port, VALUE proc) + else { + io_needed(); + } +- wrapper = TypedData_Make_Struct(rb_cData, struct load_arg, &load_arg_data, arg); ++ wrapper = TypedData_Make_Struct(0, struct load_arg, &load_arg_data, arg); + arg->infection = infection; + arg->src = port; + arg->offset = 0; +diff --git a/test/ruby/test_marshal.rb b/test/ruby/test_marshal.rb +index bc22b5fd3ab8..bfc3f6df256f 100644 +--- a/test/ruby/test_marshal.rb ++++ b/test/ruby/test_marshal.rb +@@ -644,6 +644,9 @@ def test_continuation + c = Bug9523.new + assert_raise_with_message(RuntimeError, /Marshal\.dump reentered at marshal_dump/) do + Marshal.dump(c) ++ GC.start ++ 1000.times {"x"*1000} ++ GC.start + c.cc.call + end + end +diff --git a/version.h b/version.h +index 0a845df84416..39214c474439 100644 +--- a/version.h ++++ b/version.h +@@ -1,6 +1,6 @@ + #define RUBY_VERSION "2.4.0" + #define RUBY_RELEASE_DATE "2017-03-13" +-#define RUBY_PATCHLEVEL 99 ++#define RUBY_PATCHLEVEL 100 + + #define RUBY_RELEASE_YEAR 2017 + #define RUBY_RELEASE_MONTH 3 + -- cgit v1.2.3-70-g09d2 From d59ee8d07dcbda238294836f40af4656763c596a Mon Sep 17 00:00:00 2001 From: Cyrus Harrison Date: Mon, 5 Mar 2018 02:04:21 -0800 Subject: update for conduit 0.3.1 release (#7344) --- .../repos/builtin/packages/conduit/package.py | 25 +++++++++++++--------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/conduit/package.py b/var/spack/repos/builtin/packages/conduit/package.py index 7c288d60ac..40a41cda14 100644 --- a/var/spack/repos/builtin/packages/conduit/package.py +++ b/var/spack/repos/builtin/packages/conduit/package.py @@ -48,6 +48,7 @@ class Conduit(Package): homepage = "http://software.llnl.gov/conduit" url = "https://github.com/LLNL/conduit/releases/download/v0.3.0/conduit-v0.3.0-src-with-blt.tar.gz" + version('0.3.1', 'b98d1476199a46bde197220cd9cde042') version('0.3.0', '6396f1d1ca16594d7c66d4535d4f898e') # note: checksums on github automatic release source tars changed ~9/17 version('0.2.1', 'ed7358af3463ba03f07eddd6a6e626ff') @@ -79,6 +80,9 @@ class Conduit(Package): # variants for dev-tools (docs, etc) variant("doc", default=False, description="Build Conduit's documentation") + # doxygen support is wip, since doxygen has several dependencies + # we want folks to explicitly opt in to building doxygen + variant("doxygen", default=False, description="Build Conduit's Doxygen documentation") ########################################################################### # package dependencies @@ -124,7 +128,7 @@ class Conduit(Package): # Documentation related ####################### depends_on("py-sphinx", when="+python+doc", type='build') - depends_on("doxygen", when="+doc") + depends_on("doxygen", when="+doc+doxygen") def url_for_version(self, version): """ @@ -135,11 +139,12 @@ class Conduit(Package): return "https://github.com/LLNL/conduit/archive/v0.2.0.tar.gz" elif v == "0.2.1": return "https://github.com/LLNL/conduit/archive/v0.2.1.tar.gz" - elif v == "0.3.0": - # conduit uses BLT (https://github.com/llnl/blt) as a submodule, - # since github does not automatically package source from - # submodules, conduit provides a custom src tarball - return "https://github.com/LLNL/conduit/releases/download/v0.3.0/conduit-v0.3.0-src-with-blt.tar.gz" + else: + # starting with v 0.3.0, conduit uses BLT + # (https://github.com/llnl/blt) as a submodule, since github does + # not automatically package source from submodules, conduit + # provides a custom src tarball + return "https://github.com/LLNL/conduit/releases/download/v{0}/conduit-v{1}-src-with-blt.tar.gz".format(v, v) return url def install(self, spec, prefix): @@ -287,10 +292,10 @@ class Conduit(Package): sphinx_build_exe = join_path(spec['py-sphinx'].prefix.bin, "sphinx-build") cfg.write(cmake_cache_entry("SPHINX_EXECUTABLE", sphinx_build_exe)) - - cfg.write("# doxygen from uberenv\n") - doxygen_exe = spec['doxygen'].command.path - cfg.write(cmake_cache_entry("DOXYGEN_EXECUTABLE", doxygen_exe)) + if "+doxygen" in spec: + cfg.write("# doxygen from uberenv\n") + doxygen_exe = spec['doxygen'].command.path + cfg.write(cmake_cache_entry("DOXYGEN_EXECUTABLE", doxygen_exe)) else: cfg.write(cmake_cache_entry("ENABLE_DOCS", "OFF")) -- cgit v1.2.3-70-g09d2 From 90c824311372e1f10c218e467747298f601f1684 Mon Sep 17 00:00:00 2001 From: Mike Pozulp Date: Mon, 5 Mar 2018 04:28:37 -0800 Subject: add -ldl to silo ldflags when building with static hdf5 in order to fix #7384 (#7385) --- var/spack/repos/builtin/packages/silo/package.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/silo/package.py b/var/spack/repos/builtin/packages/silo/package.py index 96b2f60b4b..e348f0003b 100644 --- a/var/spack/repos/builtin/packages/silo/package.py +++ b/var/spack/repos/builtin/packages/silo/package.py @@ -48,6 +48,11 @@ class Silo(Package): patch('remove-mpiposix.patch', when='@4.8:4.10.2') + def flag_handler(self, name, flags): + if name == 'ldflags' and self.spec['hdf5'].satisfies('~shared'): + flags.append('-ldl') + return (flags, None, None) + def install(self, spec, prefix): config_args = [ '--enable-fortran' if '+fortran' in spec else '--disable-fortran', -- cgit v1.2.3-70-g09d2 From ca336b60faf9358847de30c6ae4fe4218c19bf05 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 5 Mar 2018 07:16:27 -0600 Subject: bracken: Create new package (#7375) --- .../repos/builtin/packages/bracken/package.py | 75 ++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 var/spack/repos/builtin/packages/bracken/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bracken/package.py b/var/spack/repos/builtin/packages/bracken/package.py new file mode 100644 index 0000000000..50efea40c8 --- /dev/null +++ b/var/spack/repos/builtin/packages/bracken/package.py @@ -0,0 +1,75 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Bracken(Package): + """Bracken (Bayesian Reestimation of Abundance with KrakEN) is a highly + accurate statistical method that computes the abundance of species in DNA + sequences from a metagenomics sample.""" + + homepage = "https://ccb.jhu.edu/software/bracken" + url = "https://github.com/jenniferlu717/Bracken/archive/1.0.0.tar.gz" + + version('1.0.0', 'bd91805655269c5f3becb8f8028bab6d') + + depends_on('perl') + depends_on('python@2.7:') + depends_on('perl-exporter-tiny') + depends_on('perl-list-moreutils') + depends_on('perl-parallel-forkmanager') + + def install(self, spec, prefix): + mkdirp(prefix.bin) + install_tree('sample_data', prefix.sample_data) + + filter_file( + r'#!/bin/env perl', + '#!/usr/bin/env perl', + 'count-kmer-abundances.pl' + ) + + filter_file( + r'#!/usr/bin/python', + '#!/usr/bin/env python', + 'est_abundance.py' + ) + + filter_file( + r'#!/usr/bin/python', + '#!/usr/bin/env python', + 'generate_kmer_distribution.py' + ) + + files = ( + 'count-kmer-abundances.pl', + 'est_abundance.py', + 'generate_kmer_distribution.py', + ) + + chmod = which('chmod') + for name in files: + install(name, prefix.bin) + chmod('+x', join_path(self.prefix.bin, name)) -- cgit v1.2.3-70-g09d2 From 3cf2cda4ec21144e5b388408eee5c648c1f5b91d Mon Sep 17 00:00:00 2001 From: Federico Ficarelli Date: Mon, 5 Mar 2018 14:53:42 +0100 Subject: tclap: new package (#7390) --- var/spack/repos/builtin/packages/tclap/package.py | 35 +++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 var/spack/repos/builtin/packages/tclap/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/tclap/package.py b/var/spack/repos/builtin/packages/tclap/package.py new file mode 100644 index 0000000000..c3daa1ff3c --- /dev/null +++ b/var/spack/repos/builtin/packages/tclap/package.py @@ -0,0 +1,35 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Tclap(AutotoolsPackage): + """Templatized C++ Command Line Parser""" + + homepage = "http://tclap.sourceforge.net" + url = "https://downloads.sourceforge.net/project/tclap/tclap-1.2.2.tar.gz" + + version('1.2.2', '6f35665814dca292eceda007d7e13bcb') + version('1.2.1', 'eb0521d029bf3b1cc0dcaa7e42abf82a') -- cgit v1.2.3-70-g09d2 From e4597f09bef4436e99cd63e2510e07e4c91bc821 Mon Sep 17 00:00:00 2001 From: Veselin Dobrev Date: Mon, 5 Mar 2018 11:53:36 -0800 Subject: openmpi: add package-specific 'headers' property (#7267) * [OpenMPI] Add the 'headers' property. This removes some redundant headers from sub-directories, returned by the default '.headers' handler. * [OpenMPI] In the .headers property, add a fallback to search all of prefix for the mpi.h header. Recommended by @junghans to support some external configurations, see #7268. --- var/spack/repos/builtin/packages/openmpi/package.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 5d845e84af..e14c6174ba 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -220,6 +220,13 @@ class Openmpi(AutotoolsPackage): url = "http://www.open-mpi.org/software/ompi/v{0}/downloads/openmpi-{1}.tar.bz2" return url.format(version.up_to(2), version) + @property + def headers(self): + hdrs = HeaderList(find(self.prefix.include, 'mpi.h', recursive=False)) + if not hdrs: + hdrs = HeaderList(find(self.prefix, 'mpi.h', recursive=True)) + return hdrs or None + @property def libs(self): query_parameters = self.spec.last_query.extra_parameters -- cgit v1.2.3-70-g09d2 From 89a591eb3b9b497640e3dc873599186939be802a Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 5 Mar 2018 14:00:49 -0600 Subject: Fix version-specific URLs for Python packages (#7394) --- var/spack/repos/builtin/packages/py-bsddb3/package.py | 4 ++-- var/spack/repos/builtin/packages/py-pyfasta/package.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-bsddb3/package.py b/var/spack/repos/builtin/packages/py-bsddb3/package.py index 91b8d72665..b1ebe7c759 100644 --- a/var/spack/repos/builtin/packages/py-bsddb3/package.py +++ b/var/spack/repos/builtin/packages/py-bsddb3/package.py @@ -31,8 +31,8 @@ class PyBsddb3(PythonPackage): Sequence and Transaction objects, and each of these is exposed as a Python type in the bsddb3.db module.""" - homepage = "://pypi.python.org/pypi/bsddb3/6.2.5" - url = "https://pypi.python.org/packages/ba/a7/131dfd4e3a5002ef30e20bee679d5e6bcb2fcc6af21bd5079dc1707a132c/bsddb3-6.2.5.tar.gz#md5=610267c189964c905a931990e1ba438c" + homepage = "https://pypi.python.org/pypi/bsddb3/6.2.5" + url = "https://pypi.io/packages/source/b/bsddb3/bsddb3-6.2.5.tar.gz" version('6.2.5', '610267c189964c905a931990e1ba438c') diff --git a/var/spack/repos/builtin/packages/py-pyfasta/package.py b/var/spack/repos/builtin/packages/py-pyfasta/package.py index 40a5fcf46e..ad099806b4 100644 --- a/var/spack/repos/builtin/packages/py-pyfasta/package.py +++ b/var/spack/repos/builtin/packages/py-pyfasta/package.py @@ -30,7 +30,7 @@ class PyPyfasta(PythonPackage): access to fasta sequence files""" homepage = "https://pypi.python.org/pypi/pyfasta/" - url = "https://pypi.python.org/packages/be/3f/794fbcdaaa2113f0a1d16a962463896c1a6bdab77bd63f33a8f16aae6cdc/pyfasta-0.5.2.tar.gz" + url = "https://pypi.io/packages/source/p/pyfasta/pyfasta-0.5.2.tar.gz" version('0.5.2', 'bf61ab997dca329675c3eb2ee7cdfcf2') -- cgit v1.2.3-70-g09d2 From ccb24b1438e82f7a89cde2fb468b02668d644a62 Mon Sep 17 00:00:00 2001 From: Mario Melara Date: Mon, 5 Mar 2018 12:08:11 -0800 Subject: Fix pkgconf on Crays (#7171) This updates Cray.setup_platform_environment to use cray-specific pkgconfig paths so that all providers of 'pkgconfig' have access to them (previously the 'pkg-config' provider had this but the 'pkgconf' provider did not). --- lib/spack/spack/platforms/cray.py | 3 +++ var/spack/repos/builtin/packages/pkg-config/package.py | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/lib/spack/spack/platforms/cray.py b/lib/spack/spack/platforms/cray.py index 095a426b22..e6e9685f74 100644 --- a/lib/spack/spack/platforms/cray.py +++ b/lib/spack/spack/platforms/cray.py @@ -108,6 +108,9 @@ class Cray(Platform): if os.path.isdir(cray_wrapper_names): env.prepend_path('PATH', cray_wrapper_names) env.prepend_path('SPACK_ENV_PATH', cray_wrapper_names) + # Makes spack installed pkg-config work on Crays + env.append_path("PKG_CONFIG_PATH", "/usr/lib64/pkgconfig") + env.append_path("PKG_CONFIG_PATH", "/usr/local/lib64/pkgconfig") @classmethod def detect(cls): diff --git a/var/spack/repos/builtin/packages/pkg-config/package.py b/var/spack/repos/builtin/packages/pkg-config/package.py index 44e03c7401..0d9fceec6e 100644 --- a/var/spack/repos/builtin/packages/pkg-config/package.py +++ b/var/spack/repos/builtin/packages/pkg-config/package.py @@ -53,11 +53,6 @@ class PkgConfig(AutotoolsPackage): Adds the ACLOCAL path for autotools.""" spack_env.append_path('ACLOCAL_PATH', join_path(self.prefix.share, 'aclocal')) - if 'platform=cray' in self.spec: - spack_env.append_path('PKG_CONFIG_PATH', - '/usr/lib64/pkgconfig') - spack_env.append_path('PKG_CONFIG_PATH', - '/usr/local/lib64/pkgconfig') def configure_args(self): config_args = ['--enable-shared'] -- cgit v1.2.3-70-g09d2 From fa442ed61a9c9543c366288dc6d92bdc9e1d7ab9 Mon Sep 17 00:00:00 2001 From: Federico Ficarelli Date: Mon, 5 Mar 2018 21:10:02 +0100 Subject: rapidjson: new package (#7391) --- .../repos/builtin/packages/rapidjson/package.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 var/spack/repos/builtin/packages/rapidjson/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/rapidjson/package.py b/var/spack/repos/builtin/packages/rapidjson/package.py new file mode 100644 index 0000000000..5c7356288c --- /dev/null +++ b/var/spack/repos/builtin/packages/rapidjson/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Rapidjson(CMakePackage): + """A fast JSON parser/generator for C++ with both SAX/DOM style API""" + + homepage = "http://rapidjson.org" + url = "https://github.com/Tencent/rapidjson/archive/v1.1.0.tar.gz" + + version('1.1.0', 'badd12c511e081fec6c89c43a7027bce') + version('1.0.2', '97cc60d01282a968474c97f60714828c') + version('1.0.1', '48cc188df49617b859d13d31344a50b8') + version('1.0.0', '08247fbfa464d7f15304285f04b4b228') -- cgit v1.2.3-70-g09d2 From 35115127bc755df970917f635b1f9a71ecd4cb9f Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 5 Mar 2018 14:32:22 -0600 Subject: perl-extutils-depends: Create new package (#7376) --- .../packages/perl-extutils-depends/package.py | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-extutils-depends/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-extutils-depends/package.py b/var/spack/repos/builtin/packages/perl-extutils-depends/package.py new file mode 100644 index 0000000000..ac0c3619ac --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-extutils-depends/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlExtutilsDepends(PerlPackage): + """Easily build XS extensions that depend on XS extensions""" + + homepage = "http://search.cpan.org/~xaoc/ExtUtils-Depends/lib/ExtUtils/Depends.pm" + url = "http://search.cpan.org/CPAN/authors/id/X/XA/XAOC/ExtUtils-Depends-0.405.tar.gz" + + version('0.405', 'caefbca2f173d0cea3f5ac26b6c08a2c') -- cgit v1.2.3-70-g09d2 From 94c8299a1eb383592169ddfcaa9f681b3a22daa4 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Mon, 5 Mar 2018 16:07:41 -0700 Subject: minismac2d: fix build with external Debian MPI (#7318) --- var/spack/repos/builtin/packages/minismac2d/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/minismac2d/package.py b/var/spack/repos/builtin/packages/minismac2d/package.py index 4e961fac94..2e0693a0a6 100644 --- a/var/spack/repos/builtin/packages/minismac2d/package.py +++ b/var/spack/repos/builtin/packages/minismac2d/package.py @@ -49,7 +49,7 @@ class Minismac2d(MakefilePackage): 'CPP=cpp', 'FC={0}'.format(self.spec['mpi'].mpifc), 'LD={0}'.format(self.spec['mpi'].mpifc), - 'MPIDIR=-I{0}/include'.format(self.spec['mpi'].prefix), + 'MPIDIR=-I{0}'.format(self.spec['mpi'].headers.directories[0]), 'CPPFLAGS=-P -traditional -DD_PRECISION', 'FFLAGS=-O3 -c -g -DD_PRECISION', 'LDFLAGS=-O3', -- cgit v1.2.3-70-g09d2 From 96f95764264e32958342a0ef86615578ecddef8d Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Mon, 5 Mar 2018 17:39:21 -0700 Subject: minighost: another Ubuntu fix (#7359) --- var/spack/repos/builtin/packages/minighost/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/minighost/package.py b/var/spack/repos/builtin/packages/minighost/package.py index 5142508332..0a258cc0dd 100644 --- a/var/spack/repos/builtin/packages/minighost/package.py +++ b/var/spack/repos/builtin/packages/minighost/package.py @@ -63,7 +63,7 @@ class Minighost(MakefilePackage): if '%gcc' in self.spec: targets.append('COMPILER_SUITE=gnu') if '+mpi' in self.spec: - targets.append('LIBS=-lm -lmpi_cxx -lgfortran') + targets.append('LIBS=-lm -lmpi_f77 -lmpi -lgfortran') else: targets.append('LIBS=-lm -lgfortran') elif '%cce' in self.spec: -- cgit v1.2.3-70-g09d2 From 4a7e88cc711d249c3840f07ea184835f289b64eb Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Mon, 5 Mar 2018 23:45:19 -0600 Subject: r-sf: new package (#6547) * r-sf: new package * r-sf: added version requirements for dependencies --- var/spack/repos/builtin/packages/r-sf/package.py | 47 ++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-sf/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-sf/package.py b/var/spack/repos/builtin/packages/r-sf/package.py new file mode 100644 index 0000000000..aba4ea42de --- /dev/null +++ b/var/spack/repos/builtin/packages/r-sf/package.py @@ -0,0 +1,47 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RSf(RPackage): + """Support for simple features, a standardized way to encode spatial + vector data. Binds to GDAL for reading and writing data, to GEOS for + geometrical operations, and to Proj.4 for projection conversions and + datum transformations.""" + + homepage = "https://github.com/r-spatial/sf/" + url = "https://cran.r-project.org/src/contrib/sf_0.5-5.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/sf" + + version('0.5-5', '53ff32d0c9bf2844666c68ce7d75beb2') + + depends_on('r-rcpp', type=('build', 'run')) + depends_on('r-dbi@0.5:', type=('build', 'run')) + depends_on('r-units@0.4-6:', type=('build', 'run')) + depends_on('r-classint', type=('build', 'run')) + depends_on('r-magrittr', type=('build', 'run')) + depends_on('gdal@2.0.0:') + depends_on('geos@3.3.0:') + depends_on('proj@4.8.0:') -- cgit v1.2.3-70-g09d2 From d90b03db09b0612510577efbd864e88af9058ba5 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Tue, 6 Mar 2018 01:51:43 -0600 Subject: braker: added list_url (#7058) --- var/spack/repos/builtin/packages/braker/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/braker/package.py b/var/spack/repos/builtin/packages/braker/package.py index 97fe9f710a..8fc651ce5f 100644 --- a/var/spack/repos/builtin/packages/braker/package.py +++ b/var/spack/repos/builtin/packages/braker/package.py @@ -31,6 +31,7 @@ class Braker(Package): homepage = "http://exon.gatech.edu/braker1.html" url = "http://bioinf.uni-greifswald.de/augustus/binaries/BRAKER1_v1.11.tar.gz" + list_url = "http://bioinf.uni-greifswald.de/augustus/binaries/old" version('1.11', '297efe4cabdd239b710ac2c45d81f6a5') -- cgit v1.2.3-70-g09d2 From ca367b4de3dce692a0975c82483140d0190ed695 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Tue, 6 Mar 2018 01:01:53 -0700 Subject: exasp2: add v1.0 (#7398) --- var/spack/repos/builtin/packages/exasp2/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/exasp2/package.py b/var/spack/repos/builtin/packages/exasp2/package.py index aac5419893..7bb69d461d 100644 --- a/var/spack/repos/builtin/packages/exasp2/package.py +++ b/var/spack/repos/builtin/packages/exasp2/package.py @@ -42,7 +42,9 @@ class Exasp2(MakefilePackage): tags = ['proxy-app'] homepage = "https://github.com/ECP-copa/ExaSP2" + url = "https://github.com/ECP-copa/ExaSP2/tarball/v1.0" + version('1.0', 'dba545995acc73f2bd1101bcb377bff5') version('develop', git='https://github.com/ECP-copa/ExaSP2', branch='master') -- cgit v1.2.3-70-g09d2 From c2d1344c518dcf7c4cd20786bfa7cf649b977ca5 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 6 Mar 2018 02:28:37 -0600 Subject: perl-file-slurper: Create new package (#7378) --- .../builtin/packages/perl-file-slurper/package.py | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-file-slurper/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-file-slurper/package.py b/var/spack/repos/builtin/packages/perl-file-slurper/package.py new file mode 100644 index 0000000000..c7844d741f --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-file-slurper/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlFileSlurper(PerlPackage): + """A simple, sane and efficient module to slurp a file""" + + homepage = "http://search.cpan.org/~leont/File-Slurper/lib/File/Slurper.pm" + url = "http://search.cpan.org/CPAN/authors/id/L/LE/LEONT/File-Slurper-0.011.tar.gz" + + version('0.011', 'e0482d3d5a0522e39132ba54af9f1ce3') -- cgit v1.2.3-70-g09d2 From 2f06292abcc06d298a87849ae3f4249d47e1fae0 Mon Sep 17 00:00:00 2001 From: Eric Müller Date: Tue, 6 Mar 2018 09:34:00 +0100 Subject: mosh build depends on pkg-config (#7365) --- var/spack/repos/builtin/packages/mosh/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mosh/package.py b/var/spack/repos/builtin/packages/mosh/package.py index de15e46bde..7bd10dce0f 100644 --- a/var/spack/repos/builtin/packages/mosh/package.py +++ b/var/spack/repos/builtin/packages/mosh/package.py @@ -44,6 +44,7 @@ class Mosh(AutotoolsPackage): depends_on('zlib') depends_on('openssl') + depends_on('pkgconfig', type='build') depends_on('perl', type='run') build_directory = 'spack-build' -- cgit v1.2.3-70-g09d2 From 7aff7cbaec6fd13d77551154783d1d94b01b5a8d Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Tue, 6 Mar 2018 02:34:22 -0600 Subject: snpEff: Create new package. (#7382) --- var/spack/repos/builtin/packages/snpeff/package.py | 58 ++++++++++++++++++++++ var/spack/repos/builtin/packages/snpeff/snpEff.sh | 3 ++ 2 files changed, 61 insertions(+) create mode 100644 var/spack/repos/builtin/packages/snpeff/package.py create mode 100644 var/spack/repos/builtin/packages/snpeff/snpEff.sh (limited to 'var') diff --git a/var/spack/repos/builtin/packages/snpeff/package.py b/var/spack/repos/builtin/packages/snpeff/package.py new file mode 100644 index 0000000000..9e39f0eeeb --- /dev/null +++ b/var/spack/repos/builtin/packages/snpeff/package.py @@ -0,0 +1,58 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import os.path +from shutil import copyfile + + +class Snpeff(Package): + """SnpEff is a variant annotation and effect prediction tool. It + annotates and predicts the effects of genetic variants (such as + amino acid changes).""" + + homepage = "http://snpeff.sourceforge.net/" + url = "https://kent.dl.sourceforge.net/project/snpeff/snpEff_latest_core.zip" + + version('2017-11-24', '1fa84a703580a423e27f1e14a945901c') + + depends_on('jdk', type=('build', 'run')) + + def install(self, spec, prefix): + install_tree('snpEff', prefix.bin) + + # Set up a helper script to call java on the jar file, + # explicitly codes the path for java and the jar file. + script_sh = join_path(os.path.dirname(__file__), "snpEff.sh") + script = join_path(prefix.bin, "snpEff") + copyfile(script_sh, script) + set_executable(script) + + # Munge the helper script to explicitly point to java and the + # jar file. + java = join_path(self.spec['java'].prefix.bin, 'java') + kwargs = {'backup': False} + filter_file('^java', java, script, **kwargs) + filter_file('snpEff.jar', join_path(prefix.bin, 'snpEff.jar'), + script, **kwargs) diff --git a/var/spack/repos/builtin/packages/snpeff/snpEff.sh b/var/spack/repos/builtin/packages/snpeff/snpEff.sh new file mode 100644 index 0000000000..7bee480e2e --- /dev/null +++ b/var/spack/repos/builtin/packages/snpeff/snpEff.sh @@ -0,0 +1,3 @@ +#!/bin/sh +# convenience wrapper for the snpEff jar file +java -jar snpEff.jar "$@" -- cgit v1.2.3-70-g09d2 From c7a8c4a44c59de870584a9a830f29a7ac2a9924a Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Tue, 6 Mar 2018 17:38:40 +0900 Subject: libSplash 1.7.0: Root Fix (#7368) Fix installs as "root" user for the last libSplash release. Missing quoting of string compares resulted in a CMake error when run as root (e.g. in a Docker build). --- var/spack/repos/builtin/packages/libsplash/package.py | 2 ++ .../builtin/packages/libsplash/root_cmake_1.7.0.patch | 15 +++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 var/spack/repos/builtin/packages/libsplash/root_cmake_1.7.0.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libsplash/package.py b/var/spack/repos/builtin/packages/libsplash/package.py index 0388b31a3f..e8493bdba2 100644 --- a/var/spack/repos/builtin/packages/libsplash/package.py +++ b/var/spack/repos/builtin/packages/libsplash/package.py @@ -57,6 +57,8 @@ class Libsplash(CMakePackage): depends_on('hdf5@1.8.6: +mpi', when='+mpi') depends_on('mpi', when='+mpi') + patch('root_cmake_1.7.0.patch', when='@1.7.0') + def cmake_args(self): spec = self.spec args = [] diff --git a/var/spack/repos/builtin/packages/libsplash/root_cmake_1.7.0.patch b/var/spack/repos/builtin/packages/libsplash/root_cmake_1.7.0.patch new file mode 100644 index 0000000000..788e24925d --- /dev/null +++ b/var/spack/repos/builtin/packages/libsplash/root_cmake_1.7.0.patch @@ -0,0 +1,15 @@ +diff --git CMakeLists.txt CMakeLists.txt +index 4846ff7..5e102ce 100644 +--- libSplash-1.7.0/CMakeLists.txt ++++ libSplash-1.7.0/CMakeLists.txt +@@ -392,7 +392,8 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tools/splash2xdmf.py DESTINATION bin) + # + enable_testing() + +-if($ENV{USER} STREQUAL root) ++# OpenMPI root guard: https://github.com/open-mpi/ompi/issues/4451 ++if("$ENV{USER}" STREQUAL "root") + set(MPI_ALLOW_ROOT --allow-run-as-root) + endif() + set(MPI_TEST_EXE ${MPIEXEC_EXECUTABLE} ${MPI_ALLOW_ROOT} ${MPIEXEC_NUMPROC_FLAG}) + -- cgit v1.2.3-70-g09d2 From 9c828f30684330f1d9ba710c3852a4a71b70f641 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Tue, 6 Mar 2018 02:58:05 -0600 Subject: trnascan-se: new package (#7351) --- .../repos/builtin/packages/trnascan-se/package.py | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 var/spack/repos/builtin/packages/trnascan-se/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trnascan-se/package.py b/var/spack/repos/builtin/packages/trnascan-se/package.py new file mode 100644 index 0000000000..30ffc06f41 --- /dev/null +++ b/var/spack/repos/builtin/packages/trnascan-se/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class TrnascanSe(AutotoolsPackage): + """Seaching for tRNA genes in genomic sequence""" + + homepage = "http://lowelab.ucsc.edu/tRNAscan-SE/" + url = "http://trna.ucsc.edu/software/trnascan-se-2.0.0.tar.gz" + + version('2.0.0', '36d2b53bcb281efbae09e0305346e544') -- cgit v1.2.3-70-g09d2 From 7482cf1d9fc19b1fb0690aad490129e276a5731c Mon Sep 17 00:00:00 2001 From: Veselin Dobrev Date: Tue, 6 Mar 2018 01:09:20 -0800 Subject: suite-sparse: add a package-specific 'libs' property (#7269) --- .../repos/builtin/packages/suite-sparse/package.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/suite-sparse/package.py b/var/spack/repos/builtin/packages/suite-sparse/package.py index fd93cd6ca7..2f8660f496 100644 --- a/var/spack/repos/builtin/packages/suite-sparse/package.py +++ b/var/spack/repos/builtin/packages/suite-sparse/package.py @@ -95,7 +95,7 @@ class SuiteSparse(Package): # with the TCOV path of SparseSuite 4.5.1's Suitesparse_config.mk, # even though this fix is ugly 'BLAS=%s' % (spec['blas'].libs.ld_flags + ( - '-lstdc++' if '@4.5.1' in spec else '')), + ' -lstdc++' if '@4.5.1' in spec else '')), 'LAPACK=%s' % spec['lapack'].libs.ld_flags, ] @@ -125,3 +125,22 @@ class SuiteSparse(Package): ] make('install', *make_args) + + @property + def libs(self): + """Export the libraries of SuiteSparse. + Sample usage: spec['suite-sparse'].libs.ld_flags + spec['suite-sparse:klu,btf'].libs.ld_flags + """ + # Component libraries, ordered by dependency. Any missing components? + all_comps = ['klu', 'btf', 'umfpack', 'cholmod', 'colamd', 'amd', + 'camd', 'ccolamd', 'cxsparse', 'ldl', 'rbio', 'spqr', + 'suitesparseconfig'] + query_parameters = self.spec.last_query.extra_parameters + comps = all_comps if not query_parameters else query_parameters + libs = find_libraries(['lib' + c for c in comps], root=self.prefix.lib, + shared=True, recursive=False) + if not libs: + return None + libs += find_system_libraries('librt') + return libs -- cgit v1.2.3-70-g09d2 From bcae9c3506c4fe4e3ebe6ea7725352c8d1e86368 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 6 Mar 2018 06:04:16 -0600 Subject: py-bitstring: Create new package (#7190) --- .../repos/builtin/packages/py-bitstring/package.py | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-bitstring/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-bitstring/package.py b/var/spack/repos/builtin/packages/py-bitstring/package.py new file mode 100644 index 0000000000..0c236c2c2a --- /dev/null +++ b/var/spack/repos/builtin/packages/py-bitstring/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyBitstring(PythonPackage): + """Simple construction, analysis and modification of binary data.""" + + homepage = "http://pythonhosted.org/bitstring" + url = "https://pypi.io/packages/source/b/bitstring/bitstring-3.1.5.zip" + + version('3.1.5', '70689a282f66625d0c7c3579a13e66db') -- cgit v1.2.3-70-g09d2 From 8f350d00026e290038b0800b6624a3d024bf1510 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Tue, 6 Mar 2018 06:14:29 -0600 Subject: Colordiff: new package (#7070) --- .../repos/builtin/packages/colordiff/package.py | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 var/spack/repos/builtin/packages/colordiff/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/colordiff/package.py b/var/spack/repos/builtin/packages/colordiff/package.py new file mode 100644 index 0000000000..ba03f4f777 --- /dev/null +++ b/var/spack/repos/builtin/packages/colordiff/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Colordiff(Package): + """Colorful diff utility.""" + + homepage = "https://www.colordiff.org" + url = "https://www.colordiff.org/colordiff-1.0.18.tar.gz" + + version('1.0.18', '07658f09a44f30a3b5c1cea9c132baed') + + depends_on('perl') + + def install(self, spec, prefix): + make("INSTALL_DIR=" + prefix.bin, "ETC_DIR=" + prefix.etc, + "MAN_DIR=" + prefix.man, 'install', parallel=False) -- cgit v1.2.3-70-g09d2 From 4a54178ff8aefcd58c3206b752db8f155901e2cb Mon Sep 17 00:00:00 2001 From: Ricardo Silva Date: Tue, 6 Mar 2018 16:31:28 +0100 Subject: Make neuron package more generic (#7393) Make neuron package more generic * find the bin directory dynamically for use in run_env and spack_env * replace filter_compilers after install with filter_compiler_wrappers * update checksum for _current_ 7.5 version * make +python conflict with ~shared * prepend the architecture specific lib directory to the LD_LIBRARY_PATH Signed-off-by: Ricardo Silva --- var/spack/repos/builtin/packages/neuron/package.py | 75 +++++++++++----------- 1 file changed, 36 insertions(+), 39 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/neuron/package.py b/var/spack/repos/builtin/packages/neuron/package.py index 245d2d2902..e3e97ed8e4 100644 --- a/var/spack/repos/builtin/packages/neuron/package.py +++ b/var/spack/repos/builtin/packages/neuron/package.py @@ -27,19 +27,20 @@ from spack import * class Neuron(Package): + """NEURON is a simulation environment for single and networks of neurons. - """NEURON is a simulation environment for modeling individual - and networks of neurons. NEURON models individual neurons via - the use of sections that are automatically subdivided into individual - compartments, instead of requiring the user to manually create - compartments. The primary scripting language is hoc but a Python - interface is also available.""" + NEURON is a simulation environment for modeling individual and networks of + neurons. NEURON models individual neurons via the use of sections that are + automatically subdivided into individual compartments, instead of + requiring the user to manually create compartments. The primary scripting + language is hoc but a Python interface is also available. + """ homepage = "https://www.neuron.yale.edu/" url = "http://www.neuron.yale.edu/ftp/neuron/versions/v7.5/nrn-7.5.tar.gz" github = "https://github.com/nrnhines/nrn" - version('7.5', '1641ae7a7cd02728e5ae4c8aa93b3749') + version('7.5', 'fb72c841374dfacbb6c2168ff57bfae9') version('7.4', '2c0bbee8a9e55d60fa26336f4ab7acbf') version('7.3', '993e539cb8bf102ca52e9fefd644ab61') version('7.2', '5486709b6366add932e3a6d141c4f7ad') @@ -64,6 +65,26 @@ class Neuron(Package): depends_on('python@2.6:', when='+python') depends_on('ncurses', when='~cross-compile') + conflicts('~shared', when='+python') + + filter_compiler_wrappers('*/bin/nrniv_makefile') + + def get_neuron_archdir(self): + """Determine the architecture-specific neuron base directory. + + Instead of recreating the logic of the neuron's configure + we dynamically find the architecture-specific directory by + looking for a specific binary. + """ + file_list = find(self.prefix, '*/bin/nrniv_makefile') + # check needed as when initially evaluated the prefix is empty + if file_list: + neuron_archdir = os.path.dirname(os.path.dirname(file_list[0])) + else: + neuron_archdir = self.prefix + + return neuron_archdir + def patch(self): # aclocal need complete include path (especially on os x) pkgconf_inc = '-I %s/share/aclocal/' % (self.spec['pkg-config'].prefix) @@ -90,18 +111,6 @@ class Neuron(Package): return options - def get_arch_dir(self): - if 'bgq' in self.spec.architecture: - arch = 'powerpc64' - elif 'cray' in self.spec.architecture: - arch = 'x86_64' - elif 'ppc64le' in self.spec.architecture: - arch = 'powerpc64le' - else: - arch = self.spec.architecture.target - - return arch - def get_python_options(self, spec): options = [] @@ -199,26 +208,14 @@ class Neuron(Package): make('VERBOSE=1') make('install') - @run_after('install') - def filter_compilers(self): - """run after install to avoid spack compiler wrappers - getting embded into nrnivmodl script""" - - arch = self.get_arch_dir() - nrnmakefile = join_path(self.prefix, arch, 'bin/nrniv_makefile') - - kwargs = { - 'backup': False, - 'string': True - } - - filter_file(env['CC'], self.compiler.cc, nrnmakefile, **kwargs) - filter_file(env['CXX'], self.compiler.cxx, nrnmakefile, **kwargs) - def setup_environment(self, spack_env, run_env): - arch = self.get_arch_dir() - run_env.prepend_path('PATH', join_path(self.prefix, arch, 'bin')) + neuron_archdir = self.get_neuron_archdir() + run_env.prepend_path('PATH', join_path(neuron_archdir, 'bin')) + run_env.prepend_path( + 'LD_LIBRARY_PATH', join_path(neuron_archdir, 'lib')) def setup_dependent_environment(self, spack_env, run_env, dependent_spec): - arch = self.get_arch_dir() - spack_env.prepend_path('PATH', join_path(self.prefix, arch, 'bin')) + neuron_archdir = self.get_neuron_archdir() + spack_env.prepend_path('PATH', join_path(neuron_archdir, 'bin')) + spack_env.prepend_path( + 'LD_LIBRARY_PATH', join_path(neuron_archdir, 'lib')) -- cgit v1.2.3-70-g09d2 From 65a165502263cab2f22083c0b31df1e9a9631ce9 Mon Sep 17 00:00:00 2001 From: Veselin Dobrev Date: Tue, 6 Mar 2018 09:05:58 -0800 Subject: mumps: add the libs property (#7264) --- var/spack/repos/builtin/packages/mumps/package.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mumps/package.py b/var/spack/repos/builtin/packages/mumps/package.py index cf3c4bbd1e..43f565ec99 100644 --- a/var/spack/repos/builtin/packages/mumps/package.py +++ b/var/spack/repos/builtin/packages/mumps/package.py @@ -262,3 +262,11 @@ class Mumps(Package): os.system('./dsimpletest < input_simpletest_real') if '+complex' in spec: os.system('./zsimpletest < input_simpletest_cmplx') + + @property + def libs(self): + component_libs = ['*mumps*', 'pord'] + return find_libraries(['lib' + comp for comp in component_libs], + root=self.prefix.lib, + shared=('+shared' in self.spec), + recursive=False) or None -- cgit v1.2.3-70-g09d2 From 17772fcd43ad083d15c3e0157c2f9ddb237308aa Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Tue, 6 Mar 2018 18:07:37 +0100 Subject: likwid: Fix build (#7244) likwid uses the current directory when building the paths to its internal libraries. Spack overwrites PWD, causing likwid to not find hwloc.h. --- var/spack/repos/builtin/packages/likwid/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/likwid/package.py b/var/spack/repos/builtin/packages/likwid/package.py index 096f2772f3..8e3492ef1c 100644 --- a/var/spack/repos/builtin/packages/likwid/package.py +++ b/var/spack/repos/builtin/packages/likwid/package.py @@ -24,6 +24,7 @@ ############################################################################## from spack import * import glob +import os class Likwid(Package): @@ -105,5 +106,6 @@ class Likwid(Package): spec['lua'].prefix.bin), 'config.mk') + env['PWD'] = os.getcwd() make() make('install') -- cgit v1.2.3-70-g09d2 From b106c86fa33d5f4296389071ad4cd5fdd5c389df Mon Sep 17 00:00:00 2001 From: healther Date: Tue, 6 Mar 2018 18:08:51 +0100 Subject: Fix apr pick up of log4cxx (#7347) --- var/spack/repos/builtin/packages/log4cxx/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/log4cxx/package.py b/var/spack/repos/builtin/packages/log4cxx/package.py index b2bf7a4e35..eda990b590 100644 --- a/var/spack/repos/builtin/packages/log4cxx/package.py +++ b/var/spack/repos/builtin/packages/log4cxx/package.py @@ -43,5 +43,8 @@ class Log4cxx(AutotoolsPackage): patch('log4cxx-0.10.0-narrowing-fixes-from-upstream.patch') def configure_args(self): - args = ['--disable-static'] + args = ['--disable-static', + # 'apr''s 'bin' isn't pulled (via apr-util) into build env + '--with-apr={0}'.format(self.spec['apr'].prefix)] + return args -- cgit v1.2.3-70-g09d2 From 642484caebcaa261c5db3ba2952a23f9af54c784 Mon Sep 17 00:00:00 2001 From: mcneish1 <35310375+mcneish1@users.noreply.github.com> Date: Tue, 6 Mar 2018 09:09:09 -0800 Subject: Add sqlite 3.22.0 (#7335) --- var/spack/repos/builtin/packages/sqlite/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sqlite/package.py b/var/spack/repos/builtin/packages/sqlite/package.py index 350bbf9886..5f359aaf1e 100644 --- a/var/spack/repos/builtin/packages/sqlite/package.py +++ b/var/spack/repos/builtin/packages/sqlite/package.py @@ -33,6 +33,8 @@ class Sqlite(AutotoolsPackage): """ homepage = "www.sqlite.org" + version('3.22.0', '2fb24ec12001926d5209d2da90d252b9825366ac', + url='https://www.sqlite.org/2018/sqlite-autoconf-3220000.tar.gz') version('3.21.0', '7913de4c3126ba3c24689cb7a199ea31', url='https://www.sqlite.org/2017/sqlite-autoconf-3210000.tar.gz') version('3.20.0', 'e262a28b73cc330e7e83520c8ce14e4d', -- cgit v1.2.3-70-g09d2 From d77a2eecbe1426b3ef5f083d6f7e97995599cecb Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 6 Mar 2018 11:12:06 -0600 Subject: perl-graph-readwrite: Create new package (#7284) --- .../packages/perl-graph-readwrite/package.py | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-graph-readwrite/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-graph-readwrite/package.py b/var/spack/repos/builtin/packages/perl-graph-readwrite/package.py new file mode 100644 index 0000000000..4e3ddbcdd0 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-graph-readwrite/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlGraphReadwrite(PerlPackage): + """Write out directed graph in Dot format""" + + homepage = "http://search.cpan.org/~neilb/Graph-ReadWrite/lib/Graph/Writer/Dot.pm" + url = "http://search.cpan.org/CPAN/authors/id/N/NE/NEILB/Graph-ReadWrite-2.09.tar.gz" + + version('2.09', '5cd9191eadd2fe8fe8bb431575434f67') -- cgit v1.2.3-70-g09d2 From ceb896336288f5f9803edca0cd6994d349b6adb0 Mon Sep 17 00:00:00 2001 From: Paschalis Korosoglou Date: Tue, 6 Mar 2018 19:16:52 +0200 Subject: Add cmor version 3.3.0 (#7197) --- var/spack/repos/builtin/packages/cmor/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cmor/package.py b/var/spack/repos/builtin/packages/cmor/package.py index 59a0330324..534d408096 100644 --- a/var/spack/repos/builtin/packages/cmor/package.py +++ b/var/spack/repos/builtin/packages/cmor/package.py @@ -34,6 +34,7 @@ class Cmor(AutotoolsPackage): homepage = "http://cmor.llnl.gov" url = "https://github.com/PCMDI/cmor/archive/3.1.2.tar.gz" + version('3.3.0', 'cfdeeddab1aedb823e26ec38723bd67e') version('3.2.0', 'b48105105d4261012c19cd65e89ff7a6') version('3.1.2', '72f7227159c901e4bcf80d2c73a8ce77') @@ -43,7 +44,7 @@ class Cmor(AutotoolsPackage): depends_on('uuid') depends_on('netcdf') depends_on('udunits2') - depends_on('hdf5@:1.8') + depends_on('hdf5@:1.8.19') extends('python', when='+python') depends_on('python@:2.8', when='+python') -- cgit v1.2.3-70-g09d2 From 45e78a42cf11719843d0fe1cfc5caa194653b9d6 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Tue, 6 Mar 2018 09:17:49 -0800 Subject: sosflow: add missing dependencies (#7182) SOSflow depends on MPI and pkg-config, but neither of these dependencies are currently in the spack package, so this commit adds them. --- var/spack/repos/builtin/packages/sosflow/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sosflow/package.py b/var/spack/repos/builtin/packages/sosflow/package.py index c3b99fd479..ee92f5aab2 100644 --- a/var/spack/repos/builtin/packages/sosflow/package.py +++ b/var/spack/repos/builtin/packages/sosflow/package.py @@ -37,6 +37,8 @@ class Sosflow(CMakePackage): depends_on('libevpath') depends_on('sqlite@3:') + depends_on('pkgconfig') + depends_on('mpi') def setup_environment(self, spack_env, run_env): spack_env.set('SOS_HOST_KNOWN_AS', 'SPACK-SOS-BUILD') -- cgit v1.2.3-70-g09d2 From 02bed55007361b11b7f732a8d0744532e9067513 Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Tue, 6 Mar 2018 12:21:34 -0500 Subject: py-rasterio: Added with dependencies. (#7156) --- .../repos/builtin/packages/py-affine/package.py | 36 +++++++++++++ .../repos/builtin/packages/py-cligj/package.py | 38 ++++++++++++++ .../repos/builtin/packages/py-rasterio/package.py | 60 ++++++++++++++++++++++ .../repos/builtin/packages/py-snuggs/package.py | 37 +++++++++++++ 4 files changed, 171 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-affine/package.py create mode 100644 var/spack/repos/builtin/packages/py-cligj/package.py create mode 100644 var/spack/repos/builtin/packages/py-rasterio/package.py create mode 100644 var/spack/repos/builtin/packages/py-snuggs/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-affine/package.py b/var/spack/repos/builtin/packages/py-affine/package.py new file mode 100644 index 0000000000..d70640695c --- /dev/null +++ b/var/spack/repos/builtin/packages/py-affine/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyAffine(PythonPackage): + """Matrices describing affine transformation of the plane.""" + + homepage = "https://github.com/sgillies/affine" + url = "https://github.com/sgillies/affine/archive/2.1.0.zip" + + depends_on('py-setuptools', type='build') + + version('2.1.0', '99cf61c3ef484f93da9dc062dfbce4b5') diff --git a/var/spack/repos/builtin/packages/py-cligj/package.py b/var/spack/repos/builtin/packages/py-cligj/package.py new file mode 100644 index 0000000000..5ce8ad7b13 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-cligj/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyCligj(PythonPackage): + """Click-based argument and option decorators for Python GIS command + line programs""" + + homepage = "https://github.com/mapbox/cligj" + url = "https://github.com/mapbox/cligj/archive/0.4.0.zip" + + version('0.4.0', 'fe5376068b84c5ed01e2d3adf553e226') + + depends_on('py-setuptools', type='build') + depends_on('py-click', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-rasterio/package.py b/var/spack/repos/builtin/packages/py-rasterio/package.py new file mode 100644 index 0000000000..cc5fc8179a --- /dev/null +++ b/var/spack/repos/builtin/packages/py-rasterio/package.py @@ -0,0 +1,60 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyRasterio(PythonPackage): + """Rasterio reads and writes geospatial raster data. + Geographic information systems use GeoTIFF and other formats to + organize and store gridded, or raster, datasets. Rasterio reads + and writes these formats and provides a Python API based on N-D + arrays.""" + + homepage = "https://github.com/mapbox/rasterio" + url = "https://github.com/mapbox/rasterio/archive/1.0a12.zip" + + version('1.0a12', 'e078ca02b3513b65a9be5bb3f528b4da') + + variant('aws', default=False, + description='Enable testing with Amazon Web Services') + + depends_on('py-setuptools', type='build') + depends_on('py-cython', type='build') + + # Only use py-enum34 with Python2 + # depends_on('py-enum34', type='run', when='^python@:2.7') + + depends_on('py-attrs', type=('build', 'run')) + depends_on('py-numpy', type=('build', 'run')) + depends_on('py-cligj', type=('build', 'run')) + depends_on('py-click', type=('build', 'run')) + depends_on('py-affine', type=('build', 'run')) + depends_on('py-snuggs', type=('build', 'run')) + depends_on('gdal') + depends_on('jpeg') + + # (Commented out for now: py-boto3 is not yet a Spack package) + # Some (optional) tests use py-boto3 for Amazon Web Services + # depends_on('py-boto3', type=('build', 'run'), when='+aws') diff --git a/var/spack/repos/builtin/packages/py-snuggs/package.py b/var/spack/repos/builtin/packages/py-snuggs/package.py new file mode 100644 index 0000000000..c489d830b7 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-snuggs/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PySnuggs(PythonPackage): + """Snuggs are s-expressions for Numpy""" + + homepage = "https://github.com/mapbox/snuggs""" + url = "https://github.com/mapbox/snuggs/archive/1.4.1.zip" + + version('1.4.1', 'bfc4058c32faa4ef76ab7946755557cc') + + depends_on('py-numpy', type=('build', 'run')) + depends_on('py-click', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 8d6738a3e66c2c02de68c2a2496a62b2d91228ac Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Tue, 6 Mar 2018 18:25:00 +0100 Subject: Setup dependent environment for pkgconf. (#7102) --- var/spack/repos/builtin/packages/pkgconf/package.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pkgconf/package.py b/var/spack/repos/builtin/packages/pkgconf/package.py index 5ed5bf4c7e..d0cf6eb899 100644 --- a/var/spack/repos/builtin/packages/pkgconf/package.py +++ b/var/spack/repos/builtin/packages/pkgconf/package.py @@ -40,6 +40,19 @@ class Pkgconf(AutotoolsPackage): provides('pkgconfig') + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): + """spack built pkg-config on cray's requires adding /usr/local/ + and /usr/lib64/ to PKG_CONFIG_PATH in order to access cray '.pc' + files. + Adds the ACLOCAL path for autotools.""" + spack_env.append_path('ACLOCAL_PATH', + join_path(self.prefix.share, 'aclocal')) + if 'platform=cray' in self.spec: + spack_env.append_path('PKG_CONFIG_PATH', + '/usr/lib64/pkgconfig') + spack_env.append_path('PKG_CONFIG_PATH', + '/usr/local/lib64/pkgconfig') + @run_after('install') def link_pkg_config(self): symlink('pkgconf', '{0}/pkg-config'.format(self.prefix.bin)) -- cgit v1.2.3-70-g09d2 From d649fda48a8b8353405a8a0197457a891932c708 Mon Sep 17 00:00:00 2001 From: peetsv <32349688+peetsv@users.noreply.github.com> Date: Tue, 6 Mar 2018 09:27:03 -0800 Subject: py-crossmap: adding new package (#7108) --- .../repos/builtin/packages/py-crossmap/package.py | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-crossmap/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-crossmap/package.py b/var/spack/repos/builtin/packages/py-crossmap/package.py new file mode 100644 index 0000000000..bb8c9d60f7 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-crossmap/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyCrossmap(PythonPackage): + """CrossMap is a program for convenient conversion of genome + coordinates (or annotation files) between different assemblies""" + + homepage = "http://crossmap.sourceforge.net" + url = "https://downloads.sourceforge.net/project/crossmap/CrossMap-0.2.7.tar.gz" + + version('0.2.7', '91dadec9644ee3038f20ee7a6eb8dfb7') + + depends_on('python@2.7:2.7.999', type=('build', 'run')) + depends_on('py-cython@0.17:', type='build') + depends_on('py-pysam', type='build') -- cgit v1.2.3-70-g09d2 From fa5911af836bcc2ad434a31533f898e3a71a20d9 Mon Sep 17 00:00:00 2001 From: Simon Flood Date: Tue, 6 Mar 2018 17:28:02 +0000 Subject: Update package.py (#7327) Add versions released after 3.5.0 (3.4.3, 3.5.1, and 3.6.x) --- var/spack/repos/builtin/packages/geos/package.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/geos/package.py b/var/spack/repos/builtin/packages/geos/package.py index f74e03ff57..7d5ccaec70 100644 --- a/var/spack/repos/builtin/packages/geos/package.py +++ b/var/spack/repos/builtin/packages/geos/package.py @@ -35,10 +35,15 @@ class Geos(Package): homepage = "http://trac.osgeo.org/geos/" url = "http://download.osgeo.org/geos/geos-3.4.2.tar.bz2" - # Verison 3.5.0 supports Autotools and CMake - version('3.5.0', '136842690be7f504fba46b3c539438dd') + # Versions from 3.5.1 support Autotools and CMake + version('3.6.2', 'a32142343c93d3bf151f73db3baa651f') + version('3.6.1', 'c97e338b3bc81f9848656e9d693ca6cc') + version('3.6.0', '55de5fdf075c608d2d7b9348179ee649') + version('3.5.1', '2e3e1ccbd42fee9ec427106b65e43dc0') - # Versions through 3.4.2 have CMake, but only Autotools is supported + # Versions through 3.5.0 have CMake, but only Autotools is supported + version('3.5.0', '136842690be7f504fba46b3c539438dd') + version('3.4.3', '77f2c2cca1e9f49bc1bece9037ac7a7a') version('3.4.2', 'fc5df2d926eb7e67f988a43a92683bae') version('3.4.1', '4c930dec44c45c49cd71f3e0931ded7e') version('3.4.0', 'e41318fc76b5dc764a69d43ac6b18488') -- cgit v1.2.3-70-g09d2 From 274036bfed92b7ea9cebc3b60940f6ec43c984e2 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Tue, 6 Mar 2018 10:37:45 -0700 Subject: gromacs: add v2018 (#7050) --- var/spack/repos/builtin/packages/gromacs/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gromacs/package.py b/var/spack/repos/builtin/packages/gromacs/package.py index 22f0527439..e4bfeb2f84 100644 --- a/var/spack/repos/builtin/packages/gromacs/package.py +++ b/var/spack/repos/builtin/packages/gromacs/package.py @@ -41,6 +41,7 @@ class Gromacs(CMakePackage): homepage = 'http://www.gromacs.org' url = 'http://ftp.gromacs.org/gromacs/gromacs-5.1.2.tar.gz' + version('2018', '6467ffb1575b8271548a13abfba6374c') version('2016.4', '19c8b5c85f3ec62df79d2249a3c272f8') version('2016.3', 'e9e3a41bd123b52fbcc6b32d09f8202b') version('5.1.4', 'ba2e34d59b3982603b4935d650c08040') @@ -65,6 +66,7 @@ class Gromacs(CMakePackage): depends_on('plumed~mpi', when='+plumed~mpi') depends_on('fftw') depends_on('cmake@2.8.8:', type='build') + depends_on('cmake@3.4.3:', type='build', when='@2018:') depends_on('cuda', when='+cuda') def patch(self): -- cgit v1.2.3-70-g09d2 From 2be87124060900e0b3bbd1c35a0a9d9533b0f112 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 6 Mar 2018 11:39:13 -0600 Subject: perl-net-scp-expect: Create new package (#7028) --- .../packages/perl-net-scp-expect/package.py | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-net-scp-expect/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-net-scp-expect/package.py b/var/spack/repos/builtin/packages/perl-net-scp-expect/package.py new file mode 100644 index 0000000000..1b393074fc --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-net-scp-expect/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlNetScpExpect(PerlPackage): + """Wrapper for scp that allows passwords via Expect.""" + + homepage = "http://search.cpan.org/~rybskej/Net-SCP-Expect/Expect.pm" + url = "http://search.cpan.org/CPAN/authors/id/R/RY/RYBSKEJ/Net-SCP-Expect-0.16.tar.gz" + + version('0.16', 'a3d8f5e6a34ba3df8527aea098f64a58') -- cgit v1.2.3-70-g09d2 From c0f6cb5393e0a0e297b59544c92ea16990f7b349 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Wed, 7 Mar 2018 01:41:22 +0800 Subject: Add the libssh2 variant for curl. (#6980) --- var/spack/repos/builtin/packages/curl/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/curl/package.py b/var/spack/repos/builtin/packages/curl/package.py index f567623be0..41ab94978f 100644 --- a/var/spack/repos/builtin/packages/curl/package.py +++ b/var/spack/repos/builtin/packages/curl/package.py @@ -49,10 +49,12 @@ class Curl(AutotoolsPackage): version('7.42.1', '296945012ce647b94083ed427c1877a8') variant('nghttp2', default=False, description='build nghttp2 library (requires C++11)') + variant('libssh2', default=True, description='enable libssh2 support') depends_on('openssl') depends_on('zlib') depends_on('nghttp2', when='+nghttp2') + depends_on('libssh2', when='+libssh2') def configure_args(self): spec = self.spec @@ -62,4 +64,5 @@ class Curl(AutotoolsPackage): '--with-ssl={0}'.format(spec['openssl'].prefix) ] args += self.with_or_without('nghttp2') + args += self.with_or_without('libssh2') return args -- cgit v1.2.3-70-g09d2 From 5ed6e6f1846efcd9d6de2c5091f215531a498abc Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Tue, 6 Mar 2018 09:48:28 -0800 Subject: pnmpi@1.7: new package (#7051) Add PnMPI, a dynamic MPI tool infrastructure that builds on top of the PMPI interface. --- var/spack/repos/builtin/packages/pnmpi/package.py | 67 +++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 var/spack/repos/builtin/packages/pnmpi/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pnmpi/package.py b/var/spack/repos/builtin/packages/pnmpi/package.py new file mode 100644 index 0000000000..944a6133bd --- /dev/null +++ b/var/spack/repos/builtin/packages/pnmpi/package.py @@ -0,0 +1,67 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Pnmpi(CMakePackage): + """PnMPI is a dynamic MPI tool infrastructure that builds on top of + the standardized PMPI interface. """ + + homepage = "https://github.com/LLNL/PnMPI" + url = "https://github.com/LLNL/PnMPI/releases/download/v1.7/PnMPI-v1.7-full.tar.gz" + + version('1.7', '8040c1558c0deaa3d964c35d1760f3a8') + + variant('fortran', default=False, + description='Configure PnMPI with Fortran support') + variant('tests', default=False, + description='Build test cases and enable "test" makefile target') + + depends_on('cmake', type='build') + depends_on('argp-standalone', when='platform=darwin') + depends_on('binutils') + depends_on('help2man') + depends_on('doxygen') + depends_on('mpi') + + @run_before('cmake') + def check_fortran(self): + is_no_fortran_compiler = not self.compiler.f77 and not self.compiler.fc + if self.spec.satisfies('+fortran'): + if is_no_fortran_compiler: + raise InstallError('pnmpi+fortran requires Fortran compiler ' + 'but no Fortran compiler found!') + + def cmake_args(self): + args = [] + spec = self.spec + on_off = {True: 'ON', False: 'OFF'} + + has_fortran = spec.satisfies('+fortran') + has_tests = spec.satisfies('+tests') + + args.append('-DENABLE_FORTRAN:BOOL={0}'.format(on_off[has_fortran])) + args.append('-DENABLE_TESTING:BOOL={0}'.format(on_off[has_tests])) + return args -- cgit v1.2.3-70-g09d2 From ea7879bce5a05d4ffd6858831142f25aa20caf21 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 6 Mar 2018 11:48:48 -0600 Subject: bowtie2: Add version 2.3.4.1 (#7252) --- var/spack/repos/builtin/packages/bowtie2/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bowtie2/package.py b/var/spack/repos/builtin/packages/bowtie2/package.py index 677020f60f..084d2701b4 100644 --- a/var/spack/repos/builtin/packages/bowtie2/package.py +++ b/var/spack/repos/builtin/packages/bowtie2/package.py @@ -33,6 +33,7 @@ class Bowtie2(Package): homepage = "bowtie-bio.sourceforge.net/bowtie2/index.shtml" url = "http://downloads.sourceforge.net/project/bowtie-bio/bowtie2/2.3.1/bowtie2-2.3.1-source.zip" + version('2.3.4.1', '8371bbb6eb02ae99c5cf633054265cb9') version('2.3.1', 'b4efa22612e98e0c23de3d2c9f2f2478') version('2.3.0', '3ab33f30f00f3c30fec1355b4e569ea2') version('2.2.5', '51fa97a862d248d7ee660efc1147c75f') @@ -48,7 +49,7 @@ class Bowtie2(Package): patch('bowtie2-2.3.0.patch', when='@2.3.0', level=0) # seems to have trouble with 6's -std=gnu++14 - conflicts('%gcc@6:') + conflicts('%gcc@6:', when='@:2.3.1') @run_before('install') def filter_sbang(self): -- cgit v1.2.3-70-g09d2 From b0795d84c70cdfbb0f69bb65f713e967899d86d2 Mon Sep 17 00:00:00 2001 From: Mike Pozulp Date: Tue, 6 Mar 2018 12:49:36 -0800 Subject: adds patches required to build hdf5 1.8.10 (#7386) For hdf5 `1.8.10` and some compilers, the hdf5 build system adds the '-ansi' flag. hdf5 1.8.10 is not actually ansi compliant so this adds a patch to modify the places where it violates ansi compatibility (which ends up being a few comments). --- var/spack/repos/builtin/packages/hdf5/package.py | 13 +++++++ .../builtin/packages/hdf5/pre-c99-comments.patch | 43 ++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 var/spack/repos/builtin/packages/hdf5/pre-c99-comments.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index abfde6541b..68c81f68cb 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -50,6 +50,7 @@ class Hdf5(AutotoolsPackage): version('1.8.14', 'a482686e733514a51cde12d6fe5c5d95') version('1.8.13', 'c03426e9e77d7766944654280b467289') version('1.8.12', 'd804802feb99b87fc668a90e6fa34411') + version('1.8.10', '710aa9fb61a51d61a7e2c09bf0052157') variant('debug', default=False, description='Builds a debug version of the library') @@ -97,6 +98,18 @@ class Hdf5(AutotoolsPackage): patch('h5f90global-mult-obj-same-equivalence-same-common-block.patch', when='@1.10.1%intel@18') + # Turn line comments into block comments to conform with pre-C99 language + # standards. Versions of hdf5 after 1.8.10 don't require this patch, + # either because they conform to pre-C99 or neglect to ask for pre-C99 + # language standards from their compiler. The hdf5 build system adds + # the -ansi cflag (run 'man gcc' for info on -ansi) for some versions + # of some compilers (see hdf5-1.8.10/config/gnu-flags). The hdf5 build + # system does not provide an option to disable -ansi, but since the + # pre-C99 code is restricted to just five lines of line comments in + # three src files, this patch accomplishes the simple task of patching the + # three src files and leaves the hdf5 build system alone. + patch('pre-c99-comments.patch', when='@1.8.10') + filter_compiler_wrappers('h5cc', 'h5c++', 'h5fc', relative_root='bin') def url_for_version(self, version): diff --git a/var/spack/repos/builtin/packages/hdf5/pre-c99-comments.patch b/var/spack/repos/builtin/packages/hdf5/pre-c99-comments.patch new file mode 100644 index 0000000000..97743e8fa5 --- /dev/null +++ b/var/spack/repos/builtin/packages/hdf5/pre-c99-comments.patch @@ -0,0 +1,43 @@ +diff --git a/test/th5s.c b/test/th5s.c +index 462bc36..8e18fad 100644 +--- a/test/th5s.c ++++ b/test/th5s.c +@@ -730,8 +730,8 @@ test_h5s_zero_dim(void) + ret = H5Pset_chunk(plist_id, SPACE1_RANK, chunk_dims); + CHECK(ret, FAIL, "H5Pset_chunk"); + +- // ret = H5Pset_alloc_time(plist_id, alloc_time); +- // CHECK(ret, FAIL, "H5Pset_alloc_time"); ++ /* ret = H5Pset_alloc_time(plist_id, alloc_time); */ ++ /* CHECK(ret, FAIL, "H5Pset_alloc_time"); */ + + dset1 = H5Dcreate2(fid1, BASICDATASET1, H5T_NATIVE_INT, sid_chunk, H5P_DEFAULT, plist_id, H5P_DEFAULT); + CHECK(dset1, FAIL, "H5Dcreate2"); +diff --git a/tools/h5dump/h5dump_ddl.c b/tools/h5dump/h5dump_ddl.c +index ee6de5e..3ed6045 100644 +--- a/tools/h5dump/h5dump_ddl.c ++++ b/tools/h5dump/h5dump_ddl.c +@@ -1341,8 +1341,8 @@ handle_attributes(hid_t fid, const char *attr, void UNUSED * data, int UNUSED pe + string_dataformat.do_escape = display_escape; + outputformat = &string_dataformat; + +- //attr_name = attr + j + 1; +- // need to replace escape characters ++ /* attr_name = attr + j + 1; */ ++ /* need to replace escape characters */ + attr_name = h5tools_str_replace(attr + j + 1, "\\/", "/"); + + +diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c +index 9ce3524..3b4e5e7 100644 +--- a/tools/lib/h5tools_str.c ++++ b/tools/lib/h5tools_str.c +@@ -632,7 +632,7 @@ h5tools_str_indent(h5tools_str_t *str, const h5tool_format_t *info, + h5tools_str_append(str, "%s", OPT(info->line_indent, "")); + } + +-// ctx->need_prefix = 0; ++/* ctx->need_prefix = 0; */ + } + + /*------------------------------------------------------------------------- -- cgit v1.2.3-70-g09d2 From 360feb4193b5d20f064721b3e2608a7cf6ea5266 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Tue, 6 Mar 2018 15:51:12 -0700 Subject: minighost: rework link logic (#7402) --- var/spack/repos/builtin/packages/minighost/package.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/minighost/package.py b/var/spack/repos/builtin/packages/minighost/package.py index 0a258cc0dd..1ad8b9f3f4 100644 --- a/var/spack/repos/builtin/packages/minighost/package.py +++ b/var/spack/repos/builtin/packages/minighost/package.py @@ -54,7 +54,8 @@ class Minighost(MakefilePackage): if '+mpi' in self.spec: targets.append('PROTOCOL=-D_MG_MPI') targets.append('FC={0}'.format(self.spec['mpi'].mpif77)) - targets.append('CC={0}'.format(self.spec['mpi'].mpicc)) + # CC is only used for linking, use it to pull in the right f77 libs + targets.append('CC={0}'.format(self.spec['mpi'].mpif77)) else: targets.append('PROTOCOL=-D_MG_SERIAL') targets.append('FC=f77') @@ -62,10 +63,7 @@ class Minighost(MakefilePackage): if '%gcc' in self.spec: targets.append('COMPILER_SUITE=gnu') - if '+mpi' in self.spec: - targets.append('LIBS=-lm -lmpi_f77 -lmpi -lgfortran') - else: - targets.append('LIBS=-lm -lgfortran') + targets.append('LIBS=-lm -lgfortran') elif '%cce' in self.spec: targets.append('COMPILER_SUITE=cray') elif '%intel' in self.spec: -- cgit v1.2.3-70-g09d2 From 95b27385492b948acf6903842a4248ab8ce30ef9 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Tue, 6 Mar 2018 22:32:06 -0700 Subject: lammps: add version 20180222 (#7408) --- var/spack/repos/builtin/packages/lammps/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lammps/package.py b/var/spack/repos/builtin/packages/lammps/package.py index 7eeea42773..994a10373e 100644 --- a/var/spack/repos/builtin/packages/lammps/package.py +++ b/var/spack/repos/builtin/packages/lammps/package.py @@ -36,6 +36,7 @@ class Lammps(CMakePackage): homepage = "http://lammps.sandia.gov/" url = "https://github.com/lammps/lammps/archive/patch_1Sep2017.tar.gz" + version('20180222', '4d0513e3183bd57721814d217fdaf957') version('20170922', '4306071f919ec7e759bda195c26cfd9a') version('20170901', '767e7f07289663f033474dfe974974e7') version('develop', git='https://github.com/lammps/lammps', branch='master') -- cgit v1.2.3-70-g09d2 From 0f114d97180af39afe99b3d299fe933dfb2aa76b Mon Sep 17 00:00:00 2001 From: Douglas Duckworth Date: Wed, 7 Mar 2018 01:45:48 -0500 Subject: Relion 2.1 - Using CudaPackage class (#6707) --- var/spack/repos/builtin/packages/relion/package.py | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/relion/package.py b/var/spack/repos/builtin/packages/relion/package.py index 03fa8fc9a0..1e28d32d88 100644 --- a/var/spack/repos/builtin/packages/relion/package.py +++ b/var/spack/repos/builtin/packages/relion/package.py @@ -25,7 +25,7 @@ from spack import * -class Relion(CMakePackage): +class Relion(CMakePackage, CudaPackage): """RELION (for REgularised LIkelihood OptimisatioN, pronounce rely-on) is a stand-alone computer program that employs an empirical Bayesian approach to refinement of (multiple) 3D reconstructions or 2D class averages in @@ -40,10 +40,6 @@ class Relion(CMakePackage): variant('gui', default=True, description="build the gui") variant('cuda', default=True, description="enable compute on gpu") - variant('cuda_arch', default=None, description='CUDA architecture', - values=('20', '30', '32', '35', '50', '52', '53', '60', '61', '62' - '70'), - multi=True) variant('double', default=True, description="double precision (cpu) code") variant('double-gpu', default=False, description="double precision (gpu) code") variant('build_type', default='RelWithDebInfo', @@ -68,15 +64,15 @@ class Relion(CMakePackage): '-DDoublePrec_CPU=%s' % ('+double' in self.spec), '-DDoublePrec_GPU=%s' % ('+double-gpu' in self.spec), ] - if '+cuda' in self.spec: - args += [ - '-DCUDA=on', - ] carch = self.spec.variants['cuda_arch'].value - if carch is not None: + if '+cuda' in self.spec: args += [ - '-DCUDA_ARCH=%s' % (carch), + '-DCUDA=on', ] + if carch is not None: + args += [ + '-DCUDA_ARCH=%s' % (carch), + ] return args -- cgit v1.2.3-70-g09d2 From da48d3113c36f3b8bab04c661d189e57cdbaf04c Mon Sep 17 00:00:00 2001 From: simo-tuomisto Date: Wed, 7 Mar 2018 10:30:47 +0200 Subject: py-gpaw package with variants for MPI, FFTW and ScaLAPACK (#7373) --- var/spack/repos/builtin/packages/py-ase/package.py | 1 + .../repos/builtin/packages/py-gpaw/package.py | 107 +++++++++++++++++++++ 2 files changed, 108 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-gpaw/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-ase/package.py b/var/spack/repos/builtin/packages/py-ase/package.py index 0030615861..cb4e8ddf7d 100644 --- a/var/spack/repos/builtin/packages/py-ase/package.py +++ b/var/spack/repos/builtin/packages/py-ase/package.py @@ -33,6 +33,7 @@ class PyAse(PythonPackage): homepage = "https://wiki.fysik.dtu.dk/ase/" url = "https://pypi.io/packages/source/a/ase/ase-3.13.0.tar.gz" + version('3.15.0', '65a0143753517c2df157e53bd29a18e3') version('3.13.0', 'e946a0addc5b61e5e2e75857e0f99b89') depends_on('python@2.6:') diff --git a/var/spack/repos/builtin/packages/py-gpaw/package.py b/var/spack/repos/builtin/packages/py-gpaw/package.py new file mode 100644 index 0000000000..fb802d93b8 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-gpaw/package.py @@ -0,0 +1,107 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyGpaw(PythonPackage): + """GPAW is a density-functional theory (DFT) Python code based on the + projector-augmented wave (PAW) method and the atomic simulation environment + (ASE).""" + + homepage = "https://wiki.fysik.dtu.dk/gpaw/index.html" + url = "https://pypi.io/packages/source/g/gpaw/gpaw-1.3.0.tar.gz" + + version('1.3.0', '82e8c80e637696248db00b5713cdffd1') + + variant('mpi', default=True, description='Build with MPI support') + variant('scalapack', default=False, + description='Build with ScaLAPACK support') + variant('fftw', default=True, description='Build with FFTW support') + + depends_on('mpi', when='+mpi', type=('build', 'link', 'run')) + depends_on('python@2.6:') + depends_on('py-ase@3.13.0:', type=('build', 'run')) + depends_on('py-numpy +blas +lapack', type=('build', 'run')) + depends_on('py-scipy', type=('build', 'run')) + depends_on('libxc') + depends_on('blas') + depends_on('lapack') + depends_on('fftw+mpi', when='+fftw +mpi') + depends_on('fftw~mpi', when='+fftw ~mpi') + depends_on('scalapack', when='+scalapack') + + def patch(self): + spec = self.spec + # For build notes see https://wiki.fysik.dtu.dk/gpaw/install.html + + libxc = spec['libxc'] + blas = spec['blas'] + lapack = spec['lapack'] + + libs = blas.libs + lapack.libs + libxc.libs + include_dirs = [ + blas.prefix.include, + lapack.prefix.include, + libxc.prefix.include + ] + if '+mpi' in spec: + libs += spec['mpi'].libs + mpi_include_dirs = repr([spec['mpi'].prefix.include]) + mpi_library_dirs = repr(list(spec['mpi'].libs.directories)) + include_dirs.append(spec['mpi'].prefix.include) + if '+scalapack' in spec: + libs += spec['scalapack'].libs + include_dirs.append(spec['scalapack'].prefix.include) + scalapack_macros = repr([ + ('GPAW_NO_UNDERSCORE_CBLACS', '1'), + ('GPAW_NO_UNDERSCORE_CSCALAPACK', '1') + ]) + if '+fftw' in spec: + libs += spec['fftw'].libs + include_dirs.append(spec['fftw'].prefix.include) + + lib_dirs = list(libs.directories) + libs = list(libs.names) + rpath_str = ':'.join(self.rpath) + + with open('customize.py', 'w') as f: + f.write("libraries = {0}\n".format(repr(libs))) + f.write("include_dirs = {0}\n".format(repr(include_dirs))) + f.write("library_dirs = {0}\n".format(repr(lib_dirs))) + f.write( + "extra_link_args += ['-Wl,-rpath={0}']\n".format(rpath_str) + ) + if '+mpi' in spec: + f.write("define_macros += [('PARALLEL', '1')]\n") + f.write("compiler='{0}'\n".format(spec['mpi'].mpicc)) + f.write("mpicompiler = '{0}'\n".format(spec['mpi'].mpicc)) + f.write("mpi_include_dirs = {0}\n".format(mpi_include_dirs)) + f.write("mpi_library_dirs = {0}\n".format(mpi_library_dirs)) + else: + f.write("compiler='{0}'\n".format(self.compiler.cc)) + f.write("mpicompiler = None\n") + if '+scalapack' in spec: + f.write("scalapack = True\n") + f.write("define_macros += {0}\n".format(scalapack_macros)) -- cgit v1.2.3-70-g09d2 From ef310d9f66366d52ced0c61db2d99e11dfe0c270 Mon Sep 17 00:00:00 2001 From: Federico Ficarelli Date: Wed, 7 Mar 2018 13:59:20 +0100 Subject: fmt: add version (#7415) --- var/spack/repos/builtin/packages/fmt/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fmt/package.py b/var/spack/repos/builtin/packages/fmt/package.py index 78b4bfd664..0e1ed762be 100644 --- a/var/spack/repos/builtin/packages/fmt/package.py +++ b/var/spack/repos/builtin/packages/fmt/package.py @@ -33,6 +33,7 @@ class Fmt(CMakePackage): homepage = "http://fmtlib.net/latest/index.html" url = "https://github.com/fmtlib/fmt/releases/download/4.0.0/fmt-4.0.0.zip" + version('4.1.0', 'ded3074a9405a07604d6355fdb592484') version('4.0.0', '605b5abee11b83195191234f4f414cf1') version('3.0.2', 'b190a7b8f2a5e522ee70cf339a53d3b2') version('3.0.1', '14505463b838befe1513b09cae112715') -- cgit v1.2.3-70-g09d2 From f393a2c146d089341c9efebdfe789804b547f06e Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Wed, 7 Mar 2018 13:45:45 -0600 Subject: orthofinder: Create new package. (#7364) --- .../repos/builtin/packages/orthofinder/package.py | 53 ++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 var/spack/repos/builtin/packages/orthofinder/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/orthofinder/package.py b/var/spack/repos/builtin/packages/orthofinder/package.py new file mode 100644 index 0000000000..fa620cf1b3 --- /dev/null +++ b/var/spack/repos/builtin/packages/orthofinder/package.py @@ -0,0 +1,53 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Orthofinder(Package): + """OrthoFinder is a fast, accurate and comprehensive analysis tool for + comparative genomics. + + It finds orthologues and orthogroups infers rooted gene trees for all + orthogroups and infers a rooted species tree for the species being + analysed. OrthoFinder also provides comprehensive statistics for + comparative genomic analyses. OrthoFinder is simple to use and all you + need to run it is a set of protein sequence files (one per species) + in FASTA format.""" + + homepage = "https://github.com/davidemms/OrthoFinder" + url = "https://github.com/davidemms/OrthoFinder/releases/download/2.2.0/OrthoFinder-2.2.0.tar.gz" + + version('2.2.0', '4ff585e1eb148fc694a219296fbdd431') + + depends_on('blast-plus', type='run') + depends_on('mcl', type='run') + depends_on('fastme', type='run') + depends_on('py-dlcpar', type='run') + + def install(self, spec, prefix): + install_tree('.', prefix.bin) + + chmod = which('chmod') + chmod('+x', join_path(prefix.bin, 'orthofinder')) -- cgit v1.2.3-70-g09d2 From 7f3a72fb33df5bb954728b1f1468059d2899944b Mon Sep 17 00:00:00 2001 From: Jim Galarowicz Date: Wed, 7 Mar 2018 16:26:07 -0600 Subject: OpenSpeedShop package: add support for building on cray (#7338) --- .../builtin/packages/cbtf-argonavis-gui/package.py | 6 +- .../builtin/packages/cbtf-argonavis/package.py | 37 ++++++- .../repos/builtin/packages/cbtf-krell/package.py | 96 ++++++++++++++++-- .../repos/builtin/packages/cbtf-lanl/package.py | 14 ++- var/spack/repos/builtin/packages/cbtf/package.py | 12 ++- .../repos/builtin/packages/elfutils/package.py | 1 + .../builtin/packages/llvm-openmp-ompt/package.py | 10 +- var/spack/repos/builtin/packages/mrnet/package.py | 12 ++- .../builtin/packages/openspeedshop/package.py | 107 ++++++++++++++------- var/spack/repos/builtin/packages/qt/qt3krell.patch | 20 ---- 10 files changed, 233 insertions(+), 82 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py index 42f40c63ea..05b8ebe537 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. @@ -23,7 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## ########################################################################## -# Copyright (c) 2015-2017 Krell Institute. All Rights Reserved. +# Copyright (c) 2015-2018 Krell Institute. All Rights Reserved. # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software @@ -49,7 +49,7 @@ class CbtfArgonavisGui(QMakePackage): """ homepage = "http://sourceforge.net/p/cbtf/wiki/Home/" - version('0.8.1', branch='master', + version('1.3.0', branch='master', git='https://github.com/OpenSpeedShop/cbtf-argonavis-gui.git') depends_on("cmake@3.0.2", type='build') diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py index a335754537..b7b2dfa52a 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. @@ -23,7 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## ########################################################################## -# Copyright (c) 2015-2017 Krell Institute. All Rights Reserved. +# Copyright (c) 2015-2018 Krell Institute. All Rights Reserved. # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software @@ -41,6 +41,7 @@ ########################################################################## from spack import * +import os class CbtfArgonavis(CMakePackage): @@ -50,18 +51,31 @@ class CbtfArgonavis(CMakePackage): """ homepage = "http://sourceforge.net/p/cbtf/wiki/Home/" - version('1.8', branch='master', + version('1.9.1', branch='master', git='https://github.com/OpenSpeedShop/cbtf-argonavis.git') + variant('cti', default=False, + description="Build MRNet with the CTI startup option") + variant('crayfe', default=False, + description="build only the FE tool using the runtime_dir \ + to point to target build.") + variant('runtime', default=False, + description="build only the runtime libraries and collectors.") variant('build_type', default='None', values=('None'), description='CMake build type') depends_on("cmake@3.0.2:", type='build') depends_on("boost@1.50.0:1.59.0") depends_on("papi") + depends_on("libmonitor") depends_on("mrnet@5.0.1:+lwthreads") + depends_on("mrnet@5.0.1:+cti", when='+cti') depends_on("cbtf") + depends_on("cbtf+cti", when='+cti') + depends_on("cbtf+runtime", when='+runtime') depends_on("cbtf-krell") + depends_on("cbtf-krell+cti", when="+cti") + depends_on("cbtf-krell+runtime", when="+runtime") depends_on("cuda") parallel = False @@ -87,6 +101,23 @@ class CbtfArgonavis(CMakePackage): '-DBoost_DIR=%s' % spec['boost'].prefix, '-DBOOST_LIBRARYDIR=%s' % spec['boost'].prefix.lib, '-DMRNET_DIR=%s' % spec['mrnet'].prefix, + '-DLIBMONITOR_DIR=%s' % spec['libmonitor'].prefix, '-DBoost_NO_SYSTEM_PATHS=ON'] return cmake_args + + def setup_environment(self, spack_env, run_env): + """Set up the compile and runtime environments for a package.""" + + if os.environ.get('LD_LIBRARY_PATH'): + cupti_path = self.spec['cuda'].prefix + '/extras/CUPTI/lib64' + os.environ['LD_LIBRARY_PATH'] += cupti_path + else: + os.environ['LD_LIBRARY_PATH'] = cupti_path + + run_env.prepend_path( + 'LD_LIBRARY_PATH', + self.spec['cuda'].prefix + '/extras/CUPTI/lib64') + spack_env.prepend_path( + 'LD_LIBRARY_PATH', + self.spec['cuda'].prefix + '/extras/CUPTI/lib64') diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py index 1716d83188..42938c3713 100644 --- a/var/spack/repos/builtin/packages/cbtf-krell/package.py +++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. @@ -23,7 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## ########################################################################## -# Copyright (c) 2015-2017 Krell Institute. All Rights Reserved. +# Copyright (c) 2015-2018 Krell Institute. All Rights Reserved. # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software @@ -41,6 +41,8 @@ ########################################################################## from spack import * +import spack +import spack.store class CbtfKrell(CMakePackage): @@ -52,7 +54,7 @@ class CbtfKrell(CMakePackage): """ homepage = "http://sourceforge.net/p/cbtf/wiki/Home/" - version('1.8', branch='master', + version('1.9.1', branch='master', git='https://github.com/OpenSpeedShop/cbtf-krell.git') # MPI variants @@ -68,8 +70,15 @@ class CbtfKrell(CMakePackage): description="Build mpi experiment collector for mpich2 MPI.") variant('mpich', default=False, description="Build mpi experiment collector for mpich MPI.") + variant('runtime', default=False, + description="build only the runtime libraries and collectors.") variant('build_type', default='None', values=('None'), description='CMake build type') + variant('cti', default=False, + description="Build MRNet with the CTI startup option") + variant('crayfe', default=False, + description="build only the FE tool using the runtime_dir \ + to point to target build.") # Dependencies for cbtf-krell depends_on("cmake@3.0.2:", type='build') @@ -80,16 +89,19 @@ class CbtfKrell(CMakePackage): # collectionTool depends_on("boost@1.50.0:1.59.0") depends_on("dyninst@9.3.2") + depends_on("mrnet@5.0.1:+cti", when='+cti') depends_on("mrnet@5.0.1:+lwthreads") depends_on("xerces-c@3.1.1:") depends_on("cbtf") + depends_on("cbtf+cti", when='+cti') + depends_on("cbtf+runtime", when='+runtime') # for services and collectors depends_on("libmonitor+krellpatch") depends_on("libunwind") depends_on("papi") - depends_on("llvm-openmp-ompt@towards_tr4+standalone") + depends_on("llvm-openmp-ompt@tr6_forwards+standalone") # MPI Installations # These have not worked either for build or execution, commenting out for @@ -105,6 +117,14 @@ class CbtfKrell(CMakePackage): build_directory = 'build_cbtf_krell' + def set_RTOnly_cmakeOptions(self, spec, cmakeOptions): + # Appends to cmakeOptions the options that will enable the appropriate + # MPI implementations + + RTOnlyOptions = [] + RTOnlyOptions.append('-DRUNTIME_ONLY=true') + cmakeOptions.extend(RTOnlyOptions) + def set_mpi_cmakeOptions(self, spec, cmakeOptions): # Appends to cmakeOptions the options that will enable the appropriate # MPI implementations @@ -112,26 +132,74 @@ class CbtfKrell(CMakePackage): MPIOptions = [] # openmpi - if '+openmpi' in spec: + if spec.satisfies('+openmpi'): MPIOptions.append('-DOPENMPI_DIR=%s' % spec['openmpi'].prefix) # mpich - if '+mpich' in spec: + if spec.satisfies('+mpich'): MPIOptions.append('-DMPICH_DIR=%s' % spec['mpich'].prefix) # mpich2 - if '+mpich2' in spec: + if spec.satisfies('+mpich2'): MPIOptions.append('-DMPICH2_DIR=%s' % spec['mpich2'].prefix) # mvapich - if '+mvapich' in spec: + if spec.satisfies('+mvapich'): MPIOptions.append('-DMVAPICH_DIR=%s' % spec['mvapich'].prefix) # mvapich2 - if '+mvapich2' in spec: + if spec.satisfies('+mvapich2'): MPIOptions.append('-DMVAPICH2_DIR=%s' % spec['mvapich2'].prefix) # mpt - if '+mpt' in spec: + if spec.satisfies('+mpt'): MPIOptions.append('-DMPT_DIR=%s' % spec['mpt'].prefix) cmakeOptions.extend(MPIOptions) + def set_CrayLoginNode_cmakeOptions(self, spec, cmakeOptions): + # Appends to cmakeOptions the options that will enable + # the appropriate Cray login node libraries + + CrayLoginNodeOptions = [] + rt_platform = "cray" + # How do we get the compute node (CNL) cbtf package + # install directory path. spec['cbtf'].prefix is the + # login node path for this build, as we are building + # the login node components with this spack invocation. We + # need these paths to be the ones created in the CNL + # spack invocation. + be_cbtf = spack.store.db.query_one('cbtf arch=cray-CNL-haswell') + be_cbtfk = spack.store.db.query_one('cbtf-krell arch=cray-CNL-haswell') + be_papi = spack.store.db.query_one('papi arch=cray-CNL-haswell') + be_boost = spack.store.db.query_one('boost arch=cray-CNL-haswell') + be_mont = spack.store.db.query_one('libmonitor arch=cray-CNL-haswell') + be_unw = spack.store.db.query_one('libunwind arch=cray-CNL-haswell') + be_xer = spack.store.db.query_one('xerces-c arch=cray-CNL-haswell') + be_dyn = spack.store.db.query_one('dyninst arch=cray-CNL-haswell') + be_mrnet = spack.store.db.query_one('mrnet arch=cray-CNL-haswell') + + CrayLoginNodeOptions.append('-DCN_RUNTIME_PLATFORM=%s' + % rt_platform) + + # Use install directories as CMAKE args for the building + # of login cbtf-krell + CrayLoginNodeOptions.append('-DCBTF_CN_RUNTIME_DIR=%s' + % be_cbtf.prefix) + CrayLoginNodeOptions.append('-DCBTF_KRELL_CN_RUNTIME_DIR=%s' + % be_cbtfk.prefix) + CrayLoginNodeOptions.append('-DPAPI_CN_RUNTIME_DIR=%s' + % be_papi.prefix) + CrayLoginNodeOptions.append('-DBOOST_CN_RUNTIME_DIR=%s' + % be_boost.prefix) + CrayLoginNodeOptions.append('-DLIBMONITOR_CN_RUNTIME_DIR=%s' + % be_mont.prefix) + CrayLoginNodeOptions.append('-DLIBUNWIND_CN_RUNTIME_DIR=%s' + % be_unw.prefix) + CrayLoginNodeOptions.append('-DXERCESC_CN_RUNTIME_DIR=%s' + % be_xer.prefix) + CrayLoginNodeOptions.append('-DDYNINST_CN_RUNTIME_DIR=%s' + % be_dyn.prefix) + CrayLoginNodeOptions.append('-DMRNET_CN_RUNTIME_DIR=%s' + % be_mrnet.prefix) + + cmakeOptions.extend(CrayLoginNodeOptions) + def cmake_args(self): spec = self.spec @@ -153,7 +221,15 @@ class CbtfKrell(CMakePackage): '-DLIBIOMP_DIR=%s' % spec['llvm-openmp-ompt'].prefix, '-DXERCESC_DIR=%s' % spec['xerces-c'].prefix] + if self.spec.satisfies('+runtime'): + self.set_RTOnly_cmakeOptions(spec, cmake_args) + # Add any MPI implementations coming from variant settings self.set_mpi_cmakeOptions(spec, cmake_args) + if self.spec.satisfies('+crayfe'): + # We need to build target/compute node components/libraries first + # then pass those libraries to the cbtf-krell login node build + self.set_CrayLoginNode_cmakeOptions(spec, cmake_args) + return cmake_args diff --git a/var/spack/repos/builtin/packages/cbtf-lanl/package.py b/var/spack/repos/builtin/packages/cbtf-lanl/package.py index 19b00e00df..0c6bf54b4c 100644 --- a/var/spack/repos/builtin/packages/cbtf-lanl/package.py +++ b/var/spack/repos/builtin/packages/cbtf-lanl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. @@ -23,7 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## ########################################################################## -# Copyright (c) 2015-2017 Krell Institute. All Rights Reserved. +# Copyright (c) 2015-2018 Krell Institute. All Rights Reserved. # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software @@ -48,18 +48,26 @@ class CbtfLanl(CMakePackage): command monitoring tool.""" homepage = "http://sourceforge.net/p/cbtf/wiki/Home/" - version('1.8', branch='master', + version('1.9.1', branch='master', git='http://git.code.sf.net/p/cbtf-lanl/cbtf-lanl') variant('build_type', default='None', values=('None'), description='CMake build type') + variant('runtime', default=False, + description="build only the runtime libraries and collectors.") + variant('cti', default=False, + description="Build MRNet with the CTI startup option") depends_on("cmake@3.0.2:", type='build') # Dependencies for cbtf-krell depends_on("mrnet@5.0.1:+lwthreads") depends_on("xerces-c@3.1.1:") depends_on("cbtf") + depends_on("cbtf+cti", when='+cti') + depends_on("cbtf+runtime", when='+runtime') depends_on("cbtf-krell") + depends_on("cbtf-krell+cti", when='+cti') + depends_on("cbtf-krell+runtime", when='+runtime') parallel = False diff --git a/var/spack/repos/builtin/packages/cbtf/package.py b/var/spack/repos/builtin/packages/cbtf/package.py index 2f0b3b275d..4e68e21d5b 100644 --- a/var/spack/repos/builtin/packages/cbtf/package.py +++ b/var/spack/repos/builtin/packages/cbtf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. @@ -23,7 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## ########################################################################## -# Copyright (c) 2015-2017 Krell Institute. All Rights Reserved. +# Copyright (c) 2015-2018 Krell Institute. All Rights Reserved. # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software @@ -53,9 +53,11 @@ class Cbtf(CMakePackage): homepage = "http://sourceforge.net/p/cbtf/wiki/Home" # Use when the git repository is available - version('1.8', branch='master', + version('1.9.1', branch='master', git='https://github.com/OpenSpeedShop/cbtf.git') + variant('cti', default=False, + description="Build MRNet with the CTI startup option") variant('runtime', default=False, description="build only the runtime libraries and collectors.") variant('build_type', default='None', values=('None'), @@ -64,6 +66,7 @@ class Cbtf(CMakePackage): depends_on("cmake@3.0.2:", type='build') depends_on("boost@1.50.0:1.59.0") depends_on("mrnet@5.0.1:+lwthreads") + depends_on("mrnet@5.0.1:+cti", when='+cti') depends_on("xerces-c@3.1.1:") # Work around for spack libxml2 package bug, take off python when fixed depends_on("libxml2+python") @@ -83,7 +86,8 @@ class Cbtf(CMakePackage): compile_flags = "-O2 -g" - if '+runtime' in spec: + if spec.satisfies('+runtime'): + # Install message tag include file for use in Intel MIC # cbtf-krell build # FIXME diff --git a/var/spack/repos/builtin/packages/elfutils/package.py b/var/spack/repos/builtin/packages/elfutils/package.py index 2db5d71d3a..726c53a032 100644 --- a/var/spack/repos/builtin/packages/elfutils/package.py +++ b/var/spack/repos/builtin/packages/elfutils/package.py @@ -46,6 +46,7 @@ class Elfutils(AutotoolsPackage): depends_on('flex', type='build') depends_on('bison', type='build') depends_on('gettext') + conflicts('%gcc@7.2.0:', when='@0.163') provides('elf@1') diff --git a/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py b/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py index 2526cd4d03..310df251aa 100644 --- a/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py +++ b/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. @@ -33,8 +33,8 @@ class LlvmOpenmpOmpt(CMakePackage): homepage = "https://github.com/OpenMPToolsInterface/LLVM-openmp" - # towards_tr4 branch - version('towards_tr4', branch='towards_tr4', + # tr6_forwards branch + version('tr6_forwards', branch='tr6_forwards', git='https://github.com/OpenMPToolsInterface/LLVM-openmp.git') version('3.9.2b2', @@ -79,9 +79,9 @@ class LlvmOpenmpOmpt(CMakePackage): '-DCMAKE_BUILD_WITH_INSTALL_RPATH=true', '-DLIBOMP_USE_DEBUGGER=false']) - # Build llvm-openmp-ompt using the toward_tr4 branch + # Build llvm-openmp-ompt using the tr6_forwards branch # This requires the version to be 5.0 (50) - if '@towards_tr4' in self.spec: + if '@tr6_forwards' in self.spec: cmake_args.extend( ['-DLIBOMP_OMP_VERSION=50']) diff --git a/var/spack/repos/builtin/packages/mrnet/package.py b/var/spack/repos/builtin/packages/mrnet/package.py index 6569934817..97637bf9fa 100644 --- a/var/spack/repos/builtin/packages/mrnet/package.py +++ b/var/spack/repos/builtin/packages/mrnet/package.py @@ -31,17 +31,21 @@ class Mrnet(AutotoolsPackage): url = "http://ftp.cs.wisc.edu/pub/paradyn/mrnet/mrnet_5.0.1.tar.gz" list_url = "http://ftp.cs.wisc.edu/paradyn/mrnet" + version('5.0.1-3', git='https://github.com/dyninst/mrnet.git') version('5.0.1-2', git='https://github.com/dyninst/mrnet.git', commit='20b1eacfc6d680d9f6472146d2dfaa0f900cc2e9') version('5.0.1', '17f65738cf1b9f9b95647ff85f69ecdd') version('4.1.0', '5a248298b395b329e2371bf25366115c') version('4.0.0', 'd00301c078cba57ef68613be32ceea2f') + variant('cti', default=False, + description="Build the MRNet with the CTI startup option") variant('lwthreads', default=False, description="Also build the MRNet LW threadsafe libraries") parallel = False depends_on("boost") + depends_on("cti", when='+cti') def configure_args(self): spec = self.spec @@ -51,5 +55,11 @@ class Mrnet(AutotoolsPackage): # lwthreads variant is present if '+lwthreads' in spec: config_args.append('--enable-ltwt-threadsafe') - + # Build the MRNet with CTI based start-up when + # the cti variant is present + if '+cti' in spec: + config_args.append('--with-startup=cray-cti') + cti = self.spec['cti'].prefix + config_args.append('--with-craycti-inc=-I%s/include' % cti) + config_args.append('--with-craycti-lib=-I%s/lib' % cti) return config_args diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py index 60d5a1c1b7..39df30afd2 100644 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. @@ -23,7 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## ############################################################################## -# Copyright (c) 2015-2017 Krell Institute. All Rights Reserved. +# Copyright (c) 2015-2018 Krell Institute. All Rights Reserved. # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the Free @@ -41,6 +41,10 @@ ############################################################################## from spack import * + +import spack +import spack.store + import os import os.path @@ -63,7 +67,7 @@ class Openspeedshop(CMakePackage): url = "https://github.com/OpenSpeedShop" # Use when the git repository is available - version('2.3', branch='master', + version('2.3.1', branch='master', git='https://github.com/OpenSpeedShop/openspeedshop.git') variant('offline', default=False, @@ -72,7 +76,9 @@ class Openspeedshop(CMakePackage): description="build with cbtf instrumentor enabled.") variant('runtime', default=False, description="build only the runtime libraries and collectors.") - variant('frontend', default=False, + variant('cti', default=False, + description="Build MRNet with the CTI startup option") + variant('crayfe', default=False, description="build only the FE tool using the runtime_dir \ to point to target build.") variant('cuda', default=False, @@ -117,6 +123,7 @@ class Openspeedshop(CMakePackage): depends_on("sqlite") depends_on("boost@1.50.0:1.59.0") depends_on("dyninst@9.3.2") + depends_on("python") depends_on("libxml2+python") depends_on("qt@3.3.8b+krellpatch", when='gui=qt3') # Actively working on adding this gui package @@ -136,6 +143,8 @@ class Openspeedshop(CMakePackage): # Dependencies only for the openspeedshop cbtf package. depends_on("cbtf", when='+cbtf') depends_on('cbtf-krell', when='+cbtf') + depends_on('cbtf-krell+crayfe', when='+crayfe') + depends_on('cbtf-krell+cti', when='+cti') depends_on('cbtf-krell+mpich', when='+cbtf+mpich') depends_on('cbtf-krell+mpich2', when='+cbtf+mpich2') depends_on('cbtf-krell+mpt', when='+cbtf+mpt') @@ -144,19 +153,45 @@ class Openspeedshop(CMakePackage): depends_on('cbtf-krell+openmpi', when='+cbtf+openmpi') depends_on("cbtf-argonavis", when='+cbtf+cuda') depends_on("mrnet@5.0.1:+lwthreads", when='+cbtf') + depends_on("mrnet@5.0.1:+cti", when='+cti+cbtf') parallel = False build_directory = 'build_openspeedshop' + def set_CrayLoginNode_cmakeOptions(self, spec, cmakeOptions): + # Appends to cmakeOptions the options that will enable the appropriate + # Cray login node libraries + + CrayLoginNodeOptions = [] + rt_platform = "cray" + # How do we get the compute node (CNL) cbtf package install + # directory path? + # spec['cbtf'].prefix is the login node value for this build, as + # we only get here when building the login node components and + # that is all that is known to spack. + be_ck = spack.store.db.query_one('cbtf-krell arch=cray-CNL-haswell') + + # Equivalent to install-tool cmake arg: + # '-DCBTF_KRELL_CN_RUNTIME_DIR=%s' + # % /cbtf_v2.3.1.release/compute) + CrayLoginNodeOptions.append('-DCBTF_KRELL_CN_RUNTIME_DIR=%s' + % be_ck.prefix) + CrayLoginNodeOptions.append('-DRUNTIME_PLATFORM=%s' + % rt_platform) + + cmakeOptions.extend(CrayLoginNodeOptions) + def cmake_args(self): + spec = self.spec + compile_flags = "-O2 -g" - if '+offline' in spec: + if spec.satisfies('+offline'): # Indicate building offline vers (writes rawdata files) instrumentor_setting = "offline" - if '+runtime' in spec: + if spec.satisfies('+runtime'): cmake_args = [ '-DCMAKE_CXX_FLAGS=%s' % compile_flags, '-DCMAKE_C_FLAGS=%s' % compile_flags, @@ -173,7 +208,6 @@ class Openspeedshop(CMakePackage): # Appends base options to cmake_args self.set_defaultbase_cmakeOptions(spec, cmake_args) - cmake_args.extend( ['-DCMAKE_CXX_FLAGS=%s' % compile_flags, '-DCMAKE_C_FLAGS=%s' % compile_flags, @@ -187,11 +221,14 @@ class Openspeedshop(CMakePackage): # Add any MPI implementations coming from variant settings self.set_mpi_cmakeOptions(spec, cmake_args) - elif '+cbtf' in spec: + elif spec.satisfies('+cbtf'): + + cmake_args = [] + # Indicate building cbtf vers (transfer rawdata files) instrumentor_setting = "cbtf" - if '+runtime' in spec: + if spec.satisfies('+runtime'): # Appends base options to cmake_args self.set_defaultbase_cmakeOptions(spec, cmake_args) @@ -204,7 +241,6 @@ class Openspeedshop(CMakePackage): '-DMRNET_DIR=%s' % spec['mrnet'].prefix]) else: - cmake_args = [] # Appends base options to cmake_args self.set_defaultbase_cmakeOptions(spec, cmake_args) @@ -229,6 +265,13 @@ class Openspeedshop(CMakePackage): ['-DQTLIB_DIR=%s' % spec['qt'].prefix]) + if spec.satisfies('+crayfe'): + # We need to build target/compute node + # components/libraries first then pass + # those libraries to the openspeedshop + # login node build + self.set_CrayLoginNode_cmakeOptions(spec, cmake_args) + return cmake_args def set_defaultbase_cmakeOptions(self, spec, cmakeOptions): @@ -263,22 +306,22 @@ class Openspeedshop(CMakePackage): MPIOptions = [] # openmpi - if '+openmpi' in spec: + if spec.satisfies('+openmpi'): MPIOptions.append('-DOPENMPI_DIR=%s' % spec['openmpi'].prefix) # mpich - if '+mpich' in spec: + if spec.satisfies('+mpich'): MPIOptions.append('-DMPICH_DIR=%s' % spec['mpich'].prefix) # mpich2 - if '+mpich2' in spec: + if spec.satisfies('+mpich2'): MPIOptions.append('-DMPICH2_DIR=%s' % spec['mpich2'].prefix) # mvapich - if '+mvapich' in spec: + if spec.satisfies('+mvapich'): MPIOptions.append('-DMVAPICH_DIR=%s' % spec['mvapich'].prefix) # mvapich2 - if '+mvapich2' in spec: + if spec.satisfies('+mvapich2'): MPIOptions.append('-DMVAPICH2_DIR=%s' % spec['mvapich2'].prefix) # mpt - if '+mpt' in spec: + if spec.satisfies('+mpt'): MPIOptions.append('-DMPT_DIR=%s' % spec['mpt'].prefix) cmakeOptions.extend(MPIOptions) @@ -308,26 +351,13 @@ class Openspeedshop(CMakePackage): run_env.prepend_path('LD_LIBRARY_PATH', os.path.dirname(oss_libdir.joined())) + run_env.set('OPENSS_RAWDATA_DIR', '.') # Settings specific to the version, checking here - # for the cbtf instrumentor - if '+cbtf' in self.spec: - cbtf_mc = '/sbin/cbtf_mrnet_commnode' - cbtf_lmb = '/sbin/cbtf_libcbtf_mrnet_backend' - run_env.set('XPLAT_RSH', 'ssh') - run_env.set('MRNET_COMM_PATH', - join_path(self.spec['cbtf-krell'].prefix + cbtf_mc)) - - run_env.set('CBTF_MRNET_BACKEND_PATH', - join_path(self.spec['cbtf-krell'].prefix + cbtf_lmb)) - - run_env.prepend_path('PATH', self.spec['mrnet'].prefix.bin) - run_env.prepend_path('PATH', self.spec['cbtf-krell'].prefix.bin) - run_env.prepend_path('PATH', self.spec['cbtf-krell'].prefix.sbin) - - elif '+offline' in self.spec: + # for the offline instrumentor, otherwise use cbtf instrumentor + # settings. MPI for the cbtf instrumentor is setup in cbtf-krell + if '+offline' in self.spec: # Had to use this form of syntax self.prefix.lib and # self.prefix.lib64 returned None all the time - run_env.set('OPENSS_RAWDATA_DIR', '.') run_env.set('OPENSS_PLUGIN_PATH', join_path(oss_libdir + '/openspeedshop')) run_env.prepend_path('PATH', self.spec['papi'].prefix.bin) @@ -341,3 +371,14 @@ class Openspeedshop(CMakePackage): run_env.set('OPENSS_MPI_IMPLEMENTATION', 'mvapich2') if '+openmpi' in self.spec: run_env.set('OPENSS_MPI_IMPLEMENTATION', 'openmpi') + else: + cbtf_mc = '/sbin/cbtf_mrnet_commnode' + cbtf_lmb = '/sbin/cbtf_libcbtf_mrnet_backend' + run_env.set('XPLAT_RSH', 'ssh') + run_env.set('MRNET_COMM_PATH', + join_path(self.spec['cbtf-krell'].prefix + cbtf_mc)) + run_env.set('CBTF_MRNET_BACKEND_PATH', + join_path(self.spec['cbtf-krell'].prefix + cbtf_lmb)) + run_env.prepend_path('PATH', self.spec['mrnet'].prefix.bin) + run_env.prepend_path('PATH', self.spec['cbtf-krell'].prefix.bin) + run_env.prepend_path('PATH', self.spec['cbtf-krell'].prefix.sbin) diff --git a/var/spack/repos/builtin/packages/qt/qt3krell.patch b/var/spack/repos/builtin/packages/qt/qt3krell.patch index 4f1c12e43e..cee94b3cbc 100644 --- a/var/spack/repos/builtin/packages/qt/qt3krell.patch +++ b/var/spack/repos/builtin/packages/qt/qt3krell.patch @@ -1,23 +1,3 @@ ---- qt-x11-free-3.3.8b/src/tools/qmap.h 2008-01-15 13:09:13.000000000 -0600 -+++ qt-x11-free-3.3.8b-fixes/src/tools/qmap.h 2015-07-08 15:47:34.757565247 -0500 -@@ -52,6 +52,7 @@ - #ifndef QT_NO_STL - #include - #include -+#include - #endif - - //#define QT_CHECK_MAP_RANGE ---- qt-x11-free-3.3.8b/src/tools/qvaluelist.h 2008-01-15 13:09:13.000000000 -0600 -+++ qt-x11-free-3.3.8b-fixes/src/tools/qvaluelist.h 2015-07-08 15:47:34.758565247 -0500 -@@ -50,6 +50,7 @@ - #ifndef QT_NO_STL - #include - #include -+#include - #endif - - //#define QT_CHECK_VALUELIST_RANGE --- qt-x11-free-3.3.8b/src/tools/qvaluevector.h 2008-01-15 13:09:13.000000000 -0600 +++ qt-x11-free-3.3.8b-fixes/src/tools/qvaluevector.h 2015-07-08 15:47:34.758565247 -0500 @@ -47,6 +47,7 @@ -- cgit v1.2.3-70-g09d2 From cb64e3229639fc777f39e0c32a95e995dc0f5c4b Mon Sep 17 00:00:00 2001 From: snehring Date: Wed, 7 Mar 2018 17:40:51 -0600 Subject: gcta: new package (#7425) --- var/spack/repos/builtin/packages/gcta/package.py | 48 ++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 var/spack/repos/builtin/packages/gcta/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gcta/package.py b/var/spack/repos/builtin/packages/gcta/package.py new file mode 100644 index 0000000000..4dd47759a3 --- /dev/null +++ b/var/spack/repos/builtin/packages/gcta/package.py @@ -0,0 +1,48 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Gcta(Package): + + """GCTA (Genome-wide Complex Trait Analysis) was originally designed to + estimate the proportion of phenotypic variance explained by all genome-wide + SNPs for complex traits (the GREML method), and has subsequently extended + for many other analyses to better understand the genetic architecture of + complex traits. GCTA currently supports the following analyses.""" + + homepage = "http://cnsgenomics.com/software/gcta/#Overview" + url = "http://cnsgenomics.com/software/gcta/gcta_1.91.2beta.zip" + + version('1.91.2beta_mac', 'ce0882ad35dd9474ffe40911da369274700af1ecb9916c0a355b7bad14850234') + version('1.91.2beta', '192efb767be1c7ca9c2dac5d2c2317a97c7a9db1f801168d19ad2a51b98d9b10', preferred=True) + + conflicts('@1.91.2beta', when='platform=darwin') + conflicts('@1.91.2beta_mac', when='platform=linux') + + def install(self, spec, prefix): + mkdirp(prefix.bin) + install('gcta64', join_path(prefix.bin, 'gcta64')) + set_executable(join_path(prefix.bin, 'gcta64')) -- cgit v1.2.3-70-g09d2 From 13e6fc730da6c0ace31e846af4fdb6213dc3c0e8 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 7 Mar 2018 17:42:37 -0600 Subject: cdbfasta: needs zlib (#7413) --- var/spack/repos/builtin/packages/cdbfasta/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cdbfasta/package.py b/var/spack/repos/builtin/packages/cdbfasta/package.py index f3aafbe20a..7350de6841 100644 --- a/var/spack/repos/builtin/packages/cdbfasta/package.py +++ b/var/spack/repos/builtin/packages/cdbfasta/package.py @@ -33,6 +33,8 @@ class Cdbfasta(MakefilePackage): version('2017-03-16', git='https://github.com/gpertea/cdbfasta.git', commit='b3e481fe02dfbc767a3842bcb1b687c60376a5e8') + depends_on('zlib') + def install(self, spec, prefix): mkdirp(prefix.bin) install('cdbfasta', prefix.bin) -- cgit v1.2.3-70-g09d2 From 1cf451b62c17d35720db0728a376bc4cd75fac07 Mon Sep 17 00:00:00 2001 From: Robert Pavel Date: Wed, 7 Mar 2018 16:46:53 -0700 Subject: Generalized ExaSP2 Install (#7422) Generalized ExaSP2 Install to use glob due to changes in naming convention between previous release and current development branch --- var/spack/repos/builtin/packages/exasp2/package.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/exasp2/package.py b/var/spack/repos/builtin/packages/exasp2/package.py index 7bb69d461d..7c7b414e8b 100644 --- a/var/spack/repos/builtin/packages/exasp2/package.py +++ b/var/spack/repos/builtin/packages/exasp2/package.py @@ -23,6 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * +import glob class Exasp2(MakefilePackage): @@ -88,9 +89,7 @@ class Exasp2(MakefilePackage): def install(self, spec, prefix): mkdir(prefix.bin) mkdir(prefix.doc) - if '+mpi' in self.spec: - install('bin/ExaSP2-parallel', prefix.bin) - else: - install('bin/ExaSP2-serial', prefix.bin) + for files in glob.glob('bin/ExaSP2-*'): + install(files, prefix.bin) install('LICENSE.md', prefix.doc) install('README.md', prefix.doc) -- cgit v1.2.3-70-g09d2 From 64f1fbb2e2aecbf16e4ddd9689f5bfdc5a800a90 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Wed, 7 Mar 2018 23:38:17 -0600 Subject: dislin: new package (#7305) --- var/spack/repos/builtin/packages/dislin/package.py | 53 ++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 var/spack/repos/builtin/packages/dislin/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dislin/package.py b/var/spack/repos/builtin/packages/dislin/package.py new file mode 100644 index 0000000000..b77b9cbf19 --- /dev/null +++ b/var/spack/repos/builtin/packages/dislin/package.py @@ -0,0 +1,53 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Dislin(Package): + """DISLIN is a high level and easy to use graphics library for displaying + data as curves, bar graphs, pie charts, 3D-colour plots, surfaces, + contours and maps.""" + + homepage = "http://www.mps.mpg.de/dislin" + url = "ftp://ftp.gwdg.de/pub/grafik/dislin/linux/i586_64/dislin-11.0.linux.i586_64.tar.gz" + + version('11.0.linux.i586_64', '6fb099b54f41db009cafc702eebb5bc6') + + depends_on('motif') + depends_on('mesa') + + def setup_environment(self, spack_env, run_env): + spack_env.set('DISLIN', self.prefix) + run_env.set('DISLIN', self.prefix) + run_env.prepend_path('PATH', self.prefix) + run_env.prepend_path('LD_LIBRARY_PATH', self.prefix) + run_env.prepend_path('LD_LIBRARY_PATH', self.spec['motif'].prefix.lib) + run_env.prepend_path('LD_LIBRARY_PATH', self.spec['mesa'].prefix.lib) + + def install(self, spec, prefix): + INSTALL = Executable('./INSTALL') + INSTALL() + with working_dir('examples'): + install('dislin_d.h', prefix) -- cgit v1.2.3-70-g09d2 From 98808196cb4ab5531f71341882ce47b6bbd34005 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Thu, 8 Mar 2018 01:27:41 -0600 Subject: star: needs zlib (#7418) --- var/spack/repos/builtin/packages/star/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/star/package.py b/var/spack/repos/builtin/packages/star/package.py index 3a21e5806e..89ffbc15f3 100644 --- a/var/spack/repos/builtin/packages/star/package.py +++ b/var/spack/repos/builtin/packages/star/package.py @@ -36,6 +36,8 @@ class Star(Package): version('2.4.2a', '8b9345f2685a5ec30731e0868e86d506', url='https://github.com/alexdobin/STAR/archive/STAR_2.4.2a.tar.gz') + depends_on('zlib') + def install(self, spec, prefix): with working_dir('source'): make('STAR', 'STARlong') -- cgit v1.2.3-70-g09d2 From 66c46ae655cbb800ba9a36a0ba4b81f22df657ce Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Thu, 8 Mar 2018 01:30:02 -0600 Subject: New package r-phangorn and its dependencies (#7034) --- var/spack/repos/builtin/packages/r-ape/package.py | 4 ++ .../repos/builtin/packages/r-fastmatch/package.py | 38 ++++++++++++++++++ .../repos/builtin/packages/r-igraph/package.py | 3 +- .../repos/builtin/packages/r-phangorn/package.py | 46 ++++++++++++++++++++++ 4 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 var/spack/repos/builtin/packages/r-fastmatch/package.py create mode 100644 var/spack/repos/builtin/packages/r-phangorn/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-ape/package.py b/var/spack/repos/builtin/packages/r-ape/package.py index 17a0f0ff23..bb225a501a 100644 --- a/var/spack/repos/builtin/packages/r-ape/package.py +++ b/var/spack/repos/builtin/packages/r-ape/package.py @@ -46,6 +46,10 @@ class RApe(RPackage): url = "https://cran.r-project.org/src/contrib/ape_4.1.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/ape" + version('5.0', '82fd2786a502f070ca020797f7b19fa4') version('4.1', 'a9ed416d6d172d4b9682556cf692d7c2') depends_on('r@3.2:') + depends_on('r-nlme', type=('build', 'run')) + depends_on('r-lattice', type=('build', 'run')) + depends_on('r-rcpp', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-fastmatch/package.py b/var/spack/repos/builtin/packages/r-fastmatch/package.py new file mode 100644 index 0000000000..aa13e7a01f --- /dev/null +++ b/var/spack/repos/builtin/packages/r-fastmatch/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RFastmatch(RPackage): + """Package providing a fast match() replacement for cases that require + repeated look-ups. It is slightly faster that R's built-in match() + function on first match against a table, but extremely fast on any + subsequent lookup as it keeps the hash table in memory.""" + + homepage = "http://www.rforge.net/fastmatch" + url = "https://cran.r-project.org/src/contrib/fastmatch_1.1-0.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/fastmatch" + + version('1.1-0', '900c2363c15059ac9d63c4c71ea2d6b2') diff --git a/var/spack/repos/builtin/packages/r-igraph/package.py b/var/spack/repos/builtin/packages/r-igraph/package.py index b8a715b9ae..5df9b7de86 100644 --- a/var/spack/repos/builtin/packages/r-igraph/package.py +++ b/var/spack/repos/builtin/packages/r-igraph/package.py @@ -34,11 +34,12 @@ class RIgraph(RPackage): url = "https://cran.r-project.org/src/contrib/igraph_1.0.1.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/igraph" + version('1.1.2', 'ca1617aea272852d2856c4661ad1c7d8') version('1.0.1', 'ea33495e49adf4a331e4ba60ba559065') depends_on('r-matrix', type=('build', 'run')) depends_on('r-magrittr', type=('build', 'run')) - depends_on('r-nmf', type=('build', 'run')) + depends_on('r-pkgconfig', type=('build', 'run')) depends_on('r-irlba', type=('build', 'run')) depends_on('gmp') depends_on('libxml2') diff --git a/var/spack/repos/builtin/packages/r-phangorn/package.py b/var/spack/repos/builtin/packages/r-phangorn/package.py new file mode 100644 index 0000000000..1710b2b75f --- /dev/null +++ b/var/spack/repos/builtin/packages/r-phangorn/package.py @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RPhangorn(RPackage): + """Package contains methods for estimation of phylogenetic trees and + networks using Maximum Likelihood, Maximum Parsimony, distance methods + and Hadamard conjugation. Allows to compare trees, models selection and + offers visualizations for trees and split networks.""" + + homepage = "http://www.example.co://github.com/KlausVigo/phangorn" + url = "https://cran.r-project.org/src/contrib/phangorn_2.3.1.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/phangorn" + + version('2.3.1', '85e7309900d061432508ab6f7e3e627e') + + depends_on('r-ape@5.0:', type=('build', 'run')) + depends_on('r-quadprog', type=('build', 'run')) + depends_on('r-igraph@1.0:', type=('build', 'run')) + depends_on('r-matrix', type=('build', 'run')) + depends_on('r-fastmatch', type=('build', 'run')) + depends_on('r-magrittr', type=('build', 'run')) + depends_on('r-rcpp@0.12.0:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From ac7fef3253f4b3b8be9635d123e186f52c7a3b29 Mon Sep 17 00:00:00 2001 From: "Kelly (KT) Thompson" Date: Thu, 8 Mar 2018 00:39:35 -0700 Subject: Help newer versions of trilinos/zoltan2 successfully configure. (#7059) + Newer versions of zoltan2 are doing test compiles that link to parmetis. If these checks don't find `metis.h`, the check fails. + This small tweak ensures that the zoltan2 configure step can find `metis.h` that is provided by spack. --- var/spack/repos/builtin/packages/trilinos/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 9ece60a57f..65b91b2831 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -451,8 +451,9 @@ class Trilinos(CMakePackage): '-DParMETIS_LIBRARY_DIRS=%s;%s' % ( spec['parmetis'].prefix.lib, spec['metis'].prefix.lib), '-DParMETIS_LIBRARY_NAMES=parmetis;metis', - '-DTPL_ParMETIS_INCLUDE_DIRS=%s' % ( - spec['parmetis'].prefix.include) + '-DTPL_ParMETIS_INCLUDE_DIRS=%s;%s' % ( + spec['parmetis'].prefix.include, + spec['metis'].prefix.include) ]) else: options.extend([ -- cgit v1.2.3-70-g09d2 From ad183f652f4971b229cada6b09e7bbe4d7a27bf0 Mon Sep 17 00:00:00 2001 From: zenln Date: Thu, 8 Mar 2018 01:47:46 -0600 Subject: Added compiler conflict to prank (#7168) --- var/spack/repos/builtin/packages/prank/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/prank/package.py b/var/spack/repos/builtin/packages/prank/package.py index 740cb63b85..27ac4d4cd5 100644 --- a/var/spack/repos/builtin/packages/prank/package.py +++ b/var/spack/repos/builtin/packages/prank/package.py @@ -36,6 +36,7 @@ class Prank(Package): depends_on('mafft') depends_on('exonerate') depends_on('bpp-suite') # for bppancestor + conflicts('%gcc@7.2.0', when='@:150803') def install(self, spec, prefix): with working_dir('src'): -- cgit v1.2.3-70-g09d2 From 732432df500f2e356f38f3e538fbb788be7374cb Mon Sep 17 00:00:00 2001 From: Brock Palen Date: Thu, 8 Mar 2018 03:35:59 -0500 Subject: hoomd-blue version bump and compiler updated (#7021) updated hoomd-blue to latest tagged release in repo. This version also supports newer gcc6 compilers, so added constraint for older version to avoid breaking existing installs. --- var/spack/repos/builtin/packages/hoomd-blue/package.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hoomd-blue/package.py b/var/spack/repos/builtin/packages/hoomd-blue/package.py index 7a9933424a..8b0099f291 100644 --- a/var/spack/repos/builtin/packages/hoomd-blue/package.py +++ b/var/spack/repos/builtin/packages/hoomd-blue/package.py @@ -50,6 +50,7 @@ class HoomdBlue(CMakePackage): # with a .git directory, causing the build to fail. As a workaround, # clone a specific tag from Bitbucket instead of using the tarballs. # https://bitbucket.org/glotzer/hoomd-blue/issues/238 + version('2.2.2', git=git, tag='v2.2.2', submodules=True) version('2.1.6', git=git, tag='v2.1.6', submodules=True) variant('mpi', default=True, description='Compile with MPI enabled') @@ -61,11 +62,14 @@ class HoomdBlue(CMakePackage): # https://gcc.gnu.org/projects/cxx-status.html conflicts('%gcc@:4.6') - # HOOMD-blue uses hexadecimal floats, which are not technically part of - # the C++11 standard. GCC 6.0+ produces an error when this happens. + # HOOMD-blue 2.1.6 uses hexadecimal floats, which are not technically + # part of the C++11 standard. GCC 6.0+ produces an error when this happens. # https://bitbucket.org/glotzer/hoomd-blue/issues/239 # https://bugzilla.redhat.com/show_bug.cgi?id=1321986 - conflicts('%gcc@6.0:') + conflicts('%gcc@6.0:', when='@2.1.6') + + # HOOMD-blue GCC 7+ is not yet supported + conflicts('%gcc@7.0:') extends('python') depends_on('python@2.7:') -- cgit v1.2.3-70-g09d2 From bcde37633d62c96586f9b8c54e69a5f11272375a Mon Sep 17 00:00:00 2001 From: jthies Date: Thu, 8 Mar 2018 02:16:51 -0800 Subject: Added new package: ghost (#7362) --- var/spack/repos/builtin/packages/ghost/package.py | 87 +++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 var/spack/repos/builtin/packages/ghost/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ghost/package.py b/var/spack/repos/builtin/packages/ghost/package.py new file mode 100644 index 0000000000..8964ee6404 --- /dev/null +++ b/var/spack/repos/builtin/packages/ghost/package.py @@ -0,0 +1,87 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class Ghost(CMakePackage): + """GHOST: a General, Hybrid and Optimized Sparse Toolkit. + This library provides highly optimized building blocks for implementing + sparse iterative eigenvalue and linear solvers multi- and manycore + clusters and on heterogenous CPU/GPU machines. For an iterative solver + library using these kernels, see the phist package. + """ + + homepage = "https://www.bitbucket.org/essex/ghost/" + url = "https://bitbucket.org/essex/ghost/" + + version('develop', + git='https://bitbucket.org/essex/ghost/ghost.git', branch='devel') + + variant('shared', default=True, + description='Enables the build of shared libraries') + variant('mpi', default=True, + description='enable/disable MPI') + variant('cuda', default=False, + description='enable/disable CUDA') + variant('scotch', default=False, + description='enable/disable matrix reordering with PT-SCOTCH') + variant('zoltan', default=False, + description='enable/disable matrix reordering with Zoltan') + + # ###################### Dependencies ########################## + + # Everything should be compiled position independent (-fpic) + depends_on('cmake@3.5:') + depends_on('hwloc') + depends_on('blas') + depends_on('mpi', when='+mpi') + depends_on('cuda@8:', when='+cuda') + depends_on('scotch', when='+scotch') + depends_on('zoltan', when='+zoltan') + + def cmake_args(self): + spec = self.spec + cblas_include_dir = '' + if '^mkl' not in spec: + cblas_include_dir = '-DCBLAS_INCLUDE_DIR=' + \ + spec['blas'].prefix.include + + args = ['-DGHOST_ENABLE_MPI:BOOL=%s' + % ('ON' if '+mpi' in spec else 'OFF'), + '-DGHOST_USE_CUDA:BOOL=%s' + % ('ON' if '+cuda' in spec else 'OFF'), + '-DGHOST_USE_SCOTCH:BOOL=%s' + % ('ON' if '+scotch' in spec else 'OFF'), + '-DGHOST_USE_ZOLTAN:BOOL=%s' + % ('ON' if '+zoltan' in spec else 'OFF'), + '-DBUILD_SHARED_LIBS:BOOL=%s' + % ('ON' if '+shared' in spec else 'OFF'), cblas_include_dir + ] + + return args + + def check(self): + make('test') -- cgit v1.2.3-70-g09d2 From 74bb15285baa765077ecc3b6fc57fd6bf0f74971 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Thu, 8 Mar 2018 23:25:29 +0100 Subject: json-c: Update to 0.13.1 (#7419) * json-c: Update to 0.13.1 0.12.1 does not compile with GCC 7. * json-c: Add patch to make 0.12.1 build with gcc 7 --- var/spack/repos/builtin/packages/json-c/package.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/json-c/package.py b/var/spack/repos/builtin/packages/json-c/package.py index 5076650d69..472fb2af13 100644 --- a/var/spack/repos/builtin/packages/json-c/package.py +++ b/var/spack/repos/builtin/packages/json-c/package.py @@ -30,9 +30,16 @@ class JsonC(AutotoolsPackage): homepage = "https://github.com/json-c/json-c/wiki" url = "https://s3.amazonaws.com/json-c_releases/releases/json-c-0.12.1.tar.gz" + version('0.13.1', '04969ad59cc37bddd83741a08b98f350') version('0.12.1', '55f7853f7d8cf664554ce3fa71bf1c7d') version('0.11', 'aa02367d2f7a830bf1e3376f77881e98') depends_on('autoconf', type='build') parallel = False + + @when('@0.12.1 %gcc@7') + def patch(self): + filter_file('-Wextra', + '-Wextra -Wno-error=implicit-fallthrough', + 'Makefile.in') -- cgit v1.2.3-70-g09d2 From 331f5f27eb51340978c920a4b86ea9dcc625a854 Mon Sep 17 00:00:00 2001 From: Patrick Gartung Date: Thu, 8 Mar 2018 22:18:55 -0600 Subject: lua package: add lib64 to LUA_PATH and LUA_CPATH (#7434) This is needed when using system lua on RHEL and clones where lua is installed in /usr/lib64. Note that the path entry for lua in packages.yaml should specify the major/minor version of lua (since this is used to calculate the lua lib directory) --- var/spack/repos/builtin/packages/lua/package.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lua/package.py b/var/spack/repos/builtin/packages/lua/package.py index 46d1e5c094..763f6c5cbe 100644 --- a/var/spack/repos/builtin/packages/lua/package.py +++ b/var/spack/repos/builtin/packages/lua/package.py @@ -102,6 +102,7 @@ class Lua(Package): deptypes=('build', 'run'), deptype_query='run'): if d.package.extends(self.spec): lua_paths.append(os.path.join(d.prefix, self.lua_lib_dir)) + lua_paths.append(os.path.join(d.prefix, self.lua64_lib_dir)) lua_paths.append(os.path.join(d.prefix, self.lua_share_dir)) lua_patterns = [] @@ -112,6 +113,7 @@ class Lua(Package): # Always add this package's paths for p in (os.path.join(self.spec.prefix, self.lua_lib_dir), + os.path.join(self.spec.prefix, self.lua_lib64_dir), os.path.join(self.spec.prefix, self.lua_share_dir)): self.append_paths(lua_patterns, lua_cpatterns, p) @@ -155,6 +157,10 @@ class Lua(Package): def lua_lib_dir(self): return os.path.join('lib', 'lua', str(self.version.up_to(2))) + @property + def lua_lib64_dir(self): + return os.path.join('lib64', 'lua', str(self.version.up_to(2))) + @property def lua_share_dir(self): return os.path.join('share', 'lua', str(self.version.up_to(2))) -- cgit v1.2.3-70-g09d2 From b6440fd10ed131b4f8c8afe0e28ddf420110a07a Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Fri, 9 Mar 2018 01:36:26 -0600 Subject: r-cner: new package (#7228) --- var/spack/repos/builtin/packages/r-cner/package.py | 56 ++++++++++++++++++++++ .../repos/builtin/packages/r-keggrest/package.py | 3 ++ 2 files changed, 59 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-cner/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-cner/package.py b/var/spack/repos/builtin/packages/r-cner/package.py new file mode 100644 index 0000000000..8b920b11e1 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-cner/package.py @@ -0,0 +1,56 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RCner(RPackage): + """"Large-scale identification and advanced visualization of sets of + conserved noncoding elements.""" + + homepage = "http://www.example.co://bioconductor.org/packages/CNEr/" + url = "https://git.bioconductor.org/packages/CNEr" + + version('1.14.0', git='https://git.bioconductor.org/packages/CNEr', commit='b8634d65c51728c815127e22b45eba7c9b9db897') + + depends_on('r-biostrings@2.33.4:', type=('build', 'run')) + depends_on('r-dbi@0.7:', type=('build', 'run')) + depends_on('r-rsqlite@0.11.4:', type=('build', 'run')) + depends_on('r-genomeinfodb@1.1.3:', type=('build', 'run')) + depends_on('r-genomicranges@1.23.16:', type=('build', 'run')) + depends_on('r-rtracklayer@1.25.5:', type=('build', 'run')) + depends_on('r-xvector@0.5.4:', type=('build', 'run')) + depends_on('r-genomicalignments@1.1.9:', type=('build', 'run')) + depends_on('r-s4vectors@0.13.13:', type=('build', 'run')) + depends_on('r-iranges@2.5.27:', type=('build', 'run')) + depends_on('r-readr@0.2.2:', type=('build', 'run')) + depends_on('r-biocgenerics', type=('build', 'run')) + depends_on('r-reshape2@1.4.1:', type=('build', 'run')) + depends_on('r-ggplot2@2.1.0:', type=('build', 'run')) + depends_on('r-powerlaw@0.60.3:', type=('build', 'run')) + depends_on('r-annotate@1.50.0:', type=('build', 'run')) + depends_on('r-go-db@3.3.0:', type=('build', 'run')) + depends_on('r-keggrest@1.14.0:', type=('build', 'run')) + depends_on('r-utils@2.3.0:', type=('build', 'run')) + depends_on('r@3.4.3:3.4.9', when='@1.14.0') diff --git a/var/spack/repos/builtin/packages/r-keggrest/package.py b/var/spack/repos/builtin/packages/r-keggrest/package.py index b9a6e6a291..80e7b99024 100644 --- a/var/spack/repos/builtin/packages/r-keggrest/package.py +++ b/var/spack/repos/builtin/packages/r-keggrest/package.py @@ -37,8 +37,11 @@ class RKeggrest(RPackage): url = "https://git.bioconductor.org/packages/KEGGREST" list_url = homepage + version('1.18.1', git='https://git.bioconductor.org/packages/KEGGREST', commit='f6e6f1987e4db9d977a75609fab0cb710be2e2e4') version('1.2.0', git='https://git.bioconductor.org/packages/KEGGREST', commit='ed48de0def57a909894e237fa4731c4a052d8849') depends_on('r-httr', type=('build', 'run')) depends_on('r-png', type=('build', 'run')) depends_on('r-biostrings', type=('build', 'run')) + depends_on('r@3.4.0:3.4.9', when='@1.2.0') + depends_on('r@3.4.3:3.4.9', when='@1.18.1') -- cgit v1.2.3-70-g09d2 From 8ad40babd624b4ca512639848ef72235fff34bf3 Mon Sep 17 00:00:00 2001 From: Federico Ficarelli Date: Fri, 9 Mar 2018 09:18:58 +0100 Subject: cmake: new version (#7429) --- var/spack/repos/builtin/packages/cmake/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index f6b6bf07d0..d3705eb899 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -33,6 +33,7 @@ class Cmake(Package): list_url = 'https://cmake.org/files/' list_depth = 1 + version('3.10.2', '732808e17fc14dc8cee50d51518c34eb') version('3.10.1', '9a726e5ec69618b172aa4b06d18c3998') version('3.10.0', 'f3f8e70ca3055f3cd288f89ff233057e') version('3.9.4', '33769e001bdcd788f565bf378692e5ae') -- cgit v1.2.3-70-g09d2 From 869c654c37529b61b052148d2415295cb1ccd5df Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Sat, 10 Mar 2018 02:57:41 +0900 Subject: Boost: More Bintray (#7389) There are two additional releases moved to bintray. Change to bintray for 1.64 and 1.65 as well since SF downloads are too instable. --- var/spack/repos/builtin/packages/boost/package.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index 9730f7a4d2..869c08deb7 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -56,8 +56,10 @@ class Boost(Package): # +python and +mpi, there seem to be errors with out-of-date # API calls from mpi/python. # See: https://github.com/spack/spack/issues/3963 - version('1.64.0', '93eecce2abed9d2442c9676914709349') - version('1.63.0', '1c837ecd990bb022d07e7aab32b09847') + version('1.64.0', '93eecce2abed9d2442c9676914709349', + url='https://dl.bintray.com/boostorg/release/1.64.0/source/boost_1_64_0.tar.bz2') + version('1.63.0', '1c837ecd990bb022d07e7aab32b09847', + url='https://dl.bintray.com/boostorg/release/1.63.0/source/boost_1_63_0.tar.bz2') version('1.62.0', '5fb94629535c19e48703bdb2b2e9490f') version('1.61.0', '6095876341956f65f9d35939ccea1a9f') version('1.60.0', '65a840e1a0b13a558ff19eeb2c4f0cbe') -- cgit v1.2.3-70-g09d2 From 2f97aea4e422f749edc0606d275fe10388b7cc3d Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 9 Mar 2018 12:13:41 -0600 Subject: new package: deconseq-standalone (#7290) --- .../packages/deconseq-standalone/package.py | 60 ++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 var/spack/repos/builtin/packages/deconseq-standalone/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/deconseq-standalone/package.py b/var/spack/repos/builtin/packages/deconseq-standalone/package.py new file mode 100644 index 0000000000..ce73ce59a3 --- /dev/null +++ b/var/spack/repos/builtin/packages/deconseq-standalone/package.py @@ -0,0 +1,60 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class DeconseqStandalone(Package): + """The DeconSeq tool can be used to automatically detect and efficiently + remove sequence contaminations from genomic and metagenomic datasets.""" + + homepage = "http://deconseq.sourceforge.net" + url = "https://sourceforge.net/projects/deconseq/files/standalone/deconseq-standalone-0.4.3.tar.gz" + + version('0.4.3', 'cb3fddb90e584d89fd9c2b6b8f2e20a2') + + depends_on('perl@5:') + + def install(self, spec, prefix): + + filter_file(r'#!/usr/bin/perl', + '#!/usr/bin/env perl', 'deconseq.pl') + filter_file(r'#!/usr/bin/perl', + '#!/usr/bin/env perl', 'splitFasta.pl') + + mkdirp(prefix.bin) + install('bwa64', prefix.bin) + install('bwaMAC', prefix.bin) + install('deconseq.pl', prefix.bin) + install('splitFasta.pl', prefix.bin) + install('DeconSeqConfig.pm', prefix) + + chmod = which('chmod') + chmod('+x', join_path(prefix.bin, 'bwa64')) + chmod('+x', join_path(prefix.bin, 'bwaMAC')) + chmod('+x', join_path(prefix.bin, 'deconseq.pl')) + chmod('+x', join_path(prefix.bin, 'splitFasta.pl')) + + def setup_environment(self, spack_env, run_env): + run_env.prepend_path('PERL5LIB', prefix) -- cgit v1.2.3-70-g09d2 From d2f0e577710f363d77c19110cdaffd07f6ffc9f6 Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 9 Mar 2018 12:14:53 -0600 Subject: new package: py-bcbio-gff (#7129) --- .../repos/builtin/packages/py-bcbio-gff/package.py | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-bcbio-gff/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-bcbio-gff/package.py b/var/spack/repos/builtin/packages/py-bcbio-gff/package.py new file mode 100644 index 0000000000..6e63cfb492 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-bcbio-gff/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyBcbioGff(PythonPackage): + """Read and write Generic Feature Format (GFF) with Biopython + integration.""" + + homepage = "https://pypi.python.org/pypi/bcbio-gff/0.6.2" + url = "https://pypi.io/packages/source/b/bcbio-gff/bcbio-gff-0.6.2.tar.gz" + + version('0.6.2', 'd5aae8b125cdad4291f15bec20cfb0ef') + + depends_on('py-setuptools', type='build') + depends_on('py-six', type=('build', 'run')) + depends_on('py-biopython', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 1eeb918f0db73c16eb079320e56f5dafc968e010 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Fri, 9 Mar 2018 12:19:10 -0600 Subject: new package: cistem (#7438) --- var/spack/repos/builtin/packages/cistem/package.py | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 var/spack/repos/builtin/packages/cistem/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cistem/package.py b/var/spack/repos/builtin/packages/cistem/package.py new file mode 100644 index 0000000000..95fe4df381 --- /dev/null +++ b/var/spack/repos/builtin/packages/cistem/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class Cistem(AutotoolsPackage): + """cisTEM is user-friendly software to process cryo-EM images of + macromolecular complexes and obtain high-resolution 3D reconstructions + from them.""" + + homepage = "https://cistem.org/" + url = "https://cistem.org/system/tdf/upload3/cistem-1.0.0-beta-source-code.tar.gz?file=1&type=cistem_details&id=37&force=0" + + version('1.0.0', '479f395b30ad630df3cbba9c56eb29c2') + + depends_on('wx@3.0.2') + depends_on('fftw') -- cgit v1.2.3-70-g09d2 From 9d3d7d321668e7cffc168f6410de9dbd6a8065b5 Mon Sep 17 00:00:00 2001 From: sknigh Date: Fri, 9 Mar 2018 10:46:57 -0800 Subject: new package: tcptrace (#6993) Also added missing deps for libpcap: bison and flex --- .../repos/builtin/packages/libpcap/package.py | 3 ++ .../repos/builtin/packages/tcptrace/package.py | 59 ++++++++++++++++++++++ .../repos/builtin/packages/tcptrace/tcpdump.patch | 37 ++++++++++++++ 3 files changed, 99 insertions(+) create mode 100644 var/spack/repos/builtin/packages/tcptrace/package.py create mode 100644 var/spack/repos/builtin/packages/tcptrace/tcpdump.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libpcap/package.py b/var/spack/repos/builtin/packages/libpcap/package.py index 02221b371e..4236fdbc3e 100644 --- a/var/spack/repos/builtin/packages/libpcap/package.py +++ b/var/spack/repos/builtin/packages/libpcap/package.py @@ -32,3 +32,6 @@ class Libpcap(AutotoolsPackage): url = "http://www.tcpdump.org/release/libpcap-1.8.1.tar.gz" version('1.8.1', '3d48f9cd171ff12b0efd9134b52f1447') + + depends_on('flex', type='build') + depends_on('bison', type='build') diff --git a/var/spack/repos/builtin/packages/tcptrace/package.py b/var/spack/repos/builtin/packages/tcptrace/package.py new file mode 100644 index 0000000000..ff2726a6a6 --- /dev/null +++ b/var/spack/repos/builtin/packages/tcptrace/package.py @@ -0,0 +1,59 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +from os.path import join + + +class Tcptrace(AutotoolsPackage): + """tcptrace is a tool written by Shawn Ostermann at Ohio University for + analysis of TCP dump files. It can take as input the files produced by + several popular packet-capture programs, including tcpdump, snoop, + etherpeek, HP Net Metrix, and WinDump.""" + + homepage = "http://www.tcptrace.org/" + url = "http://www.tcptrace.org/download/tcptrace-6.6.7.tar.gz" + + version('6.6.7', '68128dc1817b866475e2f048e158f5b9') + + depends_on('bison', type='build') + depends_on('flex', type='build') + depends_on('libpcap') + + # Fixes incorrect API access in libpcap. + # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=545595 + patch('tcpdump.patch') + + @run_after('configure') + def patch_makefile(self): + # see https://github.com/blitz/tcptrace/blob/master/README.linux + Makefile = FileFilter('Makefile') + Makefile.filter( + "PCAP_LDLIBS = -lpcap", + "DEFINES += -D_BSD_SOURCE\nPCAP_LDLIBS = -lpcap") + + def install(self, spec, prefix): + # The build system has trouble creating directories + mkdirp(prefix.bin) + install('tcptrace', join(prefix.bin, 'tcptrace')) diff --git a/var/spack/repos/builtin/packages/tcptrace/tcpdump.patch b/var/spack/repos/builtin/packages/tcptrace/tcpdump.patch new file mode 100644 index 0000000000..107d3a8af6 --- /dev/null +++ b/var/spack/repos/builtin/packages/tcptrace/tcpdump.patch @@ -0,0 +1,37 @@ +--- a/tcpdump.c ++++ b/tcpdump.c +@@ -68,9 +68,6 @@ + + + +-/* external ref, in case missing in older version */ +-extern int pcap_offline_read(void *, int, pcap_handler, u_char *); +- + /* global pointer, the pcap info header */ + static pcap_t *pcap; + +@@ -248,9 +245,12 @@ + void **pplast) + { + int ret; ++ struct pcap_pkthdr *pkt_header; ++ const u_char *pkt_data; + + while (1) { +- if ((ret = pcap_offline_read(pcap,1,(pcap_handler)callback,0)) != 1) { ++ ret = pcap_next_ex(pcap, &pkt_header, &pkt_data); ++ if (ret != 1) { + /* prob EOF */ + + if (ret == -1) { +@@ -265,6 +265,10 @@ + return(0); + } + ++ if (callback(0, pkt_header, (char *)pkt_data)) { ++ continue; ++ } ++ + /* at least one tcpdump implementation (AIX) seems to be */ + /* storing NANOseconds in the usecs field of the timestamp. */ + /* This confuses EVERYTHING. Try to compensate. */ -- cgit v1.2.3-70-g09d2 From 3945b2adb418e2b37c6785a1a7472f1711156bf0 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Fri, 9 Mar 2018 18:05:39 -0600 Subject: Augustus hash (#7447) * augustus: 3.3 package hash changed * augustus: bamtools libraries now seem to be in lib64 * augustus: fix lib problem with older bamtools --- .../repos/builtin/packages/augustus/package.py | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/augustus/package.py b/var/spack/repos/builtin/packages/augustus/package.py index b7686796b5..59893e532b 100644 --- a/var/spack/repos/builtin/packages/augustus/package.py +++ b/var/spack/repos/builtin/packages/augustus/package.py @@ -49,18 +49,28 @@ class Augustus(MakefilePackage): 'bamtools'].prefix) makefile.filter('INCLUDES = *', 'INCLUDES = -I$(BAMTOOLS)/include/bamtools ') - makefile.filter('LIBS = -lbamtools -lz', - 'LIBS = $(BAMTOOLS)/lib64/' - '/libbamtools.a -lz') + if 'bamtools@2.5:' in spec: + makefile.filter('LIBS = -lbamtools -lz', + 'LIBS = $(BAMTOOLS)/lib64/' + '/libbamtools.a -lz') + if 'bamtools@:2.4' in spec: + makefile.filter('LIBS = -lbamtools -lz', + 'LIBS = $(BAMTOOLS)/lib/bamtools' + '/libbamtools.a -lz') with working_dir(join_path('auxprogs', 'bam2hints')): makefile = FileFilter('Makefile') makefile.filter('# Variable definition', 'BAMTOOLS = %s' % self.spec['bamtools'].prefix) makefile.filter('INCLUDES = /usr/include/bamtools', 'INCLUDES = $(BAMTOOLS)/include/bamtools') - makefile.filter('LIBS = -lbamtools -lz', - 'LIBS = $(BAMTOOLS)/lib64/' - '/libbamtools.a -lz') + if 'bamtools@2.5:' in spec: + makefile.filter('LIBS = -lbamtools -lz', + 'LIBS = $(BAMTOOLS)/lib64/' + '/libbamtools.a -lz') + if 'bamtools@:2.4' in spec: + makefile.filter('LIBS = -lbamtools -lz', + 'LIBS = $(BAMTOOLS)/lib/bamtools' + '/libbamtools.a -lz') def install(self, spec, prefix): install_tree('bin', join_path(self.spec.prefix, 'bin')) -- cgit v1.2.3-70-g09d2 From 82aa54151ac0321ea6eeb99e7f3168ba3c5d30a4 Mon Sep 17 00:00:00 2001 From: Patrick Gartung Date: Fri, 9 Mar 2018 18:57:46 -0600 Subject: Fix bug in lua package instroduced by PR #7434 (#7450) Fixes issue #7449 --- var/spack/repos/builtin/packages/lua/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lua/package.py b/var/spack/repos/builtin/packages/lua/package.py index 763f6c5cbe..ff206be5cc 100644 --- a/var/spack/repos/builtin/packages/lua/package.py +++ b/var/spack/repos/builtin/packages/lua/package.py @@ -102,7 +102,7 @@ class Lua(Package): deptypes=('build', 'run'), deptype_query='run'): if d.package.extends(self.spec): lua_paths.append(os.path.join(d.prefix, self.lua_lib_dir)) - lua_paths.append(os.path.join(d.prefix, self.lua64_lib_dir)) + lua_paths.append(os.path.join(d.prefix, self.lua_lib64_dir)) lua_paths.append(os.path.join(d.prefix, self.lua_share_dir)) lua_patterns = [] -- cgit v1.2.3-70-g09d2 From 39bfa12f22b56cd35340bedd92f262ba05f9e125 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Fri, 9 Mar 2018 19:56:59 -0600 Subject: astral: needs zip (#7443) --- var/spack/repos/builtin/packages/astral/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/astral/package.py b/var/spack/repos/builtin/packages/astral/package.py index 11d8b0ed23..5670599cd7 100644 --- a/var/spack/repos/builtin/packages/astral/package.py +++ b/var/spack/repos/builtin/packages/astral/package.py @@ -36,6 +36,7 @@ class Astral(Package): version('4.10.7', '38c81020570254e3f5c75d6c3c27fc6d') depends_on('java', type=('build', 'run')) + depends_on('zip', type='build') phases = ['build', 'install'] -- cgit v1.2.3-70-g09d2 From a4ed76c2071d4dfd721adefe1f5702fd210df73f Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Mon, 12 Mar 2018 13:36:37 +0530 Subject: arpack-ng: add develop (#7458) --- var/spack/repos/builtin/packages/arpack-ng/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/arpack-ng/package.py b/var/spack/repos/builtin/packages/arpack-ng/package.py index ed5e1978ed..f64323e10c 100644 --- a/var/spack/repos/builtin/packages/arpack-ng/package.py +++ b/var/spack/repos/builtin/packages/arpack-ng/package.py @@ -59,6 +59,7 @@ class ArpackNg(Package): version('3.5.0', '9762c9ae6d739a9e040f8201b1578874') version('3.4.0', 'ae9ca13f2143a7ea280cb0e2fd4bfae4') version('3.3.0', 'ed3648a23f0a868a43ef44c97a21bad5') + version('develop', git='https://github.com/opencollab/arpack-ng.git', branch='master') variant('shared', default=True, description='Enables the build of shared libraries') -- cgit v1.2.3-70-g09d2 From b594f89d5e672c00a43e172666635bcb3a47eb33 Mon Sep 17 00:00:00 2001 From: Federico Ficarelli Date: Tue, 13 Mar 2018 02:31:03 +0100 Subject: Treat tcl as extendable (#7410) * Make tcl package extendable * Let tk extend tcl * Fix environment for Tcl extensions --- var/spack/repos/builtin/packages/tcl/package.py | 44 +++++++++++++++++++++++-- var/spack/repos/builtin/packages/tk/package.py | 4 ++- 2 files changed, 45 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/tcl/package.py b/var/spack/repos/builtin/packages/tcl/package.py index 219c63e62b..0b30611435 100644 --- a/var/spack/repos/builtin/packages/tcl/package.py +++ b/var/spack/repos/builtin/packages/tcl/package.py @@ -22,6 +22,8 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## +import os + from spack import * @@ -42,6 +44,8 @@ class Tcl(AutotoolsPackage): version('8.6.3', 'db382feca91754b7f93da16dc4cdad1f') version('8.5.19', '0e6426a4ca9401825fbc6ecf3d89a326') + extendable = True + depends_on('zlib') configure_directory = 'unix' @@ -49,8 +53,7 @@ class Tcl(AutotoolsPackage): def setup_environment(self, spack_env, run_env): # When using Tkinter from within spack provided python+tk, python # will not be able to find Tcl/Tk unless TCL_LIBRARY is set. - run_env.set('TCL_LIBRARY', join_path(self.prefix.lib, 'tcl{0}'.format( - self.spec.version.up_to(2)))) + run_env.set('TCL_LIBRARY', join_path(self.prefix, self.tcl_lib_dir)) def install(self, spec, prefix): with working_dir(self.build_directory): @@ -63,3 +66,40 @@ class Tcl(AutotoolsPackage): def symlink_tclsh(self): with working_dir(self.prefix.bin): symlink('tclsh{0}'.format(self.version.up_to(2)), 'tclsh') + + # ======================================================================== + # Set up environment to make install easy for tcl extensions. + # ======================================================================== + + @property + def tcl_lib_dir(self): + """The Tcl version-specific library directory where all extensions are + installed.""" + return join_path('lib', 'tcl{0}'.format(self.version.up_to(2))) + + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): + """Set TCLLIBPATH to include the tcl-shipped directory for + extensions and any other tcl extension it depends on. + For further info see: https://wiki.tcl.tk/1787""" + + # If we set TCLLIBPATH, we must also ensure that the corresponding + # tcl is found in the build environment. This to prevent cases + # where a system provided tcl is run against the standard libraries + # of a Spack built tcl. See issue #7128 that relates to python but + # it boils down to the same situation we have here. + spack_env.prepend_path('PATH', os.path.dirname(self.prefix.bin)) + + tcl_paths = [join_path(self.prefix, self.tcl_lib_dir)] + + for d in dependent_spec.traverse(deptype=('build', 'run', 'test')): + if d.package.extends(self.spec): + tcl_paths.append(join_path(d.prefix, self.tcl_lib_dir)) + + tcllibpath = ':'.join(tcl_paths) + spack_env.set('TCLLIBPATH', tcllibpath) + + # For run time environment set only the path for + # dependent_spec and prepend it to TCLLIBPATH + if dependent_spec.package.extends(self.spec): + run_env.prepend_path('TCLLIBPATH', join_path( + dependent_spec.prefix, self.tcl_lib_dir)) diff --git a/var/spack/repos/builtin/packages/tk/package.py b/var/spack/repos/builtin/packages/tk/package.py index b03d07013a..1b3028622b 100644 --- a/var/spack/repos/builtin/packages/tk/package.py +++ b/var/spack/repos/builtin/packages/tk/package.py @@ -39,7 +39,9 @@ class Tk(AutotoolsPackage): version('8.6.5', '11dbbd425c3e0201f20d6a51482ce6c4') version('8.6.3', '85ca4dbf4dcc19777fd456f6ee5d0221') - depends_on('tcl') + extends('tcl') + + depends_on('tcl@8.6:') depends_on('libx11') configure_directory = 'unix' -- cgit v1.2.3-70-g09d2 From 1329f3bacafc2c6f1179566565d961fb97873fab Mon Sep 17 00:00:00 2001 From: f-sim Date: Tue, 13 Mar 2018 08:04:09 +0100 Subject: Fix dependency conflict in FEniCS. (#7404) --- var/spack/repos/builtin/packages/fenics/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fenics/package.py b/var/spack/repos/builtin/packages/fenics/package.py index d95c826c34..4c6522ac38 100644 --- a/var/spack/repos/builtin/packages/fenics/package.py +++ b/var/spack/repos/builtin/packages/fenics/package.py @@ -77,7 +77,7 @@ class Fenics(CMakePackage): depends_on('boost+filesystem+program_options+system+iostreams+timer+regex+chrono') depends_on('mpi', when='+mpi') - depends_on('hdf5', when='+hdf5') + depends_on('hdf5+hl', when='+hdf5') depends_on('parmetis@4.0.2:^metis+real64', when='+parmetis') depends_on('scotch~metis', when='+scotch~mpi') depends_on('scotch+mpi~metis', when='+scotch+mpi') -- cgit v1.2.3-70-g09d2 From f8d3a0225f2c09494a778eedaf0bca3c3beb3af2 Mon Sep 17 00:00:00 2001 From: Cyrus Harrison Date: Tue, 13 Mar 2018 00:08:02 -0700 Subject: add an option to build tbb statically (#7407) --- var/spack/repos/builtin/packages/intel-tbb/package.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/intel-tbb/package.py b/var/spack/repos/builtin/packages/intel-tbb/package.py index f4ed13f07f..053725fd22 100644 --- a/var/spack/repos/builtin/packages/intel-tbb/package.py +++ b/var/spack/repos/builtin/packages/intel-tbb/package.py @@ -56,6 +56,9 @@ class IntelTbb(Package): provides('tbb') + variant('shared', default=True, + description='Builds a shared version of TBB libraries') + # include patch for gcc rtm options patch("tbb_gcc_rtm_key.patch", level=0) @@ -102,11 +105,20 @@ class IntelTbb(Package): mkdirp(prefix) mkdirp(prefix.lib) + make_opts = [] + + # Static builds of TBB are enabled by including 'big_iron.inc' file + # See caveats in 'big_iron.inc' for limits on using TBB statically + # Lore states this file must be handed to make before other options + if '+shared' not in self.spec: + make_opts.append("extra_inc=big_iron.inc") + # # tbb does not have a configure script or make install target # we simply call make, and try to put the pieces together # - make("compiler=%s" % (tbb_compiler)) + make_opts.append("compiler={0}".format(tbb_compiler)) + make(*make_opts) # install headers to {prefix}/include install_tree('include', prefix.include) -- cgit v1.2.3-70-g09d2 From 6f76c2124a92128f26e66aa0897171da88b1e2e0 Mon Sep 17 00:00:00 2001 From: Stephen McDowell Date: Tue, 13 Mar 2018 03:34:19 -0700 Subject: llvm 6.0.0 released as stable (#7459) Relase notes: http://releases.llvm.org/6.0.0/docs/ReleaseNotes.html --- var/spack/repos/builtin/packages/llvm/package.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index ae35eb56e9..850554c406 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -179,6 +179,22 @@ class Llvm(CMakePackage): 'libunwind': 'http://llvm.org/svn/llvm-project/libunwind/trunk', } }, + { + 'version': '6.0.0', + 'md5': '788a11a35fa62eb008019b37187d09d2', + 'resources': { + 'compiler-rt': 'ba6368e894b5528e527d86a69d8533c6', + 'openmp': 'eb6b8d0318a950a8192933a3b500585d', + 'polly': 'e5808a3a1ed1c23f56dd1854b86689d0', + 'libcxx': '4ecad7dfd8ea636205d3ffef028df73a', + 'libcxxabi': '9d06327892fc5d8acec4ef2e2821ab3d', + 'cfe': '121b3896cb0c7765d690acc5d9495d24', + 'clang-tools-extra': '6b1d543116dab5a3caba10091d983743', + 'lldb': '1ec6498066e273b7261270f344b68121', + 'lld': '7ab2612417477b03538f11cd8b5e12f8', + 'libunwind': '022a4ee2c3bf7b6d151e0444f66aca64' + } + }, { 'version': '5.0.1', 'md5': '3a4ec6dcbc71579eeaec7cb157fe2168', -- cgit v1.2.3-70-g09d2 From 5bd8ec8160050922be85112717396cd438476b57 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Tue, 13 Mar 2018 06:40:41 -0500 Subject: r-tfbstools: new package (#7243) --- .../repos/builtin/packages/r-tfbstools/package.py | 68 ++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-tfbstools/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-tfbstools/package.py b/var/spack/repos/builtin/packages/r-tfbstools/package.py new file mode 100644 index 0000000000..1c8cbf6e6c --- /dev/null +++ b/var/spack/repos/builtin/packages/r-tfbstools/package.py @@ -0,0 +1,68 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RTfbstools(RPackage): + """TFBSTools is a package for the analysis and manipulation of + transcription factor binding sites. + + It includes matrices conversion between Position Frequency Matirx (PFM), + Position Weight Matirx (PWM) and Information Content Matrix (ICM). It + can also scan putative TFBS from sequence/alignment, query JASPAR + database and provides a wrapper of de novo motif discovery software. + TFBSTools is a package for the analysis and manipulation of + transcription factor binding sites. It includes matrices conversion + between Position Frequency Matirx (PFM), Position Weight Matirx (PWM) + and Information Content Matrix (ICM). It can also scan putative TFBS + from sequence/alignment, query JASPAR database and provides a wrapper + of de novo motif discovery software.""" + + homepage = "http://bioconductor.org/packages/TFBSTools/" + url = "https://git.bioconductor.org/packages/TFBSTools" + + version('1.16.0', git='https://git.bioconductor.org/packages/TFBSTools', commit='565436a5a674d4dea7279e796a20c5bd2034f65a') + + depends_on('r-biobase@2.28:', type=('build', 'run')) + depends_on('r-biostrings@2.36.4:', type=('build', 'run')) + depends_on('r-biocgenerics@0.14.0:', type=('build', 'run')) + depends_on('r-biocparallel@1.2.21:', type=('build', 'run')) + depends_on('r-bsgenome@1.36.3:', type=('build', 'run')) + depends_on('r-catools@1.17.1:', type=('build', 'run')) + depends_on('r-cner@1.4.0:', type=('build', 'run')) + depends_on('r-dirichletmultinomial@1.10.0:', type=('build', 'run')) + depends_on('r-genomeinfodb@1.6.1:', type=('build', 'run')) + depends_on('r-genomicranges@1.20.6:', type=('build', 'run')) + depends_on('r-gtools@3.5.0:', type=('build', 'run')) + depends_on('r-iranges@2.2.7:', type=('build', 'run')) + depends_on('r-dbi@0.6:', type=('build', 'run')) + depends_on('r-rsqlite@1.0.0:', type=('build', 'run')) + depends_on('r-rtracklayer@1.28.10:', type=('build', 'run')) + depends_on('r-seqlogo@1.34.0:', type=('build', 'run')) + depends_on('r-s4vectors@0.9.25:', type=('build', 'run')) + depends_on('r-tfmpvalue@0.0.5:', type=('build', 'run')) + depends_on('r-xml@3.98-1.3:', type=('build', 'run')) + depends_on('r-xvector@0.8.0:', type=('build', 'run')) + depends_on('r@3.4.3:3.4.9', when='@1.16.0') -- cgit v1.2.3-70-g09d2 From 86f9c9fc7340de3bf11cfa9b2f97d4935473b75a Mon Sep 17 00:00:00 2001 From: "Kelly (KT) Thompson" Date: Tue, 13 Mar 2018 23:56:11 -0600 Subject: Provide new package: mscgen. (#7477) Mscgen is a small program that parses Message Sequence Chart descriptions and produces PNG, SVG, EPS or server side image maps (ismaps) as the output. See http://www.mcternan.me.uk/mscgen/ --- var/spack/repos/builtin/packages/mscgen/package.py | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 var/spack/repos/builtin/packages/mscgen/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mscgen/package.py b/var/spack/repos/builtin/packages/mscgen/package.py new file mode 100644 index 0000000000..5b33252a5b --- /dev/null +++ b/var/spack/repos/builtin/packages/mscgen/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class Mscgen(AutotoolsPackage): + """Mscgen is a small program that parses Message Sequence Chart descriptions + and produces PNG, SVG, EPS or server side image maps (ismaps) as the + output.""" + + homepage = "http://www.mcternan.me.uk/mscgen/" + url = "http://www.mcternan.me.uk/mscgen/software/mscgen-src-0.20.tar.gz" + + version('0.20', '65c90fb5150d7176b65b793f0faa7377') + + depends_on('flex') + depends_on('bison') + depends_on('pkgconf') + depends_on('libgd') -- cgit v1.2.3-70-g09d2 From 73dd58b68aa72f4ae4f92d6cd0aed2f158ce7b5e Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Wed, 14 Mar 2018 00:58:42 -0500 Subject: Xterm: Fix URL (#7476) --- var/spack/repos/builtin/packages/xterm/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/xterm/package.py b/var/spack/repos/builtin/packages/xterm/package.py index 320f3490c8..72b0cfefe7 100644 --- a/var/spack/repos/builtin/packages/xterm/package.py +++ b/var/spack/repos/builtin/packages/xterm/package.py @@ -31,7 +31,7 @@ class Xterm(AutotoolsPackage): that can't use the window system directly.""" homepage = "http://invisible-island.net/xterm/" - url = "http://invisible-island.net/xterm/xterm-327.tgz" + url = "ftp://ftp.invisible-island.net/xterm/xterm-327.tgz" version('327', '3c32e931adcad44e64e57892e75d9e02') -- cgit v1.2.3-70-g09d2 From b5879d7d076acbac8912d3996ff40e0e53832d7a Mon Sep 17 00:00:00 2001 From: Federico Ficarelli Date: Wed, 14 Mar 2018 07:02:50 +0100 Subject: Fix extends('tcl') environment (#7473) --- var/spack/repos/builtin/packages/tcl/package.py | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/tcl/package.py b/var/spack/repos/builtin/packages/tcl/package.py index 0b30611435..21a31efaf3 100644 --- a/var/spack/repos/builtin/packages/tcl/package.py +++ b/var/spack/repos/builtin/packages/tcl/package.py @@ -75,7 +75,14 @@ class Tcl(AutotoolsPackage): def tcl_lib_dir(self): """The Tcl version-specific library directory where all extensions are installed.""" - return join_path('lib', 'tcl{0}'.format(self.version.up_to(2))) + return 'lib' + + @property + def tcl_builtin_lib_dir(self): + """The Tcl version-specific library directory where all builtin + extensions are installed.""" + return join_path(self.tcl_lib_dir, + 'tcl{0}'.format(self.version.up_to(2))) def setup_dependent_environment(self, spack_env, run_env, dependent_spec): """Set TCLLIBPATH to include the tcl-shipped directory for @@ -89,17 +96,24 @@ class Tcl(AutotoolsPackage): # it boils down to the same situation we have here. spack_env.prepend_path('PATH', os.path.dirname(self.prefix.bin)) - tcl_paths = [join_path(self.prefix, self.tcl_lib_dir)] + tcl_paths = [join_path(self.prefix, self.tcl_builtin_lib_dir)] for d in dependent_spec.traverse(deptype=('build', 'run', 'test')): if d.package.extends(self.spec): tcl_paths.append(join_path(d.prefix, self.tcl_lib_dir)) - tcllibpath = ':'.join(tcl_paths) + # WARNING: paths in $TCLLIBPATH must be *space* separated, + # its value is meant to be a Tcl list, *not* an env list + # as explained here: https://wiki.tcl.tk/1787: + # "TCLLIBPATH is a Tcl list, not some platform-specific + # colon-separated or semi-colon separated format" + tcllibpath = ' '.join(tcl_paths) spack_env.set('TCLLIBPATH', tcllibpath) # For run time environment set only the path for # dependent_spec and prepend it to TCLLIBPATH if dependent_spec.package.extends(self.spec): - run_env.prepend_path('TCLLIBPATH', join_path( - dependent_spec.prefix, self.tcl_lib_dir)) + dependent_tcllibpath = join_path(dependent_spec.prefix, + self.tcl_lib_dir) + run_env.prepend_path('TCLLIBPATH', dependent_tcllibpath, + separator=' ') -- cgit v1.2.3-70-g09d2 From e378044f160a40ab9d6ea2f2ca62782cf8a03649 Mon Sep 17 00:00:00 2001 From: Sinan Date: Wed, 14 Mar 2018 00:54:02 -0700 Subject: postgresql: add newest version 10.3 (#7455) --- var/spack/repos/builtin/packages/postgresql/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/postgresql/package.py b/var/spack/repos/builtin/packages/postgresql/package.py index 97414f5a97..30d288ebcb 100644 --- a/var/spack/repos/builtin/packages/postgresql/package.py +++ b/var/spack/repos/builtin/packages/postgresql/package.py @@ -34,6 +34,7 @@ class Postgresql(AutotoolsPackage): homepage = "http://www.postgresql.org/" url = "http://ftp.postgresql.org/pub/source/v9.3.4/postgresql-9.3.4.tar.bz2" + version('10.3', '506498796a314c549388cafb3d5c717a') version('10.2', 'e97c3cc72bdf661441f29069299b260a') version('9.3.4', 'd0a41f54c377b2d2fab4a003b0dac762') version('9.5.3', '3f0c388566c688c82b01a0edf1e6b7a0') -- cgit v1.2.3-70-g09d2 From 1cde74656bd5d8c643b173c973d6647dd467e5e5 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 14 Mar 2018 02:56:15 -0500 Subject: phylip: new version (#7467) --- var/spack/repos/builtin/packages/phylip/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/phylip/package.py b/var/spack/repos/builtin/packages/phylip/package.py index 1ebe04f4ca..d0f82242ca 100644 --- a/var/spack/repos/builtin/packages/phylip/package.py +++ b/var/spack/repos/builtin/packages/phylip/package.py @@ -32,6 +32,7 @@ class Phylip(Package): homepage = "http://evolution.genetics.washington.edu/phylip/" url = "http://evolution.gs.washington.edu/phylip/download/phylip-3.696.tar.gz" + version('3.697', '0e83d17fb4d668213603c86bc21d9012') version('3.696', 'dbe5abc26f6089ead3dba41c2db526ee') def install(self, spec, prefix): -- cgit v1.2.3-70-g09d2 From 423f2341bce3837944b062e86f6a0505e7cfff41 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Wed, 14 Mar 2018 09:01:11 +0100 Subject: cube: Fix qt detection (#7242) cube's configure only recognizes qt versions with single digit version components and breaks with qt 5.10. Patch the configure files directly to avoid having to regenerate them. --- var/spack/repos/builtin/packages/cube/package.py | 2 ++ .../repos/builtin/packages/cube/qt-version.patch | 24 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 var/spack/repos/builtin/packages/cube/qt-version.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cube/package.py b/var/spack/repos/builtin/packages/cube/package.py index 4f1f643bf2..6c3b82d227 100644 --- a/var/spack/repos/builtin/packages/cube/package.py +++ b/var/spack/repos/builtin/packages/cube/package.py @@ -44,6 +44,8 @@ class Cube(AutotoolsPackage): variant('gui', default=False, description='Build CUBE GUI') + patch('qt-version.patch', when='@4.3.0:4.3.999 +gui') + depends_on('zlib') depends_on('qt@5:', when='@4.3.0:4.3.999 +gui') diff --git a/var/spack/repos/builtin/packages/cube/qt-version.patch b/var/spack/repos/builtin/packages/cube/qt-version.patch new file mode 100644 index 0000000000..33f36e76d2 --- /dev/null +++ b/var/spack/repos/builtin/packages/cube/qt-version.patch @@ -0,0 +1,24 @@ +diff -ruw cube-4.3.5.orig/build-backend/configure cube-4.3.5/build-backend/configure +--- cube-4.3.5.orig/build-backend/configure 2017-05-23 13:15:46.121704000 +0200 ++++ cube-4.3.5/build-backend/configure 2018-02-14 15:07:27.313842086 +0100 +@@ -5589,7 +5589,7 @@ + else + echo "$as_me:$LINENO: Running $QMAKE --version:" >&5 + $QMAKE --version >&5 2>&1 +- qmake_version_sed='/^.*Qt.version.\([0-9]\.[0-9]\.[0-9]\).in.*$/!d;s//\1/' ++ qmake_version_sed='/^.*Qt.version.\([0-9]\.[0-9]\+\.[0-9]\+\).in.*$/!d;s//\1/' + at_cv_QT_VERSION=`$QMAKE --version 2>&1 | sed "$qmake_version_sed"` + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $at_cv_QT_VERSION" >&5 +diff -ruw cube-4.3.5.orig/build-frontend/configure cube-4.3.5/build-frontend/configure +--- cube-4.3.5.orig/build-frontend/configure 2017-05-23 13:16:00.499773000 +0200 ++++ cube-4.3.5/build-frontend/configure 2018-02-14 15:07:46.349487111 +0100 +@@ -19757,7 +19757,7 @@ + else + echo "$as_me:$LINENO: Running $QMAKE --version:" >&5 + $QMAKE --version >&5 2>&1 +- qmake_version_sed='/^.*Qt.version.\([0-9]\.[0-9]\.[0-9]\).in.*$/!d;s//\1/' ++ qmake_version_sed='/^.*Qt.version.\([0-9]\.[0-9]\+\.[0-9]\+\).in.*$/!d;s//\1/' + at_cv_QT_VERSION=`$QMAKE --version 2>&1 | sed "$qmake_version_sed"` + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $at_cv_QT_VERSION" >&5 -- cgit v1.2.3-70-g09d2 From 30b8dfbebaafd443157c2463d1bfd5d6ec3f98ae Mon Sep 17 00:00:00 2001 From: Robert Pavel Date: Wed, 14 Mar 2018 18:37:21 -0600 Subject: Added Tagged Release of ExaMiniMD (#7485) --- var/spack/repos/builtin/packages/examinimd/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/examinimd/package.py b/var/spack/repos/builtin/packages/examinimd/package.py index 01f0b24dc0..f2932eda7f 100644 --- a/var/spack/repos/builtin/packages/examinimd/package.py +++ b/var/spack/repos/builtin/packages/examinimd/package.py @@ -40,10 +40,10 @@ class Examinimd(MakefilePackage): tags = ['proxy-app', 'ecp-proxy-app'] homepage = "https://github.com/ECP-copa/ExaMiniMD" - url = "https://github.com/ECP-copa/ExaMiniMD/archive/master.zip" + url = "https://github.com/ECP-copa/ExaMiniMD/archive/1.0.zip" + version('1.0', '5db7679a4b9296c0cc3b2ff3a7e8f38f') version('develop', git='https://github.com/ECP-copa/ExaMiniMD', branch='master') - # TODO: Add proper tagged release when available variant('mpi', default=True, description='Build with MPI support') variant('openmp', default=False, description='Build with OpenMP support') -- cgit v1.2.3-70-g09d2 From cf4b3f2af673176d8ab2fdcee32806f5f143ee70 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Thu, 15 Mar 2018 10:16:33 +0100 Subject: hwloc: updated package (#7483) This includes: * Added latest available versions (1.11.9, 2.0.0) * Added variants to enable graphical output from lstopo * Enabled build of the bundled netloc package if @2.0.0: * Added dependency from numactl if @:1.11.9 * Added a constraint to avoid using hwloc@2.0.0 with openmpi --- var/spack/repos/builtin/packages/hwloc/package.py | 52 +++++++++++++++------- .../repos/builtin/packages/openmpi/package.py | 24 ++++++---- 2 files changed, 51 insertions(+), 25 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hwloc/package.py b/var/spack/repos/builtin/packages/hwloc/package.py index a29f927ba1..8e3304da85 100644 --- a/var/spack/repos/builtin/packages/hwloc/package.py +++ b/var/spack/repos/builtin/packages/hwloc/package.py @@ -28,22 +28,28 @@ import sys class Hwloc(AutotoolsPackage): - """The Portable Hardware Locality (hwloc) software package - provides a portable abstraction (across OS, versions, - architectures, ...) of the hierarchical topology of modern - architectures, including NUMA memory nodes, sockets, shared - caches, cores and simultaneous multithreading. It also gathers - various system attributes such as cache and memory information - as well as the locality of I/O devices such as network - interfaces, InfiniBand HCAs or GPUs. It primarily aims at - helping applications with gathering information about modern - computing hardware so as to exploit it accordingly and - efficiently.""" + """The Hardware Locality (hwloc) software project. + + The Portable Hardware Locality (hwloc) software package + provides a portable abstraction (across OS, versions, + architectures, ...) of the hierarchical topology of modern + architectures, including NUMA memory nodes, sockets, shared + caches, cores and simultaneous multithreading. It also gathers + various system attributes such as cache and memory information + as well as the locality of I/O devices such as network + interfaces, InfiniBand HCAs or GPUs. It primarily aims at + helping applications with gathering information about modern + computing hardware so as to exploit it accordingly and + efficiently. + """ + homepage = "http://www.open-mpi.org/projects/hwloc/" url = "http://www.open-mpi.org/software/hwloc/v1.9/downloads/hwloc-1.9.tar.gz" list_url = "http://www.open-mpi.org/software/hwloc/" list_depth = 2 + version('2.0.0', '027e6928ae0b5b64c821d0a71a61cd82') + version('1.11.9', '4d5f5da8b1d09731d82e865ecf3fa399') version('1.11.8', 'a0fa1c9109a4d8b4b6568e62cc9b6e30') version('1.11.7', '867a5266675e5bf1ef4ab66c459653f8') version('1.11.6', 'b4e95eadd2fbdb6d40bbd96be6f03c84') @@ -59,25 +65,37 @@ class Hwloc(AutotoolsPackage): variant('pci', default=(sys.platform != 'darwin'), description="Support analyzing devices on PCI bus") variant('shared', default=True, description="Build shared libraries") + variant( + 'cairo', + default=False, + description='Enable the Cairo back-end of hwloc\'s lstopo command' + ) + + depends_on('pkgconfig', type='build') depends_on('cuda', when='+cuda') depends_on('libpciaccess', when='+pci') depends_on('libxml2', when='+libxml2') - depends_on('pkgconfig', type='build') + depends_on('cairo', when='+cairo') + depends_on('numactl', when='@:1.11.9') def url_for_version(self, version): return "http://www.open-mpi.org/software/hwloc/v%s/downloads/hwloc-%s.tar.gz" % (version.up_to(2), version) def configure_args(self): - spec = self.spec args = [ - "--enable-cuda" if '+cuda' in spec else "--disable-cuda", - "--enable-libxml2" if '+libxml2' in spec else "--disable-libxml2", - "--enable-pci" if '+pci' in spec else "--disable-pci", - "--enable-shared" if '+shared' in spec else "--disable-shared", # Disable OpenCL, since hwloc might pick up an OpenCL # library at build time that is then not found at run time # (Alternatively, we could require OpenCL as dependency.) "--disable-opencl", ] + if '@2.0.0:' in self.spec: + args.append('--enable-netloc') + + args.extend(self.enable_or_disable('cairo')) + args.extend(self.enable_or_disable('cuda')) + args.extend(self.enable_or_disable('libxml2')) + args.extend(self.enable_or_disable('pci')) + args.extend(self.enable_or_disable('shared')) + return args diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index e14c6174ba..80657b618e 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -65,14 +65,16 @@ def _mxm_dir(): class Openmpi(AutotoolsPackage): - """The Open MPI Project is an open source Message Passing Interface - implementation that is developed and maintained by a consortium - of academic, research, and industry partners. Open MPI is - therefore able to combine the expertise, technologies, and - resources from all across the High Performance Computing - community in order to build the best MPI library available. - Open MPI offers advantages for system and software vendors, - application developers and computer science researchers. + """An open source Message Passing Interface implementation. + + The Open MPI Project is an open source Message Passing Interface + implementation that is developed and maintained by a consortium + of academic, research, and industry partners. Open MPI is + therefore able to combine the expertise, technologies, and + resources from all across the High Performance Computing + community in order to build the best MPI library available. + Open MPI offers advantages for system and software vendors, + application developers and computer science researchers. """ homepage = "http://www.open-mpi.org" @@ -204,6 +206,12 @@ class Openmpi(AutotoolsPackage): provides('mpi@:3.1', when='@2.0.0:') depends_on('hwloc') + # ompi@:3.0.0 doesn't support newer hwloc releases: + # "configure: error: OMPI does not currently support hwloc v2 API" + # Future ompi releases may support it, needs to be verified. + # See #7483 for context. + depends_on('hwloc@:1.999') + depends_on('hwloc +cuda', when='+cuda') depends_on('java', when='+java') depends_on('sqlite', when='+sqlite3@:1.11') -- cgit v1.2.3-70-g09d2 From e1290b438b999902ac9142bb8af9ea5d7cfeb0c2 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Sat, 17 Mar 2018 18:18:35 +0100 Subject: hwloc: constrain dependency on numactl (#7509) fixes #7505 --- var/spack/repos/builtin/packages/hwloc/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hwloc/package.py b/var/spack/repos/builtin/packages/hwloc/package.py index 8e3304da85..c3f51ef0c4 100644 --- a/var/spack/repos/builtin/packages/hwloc/package.py +++ b/var/spack/repos/builtin/packages/hwloc/package.py @@ -77,7 +77,7 @@ class Hwloc(AutotoolsPackage): depends_on('libpciaccess', when='+pci') depends_on('libxml2', when='+libxml2') depends_on('cairo', when='+cairo') - depends_on('numactl', when='@:1.11.9') + depends_on('numactl', when='@:1.11.9 platform=linux') def url_for_version(self, version): return "http://www.open-mpi.org/software/hwloc/v%s/downloads/hwloc-%s.tar.gz" % (version.up_to(2), version) -- cgit v1.2.3-70-g09d2 From 49feddf71e74a83dd1a0c259f72377b11b40b7c7 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Sat, 17 Mar 2018 20:33:13 +0100 Subject: py-performance: added package (#7500) --- .../repos/builtin/packages/py-perf/package.py | 39 +++++++++++++++++++ .../builtin/packages/py-performance/package.py | 44 ++++++++++++++++++++++ 2 files changed, 83 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-perf/package.py create mode 100644 var/spack/repos/builtin/packages/py-performance/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-perf/package.py b/var/spack/repos/builtin/packages/py-perf/package.py new file mode 100644 index 0000000000..fc75740d17 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-perf/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPerf(PythonPackage): + """The Python perf module is a toolkit to write, run and + analyze benchmarks. + """ + + homepage = "https://pypi.python.org/pypi/perf" + url = "https://github.com/vstinner/perf/archive/1.5.1.tar.gz" + + version('1.5.1', 'e3dc532fdbaf44f2d921556164bd74e5') + + depends_on('py-setuptools', type='build') + depends_on('py-six', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-performance/package.py b/var/spack/repos/builtin/packages/py-performance/package.py new file mode 100644 index 0000000000..932a593c30 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-performance/package.py @@ -0,0 +1,44 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPerformance(PythonPackage): + """The performance project is intended to be an authoritative source + of benchmarks for all Python implementations. + + The focus is on real-world benchmarks, rather than synthetic benchmarks, + using whole applications when possible. + """ + + homepage = 'http://pyperformance.readthedocs.io/' + url = 'https://github.com/python/performance/archive/0.6.1.tar.gz' + + version('0.6.1', '95477b584a284582b66c922a5335b427') + version('0.6.0', 'b93661e07668fa0b461236dca164eedf') + + depends_on('py-setuptools', type=('build', 'run')) + depends_on('py-six', type=('build', 'run')) + depends_on('py-perf', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 5a04ad1273e31d0da7c4561d7ffda088886979e1 Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 17 Mar 2018 18:22:12 -0500 Subject: py-multiqc: Add version 1.5 (#7506) --- var/spack/repos/builtin/packages/py-multiqc/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-multiqc/package.py b/var/spack/repos/builtin/packages/py-multiqc/package.py index 4d9ec344db..a0f945dd01 100644 --- a/var/spack/repos/builtin/packages/py-multiqc/package.py +++ b/var/spack/repos/builtin/packages/py-multiqc/package.py @@ -33,6 +33,7 @@ class PyMultiqc(PythonPackage): homepage = "https://multiqc.info" url = "https://pypi.io/packages/source/m/multiqc/multiqc-1.0.tar.gz" + version('1.5', 'c9fc5f54a75b1d0c3e119e0db7f5fe72') version('1.3', '78fef8a89c0bd40d559b10c1f736bbcd') version('1.0', '0b7310b3f75595e5be8099fbed2d2515') -- cgit v1.2.3-70-g09d2 From e064927fab80cc18d5323311df5ecb45c6a4726b Mon Sep 17 00:00:00 2001 From: jthies Date: Sat, 17 Mar 2018 16:22:42 -0700 Subject: gmp: add oldish version 5.1.3 with checksum (#7510) --- var/spack/repos/builtin/packages/gmp/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gmp/package.py b/var/spack/repos/builtin/packages/gmp/package.py index 0367a35200..679b63f21d 100644 --- a/var/spack/repos/builtin/packages/gmp/package.py +++ b/var/spack/repos/builtin/packages/gmp/package.py @@ -37,6 +37,7 @@ class Gmp(AutotoolsPackage): version('6.1.0', '86ee6e54ebfc4a90b643a65e402c4048') version('6.0.0a', 'b7ff2d88cae7f8085bd5006096eed470') version('6.0.0', '6ef5869ae735db9995619135bd856b84') + version('5.1.3', 'a082867cbca5e898371a97bb27b31fea') depends_on('autoconf', type='build') depends_on('automake', type='build') -- cgit v1.2.3-70-g09d2 From e61b239a8ae564ed5c5dfb57726ca2794a9707c7 Mon Sep 17 00:00:00 2001 From: Hans Pabst Date: Sun, 18 Mar 2018 00:29:17 +0100 Subject: LIBXSMM 1.9 (#7495) --- var/spack/repos/builtin/packages/libxsmm/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libxsmm/package.py b/var/spack/repos/builtin/packages/libxsmm/package.py index 3a3a2087dd..57e6f0d7e1 100644 --- a/var/spack/repos/builtin/packages/libxsmm/package.py +++ b/var/spack/repos/builtin/packages/libxsmm/package.py @@ -32,10 +32,11 @@ class Libxsmm(MakefilePackage): and small convolutions.''' homepage = 'https://github.com/hfp/libxsmm' - url = 'https://github.com/hfp/libxsmm/archive/1.8.3.tar.gz' + url = 'https://github.com/hfp/libxsmm/archive/1.9.tar.gz' version('develop', git='https://github.com/hfp/libxsmm.git') + version('1.9', 'a001a491d9b98239bc2bfd906bd09d90') version('1.8.3', '3415928340929c3a29773934de05c978') version('1.8.2', '8f11ece699244c28dcb6742969a2ccd4') version('1.8.1', 'ece51ec767580f4542f509655daa5ec0') -- cgit v1.2.3-70-g09d2 From ba1b3fdc9dd714d8a2fd3487948ab02e11e1b177 Mon Sep 17 00:00:00 2001 From: Jimmy Tang Date: Sun, 18 Mar 2018 13:53:57 +0000 Subject: Update the patches to work with bazel 0.9.0 (#7013) Some code got moved around so the patches needed to be updated --- .../packages/bazel/fix_env_handling-0.9.0.patch | 126 +++++++++++++++++++++ var/spack/repos/builtin/packages/bazel/package.py | 7 +- .../builtin/packages/bazel/unix_cc_configure.patch | 32 ++++++ 3 files changed, 163 insertions(+), 2 deletions(-) create mode 100644 var/spack/repos/builtin/packages/bazel/fix_env_handling-0.9.0.patch create mode 100644 var/spack/repos/builtin/packages/bazel/unix_cc_configure.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bazel/fix_env_handling-0.9.0.patch b/var/spack/repos/builtin/packages/bazel/fix_env_handling-0.9.0.patch new file mode 100644 index 0000000000..323748377f --- /dev/null +++ b/var/spack/repos/builtin/packages/bazel/fix_env_handling-0.9.0.patch @@ -0,0 +1,126 @@ +diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java.orig b/home/jtang/spack/var/spack/stage/bazel-0.9.0-xcsfcyrpdn3df755cwpk4sxtfwjdv4ub/spack-expanded-archive/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java +index f1a7a1f..32cd181 100755 +--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java.orig ++++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java +@@ -154,6 +154,121 @@ public class BazelConfiguration extends Fragment { + if (tmpdir != null) { + builder.put("TMPDIR", tmpdir); + } ++ ++ String spack_prefix = System.getenv("SPACK_PREFIX"); ++ if (spack_prefix != null) { ++ builder.put("SPACK_PREFIX", spack_prefix); ++ } ++ ++ String spack_env_path = System.getenv("SPACK_ENV_PATH"); ++ if (spack_env_path != null) { ++ builder.put("SPACK_ENV_PATH", spack_env_path); ++ } ++ ++ String spack_debug_log_id = System.getenv("SPACK_DEBUG_LOG_ID"); ++ if (spack_debug_log_id != null) { ++ builder.put("SPACK_DEBUG_LOG_ID", spack_debug_log_id); ++ } ++ ++ String spack_debug_log_dir = System.getenv("SPACK_DEBUG_LOG_DIR"); ++ if (spack_debug_log_dir != null) { ++ builder.put("SPACK_DEBUG_LOG_DIR", spack_debug_log_dir); ++ } ++ ++ String spack_compiler_spec = System.getenv("SPACK_COMPILER_SPEC"); ++ if (spack_compiler_spec != null) { ++ builder.put("SPACK_COMPILER_SPEC", spack_compiler_spec); ++ } ++ ++ String spack_cc_rpath_arg = System.getenv("SPACK_CC_RPATH_ARG"); ++ if (spack_cc_rpath_arg != null) { ++ builder.put("SPACK_CC_RPATH_ARG", spack_cc_rpath_arg); ++ } ++ ++ String spack_cxx_rpath_arg = System.getenv("SPACK_CXX_RPATH_ARG"); ++ if (spack_cxx_rpath_arg != null) { ++ builder.put("SPACK_CXX_RPATH_ARG", spack_cxx_rpath_arg); ++ } ++ ++ String spack_f77_rpath_arg = System.getenv("SPACK_F77_RPATH_ARG"); ++ if (spack_f77_rpath_arg != null) { ++ builder.put("SPACK_F77_RPATH_ARG", spack_f77_rpath_arg); ++ } ++ ++ String spack_fc_rpath_arg = System.getenv("SPACK_FC_RPATH_ARG"); ++ if (spack_fc_rpath_arg != null) { ++ builder.put("SPACK_FC_RPATH_ARG", spack_fc_rpath_arg); ++ } ++ ++ String spack_short_spec = System.getenv("SPACK_SHORT_SPEC"); ++ if (spack_short_spec != null) { ++ builder.put("SPACK_SHORT_SPEC", spack_short_spec); ++ } ++ ++ String spack_cc = System.getenv("SPACK_CC"); ++ if (spack_cc != null) { ++ builder.put("SPACK_CC", spack_cc); ++ } ++ ++ String spack_cxx = System.getenv("SPACK_CXX"); ++ if (spack_cxx != null) { ++ builder.put("SPACK_CXX", spack_cxx); ++ } ++ ++ String spack_f77 = System.getenv("SPACK_F77"); ++ if (spack_f77 != null) { ++ builder.put("SPACK_F77", spack_f77); ++ } ++ ++ String spack_fc = System.getenv("SPACK_FC"); ++ if (spack_fc != null) { ++ builder.put("SPACK_FC", spack_fc); ++ } ++ ++ String spack_cflags = System.getenv("SPACK_CFLAGS"); ++ if (spack_cflags != null) { ++ builder.put("SPACK_CFLAGS", spack_cflags); ++ } ++ ++ String spack_cxxflags = System.getenv("SPACK_CXXFLAGS"); ++ if (spack_cxxflags != null) { ++ builder.put("SPACK_CXXFLAGS", spack_cxxflags); ++ } ++ ++ String spack_fcflags = System.getenv("SPACK_FCFLAGS"); ++ if (spack_fcflags != null) { ++ builder.put("SPACK_FCFLAGS", spack_fcflags); ++ } ++ ++ String spack_fflags = System.getenv("SPACK_FFLAGS"); ++ if (spack_fflags != null) { ++ builder.put("SPACK_FFLAGS", spack_fflags); ++ } ++ ++ String spack_ldflags = System.getenv("SPACK_LDFLAGS"); ++ if (spack_ldflags != null) { ++ builder.put("SPACK_LDFLAGS", spack_ldflags); ++ } ++ ++ String spack_ldlibs = System.getenv("SPACK_LDLIBS"); ++ if (spack_ldlibs != null) { ++ builder.put("SPACK_LDLIBS", spack_ldlibs); ++ } ++ ++ String spack_debug = System.getenv("SPACK_DEBUG"); ++ if (spack_debug != null) { ++ builder.put("SPACK_DEBUG", spack_debug); ++ } ++ ++ String spack_test_command = System.getenv("SPACK_TEST_COMMAND"); ++ if (spack_test_command != null) { ++ builder.put("SPACK_TEST_COMMAND", spack_test_command); ++ } ++ ++ String spack_dependencies = System.getenv("SPACK_DEPENDENCIES"); ++ if (spack_dependencies != null) { ++ builder.put("SPACK_DEPENDENCIES", spack_dependencies); ++ } + } + } + diff --git a/var/spack/repos/builtin/packages/bazel/package.py b/var/spack/repos/builtin/packages/bazel/package.py index ff9817be97..d70680fb84 100644 --- a/var/spack/repos/builtin/packages/bazel/package.py +++ b/var/spack/repos/builtin/packages/bazel/package.py @@ -34,6 +34,7 @@ class Bazel(Package): homepage = "https://www.bazel.io" url = "https://github.com/bazelbuild/bazel/releases/download/0.5.0/bazel-0.5.0-dist.zip" + version('0.9.0', '7fda74c163108f7c180bbc513bc8123b') version('0.4.5', '2b737be42678900470ae9e48c975ac5b2296d9ae23c007bf118350dbe7c0552b') version('0.4.4', '5e7c52b89071efc41277e2f0057d258f') version('0.3.1', '5c959467484a7fc7dd2e5e4a1e8e866b') @@ -45,9 +46,11 @@ class Bazel(Package): depends_on('java@8:') depends_on('zip') - patch('fix_env_handling.patch') + patch('fix_env_handling.patch', when='@:0.4.5') + patch('fix_env_handling-0.9.0.patch', when='@0.9.0:') patch('link.patch') - patch('cc_configure.patch') + patch('cc_configure.patch', when='@:0.4.5') + patch('unix_cc_configure.patch', when='@0.9.0:') def url_for_version(self, version): if version >= Version('0.4.1'): diff --git a/var/spack/repos/builtin/packages/bazel/unix_cc_configure.patch b/var/spack/repos/builtin/packages/bazel/unix_cc_configure.patch new file mode 100644 index 0000000000..3f14bc2fc0 --- /dev/null +++ b/var/spack/repos/builtin/packages/bazel/unix_cc_configure.patch @@ -0,0 +1,32 @@ +diff --git a/spack-expanded-archive/tools/cpp/unix_cc_configure.bzl.orig b/spack-expanded-archive/tools/cpp/unix_cc_configure.bzl +old mode 100644 +new mode 100755 +index aa46f55..ae3c689 +--- spack-expanded-archive/tools/cpp/unix_cc_configure.bzl ++++ spack-expanded-archive/tools/cpp/unix_cc_configure.bzl +@@ -117,9 +117,23 @@ def get_escaped_cxx_inc_directories(repository_ctx, cc): + else: + inc_dirs = result.stderr[index1 + 1:index2].strip() + +- return [escape_string(repository_ctx.path(_cxx_inc_convert(p))) +- for p in inc_dirs.split("\n")] ++ default_inc_directories = [ ++ escape_string(repository_ctx.path(_cxx_inc_convert(p))) ++ for p in inc_dirs.split("\n") ++ ] + ++ env = repository_ctx.os.environ ++ if "SPACK_DEPENDENCIES" in env: ++ for dep in env["SPACK_DEPENDENCIES"].split(":"): ++ path = dep + "/include" ++ # path = repository_ctx.os.path.join(dep, "include") ++ # if not repository_ctx.os.path.exists(path): ++ # continue ++ default_inc_directories.append( ++ repository_ctx.path(_cxx_inc_convert(path)) ++ ) ++ ++ return default_inc_directories + + def _add_option_if_supported(repository_ctx, cc, option): + """Checks that `option` is supported by the C compiler. Doesn't %-escape the option.""" -- cgit v1.2.3-70-g09d2 From b2822b2582328836ff4c601705f402de88192f98 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Mon, 19 Mar 2018 06:38:42 +0100 Subject: glib: updated package and fixed issues with dtrace (#7493) fixes #6965 closes #6968 --- var/spack/repos/builtin/packages/glib/package.py | 65 ++++++++++++++++++++---- 1 file changed, 54 insertions(+), 11 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/glib/package.py b/var/spack/repos/builtin/packages/glib/package.py index c5e1ae4425..e517f0a693 100644 --- a/var/spack/repos/builtin/packages/glib/package.py +++ b/var/spack/repos/builtin/packages/glib/package.py @@ -24,16 +24,24 @@ ############################################################################## from spack import * +import os.path +import shutil + class Glib(AutotoolsPackage): - """The GLib package contains a low-level libraries useful for - providing data structure handling for C, portability wrappers - and interfaces for such runtime functionality as an event loop, - threads, dynamic loading and an object system.""" + """GLib provides the core application building blocks for + libraries and applications written in C. + + The GLib package contains a low-level libraries useful for + providing data structure handling for C, portability wrappers + and interfaces for such runtime functionality as an event loop, + threads, dynamic loading and an object system. + """ homepage = "https://developer.gnome.org/glib/" url = "https://ftp.gnome.org/pub/gnome/sources/glib/2.53/glib-2.53.1.tar.xz" + version('2.56.0', 'f2b59392f2fb514bbe7791dda0c36da5') version('2.55.1', '9cbb6b3c7e75ba75575588497c7707b6') version('2.53.1', '3362ef4da713f834ea26904caf3a75f5') version('2.49.7', '397ead3fcf325cb921d54e2c9e7dfd7a') @@ -42,6 +50,13 @@ class Glib(AutotoolsPackage): version('2.42.1', '89c4119e50e767d3532158605ee9121a') variant('libmount', default=False, description='Build with libmount support') + variant( + 'tracing', + default='', + values=('dtrace', 'systemtap'), + multi=True, + description='Enable tracing support' + ) depends_on('pkgconfig', type='build') depends_on('libffi') @@ -64,16 +79,18 @@ class Glib(AutotoolsPackage): return url + '/%s/glib-%s.tar.xz' % (version.up_to(2), version) def configure_args(self): - spec = self.spec args = [] - - if '+libmount' in spec: - args.append('--enable-libmount') - else: - args.append('--disable-libmount') - + args.extend(self.enable_or_disable('libmount')) + args.append('--with-python={0}'.format( + os.path.basename(self.spec['python'].command.path)) + ) + args.extend(self.enable_or_disable('tracing')) return args + @property + def dtrace_copy_path(self): + return join_path(self.stage.source_path, 'dtrace-copy') + @run_before('configure') def fix_python_path(self): if not self.spec.satisfies('@2.53.4:'): @@ -85,6 +102,32 @@ class Glib(AutotoolsPackage): '#!/usr/bin/env python', *files) + @run_before('configure') + def fix_dtrace_usr_bin_path(self): + if 'tracing=dtrace' not in self.spec: + return + + # dtrace may cause glib build to fail because it uses + # '/usr/bin/python' in the shebang. To work around that + # we copy the original script into a temporary folder, and + # change the shebang to '/usr/bin/env python' + dtrace = which('dtrace').path + dtrace_copy = join_path(self.dtrace_copy_path, 'dtrace') + + with working_dir(self.dtrace_copy_path, create=True): + shutil.copy(dtrace, dtrace_copy) + filter_file( + '^#!/usr/bin/python', + '#!/usr/bin/env python', + dtrace_copy + ) + + # To have our own copy of dtrace in PATH, we need to + # prepend to PATH the temporary folder where it resides + env['PATH'] = ':'.join( + [self.dtrace_copy_path] + env['PATH'].split(':') + ) + @run_after('install') def filter_sbang(self): # Revert sbang, so Spack's sbang hook can fix it up (we have to do -- cgit v1.2.3-70-g09d2 From bb591e675c731521482cdd1fef6b89e00b8dd9ff Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 19 Mar 2018 08:50:02 -0500 Subject: Add latest version of nasm (#7515) --- var/spack/repos/builtin/packages/nasm/package.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nasm/package.py b/var/spack/repos/builtin/packages/nasm/package.py index 2979ad43f5..18ec925b8b 100644 --- a/var/spack/repos/builtin/packages/nasm/package.py +++ b/var/spack/repos/builtin/packages/nasm/package.py @@ -27,8 +27,12 @@ from spack import * class Nasm(AutotoolsPackage): """NASM (Netwide Assembler) is an 80x86 assembler designed for - portability and modularity. It includes a disassembler as well.""" + portability and modularity. It includes a disassembler as well.""" + homepage = "http://www.nasm.us" - url = "http://www.nasm.us/pub/nasm/releasebuilds/2.11.06/nasm-2.11.06.tar.xz" + url = "http://www.nasm.us/pub/nasm/releasebuilds/2.13.03/nasm-2.13.03.tar.xz" + list_url = "http://www.nasm.us/pub/nasm/releasebuilds" + list_depth = 1 + version('2.13.03', 'd5ca2ad7121ccbae69dd606b1038532c') version('2.11.06', '2b958e9f5d200641e6fc9564977aecc5') -- cgit v1.2.3-70-g09d2 From 967194ce267722fedfb83fbb52c42ac41b39cd4b Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 19 Mar 2018 10:40:56 -0500 Subject: Add latest version of libpng (#7516) --- var/spack/repos/builtin/packages/libpng/package.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libpng/package.py b/var/spack/repos/builtin/packages/libpng/package.py index cbab3c68a3..7c0f56dc6a 100644 --- a/var/spack/repos/builtin/packages/libpng/package.py +++ b/var/spack/repos/builtin/packages/libpng/package.py @@ -29,10 +29,11 @@ class Libpng(AutotoolsPackage): """libpng is the official PNG reference library.""" homepage = "http://www.libpng.org/pub/png/libpng.html" - url = "http://download.sourceforge.net/libpng/libpng-1.6.29.tar.gz" + url = "http://download.sourceforge.net/libpng/libpng-1.6.34.tar.gz" list_url = "https://sourceforge.net/projects/libpng/files/" list_depth = 2 + version('1.6.34', '03fbc5134830240104e96d3cda648e71') version('1.6.29', '68553080685f812d1dd7a6b8215c37d8') version('1.6.27', '58698519e9f6126c1caeefc28dbcbd5f') # From http://www.libpng.org/pub/png/libpng.html (2017-01-04) @@ -61,3 +62,8 @@ class Libpng(AutotoolsPackage): 'LDFLAGS={0}'.format(self.spec['zlib'].libs.search_flags) ] return args + + def check(self): + # Libpng has both 'check' and 'test' targets that are aliases. + # Only need to run the tests once. + make('check') -- cgit v1.2.3-70-g09d2 From 9e4bd6267f5fb5294f9d433288eacb1644485d79 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 19 Mar 2018 10:41:17 -0500 Subject: Add latest version of libjpeg (#7517) --- var/spack/repos/builtin/packages/libjpeg/package.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libjpeg/package.py b/var/spack/repos/builtin/packages/libjpeg/package.py index bd789200cb..92584adc10 100644 --- a/var/spack/repos/builtin/packages/libjpeg/package.py +++ b/var/spack/repos/builtin/packages/libjpeg/package.py @@ -31,9 +31,15 @@ class Libjpeg(AutotoolsPackage): alongside various utilities for handling JPEG data.""" homepage = "http://www.ijg.org" - url = "http://www.ijg.org/files/jpegsrc.v9b.tar.gz" + url = "http://www.ijg.org/files/jpegsrc.v9c.tar.gz" + version('9c', '7794e558c60605424fb1025d836fbf47') version('9b', '6a9996ce116ec5c52b4870dbcd6d3ddb') version('9a', '3353992aecaee1805ef4109aadd433e7') provides('jpeg') + + def check(self): + # Libjpeg has both 'check' and 'test' targets that are aliases. + # Only need to run the tests once. + make('check') -- cgit v1.2.3-70-g09d2 From 2e9f158a79ddf2e042338f59b13029fe847cbb48 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 19 Mar 2018 10:41:37 -0500 Subject: Add latest version of libjpeg-turbo (#7518) --- var/spack/repos/builtin/packages/libjpeg-turbo/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libjpeg-turbo/package.py b/var/spack/repos/builtin/packages/libjpeg-turbo/package.py index 2264147362..0e5543c301 100644 --- a/var/spack/repos/builtin/packages/libjpeg-turbo/package.py +++ b/var/spack/repos/builtin/packages/libjpeg-turbo/package.py @@ -32,8 +32,9 @@ class LibjpegTurbo(AutotoolsPackage): transcoding.""" homepage = "http://libjpeg-turbo.virtualgl.org" - url = "http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-1.3.1.tar.gz" + url = "https://sourceforge.net/projects/libjpeg-turbo/files/1.5.3/libjpeg-turbo-1.5.3.tar.gz" + version('1.5.3', '7c82f0f6a3130ec06b8a4d0b321cbca3') version('1.5.0', '3fc5d9b6a8bce96161659ae7a9939257') version('1.3.1', '2c3a68129dac443a72815ff5bb374b05') -- cgit v1.2.3-70-g09d2 From 72fae99a9e34145c9c6926ca57725e7ec9464d32 Mon Sep 17 00:00:00 2001 From: Federico Ficarelli Date: Mon, 19 Mar 2018 16:43:22 +0100 Subject: modern-wheel: new package (#7514) #Fix imports --- .../repos/builtin/packages/modern-wheel/package.py | 64 ++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 var/spack/repos/builtin/packages/modern-wheel/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/modern-wheel/package.py b/var/spack/repos/builtin/packages/modern-wheel/package.py new file mode 100644 index 0000000000..066695524c --- /dev/null +++ b/var/spack/repos/builtin/packages/modern-wheel/package.py @@ -0,0 +1,64 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import sys + + +class ModernWheel(CMakePackage): + """C++ utility collection. Provides various facilities of common use in + modern codebases like dynamic linking helpers, loadable plugins facilities + and misc patterns.""" + + homepage = "https://github.com/alalazo/modern_wheel" + url = "https://github.com/alalazo/modern_wheel/archive/1.2.tar.gz" + + version('1.2', 'dc440099c52b6af3b8ddff6fd7730aff') + version('1.1', '289455239ad19497b7db55aacb299ca8') + version('1.0', '503dc3e7da2b422c4295e4afcba09dfb') + + variant('shared', default=True, + description='Enables the build of shared libraries') + # Test implementation files cause some issues on darwin, + # needs to be investigated. + variant('test', default=sys.platform != 'darwin', + description='Enables the build of unit tests') + + # FindBoost shipped with CMake up to version 3.10.2 (latest one + # up to now) is known to be unable to detect Boost >= 1.66.0. + # This issue will be probably fixed in CMake >= 3.11.0: + # https://gitlab.kitware.com/cmake/cmake/issues/17575 + # Until then, just assume that we cannot correctly configure + # ModernWheel with Boost >= 1.66.0. + depends_on('boost +system +filesystem', when='@:1.1.999') + depends_on('boost@:1.65.999 +system +filesystem', when='@1.2:') + + def cmake_args(self): + spec = self.spec + return [ + '-DBUILD_UNIT_TEST:BOOL={0}'.format( + 'ON' if '+test' in spec else 'OFF'), + '-DBUILD_SHARED_LIBS:BOOL={0}'.format( + 'ON' if '+shared' in spec else 'OFF'), + ] -- cgit v1.2.3-70-g09d2 From a84cfb9ad4006ca3f3d53c87be89a0d2078bba2b Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 19 Mar 2018 16:18:42 -0500 Subject: Add latest version of GLPK (#7521) --- var/spack/repos/builtin/packages/glpk/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/glpk/package.py b/var/spack/repos/builtin/packages/glpk/package.py index 7693ba7b9a..3768dbac83 100644 --- a/var/spack/repos/builtin/packages/glpk/package.py +++ b/var/spack/repos/builtin/packages/glpk/package.py @@ -33,9 +33,10 @@ class Glpk(AutotoolsPackage): """ homepage = "https://www.gnu.org/software/glpk" - url = "http://ftp.gnu.org/gnu/glpk/glpk-4.57.tar.gz" + url = "http://ftp.gnu.org/gnu/glpk/glpk-4.65.tar.gz" - version('4.61', '3ce3e224a8b6e75a1a0b378445830f21') + version('4.65', '470a984a8b1c0e027bdb6d5859063fe8') + version('4.61', '3ce3e224a8b6e75a1a0b378445830f21') version('4.57', '237531a54f73155842f8defe51aedb0f') variant( -- cgit v1.2.3-70-g09d2 From aea0b84e90fefab69aafc9c7a84aaa952e3ebb66 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 19 Mar 2018 16:19:05 -0500 Subject: Add latest version of py-packaging (#7522) --- var/spack/repos/builtin/packages/py-packaging/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-packaging/package.py b/var/spack/repos/builtin/packages/py-packaging/package.py index 0ee13a5cdf..3867b22033 100644 --- a/var/spack/repos/builtin/packages/py-packaging/package.py +++ b/var/spack/repos/builtin/packages/py-packaging/package.py @@ -29,10 +29,11 @@ class PyPackaging(PythonPackage): """Core utilities for Python packages.""" homepage = "https://github.com/pypa/packaging" - url = "https://pypi.io/packages/source/p/packaging/packaging-16.8.tar.gz" + url = "https://pypi.io/packages/source/p/packaging/packaging-17.1.tar.gz" import_modules = ['packaging'] + version('17.1', '8baf8241d1b6b0a5fae9b00f359976a8') version('16.8', '53895cdca04ecff80b54128e475b5d3b') # Not needed for the installation, but used at runtime -- cgit v1.2.3-70-g09d2 From 38748715124f476ecd9e260084e548f216d648b1 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 19 Mar 2018 16:19:19 -0500 Subject: Add latest version of py-six (#7524) --- var/spack/repos/builtin/packages/py-six/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-six/package.py b/var/spack/repos/builtin/packages/py-six/package.py index 03bb484007..2fee459770 100644 --- a/var/spack/repos/builtin/packages/py-six/package.py +++ b/var/spack/repos/builtin/packages/py-six/package.py @@ -29,10 +29,11 @@ class PySix(PythonPackage): """Python 2 and 3 compatibility utilities.""" homepage = "https://pypi.python.org/pypi/six" - url = "https://pypi.io/packages/source/s/six/six-1.10.0.tar.gz" + url = "https://pypi.io/packages/source/s/six/six-1.11.0.tar.gz" import_modules = ['six'] + version('1.11.0', 'd12789f9baf7e9fb2524c0c64f1773f8') version('1.10.0', '34eed507548117b2ab523ab14b2f8b55') version('1.9.0', '476881ef4012262dfc8adc645ee786c4') version('1.8.0', '1626eb24cc889110c38f7e786ec69885') -- cgit v1.2.3-70-g09d2 From c14c0d8e7410fcc3754b6a3c8b988f8c71d2960a Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Mon, 19 Mar 2018 22:19:26 +0100 Subject: python: dbm module + version 3.6.4 (#7520) A build of python@3.X had the following in the logs: ``` The necessary bits to build these optional modules were not found: _dbm _gdbm _tkinter ``` As Tkinter is already a variant, we adopt the same strategy for dbm. --- var/spack/repos/builtin/packages/python/package.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index a3ad52df89..c045e50df4 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -46,6 +46,7 @@ class Python(AutotoolsPackage): list_url = "https://www.python.org/downloads/" list_depth = 1 + version('3.6.4', '9de6494314ea199e3633211696735f65') version('3.6.3', 'e9180c69ed9a878a4a8a3ab221e32fa9') version('3.6.2', 'e1a36bfffdd1d3a780b1825daf16e56c') version('3.6.1', '2d0fc9f3a5940707590e07f03ecb08b9') @@ -84,6 +85,8 @@ class Python(AutotoolsPackage): variant('pic', default=True, description='Produce position-independent code (for shared libs)') + variant('dbm', default=True, description='Provide support for dbm') + depends_on("openssl") depends_on("bzip2") depends_on("readline") @@ -92,6 +95,7 @@ class Python(AutotoolsPackage): depends_on("zlib") depends_on("tk", when="+tk") depends_on("tcl", when="+tk") + depends_on("gdbm", when='+dbm') # Patch does not work for Python 3.1 patch('ncurses.patch', when='@:2.8,3.2:') -- cgit v1.2.3-70-g09d2 From 869cb699856c29715157d171ed3f24aa2c9995f2 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 19 Mar 2018 16:19:44 -0500 Subject: Add latest version of SuiteSparse (#7525) --- var/spack/repos/builtin/packages/suite-sparse/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/suite-sparse/package.py b/var/spack/repos/builtin/packages/suite-sparse/package.py index 2f8660f496..da12a38e3e 100644 --- a/var/spack/repos/builtin/packages/suite-sparse/package.py +++ b/var/spack/repos/builtin/packages/suite-sparse/package.py @@ -30,8 +30,9 @@ class SuiteSparse(Package): SuiteSparse is a suite of sparse matrix algorithms """ homepage = 'http://faculty.cse.tamu.edu/davis/suitesparse.html' - url = 'http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.5.1.tar.gz' + url = 'http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-5.2.0.tar.gz' + version('5.2.0', '8e625539dbeed061cc62fbdfed9be7cf') version('5.1.0', '9c34d7c07ad5ce1624b8187faa132046') version('4.5.5', '0a5b38af0016f009409a9606d2f1b555') version('4.5.4', 'f6ab689442e64a1624a47aa220072d1b') -- cgit v1.2.3-70-g09d2 From 4ea0c16f3604979c3059b44cedd3dab5a0dc7562 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 19 Mar 2018 16:21:04 -0500 Subject: picard: Add version 2.18.0 (#7528) --- var/spack/repos/builtin/packages/picard/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/picard/package.py b/var/spack/repos/builtin/packages/picard/package.py index c5047bab1b..c2e196f800 100644 --- a/var/spack/repos/builtin/packages/picard/package.py +++ b/var/spack/repos/builtin/packages/picard/package.py @@ -41,6 +41,7 @@ class Picard(Package): # They started distributing a single jar file at v2.6.0, prior to # that it was a .zip file with multiple .jar and .so files + version('2.18.0', '20045ff141e4a67512365f0b6bbd8229', expand=False) version('2.17.0', '72cc527f1e4ca6a799ae0117af60b54e', expand=False) version('2.16.0', 'fed8928b03bb36e355656f349e579083', expand=False) version('2.15.0', '3f5751630b1a3449edda47a0712a64e4', expand=False) -- cgit v1.2.3-70-g09d2 From 106827db0329b6cef44c492cdba3b410c7d333b4 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Tue, 20 Mar 2018 06:44:01 +0900 Subject: pocl: fix spec (#7461) It seems there has been a change in concretization that resulted in a request for a llvm latest (5.0.1) while not satisfying the later more precise request for a version. Remove the first line and only rely on the last. --- var/spack/repos/builtin/packages/pocl/package.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pocl/package.py b/var/spack/repos/builtin/packages/pocl/package.py index 3ac7182966..615d261626 100644 --- a/var/spack/repos/builtin/packages/pocl/package.py +++ b/var/spack/repos/builtin/packages/pocl/package.py @@ -58,19 +58,18 @@ class Pocl(CMakePackage): depends_on("cmake @2.8.12:", type="build") depends_on("hwloc") depends_on("libtool", type=("build", "link", "run")) + depends_on("pkgconfig", type="build") + # We don't request LLVM's shared libraries because these are not # enabled by default, and also because they fail to build for us # (see #1616) - depends_on("llvm +clang") - depends_on("pkgconfig", type="build") - # These are the supported LLVM versions - depends_on("llvm @3.7:3.9", when="@master") - depends_on("llvm @3.7:4.0", when="@0.14") - depends_on("llvm @3.7:3.8", when="@0.13") - depends_on("llvm @3.2:3.7", when="@0.12") - depends_on("llvm @3.2:3.6", when="@0.11") - depends_on("llvm @3.2:3.5", when="@0.10") + depends_on("llvm +clang @3.7:3.9", when="@master") + depends_on("llvm +clang @3.7:4.0", when="@0.14") + depends_on("llvm +clang @3.7:3.8", when="@0.13") + depends_on("llvm +clang @3.2:3.7", when="@0.12") + depends_on("llvm +clang @3.2:3.6", when="@0.11") + depends_on("llvm +clang @3.2:3.5", when="@0.10") variant("distro", default=False, description=("Support several CPU architectures, " -- cgit v1.2.3-70-g09d2 From ae795d81849de8cbaba27eb63aac2ee256f022d3 Mon Sep 17 00:00:00 2001 From: Veselin Dobrev Date: Mon, 19 Mar 2018 15:57:03 -0700 Subject: [MUMPS] Various improvements in the package. * Fix a bug when checking for 'xl' or 'xl_r' compiler. * Add support for parallel build - the 's', 'c', 'd', and 'z' targets are build separately allowing parallel builds. * When build '+shared', inject all dependencies into the link lines of the mumps libraries. * Run the examples only when installing with the '--test' Spack option. --- var/spack/repos/builtin/packages/mumps/package.py | 122 +++++++++++++++------- 1 file changed, 83 insertions(+), 39 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mumps/package.py b/var/spack/repos/builtin/packages/mumps/package.py index 43f565ec99..f572b4d032 100644 --- a/var/spack/repos/builtin/packages/mumps/package.py +++ b/var/spack/repos/builtin/packages/mumps/package.py @@ -85,16 +85,26 @@ class Mumps(Package): raise RuntimeError( 'You cannot use the variants parmetis or ptscotch without mpi') - lapack_blas = (self.spec['lapack'].libs + - self.spec['blas'].libs) - makefile_conf = ["LIBBLAS = %s" % lapack_blas.ld_flags] + # The makefile variables LIBBLAS, LSCOTCH, LMETIS, and SCALAP are only + # used to link the examples, so if building '+shared' there is no need + # to explicitly link with the respective libraries because we make sure + # the mumps shared libraries are already linked with them. See also the + # comment below about 'inject_libs'. This behaviour may cause problems + # if building '+shared' and the used libraries were build static + # without the PIC option. + shared = '+shared' in self.spec + + lapack_blas = (self.spec['lapack'].libs + self.spec['blas'].libs) + makefile_conf = ["LIBBLAS = %s" % + lapack_blas.ld_flags if not shared else ''] orderings = ['-Dpord'] if '+ptscotch' in self.spec or '+scotch' in self.spec: makefile_conf.extend([ "ISCOTCH = -I%s" % self.spec['scotch'].prefix.include, - "LSCOTCH = {0}".format(self.spec['scotch'].libs.ld_flags) + "LSCOTCH = {0}".format( + self.spec['scotch'].libs.ld_flags if not shared else '') ]) orderings.append('-Dscotch') @@ -104,16 +114,19 @@ class Mumps(Package): if '+parmetis' in self.spec and '+metis' in self.spec: makefile_conf.extend([ "IMETIS = -I%s" % self.spec['parmetis'].prefix.include, - "LMETIS = -L%s -l%s -L%s -l%s" % ( + ("LMETIS = -L%s -l%s -L%s -l%s" % ( self.spec['parmetis'].prefix.lib, 'parmetis', - self.spec['metis'].prefix.lib, 'metis') + self.spec['metis'].prefix.lib, 'metis')) if not shared + else 'LMETIS =' ]) orderings.append('-Dparmetis') elif '+metis' in self.spec: makefile_conf.extend([ "IMETIS = -I%s" % self.spec['metis'].prefix.include, - "LMETIS = -L%s -l%s" % (self.spec['metis'].prefix.lib, 'metis') + ("LMETIS = -L%s -l%s" % ( + self.spec['metis'].prefix.lib, 'metis')) if not shared + else 'LMETIS =' ]) orderings.append('-Dmetis') @@ -127,6 +140,7 @@ class Mumps(Package): # TODO: test this part, it needs a full blas, scalapack and # partitionning environment with 64bit integers + using_xl = self.compiler.name in ['xl', 'xl_r'] if '+int64' in self.spec: if self.compiler.name == "xl" or self.compiler.name == "xl_r": makefile_conf.extend( @@ -142,7 +156,7 @@ class Mumps(Package): 'OPTL = %s -O ' % fpic, 'OPTC = %s -O -DINTSIZE64' % fpic]) else: - if self.compiler.name == "xl" or self.compiler.name == "xl_r": + if using_xl: makefile_conf.extend( ['OPTF = -O3 -qfixed', 'OPTL = %s -O3' % fpic, @@ -154,13 +168,16 @@ class Mumps(Package): 'OPTC = %s -O ' % fpic]) if '+mpi' in self.spec: - scalapack = self.spec['scalapack'].libs + scalapack = self.spec['scalapack'].libs if not shared \ + else LibraryList([]) makefile_conf.extend( ['CC = {0}'.format(self.spec['mpi'].mpicc), 'FC = {0}'.format(self.spec['mpi'].mpifc), "SCALAP = %s" % scalapack.ld_flags, "MUMPS_TYPE = par"]) - if (self.spec.satisfies('%xl_r' or '%xl')) and self.spec.satisfies('^spectrum-mpi'): # noqa + # The FL makefile variable is used for linking the examples and + # linking the shared mumps libraries (in some cases). + if using_xl and self.spec.satisfies('^spectrum-mpi'): makefile_conf.extend( ['FL = {0}'.format(self.spec['mpi'].mpicc)]) else: @@ -181,28 +198,54 @@ class Mumps(Package): # hack defined by _DMAIN_COMP (see examples/c_example.c) makefile_conf.append("CDEFS = -DAdd_ -DMAIN_COMP") else: - if self.compiler.name != "xl" and self.compiler.name != "xl_r": + if not using_xl: makefile_conf.append("CDEFS = -DAdd_") if '+shared' in self.spec: + # All Mumps libraries will be linked with 'inject_libs'. + # Usually, the rpaths will be injected by the Spack compiler + # wrapper, however some MPI wrappers may not call the Spack + # compiler wrapper. + inject_libs = [self.rpath_args] + if '+mpi' in self.spec: + inject_libs += [self.spec['scalapack'].libs.ld_flags] + if '+ptscotch' in self.spec or '+scotch' in self.spec: + inject_libs += [self.spec['scotch'].libs.ld_flags] + if '+parmetis' in self.spec and '+metis' in self.spec: + inject_libs += [ + "-L%s -l%s -L%s -l%s" % ( + self.spec['parmetis'].prefix.lib, 'parmetis', + self.spec['metis'].prefix.lib, 'metis')] + elif '+metis' in self.spec: + inject_libs += [ + "-L%s -l%s" % (self.spec['metis'].prefix.lib, 'metis')] + inject_libs += [lapack_blas.ld_flags] + inject_libs = ' '.join(inject_libs) + if sys.platform == 'darwin': # Building dylibs with mpif90 causes segfaults on 10.8 and # 10.10. Use gfortran. (Homebrew) makefile_conf.extend([ 'LIBEXT=.dylib', - 'AR=%s -dynamiclib -Wl,-install_name -Wl,%s/$(notdir $@) -undefined dynamic_lookup -o ' % (os.environ['FC'], prefix.lib), # noqa + 'AR=%s -dynamiclib -Wl,-install_name -Wl,%s/$(notdir $@)' + ' -undefined dynamic_lookup %s -o ' % + (os.environ['FC'], prefix.lib, inject_libs), 'RANLIB=echo' ]) else: makefile_conf.extend([ 'LIBEXT=.so', - 'AR=$(FL) -shared -Wl,-soname -Wl,%s/$(notdir $@) -o' % prefix.lib, # noqa + 'AR=$(FL) -shared -Wl,-soname -Wl,%s/$(notdir $@) %s -o' % + (prefix.lib, inject_libs), 'RANLIB=echo' ]) - if self.compiler.name == 'xl' or self.compiler.name == 'xl_r': + if using_xl: + # The patches for xl + spectrum-mpi use SAR for linking + # libpord. makefile_conf.extend([ - 'SAR=/bin/xlc -shared -Wl,-soname -Wl,%s/$(notdir $@) -o' % prefix.lib # noqa + 'SAR=%s -shared -Wl,-soname -Wl,%s/$(notdir $@) %s -o' + % (env['CC'], prefix.lib, inject_libs) ]) else: makefile_conf.extend([ @@ -222,24 +265,17 @@ class Mumps(Package): fh.write(makefile_inc) def install(self, spec, prefix): - make_libs = [] - - # the choice to compile ?examples is to have kind of a sanity - # check on the libraries generated. - if '+float' in spec: - make_libs.append('sexamples') - if '+complex' in spec: - make_libs.append('cexamples') - - if '+double' in spec: - make_libs.append('dexamples') - if '+complex' in spec: - make_libs.append('zexamples') - self.write_makefile_inc() # Build fails in parallel - make(*make_libs, parallel=False) + # That is why we split the builds of 's', 'c', 'd', and/or 'z' which + # can be build one after the other, each using a parallel build. + letters_variants = [ + ['s', '+float'], ['c', '+complex+float'], + ['d', '+double'], ['z', '+complex+double']] + for l, v in letters_variants: + if v in spec: + make(l + 'examples') install_tree('lib', prefix.lib) install_tree('include', prefix.include) @@ -253,15 +289,23 @@ class Mumps(Package): # FIXME: extend the tests to mpirun -np 2 when build with MPI # FIXME: use something like numdiff to compare output files - with working_dir('examples'): - if '+float' in spec: - os.system('./ssimpletest < input_simpletest_real') - if '+complex' in spec: - os.system('./csimpletest < input_simpletest_real') - if '+double' in spec: - os.system('./dsimpletest < input_simpletest_real') - if '+complex' in spec: - os.system('./zsimpletest < input_simpletest_cmplx') + # Note: In some cases, when 'mpi' is enabled, the examples below cannot + # be run without 'mpirun', so we enabled the tests only if explicitly + # requested with the Spack '--test' option. + if self.run_tests: + with working_dir('examples'): + if '+float' in spec: + ssimpletest = Executable('./ssimpletest') + ssimpletest(input='input_simpletest_real') + if '+complex' in spec: + csimpletest = Executable('./csimpletest') + csimpletest(input='input_simpletest_cmplx') + if '+double' in spec: + dsimpletest = Executable('./dsimpletest') + dsimpletest(input='input_simpletest_real') + if '+complex' in spec: + zsimpletest = Executable('./zsimpletest') + zsimpletest(input='input_simpletest_cmplx') @property def libs(self): -- cgit v1.2.3-70-g09d2 From c11b46ae9916b2811d06da8a72fea75b3bdc00e7 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Tue, 20 Mar 2018 01:08:18 -0500 Subject: Add DSDP package (#7526) --- var/spack/repos/builtin/packages/dsdp/malloc.patch | 16 +++++ var/spack/repos/builtin/packages/dsdp/package.py | 71 ++++++++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100644 var/spack/repos/builtin/packages/dsdp/malloc.patch create mode 100644 var/spack/repos/builtin/packages/dsdp/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dsdp/malloc.patch b/var/spack/repos/builtin/packages/dsdp/malloc.patch new file mode 100644 index 0000000000..54b92628be --- /dev/null +++ b/var/spack/repos/builtin/packages/dsdp/malloc.patch @@ -0,0 +1,16 @@ +malloc.h does not exist on macOS. The same functionality is +already provided by stdlib.h, so there's no need for it. +Patch stolen from: +https://github.com/sjackman/homebrew-science-deprecated/blob/master/dsdp.rb + +diff --git a/src/sys/dsdploginfo.c b/src/sys/dsdploginfo.c +index 9313549..cee4f93 100644 +--- a/src/sys/dsdploginfo.c ++++ b/src/sys/dsdploginfo.c +@@ -6,7 +6,6 @@ + #include + #include + #include +-#include + #include "dsdpsys.h" + #include "dsdpbasictypes.h" diff --git a/var/spack/repos/builtin/packages/dsdp/package.py b/var/spack/repos/builtin/packages/dsdp/package.py new file mode 100644 index 0000000000..e90e059399 --- /dev/null +++ b/var/spack/repos/builtin/packages/dsdp/package.py @@ -0,0 +1,71 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import os + + +class Dsdp(MakefilePackage): + """The DSDP software is a free open source implementation of an + interior-point method for semidefinite programming. It provides primal and + dual solutions, exploits low-rank structure and sparsity in the data, and + has relatively low memory requirements for an interior-point method. It + allows feasible and infeasible starting points and provides approximate + certificates of infeasibility when no feasible solution exists.""" + + homepage = "http://www.mcs.anl.gov/hs/software/DSDP/" + url = "http://www.mcs.anl.gov/hs/software/DSDP/DSDP5.8.tar.gz" + + version('5.8', '37c15a3c6c3f13e31262f65ac4364b5e') + + depends_on('blas') + depends_on('lapack') + + patch('malloc.patch') + + build_targets = ['dsdpapi'] + + def edit(self, spec, prefix): + make_include = FileFilter('make.include') + + # STEP 1: Set DSDPROOT. + make_include.filter('^#DSDPROOT.*=.*', + 'DSDPROOT = {0}'.format(os.getcwd())) + + # STEP 2: Set the name of the C compiler. + make_include.filter('^CC.*=.*', 'CC = {0}'.format(spack_cc)) + + # STEP 5: + # Location of BLAS AND LAPACK libraries. + # Also include the math library and other libraries needed to + # link the BLAS to the C files that call them. + lapackblas = spec['lapack'].libs + spec['blas'].libs + make_include.filter('^LAPACKBLAS.*=.*', + 'LAPACKBLAS = {0}'.format( + lapackblas.link_flags + ' -lm')) + + def install(self, spec, prefix): + # Manual installation + install_tree('lib', prefix.lib) + install_tree('include', prefix.include) -- cgit v1.2.3-70-g09d2 From 6058cc177031ff8ce05a5a7b4c1df20b84d3226a Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Tue, 20 Mar 2018 01:18:20 -0500 Subject: Add latest version of py-setuptools (#7523) --- .../builtin/packages/py-setuptools/package.py | 34 +++++++++++++++------- 1 file changed, 23 insertions(+), 11 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-setuptools/package.py b/var/spack/repos/builtin/packages/py-setuptools/package.py index de7b47367b..c6fb8b18d0 100644 --- a/var/spack/repos/builtin/packages/py-setuptools/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools/package.py @@ -30,16 +30,14 @@ class PySetuptools(PythonPackage): upgrading, installing, and uninstalling Python packages.""" homepage = "https://pypi.python.org/pypi/setuptools" - url = "https://pypi.io/packages/source/s/setuptools/setuptools-25.2.0.tar.gz" + url = "https://pypi.io/packages/source/s/setuptools/setuptools-39.0.1.zip" import_modules = ['pkg_resources', 'setuptools', 'setuptools.command'] - version('35.0.2', 'c368b4970d3ad3eab5afe4ef4dbe2437', - url="https://pypi.io/packages/source/s/setuptools/setuptools-35.0.2.zip") - version('34.4.1', '5f9b07aeaafd29eac2548fc0b89a4934', - url="https://pypi.io/packages/source/s/setuptools/setuptools-34.4.1.zip") - version('34.2.0', '41b630da4ea6cfa5894d9eb3142922be', - url="https://pypi.io/packages/source/s/setuptools/setuptools-34.2.0.zip") + version('39.0.1', '75310b72ca0ab4e673bf7679f69d7a62') + version('35.0.2', 'c368b4970d3ad3eab5afe4ef4dbe2437') + version('34.4.1', '5f9b07aeaafd29eac2548fc0b89a4934') + version('34.2.0', '41b630da4ea6cfa5894d9eb3142922be') version('25.2.0', 'a0dbb65889c46214c691f6c516cf959c') version('20.7.0', '5d12b39bf3e75e80fdce54e44b255615') version('20.6.7', '45d6110f3ec14924e44c33411db64fe6') @@ -53,7 +51,21 @@ class PySetuptools(PythonPackage): # Previously, setuptools vendored all of its dependencies to allow # easy bootstrapping. As of version 34.0.0, this is no longer done - # and the dependencies need to be installed externally. - depends_on('py-packaging@16.8:', when='@34.0.0:', type=('build', 'run')) - depends_on('py-six@1.6.0:', when='@34.0.0:', type=('build', 'run')) - depends_on('py-appdirs@1.4.0:', when='@34.0.0:', type=('build', 'run')) + # and the dependencies need to be installed externally. As of version + # 36.0.0, setuptools now vendors its dependencies again. See + # https://github.com/pypa/setuptools/issues/980 for the reason they + # reverted back to vendoring again. + depends_on('py-packaging@16.8:', when='@34:35', type=('build', 'run')) + depends_on('py-six@1.6.0:', when='@34:35', type=('build', 'run')) + depends_on('py-appdirs@1.4.0:', when='@34:35', type=('build', 'run')) + + def url_for_version(self, version): + url = 'https://pypi.io/packages/source/s/setuptools/setuptools-{0}' + url = url.format(version) + + if version > Version('32.1.2'): + url += '.zip' + else: + url += '.tar.gz' + + return url -- cgit v1.2.3-70-g09d2 From 2379ed54b9e8183bec8487c08d66e5f4c51eeb64 Mon Sep 17 00:00:00 2001 From: Peter Scheibel Date: Tue, 6 Feb 2018 10:48:58 -0500 Subject: package_hash: add code to generate a hash for a package file This will be included in the full hash of packages. --- lib/spack/spack/test/package_hash.py | 84 ++++++++++++ lib/spack/spack/util/package_hash.py | 151 +++++++++++++++++++++ .../builtin.mock/packages/hash-test1/package.py | 34 +++++ .../builtin.mock/packages/hash-test1/patch1.patch | 1 + .../builtin.mock/packages/hash-test1/patch2.patch | 1 + .../builtin.mock/packages/hash-test2/package.py | 28 ++++ .../builtin.mock/packages/hash-test2/patch1.patch | 2 + 7 files changed, 301 insertions(+) create mode 100644 lib/spack/spack/test/package_hash.py create mode 100644 lib/spack/spack/util/package_hash.py create mode 100644 var/spack/repos/builtin.mock/packages/hash-test1/package.py create mode 100644 var/spack/repos/builtin.mock/packages/hash-test1/patch1.patch create mode 100644 var/spack/repos/builtin.mock/packages/hash-test1/patch2.patch create mode 100644 var/spack/repos/builtin.mock/packages/hash-test2/package.py create mode 100644 var/spack/repos/builtin.mock/packages/hash-test2/patch1.patch (limited to 'var') diff --git a/lib/spack/spack/test/package_hash.py b/lib/spack/spack/test/package_hash.py new file mode 100644 index 0000000000..77768bb648 --- /dev/null +++ b/lib/spack/spack/test/package_hash.py @@ -0,0 +1,84 @@ +############################################################################## +# Copyright (c) 2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://software.llnl.gov/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License (as published by +# the Free Software Foundation) version 2.1 dated February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack.util.package_hash import package_hash, package_content +from spack.spec import Spec + + +def test_hash(tmpdir, builtin_mock, config): + package_hash("hash-test1@1.2") + + +def test_different_variants(tmpdir, builtin_mock, config): + spec1 = Spec("hash-test1@1.2 +variantx") + spec2 = Spec("hash-test1@1.2 +varianty") + assert package_hash(spec1) == package_hash(spec2) + + +def test_all_same_but_name(tmpdir, builtin_mock, config): + spec1 = Spec("hash-test1@1.2") + spec2 = Spec("hash-test2@1.2") + compare_sans_name(True, spec1, spec2) + + spec1 = Spec("hash-test1@1.2 +varianty") + spec2 = Spec("hash-test2@1.2 +varianty") + compare_sans_name(True, spec1, spec2) + + +def test_all_same_but_archive_hash(tmpdir, builtin_mock, config): + """ + Archive hash is not intended to be reflected in Package hash. + """ + spec1 = Spec("hash-test1@1.3") + spec2 = Spec("hash-test2@1.3") + compare_sans_name(True, spec1, spec2) + + +def test_all_same_but_patch_contents(tmpdir, builtin_mock, config): + spec1 = Spec("hash-test1@1.1") + spec2 = Spec("hash-test2@1.1") + compare_sans_name(True, spec1, spec2) + + +def test_all_same_but_patches_to_apply(tmpdir, builtin_mock, config): + spec1 = Spec("hash-test1@1.4") + spec2 = Spec("hash-test2@1.4") + compare_sans_name(True, spec1, spec2) + + +def test_all_same_but_install(tmpdir, builtin_mock, config): + spec1 = Spec("hash-test1@1.5") + spec2 = Spec("hash-test2@1.5") + compare_sans_name(False, spec1, spec2) + + +def compare_sans_name(eq, spec1, spec2): + content1 = package_content(spec1) + content1 = content1.replace(spec1.package.__class__.__name__, '') + content2 = package_content(spec2) + content2 = content2.replace(spec2.package.__class__.__name__, '') + if eq: + assert content1 == content2 + else: + assert content1 != content2 diff --git a/lib/spack/spack/util/package_hash.py b/lib/spack/spack/util/package_hash.py new file mode 100644 index 0000000000..6362d9d7bb --- /dev/null +++ b/lib/spack/spack/util/package_hash.py @@ -0,0 +1,151 @@ +############################################################################## +# Copyright (c) 2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://software.llnl.gov/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License (as published by +# the Free Software Foundation) version 2.1 dated February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +import spack +from spack import directives +from spack.error import SpackError +from spack.spec import Spec +from spack.util.naming import mod_to_class + +import ast +import hashlib + + +class RemoveDocstrings(ast.NodeTransformer): + """Transformer that removes docstrings from a Python AST.""" + def remove_docstring(self, node): + if node.body: + if isinstance(node.body[0], ast.Expr) and \ + isinstance(node.body[0].value, ast.Str): + node.body.pop(0) + + self.generic_visit(node) + return node + + def visit_FunctionDef(self, node): + return self.remove_docstring(node) + + def visit_ClassDef(self, node): + return self.remove_docstring(node) + + def visit_Module(self, node): + return self.remove_docstring(node) + + +class RemoveDirectives(ast.NodeTransformer): + """Remove Spack directives from a package AST.""" + def __init__(self, spec): + self.spec = spec + + def is_directive(self, node): + return (isinstance(node, ast.Expr) and + node.value and isinstance(node.value, ast.Call) and + node.value.func.id in directives.__all__) + + def is_spack_attr(self, node): + return (isinstance(node, ast.Assign) and + node.targets and isinstance(node.targets[0], ast.Name) and + node.targets[0].id in spack.Package.metadata_attrs) + + def visit_ClassDef(self, node): + if node.name == mod_to_class(self.spec.name): + node.body = [ + c for c in node.body + if (not self.is_directive(c) and not self.is_spack_attr(c))] + return node + + +class TagMultiMethods(ast.NodeVisitor): + """Tag @when-decorated methods in a spec.""" + def __init__(self, spec): + self.spec = spec + self.methods = {} + + def visit_FunctionDef(self, node): + nodes = self.methods.setdefault(node.name, []) + if node.decorator_list: + dec = node.decorator_list[0] + if isinstance(dec, ast.Call) and dec.func.id == 'when': + cond = dec.args[0].s + nodes.append((node, self.spec.satisfies(cond, strict=True))) + else: + nodes.append((node, None)) + + +class ResolveMultiMethods(ast.NodeTransformer): + """Remove methods which do not exist if their @when is not satisfied.""" + def __init__(self, methods): + self.methods = methods + + def resolve(self, node): + if node.name not in self.methods: + raise PackageHashError( + "Future traversal visited new node: %s" % node.name) + + result = None + for n, cond in self.methods[node.name]: + if cond: + return n + if cond is None: + result = n + return result + + def visit_FunctionDef(self, node): + if self.resolve(node) is node: + node.decorator_list = [] + return node + return None + + +def package_content(spec): + return ast.dump(package_ast(spec)) + + +def package_hash(spec, content=None): + if content is None: + content = package_content(spec) + return hashlib.sha256(content.encode('utf-8')).digest().lower() + + +def package_ast(spec): + spec = Spec(spec) + + filename = spack.repo.filename_for_package_name(spec.name) + with open(filename) as f: + text = f.read() + root = ast.parse(text) + + root = RemoveDocstrings().visit(root) + + RemoveDirectives(spec).visit(root) + + fmm = TagMultiMethods(spec) + fmm.visit(root) + + root = ResolveMultiMethods(fmm.methods).visit(root) + return root + + +class PackageHashError(SpackError): + """Raised for all errors encountered during package hashing.""" diff --git a/var/spack/repos/builtin.mock/packages/hash-test1/package.py b/var/spack/repos/builtin.mock/packages/hash-test1/package.py new file mode 100644 index 0000000000..60c7fbe32b --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/hash-test1/package.py @@ -0,0 +1,34 @@ +from spack import * + +import os + + +class HashTest1(Package): + """Used to test package hashing + """ + + homepage = "http://www.hashtest1.org" + url = "http://www.hashtest1.org/downloads/hashtest1-1.1.tar.bz2" + + version('1.1', 'a' * 32) + version('1.2', 'b' * 32) + version('1.3', 'c' * 32) + version('1.4', 'd' * 32) + + patch('patch1.patch', when="@1.1") + patch('patch2.patch', when="@1.4") + + variant('variantx', default=False, description='Test variant X') + variant('varianty', default=False, description='Test variant Y') + + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): + pass + + @when('@:1.4') + def install(self, spec, prefix): + print("install 1") + os.listdir(os.getcwd()) + + @when('@1.5') + def install(self, spec, prefix): + os.listdir(os.getcwd()) diff --git a/var/spack/repos/builtin.mock/packages/hash-test1/patch1.patch b/var/spack/repos/builtin.mock/packages/hash-test1/patch1.patch new file mode 100644 index 0000000000..a333c82dfd --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/hash-test1/patch1.patch @@ -0,0 +1 @@ +the contents of patch 1 (not a valid diff, but sufficient for testing) diff --git a/var/spack/repos/builtin.mock/packages/hash-test1/patch2.patch b/var/spack/repos/builtin.mock/packages/hash-test1/patch2.patch new file mode 100644 index 0000000000..9e292a10fe --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/hash-test1/patch2.patch @@ -0,0 +1 @@ +the contents of patch 2 (not a valid diff, but sufficient for testing) diff --git a/var/spack/repos/builtin.mock/packages/hash-test2/package.py b/var/spack/repos/builtin.mock/packages/hash-test2/package.py new file mode 100644 index 0000000000..3c4c2addf2 --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/hash-test2/package.py @@ -0,0 +1,28 @@ +from spack import * + +import os + + +class HashTest2(Package): + """Used to test package hashing + """ + + homepage = "http://www.hashtest2.org" + url = "http://www.hashtest1.org/downloads/hashtest2-1.1.tar.bz2" + + version('1.1', 'a' * 32) + version('1.2', 'b' * 32) + version('1.3', 'c' * 31 + 'x') # Source hash differs from hash-test1@1.3 + version('1.4', 'd' * 32) + + patch('patch1.patch', when="@1.1") + + variant('variantx', default=False, description='Test variant X') + variant('varianty', default=False, description='Test variant Y') + + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): + pass + + def install(self, spec, prefix): + print("install 1") + os.listdir(os.getcwd()) diff --git a/var/spack/repos/builtin.mock/packages/hash-test2/patch1.patch b/var/spack/repos/builtin.mock/packages/hash-test2/patch1.patch new file mode 100644 index 0000000000..bbfa868935 --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/hash-test2/patch1.patch @@ -0,0 +1,2 @@ +the different contents of patch 1 (not a valid diff, but sufficient for testing, +and different from patch 1 of hash-test1) -- cgit v1.2.3-70-g09d2 From ed4640c75b8493bb733879b8582cf0104cc34e69 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Tue, 20 Mar 2018 14:33:14 +0100 Subject: alglib: fix on Darwin (#7534) --- var/spack/repos/builtin/packages/alglib/package.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/alglib/package.py b/var/spack/repos/builtin/packages/alglib/package.py index e470dba292..c6b0c5d85f 100644 --- a/var/spack/repos/builtin/packages/alglib/package.py +++ b/var/spack/repos/builtin/packages/alglib/package.py @@ -25,6 +25,7 @@ from spack import * import glob import os +import sys import shutil @@ -59,3 +60,9 @@ class Alglib(MakefilePackage): headers = glob.glob('*.h') for h in headers: install(h, prefix.include) + + @run_after('install') + def fix_darwin_install(self): + # The shared libraries are not installed correctly on Darwin: + if sys.platform == 'darwin': + fix_darwin_install_name(self.spec.prefix.lib) -- cgit v1.2.3-70-g09d2 From 35e7b9ac44a28646340df139b07a0b689a0f2edf Mon Sep 17 00:00:00 2001 From: jthies Date: Tue, 20 Mar 2018 09:23:45 -0700 Subject: Ghost as cuda package (#7501) * add headers property to netlib-lapack and intel-mkl * ghost: fix finding cblas header and libs (at least for mkl and netlib-lapack, which provide headers()) * fix flake8 errors * ghost: remove unnecessary query parameter * fix flake8 errors * ghost: make it a CudaPackage (as suggested by @davydden, thanks!) * ghost: missing whitespace --- var/spack/repos/builtin/packages/ghost/package.py | 20 +++++++++----------- .../repos/builtin/packages/intel-mkl/package.py | 12 ++++++++++++ .../repos/builtin/packages/netlib-lapack/package.py | 10 +++++++++- 3 files changed, 30 insertions(+), 12 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ghost/package.py b/var/spack/repos/builtin/packages/ghost/package.py index 8964ee6404..46f884e0f6 100644 --- a/var/spack/repos/builtin/packages/ghost/package.py +++ b/var/spack/repos/builtin/packages/ghost/package.py @@ -26,7 +26,7 @@ from spack import * -class Ghost(CMakePackage): +class Ghost(CMakePackage, CudaPackage): """GHOST: a General, Hybrid and Optimized Sparse Toolkit. This library provides highly optimized building blocks for implementing sparse iterative eigenvalue and linear solvers multi- and manycore @@ -44,8 +44,6 @@ class Ghost(CMakePackage): description='Enables the build of shared libraries') variant('mpi', default=True, description='enable/disable MPI') - variant('cuda', default=False, - description='enable/disable CUDA') variant('scotch', default=False, description='enable/disable matrix reordering with PT-SCOTCH') variant('zoltan', default=False, @@ -58,17 +56,14 @@ class Ghost(CMakePackage): depends_on('hwloc') depends_on('blas') depends_on('mpi', when='+mpi') - depends_on('cuda@8:', when='+cuda') depends_on('scotch', when='+scotch') depends_on('zoltan', when='+zoltan') def cmake_args(self): spec = self.spec - cblas_include_dir = '' - if '^mkl' not in spec: - cblas_include_dir = '-DCBLAS_INCLUDE_DIR=' + \ - spec['blas'].prefix.include - + # note: we require the cblas_include_dir property from the blas + # provider, this is implemented at least for intel-mkl and + # netlib-lapack args = ['-DGHOST_ENABLE_MPI:BOOL=%s' % ('ON' if '+mpi' in spec else 'OFF'), '-DGHOST_USE_CUDA:BOOL=%s' @@ -78,9 +73,12 @@ class Ghost(CMakePackage): '-DGHOST_USE_ZOLTAN:BOOL=%s' % ('ON' if '+zoltan' in spec else 'OFF'), '-DBUILD_SHARED_LIBS:BOOL=%s' - % ('ON' if '+shared' in spec else 'OFF'), cblas_include_dir + % ('ON' if '+shared' in spec else 'OFF'), + '-DCBLAS_INCLUDE_DIR:STRING=%s' + % format(spec['blas'].headers.directories[0]), + '-DBLAS_LIBRARIES=%s' + % spec['blas:c'].libs.joined(';') ] - return args def check(self): diff --git a/var/spack/repos/builtin/packages/intel-mkl/package.py b/var/spack/repos/builtin/packages/intel-mkl/package.py index 6cbf355e56..67002bda7f 100644 --- a/var/spack/repos/builtin/packages/intel-mkl/package.py +++ b/var/spack/repos/builtin/packages/intel-mkl/package.py @@ -182,6 +182,18 @@ class IntelMkl(IntelPackage): return libs + @property + def headers(self): + prefix = self.spec.prefix + if sys.platform != 'darwin': + include_dir = prefix.compilers_and_libraries.linux.mkl.include + else: + include_dir = prefix.include + + cblas_h = join_path(include_dir, 'mkl_cblas.h') + lapacke_h = join_path(include_dir, 'mkl_lapacke.h') + return HeaderList([cblas_h, lapacke_h]) + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): # set up MKLROOT for everyone using MKL package if sys.platform == 'darwin': diff --git a/var/spack/repos/builtin/packages/netlib-lapack/package.py b/var/spack/repos/builtin/packages/netlib-lapack/package.py index 27d70e9c7a..bc74a99c59 100644 --- a/var/spack/repos/builtin/packages/netlib-lapack/package.py +++ b/var/spack/repos/builtin/packages/netlib-lapack/package.py @@ -48,7 +48,8 @@ class NetlibLapack(Package): version('3.4.0', '02d5706ec03ba885fc246e5fa10d8c70') version('3.3.1', 'd0d533ec9a5b74933c2a1e84eedc58b4') - variant('debug', default=False, description='Activates the Debug build type') + variant('debug', default=False, + description='Activates the Debug build type') variant('shared', default=True, description="Build shared library version") variant('external-blas', default=False, description='Build lapack with an external blas') @@ -123,6 +124,13 @@ class NetlibLapack(Package): libraries, root=self.prefix, shared=shared, recursive=True ) + @property + def headers(self): + include_dir = self.spec.prefix.include + cblas_h = join_path(include_dir, 'cblas.h') + lapacke_h = join_path(include_dir, 'lapacke.h') + return HeaderList([cblas_h, lapacke_h]) + def install_one(self, spec, prefix, shared): cmake_args = [ '-DBUILD_SHARED_LIBS:BOOL=%s' % ('ON' if shared else 'OFF'), -- cgit v1.2.3-70-g09d2 From 9b1d69c9347567f73bdc71a4e6357200bf1971b7 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Wed, 21 Mar 2018 11:16:55 +0800 Subject: A new package: wcslib. (#7463) --- var/spack/repos/builtin/packages/wcslib/package.py | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 var/spack/repos/builtin/packages/wcslib/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/wcslib/package.py b/var/spack/repos/builtin/packages/wcslib/package.py new file mode 100644 index 0000000000..a4ff883d47 --- /dev/null +++ b/var/spack/repos/builtin/packages/wcslib/package.py @@ -0,0 +1,35 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Wcslib(AutotoolsPackage): + """WCSLIB a C implementation of the coordinate transformations + defined in the FITS WCS papers.""" + + homepage = "http://www.atnf.csiro.au/people/mcalabre/WCS/" + url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib.tar.bz2" + + version('5.18', '67a78354be74eca4f17d3e0853d5685f') -- cgit v1.2.3-70-g09d2 From 8c9a5a95d85180aed48b143fea755440c303b3ce Mon Sep 17 00:00:00 2001 From: Leonhard Reichenbach Date: Wed, 21 Mar 2018 14:16:41 +0100 Subject: Add latest version of patch (#7539) --- var/spack/repos/builtin/packages/patch/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/patch/package.py b/var/spack/repos/builtin/packages/patch/package.py index 6c69b7994f..8177a3ba5a 100644 --- a/var/spack/repos/builtin/packages/patch/package.py +++ b/var/spack/repos/builtin/packages/patch/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. @@ -32,8 +32,9 @@ class Patch(AutotoolsPackage): """ homepage = "http://savannah.gnu.org/projects/patch/" - url = "http://ftp.gnu.org/gnu/patch/patch-2.7.5.tar.xz" + url = "http://ftp.gnu.org/gnu/patch/patch-2.7.6.tar.xz" + version('2.7.6', '78ad9937e4caadcba1526ef1853730d5') version('2.7.5', 'e3da7940431633fb65a01b91d3b7a27a') build_directory = 'spack-build' -- cgit v1.2.3-70-g09d2 From 71802a57cf25330e23aa2a3327a0c6df9c2f1f62 Mon Sep 17 00:00:00 2001 From: peetsv <32349688+peetsv@users.noreply.github.com> Date: Wed, 21 Mar 2018 09:08:58 -0700 Subject: VMD-python v2.0.10 - new package (#7490) * VMD-python v2.0.10 - new package * removing extraneous comments * flake8 error - trailing blank lines removed --- .../builtin/packages/py-vmd-python/package.py | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-vmd-python/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-vmd-python/package.py b/var/spack/repos/builtin/packages/py-vmd-python/package.py new file mode 100644 index 0000000000..86c33b3fdd --- /dev/null +++ b/var/spack/repos/builtin/packages/py-vmd-python/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyVmdPython(PythonPackage): + """Installable VMD as a python module""" + + homepage = "https://github.com/Eigenstate" + url = "https://github.com/Eigenstate/vmd-python/archive/v2.0.10.tar.gz" + + version('2.0.10', '8c746d961497a676053b66e3dd692794') + + depends_on('python@2.7:2.8') + depends_on('py-numpy') + depends_on('tcl') + depends_on('netcdf') + depends_on('expat') -- cgit v1.2.3-70-g09d2 From 64f15957cedf6bdc5be8cc1b8d9d4c36e100ff98 Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 21 Mar 2018 12:35:28 -0500 Subject: new package: perl-module-runtime (#7494) --- .../packages/perl-module-runtime/package.py | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-module-runtime/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-module-runtime/package.py b/var/spack/repos/builtin/packages/perl-module-runtime/package.py new file mode 100644 index 0000000000..badcc7c5ce --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-module-runtime/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlModuleRuntime(PerlPackage): + """Runtime module handling""" + + homepage = "http://search.cpan.org/~zefram/Module-Runtime/lib/Module/Runtime.pm" + url = "http://search.cpan.org/CPAN/authors/id/Z/ZE/ZEFRAM/Module-Runtime-0.016.tar.gz" + + version('0.016', 'd3d47222fa2e3dfcb4526f6cc8437b20') + + depends_on('perl-module-build', type='build') -- cgit v1.2.3-70-g09d2 From 29e429e5256e8a18f77d83e0184004c4beba79c0 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 21 Mar 2018 12:55:47 -0500 Subject: orfm: needs zlib (#7466) --- var/spack/repos/builtin/packages/orfm/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/orfm/package.py b/var/spack/repos/builtin/packages/orfm/package.py index 4b59bca7b6..e7a3e88ac2 100644 --- a/var/spack/repos/builtin/packages/orfm/package.py +++ b/var/spack/repos/builtin/packages/orfm/package.py @@ -35,3 +35,5 @@ class Orfm(AutotoolsPackage): url = "https://github.com/wwood/OrfM/releases/download/v0.7.1/orfm-0.7.1.tar.gz" version('0.7.1', 'fcf18283a028cea2af90663a76a73a2a') + + depends_on('zlib', type='link') -- cgit v1.2.3-70-g09d2 From 849078e95a167c7f3b7110157e90c5a6acafe935 Mon Sep 17 00:00:00 2001 From: scheibelp Date: Wed, 21 Mar 2018 11:20:40 -0700 Subject: remove cray-specific path modifications from pkgconfig providers (now handled in cray platform) (#7406) --- var/spack/repos/builtin/packages/pkg-config/package.py | 5 +---- var/spack/repos/builtin/packages/pkgconf/package.py | 10 +--------- 2 files changed, 2 insertions(+), 13 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pkg-config/package.py b/var/spack/repos/builtin/packages/pkg-config/package.py index 0d9fceec6e..08cbc27c56 100644 --- a/var/spack/repos/builtin/packages/pkg-config/package.py +++ b/var/spack/repos/builtin/packages/pkg-config/package.py @@ -47,10 +47,7 @@ class PkgConfig(AutotoolsPackage): parallel = False def setup_dependent_environment(self, spack_env, run_env, dependent_spec): - """spack built pkg-config on cray's requires adding /usr/local/ - and /usr/lib64/ to PKG_CONFIG_PATH in order to access cray '.pc' - files. - Adds the ACLOCAL path for autotools.""" + """Adds the ACLOCAL path for autotools.""" spack_env.append_path('ACLOCAL_PATH', join_path(self.prefix.share, 'aclocal')) diff --git a/var/spack/repos/builtin/packages/pkgconf/package.py b/var/spack/repos/builtin/packages/pkgconf/package.py index d0cf6eb899..2d264626dd 100644 --- a/var/spack/repos/builtin/packages/pkgconf/package.py +++ b/var/spack/repos/builtin/packages/pkgconf/package.py @@ -41,17 +41,9 @@ class Pkgconf(AutotoolsPackage): provides('pkgconfig') def setup_dependent_environment(self, spack_env, run_env, dependent_spec): - """spack built pkg-config on cray's requires adding /usr/local/ - and /usr/lib64/ to PKG_CONFIG_PATH in order to access cray '.pc' - files. - Adds the ACLOCAL path for autotools.""" + """Adds the ACLOCAL path for autotools.""" spack_env.append_path('ACLOCAL_PATH', join_path(self.prefix.share, 'aclocal')) - if 'platform=cray' in self.spec: - spack_env.append_path('PKG_CONFIG_PATH', - '/usr/lib64/pkgconfig') - spack_env.append_path('PKG_CONFIG_PATH', - '/usr/local/lib64/pkgconfig') @run_after('install') def link_pkg_config(self): -- cgit v1.2.3-70-g09d2 From 647c4a15077c8d78d906c66ba2dfd7c98911b029 Mon Sep 17 00:00:00 2001 From: Eric Müller Date: Wed, 21 Mar 2018 19:22:08 +0100 Subject: py-py{gobject,gtk} require pkgconfig for build (#7380) --- var/spack/repos/builtin/packages/py-pygobject/package.py | 1 + var/spack/repos/builtin/packages/py-pygtk/package.py | 2 ++ 2 files changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pygobject/package.py b/var/spack/repos/builtin/packages/py-pygobject/package.py index 6c81418fce..dc59d6749f 100644 --- a/var/spack/repos/builtin/packages/py-pygobject/package.py +++ b/var/spack/repos/builtin/packages/py-pygobject/package.py @@ -38,6 +38,7 @@ class PyPygobject(AutotoolsPackage): extends('python') + depends_on('pkgconfig', type=('build')) depends_on("libffi") depends_on('glib') depends_on('py-py2cairo', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pygtk/package.py b/var/spack/repos/builtin/packages/py-pygtk/package.py index 7edda3dec0..2227e0f77f 100644 --- a/var/spack/repos/builtin/packages/py-pygtk/package.py +++ b/var/spack/repos/builtin/packages/py-pygtk/package.py @@ -34,6 +34,8 @@ class PyPygtk(AutotoolsPackage): version('2.24.0', 'd27c7f245a9e027f6b6cd9acb7468e36') extends('python') + + depends_on('pkgconfig', type=('build')) depends_on("libffi") depends_on('cairo') depends_on('glib') -- cgit v1.2.3-70-g09d2 From 011d4071326c677736980b055bef0e9af761d4db Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Wed, 21 Mar 2018 13:53:26 -0500 Subject: Xorg-server: Add dependencies and fix installation. (#7220) * xorg-server: Add several dependencies. * libepoxy: Add dependendies mesa and meson. * mesa: Add dependencies for hwrender. * mesa: undo some changes. --- .../repos/builtin/packages/libepoxy/package.py | 7 +- var/spack/repos/builtin/packages/mesa/package.py | 2 + .../repos/builtin/packages/xorg-server/package.py | 81 ++++++++-------------- 3 files changed, 37 insertions(+), 53 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libepoxy/package.py b/var/spack/repos/builtin/packages/libepoxy/package.py index 9f29a701a0..a8d077e928 100644 --- a/var/spack/repos/builtin/packages/libepoxy/package.py +++ b/var/spack/repos/builtin/packages/libepoxy/package.py @@ -29,6 +29,11 @@ class Libepoxy(AutotoolsPackage): """Epoxy is a library for handling OpenGL function pointer management for you.""" homepage = "https://github.com/anholt/libepoxy" - url = "https://github.com/anholt/libepoxy/releases/download/v1.3.1/libepoxy-1.3.1.tar.bz2" + url = "https://github.com/anholt/libepoxy/releases/download/1.4.3/libepoxy-1.4.3.tar.xz" + list_url = "https://github.com/anholt/libepoxy/releases" + version('1.4.3', 'af4c3ce0fb1143bdc4e43f85695a9bed') version('1.3.1', '96f6620a9b005a503e7b44b0b528287d') + + depends_on('meson') + depends_on('mesa') diff --git a/var/spack/repos/builtin/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py index 2912f6c789..09ed462ab2 100644 --- a/var/spack/repos/builtin/packages/mesa/package.py +++ b/var/spack/repos/builtin/packages/mesa/package.py @@ -90,6 +90,8 @@ class Mesa(AutotoolsPackage): depends_on('llvm@:3.9.1+link_dylib', when='@13:13.99+llvm') depends_on('llvm+link_dylib', when='+llvm') depends_on('libelf', when='+llvm') + depends_on('damageproto', when='+hwrender') + depends_on('fixesproto', when='+hwrender') def url_for_version(self, version): """Handle Mesa version-based custom URLs.""" diff --git a/var/spack/repos/builtin/packages/xorg-server/package.py b/var/spack/repos/builtin/packages/xorg-server/package.py index 0b3994943d..883536a587 100644 --- a/var/spack/repos/builtin/packages/xorg-server/package.py +++ b/var/spack/repos/builtin/packages/xorg-server/package.py @@ -39,7 +39,7 @@ class XorgServer(AutotoolsPackage): depends_on('libxshmfence@1.1:') depends_on('libdrm@2.3.0:') depends_on('libx11') - # depends_on('gl@9.2.0:') + depends_on('mesa+hwrender', type='build') depends_on('dri2proto@2.8:', type='build') depends_on('dri3proto@1.0:', type='build') @@ -49,54 +49,31 @@ class XorgServer(AutotoolsPackage): depends_on('bison', type='build') depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') - - # TODO: add missing dependencies - # $LIBSELINUX $REQUIRED_MODULES $REQUIRED_LIBS - # $LIBPCIACCESS $DGAPROTO $XORG_MODULES epoxy xdmcp xau xfixes x11-xcb - # xcb-aux xcb-image xcb-ewmh xcb-icccm $WINDOWSWMPROTO windowsdriproto - # khronos-opengl-registry - # $APPLEWMPROTO $LIBAPPLEWM xfixes $LIBDMX $LIBXEXT $LIBDMX xmu $LIBXEXT - # $LIBDMX $LIBXI $LIBXEXT $LIBXTST $LIBXEXT xres $LIBXEXT $LIBXEXT - # $XEPHYR_REQUIRED_LIBS - - # VIDEOPROTO="videoproto" - # COMPOSITEPROTO="compositeproto >= 0.4" - # RECORDPROTO="recordproto >= 1.13.99.1" - # SCRNSAVERPROTO="scrnsaverproto >= 1.1" - # RESOURCEPROTO="resourceproto >= 1.2.0" - # DRIPROTO="xf86driproto >= 2.1.0" - # XINERAMAPROTO="xineramaproto" - # BIGFONTPROTO="xf86bigfontproto >= 1.2.0" - # DGAPROTO="xf86dgaproto >= 2.0.99.1" - # DMXPROTO="dmxproto >= 2.2.99.1" - # VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1" - # WINDOWSWMPROTO="windowswmproto" - # APPLEWMPROTO="applewmproto >= 1.4" - - # XPROTO="xproto >= 7.0.28" - # RANDRPROTO="randrproto >= 1.5.0" - # RENDERPROTO="renderproto >= 0.11" - # XEXTPROTO="xextproto >= 7.2.99.901" - # INPUTPROTO="inputproto >= 2.3" - # KBPROTO="kbproto >= 1.0.3" - # FONTSPROTO="fontsproto >= 2.1.3" - # FIXESPROTO="fixesproto >= 5.0" - # DAMAGEPROTO="damageproto >= 1.1" - # XCMISCPROTO="xcmiscproto >= 1.2.0" - # BIGREQSPROTO="bigreqsproto >= 1.1.0" - # XTRANS="xtrans >= 1.3.5" - # PRESENTPROTO="presentproto >= 1.0" - - # LIBAPPLEWM="applewm >= 1.4" - # LIBDMX="dmx >= 1.0.99.1" - # LIBDRI="dri >= 7.8.0" - # LIBEGL="egl" - # LIBGBM="gbm >= 10.2.0" - # LIBXEXT="xext >= 1.0.99.4" - # LIBXFONT="xfont2 >= 2.0.0" - # LIBXI="xi >= 1.2.99.1" - # LIBXTST="xtst >= 1.0.99.2" - # LIBPCIACCESS="pciaccess >= 0.12.901" - # LIBUDEV="libudev >= 143" - # LIBSELINUX="libselinux >= 2.0.86" - # LIBDBUS="dbus-1 >= 1.0" + depends_on('fixesproto@5.0:') + depends_on('damageproto@1.1:') + depends_on('xcmiscproto@1.2.0:') + depends_on('xtrans@1.3.5:') + depends_on('bigreqsproto@1.1.0:') + depends_on('xproto@7.0.28:') + depends_on('randrproto@1.5.0:') + depends_on('renderproto@0.11:') + depends_on('xextproto@7.2.99.901:') + depends_on('inputproto@2.3:') + depends_on('kbproto@1.0.3:') + depends_on('fontsproto@2.1.3:') + depends_on('pixman@0.27.2:') + depends_on('videoproto') + depends_on('compositeproto@0.4:') + depends_on('recordproto@1.13.99.1:') + depends_on('scrnsaverproto@1.1:') + depends_on('resourceproto@1.2.0:') + depends_on('xf86driproto@2.1.0:') + depends_on('glproto@1.4.17:') + depends_on('presentproto@1.0:') + depends_on('xineramaproto') + depends_on('libxkbfile') + depends_on('libxfont2') + depends_on('libxext') + depends_on('libxdamage') + depends_on('libxfixes') + depends_on('libepoxy') -- cgit v1.2.3-70-g09d2 From 3d7930a37916ec14bbf8f818d20dfd6655947fab Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Wed, 21 Mar 2018 12:59:39 -0600 Subject: Adding unzip package. (#7446) * Adding unzip package. * Removing bzip2 dependency in unzip and raising an error when on Cray. * Fixing error. * Using conflicts statement for Cray detection in unzip package. --- var/spack/repos/builtin/packages/unzip/package.py | 46 +++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 var/spack/repos/builtin/packages/unzip/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/unzip/package.py b/var/spack/repos/builtin/packages/unzip/package.py new file mode 100644 index 0000000000..de0957978b --- /dev/null +++ b/var/spack/repos/builtin/packages/unzip/package.py @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Unzip(MakefilePackage): + """Unzip is a compression and file packaging/archive utility.""" + + homepage = 'http://www.info-zip.org/Zip.html' + url = 'http://downloads.sourceforge.net/infozip/unzip60.tar.gz' + + version('6.0', '62b490407489521db863b523a7f86375') + + conflicts('platform=cray', msg='Unzip does not currently build on Cray') + + make_args = ['-f', 'unix/Makefile'] + build_targets = make_args + ['generic'] + + def url_for_version(self, version): + return 'http://downloads.sourceforge.net/infozip/unzip{0}.tar.gz'.format(version.joined) + + @property + def install_targets(self): + return self.make_args + ['prefix={0}'.format(self.prefix), 'install'] -- cgit v1.2.3-70-g09d2 From e07ed2ab977612a96b11d7eff5df040b6ea6485c Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 21 Mar 2018 14:09:55 -0500 Subject: py-backports-functools-lru-cache: add version 1.5 (#7206) * py-backports-functools-lru-cache: add version 1.5 * py-backports-functools-lru-cache: fix conflicts --- .../repos/builtin/packages/py-backports-functools-lru-cache/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py b/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py index 48e4764e5f..adb55908b0 100644 --- a/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py +++ b/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py @@ -31,6 +31,8 @@ class PyBackportsFunctoolsLruCache(PythonPackage): homepage = "https://github.com/jaraco/backports.functools_lru_cache" url = "https://pypi.io/packages/source/b/backports.functools_lru_cache/backports.functools_lru_cache-1.4.tar.gz" + version('1.5', '20f53f54cd3f04b3346ce75a54959754', + url="https://pypi.io/packages/source/b/backports.functools_lru_cache/backports.functools_lru_cache-1.5.tar.gz") version('1.4', 'b954e7d5e2ca0f0f66ad2ed12ba800e5', url="https://pypi.io/packages/source/b/backports.functools_lru_cache/backports.functools_lru_cache-1.4.tar.gz") version('1.0.1', 'c789ef439d189330b99872746a6d9e85', -- cgit v1.2.3-70-g09d2 From 935cc30c1747d77452d5fc2dcf96326c2708da94 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Wed, 21 Mar 2018 12:16:36 -0700 Subject: librom: new package (#7180) * libtool: actually do symlinking correctly on darwin Version 4 of the libtool/darwin debacle: AutotoolsPackage hardcodes libtool & libtoolize into the autoreconf stage, so the commands `libtool` and `libtoolize` MUST be present, and shimming in glibtoolize into AutotoolsPackage when sys.platfrom == 'darwin' does not work. join_path(spec['libtool'].prefix.bin, 'libtool') still shadows system BSD libtool (in apple-cctools, see PR #7177), but this shadowing could be okay, depending on the combination of dependent specs. * librom: new package --- var/spack/repos/builtin/packages/librom/package.py | 77 ++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 var/spack/repos/builtin/packages/librom/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/librom/package.py b/var/spack/repos/builtin/packages/librom/package.py new file mode 100644 index 0000000000..d36de8192b --- /dev/null +++ b/var/spack/repos/builtin/packages/librom/package.py @@ -0,0 +1,77 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import glob + + +class Librom(AutotoolsPackage): + """libROM: library for computing large-scale reduced order models""" + + homepage = "https://github.com/LLNL/libROM" + url = "https://github.com/LLNL/libROM" + + version('develop', git='https://github.com/LLNL/libROM', + branch='master') + + depends_on('lapack') + depends_on('mpi') + depends_on('zlib') + depends_on('libszip') + depends_on('hdf5') + depends_on('perl') + depends_on('graphviz') + depends_on('doxygen') + depends_on('boost') + + def configure_args(self): + spec = self.spec + args = ['--with-lapack={0}'.format(spec['lapack'].prefix), + '--with-lapack-libs={0}'.format(spec['lapack'].libs.ld_flags), + '--with-zlib={0}'.format(spec['zlib'].prefix), + '--with-szlib={0}'.format(spec['libszip'].prefix), + '--with-hdf5={0}'.format(spec['hdf5'].prefix), + '--with-MPICC={0}'.format(spec['mpi'].mpicc), + '--with-mpi-include={0}'.format(spec['mpi'].prefix.include), + '--with-mpi-libs={0}'.format(spec['mpi'].libs.ld_flags), + '--with-perl={0}'.format(spec['perl'].prefix), + '--with-doxygen={0}'.format(spec['doxygen'].prefix)] + return args + + # TODO(oxberry1@llnl.gov): Submit PR upstream that implements + # install phase in autotools + def install(self, spec, prefix): + mkdirp(self.spec.prefix.lib) + install('libROM.a', join_path(self.spec.prefix.lib, 'libROM.a')) + + mkdirp(self.spec.prefix.include) + for f in glob.glob('*.h'): + install(f, join_path(self.spec.prefix.include, f)) + + mkdirp(self.spec.prefix.share) + install('libROM_Design_and_Theory.pdf', + join_path(self.spec.prefix.share, + 'libROM_Design_and_Theory.pdf')) + + install_tree('docs', self.spec.prefix.share.docs) -- cgit v1.2.3-70-g09d2 From 9d2fce454446e76c6362eca2e5489b4af28e126a Mon Sep 17 00:00:00 2001 From: lpoirel Date: Wed, 21 Mar 2018 20:22:50 +0100 Subject: scotch%intel: remove restrict (#7148) The restrict compilation option with icc causes deadlock when multithreading is used. This issue has already been reported to the Scotch development team, but for current versions it is more reliable not to use the restrict compilation option. --- var/spack/repos/builtin/packages/scotch/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/scotch/package.py b/var/spack/repos/builtin/packages/scotch/package.py index 7cebeed49d..712cd0ca6c 100644 --- a/var/spack/repos/builtin/packages/scotch/package.py +++ b/var/spack/repos/builtin/packages/scotch/package.py @@ -159,7 +159,7 @@ class Scotch(Package): if self.compiler.name == 'gcc': cflags.append('-Drestrict=__restrict') elif self.compiler.name == 'intel': - cflags.append('-restrict') + cflags.append('-Drestrict=') mpicc_path = self.spec['mpi'].mpicc if '+mpi' in self.spec else 'mpicc' makefile_inc.append('CCS = $(CC)') -- cgit v1.2.3-70-g09d2 From 154401de769f2da7ab5ff83242a83af653c6110f Mon Sep 17 00:00:00 2001 From: "Mark W. Krentel" Date: Wed, 21 Mar 2018 14:39:06 -0500 Subject: intel-xed: new package (#7106) * intel-xed: new package The Intel X86 Encoder Decoder library for encoding and decoding x86 machine instructions. * intel-xed: style fixes for flake8. * intel-xed: better style fix * intel-xed: update to version 2018.02.14, add PYTHONPATH for building with python 3, cleanup the opt flag. --- .../repos/builtin/packages/intel-xed/package.py | 105 +++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 var/spack/repos/builtin/packages/intel-xed/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/intel-xed/package.py b/var/spack/repos/builtin/packages/intel-xed/package.py new file mode 100644 index 0000000000..0ca6a63746 --- /dev/null +++ b/var/spack/repos/builtin/packages/intel-xed/package.py @@ -0,0 +1,105 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import glob +import os + + +class IntelXed(Package): + """The Intel X86 Encoder Decoder library for encoding and decoding x86 + machine instructions (64- and 32-bit). Also includes libxed-ild, + a lightweight library for decoding the length of an instruction.""" + + homepage = "https://intelxed.github.io/" + url = "https://github.com/intelxed/xed" + + version('2018.02.14', + git='https://github.com/intelxed/xed', + commit='44d06033b69aef2c20ab01bfb518c52cd71bb537') + + resource(name='mbuild', + git='https://github.com/intelxed/mbuild', + commit='bb9123152a330c7fa1ff1a502950dc199c83e177', + destination='') + + variant('debug', default=False, description='enable debug symbols') + + depends_on('python@2.7:', type='build') + + mycflags = [] + + # Save CFLAGS for use in install. + def flag_handler(self, name, flags): + if name == 'cflags': + self.mycflags = flags + return (flags, None, None) + + def install(self, spec, prefix): + # XED needs PYTHONPATH to find the mbuild directory. + mbuild_dir = join_path(self.stage.source_path, 'mbuild') + python_path = os.getenv('PYTHONPATH', '') + os.environ['PYTHONPATH'] = mbuild_dir + ':' + python_path + + mfile = Executable('./mfile.py') + + args = ['-j', str(make_jobs), + '--cc=%s' % spack_cc, + '--no-werror'] + + if '+debug' in spec: + args.append('--debug') + + # If an optimization flag (-O...) is specified in CFLAGS, use + # that, else set default opt level. + for flag in self.mycflags: + if len(flag) >= 2 and flag[0:2] == '-O': + break + else: + args.append('--opt=2') + + # Build and install static libxed.a. + mfile('--clean') + mfile(*args) + + mkdirp(prefix.include) + mkdirp(prefix.lib) + + libs = glob.glob(join_path('obj', 'lib*.a')) + for lib in libs: + install(lib, prefix.lib) + + # Build and install shared libxed.so. + mfile('--clean') + mfile('--shared', *args) + + libs = glob.glob(join_path('obj', 'lib*.so')) + for lib in libs: + install(lib, prefix.lib) + + # Install header files. + hdrs = glob.glob(join_path('include', 'public', 'xed', '*.h')) \ + + glob.glob(join_path('obj', '*.h')) + for hdr in hdrs: + install(hdr, prefix.include) -- cgit v1.2.3-70-g09d2 From 6127b02324d0b7af4015dc0be68023a77ce852ad Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Wed, 21 Mar 2018 14:00:49 -0700 Subject: elfutils: document conflict with clang (#7096) --- var/spack/repos/builtin/packages/elfutils/package.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/elfutils/package.py b/var/spack/repos/builtin/packages/elfutils/package.py index 726c53a032..27f11c72e6 100644 --- a/var/spack/repos/builtin/packages/elfutils/package.py +++ b/var/spack/repos/builtin/packages/elfutils/package.py @@ -50,6 +50,12 @@ class Elfutils(AutotoolsPackage): provides('elf@1') + # Elfutils uses nested functions in C code, which is implemented + # in gcc, but not in clang. C code compiled with gcc is + # binary-compatible with clang, so it should be possible to build + # elfutils with gcc, and then link it to clang-built libraries. + conflicts('%clang') + def configure_args(self): # configure doesn't use LIBS correctly gettext_lib = self.spec['gettext'].prefix.lib, -- cgit v1.2.3-70-g09d2 From 55f4bbb1116cadb7ee5c05d9932d4365b8f919c4 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Wed, 21 Mar 2018 16:21:55 -0500 Subject: snphylo: new package (#7045) * pushing partially done recipe for snphylo * r-snphylo: try * phylip: added version 3.697 * snphylo: updated package.py * snphylo: flake8 error fixed --- var/spack/repos/builtin/packages/phylip/package.py | 2 +- .../repos/builtin/packages/snphylo/package.py | 57 ++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 var/spack/repos/builtin/packages/snphylo/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/phylip/package.py b/var/spack/repos/builtin/packages/phylip/package.py index d0f82242ca..a26484ce87 100644 --- a/var/spack/repos/builtin/packages/phylip/package.py +++ b/var/spack/repos/builtin/packages/phylip/package.py @@ -30,7 +30,7 @@ class Phylip(Package): inferring phylogenies (evolutionary trees).""" homepage = "http://evolution.genetics.washington.edu/phylip/" - url = "http://evolution.gs.washington.edu/phylip/download/phylip-3.696.tar.gz" + url = "http://evolution.gs.washington.edu/phylip/download/phylip-3.697.tar.gz" version('3.697', '0e83d17fb4d668213603c86bc21d9012') version('3.696', 'dbe5abc26f6089ead3dba41c2db526ee') diff --git a/var/spack/repos/builtin/packages/snphylo/package.py b/var/spack/repos/builtin/packages/snphylo/package.py new file mode 100644 index 0000000000..6634835ab1 --- /dev/null +++ b/var/spack/repos/builtin/packages/snphylo/package.py @@ -0,0 +1,57 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import distutils.dir_util + + +class Snphylo(Package): + """A pipeline to generate a phylogenetic tree from huge SNP data""" + + homepage = "http://chibba.pgml.uga.edu/snphylo/" + url = "http://chibba.pgml.uga.edu/snphylo/snphylo.tar.gz" + + version('2016-02-04', '467660814965bc9bed6c020c05c0d3a6') + + depends_on('python', type=('build', 'run')) + depends_on('r', type=('build', 'run')) + depends_on('r-phangorn', type=('build', 'run')) + depends_on('r-gdsfmt', type=('build', 'run')) + depends_on('r-snprelate', type=('build', 'run')) + depends_on('r-getopt', type=('build', 'run')) + depends_on('muscle') + depends_on('phylip') + + def install(self, spec, prefix): + install_answer = ['y', 'y', 'y', 'y'] + install_answer_input = 'spack-config.in' + with open(install_answer_input, 'w') as f: + f.writelines(install_answer) + with open(install_answer_input, 'r') as f: + bash = which('bash') + bash('./setup.sh', input=f) + distutils.dir_util.copy_tree(".", prefix) + + def setup_environment(self, spack_env, run_env): + run_env.prepend_path('PATH', self.spec.prefix) -- cgit v1.2.3-70-g09d2 From 7504e9997db3ce355ab0380f316ca7427b2a5c9a Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Wed, 21 Mar 2018 14:34:27 -0700 Subject: make py-setuptools a run-time-only dep for py-basemap and patch pytho… (#6989) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * make py-setuptools a run-time-only dep for py-basemap and patch python package to only apply setuptools flag for build deps * py-qtconsole does not require setuptools --- lib/spack/spack/build_systems/python.py | 10 ++++++++-- var/spack/repos/builtin/packages/py-basemap/package.py | 2 +- var/spack/repos/builtin/packages/py-qtconsole/package.py | 1 - 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/lib/spack/spack/build_systems/python.py b/lib/spack/spack/build_systems/python.py index fcfa68e4f4..837ebd65ae 100644 --- a/lib/spack/spack/build_systems/python.py +++ b/lib/spack/spack/build_systems/python.py @@ -237,9 +237,15 @@ class PythonPackage(PackageBase): # Spack manages the package directory on its own by symlinking # extensions into the site-packages directory, so we don't really # need the .pth files or egg directories, anyway. + # + # We need to make sure this is only for build dependencies. A package + # such as py-basemap will not build properly with this flag since + # it does not use setuptools to build and those does not recognize + # the --single-version-externally-managed flag if ('py-setuptools' == spec.name or # this is setuptools, or - 'py-setuptools' in spec._dependencies): # it's an immediate dep - args += ['--single-version-externally-managed', '--root=/'] + 'py-setuptools' in spec._dependencies and # it's an immediate dep + 'build' in spec._dependencies['py-setuptools'].deptypes): + args += ['--single-version-externally-managed', '--root=/'] return args diff --git a/var/spack/repos/builtin/packages/py-basemap/package.py b/var/spack/repos/builtin/packages/py-basemap/package.py index 4e127f9626..624ffd6c3e 100644 --- a/var/spack/repos/builtin/packages/py-basemap/package.py +++ b/var/spack/repos/builtin/packages/py-basemap/package.py @@ -37,7 +37,7 @@ class PyBasemap(PythonPackage): # Per Github issue #3813, setuptools is required at runtime in order # to make mpl_toolkits a namespace package that can span multiple # directories (i.e., matplotlib and basemap) - depends_on('py-setuptools', type=('build', 'run')) + depends_on('py-setuptools', type=('run')) depends_on('py-numpy', type=('build', 'run')) depends_on('py-matplotlib', type=('build', 'run')) depends_on('pil', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-qtconsole/package.py b/var/spack/repos/builtin/packages/py-qtconsole/package.py index 20306e07c4..2c19787cad 100644 --- a/var/spack/repos/builtin/packages/py-qtconsole/package.py +++ b/var/spack/repos/builtin/packages/py-qtconsole/package.py @@ -35,7 +35,6 @@ class PyQtconsole(PythonPackage): variant('doc', default=False, description='Build documentation') - depends_on('py-setuptools', type='build') depends_on('py-ipykernel@4.1:', type=('build', 'run')) depends_on('py-jupyter-client@4.1:', type=('build', 'run')) depends_on('py-jupyter-core', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 75c9083139f2ee2dc7317328fba59c0881bdebc5 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Wed, 21 Mar 2018 22:49:01 +0100 Subject: suite-sparse: add cmake dependency (#7538) --- var/spack/repos/builtin/packages/suite-sparse/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/suite-sparse/package.py b/var/spack/repos/builtin/packages/suite-sparse/package.py index da12a38e3e..64c42c36d0 100644 --- a/var/spack/repos/builtin/packages/suite-sparse/package.py +++ b/var/spack/repos/builtin/packages/suite-sparse/package.py @@ -46,6 +46,7 @@ class SuiteSparse(Package): depends_on('blas') depends_on('lapack') + depends_on('cmake', when='@5.2.0:', type='build') depends_on('metis@5.1.0', when='@4.5.1:') # in @4.5.1. TBB support in SPQR seems to be broken as TBB-related linkng -- cgit v1.2.3-70-g09d2 From f59a447f719ce7d81e5785187cec676f1babd50b Mon Sep 17 00:00:00 2001 From: Howard Pritchard Date: Wed, 21 Mar 2018 15:49:31 -0600 Subject: Open MPI: add 2.1.3 (#7535) note the libmpi.so itself didn't have changes, only other components of the package had updates. Signed-off-by: Howard Pritchard --- var/spack/repos/builtin/packages/openmpi/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 80657b618e..cd01121c6a 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -85,6 +85,7 @@ class Openmpi(AutotoolsPackage): version('3.0.0', '757d51719efec08f9f1a7f32d58b3305') # libmpi.so.40.00.0 # Still supported + version('2.1.3', '46079b6f898a412240a0bf523e6cd24b') # libmpi.so.20.10.2 version('2.1.2', 'ff2e55cc529802e7b0738cf87acd3ee4') # libmpi.so.20.10.2 version('2.1.1', 'ae542f5cf013943ffbbeb93df883731b') # libmpi.so.20.10.1 version('2.1.0', '4838a5973115c44e14442c01d3f21d52') # libmpi.so.20.10.0 -- cgit v1.2.3-70-g09d2 From de52c175de1cd66d75e246959e20a2b8bff1963f Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Wed, 21 Mar 2018 15:52:08 -0600 Subject: Using self.prefix in Trilinos to avoid global name prefix undefined bug (#7478) * Using self.prefix in Trilinos to avoid global name prefix undefined bug during module refreshing. * Fixing flake8 errors. --- var/spack/repos/builtin/packages/trilinos/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 65b91b2831..8defeb24a1 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -610,7 +610,8 @@ class Trilinos(CMakePackage): # use @rpath on Sierra due to limit of dynamic loader options.append('-DCMAKE_MACOSX_RPATH=ON') else: - options.append('-DCMAKE_INSTALL_NAME_DIR:PATH=%s' % prefix.lib) + options.append('-DCMAKE_INSTALL_NAME_DIR:PATH=%s' % + self.prefix.lib) if spec.satisfies('%intel') and spec.satisfies('@12.6.2'): # Panzer uses some std:chrono that is not recognized by Intel -- cgit v1.2.3-70-g09d2 From 720a4854c2a38d43ebe0efce4caf0906f760a2a0 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 21 Mar 2018 16:52:46 -0500 Subject: pandaseq: needs bzip and libtool as link (#7465) --- var/spack/repos/builtin/packages/pandaseq/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pandaseq/package.py b/var/spack/repos/builtin/packages/pandaseq/package.py index 86a0fbb0c8..09684c20c5 100644 --- a/var/spack/repos/builtin/packages/pandaseq/package.py +++ b/var/spack/repos/builtin/packages/pandaseq/package.py @@ -38,10 +38,11 @@ class Pandaseq(AutotoolsPackage): depends_on('autoconf', type='build') depends_on('automake', type='build') - depends_on('libtool', type='build') + depends_on('libtool', type=('build', 'link')) depends_on('m4', type='build') depends_on('zlib', type='build') depends_on('pkg-config', type='build') + depends_on('bzip2', type='link') def autoreconf(self, spec, prefix): bash = which('bash') -- cgit v1.2.3-70-g09d2 From 6c23b82d6b1d7cb3e225345e65d50af3527e57c7 Mon Sep 17 00:00:00 2001 From: Sinan Date: Wed, 21 Mar 2018 14:53:11 -0700 Subject: package/JAGS: new version (4.3) (#7456) * package/JAGS: new version (4.3) * fix typo fix typo --- var/spack/repos/builtin/packages/jags/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/jags/package.py b/var/spack/repos/builtin/packages/jags/package.py index 4e9d77735d..1b0af86af0 100644 --- a/var/spack/repos/builtin/packages/jags/package.py +++ b/var/spack/repos/builtin/packages/jags/package.py @@ -35,6 +35,7 @@ class Jags(AutotoolsPackage): homepage = "http://mcmc-jags.sourceforge.net/" url = "https://downloads.sourceforge.net/project/mcmc-jags/JAGS/4.x/Source/JAGS-4.2.0.tar.gz" + version('4.3.0', 'd88dff326603deee39ce7fa4234c5a43') version('4.2.0', '9e521b3cfb23d3290a8c6bc0b79bf426') depends_on('blas') -- cgit v1.2.3-70-g09d2 From 5e8370e093ed1f5453970c42d1aeda2809e7f62f Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 21 Mar 2018 16:53:55 -0500 Subject: bamutil: needs zlib (#7444) --- var/spack/repos/builtin/packages/bamutil/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bamutil/package.py b/var/spack/repos/builtin/packages/bamutil/package.py index d739fe1f84..eb9b8da878 100644 --- a/var/spack/repos/builtin/packages/bamutil/package.py +++ b/var/spack/repos/builtin/packages/bamutil/package.py @@ -36,6 +36,8 @@ class Bamutil(MakefilePackage): version('1.0.13', '08b7d0bb1d60be104a11f0e54ddf4a79') + depends_on('zlib', type=('build', 'link')) + # Looks like this will be fixed in 1.0.14. # https://github.com/statgen/libStatGen/issues/9 patch('libstatgen-issue-9.patch', when='@1.0.13:') -- cgit v1.2.3-70-g09d2 From 08f3ebf859675a622b584a86733aecc73a044d4f Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 21 Mar 2018 16:54:25 -0500 Subject: perl-cairo: Create new package (#7432) * perl-cairo: Create new package * perl-cairo: Add cairo dependency --- .../repos/builtin/packages/perl-cairo/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-cairo/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-cairo/package.py b/var/spack/repos/builtin/packages/perl-cairo/package.py new file mode 100644 index 0000000000..3fa273f1c0 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-cairo/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlCairo(PerlPackage): + """Perl interface to the cairo 2d vector graphics library""" + + homepage = "http://search.cpan.org/~xaoc/Cairo/lib/Cairo.pm" + url = "http://search.cpan.org/CPAN/authors/id/X/XA/XAOC/Cairo-1.106.tar.gz" + + version('1.106', '47ca0ae0f5b9bc4c16a27627ff48bd8b') + + depends_on('cairo') + depends_on('perl-extutils-depends') + depends_on('perl-extutils-pkgconfig') -- cgit v1.2.3-70-g09d2 From 88fb67768d618a99228b4591b3cb1a5eb8cbe9f3 Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 21 Mar 2018 16:54:51 -0500 Subject: py-python-levenshtein: Create new package (#7426) * py-python-levenshtein: Create new package * py-python-levenshtein: fix flake8 errors * py-python-levenshtein: Use pypi.io per packaging guide --- .../packages/py-python-levenshtein/package.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-python-levenshtein/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-python-levenshtein/package.py b/var/spack/repos/builtin/packages/py-python-levenshtein/package.py new file mode 100644 index 0000000000..818fa33053 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-python-levenshtein/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPythonLevenshtein(PythonPackage): + """Python extension for computing string edit distances and + similarities.""" + + homepage = "https://github.com/ztane/python-Levenshtein" + url = "https://pypi.io/packages/source/p/python-Levenshtein/python-Levenshtein-0.12.0.tar.gz" + + version('0.12.0', 'e8cde197d6d304bbdc3adae66fec99fb') + + depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From a2b885d0baecdfad914d70ec2e12def1917ccac2 Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Wed, 21 Mar 2018 16:55:35 -0500 Subject: r-dirichletmultinomial: Create new package. (#7227) * r-dirichletmultinomial: Create new package. * Change description. * Change description. --- .../packages/r-dirichletmultinomial/package.py | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-dirichletmultinomial/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-dirichletmultinomial/package.py b/var/spack/repos/builtin/packages/r-dirichletmultinomial/package.py new file mode 100644 index 0000000000..ef23ae0abd --- /dev/null +++ b/var/spack/repos/builtin/packages/r-dirichletmultinomial/package.py @@ -0,0 +1,44 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RDirichletmultinomial(RPackage): + """Dirichlet-multinomial mixture models can be used to describe + variability in microbial metagenomic data. + + This package is an interface to code originally made available by + Holmes, Harris, and Quince, 2012, PLoS ONE 7(2): 1-15, as discussed + further in the man page for this package, ?DirichletMultinomial.""" + + homepage = "https://bioconductor.org/packages/DirichletMultinomial/" + url = "https://git.bioconductor.org/packages/DirichletMultinomial" + + version('1.20.0', git='https://git.bioconductor.org/packages/DirichletMultinomial', commit='251529f301da1482551142240aeb6baf8dab2272') + + depends_on('r-s4vectors', type=('build', 'run')) + depends_on('r-iranges', type=('build', 'run')) + depends_on('gsl') + depends_on('r@3.4.0:') -- cgit v1.2.3-70-g09d2 From a81ebfc2ba000dbe7ef3654c36fb63d3ffc483e0 Mon Sep 17 00:00:00 2001 From: Julien Adam Date: Wed, 21 Mar 2018 22:56:20 +0100 Subject: New Package: jchronoss (#7207) * New Package: jchronoss * jchronoss: Fix flake8 errors * jchronoss: Fix according to recommendations * jchronoss: Remove FIXME * jchronoss: Fix another flake8 error --- .../repos/builtin/packages/jchronoss/package.py | 63 ++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 var/spack/repos/builtin/packages/jchronoss/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/jchronoss/package.py b/var/spack/repos/builtin/packages/jchronoss/package.py new file mode 100644 index 0000000000..d61d00284c --- /dev/null +++ b/var/spack/repos/builtin/packages/jchronoss/package.py @@ -0,0 +1,63 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class Jchronoss(CMakePackage): + """ JCHRONOSS aims to help HPC application testing process + to scale as much as the application does. """ + + homepage = "http://jchronoss.hpcframework.com" + url = "http://fs.paratools.com/mpc/contrib/apps/jchronoss/JCHRONOSS-1.2.tar.gz" + + version('1.2', 'f083ca453537e4f60ad17d266bbab1f1') + version('1.1.1', '2d78a0998efec20e7726af19fff76a72') + version('1.1', 'a8ba0b21b18548874b8ab2a6ca6e1081') + version('1.0', '78d81e00248e21f4adea4a1ccfd6156b') + + variant("realtime", default=False, description="Enable Real-Time support") + variant("openmp", default=False, description="Enable OpenMP constructs") + variant("ncurses", default=False, description="Enable ncurses-based tool") + variant('color', default=False, description='Enable colour-themed output') + + depends_on("libxml2") + depends_on("libwebsockets", when="+realtime") + depends_on("libev", when="+realtime") + depends_on("ncurses", when="+ncurses") + + def cmake_args(self): + args = ["-DSPACK_DRIVEN=ON"] + + if '+color' in self.spec: + args.append("-DENABLE_COLOR=yes") + if '+openmp' in self.spec: + args.append("-DENABLE_OPENMP=yes") + if '+ncurses' in self.spec: + args.append("-DENABLE_PLUGIN_NCURSES=yes") + if '+realtime' in self.spec: + args.append("-DENABLE_PLUGIN_SERVER=yes") + + return args -- cgit v1.2.3-70-g09d2 From 81dcd1b33a6b9237b303bbee4da8d526f7641bc0 Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 21 Mar 2018 17:16:24 -0500 Subject: perl-module-implementation: Create new package (#7549) --- .../packages/perl-module-implementation/package.py | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-module-implementation/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-module-implementation/package.py b/var/spack/repos/builtin/packages/perl-module-implementation/package.py new file mode 100644 index 0000000000..693ca5dd8b --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-module-implementation/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlModuleImplementation(PerlPackage): + """Loads one of several alternate underlying implementations for a + module""" + + homepage = "http://search.cpan.org/~drolsky/Module-Implementation/lib/Module/Implementation.pm" + url = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Module-Implementation-0.09.tar.gz" + + version('0.09', '52e3fe0ca6b1eff0488d59b7aacc0667') + + depends_on('perl-module-runtime', type=('build', 'run')) + depends_on('perl-test-fatal', type=('build', 'run')) + depends_on('perl-test-requires', type=('build', 'run')) + depends_on('perl-try-tiny', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 383c2aa2d65fa3757954025f3b1654d8861faecf Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 21 Mar 2018 19:50:53 -0500 Subject: Singularity: new version (#7551) * singularity: new version * singularity: hash --- var/spack/repos/builtin/packages/singularity/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/singularity/package.py b/var/spack/repos/builtin/packages/singularity/package.py index 9ab3faf7b5..99836311a6 100644 --- a/var/spack/repos/builtin/packages/singularity/package.py +++ b/var/spack/repos/builtin/packages/singularity/package.py @@ -32,6 +32,7 @@ class Singularity(AutotoolsPackage): homepage = "http://singularity.lbl.gov/" url = "https://github.com/singularityware/singularity/archive/2.4.tar.gz" + version('2.4.5', '9afa903ee019448104b4f40be77a46e7') version('2.4', 'd357ce68ef2f8149edd84155731531465dbe74148c37719f87f168fc39384377') version('2.3.1', '292ff7fe3db09c854b8accf42f763f62') version('develop', git='https://github.com/singularityware/singularity.git', branch='master') -- cgit v1.2.3-70-g09d2 From b0ecd0fd0b8d1ba0f79435989899fcfaceb6cef0 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 21 Mar 2018 19:51:34 -0500 Subject: py-pybedtools: fix hash for 0.6.9 (#7492) --- var/spack/repos/builtin/packages/py-pybedtools/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pybedtools/package.py b/var/spack/repos/builtin/packages/py-pybedtools/package.py index 2f75ddceda..841500a274 100644 --- a/var/spack/repos/builtin/packages/py-pybedtools/package.py +++ b/var/spack/repos/builtin/packages/py-pybedtools/package.py @@ -33,7 +33,7 @@ class PyPybedtools(PythonPackage): url = "https://pypi.io/packages/source/p/pybedtools/pybedtools-0.7.10.tar.gz" version('0.7.10', 'f003c67e22c48b77f070538368ece70c') - version('0.6.9', 'a24e4bcd0c89beb9535295db964f6a4a') + version('0.6.9', 'b7df049036422d8c6951412a90e83dca') depends_on('py-setuptools', type='build') depends_on('bedtools2', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From f5afc98cc201ffa3c2053d133082539a883909ca Mon Sep 17 00:00:00 2001 From: Eric Müller Date: Thu, 22 Mar 2018 01:51:58 +0100 Subject: libXi requires pkgconfig and fixesproto (#7480) --- var/spack/repos/builtin/packages/libxi/package.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libxi/package.py b/var/spack/repos/builtin/packages/libxi/package.py index a16be21fba..b3347f770c 100644 --- a/var/spack/repos/builtin/packages/libxi/package.py +++ b/var/spack/repos/builtin/packages/libxi/package.py @@ -33,10 +33,14 @@ class Libxi(AutotoolsPackage): version('1.7.6', 'f3828f9d7893068f6f6f10fe15b31afa') + depends_on('pkgconfig', type='build') depends_on('libx11@1.6:') depends_on('libxext@1.0.99.1:') depends_on('libxfixes@5:') + # transient build dependency (from libxfixes), i.e. shouldn't be needed? + depends_on('fixesproto@5.0:', type='build') + depends_on('xproto@7.0.13:', type='build') depends_on('xextproto@7.0.3:', type='build') depends_on('inputproto@2.2.99.1:', type='build') -- cgit v1.2.3-70-g09d2 From 973a131dacf996bea2b7ff31a6b473c157c27f6f Mon Sep 17 00:00:00 2001 From: Leonhard Reichenbach Date: Thu, 22 Mar 2018 01:52:28 +0100 Subject: Add latest versions of bazel (#7542) * Add latest versions of bazel * Added java as dependency to run bazel --- var/spack/repos/builtin/packages/bazel/package.py | 13 +++++++---- .../packages/bazel/unix_cc_configure-0.10.0.patch | 25 ++++++++++++++++++++++ 2 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 var/spack/repos/builtin/packages/bazel/unix_cc_configure-0.10.0.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bazel/package.py b/var/spack/repos/builtin/packages/bazel/package.py index d70680fb84..6fd4ad731c 100644 --- a/var/spack/repos/builtin/packages/bazel/package.py +++ b/var/spack/repos/builtin/packages/bazel/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. @@ -32,8 +32,12 @@ class Bazel(Package): """Bazel is Google's own build tool""" homepage = "https://www.bazel.io" - url = "https://github.com/bazelbuild/bazel/releases/download/0.5.0/bazel-0.5.0-dist.zip" + url = "https://github.com/bazelbuild/bazel/releases/download/0.11.1/bazel-0.11.1-dist.zip" + version('0.11.1', '80daac6b100b7f8e2b17d133150eba44') + version('0.11.0', 'e6caf93a805b45c33367028e575b91dd') + version('0.10.1', 'a7e5b9576993b752e31bd2d3259a14c5') + version('0.10.0', 'c2f15b34255099d25e94fce7283e5cd2') version('0.9.0', '7fda74c163108f7c180bbc513bc8123b') version('0.4.5', '2b737be42678900470ae9e48c975ac5b2296d9ae23c007bf118350dbe7c0552b') version('0.4.4', '5e7c52b89071efc41277e2f0057d258f') @@ -43,14 +47,15 @@ class Bazel(Package): version('0.2.2b', '75081804f073cbd194da1a07b16cba5f') version('0.2.2', '644bc4ea7f429d835e74f255dc1054e6') - depends_on('java@8:') + depends_on('java@8:', type=('build', 'link', 'run')) depends_on('zip') patch('fix_env_handling.patch', when='@:0.4.5') patch('fix_env_handling-0.9.0.patch', when='@0.9.0:') patch('link.patch') patch('cc_configure.patch', when='@:0.4.5') - patch('unix_cc_configure.patch', when='@0.9.0:') + patch('unix_cc_configure.patch', when='@0.9.0') + patch('unix_cc_configure-0.10.0.patch', when='@0.10.0:') def url_for_version(self, version): if version >= Version('0.4.1'): diff --git a/var/spack/repos/builtin/packages/bazel/unix_cc_configure-0.10.0.patch b/var/spack/repos/builtin/packages/bazel/unix_cc_configure-0.10.0.patch new file mode 100644 index 0000000000..e375283fed --- /dev/null +++ b/var/spack/repos/builtin/packages/bazel/unix_cc_configure-0.10.0.patch @@ -0,0 +1,25 @@ +diff --git a/tools/cpp/unix_cc_configure.bzl.orig b/tools/cpp/unix_cc_configure.bzl +index f67b9b5..cc952e0 100755 +--- a/tools/cpp/unix_cc_configure.bzl.orig ++++ b/tools/cpp/unix_cc_configure.bzl +@@ -147,9 +147,18 @@ def get_escaped_cxx_inc_directories(repository_ctx, cc, additional_flags = []): + else: + inc_dirs = result.stderr[index1 + 1:index2].strip() + +- return [_prepare_include_path(repository_ctx, _cxx_inc_convert(p)) +- for p in inc_dirs.split("\n")] ++ default_inc_directories = [ ++ _prepare_include_path(repository_ctx, _cxx_inc_convert(p)) ++ for p in inc_dirs.split("\n") ++ ] + ++ env = repository_ctx.os.environ ++ if "SPACK_DEPENDENCIES" in env: ++ for dep in env["SPACK_DEPENDENCIES"].split(":"): ++ path = dep + "/include" ++ default_inc_directories.append(path) ++ ++ return default_inc_directories + + def _is_option_supported(repository_ctx, cc, option): + """Checks that `option` is supported by the C compiler. Doesn't %-escape the option.""" -- cgit v1.2.3-70-g09d2 From 726c7e0f06b11dd3c0ce435b91569e7764f4e7f1 Mon Sep 17 00:00:00 2001 From: Michael Sternberg Date: Wed, 21 Mar 2018 19:53:19 -0500 Subject: Opt avx (#7486) * Promote to Autotools for simplicity; broaden Intel CPU opt targeting from SSE4.2 to AVX2 * make Intel CPU opt targeting same as in ../libxc * flake8 W291 * use canonical means to pass (ahem) the test phase, h/t @adamjstewart * revert f25d598 (unrelated merge) * re-merge --- var/spack/repos/builtin/packages/libint/package.py | 5 +- var/spack/repos/builtin/packages/libxc/package.py | 56 +++++++++++++--------- 2 files changed, 36 insertions(+), 25 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libint/package.py b/var/spack/repos/builtin/packages/libint/package.py index 8fa0906658..29c79ee4bd 100644 --- a/var/spack/repos/builtin/packages/libint/package.py +++ b/var/spack/repos/builtin/packages/libint/package.py @@ -64,11 +64,10 @@ class Libint(AutotoolsPackage): @property def optflags(self): flags = '-O2' - # Optimizations for the Intel compiler, suggested by CP2K + # See ../libxc/package.py for rationale and doc. if '%intel' in self.spec: - # -xSSE2 will make it usable on old architecture - flags += ' -xSSE2 -xAVX -axCORE-AVX2 -ipo' + flags += ' -xSSE4.2 -axAVX,CORE-AVX2 -ipo' return flags diff --git a/var/spack/repos/builtin/packages/libxc/package.py b/var/spack/repos/builtin/packages/libxc/package.py index 0149e42b6c..b6e61a69b2 100644 --- a/var/spack/repos/builtin/packages/libxc/package.py +++ b/var/spack/repos/builtin/packages/libxc/package.py @@ -25,7 +25,7 @@ from spack import * -class Libxc(Package): +class Libxc(AutotoolsPackage): """Libxc is a library of exchange-correlation functionals for density-functional theory.""" @@ -52,7 +52,7 @@ class Libxc(Package): # Libxc installs both shared and static libraries. # If a client ask for static explicitly then return # the static libraries - shared = False if 'static' in query_parameters else True + shared = ('static' not in query_parameters) # Libxc has a fortran90 interface: give clients the # possibility to query for it @@ -63,31 +63,43 @@ class Libxc(Package): libraries, root=self.prefix, shared=shared, recursive=True ) - def install(self, spec, prefix): - # Optimizations for the Intel compiler, suggested by CP2K + def setup_environment(self, spack_env, run_env): optflags = '-O2' if self.compiler.name == 'intel': - optflags += ' -xAVX -axCORE-AVX2 -ipo' + # Optimizations for the Intel compiler, suggested by CP2K + # + # Note that not every lowly login node has advanced CPUs: + # + # $ icc -xAVX -axCORE-AVX2 -ipo hello.c + # $ ./a.out + # Please verify that both the operating system and the \ + # processor support Intel(R) AVX instructions. + # + # NB: The same flags are applied in: + # - ../libint/package.py + # + # Related: + # - ../fftw/package.py variants: simd, fma + # - ../c-blosc/package.py variant: avx2 + # - ../r-rcppblaze/package.py AVX* in "info" but not in code? + # - ../openblas/package.py variants: cpu_target!?! + # - ../cp2k/package.py + # + # Documentation at: + # https://software.intel.com/en-us/cpp-compiler-18.0-developer-guide-and-reference-ax-qax + # + optflags += ' -xSSE4.2 -axAVX,CORE-AVX2 -ipo' if which('xiar'): - env['AR'] = 'xiar' + spack_env.set('AR', 'xiar') - if 'CFLAGS' in env and env['CFLAGS']: - env['CFLAGS'] += ' ' + optflags - else: - env['CFLAGS'] = optflags + spack_env.append_flags('CFLAGS', optflags) + spack_env.append_flags('FCFLAGS', optflags) - if 'FCFLAGS' in env and env['FCFLAGS']: - env['FCFLAGS'] += ' ' + optflags - else: - env['FCFLAGS'] = optflags - - configure('--prefix={0}'.format(prefix), - '--enable-shared') - - make() + def configure_args(self): + args = ['--enable-shared'] + return args + def check(self): # libxc provides a testsuite, but many tests fail # http://www.tddft.org/pipermail/libxc/2013-February/000032.html - # make('check') - - make('install') + pass -- cgit v1.2.3-70-g09d2 From 6f0472ea871a55cbafb3bbcbe258cf1fff605de7 Mon Sep 17 00:00:00 2001 From: Veselin Dobrev Date: Wed, 21 Mar 2018 17:55:04 -0700 Subject: [MUMPS] Remove the injection of rpath_args through the inject_libs variable. This should happen automatically through the Spack compiler wrapper. --- var/spack/repos/builtin/packages/mumps/package.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mumps/package.py b/var/spack/repos/builtin/packages/mumps/package.py index f572b4d032..85d2aab3b1 100644 --- a/var/spack/repos/builtin/packages/mumps/package.py +++ b/var/spack/repos/builtin/packages/mumps/package.py @@ -203,10 +203,7 @@ class Mumps(Package): if '+shared' in self.spec: # All Mumps libraries will be linked with 'inject_libs'. - # Usually, the rpaths will be injected by the Spack compiler - # wrapper, however some MPI wrappers may not call the Spack - # compiler wrapper. - inject_libs = [self.rpath_args] + inject_libs = [] if '+mpi' in self.spec: inject_libs += [self.spec['scalapack'].libs.ld_flags] if '+ptscotch' in self.spec or '+scotch' in self.spec: -- cgit v1.2.3-70-g09d2 From e71681458bef2c89415dbc97226d05d5e61bd86b Mon Sep 17 00:00:00 2001 From: Federico Ficarelli Date: Thu, 22 Mar 2018 06:35:37 +0100 Subject: tcl-tcllib: new package (#7481) --- .../repos/builtin/packages/tcl-tcllib/package.py | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 var/spack/repos/builtin/packages/tcl-tcllib/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/tcl-tcllib/package.py b/var/spack/repos/builtin/packages/tcl-tcllib/package.py new file mode 100644 index 0000000000..a9a7928a8a --- /dev/null +++ b/var/spack/repos/builtin/packages/tcl-tcllib/package.py @@ -0,0 +1,47 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class TclTcllib(AutotoolsPackage): + """Tcllib is a collection of utility modules for Tcl. These modules provide + a wide variety of functionality, from implementations of standard data + structures to implementations of common networking protocols. The intent is + to collect commonly used function into a single library, which users can + rely on to be available and stable.""" + + homepage = "http://www.tcl.tk/software/tcllib" + url = "https://sourceforge.net/projects/tcllib/files/tcllib/1.19/tcllib-1.19.tar.gz" + list_url = "https://sourceforge.net/projects/tcllib/files/tcllib/" + list_depth = 1 + + version('1.19', '8d3990d01e3fb66480d441d18a7a7d0d') + version('1.18', '219361e6bdf9d9c0d79edbd1ab3e8080') + version('1.17', '4c75fbfbb518f8990fcd4686b976bd70') + version('1.16', 'e65e91f5ca188648019fdbe15fbfb9bf') + version('1.15', '7a0525912e8863f8d4360ab10e5450f8') + version('1.14', '55bac9afce54c3328f368918cc2d7a4b') + + extends('tcl') -- cgit v1.2.3-70-g09d2 From aa84ddffed1fe421a26c4169ae94540beae8def1 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 22 Mar 2018 07:25:26 -0500 Subject: Add latest version of eigen (#7530) * Add latest version of eigen * Fix bug in ptscotch detection --- .../builtin/packages/eigen/find-ptscotch.patch | 27 ++++++++++++++++++++++ var/spack/repos/builtin/packages/eigen/package.py | 5 +++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 var/spack/repos/builtin/packages/eigen/find-ptscotch.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/eigen/find-ptscotch.patch b/var/spack/repos/builtin/packages/eigen/find-ptscotch.patch new file mode 100644 index 0000000000..4f6e286b72 --- /dev/null +++ b/var/spack/repos/builtin/packages/eigen/find-ptscotch.patch @@ -0,0 +1,27 @@ +Version 3.3.4 contained a bug that prevented it from finding scotch~mpi. + +diff --git a/tmp/FindPTSCOTCH.cmake b/cmake/FindPTSCOTCH.cmake +index 1396d05..23451b1 100644 +--- a/tmp/FindPTSCOTCH.cmake ++++ b/cmake/FindPTSCOTCH.cmake +@@ -167,11 +167,11 @@ endif() + + # If found, add path to cmake variable + # ------------------------------------ ++unset(PTSCOTCH_INCLUDE_DIRS) + foreach(ptscotch_hdr ${PTSCOTCH_hdrs_to_find}) + if (PTSCOTCH_${ptscotch_hdr}_DIRS) + list(APPEND PTSCOTCH_INCLUDE_DIRS "${PTSCOTCH_${ptscotch_hdr}_DIRS}") + else () +- set(PTSCOTCH_INCLUDE_DIRS "PTSCOTCH_INCLUDE_DIRS-NOTFOUND") + if (NOT PTSCOTCH_FIND_QUIETLY) + message(STATUS "Looking for ptscotch -- ${ptscotch_hdr} not found") + endif() +@@ -255,7 +255,6 @@ foreach(ptscotch_lib ${PTSCOTCH_libs_to_find}) + list(APPEND PTSCOTCH_LIBRARIES "${PTSCOTCH_${ptscotch_lib}_LIBRARY}") + list(APPEND PTSCOTCH_LIBRARY_DIRS "${${ptscotch_lib}_lib_path}") + else () +- list(APPEND PTSCOTCH_LIBRARIES "${PTSCOTCH_${ptscotch_lib}_LIBRARY}") + if (NOT PTSCOTCH_FIND_QUIETLY) + message(STATUS "Looking for ptscotch -- lib ${ptscotch_lib} not found") + endif() diff --git a/var/spack/repos/builtin/packages/eigen/package.py b/var/spack/repos/builtin/packages/eigen/package.py index 9e7d8c392e..0c820ec671 100644 --- a/var/spack/repos/builtin/packages/eigen/package.py +++ b/var/spack/repos/builtin/packages/eigen/package.py @@ -31,8 +31,9 @@ class Eigen(CMakePackage): """ homepage = 'http://eigen.tuxfamily.org/' - url = 'https://bitbucket.org/eigen/eigen/get/3.3.3.tar.bz2' + url = 'https://bitbucket.org/eigen/eigen/get/3.3.4.tar.bz2' + version('3.3.4', 'a7aab9f758249b86c93221ad417fbe18') version('3.3.3', 'b2ddade41040d9cf73b39b4b51e8775b') version('3.3.1', 'edb6799ef413b0868aace20d2403864c') version('3.2.10', 'a85bb68c82988648c3d53ba9768d7dcbcfe105f8') @@ -58,3 +59,5 @@ class Eigen(CMakePackage): depends_on('suite-sparse', when='+suitesparse') depends_on('mpfr@2.3.0:', when='+mpfr') depends_on('gmp', when='+mpfr') + + patch('find-ptscotch.patch', when='@3.3.4') -- cgit v1.2.3-70-g09d2 From 9280eba2146e630a83de766af715eae291b08e04 Mon Sep 17 00:00:00 2001 From: Federico Ficarelli Date: Thu, 22 Mar 2018 13:36:59 +0100 Subject: tcl-tclxml: new package (#7557) --- .../repos/builtin/packages/tcl-tclxml/package.py | 58 ++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 var/spack/repos/builtin/packages/tcl-tclxml/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/tcl-tclxml/package.py b/var/spack/repos/builtin/packages/tcl-tclxml/package.py new file mode 100644 index 0000000000..8012d67a2e --- /dev/null +++ b/var/spack/repos/builtin/packages/tcl-tclxml/package.py @@ -0,0 +1,58 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class TclTclxml(AutotoolsPackage): + """TclXML is an API for parsing XML documents using the Tcl scripting + language. It is also a package including a DOM implementation (TclDOM) and + XSL Transformations (TclXSLT). These allow Tcl scripts to read, manipulate + and write XML documents.""" + + homepage = "http://tclxml.sourceforge.net/tclxml.html" + url = "https://sourceforge.net/projects/tclxml/files/TclXML/3.2/tclxml-3.2.tar.gz" + list_url = "https://sourceforge.net/projects/tclxml/files/TclXML/" + list_depth = 1 + + version('3.2', '9d1605246c899eff7db591bca3c23200') + version('3.1', '35de63a4ceba7a6fdb85dd1a62f2e881') + + extends('tcl') + + depends_on('tcl-tcllib') + depends_on('libxml2') + depends_on('libxslt') + + def configure_args(self): + return [ + '--exec-prefix={0}'.format( + self.prefix), + '--with-tcl={0}/lib'.format( + self.spec['tcl'].prefix), + '--with-xml2-config={0}/bin/xml2-config'.format( + self.spec['libxml2'].prefix), + '--with-xslt-config={0}/bin/xslt-config'.format( + self.spec['libxslt'].prefix), + ] -- cgit v1.2.3-70-g09d2 From c8a8079c341b7122ac24445c4486ea5bfc6377f0 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Thu, 22 Mar 2018 12:06:24 -0500 Subject: meme: fix errors (#6736) * meme: added perl-xml-parser dependency, resolved issue. still need to fix ghostscript or image-magick, conversion not working. * meme: fixed issue with libxslt/libxml2 conflict, and added imagemagick support * meme: removing libxslt/libxml2 dependency lines * meme: configure args * meme: separating configure args * meme: removing a comment, and hoping for travis to rebuild. site seems back up. * meme: make image-magick optional * meme: add comment referencing PR * meme: bah flake8 --- var/spack/repos/builtin/packages/meme/package.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/meme/package.py b/var/spack/repos/builtin/packages/meme/package.py index 0ed2d3edd0..dfeed3ae1b 100644 --- a/var/spack/repos/builtin/packages/meme/package.py +++ b/var/spack/repos/builtin/packages/meme/package.py @@ -37,19 +37,20 @@ class Meme(AutotoolsPackage): version('4.11.4', '371f513f82fa0888205748e333003897') variant('mpi', default=True, description='Enable MPI support') + variant('image-magick', default=False, description='Enable image-magick for png output') depends_on('zlib', type=('link')) - depends_on('libxml2', type=('link')) - depends_on('libxslt', type=('link')) depends_on('libgcrypt', type=('link')) depends_on('perl', type=('build', 'run')) depends_on('python@2.7:', type=('build', 'run')) depends_on('mpi', when='+mpi') + depends_on('image-magick', type=('build', 'run'), when='+image-magick') + depends_on('perl-xml-parser', type=('build', 'run')) - # disable mpi support def configure_args(self): spec = self.spec - args = [] + # have meme build its own versions of libxml2/libxslt, see #6736 + args = ['--enable-build-libxml2', '--enable-build-libxslt'] if '~mpi' in spec: args += ['--enable-serial'] return args -- cgit v1.2.3-70-g09d2 From 5e7fc91d8a3ed2ea28dc76e98b6917c0e8d24df8 Mon Sep 17 00:00:00 2001 From: Sinan Date: Thu, 22 Mar 2018 13:07:34 -0700 Subject: add versions 1.9.6 1.9.7 (#7562) --- var/spack/repos/builtin/packages/subversion/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/subversion/package.py b/var/spack/repos/builtin/packages/subversion/package.py index 5d4b998b32..d21b56e250 100644 --- a/var/spack/repos/builtin/packages/subversion/package.py +++ b/var/spack/repos/builtin/packages/subversion/package.py @@ -30,6 +30,8 @@ class Subversion(Package): homepage = 'https://subversion.apache.org/' url = 'http://archive.apache.org/dist/subversion/subversion-1.8.13.tar.gz' + version('1.9.7', '1a5f48acf9d0faa60e8c7aea96a9b29ab1d4dcac') + version('1.9.6', '89e1b3f9d79422c094ccb95769360d5fe7df2bb1') version('1.9.5', 'ac9f8ee235f1b667dd6506864af8035aaedfc2d9') version('1.9.3', 'a92bcfaec4e5038f82c74a7b5bbd2f46') version('1.8.17', 'd1f8d45f97168d6271c58c5b25421cc32954c81b') -- cgit v1.2.3-70-g09d2 From 9c0fb6cceebfcff4eaf16273016ce53901a8cb85 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 22 Mar 2018 15:09:43 -0500 Subject: Add latest version of ISL (#7547) --- var/spack/repos/builtin/packages/isl/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/isl/package.py b/var/spack/repos/builtin/packages/isl/package.py index 4c25f3ec97..f9e9149414 100644 --- a/var/spack/repos/builtin/packages/isl/package.py +++ b/var/spack/repos/builtin/packages/isl/package.py @@ -30,8 +30,9 @@ class Isl(AutotoolsPackage): sets and relations of integer points bounded by affine constraints.""" homepage = "http://isl.gforge.inria.fr" - url = "http://isl.gforge.inria.fr/isl-0.18.tar.bz2" + url = "http://isl.gforge.inria.fr/isl-0.19.tar.bz2" + version('0.19', '7850d46a96e5ea31e34913190895e154') version('0.18', '11436d6b205e516635b666090b94ab32') version('0.14', 'acd347243fca5609e3df37dba47fd0bb') -- cgit v1.2.3-70-g09d2 From 06e1fdb237a5843f200aba88476ff9b74d782145 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 22 Mar 2018 15:10:58 -0500 Subject: Add latest version of MPC (#7546) --- var/spack/repos/builtin/packages/mpc/package.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mpc/package.py b/var/spack/repos/builtin/packages/mpc/package.py index 749794015a..d5193532f6 100644 --- a/var/spack/repos/builtin/packages/mpc/package.py +++ b/var/spack/repos/builtin/packages/mpc/package.py @@ -29,20 +29,28 @@ class Mpc(AutotoolsPackage): """Gnu Mpc is a C library for the arithmetic of complex numbers with arbitrarily high precision and correct rounding of the result.""" + homepage = "http://www.multiprecision.org" - url = "https://ftp.gnu.org/gnu/mpc/mpc-1.0.2.tar.gz" + url = "https://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz" + list_url = "http://www.multiprecision.org/mpc/download.html" + version('1.1.0', '4125404e41e482ec68282a2e687f6c73') version('1.0.3', 'd6a1d5f8ddea3abd2cc3e98f58352d26') version('1.0.2', '68fadff3358fb3e7976c7a398a0af4c3') - depends_on('gmp@4.3.2:') # mpir is a drop-in replacement for this - depends_on('mpfr@2.4.2:') # Could also be built against mpir + # Could also be built against mpir instead + depends_on('gmp@4.3.2:') + depends_on('gmp@5.0.0:', when='@1.1.0:') + depends_on('mpfr@2.4.2:') + depends_on('mpfr@3.0.0:', when='@1.1.0:') def url_for_version(self, version): if version < Version("1.0.1"): - return "http://www.multiprecision.org/mpc/download/mpc-%s.tar.gz" % version + url = "http://www.multiprecision.org/mpc/download/mpc-{0}.tar.gz" else: - return "https://ftp.gnu.org/gnu/mpc/mpc-%s.tar.gz" % version + url = "https://ftp.gnu.org/gnu/mpc/mpc-{0}.tar.gz" + + return url.format(version) def configure_args(self): spec = self.spec -- cgit v1.2.3-70-g09d2 From 0d7652c50856296d1e1081098e848d06092854e3 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Thu, 22 Mar 2018 21:41:55 +0100 Subject: Used names with __ in class level constructs to avoid rebinding (#7563) fixes #3129 --- var/spack/repos/builtin/packages/nwchem/package.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nwchem/package.py b/var/spack/repos/builtin/packages/nwchem/package.py index 10262be6a8..19fc338ef6 100644 --- a/var/spack/repos/builtin/packages/nwchem/package.py +++ b/var/spack/repos/builtin/packages/nwchem/package.py @@ -70,9 +70,9 @@ class Nwchem(Package): ] } # Iterate over patches - for condition, urls in urls_for_patches.items(): - for url, sha256, archive_sha256 in urls: - patch(url, when=condition, level=0, sha256=sha256, archive_sha256=archive_sha256) + for __condition, __urls in urls_for_patches.items(): + for __url, __sha256, __archive_sha256 in __urls: + patch(__url, when=__condition, level=0, sha256=__sha256, archive_sha256=__archive_sha256) def install(self, spec, prefix): scalapack = spec['scalapack'].libs -- cgit v1.2.3-70-g09d2 From be3f08d0dee19e41f595b7145b9021700d3f9972 Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Thu, 22 Mar 2018 13:42:41 -0700 Subject: llvm+python+lldb depends on py-six for versions 5 and up (#7056) --- var/spack/repos/builtin/packages/llvm/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index 850554c406..26cdb088ed 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -89,6 +89,7 @@ class Llvm(CMakePackage): depends_on('ncurses', when='+lldb') depends_on('swig', when='+lldb') depends_on('libedit', when='+lldb') + depends_on('py-six', when='@5.0.0: +lldb +python') # gold support depends_on('binutils+gold', when='+gold') @@ -441,6 +442,8 @@ class Llvm(CMakePackage): '-DLLVM_POLLY_BUILD:Bool=OFF', '-DLLVM_POLLY_LINK_INTO_TOOLS:Bool=OFF']) + if '+python' in spec and '+lldb' in spec and spec.satisfies('@5.0.0:'): + cmake_args.append('-DLLDB_USE_SYSTEM_SIX:Bool=TRUE') if '+clang' not in spec: cmake_args.append('-DLLVM_EXTERNAL_CLANG_BUILD:Bool=OFF') if '+lldb' not in spec: -- cgit v1.2.3-70-g09d2 From 8d4ef999d7e303df58ddc201b3d9328ac9d668cc Mon Sep 17 00:00:00 2001 From: Sinan Date: Thu, 22 Mar 2018 13:49:07 -0700 Subject: package/py-pyutilib: create new package (#7555) --- .../repos/builtin/packages/py-pyutilib/package.py | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-pyutilib/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pyutilib/package.py b/var/spack/repos/builtin/packages/py-pyutilib/package.py new file mode 100644 index 0000000000..14e797151a --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pyutilib/package.py @@ -0,0 +1,51 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class PyPyutilib(PythonPackage): + """The PyUtilib project supports a collection of Python utilities, + including a well-developed component architecture and extensions to the + PyUnit testing framework. PyUtilib has been developed to support several + Python-centric projects, especially Pyomo. PyUtilib is available under the + BSD License.""" + + homepage = "https://github.com/PyUtilib/pyutilib" + url = "https://github.com/PyUtilib/pyutilib/archive/5.5.1.tar.gz" + + version('5.6.2', '60c6ea5083e512211984347ffeca19d2') + version('5.6.1', 'ddc7e896304b6fabe4d21eb5fdec386e') + version('5.6', '5bfcdbf118264f1a1b8c6cac9dea8bca') + version('5.5.1', 'c4990cbced152d879812d109aaa857ff') + version('5.5', '7940563bf951332cf836f418d67b2134') + version('5.4.1', 'b34b5798757e4ab73868b7655c5c8f8a') + version('5.4', '9410e5a76885412310b03074d2f97e55') + version('5.3.5', '85e41e65f24f6711261229bcde6eb825') + version('5.3.4', '4fe1a8387c027f64b62ca99424275368') + version('5.3.3', '27a713ca8d49714244646e1ce38778b9') + + depends_on('py-nose', type=('build', 'run')) + depends_on('py-six', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 32a78eae73f6aa676318dc98e516b52c1fcbe231 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 22 Mar 2018 19:37:01 -0500 Subject: Add latest version of MPFR and patches for older versions (#7545) * Add latest version of MPFR and patches for older versions * Fetch and checksum patches instead of storing them * Fix bug, version attribute was being overridden --- var/spack/repos/builtin/packages/mpfr/package.py | 23 +++++- .../repos/builtin/packages/mpfr/strtofr.patch | 92 ---------------------- .../repos/builtin/packages/mpfr/vasprintf.patch | 82 ------------------- 3 files changed, 19 insertions(+), 178 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/mpfr/strtofr.patch delete mode 100644 var/spack/repos/builtin/packages/mpfr/vasprintf.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mpfr/package.py b/var/spack/repos/builtin/packages/mpfr/package.py index 01006dd72a..4e69fa1f14 100644 --- a/var/spack/repos/builtin/packages/mpfr/package.py +++ b/var/spack/repos/builtin/packages/mpfr/package.py @@ -30,18 +30,33 @@ class Mpfr(AutotoolsPackage): floating-point computations with correct rounding.""" homepage = "http://www.mpfr.org" - url = "https://ftp.gnu.org/gnu/mpfr/mpfr-3.1.5.tar.bz2" + url = "https://ftp.gnu.org/gnu/mpfr/mpfr-4.0.1.tar.bz2" + version('4.0.1', '8c21d8ac7460493b2b9f3ef3cc610454') + version('4.0.0', 'ef619f3bb68039e35c4a219e06be72d0') + version('3.1.6', '320c28198def956aeacdb240b46b8969') version('3.1.5', 'b1d23a55588e3b2a13e3be66bc69fd8d') version('3.1.4', 'b8a2f6b0e68bef46e53da2ac439e1cf4') version('3.1.3', '5fdfa3cfa5c86514ee4a241a1affa138') version('3.1.2', 'ee2c3ac63bf0c2359bf08fc3ee094c19') # mpir is a drop-in replacement for gmp - depends_on('gmp@4.1.0:') # 4.2.3 or higher is recommended + depends_on('gmp@4.1:') # 4.2.3 or higher is recommended + depends_on('gmp@5.0:', when='@4.0.0:') # http://www.mpfr.org/mpfr-4.0.0/ - patch('vasprintf.patch', when='@3.1.5') - patch('strtofr.patch', when='@3.1.5') + # Check the Bugs section of old release pages for patches. + # http://www.mpfr.org/mpfr-X.Y.Z/#bugs + patches = { + '3.1.6': '66a5d58364113a21405fc53f4a48f4e8', + '3.1.5': '1dc5fe65feb5607b89fe0f410d53b627', + '3.1.4': 'd124381573404fe83654c7d5a79aeabf', + '3.1.3': 'ebd1d835e0ae2fd8a9339210ccd1d0a8', + '3.1.2': '9f96a5c7cac1d6cd983ed9cf7d997074', + } + + for ver, checksum in patches.items(): + patch('http://www.mpfr.org/mpfr-{0}/allpatches'.format(ver), + when='@' + ver, sha256=checksum) def configure_args(self): args = [ diff --git a/var/spack/repos/builtin/packages/mpfr/strtofr.patch b/var/spack/repos/builtin/packages/mpfr/strtofr.patch deleted file mode 100644 index 01878bf1b0..0000000000 --- a/var/spack/repos/builtin/packages/mpfr/strtofr.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff -Naurd mpfr-3.1.5-a/PATCHES mpfr-3.1.5-b/PATCHES ---- mpfr-3.1.5-a/PATCHES 2016-12-19 22:11:17.022676737 +0000 -+++ mpfr-3.1.5-b/PATCHES 2016-12-19 22:11:17.094676820 +0000 -@@ -0,0 +1 @@ -+strtofr -diff -Naurd mpfr-3.1.5-a/VERSION mpfr-3.1.5-b/VERSION ---- mpfr-3.1.5-a/VERSION 2016-12-15 08:35:46.544430346 +0000 -+++ mpfr-3.1.5-b/VERSION 2016-12-19 22:11:17.094676820 +0000 -@@ -1 +1 @@ --3.1.5-p1 -+3.1.5-p2 -diff -Naurd mpfr-3.1.5-a/src/mpfr.h mpfr-3.1.5-b/src/mpfr.h ---- mpfr-3.1.5-a/src/mpfr.h 2016-12-15 08:35:46.540430340 +0000 -+++ mpfr-3.1.5-b/src/mpfr.h 2016-12-19 22:11:17.090676815 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 5 --#define MPFR_VERSION_STRING "3.1.5-p1" -+#define MPFR_VERSION_STRING "3.1.5-p2" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.5-a/src/strtofr.c mpfr-3.1.5-b/src/strtofr.c ---- mpfr-3.1.5-a/src/strtofr.c 2016-09-27 07:58:15.000000000 +0000 -+++ mpfr-3.1.5-b/src/strtofr.c 2016-12-19 22:11:17.066676788 +0000 -@@ -743,11 +743,14 @@ - of the pstr_size most significant digits of pstr->mant, with - equality in case exact is non-zero. */ - -- /* test if rounding is possible, and if so exit the loop */ -- if (exact || mpfr_can_round_raw (result, ysize, -- (pstr->negative) ? -1 : 1, -- ysize_bits - err - 1, -- MPFR_RNDN, rnd, MPFR_PREC(x))) -+ /* test if rounding is possible, and if so exit the loop. -+ Note: we also need to be able to determine the correct ternary value, -+ thus we use the MPFR_PREC(x) + (rnd == MPFR_RNDN) trick. -+ For example if result = xxx...xxx111...111 and rnd = RNDN, -+ then we know the correct rounding is xxx...xx(x+1), but we cannot know -+ the correct ternary value. */ -+ if (exact || mpfr_round_p (result, ysize, ysize_bits - err - 1, -+ MPFR_PREC(x) + (rnd == MPFR_RNDN))) - break; - - next_loop: -diff -Naurd mpfr-3.1.5-a/src/version.c mpfr-3.1.5-b/src/version.c ---- mpfr-3.1.5-a/src/version.c 2016-12-15 08:35:46.544430346 +0000 -+++ mpfr-3.1.5-b/src/version.c 2016-12-19 22:11:17.094676820 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.5-p1"; -+ return "3.1.5-p2"; - } -diff -Naurd mpfr-3.1.5-a/tests/tstrtofr.c mpfr-3.1.5-b/tests/tstrtofr.c ---- mpfr-3.1.5-a/tests/tstrtofr.c 2016-09-27 07:58:14.000000000 +0000 -+++ mpfr-3.1.5-b/tests/tstrtofr.c 2016-12-19 22:11:17.066676788 +0000 -@@ -1191,6 +1191,24 @@ - mpfr_clears (e, x1, x2, (mpfr_ptr) 0); - } - -+/* Note: the number is 5^47/2^9. */ -+static void -+bug20161217 (void) -+{ -+ mpfr_t fp, z; -+ static const char * num = "0.1387778780781445675529539585113525390625e31"; -+ int inex; -+ -+ mpfr_init2 (fp, 110); -+ mpfr_init2 (z, 110); -+ inex = mpfr_strtofr (fp, num, NULL, 10, MPFR_RNDN); -+ MPFR_ASSERTN(inex == 0); -+ mpfr_set_str_binary (z, "10001100001000010011110110011101101001010000001011011110010001010100010100100110111101000010001011001100001101E-9"); -+ MPFR_ASSERTN(mpfr_equal_p (fp, z)); -+ mpfr_clear (fp); -+ mpfr_clear (z); -+} -+ - int - main (int argc, char *argv[]) - { -@@ -1205,6 +1223,7 @@ - test20100310 (); - bug20120814 (); - bug20120829 (); -+ bug20161217 (); - - tests_end_mpfr (); - return 0; diff --git a/var/spack/repos/builtin/packages/mpfr/vasprintf.patch b/var/spack/repos/builtin/packages/mpfr/vasprintf.patch deleted file mode 100644 index e1576d5976..0000000000 --- a/var/spack/repos/builtin/packages/mpfr/vasprintf.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff -Naurd mpfr-3.1.5-a/PATCHES mpfr-3.1.5-b/PATCHES ---- mpfr-3.1.5-a/PATCHES 2016-12-15 08:35:46.476430238 +0000 -+++ mpfr-3.1.5-b/PATCHES 2016-12-15 08:35:46.544430346 +0000 -@@ -0,0 +1 @@ -+vasprintf -diff -Naurd mpfr-3.1.5-a/VERSION mpfr-3.1.5-b/VERSION ---- mpfr-3.1.5-a/VERSION 2016-09-27 07:58:14.000000000 +0000 -+++ mpfr-3.1.5-b/VERSION 2016-12-15 08:35:46.544430346 +0000 -@@ -1 +1 @@ --3.1.5 -+3.1.5-p1 -diff -Naurd mpfr-3.1.5-a/src/mpfr.h mpfr-3.1.5-b/src/mpfr.h ---- mpfr-3.1.5-a/src/mpfr.h 2016-09-27 07:58:15.000000000 +0000 -+++ mpfr-3.1.5-b/src/mpfr.h 2016-12-15 08:35:46.540430340 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 5 --#define MPFR_VERSION_STRING "3.1.5" -+#define MPFR_VERSION_STRING "3.1.5-p1" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.5-a/src/vasprintf.c mpfr-3.1.5-b/src/vasprintf.c ---- mpfr-3.1.5-a/src/vasprintf.c 2016-09-27 07:58:15.000000000 +0000 -+++ mpfr-3.1.5-b/src/vasprintf.c 2016-12-15 08:35:46.520430308 +0000 -@@ -1593,7 +1593,7 @@ - } - else if (spec.spec == 'f' || spec.spec == 'F') - { -- if (spec.prec == -1) -+ if (spec.prec < 0) - spec.prec = 6; - if (regular_fg (np, p, spec, NULL) == -1) - goto error; -diff -Naurd mpfr-3.1.5-a/src/version.c mpfr-3.1.5-b/src/version.c ---- mpfr-3.1.5-a/src/version.c 2016-09-27 07:58:15.000000000 +0000 -+++ mpfr-3.1.5-b/src/version.c 2016-12-15 08:35:46.544430346 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.5"; -+ return "3.1.5-p1"; - } -diff -Naurd mpfr-3.1.5-a/tests/tsprintf.c mpfr-3.1.5-b/tests/tsprintf.c ---- mpfr-3.1.5-a/tests/tsprintf.c 2016-09-27 07:58:14.000000000 +0000 -+++ mpfr-3.1.5-b/tests/tsprintf.c 2016-12-15 08:35:46.520430308 +0000 -@@ -1251,6 +1251,25 @@ - check_emin_aux (MPFR_EMIN_MIN); - } - -+static void -+test20161214 (void) -+{ -+ mpfr_t x; -+ char buf[32]; -+ const char s[] = "0x0.fffffffffffff8p+1024"; -+ int r; -+ -+ mpfr_init2 (x, 64); -+ mpfr_set_str (x, s, 16, MPFR_RNDN); -+ r = mpfr_snprintf (buf, 32, "%.*RDf", -2, x); -+ MPFR_ASSERTN(r == 316); -+ r = mpfr_snprintf (buf, 32, "%.*RDf", INT_MIN + 1, x); -+ MPFR_ASSERTN(r == 316); -+ r = mpfr_snprintf (buf, 32, "%.*RDf", INT_MIN, x); -+ MPFR_ASSERTN(r == 316); -+ mpfr_clear (x); -+} -+ - int - main (int argc, char **argv) - { -@@ -1271,6 +1290,7 @@ - mixed (); - check_emax (); - check_emin (); -+ test20161214 (); - - #if defined(HAVE_LOCALE_H) && defined(HAVE_SETLOCALE) - #if MPFR_LCONV_DPTS -- cgit v1.2.3-70-g09d2 From 1f2369387734044889fc51e6e12327ed3d461ca9 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 22 Mar 2018 19:38:17 -0500 Subject: Fix giflib unit tests on macOS/BSD (#7519) * Fix giflib unit tests on macOS/BSD * Unit tests occasionally fail when run in parallel --- .../repos/builtin/packages/giflib/bsd-head.patch | 19 +++++++++++++++++++ var/spack/repos/builtin/packages/giflib/package.py | 5 +++++ 2 files changed, 24 insertions(+) create mode 100644 var/spack/repos/builtin/packages/giflib/bsd-head.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/giflib/bsd-head.patch b/var/spack/repos/builtin/packages/giflib/bsd-head.patch new file mode 100644 index 0000000000..3831f2ca57 --- /dev/null +++ b/var/spack/repos/builtin/packages/giflib/bsd-head.patch @@ -0,0 +1,19 @@ +The BSD version of head does not accept the --bytes option, +nor does it accept negative integers. Use dd instead for +BSD support. + +--- a/tests/makefile 2014-05-16 05:46:53.000000000 -0500 ++++ b/tests/makefile 2018-03-18 18:29:47.000000000 -0500 +@@ -103,10 +103,10 @@ + + giffix-rebuild: + @echo "Rebuilding giffix test." +- @head --bytes=-20 <$(PICS)/treescap.gif | $(UTILS)/giffix 2>/dev/null | $(UTILS)/gifbuild -d >giffixed.ico ++ @dd if=$(PICS)/treescap.gif bs=1 count=387 | $(UTILS)/giffix 2>/dev/null | $(UTILS)/gifbuild -d >giffixed.ico + giffix-regress: + @echo "giffix: Testing giffix behavior" +- @head --bytes=-20 <$(PICS)/treescap.gif | $(UTILS)/giffix 2>/dev/null | $(UTILS)/gifbuild -d | diff -u giffixed.ico - ++ @dd if=$(PICS)/treescap.gif bs=1 count=387 | $(UTILS)/giffix 2>/dev/null | $(UTILS)/gifbuild -d | diff -u giffixed.ico - + + gifinto-regress: + @echo "gifinto: Checking behavior on short files." diff --git a/var/spack/repos/builtin/packages/giflib/package.py b/var/spack/repos/builtin/packages/giflib/package.py index 3ab0d8453f..a320b3ceb5 100644 --- a/var/spack/repos/builtin/packages/giflib/package.py +++ b/var/spack/repos/builtin/packages/giflib/package.py @@ -33,3 +33,8 @@ class Giflib(AutotoolsPackage): url = "https://downloads.sourceforge.net/project/giflib/giflib-5.1.4.tar.bz2" version('5.1.4', '2c171ced93c0e83bb09e6ccad8e3ba2b') + + patch('bsd-head.patch') + + def check(self): + make('check', parallel=False) -- cgit v1.2.3-70-g09d2 From 666341599ccd43e65dfaaf7c5b4eb2fc2389755b Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 22 Mar 2018 19:38:46 -0500 Subject: Add py-cvxopt package (#7527) * Add py-cvxopt package * Flake8 fixes --- .../repos/builtin/packages/py-cvxopt/package.py | 143 +++++++++++++++++++++ 1 file changed, 143 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-cvxopt/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-cvxopt/package.py b/var/spack/repos/builtin/packages/py-cvxopt/package.py new file mode 100644 index 0000000000..9a2ba5814d --- /dev/null +++ b/var/spack/repos/builtin/packages/py-cvxopt/package.py @@ -0,0 +1,143 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyCvxopt(PythonPackage): + """CVXOPT is a free software package for convex optimization based on the + Python programming language.""" + + homepage = "http://cvxopt.org/" + url = "https://pypi.io/packages/source/c/cvxopt/cvxopt-1.1.9.tar.gz" + + import_modules = ['cvxopt'] + + version('1.1.9', 'a56e7b23d76c2b5aaf3bea2a7c245ea7') + + variant('gsl', default=False, description='Use GSL random number generators for constructing random matrices') + variant('fftw', default=False, description='Install the cvxopt.fftw interface to FFTW') + variant('glpk', default=False, description='Enable support for the linear programming solver GLPK') + # variant('mosek', default=False, description='Enable support for the linear, second-order cone, and quadratic programming solvers in MOSEK') # noqa: flake8 + variant('dsdp', default=False, description='Enable support for the semidefinite programming solver DSDP') + + # Required dependencies + depends_on('python@2.7:') + depends_on('py-setuptools', type='build') + depends_on('blas') + depends_on('lapack') + depends_on('suite-sparse') + + # Optional dependencies + depends_on('gsl', when='+gsl') + depends_on('fftw', when='+fftw') + depends_on('glpk', when='+glpk') + # depends_on('mosek@8:', when='+mosek') + depends_on('dsdp@5.8:', when='+dsdp') + + def setup_environment(self, spack_env, run_env): + spec = self.spec + + # BLAS/LAPACK Libraries + + # Default names of BLAS and LAPACK libraries + spack_env.set('CVXOPT_BLAS_LIB', ';'.join(spec['blas'].libs.names)) + spack_env.set('CVXOPT_LAPACK_LIB', ';'.join(spec['lapack'].libs.names)) + + # Directory containing BLAS and LAPACK libraries + spack_env.set('CVXOPT_BLAS_LIB_DIR', spec['blas'].libs.directories[0]) + + # SuiteSparse Libraries + + # Directory containing SuiteSparse libraries + spack_env.set('CVXOPT_SUITESPARSE_LIB_DIR', + spec['suite-sparse'].libs.directories[0]) + + # Directory containing SuiteSparse header files + spack_env.set('CVXOPT_SUITESPARSE_INC_DIR', + spec['suite-sparse'].headers.directories[0]) + + # GSL Libraries + + if '+gsl' in spec: + spack_env.set('CVXOPT_BUILD_GSL', 1) + + # Directory containing libgsl + spack_env.set('CVXOPT_GSL_LIB_DIR', + spec['gsl'].libs.directories[0]) + + # Directory containing the GSL header files + spack_env.set('CVXOPT_GSL_INC_DIR', + spec['gsl'].headers.directories[0]) + else: + spack_env.set('CVXOPT_BUILD_GSL', 0) + + # FFTW Libraries + + if '+fftw' in spec: + spack_env.set('CVXOPT_BUILD_FFTW', 1) + + # Directory containing libfftw3 + spack_env.set('CVXOPT_FFTW_LIB_DIR', + spec['fftw'].libs.directories[0]) + + # Directory containing fftw.h + spack_env.set('CVXOPT_FFTW_INC_DIR', + spec['fftw'].headers.directories[0]) + else: + spack_env.set('CVXOPT_BUILD_FFTW', 0) + + # GLPK Libraries + + if '+glpk' in spec: + spack_env.set('CVXOPT_BUILD_GLPK', 1) + + # Directory containing libglpk + spack_env.set('CVXOPT_GLPK_LIB_DIR', + spec['glpk'].libs.directories[0]) + + # Directory containing glpk.h + spack_env.set('CVXOPT_GLPK_INC_DIR', + spec['glpk'].headers.directories[0]) + else: + spack_env.set('CVXOPT_BUILD_GLPK', 0) + + # DSDP Libraries + + if '+dsdp' in spec: + spack_env.set('CVXOPT_BUILD_DSDP', 1) + + # Directory containing libdsdp + spack_env.set('CVXOPT_DSDP_LIB_DIR', + spec['dsdp'].libs.directories[0]) + + # Directory containing dsdp5.h + spack_env.set('CVXOPT_DSDP_INC_DIR', + spec['dsdp'].headers.directories[0]) + + @run_after('install') + @on_package_attributes(run_tests=True) + def install_test(self): + """Test that the installation was successful.""" + python('-m', 'unittest', 'discover', '-s', 'tests') -- cgit v1.2.3-70-g09d2 From 9a3a9860df2a7f2098040f2354f1c15e0b1f76f3 Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 22 Mar 2018 19:41:50 -0500 Subject: perl-json: Create new package (#7431) --- .../repos/builtin/packages/perl-json/package.py | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-json/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-json/package.py b/var/spack/repos/builtin/packages/perl-json/package.py new file mode 100644 index 0000000000..007dcc2293 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-json/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlJson(PerlPackage): + """JSON (JavaScript Object Notation) encoder/decoder""" + + homepage = "http://search.cpan.org/~ishigaki/JSON/lib/JSON.pm" + url = "http://search.cpan.org/CPAN/authors/id/I/IS/ISHIGAKI/JSON-2.97001.tar.gz" + + version('2.97001', '693d6ff167496362f8ec6c3c5b8ba5ee') -- cgit v1.2.3-70-g09d2 From 2e4378bcd035c9910a4565d791fcdbdab0afffd8 Mon Sep 17 00:00:00 2001 From: jthies Date: Thu, 22 Mar 2018 17:42:38 -0700 Subject: added a new package file for PHIST (Pipelined, Hybrid-parallel Iterat… (#7361) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * added a new package file for PHIST (Pipelined, Hybrid-parallel Iterative Solver Toolkit) * packages/phist: fix some formatting errors (too long lines etc) and set allowed values for option "outlev" * packages/phist: fix some more flake8 errors * add headers property to netlib-lapack and intel-mkl * ghost: fix finding cblas header and libs (at least for mkl and netlib-lapack, which provide headers()) * added a new package file for PHIST (Pipelined, Hybrid-parallel Iterative Solver Toolkit) * packages/phist: fix some formatting errors (too long lines etc) and set allowed values for option "outlev" * packages/phist: fix some more flake8 errors * phist: use headers property to find lapacke include dir * phist: fix flake8 error * phist: be more specific about dependencies and update version * phist: state trilinos minimum version when building with Tpetra kernels * gmp: add oldish version 5.1.3 with checksum * phist: get rid of the 'petsc+complex' variant, it can be installed by kernel_lib=petsc ^petsc+complex * phist: new version * phist: fix version checksum * Revert "add headers property to netlib-lapack and intel-mkl" This reverts commit d8cb62905ebfb2cba186fd2d736d54a88a49d089. * Revert "ghost: fix finding cblas header and libs (at least for mkl and netlib-lapack, which provide headers())" This reverts commit d406a77ed7879c124fbaf1d757d002b9f0771620. * phist: remove unused function * phist: reorder package file versions/variants/depends_on/rest * phist: some minor changes requested by @adamjsteward --- var/spack/repos/builtin/packages/phist/package.py | 132 ++++++++++++++++++++++ 1 file changed, 132 insertions(+) create mode 100644 var/spack/repos/builtin/packages/phist/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/phist/package.py b/var/spack/repos/builtin/packages/phist/package.py new file mode 100644 index 0000000000..d224be372f --- /dev/null +++ b/var/spack/repos/builtin/packages/phist/package.py @@ -0,0 +1,132 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class Phist(CMakePackage): + """The Pipelined, Hybrid-parallel Iterative Solver Toolkit provides + implementations of and interfaces to block iterative solvers for sparse + linear and eigenvalue problems. In contrast to other libraries we support + multiple backends (e.g. Trilinos, PETSc and our own optimized kernels), + and interfaces in multiple languages such as C, C++, Fortran 2003 and + Python. PHIST has a clear focus on portability and hardware performance: + in particular support row-major storage of block vectors and using GPUs + (via the ghost library or Trilinos/Tpetra). + """ + + homepage = "https://bitbucket.org/essex/phist/" + url = 'https://bitbucket.org/essex/phist/get/phist-1.4.3.tar.gz' + + version('develop', + git='https://bitbucket.org/essex/phist/phist.git', branch='devel') + version('master', + git='https://bitbucket.org/essex/phist/phist.git', branch='master') + version('1.4.3', 'af3300378d4282366d148e38c3a3199a') + + variant(name='kernel_lib', default='builtin', + description='select the kernel library (backend) for phist', + values=['builtin', + 'epetra', + 'tpetra', + 'petsc', + 'eigen', + 'ghost']) + variant(name='outlev', default='2', values=['0', '1', '2', '3', '4', '5'], + description='verbosity. 0: errors 1: +warnings 2: +info ' + '3: +verbose 4: +extreme 5; +debug') + + variant('shared', default=True, + description='Enables the build of shared libraries') + + variant('mpi', default=True, + description='enable/disable MPI (note that the kernel library may ' + 'not support this choice)') + variant('parmetis', default=False, + description='enable/disable ParMETIS partitioning (only actually ' + 'used with kernel_lib=builtin)') + variant('trilinos', default=False, + description='enable/disable Trilinos third-party libraries. ' + 'For all kernel_libs, we can use Belos and Anasazi ' + 'iterative solvers. For the Trilinos backends ' + '(kernel_lib=epetra|tpetra) we can use preconditioner ' + 'packages such as Ifpack, Ifpack2 and ML.') + + # ###################### Dependencies ########################## + + depends_on('cmake@3.8:', type='build') + depends_on('blas') + depends_on('lapack') + depends_on('mpi', when='+mpi') + depends_on('trilinos+anasazi+belos+teuchos', when='+trilinos') + depends_on('trilinos@12:+tpetra', when='kernel_lib=tpetra') + # Epetra backend also works with older Trilinos versions + depends_on('trilinos+epetra', when='kernel_lib=epetra') + depends_on('petsc', when='kernel_lib=petsc') + depends_on('eigen', when='kernel_lib=eigen') + depends_on('ghost', when='kernel_lib=ghost') + + depends_on('trilinos', when='+trilinos') + depends_on('parmetis ^metis+int64', when='+parmetis') + + def cmake_args(self): + spec = self.spec + + kernel_lib = spec.variants['kernel_lib'].value + outlev = spec.variants['outlev'].value + + lapacke_libs = \ + (spec['lapack:c'].libs + spec['blas:c'].libs).joined(';') + lapacke_include_dir = spec['lapack:c'].headers.directories[0] + + args = ['-DPHIST_KERNEL_LIB=%s' % kernel_lib, + '-DPHIST_OUTLEV=%s' % outlev, + '-DTPL_LAPACKE_LIBRARIES=%s' % lapacke_libs, + '-DTPL_LAPACKE_INCLUDE_DIRS=%s' % lapacke_include_dir, + '-DPHIST_ENABLE_MPI:BOOL=%s' + % ('ON' if '+mpi' in spec else 'OFF'), + '-DBUILD_SHARED_LIBS:BOOL=%s' + % ('ON' if '+shared' in spec else 'OFF'), + '-DPHIST_USE_TRILINOS_TPLS:BOOL=%s' + % ('ON' if '+trilinos' in spec else 'OFF'), + '-DPHIST_USE_SOLVER_TPLS:BOOL=%s' + % ('ON' if '+trilinos' in spec else 'OFF'), + '-DPHIST_USE_PRECON_TPLS:BOOL=%s' + % ('ON' if '+trilinos' in spec else 'OFF'), + ] + + return args + + @run_after('build') + @on_package_attributes(run_tests=True) + def check(self): + with working_dir(self.build_directory): + make("check") + + @run_after('install') + @on_package_attributes(run_tests=True) + def test_install(self): + with working_dir(self.build_directory): + make("test_install") -- cgit v1.2.3-70-g09d2 From 3858d4a3a354facf4bce66567c07d2d229f9d98a Mon Sep 17 00:00:00 2001 From: Veselin Dobrev Date: Thu, 22 Mar 2018 17:43:23 -0700 Subject: [hypre] add the 'headers' property (#7278) * [hypre] Add the 'headers' property plus a small tweak in the 'libs' property. * [hypre] Add fallbacks for searching for '.libs' in 'prefix.lib64' and in all of 'prefix'. * [hypre] Fix style. * [hypre] Use find_headers instead of find + HeaderList. --- var/spack/repos/builtin/packages/hypre/package.py | 24 ++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hypre/package.py b/var/spack/repos/builtin/packages/hypre/package.py index d17da61a1b..6f41e3840b 100644 --- a/var/spack/repos/builtin/packages/hypre/package.py +++ b/var/spack/repos/builtin/packages/hypre/package.py @@ -110,8 +110,26 @@ class Hypre(Package): '-rhsone') make("install") + @property + def headers(self): + """Export the main hypre header, HYPRE.h; all other headers can be found + in the same directory. + Sample usage: spec['hypre'].headers.cpp_flags + """ + hdrs = find_headers('HYPRE', self.prefix.include, recursive=False) + return hdrs or None + @property def libs(self): - is_shared = self.spec.satisfies('+shared') - return find_libraries('libHYPRE', root=self.prefix, - shared=is_shared, recursive=True) + """Export the hypre library. + Sample usage: spec['hypre'].libs.ld_flags + """ + search_paths = [[self.prefix.lib, False], [self.prefix.lib64, False], + [self.prefix, True]] + is_shared = '+shared' in self.spec + for path, recursive in search_paths: + libs = find_libraries('libHYPRE', root=path, + shared=is_shared, recursive=recursive) + if libs: + return libs + return None -- cgit v1.2.3-70-g09d2 From a0494003a2421cfa6c4fbaaefb7266bbe6a21410 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Thu, 22 Mar 2018 19:48:48 -0500 Subject: mc: create new package (#7564) * mc: new package * Update package.py * Update package.py * Update package.py --- var/spack/repos/builtin/packages/mc/package.py | 56 ++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 var/spack/repos/builtin/packages/mc/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mc/package.py b/var/spack/repos/builtin/packages/mc/package.py new file mode 100644 index 0000000000..5a54d4273b --- /dev/null +++ b/var/spack/repos/builtin/packages/mc/package.py @@ -0,0 +1,56 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Mc(AutotoolsPackage): + """The GNU Midnight Commander is a visual file manager.""" + + homepage = "https://midnight-commander.org" + url = "http://ftp.midnight-commander.org/mc-4.8.20.tar.bz2" + + version('4.8.20', 'dcfc7aa613c62291a0f71f6b698d8267') + + depends_on('ncurses') + depends_on('pkg-config', type='build') + depends_on('glib@2.14:') + depends_on('libssh2@1.2.5:') + + def setup_environment(self, spack_env, run_env): + # Fix compilation bug on macOS by pretending we don't have utimensat() + # https://github.com/MidnightCommander/mc/pull/130 + if 'darwin' in self.spec.architecture: + env['ac_cv_func_utimensat'] = 'no' + + def configure_args(self): + args = [ + '--disable-debug', + '--disable-dependency-tracking', + '--disable-silent-rules', + '--without-x', + '--with-screen=ncurses', + '--enable-vfs-sftp' + ] + return args -- cgit v1.2.3-70-g09d2 From a37acfc1e9bbd2dae1a3a18227e90763785058a6 Mon Sep 17 00:00:00 2001 From: Alfredo Adolfo Gimenez Date: Thu, 22 Mar 2018 18:29:17 -0700 Subject: Dyninst links broken, everything switched to github (#6066) --- var/spack/repos/builtin/packages/dyninst/package.py | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dyninst/package.py b/var/spack/repos/builtin/packages/dyninst/package.py index 8a18b99940..a0683e9d81 100644 --- a/var/spack/repos/builtin/packages/dyninst/package.py +++ b/var/spack/repos/builtin/packages/dyninst/package.py @@ -33,18 +33,13 @@ class Dyninst(Package): url = "https://github.com/dyninst/dyninst/archive/v9.2.0.tar.gz" list_url = "http://www.dyninst.org/downloads/dyninst-8.x" - version('9.3.2', 'a2bf03b6d1d424853e80d39b13e9c229') - version('9.3.0', 'edde7847dc673ca69bd59412af572450') - version('9.2.0', 'ad023f85e8e57837ed9de073b59d6bab', - url="https://github.com/dyninst/dyninst/archive/v9.2.0.tar.gz") - version('9.1.0', '5c64b77521457199db44bec82e4988ac', - url="http://www.paradyn.org/release9.1.0/DyninstAPI-9.1.0.tgz") - version('8.2.1', 'abf60b7faabe7a2e4b54395757be39c7', - url="http://www.paradyn.org/release8.2/DyninstAPI-8.2.1.tgz") - version('8.1.2', 'bf03b33375afa66fe0efa46ce3f4b17a', - url="http://www.paradyn.org/release8.1.2/DyninstAPI-8.1.2.tgz") - version('8.1.1', 'd1a04e995b7aa70960cd1d1fac8bd6ac', - url="http://www.paradyn.org/release8.1/DyninstAPI-8.1.1.tgz") + version('9.3.2', git="https://github.com/dyninst/dyninst.git", tag='v9.3.2') + version('9.3.0', git="https://github.com/dyninst/dyninst.git", tag='v9.3.0') + version('9.2.0', git="https://github.com/dyninst/dyninst.git", tag='v9.2.0') + version('9.1.0', git="https://github.com/dyninst/dyninst.git", tag='v9.1.0') + version('8.2.1', git="https://github.com/dyninst/dyninst.git", tag='v8.2.1') + version('8.1.2', git="https://github.com/dyninst/dyninst.git", tag='v8.1.2') + version('8.1.1', git="https://github.com/dyninst/dyninst.git", tag='v8.1.1') variant('stat_dysect', default=False, description="patch for STAT's DySectAPI") -- cgit v1.2.3-70-g09d2 From 213a3de539202c5e1da5b730744ee214d8af64e7 Mon Sep 17 00:00:00 2001 From: Federico Ficarelli Date: Fri, 23 Mar 2018 10:05:54 +0100 Subject: Fix tclsh command for transitive dependencies (#7566) --- var/spack/repos/builtin/packages/tcl/package.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/tcl/package.py b/var/spack/repos/builtin/packages/tcl/package.py index 21a31efaf3..ab05352dc2 100644 --- a/var/spack/repos/builtin/packages/tcl/package.py +++ b/var/spack/repos/builtin/packages/tcl/package.py @@ -70,6 +70,14 @@ class Tcl(AutotoolsPackage): # ======================================================================== # Set up environment to make install easy for tcl extensions. # ======================================================================== + @property + def command(self): + """Returns the tclsh command. + + :returns: The tclsh command + :rtype: Executable + """ + return Executable(os.path.realpath(self.prefix.bin.tclsh)) @property def tcl_lib_dir(self): @@ -94,7 +102,7 @@ class Tcl(AutotoolsPackage): # where a system provided tcl is run against the standard libraries # of a Spack built tcl. See issue #7128 that relates to python but # it boils down to the same situation we have here. - spack_env.prepend_path('PATH', os.path.dirname(self.prefix.bin)) + spack_env.prepend_path('PATH', os.path.dirname(self.command.path)) tcl_paths = [join_path(self.prefix, self.tcl_builtin_lib_dir)] -- cgit v1.2.3-70-g09d2 From adf972e7ff3f91d5febeaeb37a7879760cbe8d80 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Fri, 23 Mar 2018 13:49:59 +0100 Subject: intel performance libraries: add 2018.2 (#7569) --- var/spack/repos/builtin/packages/intel-daal/package.py | 2 ++ var/spack/repos/builtin/packages/intel-ipp/package.py | 2 ++ var/spack/repos/builtin/packages/intel-mkl/package.py | 2 ++ var/spack/repos/builtin/packages/intel-mpi/package.py | 2 ++ 4 files changed, 8 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/intel-daal/package.py b/var/spack/repos/builtin/packages/intel-daal/package.py index 8c618089ed..9a4f207710 100644 --- a/var/spack/repos/builtin/packages/intel-daal/package.py +++ b/var/spack/repos/builtin/packages/intel-daal/package.py @@ -33,6 +33,8 @@ class IntelDaal(IntelPackage): homepage = "https://software.intel.com/en-us/daal" + version('2018.2.199', 'd015ff34a87a18922736b5fba0d0b0e0', + url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12727/l_daal_2018.2.199.tgz") version('2018.1.163', '12a9586734a03a956095440161fd741a', url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12414/l_daal_2018.1.163.tgz") version('2018.0.128', '5779e670f67c33cc1c6cdcdca5e4636e', diff --git a/var/spack/repos/builtin/packages/intel-ipp/package.py b/var/spack/repos/builtin/packages/intel-ipp/package.py index 5f90188ab1..6046d864a2 100644 --- a/var/spack/repos/builtin/packages/intel-ipp/package.py +++ b/var/spack/repos/builtin/packages/intel-ipp/package.py @@ -33,6 +33,8 @@ class IntelIpp(IntelPackage): homepage = "https://software.intel.com/en-us/intel-ipp" + version('2018.2.199', 'f87276b485d2f6ec070c1b41ac1ed871', + url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12726/l_ipp_2018.2.199.tgz') version('2018.1.163', '183d4888f3d91f632b617fdd401f04ed', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12414/l_ipp_2018.1.163.tgz') version('2018.0.128', 'e64190bc9041b52d9eed7e8ee91bf1de', diff --git a/var/spack/repos/builtin/packages/intel-mkl/package.py b/var/spack/repos/builtin/packages/intel-mkl/package.py index 67002bda7f..8b5ad1ee92 100644 --- a/var/spack/repos/builtin/packages/intel-mkl/package.py +++ b/var/spack/repos/builtin/packages/intel-mkl/package.py @@ -34,6 +34,8 @@ class IntelMkl(IntelPackage): homepage = "https://software.intel.com/en-us/intel-mkl" + version('2018.2.199', 'fd31b656a8eb859c89495b9cc41230b4', + url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12725/l_mkl_2018.2.199.tgz") version('2018.1.163', 'f1f7b6ddd7eb57dfe39bd4643446dc1c', url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12414/l_mkl_2018.1.163.tgz") version('2018.0.128', '0fa23779816a0f2ee23a396fc1af9978', diff --git a/var/spack/repos/builtin/packages/intel-mpi/package.py b/var/spack/repos/builtin/packages/intel-mpi/package.py index 82bfe76125..44014c7f59 100644 --- a/var/spack/repos/builtin/packages/intel-mpi/package.py +++ b/var/spack/repos/builtin/packages/intel-mpi/package.py @@ -33,6 +33,8 @@ class IntelMpi(IntelPackage): homepage = "https://software.intel.com/en-us/intel-mpi-library" + version('2018.2.199', '6ffeab59c83a8842537484d53e180520', + url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12748/l_mpi_2018.2.199.tgz') version('2018.1.163', '437ce50224c5bbf98fd578a810c3e401', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12414/l_mpi_2018.1.163.tgz') version('2018.0.128', '15b46fc6a3014595de897aa48d3a658b', -- cgit v1.2.3-70-g09d2 From 1391f0db44c8932ed0a1c416304aa40ad3960848 Mon Sep 17 00:00:00 2001 From: healther Date: Fri, 23 Mar 2018 14:40:18 +0100 Subject: add matplotlib version 2.2.2 (#7572) --- var/spack/repos/builtin/packages/py-matplotlib/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-matplotlib/package.py b/var/spack/repos/builtin/packages/py-matplotlib/package.py index acdee085bb..883bdbd28b 100644 --- a/var/spack/repos/builtin/packages/py-matplotlib/package.py +++ b/var/spack/repos/builtin/packages/py-matplotlib/package.py @@ -34,6 +34,7 @@ class PyMatplotlib(PythonPackage): homepage = "https://pypi.python.org/pypi/matplotlib" url = "https://pypi.io/packages/source/m/matplotlib/matplotlib-2.0.2.tar.gz" + version('2.2.2', 'dd1e49e041309a7fd4e32be8bf17c3b6') version('2.0.2', '061111784278bde89b5d4987014be4ca') version('2.0.0', '7aa54b06327f0e1c4f3877fc2f7d6b17') version('1.5.3', 'ba993b06113040fee6628d74b80af0fd') -- cgit v1.2.3-70-g09d2 From 9799e6062d72ee9048585d9bb7fe850841b2aea4 Mon Sep 17 00:00:00 2001 From: xfzhao Date: Fri, 23 Mar 2018 15:19:26 -0500 Subject: beast1: new package (#7544) * beast1: new package * beast1: taking suggestion --- var/spack/repos/builtin/packages/beast1/package.py | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 var/spack/repos/builtin/packages/beast1/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/beast1/package.py b/var/spack/repos/builtin/packages/beast1/package.py new file mode 100644 index 0000000000..4d04d28c03 --- /dev/null +++ b/var/spack/repos/builtin/packages/beast1/package.py @@ -0,0 +1,47 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Beast1(Package): + """BEAST is a cross-platform program for Bayesian + analysis of molecular sequences using MCMC.""" + + homepage = "http://beast.community/" + url = "https://github.com/beast-dev/beast-mcmc/releases/download/v1.8.4/BEASTv1.8.4.tgz" + + version('1.8.4', 'cb8752340c1f77a22d39ca4fe09687b0') + + depends_on('java', type='run') + + def setup_environment(self, spack_env, run_env): + run_env.set('BEAST1', self.prefix) + + def install(self, spec, prefix): + install_tree('bin', prefix.bin) + install_tree('examples', prefix.examples) + install_tree('images', prefix.images) + install_tree('lib', prefix.lib) + install_tree('doc', prefix.doc) -- cgit v1.2.3-70-g09d2 From 04358f827f86c0aa39e7d56b0f5e6c427a64e433 Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Fri, 23 Mar 2018 14:24:35 -0600 Subject: Adding bc and ed packages. (#7578) * Adding bc package. * Adding ed package which is actually a dependency of bc. --- var/spack/repos/builtin/packages/bc/package.py | 41 ++++++++++++++++++++++++++ var/spack/repos/builtin/packages/ed/package.py | 38 ++++++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 var/spack/repos/builtin/packages/bc/package.py create mode 100644 var/spack/repos/builtin/packages/ed/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bc/package.py b/var/spack/repos/builtin/packages/bc/package.py new file mode 100644 index 0000000000..9b6dfa6506 --- /dev/null +++ b/var/spack/repos/builtin/packages/bc/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Bc(AutotoolsPackage): + """bc is an arbitrary precision numeric processing language. Syntax is + similar to C, but differs in many substantial areas. It supports + interactive execution of statements.""" + + homepage = "https://www.gnu.org/software/bc" + url = "https://ftp.gnu.org/gnu/bc/bc-1.07.tar.gz" + + version('1.07', 'e91638a947beadabf4d7770bdbb3d512') + + depends_on('ed', type='build') + depends_on('texinfo', type='build') + + parallel = False diff --git a/var/spack/repos/builtin/packages/ed/package.py b/var/spack/repos/builtin/packages/ed/package.py new file mode 100644 index 0000000000..031de1e402 --- /dev/null +++ b/var/spack/repos/builtin/packages/ed/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Ed(AutotoolsPackage): + """GNU ed is a line-oriented text editor. It is used to create, + display, modify and otherwise manipulate text files, both + interactively and via shell scripts.""" + + homepage = "https://www.gnu.org/software/ed" + url = "https://ftp.gnu.org/gnu/ed/ed-1.4.tar.gz" + + version('1.4', 'da0ddc0e0b0bec2da4b13b0d0d1bce2b') + + parallel = False -- cgit v1.2.3-70-g09d2 From 5b810579facb503007d2cb7dd4a79c237e670c0f Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Fri, 23 Mar 2018 15:35:09 -0500 Subject: Only add python flag for newer versions of glib (#7579) --- var/spack/repos/builtin/packages/glib/package.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/glib/package.py b/var/spack/repos/builtin/packages/glib/package.py index e517f0a693..a8bb034f04 100644 --- a/var/spack/repos/builtin/packages/glib/package.py +++ b/var/spack/repos/builtin/packages/glib/package.py @@ -81,9 +81,10 @@ class Glib(AutotoolsPackage): def configure_args(self): args = [] args.extend(self.enable_or_disable('libmount')) - args.append('--with-python={0}'.format( - os.path.basename(self.spec['python'].command.path)) - ) + if self.spec.satisfies('@2.53.4:'): + args.append('--with-python={0}'.format( + os.path.basename(self.spec['python'].command.path)) + ) args.extend(self.enable_or_disable('tracing')) return args -- cgit v1.2.3-70-g09d2 From 756cb4e6d792ba1f832ae89865a4b4982c45ff8e Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Sun, 25 Mar 2018 00:48:31 +0800 Subject: Add a new package: graph500. (#7499) * Add a new package: graph500. * Remove leading comments. * graph500 is a MakefilePackage. * Update. * Update. --- .../repos/builtin/packages/graph500/package.py | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 var/spack/repos/builtin/packages/graph500/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/graph500/package.py b/var/spack/repos/builtin/packages/graph500/package.py new file mode 100644 index 0000000000..630cadb539 --- /dev/null +++ b/var/spack/repos/builtin/packages/graph500/package.py @@ -0,0 +1,50 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Graph500(MakefilePackage): + """Graph500 reference implementations.""" + + homepage = "https://graph500.org" + url = "https://github.com/graph500/graph500/archive/graph500-3.0.0.tar.gz" + + version('3.0.0', 'a2ebb4783b21e2d86387a217776395e3') + + depends_on('mpi@2.0:') + + build_directory = 'src' + + def edit(self, spec, prefix): + makefile = FileFilter(join_path(self.build_directory, 'Makefile')) + makefile.filter(r'^MPICC\s*=.*', 'MPICC={0}'.format(spec['mpi'].mpicc)) + + def install(self, spec, prefix): + with working_dir(self.build_directory): + mkdir(prefix.bin) + install('graph500_reference_bfs', prefix.bin) + install('graph500_reference_bfs_sssp', prefix.bin) + install('graph500_custom_bfs', prefix.bin) + install('graph500_custom_bfs_sssp', prefix.bin) -- cgit v1.2.3-70-g09d2 From 54f97d1dec8df18b3d34144f38760abd9a7cc5b4 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Sat, 24 Mar 2018 12:13:52 -0700 Subject: Update copyright on LLNL files for 2018. (#7592) --- bin/sbang | 2 +- bin/spack | 2 +- bin/spack-python | 2 +- conftest.py | 2 +- lib/spack/docs/conf.py | 4 ++-- lib/spack/docs/tutorial/examples/0.package.py | 2 +- lib/spack/docs/tutorial/examples/1.package.py | 2 +- lib/spack/docs/tutorial/examples/2.package.py | 2 +- lib/spack/docs/tutorial/examples/3.package.py | 2 +- lib/spack/docs/tutorial/examples/4.package.py | 2 +- lib/spack/docs/tutorial/examples/5.package.py | 2 +- lib/spack/docs/tutorial/examples/Autotools/0.package.py | 2 +- lib/spack/docs/tutorial/examples/Autotools/1.package.py | 2 +- lib/spack/docs/tutorial/examples/Cmake/0.package.py | 2 +- lib/spack/docs/tutorial/examples/Cmake/1.package.py | 2 +- lib/spack/docs/tutorial/examples/Cmake/2.package.py | 2 +- lib/spack/docs/tutorial/examples/Makefile/0.package.py | 2 +- lib/spack/docs/tutorial/examples/Makefile/1.package.py | 2 +- lib/spack/docs/tutorial/examples/Makefile/2.package.py | 2 +- lib/spack/docs/tutorial/examples/Makefile/3.package.py | 2 +- lib/spack/docs/tutorial/examples/PyPackage/0.package.py | 2 +- lib/spack/docs/tutorial/examples/PyPackage/1.package.py | 2 +- lib/spack/env/cc | 2 +- lib/spack/external/__init__.py | 2 +- lib/spack/llnl/__init__.py | 2 +- lib/spack/llnl/util/__init__.py | 2 +- lib/spack/llnl/util/argparsewriter.py | 2 +- lib/spack/llnl/util/filesystem.py | 2 +- lib/spack/llnl/util/lang.py | 2 +- lib/spack/llnl/util/link_tree.py | 2 +- lib/spack/llnl/util/lock.py | 2 +- lib/spack/llnl/util/tty/__init__.py | 2 +- lib/spack/llnl/util/tty/colify.py | 2 +- lib/spack/llnl/util/tty/color.py | 2 +- lib/spack/llnl/util/tty/log.py | 2 +- lib/spack/spack/__init__.py | 2 +- lib/spack/spack/abi.py | 2 +- lib/spack/spack/architecture.py | 2 +- lib/spack/spack/binary_distribution.py | 2 +- lib/spack/spack/build_environment.py | 2 +- lib/spack/spack/build_systems/__init__.py | 2 +- lib/spack/spack/build_systems/aspell_dict.py | 2 +- lib/spack/spack/build_systems/autotools.py | 2 +- lib/spack/spack/build_systems/cmake.py | 2 +- lib/spack/spack/build_systems/cuda.py | 2 +- lib/spack/spack/build_systems/intel.py | 2 +- lib/spack/spack/build_systems/makefile.py | 2 +- lib/spack/spack/build_systems/octave.py | 2 +- lib/spack/spack/build_systems/perl.py | 2 +- lib/spack/spack/build_systems/python.py | 2 +- lib/spack/spack/build_systems/qmake.py | 2 +- lib/spack/spack/build_systems/r.py | 2 +- lib/spack/spack/build_systems/scons.py | 2 +- lib/spack/spack/build_systems/waf.py | 2 +- lib/spack/spack/cmd/__init__.py | 2 +- lib/spack/spack/cmd/activate.py | 2 +- lib/spack/spack/cmd/arch.py | 2 +- lib/spack/spack/cmd/blame.py | 2 +- lib/spack/spack/cmd/bootstrap.py | 2 +- lib/spack/spack/cmd/build.py | 2 +- lib/spack/spack/cmd/buildcache.py | 2 +- lib/spack/spack/cmd/cd.py | 2 +- lib/spack/spack/cmd/checksum.py | 2 +- lib/spack/spack/cmd/clean.py | 2 +- lib/spack/spack/cmd/clone.py | 2 +- lib/spack/spack/cmd/commands.py | 2 +- lib/spack/spack/cmd/common/__init__.py | 2 +- lib/spack/spack/cmd/common/arguments.py | 2 +- lib/spack/spack/cmd/compiler.py | 2 +- lib/spack/spack/cmd/compilers.py | 2 +- lib/spack/spack/cmd/config.py | 2 +- lib/spack/spack/cmd/configure.py | 2 +- lib/spack/spack/cmd/create.py | 4 ++-- lib/spack/spack/cmd/deactivate.py | 2 +- lib/spack/spack/cmd/debug.py | 2 +- lib/spack/spack/cmd/dependencies.py | 2 +- lib/spack/spack/cmd/dependents.py | 2 +- lib/spack/spack/cmd/diy.py | 2 +- lib/spack/spack/cmd/docs.py | 2 +- lib/spack/spack/cmd/edit.py | 2 +- lib/spack/spack/cmd/env.py | 2 +- lib/spack/spack/cmd/extensions.py | 2 +- lib/spack/spack/cmd/fetch.py | 2 +- lib/spack/spack/cmd/find.py | 2 +- lib/spack/spack/cmd/flake8.py | 2 +- lib/spack/spack/cmd/gpg.py | 2 +- lib/spack/spack/cmd/graph.py | 2 +- lib/spack/spack/cmd/help.py | 2 +- lib/spack/spack/cmd/info.py | 2 +- lib/spack/spack/cmd/install.py | 2 +- lib/spack/spack/cmd/list.py | 2 +- lib/spack/spack/cmd/load.py | 2 +- lib/spack/spack/cmd/location.py | 2 +- lib/spack/spack/cmd/log_parse.py | 2 +- lib/spack/spack/cmd/mirror.py | 2 +- lib/spack/spack/cmd/module.py | 2 +- lib/spack/spack/cmd/patch.py | 2 +- lib/spack/spack/cmd/pkg.py | 2 +- lib/spack/spack/cmd/providers.py | 2 +- lib/spack/spack/cmd/pydoc.py | 2 +- lib/spack/spack/cmd/python.py | 2 +- lib/spack/spack/cmd/reindex.py | 2 +- lib/spack/spack/cmd/repo.py | 2 +- lib/spack/spack/cmd/restage.py | 2 +- lib/spack/spack/cmd/setup.py | 2 +- lib/spack/spack/cmd/spec.py | 2 +- lib/spack/spack/cmd/stage.py | 2 +- lib/spack/spack/cmd/test.py | 2 +- lib/spack/spack/cmd/uninstall.py | 2 +- lib/spack/spack/cmd/unload.py | 2 +- lib/spack/spack/cmd/unuse.py | 2 +- lib/spack/spack/cmd/url.py | 2 +- lib/spack/spack/cmd/use.py | 2 +- lib/spack/spack/cmd/versions.py | 2 +- lib/spack/spack/cmd/view.py | 2 +- lib/spack/spack/compiler.py | 2 +- lib/spack/spack/compilers/__init__.py | 2 +- lib/spack/spack/compilers/cce.py | 2 +- lib/spack/spack/compilers/clang.py | 2 +- lib/spack/spack/compilers/gcc.py | 2 +- lib/spack/spack/compilers/intel.py | 2 +- lib/spack/spack/compilers/nag.py | 2 +- lib/spack/spack/compilers/pgi.py | 2 +- lib/spack/spack/compilers/xl.py | 2 +- lib/spack/spack/concretize.py | 2 +- lib/spack/spack/config.py | 2 +- lib/spack/spack/database.py | 2 +- lib/spack/spack/dependency.py | 2 +- lib/spack/spack/directives.py | 2 +- lib/spack/spack/directory_layout.py | 2 +- lib/spack/spack/environment.py | 2 +- lib/spack/spack/error.py | 2 +- lib/spack/spack/fetch_strategy.py | 2 +- lib/spack/spack/file_cache.py | 2 +- lib/spack/spack/filesystem_view.py | 2 +- lib/spack/spack/graph.py | 2 +- lib/spack/spack/hooks/__init__.py | 2 +- lib/spack/spack/hooks/extensions.py | 2 +- lib/spack/spack/hooks/licensing.py | 2 +- lib/spack/spack/hooks/module_file_generation.py | 2 +- lib/spack/spack/hooks/sbang.py | 2 +- lib/spack/spack/hooks/yaml_version_check.py | 2 +- lib/spack/spack/main.py | 2 +- lib/spack/spack/mirror.py | 2 +- lib/spack/spack/mixins.py | 2 +- lib/spack/spack/modules/__init__.py | 2 +- lib/spack/spack/modules/common.py | 2 +- lib/spack/spack/modules/dotkit.py | 2 +- lib/spack/spack/modules/lmod.py | 2 +- lib/spack/spack/modules/tcl.py | 2 +- lib/spack/spack/multimethod.py | 2 +- lib/spack/spack/operating_systems/__init__.py | 2 +- lib/spack/spack/operating_systems/cnk.py | 2 +- lib/spack/spack/operating_systems/cnl.py | 2 +- lib/spack/spack/operating_systems/cray_frontend.py | 2 +- lib/spack/spack/operating_systems/linux_distro.py | 2 +- lib/spack/spack/operating_systems/mac_os.py | 2 +- lib/spack/spack/package.py | 2 +- lib/spack/spack/package_prefs.py | 2 +- lib/spack/spack/package_test.py | 2 +- lib/spack/spack/parse.py | 2 +- lib/spack/spack/patch.py | 2 +- lib/spack/spack/platforms/__init__.py | 2 +- lib/spack/spack/platforms/bgq.py | 2 +- lib/spack/spack/platforms/cray.py | 2 +- lib/spack/spack/platforms/darwin.py | 2 +- lib/spack/spack/platforms/linux.py | 2 +- lib/spack/spack/platforms/test.py | 2 +- lib/spack/spack/provider_index.py | 2 +- lib/spack/spack/relocate.py | 2 +- lib/spack/spack/report.py | 2 +- lib/spack/spack/repository.py | 2 +- lib/spack/spack/resource.py | 2 +- lib/spack/spack/schema/__init__.py | 2 +- lib/spack/spack/schema/compilers.py | 2 +- lib/spack/spack/schema/config.py | 2 +- lib/spack/spack/schema/mirrors.py | 2 +- lib/spack/spack/schema/modules.py | 2 +- lib/spack/spack/schema/packages.py | 2 +- lib/spack/spack/schema/repos.py | 2 +- lib/spack/spack/spec.py | 2 +- lib/spack/spack/stage.py | 2 +- lib/spack/spack/store.py | 2 +- lib/spack/spack/tengine.py | 2 +- lib/spack/spack/test/__init__.py | 2 +- lib/spack/spack/test/architecture.py | 2 +- lib/spack/spack/test/build_environment.py | 2 +- lib/spack/spack/test/build_system_guess.py | 2 +- lib/spack/spack/test/build_systems.py | 2 +- lib/spack/spack/test/cc.py | 2 +- lib/spack/spack/test/cmd/__init__.py | 2 +- lib/spack/spack/test/cmd/arch.py | 2 +- lib/spack/spack/test/cmd/blame.py | 2 +- lib/spack/spack/test/cmd/cd.py | 2 +- lib/spack/spack/test/cmd/clean.py | 2 +- lib/spack/spack/test/cmd/commands.py | 2 +- lib/spack/spack/test/cmd/dependencies.py | 2 +- lib/spack/spack/test/cmd/dependents.py | 2 +- lib/spack/spack/test/cmd/env.py | 2 +- lib/spack/spack/test/cmd/find.py | 2 +- lib/spack/spack/test/cmd/flake8.py | 2 +- lib/spack/spack/test/cmd/gpg.py | 2 +- lib/spack/spack/test/cmd/graph.py | 2 +- lib/spack/spack/test/cmd/help.py | 2 +- lib/spack/spack/test/cmd/info.py | 2 +- lib/spack/spack/test/cmd/install.py | 2 +- lib/spack/spack/test/cmd/list.py | 2 +- lib/spack/spack/test/cmd/module.py | 2 +- lib/spack/spack/test/cmd/python.py | 2 +- lib/spack/spack/test/cmd/test_compiler_cmd.py | 2 +- lib/spack/spack/test/cmd/uninstall.py | 2 +- lib/spack/spack/test/cmd/url.py | 2 +- lib/spack/spack/test/cmd/versions.py | 2 +- lib/spack/spack/test/cmd/view.py | 2 +- lib/spack/spack/test/compilers.py | 2 +- lib/spack/spack/test/concretize.py | 2 +- lib/spack/spack/test/concretize_preferences.py | 2 +- lib/spack/spack/test/config.py | 2 +- lib/spack/spack/test/conftest.py | 2 +- lib/spack/spack/test/data/sourceme_first.sh | 2 +- lib/spack/spack/test/data/sourceme_parameters.sh | 2 +- lib/spack/spack/test/data/sourceme_second.sh | 2 +- lib/spack/spack/test/data/sourceme_unicode.sh | 2 +- lib/spack/spack/test/database.py | 2 +- lib/spack/spack/test/directory_layout.py | 2 +- lib/spack/spack/test/environment.py | 2 +- lib/spack/spack/test/file_cache.py | 2 +- lib/spack/spack/test/flag_handlers.py | 2 +- lib/spack/spack/test/git_fetch.py | 2 +- lib/spack/spack/test/graph.py | 2 +- lib/spack/spack/test/hg_fetch.py | 2 +- lib/spack/spack/test/install.py | 2 +- lib/spack/spack/test/llnl/util/file_list.py | 2 +- lib/spack/spack/test/llnl/util/lang.py | 2 +- lib/spack/spack/test/llnl/util/link_tree.py | 2 +- lib/spack/spack/test/llnl/util/lock.py | 2 +- lib/spack/spack/test/llnl/util/log.py | 2 +- lib/spack/spack/test/make_executable.py | 2 +- lib/spack/spack/test/mirror.py | 2 +- lib/spack/spack/test/module_parsing.py | 2 +- lib/spack/spack/test/modules/common.py | 2 +- lib/spack/spack/test/modules/conftest.py | 2 +- lib/spack/spack/test/modules/dotkit.py | 2 +- lib/spack/spack/test/modules/lmod.py | 2 +- lib/spack/spack/test/modules/tcl.py | 2 +- lib/spack/spack/test/multimethod.py | 2 +- lib/spack/spack/test/namespace_trie.py | 2 +- lib/spack/spack/test/optional_deps.py | 2 +- lib/spack/spack/test/package_sanity.py | 2 +- lib/spack/spack/test/packages.py | 2 +- lib/spack/spack/test/packaging.py | 2 +- lib/spack/spack/test/patch.py | 2 +- lib/spack/spack/test/pattern.py | 2 +- lib/spack/spack/test/provider_index.py | 2 +- lib/spack/spack/test/python_version.py | 2 +- lib/spack/spack/test/repo.py | 2 +- lib/spack/spack/test/sbang.py | 2 +- lib/spack/spack/test/spack_yaml.py | 2 +- lib/spack/spack/test/spec_dag.py | 2 +- lib/spack/spack/test/spec_semantics.py | 2 +- lib/spack/spack/test/spec_syntax.py | 2 +- lib/spack/spack/test/spec_yaml.py | 2 +- lib/spack/spack/test/stage.py | 2 +- lib/spack/spack/test/svn_fetch.py | 2 +- lib/spack/spack/test/tengine.py | 2 +- lib/spack/spack/test/test_activations.py | 2 +- lib/spack/spack/test/url_fetch.py | 2 +- lib/spack/spack/test/url_parse.py | 2 +- lib/spack/spack/test/url_substitution.py | 2 +- lib/spack/spack/test/util/filesystem.py | 2 +- lib/spack/spack/test/util/log_parser.py | 2 +- lib/spack/spack/test/util/prefix.py | 2 +- lib/spack/spack/test/variant.py | 2 +- lib/spack/spack/test/versions.py | 2 +- lib/spack/spack/test/web.py | 2 +- lib/spack/spack/url.py | 2 +- lib/spack/spack/util/__init__.py | 2 +- lib/spack/spack/util/compression.py | 2 +- lib/spack/spack/util/crypto.py | 2 +- lib/spack/spack/util/debug.py | 2 +- lib/spack/spack/util/environment.py | 2 +- lib/spack/spack/util/executable.py | 2 +- lib/spack/spack/util/gpg.py | 2 +- lib/spack/spack/util/log_parse.py | 2 +- lib/spack/spack/util/module_cmd.py | 2 +- lib/spack/spack/util/multiproc.py | 2 +- lib/spack/spack/util/naming.py | 2 +- lib/spack/spack/util/ordereddict.py | 2 +- lib/spack/spack/util/path.py | 2 +- lib/spack/spack/util/pattern.py | 2 +- lib/spack/spack/util/prefix.py | 2 +- lib/spack/spack/util/spack_json.py | 2 +- lib/spack/spack/util/spack_yaml.py | 2 +- lib/spack/spack/util/string.py | 2 +- lib/spack/spack/util/web.py | 2 +- lib/spack/spack/variant.py | 2 +- lib/spack/spack/version.py | 2 +- share/spack/setup-env.csh | 2 +- share/spack/setup-env.sh | 2 +- share/spack/spack-completion.bash | 2 +- var/spack/repos/builtin.mock/packages/a/package.py | 2 +- var/spack/repos/builtin.mock/packages/b/package.py | 2 +- var/spack/repos/builtin.mock/packages/boost/package.py | 2 +- var/spack/repos/builtin.mock/packages/build-error/package.py | 2 +- var/spack/repos/builtin.mock/packages/c/package.py | 2 +- var/spack/repos/builtin.mock/packages/callpath/package.py | 2 +- var/spack/repos/builtin.mock/packages/canfail/package.py | 2 +- var/spack/repos/builtin.mock/packages/cmake-client/package.py | 2 +- var/spack/repos/builtin.mock/packages/cmake/package.py | 2 +- var/spack/repos/builtin.mock/packages/conflict-parent/package.py | 2 +- var/spack/repos/builtin.mock/packages/conflict/package.py | 2 +- .../repos/builtin.mock/packages/conflicting-dependent/package.py | 2 +- var/spack/repos/builtin.mock/packages/dependency-install/package.py | 2 +- var/spack/repos/builtin.mock/packages/dependent-install/package.py | 2 +- var/spack/repos/builtin.mock/packages/develop-test/package.py | 2 +- var/spack/repos/builtin.mock/packages/direct-mpich/package.py | 2 +- var/spack/repos/builtin.mock/packages/dt-diamond-bottom/package.py | 2 +- var/spack/repos/builtin.mock/packages/dt-diamond-left/package.py | 2 +- var/spack/repos/builtin.mock/packages/dt-diamond-right/package.py | 2 +- var/spack/repos/builtin.mock/packages/dt-diamond/package.py | 2 +- var/spack/repos/builtin.mock/packages/dtbuild1/package.py | 2 +- var/spack/repos/builtin.mock/packages/dtbuild2/package.py | 2 +- var/spack/repos/builtin.mock/packages/dtbuild3/package.py | 2 +- var/spack/repos/builtin.mock/packages/dtlink1/package.py | 2 +- var/spack/repos/builtin.mock/packages/dtlink2/package.py | 2 +- var/spack/repos/builtin.mock/packages/dtlink3/package.py | 2 +- var/spack/repos/builtin.mock/packages/dtlink4/package.py | 2 +- var/spack/repos/builtin.mock/packages/dtlink5/package.py | 2 +- var/spack/repos/builtin.mock/packages/dtrun1/package.py | 2 +- var/spack/repos/builtin.mock/packages/dtrun2/package.py | 2 +- var/spack/repos/builtin.mock/packages/dtrun3/package.py | 2 +- var/spack/repos/builtin.mock/packages/dttop/package.py | 2 +- var/spack/repos/builtin.mock/packages/dtuse/package.py | 2 +- var/spack/repos/builtin.mock/packages/dyninst/package.py | 2 +- var/spack/repos/builtin.mock/packages/e/package.py | 2 +- var/spack/repos/builtin.mock/packages/extendee/package.py | 2 +- var/spack/repos/builtin.mock/packages/extension1/package.py | 2 +- var/spack/repos/builtin.mock/packages/extension2/package.py | 2 +- var/spack/repos/builtin.mock/packages/externalmodule/package.py | 2 +- var/spack/repos/builtin.mock/packages/externalprereq/package.py | 2 +- var/spack/repos/builtin.mock/packages/externaltest/package.py | 2 +- var/spack/repos/builtin.mock/packages/externaltool/package.py | 2 +- var/spack/repos/builtin.mock/packages/externalvirtual/package.py | 2 +- var/spack/repos/builtin.mock/packages/failing-build/package.py | 2 +- var/spack/repos/builtin.mock/packages/fake/package.py | 2 +- var/spack/repos/builtin.mock/packages/flake8/package.py | 2 +- var/spack/repos/builtin.mock/packages/git-test/package.py | 2 +- var/spack/repos/builtin.mock/packages/hg-test/package.py | 2 +- var/spack/repos/builtin.mock/packages/hypre/package.py | 2 +- var/spack/repos/builtin.mock/packages/indirect-mpich/package.py | 2 +- var/spack/repos/builtin.mock/packages/libdwarf/package.py | 2 +- var/spack/repos/builtin.mock/packages/libelf/package.py | 2 +- var/spack/repos/builtin.mock/packages/mixedversions/package.py | 2 +- var/spack/repos/builtin.mock/packages/mpich/package.py | 2 +- var/spack/repos/builtin.mock/packages/mpich2/package.py | 2 +- var/spack/repos/builtin.mock/packages/mpileaks/package.py | 2 +- var/spack/repos/builtin.mock/packages/multi-provider-mpi/package.py | 2 +- var/spack/repos/builtin.mock/packages/multimethod-base/package.py | 2 +- var/spack/repos/builtin.mock/packages/multimethod/package.py | 2 +- var/spack/repos/builtin.mock/packages/multivalue_variant/package.py | 2 +- var/spack/repos/builtin.mock/packages/netlib-blas/package.py | 2 +- var/spack/repos/builtin.mock/packages/netlib-lapack/package.py | 2 +- var/spack/repos/builtin.mock/packages/openblas-with-lapack/package.py | 2 +- var/spack/repos/builtin.mock/packages/openblas/package.py | 2 +- var/spack/repos/builtin.mock/packages/optional-dep-test-2/package.py | 2 +- var/spack/repos/builtin.mock/packages/optional-dep-test-3/package.py | 2 +- var/spack/repos/builtin.mock/packages/optional-dep-test/package.py | 2 +- var/spack/repos/builtin.mock/packages/othervirtual/package.py | 2 +- .../repos/builtin.mock/packages/override-context-templates/package.py | 2 +- .../repos/builtin.mock/packages/override-module-templates/package.py | 2 +- var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py | 2 +- .../repos/builtin.mock/packages/patch-several-dependencies/package.py | 2 +- var/spack/repos/builtin.mock/packages/patch/package.py | 2 +- var/spack/repos/builtin.mock/packages/patchelf/package.py | 2 +- var/spack/repos/builtin.mock/packages/printing-package/package.py | 2 +- var/spack/repos/builtin.mock/packages/python/package.py | 2 +- var/spack/repos/builtin.mock/packages/raiser/package.py | 2 +- .../builtin.mock/packages/singlevalue-variant-dependent/package.py | 2 +- var/spack/repos/builtin.mock/packages/svn-test/package.py | 2 +- .../builtin.mock/packages/trivial-install-test-package/package.py | 2 +- var/spack/repos/builtin.mock/packages/url-list-test/package.py | 2 +- var/spack/repos/builtin.mock/packages/url-test/package.py | 2 +- var/spack/repos/builtin.mock/packages/zmpi/package.py | 2 +- var/spack/repos/builtin/packages/abinit/package.py | 2 +- var/spack/repos/builtin/packages/abyss/package.py | 2 +- var/spack/repos/builtin/packages/accfft/package.py | 2 +- var/spack/repos/builtin/packages/ack/package.py | 2 +- var/spack/repos/builtin/packages/activeharmony/package.py | 2 +- var/spack/repos/builtin/packages/adept-utils/package.py | 2 +- var/spack/repos/builtin/packages/adios/package.py | 2 +- var/spack/repos/builtin/packages/adios2/package.py | 2 +- var/spack/repos/builtin/packages/adlbx/package.py | 2 +- var/spack/repos/builtin/packages/adol-c/package.py | 2 +- var/spack/repos/builtin/packages/albert/package.py | 2 +- var/spack/repos/builtin/packages/alglib/package.py | 2 +- var/spack/repos/builtin/packages/allinea-forge/package.py | 2 +- var/spack/repos/builtin/packages/allinea-reports/package.py | 2 +- var/spack/repos/builtin/packages/allpaths-lg/package.py | 2 +- var/spack/repos/builtin/packages/alquimia/package.py | 2 +- var/spack/repos/builtin/packages/alsa-lib/package.py | 2 +- var/spack/repos/builtin/packages/amg/package.py | 2 +- var/spack/repos/builtin/packages/amg2013/package.py | 2 +- var/spack/repos/builtin/packages/amp/package.py | 2 +- var/spack/repos/builtin/packages/ampliconnoise/package.py | 2 +- var/spack/repos/builtin/packages/amrex/package.py | 2 +- var/spack/repos/builtin/packages/andi/package.py | 2 +- var/spack/repos/builtin/packages/angsd/package.py | 2 +- var/spack/repos/builtin/packages/ant/package.py | 2 +- var/spack/repos/builtin/packages/antlr/package.py | 2 +- var/spack/repos/builtin/packages/ape/package.py | 2 +- var/spack/repos/builtin/packages/apex/package.py | 2 +- var/spack/repos/builtin/packages/applewmproto/package.py | 2 +- var/spack/repos/builtin/packages/appres/package.py | 2 +- var/spack/repos/builtin/packages/apr-util/package.py | 2 +- var/spack/repos/builtin/packages/apr/package.py | 2 +- var/spack/repos/builtin/packages/archer/package.py | 2 +- var/spack/repos/builtin/packages/argp-standalone/package.py | 2 +- var/spack/repos/builtin/packages/argtable/package.py | 2 +- var/spack/repos/builtin/packages/arlecore/package.py | 2 +- var/spack/repos/builtin/packages/armadillo/package.py | 2 +- var/spack/repos/builtin/packages/arpack-ng/package.py | 2 +- var/spack/repos/builtin/packages/ascent/package.py | 2 +- var/spack/repos/builtin/packages/asciidoc/package.py | 2 +- var/spack/repos/builtin/packages/aspa/package.py | 2 +- var/spack/repos/builtin/packages/aspcud/package.py | 2 +- var/spack/repos/builtin/packages/aspell/package.py | 2 +- var/spack/repos/builtin/packages/aspell6-de/package.py | 2 +- var/spack/repos/builtin/packages/aspell6-en/package.py | 2 +- var/spack/repos/builtin/packages/aspell6-es/package.py | 2 +- var/spack/repos/builtin/packages/assimp/package.py | 2 +- var/spack/repos/builtin/packages/astra/package.py | 2 +- var/spack/repos/builtin/packages/astral/package.py | 2 +- var/spack/repos/builtin/packages/astyle/package.py | 2 +- var/spack/repos/builtin/packages/atk/package.py | 2 +- var/spack/repos/builtin/packages/atlas/package.py | 2 +- var/spack/repos/builtin/packages/atom-dft/package.py | 2 +- var/spack/repos/builtin/packages/atompaw/package.py | 2 +- var/spack/repos/builtin/packages/atop/package.py | 2 +- var/spack/repos/builtin/packages/augustus/package.py | 2 +- var/spack/repos/builtin/packages/autoconf/package.py | 2 +- var/spack/repos/builtin/packages/autodock-vina/package.py | 2 +- var/spack/repos/builtin/packages/autogen/package.py | 2 +- var/spack/repos/builtin/packages/automaded/package.py | 2 +- var/spack/repos/builtin/packages/automake/package.py | 2 +- var/spack/repos/builtin/packages/bamtools/package.py | 2 +- var/spack/repos/builtin/packages/bamutil/package.py | 2 +- var/spack/repos/builtin/packages/barrnap/package.py | 2 +- var/spack/repos/builtin/packages/bash-completion/package.py | 2 +- var/spack/repos/builtin/packages/bash/package.py | 2 +- var/spack/repos/builtin/packages/bats/package.py | 2 +- var/spack/repos/builtin/packages/bbcp/package.py | 2 +- var/spack/repos/builtin/packages/bbmap/package.py | 2 +- var/spack/repos/builtin/packages/bc/package.py | 2 +- var/spack/repos/builtin/packages/bcftools/package.py | 2 +- var/spack/repos/builtin/packages/bcl2fastq2/package.py | 2 +- var/spack/repos/builtin/packages/bdftopcf/package.py | 2 +- var/spack/repos/builtin/packages/bdw-gc/package.py | 2 +- var/spack/repos/builtin/packages/bear/package.py | 2 +- var/spack/repos/builtin/packages/beast1/package.py | 2 +- var/spack/repos/builtin/packages/beast2/package.py | 2 +- var/spack/repos/builtin/packages/bedtools2/package.py | 2 +- var/spack/repos/builtin/packages/beforelight/package.py | 2 +- var/spack/repos/builtin/packages/benchmark/package.py | 2 +- var/spack/repos/builtin/packages/bertini/package.py | 2 +- var/spack/repos/builtin/packages/bib2xhtml/package.py | 2 +- var/spack/repos/builtin/packages/bigreqsproto/package.py | 2 +- var/spack/repos/builtin/packages/binutils/package.py | 2 +- var/spack/repos/builtin/packages/bioawk/package.py | 2 +- var/spack/repos/builtin/packages/biopieces/package.py | 2 +- var/spack/repos/builtin/packages/bison/package.py | 2 +- var/spack/repos/builtin/packages/bitmap/package.py | 2 +- var/spack/repos/builtin/packages/blast-plus/package.py | 2 +- var/spack/repos/builtin/packages/blat/package.py | 2 +- var/spack/repos/builtin/packages/blaze/package.py | 2 +- var/spack/repos/builtin/packages/bliss/package.py | 2 +- var/spack/repos/builtin/packages/blitz/package.py | 2 +- var/spack/repos/builtin/packages/bmake/package.py | 2 +- var/spack/repos/builtin/packages/bohrium/package.py | 2 +- var/spack/repos/builtin/packages/boost/package.py | 2 +- var/spack/repos/builtin/packages/bowtie/package.py | 2 +- var/spack/repos/builtin/packages/bowtie2/package.py | 2 +- var/spack/repos/builtin/packages/boxlib/package.py | 2 +- var/spack/repos/builtin/packages/bpp-core/package.py | 2 +- var/spack/repos/builtin/packages/bpp-phyl/package.py | 2 +- var/spack/repos/builtin/packages/bpp-seq/package.py | 2 +- var/spack/repos/builtin/packages/bpp-suite/package.py | 2 +- var/spack/repos/builtin/packages/bracken/package.py | 2 +- var/spack/repos/builtin/packages/braker/package.py | 2 +- var/spack/repos/builtin/packages/breakdancer/package.py | 2 +- var/spack/repos/builtin/packages/breseq/package.py | 2 +- var/spack/repos/builtin/packages/brigand/package.py | 2 +- var/spack/repos/builtin/packages/bsseeker2/package.py | 2 +- var/spack/repos/builtin/packages/bucky/package.py | 2 +- var/spack/repos/builtin/packages/busco/package.py | 2 +- var/spack/repos/builtin/packages/butter/package.py | 2 +- var/spack/repos/builtin/packages/bwa/package.py | 2 +- var/spack/repos/builtin/packages/byobu/package.py | 2 +- var/spack/repos/builtin/packages/bzip2/package.py | 2 +- var/spack/repos/builtin/packages/c-blosc/package.py | 2 +- var/spack/repos/builtin/packages/caffe/package.py | 2 +- var/spack/repos/builtin/packages/cairo/package.py | 2 +- var/spack/repos/builtin/packages/caliper/package.py | 2 +- var/spack/repos/builtin/packages/callpath/package.py | 2 +- var/spack/repos/builtin/packages/cantera/package.py | 2 +- var/spack/repos/builtin/packages/canu/package.py | 2 +- var/spack/repos/builtin/packages/cap3/package.py | 2 +- var/spack/repos/builtin/packages/cares/package.py | 2 +- var/spack/repos/builtin/packages/cask/package.py | 2 +- var/spack/repos/builtin/packages/casper/package.py | 2 +- var/spack/repos/builtin/packages/catch/package.py | 2 +- var/spack/repos/builtin/packages/cbench/package.py | 2 +- var/spack/repos/builtin/packages/cblas/package.py | 2 +- var/spack/repos/builtin/packages/ccache/package.py | 2 +- var/spack/repos/builtin/packages/cctools/package.py | 2 +- var/spack/repos/builtin/packages/cdbfasta/package.py | 2 +- var/spack/repos/builtin/packages/cdd/package.py | 2 +- var/spack/repos/builtin/packages/cddlib/package.py | 2 +- var/spack/repos/builtin/packages/cdhit/package.py | 2 +- var/spack/repos/builtin/packages/cdo/package.py | 2 +- var/spack/repos/builtin/packages/cereal/package.py | 2 +- var/spack/repos/builtin/packages/cfitsio/package.py | 2 +- var/spack/repos/builtin/packages/cgal/package.py | 2 +- var/spack/repos/builtin/packages/cgm/package.py | 2 +- var/spack/repos/builtin/packages/cgns/package.py | 2 +- var/spack/repos/builtin/packages/charm/package.py | 2 +- var/spack/repos/builtin/packages/check/package.py | 2 +- var/spack/repos/builtin/packages/chlorop/package.py | 2 +- var/spack/repos/builtin/packages/chombo/package.py | 2 +- var/spack/repos/builtin/packages/cistem/package.py | 2 +- var/spack/repos/builtin/packages/cityhash/package.py | 2 +- var/spack/repos/builtin/packages/clamr/package.py | 2 +- var/spack/repos/builtin/packages/cleaveland4/package.py | 2 +- var/spack/repos/builtin/packages/cleverleaf/package.py | 2 +- var/spack/repos/builtin/packages/clfft/package.py | 2 +- var/spack/repos/builtin/packages/clhep/package.py | 2 +- var/spack/repos/builtin/packages/clingo/package.py | 2 +- var/spack/repos/builtin/packages/cloc/package.py | 2 +- var/spack/repos/builtin/packages/cloog/package.py | 2 +- var/spack/repos/builtin/packages/cloverleaf/package.py | 2 +- var/spack/repos/builtin/packages/cloverleaf3d/package.py | 2 +- var/spack/repos/builtin/packages/clustalo/package.py | 2 +- var/spack/repos/builtin/packages/clustalw/package.py | 2 +- var/spack/repos/builtin/packages/cmake/package.py | 2 +- var/spack/repos/builtin/packages/cmocka/package.py | 2 +- var/spack/repos/builtin/packages/cmor/package.py | 2 +- var/spack/repos/builtin/packages/cnmem/package.py | 2 +- var/spack/repos/builtin/packages/cnpy/package.py | 2 +- var/spack/repos/builtin/packages/cntk/package.py | 2 +- var/spack/repos/builtin/packages/cntk1bitsgd/package.py | 2 +- var/spack/repos/builtin/packages/codar-cheetah/package.py | 2 +- var/spack/repos/builtin/packages/cohmm/package.py | 2 +- var/spack/repos/builtin/packages/coinhsl/package.py | 2 +- var/spack/repos/builtin/packages/colordiff/package.py | 2 +- var/spack/repos/builtin/packages/comd/package.py | 2 +- var/spack/repos/builtin/packages/compiz/package.py | 2 +- var/spack/repos/builtin/packages/compositeproto/package.py | 2 +- var/spack/repos/builtin/packages/conduit/package.py | 2 +- var/spack/repos/builtin/packages/constype/package.py | 2 +- var/spack/repos/builtin/packages/converge/package.py | 2 +- var/spack/repos/builtin/packages/coreutils/package.py | 2 +- var/spack/repos/builtin/packages/corset/package.py | 2 +- var/spack/repos/builtin/packages/cosmomc/package.py | 2 +- var/spack/repos/builtin/packages/cosp2/package.py | 2 +- var/spack/repos/builtin/packages/cp2k/package.py | 2 +- var/spack/repos/builtin/packages/cppad/package.py | 2 +- var/spack/repos/builtin/packages/cppcheck/package.py | 2 +- var/spack/repos/builtin/packages/cpprestsdk/package.py | 2 +- var/spack/repos/builtin/packages/cppunit/package.py | 2 +- var/spack/repos/builtin/packages/cppzmq/package.py | 2 +- var/spack/repos/builtin/packages/cram/package.py | 2 +- var/spack/repos/builtin/packages/cryptopp/package.py | 2 +- var/spack/repos/builtin/packages/cscope/package.py | 2 +- var/spack/repos/builtin/packages/csdp/package.py | 2 +- var/spack/repos/builtin/packages/ctffind/package.py | 2 +- var/spack/repos/builtin/packages/cub/package.py | 2 +- var/spack/repos/builtin/packages/cube/package.py | 2 +- var/spack/repos/builtin/packages/cuda-memtest/package.py | 2 +- var/spack/repos/builtin/packages/cuda/package.py | 2 +- var/spack/repos/builtin/packages/cudnn/package.py | 2 +- var/spack/repos/builtin/packages/cufflinks/package.py | 2 +- var/spack/repos/builtin/packages/cups/package.py | 2 +- var/spack/repos/builtin/packages/curl/package.py | 2 +- var/spack/repos/builtin/packages/cvs/package.py | 2 +- var/spack/repos/builtin/packages/czmq/package.py | 2 +- var/spack/repos/builtin/packages/dakota/package.py | 2 +- var/spack/repos/builtin/packages/daligner/package.py | 2 +- var/spack/repos/builtin/packages/damageproto/package.py | 2 +- var/spack/repos/builtin/packages/damselfly/package.py | 2 +- var/spack/repos/builtin/packages/darshan-runtime/package.py | 2 +- var/spack/repos/builtin/packages/darshan-util/package.py | 2 +- var/spack/repos/builtin/packages/dash/package.py | 2 +- var/spack/repos/builtin/packages/datamash/package.py | 2 +- var/spack/repos/builtin/packages/dataspaces/package.py | 2 +- var/spack/repos/builtin/packages/dbus/package.py | 2 +- var/spack/repos/builtin/packages/dealii/package.py | 2 +- var/spack/repos/builtin/packages/deconseq-standalone/package.py | 2 +- var/spack/repos/builtin/packages/dejagnu/package.py | 2 +- var/spack/repos/builtin/packages/delly2/package.py | 2 +- var/spack/repos/builtin/packages/denovogear/package.py | 2 +- var/spack/repos/builtin/packages/dia/package.py | 2 +- var/spack/repos/builtin/packages/dialign-tx/package.py | 2 +- var/spack/repos/builtin/packages/diamond/package.py | 2 +- var/spack/repos/builtin/packages/diffsplice/package.py | 2 +- var/spack/repos/builtin/packages/direnv/package.py | 2 +- var/spack/repos/builtin/packages/discovar/package.py | 2 +- var/spack/repos/builtin/packages/discovardenovo/package.py | 2 +- var/spack/repos/builtin/packages/dislin/package.py | 2 +- var/spack/repos/builtin/packages/dlpack/package.py | 2 +- var/spack/repos/builtin/packages/dmlc-core/package.py | 2 +- var/spack/repos/builtin/packages/dmxproto/package.py | 2 +- var/spack/repos/builtin/packages/docbook-xml/package.py | 2 +- var/spack/repos/builtin/packages/docbook-xsl/package.py | 2 +- var/spack/repos/builtin/packages/dos2unix/package.py | 2 +- var/spack/repos/builtin/packages/double-conversion/package.py | 2 +- var/spack/repos/builtin/packages/doxygen/package.py | 2 +- var/spack/repos/builtin/packages/dri2proto/package.py | 2 +- var/spack/repos/builtin/packages/dri3proto/package.py | 2 +- var/spack/repos/builtin/packages/dsdp/package.py | 2 +- var/spack/repos/builtin/packages/dtcmp/package.py | 2 +- var/spack/repos/builtin/packages/dyninst/package.py | 2 +- var/spack/repos/builtin/packages/ea-utils/package.py | 2 +- var/spack/repos/builtin/packages/ebms/package.py | 2 +- var/spack/repos/builtin/packages/eccodes/package.py | 2 +- var/spack/repos/builtin/packages/ecp-proxy-apps/package.py | 2 +- var/spack/repos/builtin/packages/ed/package.py | 2 +- var/spack/repos/builtin/packages/editres/package.py | 2 +- var/spack/repos/builtin/packages/eigen/package.py | 2 +- var/spack/repos/builtin/packages/elemental/package.py | 2 +- var/spack/repos/builtin/packages/elfutils/package.py | 2 +- var/spack/repos/builtin/packages/elk/package.py | 2 +- var/spack/repos/builtin/packages/elpa/package.py | 2 +- var/spack/repos/builtin/packages/emacs/package.py | 2 +- var/spack/repos/builtin/packages/emboss/package.py | 2 +- var/spack/repos/builtin/packages/encodings/package.py | 2 +- var/spack/repos/builtin/packages/environment-modules/package.py | 2 +- var/spack/repos/builtin/packages/es/package.py | 2 +- var/spack/repos/builtin/packages/esmf/package.py | 2 +- var/spack/repos/builtin/packages/espresso/package.py | 2 +- var/spack/repos/builtin/packages/essl/package.py | 2 +- var/spack/repos/builtin/packages/ethminer/package.py | 2 +- var/spack/repos/builtin/packages/etsf-io/package.py | 2 +- var/spack/repos/builtin/packages/everytrace-example/package.py | 2 +- var/spack/repos/builtin/packages/everytrace/package.py | 2 +- var/spack/repos/builtin/packages/evieext/package.py | 2 +- var/spack/repos/builtin/packages/exabayes/package.py | 2 +- var/spack/repos/builtin/packages/exmcutils/package.py | 2 +- var/spack/repos/builtin/packages/exodusii/package.py | 2 +- var/spack/repos/builtin/packages/exonerate/package.py | 2 +- var/spack/repos/builtin/packages/expat/package.py | 2 +- var/spack/repos/builtin/packages/expect/package.py | 2 +- var/spack/repos/builtin/packages/express/package.py | 2 +- var/spack/repos/builtin/packages/extrae/package.py | 2 +- var/spack/repos/builtin/packages/exuberant-ctags/package.py | 2 +- var/spack/repos/builtin/packages/falcon/package.py | 2 +- var/spack/repos/builtin/packages/farmhash/package.py | 2 +- var/spack/repos/builtin/packages/fastjar/package.py | 2 +- var/spack/repos/builtin/packages/fastmath/package.py | 2 +- var/spack/repos/builtin/packages/fastme/package.py | 2 +- var/spack/repos/builtin/packages/fastphase/package.py | 2 +- var/spack/repos/builtin/packages/fastq-screen/package.py | 2 +- var/spack/repos/builtin/packages/fastqc/package.py | 2 +- var/spack/repos/builtin/packages/fastqvalidator/package.py | 2 +- var/spack/repos/builtin/packages/fasttree/package.py | 2 +- var/spack/repos/builtin/packages/fastx-toolkit/package.py | 2 +- var/spack/repos/builtin/packages/fenics/package.py | 2 +- var/spack/repos/builtin/packages/ferret/package.py | 2 +- var/spack/repos/builtin/packages/ffmpeg/package.py | 2 +- var/spack/repos/builtin/packages/fftw/package.py | 2 +- var/spack/repos/builtin/packages/fimpute/package.py | 2 +- var/spack/repos/builtin/packages/findutils/package.py | 2 +- var/spack/repos/builtin/packages/fio/package.py | 2 +- var/spack/repos/builtin/packages/fish/package.py | 2 +- var/spack/repos/builtin/packages/fixesproto/package.py | 2 +- var/spack/repos/builtin/packages/flac/package.py | 2 +- var/spack/repos/builtin/packages/flann/package.py | 2 +- var/spack/repos/builtin/packages/flash/package.py | 2 +- var/spack/repos/builtin/packages/flex/package.py | 2 +- var/spack/repos/builtin/packages/flint/package.py | 2 +- var/spack/repos/builtin/packages/flit/package.py | 2 +- var/spack/repos/builtin/packages/fltk/package.py | 2 +- var/spack/repos/builtin/packages/flux/package.py | 2 +- var/spack/repos/builtin/packages/fluxbox/package.py | 2 +- var/spack/repos/builtin/packages/fmt/package.py | 2 +- var/spack/repos/builtin/packages/foam-extend/package.py | 2 +- var/spack/repos/builtin/packages/folly/package.py | 2 +- var/spack/repos/builtin/packages/font-adobe-100dpi/package.py | 2 +- var/spack/repos/builtin/packages/font-adobe-75dpi/package.py | 2 +- var/spack/repos/builtin/packages/font-adobe-utopia-100dpi/package.py | 2 +- var/spack/repos/builtin/packages/font-adobe-utopia-75dpi/package.py | 2 +- var/spack/repos/builtin/packages/font-adobe-utopia-type1/package.py | 2 +- var/spack/repos/builtin/packages/font-alias/package.py | 2 +- var/spack/repos/builtin/packages/font-arabic-misc/package.py | 2 +- var/spack/repos/builtin/packages/font-bh-100dpi/package.py | 2 +- var/spack/repos/builtin/packages/font-bh-75dpi/package.py | 2 +- .../repos/builtin/packages/font-bh-lucidatypewriter-100dpi/package.py | 2 +- .../repos/builtin/packages/font-bh-lucidatypewriter-75dpi/package.py | 2 +- var/spack/repos/builtin/packages/font-bh-ttf/package.py | 2 +- var/spack/repos/builtin/packages/font-bh-type1/package.py | 2 +- var/spack/repos/builtin/packages/font-bitstream-100dpi/package.py | 2 +- var/spack/repos/builtin/packages/font-bitstream-75dpi/package.py | 2 +- var/spack/repos/builtin/packages/font-bitstream-speedo/package.py | 2 +- var/spack/repos/builtin/packages/font-bitstream-type1/package.py | 2 +- var/spack/repos/builtin/packages/font-cronyx-cyrillic/package.py | 2 +- var/spack/repos/builtin/packages/font-cursor-misc/package.py | 2 +- var/spack/repos/builtin/packages/font-daewoo-misc/package.py | 2 +- var/spack/repos/builtin/packages/font-dec-misc/package.py | 2 +- var/spack/repos/builtin/packages/font-ibm-type1/package.py | 2 +- var/spack/repos/builtin/packages/font-isas-misc/package.py | 2 +- var/spack/repos/builtin/packages/font-jis-misc/package.py | 2 +- var/spack/repos/builtin/packages/font-micro-misc/package.py | 2 +- var/spack/repos/builtin/packages/font-misc-cyrillic/package.py | 2 +- var/spack/repos/builtin/packages/font-misc-ethiopic/package.py | 2 +- var/spack/repos/builtin/packages/font-misc-meltho/package.py | 2 +- var/spack/repos/builtin/packages/font-misc-misc/package.py | 2 +- var/spack/repos/builtin/packages/font-mutt-misc/package.py | 2 +- var/spack/repos/builtin/packages/font-schumacher-misc/package.py | 2 +- var/spack/repos/builtin/packages/font-screen-cyrillic/package.py | 2 +- var/spack/repos/builtin/packages/font-sony-misc/package.py | 2 +- var/spack/repos/builtin/packages/font-sun-misc/package.py | 2 +- var/spack/repos/builtin/packages/font-util/package.py | 2 +- var/spack/repos/builtin/packages/font-winitzki-cyrillic/package.py | 2 +- var/spack/repos/builtin/packages/font-xfree86-type1/package.py | 2 +- var/spack/repos/builtin/packages/fontcacheproto/package.py | 2 +- var/spack/repos/builtin/packages/fontconfig/package.py | 2 +- var/spack/repos/builtin/packages/fontsproto/package.py | 2 +- var/spack/repos/builtin/packages/fonttosfnt/package.py | 2 +- var/spack/repos/builtin/packages/fpc/package.py | 2 +- var/spack/repos/builtin/packages/fr-hit/package.py | 2 +- var/spack/repos/builtin/packages/freebayes/package.py | 2 +- var/spack/repos/builtin/packages/freetype/package.py | 2 +- var/spack/repos/builtin/packages/fseq/package.py | 2 +- var/spack/repos/builtin/packages/fsl/package.py | 2 +- var/spack/repos/builtin/packages/fslsfonts/package.py | 2 +- var/spack/repos/builtin/packages/fstobdf/package.py | 2 +- var/spack/repos/builtin/packages/funhpc/package.py | 2 +- var/spack/repos/builtin/packages/gapbs/package.py | 2 +- var/spack/repos/builtin/packages/gapcloser/package.py | 2 +- var/spack/repos/builtin/packages/gapfiller/package.py | 2 +- var/spack/repos/builtin/packages/gasnet/package.py | 2 +- var/spack/repos/builtin/packages/gatk/package.py | 2 +- var/spack/repos/builtin/packages/gaussian/package.py | 2 +- var/spack/repos/builtin/packages/gawk/package.py | 2 +- var/spack/repos/builtin/packages/gblocks/package.py | 2 +- var/spack/repos/builtin/packages/gcc/package.py | 2 +- var/spack/repos/builtin/packages/gccmakedep/package.py | 2 +- var/spack/repos/builtin/packages/gconf/package.py | 2 +- var/spack/repos/builtin/packages/gcta/package.py | 2 +- var/spack/repos/builtin/packages/gdal/package.py | 2 +- var/spack/repos/builtin/packages/gdb/package.py | 2 +- var/spack/repos/builtin/packages/gdbm/package.py | 2 +- var/spack/repos/builtin/packages/gdk-pixbuf/package.py | 2 +- var/spack/repos/builtin/packages/geant4/package.py | 2 +- var/spack/repos/builtin/packages/gearshifft/package.py | 2 +- var/spack/repos/builtin/packages/gemmlowp/package.py | 2 +- var/spack/repos/builtin/packages/genemark-et/package.py | 2 +- var/spack/repos/builtin/packages/genometools/package.py | 2 +- var/spack/repos/builtin/packages/geos/package.py | 2 +- var/spack/repos/builtin/packages/gettext/package.py | 2 +- var/spack/repos/builtin/packages/gflags/package.py | 2 +- var/spack/repos/builtin/packages/ghost/package.py | 2 +- var/spack/repos/builtin/packages/ghostscript-fonts/package.py | 2 +- var/spack/repos/builtin/packages/ghostscript/package.py | 2 +- var/spack/repos/builtin/packages/giflib/package.py | 2 +- var/spack/repos/builtin/packages/git-imerge/package.py | 2 +- var/spack/repos/builtin/packages/git-lfs/package.py | 2 +- var/spack/repos/builtin/packages/git/package.py | 2 +- var/spack/repos/builtin/packages/gl2ps/package.py | 2 +- var/spack/repos/builtin/packages/glew/package.py | 2 +- var/spack/repos/builtin/packages/glfmultiples/package.py | 2 +- var/spack/repos/builtin/packages/glib/package.py | 2 +- var/spack/repos/builtin/packages/glimmer/package.py | 2 +- var/spack/repos/builtin/packages/glm/package.py | 2 +- var/spack/repos/builtin/packages/global/package.py | 2 +- var/spack/repos/builtin/packages/globalarrays/package.py | 2 +- var/spack/repos/builtin/packages/globus-toolkit/package.py | 2 +- var/spack/repos/builtin/packages/glog/package.py | 2 +- var/spack/repos/builtin/packages/glpk/package.py | 2 +- var/spack/repos/builtin/packages/glproto/package.py | 2 +- var/spack/repos/builtin/packages/gmake/package.py | 2 +- var/spack/repos/builtin/packages/gmap-gsnap/package.py | 2 +- var/spack/repos/builtin/packages/gmime/package.py | 2 +- var/spack/repos/builtin/packages/gmp/package.py | 2 +- var/spack/repos/builtin/packages/gmsh/package.py | 2 +- var/spack/repos/builtin/packages/gnat/package.py | 2 +- var/spack/repos/builtin/packages/gnu-prolog/package.py | 2 +- var/spack/repos/builtin/packages/gnupg/package.py | 2 +- var/spack/repos/builtin/packages/gnuplot/package.py | 2 +- var/spack/repos/builtin/packages/gnutls/package.py | 2 +- var/spack/repos/builtin/packages/go-bootstrap/package.py | 2 +- var/spack/repos/builtin/packages/go/package.py | 2 +- var/spack/repos/builtin/packages/gobject-introspection/package.py | 2 +- var/spack/repos/builtin/packages/googletest/package.py | 2 +- var/spack/repos/builtin/packages/gotcha/package.py | 2 +- var/spack/repos/builtin/packages/gource/package.py | 2 +- var/spack/repos/builtin/packages/gperf/package.py | 2 +- var/spack/repos/builtin/packages/gperftools/package.py | 2 +- var/spack/repos/builtin/packages/grackle/package.py | 2 +- var/spack/repos/builtin/packages/gradle/package.py | 2 +- var/spack/repos/builtin/packages/grandr/package.py | 2 +- var/spack/repos/builtin/packages/graph500/package.py | 2 +- var/spack/repos/builtin/packages/graphlib/package.py | 2 +- var/spack/repos/builtin/packages/graphmap/package.py | 2 +- var/spack/repos/builtin/packages/graphviz/package.py | 2 +- var/spack/repos/builtin/packages/grib-api/package.py | 2 +- var/spack/repos/builtin/packages/groff/package.py | 2 +- var/spack/repos/builtin/packages/gromacs/package.py | 2 +- var/spack/repos/builtin/packages/gsl/package.py | 2 +- var/spack/repos/builtin/packages/gslib/package.py | 2 +- var/spack/repos/builtin/packages/gtkorvo-atl/package.py | 2 +- var/spack/repos/builtin/packages/gtkorvo-cercs-env/package.py | 2 +- var/spack/repos/builtin/packages/gtkorvo-dill/package.py | 2 +- var/spack/repos/builtin/packages/gtkorvo-enet/package.py | 2 +- var/spack/repos/builtin/packages/gtkplus/package.py | 2 +- var/spack/repos/builtin/packages/gts/package.py | 2 +- var/spack/repos/builtin/packages/guidance/package.py | 2 +- var/spack/repos/builtin/packages/guile/package.py | 2 +- var/spack/repos/builtin/packages/h5hut/package.py | 2 +- var/spack/repos/builtin/packages/h5utils/package.py | 2 +- var/spack/repos/builtin/packages/h5z-zfp/package.py | 2 +- var/spack/repos/builtin/packages/hacckernels/package.py | 2 +- var/spack/repos/builtin/packages/hadoop/package.py | 2 +- var/spack/repos/builtin/packages/hapcut2/package.py | 2 +- var/spack/repos/builtin/packages/haploview/package.py | 2 +- var/spack/repos/builtin/packages/harfbuzz/package.py | 2 +- var/spack/repos/builtin/packages/harminv/package.py | 2 +- var/spack/repos/builtin/packages/hdf/package.py | 2 +- var/spack/repos/builtin/packages/hdf5-blosc/package.py | 2 +- var/spack/repos/builtin/packages/hdf5/package.py | 2 +- var/spack/repos/builtin/packages/help2man/package.py | 2 +- var/spack/repos/builtin/packages/hepmc/package.py | 2 +- var/spack/repos/builtin/packages/heppdt/package.py | 2 +- var/spack/repos/builtin/packages/highfive/package.py | 2 +- var/spack/repos/builtin/packages/highwayhash/package.py | 2 +- var/spack/repos/builtin/packages/hiop/package.py | 2 +- var/spack/repos/builtin/packages/hisat2/package.py | 2 +- var/spack/repos/builtin/packages/hmmer/package.py | 2 +- var/spack/repos/builtin/packages/hoomd-blue/package.py | 2 +- var/spack/repos/builtin/packages/hpccg/package.py | 2 +- var/spack/repos/builtin/packages/hpctoolkit-externals/package.py | 2 +- var/spack/repos/builtin/packages/hpctoolkit/package.py | 2 +- var/spack/repos/builtin/packages/hpgmg/package.py | 2 +- var/spack/repos/builtin/packages/hpl/package.py | 2 +- var/spack/repos/builtin/packages/hpx5/package.py | 2 +- var/spack/repos/builtin/packages/hsakmt/package.py | 2 +- var/spack/repos/builtin/packages/hstr/package.py | 2 +- var/spack/repos/builtin/packages/htop/package.py | 2 +- var/spack/repos/builtin/packages/htslib/package.py | 2 +- var/spack/repos/builtin/packages/httpie/package.py | 2 +- var/spack/repos/builtin/packages/hub/package.py | 2 +- var/spack/repos/builtin/packages/hunspell/package.py | 2 +- var/spack/repos/builtin/packages/hwloc/package.py | 2 +- var/spack/repos/builtin/packages/hybpiper/package.py | 2 +- var/spack/repos/builtin/packages/hydra/package.py | 2 +- var/spack/repos/builtin/packages/hypre/package.py | 2 +- var/spack/repos/builtin/packages/i3/package.py | 2 +- var/spack/repos/builtin/packages/ibmisc/package.py | 2 +- var/spack/repos/builtin/packages/iceauth/package.py | 2 +- var/spack/repos/builtin/packages/icedtea/package.py | 2 +- var/spack/repos/builtin/packages/icet/package.py | 2 +- var/spack/repos/builtin/packages/ico/package.py | 2 +- var/spack/repos/builtin/packages/icu4c/package.py | 2 +- var/spack/repos/builtin/packages/id3lib/package.py | 2 +- var/spack/repos/builtin/packages/idba/package.py | 2 +- var/spack/repos/builtin/packages/igraph/package.py | 2 +- var/spack/repos/builtin/packages/igv/package.py | 2 +- var/spack/repos/builtin/packages/igvtools/package.py | 2 +- var/spack/repos/builtin/packages/ilmbase/package.py | 2 +- var/spack/repos/builtin/packages/image-magick/package.py | 2 +- var/spack/repos/builtin/packages/imake/package.py | 2 +- var/spack/repos/builtin/packages/impute2/package.py | 2 +- var/spack/repos/builtin/packages/infernal/package.py | 2 +- var/spack/repos/builtin/packages/inputproto/package.py | 2 +- var/spack/repos/builtin/packages/intel-daal/package.py | 2 +- var/spack/repos/builtin/packages/intel-gpu-tools/package.py | 2 +- var/spack/repos/builtin/packages/intel-ipp/package.py | 2 +- var/spack/repos/builtin/packages/intel-mkl-dnn/package.py | 2 +- var/spack/repos/builtin/packages/intel-mkl/package.py | 2 +- var/spack/repos/builtin/packages/intel-mpi/package.py | 2 +- var/spack/repos/builtin/packages/intel-parallel-studio/package.py | 2 +- var/spack/repos/builtin/packages/intel-tbb/package.py | 2 +- var/spack/repos/builtin/packages/intel-xed/package.py | 2 +- var/spack/repos/builtin/packages/intel/package.py | 2 +- var/spack/repos/builtin/packages/intltool/package.py | 2 +- var/spack/repos/builtin/packages/ior/package.py | 2 +- var/spack/repos/builtin/packages/iozone/package.py | 2 +- var/spack/repos/builtin/packages/ipopt/package.py | 2 +- var/spack/repos/builtin/packages/isaac-server/package.py | 2 +- var/spack/repos/builtin/packages/isaac/package.py | 2 +- var/spack/repos/builtin/packages/isl/package.py | 2 +- var/spack/repos/builtin/packages/itstool/package.py | 2 +- var/spack/repos/builtin/packages/itsx/package.py | 2 +- var/spack/repos/builtin/packages/jags/package.py | 2 +- var/spack/repos/builtin/packages/jansson/package.py | 2 +- var/spack/repos/builtin/packages/jasper/package.py | 2 +- var/spack/repos/builtin/packages/jbigkit/package.py | 2 +- var/spack/repos/builtin/packages/jchronoss/package.py | 2 +- var/spack/repos/builtin/packages/jdk/package.py | 2 +- var/spack/repos/builtin/packages/jellyfish/package.py | 2 +- var/spack/repos/builtin/packages/jemalloc/package.py | 2 +- var/spack/repos/builtin/packages/jmol/package.py | 2 +- var/spack/repos/builtin/packages/jq/package.py | 2 +- var/spack/repos/builtin/packages/json-c/package.py | 2 +- var/spack/repos/builtin/packages/json-cwx/package.py | 2 +- var/spack/repos/builtin/packages/json-glib/package.py | 2 +- var/spack/repos/builtin/packages/jsoncpp/package.py | 2 +- var/spack/repos/builtin/packages/judy/package.py | 2 +- var/spack/repos/builtin/packages/julia/package.py | 2 +- var/spack/repos/builtin/packages/kaks-calculator/package.py | 2 +- var/spack/repos/builtin/packages/kaldi/package.py | 2 +- var/spack/repos/builtin/packages/kallisto/package.py | 2 +- var/spack/repos/builtin/packages/kbproto/package.py | 2 +- var/spack/repos/builtin/packages/kdiff3/package.py | 2 +- var/spack/repos/builtin/packages/kealib/package.py | 2 +- var/spack/repos/builtin/packages/kentutils/package.py | 2 +- var/spack/repos/builtin/packages/kmergenie/package.py | 2 +- var/spack/repos/builtin/packages/kokkos/package.py | 2 +- var/spack/repos/builtin/packages/kraken/package.py | 2 +- var/spack/repos/builtin/packages/krims/package.py | 2 +- var/spack/repos/builtin/packages/kripke/package.py | 2 +- var/spack/repos/builtin/packages/kvasir-mpl/package.py | 2 +- var/spack/repos/builtin/packages/laghos/package.py | 2 +- var/spack/repos/builtin/packages/lammps/package.py | 2 +- var/spack/repos/builtin/packages/last/package.py | 2 +- var/spack/repos/builtin/packages/launchmon/package.py | 2 +- var/spack/repos/builtin/packages/lazyten/package.py | 2 +- var/spack/repos/builtin/packages/lbann/package.py | 2 +- var/spack/repos/builtin/packages/lbxproxy/package.py | 2 +- var/spack/repos/builtin/packages/lcals/package.py | 2 +- var/spack/repos/builtin/packages/lcms/package.py | 2 +- var/spack/repos/builtin/packages/ldc-bootstrap/package.py | 2 +- var/spack/repos/builtin/packages/ldc/package.py | 2 +- var/spack/repos/builtin/packages/leveldb/package.py | 2 +- var/spack/repos/builtin/packages/lftp/package.py | 2 +- var/spack/repos/builtin/packages/libaec/package.py | 2 +- var/spack/repos/builtin/packages/libaio/package.py | 2 +- var/spack/repos/builtin/packages/libapplewm/package.py | 2 +- var/spack/repos/builtin/packages/libarchive/package.py | 2 +- var/spack/repos/builtin/packages/libassuan/package.py | 2 +- var/spack/repos/builtin/packages/libatomic-ops/package.py | 2 +- var/spack/repos/builtin/packages/libbeagle/package.py | 2 +- var/spack/repos/builtin/packages/libbsd/package.py | 2 +- var/spack/repos/builtin/packages/libbson/package.py | 2 +- var/spack/repos/builtin/packages/libcanberra/package.py | 2 +- var/spack/repos/builtin/packages/libcap/package.py | 2 +- var/spack/repos/builtin/packages/libcerf/package.py | 2 +- var/spack/repos/builtin/packages/libcheck/package.py | 2 +- var/spack/repos/builtin/packages/libcint/package.py | 2 +- var/spack/repos/builtin/packages/libcircle/package.py | 2 +- var/spack/repos/builtin/packages/libconfig/package.py | 2 +- var/spack/repos/builtin/packages/libcroco/package.py | 2 +- var/spack/repos/builtin/packages/libctl/package.py | 2 +- var/spack/repos/builtin/packages/libdivsufsort/package.py | 2 +- var/spack/repos/builtin/packages/libdmx/package.py | 2 +- var/spack/repos/builtin/packages/libdrm/package.py | 2 +- var/spack/repos/builtin/packages/libdwarf/package.py | 2 +- var/spack/repos/builtin/packages/libedit/package.py | 2 +- var/spack/repos/builtin/packages/libelf/package.py | 2 +- var/spack/repos/builtin/packages/libemos/package.py | 2 +- var/spack/repos/builtin/packages/libepoxy/package.py | 2 +- var/spack/repos/builtin/packages/libev/package.py | 2 +- var/spack/repos/builtin/packages/libevent/package.py | 2 +- var/spack/repos/builtin/packages/libevpath/package.py | 2 +- var/spack/repos/builtin/packages/libfabric/package.py | 2 +- var/spack/repos/builtin/packages/libffi/package.py | 2 +- var/spack/repos/builtin/packages/libffs/package.py | 2 +- var/spack/repos/builtin/packages/libfontenc/package.py | 2 +- var/spack/repos/builtin/packages/libfs/package.py | 2 +- var/spack/repos/builtin/packages/libgcrypt/package.py | 2 +- var/spack/repos/builtin/packages/libgd/package.py | 2 +- var/spack/repos/builtin/packages/libgit2/package.py | 2 +- var/spack/repos/builtin/packages/libgpg-error/package.py | 2 +- var/spack/repos/builtin/packages/libgpuarray/package.py | 2 +- var/spack/repos/builtin/packages/libgridxc/package.py | 2 +- var/spack/repos/builtin/packages/libgtextutils/package.py | 2 +- var/spack/repos/builtin/packages/libharu/package.py | 2 +- var/spack/repos/builtin/packages/libhio/package.py | 2 +- var/spack/repos/builtin/packages/libice/package.py | 2 +- var/spack/repos/builtin/packages/libiconv/package.py | 2 +- var/spack/repos/builtin/packages/libint/package.py | 2 +- var/spack/repos/builtin/packages/libjpeg-turbo/package.py | 2 +- var/spack/repos/builtin/packages/libjpeg/package.py | 2 +- var/spack/repos/builtin/packages/libksba/package.py | 2 +- var/spack/repos/builtin/packages/liblbxutil/package.py | 2 +- var/spack/repos/builtin/packages/libmatheval/package.py | 2 +- var/spack/repos/builtin/packages/libmesh/package.py | 2 +- var/spack/repos/builtin/packages/libmng/package.py | 2 +- var/spack/repos/builtin/packages/libmongoc/package.py | 2 +- var/spack/repos/builtin/packages/libmonitor/package.py | 2 +- var/spack/repos/builtin/packages/libnbc/package.py | 2 +- var/spack/repos/builtin/packages/libogg/package.py | 2 +- var/spack/repos/builtin/packages/liboldx/package.py | 2 +- var/spack/repos/builtin/packages/libpcap/package.py | 2 +- var/spack/repos/builtin/packages/libpciaccess/package.py | 2 +- var/spack/repos/builtin/packages/libpfm4/package.py | 2 +- var/spack/repos/builtin/packages/libpipeline/package.py | 2 +- var/spack/repos/builtin/packages/libpng/package.py | 2 +- var/spack/repos/builtin/packages/libpsl/package.py | 2 +- var/spack/repos/builtin/packages/libpthread-stubs/package.py | 2 +- var/spack/repos/builtin/packages/libquo/package.py | 2 +- var/spack/repos/builtin/packages/librom/package.py | 2 +- var/spack/repos/builtin/packages/libsigsegv/package.py | 2 +- var/spack/repos/builtin/packages/libsm/package.py | 2 +- var/spack/repos/builtin/packages/libsodium/package.py | 2 +- var/spack/repos/builtin/packages/libspatialindex/package.py | 2 +- var/spack/repos/builtin/packages/libsplash/package.py | 2 +- var/spack/repos/builtin/packages/libssh2/package.py | 2 +- var/spack/repos/builtin/packages/libsvm/package.py | 2 +- var/spack/repos/builtin/packages/libszip/package.py | 2 +- var/spack/repos/builtin/packages/libtermkey/package.py | 2 +- var/spack/repos/builtin/packages/libtiff/package.py | 2 +- var/spack/repos/builtin/packages/libtool/package.py | 2 +- var/spack/repos/builtin/packages/libunistring/package.py | 2 +- var/spack/repos/builtin/packages/libunwind/package.py | 2 +- var/spack/repos/builtin/packages/libuuid/package.py | 2 +- var/spack/repos/builtin/packages/libuv/package.py | 2 +- var/spack/repos/builtin/packages/libvorbis/package.py | 2 +- var/spack/repos/builtin/packages/libvterm/package.py | 2 +- var/spack/repos/builtin/packages/libwebsockets/package.py | 2 +- var/spack/repos/builtin/packages/libwindowswm/package.py | 2 +- var/spack/repos/builtin/packages/libx11/package.py | 2 +- var/spack/repos/builtin/packages/libxau/package.py | 2 +- var/spack/repos/builtin/packages/libxaw/package.py | 2 +- var/spack/repos/builtin/packages/libxaw3d/package.py | 2 +- var/spack/repos/builtin/packages/libxc/package.py | 2 +- var/spack/repos/builtin/packages/libxcb/package.py | 2 +- var/spack/repos/builtin/packages/libxcomposite/package.py | 2 +- var/spack/repos/builtin/packages/libxcursor/package.py | 2 +- var/spack/repos/builtin/packages/libxdamage/package.py | 2 +- var/spack/repos/builtin/packages/libxdmcp/package.py | 2 +- var/spack/repos/builtin/packages/libxevie/package.py | 2 +- var/spack/repos/builtin/packages/libxext/package.py | 2 +- var/spack/repos/builtin/packages/libxfixes/package.py | 2 +- var/spack/repos/builtin/packages/libxfont/package.py | 2 +- var/spack/repos/builtin/packages/libxfont2/package.py | 2 +- var/spack/repos/builtin/packages/libxfontcache/package.py | 2 +- var/spack/repos/builtin/packages/libxft/package.py | 2 +- var/spack/repos/builtin/packages/libxi/package.py | 2 +- var/spack/repos/builtin/packages/libxinerama/package.py | 2 +- var/spack/repos/builtin/packages/libxkbcommon/package.py | 2 +- var/spack/repos/builtin/packages/libxkbfile/package.py | 2 +- var/spack/repos/builtin/packages/libxkbui/package.py | 2 +- var/spack/repos/builtin/packages/libxml2/package.py | 2 +- var/spack/repos/builtin/packages/libxmu/package.py | 2 +- var/spack/repos/builtin/packages/libxp/package.py | 2 +- var/spack/repos/builtin/packages/libxpm/package.py | 2 +- var/spack/repos/builtin/packages/libxpresent/package.py | 2 +- var/spack/repos/builtin/packages/libxprintapputil/package.py | 2 +- var/spack/repos/builtin/packages/libxprintutil/package.py | 2 +- var/spack/repos/builtin/packages/libxrandr/package.py | 2 +- var/spack/repos/builtin/packages/libxrender/package.py | 2 +- var/spack/repos/builtin/packages/libxres/package.py | 2 +- var/spack/repos/builtin/packages/libxscrnsaver/package.py | 2 +- var/spack/repos/builtin/packages/libxshmfence/package.py | 2 +- var/spack/repos/builtin/packages/libxslt/package.py | 2 +- var/spack/repos/builtin/packages/libxsmm/package.py | 2 +- var/spack/repos/builtin/packages/libxstream/package.py | 2 +- var/spack/repos/builtin/packages/libxt/package.py | 2 +- var/spack/repos/builtin/packages/libxtrap/package.py | 2 +- var/spack/repos/builtin/packages/libxtst/package.py | 2 +- var/spack/repos/builtin/packages/libxv/package.py | 2 +- var/spack/repos/builtin/packages/libxvmc/package.py | 2 +- var/spack/repos/builtin/packages/libxxf86dga/package.py | 2 +- var/spack/repos/builtin/packages/libxxf86misc/package.py | 2 +- var/spack/repos/builtin/packages/libxxf86vm/package.py | 2 +- var/spack/repos/builtin/packages/libyogrt/package.py | 2 +- var/spack/repos/builtin/packages/libzip/package.py | 2 +- var/spack/repos/builtin/packages/likwid/package.py | 2 +- var/spack/repos/builtin/packages/linkphase3/package.py | 2 +- var/spack/repos/builtin/packages/linux-headers/package.py | 2 +- var/spack/repos/builtin/packages/listres/package.py | 2 +- var/spack/repos/builtin/packages/llvm/package.py | 2 +- var/spack/repos/builtin/packages/lmdb/package.py | 2 +- var/spack/repos/builtin/packages/lmod/package.py | 2 +- var/spack/repos/builtin/packages/lndir/package.py | 2 +- var/spack/repos/builtin/packages/log4cplus/package.py | 2 +- var/spack/repos/builtin/packages/log4cxx/package.py | 2 +- var/spack/repos/builtin/packages/lrslib/package.py | 2 +- var/spack/repos/builtin/packages/lrzip/package.py | 2 +- var/spack/repos/builtin/packages/lua-bitlib/package.py | 2 +- var/spack/repos/builtin/packages/lua-jit/package.py | 2 +- var/spack/repos/builtin/packages/lua-lpeg/package.py | 2 +- var/spack/repos/builtin/packages/lua-luafilesystem/package.py | 2 +- var/spack/repos/builtin/packages/lua-luaposix/package.py | 2 +- var/spack/repos/builtin/packages/lua-mpack/package.py | 2 +- var/spack/repos/builtin/packages/lua/package.py | 2 +- var/spack/repos/builtin/packages/luit/package.py | 2 +- var/spack/repos/builtin/packages/lulesh/package.py | 2 +- var/spack/repos/builtin/packages/lumpy-sv/package.py | 2 +- var/spack/repos/builtin/packages/lwgrp/package.py | 2 +- var/spack/repos/builtin/packages/lwm2/package.py | 2 +- var/spack/repos/builtin/packages/lz4/package.py | 2 +- var/spack/repos/builtin/packages/lzma/package.py | 2 +- var/spack/repos/builtin/packages/lzo/package.py | 2 +- var/spack/repos/builtin/packages/m4/package.py | 2 +- var/spack/repos/builtin/packages/macsio/package.py | 2 +- var/spack/repos/builtin/packages/mafft/package.py | 2 +- var/spack/repos/builtin/packages/magics/package.py | 2 +- var/spack/repos/builtin/packages/magma/package.py | 2 +- var/spack/repos/builtin/packages/makedepend/package.py | 2 +- var/spack/repos/builtin/packages/mallocmc/package.py | 2 +- var/spack/repos/builtin/packages/man-db/package.py | 2 +- var/spack/repos/builtin/packages/maq/package.py | 2 +- var/spack/repos/builtin/packages/mariadb/package.py | 2 +- var/spack/repos/builtin/packages/masa/package.py | 2 +- var/spack/repos/builtin/packages/masurca/package.py | 2 +- var/spack/repos/builtin/packages/matio/package.py | 2 +- var/spack/repos/builtin/packages/matlab/package.py | 2 +- var/spack/repos/builtin/packages/maven/package.py | 2 +- var/spack/repos/builtin/packages/maverick/package.py | 2 +- var/spack/repos/builtin/packages/mawk/package.py | 2 +- var/spack/repos/builtin/packages/mbedtls/package.py | 2 +- var/spack/repos/builtin/packages/mc/package.py | 2 +- var/spack/repos/builtin/packages/mcl/package.py | 2 +- var/spack/repos/builtin/packages/mdtest/package.py | 2 +- var/spack/repos/builtin/packages/meep/package.py | 2 +- var/spack/repos/builtin/packages/mefit/package.py | 2 +- var/spack/repos/builtin/packages/memaxes/package.py | 2 +- var/spack/repos/builtin/packages/meme/package.py | 2 +- var/spack/repos/builtin/packages/meraculous/package.py | 2 +- var/spack/repos/builtin/packages/mercurial/package.py | 2 +- var/spack/repos/builtin/packages/mesa-glu/package.py | 2 +- var/spack/repos/builtin/packages/mesa/package.py | 2 +- var/spack/repos/builtin/packages/meshkit/package.py | 2 +- var/spack/repos/builtin/packages/meson/package.py | 2 +- var/spack/repos/builtin/packages/mesquite/package.py | 2 +- var/spack/repos/builtin/packages/metaphysicl/package.py | 2 +- var/spack/repos/builtin/packages/metasv/package.py | 2 +- var/spack/repos/builtin/packages/metis/package.py | 2 +- var/spack/repos/builtin/packages/mfem/package.py | 2 +- var/spack/repos/builtin/packages/microbiomeutil/package.py | 2 +- var/spack/repos/builtin/packages/minced/package.py | 2 +- var/spack/repos/builtin/packages/miniaero/package.py | 2 +- var/spack/repos/builtin/packages/miniamr/package.py | 2 +- var/spack/repos/builtin/packages/miniconda2/package.py | 2 +- var/spack/repos/builtin/packages/miniconda3/package.py | 2 +- var/spack/repos/builtin/packages/minife/package.py | 2 +- var/spack/repos/builtin/packages/minighost/package.py | 2 +- var/spack/repos/builtin/packages/minigmg/package.py | 2 +- var/spack/repos/builtin/packages/minimap2/package.py | 2 +- var/spack/repos/builtin/packages/minimd/package.py | 2 +- var/spack/repos/builtin/packages/minisign/package.py | 2 +- var/spack/repos/builtin/packages/minismac2d/package.py | 2 +- var/spack/repos/builtin/packages/minitri/package.py | 2 +- var/spack/repos/builtin/packages/minixyce/package.py | 2 +- var/spack/repos/builtin/packages/mira/package.py | 2 +- var/spack/repos/builtin/packages/mirdeep/package.py | 2 +- var/spack/repos/builtin/packages/mitofates/package.py | 2 +- var/spack/repos/builtin/packages/mitos/package.py | 2 +- var/spack/repos/builtin/packages/mkfontdir/package.py | 2 +- var/spack/repos/builtin/packages/mkfontscale/package.py | 2 +- var/spack/repos/builtin/packages/mlhka/package.py | 2 +- var/spack/repos/builtin/packages/moab/package.py | 2 +- var/spack/repos/builtin/packages/modern-wheel/package.py | 2 +- var/spack/repos/builtin/packages/molcas/package.py | 2 +- var/spack/repos/builtin/packages/mono/package.py | 2 +- var/spack/repos/builtin/packages/mosh/package.py | 2 +- var/spack/repos/builtin/packages/mothur/package.py | 2 +- var/spack/repos/builtin/packages/motif/package.py | 2 +- var/spack/repos/builtin/packages/motioncor2/package.py | 2 +- var/spack/repos/builtin/packages/mozjs/package.py | 2 +- var/spack/repos/builtin/packages/mpc/package.py | 2 +- var/spack/repos/builtin/packages/mpe2/package.py | 2 +- var/spack/repos/builtin/packages/mpest/package.py | 2 +- var/spack/repos/builtin/packages/mpfr/package.py | 2 +- var/spack/repos/builtin/packages/mpibash/package.py | 2 +- var/spack/repos/builtin/packages/mpiblast/package.py | 2 +- var/spack/repos/builtin/packages/mpich/package.py | 2 +- var/spack/repos/builtin/packages/mpifileutils/package.py | 2 +- var/spack/repos/builtin/packages/mpileaks/package.py | 2 +- var/spack/repos/builtin/packages/mpip/package.py | 2 +- var/spack/repos/builtin/packages/mpir/package.py | 2 +- var/spack/repos/builtin/packages/mpix-launch-swift/package.py | 2 +- var/spack/repos/builtin/packages/mrbayes/package.py | 2 +- var/spack/repos/builtin/packages/mrnet/package.py | 2 +- var/spack/repos/builtin/packages/mrtrix3/package.py | 2 +- var/spack/repos/builtin/packages/mscgen/package.py | 2 +- var/spack/repos/builtin/packages/msgpack-c/package.py | 2 +- var/spack/repos/builtin/packages/mshadow/package.py | 2 +- var/spack/repos/builtin/packages/multitail/package.py | 2 +- var/spack/repos/builtin/packages/multiverso/package.py | 2 +- var/spack/repos/builtin/packages/mummer/package.py | 2 +- var/spack/repos/builtin/packages/mumps/package.py | 2 +- var/spack/repos/builtin/packages/munge/package.py | 2 +- var/spack/repos/builtin/packages/muparser/package.py | 2 +- var/spack/repos/builtin/packages/muscle/package.py | 2 +- var/spack/repos/builtin/packages/muse/package.py | 2 +- var/spack/repos/builtin/packages/muster/package.py | 2 +- var/spack/repos/builtin/packages/mvapich2/package.py | 2 +- var/spack/repos/builtin/packages/mxml/package.py | 2 +- var/spack/repos/builtin/packages/mxnet/package.py | 2 +- var/spack/repos/builtin/packages/nag/package.py | 2 +- var/spack/repos/builtin/packages/nalu/package.py | 2 +- var/spack/repos/builtin/packages/namd/package.py | 2 +- var/spack/repos/builtin/packages/nano/package.py | 2 +- var/spack/repos/builtin/packages/nanoflann/package.py | 2 +- var/spack/repos/builtin/packages/nasm/package.py | 2 +- var/spack/repos/builtin/packages/nauty/package.py | 2 +- var/spack/repos/builtin/packages/ncbi-rmblastn/package.py | 2 +- var/spack/repos/builtin/packages/nccl/package.py | 2 +- var/spack/repos/builtin/packages/nccmp/package.py | 2 +- var/spack/repos/builtin/packages/ncdu/package.py | 2 +- var/spack/repos/builtin/packages/ncftp/package.py | 2 +- var/spack/repos/builtin/packages/ncl/package.py | 2 +- var/spack/repos/builtin/packages/nco/package.py | 2 +- var/spack/repos/builtin/packages/ncurses/package.py | 2 +- var/spack/repos/builtin/packages/ncview/package.py | 2 +- var/spack/repos/builtin/packages/ndiff/package.py | 2 +- var/spack/repos/builtin/packages/nek5000/package.py | 2 +- var/spack/repos/builtin/packages/nekbone/package.py | 2 +- var/spack/repos/builtin/packages/nekcem/package.py | 2 +- var/spack/repos/builtin/packages/neovim/package.py | 2 +- var/spack/repos/builtin/packages/netcdf-cxx/package.py | 2 +- var/spack/repos/builtin/packages/netcdf-cxx4/package.py | 2 +- var/spack/repos/builtin/packages/netcdf-fortran/package.py | 2 +- var/spack/repos/builtin/packages/netcdf/package.py | 2 +- var/spack/repos/builtin/packages/netgauge/package.py | 2 +- var/spack/repos/builtin/packages/netgen/package.py | 2 +- var/spack/repos/builtin/packages/netlib-lapack/package.py | 2 +- var/spack/repos/builtin/packages/netlib-scalapack/package.py | 2 +- var/spack/repos/builtin/packages/netlib-xblas/package.py | 2 +- var/spack/repos/builtin/packages/nettle/package.py | 2 +- var/spack/repos/builtin/packages/neuron/package.py | 2 +- var/spack/repos/builtin/packages/nextflow/package.py | 2 +- var/spack/repos/builtin/packages/nfft/package.py | 2 +- var/spack/repos/builtin/packages/nghttp2/package.py | 2 +- var/spack/repos/builtin/packages/nginx/package.py | 2 +- var/spack/repos/builtin/packages/ngmlr/package.py | 2 +- var/spack/repos/builtin/packages/ninja-fortran/package.py | 2 +- var/spack/repos/builtin/packages/ninja/package.py | 2 +- var/spack/repos/builtin/packages/nlopt/package.py | 2 +- var/spack/repos/builtin/packages/nmap/package.py | 2 +- var/spack/repos/builtin/packages/nnvm/package.py | 2 +- var/spack/repos/builtin/packages/node-js/package.py | 2 +- var/spack/repos/builtin/packages/notmuch/package.py | 2 +- var/spack/repos/builtin/packages/npb/package.py | 2 +- var/spack/repos/builtin/packages/npm/package.py | 2 +- var/spack/repos/builtin/packages/npth/package.py | 2 +- var/spack/repos/builtin/packages/nspr/package.py | 2 +- var/spack/repos/builtin/packages/numactl/package.py | 2 +- var/spack/repos/builtin/packages/numdiff/package.py | 2 +- var/spack/repos/builtin/packages/nut/package.py | 2 +- var/spack/repos/builtin/packages/nwchem/package.py | 2 +- var/spack/repos/builtin/packages/ocaml/package.py | 2 +- var/spack/repos/builtin/packages/oce/package.py | 2 +- var/spack/repos/builtin/packages/oclint/package.py | 2 +- var/spack/repos/builtin/packages/oclock/package.py | 2 +- var/spack/repos/builtin/packages/octave-optim/package.py | 2 +- var/spack/repos/builtin/packages/octave-splines/package.py | 2 +- var/spack/repos/builtin/packages/octave-struct/package.py | 2 +- var/spack/repos/builtin/packages/octave/package.py | 2 +- var/spack/repos/builtin/packages/octopus/package.py | 2 +- var/spack/repos/builtin/packages/ompss/package.py | 2 +- var/spack/repos/builtin/packages/ompt-openmp/package.py | 2 +- var/spack/repos/builtin/packages/oniguruma/package.py | 2 +- var/spack/repos/builtin/packages/ont-albacore/package.py | 2 +- var/spack/repos/builtin/packages/opa-psm2/package.py | 2 +- var/spack/repos/builtin/packages/opam/package.py | 2 +- var/spack/repos/builtin/packages/opari2/package.py | 2 +- var/spack/repos/builtin/packages/openbabel/package.py | 2 +- var/spack/repos/builtin/packages/openblas/package.py | 2 +- var/spack/repos/builtin/packages/opencoarrays/package.py | 2 +- var/spack/repos/builtin/packages/opencv/package.py | 2 +- var/spack/repos/builtin/packages/openexr/package.py | 2 +- var/spack/repos/builtin/packages/openfast/package.py | 2 +- var/spack/repos/builtin/packages/openfst/package.py | 2 +- var/spack/repos/builtin/packages/opengl/package.py | 2 +- var/spack/repos/builtin/packages/openjpeg/package.py | 2 +- var/spack/repos/builtin/packages/openmc/package.py | 2 +- var/spack/repos/builtin/packages/openmpi/package.py | 2 +- var/spack/repos/builtin/packages/opennurbs/package.py | 2 +- var/spack/repos/builtin/packages/openscenegraph/package.py | 2 +- var/spack/repos/builtin/packages/openssh/package.py | 2 +- var/spack/repos/builtin/packages/openssl/package.py | 2 +- var/spack/repos/builtin/packages/opium/package.py | 2 +- var/spack/repos/builtin/packages/opus/package.py | 2 +- var/spack/repos/builtin/packages/orfm/package.py | 2 +- var/spack/repos/builtin/packages/orthofinder/package.py | 2 +- var/spack/repos/builtin/packages/orthomcl/package.py | 2 +- var/spack/repos/builtin/packages/osu-micro-benchmarks/package.py | 2 +- var/spack/repos/builtin/packages/otf/package.py | 2 +- var/spack/repos/builtin/packages/otf2/package.py | 2 +- var/spack/repos/builtin/packages/p4est/package.py | 2 +- var/spack/repos/builtin/packages/p7zip/package.py | 2 +- var/spack/repos/builtin/packages/pacbio-daligner/package.py | 2 +- var/spack/repos/builtin/packages/pacbio-damasker/package.py | 2 +- var/spack/repos/builtin/packages/pacbio-dazz-db/package.py | 2 +- var/spack/repos/builtin/packages/pacbio-dextractor/package.py | 2 +- var/spack/repos/builtin/packages/pagit/package.py | 2 +- var/spack/repos/builtin/packages/pagmo/package.py | 2 +- var/spack/repos/builtin/packages/paml/package.py | 2 +- var/spack/repos/builtin/packages/panda/package.py | 2 +- var/spack/repos/builtin/packages/pandaseq/package.py | 2 +- var/spack/repos/builtin/packages/pango/package.py | 2 +- var/spack/repos/builtin/packages/papi/package.py | 2 +- var/spack/repos/builtin/packages/paradiseo/package.py | 2 +- var/spack/repos/builtin/packages/parallel-netcdf/package.py | 2 +- var/spack/repos/builtin/packages/parallel/package.py | 2 +- var/spack/repos/builtin/packages/paraver/package.py | 2 +- var/spack/repos/builtin/packages/paraview/package.py | 2 +- var/spack/repos/builtin/packages/parmetis/package.py | 2 +- var/spack/repos/builtin/packages/parmgridgen/package.py | 2 +- var/spack/repos/builtin/packages/parsimonator/package.py | 2 +- var/spack/repos/builtin/packages/partitionfinder/package.py | 2 +- var/spack/repos/builtin/packages/patchelf/package.py | 2 +- var/spack/repos/builtin/packages/pathfinder/package.py | 2 +- var/spack/repos/builtin/packages/pbmpi/package.py | 2 +- var/spack/repos/builtin/packages/pcma/package.py | 2 +- var/spack/repos/builtin/packages/pcre/package.py | 2 +- var/spack/repos/builtin/packages/pcre2/package.py | 2 +- var/spack/repos/builtin/packages/pdsh/package.py | 2 +- var/spack/repos/builtin/packages/pdt/package.py | 2 +- var/spack/repos/builtin/packages/pennant/package.py | 2 +- var/spack/repos/builtin/packages/percept/package.py | 2 +- var/spack/repos/builtin/packages/perl-algorithm-diff/package.py | 2 +- var/spack/repos/builtin/packages/perl-app-cmd/package.py | 2 +- var/spack/repos/builtin/packages/perl-array-utils/package.py | 2 +- var/spack/repos/builtin/packages/perl-b-hooks-endofscope/package.py | 2 +- var/spack/repos/builtin/packages/perl-bio-perl/package.py | 2 +- var/spack/repos/builtin/packages/perl-bit-vector/package.py | 2 +- var/spack/repos/builtin/packages/perl-cairo/package.py | 2 +- var/spack/repos/builtin/packages/perl-capture-tiny/package.py | 2 +- var/spack/repos/builtin/packages/perl-carp-clan/package.py | 2 +- .../repos/builtin/packages/perl-class-data-inheritable/package.py | 2 +- var/spack/repos/builtin/packages/perl-class-inspector/package.py | 2 +- var/spack/repos/builtin/packages/perl-class-load-xs/package.py | 2 +- var/spack/repos/builtin/packages/perl-class-load/package.py | 2 +- var/spack/repos/builtin/packages/perl-cpan-meta-check/package.py | 2 +- var/spack/repos/builtin/packages/perl-data-optlist/package.py | 2 +- var/spack/repos/builtin/packages/perl-data-stag/package.py | 2 +- var/spack/repos/builtin/packages/perl-dbd-mysql/package.py | 2 +- var/spack/repos/builtin/packages/perl-dbfile/package.py | 2 +- var/spack/repos/builtin/packages/perl-dbi/package.py | 2 +- var/spack/repos/builtin/packages/perl-devel-cycle/package.py | 2 +- .../repos/builtin/packages/perl-devel-globaldestruction/package.py | 2 +- var/spack/repos/builtin/packages/perl-devel-overloadinfo/package.py | 2 +- var/spack/repos/builtin/packages/perl-devel-stacktrace/package.py | 2 +- var/spack/repos/builtin/packages/perl-digest-md5/package.py | 2 +- var/spack/repos/builtin/packages/perl-dist-checkconflicts/package.py | 2 +- var/spack/repos/builtin/packages/perl-encode-locale/package.py | 2 +- var/spack/repos/builtin/packages/perl-eval-closure/package.py | 2 +- var/spack/repos/builtin/packages/perl-exception-class/package.py | 2 +- var/spack/repos/builtin/packages/perl-exporter-tiny/package.py | 2 +- var/spack/repos/builtin/packages/perl-extutils-depends/package.py | 2 +- var/spack/repos/builtin/packages/perl-extutils-makemaker/package.py | 2 +- var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py | 2 +- var/spack/repos/builtin/packages/perl-file-copy-recursive/package.py | 2 +- var/spack/repos/builtin/packages/perl-file-listing/package.py | 2 +- var/spack/repos/builtin/packages/perl-file-pushd/package.py | 2 +- .../repos/builtin/packages/perl-file-sharedir-install/package.py | 2 +- var/spack/repos/builtin/packages/perl-file-slurp-tiny/package.py | 2 +- var/spack/repos/builtin/packages/perl-file-slurper/package.py | 2 +- var/spack/repos/builtin/packages/perl-file-which/package.py | 2 +- var/spack/repos/builtin/packages/perl-font-ttf/package.py | 2 +- var/spack/repos/builtin/packages/perl-gd-graph/package.py | 2 +- var/spack/repos/builtin/packages/perl-gd-text/package.py | 2 +- var/spack/repos/builtin/packages/perl-gd/package.py | 2 +- var/spack/repos/builtin/packages/perl-graph-readwrite/package.py | 2 +- var/spack/repos/builtin/packages/perl-graph/package.py | 2 +- var/spack/repos/builtin/packages/perl-html-parser/package.py | 2 +- var/spack/repos/builtin/packages/perl-html-tagset/package.py | 2 +- var/spack/repos/builtin/packages/perl-http-cookies/package.py | 2 +- var/spack/repos/builtin/packages/perl-http-daemon/package.py | 2 +- var/spack/repos/builtin/packages/perl-http-date/package.py | 2 +- var/spack/repos/builtin/packages/perl-http-message/package.py | 2 +- var/spack/repos/builtin/packages/perl-http-negotiate/package.py | 2 +- var/spack/repos/builtin/packages/perl-inline-c/package.py | 2 +- var/spack/repos/builtin/packages/perl-inline/package.py | 2 +- var/spack/repos/builtin/packages/perl-intervaltree/package.py | 2 +- var/spack/repos/builtin/packages/perl-io-html/package.py | 2 +- var/spack/repos/builtin/packages/perl-io-sessiondata/package.py | 2 +- var/spack/repos/builtin/packages/perl-io-socket-ssl/package.py | 2 +- var/spack/repos/builtin/packages/perl-io-string/package.py | 2 +- var/spack/repos/builtin/packages/perl-json/package.py | 2 +- var/spack/repos/builtin/packages/perl-list-moreutils/package.py | 2 +- var/spack/repos/builtin/packages/perl-log-log4perl/package.py | 2 +- var/spack/repos/builtin/packages/perl-lwp-mediatypes/package.py | 2 +- var/spack/repos/builtin/packages/perl-lwp-protocol-https/package.py | 2 +- var/spack/repos/builtin/packages/perl-lwp/package.py | 2 +- var/spack/repos/builtin/packages/perl-math-cdf/package.py | 2 +- var/spack/repos/builtin/packages/perl-module-build/package.py | 2 +- .../repos/builtin/packages/perl-module-implementation/package.py | 2 +- .../repos/builtin/packages/perl-module-runtime-conflicts/package.py | 2 +- var/spack/repos/builtin/packages/perl-module-runtime/package.py | 2 +- var/spack/repos/builtin/packages/perl-moose/package.py | 2 +- var/spack/repos/builtin/packages/perl-mozilla-ca/package.py | 2 +- var/spack/repos/builtin/packages/perl-mro-compat/package.py | 2 +- var/spack/repos/builtin/packages/perl-namespace-clean/package.py | 2 +- var/spack/repos/builtin/packages/perl-net-http/package.py | 2 +- var/spack/repos/builtin/packages/perl-net-scp-expect/package.py | 2 +- var/spack/repos/builtin/packages/perl-net-ssleay/package.py | 2 +- .../repos/builtin/packages/perl-package-deprecationmanager/package.py | 2 +- var/spack/repos/builtin/packages/perl-package-stash-xs/package.py | 2 +- var/spack/repos/builtin/packages/perl-package-stash/package.py | 2 +- var/spack/repos/builtin/packages/perl-padwalker/package.py | 2 +- var/spack/repos/builtin/packages/perl-parallel-forkmanager/package.py | 2 +- var/spack/repos/builtin/packages/perl-params-util/package.py | 2 +- var/spack/repos/builtin/packages/perl-parse-recdescent/package.py | 2 +- var/spack/repos/builtin/packages/perl-pdf-api2/package.py | 2 +- var/spack/repos/builtin/packages/perl-pegex/package.py | 2 +- var/spack/repos/builtin/packages/perl-perlio-gzip/package.py | 2 +- var/spack/repos/builtin/packages/perl-soap-lite/package.py | 2 +- var/spack/repos/builtin/packages/perl-star-fusion/package.py | 2 +- .../repos/builtin/packages/perl-statistics-descriptive/package.py | 2 +- .../repos/builtin/packages/perl-sub-exporter-progressive/package.py | 2 +- var/spack/repos/builtin/packages/perl-sub-exporter/package.py | 2 +- var/spack/repos/builtin/packages/perl-sub-identify/package.py | 2 +- var/spack/repos/builtin/packages/perl-sub-install/package.py | 2 +- var/spack/repos/builtin/packages/perl-sub-name/package.py | 2 +- var/spack/repos/builtin/packages/perl-sub-uplevel/package.py | 2 +- var/spack/repos/builtin/packages/perl-svg/package.py | 2 +- var/spack/repos/builtin/packages/perl-swissknife/package.py | 2 +- var/spack/repos/builtin/packages/perl-task-weaken/package.py | 2 +- var/spack/repos/builtin/packages/perl-term-readkey/package.py | 2 +- var/spack/repos/builtin/packages/perl-test-cleannamespaces/package.py | 2 +- var/spack/repos/builtin/packages/perl-test-deep/package.py | 2 +- var/spack/repos/builtin/packages/perl-test-differences/package.py | 2 +- var/spack/repos/builtin/packages/perl-test-exception/package.py | 2 +- var/spack/repos/builtin/packages/perl-test-fatal/package.py | 2 +- var/spack/repos/builtin/packages/perl-test-memory-cycle/package.py | 2 +- var/spack/repos/builtin/packages/perl-test-most/package.py | 2 +- var/spack/repos/builtin/packages/perl-test-needs/package.py | 2 +- var/spack/repos/builtin/packages/perl-test-requires/package.py | 2 +- .../repos/builtin/packages/perl-test-requiresinternet/package.py | 2 +- var/spack/repos/builtin/packages/perl-test-warn/package.py | 2 +- var/spack/repos/builtin/packages/perl-test-warnings/package.py | 2 +- var/spack/repos/builtin/packages/perl-text-csv/package.py | 2 +- var/spack/repos/builtin/packages/perl-text-diff/package.py | 2 +- var/spack/repos/builtin/packages/perl-text-unidecode/package.py | 2 +- var/spack/repos/builtin/packages/perl-time-hires/package.py | 2 +- var/spack/repos/builtin/packages/perl-time-piece/package.py | 2 +- var/spack/repos/builtin/packages/perl-try-tiny/package.py | 2 +- var/spack/repos/builtin/packages/perl-uri-escape/package.py | 2 +- var/spack/repos/builtin/packages/perl-uri/package.py | 2 +- var/spack/repos/builtin/packages/perl-version/package.py | 2 +- var/spack/repos/builtin/packages/perl-www-robotrules/package.py | 2 +- var/spack/repos/builtin/packages/perl-xml-libxml/package.py | 2 +- var/spack/repos/builtin/packages/perl-xml-parser-lite/package.py | 2 +- var/spack/repos/builtin/packages/perl-xml-parser/package.py | 2 +- var/spack/repos/builtin/packages/perl-xml-simple/package.py | 2 +- var/spack/repos/builtin/packages/perl-yaml-libyaml/package.py | 2 +- var/spack/repos/builtin/packages/perl/package.py | 2 +- var/spack/repos/builtin/packages/petsc/package.py | 2 +- var/spack/repos/builtin/packages/pexsi/package.py | 2 +- var/spack/repos/builtin/packages/pfft/package.py | 2 +- var/spack/repos/builtin/packages/pflotran/package.py | 2 +- var/spack/repos/builtin/packages/pfunit/package.py | 2 +- var/spack/repos/builtin/packages/pgdspider/package.py | 2 +- var/spack/repos/builtin/packages/pgi/package.py | 2 +- var/spack/repos/builtin/packages/phantompeakqualtools/package.py | 2 +- var/spack/repos/builtin/packages/phasta/package.py | 2 +- var/spack/repos/builtin/packages/phist/package.py | 2 +- var/spack/repos/builtin/packages/phylip/package.py | 2 +- var/spack/repos/builtin/packages/picard/package.py | 2 +- var/spack/repos/builtin/packages/pidx/package.py | 2 +- var/spack/repos/builtin/packages/pigz/package.py | 2 +- var/spack/repos/builtin/packages/pilon/package.py | 2 +- var/spack/repos/builtin/packages/piranha/package.py | 2 +- var/spack/repos/builtin/packages/pixman/package.py | 2 +- var/spack/repos/builtin/packages/pkg-config/package.py | 2 +- var/spack/repos/builtin/packages/pkgconf/package.py | 2 +- var/spack/repos/builtin/packages/planck-likelihood/package.py | 2 +- var/spack/repos/builtin/packages/plink/package.py | 2 +- var/spack/repos/builtin/packages/plumed/package.py | 2 +- var/spack/repos/builtin/packages/pmgr-collective/package.py | 2 +- var/spack/repos/builtin/packages/pmix/package.py | 2 +- var/spack/repos/builtin/packages/pnfft/package.py | 2 +- var/spack/repos/builtin/packages/pngwriter/package.py | 2 +- var/spack/repos/builtin/packages/pnmpi/package.py | 2 +- var/spack/repos/builtin/packages/poamsa/package.py | 2 +- var/spack/repos/builtin/packages/pocl/package.py | 2 +- var/spack/repos/builtin/packages/polymake/package.py | 2 +- var/spack/repos/builtin/packages/porta/package.py | 2 +- var/spack/repos/builtin/packages/postgresql/package.py | 2 +- var/spack/repos/builtin/packages/ppl/package.py | 2 +- var/spack/repos/builtin/packages/prank/package.py | 2 +- var/spack/repos/builtin/packages/presentproto/package.py | 2 +- var/spack/repos/builtin/packages/preseq/package.py | 2 +- var/spack/repos/builtin/packages/price/package.py | 2 +- var/spack/repos/builtin/packages/primer3/package.py | 2 +- var/spack/repos/builtin/packages/printproto/package.py | 2 +- var/spack/repos/builtin/packages/probconsrna/package.py | 2 +- var/spack/repos/builtin/packages/prodigal/package.py | 2 +- var/spack/repos/builtin/packages/proj/package.py | 2 +- var/spack/repos/builtin/packages/protobuf/package.py | 2 +- var/spack/repos/builtin/packages/proxymngr/package.py | 2 +- var/spack/repos/builtin/packages/pruners-ninja/package.py | 2 +- var/spack/repos/builtin/packages/ps-lite/package.py | 2 +- var/spack/repos/builtin/packages/psi4/package.py | 2 +- var/spack/repos/builtin/packages/pumi/package.py | 2 +- var/spack/repos/builtin/packages/pvm/package.py | 2 +- var/spack/repos/builtin/packages/py-3to2/package.py | 2 +- var/spack/repos/builtin/packages/py-4suite-xml/package.py | 2 +- var/spack/repos/builtin/packages/py-abipy/package.py | 2 +- var/spack/repos/builtin/packages/py-adios/package.py | 2 +- var/spack/repos/builtin/packages/py-affine/package.py | 2 +- var/spack/repos/builtin/packages/py-alabaster/package.py | 2 +- var/spack/repos/builtin/packages/py-apache-libcloud/package.py | 2 +- var/spack/repos/builtin/packages/py-apipkg/package.py | 2 +- var/spack/repos/builtin/packages/py-appdirs/package.py | 2 +- var/spack/repos/builtin/packages/py-appnope/package.py | 2 +- var/spack/repos/builtin/packages/py-apscheduler/package.py | 2 +- var/spack/repos/builtin/packages/py-argcomplete/package.py | 2 +- var/spack/repos/builtin/packages/py-argparse/package.py | 2 +- var/spack/repos/builtin/packages/py-ase/package.py | 2 +- var/spack/repos/builtin/packages/py-asn1crypto/package.py | 2 +- var/spack/repos/builtin/packages/py-astroid/package.py | 2 +- var/spack/repos/builtin/packages/py-astropy/package.py | 2 +- var/spack/repos/builtin/packages/py-attrs/package.py | 2 +- var/spack/repos/builtin/packages/py-autopep8/package.py | 2 +- var/spack/repos/builtin/packages/py-babel/package.py | 2 +- var/spack/repos/builtin/packages/py-backports-abc/package.py | 2 +- .../builtin/packages/py-backports-functools-lru-cache/package.py | 2 +- .../builtin/packages/py-backports-shutil-get-terminal-size/package.py | 2 +- .../repos/builtin/packages/py-backports-ssl-match-hostname/package.py | 2 +- var/spack/repos/builtin/packages/py-basemap/package.py | 2 +- var/spack/repos/builtin/packages/py-bcbio-gff/package.py | 2 +- var/spack/repos/builtin/packages/py-beautifulsoup4/package.py | 2 +- var/spack/repos/builtin/packages/py-binwalk/package.py | 2 +- var/spack/repos/builtin/packages/py-biom-format/package.py | 2 +- var/spack/repos/builtin/packages/py-biopython/package.py | 2 +- var/spack/repos/builtin/packages/py-bitarray/package.py | 2 +- var/spack/repos/builtin/packages/py-bitstring/package.py | 2 +- var/spack/repos/builtin/packages/py-bleach/package.py | 2 +- var/spack/repos/builtin/packages/py-blessings/package.py | 2 +- var/spack/repos/builtin/packages/py-bokeh/package.py | 2 +- var/spack/repos/builtin/packages/py-boltons/package.py | 2 +- var/spack/repos/builtin/packages/py-bottleneck/package.py | 2 +- var/spack/repos/builtin/packages/py-brian/package.py | 2 +- var/spack/repos/builtin/packages/py-brian2/package.py | 2 +- var/spack/repos/builtin/packages/py-bsddb3/package.py | 2 +- var/spack/repos/builtin/packages/py-bx-python/package.py | 2 +- var/spack/repos/builtin/packages/py-cclib/package.py | 2 +- var/spack/repos/builtin/packages/py-cdat-lite/package.py | 2 +- var/spack/repos/builtin/packages/py-cdo/package.py | 2 +- var/spack/repos/builtin/packages/py-certifi/package.py | 2 +- var/spack/repos/builtin/packages/py-cffi/package.py | 2 +- var/spack/repos/builtin/packages/py-chardet/package.py | 2 +- var/spack/repos/builtin/packages/py-checkm-genome/package.py | 2 +- var/spack/repos/builtin/packages/py-click/package.py | 2 +- var/spack/repos/builtin/packages/py-cligj/package.py | 2 +- var/spack/repos/builtin/packages/py-cogent/package.py | 2 +- var/spack/repos/builtin/packages/py-colorama/package.py | 2 +- var/spack/repos/builtin/packages/py-colormath/package.py | 2 +- var/spack/repos/builtin/packages/py-configparser/package.py | 2 +- var/spack/repos/builtin/packages/py-counter/package.py | 2 +- var/spack/repos/builtin/packages/py-coverage/package.py | 2 +- var/spack/repos/builtin/packages/py-cpuinfo/package.py | 2 +- var/spack/repos/builtin/packages/py-crossmap/package.py | 2 +- var/spack/repos/builtin/packages/py-cryptography/package.py | 2 +- var/spack/repos/builtin/packages/py-csvkit/package.py | 2 +- var/spack/repos/builtin/packages/py-current/package.py | 2 +- var/spack/repos/builtin/packages/py-cutadapt/package.py | 2 +- var/spack/repos/builtin/packages/py-cvxopt/package.py | 2 +- var/spack/repos/builtin/packages/py-cycler/package.py | 2 +- var/spack/repos/builtin/packages/py-cython/package.py | 2 +- var/spack/repos/builtin/packages/py-dask/package.py | 2 +- var/spack/repos/builtin/packages/py-dateutil/package.py | 2 +- var/spack/repos/builtin/packages/py-dbf/package.py | 2 +- var/spack/repos/builtin/packages/py-decorator/package.py | 2 +- var/spack/repos/builtin/packages/py-deeptools/package.py | 2 +- var/spack/repos/builtin/packages/py-dendropy/package.py | 2 +- var/spack/repos/builtin/packages/py-dev/package.py | 2 +- var/spack/repos/builtin/packages/py-dill/package.py | 2 +- var/spack/repos/builtin/packages/py-dlcpar/package.py | 2 +- var/spack/repos/builtin/packages/py-docutils/package.py | 2 +- var/spack/repos/builtin/packages/py-doxypy/package.py | 2 +- var/spack/repos/builtin/packages/py-doxypypy/package.py | 2 +- var/spack/repos/builtin/packages/py-dryscrape/package.py | 2 +- var/spack/repos/builtin/packages/py-dxchange/package.py | 2 +- var/spack/repos/builtin/packages/py-dxfile/package.py | 2 +- var/spack/repos/builtin/packages/py-edffile/package.py | 2 +- var/spack/repos/builtin/packages/py-editdistance/package.py | 2 +- var/spack/repos/builtin/packages/py-elasticsearch/package.py | 2 +- var/spack/repos/builtin/packages/py-elephant/package.py | 2 +- var/spack/repos/builtin/packages/py-emcee/package.py | 2 +- var/spack/repos/builtin/packages/py-entrypoints/package.py | 2 +- var/spack/repos/builtin/packages/py-enum34/package.py | 2 +- var/spack/repos/builtin/packages/py-epydoc/package.py | 2 +- var/spack/repos/builtin/packages/py-espresso/package.py | 2 +- var/spack/repos/builtin/packages/py-espressopp/package.py | 2 +- var/spack/repos/builtin/packages/py-et-xmlfile/package.py | 2 +- var/spack/repos/builtin/packages/py-execnet/package.py | 2 +- var/spack/repos/builtin/packages/py-fastaindex/package.py | 2 +- var/spack/repos/builtin/packages/py-fasteners/package.py | 2 +- var/spack/repos/builtin/packages/py-faststructure/package.py | 2 +- var/spack/repos/builtin/packages/py-fiscalyear/package.py | 2 +- var/spack/repos/builtin/packages/py-flake8/package.py | 2 +- var/spack/repos/builtin/packages/py-flask/package.py | 2 +- var/spack/repos/builtin/packages/py-flexx/package.py | 2 +- var/spack/repos/builtin/packages/py-fparser/package.py | 2 +- var/spack/repos/builtin/packages/py-funcsigs/package.py | 2 +- var/spack/repos/builtin/packages/py-functools32/package.py | 2 +- var/spack/repos/builtin/packages/py-future/package.py | 2 +- var/spack/repos/builtin/packages/py-futures/package.py | 2 +- var/spack/repos/builtin/packages/py-genders/package.py | 2 +- var/spack/repos/builtin/packages/py-genshi/package.py | 2 +- var/spack/repos/builtin/packages/py-git-review/package.py | 2 +- var/spack/repos/builtin/packages/py-git2/package.py | 2 +- var/spack/repos/builtin/packages/py-gnuplot/package.py | 2 +- var/spack/repos/builtin/packages/py-goatools/package.py | 2 +- var/spack/repos/builtin/packages/py-gpaw/package.py | 2 +- var/spack/repos/builtin/packages/py-griddataformats/package.py | 2 +- var/spack/repos/builtin/packages/py-guidata/package.py | 2 +- var/spack/repos/builtin/packages/py-guiqwt/package.py | 2 +- var/spack/repos/builtin/packages/py-h5py/package.py | 2 +- var/spack/repos/builtin/packages/py-html2text/package.py | 2 +- var/spack/repos/builtin/packages/py-html5lib/package.py | 2 +- var/spack/repos/builtin/packages/py-htseq/package.py | 2 +- var/spack/repos/builtin/packages/py-httpbin/package.py | 2 +- var/spack/repos/builtin/packages/py-hypothesis/package.py | 2 +- var/spack/repos/builtin/packages/py-idna/package.py | 2 +- var/spack/repos/builtin/packages/py-igraph/package.py | 2 +- var/spack/repos/builtin/packages/py-imagesize/package.py | 2 +- var/spack/repos/builtin/packages/py-iminuit/package.py | 2 +- var/spack/repos/builtin/packages/py-importlib/package.py | 2 +- var/spack/repos/builtin/packages/py-ipaddress/package.py | 2 +- var/spack/repos/builtin/packages/py-ipdb/package.py | 2 +- var/spack/repos/builtin/packages/py-ipykernel/package.py | 2 +- var/spack/repos/builtin/packages/py-ipython-genutils/package.py | 2 +- var/spack/repos/builtin/packages/py-ipython/package.py | 2 +- var/spack/repos/builtin/packages/py-ipywidgets/package.py | 2 +- var/spack/repos/builtin/packages/py-isort/package.py | 2 +- var/spack/repos/builtin/packages/py-itsdangerous/package.py | 2 +- var/spack/repos/builtin/packages/py-jdcal/package.py | 2 +- var/spack/repos/builtin/packages/py-jedi/package.py | 2 +- var/spack/repos/builtin/packages/py-jinja2/package.py | 2 +- var/spack/repos/builtin/packages/py-joblib/package.py | 2 +- var/spack/repos/builtin/packages/py-jpype/package.py | 2 +- var/spack/repos/builtin/packages/py-jsonschema/package.py | 2 +- var/spack/repos/builtin/packages/py-junit-xml/package.py | 2 +- var/spack/repos/builtin/packages/py-jupyter-client/package.py | 2 +- var/spack/repos/builtin/packages/py-jupyter-console/package.py | 2 +- var/spack/repos/builtin/packages/py-jupyter-core/package.py | 2 +- var/spack/repos/builtin/packages/py-jupyter-notebook/package.py | 2 +- var/spack/repos/builtin/packages/py-keras/package.py | 2 +- var/spack/repos/builtin/packages/py-latexcodec/package.py | 2 +- var/spack/repos/builtin/packages/py-lazy-object-proxy/package.py | 2 +- var/spack/repos/builtin/packages/py-lazy/package.py | 2 +- var/spack/repos/builtin/packages/py-lazyarray/package.py | 2 +- var/spack/repos/builtin/packages/py-libconf/package.py | 2 +- var/spack/repos/builtin/packages/py-libensemble/package.py | 2 +- var/spack/repos/builtin/packages/py-line-profiler/package.py | 2 +- var/spack/repos/builtin/packages/py-linecache2/package.py | 2 +- var/spack/repos/builtin/packages/py-lit/package.py | 2 +- var/spack/repos/builtin/packages/py-llvmlite/package.py | 2 +- var/spack/repos/builtin/packages/py-lmfit/package.py | 2 +- var/spack/repos/builtin/packages/py-localcider/package.py | 2 +- var/spack/repos/builtin/packages/py-lockfile/package.py | 2 +- var/spack/repos/builtin/packages/py-logilab-common/package.py | 2 +- var/spack/repos/builtin/packages/py-lrudict/package.py | 2 +- var/spack/repos/builtin/packages/py-lxml/package.py | 2 +- var/spack/repos/builtin/packages/py-lzstring/package.py | 2 +- var/spack/repos/builtin/packages/py-macholib/package.py | 2 +- var/spack/repos/builtin/packages/py-machotools/package.py | 2 +- var/spack/repos/builtin/packages/py-macs2/package.py | 2 +- var/spack/repos/builtin/packages/py-maestrowf/package.py | 2 +- var/spack/repos/builtin/packages/py-mako/package.py | 2 +- var/spack/repos/builtin/packages/py-mappy/package.py | 2 +- var/spack/repos/builtin/packages/py-markdown/package.py | 2 +- var/spack/repos/builtin/packages/py-markupsafe/package.py | 2 +- var/spack/repos/builtin/packages/py-matplotlib/package.py | 2 +- var/spack/repos/builtin/packages/py-mccabe/package.py | 2 +- var/spack/repos/builtin/packages/py-mdanalysis/package.py | 2 +- var/spack/repos/builtin/packages/py-meep/package.py | 2 +- var/spack/repos/builtin/packages/py-memory-profiler/package.py | 2 +- var/spack/repos/builtin/packages/py-methylcode/package.py | 2 +- var/spack/repos/builtin/packages/py-misopy/package.py | 2 +- var/spack/repos/builtin/packages/py-mistune/package.py | 2 +- var/spack/repos/builtin/packages/py-mock/package.py | 2 +- var/spack/repos/builtin/packages/py-moltemplate/package.py | 2 +- var/spack/repos/builtin/packages/py-mongo/package.py | 2 +- var/spack/repos/builtin/packages/py-monotonic/package.py | 2 +- var/spack/repos/builtin/packages/py-monty/package.py | 2 +- var/spack/repos/builtin/packages/py-mpi4py/package.py | 2 +- var/spack/repos/builtin/packages/py-mpmath/package.py | 2 +- var/spack/repos/builtin/packages/py-multiprocess/package.py | 2 +- var/spack/repos/builtin/packages/py-multiqc/package.py | 2 +- var/spack/repos/builtin/packages/py-mx/package.py | 2 +- var/spack/repos/builtin/packages/py-mxnet/package.py | 2 +- var/spack/repos/builtin/packages/py-myhdl/package.py | 2 +- var/spack/repos/builtin/packages/py-mysqldb1/package.py | 2 +- var/spack/repos/builtin/packages/py-nbconvert/package.py | 2 +- var/spack/repos/builtin/packages/py-nbformat/package.py | 2 +- var/spack/repos/builtin/packages/py-neo/package.py | 2 +- var/spack/repos/builtin/packages/py-nestle/package.py | 2 +- var/spack/repos/builtin/packages/py-netcdf4/package.py | 2 +- var/spack/repos/builtin/packages/py-netifaces/package.py | 2 +- var/spack/repos/builtin/packages/py-networkx/package.py | 2 +- var/spack/repos/builtin/packages/py-nose/package.py | 2 +- var/spack/repos/builtin/packages/py-nosexcover/package.py | 2 +- var/spack/repos/builtin/packages/py-numba/package.py | 2 +- var/spack/repos/builtin/packages/py-numexpr/package.py | 2 +- var/spack/repos/builtin/packages/py-numpy/package.py | 2 +- var/spack/repos/builtin/packages/py-numpydoc/package.py | 2 +- var/spack/repos/builtin/packages/py-olefile/package.py | 2 +- var/spack/repos/builtin/packages/py-ont-fast5-api/package.py | 2 +- var/spack/repos/builtin/packages/py-openpyxl/package.py | 2 +- var/spack/repos/builtin/packages/py-ordereddict/package.py | 2 +- var/spack/repos/builtin/packages/py-oset/package.py | 2 +- var/spack/repos/builtin/packages/py-packaging/package.py | 2 +- var/spack/repos/builtin/packages/py-palettable/package.py | 2 +- var/spack/repos/builtin/packages/py-pandas/package.py | 2 +- var/spack/repos/builtin/packages/py-paramiko/package.py | 2 +- var/spack/repos/builtin/packages/py-pathlib2/package.py | 2 +- var/spack/repos/builtin/packages/py-pathos/package.py | 2 +- var/spack/repos/builtin/packages/py-pathspec/package.py | 2 +- var/spack/repos/builtin/packages/py-patsy/package.py | 2 +- var/spack/repos/builtin/packages/py-pbr/package.py | 2 +- var/spack/repos/builtin/packages/py-perf/package.py | 2 +- var/spack/repos/builtin/packages/py-performance/package.py | 2 +- var/spack/repos/builtin/packages/py-periodictable/package.py | 2 +- var/spack/repos/builtin/packages/py-petsc4py/package.py | 2 +- var/spack/repos/builtin/packages/py-pexpect/package.py | 2 +- var/spack/repos/builtin/packages/py-phonopy/package.py | 2 +- var/spack/repos/builtin/packages/py-pickleshare/package.py | 2 +- var/spack/repos/builtin/packages/py-pil/package.py | 2 +- var/spack/repos/builtin/packages/py-pillow/package.py | 2 +- var/spack/repos/builtin/packages/py-pip/package.py | 2 +- var/spack/repos/builtin/packages/py-pipits/package.py | 2 +- var/spack/repos/builtin/packages/py-pkgconfig/package.py | 2 +- var/spack/repos/builtin/packages/py-plotly/package.py | 2 +- var/spack/repos/builtin/packages/py-ply/package.py | 2 +- var/spack/repos/builtin/packages/py-pmw/package.py | 2 +- var/spack/repos/builtin/packages/py-pox/package.py | 2 +- var/spack/repos/builtin/packages/py-ppft/package.py | 2 +- var/spack/repos/builtin/packages/py-prettytable/package.py | 2 +- var/spack/repos/builtin/packages/py-proj/package.py | 2 +- var/spack/repos/builtin/packages/py-prompt-toolkit/package.py | 2 +- var/spack/repos/builtin/packages/py-protobuf/package.py | 2 +- var/spack/repos/builtin/packages/py-psutil/package.py | 2 +- var/spack/repos/builtin/packages/py-psyclone/package.py | 2 +- var/spack/repos/builtin/packages/py-ptyprocess/package.py | 2 +- var/spack/repos/builtin/packages/py-pudb/package.py | 2 +- var/spack/repos/builtin/packages/py-py/package.py | 2 +- var/spack/repos/builtin/packages/py-py2bit/package.py | 2 +- var/spack/repos/builtin/packages/py-py2cairo/package.py | 2 +- var/spack/repos/builtin/packages/py-py2neo/package.py | 2 +- var/spack/repos/builtin/packages/py-py4j/package.py | 2 +- var/spack/repos/builtin/packages/py-pyani/package.py | 2 +- var/spack/repos/builtin/packages/py-pyasn1/package.py | 2 +- var/spack/repos/builtin/packages/py-pybedtools/package.py | 2 +- var/spack/repos/builtin/packages/py-pybigwig/package.py | 2 +- var/spack/repos/builtin/packages/py-pybind11/package.py | 2 +- var/spack/repos/builtin/packages/py-pybtex-docutils/package.py | 2 +- var/spack/repos/builtin/packages/py-pybtex/package.py | 2 +- var/spack/repos/builtin/packages/py-pychecker/package.py | 2 +- var/spack/repos/builtin/packages/py-pycodestyle/package.py | 2 +- var/spack/repos/builtin/packages/py-pycparser/package.py | 2 +- var/spack/repos/builtin/packages/py-pycrypto/package.py | 2 +- var/spack/repos/builtin/packages/py-pycurl/package.py | 2 +- var/spack/repos/builtin/packages/py-pydatalog/package.py | 2 +- var/spack/repos/builtin/packages/py-pydispatcher/package.py | 2 +- var/spack/repos/builtin/packages/py-pydot/package.py | 2 +- var/spack/repos/builtin/packages/py-pyelftools/package.py | 2 +- var/spack/repos/builtin/packages/py-pyfasta/package.py | 2 +- var/spack/repos/builtin/packages/py-pyfftw/package.py | 2 +- var/spack/repos/builtin/packages/py-pyflakes/package.py | 2 +- var/spack/repos/builtin/packages/py-pygments/package.py | 2 +- var/spack/repos/builtin/packages/py-pygobject/package.py | 2 +- var/spack/repos/builtin/packages/py-pygpu/package.py | 2 +- var/spack/repos/builtin/packages/py-pygtk/package.py | 2 +- var/spack/repos/builtin/packages/py-pylint/package.py | 2 +- var/spack/repos/builtin/packages/py-pymatgen/package.py | 2 +- var/spack/repos/builtin/packages/py-pyminifier/package.py | 2 +- var/spack/repos/builtin/packages/py-pympler/package.py | 2 +- var/spack/repos/builtin/packages/py-pynn/package.py | 2 +- var/spack/repos/builtin/packages/py-pypar/package.py | 2 +- var/spack/repos/builtin/packages/py-pyparsing/package.py | 2 +- var/spack/repos/builtin/packages/py-pypeflow/package.py | 2 +- var/spack/repos/builtin/packages/py-pyprof2html/package.py | 2 +- var/spack/repos/builtin/packages/py-pyqt/package.py | 2 +- var/spack/repos/builtin/packages/py-pyrad/package.py | 2 +- var/spack/repos/builtin/packages/py-pysam/package.py | 2 +- var/spack/repos/builtin/packages/py-pyscaf/package.py | 2 +- var/spack/repos/builtin/packages/py-pyserial/package.py | 2 +- var/spack/repos/builtin/packages/py-pyside/package.py | 2 +- var/spack/repos/builtin/packages/py-pysocks/package.py | 2 +- var/spack/repos/builtin/packages/py-pytables/package.py | 2 +- var/spack/repos/builtin/packages/py-pytest-cov/package.py | 2 +- var/spack/repos/builtin/packages/py-pytest-flake8/package.py | 2 +- var/spack/repos/builtin/packages/py-pytest-httpbin/package.py | 2 +- var/spack/repos/builtin/packages/py-pytest-mock/package.py | 2 +- var/spack/repos/builtin/packages/py-pytest-runner/package.py | 2 +- var/spack/repos/builtin/packages/py-pytest-xdist/package.py | 2 +- var/spack/repos/builtin/packages/py-pytest/package.py | 2 +- var/spack/repos/builtin/packages/py-python-daemon/package.py | 2 +- var/spack/repos/builtin/packages/py-python-gitlab/package.py | 2 +- var/spack/repos/builtin/packages/py-python-levenshtein/package.py | 2 +- var/spack/repos/builtin/packages/py-pythonqwt/package.py | 2 +- var/spack/repos/builtin/packages/py-pytz/package.py | 2 +- var/spack/repos/builtin/packages/py-pyutilib/package.py | 2 +- var/spack/repos/builtin/packages/py-pyvcf/package.py | 2 +- var/spack/repos/builtin/packages/py-pywavelets/package.py | 2 +- var/spack/repos/builtin/packages/py-pyyaml/package.py | 2 +- var/spack/repos/builtin/packages/py-qtawesome/package.py | 2 +- var/spack/repos/builtin/packages/py-qtconsole/package.py | 2 +- var/spack/repos/builtin/packages/py-qtpy/package.py | 2 +- var/spack/repos/builtin/packages/py-quantities/package.py | 2 +- var/spack/repos/builtin/packages/py-quast/package.py | 2 +- var/spack/repos/builtin/packages/py-radical-utils/package.py | 2 +- var/spack/repos/builtin/packages/py-ranger/package.py | 2 +- var/spack/repos/builtin/packages/py-rasterio/package.py | 2 +- var/spack/repos/builtin/packages/py-readme-renderer/package.py | 2 +- var/spack/repos/builtin/packages/py-regex/package.py | 2 +- var/spack/repos/builtin/packages/py-reportlab/package.py | 2 +- var/spack/repos/builtin/packages/py-requests/package.py | 2 +- var/spack/repos/builtin/packages/py-restview/package.py | 2 +- var/spack/repos/builtin/packages/py-rope/package.py | 2 +- var/spack/repos/builtin/packages/py-rpy2/package.py | 2 +- var/spack/repos/builtin/packages/py-rsa/package.py | 2 +- var/spack/repos/builtin/packages/py-rseqc/package.py | 2 +- var/spack/repos/builtin/packages/py-rtree/package.py | 2 +- var/spack/repos/builtin/packages/py-saga-python/package.py | 2 +- var/spack/repos/builtin/packages/py-scandir/package.py | 2 +- var/spack/repos/builtin/packages/py-scientificpython/package.py | 2 +- var/spack/repos/builtin/packages/py-scikit-image/package.py | 2 +- var/spack/repos/builtin/packages/py-scikit-learn/package.py | 2 +- var/spack/repos/builtin/packages/py-scipy/package.py | 2 +- var/spack/repos/builtin/packages/py-seaborn/package.py | 2 +- var/spack/repos/builtin/packages/py-setuptools-git/package.py | 2 +- var/spack/repos/builtin/packages/py-setuptools-scm/package.py | 2 +- var/spack/repos/builtin/packages/py-setuptools/package.py | 2 +- var/spack/repos/builtin/packages/py-sfepy/package.py | 2 +- var/spack/repos/builtin/packages/py-sh/package.py | 2 +- var/spack/repos/builtin/packages/py-shiboken/package.py | 2 +- var/spack/repos/builtin/packages/py-simplegeneric/package.py | 2 +- var/spack/repos/builtin/packages/py-simplejson/package.py | 2 +- var/spack/repos/builtin/packages/py-singledispatch/package.py | 2 +- var/spack/repos/builtin/packages/py-sip/package.py | 2 +- var/spack/repos/builtin/packages/py-six/package.py | 2 +- var/spack/repos/builtin/packages/py-slepc4py/package.py | 2 +- var/spack/repos/builtin/packages/py-sncosmo/package.py | 2 +- var/spack/repos/builtin/packages/py-snowballstemmer/package.py | 2 +- var/spack/repos/builtin/packages/py-snuggs/package.py | 2 +- var/spack/repos/builtin/packages/py-spectra/package.py | 2 +- var/spack/repos/builtin/packages/py-spefile/package.py | 2 +- var/spack/repos/builtin/packages/py-spglib/package.py | 2 +- var/spack/repos/builtin/packages/py-sphinx-bootstrap-theme/package.py | 2 +- var/spack/repos/builtin/packages/py-sphinx-rtd-theme/package.py | 2 +- var/spack/repos/builtin/packages/py-sphinx/package.py | 2 +- var/spack/repos/builtin/packages/py-sphinxcontrib-bibtex/package.py | 2 +- .../repos/builtin/packages/py-sphinxcontrib-programoutput/package.py | 2 +- .../repos/builtin/packages/py-sphinxcontrib-websupport/package.py | 2 +- var/spack/repos/builtin/packages/py-spyder/package.py | 2 +- var/spack/repos/builtin/packages/py-spykeutils/package.py | 2 +- var/spack/repos/builtin/packages/py-sqlalchemy/package.py | 2 +- var/spack/repos/builtin/packages/py-statsmodels/package.py | 2 +- var/spack/repos/builtin/packages/py-stevedore/package.py | 2 +- var/spack/repos/builtin/packages/py-storm/package.py | 2 +- var/spack/repos/builtin/packages/py-subprocess32/package.py | 2 +- var/spack/repos/builtin/packages/py-symengine/package.py | 2 +- var/spack/repos/builtin/packages/py-symfit/package.py | 2 +- var/spack/repos/builtin/packages/py-sympy/package.py | 2 +- var/spack/repos/builtin/packages/py-tabulate/package.py | 2 +- var/spack/repos/builtin/packages/py-tappy/package.py | 2 +- var/spack/repos/builtin/packages/py-terminado/package.py | 2 +- var/spack/repos/builtin/packages/py-tetoolkit/package.py | 2 +- var/spack/repos/builtin/packages/py-theano/package.py | 2 +- var/spack/repos/builtin/packages/py-tifffile/package.py | 2 +- var/spack/repos/builtin/packages/py-toml/package.py | 2 +- var/spack/repos/builtin/packages/py-tomopy/package.py | 2 +- var/spack/repos/builtin/packages/py-tornado/package.py | 2 +- var/spack/repos/builtin/packages/py-tqdm/package.py | 2 +- var/spack/repos/builtin/packages/py-traceback2/package.py | 2 +- var/spack/repos/builtin/packages/py-traitlets/package.py | 2 +- var/spack/repos/builtin/packages/py-tuiview/package.py | 2 +- var/spack/repos/builtin/packages/py-twisted/package.py | 2 +- var/spack/repos/builtin/packages/py-typing/package.py | 2 +- var/spack/repos/builtin/packages/py-tzlocal/package.py | 2 +- var/spack/repos/builtin/packages/py-umi-tools/package.py | 2 +- var/spack/repos/builtin/packages/py-unittest2/package.py | 2 +- var/spack/repos/builtin/packages/py-unittest2py3k/package.py | 2 +- var/spack/repos/builtin/packages/py-urllib3/package.py | 2 +- var/spack/repos/builtin/packages/py-urwid/package.py | 2 +- var/spack/repos/builtin/packages/py-vcversioner/package.py | 2 +- var/spack/repos/builtin/packages/py-virtualenv-clone/package.py | 2 +- var/spack/repos/builtin/packages/py-virtualenv/package.py | 2 +- var/spack/repos/builtin/packages/py-virtualenvwrapper/package.py | 2 +- var/spack/repos/builtin/packages/py-vmd-python/package.py | 2 +- var/spack/repos/builtin/packages/py-wcsaxes/package.py | 2 +- var/spack/repos/builtin/packages/py-wcwidth/package.py | 2 +- var/spack/repos/builtin/packages/py-webkit-server/package.py | 2 +- var/spack/repos/builtin/packages/py-werkzeug/package.py | 2 +- var/spack/repos/builtin/packages/py-wheel/package.py | 2 +- var/spack/repos/builtin/packages/py-widgetsnbextension/package.py | 2 +- var/spack/repos/builtin/packages/py-wrapt/package.py | 2 +- var/spack/repos/builtin/packages/py-xarray/package.py | 2 +- var/spack/repos/builtin/packages/py-xattr/package.py | 2 +- var/spack/repos/builtin/packages/py-xlrd/package.py | 2 +- var/spack/repos/builtin/packages/py-xlsxwriter/package.py | 2 +- var/spack/repos/builtin/packages/py-xmlrunner/package.py | 2 +- var/spack/repos/builtin/packages/py-xopen/package.py | 2 +- var/spack/repos/builtin/packages/py-xpyb/package.py | 2 +- var/spack/repos/builtin/packages/py-xvfbwrapper/package.py | 2 +- var/spack/repos/builtin/packages/py-yapf/package.py | 2 +- var/spack/repos/builtin/packages/py-yt/package.py | 2 +- var/spack/repos/builtin/packages/py-zmq/package.py | 2 +- var/spack/repos/builtin/packages/python/package.py | 2 +- var/spack/repos/builtin/packages/qbank/package.py | 2 +- var/spack/repos/builtin/packages/qbox/package.py | 2 +- var/spack/repos/builtin/packages/qhull/package.py | 2 +- var/spack/repos/builtin/packages/qmcpack/package.py | 2 +- var/spack/repos/builtin/packages/qrupdate/package.py | 2 +- var/spack/repos/builtin/packages/qt-creator/package.py | 2 +- var/spack/repos/builtin/packages/qt/package.py | 2 +- var/spack/repos/builtin/packages/qtgraph/package.py | 2 +- var/spack/repos/builtin/packages/qthreads/package.py | 2 +- var/spack/repos/builtin/packages/qwt/package.py | 2 +- var/spack/repos/builtin/packages/r-a4/package.py | 2 +- var/spack/repos/builtin/packages/r-a4base/package.py | 2 +- var/spack/repos/builtin/packages/r-a4classif/package.py | 2 +- var/spack/repos/builtin/packages/r-a4core/package.py | 2 +- var/spack/repos/builtin/packages/r-a4preproc/package.py | 2 +- var/spack/repos/builtin/packages/r-a4reporting/package.py | 2 +- var/spack/repos/builtin/packages/r-abadata/package.py | 2 +- var/spack/repos/builtin/packages/r-abaenrichment/package.py | 2 +- var/spack/repos/builtin/packages/r-abind/package.py | 2 +- var/spack/repos/builtin/packages/r-absseq/package.py | 2 +- var/spack/repos/builtin/packages/r-acde/package.py | 2 +- var/spack/repos/builtin/packages/r-acepack/package.py | 2 +- var/spack/repos/builtin/packages/r-acgh/package.py | 2 +- var/spack/repos/builtin/packages/r-acme/package.py | 2 +- var/spack/repos/builtin/packages/r-ada/package.py | 2 +- var/spack/repos/builtin/packages/r-adabag/package.py | 2 +- var/spack/repos/builtin/packages/r-ade4/package.py | 2 +- var/spack/repos/builtin/packages/r-adegenet/package.py | 2 +- var/spack/repos/builtin/packages/r-adsplit/package.py | 2 +- var/spack/repos/builtin/packages/r-affxparser/package.py | 2 +- var/spack/repos/builtin/packages/r-affy/package.py | 2 +- var/spack/repos/builtin/packages/r-affycomp/package.py | 2 +- var/spack/repos/builtin/packages/r-affycompatible/package.py | 2 +- var/spack/repos/builtin/packages/r-affycontam/package.py | 2 +- var/spack/repos/builtin/packages/r-affycoretools/package.py | 2 +- var/spack/repos/builtin/packages/r-affydata/package.py | 2 +- var/spack/repos/builtin/packages/r-affyexpress/package.py | 2 +- var/spack/repos/builtin/packages/r-affyilm/package.py | 2 +- var/spack/repos/builtin/packages/r-affyio/package.py | 2 +- var/spack/repos/builtin/packages/r-affypdnn/package.py | 2 +- var/spack/repos/builtin/packages/r-affyplm/package.py | 2 +- var/spack/repos/builtin/packages/r-affyqcreport/package.py | 2 +- var/spack/repos/builtin/packages/r-affyrnadegradation/package.py | 2 +- var/spack/repos/builtin/packages/r-agdex/package.py | 2 +- var/spack/repos/builtin/packages/r-agilp/package.py | 2 +- var/spack/repos/builtin/packages/r-agimicrorna/package.py | 2 +- var/spack/repos/builtin/packages/r-aims/package.py | 2 +- var/spack/repos/builtin/packages/r-aldex2/package.py | 2 +- var/spack/repos/builtin/packages/r-allelicimbalance/package.py | 2 +- var/spack/repos/builtin/packages/r-alpine/package.py | 2 +- var/spack/repos/builtin/packages/r-als/package.py | 2 +- var/spack/repos/builtin/packages/r-alsace/package.py | 2 +- var/spack/repos/builtin/packages/r-altcdfenvs/package.py | 2 +- var/spack/repos/builtin/packages/r-ampliqueso/package.py | 2 +- var/spack/repos/builtin/packages/r-analysispageserver/package.py | 2 +- var/spack/repos/builtin/packages/r-anaquin/package.py | 2 +- var/spack/repos/builtin/packages/r-aneufinder/package.py | 2 +- var/spack/repos/builtin/packages/r-aneufinderdata/package.py | 2 +- var/spack/repos/builtin/packages/r-annaffy/package.py | 2 +- var/spack/repos/builtin/packages/r-annotate/package.py | 2 +- var/spack/repos/builtin/packages/r-annotationdbi/package.py | 2 +- var/spack/repos/builtin/packages/r-annotationfilter/package.py | 2 +- var/spack/repos/builtin/packages/r-annotationforge/package.py | 2 +- var/spack/repos/builtin/packages/r-annotationhub/package.py | 2 +- var/spack/repos/builtin/packages/r-ape/package.py | 2 +- var/spack/repos/builtin/packages/r-assertthat/package.py | 2 +- var/spack/repos/builtin/packages/r-backports/package.py | 2 +- var/spack/repos/builtin/packages/r-bamsignals/package.py | 2 +- var/spack/repos/builtin/packages/r-base64/package.py | 2 +- var/spack/repos/builtin/packages/r-base64enc/package.py | 2 +- var/spack/repos/builtin/packages/r-beanplot/package.py | 2 +- var/spack/repos/builtin/packages/r-bh/package.py | 2 +- var/spack/repos/builtin/packages/r-bindr/package.py | 2 +- var/spack/repos/builtin/packages/r-bindrcpp/package.py | 2 +- var/spack/repos/builtin/packages/r-biobase/package.py | 2 +- var/spack/repos/builtin/packages/r-biocgenerics/package.py | 2 +- var/spack/repos/builtin/packages/r-biocinstaller/package.py | 2 +- var/spack/repos/builtin/packages/r-biocparallel/package.py | 2 +- var/spack/repos/builtin/packages/r-biocstyle/package.py | 2 +- var/spack/repos/builtin/packages/r-biomart/package.py | 2 +- var/spack/repos/builtin/packages/r-biomformat/package.py | 2 +- var/spack/repos/builtin/packages/r-biostrings/package.py | 2 +- var/spack/repos/builtin/packages/r-biovizbase/package.py | 2 +- var/spack/repos/builtin/packages/r-bit/package.py | 2 +- var/spack/repos/builtin/packages/r-bit64/package.py | 2 +- var/spack/repos/builtin/packages/r-bitops/package.py | 2 +- var/spack/repos/builtin/packages/r-blob/package.py | 2 +- var/spack/repos/builtin/packages/r-bookdown/package.py | 2 +- var/spack/repos/builtin/packages/r-boot/package.py | 2 +- var/spack/repos/builtin/packages/r-brew/package.py | 2 +- var/spack/repos/builtin/packages/r-broom/package.py | 2 +- var/spack/repos/builtin/packages/r-bsgenome/package.py | 2 +- var/spack/repos/builtin/packages/r-bumphunter/package.py | 2 +- var/spack/repos/builtin/packages/r-c50/package.py | 2 +- var/spack/repos/builtin/packages/r-callr/package.py | 2 +- var/spack/repos/builtin/packages/r-car/package.py | 2 +- var/spack/repos/builtin/packages/r-caret/package.py | 2 +- var/spack/repos/builtin/packages/r-category/package.py | 2 +- var/spack/repos/builtin/packages/r-catools/package.py | 2 +- var/spack/repos/builtin/packages/r-cellranger/package.py | 2 +- var/spack/repos/builtin/packages/r-checkmate/package.py | 2 +- var/spack/repos/builtin/packages/r-checkpoint/package.py | 2 +- var/spack/repos/builtin/packages/r-chemometrics/package.py | 2 +- var/spack/repos/builtin/packages/r-chron/package.py | 2 +- var/spack/repos/builtin/packages/r-circlize/package.py | 2 +- var/spack/repos/builtin/packages/r-class/package.py | 2 +- var/spack/repos/builtin/packages/r-classint/package.py | 2 +- var/spack/repos/builtin/packages/r-cli/package.py | 2 +- var/spack/repos/builtin/packages/r-clipr/package.py | 2 +- var/spack/repos/builtin/packages/r-cluster/package.py | 2 +- var/spack/repos/builtin/packages/r-clusterprofiler/package.py | 2 +- var/spack/repos/builtin/packages/r-cner/package.py | 2 +- var/spack/repos/builtin/packages/r-coda/package.py | 2 +- var/spack/repos/builtin/packages/r-codetools/package.py | 2 +- var/spack/repos/builtin/packages/r-coin/package.py | 2 +- var/spack/repos/builtin/packages/r-colorspace/package.py | 2 +- var/spack/repos/builtin/packages/r-complexheatmap/package.py | 2 +- var/spack/repos/builtin/packages/r-corpcor/package.py | 2 +- var/spack/repos/builtin/packages/r-corrplot/package.py | 2 +- var/spack/repos/builtin/packages/r-covr/package.py | 2 +- var/spack/repos/builtin/packages/r-cowplot/package.py | 2 +- var/spack/repos/builtin/packages/r-crayon/package.py | 2 +- var/spack/repos/builtin/packages/r-crosstalk/package.py | 2 +- var/spack/repos/builtin/packages/r-cubature/package.py | 2 +- var/spack/repos/builtin/packages/r-cubist/package.py | 2 +- var/spack/repos/builtin/packages/r-curl/package.py | 2 +- var/spack/repos/builtin/packages/r-data-table/package.py | 2 +- var/spack/repos/builtin/packages/r-dbi/package.py | 2 +- var/spack/repos/builtin/packages/r-dbplyr/package.py | 2 +- var/spack/repos/builtin/packages/r-delayedarray/package.py | 2 +- var/spack/repos/builtin/packages/r-deldir/package.py | 2 +- var/spack/repos/builtin/packages/r-dendextend/package.py | 2 +- var/spack/repos/builtin/packages/r-deoptim/package.py | 2 +- var/spack/repos/builtin/packages/r-deoptimr/package.py | 2 +- var/spack/repos/builtin/packages/r-deseq/package.py | 2 +- var/spack/repos/builtin/packages/r-deseq2/package.py | 2 +- var/spack/repos/builtin/packages/r-desolve/package.py | 2 +- var/spack/repos/builtin/packages/r-devtools/package.py | 2 +- var/spack/repos/builtin/packages/r-diagrammer/package.py | 2 +- var/spack/repos/builtin/packages/r-dichromat/package.py | 2 +- var/spack/repos/builtin/packages/r-diffusionmap/package.py | 2 +- var/spack/repos/builtin/packages/r-digest/package.py | 2 +- var/spack/repos/builtin/packages/r-diptest/package.py | 2 +- var/spack/repos/builtin/packages/r-dirichletmultinomial/package.py | 2 +- var/spack/repos/builtin/packages/r-dnacopy/package.py | 2 +- var/spack/repos/builtin/packages/r-do-db/package.py | 2 +- var/spack/repos/builtin/packages/r-domc/package.py | 2 +- var/spack/repos/builtin/packages/r-doparallel/package.py | 2 +- var/spack/repos/builtin/packages/r-dorng/package.py | 2 +- var/spack/repos/builtin/packages/r-dose/package.py | 2 +- var/spack/repos/builtin/packages/r-downloader/package.py | 2 +- var/spack/repos/builtin/packages/r-dplyr/package.py | 2 +- var/spack/repos/builtin/packages/r-dt/package.py | 2 +- var/spack/repos/builtin/packages/r-dtw/package.py | 2 +- var/spack/repos/builtin/packages/r-dygraphs/package.py | 2 +- var/spack/repos/builtin/packages/r-e1071/package.py | 2 +- var/spack/repos/builtin/packages/r-edger/package.py | 2 +- var/spack/repos/builtin/packages/r-ellipse/package.py | 2 +- var/spack/repos/builtin/packages/r-ensembldb/package.py | 2 +- var/spack/repos/builtin/packages/r-ergm/package.py | 2 +- var/spack/repos/builtin/packages/r-evaluate/package.py | 2 +- var/spack/repos/builtin/packages/r-expm/package.py | 2 +- var/spack/repos/builtin/packages/r-factoextra/package.py | 2 +- var/spack/repos/builtin/packages/r-factominer/package.py | 2 +- var/spack/repos/builtin/packages/r-fastmatch/package.py | 2 +- var/spack/repos/builtin/packages/r-ff/package.py | 2 +- var/spack/repos/builtin/packages/r-fftwtools/package.py | 2 +- var/spack/repos/builtin/packages/r-fgsea/package.py | 2 +- var/spack/repos/builtin/packages/r-filehash/package.py | 2 +- var/spack/repos/builtin/packages/r-flashclust/package.py | 2 +- var/spack/repos/builtin/packages/r-flexmix/package.py | 2 +- var/spack/repos/builtin/packages/r-fnn/package.py | 2 +- var/spack/repos/builtin/packages/r-forcats/package.py | 2 +- var/spack/repos/builtin/packages/r-foreach/package.py | 2 +- var/spack/repos/builtin/packages/r-forecast/package.py | 2 +- var/spack/repos/builtin/packages/r-foreign/package.py | 2 +- var/spack/repos/builtin/packages/r-formatr/package.py | 2 +- var/spack/repos/builtin/packages/r-formula/package.py | 2 +- var/spack/repos/builtin/packages/r-fpc/package.py | 2 +- var/spack/repos/builtin/packages/r-fracdiff/package.py | 2 +- var/spack/repos/builtin/packages/r-futile-logger/package.py | 2 +- var/spack/repos/builtin/packages/r-futile-options/package.py | 2 +- var/spack/repos/builtin/packages/r-gbm/package.py | 2 +- var/spack/repos/builtin/packages/r-gcrma/package.py | 2 +- var/spack/repos/builtin/packages/r-gdata/package.py | 2 +- var/spack/repos/builtin/packages/r-gdsfmt/package.py | 2 +- var/spack/repos/builtin/packages/r-geiger/package.py | 2 +- var/spack/repos/builtin/packages/r-genefilter/package.py | 2 +- var/spack/repos/builtin/packages/r-geneplotter/package.py | 2 +- var/spack/repos/builtin/packages/r-genomeinfodb/package.py | 2 +- var/spack/repos/builtin/packages/r-genomeinfodbdata/package.py | 2 +- var/spack/repos/builtin/packages/r-genomicalignments/package.py | 2 +- var/spack/repos/builtin/packages/r-genomicfeatures/package.py | 2 +- var/spack/repos/builtin/packages/r-genomicranges/package.py | 2 +- var/spack/repos/builtin/packages/r-geomorph/package.py | 2 +- var/spack/repos/builtin/packages/r-geoquery/package.py | 2 +- var/spack/repos/builtin/packages/r-geosphere/package.py | 2 +- var/spack/repos/builtin/packages/r-getopt/package.py | 2 +- var/spack/repos/builtin/packages/r-getoptlong/package.py | 2 +- var/spack/repos/builtin/packages/r-ggally/package.py | 2 +- var/spack/repos/builtin/packages/r-ggbio/package.py | 2 +- var/spack/repos/builtin/packages/r-ggdendro/package.py | 2 +- var/spack/repos/builtin/packages/r-ggjoy/package.py | 2 +- var/spack/repos/builtin/packages/r-ggmap/package.py | 2 +- var/spack/repos/builtin/packages/r-ggplot2/package.py | 2 +- var/spack/repos/builtin/packages/r-ggpubr/package.py | 2 +- var/spack/repos/builtin/packages/r-ggrepel/package.py | 2 +- var/spack/repos/builtin/packages/r-ggridges/package.py | 2 +- var/spack/repos/builtin/packages/r-ggsci/package.py | 2 +- var/spack/repos/builtin/packages/r-ggvis/package.py | 2 +- var/spack/repos/builtin/packages/r-gistr/package.py | 2 +- var/spack/repos/builtin/packages/r-git2r/package.py | 2 +- var/spack/repos/builtin/packages/r-glmnet/package.py | 2 +- var/spack/repos/builtin/packages/r-globaloptions/package.py | 2 +- var/spack/repos/builtin/packages/r-glue/package.py | 2 +- var/spack/repos/builtin/packages/r-gmodels/package.py | 2 +- var/spack/repos/builtin/packages/r-gmp/package.py | 2 +- var/spack/repos/builtin/packages/r-go-db/package.py | 2 +- var/spack/repos/builtin/packages/r-googlevis/package.py | 2 +- var/spack/repos/builtin/packages/r-gosemsim/package.py | 2 +- var/spack/repos/builtin/packages/r-gostats/package.py | 2 +- var/spack/repos/builtin/packages/r-gplots/package.py | 2 +- var/spack/repos/builtin/packages/r-graph/package.py | 2 +- var/spack/repos/builtin/packages/r-gridbase/package.py | 2 +- var/spack/repos/builtin/packages/r-gridextra/package.py | 2 +- var/spack/repos/builtin/packages/r-gseabase/package.py | 2 +- var/spack/repos/builtin/packages/r-gsubfn/package.py | 2 +- var/spack/repos/builtin/packages/r-gtable/package.py | 2 +- var/spack/repos/builtin/packages/r-gtools/package.py | 2 +- var/spack/repos/builtin/packages/r-gtrellis/package.py | 2 +- var/spack/repos/builtin/packages/r-gviz/package.py | 2 +- var/spack/repos/builtin/packages/r-haven/package.py | 2 +- var/spack/repos/builtin/packages/r-hexbin/package.py | 2 +- var/spack/repos/builtin/packages/r-highr/package.py | 2 +- var/spack/repos/builtin/packages/r-hmisc/package.py | 2 +- var/spack/repos/builtin/packages/r-hms/package.py | 2 +- var/spack/repos/builtin/packages/r-htmltable/package.py | 2 +- var/spack/repos/builtin/packages/r-htmltools/package.py | 2 +- var/spack/repos/builtin/packages/r-htmlwidgets/package.py | 2 +- var/spack/repos/builtin/packages/r-httpuv/package.py | 2 +- var/spack/repos/builtin/packages/r-httr/package.py | 2 +- var/spack/repos/builtin/packages/r-hwriter/package.py | 2 +- var/spack/repos/builtin/packages/r-hypergraph/package.py | 2 +- var/spack/repos/builtin/packages/r-ica/package.py | 2 +- var/spack/repos/builtin/packages/r-igraph/package.py | 2 +- var/spack/repos/builtin/packages/r-illuminaio/package.py | 2 +- var/spack/repos/builtin/packages/r-impute/package.py | 2 +- var/spack/repos/builtin/packages/r-influencer/package.py | 2 +- var/spack/repos/builtin/packages/r-inline/package.py | 2 +- var/spack/repos/builtin/packages/r-interactivedisplaybase/package.py | 2 +- var/spack/repos/builtin/packages/r-ipred/package.py | 2 +- var/spack/repos/builtin/packages/r-iranges/package.py | 2 +- var/spack/repos/builtin/packages/r-irdisplay/package.py | 2 +- var/spack/repos/builtin/packages/r-irkernel/package.py | 2 +- var/spack/repos/builtin/packages/r-irlba/package.py | 2 +- var/spack/repos/builtin/packages/r-iso/package.py | 2 +- var/spack/repos/builtin/packages/r-iterators/package.py | 2 +- var/spack/repos/builtin/packages/r-janitor/package.py | 2 +- var/spack/repos/builtin/packages/r-jaspar2018/package.py | 2 +- var/spack/repos/builtin/packages/r-jpeg/package.py | 2 +- var/spack/repos/builtin/packages/r-jsonlite/package.py | 2 +- var/spack/repos/builtin/packages/r-kegg-db/package.py | 2 +- var/spack/repos/builtin/packages/r-kegggraph/package.py | 2 +- var/spack/repos/builtin/packages/r-keggrest/package.py | 2 +- var/spack/repos/builtin/packages/r-kernlab/package.py | 2 +- var/spack/repos/builtin/packages/r-kernsmooth/package.py | 2 +- var/spack/repos/builtin/packages/r-kknn/package.py | 2 +- var/spack/repos/builtin/packages/r-knitr/package.py | 2 +- var/spack/repos/builtin/packages/r-labeling/package.py | 2 +- var/spack/repos/builtin/packages/r-lambda-r/package.py | 2 +- var/spack/repos/builtin/packages/r-laplacesdemon/package.py | 2 +- var/spack/repos/builtin/packages/r-lars/package.py | 2 +- var/spack/repos/builtin/packages/r-lattice/package.py | 2 +- var/spack/repos/builtin/packages/r-latticeextra/package.py | 2 +- var/spack/repos/builtin/packages/r-lava/package.py | 2 +- var/spack/repos/builtin/packages/r-lazyeval/package.py | 2 +- var/spack/repos/builtin/packages/r-leaflet/package.py | 2 +- var/spack/repos/builtin/packages/r-leaps/package.py | 2 +- var/spack/repos/builtin/packages/r-learnbayes/package.py | 2 +- var/spack/repos/builtin/packages/r-limma/package.py | 2 +- var/spack/repos/builtin/packages/r-lme4/package.py | 2 +- var/spack/repos/builtin/packages/r-lmtest/package.py | 2 +- var/spack/repos/builtin/packages/r-locfit/package.py | 2 +- var/spack/repos/builtin/packages/r-log4r/package.py | 2 +- var/spack/repos/builtin/packages/r-lpsolve/package.py | 2 +- var/spack/repos/builtin/packages/r-lsei/package.py | 2 +- var/spack/repos/builtin/packages/r-lubridate/package.py | 2 +- var/spack/repos/builtin/packages/r-magic/package.py | 2 +- var/spack/repos/builtin/packages/r-magrittr/package.py | 2 +- var/spack/repos/builtin/packages/r-makecdfenv/package.py | 2 +- var/spack/repos/builtin/packages/r-maldiquant/package.py | 2 +- var/spack/repos/builtin/packages/r-mapproj/package.py | 2 +- var/spack/repos/builtin/packages/r-maps/package.py | 2 +- var/spack/repos/builtin/packages/r-maptools/package.py | 2 +- var/spack/repos/builtin/packages/r-markdown/package.py | 2 +- var/spack/repos/builtin/packages/r-mass/package.py | 2 +- var/spack/repos/builtin/packages/r-matrix/package.py | 2 +- var/spack/repos/builtin/packages/r-matrixmodels/package.py | 2 +- var/spack/repos/builtin/packages/r-matrixstats/package.py | 2 +- var/spack/repos/builtin/packages/r-mclust/package.py | 2 +- var/spack/repos/builtin/packages/r-mcmcglmm/package.py | 2 +- var/spack/repos/builtin/packages/r-mda/package.py | 2 +- var/spack/repos/builtin/packages/r-memoise/package.py | 2 +- var/spack/repos/builtin/packages/r-mergemaid/package.py | 2 +- var/spack/repos/builtin/packages/r-methodss3/package.py | 2 +- var/spack/repos/builtin/packages/r-mgcv/package.py | 2 +- var/spack/repos/builtin/packages/r-mime/package.py | 2 +- var/spack/repos/builtin/packages/r-minfi/package.py | 2 +- var/spack/repos/builtin/packages/r-minqa/package.py | 2 +- var/spack/repos/builtin/packages/r-mixtools/package.py | 2 +- var/spack/repos/builtin/packages/r-mlbench/package.py | 2 +- var/spack/repos/builtin/packages/r-mlinterfaces/package.py | 2 +- var/spack/repos/builtin/packages/r-mnormt/package.py | 2 +- var/spack/repos/builtin/packages/r-modelmetrics/package.py | 2 +- var/spack/repos/builtin/packages/r-modelr/package.py | 2 +- var/spack/repos/builtin/packages/r-modeltools/package.py | 2 +- var/spack/repos/builtin/packages/r-mpm/package.py | 2 +- var/spack/repos/builtin/packages/r-msnbase/package.py | 2 +- var/spack/repos/builtin/packages/r-multcomp/package.py | 2 +- var/spack/repos/builtin/packages/r-multtest/package.py | 2 +- var/spack/repos/builtin/packages/r-munsell/package.py | 2 +- var/spack/repos/builtin/packages/r-mvtnorm/package.py | 2 +- var/spack/repos/builtin/packages/r-mzid/package.py | 2 +- var/spack/repos/builtin/packages/r-mzr/package.py | 2 +- var/spack/repos/builtin/packages/r-nanotime/package.py | 2 +- var/spack/repos/builtin/packages/r-ncbit/package.py | 2 +- var/spack/repos/builtin/packages/r-ncdf4/package.py | 2 +- var/spack/repos/builtin/packages/r-network/package.py | 2 +- var/spack/repos/builtin/packages/r-networkd3/package.py | 2 +- var/spack/repos/builtin/packages/r-nlme/package.py | 2 +- var/spack/repos/builtin/packages/r-nloptr/package.py | 2 +- var/spack/repos/builtin/packages/r-nmf/package.py | 2 +- var/spack/repos/builtin/packages/r-nnet/package.py | 2 +- var/spack/repos/builtin/packages/r-nnls/package.py | 2 +- var/spack/repos/builtin/packages/r-nor1mix/package.py | 2 +- var/spack/repos/builtin/packages/r-np/package.py | 2 +- var/spack/repos/builtin/packages/r-numderiv/package.py | 2 +- var/spack/repos/builtin/packages/r-oligoclasses/package.py | 2 +- var/spack/repos/builtin/packages/r-oo/package.py | 2 +- var/spack/repos/builtin/packages/r-openssl/package.py | 2 +- var/spack/repos/builtin/packages/r-org-hs-eg-db/package.py | 2 +- var/spack/repos/builtin/packages/r-organismdbi/package.py | 2 +- var/spack/repos/builtin/packages/r-packrat/package.py | 2 +- var/spack/repos/builtin/packages/r-pacman/package.py | 2 +- var/spack/repos/builtin/packages/r-pamr/package.py | 2 +- var/spack/repos/builtin/packages/r-party/package.py | 2 +- var/spack/repos/builtin/packages/r-partykit/package.py | 2 +- var/spack/repos/builtin/packages/r-pathview/package.py | 2 +- var/spack/repos/builtin/packages/r-pbapply/package.py | 2 +- var/spack/repos/builtin/packages/r-pbdzmq/package.py | 2 +- var/spack/repos/builtin/packages/r-pbkrtest/package.py | 2 +- var/spack/repos/builtin/packages/r-pcamethods/package.py | 2 +- var/spack/repos/builtin/packages/r-pcapp/package.py | 2 +- var/spack/repos/builtin/packages/r-permute/package.py | 2 +- var/spack/repos/builtin/packages/r-pfam-db/package.py | 2 +- var/spack/repos/builtin/packages/r-phangorn/package.py | 2 +- var/spack/repos/builtin/packages/r-phantompeakqualtools/package.py | 2 +- var/spack/repos/builtin/packages/r-phyloseq/package.py | 2 +- var/spack/repos/builtin/packages/r-pkgconfig/package.py | 2 +- var/spack/repos/builtin/packages/r-pkgmaker/package.py | 2 +- var/spack/repos/builtin/packages/r-plogr/package.py | 2 +- var/spack/repos/builtin/packages/r-plotly/package.py | 2 +- var/spack/repos/builtin/packages/r-plotrix/package.py | 2 +- var/spack/repos/builtin/packages/r-pls/package.py | 2 +- var/spack/repos/builtin/packages/r-plyr/package.py | 2 +- var/spack/repos/builtin/packages/r-pmcmr/package.py | 2 +- var/spack/repos/builtin/packages/r-png/package.py | 2 +- var/spack/repos/builtin/packages/r-powerlaw/package.py | 2 +- var/spack/repos/builtin/packages/r-prabclus/package.py | 2 +- var/spack/repos/builtin/packages/r-praise/package.py | 2 +- var/spack/repos/builtin/packages/r-preprocesscore/package.py | 2 +- var/spack/repos/builtin/packages/r-prettyunits/package.py | 2 +- var/spack/repos/builtin/packages/r-prodlim/package.py | 2 +- var/spack/repos/builtin/packages/r-progress/package.py | 2 +- var/spack/repos/builtin/packages/r-protgenerics/package.py | 2 +- var/spack/repos/builtin/packages/r-proto/package.py | 2 +- var/spack/repos/builtin/packages/r-proxy/package.py | 2 +- var/spack/repos/builtin/packages/r-pryr/package.py | 2 +- var/spack/repos/builtin/packages/r-psych/package.py | 2 +- var/spack/repos/builtin/packages/r-ptw/package.py | 2 +- var/spack/repos/builtin/packages/r-purrr/package.py | 2 +- var/spack/repos/builtin/packages/r-quadprog/package.py | 2 +- var/spack/repos/builtin/packages/r-quantmod/package.py | 2 +- var/spack/repos/builtin/packages/r-quantreg/package.py | 2 +- var/spack/repos/builtin/packages/r-quantro/package.py | 2 +- var/spack/repos/builtin/packages/r-qvalue/package.py | 2 +- var/spack/repos/builtin/packages/r-r6/package.py | 2 +- var/spack/repos/builtin/packages/r-randomforest/package.py | 2 +- var/spack/repos/builtin/packages/r-ranger/package.py | 2 +- var/spack/repos/builtin/packages/r-rappdirs/package.py | 2 +- var/spack/repos/builtin/packages/r-raster/package.py | 2 +- var/spack/repos/builtin/packages/r-rbgl/package.py | 2 +- var/spack/repos/builtin/packages/r-rbokeh/package.py | 2 +- var/spack/repos/builtin/packages/r-rcolorbrewer/package.py | 2 +- var/spack/repos/builtin/packages/r-rcpp/package.py | 2 +- var/spack/repos/builtin/packages/r-rcpparmadillo/package.py | 2 +- var/spack/repos/builtin/packages/r-rcppblaze/package.py | 2 +- var/spack/repos/builtin/packages/r-rcppcctz/package.py | 2 +- var/spack/repos/builtin/packages/r-rcppeigen/package.py | 2 +- var/spack/repos/builtin/packages/r-rcppprogress/package.py | 2 +- var/spack/repos/builtin/packages/r-rcurl/package.py | 2 +- var/spack/repos/builtin/packages/r-rda/package.py | 2 +- var/spack/repos/builtin/packages/r-readr/package.py | 2 +- var/spack/repos/builtin/packages/r-readxl/package.py | 2 +- var/spack/repos/builtin/packages/r-registry/package.py | 2 +- var/spack/repos/builtin/packages/r-rematch/package.py | 2 +- var/spack/repos/builtin/packages/r-reordercluster/package.py | 2 +- var/spack/repos/builtin/packages/r-reportingtools/package.py | 2 +- var/spack/repos/builtin/packages/r-repr/package.py | 2 +- var/spack/repos/builtin/packages/r-reprex/package.py | 2 +- var/spack/repos/builtin/packages/r-reshape/package.py | 2 +- var/spack/repos/builtin/packages/r-reshape2/package.py | 2 +- var/spack/repos/builtin/packages/r-rex/package.py | 2 +- var/spack/repos/builtin/packages/r-rgdal/package.py | 2 +- var/spack/repos/builtin/packages/r-rgeos/package.py | 2 +- var/spack/repos/builtin/packages/r-rgl/package.py | 2 +- var/spack/repos/builtin/packages/r-rgooglemaps/package.py | 2 +- var/spack/repos/builtin/packages/r-rgraphviz/package.py | 2 +- var/spack/repos/builtin/packages/r-rhdf5/package.py | 2 +- var/spack/repos/builtin/packages/r-rhtslib/package.py | 2 +- var/spack/repos/builtin/packages/r-rinside/package.py | 2 +- var/spack/repos/builtin/packages/r-rjags/package.py | 2 +- var/spack/repos/builtin/packages/r-rjava/package.py | 2 +- var/spack/repos/builtin/packages/r-rjson/package.py | 2 +- var/spack/repos/builtin/packages/r-rjsonio/package.py | 2 +- var/spack/repos/builtin/packages/r-rlang/package.py | 2 +- var/spack/repos/builtin/packages/r-rmarkdown/package.py | 2 +- var/spack/repos/builtin/packages/r-rminer/package.py | 2 +- var/spack/repos/builtin/packages/r-rmpfr/package.py | 2 +- var/spack/repos/builtin/packages/r-rmpi/package.py | 2 +- var/spack/repos/builtin/packages/r-rmysql/package.py | 2 +- var/spack/repos/builtin/packages/r-rngtools/package.py | 2 +- var/spack/repos/builtin/packages/r-robustbase/package.py | 2 +- var/spack/repos/builtin/packages/r-rocr/package.py | 2 +- var/spack/repos/builtin/packages/r-rodbc/package.py | 2 +- var/spack/repos/builtin/packages/r-roxygen2/package.py | 2 +- var/spack/repos/builtin/packages/r-rpart-plot/package.py | 2 +- var/spack/repos/builtin/packages/r-rpart/package.py | 2 +- var/spack/repos/builtin/packages/r-rpostgresql/package.py | 2 +- var/spack/repos/builtin/packages/r-rprojroot/package.py | 2 +- var/spack/repos/builtin/packages/r-rsamtools/package.py | 2 +- var/spack/repos/builtin/packages/r-rsnns/package.py | 2 +- var/spack/repos/builtin/packages/r-rsqlite/package.py | 2 +- var/spack/repos/builtin/packages/r-rstan/package.py | 2 +- var/spack/repos/builtin/packages/r-rstudioapi/package.py | 2 +- var/spack/repos/builtin/packages/r-rtracklayer/package.py | 2 +- var/spack/repos/builtin/packages/r-rtsne/package.py | 2 +- var/spack/repos/builtin/packages/r-rvcheck/package.py | 2 +- var/spack/repos/builtin/packages/r-rvest/package.py | 2 +- var/spack/repos/builtin/packages/r-rzmq/package.py | 2 +- var/spack/repos/builtin/packages/r-s4vectors/package.py | 2 +- var/spack/repos/builtin/packages/r-samr/package.py | 2 +- var/spack/repos/builtin/packages/r-sandwich/package.py | 2 +- var/spack/repos/builtin/packages/r-scales/package.py | 2 +- var/spack/repos/builtin/packages/r-scatterplot3d/package.py | 2 +- var/spack/repos/builtin/packages/r-sdmtools/package.py | 2 +- var/spack/repos/builtin/packages/r-segmented/package.py | 2 +- var/spack/repos/builtin/packages/r-selectr/package.py | 2 +- var/spack/repos/builtin/packages/r-seqinr/package.py | 2 +- var/spack/repos/builtin/packages/r-seqlogo/package.py | 2 +- var/spack/repos/builtin/packages/r-seurat/package.py | 2 +- var/spack/repos/builtin/packages/r-sf/package.py | 2 +- var/spack/repos/builtin/packages/r-sfsmisc/package.py | 2 +- var/spack/repos/builtin/packages/r-shape/package.py | 2 +- var/spack/repos/builtin/packages/r-shiny/package.py | 2 +- var/spack/repos/builtin/packages/r-shortread/package.py | 2 +- var/spack/repos/builtin/packages/r-siggenes/package.py | 2 +- var/spack/repos/builtin/packages/r-simpleaffy/package.py | 2 +- var/spack/repos/builtin/packages/r-sn/package.py | 2 +- var/spack/repos/builtin/packages/r-snow/package.py | 2 +- var/spack/repos/builtin/packages/r-snprelate/package.py | 2 +- var/spack/repos/builtin/packages/r-som/package.py | 2 +- var/spack/repos/builtin/packages/r-somaticsignatures/package.py | 2 +- var/spack/repos/builtin/packages/r-sourcetools/package.py | 2 +- var/spack/repos/builtin/packages/r-sp/package.py | 2 +- var/spack/repos/builtin/packages/r-sparsem/package.py | 2 +- var/spack/repos/builtin/packages/r-spdep/package.py | 2 +- var/spack/repos/builtin/packages/r-speedglm/package.py | 2 +- var/spack/repos/builtin/packages/r-sqldf/package.py | 2 +- var/spack/repos/builtin/packages/r-stanheaders/package.py | 2 +- var/spack/repos/builtin/packages/r-statmod/package.py | 2 +- var/spack/repos/builtin/packages/r-statnet-common/package.py | 2 +- var/spack/repos/builtin/packages/r-stringi/package.py | 2 +- var/spack/repos/builtin/packages/r-stringr/package.py | 2 +- var/spack/repos/builtin/packages/r-strucchange/package.py | 2 +- var/spack/repos/builtin/packages/r-subplex/package.py | 2 +- var/spack/repos/builtin/packages/r-summarizedexperiment/package.py | 2 +- var/spack/repos/builtin/packages/r-survey/package.py | 2 +- var/spack/repos/builtin/packages/r-survival/package.py | 2 +- var/spack/repos/builtin/packages/r-sva/package.py | 2 +- var/spack/repos/builtin/packages/r-tarifx/package.py | 2 +- var/spack/repos/builtin/packages/r-tclust/package.py | 2 +- var/spack/repos/builtin/packages/r-tensora/package.py | 2 +- var/spack/repos/builtin/packages/r-testit/package.py | 2 +- var/spack/repos/builtin/packages/r-testthat/package.py | 2 +- var/spack/repos/builtin/packages/r-tfbstools/package.py | 2 +- var/spack/repos/builtin/packages/r-tfmpvalue/package.py | 2 +- var/spack/repos/builtin/packages/r-th-data/package.py | 2 +- var/spack/repos/builtin/packages/r-threejs/package.py | 2 +- var/spack/repos/builtin/packages/r-tibble/package.py | 2 +- var/spack/repos/builtin/packages/r-tidycensus/package.py | 2 +- var/spack/repos/builtin/packages/r-tidyr/package.py | 2 +- var/spack/repos/builtin/packages/r-tiff/package.py | 2 +- var/spack/repos/builtin/packages/r-tigris/package.py | 2 +- var/spack/repos/builtin/packages/r-timedate/package.py | 2 +- var/spack/repos/builtin/packages/r-topgo/package.py | 2 +- var/spack/repos/builtin/packages/r-trimcluster/package.py | 2 +- var/spack/repos/builtin/packages/r-trust/package.py | 2 +- var/spack/repos/builtin/packages/r-tseries/package.py | 2 +- var/spack/repos/builtin/packages/r-tsne/package.py | 2 +- var/spack/repos/builtin/packages/r-ttr/package.py | 2 +- var/spack/repos/builtin/packages/r-udunits2/package.py | 2 +- var/spack/repos/builtin/packages/r-units/package.py | 2 +- var/spack/repos/builtin/packages/r-utils/package.py | 2 +- var/spack/repos/builtin/packages/r-uuid/package.py | 2 +- var/spack/repos/builtin/packages/r-variantannotation/package.py | 2 +- var/spack/repos/builtin/packages/r-varselrf/package.py | 2 +- var/spack/repos/builtin/packages/r-vcd/package.py | 2 +- var/spack/repos/builtin/packages/r-vegan/package.py | 2 +- var/spack/repos/builtin/packages/r-vgam/package.py | 2 +- var/spack/repos/builtin/packages/r-viridis/package.py | 2 +- var/spack/repos/builtin/packages/r-viridislite/package.py | 2 +- var/spack/repos/builtin/packages/r-visnetwork/package.py | 2 +- var/spack/repos/builtin/packages/r-vsn/package.py | 2 +- var/spack/repos/builtin/packages/r-whisker/package.py | 2 +- var/spack/repos/builtin/packages/r-withr/package.py | 2 +- var/spack/repos/builtin/packages/r-xde/package.py | 2 +- var/spack/repos/builtin/packages/r-xgboost/package.py | 2 +- var/spack/repos/builtin/packages/r-xlconnect/package.py | 2 +- var/spack/repos/builtin/packages/r-xlconnectjars/package.py | 2 +- var/spack/repos/builtin/packages/r-xlsx/package.py | 2 +- var/spack/repos/builtin/packages/r-xlsxjars/package.py | 2 +- var/spack/repos/builtin/packages/r-xmapbridge/package.py | 2 +- var/spack/repos/builtin/packages/r-xml/package.py | 2 +- var/spack/repos/builtin/packages/r-xml2/package.py | 2 +- var/spack/repos/builtin/packages/r-xtable/package.py | 2 +- var/spack/repos/builtin/packages/r-xts/package.py | 2 +- var/spack/repos/builtin/packages/r-xvector/package.py | 2 +- var/spack/repos/builtin/packages/r-yaml/package.py | 2 +- var/spack/repos/builtin/packages/r-yapsa/package.py | 2 +- var/spack/repos/builtin/packages/r-yaqcaffy/package.py | 2 +- var/spack/repos/builtin/packages/r-yarn/package.py | 2 +- var/spack/repos/builtin/packages/r-zlibbioc/package.py | 2 +- var/spack/repos/builtin/packages/r-zoo/package.py | 2 +- var/spack/repos/builtin/packages/r/package.py | 2 +- var/spack/repos/builtin/packages/raft/package.py | 2 +- var/spack/repos/builtin/packages/raja/package.py | 2 +- var/spack/repos/builtin/packages/randfold/package.py | 2 +- var/spack/repos/builtin/packages/random123/package.py | 2 +- var/spack/repos/builtin/packages/randrproto/package.py | 2 +- var/spack/repos/builtin/packages/rapidjson/package.py | 2 +- var/spack/repos/builtin/packages/ravel/package.py | 2 +- var/spack/repos/builtin/packages/raxml/package.py | 2 +- var/spack/repos/builtin/packages/ray/package.py | 2 +- var/spack/repos/builtin/packages/rdp-classifier/package.py | 2 +- var/spack/repos/builtin/packages/re2c/package.py | 2 +- var/spack/repos/builtin/packages/readline/package.py | 2 +- var/spack/repos/builtin/packages/recordproto/package.py | 2 +- var/spack/repos/builtin/packages/redundans/package.py | 2 +- var/spack/repos/builtin/packages/relion/package.py | 2 +- var/spack/repos/builtin/packages/rempi/package.py | 2 +- var/spack/repos/builtin/packages/rename/package.py | 2 +- var/spack/repos/builtin/packages/rendercheck/package.py | 2 +- var/spack/repos/builtin/packages/renderproto/package.py | 2 +- var/spack/repos/builtin/packages/repeatmasker/package.py | 2 +- var/spack/repos/builtin/packages/resourceproto/package.py | 2 +- var/spack/repos/builtin/packages/revbayes/package.py | 2 +- var/spack/repos/builtin/packages/rgb/package.py | 2 +- var/spack/repos/builtin/packages/rhash/package.py | 2 +- var/spack/repos/builtin/packages/rlwrap/package.py | 2 +- var/spack/repos/builtin/packages/rmlab/package.py | 2 +- var/spack/repos/builtin/packages/rna-seqc/package.py | 2 +- var/spack/repos/builtin/packages/rockstar/package.py | 2 +- var/spack/repos/builtin/packages/root/package.py | 2 +- var/spack/repos/builtin/packages/rose/package.py | 2 +- var/spack/repos/builtin/packages/rr/package.py | 2 +- var/spack/repos/builtin/packages/rsbench/package.py | 2 +- var/spack/repos/builtin/packages/rsem/package.py | 2 +- var/spack/repos/builtin/packages/rstart/package.py | 2 +- var/spack/repos/builtin/packages/rsync/package.py | 2 +- var/spack/repos/builtin/packages/rtags/package.py | 2 +- var/spack/repos/builtin/packages/rtax/package.py | 2 +- var/spack/repos/builtin/packages/ruby-gnuplot/package.py | 2 +- var/spack/repos/builtin/packages/ruby-narray/package.py | 2 +- var/spack/repos/builtin/packages/ruby-rubyinline/package.py | 2 +- var/spack/repos/builtin/packages/ruby-terminal-table/package.py | 2 +- var/spack/repos/builtin/packages/ruby/package.py | 2 +- var/spack/repos/builtin/packages/rust-bindgen/package.py | 2 +- var/spack/repos/builtin/packages/rust/package.py | 2 +- var/spack/repos/builtin/packages/sabre/package.py | 2 +- var/spack/repos/builtin/packages/sailfish/package.py | 2 +- var/spack/repos/builtin/packages/salmon/package.py | 2 +- var/spack/repos/builtin/packages/sambamba/package.py | 2 +- var/spack/repos/builtin/packages/samblaster/package.py | 2 +- var/spack/repos/builtin/packages/samrai/package.py | 2 +- var/spack/repos/builtin/packages/samtools/package.py | 2 +- var/spack/repos/builtin/packages/sas/package.py | 2 +- var/spack/repos/builtin/packages/satsuma2/package.py | 2 +- var/spack/repos/builtin/packages/savanna/package.py | 2 +- var/spack/repos/builtin/packages/saws/package.py | 2 +- var/spack/repos/builtin/packages/sbt/package.py | 2 +- var/spack/repos/builtin/packages/scala/package.py | 2 +- var/spack/repos/builtin/packages/scalasca/package.py | 2 +- var/spack/repos/builtin/packages/scalpel/package.py | 2 +- var/spack/repos/builtin/packages/scan-for-matches/package.py | 2 +- var/spack/repos/builtin/packages/scons/package.py | 2 +- var/spack/repos/builtin/packages/scorec-core/package.py | 2 +- var/spack/repos/builtin/packages/scorep/package.py | 2 +- var/spack/repos/builtin/packages/scotch/package.py | 2 +- var/spack/repos/builtin/packages/scr/package.py | 2 +- var/spack/repos/builtin/packages/screen/package.py | 2 +- var/spack/repos/builtin/packages/scripts/package.py | 2 +- var/spack/repos/builtin/packages/scrnsaverproto/package.py | 2 +- var/spack/repos/builtin/packages/sctk/package.py | 2 +- var/spack/repos/builtin/packages/sdl2-image/package.py | 2 +- var/spack/repos/builtin/packages/sdl2/package.py | 2 +- var/spack/repos/builtin/packages/sed/package.py | 2 +- var/spack/repos/builtin/packages/seqprep/package.py | 2 +- var/spack/repos/builtin/packages/seqtk/package.py | 2 +- var/spack/repos/builtin/packages/serf/package.py | 2 +- var/spack/repos/builtin/packages/sessreg/package.py | 2 +- var/spack/repos/builtin/packages/setxkbmap/package.py | 2 +- var/spack/repos/builtin/packages/sga/package.py | 2 +- var/spack/repos/builtin/packages/shapeit/package.py | 2 +- var/spack/repos/builtin/packages/shared-mime-info/package.py | 2 +- var/spack/repos/builtin/packages/shiny-server/package.py | 2 +- var/spack/repos/builtin/packages/shortbred/package.py | 2 +- var/spack/repos/builtin/packages/shortstack/package.py | 2 +- var/spack/repos/builtin/packages/showfont/package.py | 2 +- var/spack/repos/builtin/packages/sickle/package.py | 2 +- var/spack/repos/builtin/packages/siesta/package.py | 2 +- var/spack/repos/builtin/packages/signalp/package.py | 2 +- var/spack/repos/builtin/packages/signify/package.py | 2 +- var/spack/repos/builtin/packages/silo/package.py | 2 +- var/spack/repos/builtin/packages/simplemoc/package.py | 2 +- var/spack/repos/builtin/packages/simul/package.py | 2 +- var/spack/repos/builtin/packages/simulationio/package.py | 2 +- var/spack/repos/builtin/packages/singularity/package.py | 2 +- var/spack/repos/builtin/packages/slepc/package.py | 2 +- var/spack/repos/builtin/packages/slurm/package.py | 2 +- var/spack/repos/builtin/packages/smalt/package.py | 2 +- var/spack/repos/builtin/packages/smproxy/package.py | 2 +- var/spack/repos/builtin/packages/snakemake/package.py | 2 +- var/spack/repos/builtin/packages/snap-berkeley/package.py | 2 +- var/spack/repos/builtin/packages/snap-korf/package.py | 2 +- var/spack/repos/builtin/packages/snap/package.py | 2 +- var/spack/repos/builtin/packages/snappy/package.py | 2 +- var/spack/repos/builtin/packages/snbone/package.py | 2 +- var/spack/repos/builtin/packages/sniffles/package.py | 2 +- var/spack/repos/builtin/packages/snpeff/package.py | 2 +- var/spack/repos/builtin/packages/snphylo/package.py | 2 +- var/spack/repos/builtin/packages/snptest/package.py | 2 +- var/spack/repos/builtin/packages/soap2/package.py | 2 +- var/spack/repos/builtin/packages/soapdenovo2/package.py | 2 +- var/spack/repos/builtin/packages/soapindel/package.py | 2 +- var/spack/repos/builtin/packages/soapsnp/package.py | 2 +- var/spack/repos/builtin/packages/somatic-sniper/package.py | 2 +- var/spack/repos/builtin/packages/sortmerna/package.py | 2 +- var/spack/repos/builtin/packages/sosflow/package.py | 2 +- var/spack/repos/builtin/packages/sowing/package.py | 2 +- var/spack/repos/builtin/packages/sox/package.py | 2 +- var/spack/repos/builtin/packages/spades/package.py | 2 +- var/spack/repos/builtin/packages/spark/package.py | 2 +- var/spack/repos/builtin/packages/sparsehash/package.py | 2 +- var/spack/repos/builtin/packages/sparta/package.py | 2 +- var/spack/repos/builtin/packages/spdlog/package.py | 2 +- var/spack/repos/builtin/packages/spectrum-mpi/package.py | 2 +- var/spack/repos/builtin/packages/speex/package.py | 2 +- var/spack/repos/builtin/packages/spglib/package.py | 2 +- var/spack/repos/builtin/packages/sph2pipe/package.py | 2 +- var/spack/repos/builtin/packages/spherepack/package.py | 2 +- var/spack/repos/builtin/packages/spindle/package.py | 2 +- var/spack/repos/builtin/packages/spot/package.py | 2 +- var/spack/repos/builtin/packages/sqlite/package.py | 2 +- var/spack/repos/builtin/packages/squid/package.py | 2 +- var/spack/repos/builtin/packages/sra-toolkit/package.py | 2 +- var/spack/repos/builtin/packages/sspace-longread/package.py | 2 +- var/spack/repos/builtin/packages/sspace-standard/package.py | 2 +- var/spack/repos/builtin/packages/sst-dumpi/package.py | 2 +- var/spack/repos/builtin/packages/sst-macro/package.py | 2 +- var/spack/repos/builtin/packages/stacks/package.py | 2 +- var/spack/repos/builtin/packages/staden-io-lib/package.py | 2 +- var/spack/repos/builtin/packages/star-ccm-plus/package.py | 2 +- var/spack/repos/builtin/packages/star/package.py | 2 +- var/spack/repos/builtin/packages/startup-notification/package.py | 2 +- var/spack/repos/builtin/packages/stat/package.py | 2 +- var/spack/repos/builtin/packages/stc/package.py | 2 +- var/spack/repos/builtin/packages/stow/package.py | 2 +- var/spack/repos/builtin/packages/stream/package.py | 2 +- var/spack/repos/builtin/packages/strelka/package.py | 2 +- var/spack/repos/builtin/packages/stress/package.py | 2 +- var/spack/repos/builtin/packages/stringtie/package.py | 2 +- var/spack/repos/builtin/packages/structure/package.py | 2 +- var/spack/repos/builtin/packages/sublime-text/package.py | 2 +- var/spack/repos/builtin/packages/subread/package.py | 2 +- var/spack/repos/builtin/packages/subversion/package.py | 2 +- var/spack/repos/builtin/packages/suite-sparse/package.py | 2 +- var/spack/repos/builtin/packages/sumaclust/package.py | 2 +- var/spack/repos/builtin/packages/sundials/package.py | 2 +- var/spack/repos/builtin/packages/superlu-dist/package.py | 2 +- var/spack/repos/builtin/packages/superlu-mt/package.py | 2 +- var/spack/repos/builtin/packages/superlu/package.py | 2 +- var/spack/repos/builtin/packages/swarm/package.py | 2 +- var/spack/repos/builtin/packages/swiftsim/package.py | 2 +- var/spack/repos/builtin/packages/swig/package.py | 2 +- var/spack/repos/builtin/packages/symengine/package.py | 2 +- var/spack/repos/builtin/packages/sympol/package.py | 2 +- var/spack/repos/builtin/packages/sz/package.py | 2 +- var/spack/repos/builtin/packages/tabix/package.py | 2 +- var/spack/repos/builtin/packages/talloc/package.py | 2 +- var/spack/repos/builtin/packages/tantan/package.py | 2 +- var/spack/repos/builtin/packages/tar/package.py | 2 +- var/spack/repos/builtin/packages/targetp/package.py | 2 +- var/spack/repos/builtin/packages/task/package.py | 2 +- var/spack/repos/builtin/packages/taskd/package.py | 2 +- var/spack/repos/builtin/packages/tasmanian/package.py | 2 +- var/spack/repos/builtin/packages/tassel/package.py | 2 +- var/spack/repos/builtin/packages/tau/package.py | 2 +- var/spack/repos/builtin/packages/tcl-tcllib/package.py | 2 +- var/spack/repos/builtin/packages/tcl-tclxml/package.py | 2 +- var/spack/repos/builtin/packages/tcl/package.py | 2 +- var/spack/repos/builtin/packages/tclap/package.py | 2 +- var/spack/repos/builtin/packages/tcoffee/package.py | 2 +- var/spack/repos/builtin/packages/tcptrace/package.py | 2 +- var/spack/repos/builtin/packages/tcsh/package.py | 2 +- var/spack/repos/builtin/packages/tealeaf/package.py | 2 +- var/spack/repos/builtin/packages/tetgen/package.py | 2 +- var/spack/repos/builtin/packages/tethex/package.py | 2 +- var/spack/repos/builtin/packages/texinfo/package.py | 2 +- var/spack/repos/builtin/packages/texlive/package.py | 2 +- var/spack/repos/builtin/packages/the-platinum-searcher/package.py | 2 +- var/spack/repos/builtin/packages/the-silver-searcher/package.py | 2 +- var/spack/repos/builtin/packages/thrift/package.py | 2 +- var/spack/repos/builtin/packages/thrust/package.py | 2 +- var/spack/repos/builtin/packages/tig/package.py | 2 +- var/spack/repos/builtin/packages/tinyxml/package.py | 2 +- var/spack/repos/builtin/packages/tinyxml2/package.py | 2 +- var/spack/repos/builtin/packages/tioga/package.py | 2 +- var/spack/repos/builtin/packages/tk/package.py | 2 +- var/spack/repos/builtin/packages/tmalign/package.py | 2 +- var/spack/repos/builtin/packages/tmhmm/package.py | 2 +- var/spack/repos/builtin/packages/tmux/package.py | 2 +- var/spack/repos/builtin/packages/tmuxinator/package.py | 2 +- var/spack/repos/builtin/packages/tophat/package.py | 2 +- var/spack/repos/builtin/packages/tppred/package.py | 2 +- var/spack/repos/builtin/packages/transabyss/package.py | 2 +- var/spack/repos/builtin/packages/transdecoder/package.py | 2 +- var/spack/repos/builtin/packages/transposome/package.py | 2 +- var/spack/repos/builtin/packages/transset/package.py | 2 +- var/spack/repos/builtin/packages/trapproto/package.py | 2 +- var/spack/repos/builtin/packages/tree/package.py | 2 +- var/spack/repos/builtin/packages/trf/package.py | 2 +- var/spack/repos/builtin/packages/triangle/package.py | 2 +- var/spack/repos/builtin/packages/trilinos/package.py | 2 +- var/spack/repos/builtin/packages/trimgalore/package.py | 2 +- var/spack/repos/builtin/packages/trimmomatic/package.py | 2 +- var/spack/repos/builtin/packages/trnascan-se/package.py | 2 +- var/spack/repos/builtin/packages/turbine/package.py | 2 +- var/spack/repos/builtin/packages/turbomole/package.py | 2 +- var/spack/repos/builtin/packages/twm/package.py | 2 +- var/spack/repos/builtin/packages/typhonio/package.py | 2 +- var/spack/repos/builtin/packages/uberftp/package.py | 2 +- var/spack/repos/builtin/packages/ucx/package.py | 2 +- var/spack/repos/builtin/packages/udunits2/package.py | 2 +- var/spack/repos/builtin/packages/ufo-core/package.py | 2 +- var/spack/repos/builtin/packages/ufo-filters/package.py | 2 +- var/spack/repos/builtin/packages/unblur/package.py | 2 +- var/spack/repos/builtin/packages/uncrustify/package.py | 2 +- var/spack/repos/builtin/packages/unibilium/package.py | 2 +- var/spack/repos/builtin/packages/unison/package.py | 2 +- var/spack/repos/builtin/packages/units/package.py | 2 +- var/spack/repos/builtin/packages/unixodbc/package.py | 2 +- var/spack/repos/builtin/packages/unzip/package.py | 2 +- var/spack/repos/builtin/packages/usearch/package.py | 2 +- var/spack/repos/builtin/packages/util-linux/package.py | 2 +- var/spack/repos/builtin/packages/util-macros/package.py | 2 +- var/spack/repos/builtin/packages/uuid/package.py | 2 +- var/spack/repos/builtin/packages/valgrind/package.py | 2 +- var/spack/repos/builtin/packages/vampirtrace/package.py | 2 +- var/spack/repos/builtin/packages/vardictjava/package.py | 2 +- var/spack/repos/builtin/packages/varscan/package.py | 2 +- var/spack/repos/builtin/packages/vc/package.py | 2 +- var/spack/repos/builtin/packages/vcftools/package.py | 2 +- var/spack/repos/builtin/packages/vcsh/package.py | 2 +- var/spack/repos/builtin/packages/vdt/package.py | 2 +- var/spack/repos/builtin/packages/vecgeom/package.py | 2 +- var/spack/repos/builtin/packages/veclibfort/package.py | 2 +- var/spack/repos/builtin/packages/vegas2/package.py | 2 +- var/spack/repos/builtin/packages/velvet/package.py | 2 +- var/spack/repos/builtin/packages/verilator/package.py | 2 +- var/spack/repos/builtin/packages/videoproto/package.py | 2 +- var/spack/repos/builtin/packages/viennarna/package.py | 2 +- var/spack/repos/builtin/packages/viewres/package.py | 2 +- var/spack/repos/builtin/packages/vim/package.py | 2 +- var/spack/repos/builtin/packages/virtualgl/package.py | 2 +- var/spack/repos/builtin/packages/visit/package.py | 2 +- var/spack/repos/builtin/packages/vizglow/package.py | 2 +- var/spack/repos/builtin/packages/vmatch/package.py | 2 +- var/spack/repos/builtin/packages/voropp/package.py | 2 +- var/spack/repos/builtin/packages/vpfft/package.py | 2 +- var/spack/repos/builtin/packages/vsearch/package.py | 2 +- var/spack/repos/builtin/packages/vtk/package.py | 2 +- var/spack/repos/builtin/packages/vtkh/package.py | 2 +- var/spack/repos/builtin/packages/vtkm/package.py | 2 +- var/spack/repos/builtin/packages/wannier90/package.py | 2 +- var/spack/repos/builtin/packages/wcslib/package.py | 2 +- var/spack/repos/builtin/packages/wget/package.py | 2 +- var/spack/repos/builtin/packages/windowswmproto/package.py | 2 +- var/spack/repos/builtin/packages/wt/package.py | 2 +- var/spack/repos/builtin/packages/wx/package.py | 2 +- var/spack/repos/builtin/packages/wxpropgrid/package.py | 2 +- var/spack/repos/builtin/packages/x11perf/package.py | 2 +- var/spack/repos/builtin/packages/xapian-core/package.py | 2 +- var/spack/repos/builtin/packages/xauth/package.py | 2 +- var/spack/repos/builtin/packages/xbacklight/package.py | 2 +- var/spack/repos/builtin/packages/xbiff/package.py | 2 +- var/spack/repos/builtin/packages/xbitmaps/package.py | 2 +- var/spack/repos/builtin/packages/xbraid/package.py | 2 +- var/spack/repos/builtin/packages/xcalc/package.py | 2 +- var/spack/repos/builtin/packages/xcb-demo/package.py | 2 +- var/spack/repos/builtin/packages/xcb-proto/package.py | 2 +- var/spack/repos/builtin/packages/xcb-util-cursor/package.py | 2 +- var/spack/repos/builtin/packages/xcb-util-errors/package.py | 2 +- var/spack/repos/builtin/packages/xcb-util-image/package.py | 2 +- var/spack/repos/builtin/packages/xcb-util-keysyms/package.py | 2 +- var/spack/repos/builtin/packages/xcb-util-renderutil/package.py | 2 +- var/spack/repos/builtin/packages/xcb-util-wm/package.py | 2 +- var/spack/repos/builtin/packages/xcb-util-xrm/package.py | 2 +- var/spack/repos/builtin/packages/xcb-util/package.py | 2 +- var/spack/repos/builtin/packages/xclip/package.py | 2 +- var/spack/repos/builtin/packages/xclipboard/package.py | 2 +- var/spack/repos/builtin/packages/xclock/package.py | 2 +- var/spack/repos/builtin/packages/xcmiscproto/package.py | 2 +- var/spack/repos/builtin/packages/xcmsdb/package.py | 2 +- var/spack/repos/builtin/packages/xcompmgr/package.py | 2 +- var/spack/repos/builtin/packages/xconsole/package.py | 2 +- var/spack/repos/builtin/packages/xcursor-themes/package.py | 2 +- var/spack/repos/builtin/packages/xcursorgen/package.py | 2 +- var/spack/repos/builtin/packages/xdbedizzy/package.py | 2 +- var/spack/repos/builtin/packages/xditview/package.py | 2 +- var/spack/repos/builtin/packages/xdm/package.py | 2 +- var/spack/repos/builtin/packages/xdpyinfo/package.py | 2 +- var/spack/repos/builtin/packages/xdriinfo/package.py | 2 +- var/spack/repos/builtin/packages/xedit/package.py | 2 +- var/spack/repos/builtin/packages/xerces-c/package.py | 2 +- var/spack/repos/builtin/packages/xev/package.py | 2 +- var/spack/repos/builtin/packages/xextproto/package.py | 2 +- var/spack/repos/builtin/packages/xeyes/package.py | 2 +- var/spack/repos/builtin/packages/xf86bigfontproto/package.py | 2 +- var/spack/repos/builtin/packages/xf86dga/package.py | 2 +- var/spack/repos/builtin/packages/xf86dgaproto/package.py | 2 +- var/spack/repos/builtin/packages/xf86driproto/package.py | 2 +- var/spack/repos/builtin/packages/xf86miscproto/package.py | 2 +- var/spack/repos/builtin/packages/xf86rushproto/package.py | 2 +- var/spack/repos/builtin/packages/xf86vidmodeproto/package.py | 2 +- var/spack/repos/builtin/packages/xfd/package.py | 2 +- var/spack/repos/builtin/packages/xfindproxy/package.py | 2 +- var/spack/repos/builtin/packages/xfontsel/package.py | 2 +- var/spack/repos/builtin/packages/xfs/package.py | 2 +- var/spack/repos/builtin/packages/xfsinfo/package.py | 2 +- var/spack/repos/builtin/packages/xfwp/package.py | 2 +- var/spack/repos/builtin/packages/xgamma/package.py | 2 +- var/spack/repos/builtin/packages/xgc/package.py | 2 +- var/spack/repos/builtin/packages/xhost/package.py | 2 +- var/spack/repos/builtin/packages/xineramaproto/package.py | 2 +- var/spack/repos/builtin/packages/xinit/package.py | 2 +- var/spack/repos/builtin/packages/xinput/package.py | 2 +- var/spack/repos/builtin/packages/xios/package.py | 2 +- var/spack/repos/builtin/packages/xkbcomp/package.py | 2 +- var/spack/repos/builtin/packages/xkbdata/package.py | 2 +- var/spack/repos/builtin/packages/xkbevd/package.py | 2 +- var/spack/repos/builtin/packages/xkbprint/package.py | 2 +- var/spack/repos/builtin/packages/xkbutils/package.py | 2 +- var/spack/repos/builtin/packages/xkeyboard-config/package.py | 2 +- var/spack/repos/builtin/packages/xkill/package.py | 2 +- var/spack/repos/builtin/packages/xload/package.py | 2 +- var/spack/repos/builtin/packages/xlogo/package.py | 2 +- var/spack/repos/builtin/packages/xlsatoms/package.py | 2 +- var/spack/repos/builtin/packages/xlsclients/package.py | 2 +- var/spack/repos/builtin/packages/xlsfonts/package.py | 2 +- var/spack/repos/builtin/packages/xmag/package.py | 2 +- var/spack/repos/builtin/packages/xman/package.py | 2 +- var/spack/repos/builtin/packages/xmessage/package.py | 2 +- var/spack/repos/builtin/packages/xmh/package.py | 2 +- var/spack/repos/builtin/packages/xmlf90/package.py | 2 +- var/spack/repos/builtin/packages/xmlto/package.py | 2 +- var/spack/repos/builtin/packages/xmodmap/package.py | 2 +- var/spack/repos/builtin/packages/xmore/package.py | 2 +- var/spack/repos/builtin/packages/xorg-cf-files/package.py | 2 +- var/spack/repos/builtin/packages/xorg-docs/package.py | 2 +- var/spack/repos/builtin/packages/xorg-gtest/package.py | 2 +- var/spack/repos/builtin/packages/xorg-server/package.py | 2 +- var/spack/repos/builtin/packages/xorg-sgml-doctools/package.py | 2 +- var/spack/repos/builtin/packages/xphelloworld/package.py | 2 +- var/spack/repos/builtin/packages/xplor-nih/package.py | 2 +- var/spack/repos/builtin/packages/xplsprinters/package.py | 2 +- var/spack/repos/builtin/packages/xpr/package.py | 2 +- var/spack/repos/builtin/packages/xprehashprinterlist/package.py | 2 +- var/spack/repos/builtin/packages/xprop/package.py | 2 +- var/spack/repos/builtin/packages/xproto/package.py | 2 +- var/spack/repos/builtin/packages/xproxymanagementprotocol/package.py | 2 +- var/spack/repos/builtin/packages/xqilla/package.py | 2 +- var/spack/repos/builtin/packages/xrandr/package.py | 2 +- var/spack/repos/builtin/packages/xrdb/package.py | 2 +- var/spack/repos/builtin/packages/xrefresh/package.py | 2 +- var/spack/repos/builtin/packages/xrootd/package.py | 2 +- var/spack/repos/builtin/packages/xrx/package.py | 2 +- var/spack/repos/builtin/packages/xsbench/package.py | 2 +- var/spack/repos/builtin/packages/xscope/package.py | 2 +- var/spack/repos/builtin/packages/xsdk/package.py | 2 +- var/spack/repos/builtin/packages/xsdktrilinos/package.py | 2 +- var/spack/repos/builtin/packages/xset/package.py | 2 +- var/spack/repos/builtin/packages/xsetmode/package.py | 2 +- var/spack/repos/builtin/packages/xsetpointer/package.py | 2 +- var/spack/repos/builtin/packages/xsetroot/package.py | 2 +- var/spack/repos/builtin/packages/xsimd/package.py | 2 +- var/spack/repos/builtin/packages/xsm/package.py | 2 +- var/spack/repos/builtin/packages/xstdcmap/package.py | 2 +- var/spack/repos/builtin/packages/xtensor/package.py | 2 +- var/spack/repos/builtin/packages/xterm/package.py | 2 +- var/spack/repos/builtin/packages/xtl/package.py | 2 +- var/spack/repos/builtin/packages/xtrans/package.py | 2 +- var/spack/repos/builtin/packages/xtrap/package.py | 2 +- var/spack/repos/builtin/packages/xts/package.py | 2 +- var/spack/repos/builtin/packages/xvidtune/package.py | 2 +- var/spack/repos/builtin/packages/xvinfo/package.py | 2 +- var/spack/repos/builtin/packages/xwd/package.py | 2 +- var/spack/repos/builtin/packages/xwininfo/package.py | 2 +- var/spack/repos/builtin/packages/xwud/package.py | 2 +- var/spack/repos/builtin/packages/xz/package.py | 2 +- var/spack/repos/builtin/packages/yambo/package.py | 2 +- var/spack/repos/builtin/packages/yaml-cpp/package.py | 2 +- var/spack/repos/builtin/packages/yasm/package.py | 2 +- var/spack/repos/builtin/packages/yorick/package.py | 2 +- var/spack/repos/builtin/packages/z3/package.py | 2 +- var/spack/repos/builtin/packages/zeromq/package.py | 2 +- var/spack/repos/builtin/packages/zfp/package.py | 2 +- var/spack/repos/builtin/packages/zip/package.py | 2 +- var/spack/repos/builtin/packages/zlib/package.py | 2 +- var/spack/repos/builtin/packages/zoltan/package.py | 2 +- var/spack/repos/builtin/packages/zsh/package.py | 2 +- var/spack/repos/builtin/packages/zstd/package.py | 2 +- 2840 files changed, 2842 insertions(+), 2842 deletions(-) (limited to 'var') diff --git a/bin/sbang b/bin/sbang index f7182c0f23..4ff6b1b327 100755 --- a/bin/sbang +++ b/bin/sbang @@ -1,6 +1,6 @@ #!/bin/bash ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/bin/spack b/bin/spack index e9278ddc4c..78f5b7977f 100755 --- a/bin/spack +++ b/bin/spack @@ -1,6 +1,6 @@ #!/usr/bin/env python ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/bin/spack-python b/bin/spack-python index 2a717025bf..4f6ae94904 100755 --- a/bin/spack-python +++ b/bin/spack-python @@ -1,6 +1,6 @@ #!/bin/sh ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/conftest.py b/conftest.py index 85adf54d1d..6374a387c8 100644 --- a/conftest.py +++ b/conftest.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/docs/conf.py b/lib/spack/docs/conf.py index 80e7f42bff..18779c5d0c 100644 --- a/lib/spack/docs/conf.py +++ b/lib/spack/docs/conf.py @@ -1,6 +1,6 @@ # flake8: noqa ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. @@ -185,7 +185,7 @@ master_doc = 'index' # General information about the project. project = u'Spack' -copyright = u'2013-2017, Lawrence Livermore National Laboratory.' +copyright = u'2013-2018, Lawrence Livermore National Laboratory.' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/lib/spack/docs/tutorial/examples/0.package.py b/lib/spack/docs/tutorial/examples/0.package.py index 0a42cdc802..147492127d 100644 --- a/lib/spack/docs/tutorial/examples/0.package.py +++ b/lib/spack/docs/tutorial/examples/0.package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/docs/tutorial/examples/1.package.py b/lib/spack/docs/tutorial/examples/1.package.py index 308779d016..9b7466b4ff 100644 --- a/lib/spack/docs/tutorial/examples/1.package.py +++ b/lib/spack/docs/tutorial/examples/1.package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/docs/tutorial/examples/2.package.py b/lib/spack/docs/tutorial/examples/2.package.py index 7980768e06..bb16f5b82f 100644 --- a/lib/spack/docs/tutorial/examples/2.package.py +++ b/lib/spack/docs/tutorial/examples/2.package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/docs/tutorial/examples/3.package.py b/lib/spack/docs/tutorial/examples/3.package.py index b30dd900ae..71a42cd54c 100644 --- a/lib/spack/docs/tutorial/examples/3.package.py +++ b/lib/spack/docs/tutorial/examples/3.package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/docs/tutorial/examples/4.package.py b/lib/spack/docs/tutorial/examples/4.package.py index 116a11a0fa..c1167c61f6 100644 --- a/lib/spack/docs/tutorial/examples/4.package.py +++ b/lib/spack/docs/tutorial/examples/4.package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/docs/tutorial/examples/5.package.py b/lib/spack/docs/tutorial/examples/5.package.py index 3e7a1f83cb..1147d87753 100644 --- a/lib/spack/docs/tutorial/examples/5.package.py +++ b/lib/spack/docs/tutorial/examples/5.package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/docs/tutorial/examples/Autotools/0.package.py b/lib/spack/docs/tutorial/examples/Autotools/0.package.py index 9242fc2dcd..566ec5293f 100644 --- a/lib/spack/docs/tutorial/examples/Autotools/0.package.py +++ b/lib/spack/docs/tutorial/examples/Autotools/0.package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/docs/tutorial/examples/Autotools/1.package.py b/lib/spack/docs/tutorial/examples/Autotools/1.package.py index 1bb325bf79..69542c434f 100644 --- a/lib/spack/docs/tutorial/examples/Autotools/1.package.py +++ b/lib/spack/docs/tutorial/examples/Autotools/1.package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/docs/tutorial/examples/Cmake/0.package.py b/lib/spack/docs/tutorial/examples/Cmake/0.package.py index e4996c80c8..529405ab15 100644 --- a/lib/spack/docs/tutorial/examples/Cmake/0.package.py +++ b/lib/spack/docs/tutorial/examples/Cmake/0.package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/docs/tutorial/examples/Cmake/1.package.py b/lib/spack/docs/tutorial/examples/Cmake/1.package.py index 6b88147272..8f11003015 100644 --- a/lib/spack/docs/tutorial/examples/Cmake/1.package.py +++ b/lib/spack/docs/tutorial/examples/Cmake/1.package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/docs/tutorial/examples/Cmake/2.package.py b/lib/spack/docs/tutorial/examples/Cmake/2.package.py index 2546b9c799..d2fc1e670c 100644 --- a/lib/spack/docs/tutorial/examples/Cmake/2.package.py +++ b/lib/spack/docs/tutorial/examples/Cmake/2.package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/docs/tutorial/examples/Makefile/0.package.py b/lib/spack/docs/tutorial/examples/Makefile/0.package.py index 847d010d8b..d1b5be0c47 100644 --- a/lib/spack/docs/tutorial/examples/Makefile/0.package.py +++ b/lib/spack/docs/tutorial/examples/Makefile/0.package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/docs/tutorial/examples/Makefile/1.package.py b/lib/spack/docs/tutorial/examples/Makefile/1.package.py index feee7750f0..cf1cdc8b50 100644 --- a/lib/spack/docs/tutorial/examples/Makefile/1.package.py +++ b/lib/spack/docs/tutorial/examples/Makefile/1.package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/docs/tutorial/examples/Makefile/2.package.py b/lib/spack/docs/tutorial/examples/Makefile/2.package.py index cebb108ac7..4405eea22b 100644 --- a/lib/spack/docs/tutorial/examples/Makefile/2.package.py +++ b/lib/spack/docs/tutorial/examples/Makefile/2.package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/docs/tutorial/examples/Makefile/3.package.py b/lib/spack/docs/tutorial/examples/Makefile/3.package.py index f4142e3fb6..2f3222f84d 100644 --- a/lib/spack/docs/tutorial/examples/Makefile/3.package.py +++ b/lib/spack/docs/tutorial/examples/Makefile/3.package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/docs/tutorial/examples/PyPackage/0.package.py b/lib/spack/docs/tutorial/examples/PyPackage/0.package.py index 99df364510..fc99418da7 100644 --- a/lib/spack/docs/tutorial/examples/PyPackage/0.package.py +++ b/lib/spack/docs/tutorial/examples/PyPackage/0.package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/docs/tutorial/examples/PyPackage/1.package.py b/lib/spack/docs/tutorial/examples/PyPackage/1.package.py index a4313d8cba..d22fe6f044 100644 --- a/lib/spack/docs/tutorial/examples/PyPackage/1.package.py +++ b/lib/spack/docs/tutorial/examples/PyPackage/1.package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/env/cc b/lib/spack/env/cc index b06c6fd6fc..22f6cb345c 100755 --- a/lib/spack/env/cc +++ b/lib/spack/env/cc @@ -1,6 +1,6 @@ #!/bin/bash ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/external/__init__.py b/lib/spack/external/__init__.py index 004339d7e3..578a21df93 100644 --- a/lib/spack/external/__init__.py +++ b/lib/spack/external/__init__.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/llnl/__init__.py b/lib/spack/llnl/__init__.py index 8922701e9f..0e81cb3b36 100644 --- a/lib/spack/llnl/__init__.py +++ b/lib/spack/llnl/__init__.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/llnl/util/__init__.py b/lib/spack/llnl/util/__init__.py index 8922701e9f..0e81cb3b36 100644 --- a/lib/spack/llnl/util/__init__.py +++ b/lib/spack/llnl/util/__init__.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/llnl/util/argparsewriter.py b/lib/spack/llnl/util/argparsewriter.py index 27439c2994..75c62f007f 100644 --- a/lib/spack/llnl/util/argparsewriter.py +++ b/lib/spack/llnl/util/argparsewriter.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/llnl/util/filesystem.py b/lib/spack/llnl/util/filesystem.py index 0146bf0e7e..845effefbd 100644 --- a/lib/spack/llnl/util/filesystem.py +++ b/lib/spack/llnl/util/filesystem.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/llnl/util/lang.py b/lib/spack/llnl/util/lang.py index f8cee2892b..087a6b6be9 100644 --- a/lib/spack/llnl/util/lang.py +++ b/lib/spack/llnl/util/lang.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/llnl/util/link_tree.py b/lib/spack/llnl/util/link_tree.py index 60ab5cb2b0..b90661ccce 100644 --- a/lib/spack/llnl/util/link_tree.py +++ b/lib/spack/llnl/util/link_tree.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/llnl/util/lock.py b/lib/spack/llnl/util/lock.py index 5467838744..ed797d2ebf 100644 --- a/lib/spack/llnl/util/lock.py +++ b/lib/spack/llnl/util/lock.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/llnl/util/tty/__init__.py b/lib/spack/llnl/util/tty/__init__.py index 1d04787372..d8e5f35379 100644 --- a/lib/spack/llnl/util/tty/__init__.py +++ b/lib/spack/llnl/util/tty/__init__.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/llnl/util/tty/colify.py b/lib/spack/llnl/util/tty/colify.py index eebb102fb1..bc3aed3a92 100644 --- a/lib/spack/llnl/util/tty/colify.py +++ b/lib/spack/llnl/util/tty/colify.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/llnl/util/tty/color.py b/lib/spack/llnl/util/tty/color.py index c1365a93a0..de26deceb2 100644 --- a/lib/spack/llnl/util/tty/color.py +++ b/lib/spack/llnl/util/tty/color.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/llnl/util/tty/log.py b/lib/spack/llnl/util/tty/log.py index 40edca972e..70dc7c4ee5 100644 --- a/lib/spack/llnl/util/tty/log.py +++ b/lib/spack/llnl/util/tty/log.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/__init__.py b/lib/spack/spack/__init__.py index 4d34d71614..ab6281e018 100644 --- a/lib/spack/spack/__init__.py +++ b/lib/spack/spack/__init__.py @@ -1,6 +1,6 @@ # flake8: noqa ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/abi.py b/lib/spack/spack/abi.py index ad46e88e61..1d3a940831 100644 --- a/lib/spack/spack/abi.py +++ b/lib/spack/spack/abi.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/architecture.py b/lib/spack/spack/architecture.py index fad6896387..900747bedc 100644 --- a/lib/spack/spack/architecture.py +++ b/lib/spack/spack/architecture.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/binary_distribution.py b/lib/spack/spack/binary_distribution.py index 2d63c8c3a1..209a720df9 100644 --- a/lib/spack/spack/binary_distribution.py +++ b/lib/spack/spack/binary_distribution.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py index 81626d7361..2bb54ab680 100644 --- a/lib/spack/spack/build_environment.py +++ b/lib/spack/spack/build_environment.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/build_systems/__init__.py b/lib/spack/spack/build_systems/__init__.py index 8922701e9f..0e81cb3b36 100644 --- a/lib/spack/spack/build_systems/__init__.py +++ b/lib/spack/spack/build_systems/__init__.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/build_systems/aspell_dict.py b/lib/spack/spack/build_systems/aspell_dict.py index edf9bdb5da..c9369ca9a8 100644 --- a/lib/spack/spack/build_systems/aspell_dict.py +++ b/lib/spack/spack/build_systems/aspell_dict.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/build_systems/autotools.py b/lib/spack/spack/build_systems/autotools.py index 4a81133d6b..0c8d392f01 100644 --- a/lib/spack/spack/build_systems/autotools.py +++ b/lib/spack/spack/build_systems/autotools.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/build_systems/cmake.py b/lib/spack/spack/build_systems/cmake.py index e3acb2e845..8f0d3cd021 100644 --- a/lib/spack/spack/build_systems/cmake.py +++ b/lib/spack/spack/build_systems/cmake.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/build_systems/cuda.py b/lib/spack/spack/build_systems/cuda.py index 95c91f88b2..9f8bb67183 100644 --- a/lib/spack/spack/build_systems/cuda.py +++ b/lib/spack/spack/build_systems/cuda.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/build_systems/intel.py b/lib/spack/spack/build_systems/intel.py index d9ad0da2fa..0218be59bc 100644 --- a/lib/spack/spack/build_systems/intel.py +++ b/lib/spack/spack/build_systems/intel.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/build_systems/makefile.py b/lib/spack/spack/build_systems/makefile.py index 286b702fc9..5e7fe121f3 100644 --- a/lib/spack/spack/build_systems/makefile.py +++ b/lib/spack/spack/build_systems/makefile.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/build_systems/octave.py b/lib/spack/spack/build_systems/octave.py index af4651d1e1..67f3f2432f 100644 --- a/lib/spack/spack/build_systems/octave.py +++ b/lib/spack/spack/build_systems/octave.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/build_systems/perl.py b/lib/spack/spack/build_systems/perl.py index fe845a45db..9e2bf0fddb 100644 --- a/lib/spack/spack/build_systems/perl.py +++ b/lib/spack/spack/build_systems/perl.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/build_systems/python.py b/lib/spack/spack/build_systems/python.py index 837ebd65ae..98fdab3be5 100644 --- a/lib/spack/spack/build_systems/python.py +++ b/lib/spack/spack/build_systems/python.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/build_systems/qmake.py b/lib/spack/spack/build_systems/qmake.py index 70b53664dc..4c59085d26 100644 --- a/lib/spack/spack/build_systems/qmake.py +++ b/lib/spack/spack/build_systems/qmake.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/build_systems/r.py b/lib/spack/spack/build_systems/r.py index 05a66427ec..0c4cf4d8f4 100644 --- a/lib/spack/spack/build_systems/r.py +++ b/lib/spack/spack/build_systems/r.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/build_systems/scons.py b/lib/spack/spack/build_systems/scons.py index 0476362e17..205f3c73fb 100644 --- a/lib/spack/spack/build_systems/scons.py +++ b/lib/spack/spack/build_systems/scons.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/build_systems/waf.py b/lib/spack/spack/build_systems/waf.py index 2097e1680f..77c73f3619 100644 --- a/lib/spack/spack/build_systems/waf.py +++ b/lib/spack/spack/build_systems/waf.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/__init__.py b/lib/spack/spack/cmd/__init__.py index c161d548b4..9ac28da198 100644 --- a/lib/spack/spack/cmd/__init__.py +++ b/lib/spack/spack/cmd/__init__.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/activate.py b/lib/spack/spack/cmd/activate.py index 12a743161d..52dc497f81 100644 --- a/lib/spack/spack/cmd/activate.py +++ b/lib/spack/spack/cmd/activate.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/arch.py b/lib/spack/spack/cmd/arch.py index c8f844e4c1..adec8db139 100644 --- a/lib/spack/spack/cmd/arch.py +++ b/lib/spack/spack/cmd/arch.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/blame.py b/lib/spack/spack/cmd/blame.py index a4f75da19a..28dcdd27ad 100644 --- a/lib/spack/spack/cmd/blame.py +++ b/lib/spack/spack/cmd/blame.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/bootstrap.py b/lib/spack/spack/cmd/bootstrap.py index 99b6b373db..8aa0fe6171 100644 --- a/lib/spack/spack/cmd/bootstrap.py +++ b/lib/spack/spack/cmd/bootstrap.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/build.py b/lib/spack/spack/cmd/build.py index 08fb9f1350..7aa02a8747 100644 --- a/lib/spack/spack/cmd/build.py +++ b/lib/spack/spack/cmd/build.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/buildcache.py b/lib/spack/spack/cmd/buildcache.py index d4a46a96f3..8161548283 100644 --- a/lib/spack/spack/cmd/buildcache.py +++ b/lib/spack/spack/cmd/buildcache.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/cd.py b/lib/spack/spack/cmd/cd.py index 242064e2be..a649eccb59 100644 --- a/lib/spack/spack/cmd/cd.py +++ b/lib/spack/spack/cmd/cd.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/checksum.py b/lib/spack/spack/cmd/checksum.py index b35eda7b8f..1cb949efb8 100644 --- a/lib/spack/spack/cmd/checksum.py +++ b/lib/spack/spack/cmd/checksum.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/clean.py b/lib/spack/spack/cmd/clean.py index 62359aaa42..c072bac251 100644 --- a/lib/spack/spack/cmd/clean.py +++ b/lib/spack/spack/cmd/clean.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/clone.py b/lib/spack/spack/cmd/clone.py index 1394368f0b..3c548c66ed 100644 --- a/lib/spack/spack/cmd/clone.py +++ b/lib/spack/spack/cmd/clone.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/commands.py b/lib/spack/spack/cmd/commands.py index c8c0ab1e6c..3b9e780268 100644 --- a/lib/spack/spack/cmd/commands.py +++ b/lib/spack/spack/cmd/commands.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/common/__init__.py b/lib/spack/spack/cmd/common/__init__.py index bb4e45438e..e7e2b142f8 100644 --- a/lib/spack/spack/cmd/common/__init__.py +++ b/lib/spack/spack/cmd/common/__init__.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/common/arguments.py b/lib/spack/spack/cmd/common/arguments.py index 6628ec4190..59b2f4e14e 100644 --- a/lib/spack/spack/cmd/common/arguments.py +++ b/lib/spack/spack/cmd/common/arguments.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/compiler.py b/lib/spack/spack/cmd/compiler.py index c133a85876..1f668b19b6 100644 --- a/lib/spack/spack/cmd/compiler.py +++ b/lib/spack/spack/cmd/compiler.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/compilers.py b/lib/spack/spack/cmd/compilers.py index f23ba5cc68..9fc0fd69a3 100644 --- a/lib/spack/spack/cmd/compilers.py +++ b/lib/spack/spack/cmd/compilers.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/config.py b/lib/spack/spack/cmd/config.py index 7614d5a09a..b7536b45b7 100644 --- a/lib/spack/spack/cmd/config.py +++ b/lib/spack/spack/cmd/config.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/configure.py b/lib/spack/spack/cmd/configure.py index 311b53d9c6..04ce8641e4 100644 --- a/lib/spack/spack/cmd/configure.py +++ b/lib/spack/spack/cmd/configure.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/create.py b/lib/spack/spack/cmd/create.py index 1be351a430..6bd3a80925 100644 --- a/lib/spack/spack/cmd/create.py +++ b/lib/spack/spack/cmd/create.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. @@ -47,7 +47,7 @@ level = "short" package_template = '''\ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/deactivate.py b/lib/spack/spack/cmd/deactivate.py index ae5241dfe8..575ba05a1d 100644 --- a/lib/spack/spack/cmd/deactivate.py +++ b/lib/spack/spack/cmd/deactivate.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/debug.py b/lib/spack/spack/cmd/debug.py index 1d3e645a29..db8180621a 100644 --- a/lib/spack/spack/cmd/debug.py +++ b/lib/spack/spack/cmd/debug.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/dependencies.py b/lib/spack/spack/cmd/dependencies.py index e0b62c3a53..492264fe24 100644 --- a/lib/spack/spack/cmd/dependencies.py +++ b/lib/spack/spack/cmd/dependencies.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/dependents.py b/lib/spack/spack/cmd/dependents.py index 1ad3c0a3b9..f7157514c1 100644 --- a/lib/spack/spack/cmd/dependents.py +++ b/lib/spack/spack/cmd/dependents.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/diy.py b/lib/spack/spack/cmd/diy.py index deef0f1372..8da2568def 100644 --- a/lib/spack/spack/cmd/diy.py +++ b/lib/spack/spack/cmd/diy.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/docs.py b/lib/spack/spack/cmd/docs.py index 02096a0020..4aeaded7e8 100644 --- a/lib/spack/spack/cmd/docs.py +++ b/lib/spack/spack/cmd/docs.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/edit.py b/lib/spack/spack/cmd/edit.py index de2485b18d..32a892e565 100644 --- a/lib/spack/spack/cmd/edit.py +++ b/lib/spack/spack/cmd/edit.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/env.py b/lib/spack/spack/cmd/env.py index 14432c4dd0..29b00e12f2 100644 --- a/lib/spack/spack/cmd/env.py +++ b/lib/spack/spack/cmd/env.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/extensions.py b/lib/spack/spack/cmd/extensions.py index 6d36511691..ccd692147d 100644 --- a/lib/spack/spack/cmd/extensions.py +++ b/lib/spack/spack/cmd/extensions.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/fetch.py b/lib/spack/spack/cmd/fetch.py index e3956b125a..7ec71f1c4a 100644 --- a/lib/spack/spack/cmd/fetch.py +++ b/lib/spack/spack/cmd/fetch.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/find.py b/lib/spack/spack/cmd/find.py index 41bc6603ed..c75a5332f7 100644 --- a/lib/spack/spack/cmd/find.py +++ b/lib/spack/spack/cmd/find.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/flake8.py b/lib/spack/spack/cmd/flake8.py index d767e310da..40eac23034 100644 --- a/lib/spack/spack/cmd/flake8.py +++ b/lib/spack/spack/cmd/flake8.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/gpg.py b/lib/spack/spack/cmd/gpg.py index b5ec97ac6a..e23cfd25de 100644 --- a/lib/spack/spack/cmd/gpg.py +++ b/lib/spack/spack/cmd/gpg.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/graph.py b/lib/spack/spack/cmd/graph.py index 16bd6a38a1..dab99038be 100644 --- a/lib/spack/spack/cmd/graph.py +++ b/lib/spack/spack/cmd/graph.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/help.py b/lib/spack/spack/cmd/help.py index a76ef3a083..b0bd85b8b1 100644 --- a/lib/spack/spack/cmd/help.py +++ b/lib/spack/spack/cmd/help.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/info.py b/lib/spack/spack/cmd/info.py index e53d607704..1fee14989d 100644 --- a/lib/spack/spack/cmd/info.py +++ b/lib/spack/spack/cmd/info.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/install.py b/lib/spack/spack/cmd/install.py index ceb03f938c..bf5aa14376 100644 --- a/lib/spack/spack/cmd/install.py +++ b/lib/spack/spack/cmd/install.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/list.py b/lib/spack/spack/cmd/list.py index 85d94a3fce..01e5075de0 100644 --- a/lib/spack/spack/cmd/list.py +++ b/lib/spack/spack/cmd/list.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/load.py b/lib/spack/spack/cmd/load.py index 61c7003855..246d6fe5e2 100644 --- a/lib/spack/spack/cmd/load.py +++ b/lib/spack/spack/cmd/load.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/location.py b/lib/spack/spack/cmd/location.py index 99ce4d4fc3..719a4699db 100644 --- a/lib/spack/spack/cmd/location.py +++ b/lib/spack/spack/cmd/location.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/log_parse.py b/lib/spack/spack/cmd/log_parse.py index b5ce4fc9c9..0d54159912 100644 --- a/lib/spack/spack/cmd/log_parse.py +++ b/lib/spack/spack/cmd/log_parse.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/mirror.py b/lib/spack/spack/cmd/mirror.py index f00df323f4..1baf3b683e 100644 --- a/lib/spack/spack/cmd/mirror.py +++ b/lib/spack/spack/cmd/mirror.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/module.py b/lib/spack/spack/cmd/module.py index b097da972e..908f0e568a 100644 --- a/lib/spack/spack/cmd/module.py +++ b/lib/spack/spack/cmd/module.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/patch.py b/lib/spack/spack/cmd/patch.py index b19acfcde4..84ae0e5dcb 100644 --- a/lib/spack/spack/cmd/patch.py +++ b/lib/spack/spack/cmd/patch.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/pkg.py b/lib/spack/spack/cmd/pkg.py index 9591b58acd..ec48bf0c55 100644 --- a/lib/spack/spack/cmd/pkg.py +++ b/lib/spack/spack/cmd/pkg.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/providers.py b/lib/spack/spack/cmd/providers.py index de45e20ec5..2944bdcb67 100644 --- a/lib/spack/spack/cmd/providers.py +++ b/lib/spack/spack/cmd/providers.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/pydoc.py b/lib/spack/spack/cmd/pydoc.py index 093b16f66a..3a9e870f68 100644 --- a/lib/spack/spack/cmd/pydoc.py +++ b/lib/spack/spack/cmd/pydoc.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/python.py b/lib/spack/spack/cmd/python.py index 8bdb796efa..a4638a2a21 100644 --- a/lib/spack/spack/cmd/python.py +++ b/lib/spack/spack/cmd/python.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/reindex.py b/lib/spack/spack/cmd/reindex.py index 6babec60d5..33207d5ddf 100644 --- a/lib/spack/spack/cmd/reindex.py +++ b/lib/spack/spack/cmd/reindex.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/repo.py b/lib/spack/spack/cmd/repo.py index 9fbce6137b..dab1c95612 100644 --- a/lib/spack/spack/cmd/repo.py +++ b/lib/spack/spack/cmd/repo.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/restage.py b/lib/spack/spack/cmd/restage.py index 992aa40951..2a9e2ca93a 100644 --- a/lib/spack/spack/cmd/restage.py +++ b/lib/spack/spack/cmd/restage.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/setup.py b/lib/spack/spack/cmd/setup.py index 26be575553..bbf4740b12 100644 --- a/lib/spack/spack/cmd/setup.py +++ b/lib/spack/spack/cmd/setup.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/spec.py b/lib/spack/spack/cmd/spec.py index e6199f6ff3..b51ca9d879 100644 --- a/lib/spack/spack/cmd/spec.py +++ b/lib/spack/spack/cmd/spec.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/stage.py b/lib/spack/spack/cmd/stage.py index 3456e9290e..5dfa04b779 100644 --- a/lib/spack/spack/cmd/stage.py +++ b/lib/spack/spack/cmd/stage.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/test.py b/lib/spack/spack/cmd/test.py index d25a851237..9fd53d8ae9 100644 --- a/lib/spack/spack/cmd/test.py +++ b/lib/spack/spack/cmd/test.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/uninstall.py b/lib/spack/spack/cmd/uninstall.py index 0cb79340eb..47eead78f9 100644 --- a/lib/spack/spack/cmd/uninstall.py +++ b/lib/spack/spack/cmd/uninstall.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/unload.py b/lib/spack/spack/cmd/unload.py index 9820ff52d3..8907e477d4 100644 --- a/lib/spack/spack/cmd/unload.py +++ b/lib/spack/spack/cmd/unload.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/unuse.py b/lib/spack/spack/cmd/unuse.py index 14ca4227d2..0546fa12a4 100644 --- a/lib/spack/spack/cmd/unuse.py +++ b/lib/spack/spack/cmd/unuse.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/url.py b/lib/spack/spack/cmd/url.py index a445810b69..e31f98171b 100644 --- a/lib/spack/spack/cmd/url.py +++ b/lib/spack/spack/cmd/url.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/use.py b/lib/spack/spack/cmd/use.py index 956f5c6cbc..da4a23586c 100644 --- a/lib/spack/spack/cmd/use.py +++ b/lib/spack/spack/cmd/use.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/versions.py b/lib/spack/spack/cmd/versions.py index 9c6f2d1ead..ea39c96ac5 100644 --- a/lib/spack/spack/cmd/versions.py +++ b/lib/spack/spack/cmd/versions.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/cmd/view.py b/lib/spack/spack/cmd/view.py index 13005053ff..c7e7ff6699 100644 --- a/lib/spack/spack/cmd/view.py +++ b/lib/spack/spack/cmd/view.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/compiler.py b/lib/spack/spack/compiler.py index 451051364c..f6f5a4d4dc 100644 --- a/lib/spack/spack/compiler.py +++ b/lib/spack/spack/compiler.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/compilers/__init__.py b/lib/spack/spack/compilers/__init__.py index f251889f83..bf3a11fa2f 100644 --- a/lib/spack/spack/compilers/__init__.py +++ b/lib/spack/spack/compilers/__init__.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/compilers/cce.py b/lib/spack/spack/compilers/cce.py index 7bb95492ad..e8f48242ee 100644 --- a/lib/spack/spack/compilers/cce.py +++ b/lib/spack/spack/compilers/cce.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/compilers/clang.py b/lib/spack/spack/compilers/clang.py index a748bd95bd..81dbadfd69 100644 --- a/lib/spack/spack/compilers/clang.py +++ b/lib/spack/spack/compilers/clang.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/compilers/gcc.py b/lib/spack/spack/compilers/gcc.py index b97d8b2e24..71ae6187ea 100644 --- a/lib/spack/spack/compilers/gcc.py +++ b/lib/spack/spack/compilers/gcc.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/compilers/intel.py b/lib/spack/spack/compilers/intel.py index b66436ecc0..e18a30587e 100644 --- a/lib/spack/spack/compilers/intel.py +++ b/lib/spack/spack/compilers/intel.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/compilers/nag.py b/lib/spack/spack/compilers/nag.py index 20688b67ef..1204218b8a 100644 --- a/lib/spack/spack/compilers/nag.py +++ b/lib/spack/spack/compilers/nag.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/compilers/pgi.py b/lib/spack/spack/compilers/pgi.py index 0a90c4202d..c33589e092 100644 --- a/lib/spack/spack/compilers/pgi.py +++ b/lib/spack/spack/compilers/pgi.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/compilers/xl.py b/lib/spack/spack/compilers/xl.py index 827ffeba1b..8fda5cb536 100644 --- a/lib/spack/spack/compilers/xl.py +++ b/lib/spack/spack/compilers/xl.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/concretize.py b/lib/spack/spack/concretize.py index c722a5506c..151aee13a9 100644 --- a/lib/spack/spack/concretize.py +++ b/lib/spack/spack/concretize.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/config.py b/lib/spack/spack/config.py index 7b56328621..619464727b 100644 --- a/lib/spack/spack/config.py +++ b/lib/spack/spack/config.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/database.py b/lib/spack/spack/database.py index c857802ab9..f7503dce75 100644 --- a/lib/spack/spack/database.py +++ b/lib/spack/spack/database.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/dependency.py b/lib/spack/spack/dependency.py index 99a16c9d45..a1691157a4 100644 --- a/lib/spack/spack/dependency.py +++ b/lib/spack/spack/dependency.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/directives.py b/lib/spack/spack/directives.py index d26910f1d9..1e2435eac2 100644 --- a/lib/spack/spack/directives.py +++ b/lib/spack/spack/directives.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/directory_layout.py b/lib/spack/spack/directory_layout.py index e07db0ede4..5ce0a9ca2c 100644 --- a/lib/spack/spack/directory_layout.py +++ b/lib/spack/spack/directory_layout.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/environment.py b/lib/spack/spack/environment.py index 1e8665fe01..0db7706d9c 100644 --- a/lib/spack/spack/environment.py +++ b/lib/spack/spack/environment.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/error.py b/lib/spack/spack/error.py index 4a1278b6fe..08112bf910 100644 --- a/lib/spack/spack/error.py +++ b/lib/spack/spack/error.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/fetch_strategy.py b/lib/spack/spack/fetch_strategy.py index 5c7b3aa395..04e42a9f0c 100644 --- a/lib/spack/spack/fetch_strategy.py +++ b/lib/spack/spack/fetch_strategy.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/file_cache.py b/lib/spack/spack/file_cache.py index 688f32a4ad..37e2bcf0a6 100644 --- a/lib/spack/spack/file_cache.py +++ b/lib/spack/spack/file_cache.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/filesystem_view.py b/lib/spack/spack/filesystem_view.py index 1c6e5f0523..f374bccd1f 100644 --- a/lib/spack/spack/filesystem_view.py +++ b/lib/spack/spack/filesystem_view.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/graph.py b/lib/spack/spack/graph.py index bfc0ab1591..3cfaa91c12 100644 --- a/lib/spack/spack/graph.py +++ b/lib/spack/spack/graph.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/hooks/__init__.py b/lib/spack/spack/hooks/__init__.py index 5bf4110608..4d36719aeb 100644 --- a/lib/spack/spack/hooks/__init__.py +++ b/lib/spack/spack/hooks/__init__.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/hooks/extensions.py b/lib/spack/spack/hooks/extensions.py index 7865c34dc0..94fe9f3cf4 100644 --- a/lib/spack/spack/hooks/extensions.py +++ b/lib/spack/spack/hooks/extensions.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/hooks/licensing.py b/lib/spack/spack/hooks/licensing.py index 515935e8d4..02c27b1ec0 100644 --- a/lib/spack/spack/hooks/licensing.py +++ b/lib/spack/spack/hooks/licensing.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/hooks/module_file_generation.py b/lib/spack/spack/hooks/module_file_generation.py index 6858b0874e..0136150034 100644 --- a/lib/spack/spack/hooks/module_file_generation.py +++ b/lib/spack/spack/hooks/module_file_generation.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/hooks/sbang.py b/lib/spack/spack/hooks/sbang.py index 887dfdc5b9..412aa5c083 100644 --- a/lib/spack/spack/hooks/sbang.py +++ b/lib/spack/spack/hooks/sbang.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/hooks/yaml_version_check.py b/lib/spack/spack/hooks/yaml_version_check.py index 338d2e51e7..0896f259ca 100644 --- a/lib/spack/spack/hooks/yaml_version_check.py +++ b/lib/spack/spack/hooks/yaml_version_check.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/main.py b/lib/spack/spack/main.py index 735dad5a1d..7e2b447501 100644 --- a/lib/spack/spack/main.py +++ b/lib/spack/spack/main.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/mirror.py b/lib/spack/spack/mirror.py index f8cedc38b4..5b9b22b754 100644 --- a/lib/spack/spack/mirror.py +++ b/lib/spack/spack/mirror.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/mixins.py b/lib/spack/spack/mixins.py index d8ffc253fe..edc67723a1 100644 --- a/lib/spack/spack/mixins.py +++ b/lib/spack/spack/mixins.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/modules/__init__.py b/lib/spack/spack/modules/__init__.py index 47802092a5..4954b8ed86 100644 --- a/lib/spack/spack/modules/__init__.py +++ b/lib/spack/spack/modules/__init__.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/modules/common.py b/lib/spack/spack/modules/common.py index 6feed2938c..c77678903b 100644 --- a/lib/spack/spack/modules/common.py +++ b/lib/spack/spack/modules/common.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/modules/dotkit.py b/lib/spack/spack/modules/dotkit.py index e1374292d6..3d30f113d5 100644 --- a/lib/spack/spack/modules/dotkit.py +++ b/lib/spack/spack/modules/dotkit.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/modules/lmod.py b/lib/spack/spack/modules/lmod.py index db221b8da3..5c5c454de5 100644 --- a/lib/spack/spack/modules/lmod.py +++ b/lib/spack/spack/modules/lmod.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/modules/tcl.py b/lib/spack/spack/modules/tcl.py index e3085f5d79..815509962b 100644 --- a/lib/spack/spack/modules/tcl.py +++ b/lib/spack/spack/modules/tcl.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/multimethod.py b/lib/spack/spack/multimethod.py index 78d547a69a..6ced487d14 100644 --- a/lib/spack/spack/multimethod.py +++ b/lib/spack/spack/multimethod.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/operating_systems/__init__.py b/lib/spack/spack/operating_systems/__init__.py index 8922701e9f..0e81cb3b36 100644 --- a/lib/spack/spack/operating_systems/__init__.py +++ b/lib/spack/spack/operating_systems/__init__.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/operating_systems/cnk.py b/lib/spack/spack/operating_systems/cnk.py index 008e5fc33b..34cf73e472 100644 --- a/lib/spack/spack/operating_systems/cnk.py +++ b/lib/spack/spack/operating_systems/cnk.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/operating_systems/cnl.py b/lib/spack/spack/operating_systems/cnl.py index 167b31f6e3..153cacca13 100644 --- a/lib/spack/spack/operating_systems/cnl.py +++ b/lib/spack/spack/operating_systems/cnl.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/operating_systems/cray_frontend.py b/lib/spack/spack/operating_systems/cray_frontend.py index d761a758ef..98f3da9e0f 100644 --- a/lib/spack/spack/operating_systems/cray_frontend.py +++ b/lib/spack/spack/operating_systems/cray_frontend.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/operating_systems/linux_distro.py b/lib/spack/spack/operating_systems/linux_distro.py index 723b4d5447..a54743f258 100644 --- a/lib/spack/spack/operating_systems/linux_distro.py +++ b/lib/spack/spack/operating_systems/linux_distro.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/operating_systems/mac_os.py b/lib/spack/spack/operating_systems/mac_os.py index a5577fa39d..8f283e2fe1 100644 --- a/lib/spack/spack/operating_systems/mac_os.py +++ b/lib/spack/spack/operating_systems/mac_os.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py index 4a1f24b234..8c22051b91 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/package_prefs.py b/lib/spack/spack/package_prefs.py index 489e87b9b0..10c6ede916 100644 --- a/lib/spack/spack/package_prefs.py +++ b/lib/spack/spack/package_prefs.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/package_test.py b/lib/spack/spack/package_test.py index e3f2e82d03..c3afd9a434 100644 --- a/lib/spack/spack/package_test.py +++ b/lib/spack/spack/package_test.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/parse.py b/lib/spack/spack/parse.py index 1bdefde7a4..153040434d 100644 --- a/lib/spack/spack/parse.py +++ b/lib/spack/spack/parse.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/patch.py b/lib/spack/spack/patch.py index 2fea1d9aff..7c144b11c2 100644 --- a/lib/spack/spack/patch.py +++ b/lib/spack/spack/patch.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/platforms/__init__.py b/lib/spack/spack/platforms/__init__.py index 8922701e9f..0e81cb3b36 100644 --- a/lib/spack/spack/platforms/__init__.py +++ b/lib/spack/spack/platforms/__init__.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/platforms/bgq.py b/lib/spack/spack/platforms/bgq.py index f0dfe1dd14..1c46542018 100644 --- a/lib/spack/spack/platforms/bgq.py +++ b/lib/spack/spack/platforms/bgq.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/platforms/cray.py b/lib/spack/spack/platforms/cray.py index dee98c0629..78c8ef377f 100644 --- a/lib/spack/spack/platforms/cray.py +++ b/lib/spack/spack/platforms/cray.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/platforms/darwin.py b/lib/spack/spack/platforms/darwin.py index be2a1e7e41..3d9e4df9c5 100644 --- a/lib/spack/spack/platforms/darwin.py +++ b/lib/spack/spack/platforms/darwin.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/platforms/linux.py b/lib/spack/spack/platforms/linux.py index 4913be4ed2..cf263bb457 100644 --- a/lib/spack/spack/platforms/linux.py +++ b/lib/spack/spack/platforms/linux.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/platforms/test.py b/lib/spack/spack/platforms/test.py index 3a4d2c00ad..a1ad34b46f 100644 --- a/lib/spack/spack/platforms/test.py +++ b/lib/spack/spack/platforms/test.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/provider_index.py b/lib/spack/spack/provider_index.py index 21bde7ce5c..6cb530b2f4 100644 --- a/lib/spack/spack/provider_index.py +++ b/lib/spack/spack/provider_index.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/relocate.py b/lib/spack/spack/relocate.py index 29c062a713..90b082371d 100644 --- a/lib/spack/spack/relocate.py +++ b/lib/spack/spack/relocate.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/report.py b/lib/spack/spack/report.py index 6260594620..900f1b0cd7 100644 --- a/lib/spack/spack/report.py +++ b/lib/spack/spack/report.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/repository.py b/lib/spack/spack/repository.py index a3cac95c3b..8a713b1a39 100644 --- a/lib/spack/spack/repository.py +++ b/lib/spack/spack/repository.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/resource.py b/lib/spack/spack/resource.py index 35ae0170e6..5d60adfb69 100644 --- a/lib/spack/spack/resource.py +++ b/lib/spack/spack/resource.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/schema/__init__.py b/lib/spack/spack/schema/__init__.py index 764dbd23bc..df8ecb3ffc 100644 --- a/lib/spack/spack/schema/__init__.py +++ b/lib/spack/spack/schema/__init__.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/schema/compilers.py b/lib/spack/spack/schema/compilers.py index caa0d27662..e569989d30 100644 --- a/lib/spack/spack/schema/compilers.py +++ b/lib/spack/spack/schema/compilers.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/schema/config.py b/lib/spack/spack/schema/config.py index 57a1c075b1..5a60f71f9d 100644 --- a/lib/spack/spack/schema/config.py +++ b/lib/spack/spack/schema/config.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/schema/mirrors.py b/lib/spack/spack/schema/mirrors.py index b826bc251c..c4f13ababd 100644 --- a/lib/spack/spack/schema/mirrors.py +++ b/lib/spack/spack/schema/mirrors.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/schema/modules.py b/lib/spack/spack/schema/modules.py index 08380f0789..efd093a9cb 100644 --- a/lib/spack/spack/schema/modules.py +++ b/lib/spack/spack/schema/modules.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/schema/packages.py b/lib/spack/spack/schema/packages.py index 70773c8aef..56949b7267 100644 --- a/lib/spack/spack/schema/packages.py +++ b/lib/spack/spack/schema/packages.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/schema/repos.py b/lib/spack/spack/schema/repos.py index bdd1dfc5cf..8d5b10946a 100644 --- a/lib/spack/spack/schema/repos.py +++ b/lib/spack/spack/schema/repos.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py index a88cb3f62a..e796b45e9b 100644 --- a/lib/spack/spack/spec.py +++ b/lib/spack/spack/spec.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/stage.py b/lib/spack/spack/stage.py index e708662253..b771e046b5 100644 --- a/lib/spack/spack/stage.py +++ b/lib/spack/spack/stage.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/store.py b/lib/spack/spack/store.py index a9a607150f..2e86b9dd83 100644 --- a/lib/spack/spack/store.py +++ b/lib/spack/spack/store.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/tengine.py b/lib/spack/spack/tengine.py index 44c62521b1..d49b4c69b2 100644 --- a/lib/spack/spack/tengine.py +++ b/lib/spack/spack/tengine.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/__init__.py b/lib/spack/spack/test/__init__.py index 8922701e9f..0e81cb3b36 100644 --- a/lib/spack/spack/test/__init__.py +++ b/lib/spack/spack/test/__init__.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/architecture.py b/lib/spack/spack/test/architecture.py index 18bf7d66c5..1ed0dc3277 100644 --- a/lib/spack/spack/test/architecture.py +++ b/lib/spack/spack/test/architecture.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/build_environment.py b/lib/spack/spack/test/build_environment.py index 37664aa35e..f0aa1b1fc6 100644 --- a/lib/spack/spack/test/build_environment.py +++ b/lib/spack/spack/test/build_environment.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/build_system_guess.py b/lib/spack/spack/test/build_system_guess.py index b23b66a846..88c788f587 100644 --- a/lib/spack/spack/test/build_system_guess.py +++ b/lib/spack/spack/test/build_system_guess.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/build_systems.py b/lib/spack/spack/test/build_systems.py index 72b88f3f26..983a474310 100644 --- a/lib/spack/spack/test/build_systems.py +++ b/lib/spack/spack/test/build_systems.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/cc.py b/lib/spack/spack/test/cc.py index 671379c717..8290020662 100644 --- a/lib/spack/spack/test/cc.py +++ b/lib/spack/spack/test/cc.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/cmd/__init__.py b/lib/spack/spack/test/cmd/__init__.py index 8922701e9f..0e81cb3b36 100644 --- a/lib/spack/spack/test/cmd/__init__.py +++ b/lib/spack/spack/test/cmd/__init__.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/cmd/arch.py b/lib/spack/spack/test/cmd/arch.py index 9f5f7c6454..fe8dec8b2e 100644 --- a/lib/spack/spack/test/cmd/arch.py +++ b/lib/spack/spack/test/cmd/arch.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/cmd/blame.py b/lib/spack/spack/test/cmd/blame.py index 1f7d9e81a8..ea56cd327a 100644 --- a/lib/spack/spack/test/cmd/blame.py +++ b/lib/spack/spack/test/cmd/blame.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/cmd/cd.py b/lib/spack/spack/test/cmd/cd.py index 8e9014bee8..e62432a0e7 100644 --- a/lib/spack/spack/test/cmd/cd.py +++ b/lib/spack/spack/test/cmd/cd.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/cmd/clean.py b/lib/spack/spack/test/cmd/clean.py index 03a1c702e4..9231029c90 100644 --- a/lib/spack/spack/test/cmd/clean.py +++ b/lib/spack/spack/test/cmd/clean.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/cmd/commands.py b/lib/spack/spack/test/cmd/commands.py index 84f26e246d..f3ca3e7249 100644 --- a/lib/spack/spack/test/cmd/commands.py +++ b/lib/spack/spack/test/cmd/commands.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/cmd/dependencies.py b/lib/spack/spack/test/cmd/dependencies.py index 6a8d845fea..f6ce5c3602 100644 --- a/lib/spack/spack/test/cmd/dependencies.py +++ b/lib/spack/spack/test/cmd/dependencies.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/cmd/dependents.py b/lib/spack/spack/test/cmd/dependents.py index 9a20f3639b..2ed4786c05 100644 --- a/lib/spack/spack/test/cmd/dependents.py +++ b/lib/spack/spack/test/cmd/dependents.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/cmd/env.py b/lib/spack/spack/test/cmd/env.py index 18d64b454b..da489c8c82 100644 --- a/lib/spack/spack/test/cmd/env.py +++ b/lib/spack/spack/test/cmd/env.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/cmd/find.py b/lib/spack/spack/test/cmd/find.py index 0e88aadd43..c807ce6b6d 100644 --- a/lib/spack/spack/test/cmd/find.py +++ b/lib/spack/spack/test/cmd/find.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/cmd/flake8.py b/lib/spack/spack/test/cmd/flake8.py index 632351601d..8d77f2300f 100644 --- a/lib/spack/spack/test/cmd/flake8.py +++ b/lib/spack/spack/test/cmd/flake8.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/cmd/gpg.py b/lib/spack/spack/test/cmd/gpg.py index dadaba5833..a3d4cff837 100644 --- a/lib/spack/spack/test/cmd/gpg.py +++ b/lib/spack/spack/test/cmd/gpg.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/cmd/graph.py b/lib/spack/spack/test/cmd/graph.py index 8350a26d55..0fc18e8f71 100644 --- a/lib/spack/spack/test/cmd/graph.py +++ b/lib/spack/spack/test/cmd/graph.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/cmd/help.py b/lib/spack/spack/test/cmd/help.py index d4f914fcde..89cfaa3acc 100644 --- a/lib/spack/spack/test/cmd/help.py +++ b/lib/spack/spack/test/cmd/help.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/cmd/info.py b/lib/spack/spack/test/cmd/info.py index c406f6f78e..88919a9b06 100644 --- a/lib/spack/spack/test/cmd/info.py +++ b/lib/spack/spack/test/cmd/info.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/cmd/install.py b/lib/spack/spack/test/cmd/install.py index 85e52f2daf..a6a93d2fea 100644 --- a/lib/spack/spack/test/cmd/install.py +++ b/lib/spack/spack/test/cmd/install.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/cmd/list.py b/lib/spack/spack/test/cmd/list.py index 33339026b4..72174c6b7b 100644 --- a/lib/spack/spack/test/cmd/list.py +++ b/lib/spack/spack/test/cmd/list.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/cmd/module.py b/lib/spack/spack/test/cmd/module.py index 3cdd5e81c2..df55f0bd5e 100644 --- a/lib/spack/spack/test/cmd/module.py +++ b/lib/spack/spack/test/cmd/module.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/cmd/python.py b/lib/spack/spack/test/cmd/python.py index 000535af8e..73221d7316 100644 --- a/lib/spack/spack/test/cmd/python.py +++ b/lib/spack/spack/test/cmd/python.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/cmd/test_compiler_cmd.py b/lib/spack/spack/test/cmd/test_compiler_cmd.py index e7a2186344..7463047853 100644 --- a/lib/spack/spack/test/cmd/test_compiler_cmd.py +++ b/lib/spack/spack/test/cmd/test_compiler_cmd.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/cmd/uninstall.py b/lib/spack/spack/test/cmd/uninstall.py index 280db6f126..1c187431d1 100644 --- a/lib/spack/spack/test/cmd/uninstall.py +++ b/lib/spack/spack/test/cmd/uninstall.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/cmd/url.py b/lib/spack/spack/test/cmd/url.py index 724dffaa4f..a12880728b 100644 --- a/lib/spack/spack/test/cmd/url.py +++ b/lib/spack/spack/test/cmd/url.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/cmd/versions.py b/lib/spack/spack/test/cmd/versions.py index 76636ce689..69d2dae056 100644 --- a/lib/spack/spack/test/cmd/versions.py +++ b/lib/spack/spack/test/cmd/versions.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/cmd/view.py b/lib/spack/spack/test/cmd/view.py index 9ab3e528d2..252ec24f4e 100644 --- a/lib/spack/spack/test/cmd/view.py +++ b/lib/spack/spack/test/cmd/view.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/compilers.py b/lib/spack/spack/test/compilers.py index d4f1aa9976..7875743761 100644 --- a/lib/spack/spack/test/compilers.py +++ b/lib/spack/spack/test/compilers.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/concretize.py b/lib/spack/spack/test/concretize.py index 87a4e03b4d..0478d5233b 100644 --- a/lib/spack/spack/test/concretize.py +++ b/lib/spack/spack/test/concretize.py @@ -1,5 +1,5 @@ ############################################################################# -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/concretize_preferences.py b/lib/spack/spack/test/concretize_preferences.py index 164b21e072..8592289f7b 100644 --- a/lib/spack/spack/test/concretize_preferences.py +++ b/lib/spack/spack/test/concretize_preferences.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/config.py b/lib/spack/spack/test/config.py index e79d829ba0..f3a745ad17 100644 --- a/lib/spack/spack/test/config.py +++ b/lib/spack/spack/test/config.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/conftest.py b/lib/spack/spack/test/conftest.py index 0bdbf72f12..0e98a1cf00 100644 --- a/lib/spack/spack/test/conftest.py +++ b/lib/spack/spack/test/conftest.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/data/sourceme_first.sh b/lib/spack/spack/test/data/sourceme_first.sh index 7adf35e137..94fb68dfdf 100644 --- a/lib/spack/spack/test/data/sourceme_first.sh +++ b/lib/spack/spack/test/data/sourceme_first.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/data/sourceme_parameters.sh b/lib/spack/spack/test/data/sourceme_parameters.sh index 8b60e944b3..d6703f983b 100644 --- a/lib/spack/spack/test/data/sourceme_parameters.sh +++ b/lib/spack/spack/test/data/sourceme_parameters.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/data/sourceme_second.sh b/lib/spack/spack/test/data/sourceme_second.sh index 37059707f8..37182ef7e7 100644 --- a/lib/spack/spack/test/data/sourceme_second.sh +++ b/lib/spack/spack/test/data/sourceme_second.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/data/sourceme_unicode.sh b/lib/spack/spack/test/data/sourceme_unicode.sh index b602dadbbc..b4f5ddb733 100644 --- a/lib/spack/spack/test/data/sourceme_unicode.sh +++ b/lib/spack/spack/test/data/sourceme_unicode.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/database.py b/lib/spack/spack/test/database.py index 99cda8dd81..c03c0a254d 100644 --- a/lib/spack/spack/test/database.py +++ b/lib/spack/spack/test/database.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/directory_layout.py b/lib/spack/spack/test/directory_layout.py index e5fb8c7a29..269f98b49c 100644 --- a/lib/spack/spack/test/directory_layout.py +++ b/lib/spack/spack/test/directory_layout.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/environment.py b/lib/spack/spack/test/environment.py index c11c050820..6f4af17e1c 100644 --- a/lib/spack/spack/test/environment.py +++ b/lib/spack/spack/test/environment.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/file_cache.py b/lib/spack/spack/test/file_cache.py index 7098b9673e..c3c87296d2 100644 --- a/lib/spack/spack/test/file_cache.py +++ b/lib/spack/spack/test/file_cache.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/flag_handlers.py b/lib/spack/spack/test/flag_handlers.py index 80dad9c35e..d9433a2c3c 100644 --- a/lib/spack/spack/test/flag_handlers.py +++ b/lib/spack/spack/test/flag_handlers.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/git_fetch.py b/lib/spack/spack/test/git_fetch.py index 4ca8ce506f..f9fd6381d1 100644 --- a/lib/spack/spack/test/git_fetch.py +++ b/lib/spack/spack/test/git_fetch.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/graph.py b/lib/spack/spack/test/graph.py index 7cd82c3a88..b993d83214 100644 --- a/lib/spack/spack/test/graph.py +++ b/lib/spack/spack/test/graph.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/hg_fetch.py b/lib/spack/spack/test/hg_fetch.py index 07e7840eaa..c894b7775e 100644 --- a/lib/spack/spack/test/hg_fetch.py +++ b/lib/spack/spack/test/hg_fetch.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/install.py b/lib/spack/spack/test/install.py index 86b95459f4..7ce27b780b 100644 --- a/lib/spack/spack/test/install.py +++ b/lib/spack/spack/test/install.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/llnl/util/file_list.py b/lib/spack/spack/test/llnl/util/file_list.py index d92f15c5e1..4a001f1598 100644 --- a/lib/spack/spack/test/llnl/util/file_list.py +++ b/lib/spack/spack/test/llnl/util/file_list.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/llnl/util/lang.py b/lib/spack/spack/test/llnl/util/lang.py index 8b97c175b7..7d39a796f0 100644 --- a/lib/spack/spack/test/llnl/util/lang.py +++ b/lib/spack/spack/test/llnl/util/lang.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/llnl/util/link_tree.py b/lib/spack/spack/test/llnl/util/link_tree.py index 59af3b8ad4..b4808ce0f7 100644 --- a/lib/spack/spack/test/llnl/util/link_tree.py +++ b/lib/spack/spack/test/llnl/util/link_tree.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/llnl/util/lock.py b/lib/spack/spack/test/llnl/util/lock.py index 0574adff51..5c30650a23 100644 --- a/lib/spack/spack/test/llnl/util/lock.py +++ b/lib/spack/spack/test/llnl/util/lock.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/llnl/util/log.py b/lib/spack/spack/test/llnl/util/log.py index 44f4f15131..f0343e271f 100644 --- a/lib/spack/spack/test/llnl/util/log.py +++ b/lib/spack/spack/test/llnl/util/log.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/make_executable.py b/lib/spack/spack/test/make_executable.py index dd50746ade..23df9ca1e4 100644 --- a/lib/spack/spack/test/make_executable.py +++ b/lib/spack/spack/test/make_executable.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/mirror.py b/lib/spack/spack/test/mirror.py index ec8a0d504c..014f0e5031 100644 --- a/lib/spack/spack/test/mirror.py +++ b/lib/spack/spack/test/mirror.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/module_parsing.py b/lib/spack/spack/test/module_parsing.py index 61e0ba1972..978de51559 100644 --- a/lib/spack/spack/test/module_parsing.py +++ b/lib/spack/spack/test/module_parsing.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/modules/common.py b/lib/spack/spack/test/modules/common.py index 9c04dae649..b73e5aa975 100644 --- a/lib/spack/spack/test/modules/common.py +++ b/lib/spack/spack/test/modules/common.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/modules/conftest.py b/lib/spack/spack/test/modules/conftest.py index 35b5a30856..28b672879a 100644 --- a/lib/spack/spack/test/modules/conftest.py +++ b/lib/spack/spack/test/modules/conftest.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/modules/dotkit.py b/lib/spack/spack/test/modules/dotkit.py index b27a9eecf7..d471674f27 100644 --- a/lib/spack/spack/test/modules/dotkit.py +++ b/lib/spack/spack/test/modules/dotkit.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/modules/lmod.py b/lib/spack/spack/test/modules/lmod.py index 494a78e829..11ebf0302a 100644 --- a/lib/spack/spack/test/modules/lmod.py +++ b/lib/spack/spack/test/modules/lmod.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/modules/tcl.py b/lib/spack/spack/test/modules/tcl.py index 0a8dd99c76..753cd57ddc 100644 --- a/lib/spack/spack/test/modules/tcl.py +++ b/lib/spack/spack/test/modules/tcl.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/multimethod.py b/lib/spack/spack/test/multimethod.py index 40519cccb1..55da4b6279 100644 --- a/lib/spack/spack/test/multimethod.py +++ b/lib/spack/spack/test/multimethod.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/namespace_trie.py b/lib/spack/spack/test/namespace_trie.py index fa38a76cc1..48791bd20d 100644 --- a/lib/spack/spack/test/namespace_trie.py +++ b/lib/spack/spack/test/namespace_trie.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/optional_deps.py b/lib/spack/spack/test/optional_deps.py index 23702a3410..74314fe3cd 100644 --- a/lib/spack/spack/test/optional_deps.py +++ b/lib/spack/spack/test/optional_deps.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/package_sanity.py b/lib/spack/spack/test/package_sanity.py index e1259eaf7e..65861273cd 100644 --- a/lib/spack/spack/test/package_sanity.py +++ b/lib/spack/spack/test/package_sanity.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/packages.py b/lib/spack/spack/test/packages.py index 0fd115dac2..0ef76ae355 100644 --- a/lib/spack/spack/test/packages.py +++ b/lib/spack/spack/test/packages.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/packaging.py b/lib/spack/spack/test/packaging.py index 27018d3706..a58d9f274e 100644 --- a/lib/spack/spack/test/packaging.py +++ b/lib/spack/spack/test/packaging.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/patch.py b/lib/spack/spack/test/patch.py index 6afb50bba0..1a03199ca0 100644 --- a/lib/spack/spack/test/patch.py +++ b/lib/spack/spack/test/patch.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/pattern.py b/lib/spack/spack/test/pattern.py index 72cabbbfd7..7553b70fac 100644 --- a/lib/spack/spack/test/pattern.py +++ b/lib/spack/spack/test/pattern.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/provider_index.py b/lib/spack/spack/test/provider_index.py index 985a1ae3f3..af1be26923 100644 --- a/lib/spack/spack/test/provider_index.py +++ b/lib/spack/spack/test/provider_index.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/python_version.py b/lib/spack/spack/test/python_version.py index 6d0c42fcde..36fc138ae2 100644 --- a/lib/spack/spack/test/python_version.py +++ b/lib/spack/spack/test/python_version.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/repo.py b/lib/spack/spack/test/repo.py index 7bf1291ec0..570bd0c469 100644 --- a/lib/spack/spack/test/repo.py +++ b/lib/spack/spack/test/repo.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/sbang.py b/lib/spack/spack/test/sbang.py index 6b583b187f..ffa99428ed 100644 --- a/lib/spack/spack/test/sbang.py +++ b/lib/spack/spack/test/sbang.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/spack_yaml.py b/lib/spack/spack/test/spack_yaml.py index 7bf4e4e041..e84e356e8a 100644 --- a/lib/spack/spack/test/spack_yaml.py +++ b/lib/spack/spack/test/spack_yaml.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/spec_dag.py b/lib/spack/spack/test/spec_dag.py index 0f359d8291..f8dd7a7f74 100644 --- a/lib/spack/spack/test/spec_dag.py +++ b/lib/spack/spack/test/spec_dag.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/spec_semantics.py b/lib/spack/spack/test/spec_semantics.py index 4ffb458765..396ef41d4a 100644 --- a/lib/spack/spack/test/spec_semantics.py +++ b/lib/spack/spack/test/spec_semantics.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/spec_syntax.py b/lib/spack/spack/test/spec_syntax.py index f134319532..6d5225f26e 100644 --- a/lib/spack/spack/test/spec_syntax.py +++ b/lib/spack/spack/test/spec_syntax.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/spec_yaml.py b/lib/spack/spack/test/spec_yaml.py index 0d1840a11c..b9798190b5 100644 --- a/lib/spack/spack/test/spec_yaml.py +++ b/lib/spack/spack/test/spec_yaml.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/stage.py b/lib/spack/spack/test/stage.py index 2117ef5462..1fb3aada77 100644 --- a/lib/spack/spack/test/stage.py +++ b/lib/spack/spack/test/stage.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/svn_fetch.py b/lib/spack/spack/test/svn_fetch.py index 7e107ec423..939c6c0ad3 100644 --- a/lib/spack/spack/test/svn_fetch.py +++ b/lib/spack/spack/test/svn_fetch.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/tengine.py b/lib/spack/spack/test/tengine.py index 35979879e1..8af70655f0 100644 --- a/lib/spack/spack/test/tengine.py +++ b/lib/spack/spack/test/tengine.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/test_activations.py b/lib/spack/spack/test/test_activations.py index 025ef89abe..34e5c8d0b3 100644 --- a/lib/spack/spack/test/test_activations.py +++ b/lib/spack/spack/test/test_activations.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/url_fetch.py b/lib/spack/spack/test/url_fetch.py index 83e184f196..4085f89561 100644 --- a/lib/spack/spack/test/url_fetch.py +++ b/lib/spack/spack/test/url_fetch.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/url_parse.py b/lib/spack/spack/test/url_parse.py index 7a22205076..d030e769a4 100644 --- a/lib/spack/spack/test/url_parse.py +++ b/lib/spack/spack/test/url_parse.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/url_substitution.py b/lib/spack/spack/test/url_substitution.py index dcd26aad0d..39c314e517 100644 --- a/lib/spack/spack/test/url_substitution.py +++ b/lib/spack/spack/test/url_substitution.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/util/filesystem.py b/lib/spack/spack/test/util/filesystem.py index 86c243a97e..86c3332bb5 100644 --- a/lib/spack/spack/test/util/filesystem.py +++ b/lib/spack/spack/test/util/filesystem.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/util/log_parser.py b/lib/spack/spack/test/util/log_parser.py index 37642f7f1f..a3c6ed0f81 100644 --- a/lib/spack/spack/test/util/log_parser.py +++ b/lib/spack/spack/test/util/log_parser.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/util/prefix.py b/lib/spack/spack/test/util/prefix.py index e1cda1f1e4..812549a794 100644 --- a/lib/spack/spack/test/util/prefix.py +++ b/lib/spack/spack/test/util/prefix.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/variant.py b/lib/spack/spack/test/variant.py index 6bb7dc78e4..65516a5123 100644 --- a/lib/spack/spack/test/variant.py +++ b/lib/spack/spack/test/variant.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/versions.py b/lib/spack/spack/test/versions.py index c0136c41dc..e89d39553f 100644 --- a/lib/spack/spack/test/versions.py +++ b/lib/spack/spack/test/versions.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/test/web.py b/lib/spack/spack/test/web.py index 82ca61f410..6d9b106ea1 100644 --- a/lib/spack/spack/test/web.py +++ b/lib/spack/spack/test/web.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/url.py b/lib/spack/spack/url.py index 5276b3165f..efc1a325e2 100644 --- a/lib/spack/spack/url.py +++ b/lib/spack/spack/url.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/util/__init__.py b/lib/spack/spack/util/__init__.py index 8922701e9f..0e81cb3b36 100644 --- a/lib/spack/spack/util/__init__.py +++ b/lib/spack/spack/util/__init__.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/util/compression.py b/lib/spack/spack/util/compression.py index 3b747e08c6..0c427ab50c 100644 --- a/lib/spack/spack/util/compression.py +++ b/lib/spack/spack/util/compression.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/util/crypto.py b/lib/spack/spack/util/crypto.py index 28bc640d52..e364b62064 100644 --- a/lib/spack/spack/util/crypto.py +++ b/lib/spack/spack/util/crypto.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/util/debug.py b/lib/spack/spack/util/debug.py index 25f0600935..3f3eb51fbf 100644 --- a/lib/spack/spack/util/debug.py +++ b/lib/spack/spack/util/debug.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/util/environment.py b/lib/spack/spack/util/environment.py index 51f7f586ec..1b07b72873 100644 --- a/lib/spack/spack/util/environment.py +++ b/lib/spack/spack/util/environment.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/util/executable.py b/lib/spack/spack/util/executable.py index af516dc607..35d43cec65 100644 --- a/lib/spack/spack/util/executable.py +++ b/lib/spack/spack/util/executable.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/util/gpg.py b/lib/spack/spack/util/gpg.py index 4af849fb3c..09e7ded412 100644 --- a/lib/spack/spack/util/gpg.py +++ b/lib/spack/spack/util/gpg.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/util/log_parse.py b/lib/spack/spack/util/log_parse.py index 6d0228fc0d..34192fd6fd 100644 --- a/lib/spack/spack/util/log_parse.py +++ b/lib/spack/spack/util/log_parse.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/util/module_cmd.py b/lib/spack/spack/util/module_cmd.py index 1419ec4455..66a553f60c 100644 --- a/lib/spack/spack/util/module_cmd.py +++ b/lib/spack/spack/util/module_cmd.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/util/multiproc.py b/lib/spack/spack/util/multiproc.py index 3cbbac4566..2bf5d1a200 100644 --- a/lib/spack/spack/util/multiproc.py +++ b/lib/spack/spack/util/multiproc.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/util/naming.py b/lib/spack/spack/util/naming.py index 78e368f06c..1dd95fbcde 100644 --- a/lib/spack/spack/util/naming.py +++ b/lib/spack/spack/util/naming.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/util/ordereddict.py b/lib/spack/spack/util/ordereddict.py index 5d9f716005..bd21103cdc 100644 --- a/lib/spack/spack/util/ordereddict.py +++ b/lib/spack/spack/util/ordereddict.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/util/path.py b/lib/spack/spack/util/path.py index 9ce6c9306c..83d00b67f0 100644 --- a/lib/spack/spack/util/path.py +++ b/lib/spack/spack/util/path.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/util/pattern.py b/lib/spack/spack/util/pattern.py index 3a85336bdc..5ced4d8cfd 100644 --- a/lib/spack/spack/util/pattern.py +++ b/lib/spack/spack/util/pattern.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/util/prefix.py b/lib/spack/spack/util/prefix.py index d96b1c2449..60beb09c95 100644 --- a/lib/spack/spack/util/prefix.py +++ b/lib/spack/spack/util/prefix.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/util/spack_json.py b/lib/spack/spack/util/spack_json.py index fbc514c14b..67b6093c5f 100644 --- a/lib/spack/spack/util/spack_json.py +++ b/lib/spack/spack/util/spack_json.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/util/spack_yaml.py b/lib/spack/spack/util/spack_yaml.py index 8ac2efc229..152b57de19 100644 --- a/lib/spack/spack/util/spack_yaml.py +++ b/lib/spack/spack/util/spack_yaml.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/util/string.py b/lib/spack/spack/util/string.py index feb05a31a8..93de553c32 100644 --- a/lib/spack/spack/util/string.py +++ b/lib/spack/spack/util/string.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/util/web.py b/lib/spack/spack/util/web.py index 505c0a02a6..796f64e71b 100644 --- a/lib/spack/spack/util/web.py +++ b/lib/spack/spack/util/web.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/variant.py b/lib/spack/spack/variant.py index 43a1ab4ae6..af05ed93a9 100644 --- a/lib/spack/spack/variant.py +++ b/lib/spack/spack/variant.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/lib/spack/spack/version.py b/lib/spack/spack/version.py index cef58d43f4..59041d8009 100644 --- a/lib/spack/spack/version.py +++ b/lib/spack/spack/version.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/share/spack/setup-env.csh b/share/spack/setup-env.csh index 6fc728daa8..b17b753bbe 100755 --- a/share/spack/setup-env.csh +++ b/share/spack/setup-env.csh @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/share/spack/setup-env.sh b/share/spack/setup-env.sh index 38bcac03a9..688529491a 100755 --- a/share/spack/setup-env.sh +++ b/share/spack/setup-env.sh @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/share/spack/spack-completion.bash b/share/spack/spack-completion.bash index 8f549b0933..3da9d8de80 100755 --- a/share/spack/spack-completion.bash +++ b/share/spack/spack-completion.bash @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/a/package.py b/var/spack/repos/builtin.mock/packages/a/package.py index 468e839dec..1b3badcd9a 100644 --- a/var/spack/repos/builtin.mock/packages/a/package.py +++ b/var/spack/repos/builtin.mock/packages/a/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/b/package.py b/var/spack/repos/builtin.mock/packages/b/package.py index b352fa6f80..d234d4ee43 100644 --- a/var/spack/repos/builtin.mock/packages/b/package.py +++ b/var/spack/repos/builtin.mock/packages/b/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/boost/package.py b/var/spack/repos/builtin.mock/packages/boost/package.py index df50e18574..cec52e5f7a 100644 --- a/var/spack/repos/builtin.mock/packages/boost/package.py +++ b/var/spack/repos/builtin.mock/packages/boost/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/build-error/package.py b/var/spack/repos/builtin.mock/packages/build-error/package.py index e0c1a9ee83..7cfc59905c 100644 --- a/var/spack/repos/builtin.mock/packages/build-error/package.py +++ b/var/spack/repos/builtin.mock/packages/build-error/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/c/package.py b/var/spack/repos/builtin.mock/packages/c/package.py index 22132dd00d..3d0de89dd2 100644 --- a/var/spack/repos/builtin.mock/packages/c/package.py +++ b/var/spack/repos/builtin.mock/packages/c/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/callpath/package.py b/var/spack/repos/builtin.mock/packages/callpath/package.py index 19438e6277..2105c41b6f 100644 --- a/var/spack/repos/builtin.mock/packages/callpath/package.py +++ b/var/spack/repos/builtin.mock/packages/callpath/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/canfail/package.py b/var/spack/repos/builtin.mock/packages/canfail/package.py index b49bb3ce3e..bf0ee03a5b 100644 --- a/var/spack/repos/builtin.mock/packages/canfail/package.py +++ b/var/spack/repos/builtin.mock/packages/canfail/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/cmake-client/package.py b/var/spack/repos/builtin.mock/packages/cmake-client/package.py index 2fde961376..c775bdcbff 100644 --- a/var/spack/repos/builtin.mock/packages/cmake-client/package.py +++ b/var/spack/repos/builtin.mock/packages/cmake-client/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/cmake/package.py b/var/spack/repos/builtin.mock/packages/cmake/package.py index 15ad5606b4..1418aefd31 100644 --- a/var/spack/repos/builtin.mock/packages/cmake/package.py +++ b/var/spack/repos/builtin.mock/packages/cmake/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/conflict-parent/package.py b/var/spack/repos/builtin.mock/packages/conflict-parent/package.py index b8aaf55def..a8be93a22f 100644 --- a/var/spack/repos/builtin.mock/packages/conflict-parent/package.py +++ b/var/spack/repos/builtin.mock/packages/conflict-parent/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/conflict/package.py b/var/spack/repos/builtin.mock/packages/conflict/package.py index 26f09d77ee..bc3a4100a1 100644 --- a/var/spack/repos/builtin.mock/packages/conflict/package.py +++ b/var/spack/repos/builtin.mock/packages/conflict/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/conflicting-dependent/package.py b/var/spack/repos/builtin.mock/packages/conflicting-dependent/package.py index 620d398d35..dd9cd46655 100644 --- a/var/spack/repos/builtin.mock/packages/conflicting-dependent/package.py +++ b/var/spack/repos/builtin.mock/packages/conflicting-dependent/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/dependency-install/package.py b/var/spack/repos/builtin.mock/packages/dependency-install/package.py index eeaf2ada11..b45d60a538 100644 --- a/var/spack/repos/builtin.mock/packages/dependency-install/package.py +++ b/var/spack/repos/builtin.mock/packages/dependency-install/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/dependent-install/package.py b/var/spack/repos/builtin.mock/packages/dependent-install/package.py index 9bcc73d056..865caa1f19 100644 --- a/var/spack/repos/builtin.mock/packages/dependent-install/package.py +++ b/var/spack/repos/builtin.mock/packages/dependent-install/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/develop-test/package.py b/var/spack/repos/builtin.mock/packages/develop-test/package.py index c546f701fd..f32ffeec16 100644 --- a/var/spack/repos/builtin.mock/packages/develop-test/package.py +++ b/var/spack/repos/builtin.mock/packages/develop-test/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/direct-mpich/package.py b/var/spack/repos/builtin.mock/packages/direct-mpich/package.py index 737570ffe8..5a2ec12181 100644 --- a/var/spack/repos/builtin.mock/packages/direct-mpich/package.py +++ b/var/spack/repos/builtin.mock/packages/direct-mpich/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/dt-diamond-bottom/package.py b/var/spack/repos/builtin.mock/packages/dt-diamond-bottom/package.py index 7f55beb542..356c1d3e04 100644 --- a/var/spack/repos/builtin.mock/packages/dt-diamond-bottom/package.py +++ b/var/spack/repos/builtin.mock/packages/dt-diamond-bottom/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/dt-diamond-left/package.py b/var/spack/repos/builtin.mock/packages/dt-diamond-left/package.py index 262008079c..45602eb817 100644 --- a/var/spack/repos/builtin.mock/packages/dt-diamond-left/package.py +++ b/var/spack/repos/builtin.mock/packages/dt-diamond-left/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/dt-diamond-right/package.py b/var/spack/repos/builtin.mock/packages/dt-diamond-right/package.py index cc0db5bff1..3fea7ba879 100644 --- a/var/spack/repos/builtin.mock/packages/dt-diamond-right/package.py +++ b/var/spack/repos/builtin.mock/packages/dt-diamond-right/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/dt-diamond/package.py b/var/spack/repos/builtin.mock/packages/dt-diamond/package.py index c3b0b9db57..c186b9f456 100644 --- a/var/spack/repos/builtin.mock/packages/dt-diamond/package.py +++ b/var/spack/repos/builtin.mock/packages/dt-diamond/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/dtbuild1/package.py b/var/spack/repos/builtin.mock/packages/dtbuild1/package.py index bc00d4ed03..46186f9311 100644 --- a/var/spack/repos/builtin.mock/packages/dtbuild1/package.py +++ b/var/spack/repos/builtin.mock/packages/dtbuild1/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/dtbuild2/package.py b/var/spack/repos/builtin.mock/packages/dtbuild2/package.py index 1a3eb57835..ffafb17e20 100644 --- a/var/spack/repos/builtin.mock/packages/dtbuild2/package.py +++ b/var/spack/repos/builtin.mock/packages/dtbuild2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/dtbuild3/package.py b/var/spack/repos/builtin.mock/packages/dtbuild3/package.py index a03a04a523..bd40976322 100644 --- a/var/spack/repos/builtin.mock/packages/dtbuild3/package.py +++ b/var/spack/repos/builtin.mock/packages/dtbuild3/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/dtlink1/package.py b/var/spack/repos/builtin.mock/packages/dtlink1/package.py index 9c7e4bdebf..5b721ef4ad 100644 --- a/var/spack/repos/builtin.mock/packages/dtlink1/package.py +++ b/var/spack/repos/builtin.mock/packages/dtlink1/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/dtlink2/package.py b/var/spack/repos/builtin.mock/packages/dtlink2/package.py index 1a78a4879c..4ea715c45a 100644 --- a/var/spack/repos/builtin.mock/packages/dtlink2/package.py +++ b/var/spack/repos/builtin.mock/packages/dtlink2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/dtlink3/package.py b/var/spack/repos/builtin.mock/packages/dtlink3/package.py index 8c53f3e2a0..cd45f960d7 100644 --- a/var/spack/repos/builtin.mock/packages/dtlink3/package.py +++ b/var/spack/repos/builtin.mock/packages/dtlink3/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/dtlink4/package.py b/var/spack/repos/builtin.mock/packages/dtlink4/package.py index 4d7a57b2da..16faf53882 100644 --- a/var/spack/repos/builtin.mock/packages/dtlink4/package.py +++ b/var/spack/repos/builtin.mock/packages/dtlink4/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/dtlink5/package.py b/var/spack/repos/builtin.mock/packages/dtlink5/package.py index 914e7655fb..ba86dcb100 100644 --- a/var/spack/repos/builtin.mock/packages/dtlink5/package.py +++ b/var/spack/repos/builtin.mock/packages/dtlink5/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/dtrun1/package.py b/var/spack/repos/builtin.mock/packages/dtrun1/package.py index 738540ea52..114d8bb87f 100644 --- a/var/spack/repos/builtin.mock/packages/dtrun1/package.py +++ b/var/spack/repos/builtin.mock/packages/dtrun1/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/dtrun2/package.py b/var/spack/repos/builtin.mock/packages/dtrun2/package.py index 84129c1732..60c1f1ea97 100644 --- a/var/spack/repos/builtin.mock/packages/dtrun2/package.py +++ b/var/spack/repos/builtin.mock/packages/dtrun2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/dtrun3/package.py b/var/spack/repos/builtin.mock/packages/dtrun3/package.py index ee0c4272e4..8b64d05824 100644 --- a/var/spack/repos/builtin.mock/packages/dtrun3/package.py +++ b/var/spack/repos/builtin.mock/packages/dtrun3/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/dttop/package.py b/var/spack/repos/builtin.mock/packages/dttop/package.py index 9bb83fff89..5c9839545c 100644 --- a/var/spack/repos/builtin.mock/packages/dttop/package.py +++ b/var/spack/repos/builtin.mock/packages/dttop/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/dtuse/package.py b/var/spack/repos/builtin.mock/packages/dtuse/package.py index 3f8b0c9e98..8b0596d5f6 100644 --- a/var/spack/repos/builtin.mock/packages/dtuse/package.py +++ b/var/spack/repos/builtin.mock/packages/dtuse/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/dyninst/package.py b/var/spack/repos/builtin.mock/packages/dyninst/package.py index d00f604d61..6827005bbd 100644 --- a/var/spack/repos/builtin.mock/packages/dyninst/package.py +++ b/var/spack/repos/builtin.mock/packages/dyninst/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/e/package.py b/var/spack/repos/builtin.mock/packages/e/package.py index a00d459e9f..02c06e4fc5 100644 --- a/var/spack/repos/builtin.mock/packages/e/package.py +++ b/var/spack/repos/builtin.mock/packages/e/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/extendee/package.py b/var/spack/repos/builtin.mock/packages/extendee/package.py index cae5f93bf3..0ce4a44857 100644 --- a/var/spack/repos/builtin.mock/packages/extendee/package.py +++ b/var/spack/repos/builtin.mock/packages/extendee/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/extension1/package.py b/var/spack/repos/builtin.mock/packages/extension1/package.py index f4999e9963..1b713bcbd9 100644 --- a/var/spack/repos/builtin.mock/packages/extension1/package.py +++ b/var/spack/repos/builtin.mock/packages/extension1/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/extension2/package.py b/var/spack/repos/builtin.mock/packages/extension2/package.py index 01f3f94636..474974c619 100644 --- a/var/spack/repos/builtin.mock/packages/extension2/package.py +++ b/var/spack/repos/builtin.mock/packages/extension2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/externalmodule/package.py b/var/spack/repos/builtin.mock/packages/externalmodule/package.py index 5e9f8fda44..094dcdd6bc 100644 --- a/var/spack/repos/builtin.mock/packages/externalmodule/package.py +++ b/var/spack/repos/builtin.mock/packages/externalmodule/package.py @@ -1,6 +1,6 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/externalprereq/package.py b/var/spack/repos/builtin.mock/packages/externalprereq/package.py index 1890ab72d8..5e1442479d 100644 --- a/var/spack/repos/builtin.mock/packages/externalprereq/package.py +++ b/var/spack/repos/builtin.mock/packages/externalprereq/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/externaltest/package.py b/var/spack/repos/builtin.mock/packages/externaltest/package.py index 00cc553cbe..4baccfb9d7 100644 --- a/var/spack/repos/builtin.mock/packages/externaltest/package.py +++ b/var/spack/repos/builtin.mock/packages/externaltest/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/externaltool/package.py b/var/spack/repos/builtin.mock/packages/externaltool/package.py index c47c31ac66..c8867f3ef5 100644 --- a/var/spack/repos/builtin.mock/packages/externaltool/package.py +++ b/var/spack/repos/builtin.mock/packages/externaltool/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/externalvirtual/package.py b/var/spack/repos/builtin.mock/packages/externalvirtual/package.py index d0b814d83b..825608d7fa 100644 --- a/var/spack/repos/builtin.mock/packages/externalvirtual/package.py +++ b/var/spack/repos/builtin.mock/packages/externalvirtual/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/failing-build/package.py b/var/spack/repos/builtin.mock/packages/failing-build/package.py index e61451253a..3350913f4b 100644 --- a/var/spack/repos/builtin.mock/packages/failing-build/package.py +++ b/var/spack/repos/builtin.mock/packages/failing-build/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/fake/package.py b/var/spack/repos/builtin.mock/packages/fake/package.py index 6b264a4d55..64ac0221ab 100644 --- a/var/spack/repos/builtin.mock/packages/fake/package.py +++ b/var/spack/repos/builtin.mock/packages/fake/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/flake8/package.py b/var/spack/repos/builtin.mock/packages/flake8/package.py index 4f2e9bd475..f9bfc74e8a 100644 --- a/var/spack/repos/builtin.mock/packages/flake8/package.py +++ b/var/spack/repos/builtin.mock/packages/flake8/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/git-test/package.py b/var/spack/repos/builtin.mock/packages/git-test/package.py index 9378f72195..f3caae0cd2 100644 --- a/var/spack/repos/builtin.mock/packages/git-test/package.py +++ b/var/spack/repos/builtin.mock/packages/git-test/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/hg-test/package.py b/var/spack/repos/builtin.mock/packages/hg-test/package.py index 17d8379d1c..a0a1cad515 100644 --- a/var/spack/repos/builtin.mock/packages/hg-test/package.py +++ b/var/spack/repos/builtin.mock/packages/hg-test/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/hypre/package.py b/var/spack/repos/builtin.mock/packages/hypre/package.py index c815aca191..3b2ed62990 100644 --- a/var/spack/repos/builtin.mock/packages/hypre/package.py +++ b/var/spack/repos/builtin.mock/packages/hypre/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/indirect-mpich/package.py b/var/spack/repos/builtin.mock/packages/indirect-mpich/package.py index 3b9b9caec1..878a8500b0 100644 --- a/var/spack/repos/builtin.mock/packages/indirect-mpich/package.py +++ b/var/spack/repos/builtin.mock/packages/indirect-mpich/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/libdwarf/package.py b/var/spack/repos/builtin.mock/packages/libdwarf/package.py index 726cb756a6..bf0984b924 100644 --- a/var/spack/repos/builtin.mock/packages/libdwarf/package.py +++ b/var/spack/repos/builtin.mock/packages/libdwarf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/libelf/package.py b/var/spack/repos/builtin.mock/packages/libelf/package.py index 9cf8d152df..6e597a0717 100644 --- a/var/spack/repos/builtin.mock/packages/libelf/package.py +++ b/var/spack/repos/builtin.mock/packages/libelf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/mixedversions/package.py b/var/spack/repos/builtin.mock/packages/mixedversions/package.py index 6e01fbc13b..8e6183a345 100644 --- a/var/spack/repos/builtin.mock/packages/mixedversions/package.py +++ b/var/spack/repos/builtin.mock/packages/mixedversions/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/mpich/package.py b/var/spack/repos/builtin.mock/packages/mpich/package.py index f9dbf572c5..9c14024c4d 100644 --- a/var/spack/repos/builtin.mock/packages/mpich/package.py +++ b/var/spack/repos/builtin.mock/packages/mpich/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/mpich2/package.py b/var/spack/repos/builtin.mock/packages/mpich2/package.py index 92e72daa4a..c0c8ee3b05 100644 --- a/var/spack/repos/builtin.mock/packages/mpich2/package.py +++ b/var/spack/repos/builtin.mock/packages/mpich2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/mpileaks/package.py b/var/spack/repos/builtin.mock/packages/mpileaks/package.py index 6b5afafdb2..405c069e54 100644 --- a/var/spack/repos/builtin.mock/packages/mpileaks/package.py +++ b/var/spack/repos/builtin.mock/packages/mpileaks/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/multi-provider-mpi/package.py b/var/spack/repos/builtin.mock/packages/multi-provider-mpi/package.py index 9240671ba2..8ebebccf56 100644 --- a/var/spack/repos/builtin.mock/packages/multi-provider-mpi/package.py +++ b/var/spack/repos/builtin.mock/packages/multi-provider-mpi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/multimethod-base/package.py b/var/spack/repos/builtin.mock/packages/multimethod-base/package.py index 454f658adf..27499b4865 100644 --- a/var/spack/repos/builtin.mock/packages/multimethod-base/package.py +++ b/var/spack/repos/builtin.mock/packages/multimethod-base/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/multimethod/package.py b/var/spack/repos/builtin.mock/packages/multimethod/package.py index 25a7ec7fca..6f01888e59 100644 --- a/var/spack/repos/builtin.mock/packages/multimethod/package.py +++ b/var/spack/repos/builtin.mock/packages/multimethod/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/multivalue_variant/package.py b/var/spack/repos/builtin.mock/packages/multivalue_variant/package.py index 0d27e31e44..6122d04718 100644 --- a/var/spack/repos/builtin.mock/packages/multivalue_variant/package.py +++ b/var/spack/repos/builtin.mock/packages/multivalue_variant/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/netlib-blas/package.py b/var/spack/repos/builtin.mock/packages/netlib-blas/package.py index 48c99ba9d6..952a6dd0d7 100644 --- a/var/spack/repos/builtin.mock/packages/netlib-blas/package.py +++ b/var/spack/repos/builtin.mock/packages/netlib-blas/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/netlib-lapack/package.py b/var/spack/repos/builtin.mock/packages/netlib-lapack/package.py index 9108e70cf0..fade988cdd 100644 --- a/var/spack/repos/builtin.mock/packages/netlib-lapack/package.py +++ b/var/spack/repos/builtin.mock/packages/netlib-lapack/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/openblas-with-lapack/package.py b/var/spack/repos/builtin.mock/packages/openblas-with-lapack/package.py index c73e65ac2b..a3cb7d3bd9 100644 --- a/var/spack/repos/builtin.mock/packages/openblas-with-lapack/package.py +++ b/var/spack/repos/builtin.mock/packages/openblas-with-lapack/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/openblas/package.py b/var/spack/repos/builtin.mock/packages/openblas/package.py index 8d41c8958a..4ff749fa38 100644 --- a/var/spack/repos/builtin.mock/packages/openblas/package.py +++ b/var/spack/repos/builtin.mock/packages/openblas/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/optional-dep-test-2/package.py b/var/spack/repos/builtin.mock/packages/optional-dep-test-2/package.py index 51bbb9761f..2d87fe25da 100644 --- a/var/spack/repos/builtin.mock/packages/optional-dep-test-2/package.py +++ b/var/spack/repos/builtin.mock/packages/optional-dep-test-2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/optional-dep-test-3/package.py b/var/spack/repos/builtin.mock/packages/optional-dep-test-3/package.py index 48bf3820af..cd7c0f17af 100644 --- a/var/spack/repos/builtin.mock/packages/optional-dep-test-3/package.py +++ b/var/spack/repos/builtin.mock/packages/optional-dep-test-3/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/optional-dep-test/package.py b/var/spack/repos/builtin.mock/packages/optional-dep-test/package.py index 48ffbf6765..ffff5e7dfb 100644 --- a/var/spack/repos/builtin.mock/packages/optional-dep-test/package.py +++ b/var/spack/repos/builtin.mock/packages/optional-dep-test/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/othervirtual/package.py b/var/spack/repos/builtin.mock/packages/othervirtual/package.py index c7b0e72a01..6c0e66cf31 100644 --- a/var/spack/repos/builtin.mock/packages/othervirtual/package.py +++ b/var/spack/repos/builtin.mock/packages/othervirtual/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/override-context-templates/package.py b/var/spack/repos/builtin.mock/packages/override-context-templates/package.py index 9f59ad0e7e..a5cfb383b8 100644 --- a/var/spack/repos/builtin.mock/packages/override-context-templates/package.py +++ b/var/spack/repos/builtin.mock/packages/override-context-templates/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/override-module-templates/package.py b/var/spack/repos/builtin.mock/packages/override-module-templates/package.py index 6d877c7a76..50fb201fe4 100644 --- a/var/spack/repos/builtin.mock/packages/override-module-templates/package.py +++ b/var/spack/repos/builtin.mock/packages/override-module-templates/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py b/var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py index fea0b27195..8d43739d07 100644 --- a/var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py +++ b/var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/patch-several-dependencies/package.py b/var/spack/repos/builtin.mock/packages/patch-several-dependencies/package.py index 73837449c6..db902ebf4c 100644 --- a/var/spack/repos/builtin.mock/packages/patch-several-dependencies/package.py +++ b/var/spack/repos/builtin.mock/packages/patch-several-dependencies/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/patch/package.py b/var/spack/repos/builtin.mock/packages/patch/package.py index 79b0943b24..f4722e22e4 100644 --- a/var/spack/repos/builtin.mock/packages/patch/package.py +++ b/var/spack/repos/builtin.mock/packages/patch/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/patchelf/package.py b/var/spack/repos/builtin.mock/packages/patchelf/package.py index d499199d3e..5bf76d3e20 100644 --- a/var/spack/repos/builtin.mock/packages/patchelf/package.py +++ b/var/spack/repos/builtin.mock/packages/patchelf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/printing-package/package.py b/var/spack/repos/builtin.mock/packages/printing-package/package.py index 815972f9eb..74d6157138 100644 --- a/var/spack/repos/builtin.mock/packages/printing-package/package.py +++ b/var/spack/repos/builtin.mock/packages/printing-package/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/python/package.py b/var/spack/repos/builtin.mock/packages/python/package.py index f402be3b56..1c67350e97 100644 --- a/var/spack/repos/builtin.mock/packages/python/package.py +++ b/var/spack/repos/builtin.mock/packages/python/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/raiser/package.py b/var/spack/repos/builtin.mock/packages/raiser/package.py index bd8982e68d..02cd491f17 100644 --- a/var/spack/repos/builtin.mock/packages/raiser/package.py +++ b/var/spack/repos/builtin.mock/packages/raiser/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent/package.py b/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent/package.py index 60530e8202..788c6b02a2 100644 --- a/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent/package.py +++ b/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/svn-test/package.py b/var/spack/repos/builtin.mock/packages/svn-test/package.py index 1c4424dab5..f31bd269ea 100644 --- a/var/spack/repos/builtin.mock/packages/svn-test/package.py +++ b/var/spack/repos/builtin.mock/packages/svn-test/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/trivial-install-test-package/package.py b/var/spack/repos/builtin.mock/packages/trivial-install-test-package/package.py index eadba7064c..8ab5ad6560 100644 --- a/var/spack/repos/builtin.mock/packages/trivial-install-test-package/package.py +++ b/var/spack/repos/builtin.mock/packages/trivial-install-test-package/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/url-list-test/package.py b/var/spack/repos/builtin.mock/packages/url-list-test/package.py index e77d203707..75377873b7 100644 --- a/var/spack/repos/builtin.mock/packages/url-list-test/package.py +++ b/var/spack/repos/builtin.mock/packages/url-list-test/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/url-test/package.py b/var/spack/repos/builtin.mock/packages/url-test/package.py index 113dc0714b..f0b686ab8b 100644 --- a/var/spack/repos/builtin.mock/packages/url-test/package.py +++ b/var/spack/repos/builtin.mock/packages/url-test/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin.mock/packages/zmpi/package.py b/var/spack/repos/builtin.mock/packages/zmpi/package.py index 99a750afc1..52f6d11272 100644 --- a/var/spack/repos/builtin.mock/packages/zmpi/package.py +++ b/var/spack/repos/builtin.mock/packages/zmpi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/abinit/package.py b/var/spack/repos/builtin/packages/abinit/package.py index 2769118593..5fe87fc9b1 100644 --- a/var/spack/repos/builtin/packages/abinit/package.py +++ b/var/spack/repos/builtin/packages/abinit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/abyss/package.py b/var/spack/repos/builtin/packages/abyss/package.py index 29b8d424a2..bf171debce 100644 --- a/var/spack/repos/builtin/packages/abyss/package.py +++ b/var/spack/repos/builtin/packages/abyss/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/accfft/package.py b/var/spack/repos/builtin/packages/accfft/package.py index ff13660ffa..5ed7b7c61e 100644 --- a/var/spack/repos/builtin/packages/accfft/package.py +++ b/var/spack/repos/builtin/packages/accfft/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ack/package.py b/var/spack/repos/builtin/packages/ack/package.py index b532ce2414..e07cd0da73 100644 --- a/var/spack/repos/builtin/packages/ack/package.py +++ b/var/spack/repos/builtin/packages/ack/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/activeharmony/package.py b/var/spack/repos/builtin/packages/activeharmony/package.py index d03d3f99eb..3867810b2c 100644 --- a/var/spack/repos/builtin/packages/activeharmony/package.py +++ b/var/spack/repos/builtin/packages/activeharmony/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/adept-utils/package.py b/var/spack/repos/builtin/packages/adept-utils/package.py index 3f704a4893..4aa1197c1f 100644 --- a/var/spack/repos/builtin/packages/adept-utils/package.py +++ b/var/spack/repos/builtin/packages/adept-utils/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/adios/package.py b/var/spack/repos/builtin/packages/adios/package.py index 2efb487ac2..b56505af73 100644 --- a/var/spack/repos/builtin/packages/adios/package.py +++ b/var/spack/repos/builtin/packages/adios/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/adios2/package.py b/var/spack/repos/builtin/packages/adios2/package.py index 07edb5cd42..52a598e2be 100644 --- a/var/spack/repos/builtin/packages/adios2/package.py +++ b/var/spack/repos/builtin/packages/adios2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/adlbx/package.py b/var/spack/repos/builtin/packages/adlbx/package.py index dfe6dffb03..fbbde8a996 100644 --- a/var/spack/repos/builtin/packages/adlbx/package.py +++ b/var/spack/repos/builtin/packages/adlbx/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/adol-c/package.py b/var/spack/repos/builtin/packages/adol-c/package.py index 953cade297..dd173795dd 100644 --- a/var/spack/repos/builtin/packages/adol-c/package.py +++ b/var/spack/repos/builtin/packages/adol-c/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/albert/package.py b/var/spack/repos/builtin/packages/albert/package.py index d720f04650..7b80ea0561 100644 --- a/var/spack/repos/builtin/packages/albert/package.py +++ b/var/spack/repos/builtin/packages/albert/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/alglib/package.py b/var/spack/repos/builtin/packages/alglib/package.py index c6b0c5d85f..f5fa8f32fd 100644 --- a/var/spack/repos/builtin/packages/alglib/package.py +++ b/var/spack/repos/builtin/packages/alglib/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/allinea-forge/package.py b/var/spack/repos/builtin/packages/allinea-forge/package.py index a4a821737d..715795bec0 100644 --- a/var/spack/repos/builtin/packages/allinea-forge/package.py +++ b/var/spack/repos/builtin/packages/allinea-forge/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/allinea-reports/package.py b/var/spack/repos/builtin/packages/allinea-reports/package.py index 69c881c369..4a0c266411 100644 --- a/var/spack/repos/builtin/packages/allinea-reports/package.py +++ b/var/spack/repos/builtin/packages/allinea-reports/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/allpaths-lg/package.py b/var/spack/repos/builtin/packages/allpaths-lg/package.py index 69731045aa..a0824698c0 100644 --- a/var/spack/repos/builtin/packages/allpaths-lg/package.py +++ b/var/spack/repos/builtin/packages/allpaths-lg/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/alquimia/package.py b/var/spack/repos/builtin/packages/alquimia/package.py index 55b1a8642a..e579e8bbfe 100644 --- a/var/spack/repos/builtin/packages/alquimia/package.py +++ b/var/spack/repos/builtin/packages/alquimia/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/alsa-lib/package.py b/var/spack/repos/builtin/packages/alsa-lib/package.py index 8e469e9ae7..bb67b893bc 100644 --- a/var/spack/repos/builtin/packages/alsa-lib/package.py +++ b/var/spack/repos/builtin/packages/alsa-lib/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/amg/package.py b/var/spack/repos/builtin/packages/amg/package.py index 5167347dc9..f8a7c2745d 100644 --- a/var/spack/repos/builtin/packages/amg/package.py +++ b/var/spack/repos/builtin/packages/amg/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/amg2013/package.py b/var/spack/repos/builtin/packages/amg2013/package.py index 43e9277805..0475c2bc0a 100644 --- a/var/spack/repos/builtin/packages/amg2013/package.py +++ b/var/spack/repos/builtin/packages/amg2013/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/amp/package.py b/var/spack/repos/builtin/packages/amp/package.py index d855e250ed..0e232e6a50 100644 --- a/var/spack/repos/builtin/packages/amp/package.py +++ b/var/spack/repos/builtin/packages/amp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ampliconnoise/package.py b/var/spack/repos/builtin/packages/ampliconnoise/package.py index 626ac16678..cbdf8ea419 100644 --- a/var/spack/repos/builtin/packages/ampliconnoise/package.py +++ b/var/spack/repos/builtin/packages/ampliconnoise/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/amrex/package.py b/var/spack/repos/builtin/packages/amrex/package.py index 89533db2e6..7521e8411f 100644 --- a/var/spack/repos/builtin/packages/amrex/package.py +++ b/var/spack/repos/builtin/packages/amrex/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/andi/package.py b/var/spack/repos/builtin/packages/andi/package.py index 44c2644507..58b4bdea4c 100644 --- a/var/spack/repos/builtin/packages/andi/package.py +++ b/var/spack/repos/builtin/packages/andi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/angsd/package.py b/var/spack/repos/builtin/packages/angsd/package.py index 427deb2d5e..dcb518d97f 100644 --- a/var/spack/repos/builtin/packages/angsd/package.py +++ b/var/spack/repos/builtin/packages/angsd/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ant/package.py b/var/spack/repos/builtin/packages/ant/package.py index 82478c481d..1b6ef1f8f2 100644 --- a/var/spack/repos/builtin/packages/ant/package.py +++ b/var/spack/repos/builtin/packages/ant/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/antlr/package.py b/var/spack/repos/builtin/packages/antlr/package.py index 50324dd82c..706adda2e3 100644 --- a/var/spack/repos/builtin/packages/antlr/package.py +++ b/var/spack/repos/builtin/packages/antlr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ape/package.py b/var/spack/repos/builtin/packages/ape/package.py index dd24c84e5e..5a76fb4434 100644 --- a/var/spack/repos/builtin/packages/ape/package.py +++ b/var/spack/repos/builtin/packages/ape/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/apex/package.py b/var/spack/repos/builtin/packages/apex/package.py index 50f74f6220..77d6c28f7f 100644 --- a/var/spack/repos/builtin/packages/apex/package.py +++ b/var/spack/repos/builtin/packages/apex/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/applewmproto/package.py b/var/spack/repos/builtin/packages/applewmproto/package.py index d610805884..63d40e1fff 100644 --- a/var/spack/repos/builtin/packages/applewmproto/package.py +++ b/var/spack/repos/builtin/packages/applewmproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/appres/package.py b/var/spack/repos/builtin/packages/appres/package.py index 9a6b7bb795..72ebd30028 100644 --- a/var/spack/repos/builtin/packages/appres/package.py +++ b/var/spack/repos/builtin/packages/appres/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/apr-util/package.py b/var/spack/repos/builtin/packages/apr-util/package.py index 1b68584530..7808ad2e20 100644 --- a/var/spack/repos/builtin/packages/apr-util/package.py +++ b/var/spack/repos/builtin/packages/apr-util/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/apr/package.py b/var/spack/repos/builtin/packages/apr/package.py index f78b229229..033c3c8155 100644 --- a/var/spack/repos/builtin/packages/apr/package.py +++ b/var/spack/repos/builtin/packages/apr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/archer/package.py b/var/spack/repos/builtin/packages/archer/package.py index 87ced1051a..7a4675adf5 100644 --- a/var/spack/repos/builtin/packages/archer/package.py +++ b/var/spack/repos/builtin/packages/archer/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/argp-standalone/package.py b/var/spack/repos/builtin/packages/argp-standalone/package.py index c17b6ee9e9..cb115e8569 100644 --- a/var/spack/repos/builtin/packages/argp-standalone/package.py +++ b/var/spack/repos/builtin/packages/argp-standalone/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/argtable/package.py b/var/spack/repos/builtin/packages/argtable/package.py index f622e29837..655b48346a 100644 --- a/var/spack/repos/builtin/packages/argtable/package.py +++ b/var/spack/repos/builtin/packages/argtable/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/arlecore/package.py b/var/spack/repos/builtin/packages/arlecore/package.py index 69de30423d..97d152d28c 100644 --- a/var/spack/repos/builtin/packages/arlecore/package.py +++ b/var/spack/repos/builtin/packages/arlecore/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/armadillo/package.py b/var/spack/repos/builtin/packages/armadillo/package.py index 2037f552d8..76fa2a9dbc 100644 --- a/var/spack/repos/builtin/packages/armadillo/package.py +++ b/var/spack/repos/builtin/packages/armadillo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/arpack-ng/package.py b/var/spack/repos/builtin/packages/arpack-ng/package.py index f64323e10c..d4e62714a1 100644 --- a/var/spack/repos/builtin/packages/arpack-ng/package.py +++ b/var/spack/repos/builtin/packages/arpack-ng/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ascent/package.py b/var/spack/repos/builtin/packages/ascent/package.py index 9cf1f4a7a5..22a3da578b 100644 --- a/var/spack/repos/builtin/packages/ascent/package.py +++ b/var/spack/repos/builtin/packages/ascent/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/asciidoc/package.py b/var/spack/repos/builtin/packages/asciidoc/package.py index 885fc02404..c923c77001 100644 --- a/var/spack/repos/builtin/packages/asciidoc/package.py +++ b/var/spack/repos/builtin/packages/asciidoc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/aspa/package.py b/var/spack/repos/builtin/packages/aspa/package.py index 3686ffe4ea..69ec2c0d1f 100644 --- a/var/spack/repos/builtin/packages/aspa/package.py +++ b/var/spack/repos/builtin/packages/aspa/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/aspcud/package.py b/var/spack/repos/builtin/packages/aspcud/package.py index 89f32c1a31..54ab326c9f 100644 --- a/var/spack/repos/builtin/packages/aspcud/package.py +++ b/var/spack/repos/builtin/packages/aspcud/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/aspell/package.py b/var/spack/repos/builtin/packages/aspell/package.py index c24a50ef39..9038c7d0cf 100644 --- a/var/spack/repos/builtin/packages/aspell/package.py +++ b/var/spack/repos/builtin/packages/aspell/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/aspell6-de/package.py b/var/spack/repos/builtin/packages/aspell6-de/package.py index 5a4b1c82d8..0ce4d045a1 100644 --- a/var/spack/repos/builtin/packages/aspell6-de/package.py +++ b/var/spack/repos/builtin/packages/aspell6-de/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/aspell6-en/package.py b/var/spack/repos/builtin/packages/aspell6-en/package.py index 38d6caeabd..f5502ed40e 100644 --- a/var/spack/repos/builtin/packages/aspell6-en/package.py +++ b/var/spack/repos/builtin/packages/aspell6-en/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/aspell6-es/package.py b/var/spack/repos/builtin/packages/aspell6-es/package.py index 84a798d41a..8005f34694 100644 --- a/var/spack/repos/builtin/packages/aspell6-es/package.py +++ b/var/spack/repos/builtin/packages/aspell6-es/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/assimp/package.py b/var/spack/repos/builtin/packages/assimp/package.py index dd9b414772..e365e83e72 100644 --- a/var/spack/repos/builtin/packages/assimp/package.py +++ b/var/spack/repos/builtin/packages/assimp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/astra/package.py b/var/spack/repos/builtin/packages/astra/package.py index 694a394c69..155199174e 100644 --- a/var/spack/repos/builtin/packages/astra/package.py +++ b/var/spack/repos/builtin/packages/astra/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/astral/package.py b/var/spack/repos/builtin/packages/astral/package.py index 5670599cd7..47d8667f9e 100644 --- a/var/spack/repos/builtin/packages/astral/package.py +++ b/var/spack/repos/builtin/packages/astral/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/astyle/package.py b/var/spack/repos/builtin/packages/astyle/package.py index a9e4e37f33..d3c8bb72cf 100644 --- a/var/spack/repos/builtin/packages/astyle/package.py +++ b/var/spack/repos/builtin/packages/astyle/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/atk/package.py b/var/spack/repos/builtin/packages/atk/package.py index 3b37d740a8..6a1b4b25d6 100644 --- a/var/spack/repos/builtin/packages/atk/package.py +++ b/var/spack/repos/builtin/packages/atk/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/atlas/package.py b/var/spack/repos/builtin/packages/atlas/package.py index e3257e6dc2..2db36f8304 100644 --- a/var/spack/repos/builtin/packages/atlas/package.py +++ b/var/spack/repos/builtin/packages/atlas/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/atom-dft/package.py b/var/spack/repos/builtin/packages/atom-dft/package.py index d6e8d5ab15..d16d3283dc 100644 --- a/var/spack/repos/builtin/packages/atom-dft/package.py +++ b/var/spack/repos/builtin/packages/atom-dft/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/atompaw/package.py b/var/spack/repos/builtin/packages/atompaw/package.py index c86a5c5de5..e20dacd5cc 100644 --- a/var/spack/repos/builtin/packages/atompaw/package.py +++ b/var/spack/repos/builtin/packages/atompaw/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/atop/package.py b/var/spack/repos/builtin/packages/atop/package.py index 6c59ee4dbe..a40ec1da5d 100644 --- a/var/spack/repos/builtin/packages/atop/package.py +++ b/var/spack/repos/builtin/packages/atop/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/augustus/package.py b/var/spack/repos/builtin/packages/augustus/package.py index 59893e532b..ef6e3d042a 100644 --- a/var/spack/repos/builtin/packages/augustus/package.py +++ b/var/spack/repos/builtin/packages/augustus/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/autoconf/package.py b/var/spack/repos/builtin/packages/autoconf/package.py index 358131d91b..402f7e9767 100644 --- a/var/spack/repos/builtin/packages/autoconf/package.py +++ b/var/spack/repos/builtin/packages/autoconf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/autodock-vina/package.py b/var/spack/repos/builtin/packages/autodock-vina/package.py index 255839e894..c34376bac1 100644 --- a/var/spack/repos/builtin/packages/autodock-vina/package.py +++ b/var/spack/repos/builtin/packages/autodock-vina/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/autogen/package.py b/var/spack/repos/builtin/packages/autogen/package.py index 8851dc9dec..d7f70fdb4c 100644 --- a/var/spack/repos/builtin/packages/autogen/package.py +++ b/var/spack/repos/builtin/packages/autogen/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/automaded/package.py b/var/spack/repos/builtin/packages/automaded/package.py index 7b227afb9d..774122de2c 100644 --- a/var/spack/repos/builtin/packages/automaded/package.py +++ b/var/spack/repos/builtin/packages/automaded/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/automake/package.py b/var/spack/repos/builtin/packages/automake/package.py index 2140612b7f..8121626f5c 100644 --- a/var/spack/repos/builtin/packages/automake/package.py +++ b/var/spack/repos/builtin/packages/automake/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bamtools/package.py b/var/spack/repos/builtin/packages/bamtools/package.py index fc40938990..5e025af911 100644 --- a/var/spack/repos/builtin/packages/bamtools/package.py +++ b/var/spack/repos/builtin/packages/bamtools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bamutil/package.py b/var/spack/repos/builtin/packages/bamutil/package.py index eb9b8da878..f85b3a47d8 100644 --- a/var/spack/repos/builtin/packages/bamutil/package.py +++ b/var/spack/repos/builtin/packages/bamutil/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/barrnap/package.py b/var/spack/repos/builtin/packages/barrnap/package.py index 5ba0f9debb..c35d6065e2 100644 --- a/var/spack/repos/builtin/packages/barrnap/package.py +++ b/var/spack/repos/builtin/packages/barrnap/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bash-completion/package.py b/var/spack/repos/builtin/packages/bash-completion/package.py index 350cd4df05..ff860baf77 100644 --- a/var/spack/repos/builtin/packages/bash-completion/package.py +++ b/var/spack/repos/builtin/packages/bash-completion/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bash/package.py b/var/spack/repos/builtin/packages/bash/package.py index dfaf7d4654..3839314ca8 100644 --- a/var/spack/repos/builtin/packages/bash/package.py +++ b/var/spack/repos/builtin/packages/bash/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bats/package.py b/var/spack/repos/builtin/packages/bats/package.py index 4ee05c5a1c..a16f3cae31 100644 --- a/var/spack/repos/builtin/packages/bats/package.py +++ b/var/spack/repos/builtin/packages/bats/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bbcp/package.py b/var/spack/repos/builtin/packages/bbcp/package.py index f72b4fcb12..7c05e7d4b9 100644 --- a/var/spack/repos/builtin/packages/bbcp/package.py +++ b/var/spack/repos/builtin/packages/bbcp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bbmap/package.py b/var/spack/repos/builtin/packages/bbmap/package.py index 15d7d880c3..f32cd0606d 100644 --- a/var/spack/repos/builtin/packages/bbmap/package.py +++ b/var/spack/repos/builtin/packages/bbmap/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bc/package.py b/var/spack/repos/builtin/packages/bc/package.py index 9b6dfa6506..835a535e40 100644 --- a/var/spack/repos/builtin/packages/bc/package.py +++ b/var/spack/repos/builtin/packages/bc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bcftools/package.py b/var/spack/repos/builtin/packages/bcftools/package.py index 353b574ff9..08a2b37896 100644 --- a/var/spack/repos/builtin/packages/bcftools/package.py +++ b/var/spack/repos/builtin/packages/bcftools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bcl2fastq2/package.py b/var/spack/repos/builtin/packages/bcl2fastq2/package.py index 173bb050ff..5655a8462b 100644 --- a/var/spack/repos/builtin/packages/bcl2fastq2/package.py +++ b/var/spack/repos/builtin/packages/bcl2fastq2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bdftopcf/package.py b/var/spack/repos/builtin/packages/bdftopcf/package.py index e02e64f71c..382da41b04 100644 --- a/var/spack/repos/builtin/packages/bdftopcf/package.py +++ b/var/spack/repos/builtin/packages/bdftopcf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bdw-gc/package.py b/var/spack/repos/builtin/packages/bdw-gc/package.py index 7971dae506..d33dd46509 100644 --- a/var/spack/repos/builtin/packages/bdw-gc/package.py +++ b/var/spack/repos/builtin/packages/bdw-gc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bear/package.py b/var/spack/repos/builtin/packages/bear/package.py index f3f46b1025..e5ad5fd739 100644 --- a/var/spack/repos/builtin/packages/bear/package.py +++ b/var/spack/repos/builtin/packages/bear/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/beast1/package.py b/var/spack/repos/builtin/packages/beast1/package.py index 4d04d28c03..3d5797ad0c 100644 --- a/var/spack/repos/builtin/packages/beast1/package.py +++ b/var/spack/repos/builtin/packages/beast1/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/beast2/package.py b/var/spack/repos/builtin/packages/beast2/package.py index 88066116a2..3590547092 100644 --- a/var/spack/repos/builtin/packages/beast2/package.py +++ b/var/spack/repos/builtin/packages/beast2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bedtools2/package.py b/var/spack/repos/builtin/packages/bedtools2/package.py index f6a921dc43..17cecd699d 100644 --- a/var/spack/repos/builtin/packages/bedtools2/package.py +++ b/var/spack/repos/builtin/packages/bedtools2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/beforelight/package.py b/var/spack/repos/builtin/packages/beforelight/package.py index 2da9d6429a..eb652c3245 100644 --- a/var/spack/repos/builtin/packages/beforelight/package.py +++ b/var/spack/repos/builtin/packages/beforelight/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/benchmark/package.py b/var/spack/repos/builtin/packages/benchmark/package.py index 8c4dc6ec1f..6099a6e866 100644 --- a/var/spack/repos/builtin/packages/benchmark/package.py +++ b/var/spack/repos/builtin/packages/benchmark/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bertini/package.py b/var/spack/repos/builtin/packages/bertini/package.py index dc3e746eae..09886c7bb3 100644 --- a/var/spack/repos/builtin/packages/bertini/package.py +++ b/var/spack/repos/builtin/packages/bertini/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bib2xhtml/package.py b/var/spack/repos/builtin/packages/bib2xhtml/package.py index 3c9bab772e..d3f0498f82 100644 --- a/var/spack/repos/builtin/packages/bib2xhtml/package.py +++ b/var/spack/repos/builtin/packages/bib2xhtml/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bigreqsproto/package.py b/var/spack/repos/builtin/packages/bigreqsproto/package.py index 502dabfd32..3cfe9a13e5 100644 --- a/var/spack/repos/builtin/packages/bigreqsproto/package.py +++ b/var/spack/repos/builtin/packages/bigreqsproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/binutils/package.py b/var/spack/repos/builtin/packages/binutils/package.py index 8d6777daf3..cd9f7fc74c 100644 --- a/var/spack/repos/builtin/packages/binutils/package.py +++ b/var/spack/repos/builtin/packages/binutils/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bioawk/package.py b/var/spack/repos/builtin/packages/bioawk/package.py index 386aa16953..ae43dff5f5 100644 --- a/var/spack/repos/builtin/packages/bioawk/package.py +++ b/var/spack/repos/builtin/packages/bioawk/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/biopieces/package.py b/var/spack/repos/builtin/packages/biopieces/package.py index f461b80764..b8337713f0 100644 --- a/var/spack/repos/builtin/packages/biopieces/package.py +++ b/var/spack/repos/builtin/packages/biopieces/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bison/package.py b/var/spack/repos/builtin/packages/bison/package.py index 1cc2aacfaf..ac920b96aa 100644 --- a/var/spack/repos/builtin/packages/bison/package.py +++ b/var/spack/repos/builtin/packages/bison/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bitmap/package.py b/var/spack/repos/builtin/packages/bitmap/package.py index caa64480f4..46d64b2fed 100644 --- a/var/spack/repos/builtin/packages/bitmap/package.py +++ b/var/spack/repos/builtin/packages/bitmap/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/blast-plus/package.py b/var/spack/repos/builtin/packages/blast-plus/package.py index 073eab24d1..8e973f6124 100644 --- a/var/spack/repos/builtin/packages/blast-plus/package.py +++ b/var/spack/repos/builtin/packages/blast-plus/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/blat/package.py b/var/spack/repos/builtin/packages/blat/package.py index 60a33bbdff..46d40d75a4 100644 --- a/var/spack/repos/builtin/packages/blat/package.py +++ b/var/spack/repos/builtin/packages/blat/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/blaze/package.py b/var/spack/repos/builtin/packages/blaze/package.py index 2f175ff7d5..d43f0523d6 100644 --- a/var/spack/repos/builtin/packages/blaze/package.py +++ b/var/spack/repos/builtin/packages/blaze/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bliss/package.py b/var/spack/repos/builtin/packages/bliss/package.py index 6604c2dc9a..7e9091aacd 100644 --- a/var/spack/repos/builtin/packages/bliss/package.py +++ b/var/spack/repos/builtin/packages/bliss/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/blitz/package.py b/var/spack/repos/builtin/packages/blitz/package.py index 7aa9c45aaf..184262fa25 100644 --- a/var/spack/repos/builtin/packages/blitz/package.py +++ b/var/spack/repos/builtin/packages/blitz/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bmake/package.py b/var/spack/repos/builtin/packages/bmake/package.py index 55afa005b1..c590c6143a 100644 --- a/var/spack/repos/builtin/packages/bmake/package.py +++ b/var/spack/repos/builtin/packages/bmake/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bohrium/package.py b/var/spack/repos/builtin/packages/bohrium/package.py index 91551e72c5..0fcca3d7f6 100644 --- a/var/spack/repos/builtin/packages/bohrium/package.py +++ b/var/spack/repos/builtin/packages/bohrium/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index 869c08deb7..b34b3e5a7f 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bowtie/package.py b/var/spack/repos/builtin/packages/bowtie/package.py index 8958352bd1..1b47a2372c 100644 --- a/var/spack/repos/builtin/packages/bowtie/package.py +++ b/var/spack/repos/builtin/packages/bowtie/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bowtie2/package.py b/var/spack/repos/builtin/packages/bowtie2/package.py index 084d2701b4..ab5be0ce79 100644 --- a/var/spack/repos/builtin/packages/bowtie2/package.py +++ b/var/spack/repos/builtin/packages/bowtie2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/boxlib/package.py b/var/spack/repos/builtin/packages/boxlib/package.py index 833a027c29..3dff87517f 100644 --- a/var/spack/repos/builtin/packages/boxlib/package.py +++ b/var/spack/repos/builtin/packages/boxlib/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bpp-core/package.py b/var/spack/repos/builtin/packages/bpp-core/package.py index 96a775cb60..3ab12d493d 100644 --- a/var/spack/repos/builtin/packages/bpp-core/package.py +++ b/var/spack/repos/builtin/packages/bpp-core/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bpp-phyl/package.py b/var/spack/repos/builtin/packages/bpp-phyl/package.py index 3453f85a9d..bd177f12d5 100644 --- a/var/spack/repos/builtin/packages/bpp-phyl/package.py +++ b/var/spack/repos/builtin/packages/bpp-phyl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bpp-seq/package.py b/var/spack/repos/builtin/packages/bpp-seq/package.py index bd3219523f..2dda0afc61 100644 --- a/var/spack/repos/builtin/packages/bpp-seq/package.py +++ b/var/spack/repos/builtin/packages/bpp-seq/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bpp-suite/package.py b/var/spack/repos/builtin/packages/bpp-suite/package.py index 13fc341cfa..38edcb4a6b 100644 --- a/var/spack/repos/builtin/packages/bpp-suite/package.py +++ b/var/spack/repos/builtin/packages/bpp-suite/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bracken/package.py b/var/spack/repos/builtin/packages/bracken/package.py index 50efea40c8..4dc82b4737 100644 --- a/var/spack/repos/builtin/packages/bracken/package.py +++ b/var/spack/repos/builtin/packages/bracken/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/braker/package.py b/var/spack/repos/builtin/packages/braker/package.py index 8fc651ce5f..c9f5e2f611 100644 --- a/var/spack/repos/builtin/packages/braker/package.py +++ b/var/spack/repos/builtin/packages/braker/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/breakdancer/package.py b/var/spack/repos/builtin/packages/breakdancer/package.py index 4d8a2b80ca..2396bf5354 100644 --- a/var/spack/repos/builtin/packages/breakdancer/package.py +++ b/var/spack/repos/builtin/packages/breakdancer/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/breseq/package.py b/var/spack/repos/builtin/packages/breseq/package.py index d0b8c43706..a0ddfd3038 100644 --- a/var/spack/repos/builtin/packages/breseq/package.py +++ b/var/spack/repos/builtin/packages/breseq/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/brigand/package.py b/var/spack/repos/builtin/packages/brigand/package.py index 4c946d4f66..2431de57e1 100644 --- a/var/spack/repos/builtin/packages/brigand/package.py +++ b/var/spack/repos/builtin/packages/brigand/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bsseeker2/package.py b/var/spack/repos/builtin/packages/bsseeker2/package.py index 48b2fc1e6f..bbf24b9676 100644 --- a/var/spack/repos/builtin/packages/bsseeker2/package.py +++ b/var/spack/repos/builtin/packages/bsseeker2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bucky/package.py b/var/spack/repos/builtin/packages/bucky/package.py index eeac2ab2b6..fba78ff942 100644 --- a/var/spack/repos/builtin/packages/bucky/package.py +++ b/var/spack/repos/builtin/packages/bucky/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/busco/package.py b/var/spack/repos/builtin/packages/busco/package.py index 2b50abb40a..ca4220f29d 100644 --- a/var/spack/repos/builtin/packages/busco/package.py +++ b/var/spack/repos/builtin/packages/busco/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/butter/package.py b/var/spack/repos/builtin/packages/butter/package.py index 602f68c5b5..a989538d93 100644 --- a/var/spack/repos/builtin/packages/butter/package.py +++ b/var/spack/repos/builtin/packages/butter/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bwa/package.py b/var/spack/repos/builtin/packages/bwa/package.py index 7730a7b98e..ffbab1fedf 100644 --- a/var/spack/repos/builtin/packages/bwa/package.py +++ b/var/spack/repos/builtin/packages/bwa/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/byobu/package.py b/var/spack/repos/builtin/packages/byobu/package.py index 90f91db9e3..a32886ca7d 100644 --- a/var/spack/repos/builtin/packages/byobu/package.py +++ b/var/spack/repos/builtin/packages/byobu/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/bzip2/package.py b/var/spack/repos/builtin/packages/bzip2/package.py index d9b81324e5..c2d574152c 100644 --- a/var/spack/repos/builtin/packages/bzip2/package.py +++ b/var/spack/repos/builtin/packages/bzip2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/c-blosc/package.py b/var/spack/repos/builtin/packages/c-blosc/package.py index 51c2f6d3ce..e852a125c8 100644 --- a/var/spack/repos/builtin/packages/c-blosc/package.py +++ b/var/spack/repos/builtin/packages/c-blosc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/caffe/package.py b/var/spack/repos/builtin/packages/caffe/package.py index 730b293adb..489bc537cb 100644 --- a/var/spack/repos/builtin/packages/caffe/package.py +++ b/var/spack/repos/builtin/packages/caffe/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cairo/package.py b/var/spack/repos/builtin/packages/cairo/package.py index 0ced1e221e..2c4411f0b0 100644 --- a/var/spack/repos/builtin/packages/cairo/package.py +++ b/var/spack/repos/builtin/packages/cairo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/caliper/package.py b/var/spack/repos/builtin/packages/caliper/package.py index 540f31a44b..07528a2ca8 100644 --- a/var/spack/repos/builtin/packages/caliper/package.py +++ b/var/spack/repos/builtin/packages/caliper/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/callpath/package.py b/var/spack/repos/builtin/packages/callpath/package.py index a9cb2bf420..d5aa47fdea 100644 --- a/var/spack/repos/builtin/packages/callpath/package.py +++ b/var/spack/repos/builtin/packages/callpath/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cantera/package.py b/var/spack/repos/builtin/packages/cantera/package.py index 03dece3af8..f3d6047893 100644 --- a/var/spack/repos/builtin/packages/cantera/package.py +++ b/var/spack/repos/builtin/packages/cantera/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/canu/package.py b/var/spack/repos/builtin/packages/canu/package.py index 171dc49f97..441ce1db22 100644 --- a/var/spack/repos/builtin/packages/canu/package.py +++ b/var/spack/repos/builtin/packages/canu/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cap3/package.py b/var/spack/repos/builtin/packages/cap3/package.py index 13568b40cd..37c0aad378 100644 --- a/var/spack/repos/builtin/packages/cap3/package.py +++ b/var/spack/repos/builtin/packages/cap3/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cares/package.py b/var/spack/repos/builtin/packages/cares/package.py index ab3691be16..23d2eacaab 100644 --- a/var/spack/repos/builtin/packages/cares/package.py +++ b/var/spack/repos/builtin/packages/cares/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cask/package.py b/var/spack/repos/builtin/packages/cask/package.py index e1ffe284e7..96d601d39c 100644 --- a/var/spack/repos/builtin/packages/cask/package.py +++ b/var/spack/repos/builtin/packages/cask/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/casper/package.py b/var/spack/repos/builtin/packages/casper/package.py index 170bdaecef..2a0f04b64d 100644 --- a/var/spack/repos/builtin/packages/casper/package.py +++ b/var/spack/repos/builtin/packages/casper/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/catch/package.py b/var/spack/repos/builtin/packages/catch/package.py index dd324615a7..244730c89d 100644 --- a/var/spack/repos/builtin/packages/catch/package.py +++ b/var/spack/repos/builtin/packages/catch/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cbench/package.py b/var/spack/repos/builtin/packages/cbench/package.py index 22a85a9734..21482a2541 100644 --- a/var/spack/repos/builtin/packages/cbench/package.py +++ b/var/spack/repos/builtin/packages/cbench/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cblas/package.py b/var/spack/repos/builtin/packages/cblas/package.py index 05a3ddb43e..d5ce17c99d 100644 --- a/var/spack/repos/builtin/packages/cblas/package.py +++ b/var/spack/repos/builtin/packages/cblas/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ccache/package.py b/var/spack/repos/builtin/packages/ccache/package.py index 44b45fbea9..508ea1f7db 100644 --- a/var/spack/repos/builtin/packages/ccache/package.py +++ b/var/spack/repos/builtin/packages/ccache/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cctools/package.py b/var/spack/repos/builtin/packages/cctools/package.py index 997a6ba6df..f97c410d6c 100644 --- a/var/spack/repos/builtin/packages/cctools/package.py +++ b/var/spack/repos/builtin/packages/cctools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cdbfasta/package.py b/var/spack/repos/builtin/packages/cdbfasta/package.py index 7350de6841..5eda8af773 100644 --- a/var/spack/repos/builtin/packages/cdbfasta/package.py +++ b/var/spack/repos/builtin/packages/cdbfasta/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cdd/package.py b/var/spack/repos/builtin/packages/cdd/package.py index cf720577ea..ec693a19e1 100644 --- a/var/spack/repos/builtin/packages/cdd/package.py +++ b/var/spack/repos/builtin/packages/cdd/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cddlib/package.py b/var/spack/repos/builtin/packages/cddlib/package.py index 360089272e..aeccc16179 100644 --- a/var/spack/repos/builtin/packages/cddlib/package.py +++ b/var/spack/repos/builtin/packages/cddlib/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cdhit/package.py b/var/spack/repos/builtin/packages/cdhit/package.py index 64f4940606..e785f736be 100644 --- a/var/spack/repos/builtin/packages/cdhit/package.py +++ b/var/spack/repos/builtin/packages/cdhit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cdo/package.py b/var/spack/repos/builtin/packages/cdo/package.py index 13aef987a6..3e69d8caaa 100644 --- a/var/spack/repos/builtin/packages/cdo/package.py +++ b/var/spack/repos/builtin/packages/cdo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cereal/package.py b/var/spack/repos/builtin/packages/cereal/package.py index 637257053e..dadfb10260 100644 --- a/var/spack/repos/builtin/packages/cereal/package.py +++ b/var/spack/repos/builtin/packages/cereal/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cfitsio/package.py b/var/spack/repos/builtin/packages/cfitsio/package.py index ba457bea58..65bce7407a 100644 --- a/var/spack/repos/builtin/packages/cfitsio/package.py +++ b/var/spack/repos/builtin/packages/cfitsio/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cgal/package.py b/var/spack/repos/builtin/packages/cgal/package.py index fe591b2b8a..ae4ee4879d 100644 --- a/var/spack/repos/builtin/packages/cgal/package.py +++ b/var/spack/repos/builtin/packages/cgal/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cgm/package.py b/var/spack/repos/builtin/packages/cgm/package.py index 8f2fa13f9a..e5284d323f 100644 --- a/var/spack/repos/builtin/packages/cgm/package.py +++ b/var/spack/repos/builtin/packages/cgm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cgns/package.py b/var/spack/repos/builtin/packages/cgns/package.py index c50523344b..e27717e94e 100644 --- a/var/spack/repos/builtin/packages/cgns/package.py +++ b/var/spack/repos/builtin/packages/cgns/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/charm/package.py b/var/spack/repos/builtin/packages/charm/package.py index b5568920d9..1395326767 100644 --- a/var/spack/repos/builtin/packages/charm/package.py +++ b/var/spack/repos/builtin/packages/charm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/check/package.py b/var/spack/repos/builtin/packages/check/package.py index c87a982fa5..e7ba13f772 100644 --- a/var/spack/repos/builtin/packages/check/package.py +++ b/var/spack/repos/builtin/packages/check/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/chlorop/package.py b/var/spack/repos/builtin/packages/chlorop/package.py index 2bccd6d951..96fdf70be4 100644 --- a/var/spack/repos/builtin/packages/chlorop/package.py +++ b/var/spack/repos/builtin/packages/chlorop/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/chombo/package.py b/var/spack/repos/builtin/packages/chombo/package.py index 8dd5155199..64280d545b 100644 --- a/var/spack/repos/builtin/packages/chombo/package.py +++ b/var/spack/repos/builtin/packages/chombo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cistem/package.py b/var/spack/repos/builtin/packages/cistem/package.py index 95fe4df381..75a2dd30a9 100644 --- a/var/spack/repos/builtin/packages/cistem/package.py +++ b/var/spack/repos/builtin/packages/cistem/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cityhash/package.py b/var/spack/repos/builtin/packages/cityhash/package.py index 67ee8561a3..70856c6c8b 100644 --- a/var/spack/repos/builtin/packages/cityhash/package.py +++ b/var/spack/repos/builtin/packages/cityhash/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/clamr/package.py b/var/spack/repos/builtin/packages/clamr/package.py index e5890a7cb9..ec31849a54 100644 --- a/var/spack/repos/builtin/packages/clamr/package.py +++ b/var/spack/repos/builtin/packages/clamr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cleaveland4/package.py b/var/spack/repos/builtin/packages/cleaveland4/package.py index 910ef7cb12..848a4be0e8 100644 --- a/var/spack/repos/builtin/packages/cleaveland4/package.py +++ b/var/spack/repos/builtin/packages/cleaveland4/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cleverleaf/package.py b/var/spack/repos/builtin/packages/cleverleaf/package.py index 0e40d3ff4c..2421133a00 100644 --- a/var/spack/repos/builtin/packages/cleverleaf/package.py +++ b/var/spack/repos/builtin/packages/cleverleaf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/clfft/package.py b/var/spack/repos/builtin/packages/clfft/package.py index d626e8964a..9bfffa34b5 100644 --- a/var/spack/repos/builtin/packages/clfft/package.py +++ b/var/spack/repos/builtin/packages/clfft/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/clhep/package.py b/var/spack/repos/builtin/packages/clhep/package.py index 22fcb659c8..3f79e82b2e 100644 --- a/var/spack/repos/builtin/packages/clhep/package.py +++ b/var/spack/repos/builtin/packages/clhep/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/clingo/package.py b/var/spack/repos/builtin/packages/clingo/package.py index 55279a55f9..cf45630e12 100644 --- a/var/spack/repos/builtin/packages/clingo/package.py +++ b/var/spack/repos/builtin/packages/clingo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cloc/package.py b/var/spack/repos/builtin/packages/cloc/package.py index a5f7f1ecf5..ff68d0e8df 100644 --- a/var/spack/repos/builtin/packages/cloc/package.py +++ b/var/spack/repos/builtin/packages/cloc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cloog/package.py b/var/spack/repos/builtin/packages/cloog/package.py index b8fad45331..b01c68e89d 100644 --- a/var/spack/repos/builtin/packages/cloog/package.py +++ b/var/spack/repos/builtin/packages/cloog/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cloverleaf/package.py b/var/spack/repos/builtin/packages/cloverleaf/package.py index 1f23d5398c..a0fd9c2c0c 100644 --- a/var/spack/repos/builtin/packages/cloverleaf/package.py +++ b/var/spack/repos/builtin/packages/cloverleaf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cloverleaf3d/package.py b/var/spack/repos/builtin/packages/cloverleaf3d/package.py index 0d00922325..77163d35e2 100644 --- a/var/spack/repos/builtin/packages/cloverleaf3d/package.py +++ b/var/spack/repos/builtin/packages/cloverleaf3d/package.py @@ -1,5 +1,5 @@ ############################################################################# -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/clustalo/package.py b/var/spack/repos/builtin/packages/clustalo/package.py index 5f3911ac29..ddba34c33a 100644 --- a/var/spack/repos/builtin/packages/clustalo/package.py +++ b/var/spack/repos/builtin/packages/clustalo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/clustalw/package.py b/var/spack/repos/builtin/packages/clustalw/package.py index 478fb702ce..e643764709 100644 --- a/var/spack/repos/builtin/packages/clustalw/package.py +++ b/var/spack/repos/builtin/packages/clustalw/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index d3705eb899..cc6a607766 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cmocka/package.py b/var/spack/repos/builtin/packages/cmocka/package.py index 7598532476..a280436ae9 100644 --- a/var/spack/repos/builtin/packages/cmocka/package.py +++ b/var/spack/repos/builtin/packages/cmocka/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cmor/package.py b/var/spack/repos/builtin/packages/cmor/package.py index 534d408096..9b9189643e 100644 --- a/var/spack/repos/builtin/packages/cmor/package.py +++ b/var/spack/repos/builtin/packages/cmor/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cnmem/package.py b/var/spack/repos/builtin/packages/cnmem/package.py index 7b068e1ede..573b72f1ad 100644 --- a/var/spack/repos/builtin/packages/cnmem/package.py +++ b/var/spack/repos/builtin/packages/cnmem/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cnpy/package.py b/var/spack/repos/builtin/packages/cnpy/package.py index 6677d8800c..0112281c5a 100644 --- a/var/spack/repos/builtin/packages/cnpy/package.py +++ b/var/spack/repos/builtin/packages/cnpy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cntk/package.py b/var/spack/repos/builtin/packages/cntk/package.py index b55c547e10..52d4e8f896 100644 --- a/var/spack/repos/builtin/packages/cntk/package.py +++ b/var/spack/repos/builtin/packages/cntk/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cntk1bitsgd/package.py b/var/spack/repos/builtin/packages/cntk1bitsgd/package.py index 6d30792b09..71d65aba17 100644 --- a/var/spack/repos/builtin/packages/cntk1bitsgd/package.py +++ b/var/spack/repos/builtin/packages/cntk1bitsgd/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/codar-cheetah/package.py b/var/spack/repos/builtin/packages/codar-cheetah/package.py index de39fb2a79..956643add4 100644 --- a/var/spack/repos/builtin/packages/codar-cheetah/package.py +++ b/var/spack/repos/builtin/packages/codar-cheetah/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cohmm/package.py b/var/spack/repos/builtin/packages/cohmm/package.py index b0e0be10d4..606ac973c6 100644 --- a/var/spack/repos/builtin/packages/cohmm/package.py +++ b/var/spack/repos/builtin/packages/cohmm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/coinhsl/package.py b/var/spack/repos/builtin/packages/coinhsl/package.py index b81feb326a..b396727713 100644 --- a/var/spack/repos/builtin/packages/coinhsl/package.py +++ b/var/spack/repos/builtin/packages/coinhsl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/colordiff/package.py b/var/spack/repos/builtin/packages/colordiff/package.py index ba03f4f777..cbfbc1c4fb 100644 --- a/var/spack/repos/builtin/packages/colordiff/package.py +++ b/var/spack/repos/builtin/packages/colordiff/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/comd/package.py b/var/spack/repos/builtin/packages/comd/package.py index 00a68ddd6f..6fee9ac97f 100644 --- a/var/spack/repos/builtin/packages/comd/package.py +++ b/var/spack/repos/builtin/packages/comd/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/compiz/package.py b/var/spack/repos/builtin/packages/compiz/package.py index 5387483879..233d507907 100644 --- a/var/spack/repos/builtin/packages/compiz/package.py +++ b/var/spack/repos/builtin/packages/compiz/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/compositeproto/package.py b/var/spack/repos/builtin/packages/compositeproto/package.py index 120c76b408..4d6ba758fe 100644 --- a/var/spack/repos/builtin/packages/compositeproto/package.py +++ b/var/spack/repos/builtin/packages/compositeproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/conduit/package.py b/var/spack/repos/builtin/packages/conduit/package.py index 40a41cda14..d37300cd07 100644 --- a/var/spack/repos/builtin/packages/conduit/package.py +++ b/var/spack/repos/builtin/packages/conduit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/constype/package.py b/var/spack/repos/builtin/packages/constype/package.py index 1fa0800b48..7778faeb06 100644 --- a/var/spack/repos/builtin/packages/constype/package.py +++ b/var/spack/repos/builtin/packages/constype/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/converge/package.py b/var/spack/repos/builtin/packages/converge/package.py index 7a17436ed3..744cc27267 100644 --- a/var/spack/repos/builtin/packages/converge/package.py +++ b/var/spack/repos/builtin/packages/converge/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/coreutils/package.py b/var/spack/repos/builtin/packages/coreutils/package.py index fa4298a42a..39d540ce8e 100644 --- a/var/spack/repos/builtin/packages/coreutils/package.py +++ b/var/spack/repos/builtin/packages/coreutils/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/corset/package.py b/var/spack/repos/builtin/packages/corset/package.py index 7b5ef695cb..65177bd77a 100644 --- a/var/spack/repos/builtin/packages/corset/package.py +++ b/var/spack/repos/builtin/packages/corset/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cosmomc/package.py b/var/spack/repos/builtin/packages/cosmomc/package.py index c3788c53ce..c7fbdf3525 100644 --- a/var/spack/repos/builtin/packages/cosmomc/package.py +++ b/var/spack/repos/builtin/packages/cosmomc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cosp2/package.py b/var/spack/repos/builtin/packages/cosp2/package.py index 2bd69e73d3..042f961ecd 100644 --- a/var/spack/repos/builtin/packages/cosp2/package.py +++ b/var/spack/repos/builtin/packages/cosp2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cp2k/package.py b/var/spack/repos/builtin/packages/cp2k/package.py index 51a88f835a..4aa79a4592 100644 --- a/var/spack/repos/builtin/packages/cp2k/package.py +++ b/var/spack/repos/builtin/packages/cp2k/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cppad/package.py b/var/spack/repos/builtin/packages/cppad/package.py index 3b503fe1c8..98a6d0a9f6 100644 --- a/var/spack/repos/builtin/packages/cppad/package.py +++ b/var/spack/repos/builtin/packages/cppad/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cppcheck/package.py b/var/spack/repos/builtin/packages/cppcheck/package.py index 55797eccb5..ef8a849a1e 100644 --- a/var/spack/repos/builtin/packages/cppcheck/package.py +++ b/var/spack/repos/builtin/packages/cppcheck/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cpprestsdk/package.py b/var/spack/repos/builtin/packages/cpprestsdk/package.py index a92b49c7a7..f6896b78cb 100644 --- a/var/spack/repos/builtin/packages/cpprestsdk/package.py +++ b/var/spack/repos/builtin/packages/cpprestsdk/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cppunit/package.py b/var/spack/repos/builtin/packages/cppunit/package.py index ef6fa6ee24..ebcbd57a70 100644 --- a/var/spack/repos/builtin/packages/cppunit/package.py +++ b/var/spack/repos/builtin/packages/cppunit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cppzmq/package.py b/var/spack/repos/builtin/packages/cppzmq/package.py index 689e3924de..98f7c2d0d2 100644 --- a/var/spack/repos/builtin/packages/cppzmq/package.py +++ b/var/spack/repos/builtin/packages/cppzmq/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cram/package.py b/var/spack/repos/builtin/packages/cram/package.py index 73a8584572..7ea9cde8a6 100644 --- a/var/spack/repos/builtin/packages/cram/package.py +++ b/var/spack/repos/builtin/packages/cram/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cryptopp/package.py b/var/spack/repos/builtin/packages/cryptopp/package.py index c8fe6968a7..171fa388ad 100644 --- a/var/spack/repos/builtin/packages/cryptopp/package.py +++ b/var/spack/repos/builtin/packages/cryptopp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cscope/package.py b/var/spack/repos/builtin/packages/cscope/package.py index 31a826be5c..b4769fed05 100644 --- a/var/spack/repos/builtin/packages/cscope/package.py +++ b/var/spack/repos/builtin/packages/cscope/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/csdp/package.py b/var/spack/repos/builtin/packages/csdp/package.py index a242f3b0c0..afed537f29 100644 --- a/var/spack/repos/builtin/packages/csdp/package.py +++ b/var/spack/repos/builtin/packages/csdp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ctffind/package.py b/var/spack/repos/builtin/packages/ctffind/package.py index 95fe40f93c..549e7f8598 100644 --- a/var/spack/repos/builtin/packages/ctffind/package.py +++ b/var/spack/repos/builtin/packages/ctffind/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cub/package.py b/var/spack/repos/builtin/packages/cub/package.py index 1ca42f8e91..9ea398d379 100644 --- a/var/spack/repos/builtin/packages/cub/package.py +++ b/var/spack/repos/builtin/packages/cub/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cube/package.py b/var/spack/repos/builtin/packages/cube/package.py index 6c3b82d227..ac1236d5cd 100644 --- a/var/spack/repos/builtin/packages/cube/package.py +++ b/var/spack/repos/builtin/packages/cube/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cuda-memtest/package.py b/var/spack/repos/builtin/packages/cuda-memtest/package.py index aef9ed892b..38b23793e3 100644 --- a/var/spack/repos/builtin/packages/cuda-memtest/package.py +++ b/var/spack/repos/builtin/packages/cuda-memtest/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cuda/package.py b/var/spack/repos/builtin/packages/cuda/package.py index e67cdc34f6..25871c907a 100644 --- a/var/spack/repos/builtin/packages/cuda/package.py +++ b/var/spack/repos/builtin/packages/cuda/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cudnn/package.py b/var/spack/repos/builtin/packages/cudnn/package.py index 53af7f9635..2752a1458f 100644 --- a/var/spack/repos/builtin/packages/cudnn/package.py +++ b/var/spack/repos/builtin/packages/cudnn/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cufflinks/package.py b/var/spack/repos/builtin/packages/cufflinks/package.py index 97197258dd..8ff26bf39c 100644 --- a/var/spack/repos/builtin/packages/cufflinks/package.py +++ b/var/spack/repos/builtin/packages/cufflinks/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cups/package.py b/var/spack/repos/builtin/packages/cups/package.py index b674bd637a..99fc772d0e 100644 --- a/var/spack/repos/builtin/packages/cups/package.py +++ b/var/spack/repos/builtin/packages/cups/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/curl/package.py b/var/spack/repos/builtin/packages/curl/package.py index 41ab94978f..ae575e4644 100644 --- a/var/spack/repos/builtin/packages/curl/package.py +++ b/var/spack/repos/builtin/packages/curl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/cvs/package.py b/var/spack/repos/builtin/packages/cvs/package.py index 58943886bf..726d7e8e9f 100644 --- a/var/spack/repos/builtin/packages/cvs/package.py +++ b/var/spack/repos/builtin/packages/cvs/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/czmq/package.py b/var/spack/repos/builtin/packages/czmq/package.py index bd97d331d0..076c9d0f03 100644 --- a/var/spack/repos/builtin/packages/czmq/package.py +++ b/var/spack/repos/builtin/packages/czmq/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/dakota/package.py b/var/spack/repos/builtin/packages/dakota/package.py index b90fb5641a..ea008dfdc5 100644 --- a/var/spack/repos/builtin/packages/dakota/package.py +++ b/var/spack/repos/builtin/packages/dakota/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/daligner/package.py b/var/spack/repos/builtin/packages/daligner/package.py index 91322b5b3a..befdd60bd2 100644 --- a/var/spack/repos/builtin/packages/daligner/package.py +++ b/var/spack/repos/builtin/packages/daligner/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/damageproto/package.py b/var/spack/repos/builtin/packages/damageproto/package.py index 4b40a5f72b..8f8ebe8e5e 100644 --- a/var/spack/repos/builtin/packages/damageproto/package.py +++ b/var/spack/repos/builtin/packages/damageproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/damselfly/package.py b/var/spack/repos/builtin/packages/damselfly/package.py index c98ad5ca7b..d2d219a930 100644 --- a/var/spack/repos/builtin/packages/damselfly/package.py +++ b/var/spack/repos/builtin/packages/damselfly/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/darshan-runtime/package.py b/var/spack/repos/builtin/packages/darshan-runtime/package.py index 7be03f19c1..d87ce88503 100644 --- a/var/spack/repos/builtin/packages/darshan-runtime/package.py +++ b/var/spack/repos/builtin/packages/darshan-runtime/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/darshan-util/package.py b/var/spack/repos/builtin/packages/darshan-util/package.py index 35d3ddb97a..c68dd9b136 100644 --- a/var/spack/repos/builtin/packages/darshan-util/package.py +++ b/var/spack/repos/builtin/packages/darshan-util/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/dash/package.py b/var/spack/repos/builtin/packages/dash/package.py index 9c79be238e..4fcad8095b 100644 --- a/var/spack/repos/builtin/packages/dash/package.py +++ b/var/spack/repos/builtin/packages/dash/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/datamash/package.py b/var/spack/repos/builtin/packages/datamash/package.py index b72a1c21bb..29a3c84a17 100644 --- a/var/spack/repos/builtin/packages/datamash/package.py +++ b/var/spack/repos/builtin/packages/datamash/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/dataspaces/package.py b/var/spack/repos/builtin/packages/dataspaces/package.py index 37121c2b47..387f72b0ae 100644 --- a/var/spack/repos/builtin/packages/dataspaces/package.py +++ b/var/spack/repos/builtin/packages/dataspaces/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # diff --git a/var/spack/repos/builtin/packages/dbus/package.py b/var/spack/repos/builtin/packages/dbus/package.py index 4d55665a4e..6d585c8952 100644 --- a/var/spack/repos/builtin/packages/dbus/package.py +++ b/var/spack/repos/builtin/packages/dbus/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 26450abc2e..b45bb09041 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/deconseq-standalone/package.py b/var/spack/repos/builtin/packages/deconseq-standalone/package.py index ce73ce59a3..86c5ad7ed7 100644 --- a/var/spack/repos/builtin/packages/deconseq-standalone/package.py +++ b/var/spack/repos/builtin/packages/deconseq-standalone/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/dejagnu/package.py b/var/spack/repos/builtin/packages/dejagnu/package.py index 7b083d00b4..d49268bf22 100644 --- a/var/spack/repos/builtin/packages/dejagnu/package.py +++ b/var/spack/repos/builtin/packages/dejagnu/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/delly2/package.py b/var/spack/repos/builtin/packages/delly2/package.py index e922d2c566..ae3311d8e9 100644 --- a/var/spack/repos/builtin/packages/delly2/package.py +++ b/var/spack/repos/builtin/packages/delly2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/denovogear/package.py b/var/spack/repos/builtin/packages/denovogear/package.py index 64a1d0f619..69194488db 100644 --- a/var/spack/repos/builtin/packages/denovogear/package.py +++ b/var/spack/repos/builtin/packages/denovogear/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/dia/package.py b/var/spack/repos/builtin/packages/dia/package.py index 03a1ca9df2..871845c93d 100644 --- a/var/spack/repos/builtin/packages/dia/package.py +++ b/var/spack/repos/builtin/packages/dia/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/dialign-tx/package.py b/var/spack/repos/builtin/packages/dialign-tx/package.py index 182069a013..ea7eddaf42 100644 --- a/var/spack/repos/builtin/packages/dialign-tx/package.py +++ b/var/spack/repos/builtin/packages/dialign-tx/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/diamond/package.py b/var/spack/repos/builtin/packages/diamond/package.py index feb0fe6a81..5233e0e9ba 100644 --- a/var/spack/repos/builtin/packages/diamond/package.py +++ b/var/spack/repos/builtin/packages/diamond/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/diffsplice/package.py b/var/spack/repos/builtin/packages/diffsplice/package.py index 9e299ab892..f7f1dbd4ac 100644 --- a/var/spack/repos/builtin/packages/diffsplice/package.py +++ b/var/spack/repos/builtin/packages/diffsplice/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/direnv/package.py b/var/spack/repos/builtin/packages/direnv/package.py index 83ec1db935..d5ae99a549 100644 --- a/var/spack/repos/builtin/packages/direnv/package.py +++ b/var/spack/repos/builtin/packages/direnv/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/discovar/package.py b/var/spack/repos/builtin/packages/discovar/package.py index e0521d3e95..2b4068cba0 100644 --- a/var/spack/repos/builtin/packages/discovar/package.py +++ b/var/spack/repos/builtin/packages/discovar/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/discovardenovo/package.py b/var/spack/repos/builtin/packages/discovardenovo/package.py index 673d75be04..88c6dfcf5b 100644 --- a/var/spack/repos/builtin/packages/discovardenovo/package.py +++ b/var/spack/repos/builtin/packages/discovardenovo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/dislin/package.py b/var/spack/repos/builtin/packages/dislin/package.py index b77b9cbf19..05f8cfa153 100644 --- a/var/spack/repos/builtin/packages/dislin/package.py +++ b/var/spack/repos/builtin/packages/dislin/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/dlpack/package.py b/var/spack/repos/builtin/packages/dlpack/package.py index 69dd99b5a0..9edf7a49a9 100644 --- a/var/spack/repos/builtin/packages/dlpack/package.py +++ b/var/spack/repos/builtin/packages/dlpack/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/dmlc-core/package.py b/var/spack/repos/builtin/packages/dmlc-core/package.py index f463acb836..eb1b1ee09a 100644 --- a/var/spack/repos/builtin/packages/dmlc-core/package.py +++ b/var/spack/repos/builtin/packages/dmlc-core/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/dmxproto/package.py b/var/spack/repos/builtin/packages/dmxproto/package.py index c3bd1919fc..f07367c3d3 100644 --- a/var/spack/repos/builtin/packages/dmxproto/package.py +++ b/var/spack/repos/builtin/packages/dmxproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/docbook-xml/package.py b/var/spack/repos/builtin/packages/docbook-xml/package.py index c91473a669..8cf4f0fc49 100644 --- a/var/spack/repos/builtin/packages/docbook-xml/package.py +++ b/var/spack/repos/builtin/packages/docbook-xml/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/docbook-xsl/package.py b/var/spack/repos/builtin/packages/docbook-xsl/package.py index 1f3d774b82..d5829e8085 100644 --- a/var/spack/repos/builtin/packages/docbook-xsl/package.py +++ b/var/spack/repos/builtin/packages/docbook-xsl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/dos2unix/package.py b/var/spack/repos/builtin/packages/dos2unix/package.py index 2457f9b9e6..95f4c65009 100644 --- a/var/spack/repos/builtin/packages/dos2unix/package.py +++ b/var/spack/repos/builtin/packages/dos2unix/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/double-conversion/package.py b/var/spack/repos/builtin/packages/double-conversion/package.py index e4f4803a24..44d50790f2 100644 --- a/var/spack/repos/builtin/packages/double-conversion/package.py +++ b/var/spack/repos/builtin/packages/double-conversion/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/doxygen/package.py b/var/spack/repos/builtin/packages/doxygen/package.py index 61cfdf8a89..8746a3f139 100644 --- a/var/spack/repos/builtin/packages/doxygen/package.py +++ b/var/spack/repos/builtin/packages/doxygen/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/dri2proto/package.py b/var/spack/repos/builtin/packages/dri2proto/package.py index bfd4326d42..9e146bb7c7 100644 --- a/var/spack/repos/builtin/packages/dri2proto/package.py +++ b/var/spack/repos/builtin/packages/dri2proto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/dri3proto/package.py b/var/spack/repos/builtin/packages/dri3proto/package.py index 257acf8514..629302b911 100644 --- a/var/spack/repos/builtin/packages/dri3proto/package.py +++ b/var/spack/repos/builtin/packages/dri3proto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/dsdp/package.py b/var/spack/repos/builtin/packages/dsdp/package.py index e90e059399..877299073a 100644 --- a/var/spack/repos/builtin/packages/dsdp/package.py +++ b/var/spack/repos/builtin/packages/dsdp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/dtcmp/package.py b/var/spack/repos/builtin/packages/dtcmp/package.py index c64fa540fa..130a79e6dd 100644 --- a/var/spack/repos/builtin/packages/dtcmp/package.py +++ b/var/spack/repos/builtin/packages/dtcmp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/dyninst/package.py b/var/spack/repos/builtin/packages/dyninst/package.py index a0683e9d81..879bbf616a 100644 --- a/var/spack/repos/builtin/packages/dyninst/package.py +++ b/var/spack/repos/builtin/packages/dyninst/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ea-utils/package.py b/var/spack/repos/builtin/packages/ea-utils/package.py index 181248a401..c924a08279 100644 --- a/var/spack/repos/builtin/packages/ea-utils/package.py +++ b/var/spack/repos/builtin/packages/ea-utils/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ebms/package.py b/var/spack/repos/builtin/packages/ebms/package.py index d9bce0a661..c6ac087ed2 100644 --- a/var/spack/repos/builtin/packages/ebms/package.py +++ b/var/spack/repos/builtin/packages/ebms/package.py @@ -1,5 +1,5 @@ ############################################################################# -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/eccodes/package.py b/var/spack/repos/builtin/packages/eccodes/package.py index ca86024f13..cd93b156f5 100644 --- a/var/spack/repos/builtin/packages/eccodes/package.py +++ b/var/spack/repos/builtin/packages/eccodes/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py b/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py index ee1a881aff..4dd71335a8 100644 --- a/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py +++ b/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ed/package.py b/var/spack/repos/builtin/packages/ed/package.py index 031de1e402..39fff79178 100644 --- a/var/spack/repos/builtin/packages/ed/package.py +++ b/var/spack/repos/builtin/packages/ed/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/editres/package.py b/var/spack/repos/builtin/packages/editres/package.py index ccd38d114f..9e44ed5210 100644 --- a/var/spack/repos/builtin/packages/editres/package.py +++ b/var/spack/repos/builtin/packages/editres/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/eigen/package.py b/var/spack/repos/builtin/packages/eigen/package.py index 0c820ec671..88d5ec409a 100644 --- a/var/spack/repos/builtin/packages/eigen/package.py +++ b/var/spack/repos/builtin/packages/eigen/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/elemental/package.py b/var/spack/repos/builtin/packages/elemental/package.py index da5f61e99a..2b72a500ca 100644 --- a/var/spack/repos/builtin/packages/elemental/package.py +++ b/var/spack/repos/builtin/packages/elemental/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/elfutils/package.py b/var/spack/repos/builtin/packages/elfutils/package.py index 27f11c72e6..1f269c883d 100644 --- a/var/spack/repos/builtin/packages/elfutils/package.py +++ b/var/spack/repos/builtin/packages/elfutils/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/elk/package.py b/var/spack/repos/builtin/packages/elk/package.py index 6abebb4174..4b4086c10b 100644 --- a/var/spack/repos/builtin/packages/elk/package.py +++ b/var/spack/repos/builtin/packages/elk/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/elpa/package.py b/var/spack/repos/builtin/packages/elpa/package.py index d678fb10e5..7349fa2ec9 100644 --- a/var/spack/repos/builtin/packages/elpa/package.py +++ b/var/spack/repos/builtin/packages/elpa/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/emacs/package.py b/var/spack/repos/builtin/packages/emacs/package.py index 73f557f96d..77a976b52d 100644 --- a/var/spack/repos/builtin/packages/emacs/package.py +++ b/var/spack/repos/builtin/packages/emacs/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/emboss/package.py b/var/spack/repos/builtin/packages/emboss/package.py index fe3f18a0dc..585b44081b 100644 --- a/var/spack/repos/builtin/packages/emboss/package.py +++ b/var/spack/repos/builtin/packages/emboss/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/encodings/package.py b/var/spack/repos/builtin/packages/encodings/package.py index ae1f5f0c04..249980e3ff 100644 --- a/var/spack/repos/builtin/packages/encodings/package.py +++ b/var/spack/repos/builtin/packages/encodings/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/environment-modules/package.py b/var/spack/repos/builtin/packages/environment-modules/package.py index ed84cea0a9..16eafcda1c 100644 --- a/var/spack/repos/builtin/packages/environment-modules/package.py +++ b/var/spack/repos/builtin/packages/environment-modules/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/es/package.py b/var/spack/repos/builtin/packages/es/package.py index 6a73488e8f..e77797acac 100644 --- a/var/spack/repos/builtin/packages/es/package.py +++ b/var/spack/repos/builtin/packages/es/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/esmf/package.py b/var/spack/repos/builtin/packages/esmf/package.py index cabe108dd9..cd631f20b6 100644 --- a/var/spack/repos/builtin/packages/esmf/package.py +++ b/var/spack/repos/builtin/packages/esmf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/espresso/package.py b/var/spack/repos/builtin/packages/espresso/package.py index e9bd29f762..63d88ff78f 100644 --- a/var/spack/repos/builtin/packages/espresso/package.py +++ b/var/spack/repos/builtin/packages/espresso/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/essl/package.py b/var/spack/repos/builtin/packages/essl/package.py index 946b93518b..115b0ca4ae 100644 --- a/var/spack/repos/builtin/packages/essl/package.py +++ b/var/spack/repos/builtin/packages/essl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ethminer/package.py b/var/spack/repos/builtin/packages/ethminer/package.py index 48ff980d0a..d3d3684787 100644 --- a/var/spack/repos/builtin/packages/ethminer/package.py +++ b/var/spack/repos/builtin/packages/ethminer/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/etsf-io/package.py b/var/spack/repos/builtin/packages/etsf-io/package.py index dc0dac415f..62f51c9dcd 100644 --- a/var/spack/repos/builtin/packages/etsf-io/package.py +++ b/var/spack/repos/builtin/packages/etsf-io/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/everytrace-example/package.py b/var/spack/repos/builtin/packages/everytrace-example/package.py index cedcd684fc..1d764e2733 100644 --- a/var/spack/repos/builtin/packages/everytrace-example/package.py +++ b/var/spack/repos/builtin/packages/everytrace-example/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/everytrace/package.py b/var/spack/repos/builtin/packages/everytrace/package.py index 96813672ad..0724e4a97c 100644 --- a/var/spack/repos/builtin/packages/everytrace/package.py +++ b/var/spack/repos/builtin/packages/everytrace/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/evieext/package.py b/var/spack/repos/builtin/packages/evieext/package.py index 0307f86b3b..1ec12e4156 100644 --- a/var/spack/repos/builtin/packages/evieext/package.py +++ b/var/spack/repos/builtin/packages/evieext/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/exabayes/package.py b/var/spack/repos/builtin/packages/exabayes/package.py index 1529261397..e3164dc1b1 100644 --- a/var/spack/repos/builtin/packages/exabayes/package.py +++ b/var/spack/repos/builtin/packages/exabayes/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/exmcutils/package.py b/var/spack/repos/builtin/packages/exmcutils/package.py index 02010deaf3..fbccd6cfd3 100644 --- a/var/spack/repos/builtin/packages/exmcutils/package.py +++ b/var/spack/repos/builtin/packages/exmcutils/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/exodusii/package.py b/var/spack/repos/builtin/packages/exodusii/package.py index d74137533c..3a17a52dde 100644 --- a/var/spack/repos/builtin/packages/exodusii/package.py +++ b/var/spack/repos/builtin/packages/exodusii/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/exonerate/package.py b/var/spack/repos/builtin/packages/exonerate/package.py index 86e3d2af7b..d2690bbcf3 100644 --- a/var/spack/repos/builtin/packages/exonerate/package.py +++ b/var/spack/repos/builtin/packages/exonerate/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/expat/package.py b/var/spack/repos/builtin/packages/expat/package.py index a4ca544e57..2b5f1c63f2 100644 --- a/var/spack/repos/builtin/packages/expat/package.py +++ b/var/spack/repos/builtin/packages/expat/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/expect/package.py b/var/spack/repos/builtin/packages/expect/package.py index 786539d025..3a14a013e5 100644 --- a/var/spack/repos/builtin/packages/expect/package.py +++ b/var/spack/repos/builtin/packages/expect/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/express/package.py b/var/spack/repos/builtin/packages/express/package.py index 687213b75b..cfc83ec44c 100644 --- a/var/spack/repos/builtin/packages/express/package.py +++ b/var/spack/repos/builtin/packages/express/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/extrae/package.py b/var/spack/repos/builtin/packages/extrae/package.py index a13963655b..2c06ee5e16 100644 --- a/var/spack/repos/builtin/packages/extrae/package.py +++ b/var/spack/repos/builtin/packages/extrae/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/exuberant-ctags/package.py b/var/spack/repos/builtin/packages/exuberant-ctags/package.py index 4a4f56e270..f0a3c632ed 100644 --- a/var/spack/repos/builtin/packages/exuberant-ctags/package.py +++ b/var/spack/repos/builtin/packages/exuberant-ctags/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/falcon/package.py b/var/spack/repos/builtin/packages/falcon/package.py index d2ca55d443..ec6cd1814d 100644 --- a/var/spack/repos/builtin/packages/falcon/package.py +++ b/var/spack/repos/builtin/packages/falcon/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/farmhash/package.py b/var/spack/repos/builtin/packages/farmhash/package.py index 071a43c1a2..b95c920f7b 100644 --- a/var/spack/repos/builtin/packages/farmhash/package.py +++ b/var/spack/repos/builtin/packages/farmhash/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/fastjar/package.py b/var/spack/repos/builtin/packages/fastjar/package.py index 19af359e81..6d154e1a64 100644 --- a/var/spack/repos/builtin/packages/fastjar/package.py +++ b/var/spack/repos/builtin/packages/fastjar/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/fastmath/package.py b/var/spack/repos/builtin/packages/fastmath/package.py index c91289afaa..57bfa16549 100644 --- a/var/spack/repos/builtin/packages/fastmath/package.py +++ b/var/spack/repos/builtin/packages/fastmath/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/fastme/package.py b/var/spack/repos/builtin/packages/fastme/package.py index a64cd3163c..bf8af1dec4 100644 --- a/var/spack/repos/builtin/packages/fastme/package.py +++ b/var/spack/repos/builtin/packages/fastme/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/fastphase/package.py b/var/spack/repos/builtin/packages/fastphase/package.py index 857e13b3bd..54797287fd 100644 --- a/var/spack/repos/builtin/packages/fastphase/package.py +++ b/var/spack/repos/builtin/packages/fastphase/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/fastq-screen/package.py b/var/spack/repos/builtin/packages/fastq-screen/package.py index 81289a5cb1..1e6aa16ad6 100644 --- a/var/spack/repos/builtin/packages/fastq-screen/package.py +++ b/var/spack/repos/builtin/packages/fastq-screen/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/fastqc/package.py b/var/spack/repos/builtin/packages/fastqc/package.py index 9d20805907..e9a53bd8f9 100644 --- a/var/spack/repos/builtin/packages/fastqc/package.py +++ b/var/spack/repos/builtin/packages/fastqc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/fastqvalidator/package.py b/var/spack/repos/builtin/packages/fastqvalidator/package.py index d91ea6d0ba..bf2ab45b11 100644 --- a/var/spack/repos/builtin/packages/fastqvalidator/package.py +++ b/var/spack/repos/builtin/packages/fastqvalidator/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/fasttree/package.py b/var/spack/repos/builtin/packages/fasttree/package.py index d1b0163004..6835dc96cc 100644 --- a/var/spack/repos/builtin/packages/fasttree/package.py +++ b/var/spack/repos/builtin/packages/fasttree/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/fastx-toolkit/package.py b/var/spack/repos/builtin/packages/fastx-toolkit/package.py index db9a1e1d6e..648fa2bb70 100644 --- a/var/spack/repos/builtin/packages/fastx-toolkit/package.py +++ b/var/spack/repos/builtin/packages/fastx-toolkit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/fenics/package.py b/var/spack/repos/builtin/packages/fenics/package.py index 4c6522ac38..f89f2da2c8 100644 --- a/var/spack/repos/builtin/packages/fenics/package.py +++ b/var/spack/repos/builtin/packages/fenics/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ferret/package.py b/var/spack/repos/builtin/packages/ferret/package.py index 33a6cfcb92..746739e27b 100644 --- a/var/spack/repos/builtin/packages/ferret/package.py +++ b/var/spack/repos/builtin/packages/ferret/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ffmpeg/package.py b/var/spack/repos/builtin/packages/ffmpeg/package.py index 1a7e3b253b..abc367aedf 100644 --- a/var/spack/repos/builtin/packages/ffmpeg/package.py +++ b/var/spack/repos/builtin/packages/ffmpeg/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/fftw/package.py b/var/spack/repos/builtin/packages/fftw/package.py index d33439ee18..39b24ee69e 100644 --- a/var/spack/repos/builtin/packages/fftw/package.py +++ b/var/spack/repos/builtin/packages/fftw/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/fimpute/package.py b/var/spack/repos/builtin/packages/fimpute/package.py index 177ba05640..f8c89f89d4 100644 --- a/var/spack/repos/builtin/packages/fimpute/package.py +++ b/var/spack/repos/builtin/packages/fimpute/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/findutils/package.py b/var/spack/repos/builtin/packages/findutils/package.py index 3abd8e2728..37bfd87a31 100644 --- a/var/spack/repos/builtin/packages/findutils/package.py +++ b/var/spack/repos/builtin/packages/findutils/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/fio/package.py b/var/spack/repos/builtin/packages/fio/package.py index 1119961ad0..b20c5d5a35 100644 --- a/var/spack/repos/builtin/packages/fio/package.py +++ b/var/spack/repos/builtin/packages/fio/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/fish/package.py b/var/spack/repos/builtin/packages/fish/package.py index b9a91dd46d..1ec75174ee 100644 --- a/var/spack/repos/builtin/packages/fish/package.py +++ b/var/spack/repos/builtin/packages/fish/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/fixesproto/package.py b/var/spack/repos/builtin/packages/fixesproto/package.py index 93de50db17..0c2ecc76c2 100644 --- a/var/spack/repos/builtin/packages/fixesproto/package.py +++ b/var/spack/repos/builtin/packages/fixesproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/flac/package.py b/var/spack/repos/builtin/packages/flac/package.py index 2b95a5a6f2..af4c819df1 100644 --- a/var/spack/repos/builtin/packages/flac/package.py +++ b/var/spack/repos/builtin/packages/flac/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/flann/package.py b/var/spack/repos/builtin/packages/flann/package.py index 1ed996bd51..9053ae8610 100644 --- a/var/spack/repos/builtin/packages/flann/package.py +++ b/var/spack/repos/builtin/packages/flann/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/flash/package.py b/var/spack/repos/builtin/packages/flash/package.py index 6c918feb1a..bbd1132e84 100644 --- a/var/spack/repos/builtin/packages/flash/package.py +++ b/var/spack/repos/builtin/packages/flash/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/flex/package.py b/var/spack/repos/builtin/packages/flex/package.py index 25e895d921..01545fc9f4 100644 --- a/var/spack/repos/builtin/packages/flex/package.py +++ b/var/spack/repos/builtin/packages/flex/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/flint/package.py b/var/spack/repos/builtin/packages/flint/package.py index 630a57c9bd..f7e7055a4a 100644 --- a/var/spack/repos/builtin/packages/flint/package.py +++ b/var/spack/repos/builtin/packages/flint/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/flit/package.py b/var/spack/repos/builtin/packages/flit/package.py index a64f9b86d2..95f1f88788 100644 --- a/var/spack/repos/builtin/packages/flit/package.py +++ b/var/spack/repos/builtin/packages/flit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/fltk/package.py b/var/spack/repos/builtin/packages/fltk/package.py index a46b580814..4e73955ee7 100644 --- a/var/spack/repos/builtin/packages/fltk/package.py +++ b/var/spack/repos/builtin/packages/fltk/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/flux/package.py b/var/spack/repos/builtin/packages/flux/package.py index ddc58bb600..22c919f25b 100644 --- a/var/spack/repos/builtin/packages/flux/package.py +++ b/var/spack/repos/builtin/packages/flux/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/fluxbox/package.py b/var/spack/repos/builtin/packages/fluxbox/package.py index 4e08869ebe..41c6e65d2f 100644 --- a/var/spack/repos/builtin/packages/fluxbox/package.py +++ b/var/spack/repos/builtin/packages/fluxbox/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/fmt/package.py b/var/spack/repos/builtin/packages/fmt/package.py index 0e1ed762be..46aec784f0 100644 --- a/var/spack/repos/builtin/packages/fmt/package.py +++ b/var/spack/repos/builtin/packages/fmt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/foam-extend/package.py b/var/spack/repos/builtin/packages/foam-extend/package.py index 6a45f92399..9d103b914b 100644 --- a/var/spack/repos/builtin/packages/foam-extend/package.py +++ b/var/spack/repos/builtin/packages/foam-extend/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/folly/package.py b/var/spack/repos/builtin/packages/folly/package.py index 1c19de1ea6..bb1dd4fcb7 100644 --- a/var/spack/repos/builtin/packages/folly/package.py +++ b/var/spack/repos/builtin/packages/folly/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-adobe-100dpi/package.py b/var/spack/repos/builtin/packages/font-adobe-100dpi/package.py index a156aa21c4..d28efecf18 100644 --- a/var/spack/repos/builtin/packages/font-adobe-100dpi/package.py +++ b/var/spack/repos/builtin/packages/font-adobe-100dpi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-adobe-75dpi/package.py b/var/spack/repos/builtin/packages/font-adobe-75dpi/package.py index 6443dddc7c..96018b183d 100644 --- a/var/spack/repos/builtin/packages/font-adobe-75dpi/package.py +++ b/var/spack/repos/builtin/packages/font-adobe-75dpi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-adobe-utopia-100dpi/package.py b/var/spack/repos/builtin/packages/font-adobe-utopia-100dpi/package.py index a8c945882b..0b6f87cb83 100644 --- a/var/spack/repos/builtin/packages/font-adobe-utopia-100dpi/package.py +++ b/var/spack/repos/builtin/packages/font-adobe-utopia-100dpi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-adobe-utopia-75dpi/package.py b/var/spack/repos/builtin/packages/font-adobe-utopia-75dpi/package.py index 60390be8a7..4e52704522 100644 --- a/var/spack/repos/builtin/packages/font-adobe-utopia-75dpi/package.py +++ b/var/spack/repos/builtin/packages/font-adobe-utopia-75dpi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-adobe-utopia-type1/package.py b/var/spack/repos/builtin/packages/font-adobe-utopia-type1/package.py index c7df91f595..32acd3d0da 100644 --- a/var/spack/repos/builtin/packages/font-adobe-utopia-type1/package.py +++ b/var/spack/repos/builtin/packages/font-adobe-utopia-type1/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-alias/package.py b/var/spack/repos/builtin/packages/font-alias/package.py index 04d14bf53c..86b4261394 100644 --- a/var/spack/repos/builtin/packages/font-alias/package.py +++ b/var/spack/repos/builtin/packages/font-alias/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-arabic-misc/package.py b/var/spack/repos/builtin/packages/font-arabic-misc/package.py index d62f1f904f..6aa5abe87d 100644 --- a/var/spack/repos/builtin/packages/font-arabic-misc/package.py +++ b/var/spack/repos/builtin/packages/font-arabic-misc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-bh-100dpi/package.py b/var/spack/repos/builtin/packages/font-bh-100dpi/package.py index 0a1101a2d3..faac468107 100644 --- a/var/spack/repos/builtin/packages/font-bh-100dpi/package.py +++ b/var/spack/repos/builtin/packages/font-bh-100dpi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-bh-75dpi/package.py b/var/spack/repos/builtin/packages/font-bh-75dpi/package.py index 00d09bc67f..893dfb7a07 100644 --- a/var/spack/repos/builtin/packages/font-bh-75dpi/package.py +++ b/var/spack/repos/builtin/packages/font-bh-75dpi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-100dpi/package.py b/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-100dpi/package.py index 6fa2c93439..8a17a95857 100644 --- a/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-100dpi/package.py +++ b/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-100dpi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-75dpi/package.py b/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-75dpi/package.py index 5417f18e55..65a6cedb24 100644 --- a/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-75dpi/package.py +++ b/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-75dpi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-bh-ttf/package.py b/var/spack/repos/builtin/packages/font-bh-ttf/package.py index c16ffce576..2212c23592 100644 --- a/var/spack/repos/builtin/packages/font-bh-ttf/package.py +++ b/var/spack/repos/builtin/packages/font-bh-ttf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-bh-type1/package.py b/var/spack/repos/builtin/packages/font-bh-type1/package.py index 65d091cedb..d47640adb2 100644 --- a/var/spack/repos/builtin/packages/font-bh-type1/package.py +++ b/var/spack/repos/builtin/packages/font-bh-type1/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-bitstream-100dpi/package.py b/var/spack/repos/builtin/packages/font-bitstream-100dpi/package.py index 92f095f9bf..f10630755f 100644 --- a/var/spack/repos/builtin/packages/font-bitstream-100dpi/package.py +++ b/var/spack/repos/builtin/packages/font-bitstream-100dpi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-bitstream-75dpi/package.py b/var/spack/repos/builtin/packages/font-bitstream-75dpi/package.py index b8a42e82df..33f82f8b12 100644 --- a/var/spack/repos/builtin/packages/font-bitstream-75dpi/package.py +++ b/var/spack/repos/builtin/packages/font-bitstream-75dpi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-bitstream-speedo/package.py b/var/spack/repos/builtin/packages/font-bitstream-speedo/package.py index 5cc6b37f06..cabb00883b 100644 --- a/var/spack/repos/builtin/packages/font-bitstream-speedo/package.py +++ b/var/spack/repos/builtin/packages/font-bitstream-speedo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-bitstream-type1/package.py b/var/spack/repos/builtin/packages/font-bitstream-type1/package.py index c37a11ba86..a6b38e7c63 100644 --- a/var/spack/repos/builtin/packages/font-bitstream-type1/package.py +++ b/var/spack/repos/builtin/packages/font-bitstream-type1/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-cronyx-cyrillic/package.py b/var/spack/repos/builtin/packages/font-cronyx-cyrillic/package.py index f0e2e90c1b..a95ad065d0 100644 --- a/var/spack/repos/builtin/packages/font-cronyx-cyrillic/package.py +++ b/var/spack/repos/builtin/packages/font-cronyx-cyrillic/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-cursor-misc/package.py b/var/spack/repos/builtin/packages/font-cursor-misc/package.py index 6d4c6f7a31..d05cbb523f 100644 --- a/var/spack/repos/builtin/packages/font-cursor-misc/package.py +++ b/var/spack/repos/builtin/packages/font-cursor-misc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-daewoo-misc/package.py b/var/spack/repos/builtin/packages/font-daewoo-misc/package.py index c12ee9363b..58e733e42c 100644 --- a/var/spack/repos/builtin/packages/font-daewoo-misc/package.py +++ b/var/spack/repos/builtin/packages/font-daewoo-misc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-dec-misc/package.py b/var/spack/repos/builtin/packages/font-dec-misc/package.py index a88e2ffc7e..d139d5095a 100644 --- a/var/spack/repos/builtin/packages/font-dec-misc/package.py +++ b/var/spack/repos/builtin/packages/font-dec-misc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-ibm-type1/package.py b/var/spack/repos/builtin/packages/font-ibm-type1/package.py index 6261a19093..4cab224e3f 100644 --- a/var/spack/repos/builtin/packages/font-ibm-type1/package.py +++ b/var/spack/repos/builtin/packages/font-ibm-type1/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-isas-misc/package.py b/var/spack/repos/builtin/packages/font-isas-misc/package.py index f704c7cafa..c98dac2bf7 100644 --- a/var/spack/repos/builtin/packages/font-isas-misc/package.py +++ b/var/spack/repos/builtin/packages/font-isas-misc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-jis-misc/package.py b/var/spack/repos/builtin/packages/font-jis-misc/package.py index 1ee1616818..b7fd329f51 100644 --- a/var/spack/repos/builtin/packages/font-jis-misc/package.py +++ b/var/spack/repos/builtin/packages/font-jis-misc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-micro-misc/package.py b/var/spack/repos/builtin/packages/font-micro-misc/package.py index fa9951d8d0..24d1b4ecdb 100644 --- a/var/spack/repos/builtin/packages/font-micro-misc/package.py +++ b/var/spack/repos/builtin/packages/font-micro-misc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-misc-cyrillic/package.py b/var/spack/repos/builtin/packages/font-misc-cyrillic/package.py index dc0bb59fbb..23d9eaf978 100644 --- a/var/spack/repos/builtin/packages/font-misc-cyrillic/package.py +++ b/var/spack/repos/builtin/packages/font-misc-cyrillic/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-misc-ethiopic/package.py b/var/spack/repos/builtin/packages/font-misc-ethiopic/package.py index 060e78dea1..2b768cd66f 100644 --- a/var/spack/repos/builtin/packages/font-misc-ethiopic/package.py +++ b/var/spack/repos/builtin/packages/font-misc-ethiopic/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-misc-meltho/package.py b/var/spack/repos/builtin/packages/font-misc-meltho/package.py index f5d1f47b78..1ebaa7973c 100644 --- a/var/spack/repos/builtin/packages/font-misc-meltho/package.py +++ b/var/spack/repos/builtin/packages/font-misc-meltho/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-misc-misc/package.py b/var/spack/repos/builtin/packages/font-misc-misc/package.py index 2850cdcc90..633992b5de 100644 --- a/var/spack/repos/builtin/packages/font-misc-misc/package.py +++ b/var/spack/repos/builtin/packages/font-misc-misc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-mutt-misc/package.py b/var/spack/repos/builtin/packages/font-mutt-misc/package.py index 3d55447064..9f345f6c1b 100644 --- a/var/spack/repos/builtin/packages/font-mutt-misc/package.py +++ b/var/spack/repos/builtin/packages/font-mutt-misc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-schumacher-misc/package.py b/var/spack/repos/builtin/packages/font-schumacher-misc/package.py index d9cb52d0a2..b726e9f0e2 100644 --- a/var/spack/repos/builtin/packages/font-schumacher-misc/package.py +++ b/var/spack/repos/builtin/packages/font-schumacher-misc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-screen-cyrillic/package.py b/var/spack/repos/builtin/packages/font-screen-cyrillic/package.py index 3efa22c1cf..fc22bbf063 100644 --- a/var/spack/repos/builtin/packages/font-screen-cyrillic/package.py +++ b/var/spack/repos/builtin/packages/font-screen-cyrillic/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-sony-misc/package.py b/var/spack/repos/builtin/packages/font-sony-misc/package.py index 0b7af22dd6..7a8d39bb27 100644 --- a/var/spack/repos/builtin/packages/font-sony-misc/package.py +++ b/var/spack/repos/builtin/packages/font-sony-misc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-sun-misc/package.py b/var/spack/repos/builtin/packages/font-sun-misc/package.py index 8febf7d802..cc69341af6 100644 --- a/var/spack/repos/builtin/packages/font-sun-misc/package.py +++ b/var/spack/repos/builtin/packages/font-sun-misc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-util/package.py b/var/spack/repos/builtin/packages/font-util/package.py index 38a7dd27eb..9a71df8e3b 100644 --- a/var/spack/repos/builtin/packages/font-util/package.py +++ b/var/spack/repos/builtin/packages/font-util/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-winitzki-cyrillic/package.py b/var/spack/repos/builtin/packages/font-winitzki-cyrillic/package.py index 2c4de3dde3..c6c8d01e83 100644 --- a/var/spack/repos/builtin/packages/font-winitzki-cyrillic/package.py +++ b/var/spack/repos/builtin/packages/font-winitzki-cyrillic/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/font-xfree86-type1/package.py b/var/spack/repos/builtin/packages/font-xfree86-type1/package.py index f84feedec8..9dda381cbe 100644 --- a/var/spack/repos/builtin/packages/font-xfree86-type1/package.py +++ b/var/spack/repos/builtin/packages/font-xfree86-type1/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/fontcacheproto/package.py b/var/spack/repos/builtin/packages/fontcacheproto/package.py index 94e952de52..2c5b0374fe 100644 --- a/var/spack/repos/builtin/packages/fontcacheproto/package.py +++ b/var/spack/repos/builtin/packages/fontcacheproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/fontconfig/package.py b/var/spack/repos/builtin/packages/fontconfig/package.py index f9ed9c583d..358e383785 100644 --- a/var/spack/repos/builtin/packages/fontconfig/package.py +++ b/var/spack/repos/builtin/packages/fontconfig/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/fontsproto/package.py b/var/spack/repos/builtin/packages/fontsproto/package.py index 527b3fe405..bd114069b3 100644 --- a/var/spack/repos/builtin/packages/fontsproto/package.py +++ b/var/spack/repos/builtin/packages/fontsproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/fonttosfnt/package.py b/var/spack/repos/builtin/packages/fonttosfnt/package.py index 30da56fd33..af7cbb07ed 100644 --- a/var/spack/repos/builtin/packages/fonttosfnt/package.py +++ b/var/spack/repos/builtin/packages/fonttosfnt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/fpc/package.py b/var/spack/repos/builtin/packages/fpc/package.py index 905aae3314..6e3f9d4353 100644 --- a/var/spack/repos/builtin/packages/fpc/package.py +++ b/var/spack/repos/builtin/packages/fpc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/fr-hit/package.py b/var/spack/repos/builtin/packages/fr-hit/package.py index 03974a9642..2c1a61e4f4 100644 --- a/var/spack/repos/builtin/packages/fr-hit/package.py +++ b/var/spack/repos/builtin/packages/fr-hit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/freebayes/package.py b/var/spack/repos/builtin/packages/freebayes/package.py index bd5c2b06a3..f8e20550e5 100644 --- a/var/spack/repos/builtin/packages/freebayes/package.py +++ b/var/spack/repos/builtin/packages/freebayes/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/freetype/package.py b/var/spack/repos/builtin/packages/freetype/package.py index 25bb29b454..7102e3429f 100644 --- a/var/spack/repos/builtin/packages/freetype/package.py +++ b/var/spack/repos/builtin/packages/freetype/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/fseq/package.py b/var/spack/repos/builtin/packages/fseq/package.py index 037aa4f648..41dcab6804 100644 --- a/var/spack/repos/builtin/packages/fseq/package.py +++ b/var/spack/repos/builtin/packages/fseq/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/fsl/package.py b/var/spack/repos/builtin/packages/fsl/package.py index 2191be1ce3..c14865622d 100644 --- a/var/spack/repos/builtin/packages/fsl/package.py +++ b/var/spack/repos/builtin/packages/fsl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/fslsfonts/package.py b/var/spack/repos/builtin/packages/fslsfonts/package.py index 14331a79fa..3153d556af 100644 --- a/var/spack/repos/builtin/packages/fslsfonts/package.py +++ b/var/spack/repos/builtin/packages/fslsfonts/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/fstobdf/package.py b/var/spack/repos/builtin/packages/fstobdf/package.py index 627826f8d7..a8abd4917f 100644 --- a/var/spack/repos/builtin/packages/fstobdf/package.py +++ b/var/spack/repos/builtin/packages/fstobdf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/funhpc/package.py b/var/spack/repos/builtin/packages/funhpc/package.py index 26863ae4f4..0cb1b1bf73 100644 --- a/var/spack/repos/builtin/packages/funhpc/package.py +++ b/var/spack/repos/builtin/packages/funhpc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gapbs/package.py b/var/spack/repos/builtin/packages/gapbs/package.py index 48826abaef..2dfd34b7f0 100644 --- a/var/spack/repos/builtin/packages/gapbs/package.py +++ b/var/spack/repos/builtin/packages/gapbs/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gapcloser/package.py b/var/spack/repos/builtin/packages/gapcloser/package.py index b59b46af00..cc7478dcc4 100644 --- a/var/spack/repos/builtin/packages/gapcloser/package.py +++ b/var/spack/repos/builtin/packages/gapcloser/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gapfiller/package.py b/var/spack/repos/builtin/packages/gapfiller/package.py index 43e6eeaac0..dc4e9ac9c8 100644 --- a/var/spack/repos/builtin/packages/gapfiller/package.py +++ b/var/spack/repos/builtin/packages/gapfiller/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gasnet/package.py b/var/spack/repos/builtin/packages/gasnet/package.py index 6b8a498671..44ff5bdfc9 100644 --- a/var/spack/repos/builtin/packages/gasnet/package.py +++ b/var/spack/repos/builtin/packages/gasnet/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gatk/package.py b/var/spack/repos/builtin/packages/gatk/package.py index 550d89fe4c..8ac97bae8b 100644 --- a/var/spack/repos/builtin/packages/gatk/package.py +++ b/var/spack/repos/builtin/packages/gatk/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gaussian/package.py b/var/spack/repos/builtin/packages/gaussian/package.py index ef8c599b94..e928d475ad 100644 --- a/var/spack/repos/builtin/packages/gaussian/package.py +++ b/var/spack/repos/builtin/packages/gaussian/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gawk/package.py b/var/spack/repos/builtin/packages/gawk/package.py index 8f9f205ff6..57744ceaa7 100644 --- a/var/spack/repos/builtin/packages/gawk/package.py +++ b/var/spack/repos/builtin/packages/gawk/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gblocks/package.py b/var/spack/repos/builtin/packages/gblocks/package.py index 7e6401bc6d..5ca22e44d0 100644 --- a/var/spack/repos/builtin/packages/gblocks/package.py +++ b/var/spack/repos/builtin/packages/gblocks/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py index 1415c87f8d..00e31fe325 100644 --- a/var/spack/repos/builtin/packages/gcc/package.py +++ b/var/spack/repos/builtin/packages/gcc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gccmakedep/package.py b/var/spack/repos/builtin/packages/gccmakedep/package.py index 0be991e041..8588cde8fe 100644 --- a/var/spack/repos/builtin/packages/gccmakedep/package.py +++ b/var/spack/repos/builtin/packages/gccmakedep/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gconf/package.py b/var/spack/repos/builtin/packages/gconf/package.py index 395ec2ff44..7449f550cf 100644 --- a/var/spack/repos/builtin/packages/gconf/package.py +++ b/var/spack/repos/builtin/packages/gconf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gcta/package.py b/var/spack/repos/builtin/packages/gcta/package.py index 4dd47759a3..5cbc05a1cf 100644 --- a/var/spack/repos/builtin/packages/gcta/package.py +++ b/var/spack/repos/builtin/packages/gcta/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gdal/package.py b/var/spack/repos/builtin/packages/gdal/package.py index 6f55b8b0d0..b62ea01af1 100644 --- a/var/spack/repos/builtin/packages/gdal/package.py +++ b/var/spack/repos/builtin/packages/gdal/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gdb/package.py b/var/spack/repos/builtin/packages/gdb/package.py index fa2e176ce6..18b9d8ae8b 100644 --- a/var/spack/repos/builtin/packages/gdb/package.py +++ b/var/spack/repos/builtin/packages/gdb/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gdbm/package.py b/var/spack/repos/builtin/packages/gdbm/package.py index 9a5f1bd12e..70754388aa 100644 --- a/var/spack/repos/builtin/packages/gdbm/package.py +++ b/var/spack/repos/builtin/packages/gdbm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gdk-pixbuf/package.py b/var/spack/repos/builtin/packages/gdk-pixbuf/package.py index 8397883b3f..7423cd5a31 100644 --- a/var/spack/repos/builtin/packages/gdk-pixbuf/package.py +++ b/var/spack/repos/builtin/packages/gdk-pixbuf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/geant4/package.py b/var/spack/repos/builtin/packages/geant4/package.py index 96498905a3..aa16b8e856 100644 --- a/var/spack/repos/builtin/packages/geant4/package.py +++ b/var/spack/repos/builtin/packages/geant4/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gearshifft/package.py b/var/spack/repos/builtin/packages/gearshifft/package.py index 4ea06f6ff4..685a3e692f 100644 --- a/var/spack/repos/builtin/packages/gearshifft/package.py +++ b/var/spack/repos/builtin/packages/gearshifft/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gemmlowp/package.py b/var/spack/repos/builtin/packages/gemmlowp/package.py index 7cd3047716..7f3847f7c7 100644 --- a/var/spack/repos/builtin/packages/gemmlowp/package.py +++ b/var/spack/repos/builtin/packages/gemmlowp/package.py @@ -1,5 +1,5 @@ ############################################################################# -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/genemark-et/package.py b/var/spack/repos/builtin/packages/genemark-et/package.py index faf5acce6a..34350a3c5a 100644 --- a/var/spack/repos/builtin/packages/genemark-et/package.py +++ b/var/spack/repos/builtin/packages/genemark-et/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/genometools/package.py b/var/spack/repos/builtin/packages/genometools/package.py index 00f359e6d2..e08a97b9b4 100644 --- a/var/spack/repos/builtin/packages/genometools/package.py +++ b/var/spack/repos/builtin/packages/genometools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/geos/package.py b/var/spack/repos/builtin/packages/geos/package.py index 7d5ccaec70..609073cc99 100644 --- a/var/spack/repos/builtin/packages/geos/package.py +++ b/var/spack/repos/builtin/packages/geos/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gettext/package.py b/var/spack/repos/builtin/packages/gettext/package.py index f25f3e7889..edbe120fe6 100644 --- a/var/spack/repos/builtin/packages/gettext/package.py +++ b/var/spack/repos/builtin/packages/gettext/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gflags/package.py b/var/spack/repos/builtin/packages/gflags/package.py index 05a168d6fa..68b91bcb74 100644 --- a/var/spack/repos/builtin/packages/gflags/package.py +++ b/var/spack/repos/builtin/packages/gflags/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ghost/package.py b/var/spack/repos/builtin/packages/ghost/package.py index 46f884e0f6..7a89adca66 100644 --- a/var/spack/repos/builtin/packages/ghost/package.py +++ b/var/spack/repos/builtin/packages/ghost/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ghostscript-fonts/package.py b/var/spack/repos/builtin/packages/ghostscript-fonts/package.py index 9dc7e8cead..69aa6851a2 100644 --- a/var/spack/repos/builtin/packages/ghostscript-fonts/package.py +++ b/var/spack/repos/builtin/packages/ghostscript-fonts/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ghostscript/package.py b/var/spack/repos/builtin/packages/ghostscript/package.py index b090909a62..15c0190964 100644 --- a/var/spack/repos/builtin/packages/ghostscript/package.py +++ b/var/spack/repos/builtin/packages/ghostscript/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/giflib/package.py b/var/spack/repos/builtin/packages/giflib/package.py index a320b3ceb5..e5dba22ff7 100644 --- a/var/spack/repos/builtin/packages/giflib/package.py +++ b/var/spack/repos/builtin/packages/giflib/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/git-imerge/package.py b/var/spack/repos/builtin/packages/git-imerge/package.py index 21ca1ec817..1c87833e69 100644 --- a/var/spack/repos/builtin/packages/git-imerge/package.py +++ b/var/spack/repos/builtin/packages/git-imerge/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/git-lfs/package.py b/var/spack/repos/builtin/packages/git-lfs/package.py index 7e557dd0a8..3250fcd53d 100644 --- a/var/spack/repos/builtin/packages/git-lfs/package.py +++ b/var/spack/repos/builtin/packages/git-lfs/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index 10225f196c..a31d7034d8 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gl2ps/package.py b/var/spack/repos/builtin/packages/gl2ps/package.py index fbe38d4bc9..d1dd9060ca 100644 --- a/var/spack/repos/builtin/packages/gl2ps/package.py +++ b/var/spack/repos/builtin/packages/gl2ps/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/glew/package.py b/var/spack/repos/builtin/packages/glew/package.py index 4ba7eb5894..529506a416 100644 --- a/var/spack/repos/builtin/packages/glew/package.py +++ b/var/spack/repos/builtin/packages/glew/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/glfmultiples/package.py b/var/spack/repos/builtin/packages/glfmultiples/package.py index 001e842264..be48f3a3ed 100644 --- a/var/spack/repos/builtin/packages/glfmultiples/package.py +++ b/var/spack/repos/builtin/packages/glfmultiples/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/glib/package.py b/var/spack/repos/builtin/packages/glib/package.py index a8bb034f04..e16b9ffee1 100644 --- a/var/spack/repos/builtin/packages/glib/package.py +++ b/var/spack/repos/builtin/packages/glib/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/glimmer/package.py b/var/spack/repos/builtin/packages/glimmer/package.py index e4b854efd8..2831b0b4b1 100644 --- a/var/spack/repos/builtin/packages/glimmer/package.py +++ b/var/spack/repos/builtin/packages/glimmer/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/glm/package.py b/var/spack/repos/builtin/packages/glm/package.py index d2bf9da282..aa103d5ee5 100644 --- a/var/spack/repos/builtin/packages/glm/package.py +++ b/var/spack/repos/builtin/packages/glm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/global/package.py b/var/spack/repos/builtin/packages/global/package.py index 040b7d6e71..401638e46a 100644 --- a/var/spack/repos/builtin/packages/global/package.py +++ b/var/spack/repos/builtin/packages/global/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/globalarrays/package.py b/var/spack/repos/builtin/packages/globalarrays/package.py index 2473be5620..2fe46e7b93 100644 --- a/var/spack/repos/builtin/packages/globalarrays/package.py +++ b/var/spack/repos/builtin/packages/globalarrays/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at IBM. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/globus-toolkit/package.py b/var/spack/repos/builtin/packages/globus-toolkit/package.py index 8ad63395c6..ce3ad3a299 100644 --- a/var/spack/repos/builtin/packages/globus-toolkit/package.py +++ b/var/spack/repos/builtin/packages/globus-toolkit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/glog/package.py b/var/spack/repos/builtin/packages/glog/package.py index 57adf51fde..ee55f1fb60 100644 --- a/var/spack/repos/builtin/packages/glog/package.py +++ b/var/spack/repos/builtin/packages/glog/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/glpk/package.py b/var/spack/repos/builtin/packages/glpk/package.py index 3768dbac83..7710bdf91c 100644 --- a/var/spack/repos/builtin/packages/glpk/package.py +++ b/var/spack/repos/builtin/packages/glpk/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/glproto/package.py b/var/spack/repos/builtin/packages/glproto/package.py index a8d51af7d1..1a585bf49e 100644 --- a/var/spack/repos/builtin/packages/glproto/package.py +++ b/var/spack/repos/builtin/packages/glproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gmake/package.py b/var/spack/repos/builtin/packages/gmake/package.py index 29042eaad6..d7a944e3b6 100644 --- a/var/spack/repos/builtin/packages/gmake/package.py +++ b/var/spack/repos/builtin/packages/gmake/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gmap-gsnap/package.py b/var/spack/repos/builtin/packages/gmap-gsnap/package.py index 00aec1d322..ce777edd72 100644 --- a/var/spack/repos/builtin/packages/gmap-gsnap/package.py +++ b/var/spack/repos/builtin/packages/gmap-gsnap/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gmime/package.py b/var/spack/repos/builtin/packages/gmime/package.py index d5d0e44d60..1df5b22939 100644 --- a/var/spack/repos/builtin/packages/gmime/package.py +++ b/var/spack/repos/builtin/packages/gmime/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gmp/package.py b/var/spack/repos/builtin/packages/gmp/package.py index 679b63f21d..bfafabaa0b 100644 --- a/var/spack/repos/builtin/packages/gmp/package.py +++ b/var/spack/repos/builtin/packages/gmp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gmsh/package.py b/var/spack/repos/builtin/packages/gmsh/package.py index aef49a3ea6..f798bd1e7f 100644 --- a/var/spack/repos/builtin/packages/gmsh/package.py +++ b/var/spack/repos/builtin/packages/gmsh/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gnat/package.py b/var/spack/repos/builtin/packages/gnat/package.py index 843d81d9e4..c02c475586 100644 --- a/var/spack/repos/builtin/packages/gnat/package.py +++ b/var/spack/repos/builtin/packages/gnat/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gnu-prolog/package.py b/var/spack/repos/builtin/packages/gnu-prolog/package.py index 819e57498a..fa6d3b9d8e 100644 --- a/var/spack/repos/builtin/packages/gnu-prolog/package.py +++ b/var/spack/repos/builtin/packages/gnu-prolog/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gnupg/package.py b/var/spack/repos/builtin/packages/gnupg/package.py index 854e7477ca..4079351b91 100644 --- a/var/spack/repos/builtin/packages/gnupg/package.py +++ b/var/spack/repos/builtin/packages/gnupg/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gnuplot/package.py b/var/spack/repos/builtin/packages/gnuplot/package.py index 12e2f13f20..e8c747bef1 100644 --- a/var/spack/repos/builtin/packages/gnuplot/package.py +++ b/var/spack/repos/builtin/packages/gnuplot/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gnutls/package.py b/var/spack/repos/builtin/packages/gnutls/package.py index 6c4a47f814..247d2d485e 100644 --- a/var/spack/repos/builtin/packages/gnutls/package.py +++ b/var/spack/repos/builtin/packages/gnutls/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/go-bootstrap/package.py b/var/spack/repos/builtin/packages/go-bootstrap/package.py index 0228aa74d9..37cf69cb70 100644 --- a/var/spack/repos/builtin/packages/go-bootstrap/package.py +++ b/var/spack/repos/builtin/packages/go-bootstrap/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/go/package.py b/var/spack/repos/builtin/packages/go/package.py index b112ebe7d8..4649850bd6 100644 --- a/var/spack/repos/builtin/packages/go/package.py +++ b/var/spack/repos/builtin/packages/go/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gobject-introspection/package.py b/var/spack/repos/builtin/packages/gobject-introspection/package.py index 2c2ff6078c..350105af32 100644 --- a/var/spack/repos/builtin/packages/gobject-introspection/package.py +++ b/var/spack/repos/builtin/packages/gobject-introspection/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/googletest/package.py b/var/spack/repos/builtin/packages/googletest/package.py index 5eab658bac..bb9661a3db 100644 --- a/var/spack/repos/builtin/packages/googletest/package.py +++ b/var/spack/repos/builtin/packages/googletest/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gotcha/package.py b/var/spack/repos/builtin/packages/gotcha/package.py index 051b678d75..7842b9bec0 100644 --- a/var/spack/repos/builtin/packages/gotcha/package.py +++ b/var/spack/repos/builtin/packages/gotcha/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gource/package.py b/var/spack/repos/builtin/packages/gource/package.py index ee01fc3364..44267c1805 100644 --- a/var/spack/repos/builtin/packages/gource/package.py +++ b/var/spack/repos/builtin/packages/gource/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gperf/package.py b/var/spack/repos/builtin/packages/gperf/package.py index e51f86fb4b..8dbb394878 100644 --- a/var/spack/repos/builtin/packages/gperf/package.py +++ b/var/spack/repos/builtin/packages/gperf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gperftools/package.py b/var/spack/repos/builtin/packages/gperftools/package.py index c5653f696c..49305fe7ff 100644 --- a/var/spack/repos/builtin/packages/gperftools/package.py +++ b/var/spack/repos/builtin/packages/gperftools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/grackle/package.py b/var/spack/repos/builtin/packages/grackle/package.py index 050d0bdf5f..885434f61d 100644 --- a/var/spack/repos/builtin/packages/grackle/package.py +++ b/var/spack/repos/builtin/packages/grackle/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gradle/package.py b/var/spack/repos/builtin/packages/gradle/package.py index 1d4112132a..483ebb95aa 100644 --- a/var/spack/repos/builtin/packages/gradle/package.py +++ b/var/spack/repos/builtin/packages/gradle/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/grandr/package.py b/var/spack/repos/builtin/packages/grandr/package.py index 14da4896f4..da42ad807d 100644 --- a/var/spack/repos/builtin/packages/grandr/package.py +++ b/var/spack/repos/builtin/packages/grandr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/graph500/package.py b/var/spack/repos/builtin/packages/graph500/package.py index 630cadb539..652138d6c2 100644 --- a/var/spack/repos/builtin/packages/graph500/package.py +++ b/var/spack/repos/builtin/packages/graph500/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/graphlib/package.py b/var/spack/repos/builtin/packages/graphlib/package.py index 0fa82267d8..e2ba37d9f2 100644 --- a/var/spack/repos/builtin/packages/graphlib/package.py +++ b/var/spack/repos/builtin/packages/graphlib/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/graphmap/package.py b/var/spack/repos/builtin/packages/graphmap/package.py index 0e4a676588..bc35f1b247 100644 --- a/var/spack/repos/builtin/packages/graphmap/package.py +++ b/var/spack/repos/builtin/packages/graphmap/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/graphviz/package.py b/var/spack/repos/builtin/packages/graphviz/package.py index 33b671aa96..905c0c8892 100644 --- a/var/spack/repos/builtin/packages/graphviz/package.py +++ b/var/spack/repos/builtin/packages/graphviz/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/grib-api/package.py b/var/spack/repos/builtin/packages/grib-api/package.py index 3e23a7e4fd..f38bdeb057 100644 --- a/var/spack/repos/builtin/packages/grib-api/package.py +++ b/var/spack/repos/builtin/packages/grib-api/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/groff/package.py b/var/spack/repos/builtin/packages/groff/package.py index bc10c102be..480184f2a7 100644 --- a/var/spack/repos/builtin/packages/groff/package.py +++ b/var/spack/repos/builtin/packages/groff/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gromacs/package.py b/var/spack/repos/builtin/packages/gromacs/package.py index e4bfeb2f84..d65dffd55b 100644 --- a/var/spack/repos/builtin/packages/gromacs/package.py +++ b/var/spack/repos/builtin/packages/gromacs/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gsl/package.py b/var/spack/repos/builtin/packages/gsl/package.py index 27be6b0d35..c10b35347b 100644 --- a/var/spack/repos/builtin/packages/gsl/package.py +++ b/var/spack/repos/builtin/packages/gsl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gslib/package.py b/var/spack/repos/builtin/packages/gslib/package.py index dd179a64cd..5af8408aae 100644 --- a/var/spack/repos/builtin/packages/gslib/package.py +++ b/var/spack/repos/builtin/packages/gslib/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gtkorvo-atl/package.py b/var/spack/repos/builtin/packages/gtkorvo-atl/package.py index 72bcf12c1d..71ae342886 100644 --- a/var/spack/repos/builtin/packages/gtkorvo-atl/package.py +++ b/var/spack/repos/builtin/packages/gtkorvo-atl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gtkorvo-cercs-env/package.py b/var/spack/repos/builtin/packages/gtkorvo-cercs-env/package.py index 2fcfc21467..40f55d3425 100644 --- a/var/spack/repos/builtin/packages/gtkorvo-cercs-env/package.py +++ b/var/spack/repos/builtin/packages/gtkorvo-cercs-env/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gtkorvo-dill/package.py b/var/spack/repos/builtin/packages/gtkorvo-dill/package.py index af2c433ed6..00b444e32b 100644 --- a/var/spack/repos/builtin/packages/gtkorvo-dill/package.py +++ b/var/spack/repos/builtin/packages/gtkorvo-dill/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gtkorvo-enet/package.py b/var/spack/repos/builtin/packages/gtkorvo-enet/package.py index 2130085b93..eece0ad91a 100644 --- a/var/spack/repos/builtin/packages/gtkorvo-enet/package.py +++ b/var/spack/repos/builtin/packages/gtkorvo-enet/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gtkplus/package.py b/var/spack/repos/builtin/packages/gtkplus/package.py index fa001a4a33..72d6501adb 100644 --- a/var/spack/repos/builtin/packages/gtkplus/package.py +++ b/var/spack/repos/builtin/packages/gtkplus/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/gts/package.py b/var/spack/repos/builtin/packages/gts/package.py index b340df34f2..ce9f3d15fe 100644 --- a/var/spack/repos/builtin/packages/gts/package.py +++ b/var/spack/repos/builtin/packages/gts/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/guidance/package.py b/var/spack/repos/builtin/packages/guidance/package.py index 6cb4e0cfc6..3059c871ee 100644 --- a/var/spack/repos/builtin/packages/guidance/package.py +++ b/var/spack/repos/builtin/packages/guidance/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/guile/package.py b/var/spack/repos/builtin/packages/guile/package.py index 328f02f005..0bf23011b2 100644 --- a/var/spack/repos/builtin/packages/guile/package.py +++ b/var/spack/repos/builtin/packages/guile/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/h5hut/package.py b/var/spack/repos/builtin/packages/h5hut/package.py index ed9ede92d6..c476a6535a 100644 --- a/var/spack/repos/builtin/packages/h5hut/package.py +++ b/var/spack/repos/builtin/packages/h5hut/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/h5utils/package.py b/var/spack/repos/builtin/packages/h5utils/package.py index 202eb0e232..5aff73e267 100644 --- a/var/spack/repos/builtin/packages/h5utils/package.py +++ b/var/spack/repos/builtin/packages/h5utils/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/h5z-zfp/package.py b/var/spack/repos/builtin/packages/h5z-zfp/package.py index 34eb81109c..d4cae6fe88 100644 --- a/var/spack/repos/builtin/packages/h5z-zfp/package.py +++ b/var/spack/repos/builtin/packages/h5z-zfp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/hacckernels/package.py b/var/spack/repos/builtin/packages/hacckernels/package.py index db48910165..39a11c7011 100644 --- a/var/spack/repos/builtin/packages/hacckernels/package.py +++ b/var/spack/repos/builtin/packages/hacckernels/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/hadoop/package.py b/var/spack/repos/builtin/packages/hadoop/package.py index ebc8e4604f..29fead0755 100644 --- a/var/spack/repos/builtin/packages/hadoop/package.py +++ b/var/spack/repos/builtin/packages/hadoop/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/hapcut2/package.py b/var/spack/repos/builtin/packages/hapcut2/package.py index 612a1c25ba..033a552145 100644 --- a/var/spack/repos/builtin/packages/hapcut2/package.py +++ b/var/spack/repos/builtin/packages/hapcut2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/haploview/package.py b/var/spack/repos/builtin/packages/haploview/package.py index 9d1b4b3e0f..faa0c8976a 100644 --- a/var/spack/repos/builtin/packages/haploview/package.py +++ b/var/spack/repos/builtin/packages/haploview/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/harfbuzz/package.py b/var/spack/repos/builtin/packages/harfbuzz/package.py index f35f2f853f..3624bc57b2 100644 --- a/var/spack/repos/builtin/packages/harfbuzz/package.py +++ b/var/spack/repos/builtin/packages/harfbuzz/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/harminv/package.py b/var/spack/repos/builtin/packages/harminv/package.py index d92405e8c7..ef38a4d9b8 100644 --- a/var/spack/repos/builtin/packages/harminv/package.py +++ b/var/spack/repos/builtin/packages/harminv/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/hdf/package.py b/var/spack/repos/builtin/packages/hdf/package.py index 0aefe3aa8c..41d327deed 100644 --- a/var/spack/repos/builtin/packages/hdf/package.py +++ b/var/spack/repos/builtin/packages/hdf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/hdf5-blosc/package.py b/var/spack/repos/builtin/packages/hdf5-blosc/package.py index 704f508cb3..168bcb07ac 100644 --- a/var/spack/repos/builtin/packages/hdf5-blosc/package.py +++ b/var/spack/repos/builtin/packages/hdf5-blosc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index 68c81f68cb..2e8ac73e79 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/help2man/package.py b/var/spack/repos/builtin/packages/help2man/package.py index cc86affeaa..ede8d67848 100644 --- a/var/spack/repos/builtin/packages/help2man/package.py +++ b/var/spack/repos/builtin/packages/help2man/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/hepmc/package.py b/var/spack/repos/builtin/packages/hepmc/package.py index a387ff6131..7b06eb81b5 100644 --- a/var/spack/repos/builtin/packages/hepmc/package.py +++ b/var/spack/repos/builtin/packages/hepmc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/heppdt/package.py b/var/spack/repos/builtin/packages/heppdt/package.py index 613d8d9f8e..fdeaaa8997 100644 --- a/var/spack/repos/builtin/packages/heppdt/package.py +++ b/var/spack/repos/builtin/packages/heppdt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/highfive/package.py b/var/spack/repos/builtin/packages/highfive/package.py index 588e445065..adef78cab7 100644 --- a/var/spack/repos/builtin/packages/highfive/package.py +++ b/var/spack/repos/builtin/packages/highfive/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/highwayhash/package.py b/var/spack/repos/builtin/packages/highwayhash/package.py index 3a12736aae..71b2472db7 100644 --- a/var/spack/repos/builtin/packages/highwayhash/package.py +++ b/var/spack/repos/builtin/packages/highwayhash/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/hiop/package.py b/var/spack/repos/builtin/packages/hiop/package.py index 157d93e314..5393f19464 100644 --- a/var/spack/repos/builtin/packages/hiop/package.py +++ b/var/spack/repos/builtin/packages/hiop/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/hisat2/package.py b/var/spack/repos/builtin/packages/hisat2/package.py index 1b945c61c8..ea123a6b85 100644 --- a/var/spack/repos/builtin/packages/hisat2/package.py +++ b/var/spack/repos/builtin/packages/hisat2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/hmmer/package.py b/var/spack/repos/builtin/packages/hmmer/package.py index 2681282b7d..e38dfc80bb 100644 --- a/var/spack/repos/builtin/packages/hmmer/package.py +++ b/var/spack/repos/builtin/packages/hmmer/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/hoomd-blue/package.py b/var/spack/repos/builtin/packages/hoomd-blue/package.py index 8b0099f291..3aed18ce27 100644 --- a/var/spack/repos/builtin/packages/hoomd-blue/package.py +++ b/var/spack/repos/builtin/packages/hoomd-blue/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/hpccg/package.py b/var/spack/repos/builtin/packages/hpccg/package.py index 97fddc4f12..47cbb3cbe0 100644 --- a/var/spack/repos/builtin/packages/hpccg/package.py +++ b/var/spack/repos/builtin/packages/hpccg/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/hpctoolkit-externals/package.py b/var/spack/repos/builtin/packages/hpctoolkit-externals/package.py index 73ee39539f..dcd9d93172 100644 --- a/var/spack/repos/builtin/packages/hpctoolkit-externals/package.py +++ b/var/spack/repos/builtin/packages/hpctoolkit-externals/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/hpctoolkit/package.py b/var/spack/repos/builtin/packages/hpctoolkit/package.py index 14be6af8ef..8b66e168ea 100644 --- a/var/spack/repos/builtin/packages/hpctoolkit/package.py +++ b/var/spack/repos/builtin/packages/hpctoolkit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/hpgmg/package.py b/var/spack/repos/builtin/packages/hpgmg/package.py index 162306a06e..3a5208493f 100644 --- a/var/spack/repos/builtin/packages/hpgmg/package.py +++ b/var/spack/repos/builtin/packages/hpgmg/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/hpl/package.py b/var/spack/repos/builtin/packages/hpl/package.py index 0c484fc1f7..71b07c638d 100644 --- a/var/spack/repos/builtin/packages/hpl/package.py +++ b/var/spack/repos/builtin/packages/hpl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/hpx5/package.py b/var/spack/repos/builtin/packages/hpx5/package.py index f489a1bf9f..0b2270dad0 100644 --- a/var/spack/repos/builtin/packages/hpx5/package.py +++ b/var/spack/repos/builtin/packages/hpx5/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/hsakmt/package.py b/var/spack/repos/builtin/packages/hsakmt/package.py index 5574486066..ea6726d424 100644 --- a/var/spack/repos/builtin/packages/hsakmt/package.py +++ b/var/spack/repos/builtin/packages/hsakmt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/hstr/package.py b/var/spack/repos/builtin/packages/hstr/package.py index e019e9c3af..b726e94442 100644 --- a/var/spack/repos/builtin/packages/hstr/package.py +++ b/var/spack/repos/builtin/packages/hstr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/htop/package.py b/var/spack/repos/builtin/packages/htop/package.py index 168c03302d..55865a6ee1 100644 --- a/var/spack/repos/builtin/packages/htop/package.py +++ b/var/spack/repos/builtin/packages/htop/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/htslib/package.py b/var/spack/repos/builtin/packages/htslib/package.py index 000c68e245..39497fdc3c 100644 --- a/var/spack/repos/builtin/packages/htslib/package.py +++ b/var/spack/repos/builtin/packages/htslib/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/httpie/package.py b/var/spack/repos/builtin/packages/httpie/package.py index 2ec4c6eaad..9cee69fd38 100644 --- a/var/spack/repos/builtin/packages/httpie/package.py +++ b/var/spack/repos/builtin/packages/httpie/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/hub/package.py b/var/spack/repos/builtin/packages/hub/package.py index ff38385242..c398e19279 100644 --- a/var/spack/repos/builtin/packages/hub/package.py +++ b/var/spack/repos/builtin/packages/hub/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/hunspell/package.py b/var/spack/repos/builtin/packages/hunspell/package.py index 2fef3d369e..67450b6cbf 100644 --- a/var/spack/repos/builtin/packages/hunspell/package.py +++ b/var/spack/repos/builtin/packages/hunspell/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/hwloc/package.py b/var/spack/repos/builtin/packages/hwloc/package.py index c3f51ef0c4..6e5d2d7ebc 100644 --- a/var/spack/repos/builtin/packages/hwloc/package.py +++ b/var/spack/repos/builtin/packages/hwloc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/hybpiper/package.py b/var/spack/repos/builtin/packages/hybpiper/package.py index c3e3a22b13..102d9ed289 100644 --- a/var/spack/repos/builtin/packages/hybpiper/package.py +++ b/var/spack/repos/builtin/packages/hybpiper/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/hydra/package.py b/var/spack/repos/builtin/packages/hydra/package.py index 428f7db386..58f94261c6 100644 --- a/var/spack/repos/builtin/packages/hydra/package.py +++ b/var/spack/repos/builtin/packages/hydra/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/hypre/package.py b/var/spack/repos/builtin/packages/hypre/package.py index 6f41e3840b..d95de54d68 100644 --- a/var/spack/repos/builtin/packages/hypre/package.py +++ b/var/spack/repos/builtin/packages/hypre/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/i3/package.py b/var/spack/repos/builtin/packages/i3/package.py index cf9380919d..cc12027578 100644 --- a/var/spack/repos/builtin/packages/i3/package.py +++ b/var/spack/repos/builtin/packages/i3/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ibmisc/package.py b/var/spack/repos/builtin/packages/ibmisc/package.py index 8fcf7980c8..ec8072e461 100644 --- a/var/spack/repos/builtin/packages/ibmisc/package.py +++ b/var/spack/repos/builtin/packages/ibmisc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/iceauth/package.py b/var/spack/repos/builtin/packages/iceauth/package.py index 6f15312ebc..665f0d74d5 100644 --- a/var/spack/repos/builtin/packages/iceauth/package.py +++ b/var/spack/repos/builtin/packages/iceauth/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/icedtea/package.py b/var/spack/repos/builtin/packages/icedtea/package.py index 39a3084d00..bc0b5ddc66 100644 --- a/var/spack/repos/builtin/packages/icedtea/package.py +++ b/var/spack/repos/builtin/packages/icedtea/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/icet/package.py b/var/spack/repos/builtin/packages/icet/package.py index d8591a2411..ff934c553e 100644 --- a/var/spack/repos/builtin/packages/icet/package.py +++ b/var/spack/repos/builtin/packages/icet/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ico/package.py b/var/spack/repos/builtin/packages/ico/package.py index 1e07bfa18c..47bfce296f 100644 --- a/var/spack/repos/builtin/packages/ico/package.py +++ b/var/spack/repos/builtin/packages/ico/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/icu4c/package.py b/var/spack/repos/builtin/packages/icu4c/package.py index da5b7cc842..39523b1563 100644 --- a/var/spack/repos/builtin/packages/icu4c/package.py +++ b/var/spack/repos/builtin/packages/icu4c/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/id3lib/package.py b/var/spack/repos/builtin/packages/id3lib/package.py index da4c513c63..a9315a4df1 100644 --- a/var/spack/repos/builtin/packages/id3lib/package.py +++ b/var/spack/repos/builtin/packages/id3lib/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/idba/package.py b/var/spack/repos/builtin/packages/idba/package.py index d886ac0455..47b10bf6d8 100644 --- a/var/spack/repos/builtin/packages/idba/package.py +++ b/var/spack/repos/builtin/packages/idba/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/igraph/package.py b/var/spack/repos/builtin/packages/igraph/package.py index 4ec2e71555..ef88274200 100644 --- a/var/spack/repos/builtin/packages/igraph/package.py +++ b/var/spack/repos/builtin/packages/igraph/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/igv/package.py b/var/spack/repos/builtin/packages/igv/package.py index 7198024ab6..b905520629 100644 --- a/var/spack/repos/builtin/packages/igv/package.py +++ b/var/spack/repos/builtin/packages/igv/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/igvtools/package.py b/var/spack/repos/builtin/packages/igvtools/package.py index 18274c54be..03e8dee653 100644 --- a/var/spack/repos/builtin/packages/igvtools/package.py +++ b/var/spack/repos/builtin/packages/igvtools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ilmbase/package.py b/var/spack/repos/builtin/packages/ilmbase/package.py index 75e52d66c2..4f4a9189a2 100644 --- a/var/spack/repos/builtin/packages/ilmbase/package.py +++ b/var/spack/repos/builtin/packages/ilmbase/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/image-magick/package.py b/var/spack/repos/builtin/packages/image-magick/package.py index 24b92132a0..ac3e8cb09d 100644 --- a/var/spack/repos/builtin/packages/image-magick/package.py +++ b/var/spack/repos/builtin/packages/image-magick/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/imake/package.py b/var/spack/repos/builtin/packages/imake/package.py index 01b8c28d98..2439828ae3 100644 --- a/var/spack/repos/builtin/packages/imake/package.py +++ b/var/spack/repos/builtin/packages/imake/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/impute2/package.py b/var/spack/repos/builtin/packages/impute2/package.py index 44993a306f..0563957e6a 100644 --- a/var/spack/repos/builtin/packages/impute2/package.py +++ b/var/spack/repos/builtin/packages/impute2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/infernal/package.py b/var/spack/repos/builtin/packages/infernal/package.py index f84722964d..6dbd7c329c 100644 --- a/var/spack/repos/builtin/packages/infernal/package.py +++ b/var/spack/repos/builtin/packages/infernal/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/inputproto/package.py b/var/spack/repos/builtin/packages/inputproto/package.py index 24ad2d20ab..9f3d0a98cf 100644 --- a/var/spack/repos/builtin/packages/inputproto/package.py +++ b/var/spack/repos/builtin/packages/inputproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/intel-daal/package.py b/var/spack/repos/builtin/packages/intel-daal/package.py index 9a4f207710..cc4c00a4a3 100644 --- a/var/spack/repos/builtin/packages/intel-daal/package.py +++ b/var/spack/repos/builtin/packages/intel-daal/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/intel-gpu-tools/package.py b/var/spack/repos/builtin/packages/intel-gpu-tools/package.py index 9a96f34450..ca40f456c1 100644 --- a/var/spack/repos/builtin/packages/intel-gpu-tools/package.py +++ b/var/spack/repos/builtin/packages/intel-gpu-tools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/intel-ipp/package.py b/var/spack/repos/builtin/packages/intel-ipp/package.py index 6046d864a2..545d0a6335 100644 --- a/var/spack/repos/builtin/packages/intel-ipp/package.py +++ b/var/spack/repos/builtin/packages/intel-ipp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/intel-mkl-dnn/package.py b/var/spack/repos/builtin/packages/intel-mkl-dnn/package.py index 7dd6c4dc3b..5ca16b7460 100644 --- a/var/spack/repos/builtin/packages/intel-mkl-dnn/package.py +++ b/var/spack/repos/builtin/packages/intel-mkl-dnn/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/intel-mkl/package.py b/var/spack/repos/builtin/packages/intel-mkl/package.py index 8b5ad1ee92..7c1ed17800 100644 --- a/var/spack/repos/builtin/packages/intel-mkl/package.py +++ b/var/spack/repos/builtin/packages/intel-mkl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/intel-mpi/package.py b/var/spack/repos/builtin/packages/intel-mpi/package.py index 44014c7f59..40536d54f8 100644 --- a/var/spack/repos/builtin/packages/intel-mpi/package.py +++ b/var/spack/repos/builtin/packages/intel-mpi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py index e49a5a8005..f9c9620d0b 100644 --- a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py +++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/intel-tbb/package.py b/var/spack/repos/builtin/packages/intel-tbb/package.py index 053725fd22..c6b5fe5eed 100644 --- a/var/spack/repos/builtin/packages/intel-tbb/package.py +++ b/var/spack/repos/builtin/packages/intel-tbb/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/intel-xed/package.py b/var/spack/repos/builtin/packages/intel-xed/package.py index 0ca6a63746..25f8057679 100644 --- a/var/spack/repos/builtin/packages/intel-xed/package.py +++ b/var/spack/repos/builtin/packages/intel-xed/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/intel/package.py b/var/spack/repos/builtin/packages/intel/package.py index a2ef5ccefb..cba11db9af 100644 --- a/var/spack/repos/builtin/packages/intel/package.py +++ b/var/spack/repos/builtin/packages/intel/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/intltool/package.py b/var/spack/repos/builtin/packages/intltool/package.py index 0c84d3b516..fdb94d625f 100644 --- a/var/spack/repos/builtin/packages/intltool/package.py +++ b/var/spack/repos/builtin/packages/intltool/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ior/package.py b/var/spack/repos/builtin/packages/ior/package.py index 96b5a455c9..b909d43471 100644 --- a/var/spack/repos/builtin/packages/ior/package.py +++ b/var/spack/repos/builtin/packages/ior/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/iozone/package.py b/var/spack/repos/builtin/packages/iozone/package.py index c75595ba14..5a6727aec3 100644 --- a/var/spack/repos/builtin/packages/iozone/package.py +++ b/var/spack/repos/builtin/packages/iozone/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ipopt/package.py b/var/spack/repos/builtin/packages/ipopt/package.py index da8f798908..3a9f606bb6 100644 --- a/var/spack/repos/builtin/packages/ipopt/package.py +++ b/var/spack/repos/builtin/packages/ipopt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/isaac-server/package.py b/var/spack/repos/builtin/packages/isaac-server/package.py index 9ae45137ec..f54f4dd989 100644 --- a/var/spack/repos/builtin/packages/isaac-server/package.py +++ b/var/spack/repos/builtin/packages/isaac-server/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/isaac/package.py b/var/spack/repos/builtin/packages/isaac/package.py index 72bbaed8a7..5be55e69fe 100644 --- a/var/spack/repos/builtin/packages/isaac/package.py +++ b/var/spack/repos/builtin/packages/isaac/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/isl/package.py b/var/spack/repos/builtin/packages/isl/package.py index f9e9149414..5ea9881820 100644 --- a/var/spack/repos/builtin/packages/isl/package.py +++ b/var/spack/repos/builtin/packages/isl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/itstool/package.py b/var/spack/repos/builtin/packages/itstool/package.py index 00e273bb2f..b46d24e953 100644 --- a/var/spack/repos/builtin/packages/itstool/package.py +++ b/var/spack/repos/builtin/packages/itstool/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/itsx/package.py b/var/spack/repos/builtin/packages/itsx/package.py index 84dc525740..c1a54db3b6 100644 --- a/var/spack/repos/builtin/packages/itsx/package.py +++ b/var/spack/repos/builtin/packages/itsx/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/jags/package.py b/var/spack/repos/builtin/packages/jags/package.py index 1b0af86af0..1c73025463 100644 --- a/var/spack/repos/builtin/packages/jags/package.py +++ b/var/spack/repos/builtin/packages/jags/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/jansson/package.py b/var/spack/repos/builtin/packages/jansson/package.py index 7379c6ef19..e9052f83aa 100644 --- a/var/spack/repos/builtin/packages/jansson/package.py +++ b/var/spack/repos/builtin/packages/jansson/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/jasper/package.py b/var/spack/repos/builtin/packages/jasper/package.py index 5739f902a1..2ae1234903 100644 --- a/var/spack/repos/builtin/packages/jasper/package.py +++ b/var/spack/repos/builtin/packages/jasper/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/jbigkit/package.py b/var/spack/repos/builtin/packages/jbigkit/package.py index 4bd1ae3d6c..8c3e792507 100644 --- a/var/spack/repos/builtin/packages/jbigkit/package.py +++ b/var/spack/repos/builtin/packages/jbigkit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/jchronoss/package.py b/var/spack/repos/builtin/packages/jchronoss/package.py index d61d00284c..1039ed25f6 100644 --- a/var/spack/repos/builtin/packages/jchronoss/package.py +++ b/var/spack/repos/builtin/packages/jchronoss/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/jdk/package.py b/var/spack/repos/builtin/packages/jdk/package.py index 9c221fa364..d377b67ee5 100644 --- a/var/spack/repos/builtin/packages/jdk/package.py +++ b/var/spack/repos/builtin/packages/jdk/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/jellyfish/package.py b/var/spack/repos/builtin/packages/jellyfish/package.py index f5e62a828e..e3c31566c1 100644 --- a/var/spack/repos/builtin/packages/jellyfish/package.py +++ b/var/spack/repos/builtin/packages/jellyfish/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/jemalloc/package.py b/var/spack/repos/builtin/packages/jemalloc/package.py index 0534c72ed5..5d984e06f5 100644 --- a/var/spack/repos/builtin/packages/jemalloc/package.py +++ b/var/spack/repos/builtin/packages/jemalloc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/jmol/package.py b/var/spack/repos/builtin/packages/jmol/package.py index 0688d63816..eda8dbe877 100644 --- a/var/spack/repos/builtin/packages/jmol/package.py +++ b/var/spack/repos/builtin/packages/jmol/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/jq/package.py b/var/spack/repos/builtin/packages/jq/package.py index 1d7d912a91..be5a31d19d 100644 --- a/var/spack/repos/builtin/packages/jq/package.py +++ b/var/spack/repos/builtin/packages/jq/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/json-c/package.py b/var/spack/repos/builtin/packages/json-c/package.py index 472fb2af13..0579e1fe9a 100644 --- a/var/spack/repos/builtin/packages/json-c/package.py +++ b/var/spack/repos/builtin/packages/json-c/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/json-cwx/package.py b/var/spack/repos/builtin/packages/json-cwx/package.py index bd331acb03..3eefca9b71 100644 --- a/var/spack/repos/builtin/packages/json-cwx/package.py +++ b/var/spack/repos/builtin/packages/json-cwx/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/json-glib/package.py b/var/spack/repos/builtin/packages/json-glib/package.py index 07b067c22f..243f77cb19 100644 --- a/var/spack/repos/builtin/packages/json-glib/package.py +++ b/var/spack/repos/builtin/packages/json-glib/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/jsoncpp/package.py b/var/spack/repos/builtin/packages/jsoncpp/package.py index 3b486bf356..fe82bca877 100644 --- a/var/spack/repos/builtin/packages/jsoncpp/package.py +++ b/var/spack/repos/builtin/packages/jsoncpp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/judy/package.py b/var/spack/repos/builtin/packages/judy/package.py index 87b061bd33..1fb81c0ad7 100644 --- a/var/spack/repos/builtin/packages/judy/package.py +++ b/var/spack/repos/builtin/packages/judy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/julia/package.py b/var/spack/repos/builtin/packages/julia/package.py index 6382475f97..f6d363ddb8 100644 --- a/var/spack/repos/builtin/packages/julia/package.py +++ b/var/spack/repos/builtin/packages/julia/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/kaks-calculator/package.py b/var/spack/repos/builtin/packages/kaks-calculator/package.py index 622e499e7f..44f6e7bb53 100644 --- a/var/spack/repos/builtin/packages/kaks-calculator/package.py +++ b/var/spack/repos/builtin/packages/kaks-calculator/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/kaldi/package.py b/var/spack/repos/builtin/packages/kaldi/package.py index 58360df08f..229b6a1939 100644 --- a/var/spack/repos/builtin/packages/kaldi/package.py +++ b/var/spack/repos/builtin/packages/kaldi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/kallisto/package.py b/var/spack/repos/builtin/packages/kallisto/package.py index 1d0cb35a18..60266b7217 100644 --- a/var/spack/repos/builtin/packages/kallisto/package.py +++ b/var/spack/repos/builtin/packages/kallisto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/kbproto/package.py b/var/spack/repos/builtin/packages/kbproto/package.py index 7f767a8c8b..a820c28b75 100644 --- a/var/spack/repos/builtin/packages/kbproto/package.py +++ b/var/spack/repos/builtin/packages/kbproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/kdiff3/package.py b/var/spack/repos/builtin/packages/kdiff3/package.py index 4d60416497..39f384641b 100644 --- a/var/spack/repos/builtin/packages/kdiff3/package.py +++ b/var/spack/repos/builtin/packages/kdiff3/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/kealib/package.py b/var/spack/repos/builtin/packages/kealib/package.py index 3b24a08393..6610cf6745 100644 --- a/var/spack/repos/builtin/packages/kealib/package.py +++ b/var/spack/repos/builtin/packages/kealib/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/kentutils/package.py b/var/spack/repos/builtin/packages/kentutils/package.py index 3fdd495a17..9e807df0e1 100644 --- a/var/spack/repos/builtin/packages/kentutils/package.py +++ b/var/spack/repos/builtin/packages/kentutils/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/kmergenie/package.py b/var/spack/repos/builtin/packages/kmergenie/package.py index 7f64892d70..031eb15964 100644 --- a/var/spack/repos/builtin/packages/kmergenie/package.py +++ b/var/spack/repos/builtin/packages/kmergenie/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/kokkos/package.py b/var/spack/repos/builtin/packages/kokkos/package.py index e1ebf79eca..0494ab938c 100644 --- a/var/spack/repos/builtin/packages/kokkos/package.py +++ b/var/spack/repos/builtin/packages/kokkos/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/kraken/package.py b/var/spack/repos/builtin/packages/kraken/package.py index 3994c8c138..4039c426b8 100644 --- a/var/spack/repos/builtin/packages/kraken/package.py +++ b/var/spack/repos/builtin/packages/kraken/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/krims/package.py b/var/spack/repos/builtin/packages/krims/package.py index f64092de6c..3fa405b669 100644 --- a/var/spack/repos/builtin/packages/krims/package.py +++ b/var/spack/repos/builtin/packages/krims/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/kripke/package.py b/var/spack/repos/builtin/packages/kripke/package.py index d2030cbcfe..a902d9f538 100644 --- a/var/spack/repos/builtin/packages/kripke/package.py +++ b/var/spack/repos/builtin/packages/kripke/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/kvasir-mpl/package.py b/var/spack/repos/builtin/packages/kvasir-mpl/package.py index 33972c405d..35470eee1a 100644 --- a/var/spack/repos/builtin/packages/kvasir-mpl/package.py +++ b/var/spack/repos/builtin/packages/kvasir-mpl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/laghos/package.py b/var/spack/repos/builtin/packages/laghos/package.py index 3b6e23307c..c13e1a010d 100644 --- a/var/spack/repos/builtin/packages/laghos/package.py +++ b/var/spack/repos/builtin/packages/laghos/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/lammps/package.py b/var/spack/repos/builtin/packages/lammps/package.py index 994a10373e..d555899d04 100644 --- a/var/spack/repos/builtin/packages/lammps/package.py +++ b/var/spack/repos/builtin/packages/lammps/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/last/package.py b/var/spack/repos/builtin/packages/last/package.py index 34054313f7..d131433947 100644 --- a/var/spack/repos/builtin/packages/last/package.py +++ b/var/spack/repos/builtin/packages/last/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/launchmon/package.py b/var/spack/repos/builtin/packages/launchmon/package.py index 5697a1f370..233c49d5a3 100644 --- a/var/spack/repos/builtin/packages/launchmon/package.py +++ b/var/spack/repos/builtin/packages/launchmon/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/lazyten/package.py b/var/spack/repos/builtin/packages/lazyten/package.py index 4827b9495e..3b5a2829d1 100644 --- a/var/spack/repos/builtin/packages/lazyten/package.py +++ b/var/spack/repos/builtin/packages/lazyten/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index 4b1a80c2b5..5ebf90d1c4 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/lbxproxy/package.py b/var/spack/repos/builtin/packages/lbxproxy/package.py index b5b4ef0fd7..970f422c0b 100644 --- a/var/spack/repos/builtin/packages/lbxproxy/package.py +++ b/var/spack/repos/builtin/packages/lbxproxy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/lcals/package.py b/var/spack/repos/builtin/packages/lcals/package.py index bd12081130..b4a919b73f 100644 --- a/var/spack/repos/builtin/packages/lcals/package.py +++ b/var/spack/repos/builtin/packages/lcals/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/lcms/package.py b/var/spack/repos/builtin/packages/lcms/package.py index 816cc3f005..ca54ebf25f 100644 --- a/var/spack/repos/builtin/packages/lcms/package.py +++ b/var/spack/repos/builtin/packages/lcms/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ldc-bootstrap/package.py b/var/spack/repos/builtin/packages/ldc-bootstrap/package.py index 6e3288f085..43e4b52477 100644 --- a/var/spack/repos/builtin/packages/ldc-bootstrap/package.py +++ b/var/spack/repos/builtin/packages/ldc-bootstrap/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ldc/package.py b/var/spack/repos/builtin/packages/ldc/package.py index 8dd2052fca..f4b007361f 100644 --- a/var/spack/repos/builtin/packages/ldc/package.py +++ b/var/spack/repos/builtin/packages/ldc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/leveldb/package.py b/var/spack/repos/builtin/packages/leveldb/package.py index db61668021..cf66732170 100644 --- a/var/spack/repos/builtin/packages/leveldb/package.py +++ b/var/spack/repos/builtin/packages/leveldb/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/lftp/package.py b/var/spack/repos/builtin/packages/lftp/package.py index fe3487f4c6..8a9ff9e789 100644 --- a/var/spack/repos/builtin/packages/lftp/package.py +++ b/var/spack/repos/builtin/packages/lftp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libaec/package.py b/var/spack/repos/builtin/packages/libaec/package.py index 814f7760c5..f6b349942b 100644 --- a/var/spack/repos/builtin/packages/libaec/package.py +++ b/var/spack/repos/builtin/packages/libaec/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libaio/package.py b/var/spack/repos/builtin/packages/libaio/package.py index 4e96dc51f1..8165f0c073 100644 --- a/var/spack/repos/builtin/packages/libaio/package.py +++ b/var/spack/repos/builtin/packages/libaio/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libapplewm/package.py b/var/spack/repos/builtin/packages/libapplewm/package.py index 49eb23c9f4..2107a3d27d 100644 --- a/var/spack/repos/builtin/packages/libapplewm/package.py +++ b/var/spack/repos/builtin/packages/libapplewm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libarchive/package.py b/var/spack/repos/builtin/packages/libarchive/package.py index 1d07f44a7b..197141eaf6 100644 --- a/var/spack/repos/builtin/packages/libarchive/package.py +++ b/var/spack/repos/builtin/packages/libarchive/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libassuan/package.py b/var/spack/repos/builtin/packages/libassuan/package.py index 167f063e70..dedc312102 100644 --- a/var/spack/repos/builtin/packages/libassuan/package.py +++ b/var/spack/repos/builtin/packages/libassuan/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libatomic-ops/package.py b/var/spack/repos/builtin/packages/libatomic-ops/package.py index df12c000f3..d312d2306c 100644 --- a/var/spack/repos/builtin/packages/libatomic-ops/package.py +++ b/var/spack/repos/builtin/packages/libatomic-ops/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libbeagle/package.py b/var/spack/repos/builtin/packages/libbeagle/package.py index 68df3093ad..4809bf2423 100644 --- a/var/spack/repos/builtin/packages/libbeagle/package.py +++ b/var/spack/repos/builtin/packages/libbeagle/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libbsd/package.py b/var/spack/repos/builtin/packages/libbsd/package.py index f9b8a291ca..f1c8d9d0d7 100644 --- a/var/spack/repos/builtin/packages/libbsd/package.py +++ b/var/spack/repos/builtin/packages/libbsd/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libbson/package.py b/var/spack/repos/builtin/packages/libbson/package.py index 98963c1973..6876d1c7f7 100644 --- a/var/spack/repos/builtin/packages/libbson/package.py +++ b/var/spack/repos/builtin/packages/libbson/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libcanberra/package.py b/var/spack/repos/builtin/packages/libcanberra/package.py index 58fd706c29..b8779b077c 100644 --- a/var/spack/repos/builtin/packages/libcanberra/package.py +++ b/var/spack/repos/builtin/packages/libcanberra/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libcap/package.py b/var/spack/repos/builtin/packages/libcap/package.py index af7c363bf0..63c36bf6a6 100644 --- a/var/spack/repos/builtin/packages/libcap/package.py +++ b/var/spack/repos/builtin/packages/libcap/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libcerf/package.py b/var/spack/repos/builtin/packages/libcerf/package.py index f119f96832..c40a125de9 100644 --- a/var/spack/repos/builtin/packages/libcerf/package.py +++ b/var/spack/repos/builtin/packages/libcerf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libcheck/package.py b/var/spack/repos/builtin/packages/libcheck/package.py index 3a743fadbd..0cedfd42c0 100644 --- a/var/spack/repos/builtin/packages/libcheck/package.py +++ b/var/spack/repos/builtin/packages/libcheck/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libcint/package.py b/var/spack/repos/builtin/packages/libcint/package.py index 75991a7b48..fe771bc244 100644 --- a/var/spack/repos/builtin/packages/libcint/package.py +++ b/var/spack/repos/builtin/packages/libcint/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libcircle/package.py b/var/spack/repos/builtin/packages/libcircle/package.py index 98778ea9a4..2170a2668a 100644 --- a/var/spack/repos/builtin/packages/libcircle/package.py +++ b/var/spack/repos/builtin/packages/libcircle/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libconfig/package.py b/var/spack/repos/builtin/packages/libconfig/package.py index e62ec6bd83..ea337d057e 100644 --- a/var/spack/repos/builtin/packages/libconfig/package.py +++ b/var/spack/repos/builtin/packages/libconfig/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libcroco/package.py b/var/spack/repos/builtin/packages/libcroco/package.py index 8a967099bc..5ad2135f36 100644 --- a/var/spack/repos/builtin/packages/libcroco/package.py +++ b/var/spack/repos/builtin/packages/libcroco/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libctl/package.py b/var/spack/repos/builtin/packages/libctl/package.py index fc729d6db8..4c46eac1df 100644 --- a/var/spack/repos/builtin/packages/libctl/package.py +++ b/var/spack/repos/builtin/packages/libctl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libdivsufsort/package.py b/var/spack/repos/builtin/packages/libdivsufsort/package.py index 1e679eb2ec..a9d49743be 100644 --- a/var/spack/repos/builtin/packages/libdivsufsort/package.py +++ b/var/spack/repos/builtin/packages/libdivsufsort/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libdmx/package.py b/var/spack/repos/builtin/packages/libdmx/package.py index 383d82492b..47c1cd64af 100644 --- a/var/spack/repos/builtin/packages/libdmx/package.py +++ b/var/spack/repos/builtin/packages/libdmx/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libdrm/package.py b/var/spack/repos/builtin/packages/libdrm/package.py index 0038ab853c..e022e7acd6 100644 --- a/var/spack/repos/builtin/packages/libdrm/package.py +++ b/var/spack/repos/builtin/packages/libdrm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libdwarf/package.py b/var/spack/repos/builtin/packages/libdwarf/package.py index cead74a9f4..80681d08d1 100644 --- a/var/spack/repos/builtin/packages/libdwarf/package.py +++ b/var/spack/repos/builtin/packages/libdwarf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libedit/package.py b/var/spack/repos/builtin/packages/libedit/package.py index 42a09fd540..0f6664a728 100644 --- a/var/spack/repos/builtin/packages/libedit/package.py +++ b/var/spack/repos/builtin/packages/libedit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libelf/package.py b/var/spack/repos/builtin/packages/libelf/package.py index 5d433c19d5..06901d3bfe 100644 --- a/var/spack/repos/builtin/packages/libelf/package.py +++ b/var/spack/repos/builtin/packages/libelf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libemos/package.py b/var/spack/repos/builtin/packages/libemos/package.py index c14e7e10b7..0e9c337e29 100644 --- a/var/spack/repos/builtin/packages/libemos/package.py +++ b/var/spack/repos/builtin/packages/libemos/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libepoxy/package.py b/var/spack/repos/builtin/packages/libepoxy/package.py index a8d077e928..e2feebf022 100644 --- a/var/spack/repos/builtin/packages/libepoxy/package.py +++ b/var/spack/repos/builtin/packages/libepoxy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libev/package.py b/var/spack/repos/builtin/packages/libev/package.py index aea5362ce9..09fe1d1a35 100644 --- a/var/spack/repos/builtin/packages/libev/package.py +++ b/var/spack/repos/builtin/packages/libev/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libevent/package.py b/var/spack/repos/builtin/packages/libevent/package.py index 562bb212f9..ce3302dce0 100644 --- a/var/spack/repos/builtin/packages/libevent/package.py +++ b/var/spack/repos/builtin/packages/libevent/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libevpath/package.py b/var/spack/repos/builtin/packages/libevpath/package.py index 64c2fb44e3..0275b8a07e 100644 --- a/var/spack/repos/builtin/packages/libevpath/package.py +++ b/var/spack/repos/builtin/packages/libevpath/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libfabric/package.py b/var/spack/repos/builtin/packages/libfabric/package.py index 753d7c5bc7..27e686db3c 100644 --- a/var/spack/repos/builtin/packages/libfabric/package.py +++ b/var/spack/repos/builtin/packages/libfabric/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libffi/package.py b/var/spack/repos/builtin/packages/libffi/package.py index f87060118d..a0c4109269 100644 --- a/var/spack/repos/builtin/packages/libffi/package.py +++ b/var/spack/repos/builtin/packages/libffi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libffs/package.py b/var/spack/repos/builtin/packages/libffs/package.py index ee7a690214..340e748bb6 100644 --- a/var/spack/repos/builtin/packages/libffs/package.py +++ b/var/spack/repos/builtin/packages/libffs/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libfontenc/package.py b/var/spack/repos/builtin/packages/libfontenc/package.py index e54d02543c..e46bedcb9c 100644 --- a/var/spack/repos/builtin/packages/libfontenc/package.py +++ b/var/spack/repos/builtin/packages/libfontenc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libfs/package.py b/var/spack/repos/builtin/packages/libfs/package.py index a7a6c1f855..97d8295830 100644 --- a/var/spack/repos/builtin/packages/libfs/package.py +++ b/var/spack/repos/builtin/packages/libfs/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libgcrypt/package.py b/var/spack/repos/builtin/packages/libgcrypt/package.py index 6e5949fa76..2a6dc91a46 100644 --- a/var/spack/repos/builtin/packages/libgcrypt/package.py +++ b/var/spack/repos/builtin/packages/libgcrypt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libgd/package.py b/var/spack/repos/builtin/packages/libgd/package.py index 7a33123884..10fb969006 100644 --- a/var/spack/repos/builtin/packages/libgd/package.py +++ b/var/spack/repos/builtin/packages/libgd/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libgit2/package.py b/var/spack/repos/builtin/packages/libgit2/package.py index adcb9bf3d3..6a47db9e06 100644 --- a/var/spack/repos/builtin/packages/libgit2/package.py +++ b/var/spack/repos/builtin/packages/libgit2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libgpg-error/package.py b/var/spack/repos/builtin/packages/libgpg-error/package.py index ea97c9e13e..260154cb31 100644 --- a/var/spack/repos/builtin/packages/libgpg-error/package.py +++ b/var/spack/repos/builtin/packages/libgpg-error/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libgpuarray/package.py b/var/spack/repos/builtin/packages/libgpuarray/package.py index 885141f833..fb5627311f 100644 --- a/var/spack/repos/builtin/packages/libgpuarray/package.py +++ b/var/spack/repos/builtin/packages/libgpuarray/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libgridxc/package.py b/var/spack/repos/builtin/packages/libgridxc/package.py index 63b119a408..42a2a05517 100644 --- a/var/spack/repos/builtin/packages/libgridxc/package.py +++ b/var/spack/repos/builtin/packages/libgridxc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libgtextutils/package.py b/var/spack/repos/builtin/packages/libgtextutils/package.py index be6759e91e..1ea3fe3f71 100644 --- a/var/spack/repos/builtin/packages/libgtextutils/package.py +++ b/var/spack/repos/builtin/packages/libgtextutils/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libharu/package.py b/var/spack/repos/builtin/packages/libharu/package.py index a647883538..4411a4f58c 100644 --- a/var/spack/repos/builtin/packages/libharu/package.py +++ b/var/spack/repos/builtin/packages/libharu/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libhio/package.py b/var/spack/repos/builtin/packages/libhio/package.py index cde2940149..19faadb4aa 100644 --- a/var/spack/repos/builtin/packages/libhio/package.py +++ b/var/spack/repos/builtin/packages/libhio/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libice/package.py b/var/spack/repos/builtin/packages/libice/package.py index bb8c222456..fb6f6515d4 100644 --- a/var/spack/repos/builtin/packages/libice/package.py +++ b/var/spack/repos/builtin/packages/libice/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libiconv/package.py b/var/spack/repos/builtin/packages/libiconv/package.py index bf0ee46b2d..df57201d7e 100644 --- a/var/spack/repos/builtin/packages/libiconv/package.py +++ b/var/spack/repos/builtin/packages/libiconv/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libint/package.py b/var/spack/repos/builtin/packages/libint/package.py index 29c79ee4bd..0b37d0267f 100644 --- a/var/spack/repos/builtin/packages/libint/package.py +++ b/var/spack/repos/builtin/packages/libint/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libjpeg-turbo/package.py b/var/spack/repos/builtin/packages/libjpeg-turbo/package.py index 0e5543c301..109a68e996 100644 --- a/var/spack/repos/builtin/packages/libjpeg-turbo/package.py +++ b/var/spack/repos/builtin/packages/libjpeg-turbo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libjpeg/package.py b/var/spack/repos/builtin/packages/libjpeg/package.py index 92584adc10..9a378157da 100644 --- a/var/spack/repos/builtin/packages/libjpeg/package.py +++ b/var/spack/repos/builtin/packages/libjpeg/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libksba/package.py b/var/spack/repos/builtin/packages/libksba/package.py index a9f498e3d3..e0c4c9c1f3 100644 --- a/var/spack/repos/builtin/packages/libksba/package.py +++ b/var/spack/repos/builtin/packages/libksba/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/liblbxutil/package.py b/var/spack/repos/builtin/packages/liblbxutil/package.py index b202ac97d1..ab26a1a9ed 100644 --- a/var/spack/repos/builtin/packages/liblbxutil/package.py +++ b/var/spack/repos/builtin/packages/liblbxutil/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libmatheval/package.py b/var/spack/repos/builtin/packages/libmatheval/package.py index f0992c4b42..3b9acc92a8 100644 --- a/var/spack/repos/builtin/packages/libmatheval/package.py +++ b/var/spack/repos/builtin/packages/libmatheval/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libmesh/package.py b/var/spack/repos/builtin/packages/libmesh/package.py index 20603a6589..c7d55d10da 100644 --- a/var/spack/repos/builtin/packages/libmesh/package.py +++ b/var/spack/repos/builtin/packages/libmesh/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libmng/package.py b/var/spack/repos/builtin/packages/libmng/package.py index 95542361ef..c182a496d7 100644 --- a/var/spack/repos/builtin/packages/libmng/package.py +++ b/var/spack/repos/builtin/packages/libmng/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libmongoc/package.py b/var/spack/repos/builtin/packages/libmongoc/package.py index 4e05b22241..56c3e0992d 100644 --- a/var/spack/repos/builtin/packages/libmongoc/package.py +++ b/var/spack/repos/builtin/packages/libmongoc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libmonitor/package.py b/var/spack/repos/builtin/packages/libmonitor/package.py index 7ec87ca453..f909e8b516 100644 --- a/var/spack/repos/builtin/packages/libmonitor/package.py +++ b/var/spack/repos/builtin/packages/libmonitor/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libnbc/package.py b/var/spack/repos/builtin/packages/libnbc/package.py index 67ac5da744..17b6a51334 100644 --- a/var/spack/repos/builtin/packages/libnbc/package.py +++ b/var/spack/repos/builtin/packages/libnbc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libogg/package.py b/var/spack/repos/builtin/packages/libogg/package.py index e2c38e7759..cced1a39b8 100644 --- a/var/spack/repos/builtin/packages/libogg/package.py +++ b/var/spack/repos/builtin/packages/libogg/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/liboldx/package.py b/var/spack/repos/builtin/packages/liboldx/package.py index 3032f75456..5d11d395fd 100644 --- a/var/spack/repos/builtin/packages/liboldx/package.py +++ b/var/spack/repos/builtin/packages/liboldx/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libpcap/package.py b/var/spack/repos/builtin/packages/libpcap/package.py index 4236fdbc3e..4be601ebeb 100644 --- a/var/spack/repos/builtin/packages/libpcap/package.py +++ b/var/spack/repos/builtin/packages/libpcap/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libpciaccess/package.py b/var/spack/repos/builtin/packages/libpciaccess/package.py index 7497cf73f0..25616f8e55 100644 --- a/var/spack/repos/builtin/packages/libpciaccess/package.py +++ b/var/spack/repos/builtin/packages/libpciaccess/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libpfm4/package.py b/var/spack/repos/builtin/packages/libpfm4/package.py index 3e30ead2dc..c10d61007d 100644 --- a/var/spack/repos/builtin/packages/libpfm4/package.py +++ b/var/spack/repos/builtin/packages/libpfm4/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libpipeline/package.py b/var/spack/repos/builtin/packages/libpipeline/package.py index 82bcd388c7..a384e2a292 100644 --- a/var/spack/repos/builtin/packages/libpipeline/package.py +++ b/var/spack/repos/builtin/packages/libpipeline/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libpng/package.py b/var/spack/repos/builtin/packages/libpng/package.py index 7c0f56dc6a..7fcb9d15e2 100644 --- a/var/spack/repos/builtin/packages/libpng/package.py +++ b/var/spack/repos/builtin/packages/libpng/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libpsl/package.py b/var/spack/repos/builtin/packages/libpsl/package.py index f0aa8572c4..61aff957c2 100644 --- a/var/spack/repos/builtin/packages/libpsl/package.py +++ b/var/spack/repos/builtin/packages/libpsl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libpthread-stubs/package.py b/var/spack/repos/builtin/packages/libpthread-stubs/package.py index 286120d908..5f4b8ba30f 100644 --- a/var/spack/repos/builtin/packages/libpthread-stubs/package.py +++ b/var/spack/repos/builtin/packages/libpthread-stubs/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libquo/package.py b/var/spack/repos/builtin/packages/libquo/package.py index 08006c4295..74957725d8 100644 --- a/var/spack/repos/builtin/packages/libquo/package.py +++ b/var/spack/repos/builtin/packages/libquo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/librom/package.py b/var/spack/repos/builtin/packages/librom/package.py index d36de8192b..c52c06370a 100644 --- a/var/spack/repos/builtin/packages/librom/package.py +++ b/var/spack/repos/builtin/packages/librom/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libsigsegv/package.py b/var/spack/repos/builtin/packages/libsigsegv/package.py index f13710bff9..e625d238ef 100644 --- a/var/spack/repos/builtin/packages/libsigsegv/package.py +++ b/var/spack/repos/builtin/packages/libsigsegv/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libsm/package.py b/var/spack/repos/builtin/packages/libsm/package.py index a8937074fb..35c4456399 100644 --- a/var/spack/repos/builtin/packages/libsm/package.py +++ b/var/spack/repos/builtin/packages/libsm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libsodium/package.py b/var/spack/repos/builtin/packages/libsodium/package.py index 7221b4f52f..0cdf742491 100644 --- a/var/spack/repos/builtin/packages/libsodium/package.py +++ b/var/spack/repos/builtin/packages/libsodium/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libspatialindex/package.py b/var/spack/repos/builtin/packages/libspatialindex/package.py index 69183c8131..9d8555aa04 100644 --- a/var/spack/repos/builtin/packages/libspatialindex/package.py +++ b/var/spack/repos/builtin/packages/libspatialindex/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libsplash/package.py b/var/spack/repos/builtin/packages/libsplash/package.py index e8493bdba2..5cca529a76 100644 --- a/var/spack/repos/builtin/packages/libsplash/package.py +++ b/var/spack/repos/builtin/packages/libsplash/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libssh2/package.py b/var/spack/repos/builtin/packages/libssh2/package.py index 7bac2c827e..ea30224aa5 100644 --- a/var/spack/repos/builtin/packages/libssh2/package.py +++ b/var/spack/repos/builtin/packages/libssh2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libsvm/package.py b/var/spack/repos/builtin/packages/libsvm/package.py index 564775c91c..72f5144bd0 100644 --- a/var/spack/repos/builtin/packages/libsvm/package.py +++ b/var/spack/repos/builtin/packages/libsvm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libszip/package.py b/var/spack/repos/builtin/packages/libszip/package.py index e33d4f5089..d98b4cad96 100644 --- a/var/spack/repos/builtin/packages/libszip/package.py +++ b/var/spack/repos/builtin/packages/libszip/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libtermkey/package.py b/var/spack/repos/builtin/packages/libtermkey/package.py index 6b8b6b58bd..aa672ea950 100644 --- a/var/spack/repos/builtin/packages/libtermkey/package.py +++ b/var/spack/repos/builtin/packages/libtermkey/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libtiff/package.py b/var/spack/repos/builtin/packages/libtiff/package.py index 329dfece29..08682ac62d 100644 --- a/var/spack/repos/builtin/packages/libtiff/package.py +++ b/var/spack/repos/builtin/packages/libtiff/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libtool/package.py b/var/spack/repos/builtin/packages/libtool/package.py index e9daa69ed8..98be32a601 100644 --- a/var/spack/repos/builtin/packages/libtool/package.py +++ b/var/spack/repos/builtin/packages/libtool/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libunistring/package.py b/var/spack/repos/builtin/packages/libunistring/package.py index a4250bc8ee..52b29dda56 100644 --- a/var/spack/repos/builtin/packages/libunistring/package.py +++ b/var/spack/repos/builtin/packages/libunistring/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libunwind/package.py b/var/spack/repos/builtin/packages/libunwind/package.py index 9c8c0574b1..1f69a1f9ec 100644 --- a/var/spack/repos/builtin/packages/libunwind/package.py +++ b/var/spack/repos/builtin/packages/libunwind/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libuuid/package.py b/var/spack/repos/builtin/packages/libuuid/package.py index 750730b6ed..4560621238 100644 --- a/var/spack/repos/builtin/packages/libuuid/package.py +++ b/var/spack/repos/builtin/packages/libuuid/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libuv/package.py b/var/spack/repos/builtin/packages/libuv/package.py index d88b2306aa..c57cf2592a 100644 --- a/var/spack/repos/builtin/packages/libuv/package.py +++ b/var/spack/repos/builtin/packages/libuv/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libvorbis/package.py b/var/spack/repos/builtin/packages/libvorbis/package.py index b472f5a886..8a0aab410f 100644 --- a/var/spack/repos/builtin/packages/libvorbis/package.py +++ b/var/spack/repos/builtin/packages/libvorbis/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libvterm/package.py b/var/spack/repos/builtin/packages/libvterm/package.py index 5ed4d0b74e..586898b8b1 100644 --- a/var/spack/repos/builtin/packages/libvterm/package.py +++ b/var/spack/repos/builtin/packages/libvterm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libwebsockets/package.py b/var/spack/repos/builtin/packages/libwebsockets/package.py index 88b2e66ad7..7e0cc05cde 100644 --- a/var/spack/repos/builtin/packages/libwebsockets/package.py +++ b/var/spack/repos/builtin/packages/libwebsockets/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libwindowswm/package.py b/var/spack/repos/builtin/packages/libwindowswm/package.py index 32a7165d54..ce573bd86d 100644 --- a/var/spack/repos/builtin/packages/libwindowswm/package.py +++ b/var/spack/repos/builtin/packages/libwindowswm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libx11/package.py b/var/spack/repos/builtin/packages/libx11/package.py index 9840c8b634..0fa29e8dfe 100644 --- a/var/spack/repos/builtin/packages/libx11/package.py +++ b/var/spack/repos/builtin/packages/libx11/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxau/package.py b/var/spack/repos/builtin/packages/libxau/package.py index a588bd6ae5..a17da9eb49 100644 --- a/var/spack/repos/builtin/packages/libxau/package.py +++ b/var/spack/repos/builtin/packages/libxau/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxaw/package.py b/var/spack/repos/builtin/packages/libxaw/package.py index f1e8b1c25a..fed4ab1d9a 100644 --- a/var/spack/repos/builtin/packages/libxaw/package.py +++ b/var/spack/repos/builtin/packages/libxaw/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxaw3d/package.py b/var/spack/repos/builtin/packages/libxaw3d/package.py index 7087604822..e10e5fa834 100644 --- a/var/spack/repos/builtin/packages/libxaw3d/package.py +++ b/var/spack/repos/builtin/packages/libxaw3d/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxc/package.py b/var/spack/repos/builtin/packages/libxc/package.py index b6e61a69b2..228ff4c034 100644 --- a/var/spack/repos/builtin/packages/libxc/package.py +++ b/var/spack/repos/builtin/packages/libxc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxcb/package.py b/var/spack/repos/builtin/packages/libxcb/package.py index 7cc1a068d0..441a5416d5 100644 --- a/var/spack/repos/builtin/packages/libxcb/package.py +++ b/var/spack/repos/builtin/packages/libxcb/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxcomposite/package.py b/var/spack/repos/builtin/packages/libxcomposite/package.py index b2c5caae12..1061277ef4 100644 --- a/var/spack/repos/builtin/packages/libxcomposite/package.py +++ b/var/spack/repos/builtin/packages/libxcomposite/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxcursor/package.py b/var/spack/repos/builtin/packages/libxcursor/package.py index b9ec94d06a..0785e849a8 100644 --- a/var/spack/repos/builtin/packages/libxcursor/package.py +++ b/var/spack/repos/builtin/packages/libxcursor/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxdamage/package.py b/var/spack/repos/builtin/packages/libxdamage/package.py index 0a69b62971..cc6e188e90 100644 --- a/var/spack/repos/builtin/packages/libxdamage/package.py +++ b/var/spack/repos/builtin/packages/libxdamage/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxdmcp/package.py b/var/spack/repos/builtin/packages/libxdmcp/package.py index fa6368dae4..11ac742890 100644 --- a/var/spack/repos/builtin/packages/libxdmcp/package.py +++ b/var/spack/repos/builtin/packages/libxdmcp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxevie/package.py b/var/spack/repos/builtin/packages/libxevie/package.py index e7e5c5aeac..a8d5c9bb42 100644 --- a/var/spack/repos/builtin/packages/libxevie/package.py +++ b/var/spack/repos/builtin/packages/libxevie/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxext/package.py b/var/spack/repos/builtin/packages/libxext/package.py index 3ea058b95e..757ff2829f 100644 --- a/var/spack/repos/builtin/packages/libxext/package.py +++ b/var/spack/repos/builtin/packages/libxext/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxfixes/package.py b/var/spack/repos/builtin/packages/libxfixes/package.py index 3c8d10189e..cfea96a067 100644 --- a/var/spack/repos/builtin/packages/libxfixes/package.py +++ b/var/spack/repos/builtin/packages/libxfixes/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxfont/package.py b/var/spack/repos/builtin/packages/libxfont/package.py index 618c26baa1..c8266bb934 100644 --- a/var/spack/repos/builtin/packages/libxfont/package.py +++ b/var/spack/repos/builtin/packages/libxfont/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxfont2/package.py b/var/spack/repos/builtin/packages/libxfont2/package.py index e7c943b5c9..2dd4b91762 100644 --- a/var/spack/repos/builtin/packages/libxfont2/package.py +++ b/var/spack/repos/builtin/packages/libxfont2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxfontcache/package.py b/var/spack/repos/builtin/packages/libxfontcache/package.py index d93afbb967..19b16e1c79 100644 --- a/var/spack/repos/builtin/packages/libxfontcache/package.py +++ b/var/spack/repos/builtin/packages/libxfontcache/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxft/package.py b/var/spack/repos/builtin/packages/libxft/package.py index 7cb66d6d9b..d1c44299e4 100644 --- a/var/spack/repos/builtin/packages/libxft/package.py +++ b/var/spack/repos/builtin/packages/libxft/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxi/package.py b/var/spack/repos/builtin/packages/libxi/package.py index b3347f770c..f2fc1b7930 100644 --- a/var/spack/repos/builtin/packages/libxi/package.py +++ b/var/spack/repos/builtin/packages/libxi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxinerama/package.py b/var/spack/repos/builtin/packages/libxinerama/package.py index d66688e66a..3d66fbf526 100644 --- a/var/spack/repos/builtin/packages/libxinerama/package.py +++ b/var/spack/repos/builtin/packages/libxinerama/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxkbcommon/package.py b/var/spack/repos/builtin/packages/libxkbcommon/package.py index d51f079381..630e8e6303 100644 --- a/var/spack/repos/builtin/packages/libxkbcommon/package.py +++ b/var/spack/repos/builtin/packages/libxkbcommon/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxkbfile/package.py b/var/spack/repos/builtin/packages/libxkbfile/package.py index 807039897a..e8b42ea30e 100644 --- a/var/spack/repos/builtin/packages/libxkbfile/package.py +++ b/var/spack/repos/builtin/packages/libxkbfile/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxkbui/package.py b/var/spack/repos/builtin/packages/libxkbui/package.py index 57cf85b6dd..f31eb53d73 100644 --- a/var/spack/repos/builtin/packages/libxkbui/package.py +++ b/var/spack/repos/builtin/packages/libxkbui/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxml2/package.py b/var/spack/repos/builtin/packages/libxml2/package.py index 4cef51f8b5..43a7e999d2 100644 --- a/var/spack/repos/builtin/packages/libxml2/package.py +++ b/var/spack/repos/builtin/packages/libxml2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxmu/package.py b/var/spack/repos/builtin/packages/libxmu/package.py index 9e6f39c408..6150697471 100644 --- a/var/spack/repos/builtin/packages/libxmu/package.py +++ b/var/spack/repos/builtin/packages/libxmu/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxp/package.py b/var/spack/repos/builtin/packages/libxp/package.py index ed5e8e2198..d0bd0d0462 100644 --- a/var/spack/repos/builtin/packages/libxp/package.py +++ b/var/spack/repos/builtin/packages/libxp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxpm/package.py b/var/spack/repos/builtin/packages/libxpm/package.py index 6d507a7e84..c49594f5c7 100644 --- a/var/spack/repos/builtin/packages/libxpm/package.py +++ b/var/spack/repos/builtin/packages/libxpm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxpresent/package.py b/var/spack/repos/builtin/packages/libxpresent/package.py index 7e5585eb0d..daea00bcf9 100644 --- a/var/spack/repos/builtin/packages/libxpresent/package.py +++ b/var/spack/repos/builtin/packages/libxpresent/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxprintapputil/package.py b/var/spack/repos/builtin/packages/libxprintapputil/package.py index 6715d2a8f5..579233bb1c 100644 --- a/var/spack/repos/builtin/packages/libxprintapputil/package.py +++ b/var/spack/repos/builtin/packages/libxprintapputil/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxprintutil/package.py b/var/spack/repos/builtin/packages/libxprintutil/package.py index 3e795b9140..3385e7cd5e 100644 --- a/var/spack/repos/builtin/packages/libxprintutil/package.py +++ b/var/spack/repos/builtin/packages/libxprintutil/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxrandr/package.py b/var/spack/repos/builtin/packages/libxrandr/package.py index a7a44028fb..331d213b30 100644 --- a/var/spack/repos/builtin/packages/libxrandr/package.py +++ b/var/spack/repos/builtin/packages/libxrandr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxrender/package.py b/var/spack/repos/builtin/packages/libxrender/package.py index c931530d1c..91c2ab76e5 100644 --- a/var/spack/repos/builtin/packages/libxrender/package.py +++ b/var/spack/repos/builtin/packages/libxrender/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxres/package.py b/var/spack/repos/builtin/packages/libxres/package.py index 2bf708d4e9..1ab962e5c8 100644 --- a/var/spack/repos/builtin/packages/libxres/package.py +++ b/var/spack/repos/builtin/packages/libxres/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxscrnsaver/package.py b/var/spack/repos/builtin/packages/libxscrnsaver/package.py index 9bb6bc1e08..9062c660bf 100644 --- a/var/spack/repos/builtin/packages/libxscrnsaver/package.py +++ b/var/spack/repos/builtin/packages/libxscrnsaver/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxshmfence/package.py b/var/spack/repos/builtin/packages/libxshmfence/package.py index 6b8e5e2c95..031dd62e6c 100644 --- a/var/spack/repos/builtin/packages/libxshmfence/package.py +++ b/var/spack/repos/builtin/packages/libxshmfence/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxslt/package.py b/var/spack/repos/builtin/packages/libxslt/package.py index cbb04c0ee2..c688fa8b87 100644 --- a/var/spack/repos/builtin/packages/libxslt/package.py +++ b/var/spack/repos/builtin/packages/libxslt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxsmm/package.py b/var/spack/repos/builtin/packages/libxsmm/package.py index 57e6f0d7e1..e97f328d18 100644 --- a/var/spack/repos/builtin/packages/libxsmm/package.py +++ b/var/spack/repos/builtin/packages/libxsmm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxstream/package.py b/var/spack/repos/builtin/packages/libxstream/package.py index 00b7c0be32..9a9171da59 100644 --- a/var/spack/repos/builtin/packages/libxstream/package.py +++ b/var/spack/repos/builtin/packages/libxstream/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxt/package.py b/var/spack/repos/builtin/packages/libxt/package.py index 4cb68c2cd2..b50871fe9f 100644 --- a/var/spack/repos/builtin/packages/libxt/package.py +++ b/var/spack/repos/builtin/packages/libxt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxtrap/package.py b/var/spack/repos/builtin/packages/libxtrap/package.py index 3d6dee29fc..2d1786b349 100644 --- a/var/spack/repos/builtin/packages/libxtrap/package.py +++ b/var/spack/repos/builtin/packages/libxtrap/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxtst/package.py b/var/spack/repos/builtin/packages/libxtst/package.py index e79e6a8fb8..5f773a85f1 100644 --- a/var/spack/repos/builtin/packages/libxtst/package.py +++ b/var/spack/repos/builtin/packages/libxtst/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxv/package.py b/var/spack/repos/builtin/packages/libxv/package.py index 7691006e12..96f9d7ee0b 100644 --- a/var/spack/repos/builtin/packages/libxv/package.py +++ b/var/spack/repos/builtin/packages/libxv/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxvmc/package.py b/var/spack/repos/builtin/packages/libxvmc/package.py index 5c6c8f95dd..fd565e2550 100644 --- a/var/spack/repos/builtin/packages/libxvmc/package.py +++ b/var/spack/repos/builtin/packages/libxvmc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxxf86dga/package.py b/var/spack/repos/builtin/packages/libxxf86dga/package.py index e2a52e7ee8..40c0e39fbb 100644 --- a/var/spack/repos/builtin/packages/libxxf86dga/package.py +++ b/var/spack/repos/builtin/packages/libxxf86dga/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxxf86misc/package.py b/var/spack/repos/builtin/packages/libxxf86misc/package.py index 29aa52eadf..80aef4b137 100644 --- a/var/spack/repos/builtin/packages/libxxf86misc/package.py +++ b/var/spack/repos/builtin/packages/libxxf86misc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libxxf86vm/package.py b/var/spack/repos/builtin/packages/libxxf86vm/package.py index 6045c890aa..9477058377 100644 --- a/var/spack/repos/builtin/packages/libxxf86vm/package.py +++ b/var/spack/repos/builtin/packages/libxxf86vm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libyogrt/package.py b/var/spack/repos/builtin/packages/libyogrt/package.py index f48ce80e83..1542edde60 100644 --- a/var/spack/repos/builtin/packages/libyogrt/package.py +++ b/var/spack/repos/builtin/packages/libyogrt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/libzip/package.py b/var/spack/repos/builtin/packages/libzip/package.py index c193caae7f..884d990ca0 100644 --- a/var/spack/repos/builtin/packages/libzip/package.py +++ b/var/spack/repos/builtin/packages/libzip/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/likwid/package.py b/var/spack/repos/builtin/packages/likwid/package.py index 8e3492ef1c..bcd15ed049 100644 --- a/var/spack/repos/builtin/packages/likwid/package.py +++ b/var/spack/repos/builtin/packages/likwid/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/linkphase3/package.py b/var/spack/repos/builtin/packages/linkphase3/package.py index 4cba38115a..3c574a5811 100644 --- a/var/spack/repos/builtin/packages/linkphase3/package.py +++ b/var/spack/repos/builtin/packages/linkphase3/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/linux-headers/package.py b/var/spack/repos/builtin/packages/linux-headers/package.py index 224c502121..81d1c2f733 100644 --- a/var/spack/repos/builtin/packages/linux-headers/package.py +++ b/var/spack/repos/builtin/packages/linux-headers/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/listres/package.py b/var/spack/repos/builtin/packages/listres/package.py index 0da87ced95..a41bf06430 100644 --- a/var/spack/repos/builtin/packages/listres/package.py +++ b/var/spack/repos/builtin/packages/listres/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index 26cdb088ed..448b601c22 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/lmdb/package.py b/var/spack/repos/builtin/packages/lmdb/package.py index fb147403d9..3553f06369 100644 --- a/var/spack/repos/builtin/packages/lmdb/package.py +++ b/var/spack/repos/builtin/packages/lmdb/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/lmod/package.py b/var/spack/repos/builtin/packages/lmod/package.py index 66bd5fab81..ab7edf0db6 100644 --- a/var/spack/repos/builtin/packages/lmod/package.py +++ b/var/spack/repos/builtin/packages/lmod/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/lndir/package.py b/var/spack/repos/builtin/packages/lndir/package.py index 317552527e..e9b708496e 100644 --- a/var/spack/repos/builtin/packages/lndir/package.py +++ b/var/spack/repos/builtin/packages/lndir/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/log4cplus/package.py b/var/spack/repos/builtin/packages/log4cplus/package.py index e75572cb24..435c070f30 100644 --- a/var/spack/repos/builtin/packages/log4cplus/package.py +++ b/var/spack/repos/builtin/packages/log4cplus/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/log4cxx/package.py b/var/spack/repos/builtin/packages/log4cxx/package.py index eda990b590..ac7be7f4a2 100644 --- a/var/spack/repos/builtin/packages/log4cxx/package.py +++ b/var/spack/repos/builtin/packages/log4cxx/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/lrslib/package.py b/var/spack/repos/builtin/packages/lrslib/package.py index 586750b9bf..aa795f726b 100644 --- a/var/spack/repos/builtin/packages/lrslib/package.py +++ b/var/spack/repos/builtin/packages/lrslib/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/lrzip/package.py b/var/spack/repos/builtin/packages/lrzip/package.py index 531cba2b87..aa26cb6ab6 100644 --- a/var/spack/repos/builtin/packages/lrzip/package.py +++ b/var/spack/repos/builtin/packages/lrzip/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/lua-bitlib/package.py b/var/spack/repos/builtin/packages/lua-bitlib/package.py index 014eb77e43..7d1bca3d35 100644 --- a/var/spack/repos/builtin/packages/lua-bitlib/package.py +++ b/var/spack/repos/builtin/packages/lua-bitlib/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/lua-jit/package.py b/var/spack/repos/builtin/packages/lua-jit/package.py index 2005936110..c8b5179b0c 100644 --- a/var/spack/repos/builtin/packages/lua-jit/package.py +++ b/var/spack/repos/builtin/packages/lua-jit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/lua-lpeg/package.py b/var/spack/repos/builtin/packages/lua-lpeg/package.py index aa9a491e4b..c62e70af38 100644 --- a/var/spack/repos/builtin/packages/lua-lpeg/package.py +++ b/var/spack/repos/builtin/packages/lua-lpeg/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/lua-luafilesystem/package.py b/var/spack/repos/builtin/packages/lua-luafilesystem/package.py index 7194654838..125c4e2890 100644 --- a/var/spack/repos/builtin/packages/lua-luafilesystem/package.py +++ b/var/spack/repos/builtin/packages/lua-luafilesystem/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/lua-luaposix/package.py b/var/spack/repos/builtin/packages/lua-luaposix/package.py index 5cc81d6e65..4db3f84546 100644 --- a/var/spack/repos/builtin/packages/lua-luaposix/package.py +++ b/var/spack/repos/builtin/packages/lua-luaposix/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/lua-mpack/package.py b/var/spack/repos/builtin/packages/lua-mpack/package.py index ffdb953428..b22d066a4d 100644 --- a/var/spack/repos/builtin/packages/lua-mpack/package.py +++ b/var/spack/repos/builtin/packages/lua-mpack/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/lua/package.py b/var/spack/repos/builtin/packages/lua/package.py index ff206be5cc..eec46f9d4c 100644 --- a/var/spack/repos/builtin/packages/lua/package.py +++ b/var/spack/repos/builtin/packages/lua/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/luit/package.py b/var/spack/repos/builtin/packages/luit/package.py index aac3ff00e3..0c71a370ed 100644 --- a/var/spack/repos/builtin/packages/luit/package.py +++ b/var/spack/repos/builtin/packages/luit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/lulesh/package.py b/var/spack/repos/builtin/packages/lulesh/package.py index 489a175108..60be952152 100644 --- a/var/spack/repos/builtin/packages/lulesh/package.py +++ b/var/spack/repos/builtin/packages/lulesh/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/lumpy-sv/package.py b/var/spack/repos/builtin/packages/lumpy-sv/package.py index a2ffca2b8e..f7a29f36fe 100644 --- a/var/spack/repos/builtin/packages/lumpy-sv/package.py +++ b/var/spack/repos/builtin/packages/lumpy-sv/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/lwgrp/package.py b/var/spack/repos/builtin/packages/lwgrp/package.py index aa742230ac..cc19174db3 100644 --- a/var/spack/repos/builtin/packages/lwgrp/package.py +++ b/var/spack/repos/builtin/packages/lwgrp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/lwm2/package.py b/var/spack/repos/builtin/packages/lwm2/package.py index 4858391f2a..7893864d29 100644 --- a/var/spack/repos/builtin/packages/lwm2/package.py +++ b/var/spack/repos/builtin/packages/lwm2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/lz4/package.py b/var/spack/repos/builtin/packages/lz4/package.py index a71b9699ce..973250a2f1 100644 --- a/var/spack/repos/builtin/packages/lz4/package.py +++ b/var/spack/repos/builtin/packages/lz4/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/lzma/package.py b/var/spack/repos/builtin/packages/lzma/package.py index 3e256d54b0..1f0996897c 100644 --- a/var/spack/repos/builtin/packages/lzma/package.py +++ b/var/spack/repos/builtin/packages/lzma/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/lzo/package.py b/var/spack/repos/builtin/packages/lzo/package.py index ded3a32375..c67846b54e 100644 --- a/var/spack/repos/builtin/packages/lzo/package.py +++ b/var/spack/repos/builtin/packages/lzo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/m4/package.py b/var/spack/repos/builtin/packages/m4/package.py index f3cb8122f5..219cde979e 100644 --- a/var/spack/repos/builtin/packages/m4/package.py +++ b/var/spack/repos/builtin/packages/m4/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/macsio/package.py b/var/spack/repos/builtin/packages/macsio/package.py index f17cec4350..8fda9c4040 100644 --- a/var/spack/repos/builtin/packages/macsio/package.py +++ b/var/spack/repos/builtin/packages/macsio/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mafft/package.py b/var/spack/repos/builtin/packages/mafft/package.py index 2b46cf9332..7436922331 100644 --- a/var/spack/repos/builtin/packages/mafft/package.py +++ b/var/spack/repos/builtin/packages/mafft/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/magics/package.py b/var/spack/repos/builtin/packages/magics/package.py index 0f4c611b22..661de3dc84 100644 --- a/var/spack/repos/builtin/packages/magics/package.py +++ b/var/spack/repos/builtin/packages/magics/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/magma/package.py b/var/spack/repos/builtin/packages/magma/package.py index bccac28497..7481afab16 100644 --- a/var/spack/repos/builtin/packages/magma/package.py +++ b/var/spack/repos/builtin/packages/magma/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/makedepend/package.py b/var/spack/repos/builtin/packages/makedepend/package.py index 862d18dc5b..7f941fca30 100644 --- a/var/spack/repos/builtin/packages/makedepend/package.py +++ b/var/spack/repos/builtin/packages/makedepend/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mallocmc/package.py b/var/spack/repos/builtin/packages/mallocmc/package.py index d110a6a17f..ce8dc2b98e 100644 --- a/var/spack/repos/builtin/packages/mallocmc/package.py +++ b/var/spack/repos/builtin/packages/mallocmc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/man-db/package.py b/var/spack/repos/builtin/packages/man-db/package.py index 7a6a03731e..98af02397f 100644 --- a/var/spack/repos/builtin/packages/man-db/package.py +++ b/var/spack/repos/builtin/packages/man-db/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/maq/package.py b/var/spack/repos/builtin/packages/maq/package.py index 67ab4ae7fd..3acf74a7ce 100644 --- a/var/spack/repos/builtin/packages/maq/package.py +++ b/var/spack/repos/builtin/packages/maq/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mariadb/package.py b/var/spack/repos/builtin/packages/mariadb/package.py index 53203f585a..931449375f 100644 --- a/var/spack/repos/builtin/packages/mariadb/package.py +++ b/var/spack/repos/builtin/packages/mariadb/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/masa/package.py b/var/spack/repos/builtin/packages/masa/package.py index e0e7c00cde..90df859473 100644 --- a/var/spack/repos/builtin/packages/masa/package.py +++ b/var/spack/repos/builtin/packages/masa/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/masurca/package.py b/var/spack/repos/builtin/packages/masurca/package.py index 519ba29e11..b62c741864 100644 --- a/var/spack/repos/builtin/packages/masurca/package.py +++ b/var/spack/repos/builtin/packages/masurca/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/matio/package.py b/var/spack/repos/builtin/packages/matio/package.py index 8569893375..6483d21be5 100644 --- a/var/spack/repos/builtin/packages/matio/package.py +++ b/var/spack/repos/builtin/packages/matio/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/matlab/package.py b/var/spack/repos/builtin/packages/matlab/package.py index c61bbe05d6..56de703712 100644 --- a/var/spack/repos/builtin/packages/matlab/package.py +++ b/var/spack/repos/builtin/packages/matlab/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/maven/package.py b/var/spack/repos/builtin/packages/maven/package.py index 425e5abaab..aef6ddeaee 100644 --- a/var/spack/repos/builtin/packages/maven/package.py +++ b/var/spack/repos/builtin/packages/maven/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/maverick/package.py b/var/spack/repos/builtin/packages/maverick/package.py index b898beafb7..ee80594b67 100644 --- a/var/spack/repos/builtin/packages/maverick/package.py +++ b/var/spack/repos/builtin/packages/maverick/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mawk/package.py b/var/spack/repos/builtin/packages/mawk/package.py index 2749736796..572089b66c 100644 --- a/var/spack/repos/builtin/packages/mawk/package.py +++ b/var/spack/repos/builtin/packages/mawk/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mbedtls/package.py b/var/spack/repos/builtin/packages/mbedtls/package.py index 12687ea5a8..6fd7e66a2f 100644 --- a/var/spack/repos/builtin/packages/mbedtls/package.py +++ b/var/spack/repos/builtin/packages/mbedtls/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mc/package.py b/var/spack/repos/builtin/packages/mc/package.py index 5a54d4273b..4b4519b953 100644 --- a/var/spack/repos/builtin/packages/mc/package.py +++ b/var/spack/repos/builtin/packages/mc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mcl/package.py b/var/spack/repos/builtin/packages/mcl/package.py index 4644cc39ac..224539bdf1 100644 --- a/var/spack/repos/builtin/packages/mcl/package.py +++ b/var/spack/repos/builtin/packages/mcl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mdtest/package.py b/var/spack/repos/builtin/packages/mdtest/package.py index 519aed704c..2a40e7e638 100644 --- a/var/spack/repos/builtin/packages/mdtest/package.py +++ b/var/spack/repos/builtin/packages/mdtest/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/meep/package.py b/var/spack/repos/builtin/packages/meep/package.py index 79c50a8123..8af280f2a2 100644 --- a/var/spack/repos/builtin/packages/meep/package.py +++ b/var/spack/repos/builtin/packages/meep/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mefit/package.py b/var/spack/repos/builtin/packages/mefit/package.py index 7f4c555bd8..e82615b732 100644 --- a/var/spack/repos/builtin/packages/mefit/package.py +++ b/var/spack/repos/builtin/packages/mefit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/memaxes/package.py b/var/spack/repos/builtin/packages/memaxes/package.py index 581454ef06..f3c4e10ebf 100644 --- a/var/spack/repos/builtin/packages/memaxes/package.py +++ b/var/spack/repos/builtin/packages/memaxes/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/meme/package.py b/var/spack/repos/builtin/packages/meme/package.py index dfeed3ae1b..5bd954dd9e 100644 --- a/var/spack/repos/builtin/packages/meme/package.py +++ b/var/spack/repos/builtin/packages/meme/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/meraculous/package.py b/var/spack/repos/builtin/packages/meraculous/package.py index 51d3943943..a2d6d6fb99 100644 --- a/var/spack/repos/builtin/packages/meraculous/package.py +++ b/var/spack/repos/builtin/packages/meraculous/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mercurial/package.py b/var/spack/repos/builtin/packages/mercurial/package.py index 198a8005be..aca0d9af6e 100644 --- a/var/spack/repos/builtin/packages/mercurial/package.py +++ b/var/spack/repos/builtin/packages/mercurial/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mesa-glu/package.py b/var/spack/repos/builtin/packages/mesa-glu/package.py index b450728e75..9d8125242e 100644 --- a/var/spack/repos/builtin/packages/mesa-glu/package.py +++ b/var/spack/repos/builtin/packages/mesa-glu/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py index 09ed462ab2..4c02066ceb 100644 --- a/var/spack/repos/builtin/packages/mesa/package.py +++ b/var/spack/repos/builtin/packages/mesa/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is released as part of spack under the LGPL license. diff --git a/var/spack/repos/builtin/packages/meshkit/package.py b/var/spack/repos/builtin/packages/meshkit/package.py index 9db76fc4d8..3225bd1133 100644 --- a/var/spack/repos/builtin/packages/meshkit/package.py +++ b/var/spack/repos/builtin/packages/meshkit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/meson/package.py b/var/spack/repos/builtin/packages/meson/package.py index 046d9b2dea..37be41030a 100644 --- a/var/spack/repos/builtin/packages/meson/package.py +++ b/var/spack/repos/builtin/packages/meson/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mesquite/package.py b/var/spack/repos/builtin/packages/mesquite/package.py index b23f1294ce..8db96cb6a9 100644 --- a/var/spack/repos/builtin/packages/mesquite/package.py +++ b/var/spack/repos/builtin/packages/mesquite/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/metaphysicl/package.py b/var/spack/repos/builtin/packages/metaphysicl/package.py index 52548f7b4c..98e28ce5a2 100644 --- a/var/spack/repos/builtin/packages/metaphysicl/package.py +++ b/var/spack/repos/builtin/packages/metaphysicl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/metasv/package.py b/var/spack/repos/builtin/packages/metasv/package.py index da513ae1b0..eba6ae5697 100644 --- a/var/spack/repos/builtin/packages/metasv/package.py +++ b/var/spack/repos/builtin/packages/metasv/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/metis/package.py b/var/spack/repos/builtin/packages/metis/package.py index 9c4016625d..56de392b69 100644 --- a/var/spack/repos/builtin/packages/metis/package.py +++ b/var/spack/repos/builtin/packages/metis/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mfem/package.py b/var/spack/repos/builtin/packages/mfem/package.py index 32b561edc8..a7be7fba8b 100644 --- a/var/spack/repos/builtin/packages/mfem/package.py +++ b/var/spack/repos/builtin/packages/mfem/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/microbiomeutil/package.py b/var/spack/repos/builtin/packages/microbiomeutil/package.py index 319148f71d..e46498eb76 100644 --- a/var/spack/repos/builtin/packages/microbiomeutil/package.py +++ b/var/spack/repos/builtin/packages/microbiomeutil/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/minced/package.py b/var/spack/repos/builtin/packages/minced/package.py index b30d427088..fa4eba232d 100644 --- a/var/spack/repos/builtin/packages/minced/package.py +++ b/var/spack/repos/builtin/packages/minced/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/miniaero/package.py b/var/spack/repos/builtin/packages/miniaero/package.py index da1421963f..bd1422ecf3 100644 --- a/var/spack/repos/builtin/packages/miniaero/package.py +++ b/var/spack/repos/builtin/packages/miniaero/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/miniamr/package.py b/var/spack/repos/builtin/packages/miniamr/package.py index 1740ab461c..838872fd7a 100644 --- a/var/spack/repos/builtin/packages/miniamr/package.py +++ b/var/spack/repos/builtin/packages/miniamr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/miniconda2/package.py b/var/spack/repos/builtin/packages/miniconda2/package.py index ce9fffd589..681be764e3 100644 --- a/var/spack/repos/builtin/packages/miniconda2/package.py +++ b/var/spack/repos/builtin/packages/miniconda2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/miniconda3/package.py b/var/spack/repos/builtin/packages/miniconda3/package.py index eedf802a27..fd8c1dbaa1 100644 --- a/var/spack/repos/builtin/packages/miniconda3/package.py +++ b/var/spack/repos/builtin/packages/miniconda3/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/minife/package.py b/var/spack/repos/builtin/packages/minife/package.py index 0757a8c6db..bce74edf57 100644 --- a/var/spack/repos/builtin/packages/minife/package.py +++ b/var/spack/repos/builtin/packages/minife/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/minighost/package.py b/var/spack/repos/builtin/packages/minighost/package.py index 1ad8b9f3f4..764a15012a 100644 --- a/var/spack/repos/builtin/packages/minighost/package.py +++ b/var/spack/repos/builtin/packages/minighost/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/minigmg/package.py b/var/spack/repos/builtin/packages/minigmg/package.py index 8cbd35faff..6dc9295078 100644 --- a/var/spack/repos/builtin/packages/minigmg/package.py +++ b/var/spack/repos/builtin/packages/minigmg/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/minimap2/package.py b/var/spack/repos/builtin/packages/minimap2/package.py index 17abaaeafa..c212826a2d 100644 --- a/var/spack/repos/builtin/packages/minimap2/package.py +++ b/var/spack/repos/builtin/packages/minimap2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/minimd/package.py b/var/spack/repos/builtin/packages/minimd/package.py index a9a6d90aa2..2cc7c1c96d 100644 --- a/var/spack/repos/builtin/packages/minimd/package.py +++ b/var/spack/repos/builtin/packages/minimd/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/minisign/package.py b/var/spack/repos/builtin/packages/minisign/package.py index 3cefd86c4d..816139a1f9 100755 --- a/var/spack/repos/builtin/packages/minisign/package.py +++ b/var/spack/repos/builtin/packages/minisign/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/minismac2d/package.py b/var/spack/repos/builtin/packages/minismac2d/package.py index 2e0693a0a6..bffed59227 100644 --- a/var/spack/repos/builtin/packages/minismac2d/package.py +++ b/var/spack/repos/builtin/packages/minismac2d/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/minitri/package.py b/var/spack/repos/builtin/packages/minitri/package.py index 6451a8b86a..b985b39b74 100644 --- a/var/spack/repos/builtin/packages/minitri/package.py +++ b/var/spack/repos/builtin/packages/minitri/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/minixyce/package.py b/var/spack/repos/builtin/packages/minixyce/package.py index 6273838f7e..0108fbaaa0 100644 --- a/var/spack/repos/builtin/packages/minixyce/package.py +++ b/var/spack/repos/builtin/packages/minixyce/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mira/package.py b/var/spack/repos/builtin/packages/mira/package.py index 2a67276588..bbcebf9154 100644 --- a/var/spack/repos/builtin/packages/mira/package.py +++ b/var/spack/repos/builtin/packages/mira/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mirdeep/package.py b/var/spack/repos/builtin/packages/mirdeep/package.py index 28981eade5..60f5aaaac9 100644 --- a/var/spack/repos/builtin/packages/mirdeep/package.py +++ b/var/spack/repos/builtin/packages/mirdeep/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mitofates/package.py b/var/spack/repos/builtin/packages/mitofates/package.py index 0ba5535b3d..57d763b340 100644 --- a/var/spack/repos/builtin/packages/mitofates/package.py +++ b/var/spack/repos/builtin/packages/mitofates/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mitos/package.py b/var/spack/repos/builtin/packages/mitos/package.py index 1cc402590b..40f4fe7014 100644 --- a/var/spack/repos/builtin/packages/mitos/package.py +++ b/var/spack/repos/builtin/packages/mitos/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mkfontdir/package.py b/var/spack/repos/builtin/packages/mkfontdir/package.py index 19ec4c3f86..404a1cecc7 100644 --- a/var/spack/repos/builtin/packages/mkfontdir/package.py +++ b/var/spack/repos/builtin/packages/mkfontdir/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mkfontscale/package.py b/var/spack/repos/builtin/packages/mkfontscale/package.py index 02e0bf23c6..ca8d77ef36 100644 --- a/var/spack/repos/builtin/packages/mkfontscale/package.py +++ b/var/spack/repos/builtin/packages/mkfontscale/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mlhka/package.py b/var/spack/repos/builtin/packages/mlhka/package.py index 85a23d5edd..dd2e044a23 100644 --- a/var/spack/repos/builtin/packages/mlhka/package.py +++ b/var/spack/repos/builtin/packages/mlhka/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/moab/package.py b/var/spack/repos/builtin/packages/moab/package.py index 8e84f63b2c..9f366ee915 100644 --- a/var/spack/repos/builtin/packages/moab/package.py +++ b/var/spack/repos/builtin/packages/moab/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/modern-wheel/package.py b/var/spack/repos/builtin/packages/modern-wheel/package.py index 066695524c..2ebd06bcc9 100644 --- a/var/spack/repos/builtin/packages/modern-wheel/package.py +++ b/var/spack/repos/builtin/packages/modern-wheel/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/molcas/package.py b/var/spack/repos/builtin/packages/molcas/package.py index 7c4958cc94..80b27f3715 100644 --- a/var/spack/repos/builtin/packages/molcas/package.py +++ b/var/spack/repos/builtin/packages/molcas/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mono/package.py b/var/spack/repos/builtin/packages/mono/package.py index a2f841ceb1..4bc593d37c 100644 --- a/var/spack/repos/builtin/packages/mono/package.py +++ b/var/spack/repos/builtin/packages/mono/package.py @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mosh/package.py b/var/spack/repos/builtin/packages/mosh/package.py index 7bd10dce0f..df091b1ad8 100644 --- a/var/spack/repos/builtin/packages/mosh/package.py +++ b/var/spack/repos/builtin/packages/mosh/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mothur/package.py b/var/spack/repos/builtin/packages/mothur/package.py index e19ee30f98..4c32475552 100644 --- a/var/spack/repos/builtin/packages/mothur/package.py +++ b/var/spack/repos/builtin/packages/mothur/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/motif/package.py b/var/spack/repos/builtin/packages/motif/package.py index 466b1c69a6..efbd767273 100644 --- a/var/spack/repos/builtin/packages/motif/package.py +++ b/var/spack/repos/builtin/packages/motif/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/motioncor2/package.py b/var/spack/repos/builtin/packages/motioncor2/package.py index e99a052c09..47f9411c3e 100644 --- a/var/spack/repos/builtin/packages/motioncor2/package.py +++ b/var/spack/repos/builtin/packages/motioncor2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mozjs/package.py b/var/spack/repos/builtin/packages/mozjs/package.py index 8343706f93..d3fbae2c84 100644 --- a/var/spack/repos/builtin/packages/mozjs/package.py +++ b/var/spack/repos/builtin/packages/mozjs/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mpc/package.py b/var/spack/repos/builtin/packages/mpc/package.py index d5193532f6..77e293c3bf 100644 --- a/var/spack/repos/builtin/packages/mpc/package.py +++ b/var/spack/repos/builtin/packages/mpc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mpe2/package.py b/var/spack/repos/builtin/packages/mpe2/package.py index d5041d7a32..43d2275ae1 100644 --- a/var/spack/repos/builtin/packages/mpe2/package.py +++ b/var/spack/repos/builtin/packages/mpe2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mpest/package.py b/var/spack/repos/builtin/packages/mpest/package.py index c5cba773dd..56d9c4a1b8 100644 --- a/var/spack/repos/builtin/packages/mpest/package.py +++ b/var/spack/repos/builtin/packages/mpest/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mpfr/package.py b/var/spack/repos/builtin/packages/mpfr/package.py index 4e69fa1f14..67c07b66e7 100644 --- a/var/spack/repos/builtin/packages/mpfr/package.py +++ b/var/spack/repos/builtin/packages/mpfr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mpibash/package.py b/var/spack/repos/builtin/packages/mpibash/package.py index bc89ed5563..fe586925d8 100644 --- a/var/spack/repos/builtin/packages/mpibash/package.py +++ b/var/spack/repos/builtin/packages/mpibash/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mpiblast/package.py b/var/spack/repos/builtin/packages/mpiblast/package.py index eebb7da1fb..b531af8c57 100644 --- a/var/spack/repos/builtin/packages/mpiblast/package.py +++ b/var/spack/repos/builtin/packages/mpiblast/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mpich/package.py b/var/spack/repos/builtin/packages/mpich/package.py index 761c39448c..df24445d4c 100644 --- a/var/spack/repos/builtin/packages/mpich/package.py +++ b/var/spack/repos/builtin/packages/mpich/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mpifileutils/package.py b/var/spack/repos/builtin/packages/mpifileutils/package.py index f1bb7e3f39..65625ff0cb 100644 --- a/var/spack/repos/builtin/packages/mpifileutils/package.py +++ b/var/spack/repos/builtin/packages/mpifileutils/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mpileaks/package.py b/var/spack/repos/builtin/packages/mpileaks/package.py index cbf330666a..33c6172051 100644 --- a/var/spack/repos/builtin/packages/mpileaks/package.py +++ b/var/spack/repos/builtin/packages/mpileaks/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mpip/package.py b/var/spack/repos/builtin/packages/mpip/package.py index a641217622..b8f14ec580 100644 --- a/var/spack/repos/builtin/packages/mpip/package.py +++ b/var/spack/repos/builtin/packages/mpip/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mpir/package.py b/var/spack/repos/builtin/packages/mpir/package.py index 14be170a3a..a196919546 100644 --- a/var/spack/repos/builtin/packages/mpir/package.py +++ b/var/spack/repos/builtin/packages/mpir/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mpix-launch-swift/package.py b/var/spack/repos/builtin/packages/mpix-launch-swift/package.py index a56337fdd4..d5d8190621 100644 --- a/var/spack/repos/builtin/packages/mpix-launch-swift/package.py +++ b/var/spack/repos/builtin/packages/mpix-launch-swift/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mrbayes/package.py b/var/spack/repos/builtin/packages/mrbayes/package.py index 1bb13800cb..fcc29329bd 100644 --- a/var/spack/repos/builtin/packages/mrbayes/package.py +++ b/var/spack/repos/builtin/packages/mrbayes/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mrnet/package.py b/var/spack/repos/builtin/packages/mrnet/package.py index 97637bf9fa..996ce273d0 100644 --- a/var/spack/repos/builtin/packages/mrnet/package.py +++ b/var/spack/repos/builtin/packages/mrnet/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mrtrix3/package.py b/var/spack/repos/builtin/packages/mrtrix3/package.py index f5daeabf5a..1d9d089333 100644 --- a/var/spack/repos/builtin/packages/mrtrix3/package.py +++ b/var/spack/repos/builtin/packages/mrtrix3/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mscgen/package.py b/var/spack/repos/builtin/packages/mscgen/package.py index 5b33252a5b..2dcf5c2293 100644 --- a/var/spack/repos/builtin/packages/mscgen/package.py +++ b/var/spack/repos/builtin/packages/mscgen/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/msgpack-c/package.py b/var/spack/repos/builtin/packages/msgpack-c/package.py index 8e5ac96718..c1cff79e24 100644 --- a/var/spack/repos/builtin/packages/msgpack-c/package.py +++ b/var/spack/repos/builtin/packages/msgpack-c/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mshadow/package.py b/var/spack/repos/builtin/packages/mshadow/package.py index cd9ecfce86..83b9eee2d4 100644 --- a/var/spack/repos/builtin/packages/mshadow/package.py +++ b/var/spack/repos/builtin/packages/mshadow/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/multitail/package.py b/var/spack/repos/builtin/packages/multitail/package.py index 9c9ef2cca0..a293298f37 100644 --- a/var/spack/repos/builtin/packages/multitail/package.py +++ b/var/spack/repos/builtin/packages/multitail/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/multiverso/package.py b/var/spack/repos/builtin/packages/multiverso/package.py index 8993ce1b4d..2d7e48cf47 100644 --- a/var/spack/repos/builtin/packages/multiverso/package.py +++ b/var/spack/repos/builtin/packages/multiverso/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mummer/package.py b/var/spack/repos/builtin/packages/mummer/package.py index 8aabf502f9..c2fa3c141a 100644 --- a/var/spack/repos/builtin/packages/mummer/package.py +++ b/var/spack/repos/builtin/packages/mummer/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mumps/package.py b/var/spack/repos/builtin/packages/mumps/package.py index 43f565ec99..9932253057 100644 --- a/var/spack/repos/builtin/packages/mumps/package.py +++ b/var/spack/repos/builtin/packages/mumps/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/munge/package.py b/var/spack/repos/builtin/packages/munge/package.py index f53fa5953e..545ed9a9be 100644 --- a/var/spack/repos/builtin/packages/munge/package.py +++ b/var/spack/repos/builtin/packages/munge/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/muparser/package.py b/var/spack/repos/builtin/packages/muparser/package.py index 8c65207dc5..e2e6c22f72 100644 --- a/var/spack/repos/builtin/packages/muparser/package.py +++ b/var/spack/repos/builtin/packages/muparser/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/muscle/package.py b/var/spack/repos/builtin/packages/muscle/package.py index 7ba57284c6..5f2f768210 100644 --- a/var/spack/repos/builtin/packages/muscle/package.py +++ b/var/spack/repos/builtin/packages/muscle/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/muse/package.py b/var/spack/repos/builtin/packages/muse/package.py index 3c3616854e..3f488a2ec0 100644 --- a/var/spack/repos/builtin/packages/muse/package.py +++ b/var/spack/repos/builtin/packages/muse/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/muster/package.py b/var/spack/repos/builtin/packages/muster/package.py index d926c90d8e..2bb704162f 100644 --- a/var/spack/repos/builtin/packages/muster/package.py +++ b/var/spack/repos/builtin/packages/muster/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mvapich2/package.py b/var/spack/repos/builtin/packages/mvapich2/package.py index 8dab2e9d6d..a141277ea4 100644 --- a/var/spack/repos/builtin/packages/mvapich2/package.py +++ b/var/spack/repos/builtin/packages/mvapich2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mxml/package.py b/var/spack/repos/builtin/packages/mxml/package.py index c1e0a8f968..0a10c6dafc 100644 --- a/var/spack/repos/builtin/packages/mxml/package.py +++ b/var/spack/repos/builtin/packages/mxml/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/mxnet/package.py b/var/spack/repos/builtin/packages/mxnet/package.py index 00443ec633..968e31c0b7 100644 --- a/var/spack/repos/builtin/packages/mxnet/package.py +++ b/var/spack/repos/builtin/packages/mxnet/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/nag/package.py b/var/spack/repos/builtin/packages/nag/package.py index 226cd90353..0d26330826 100644 --- a/var/spack/repos/builtin/packages/nag/package.py +++ b/var/spack/repos/builtin/packages/nag/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/nalu/package.py b/var/spack/repos/builtin/packages/nalu/package.py index 153a29f5ab..8f32117b7e 100644 --- a/var/spack/repos/builtin/packages/nalu/package.py +++ b/var/spack/repos/builtin/packages/nalu/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/namd/package.py b/var/spack/repos/builtin/packages/namd/package.py index 54d165525b..837ae1a5c8 100644 --- a/var/spack/repos/builtin/packages/namd/package.py +++ b/var/spack/repos/builtin/packages/namd/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/nano/package.py b/var/spack/repos/builtin/packages/nano/package.py index 200c47a7b3..0a5b646a4d 100644 --- a/var/spack/repos/builtin/packages/nano/package.py +++ b/var/spack/repos/builtin/packages/nano/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/nanoflann/package.py b/var/spack/repos/builtin/packages/nanoflann/package.py index 13c5797d69..962c888933 100644 --- a/var/spack/repos/builtin/packages/nanoflann/package.py +++ b/var/spack/repos/builtin/packages/nanoflann/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/nasm/package.py b/var/spack/repos/builtin/packages/nasm/package.py index 18ec925b8b..b4a8ad5d05 100644 --- a/var/spack/repos/builtin/packages/nasm/package.py +++ b/var/spack/repos/builtin/packages/nasm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/nauty/package.py b/var/spack/repos/builtin/packages/nauty/package.py index cf9e40a959..fece01cced 100644 --- a/var/spack/repos/builtin/packages/nauty/package.py +++ b/var/spack/repos/builtin/packages/nauty/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ncbi-rmblastn/package.py b/var/spack/repos/builtin/packages/ncbi-rmblastn/package.py index 57b918cde8..c561423b97 100644 --- a/var/spack/repos/builtin/packages/ncbi-rmblastn/package.py +++ b/var/spack/repos/builtin/packages/ncbi-rmblastn/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/nccl/package.py b/var/spack/repos/builtin/packages/nccl/package.py index e1ac486e16..be85aea43f 100644 --- a/var/spack/repos/builtin/packages/nccl/package.py +++ b/var/spack/repos/builtin/packages/nccl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/nccmp/package.py b/var/spack/repos/builtin/packages/nccmp/package.py index e710faa034..f54f9c8631 100644 --- a/var/spack/repos/builtin/packages/nccmp/package.py +++ b/var/spack/repos/builtin/packages/nccmp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ncdu/package.py b/var/spack/repos/builtin/packages/ncdu/package.py index a95fc5b1ca..9b6a0958b7 100644 --- a/var/spack/repos/builtin/packages/ncdu/package.py +++ b/var/spack/repos/builtin/packages/ncdu/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ncftp/package.py b/var/spack/repos/builtin/packages/ncftp/package.py index 704affdad3..8911e6763f 100644 --- a/var/spack/repos/builtin/packages/ncftp/package.py +++ b/var/spack/repos/builtin/packages/ncftp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ncl/package.py b/var/spack/repos/builtin/packages/ncl/package.py index 7ec9b78fc2..518bbf488e 100644 --- a/var/spack/repos/builtin/packages/ncl/package.py +++ b/var/spack/repos/builtin/packages/ncl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/nco/package.py b/var/spack/repos/builtin/packages/nco/package.py index 2aea5aed2c..47a9c57d60 100644 --- a/var/spack/repos/builtin/packages/nco/package.py +++ b/var/spack/repos/builtin/packages/nco/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ncurses/package.py b/var/spack/repos/builtin/packages/ncurses/package.py index d1cb7de8bb..f4ac9972e1 100644 --- a/var/spack/repos/builtin/packages/ncurses/package.py +++ b/var/spack/repos/builtin/packages/ncurses/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ncview/package.py b/var/spack/repos/builtin/packages/ncview/package.py index 5dd160e50c..eaf981b325 100644 --- a/var/spack/repos/builtin/packages/ncview/package.py +++ b/var/spack/repos/builtin/packages/ncview/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ndiff/package.py b/var/spack/repos/builtin/packages/ndiff/package.py index 176a3463d3..23bfceb03b 100644 --- a/var/spack/repos/builtin/packages/ndiff/package.py +++ b/var/spack/repos/builtin/packages/ndiff/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/nek5000/package.py b/var/spack/repos/builtin/packages/nek5000/package.py index aeb7e5b676..3084a202bc 100644 --- a/var/spack/repos/builtin/packages/nek5000/package.py +++ b/var/spack/repos/builtin/packages/nek5000/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/nekbone/package.py b/var/spack/repos/builtin/packages/nekbone/package.py index 053b80413d..b2c38a509b 100644 --- a/var/spack/repos/builtin/packages/nekbone/package.py +++ b/var/spack/repos/builtin/packages/nekbone/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/nekcem/package.py b/var/spack/repos/builtin/packages/nekcem/package.py index b38c17084b..b9de121249 100644 --- a/var/spack/repos/builtin/packages/nekcem/package.py +++ b/var/spack/repos/builtin/packages/nekcem/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/neovim/package.py b/var/spack/repos/builtin/packages/neovim/package.py index 9cf00c7899..d65c608847 100644 --- a/var/spack/repos/builtin/packages/neovim/package.py +++ b/var/spack/repos/builtin/packages/neovim/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/netcdf-cxx/package.py b/var/spack/repos/builtin/packages/netcdf-cxx/package.py index a87e3e7644..600033b2b5 100644 --- a/var/spack/repos/builtin/packages/netcdf-cxx/package.py +++ b/var/spack/repos/builtin/packages/netcdf-cxx/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/netcdf-cxx4/package.py b/var/spack/repos/builtin/packages/netcdf-cxx4/package.py index 7cd2cdca3e..1b308d6ada 100644 --- a/var/spack/repos/builtin/packages/netcdf-cxx4/package.py +++ b/var/spack/repos/builtin/packages/netcdf-cxx4/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/netcdf-fortran/package.py b/var/spack/repos/builtin/packages/netcdf-fortran/package.py index 3646689538..818115b187 100644 --- a/var/spack/repos/builtin/packages/netcdf-fortran/package.py +++ b/var/spack/repos/builtin/packages/netcdf-fortran/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/netcdf/package.py b/var/spack/repos/builtin/packages/netcdf/package.py index f12e2941c8..c68950a855 100644 --- a/var/spack/repos/builtin/packages/netcdf/package.py +++ b/var/spack/repos/builtin/packages/netcdf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/netgauge/package.py b/var/spack/repos/builtin/packages/netgauge/package.py index f850a22c2c..2c9a2b5379 100644 --- a/var/spack/repos/builtin/packages/netgauge/package.py +++ b/var/spack/repos/builtin/packages/netgauge/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/netgen/package.py b/var/spack/repos/builtin/packages/netgen/package.py index 9d6c4de81a..ef9d448b6e 100644 --- a/var/spack/repos/builtin/packages/netgen/package.py +++ b/var/spack/repos/builtin/packages/netgen/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/netlib-lapack/package.py b/var/spack/repos/builtin/packages/netlib-lapack/package.py index bc74a99c59..8c5336cf04 100644 --- a/var/spack/repos/builtin/packages/netlib-lapack/package.py +++ b/var/spack/repos/builtin/packages/netlib-lapack/package.py @@ -1,5 +1,5 @@ ############################################################################# -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/netlib-scalapack/package.py b/var/spack/repos/builtin/packages/netlib-scalapack/package.py index 9e9f6fd1c6..cffb4a27d0 100644 --- a/var/spack/repos/builtin/packages/netlib-scalapack/package.py +++ b/var/spack/repos/builtin/packages/netlib-scalapack/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/netlib-xblas/package.py b/var/spack/repos/builtin/packages/netlib-xblas/package.py index e24f7879d6..a1c269a20a 100644 --- a/var/spack/repos/builtin/packages/netlib-xblas/package.py +++ b/var/spack/repos/builtin/packages/netlib-xblas/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/nettle/package.py b/var/spack/repos/builtin/packages/nettle/package.py index 591483b2f9..30a0e5530b 100644 --- a/var/spack/repos/builtin/packages/nettle/package.py +++ b/var/spack/repos/builtin/packages/nettle/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/neuron/package.py b/var/spack/repos/builtin/packages/neuron/package.py index e3e97ed8e4..df1b45d2ed 100644 --- a/var/spack/repos/builtin/packages/neuron/package.py +++ b/var/spack/repos/builtin/packages/neuron/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/nextflow/package.py b/var/spack/repos/builtin/packages/nextflow/package.py index 96993816a8..b98cbe0355 100644 --- a/var/spack/repos/builtin/packages/nextflow/package.py +++ b/var/spack/repos/builtin/packages/nextflow/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/nfft/package.py b/var/spack/repos/builtin/packages/nfft/package.py index 415ddcf0eb..8321d76845 100644 --- a/var/spack/repos/builtin/packages/nfft/package.py +++ b/var/spack/repos/builtin/packages/nfft/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/nghttp2/package.py b/var/spack/repos/builtin/packages/nghttp2/package.py index 62b936e054..0cb9683bfb 100644 --- a/var/spack/repos/builtin/packages/nghttp2/package.py +++ b/var/spack/repos/builtin/packages/nghttp2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/nginx/package.py b/var/spack/repos/builtin/packages/nginx/package.py index f0375b82c7..83550ca08d 100644 --- a/var/spack/repos/builtin/packages/nginx/package.py +++ b/var/spack/repos/builtin/packages/nginx/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ngmlr/package.py b/var/spack/repos/builtin/packages/ngmlr/package.py index e1dbbe709e..0d27f2913a 100644 --- a/var/spack/repos/builtin/packages/ngmlr/package.py +++ b/var/spack/repos/builtin/packages/ngmlr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ninja-fortran/package.py b/var/spack/repos/builtin/packages/ninja-fortran/package.py index 57903928be..15ff5a11bc 100644 --- a/var/spack/repos/builtin/packages/ninja-fortran/package.py +++ b/var/spack/repos/builtin/packages/ninja-fortran/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ninja/package.py b/var/spack/repos/builtin/packages/ninja/package.py index 11c46cb81e..471b2b7da9 100644 --- a/var/spack/repos/builtin/packages/ninja/package.py +++ b/var/spack/repos/builtin/packages/ninja/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/nlopt/package.py b/var/spack/repos/builtin/packages/nlopt/package.py index 53b4aedd91..9ff1f0ee38 100644 --- a/var/spack/repos/builtin/packages/nlopt/package.py +++ b/var/spack/repos/builtin/packages/nlopt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/nmap/package.py b/var/spack/repos/builtin/packages/nmap/package.py index e4da0fbdcf..1cb3589140 100644 --- a/var/spack/repos/builtin/packages/nmap/package.py +++ b/var/spack/repos/builtin/packages/nmap/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/nnvm/package.py b/var/spack/repos/builtin/packages/nnvm/package.py index 0650df273d..c3caf69cf1 100644 --- a/var/spack/repos/builtin/packages/nnvm/package.py +++ b/var/spack/repos/builtin/packages/nnvm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/node-js/package.py b/var/spack/repos/builtin/packages/node-js/package.py index 90de2f2147..4fa1099023 100644 --- a/var/spack/repos/builtin/packages/node-js/package.py +++ b/var/spack/repos/builtin/packages/node-js/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/notmuch/package.py b/var/spack/repos/builtin/packages/notmuch/package.py index 11ff488d77..9052d5c8af 100644 --- a/var/spack/repos/builtin/packages/notmuch/package.py +++ b/var/spack/repos/builtin/packages/notmuch/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/npb/package.py b/var/spack/repos/builtin/packages/npb/package.py index 65e5294524..d216ddc566 100644 --- a/var/spack/repos/builtin/packages/npb/package.py +++ b/var/spack/repos/builtin/packages/npb/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/npm/package.py b/var/spack/repos/builtin/packages/npm/package.py index 89a46bc19b..7dd0488f79 100644 --- a/var/spack/repos/builtin/packages/npm/package.py +++ b/var/spack/repos/builtin/packages/npm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/npth/package.py b/var/spack/repos/builtin/packages/npth/package.py index fef115413b..0933691a6d 100644 --- a/var/spack/repos/builtin/packages/npth/package.py +++ b/var/spack/repos/builtin/packages/npth/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/nspr/package.py b/var/spack/repos/builtin/packages/nspr/package.py index cddcdb16a0..9d69d08577 100644 --- a/var/spack/repos/builtin/packages/nspr/package.py +++ b/var/spack/repos/builtin/packages/nspr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/numactl/package.py b/var/spack/repos/builtin/packages/numactl/package.py index 26df59c85a..fa962cc021 100644 --- a/var/spack/repos/builtin/packages/numactl/package.py +++ b/var/spack/repos/builtin/packages/numactl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/numdiff/package.py b/var/spack/repos/builtin/packages/numdiff/package.py index b584d1156c..1103f04589 100644 --- a/var/spack/repos/builtin/packages/numdiff/package.py +++ b/var/spack/repos/builtin/packages/numdiff/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/nut/package.py b/var/spack/repos/builtin/packages/nut/package.py index e8f99c775c..a5f0c427d6 100644 --- a/var/spack/repos/builtin/packages/nut/package.py +++ b/var/spack/repos/builtin/packages/nut/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/nwchem/package.py b/var/spack/repos/builtin/packages/nwchem/package.py index 19fc338ef6..f0e132b741 100644 --- a/var/spack/repos/builtin/packages/nwchem/package.py +++ b/var/spack/repos/builtin/packages/nwchem/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ocaml/package.py b/var/spack/repos/builtin/packages/ocaml/package.py index a01949ce2e..e1c5220098 100644 --- a/var/spack/repos/builtin/packages/ocaml/package.py +++ b/var/spack/repos/builtin/packages/ocaml/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/oce/package.py b/var/spack/repos/builtin/packages/oce/package.py index 6fc6183e40..c7ca09f06f 100644 --- a/var/spack/repos/builtin/packages/oce/package.py +++ b/var/spack/repos/builtin/packages/oce/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/oclint/package.py b/var/spack/repos/builtin/packages/oclint/package.py index 114a963bef..5095ce8c6e 100644 --- a/var/spack/repos/builtin/packages/oclint/package.py +++ b/var/spack/repos/builtin/packages/oclint/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/oclock/package.py b/var/spack/repos/builtin/packages/oclock/package.py index d74aff3f73..20e0025f7a 100644 --- a/var/spack/repos/builtin/packages/oclock/package.py +++ b/var/spack/repos/builtin/packages/oclock/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/octave-optim/package.py b/var/spack/repos/builtin/packages/octave-optim/package.py index 0091e66496..be8016b438 100644 --- a/var/spack/repos/builtin/packages/octave-optim/package.py +++ b/var/spack/repos/builtin/packages/octave-optim/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/octave-splines/package.py b/var/spack/repos/builtin/packages/octave-splines/package.py index 79341807c6..5b106c88f7 100644 --- a/var/spack/repos/builtin/packages/octave-splines/package.py +++ b/var/spack/repos/builtin/packages/octave-splines/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/octave-struct/package.py b/var/spack/repos/builtin/packages/octave-struct/package.py index 0af7f572fd..1b1bd1da0c 100644 --- a/var/spack/repos/builtin/packages/octave-struct/package.py +++ b/var/spack/repos/builtin/packages/octave-struct/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/octave/package.py b/var/spack/repos/builtin/packages/octave/package.py index 90c7cf00f5..2076725bb1 100644 --- a/var/spack/repos/builtin/packages/octave/package.py +++ b/var/spack/repos/builtin/packages/octave/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/octopus/package.py b/var/spack/repos/builtin/packages/octopus/package.py index c450cf6020..a3d4a30ffa 100644 --- a/var/spack/repos/builtin/packages/octopus/package.py +++ b/var/spack/repos/builtin/packages/octopus/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ompss/package.py b/var/spack/repos/builtin/packages/ompss/package.py index f3cea1597d..ebff0e64d9 100644 --- a/var/spack/repos/builtin/packages/ompss/package.py +++ b/var/spack/repos/builtin/packages/ompss/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ompt-openmp/package.py b/var/spack/repos/builtin/packages/ompt-openmp/package.py index 803f70c7c2..9495982b89 100644 --- a/var/spack/repos/builtin/packages/ompt-openmp/package.py +++ b/var/spack/repos/builtin/packages/ompt-openmp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/oniguruma/package.py b/var/spack/repos/builtin/packages/oniguruma/package.py index 28fb33590c..3faf733822 100644 --- a/var/spack/repos/builtin/packages/oniguruma/package.py +++ b/var/spack/repos/builtin/packages/oniguruma/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ont-albacore/package.py b/var/spack/repos/builtin/packages/ont-albacore/package.py index 77f6af8d1d..dadfa58921 100644 --- a/var/spack/repos/builtin/packages/ont-albacore/package.py +++ b/var/spack/repos/builtin/packages/ont-albacore/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/opa-psm2/package.py b/var/spack/repos/builtin/packages/opa-psm2/package.py index be49f676b0..68f01dcf55 100644 --- a/var/spack/repos/builtin/packages/opa-psm2/package.py +++ b/var/spack/repos/builtin/packages/opa-psm2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/opam/package.py b/var/spack/repos/builtin/packages/opam/package.py index ab71d15e7b..0b889092fc 100644 --- a/var/spack/repos/builtin/packages/opam/package.py +++ b/var/spack/repos/builtin/packages/opam/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/opari2/package.py b/var/spack/repos/builtin/packages/opari2/package.py index 9b0a4e9c47..695b6fe6eb 100644 --- a/var/spack/repos/builtin/packages/opari2/package.py +++ b/var/spack/repos/builtin/packages/opari2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/openbabel/package.py b/var/spack/repos/builtin/packages/openbabel/package.py index 05e6e0c784..2201c9555a 100644 --- a/var/spack/repos/builtin/packages/openbabel/package.py +++ b/var/spack/repos/builtin/packages/openbabel/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/openblas/package.py b/var/spack/repos/builtin/packages/openblas/package.py index 7c5513f482..bb61bafb40 100644 --- a/var/spack/repos/builtin/packages/openblas/package.py +++ b/var/spack/repos/builtin/packages/openblas/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/opencoarrays/package.py b/var/spack/repos/builtin/packages/opencoarrays/package.py index cba5651fc7..8b2c4f7bd5 100644 --- a/var/spack/repos/builtin/packages/opencoarrays/package.py +++ b/var/spack/repos/builtin/packages/opencoarrays/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index 8a16894e68..920a029c8c 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/openexr/package.py b/var/spack/repos/builtin/packages/openexr/package.py index 2d81b9419d..07b29fcfaa 100644 --- a/var/spack/repos/builtin/packages/openexr/package.py +++ b/var/spack/repos/builtin/packages/openexr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/openfast/package.py b/var/spack/repos/builtin/packages/openfast/package.py index 687ca8c3b7..ecc92d7848 100644 --- a/var/spack/repos/builtin/packages/openfast/package.py +++ b/var/spack/repos/builtin/packages/openfast/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/openfst/package.py b/var/spack/repos/builtin/packages/openfst/package.py index 29b5eca02d..13f08820c6 100644 --- a/var/spack/repos/builtin/packages/openfst/package.py +++ b/var/spack/repos/builtin/packages/openfst/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/opengl/package.py b/var/spack/repos/builtin/packages/opengl/package.py index 9d9e52f959..b2c234ee6f 100644 --- a/var/spack/repos/builtin/packages/opengl/package.py +++ b/var/spack/repos/builtin/packages/opengl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/openjpeg/package.py b/var/spack/repos/builtin/packages/openjpeg/package.py index 751722dec5..0164039087 100644 --- a/var/spack/repos/builtin/packages/openjpeg/package.py +++ b/var/spack/repos/builtin/packages/openjpeg/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/openmc/package.py b/var/spack/repos/builtin/packages/openmc/package.py index b48928c02c..ed6229cfdd 100644 --- a/var/spack/repos/builtin/packages/openmc/package.py +++ b/var/spack/repos/builtin/packages/openmc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index cd01121c6a..784e38109f 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/opennurbs/package.py b/var/spack/repos/builtin/packages/opennurbs/package.py index cffae11b28..43135b7a31 100644 --- a/var/spack/repos/builtin/packages/opennurbs/package.py +++ b/var/spack/repos/builtin/packages/opennurbs/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/openscenegraph/package.py b/var/spack/repos/builtin/packages/openscenegraph/package.py index 915848fc23..96a2b9edea 100644 --- a/var/spack/repos/builtin/packages/openscenegraph/package.py +++ b/var/spack/repos/builtin/packages/openscenegraph/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/openssh/package.py b/var/spack/repos/builtin/packages/openssh/package.py index 2edaedb437..4e1b690d73 100644 --- a/var/spack/repos/builtin/packages/openssh/package.py +++ b/var/spack/repos/builtin/packages/openssh/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/openssl/package.py b/var/spack/repos/builtin/packages/openssl/package.py index c04bb664e7..3fcd29e70e 100644 --- a/var/spack/repos/builtin/packages/openssl/package.py +++ b/var/spack/repos/builtin/packages/openssl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/opium/package.py b/var/spack/repos/builtin/packages/opium/package.py index 5ce1d8b332..ae60656f59 100644 --- a/var/spack/repos/builtin/packages/opium/package.py +++ b/var/spack/repos/builtin/packages/opium/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/opus/package.py b/var/spack/repos/builtin/packages/opus/package.py index 03d434926d..d3699c1549 100644 --- a/var/spack/repos/builtin/packages/opus/package.py +++ b/var/spack/repos/builtin/packages/opus/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/orfm/package.py b/var/spack/repos/builtin/packages/orfm/package.py index e7a3e88ac2..7a6a442c2d 100644 --- a/var/spack/repos/builtin/packages/orfm/package.py +++ b/var/spack/repos/builtin/packages/orfm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/orthofinder/package.py b/var/spack/repos/builtin/packages/orthofinder/package.py index fa620cf1b3..351d0c12f0 100644 --- a/var/spack/repos/builtin/packages/orthofinder/package.py +++ b/var/spack/repos/builtin/packages/orthofinder/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/orthomcl/package.py b/var/spack/repos/builtin/packages/orthomcl/package.py index 98bef74726..83ca00b848 100644 --- a/var/spack/repos/builtin/packages/orthomcl/package.py +++ b/var/spack/repos/builtin/packages/orthomcl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/osu-micro-benchmarks/package.py b/var/spack/repos/builtin/packages/osu-micro-benchmarks/package.py index 43bb908efa..8ca6fb01a9 100644 --- a/var/spack/repos/builtin/packages/osu-micro-benchmarks/package.py +++ b/var/spack/repos/builtin/packages/osu-micro-benchmarks/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/otf/package.py b/var/spack/repos/builtin/packages/otf/package.py index 4df0a12bdf..fc858f031d 100644 --- a/var/spack/repos/builtin/packages/otf/package.py +++ b/var/spack/repos/builtin/packages/otf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/otf2/package.py b/var/spack/repos/builtin/packages/otf2/package.py index ee08a44328..ce9776ad36 100644 --- a/var/spack/repos/builtin/packages/otf2/package.py +++ b/var/spack/repos/builtin/packages/otf2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/p4est/package.py b/var/spack/repos/builtin/packages/p4est/package.py index 56c1ffbc93..e14061d126 100644 --- a/var/spack/repos/builtin/packages/p4est/package.py +++ b/var/spack/repos/builtin/packages/p4est/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/p7zip/package.py b/var/spack/repos/builtin/packages/p7zip/package.py index 90b7479d80..35c71193b6 100644 --- a/var/spack/repos/builtin/packages/p7zip/package.py +++ b/var/spack/repos/builtin/packages/p7zip/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pacbio-daligner/package.py b/var/spack/repos/builtin/packages/pacbio-daligner/package.py index e568c7170e..2d4866f65e 100644 --- a/var/spack/repos/builtin/packages/pacbio-daligner/package.py +++ b/var/spack/repos/builtin/packages/pacbio-daligner/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pacbio-damasker/package.py b/var/spack/repos/builtin/packages/pacbio-damasker/package.py index cc32df052b..674a6d35e0 100644 --- a/var/spack/repos/builtin/packages/pacbio-damasker/package.py +++ b/var/spack/repos/builtin/packages/pacbio-damasker/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pacbio-dazz-db/package.py b/var/spack/repos/builtin/packages/pacbio-dazz-db/package.py index 595ab4cd15..328e307b63 100644 --- a/var/spack/repos/builtin/packages/pacbio-dazz-db/package.py +++ b/var/spack/repos/builtin/packages/pacbio-dazz-db/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pacbio-dextractor/package.py b/var/spack/repos/builtin/packages/pacbio-dextractor/package.py index 75bc553733..a567c22e9a 100644 --- a/var/spack/repos/builtin/packages/pacbio-dextractor/package.py +++ b/var/spack/repos/builtin/packages/pacbio-dextractor/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pagit/package.py b/var/spack/repos/builtin/packages/pagit/package.py index 7c40da934b..d276bbf3a9 100644 --- a/var/spack/repos/builtin/packages/pagit/package.py +++ b/var/spack/repos/builtin/packages/pagit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pagmo/package.py b/var/spack/repos/builtin/packages/pagmo/package.py index 0d30d847f0..b9ad411882 100644 --- a/var/spack/repos/builtin/packages/pagmo/package.py +++ b/var/spack/repos/builtin/packages/pagmo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/paml/package.py b/var/spack/repos/builtin/packages/paml/package.py index 81d9e7c25b..0bb2b83ff0 100644 --- a/var/spack/repos/builtin/packages/paml/package.py +++ b/var/spack/repos/builtin/packages/paml/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/panda/package.py b/var/spack/repos/builtin/packages/panda/package.py index 30323fa65a..09d1eb7ccd 100644 --- a/var/spack/repos/builtin/packages/panda/package.py +++ b/var/spack/repos/builtin/packages/panda/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pandaseq/package.py b/var/spack/repos/builtin/packages/pandaseq/package.py index 09684c20c5..686fa698db 100644 --- a/var/spack/repos/builtin/packages/pandaseq/package.py +++ b/var/spack/repos/builtin/packages/pandaseq/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pango/package.py b/var/spack/repos/builtin/packages/pango/package.py index bdc03bbd65..b56751f531 100644 --- a/var/spack/repos/builtin/packages/pango/package.py +++ b/var/spack/repos/builtin/packages/pango/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/papi/package.py b/var/spack/repos/builtin/packages/papi/package.py index 4809295bb6..04e1f498d5 100644 --- a/var/spack/repos/builtin/packages/papi/package.py +++ b/var/spack/repos/builtin/packages/papi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/paradiseo/package.py b/var/spack/repos/builtin/packages/paradiseo/package.py index 036d7cdb4f..4fd587bdc8 100644 --- a/var/spack/repos/builtin/packages/paradiseo/package.py +++ b/var/spack/repos/builtin/packages/paradiseo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/parallel-netcdf/package.py b/var/spack/repos/builtin/packages/parallel-netcdf/package.py index 734b61390b..01fee69574 100644 --- a/var/spack/repos/builtin/packages/parallel-netcdf/package.py +++ b/var/spack/repos/builtin/packages/parallel-netcdf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/parallel/package.py b/var/spack/repos/builtin/packages/parallel/package.py index 407eb4af09..97d0abfc1c 100644 --- a/var/spack/repos/builtin/packages/parallel/package.py +++ b/var/spack/repos/builtin/packages/parallel/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/paraver/package.py b/var/spack/repos/builtin/packages/paraver/package.py index 3a015d4b63..7556114e31 100644 --- a/var/spack/repos/builtin/packages/paraver/package.py +++ b/var/spack/repos/builtin/packages/paraver/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index 4ac904ffe5..907d98eada 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/parmetis/package.py b/var/spack/repos/builtin/packages/parmetis/package.py index 86fee57abb..fca741888a 100644 --- a/var/spack/repos/builtin/packages/parmetis/package.py +++ b/var/spack/repos/builtin/packages/parmetis/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/parmgridgen/package.py b/var/spack/repos/builtin/packages/parmgridgen/package.py index bbacf519fa..6b9ec6e99d 100644 --- a/var/spack/repos/builtin/packages/parmgridgen/package.py +++ b/var/spack/repos/builtin/packages/parmgridgen/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/parsimonator/package.py b/var/spack/repos/builtin/packages/parsimonator/package.py index 462f81e6cf..af2dda7a0a 100644 --- a/var/spack/repos/builtin/packages/parsimonator/package.py +++ b/var/spack/repos/builtin/packages/parsimonator/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/partitionfinder/package.py b/var/spack/repos/builtin/packages/partitionfinder/package.py index 3089eca783..3cc10a6df6 100644 --- a/var/spack/repos/builtin/packages/partitionfinder/package.py +++ b/var/spack/repos/builtin/packages/partitionfinder/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/patchelf/package.py b/var/spack/repos/builtin/packages/patchelf/package.py index 273d10486c..db52c1616d 100644 --- a/var/spack/repos/builtin/packages/patchelf/package.py +++ b/var/spack/repos/builtin/packages/patchelf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pathfinder/package.py b/var/spack/repos/builtin/packages/pathfinder/package.py index 79bba915d0..fb44486797 100644 --- a/var/spack/repos/builtin/packages/pathfinder/package.py +++ b/var/spack/repos/builtin/packages/pathfinder/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pbmpi/package.py b/var/spack/repos/builtin/packages/pbmpi/package.py index a8bbece03d..4ea4eb7a20 100644 --- a/var/spack/repos/builtin/packages/pbmpi/package.py +++ b/var/spack/repos/builtin/packages/pbmpi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pcma/package.py b/var/spack/repos/builtin/packages/pcma/package.py index d4f998d104..d60d76b5ea 100644 --- a/var/spack/repos/builtin/packages/pcma/package.py +++ b/var/spack/repos/builtin/packages/pcma/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pcre/package.py b/var/spack/repos/builtin/packages/pcre/package.py index 394b1aa5d3..692d847b52 100644 --- a/var/spack/repos/builtin/packages/pcre/package.py +++ b/var/spack/repos/builtin/packages/pcre/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pcre2/package.py b/var/spack/repos/builtin/packages/pcre2/package.py index 531a175ef7..e9295d3241 100644 --- a/var/spack/repos/builtin/packages/pcre2/package.py +++ b/var/spack/repos/builtin/packages/pcre2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pdsh/package.py b/var/spack/repos/builtin/packages/pdsh/package.py index 708dea108c..4d9778eb64 100644 --- a/var/spack/repos/builtin/packages/pdsh/package.py +++ b/var/spack/repos/builtin/packages/pdsh/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pdt/package.py b/var/spack/repos/builtin/packages/pdt/package.py index ef8592e44d..64dfbda8c7 100644 --- a/var/spack/repos/builtin/packages/pdt/package.py +++ b/var/spack/repos/builtin/packages/pdt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pennant/package.py b/var/spack/repos/builtin/packages/pennant/package.py index e318cd991d..3f3fa6a6e2 100644 --- a/var/spack/repos/builtin/packages/pennant/package.py +++ b/var/spack/repos/builtin/packages/pennant/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/percept/package.py b/var/spack/repos/builtin/packages/percept/package.py index 1719a7c1fe..0607434993 100644 --- a/var/spack/repos/builtin/packages/percept/package.py +++ b/var/spack/repos/builtin/packages/percept/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-algorithm-diff/package.py b/var/spack/repos/builtin/packages/perl-algorithm-diff/package.py index 79f4076da5..5561f5a512 100644 --- a/var/spack/repos/builtin/packages/perl-algorithm-diff/package.py +++ b/var/spack/repos/builtin/packages/perl-algorithm-diff/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-app-cmd/package.py b/var/spack/repos/builtin/packages/perl-app-cmd/package.py index 50688a5336..9bc09ab9f6 100644 --- a/var/spack/repos/builtin/packages/perl-app-cmd/package.py +++ b/var/spack/repos/builtin/packages/perl-app-cmd/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-array-utils/package.py b/var/spack/repos/builtin/packages/perl-array-utils/package.py index 3bbade9525..cffaede22a 100644 --- a/var/spack/repos/builtin/packages/perl-array-utils/package.py +++ b/var/spack/repos/builtin/packages/perl-array-utils/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-b-hooks-endofscope/package.py b/var/spack/repos/builtin/packages/perl-b-hooks-endofscope/package.py index eecd0b69cc..cefd4ca618 100644 --- a/var/spack/repos/builtin/packages/perl-b-hooks-endofscope/package.py +++ b/var/spack/repos/builtin/packages/perl-b-hooks-endofscope/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-bio-perl/package.py b/var/spack/repos/builtin/packages/perl-bio-perl/package.py index afbef8001c..7b52604988 100644 --- a/var/spack/repos/builtin/packages/perl-bio-perl/package.py +++ b/var/spack/repos/builtin/packages/perl-bio-perl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-bit-vector/package.py b/var/spack/repos/builtin/packages/perl-bit-vector/package.py index e72fd29957..d6b399780b 100644 --- a/var/spack/repos/builtin/packages/perl-bit-vector/package.py +++ b/var/spack/repos/builtin/packages/perl-bit-vector/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-cairo/package.py b/var/spack/repos/builtin/packages/perl-cairo/package.py index 3fa273f1c0..883b27aa83 100644 --- a/var/spack/repos/builtin/packages/perl-cairo/package.py +++ b/var/spack/repos/builtin/packages/perl-cairo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-capture-tiny/package.py b/var/spack/repos/builtin/packages/perl-capture-tiny/package.py index 952ff2999c..05f79140cb 100644 --- a/var/spack/repos/builtin/packages/perl-capture-tiny/package.py +++ b/var/spack/repos/builtin/packages/perl-capture-tiny/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-carp-clan/package.py b/var/spack/repos/builtin/packages/perl-carp-clan/package.py index b515647c75..c2643de918 100644 --- a/var/spack/repos/builtin/packages/perl-carp-clan/package.py +++ b/var/spack/repos/builtin/packages/perl-carp-clan/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-class-data-inheritable/package.py b/var/spack/repos/builtin/packages/perl-class-data-inheritable/package.py index 2fd349b077..dc87c5b56f 100644 --- a/var/spack/repos/builtin/packages/perl-class-data-inheritable/package.py +++ b/var/spack/repos/builtin/packages/perl-class-data-inheritable/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-class-inspector/package.py b/var/spack/repos/builtin/packages/perl-class-inspector/package.py index f619c3122e..6fbce7adf6 100644 --- a/var/spack/repos/builtin/packages/perl-class-inspector/package.py +++ b/var/spack/repos/builtin/packages/perl-class-inspector/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-class-load-xs/package.py b/var/spack/repos/builtin/packages/perl-class-load-xs/package.py index 11130afd97..278eaf457a 100644 --- a/var/spack/repos/builtin/packages/perl-class-load-xs/package.py +++ b/var/spack/repos/builtin/packages/perl-class-load-xs/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-class-load/package.py b/var/spack/repos/builtin/packages/perl-class-load/package.py index 0d10f82813..9f21cfe6f6 100644 --- a/var/spack/repos/builtin/packages/perl-class-load/package.py +++ b/var/spack/repos/builtin/packages/perl-class-load/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-cpan-meta-check/package.py b/var/spack/repos/builtin/packages/perl-cpan-meta-check/package.py index 7fe16bb2a0..1012c29e5f 100644 --- a/var/spack/repos/builtin/packages/perl-cpan-meta-check/package.py +++ b/var/spack/repos/builtin/packages/perl-cpan-meta-check/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-data-optlist/package.py b/var/spack/repos/builtin/packages/perl-data-optlist/package.py index 4eaeaca1a4..1503866488 100644 --- a/var/spack/repos/builtin/packages/perl-data-optlist/package.py +++ b/var/spack/repos/builtin/packages/perl-data-optlist/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-data-stag/package.py b/var/spack/repos/builtin/packages/perl-data-stag/package.py index fd1bff285f..b93888dddc 100644 --- a/var/spack/repos/builtin/packages/perl-data-stag/package.py +++ b/var/spack/repos/builtin/packages/perl-data-stag/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-dbd-mysql/package.py b/var/spack/repos/builtin/packages/perl-dbd-mysql/package.py index a5a8d27413..24402d5426 100644 --- a/var/spack/repos/builtin/packages/perl-dbd-mysql/package.py +++ b/var/spack/repos/builtin/packages/perl-dbd-mysql/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-dbfile/package.py b/var/spack/repos/builtin/packages/perl-dbfile/package.py index 3a5d8fea94..0f6d894a4f 100644 --- a/var/spack/repos/builtin/packages/perl-dbfile/package.py +++ b/var/spack/repos/builtin/packages/perl-dbfile/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-dbi/package.py b/var/spack/repos/builtin/packages/perl-dbi/package.py index a6e5e76cc5..d96edd5072 100644 --- a/var/spack/repos/builtin/packages/perl-dbi/package.py +++ b/var/spack/repos/builtin/packages/perl-dbi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-devel-cycle/package.py b/var/spack/repos/builtin/packages/perl-devel-cycle/package.py index ad4c575025..b8f6354513 100644 --- a/var/spack/repos/builtin/packages/perl-devel-cycle/package.py +++ b/var/spack/repos/builtin/packages/perl-devel-cycle/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-devel-globaldestruction/package.py b/var/spack/repos/builtin/packages/perl-devel-globaldestruction/package.py index aca5245611..ed65d5641e 100644 --- a/var/spack/repos/builtin/packages/perl-devel-globaldestruction/package.py +++ b/var/spack/repos/builtin/packages/perl-devel-globaldestruction/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-devel-overloadinfo/package.py b/var/spack/repos/builtin/packages/perl-devel-overloadinfo/package.py index 60a80aed90..4383af4a83 100644 --- a/var/spack/repos/builtin/packages/perl-devel-overloadinfo/package.py +++ b/var/spack/repos/builtin/packages/perl-devel-overloadinfo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-devel-stacktrace/package.py b/var/spack/repos/builtin/packages/perl-devel-stacktrace/package.py index d6b7b8f484..ac3d8176d8 100644 --- a/var/spack/repos/builtin/packages/perl-devel-stacktrace/package.py +++ b/var/spack/repos/builtin/packages/perl-devel-stacktrace/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-digest-md5/package.py b/var/spack/repos/builtin/packages/perl-digest-md5/package.py index 6c23ea2a94..496f1be080 100644 --- a/var/spack/repos/builtin/packages/perl-digest-md5/package.py +++ b/var/spack/repos/builtin/packages/perl-digest-md5/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-dist-checkconflicts/package.py b/var/spack/repos/builtin/packages/perl-dist-checkconflicts/package.py index f09ebd4a31..319159172d 100644 --- a/var/spack/repos/builtin/packages/perl-dist-checkconflicts/package.py +++ b/var/spack/repos/builtin/packages/perl-dist-checkconflicts/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-encode-locale/package.py b/var/spack/repos/builtin/packages/perl-encode-locale/package.py index 6f525362ad..785194fe04 100644 --- a/var/spack/repos/builtin/packages/perl-encode-locale/package.py +++ b/var/spack/repos/builtin/packages/perl-encode-locale/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-eval-closure/package.py b/var/spack/repos/builtin/packages/perl-eval-closure/package.py index d79d119140..7e20a6e08d 100644 --- a/var/spack/repos/builtin/packages/perl-eval-closure/package.py +++ b/var/spack/repos/builtin/packages/perl-eval-closure/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-exception-class/package.py b/var/spack/repos/builtin/packages/perl-exception-class/package.py index 715830432d..d3bba5b06c 100644 --- a/var/spack/repos/builtin/packages/perl-exception-class/package.py +++ b/var/spack/repos/builtin/packages/perl-exception-class/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-exporter-tiny/package.py b/var/spack/repos/builtin/packages/perl-exporter-tiny/package.py index 3285fc3b6d..3a1eac1680 100644 --- a/var/spack/repos/builtin/packages/perl-exporter-tiny/package.py +++ b/var/spack/repos/builtin/packages/perl-exporter-tiny/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-extutils-depends/package.py b/var/spack/repos/builtin/packages/perl-extutils-depends/package.py index ac0c3619ac..265996a798 100644 --- a/var/spack/repos/builtin/packages/perl-extutils-depends/package.py +++ b/var/spack/repos/builtin/packages/perl-extutils-depends/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-extutils-makemaker/package.py b/var/spack/repos/builtin/packages/perl-extutils-makemaker/package.py index c346cead50..5245ddb69b 100644 --- a/var/spack/repos/builtin/packages/perl-extutils-makemaker/package.py +++ b/var/spack/repos/builtin/packages/perl-extutils-makemaker/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py b/var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py index 547d2d2866..c383966440 100644 --- a/var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py +++ b/var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-file-copy-recursive/package.py b/var/spack/repos/builtin/packages/perl-file-copy-recursive/package.py index 75ed115c1f..b9b87ce2eb 100644 --- a/var/spack/repos/builtin/packages/perl-file-copy-recursive/package.py +++ b/var/spack/repos/builtin/packages/perl-file-copy-recursive/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-file-listing/package.py b/var/spack/repos/builtin/packages/perl-file-listing/package.py index 5fafd76a5c..963a1f628c 100644 --- a/var/spack/repos/builtin/packages/perl-file-listing/package.py +++ b/var/spack/repos/builtin/packages/perl-file-listing/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-file-pushd/package.py b/var/spack/repos/builtin/packages/perl-file-pushd/package.py index fea45e0f9e..9e06788f67 100644 --- a/var/spack/repos/builtin/packages/perl-file-pushd/package.py +++ b/var/spack/repos/builtin/packages/perl-file-pushd/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-file-sharedir-install/package.py b/var/spack/repos/builtin/packages/perl-file-sharedir-install/package.py index c02de14ada..f7077eff78 100644 --- a/var/spack/repos/builtin/packages/perl-file-sharedir-install/package.py +++ b/var/spack/repos/builtin/packages/perl-file-sharedir-install/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-file-slurp-tiny/package.py b/var/spack/repos/builtin/packages/perl-file-slurp-tiny/package.py index 89177aef8c..d8ec968e47 100644 --- a/var/spack/repos/builtin/packages/perl-file-slurp-tiny/package.py +++ b/var/spack/repos/builtin/packages/perl-file-slurp-tiny/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-file-slurper/package.py b/var/spack/repos/builtin/packages/perl-file-slurper/package.py index c7844d741f..8128c2487f 100644 --- a/var/spack/repos/builtin/packages/perl-file-slurper/package.py +++ b/var/spack/repos/builtin/packages/perl-file-slurper/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-file-which/package.py b/var/spack/repos/builtin/packages/perl-file-which/package.py index c4650db77a..ab86a1dbb4 100644 --- a/var/spack/repos/builtin/packages/perl-file-which/package.py +++ b/var/spack/repos/builtin/packages/perl-file-which/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-font-ttf/package.py b/var/spack/repos/builtin/packages/perl-font-ttf/package.py index 81ddbf20b5..64d29c3602 100644 --- a/var/spack/repos/builtin/packages/perl-font-ttf/package.py +++ b/var/spack/repos/builtin/packages/perl-font-ttf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-gd-graph/package.py b/var/spack/repos/builtin/packages/perl-gd-graph/package.py index 9e68fb208a..ea34760ae1 100644 --- a/var/spack/repos/builtin/packages/perl-gd-graph/package.py +++ b/var/spack/repos/builtin/packages/perl-gd-graph/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-gd-text/package.py b/var/spack/repos/builtin/packages/perl-gd-text/package.py index a0a512352a..2b7e5cc924 100644 --- a/var/spack/repos/builtin/packages/perl-gd-text/package.py +++ b/var/spack/repos/builtin/packages/perl-gd-text/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-gd/package.py b/var/spack/repos/builtin/packages/perl-gd/package.py index 77e5c01aee..8fe869dc09 100644 --- a/var/spack/repos/builtin/packages/perl-gd/package.py +++ b/var/spack/repos/builtin/packages/perl-gd/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-graph-readwrite/package.py b/var/spack/repos/builtin/packages/perl-graph-readwrite/package.py index 4e3ddbcdd0..2392c8ef62 100644 --- a/var/spack/repos/builtin/packages/perl-graph-readwrite/package.py +++ b/var/spack/repos/builtin/packages/perl-graph-readwrite/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-graph/package.py b/var/spack/repos/builtin/packages/perl-graph/package.py index 5a3bb7cf94..0417ac03fa 100644 --- a/var/spack/repos/builtin/packages/perl-graph/package.py +++ b/var/spack/repos/builtin/packages/perl-graph/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-html-parser/package.py b/var/spack/repos/builtin/packages/perl-html-parser/package.py index 8eb86dc002..a5b44b99c6 100644 --- a/var/spack/repos/builtin/packages/perl-html-parser/package.py +++ b/var/spack/repos/builtin/packages/perl-html-parser/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-html-tagset/package.py b/var/spack/repos/builtin/packages/perl-html-tagset/package.py index bc41572d7c..674d17df0d 100644 --- a/var/spack/repos/builtin/packages/perl-html-tagset/package.py +++ b/var/spack/repos/builtin/packages/perl-html-tagset/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-http-cookies/package.py b/var/spack/repos/builtin/packages/perl-http-cookies/package.py index 112bb88974..61dd019cfc 100644 --- a/var/spack/repos/builtin/packages/perl-http-cookies/package.py +++ b/var/spack/repos/builtin/packages/perl-http-cookies/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-http-daemon/package.py b/var/spack/repos/builtin/packages/perl-http-daemon/package.py index ff1de570e5..b3ef7d17c4 100644 --- a/var/spack/repos/builtin/packages/perl-http-daemon/package.py +++ b/var/spack/repos/builtin/packages/perl-http-daemon/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-http-date/package.py b/var/spack/repos/builtin/packages/perl-http-date/package.py index 928f7a568f..a4326753ea 100644 --- a/var/spack/repos/builtin/packages/perl-http-date/package.py +++ b/var/spack/repos/builtin/packages/perl-http-date/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-http-message/package.py b/var/spack/repos/builtin/packages/perl-http-message/package.py index 626afd4c0b..49ed80fdf3 100644 --- a/var/spack/repos/builtin/packages/perl-http-message/package.py +++ b/var/spack/repos/builtin/packages/perl-http-message/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-http-negotiate/package.py b/var/spack/repos/builtin/packages/perl-http-negotiate/package.py index f18654d36d..f03dd25988 100644 --- a/var/spack/repos/builtin/packages/perl-http-negotiate/package.py +++ b/var/spack/repos/builtin/packages/perl-http-negotiate/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-inline-c/package.py b/var/spack/repos/builtin/packages/perl-inline-c/package.py index af480c7de6..8231150495 100644 --- a/var/spack/repos/builtin/packages/perl-inline-c/package.py +++ b/var/spack/repos/builtin/packages/perl-inline-c/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-inline/package.py b/var/spack/repos/builtin/packages/perl-inline/package.py index 4759b44288..38803b87ed 100644 --- a/var/spack/repos/builtin/packages/perl-inline/package.py +++ b/var/spack/repos/builtin/packages/perl-inline/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-intervaltree/package.py b/var/spack/repos/builtin/packages/perl-intervaltree/package.py index 1a3a31f9d7..33fe2a82db 100644 --- a/var/spack/repos/builtin/packages/perl-intervaltree/package.py +++ b/var/spack/repos/builtin/packages/perl-intervaltree/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-io-html/package.py b/var/spack/repos/builtin/packages/perl-io-html/package.py index 4ad080e790..00c0f49479 100644 --- a/var/spack/repos/builtin/packages/perl-io-html/package.py +++ b/var/spack/repos/builtin/packages/perl-io-html/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-io-sessiondata/package.py b/var/spack/repos/builtin/packages/perl-io-sessiondata/package.py index 887a75d7be..53f52eb3bb 100644 --- a/var/spack/repos/builtin/packages/perl-io-sessiondata/package.py +++ b/var/spack/repos/builtin/packages/perl-io-sessiondata/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-io-socket-ssl/package.py b/var/spack/repos/builtin/packages/perl-io-socket-ssl/package.py index bc39f15f69..02364a939f 100644 --- a/var/spack/repos/builtin/packages/perl-io-socket-ssl/package.py +++ b/var/spack/repos/builtin/packages/perl-io-socket-ssl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-io-string/package.py b/var/spack/repos/builtin/packages/perl-io-string/package.py index ec08ac3078..134ae2711f 100644 --- a/var/spack/repos/builtin/packages/perl-io-string/package.py +++ b/var/spack/repos/builtin/packages/perl-io-string/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-json/package.py b/var/spack/repos/builtin/packages/perl-json/package.py index 007dcc2293..e901799bce 100644 --- a/var/spack/repos/builtin/packages/perl-json/package.py +++ b/var/spack/repos/builtin/packages/perl-json/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-list-moreutils/package.py b/var/spack/repos/builtin/packages/perl-list-moreutils/package.py index 8fa21b9392..051010a50c 100644 --- a/var/spack/repos/builtin/packages/perl-list-moreutils/package.py +++ b/var/spack/repos/builtin/packages/perl-list-moreutils/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-log-log4perl/package.py b/var/spack/repos/builtin/packages/perl-log-log4perl/package.py index 6a0d182d2f..5307cd18fd 100644 --- a/var/spack/repos/builtin/packages/perl-log-log4perl/package.py +++ b/var/spack/repos/builtin/packages/perl-log-log4perl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-lwp-mediatypes/package.py b/var/spack/repos/builtin/packages/perl-lwp-mediatypes/package.py index 15c98c7eeb..ce946ba2aa 100644 --- a/var/spack/repos/builtin/packages/perl-lwp-mediatypes/package.py +++ b/var/spack/repos/builtin/packages/perl-lwp-mediatypes/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-lwp-protocol-https/package.py b/var/spack/repos/builtin/packages/perl-lwp-protocol-https/package.py index adbe8a761f..40d38e3cb2 100644 --- a/var/spack/repos/builtin/packages/perl-lwp-protocol-https/package.py +++ b/var/spack/repos/builtin/packages/perl-lwp-protocol-https/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-lwp/package.py b/var/spack/repos/builtin/packages/perl-lwp/package.py index 90b5c13f16..ba12bc5ec3 100644 --- a/var/spack/repos/builtin/packages/perl-lwp/package.py +++ b/var/spack/repos/builtin/packages/perl-lwp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-math-cdf/package.py b/var/spack/repos/builtin/packages/perl-math-cdf/package.py index 094b08dd1d..b08737c046 100644 --- a/var/spack/repos/builtin/packages/perl-math-cdf/package.py +++ b/var/spack/repos/builtin/packages/perl-math-cdf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-module-build/package.py b/var/spack/repos/builtin/packages/perl-module-build/package.py index 53bc80a062..48d9c84953 100644 --- a/var/spack/repos/builtin/packages/perl-module-build/package.py +++ b/var/spack/repos/builtin/packages/perl-module-build/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-module-implementation/package.py b/var/spack/repos/builtin/packages/perl-module-implementation/package.py index 693ca5dd8b..e0facbf2e4 100644 --- a/var/spack/repos/builtin/packages/perl-module-implementation/package.py +++ b/var/spack/repos/builtin/packages/perl-module-implementation/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-module-runtime-conflicts/package.py b/var/spack/repos/builtin/packages/perl-module-runtime-conflicts/package.py index 1b499ce7f9..cd2d5c9a82 100644 --- a/var/spack/repos/builtin/packages/perl-module-runtime-conflicts/package.py +++ b/var/spack/repos/builtin/packages/perl-module-runtime-conflicts/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-module-runtime/package.py b/var/spack/repos/builtin/packages/perl-module-runtime/package.py index badcc7c5ce..9fad6c1d00 100644 --- a/var/spack/repos/builtin/packages/perl-module-runtime/package.py +++ b/var/spack/repos/builtin/packages/perl-module-runtime/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-moose/package.py b/var/spack/repos/builtin/packages/perl-moose/package.py index 2a0261599f..d5920bfcd6 100644 --- a/var/spack/repos/builtin/packages/perl-moose/package.py +++ b/var/spack/repos/builtin/packages/perl-moose/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-mozilla-ca/package.py b/var/spack/repos/builtin/packages/perl-mozilla-ca/package.py index d7f80c8675..9334a77e14 100644 --- a/var/spack/repos/builtin/packages/perl-mozilla-ca/package.py +++ b/var/spack/repos/builtin/packages/perl-mozilla-ca/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-mro-compat/package.py b/var/spack/repos/builtin/packages/perl-mro-compat/package.py index 81b6f19ffa..ae982a2eb9 100644 --- a/var/spack/repos/builtin/packages/perl-mro-compat/package.py +++ b/var/spack/repos/builtin/packages/perl-mro-compat/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-namespace-clean/package.py b/var/spack/repos/builtin/packages/perl-namespace-clean/package.py index 8dc2492430..cff5b92800 100644 --- a/var/spack/repos/builtin/packages/perl-namespace-clean/package.py +++ b/var/spack/repos/builtin/packages/perl-namespace-clean/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-net-http/package.py b/var/spack/repos/builtin/packages/perl-net-http/package.py index a4070eb11a..dd3bd2b640 100644 --- a/var/spack/repos/builtin/packages/perl-net-http/package.py +++ b/var/spack/repos/builtin/packages/perl-net-http/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-net-scp-expect/package.py b/var/spack/repos/builtin/packages/perl-net-scp-expect/package.py index 1b393074fc..5e07199158 100644 --- a/var/spack/repos/builtin/packages/perl-net-scp-expect/package.py +++ b/var/spack/repos/builtin/packages/perl-net-scp-expect/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-net-ssleay/package.py b/var/spack/repos/builtin/packages/perl-net-ssleay/package.py index b8bddb256c..390439bc3f 100644 --- a/var/spack/repos/builtin/packages/perl-net-ssleay/package.py +++ b/var/spack/repos/builtin/packages/perl-net-ssleay/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-package-deprecationmanager/package.py b/var/spack/repos/builtin/packages/perl-package-deprecationmanager/package.py index 89e1690fdd..dc6d8da1b9 100644 --- a/var/spack/repos/builtin/packages/perl-package-deprecationmanager/package.py +++ b/var/spack/repos/builtin/packages/perl-package-deprecationmanager/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-package-stash-xs/package.py b/var/spack/repos/builtin/packages/perl-package-stash-xs/package.py index 7d627ffb65..e57058547e 100644 --- a/var/spack/repos/builtin/packages/perl-package-stash-xs/package.py +++ b/var/spack/repos/builtin/packages/perl-package-stash-xs/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-package-stash/package.py b/var/spack/repos/builtin/packages/perl-package-stash/package.py index abc8a5ccfe..cc4a2d6fd9 100644 --- a/var/spack/repos/builtin/packages/perl-package-stash/package.py +++ b/var/spack/repos/builtin/packages/perl-package-stash/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-padwalker/package.py b/var/spack/repos/builtin/packages/perl-padwalker/package.py index 0ffef9cf18..7ca73bdf74 100644 --- a/var/spack/repos/builtin/packages/perl-padwalker/package.py +++ b/var/spack/repos/builtin/packages/perl-padwalker/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-parallel-forkmanager/package.py b/var/spack/repos/builtin/packages/perl-parallel-forkmanager/package.py index ff324a08f2..38e54e1d1b 100644 --- a/var/spack/repos/builtin/packages/perl-parallel-forkmanager/package.py +++ b/var/spack/repos/builtin/packages/perl-parallel-forkmanager/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-params-util/package.py b/var/spack/repos/builtin/packages/perl-params-util/package.py index 834601512b..ca58b78418 100644 --- a/var/spack/repos/builtin/packages/perl-params-util/package.py +++ b/var/spack/repos/builtin/packages/perl-params-util/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-parse-recdescent/package.py b/var/spack/repos/builtin/packages/perl-parse-recdescent/package.py index 6bbb75d261..55a77f6980 100644 --- a/var/spack/repos/builtin/packages/perl-parse-recdescent/package.py +++ b/var/spack/repos/builtin/packages/perl-parse-recdescent/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-pdf-api2/package.py b/var/spack/repos/builtin/packages/perl-pdf-api2/package.py index 216971529c..0cf9e9b25f 100644 --- a/var/spack/repos/builtin/packages/perl-pdf-api2/package.py +++ b/var/spack/repos/builtin/packages/perl-pdf-api2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-pegex/package.py b/var/spack/repos/builtin/packages/perl-pegex/package.py index cde3bf5eef..a9aca782d8 100644 --- a/var/spack/repos/builtin/packages/perl-pegex/package.py +++ b/var/spack/repos/builtin/packages/perl-pegex/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-perlio-gzip/package.py b/var/spack/repos/builtin/packages/perl-perlio-gzip/package.py index 7add6a916b..9790f6e909 100644 --- a/var/spack/repos/builtin/packages/perl-perlio-gzip/package.py +++ b/var/spack/repos/builtin/packages/perl-perlio-gzip/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-soap-lite/package.py b/var/spack/repos/builtin/packages/perl-soap-lite/package.py index 9f2cb8eb53..e0c6c4ad01 100644 --- a/var/spack/repos/builtin/packages/perl-soap-lite/package.py +++ b/var/spack/repos/builtin/packages/perl-soap-lite/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-star-fusion/package.py b/var/spack/repos/builtin/packages/perl-star-fusion/package.py index 5985bd7fd3..68ba8af1f8 100644 --- a/var/spack/repos/builtin/packages/perl-star-fusion/package.py +++ b/var/spack/repos/builtin/packages/perl-star-fusion/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-statistics-descriptive/package.py b/var/spack/repos/builtin/packages/perl-statistics-descriptive/package.py index 877212b124..9cceaf6c39 100644 --- a/var/spack/repos/builtin/packages/perl-statistics-descriptive/package.py +++ b/var/spack/repos/builtin/packages/perl-statistics-descriptive/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-sub-exporter-progressive/package.py b/var/spack/repos/builtin/packages/perl-sub-exporter-progressive/package.py index a6642fce2c..175b912328 100644 --- a/var/spack/repos/builtin/packages/perl-sub-exporter-progressive/package.py +++ b/var/spack/repos/builtin/packages/perl-sub-exporter-progressive/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-sub-exporter/package.py b/var/spack/repos/builtin/packages/perl-sub-exporter/package.py index 0b13cb870e..e0aecf359c 100644 --- a/var/spack/repos/builtin/packages/perl-sub-exporter/package.py +++ b/var/spack/repos/builtin/packages/perl-sub-exporter/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-sub-identify/package.py b/var/spack/repos/builtin/packages/perl-sub-identify/package.py index e173ebfeae..c985ee4d69 100644 --- a/var/spack/repos/builtin/packages/perl-sub-identify/package.py +++ b/var/spack/repos/builtin/packages/perl-sub-identify/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-sub-install/package.py b/var/spack/repos/builtin/packages/perl-sub-install/package.py index 8354eb5be7..2e552d5c37 100644 --- a/var/spack/repos/builtin/packages/perl-sub-install/package.py +++ b/var/spack/repos/builtin/packages/perl-sub-install/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-sub-name/package.py b/var/spack/repos/builtin/packages/perl-sub-name/package.py index 74df14dbd1..2022fb5dca 100644 --- a/var/spack/repos/builtin/packages/perl-sub-name/package.py +++ b/var/spack/repos/builtin/packages/perl-sub-name/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-sub-uplevel/package.py b/var/spack/repos/builtin/packages/perl-sub-uplevel/package.py index 049c844e1d..7a71db1267 100644 --- a/var/spack/repos/builtin/packages/perl-sub-uplevel/package.py +++ b/var/spack/repos/builtin/packages/perl-sub-uplevel/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-svg/package.py b/var/spack/repos/builtin/packages/perl-svg/package.py index 09c1d50f38..0d5fa2f121 100644 --- a/var/spack/repos/builtin/packages/perl-svg/package.py +++ b/var/spack/repos/builtin/packages/perl-svg/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-swissknife/package.py b/var/spack/repos/builtin/packages/perl-swissknife/package.py index d40595517b..29ee522456 100644 --- a/var/spack/repos/builtin/packages/perl-swissknife/package.py +++ b/var/spack/repos/builtin/packages/perl-swissknife/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-task-weaken/package.py b/var/spack/repos/builtin/packages/perl-task-weaken/package.py index ce0184c7ba..7dca9cbf35 100644 --- a/var/spack/repos/builtin/packages/perl-task-weaken/package.py +++ b/var/spack/repos/builtin/packages/perl-task-weaken/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-term-readkey/package.py b/var/spack/repos/builtin/packages/perl-term-readkey/package.py index b25e34c04d..be61e12973 100644 --- a/var/spack/repos/builtin/packages/perl-term-readkey/package.py +++ b/var/spack/repos/builtin/packages/perl-term-readkey/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-test-cleannamespaces/package.py b/var/spack/repos/builtin/packages/perl-test-cleannamespaces/package.py index 86e8bfae4a..262da14fed 100644 --- a/var/spack/repos/builtin/packages/perl-test-cleannamespaces/package.py +++ b/var/spack/repos/builtin/packages/perl-test-cleannamespaces/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-test-deep/package.py b/var/spack/repos/builtin/packages/perl-test-deep/package.py index d1a6d248f5..3099b8ec66 100644 --- a/var/spack/repos/builtin/packages/perl-test-deep/package.py +++ b/var/spack/repos/builtin/packages/perl-test-deep/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-test-differences/package.py b/var/spack/repos/builtin/packages/perl-test-differences/package.py index b37442fc28..f387875900 100644 --- a/var/spack/repos/builtin/packages/perl-test-differences/package.py +++ b/var/spack/repos/builtin/packages/perl-test-differences/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-test-exception/package.py b/var/spack/repos/builtin/packages/perl-test-exception/package.py index 32b902221e..b9546f0128 100644 --- a/var/spack/repos/builtin/packages/perl-test-exception/package.py +++ b/var/spack/repos/builtin/packages/perl-test-exception/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-test-fatal/package.py b/var/spack/repos/builtin/packages/perl-test-fatal/package.py index 314fee9df6..f3867e4c62 100644 --- a/var/spack/repos/builtin/packages/perl-test-fatal/package.py +++ b/var/spack/repos/builtin/packages/perl-test-fatal/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-test-memory-cycle/package.py b/var/spack/repos/builtin/packages/perl-test-memory-cycle/package.py index b9132952b2..9cc73c86cc 100644 --- a/var/spack/repos/builtin/packages/perl-test-memory-cycle/package.py +++ b/var/spack/repos/builtin/packages/perl-test-memory-cycle/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-test-most/package.py b/var/spack/repos/builtin/packages/perl-test-most/package.py index a6a3650c42..1b66f75c65 100644 --- a/var/spack/repos/builtin/packages/perl-test-most/package.py +++ b/var/spack/repos/builtin/packages/perl-test-most/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-test-needs/package.py b/var/spack/repos/builtin/packages/perl-test-needs/package.py index 9006067309..dbea54df32 100644 --- a/var/spack/repos/builtin/packages/perl-test-needs/package.py +++ b/var/spack/repos/builtin/packages/perl-test-needs/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-test-requires/package.py b/var/spack/repos/builtin/packages/perl-test-requires/package.py index 79bfb211a0..81dc2603cd 100644 --- a/var/spack/repos/builtin/packages/perl-test-requires/package.py +++ b/var/spack/repos/builtin/packages/perl-test-requires/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-test-requiresinternet/package.py b/var/spack/repos/builtin/packages/perl-test-requiresinternet/package.py index 96deb0ff36..bbc461fadf 100644 --- a/var/spack/repos/builtin/packages/perl-test-requiresinternet/package.py +++ b/var/spack/repos/builtin/packages/perl-test-requiresinternet/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-test-warn/package.py b/var/spack/repos/builtin/packages/perl-test-warn/package.py index e1e9a873a6..951b108d01 100644 --- a/var/spack/repos/builtin/packages/perl-test-warn/package.py +++ b/var/spack/repos/builtin/packages/perl-test-warn/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-test-warnings/package.py b/var/spack/repos/builtin/packages/perl-test-warnings/package.py index dc3640fe33..ba8d921ef2 100644 --- a/var/spack/repos/builtin/packages/perl-test-warnings/package.py +++ b/var/spack/repos/builtin/packages/perl-test-warnings/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-text-csv/package.py b/var/spack/repos/builtin/packages/perl-text-csv/package.py index 7787a89864..b032256fed 100644 --- a/var/spack/repos/builtin/packages/perl-text-csv/package.py +++ b/var/spack/repos/builtin/packages/perl-text-csv/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-text-diff/package.py b/var/spack/repos/builtin/packages/perl-text-diff/package.py index 4c61b3cbb1..26985419fd 100644 --- a/var/spack/repos/builtin/packages/perl-text-diff/package.py +++ b/var/spack/repos/builtin/packages/perl-text-diff/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-text-unidecode/package.py b/var/spack/repos/builtin/packages/perl-text-unidecode/package.py index 23ff07bbc0..ad04670441 100644 --- a/var/spack/repos/builtin/packages/perl-text-unidecode/package.py +++ b/var/spack/repos/builtin/packages/perl-text-unidecode/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-time-hires/package.py b/var/spack/repos/builtin/packages/perl-time-hires/package.py index 19f00986f0..b2db1d330d 100644 --- a/var/spack/repos/builtin/packages/perl-time-hires/package.py +++ b/var/spack/repos/builtin/packages/perl-time-hires/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-time-piece/package.py b/var/spack/repos/builtin/packages/perl-time-piece/package.py index ad137ae4ed..2e2984a608 100644 --- a/var/spack/repos/builtin/packages/perl-time-piece/package.py +++ b/var/spack/repos/builtin/packages/perl-time-piece/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-try-tiny/package.py b/var/spack/repos/builtin/packages/perl-try-tiny/package.py index 05e127dd51..da604864ab 100644 --- a/var/spack/repos/builtin/packages/perl-try-tiny/package.py +++ b/var/spack/repos/builtin/packages/perl-try-tiny/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-uri-escape/package.py b/var/spack/repos/builtin/packages/perl-uri-escape/package.py index 29f96003e3..d6cd70d968 100644 --- a/var/spack/repos/builtin/packages/perl-uri-escape/package.py +++ b/var/spack/repos/builtin/packages/perl-uri-escape/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-uri/package.py b/var/spack/repos/builtin/packages/perl-uri/package.py index 33efe6b75f..fa8dfd1e9a 100644 --- a/var/spack/repos/builtin/packages/perl-uri/package.py +++ b/var/spack/repos/builtin/packages/perl-uri/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-version/package.py b/var/spack/repos/builtin/packages/perl-version/package.py index 5660a9466c..77c963433a 100644 --- a/var/spack/repos/builtin/packages/perl-version/package.py +++ b/var/spack/repos/builtin/packages/perl-version/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-www-robotrules/package.py b/var/spack/repos/builtin/packages/perl-www-robotrules/package.py index 3859e205bd..05006d807d 100644 --- a/var/spack/repos/builtin/packages/perl-www-robotrules/package.py +++ b/var/spack/repos/builtin/packages/perl-www-robotrules/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-xml-libxml/package.py b/var/spack/repos/builtin/packages/perl-xml-libxml/package.py index 3ec6493f7f..7bb689544c 100644 --- a/var/spack/repos/builtin/packages/perl-xml-libxml/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-libxml/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-xml-parser-lite/package.py b/var/spack/repos/builtin/packages/perl-xml-parser-lite/package.py index 53dcc0d09c..cd2bd78c56 100644 --- a/var/spack/repos/builtin/packages/perl-xml-parser-lite/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-parser-lite/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-xml-parser/package.py b/var/spack/repos/builtin/packages/perl-xml-parser/package.py index baa337319d..7544ddf41b 100644 --- a/var/spack/repos/builtin/packages/perl-xml-parser/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-parser/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-xml-simple/package.py b/var/spack/repos/builtin/packages/perl-xml-simple/package.py index 9aae8e63af..dd14ef466e 100644 --- a/var/spack/repos/builtin/packages/perl-xml-simple/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-simple/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl-yaml-libyaml/package.py b/var/spack/repos/builtin/packages/perl-yaml-libyaml/package.py index 72175fbc34..39c9090dd8 100644 --- a/var/spack/repos/builtin/packages/perl-yaml-libyaml/package.py +++ b/var/spack/repos/builtin/packages/perl-yaml-libyaml/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/perl/package.py b/var/spack/repos/builtin/packages/perl/package.py index fbf788d106..90a85fdf83 100644 --- a/var/spack/repos/builtin/packages/perl/package.py +++ b/var/spack/repos/builtin/packages/perl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index 15b9b77ba5..46853b6b41 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pexsi/package.py b/var/spack/repos/builtin/packages/pexsi/package.py index 63819923af..f0882dba06 100644 --- a/var/spack/repos/builtin/packages/pexsi/package.py +++ b/var/spack/repos/builtin/packages/pexsi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pfft/package.py b/var/spack/repos/builtin/packages/pfft/package.py index 93f0222a48..4dd2cdb0ef 100644 --- a/var/spack/repos/builtin/packages/pfft/package.py +++ b/var/spack/repos/builtin/packages/pfft/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pflotran/package.py b/var/spack/repos/builtin/packages/pflotran/package.py index a57a040107..47474e54c9 100644 --- a/var/spack/repos/builtin/packages/pflotran/package.py +++ b/var/spack/repos/builtin/packages/pflotran/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pfunit/package.py b/var/spack/repos/builtin/packages/pfunit/package.py index 57e473112b..f71a8193d1 100644 --- a/var/spack/repos/builtin/packages/pfunit/package.py +++ b/var/spack/repos/builtin/packages/pfunit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pgdspider/package.py b/var/spack/repos/builtin/packages/pgdspider/package.py index 39a518113f..cf7081f531 100644 --- a/var/spack/repos/builtin/packages/pgdspider/package.py +++ b/var/spack/repos/builtin/packages/pgdspider/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pgi/package.py b/var/spack/repos/builtin/packages/pgi/package.py index c08b1550e1..c8a73b8783 100644 --- a/var/spack/repos/builtin/packages/pgi/package.py +++ b/var/spack/repos/builtin/packages/pgi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/phantompeakqualtools/package.py b/var/spack/repos/builtin/packages/phantompeakqualtools/package.py index 6e82b9ec9e..9396941624 100644 --- a/var/spack/repos/builtin/packages/phantompeakqualtools/package.py +++ b/var/spack/repos/builtin/packages/phantompeakqualtools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/phasta/package.py b/var/spack/repos/builtin/packages/phasta/package.py index a73c90848b..7308c70349 100644 --- a/var/spack/repos/builtin/packages/phasta/package.py +++ b/var/spack/repos/builtin/packages/phasta/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/phist/package.py b/var/spack/repos/builtin/packages/phist/package.py index d224be372f..04660b943b 100644 --- a/var/spack/repos/builtin/packages/phist/package.py +++ b/var/spack/repos/builtin/packages/phist/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/phylip/package.py b/var/spack/repos/builtin/packages/phylip/package.py index a26484ce87..1a1a92cb35 100644 --- a/var/spack/repos/builtin/packages/phylip/package.py +++ b/var/spack/repos/builtin/packages/phylip/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/picard/package.py b/var/spack/repos/builtin/packages/picard/package.py index c2e196f800..b82f98eeee 100644 --- a/var/spack/repos/builtin/packages/picard/package.py +++ b/var/spack/repos/builtin/packages/picard/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pidx/package.py b/var/spack/repos/builtin/packages/pidx/package.py index bc3977d733..75a2886b80 100644 --- a/var/spack/repos/builtin/packages/pidx/package.py +++ b/var/spack/repos/builtin/packages/pidx/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pigz/package.py b/var/spack/repos/builtin/packages/pigz/package.py index fe933c4f54..dc38cd444c 100644 --- a/var/spack/repos/builtin/packages/pigz/package.py +++ b/var/spack/repos/builtin/packages/pigz/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pilon/package.py b/var/spack/repos/builtin/packages/pilon/package.py index a075ce9fd8..8fba2c2376 100644 --- a/var/spack/repos/builtin/packages/pilon/package.py +++ b/var/spack/repos/builtin/packages/pilon/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/piranha/package.py b/var/spack/repos/builtin/packages/piranha/package.py index 9f4b26d050..4c75a77fe2 100644 --- a/var/spack/repos/builtin/packages/piranha/package.py +++ b/var/spack/repos/builtin/packages/piranha/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pixman/package.py b/var/spack/repos/builtin/packages/pixman/package.py index b81660900d..d6cab39732 100644 --- a/var/spack/repos/builtin/packages/pixman/package.py +++ b/var/spack/repos/builtin/packages/pixman/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pkg-config/package.py b/var/spack/repos/builtin/packages/pkg-config/package.py index 08cbc27c56..d89c32c47c 100644 --- a/var/spack/repos/builtin/packages/pkg-config/package.py +++ b/var/spack/repos/builtin/packages/pkg-config/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pkgconf/package.py b/var/spack/repos/builtin/packages/pkgconf/package.py index 2d264626dd..01f147d71b 100644 --- a/var/spack/repos/builtin/packages/pkgconf/package.py +++ b/var/spack/repos/builtin/packages/pkgconf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/planck-likelihood/package.py b/var/spack/repos/builtin/packages/planck-likelihood/package.py index a92fc328db..bbd28dc008 100644 --- a/var/spack/repos/builtin/packages/planck-likelihood/package.py +++ b/var/spack/repos/builtin/packages/planck-likelihood/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/plink/package.py b/var/spack/repos/builtin/packages/plink/package.py index b6df013978..2ebc7a0242 100644 --- a/var/spack/repos/builtin/packages/plink/package.py +++ b/var/spack/repos/builtin/packages/plink/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/plumed/package.py b/var/spack/repos/builtin/packages/plumed/package.py index cac4f4254f..f68ec49812 100644 --- a/var/spack/repos/builtin/packages/plumed/package.py +++ b/var/spack/repos/builtin/packages/plumed/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pmgr-collective/package.py b/var/spack/repos/builtin/packages/pmgr-collective/package.py index c96e777e5b..0a88e5bf24 100644 --- a/var/spack/repos/builtin/packages/pmgr-collective/package.py +++ b/var/spack/repos/builtin/packages/pmgr-collective/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pmix/package.py b/var/spack/repos/builtin/packages/pmix/package.py index b81753ee7e..375b125741 100644 --- a/var/spack/repos/builtin/packages/pmix/package.py +++ b/var/spack/repos/builtin/packages/pmix/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pnfft/package.py b/var/spack/repos/builtin/packages/pnfft/package.py index fbb6b636b1..0e7b3b1328 100644 --- a/var/spack/repos/builtin/packages/pnfft/package.py +++ b/var/spack/repos/builtin/packages/pnfft/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pngwriter/package.py b/var/spack/repos/builtin/packages/pngwriter/package.py index efccb3ac9f..ba8544ab1b 100644 --- a/var/spack/repos/builtin/packages/pngwriter/package.py +++ b/var/spack/repos/builtin/packages/pngwriter/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pnmpi/package.py b/var/spack/repos/builtin/packages/pnmpi/package.py index 944a6133bd..392181ef1d 100644 --- a/var/spack/repos/builtin/packages/pnmpi/package.py +++ b/var/spack/repos/builtin/packages/pnmpi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/poamsa/package.py b/var/spack/repos/builtin/packages/poamsa/package.py index dba8a03546..f313c14b06 100644 --- a/var/spack/repos/builtin/packages/poamsa/package.py +++ b/var/spack/repos/builtin/packages/poamsa/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pocl/package.py b/var/spack/repos/builtin/packages/pocl/package.py index 615d261626..f4fef47af4 100644 --- a/var/spack/repos/builtin/packages/pocl/package.py +++ b/var/spack/repos/builtin/packages/pocl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/polymake/package.py b/var/spack/repos/builtin/packages/polymake/package.py index 0fbfe52640..a66db97459 100644 --- a/var/spack/repos/builtin/packages/polymake/package.py +++ b/var/spack/repos/builtin/packages/polymake/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/porta/package.py b/var/spack/repos/builtin/packages/porta/package.py index e54187188f..9f469a8529 100644 --- a/var/spack/repos/builtin/packages/porta/package.py +++ b/var/spack/repos/builtin/packages/porta/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/postgresql/package.py b/var/spack/repos/builtin/packages/postgresql/package.py index 30d288ebcb..319bcd29b9 100644 --- a/var/spack/repos/builtin/packages/postgresql/package.py +++ b/var/spack/repos/builtin/packages/postgresql/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ppl/package.py b/var/spack/repos/builtin/packages/ppl/package.py index 0a5636d457..48231210a0 100644 --- a/var/spack/repos/builtin/packages/ppl/package.py +++ b/var/spack/repos/builtin/packages/ppl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/prank/package.py b/var/spack/repos/builtin/packages/prank/package.py index 27ac4d4cd5..8c3ae1805d 100644 --- a/var/spack/repos/builtin/packages/prank/package.py +++ b/var/spack/repos/builtin/packages/prank/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/presentproto/package.py b/var/spack/repos/builtin/packages/presentproto/package.py index 4b72c9fdef..e2cfe6acc3 100644 --- a/var/spack/repos/builtin/packages/presentproto/package.py +++ b/var/spack/repos/builtin/packages/presentproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/preseq/package.py b/var/spack/repos/builtin/packages/preseq/package.py index 136bbb62b9..d2992a1230 100644 --- a/var/spack/repos/builtin/packages/preseq/package.py +++ b/var/spack/repos/builtin/packages/preseq/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/price/package.py b/var/spack/repos/builtin/packages/price/package.py index ee47d600b8..60239ff4c0 100644 --- a/var/spack/repos/builtin/packages/price/package.py +++ b/var/spack/repos/builtin/packages/price/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/primer3/package.py b/var/spack/repos/builtin/packages/primer3/package.py index 5a747d8dec..714610c0f4 100644 --- a/var/spack/repos/builtin/packages/primer3/package.py +++ b/var/spack/repos/builtin/packages/primer3/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/printproto/package.py b/var/spack/repos/builtin/packages/printproto/package.py index a02d43ec10..40dca284e4 100644 --- a/var/spack/repos/builtin/packages/printproto/package.py +++ b/var/spack/repos/builtin/packages/printproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/probconsrna/package.py b/var/spack/repos/builtin/packages/probconsrna/package.py index 56abd8b59e..1c2d74c185 100644 --- a/var/spack/repos/builtin/packages/probconsrna/package.py +++ b/var/spack/repos/builtin/packages/probconsrna/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/prodigal/package.py b/var/spack/repos/builtin/packages/prodigal/package.py index b57f712397..8c619338c7 100644 --- a/var/spack/repos/builtin/packages/prodigal/package.py +++ b/var/spack/repos/builtin/packages/prodigal/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/proj/package.py b/var/spack/repos/builtin/packages/proj/package.py index efddcb876c..4df976d149 100644 --- a/var/spack/repos/builtin/packages/proj/package.py +++ b/var/spack/repos/builtin/packages/proj/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/protobuf/package.py b/var/spack/repos/builtin/packages/protobuf/package.py index 445a2aecb7..ec60a0e6d4 100644 --- a/var/spack/repos/builtin/packages/protobuf/package.py +++ b/var/spack/repos/builtin/packages/protobuf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/proxymngr/package.py b/var/spack/repos/builtin/packages/proxymngr/package.py index 7bd539642b..7a35270ce3 100644 --- a/var/spack/repos/builtin/packages/proxymngr/package.py +++ b/var/spack/repos/builtin/packages/proxymngr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pruners-ninja/package.py b/var/spack/repos/builtin/packages/pruners-ninja/package.py index c8e93ad997..0c7a301c28 100644 --- a/var/spack/repos/builtin/packages/pruners-ninja/package.py +++ b/var/spack/repos/builtin/packages/pruners-ninja/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ps-lite/package.py b/var/spack/repos/builtin/packages/ps-lite/package.py index b78315c060..ea9cc34ed4 100644 --- a/var/spack/repos/builtin/packages/ps-lite/package.py +++ b/var/spack/repos/builtin/packages/ps-lite/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/psi4/package.py b/var/spack/repos/builtin/packages/psi4/package.py index f322e6c1ca..3358b3bb9f 100644 --- a/var/spack/repos/builtin/packages/psi4/package.py +++ b/var/spack/repos/builtin/packages/psi4/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pumi/package.py b/var/spack/repos/builtin/packages/pumi/package.py index f4f65a33d3..bfbc296a1b 100644 --- a/var/spack/repos/builtin/packages/pumi/package.py +++ b/var/spack/repos/builtin/packages/pumi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/pvm/package.py b/var/spack/repos/builtin/packages/pvm/package.py index de4848413d..ff6677182f 100644 --- a/var/spack/repos/builtin/packages/pvm/package.py +++ b/var/spack/repos/builtin/packages/pvm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-3to2/package.py b/var/spack/repos/builtin/packages/py-3to2/package.py index 1a1a6f8805..103c250b8d 100644 --- a/var/spack/repos/builtin/packages/py-3to2/package.py +++ b/var/spack/repos/builtin/packages/py-3to2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-4suite-xml/package.py b/var/spack/repos/builtin/packages/py-4suite-xml/package.py index e0fa713fd8..503538c412 100644 --- a/var/spack/repos/builtin/packages/py-4suite-xml/package.py +++ b/var/spack/repos/builtin/packages/py-4suite-xml/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-abipy/package.py b/var/spack/repos/builtin/packages/py-abipy/package.py index dc07aaebd2..d141cd774b 100644 --- a/var/spack/repos/builtin/packages/py-abipy/package.py +++ b/var/spack/repos/builtin/packages/py-abipy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-adios/package.py b/var/spack/repos/builtin/packages/py-adios/package.py index 209e6d60fe..40b8faad1a 100644 --- a/var/spack/repos/builtin/packages/py-adios/package.py +++ b/var/spack/repos/builtin/packages/py-adios/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-affine/package.py b/var/spack/repos/builtin/packages/py-affine/package.py index d70640695c..07107fee58 100644 --- a/var/spack/repos/builtin/packages/py-affine/package.py +++ b/var/spack/repos/builtin/packages/py-affine/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-alabaster/package.py b/var/spack/repos/builtin/packages/py-alabaster/package.py index 2f718ca9e8..edd9c52435 100644 --- a/var/spack/repos/builtin/packages/py-alabaster/package.py +++ b/var/spack/repos/builtin/packages/py-alabaster/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-apache-libcloud/package.py b/var/spack/repos/builtin/packages/py-apache-libcloud/package.py index c46987f2ce..a118eca3c5 100644 --- a/var/spack/repos/builtin/packages/py-apache-libcloud/package.py +++ b/var/spack/repos/builtin/packages/py-apache-libcloud/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-apipkg/package.py b/var/spack/repos/builtin/packages/py-apipkg/package.py index ee0f979b63..38f1031c50 100644 --- a/var/spack/repos/builtin/packages/py-apipkg/package.py +++ b/var/spack/repos/builtin/packages/py-apipkg/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-appdirs/package.py b/var/spack/repos/builtin/packages/py-appdirs/package.py index 4fd412bb39..e7a51a3f9c 100644 --- a/var/spack/repos/builtin/packages/py-appdirs/package.py +++ b/var/spack/repos/builtin/packages/py-appdirs/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-appnope/package.py b/var/spack/repos/builtin/packages/py-appnope/package.py index 98d3e44032..1281bd1b8e 100644 --- a/var/spack/repos/builtin/packages/py-appnope/package.py +++ b/var/spack/repos/builtin/packages/py-appnope/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-apscheduler/package.py b/var/spack/repos/builtin/packages/py-apscheduler/package.py index 47404f9944..a36b392cd9 100644 --- a/var/spack/repos/builtin/packages/py-apscheduler/package.py +++ b/var/spack/repos/builtin/packages/py-apscheduler/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-argcomplete/package.py b/var/spack/repos/builtin/packages/py-argcomplete/package.py index 9c08f46b19..4bf8af61b4 100644 --- a/var/spack/repos/builtin/packages/py-argcomplete/package.py +++ b/var/spack/repos/builtin/packages/py-argcomplete/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-argparse/package.py b/var/spack/repos/builtin/packages/py-argparse/package.py index c89e30fdb2..47db38bf3e 100644 --- a/var/spack/repos/builtin/packages/py-argparse/package.py +++ b/var/spack/repos/builtin/packages/py-argparse/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-ase/package.py b/var/spack/repos/builtin/packages/py-ase/package.py index cb4e8ddf7d..40f8e9253d 100644 --- a/var/spack/repos/builtin/packages/py-ase/package.py +++ b/var/spack/repos/builtin/packages/py-ase/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-asn1crypto/package.py b/var/spack/repos/builtin/packages/py-asn1crypto/package.py index 1e1e408b4a..fe8b59c576 100644 --- a/var/spack/repos/builtin/packages/py-asn1crypto/package.py +++ b/var/spack/repos/builtin/packages/py-asn1crypto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-astroid/package.py b/var/spack/repos/builtin/packages/py-astroid/package.py index c0bb2b6464..b656fb09c5 100644 --- a/var/spack/repos/builtin/packages/py-astroid/package.py +++ b/var/spack/repos/builtin/packages/py-astroid/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-astropy/package.py b/var/spack/repos/builtin/packages/py-astropy/package.py index c85de6e68c..7c5b9132f0 100644 --- a/var/spack/repos/builtin/packages/py-astropy/package.py +++ b/var/spack/repos/builtin/packages/py-astropy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-attrs/package.py b/var/spack/repos/builtin/packages/py-attrs/package.py index 04daf75da4..c3091c9e12 100644 --- a/var/spack/repos/builtin/packages/py-attrs/package.py +++ b/var/spack/repos/builtin/packages/py-attrs/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-autopep8/package.py b/var/spack/repos/builtin/packages/py-autopep8/package.py index d2094056fd..da8760d649 100644 --- a/var/spack/repos/builtin/packages/py-autopep8/package.py +++ b/var/spack/repos/builtin/packages/py-autopep8/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-babel/package.py b/var/spack/repos/builtin/packages/py-babel/package.py index 8b20318c20..6be78342d7 100644 --- a/var/spack/repos/builtin/packages/py-babel/package.py +++ b/var/spack/repos/builtin/packages/py-babel/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-backports-abc/package.py b/var/spack/repos/builtin/packages/py-backports-abc/package.py index 69cd6165b5..aa3d6f48bc 100644 --- a/var/spack/repos/builtin/packages/py-backports-abc/package.py +++ b/var/spack/repos/builtin/packages/py-backports-abc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py b/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py index adb55908b0..a57434f65a 100644 --- a/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py +++ b/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-backports-shutil-get-terminal-size/package.py b/var/spack/repos/builtin/packages/py-backports-shutil-get-terminal-size/package.py index daa019daef..e30ef3770b 100644 --- a/var/spack/repos/builtin/packages/py-backports-shutil-get-terminal-size/package.py +++ b/var/spack/repos/builtin/packages/py-backports-shutil-get-terminal-size/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-backports-ssl-match-hostname/package.py b/var/spack/repos/builtin/packages/py-backports-ssl-match-hostname/package.py index 88edc5b571..08ee1abbbb 100644 --- a/var/spack/repos/builtin/packages/py-backports-ssl-match-hostname/package.py +++ b/var/spack/repos/builtin/packages/py-backports-ssl-match-hostname/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-basemap/package.py b/var/spack/repos/builtin/packages/py-basemap/package.py index 624ffd6c3e..4a86ac4fd0 100644 --- a/var/spack/repos/builtin/packages/py-basemap/package.py +++ b/var/spack/repos/builtin/packages/py-basemap/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-bcbio-gff/package.py b/var/spack/repos/builtin/packages/py-bcbio-gff/package.py index 6e63cfb492..ef1f94bf85 100644 --- a/var/spack/repos/builtin/packages/py-bcbio-gff/package.py +++ b/var/spack/repos/builtin/packages/py-bcbio-gff/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-beautifulsoup4/package.py b/var/spack/repos/builtin/packages/py-beautifulsoup4/package.py index 4874f1cba5..c3f2ac036c 100644 --- a/var/spack/repos/builtin/packages/py-beautifulsoup4/package.py +++ b/var/spack/repos/builtin/packages/py-beautifulsoup4/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-binwalk/package.py b/var/spack/repos/builtin/packages/py-binwalk/package.py index 25f9eb5dd0..980126ef30 100644 --- a/var/spack/repos/builtin/packages/py-binwalk/package.py +++ b/var/spack/repos/builtin/packages/py-binwalk/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-biom-format/package.py b/var/spack/repos/builtin/packages/py-biom-format/package.py index 1323ddee3b..441f5c1952 100644 --- a/var/spack/repos/builtin/packages/py-biom-format/package.py +++ b/var/spack/repos/builtin/packages/py-biom-format/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-biopython/package.py b/var/spack/repos/builtin/packages/py-biopython/package.py index ff50a0fb80..c7d046c25e 100644 --- a/var/spack/repos/builtin/packages/py-biopython/package.py +++ b/var/spack/repos/builtin/packages/py-biopython/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-bitarray/package.py b/var/spack/repos/builtin/packages/py-bitarray/package.py index a4e928590c..db7a9ec23d 100644 --- a/var/spack/repos/builtin/packages/py-bitarray/package.py +++ b/var/spack/repos/builtin/packages/py-bitarray/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-bitstring/package.py b/var/spack/repos/builtin/packages/py-bitstring/package.py index 0c236c2c2a..e3b786e3d4 100644 --- a/var/spack/repos/builtin/packages/py-bitstring/package.py +++ b/var/spack/repos/builtin/packages/py-bitstring/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-bleach/package.py b/var/spack/repos/builtin/packages/py-bleach/package.py index aa7866c3c3..b6c2d13c65 100644 --- a/var/spack/repos/builtin/packages/py-bleach/package.py +++ b/var/spack/repos/builtin/packages/py-bleach/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-blessings/package.py b/var/spack/repos/builtin/packages/py-blessings/package.py index 9f5b57c469..c9829fa76b 100644 --- a/var/spack/repos/builtin/packages/py-blessings/package.py +++ b/var/spack/repos/builtin/packages/py-blessings/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-bokeh/package.py b/var/spack/repos/builtin/packages/py-bokeh/package.py index 00850c51aa..072fa13024 100644 --- a/var/spack/repos/builtin/packages/py-bokeh/package.py +++ b/var/spack/repos/builtin/packages/py-bokeh/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-boltons/package.py b/var/spack/repos/builtin/packages/py-boltons/package.py index 54355ad7f1..ac25f9f181 100644 --- a/var/spack/repos/builtin/packages/py-boltons/package.py +++ b/var/spack/repos/builtin/packages/py-boltons/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-bottleneck/package.py b/var/spack/repos/builtin/packages/py-bottleneck/package.py index 4fe32139b6..05068b6b53 100644 --- a/var/spack/repos/builtin/packages/py-bottleneck/package.py +++ b/var/spack/repos/builtin/packages/py-bottleneck/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-brian/package.py b/var/spack/repos/builtin/packages/py-brian/package.py index 68ed005b4a..79568083b0 100644 --- a/var/spack/repos/builtin/packages/py-brian/package.py +++ b/var/spack/repos/builtin/packages/py-brian/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-brian2/package.py b/var/spack/repos/builtin/packages/py-brian2/package.py index e340e3ffae..ef9842516a 100644 --- a/var/spack/repos/builtin/packages/py-brian2/package.py +++ b/var/spack/repos/builtin/packages/py-brian2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-bsddb3/package.py b/var/spack/repos/builtin/packages/py-bsddb3/package.py index b1ebe7c759..c4ad7bf5ff 100644 --- a/var/spack/repos/builtin/packages/py-bsddb3/package.py +++ b/var/spack/repos/builtin/packages/py-bsddb3/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-bx-python/package.py b/var/spack/repos/builtin/packages/py-bx-python/package.py index 764396839b..50a5f0a659 100644 --- a/var/spack/repos/builtin/packages/py-bx-python/package.py +++ b/var/spack/repos/builtin/packages/py-bx-python/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-cclib/package.py b/var/spack/repos/builtin/packages/py-cclib/package.py index 7d47dcf3fb..14f0f305ee 100644 --- a/var/spack/repos/builtin/packages/py-cclib/package.py +++ b/var/spack/repos/builtin/packages/py-cclib/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-cdat-lite/package.py b/var/spack/repos/builtin/packages/py-cdat-lite/package.py index a7bf68d50f..4dc978c397 100644 --- a/var/spack/repos/builtin/packages/py-cdat-lite/package.py +++ b/var/spack/repos/builtin/packages/py-cdat-lite/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-cdo/package.py b/var/spack/repos/builtin/packages/py-cdo/package.py index c5b6d39982..e1b4943c7f 100644 --- a/var/spack/repos/builtin/packages/py-cdo/package.py +++ b/var/spack/repos/builtin/packages/py-cdo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-certifi/package.py b/var/spack/repos/builtin/packages/py-certifi/package.py index 8a5df53a27..be476d7d03 100644 --- a/var/spack/repos/builtin/packages/py-certifi/package.py +++ b/var/spack/repos/builtin/packages/py-certifi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-cffi/package.py b/var/spack/repos/builtin/packages/py-cffi/package.py index d75c9a4f38..41c1129c69 100644 --- a/var/spack/repos/builtin/packages/py-cffi/package.py +++ b/var/spack/repos/builtin/packages/py-cffi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-chardet/package.py b/var/spack/repos/builtin/packages/py-chardet/package.py index c62bd1bef3..eb3392fa89 100644 --- a/var/spack/repos/builtin/packages/py-chardet/package.py +++ b/var/spack/repos/builtin/packages/py-chardet/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-checkm-genome/package.py b/var/spack/repos/builtin/packages/py-checkm-genome/package.py index 355f7e0951..8c96b8c0e1 100644 --- a/var/spack/repos/builtin/packages/py-checkm-genome/package.py +++ b/var/spack/repos/builtin/packages/py-checkm-genome/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-click/package.py b/var/spack/repos/builtin/packages/py-click/package.py index dd2b1b3e5e..a6e9ae31d0 100644 --- a/var/spack/repos/builtin/packages/py-click/package.py +++ b/var/spack/repos/builtin/packages/py-click/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-cligj/package.py b/var/spack/repos/builtin/packages/py-cligj/package.py index 5ce8ad7b13..830dc59b02 100644 --- a/var/spack/repos/builtin/packages/py-cligj/package.py +++ b/var/spack/repos/builtin/packages/py-cligj/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-cogent/package.py b/var/spack/repos/builtin/packages/py-cogent/package.py index ac71abfadb..2fb64fee08 100644 --- a/var/spack/repos/builtin/packages/py-cogent/package.py +++ b/var/spack/repos/builtin/packages/py-cogent/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-colorama/package.py b/var/spack/repos/builtin/packages/py-colorama/package.py index d9e2678e6e..01df3e8201 100644 --- a/var/spack/repos/builtin/packages/py-colorama/package.py +++ b/var/spack/repos/builtin/packages/py-colorama/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-colormath/package.py b/var/spack/repos/builtin/packages/py-colormath/package.py index 374dcd3c8e..fa1584e85d 100644 --- a/var/spack/repos/builtin/packages/py-colormath/package.py +++ b/var/spack/repos/builtin/packages/py-colormath/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-configparser/package.py b/var/spack/repos/builtin/packages/py-configparser/package.py index 2d463b3ef3..4388e2e5cb 100644 --- a/var/spack/repos/builtin/packages/py-configparser/package.py +++ b/var/spack/repos/builtin/packages/py-configparser/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-counter/package.py b/var/spack/repos/builtin/packages/py-counter/package.py index 37f1d62203..3a95ea708c 100644 --- a/var/spack/repos/builtin/packages/py-counter/package.py +++ b/var/spack/repos/builtin/packages/py-counter/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-coverage/package.py b/var/spack/repos/builtin/packages/py-coverage/package.py index 6912c7e898..0275cc2b14 100644 --- a/var/spack/repos/builtin/packages/py-coverage/package.py +++ b/var/spack/repos/builtin/packages/py-coverage/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-cpuinfo/package.py b/var/spack/repos/builtin/packages/py-cpuinfo/package.py index ae75451311..513e91fac7 100644 --- a/var/spack/repos/builtin/packages/py-cpuinfo/package.py +++ b/var/spack/repos/builtin/packages/py-cpuinfo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-crossmap/package.py b/var/spack/repos/builtin/packages/py-crossmap/package.py index bb8c9d60f7..3331b1583d 100644 --- a/var/spack/repos/builtin/packages/py-crossmap/package.py +++ b/var/spack/repos/builtin/packages/py-crossmap/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-cryptography/package.py b/var/spack/repos/builtin/packages/py-cryptography/package.py index 9ecf7015fc..d6e72e1cc8 100644 --- a/var/spack/repos/builtin/packages/py-cryptography/package.py +++ b/var/spack/repos/builtin/packages/py-cryptography/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-csvkit/package.py b/var/spack/repos/builtin/packages/py-csvkit/package.py index 05682652c0..654fa9e6e6 100644 --- a/var/spack/repos/builtin/packages/py-csvkit/package.py +++ b/var/spack/repos/builtin/packages/py-csvkit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-current/package.py b/var/spack/repos/builtin/packages/py-current/package.py index f4cd082492..44a43544fa 100644 --- a/var/spack/repos/builtin/packages/py-current/package.py +++ b/var/spack/repos/builtin/packages/py-current/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-cutadapt/package.py b/var/spack/repos/builtin/packages/py-cutadapt/package.py index 5f029375e7..cb61110d5e 100644 --- a/var/spack/repos/builtin/packages/py-cutadapt/package.py +++ b/var/spack/repos/builtin/packages/py-cutadapt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-cvxopt/package.py b/var/spack/repos/builtin/packages/py-cvxopt/package.py index 9a2ba5814d..704b421c30 100644 --- a/var/spack/repos/builtin/packages/py-cvxopt/package.py +++ b/var/spack/repos/builtin/packages/py-cvxopt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-cycler/package.py b/var/spack/repos/builtin/packages/py-cycler/package.py index de0be6903f..47f827ce2f 100644 --- a/var/spack/repos/builtin/packages/py-cycler/package.py +++ b/var/spack/repos/builtin/packages/py-cycler/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-cython/package.py b/var/spack/repos/builtin/packages/py-cython/package.py index 33b980d87b..f0a38b627b 100644 --- a/var/spack/repos/builtin/packages/py-cython/package.py +++ b/var/spack/repos/builtin/packages/py-cython/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-dask/package.py b/var/spack/repos/builtin/packages/py-dask/package.py index 7534e7ae7e..485ae9addc 100644 --- a/var/spack/repos/builtin/packages/py-dask/package.py +++ b/var/spack/repos/builtin/packages/py-dask/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-dateutil/package.py b/var/spack/repos/builtin/packages/py-dateutil/package.py index f2b8b29429..5054105d3a 100644 --- a/var/spack/repos/builtin/packages/py-dateutil/package.py +++ b/var/spack/repos/builtin/packages/py-dateutil/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-dbf/package.py b/var/spack/repos/builtin/packages/py-dbf/package.py index 2dfc9cd3ec..e746c3a16b 100644 --- a/var/spack/repos/builtin/packages/py-dbf/package.py +++ b/var/spack/repos/builtin/packages/py-dbf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-decorator/package.py b/var/spack/repos/builtin/packages/py-decorator/package.py index b33bcbc6ee..96a9a90d84 100644 --- a/var/spack/repos/builtin/packages/py-decorator/package.py +++ b/var/spack/repos/builtin/packages/py-decorator/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-deeptools/package.py b/var/spack/repos/builtin/packages/py-deeptools/package.py index 68f77628ea..ae595c7f1f 100644 --- a/var/spack/repos/builtin/packages/py-deeptools/package.py +++ b/var/spack/repos/builtin/packages/py-deeptools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-dendropy/package.py b/var/spack/repos/builtin/packages/py-dendropy/package.py index d638745d10..50f7f2a619 100644 --- a/var/spack/repos/builtin/packages/py-dendropy/package.py +++ b/var/spack/repos/builtin/packages/py-dendropy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-dev/package.py b/var/spack/repos/builtin/packages/py-dev/package.py index 49b0e9b2c3..49c89444eb 100644 --- a/var/spack/repos/builtin/packages/py-dev/package.py +++ b/var/spack/repos/builtin/packages/py-dev/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-dill/package.py b/var/spack/repos/builtin/packages/py-dill/package.py index f5be93cdd7..f1be05e7ac 100644 --- a/var/spack/repos/builtin/packages/py-dill/package.py +++ b/var/spack/repos/builtin/packages/py-dill/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-dlcpar/package.py b/var/spack/repos/builtin/packages/py-dlcpar/package.py index 22e1ccd5a6..e299245542 100644 --- a/var/spack/repos/builtin/packages/py-dlcpar/package.py +++ b/var/spack/repos/builtin/packages/py-dlcpar/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-docutils/package.py b/var/spack/repos/builtin/packages/py-docutils/package.py index 25881c9e77..a4c8326939 100644 --- a/var/spack/repos/builtin/packages/py-docutils/package.py +++ b/var/spack/repos/builtin/packages/py-docutils/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-doxypy/package.py b/var/spack/repos/builtin/packages/py-doxypy/package.py index 5eb7e066b0..ef40d0f679 100644 --- a/var/spack/repos/builtin/packages/py-doxypy/package.py +++ b/var/spack/repos/builtin/packages/py-doxypy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-doxypypy/package.py b/var/spack/repos/builtin/packages/py-doxypypy/package.py index 243909dffc..595c788777 100644 --- a/var/spack/repos/builtin/packages/py-doxypypy/package.py +++ b/var/spack/repos/builtin/packages/py-doxypypy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-dryscrape/package.py b/var/spack/repos/builtin/packages/py-dryscrape/package.py index 675b8f87e5..83adbb8227 100644 --- a/var/spack/repos/builtin/packages/py-dryscrape/package.py +++ b/var/spack/repos/builtin/packages/py-dryscrape/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-dxchange/package.py b/var/spack/repos/builtin/packages/py-dxchange/package.py index 6c04f119ae..1988760b15 100644 --- a/var/spack/repos/builtin/packages/py-dxchange/package.py +++ b/var/spack/repos/builtin/packages/py-dxchange/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-dxfile/package.py b/var/spack/repos/builtin/packages/py-dxfile/package.py index f131b51f85..6ca00ab6c6 100644 --- a/var/spack/repos/builtin/packages/py-dxfile/package.py +++ b/var/spack/repos/builtin/packages/py-dxfile/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-edffile/package.py b/var/spack/repos/builtin/packages/py-edffile/package.py index 460840e708..5a44a748c2 100644 --- a/var/spack/repos/builtin/packages/py-edffile/package.py +++ b/var/spack/repos/builtin/packages/py-edffile/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-editdistance/package.py b/var/spack/repos/builtin/packages/py-editdistance/package.py index 8224b18514..a36b40ea9b 100644 --- a/var/spack/repos/builtin/packages/py-editdistance/package.py +++ b/var/spack/repos/builtin/packages/py-editdistance/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-elasticsearch/package.py b/var/spack/repos/builtin/packages/py-elasticsearch/package.py index 8b324b29e2..abbefbeb3e 100644 --- a/var/spack/repos/builtin/packages/py-elasticsearch/package.py +++ b/var/spack/repos/builtin/packages/py-elasticsearch/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-elephant/package.py b/var/spack/repos/builtin/packages/py-elephant/package.py index a7b580d03e..520bb35284 100644 --- a/var/spack/repos/builtin/packages/py-elephant/package.py +++ b/var/spack/repos/builtin/packages/py-elephant/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-emcee/package.py b/var/spack/repos/builtin/packages/py-emcee/package.py index 1fc6d0ac27..1cb2149fe9 100644 --- a/var/spack/repos/builtin/packages/py-emcee/package.py +++ b/var/spack/repos/builtin/packages/py-emcee/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-entrypoints/package.py b/var/spack/repos/builtin/packages/py-entrypoints/package.py index 335c04267c..6414243a52 100644 --- a/var/spack/repos/builtin/packages/py-entrypoints/package.py +++ b/var/spack/repos/builtin/packages/py-entrypoints/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-enum34/package.py b/var/spack/repos/builtin/packages/py-enum34/package.py index 89174f28ee..318ef3f02e 100644 --- a/var/spack/repos/builtin/packages/py-enum34/package.py +++ b/var/spack/repos/builtin/packages/py-enum34/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-epydoc/package.py b/var/spack/repos/builtin/packages/py-epydoc/package.py index e6eed4c94c..2c778e58be 100644 --- a/var/spack/repos/builtin/packages/py-epydoc/package.py +++ b/var/spack/repos/builtin/packages/py-epydoc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-espresso/package.py b/var/spack/repos/builtin/packages/py-espresso/package.py index 768fae16ee..19bf7bec31 100644 --- a/var/spack/repos/builtin/packages/py-espresso/package.py +++ b/var/spack/repos/builtin/packages/py-espresso/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-espressopp/package.py b/var/spack/repos/builtin/packages/py-espressopp/package.py index 53d1cc4f50..2a3c17ab8f 100644 --- a/var/spack/repos/builtin/packages/py-espressopp/package.py +++ b/var/spack/repos/builtin/packages/py-espressopp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-et-xmlfile/package.py b/var/spack/repos/builtin/packages/py-et-xmlfile/package.py index bbe649f042..50470c4e1a 100644 --- a/var/spack/repos/builtin/packages/py-et-xmlfile/package.py +++ b/var/spack/repos/builtin/packages/py-et-xmlfile/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-execnet/package.py b/var/spack/repos/builtin/packages/py-execnet/package.py index f5e55a4c21..2d0945e019 100644 --- a/var/spack/repos/builtin/packages/py-execnet/package.py +++ b/var/spack/repos/builtin/packages/py-execnet/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-fastaindex/package.py b/var/spack/repos/builtin/packages/py-fastaindex/package.py index e22ff80326..aab0fb282c 100644 --- a/var/spack/repos/builtin/packages/py-fastaindex/package.py +++ b/var/spack/repos/builtin/packages/py-fastaindex/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-fasteners/package.py b/var/spack/repos/builtin/packages/py-fasteners/package.py index 54a21ceae4..3daf2ed86a 100644 --- a/var/spack/repos/builtin/packages/py-fasteners/package.py +++ b/var/spack/repos/builtin/packages/py-fasteners/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-faststructure/package.py b/var/spack/repos/builtin/packages/py-faststructure/package.py index ddbf1b5d8c..4f9823b9ec 100644 --- a/var/spack/repos/builtin/packages/py-faststructure/package.py +++ b/var/spack/repos/builtin/packages/py-faststructure/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-fiscalyear/package.py b/var/spack/repos/builtin/packages/py-fiscalyear/package.py index e86e2a397d..e1be120d3c 100644 --- a/var/spack/repos/builtin/packages/py-fiscalyear/package.py +++ b/var/spack/repos/builtin/packages/py-fiscalyear/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-flake8/package.py b/var/spack/repos/builtin/packages/py-flake8/package.py index f0251e2869..f2282845a1 100644 --- a/var/spack/repos/builtin/packages/py-flake8/package.py +++ b/var/spack/repos/builtin/packages/py-flake8/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-flask/package.py b/var/spack/repos/builtin/packages/py-flask/package.py index fb59c93a4e..7e32f5f607 100644 --- a/var/spack/repos/builtin/packages/py-flask/package.py +++ b/var/spack/repos/builtin/packages/py-flask/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-flexx/package.py b/var/spack/repos/builtin/packages/py-flexx/package.py index 30485eafa7..6f7ef5e06d 100644 --- a/var/spack/repos/builtin/packages/py-flexx/package.py +++ b/var/spack/repos/builtin/packages/py-flexx/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-fparser/package.py b/var/spack/repos/builtin/packages/py-fparser/package.py index 8ce756b421..cebcddb79b 100644 --- a/var/spack/repos/builtin/packages/py-fparser/package.py +++ b/var/spack/repos/builtin/packages/py-fparser/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-funcsigs/package.py b/var/spack/repos/builtin/packages/py-funcsigs/package.py index d2d8ff2de5..ae52bade12 100644 --- a/var/spack/repos/builtin/packages/py-funcsigs/package.py +++ b/var/spack/repos/builtin/packages/py-funcsigs/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-functools32/package.py b/var/spack/repos/builtin/packages/py-functools32/package.py index aebf170e46..1c3b125f20 100644 --- a/var/spack/repos/builtin/packages/py-functools32/package.py +++ b/var/spack/repos/builtin/packages/py-functools32/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-future/package.py b/var/spack/repos/builtin/packages/py-future/package.py index 1ebce3c7d1..b6c6a123ce 100644 --- a/var/spack/repos/builtin/packages/py-future/package.py +++ b/var/spack/repos/builtin/packages/py-future/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-futures/package.py b/var/spack/repos/builtin/packages/py-futures/package.py index c3370cbeaa..94a7c64631 100644 --- a/var/spack/repos/builtin/packages/py-futures/package.py +++ b/var/spack/repos/builtin/packages/py-futures/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-genders/package.py b/var/spack/repos/builtin/packages/py-genders/package.py index 248e4764cc..9d5b0b6e11 100644 --- a/var/spack/repos/builtin/packages/py-genders/package.py +++ b/var/spack/repos/builtin/packages/py-genders/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-genshi/package.py b/var/spack/repos/builtin/packages/py-genshi/package.py index a9296ab6ed..fcb304a7e1 100644 --- a/var/spack/repos/builtin/packages/py-genshi/package.py +++ b/var/spack/repos/builtin/packages/py-genshi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-git-review/package.py b/var/spack/repos/builtin/packages/py-git-review/package.py index b2df6b0ba7..0ce3a852d9 100644 --- a/var/spack/repos/builtin/packages/py-git-review/package.py +++ b/var/spack/repos/builtin/packages/py-git-review/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-git2/package.py b/var/spack/repos/builtin/packages/py-git2/package.py index 9e601aa3a2..6f42e2523e 100644 --- a/var/spack/repos/builtin/packages/py-git2/package.py +++ b/var/spack/repos/builtin/packages/py-git2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-gnuplot/package.py b/var/spack/repos/builtin/packages/py-gnuplot/package.py index e6972d280f..59a0809bea 100644 --- a/var/spack/repos/builtin/packages/py-gnuplot/package.py +++ b/var/spack/repos/builtin/packages/py-gnuplot/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-goatools/package.py b/var/spack/repos/builtin/packages/py-goatools/package.py index 921ad82279..3a0ac15c44 100644 --- a/var/spack/repos/builtin/packages/py-goatools/package.py +++ b/var/spack/repos/builtin/packages/py-goatools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-gpaw/package.py b/var/spack/repos/builtin/packages/py-gpaw/package.py index fb802d93b8..6e2fa62f76 100644 --- a/var/spack/repos/builtin/packages/py-gpaw/package.py +++ b/var/spack/repos/builtin/packages/py-gpaw/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-griddataformats/package.py b/var/spack/repos/builtin/packages/py-griddataformats/package.py index 0880d860eb..56916d0e27 100644 --- a/var/spack/repos/builtin/packages/py-griddataformats/package.py +++ b/var/spack/repos/builtin/packages/py-griddataformats/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-guidata/package.py b/var/spack/repos/builtin/packages/py-guidata/package.py index cf0e8447ff..b8737bcfa5 100644 --- a/var/spack/repos/builtin/packages/py-guidata/package.py +++ b/var/spack/repos/builtin/packages/py-guidata/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-guiqwt/package.py b/var/spack/repos/builtin/packages/py-guiqwt/package.py index f135b24c57..dfe0610cbd 100644 --- a/var/spack/repos/builtin/packages/py-guiqwt/package.py +++ b/var/spack/repos/builtin/packages/py-guiqwt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-h5py/package.py b/var/spack/repos/builtin/packages/py-h5py/package.py index 0c2b733697..a39c58f697 100644 --- a/var/spack/repos/builtin/packages/py-h5py/package.py +++ b/var/spack/repos/builtin/packages/py-h5py/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-html2text/package.py b/var/spack/repos/builtin/packages/py-html2text/package.py index 118b86e2c9..ce31799049 100644 --- a/var/spack/repos/builtin/packages/py-html2text/package.py +++ b/var/spack/repos/builtin/packages/py-html2text/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-html5lib/package.py b/var/spack/repos/builtin/packages/py-html5lib/package.py index 927614002a..fd94b04f83 100644 --- a/var/spack/repos/builtin/packages/py-html5lib/package.py +++ b/var/spack/repos/builtin/packages/py-html5lib/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-htseq/package.py b/var/spack/repos/builtin/packages/py-htseq/package.py index 8cbab45bb5..57460638ce 100644 --- a/var/spack/repos/builtin/packages/py-htseq/package.py +++ b/var/spack/repos/builtin/packages/py-htseq/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-httpbin/package.py b/var/spack/repos/builtin/packages/py-httpbin/package.py index f8411112ad..ecf7af91ae 100644 --- a/var/spack/repos/builtin/packages/py-httpbin/package.py +++ b/var/spack/repos/builtin/packages/py-httpbin/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-hypothesis/package.py b/var/spack/repos/builtin/packages/py-hypothesis/package.py index ffa4e0a54e..bf420e50c1 100644 --- a/var/spack/repos/builtin/packages/py-hypothesis/package.py +++ b/var/spack/repos/builtin/packages/py-hypothesis/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-idna/package.py b/var/spack/repos/builtin/packages/py-idna/package.py index 74e6c0fd5d..25796a00a2 100644 --- a/var/spack/repos/builtin/packages/py-idna/package.py +++ b/var/spack/repos/builtin/packages/py-idna/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-igraph/package.py b/var/spack/repos/builtin/packages/py-igraph/package.py index 11f7c4a990..ad12c2f7d4 100644 --- a/var/spack/repos/builtin/packages/py-igraph/package.py +++ b/var/spack/repos/builtin/packages/py-igraph/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-imagesize/package.py b/var/spack/repos/builtin/packages/py-imagesize/package.py index f9aa0334ae..b3bbbe5024 100644 --- a/var/spack/repos/builtin/packages/py-imagesize/package.py +++ b/var/spack/repos/builtin/packages/py-imagesize/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-iminuit/package.py b/var/spack/repos/builtin/packages/py-iminuit/package.py index cbeafa683c..fc4537d5ba 100644 --- a/var/spack/repos/builtin/packages/py-iminuit/package.py +++ b/var/spack/repos/builtin/packages/py-iminuit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-importlib/package.py b/var/spack/repos/builtin/packages/py-importlib/package.py index 27221dc99a..d1996aa680 100644 --- a/var/spack/repos/builtin/packages/py-importlib/package.py +++ b/var/spack/repos/builtin/packages/py-importlib/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-ipaddress/package.py b/var/spack/repos/builtin/packages/py-ipaddress/package.py index 3a84366225..2f8b09717f 100644 --- a/var/spack/repos/builtin/packages/py-ipaddress/package.py +++ b/var/spack/repos/builtin/packages/py-ipaddress/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-ipdb/package.py b/var/spack/repos/builtin/packages/py-ipdb/package.py index 047a8ce2a7..3c2d786a1c 100644 --- a/var/spack/repos/builtin/packages/py-ipdb/package.py +++ b/var/spack/repos/builtin/packages/py-ipdb/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-ipykernel/package.py b/var/spack/repos/builtin/packages/py-ipykernel/package.py index d703f94a25..30e021a254 100644 --- a/var/spack/repos/builtin/packages/py-ipykernel/package.py +++ b/var/spack/repos/builtin/packages/py-ipykernel/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-ipython-genutils/package.py b/var/spack/repos/builtin/packages/py-ipython-genutils/package.py index e0e0865238..29d87e0186 100644 --- a/var/spack/repos/builtin/packages/py-ipython-genutils/package.py +++ b/var/spack/repos/builtin/packages/py-ipython-genutils/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-ipython/package.py b/var/spack/repos/builtin/packages/py-ipython/package.py index 7f4aafa7a6..e1e7410306 100644 --- a/var/spack/repos/builtin/packages/py-ipython/package.py +++ b/var/spack/repos/builtin/packages/py-ipython/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-ipywidgets/package.py b/var/spack/repos/builtin/packages/py-ipywidgets/package.py index b7c67b241c..a8477dc452 100644 --- a/var/spack/repos/builtin/packages/py-ipywidgets/package.py +++ b/var/spack/repos/builtin/packages/py-ipywidgets/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-isort/package.py b/var/spack/repos/builtin/packages/py-isort/package.py index 98f434b012..cfa2b711d1 100644 --- a/var/spack/repos/builtin/packages/py-isort/package.py +++ b/var/spack/repos/builtin/packages/py-isort/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-itsdangerous/package.py b/var/spack/repos/builtin/packages/py-itsdangerous/package.py index 7bb7671571..74912a055d 100644 --- a/var/spack/repos/builtin/packages/py-itsdangerous/package.py +++ b/var/spack/repos/builtin/packages/py-itsdangerous/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-jdcal/package.py b/var/spack/repos/builtin/packages/py-jdcal/package.py index 8b22cd191c..5592c42175 100644 --- a/var/spack/repos/builtin/packages/py-jdcal/package.py +++ b/var/spack/repos/builtin/packages/py-jdcal/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-jedi/package.py b/var/spack/repos/builtin/packages/py-jedi/package.py index fcf4043afa..dfe528f9d6 100644 --- a/var/spack/repos/builtin/packages/py-jedi/package.py +++ b/var/spack/repos/builtin/packages/py-jedi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-jinja2/package.py b/var/spack/repos/builtin/packages/py-jinja2/package.py index 1df8c7366f..4ea32128be 100644 --- a/var/spack/repos/builtin/packages/py-jinja2/package.py +++ b/var/spack/repos/builtin/packages/py-jinja2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-joblib/package.py b/var/spack/repos/builtin/packages/py-joblib/package.py index 7792a34539..5ad8efefd8 100644 --- a/var/spack/repos/builtin/packages/py-joblib/package.py +++ b/var/spack/repos/builtin/packages/py-joblib/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-jpype/package.py b/var/spack/repos/builtin/packages/py-jpype/package.py index 204da5d79e..f4c817cdf2 100644 --- a/var/spack/repos/builtin/packages/py-jpype/package.py +++ b/var/spack/repos/builtin/packages/py-jpype/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-jsonschema/package.py b/var/spack/repos/builtin/packages/py-jsonschema/package.py index 3c7178a4ab..d6cdae0b6f 100644 --- a/var/spack/repos/builtin/packages/py-jsonschema/package.py +++ b/var/spack/repos/builtin/packages/py-jsonschema/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-junit-xml/package.py b/var/spack/repos/builtin/packages/py-junit-xml/package.py index d256797086..06062d5a4f 100644 --- a/var/spack/repos/builtin/packages/py-junit-xml/package.py +++ b/var/spack/repos/builtin/packages/py-junit-xml/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-jupyter-client/package.py b/var/spack/repos/builtin/packages/py-jupyter-client/package.py index b291fcf448..dc1d7279cd 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-client/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-client/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-jupyter-console/package.py b/var/spack/repos/builtin/packages/py-jupyter-console/package.py index 7a3098b0e8..224072d9cf 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-console/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-console/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-jupyter-core/package.py b/var/spack/repos/builtin/packages/py-jupyter-core/package.py index a07aa3fda9..0887a64ae0 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-core/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-core/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-jupyter-notebook/package.py b/var/spack/repos/builtin/packages/py-jupyter-notebook/package.py index 39f65d9ac7..16e460b4f7 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-notebook/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-notebook/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-keras/package.py b/var/spack/repos/builtin/packages/py-keras/package.py index d995111ca9..cc0a4de1f2 100644 --- a/var/spack/repos/builtin/packages/py-keras/package.py +++ b/var/spack/repos/builtin/packages/py-keras/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-latexcodec/package.py b/var/spack/repos/builtin/packages/py-latexcodec/package.py index a768eaebf4..1ae6670d91 100644 --- a/var/spack/repos/builtin/packages/py-latexcodec/package.py +++ b/var/spack/repos/builtin/packages/py-latexcodec/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-lazy-object-proxy/package.py b/var/spack/repos/builtin/packages/py-lazy-object-proxy/package.py index 5b3cd2f852..7bb87f2673 100644 --- a/var/spack/repos/builtin/packages/py-lazy-object-proxy/package.py +++ b/var/spack/repos/builtin/packages/py-lazy-object-proxy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-lazy/package.py b/var/spack/repos/builtin/packages/py-lazy/package.py index d976001296..4b7658078e 100644 --- a/var/spack/repos/builtin/packages/py-lazy/package.py +++ b/var/spack/repos/builtin/packages/py-lazy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-lazyarray/package.py b/var/spack/repos/builtin/packages/py-lazyarray/package.py index 5b5828182f..1af8eff53e 100644 --- a/var/spack/repos/builtin/packages/py-lazyarray/package.py +++ b/var/spack/repos/builtin/packages/py-lazyarray/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-libconf/package.py b/var/spack/repos/builtin/packages/py-libconf/package.py index 9a9d0d1059..a6aebfbe94 100644 --- a/var/spack/repos/builtin/packages/py-libconf/package.py +++ b/var/spack/repos/builtin/packages/py-libconf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-libensemble/package.py b/var/spack/repos/builtin/packages/py-libensemble/package.py index ef6cf08ca0..d31793d9ed 100644 --- a/var/spack/repos/builtin/packages/py-libensemble/package.py +++ b/var/spack/repos/builtin/packages/py-libensemble/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-line-profiler/package.py b/var/spack/repos/builtin/packages/py-line-profiler/package.py index 809d9e751f..9d3ee5822d 100644 --- a/var/spack/repos/builtin/packages/py-line-profiler/package.py +++ b/var/spack/repos/builtin/packages/py-line-profiler/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-linecache2/package.py b/var/spack/repos/builtin/packages/py-linecache2/package.py index ed781e6b6d..c29c0c2e39 100644 --- a/var/spack/repos/builtin/packages/py-linecache2/package.py +++ b/var/spack/repos/builtin/packages/py-linecache2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-lit/package.py b/var/spack/repos/builtin/packages/py-lit/package.py index aa7d58bc45..552c619c32 100644 --- a/var/spack/repos/builtin/packages/py-lit/package.py +++ b/var/spack/repos/builtin/packages/py-lit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-llvmlite/package.py b/var/spack/repos/builtin/packages/py-llvmlite/package.py index c08ddb81a0..3e82c4ee38 100644 --- a/var/spack/repos/builtin/packages/py-llvmlite/package.py +++ b/var/spack/repos/builtin/packages/py-llvmlite/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-lmfit/package.py b/var/spack/repos/builtin/packages/py-lmfit/package.py index f02440c98d..4602776bed 100644 --- a/var/spack/repos/builtin/packages/py-lmfit/package.py +++ b/var/spack/repos/builtin/packages/py-lmfit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-localcider/package.py b/var/spack/repos/builtin/packages/py-localcider/package.py index 54c4b55c1b..fcd65d283b 100644 --- a/var/spack/repos/builtin/packages/py-localcider/package.py +++ b/var/spack/repos/builtin/packages/py-localcider/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-lockfile/package.py b/var/spack/repos/builtin/packages/py-lockfile/package.py index c3aec05f45..c18da87dd9 100644 --- a/var/spack/repos/builtin/packages/py-lockfile/package.py +++ b/var/spack/repos/builtin/packages/py-lockfile/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-logilab-common/package.py b/var/spack/repos/builtin/packages/py-logilab-common/package.py index 35e5d9aa88..105f1079d2 100644 --- a/var/spack/repos/builtin/packages/py-logilab-common/package.py +++ b/var/spack/repos/builtin/packages/py-logilab-common/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-lrudict/package.py b/var/spack/repos/builtin/packages/py-lrudict/package.py index 5ce967579f..fb458bb3e2 100644 --- a/var/spack/repos/builtin/packages/py-lrudict/package.py +++ b/var/spack/repos/builtin/packages/py-lrudict/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-lxml/package.py b/var/spack/repos/builtin/packages/py-lxml/package.py index 10e2435562..82a782037b 100644 --- a/var/spack/repos/builtin/packages/py-lxml/package.py +++ b/var/spack/repos/builtin/packages/py-lxml/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-lzstring/package.py b/var/spack/repos/builtin/packages/py-lzstring/package.py index 8ab7658339..48645203f6 100644 --- a/var/spack/repos/builtin/packages/py-lzstring/package.py +++ b/var/spack/repos/builtin/packages/py-lzstring/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-macholib/package.py b/var/spack/repos/builtin/packages/py-macholib/package.py index d6755f20ba..33d1a3b96f 100644 --- a/var/spack/repos/builtin/packages/py-macholib/package.py +++ b/var/spack/repos/builtin/packages/py-macholib/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-machotools/package.py b/var/spack/repos/builtin/packages/py-machotools/package.py index d51fa17469..8a2e42e824 100644 --- a/var/spack/repos/builtin/packages/py-machotools/package.py +++ b/var/spack/repos/builtin/packages/py-machotools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-macs2/package.py b/var/spack/repos/builtin/packages/py-macs2/package.py index 9d66440373..70cf69d2f7 100644 --- a/var/spack/repos/builtin/packages/py-macs2/package.py +++ b/var/spack/repos/builtin/packages/py-macs2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-maestrowf/package.py b/var/spack/repos/builtin/packages/py-maestrowf/package.py index ba2ba952cb..fbecbcd1a7 100644 --- a/var/spack/repos/builtin/packages/py-maestrowf/package.py +++ b/var/spack/repos/builtin/packages/py-maestrowf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-mako/package.py b/var/spack/repos/builtin/packages/py-mako/package.py index b6100d43bf..01e83a77fe 100644 --- a/var/spack/repos/builtin/packages/py-mako/package.py +++ b/var/spack/repos/builtin/packages/py-mako/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-mappy/package.py b/var/spack/repos/builtin/packages/py-mappy/package.py index 27ca1cbb11..d0ac64f26c 100644 --- a/var/spack/repos/builtin/packages/py-mappy/package.py +++ b/var/spack/repos/builtin/packages/py-mappy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-markdown/package.py b/var/spack/repos/builtin/packages/py-markdown/package.py index d6356d8a52..8954b0635c 100644 --- a/var/spack/repos/builtin/packages/py-markdown/package.py +++ b/var/spack/repos/builtin/packages/py-markdown/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-markupsafe/package.py b/var/spack/repos/builtin/packages/py-markupsafe/package.py index dc1bf781a0..c2d5950915 100644 --- a/var/spack/repos/builtin/packages/py-markupsafe/package.py +++ b/var/spack/repos/builtin/packages/py-markupsafe/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-matplotlib/package.py b/var/spack/repos/builtin/packages/py-matplotlib/package.py index 883bdbd28b..8b819de9ab 100644 --- a/var/spack/repos/builtin/packages/py-matplotlib/package.py +++ b/var/spack/repos/builtin/packages/py-matplotlib/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-mccabe/package.py b/var/spack/repos/builtin/packages/py-mccabe/package.py index 05dacfd6b4..63c0a828d7 100644 --- a/var/spack/repos/builtin/packages/py-mccabe/package.py +++ b/var/spack/repos/builtin/packages/py-mccabe/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-mdanalysis/package.py b/var/spack/repos/builtin/packages/py-mdanalysis/package.py index 437f2445a7..ce60ebff49 100644 --- a/var/spack/repos/builtin/packages/py-mdanalysis/package.py +++ b/var/spack/repos/builtin/packages/py-mdanalysis/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-meep/package.py b/var/spack/repos/builtin/packages/py-meep/package.py index a2252c3b00..719b7fa489 100644 --- a/var/spack/repos/builtin/packages/py-meep/package.py +++ b/var/spack/repos/builtin/packages/py-meep/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-memory-profiler/package.py b/var/spack/repos/builtin/packages/py-memory-profiler/package.py index 7bd6b70ca1..26872baf5c 100644 --- a/var/spack/repos/builtin/packages/py-memory-profiler/package.py +++ b/var/spack/repos/builtin/packages/py-memory-profiler/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-methylcode/package.py b/var/spack/repos/builtin/packages/py-methylcode/package.py index 00171890f5..b49dcb30d9 100644 --- a/var/spack/repos/builtin/packages/py-methylcode/package.py +++ b/var/spack/repos/builtin/packages/py-methylcode/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-misopy/package.py b/var/spack/repos/builtin/packages/py-misopy/package.py index 6c274dbfbc..ce0a8ac46c 100644 --- a/var/spack/repos/builtin/packages/py-misopy/package.py +++ b/var/spack/repos/builtin/packages/py-misopy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-mistune/package.py b/var/spack/repos/builtin/packages/py-mistune/package.py index 22b7c5e790..46097726f8 100644 --- a/var/spack/repos/builtin/packages/py-mistune/package.py +++ b/var/spack/repos/builtin/packages/py-mistune/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-mock/package.py b/var/spack/repos/builtin/packages/py-mock/package.py index 5600072e63..938c015ad1 100644 --- a/var/spack/repos/builtin/packages/py-mock/package.py +++ b/var/spack/repos/builtin/packages/py-mock/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-moltemplate/package.py b/var/spack/repos/builtin/packages/py-moltemplate/package.py index f9d6b67d76..6b7a6d4bf8 100644 --- a/var/spack/repos/builtin/packages/py-moltemplate/package.py +++ b/var/spack/repos/builtin/packages/py-moltemplate/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-mongo/package.py b/var/spack/repos/builtin/packages/py-mongo/package.py index 507ad82631..a774579f55 100644 --- a/var/spack/repos/builtin/packages/py-mongo/package.py +++ b/var/spack/repos/builtin/packages/py-mongo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-monotonic/package.py b/var/spack/repos/builtin/packages/py-monotonic/package.py index 3f8ba05a03..f51da8fda0 100644 --- a/var/spack/repos/builtin/packages/py-monotonic/package.py +++ b/var/spack/repos/builtin/packages/py-monotonic/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-monty/package.py b/var/spack/repos/builtin/packages/py-monty/package.py index 8b35fb6e19..acbe68b540 100644 --- a/var/spack/repos/builtin/packages/py-monty/package.py +++ b/var/spack/repos/builtin/packages/py-monty/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-mpi4py/package.py b/var/spack/repos/builtin/packages/py-mpi4py/package.py index c626da9b84..c87a0a5abc 100644 --- a/var/spack/repos/builtin/packages/py-mpi4py/package.py +++ b/var/spack/repos/builtin/packages/py-mpi4py/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-mpmath/package.py b/var/spack/repos/builtin/packages/py-mpmath/package.py index d3250b43e5..a011891c87 100644 --- a/var/spack/repos/builtin/packages/py-mpmath/package.py +++ b/var/spack/repos/builtin/packages/py-mpmath/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-multiprocess/package.py b/var/spack/repos/builtin/packages/py-multiprocess/package.py index 307433e759..e247f0cbe8 100644 --- a/var/spack/repos/builtin/packages/py-multiprocess/package.py +++ b/var/spack/repos/builtin/packages/py-multiprocess/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-multiqc/package.py b/var/spack/repos/builtin/packages/py-multiqc/package.py index a0f945dd01..1eea2b474f 100644 --- a/var/spack/repos/builtin/packages/py-multiqc/package.py +++ b/var/spack/repos/builtin/packages/py-multiqc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-mx/package.py b/var/spack/repos/builtin/packages/py-mx/package.py index 1902b33c4f..1306e663cf 100644 --- a/var/spack/repos/builtin/packages/py-mx/package.py +++ b/var/spack/repos/builtin/packages/py-mx/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-mxnet/package.py b/var/spack/repos/builtin/packages/py-mxnet/package.py index 5b7cca85ef..eeae66da56 100644 --- a/var/spack/repos/builtin/packages/py-mxnet/package.py +++ b/var/spack/repos/builtin/packages/py-mxnet/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-myhdl/package.py b/var/spack/repos/builtin/packages/py-myhdl/package.py index 69bf8d04b6..e64b7346df 100644 --- a/var/spack/repos/builtin/packages/py-myhdl/package.py +++ b/var/spack/repos/builtin/packages/py-myhdl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-mysqldb1/package.py b/var/spack/repos/builtin/packages/py-mysqldb1/package.py index b3d17c543a..7033a6f3f2 100644 --- a/var/spack/repos/builtin/packages/py-mysqldb1/package.py +++ b/var/spack/repos/builtin/packages/py-mysqldb1/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-nbconvert/package.py b/var/spack/repos/builtin/packages/py-nbconvert/package.py index ea93c618c7..ccb9434014 100644 --- a/var/spack/repos/builtin/packages/py-nbconvert/package.py +++ b/var/spack/repos/builtin/packages/py-nbconvert/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-nbformat/package.py b/var/spack/repos/builtin/packages/py-nbformat/package.py index 5f7ca27008..6f34a45dbc 100644 --- a/var/spack/repos/builtin/packages/py-nbformat/package.py +++ b/var/spack/repos/builtin/packages/py-nbformat/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-neo/package.py b/var/spack/repos/builtin/packages/py-neo/package.py index 865e34c3f1..7c58c8bb19 100644 --- a/var/spack/repos/builtin/packages/py-neo/package.py +++ b/var/spack/repos/builtin/packages/py-neo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-nestle/package.py b/var/spack/repos/builtin/packages/py-nestle/package.py index ff64b08716..8a560d1e4c 100644 --- a/var/spack/repos/builtin/packages/py-nestle/package.py +++ b/var/spack/repos/builtin/packages/py-nestle/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-netcdf4/package.py b/var/spack/repos/builtin/packages/py-netcdf4/package.py index 73e0d38586..842c988f77 100644 --- a/var/spack/repos/builtin/packages/py-netcdf4/package.py +++ b/var/spack/repos/builtin/packages/py-netcdf4/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-netifaces/package.py b/var/spack/repos/builtin/packages/py-netifaces/package.py index fcdbf80092..5831f4ccc2 100644 --- a/var/spack/repos/builtin/packages/py-netifaces/package.py +++ b/var/spack/repos/builtin/packages/py-netifaces/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-networkx/package.py b/var/spack/repos/builtin/packages/py-networkx/package.py index 528fe59a01..1e00f636a1 100644 --- a/var/spack/repos/builtin/packages/py-networkx/package.py +++ b/var/spack/repos/builtin/packages/py-networkx/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-nose/package.py b/var/spack/repos/builtin/packages/py-nose/package.py index 566808b711..dcc0471f61 100644 --- a/var/spack/repos/builtin/packages/py-nose/package.py +++ b/var/spack/repos/builtin/packages/py-nose/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-nosexcover/package.py b/var/spack/repos/builtin/packages/py-nosexcover/package.py index 7625a39d99..ebbf5cad8f 100644 --- a/var/spack/repos/builtin/packages/py-nosexcover/package.py +++ b/var/spack/repos/builtin/packages/py-nosexcover/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-numba/package.py b/var/spack/repos/builtin/packages/py-numba/package.py index 15da8af62b..45091118ca 100644 --- a/var/spack/repos/builtin/packages/py-numba/package.py +++ b/var/spack/repos/builtin/packages/py-numba/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-numexpr/package.py b/var/spack/repos/builtin/packages/py-numexpr/package.py index 6db50bf00d..7bce85851b 100644 --- a/var/spack/repos/builtin/packages/py-numexpr/package.py +++ b/var/spack/repos/builtin/packages/py-numexpr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-numpy/package.py b/var/spack/repos/builtin/packages/py-numpy/package.py index 5c22b39100..8b18c59835 100644 --- a/var/spack/repos/builtin/packages/py-numpy/package.py +++ b/var/spack/repos/builtin/packages/py-numpy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-numpydoc/package.py b/var/spack/repos/builtin/packages/py-numpydoc/package.py index f0ecfbc411..22dbb24bbc 100644 --- a/var/spack/repos/builtin/packages/py-numpydoc/package.py +++ b/var/spack/repos/builtin/packages/py-numpydoc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-olefile/package.py b/var/spack/repos/builtin/packages/py-olefile/package.py index 0925f67d96..4b8c0b6247 100644 --- a/var/spack/repos/builtin/packages/py-olefile/package.py +++ b/var/spack/repos/builtin/packages/py-olefile/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-ont-fast5-api/package.py b/var/spack/repos/builtin/packages/py-ont-fast5-api/package.py index d2e868c7c5..edb7b0c632 100644 --- a/var/spack/repos/builtin/packages/py-ont-fast5-api/package.py +++ b/var/spack/repos/builtin/packages/py-ont-fast5-api/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-openpyxl/package.py b/var/spack/repos/builtin/packages/py-openpyxl/package.py index 6f28526b8e..6b0bd0811d 100644 --- a/var/spack/repos/builtin/packages/py-openpyxl/package.py +++ b/var/spack/repos/builtin/packages/py-openpyxl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-ordereddict/package.py b/var/spack/repos/builtin/packages/py-ordereddict/package.py index 16587ba978..eecfc93301 100644 --- a/var/spack/repos/builtin/packages/py-ordereddict/package.py +++ b/var/spack/repos/builtin/packages/py-ordereddict/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-oset/package.py b/var/spack/repos/builtin/packages/py-oset/package.py index 10a5007932..0b14bd3427 100644 --- a/var/spack/repos/builtin/packages/py-oset/package.py +++ b/var/spack/repos/builtin/packages/py-oset/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-packaging/package.py b/var/spack/repos/builtin/packages/py-packaging/package.py index 3867b22033..46fbd13e71 100644 --- a/var/spack/repos/builtin/packages/py-packaging/package.py +++ b/var/spack/repos/builtin/packages/py-packaging/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-palettable/package.py b/var/spack/repos/builtin/packages/py-palettable/package.py index 65b7a9a27b..d20c83f78d 100644 --- a/var/spack/repos/builtin/packages/py-palettable/package.py +++ b/var/spack/repos/builtin/packages/py-palettable/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pandas/package.py b/var/spack/repos/builtin/packages/py-pandas/package.py index afa7075ee5..6dae27e199 100644 --- a/var/spack/repos/builtin/packages/py-pandas/package.py +++ b/var/spack/repos/builtin/packages/py-pandas/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-paramiko/package.py b/var/spack/repos/builtin/packages/py-paramiko/package.py index 90784be649..227b4037fe 100644 --- a/var/spack/repos/builtin/packages/py-paramiko/package.py +++ b/var/spack/repos/builtin/packages/py-paramiko/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pathlib2/package.py b/var/spack/repos/builtin/packages/py-pathlib2/package.py index f5cf9cf381..352efb0811 100644 --- a/var/spack/repos/builtin/packages/py-pathlib2/package.py +++ b/var/spack/repos/builtin/packages/py-pathlib2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pathos/package.py b/var/spack/repos/builtin/packages/py-pathos/package.py index 1ebbae5cf2..2905e7f904 100644 --- a/var/spack/repos/builtin/packages/py-pathos/package.py +++ b/var/spack/repos/builtin/packages/py-pathos/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pathspec/package.py b/var/spack/repos/builtin/packages/py-pathspec/package.py index 8857ee40f5..e43323b5ac 100644 --- a/var/spack/repos/builtin/packages/py-pathspec/package.py +++ b/var/spack/repos/builtin/packages/py-pathspec/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-patsy/package.py b/var/spack/repos/builtin/packages/py-patsy/package.py index 1b60b76cd7..48fbe1f7af 100644 --- a/var/spack/repos/builtin/packages/py-patsy/package.py +++ b/var/spack/repos/builtin/packages/py-patsy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pbr/package.py b/var/spack/repos/builtin/packages/py-pbr/package.py index 9468080d88..583c23a955 100644 --- a/var/spack/repos/builtin/packages/py-pbr/package.py +++ b/var/spack/repos/builtin/packages/py-pbr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-perf/package.py b/var/spack/repos/builtin/packages/py-perf/package.py index fc75740d17..749bde1c94 100644 --- a/var/spack/repos/builtin/packages/py-perf/package.py +++ b/var/spack/repos/builtin/packages/py-perf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-performance/package.py b/var/spack/repos/builtin/packages/py-performance/package.py index 932a593c30..1cdd2dde65 100644 --- a/var/spack/repos/builtin/packages/py-performance/package.py +++ b/var/spack/repos/builtin/packages/py-performance/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-periodictable/package.py b/var/spack/repos/builtin/packages/py-periodictable/package.py index 6b6cd2ecf5..ffc51128a5 100644 --- a/var/spack/repos/builtin/packages/py-periodictable/package.py +++ b/var/spack/repos/builtin/packages/py-periodictable/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-petsc4py/package.py b/var/spack/repos/builtin/packages/py-petsc4py/package.py index 8047af9ecd..53bf5fc3b0 100644 --- a/var/spack/repos/builtin/packages/py-petsc4py/package.py +++ b/var/spack/repos/builtin/packages/py-petsc4py/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pexpect/package.py b/var/spack/repos/builtin/packages/py-pexpect/package.py index 8900698f00..9019be44ea 100644 --- a/var/spack/repos/builtin/packages/py-pexpect/package.py +++ b/var/spack/repos/builtin/packages/py-pexpect/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-phonopy/package.py b/var/spack/repos/builtin/packages/py-phonopy/package.py index fd45d7db28..be91d8f9f0 100644 --- a/var/spack/repos/builtin/packages/py-phonopy/package.py +++ b/var/spack/repos/builtin/packages/py-phonopy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pickleshare/package.py b/var/spack/repos/builtin/packages/py-pickleshare/package.py index da8bdccb5e..58baa004e8 100644 --- a/var/spack/repos/builtin/packages/py-pickleshare/package.py +++ b/var/spack/repos/builtin/packages/py-pickleshare/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pil/package.py b/var/spack/repos/builtin/packages/py-pil/package.py index 332a7e91ee..23f24c4883 100644 --- a/var/spack/repos/builtin/packages/py-pil/package.py +++ b/var/spack/repos/builtin/packages/py-pil/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pillow/package.py b/var/spack/repos/builtin/packages/py-pillow/package.py index 3b54ee32ae..9e16e89233 100644 --- a/var/spack/repos/builtin/packages/py-pillow/package.py +++ b/var/spack/repos/builtin/packages/py-pillow/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pip/package.py b/var/spack/repos/builtin/packages/py-pip/package.py index d0da3dd153..3c3548d8ac 100644 --- a/var/spack/repos/builtin/packages/py-pip/package.py +++ b/var/spack/repos/builtin/packages/py-pip/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pipits/package.py b/var/spack/repos/builtin/packages/py-pipits/package.py index e24f4718db..651521a399 100644 --- a/var/spack/repos/builtin/packages/py-pipits/package.py +++ b/var/spack/repos/builtin/packages/py-pipits/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pkgconfig/package.py b/var/spack/repos/builtin/packages/py-pkgconfig/package.py index 501da31cdd..b7d424a161 100644 --- a/var/spack/repos/builtin/packages/py-pkgconfig/package.py +++ b/var/spack/repos/builtin/packages/py-pkgconfig/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-plotly/package.py b/var/spack/repos/builtin/packages/py-plotly/package.py index 7b1634be81..0bdb43fb59 100644 --- a/var/spack/repos/builtin/packages/py-plotly/package.py +++ b/var/spack/repos/builtin/packages/py-plotly/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-ply/package.py b/var/spack/repos/builtin/packages/py-ply/package.py index f1ccd85c3f..f3845c4625 100644 --- a/var/spack/repos/builtin/packages/py-ply/package.py +++ b/var/spack/repos/builtin/packages/py-ply/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pmw/package.py b/var/spack/repos/builtin/packages/py-pmw/package.py index b22499d137..7043de71eb 100644 --- a/var/spack/repos/builtin/packages/py-pmw/package.py +++ b/var/spack/repos/builtin/packages/py-pmw/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pox/package.py b/var/spack/repos/builtin/packages/py-pox/package.py index a4fe508ab2..9c7ef8496e 100644 --- a/var/spack/repos/builtin/packages/py-pox/package.py +++ b/var/spack/repos/builtin/packages/py-pox/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-ppft/package.py b/var/spack/repos/builtin/packages/py-ppft/package.py index ca14fbb6b0..b6f65bbdee 100644 --- a/var/spack/repos/builtin/packages/py-ppft/package.py +++ b/var/spack/repos/builtin/packages/py-ppft/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-prettytable/package.py b/var/spack/repos/builtin/packages/py-prettytable/package.py index 5f8378ca7c..9b7b44663e 100644 --- a/var/spack/repos/builtin/packages/py-prettytable/package.py +++ b/var/spack/repos/builtin/packages/py-prettytable/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-proj/package.py b/var/spack/repos/builtin/packages/py-proj/package.py index cea4f0c3ea..ee8451aa1c 100644 --- a/var/spack/repos/builtin/packages/py-proj/package.py +++ b/var/spack/repos/builtin/packages/py-proj/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py b/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py index f9b07f30d1..6f4432f386 100644 --- a/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py +++ b/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-protobuf/package.py b/var/spack/repos/builtin/packages/py-protobuf/package.py index fd3e4a6f09..7cf2dad7f2 100644 --- a/var/spack/repos/builtin/packages/py-protobuf/package.py +++ b/var/spack/repos/builtin/packages/py-protobuf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-psutil/package.py b/var/spack/repos/builtin/packages/py-psutil/package.py index 60c3368966..5b91d4f75a 100644 --- a/var/spack/repos/builtin/packages/py-psutil/package.py +++ b/var/spack/repos/builtin/packages/py-psutil/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-psyclone/package.py b/var/spack/repos/builtin/packages/py-psyclone/package.py index b00e7059a7..a8ec68202b 100644 --- a/var/spack/repos/builtin/packages/py-psyclone/package.py +++ b/var/spack/repos/builtin/packages/py-psyclone/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-ptyprocess/package.py b/var/spack/repos/builtin/packages/py-ptyprocess/package.py index f97ff6e048..352cfddb8c 100644 --- a/var/spack/repos/builtin/packages/py-ptyprocess/package.py +++ b/var/spack/repos/builtin/packages/py-ptyprocess/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pudb/package.py b/var/spack/repos/builtin/packages/py-pudb/package.py index bbc89251fe..b14e15d75b 100644 --- a/var/spack/repos/builtin/packages/py-pudb/package.py +++ b/var/spack/repos/builtin/packages/py-pudb/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-py/package.py b/var/spack/repos/builtin/packages/py-py/package.py index 9706a2659d..0c6bd8ecac 100644 --- a/var/spack/repos/builtin/packages/py-py/package.py +++ b/var/spack/repos/builtin/packages/py-py/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-py2bit/package.py b/var/spack/repos/builtin/packages/py-py2bit/package.py index 26d1f42a7b..706c6c911f 100644 --- a/var/spack/repos/builtin/packages/py-py2bit/package.py +++ b/var/spack/repos/builtin/packages/py-py2bit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-py2cairo/package.py b/var/spack/repos/builtin/packages/py-py2cairo/package.py index 6921d86dd1..1ddbcc440a 100644 --- a/var/spack/repos/builtin/packages/py-py2cairo/package.py +++ b/var/spack/repos/builtin/packages/py-py2cairo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-py2neo/package.py b/var/spack/repos/builtin/packages/py-py2neo/package.py index 27bb043116..51a86f12a8 100644 --- a/var/spack/repos/builtin/packages/py-py2neo/package.py +++ b/var/spack/repos/builtin/packages/py-py2neo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-py4j/package.py b/var/spack/repos/builtin/packages/py-py4j/package.py index 0c7e41a1d7..1e43b96a49 100644 --- a/var/spack/repos/builtin/packages/py-py4j/package.py +++ b/var/spack/repos/builtin/packages/py-py4j/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pyani/package.py b/var/spack/repos/builtin/packages/py-pyani/package.py index fb7520342b..c1aca44c31 100644 --- a/var/spack/repos/builtin/packages/py-pyani/package.py +++ b/var/spack/repos/builtin/packages/py-pyani/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pyasn1/package.py b/var/spack/repos/builtin/packages/py-pyasn1/package.py index 3a7fc949c5..adc8aa19f5 100644 --- a/var/spack/repos/builtin/packages/py-pyasn1/package.py +++ b/var/spack/repos/builtin/packages/py-pyasn1/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pybedtools/package.py b/var/spack/repos/builtin/packages/py-pybedtools/package.py index 841500a274..55d6d34f1f 100644 --- a/var/spack/repos/builtin/packages/py-pybedtools/package.py +++ b/var/spack/repos/builtin/packages/py-pybedtools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pybigwig/package.py b/var/spack/repos/builtin/packages/py-pybigwig/package.py index 5c88d111f5..b3fe30bfb9 100644 --- a/var/spack/repos/builtin/packages/py-pybigwig/package.py +++ b/var/spack/repos/builtin/packages/py-pybigwig/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pybind11/package.py b/var/spack/repos/builtin/packages/py-pybind11/package.py index 1de4ee8ec3..252ad0db70 100644 --- a/var/spack/repos/builtin/packages/py-pybind11/package.py +++ b/var/spack/repos/builtin/packages/py-pybind11/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pybtex-docutils/package.py b/var/spack/repos/builtin/packages/py-pybtex-docutils/package.py index 45371400a3..3656dfc0af 100644 --- a/var/spack/repos/builtin/packages/py-pybtex-docutils/package.py +++ b/var/spack/repos/builtin/packages/py-pybtex-docutils/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pybtex/package.py b/var/spack/repos/builtin/packages/py-pybtex/package.py index 606c047232..02c6d49222 100644 --- a/var/spack/repos/builtin/packages/py-pybtex/package.py +++ b/var/spack/repos/builtin/packages/py-pybtex/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pychecker/package.py b/var/spack/repos/builtin/packages/py-pychecker/package.py index 2f85fa88ac..5d691d8a38 100644 --- a/var/spack/repos/builtin/packages/py-pychecker/package.py +++ b/var/spack/repos/builtin/packages/py-pychecker/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pycodestyle/package.py b/var/spack/repos/builtin/packages/py-pycodestyle/package.py index e0d08f623a..273c6c50cc 100644 --- a/var/spack/repos/builtin/packages/py-pycodestyle/package.py +++ b/var/spack/repos/builtin/packages/py-pycodestyle/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pycparser/package.py b/var/spack/repos/builtin/packages/py-pycparser/package.py index 256130b1b7..7f9c38307d 100644 --- a/var/spack/repos/builtin/packages/py-pycparser/package.py +++ b/var/spack/repos/builtin/packages/py-pycparser/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pycrypto/package.py b/var/spack/repos/builtin/packages/py-pycrypto/package.py index 948a4f7cbd..4a25de8e8e 100644 --- a/var/spack/repos/builtin/packages/py-pycrypto/package.py +++ b/var/spack/repos/builtin/packages/py-pycrypto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pycurl/package.py b/var/spack/repos/builtin/packages/py-pycurl/package.py index c111430b9e..05912b7aab 100644 --- a/var/spack/repos/builtin/packages/py-pycurl/package.py +++ b/var/spack/repos/builtin/packages/py-pycurl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pydatalog/package.py b/var/spack/repos/builtin/packages/py-pydatalog/package.py index 9bd5c898a2..eaee1c1b9a 100644 --- a/var/spack/repos/builtin/packages/py-pydatalog/package.py +++ b/var/spack/repos/builtin/packages/py-pydatalog/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pydispatcher/package.py b/var/spack/repos/builtin/packages/py-pydispatcher/package.py index 9e329ab70c..1f389630af 100644 --- a/var/spack/repos/builtin/packages/py-pydispatcher/package.py +++ b/var/spack/repos/builtin/packages/py-pydispatcher/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pydot/package.py b/var/spack/repos/builtin/packages/py-pydot/package.py index c6067c00a1..416b761a90 100644 --- a/var/spack/repos/builtin/packages/py-pydot/package.py +++ b/var/spack/repos/builtin/packages/py-pydot/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pyelftools/package.py b/var/spack/repos/builtin/packages/py-pyelftools/package.py index a7d52ee946..e941b6756f 100644 --- a/var/spack/repos/builtin/packages/py-pyelftools/package.py +++ b/var/spack/repos/builtin/packages/py-pyelftools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pyfasta/package.py b/var/spack/repos/builtin/packages/py-pyfasta/package.py index ad099806b4..32e9067d04 100644 --- a/var/spack/repos/builtin/packages/py-pyfasta/package.py +++ b/var/spack/repos/builtin/packages/py-pyfasta/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pyfftw/package.py b/var/spack/repos/builtin/packages/py-pyfftw/package.py index 4dd9fe1600..2894d482fc 100644 --- a/var/spack/repos/builtin/packages/py-pyfftw/package.py +++ b/var/spack/repos/builtin/packages/py-pyfftw/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pyflakes/package.py b/var/spack/repos/builtin/packages/py-pyflakes/package.py index 2ccc009bb4..6ccf38b29a 100644 --- a/var/spack/repos/builtin/packages/py-pyflakes/package.py +++ b/var/spack/repos/builtin/packages/py-pyflakes/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pygments/package.py b/var/spack/repos/builtin/packages/py-pygments/package.py index 8c6ee04db8..b3e3d2e681 100644 --- a/var/spack/repos/builtin/packages/py-pygments/package.py +++ b/var/spack/repos/builtin/packages/py-pygments/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pygobject/package.py b/var/spack/repos/builtin/packages/py-pygobject/package.py index dc59d6749f..2bf5235428 100644 --- a/var/spack/repos/builtin/packages/py-pygobject/package.py +++ b/var/spack/repos/builtin/packages/py-pygobject/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pygpu/package.py b/var/spack/repos/builtin/packages/py-pygpu/package.py index 7062343153..b3ef4c59da 100644 --- a/var/spack/repos/builtin/packages/py-pygpu/package.py +++ b/var/spack/repos/builtin/packages/py-pygpu/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pygtk/package.py b/var/spack/repos/builtin/packages/py-pygtk/package.py index 2227e0f77f..dca7275c98 100644 --- a/var/spack/repos/builtin/packages/py-pygtk/package.py +++ b/var/spack/repos/builtin/packages/py-pygtk/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pylint/package.py b/var/spack/repos/builtin/packages/py-pylint/package.py index 8b0c8a641e..891b4c356a 100644 --- a/var/spack/repos/builtin/packages/py-pylint/package.py +++ b/var/spack/repos/builtin/packages/py-pylint/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pymatgen/package.py b/var/spack/repos/builtin/packages/py-pymatgen/package.py index 78343e74ff..142482fb1d 100644 --- a/var/spack/repos/builtin/packages/py-pymatgen/package.py +++ b/var/spack/repos/builtin/packages/py-pymatgen/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pyminifier/package.py b/var/spack/repos/builtin/packages/py-pyminifier/package.py index b4bc9e859b..50ae1cc062 100644 --- a/var/spack/repos/builtin/packages/py-pyminifier/package.py +++ b/var/spack/repos/builtin/packages/py-pyminifier/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pympler/package.py b/var/spack/repos/builtin/packages/py-pympler/package.py index 25766d10c4..555b974095 100644 --- a/var/spack/repos/builtin/packages/py-pympler/package.py +++ b/var/spack/repos/builtin/packages/py-pympler/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pynn/package.py b/var/spack/repos/builtin/packages/py-pynn/package.py index 284da28236..5eb900ab6e 100644 --- a/var/spack/repos/builtin/packages/py-pynn/package.py +++ b/var/spack/repos/builtin/packages/py-pynn/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pypar/package.py b/var/spack/repos/builtin/packages/py-pypar/package.py index ee1aa2735d..1fba9e0dfe 100644 --- a/var/spack/repos/builtin/packages/py-pypar/package.py +++ b/var/spack/repos/builtin/packages/py-pypar/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pyparsing/package.py b/var/spack/repos/builtin/packages/py-pyparsing/package.py index 0be88e638d..90c3fc05a1 100644 --- a/var/spack/repos/builtin/packages/py-pyparsing/package.py +++ b/var/spack/repos/builtin/packages/py-pyparsing/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pypeflow/package.py b/var/spack/repos/builtin/packages/py-pypeflow/package.py index 8eb353432c..1e05b57cfd 100644 --- a/var/spack/repos/builtin/packages/py-pypeflow/package.py +++ b/var/spack/repos/builtin/packages/py-pypeflow/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pyprof2html/package.py b/var/spack/repos/builtin/packages/py-pyprof2html/package.py index efaa525267..a840d1dd96 100644 --- a/var/spack/repos/builtin/packages/py-pyprof2html/package.py +++ b/var/spack/repos/builtin/packages/py-pyprof2html/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pyqt/package.py b/var/spack/repos/builtin/packages/py-pyqt/package.py index 401cf8ded6..fc790f9296 100644 --- a/var/spack/repos/builtin/packages/py-pyqt/package.py +++ b/var/spack/repos/builtin/packages/py-pyqt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pyrad/package.py b/var/spack/repos/builtin/packages/py-pyrad/package.py index 0b56dd3631..8a40a34454 100644 --- a/var/spack/repos/builtin/packages/py-pyrad/package.py +++ b/var/spack/repos/builtin/packages/py-pyrad/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pysam/package.py b/var/spack/repos/builtin/packages/py-pysam/package.py index 1ec5fe311f..8b98f5a4e8 100644 --- a/var/spack/repos/builtin/packages/py-pysam/package.py +++ b/var/spack/repos/builtin/packages/py-pysam/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pyscaf/package.py b/var/spack/repos/builtin/packages/py-pyscaf/package.py index a32a1aee55..b79e992e8b 100644 --- a/var/spack/repos/builtin/packages/py-pyscaf/package.py +++ b/var/spack/repos/builtin/packages/py-pyscaf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pyserial/package.py b/var/spack/repos/builtin/packages/py-pyserial/package.py index 0ddc2c51de..0bbf9826f8 100644 --- a/var/spack/repos/builtin/packages/py-pyserial/package.py +++ b/var/spack/repos/builtin/packages/py-pyserial/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pyside/package.py b/var/spack/repos/builtin/packages/py-pyside/package.py index e799b4cb72..b38550e73f 100644 --- a/var/spack/repos/builtin/packages/py-pyside/package.py +++ b/var/spack/repos/builtin/packages/py-pyside/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pysocks/package.py b/var/spack/repos/builtin/packages/py-pysocks/package.py index db734dd927..38bd439dea 100644 --- a/var/spack/repos/builtin/packages/py-pysocks/package.py +++ b/var/spack/repos/builtin/packages/py-pysocks/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pytables/package.py b/var/spack/repos/builtin/packages/py-pytables/package.py index 5e782341d9..cbef3ec8f5 100644 --- a/var/spack/repos/builtin/packages/py-pytables/package.py +++ b/var/spack/repos/builtin/packages/py-pytables/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pytest-cov/package.py b/var/spack/repos/builtin/packages/py-pytest-cov/package.py index 3621b54d0d..f22c6ffc9a 100644 --- a/var/spack/repos/builtin/packages/py-pytest-cov/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-cov/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pytest-flake8/package.py b/var/spack/repos/builtin/packages/py-pytest-flake8/package.py index 4b2ec5e014..f5e60de76f 100644 --- a/var/spack/repos/builtin/packages/py-pytest-flake8/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-flake8/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pytest-httpbin/package.py b/var/spack/repos/builtin/packages/py-pytest-httpbin/package.py index f27f121d8e..84a1be226c 100644 --- a/var/spack/repos/builtin/packages/py-pytest-httpbin/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-httpbin/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pytest-mock/package.py b/var/spack/repos/builtin/packages/py-pytest-mock/package.py index 968816f6f4..cae573c184 100644 --- a/var/spack/repos/builtin/packages/py-pytest-mock/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-mock/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pytest-runner/package.py b/var/spack/repos/builtin/packages/py-pytest-runner/package.py index b1c8eab201..2bd23df50d 100644 --- a/var/spack/repos/builtin/packages/py-pytest-runner/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-runner/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pytest-xdist/package.py b/var/spack/repos/builtin/packages/py-pytest-xdist/package.py index 968601ab29..e91952899b 100644 --- a/var/spack/repos/builtin/packages/py-pytest-xdist/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-xdist/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pytest/package.py b/var/spack/repos/builtin/packages/py-pytest/package.py index 098a9de79c..30aa0972d0 100644 --- a/var/spack/repos/builtin/packages/py-pytest/package.py +++ b/var/spack/repos/builtin/packages/py-pytest/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-python-daemon/package.py b/var/spack/repos/builtin/packages/py-python-daemon/package.py index ff47d32504..3ef87e72fb 100644 --- a/var/spack/repos/builtin/packages/py-python-daemon/package.py +++ b/var/spack/repos/builtin/packages/py-python-daemon/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-python-gitlab/package.py b/var/spack/repos/builtin/packages/py-python-gitlab/package.py index ff769b421e..8804279f7a 100644 --- a/var/spack/repos/builtin/packages/py-python-gitlab/package.py +++ b/var/spack/repos/builtin/packages/py-python-gitlab/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-python-levenshtein/package.py b/var/spack/repos/builtin/packages/py-python-levenshtein/package.py index 818fa33053..8acec3f08c 100644 --- a/var/spack/repos/builtin/packages/py-python-levenshtein/package.py +++ b/var/spack/repos/builtin/packages/py-python-levenshtein/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pythonqwt/package.py b/var/spack/repos/builtin/packages/py-pythonqwt/package.py index 7328f64f4a..8fafd49a74 100644 --- a/var/spack/repos/builtin/packages/py-pythonqwt/package.py +++ b/var/spack/repos/builtin/packages/py-pythonqwt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pytz/package.py b/var/spack/repos/builtin/packages/py-pytz/package.py index 561872d041..e0c36eec15 100644 --- a/var/spack/repos/builtin/packages/py-pytz/package.py +++ b/var/spack/repos/builtin/packages/py-pytz/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pyutilib/package.py b/var/spack/repos/builtin/packages/py-pyutilib/package.py index 14e797151a..1064856eae 100644 --- a/var/spack/repos/builtin/packages/py-pyutilib/package.py +++ b/var/spack/repos/builtin/packages/py-pyutilib/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pyvcf/package.py b/var/spack/repos/builtin/packages/py-pyvcf/package.py index 3b8d3bfd45..3a7cb21263 100644 --- a/var/spack/repos/builtin/packages/py-pyvcf/package.py +++ b/var/spack/repos/builtin/packages/py-pyvcf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pywavelets/package.py b/var/spack/repos/builtin/packages/py-pywavelets/package.py index c542a23c1c..41de891f9a 100644 --- a/var/spack/repos/builtin/packages/py-pywavelets/package.py +++ b/var/spack/repos/builtin/packages/py-pywavelets/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-pyyaml/package.py b/var/spack/repos/builtin/packages/py-pyyaml/package.py index 05ac4d2ac5..60706df0fb 100644 --- a/var/spack/repos/builtin/packages/py-pyyaml/package.py +++ b/var/spack/repos/builtin/packages/py-pyyaml/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-qtawesome/package.py b/var/spack/repos/builtin/packages/py-qtawesome/package.py index b5c08a3c60..a3cd6645a3 100644 --- a/var/spack/repos/builtin/packages/py-qtawesome/package.py +++ b/var/spack/repos/builtin/packages/py-qtawesome/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-qtconsole/package.py b/var/spack/repos/builtin/packages/py-qtconsole/package.py index 2c19787cad..e136cd6834 100644 --- a/var/spack/repos/builtin/packages/py-qtconsole/package.py +++ b/var/spack/repos/builtin/packages/py-qtconsole/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-qtpy/package.py b/var/spack/repos/builtin/packages/py-qtpy/package.py index 020894d0e7..f90bcb566d 100644 --- a/var/spack/repos/builtin/packages/py-qtpy/package.py +++ b/var/spack/repos/builtin/packages/py-qtpy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-quantities/package.py b/var/spack/repos/builtin/packages/py-quantities/package.py index d75aced6f9..f7136e27bb 100644 --- a/var/spack/repos/builtin/packages/py-quantities/package.py +++ b/var/spack/repos/builtin/packages/py-quantities/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-quast/package.py b/var/spack/repos/builtin/packages/py-quast/package.py index e17c2f9061..03e96a8263 100644 --- a/var/spack/repos/builtin/packages/py-quast/package.py +++ b/var/spack/repos/builtin/packages/py-quast/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-radical-utils/package.py b/var/spack/repos/builtin/packages/py-radical-utils/package.py index 85a4832e3e..df1abb1f1a 100644 --- a/var/spack/repos/builtin/packages/py-radical-utils/package.py +++ b/var/spack/repos/builtin/packages/py-radical-utils/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-ranger/package.py b/var/spack/repos/builtin/packages/py-ranger/package.py index 19f20c6d33..2c297e91d2 100644 --- a/var/spack/repos/builtin/packages/py-ranger/package.py +++ b/var/spack/repos/builtin/packages/py-ranger/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-rasterio/package.py b/var/spack/repos/builtin/packages/py-rasterio/package.py index cc5fc8179a..c7df3bb153 100644 --- a/var/spack/repos/builtin/packages/py-rasterio/package.py +++ b/var/spack/repos/builtin/packages/py-rasterio/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-readme-renderer/package.py b/var/spack/repos/builtin/packages/py-readme-renderer/package.py index 20691a12ec..e6bf6ed2f4 100644 --- a/var/spack/repos/builtin/packages/py-readme-renderer/package.py +++ b/var/spack/repos/builtin/packages/py-readme-renderer/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-regex/package.py b/var/spack/repos/builtin/packages/py-regex/package.py index 14c40c50cc..b475995948 100644 --- a/var/spack/repos/builtin/packages/py-regex/package.py +++ b/var/spack/repos/builtin/packages/py-regex/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-reportlab/package.py b/var/spack/repos/builtin/packages/py-reportlab/package.py index 7d4ebe1b54..bb14dd5f9f 100644 --- a/var/spack/repos/builtin/packages/py-reportlab/package.py +++ b/var/spack/repos/builtin/packages/py-reportlab/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-requests/package.py b/var/spack/repos/builtin/packages/py-requests/package.py index f35d26ed89..814778823f 100644 --- a/var/spack/repos/builtin/packages/py-requests/package.py +++ b/var/spack/repos/builtin/packages/py-requests/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-restview/package.py b/var/spack/repos/builtin/packages/py-restview/package.py index bd63d64bf5..c3e8c87f85 100644 --- a/var/spack/repos/builtin/packages/py-restview/package.py +++ b/var/spack/repos/builtin/packages/py-restview/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-rope/package.py b/var/spack/repos/builtin/packages/py-rope/package.py index 5f0d27db23..fe1fa8ce37 100644 --- a/var/spack/repos/builtin/packages/py-rope/package.py +++ b/var/spack/repos/builtin/packages/py-rope/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-rpy2/package.py b/var/spack/repos/builtin/packages/py-rpy2/package.py index c607360f0a..ad7a9ecf01 100644 --- a/var/spack/repos/builtin/packages/py-rpy2/package.py +++ b/var/spack/repos/builtin/packages/py-rpy2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-rsa/package.py b/var/spack/repos/builtin/packages/py-rsa/package.py index 6cde68a33f..e0642fb528 100644 --- a/var/spack/repos/builtin/packages/py-rsa/package.py +++ b/var/spack/repos/builtin/packages/py-rsa/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-rseqc/package.py b/var/spack/repos/builtin/packages/py-rseqc/package.py index bfeac28577..2d5410c455 100644 --- a/var/spack/repos/builtin/packages/py-rseqc/package.py +++ b/var/spack/repos/builtin/packages/py-rseqc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-rtree/package.py b/var/spack/repos/builtin/packages/py-rtree/package.py index 70eb46575c..637afc9ce5 100644 --- a/var/spack/repos/builtin/packages/py-rtree/package.py +++ b/var/spack/repos/builtin/packages/py-rtree/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-saga-python/package.py b/var/spack/repos/builtin/packages/py-saga-python/package.py index 4eb83b1dc1..9b202497f5 100644 --- a/var/spack/repos/builtin/packages/py-saga-python/package.py +++ b/var/spack/repos/builtin/packages/py-saga-python/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-scandir/package.py b/var/spack/repos/builtin/packages/py-scandir/package.py index 81f9d6875f..ff52559368 100644 --- a/var/spack/repos/builtin/packages/py-scandir/package.py +++ b/var/spack/repos/builtin/packages/py-scandir/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-scientificpython/package.py b/var/spack/repos/builtin/packages/py-scientificpython/package.py index 45fedc825b..241214a032 100644 --- a/var/spack/repos/builtin/packages/py-scientificpython/package.py +++ b/var/spack/repos/builtin/packages/py-scientificpython/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-scikit-image/package.py b/var/spack/repos/builtin/packages/py-scikit-image/package.py index 7d0c0dceb2..4aa8525d45 100644 --- a/var/spack/repos/builtin/packages/py-scikit-image/package.py +++ b/var/spack/repos/builtin/packages/py-scikit-image/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-scikit-learn/package.py b/var/spack/repos/builtin/packages/py-scikit-learn/package.py index 81f5de2737..9df4f1ae5d 100644 --- a/var/spack/repos/builtin/packages/py-scikit-learn/package.py +++ b/var/spack/repos/builtin/packages/py-scikit-learn/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-scipy/package.py b/var/spack/repos/builtin/packages/py-scipy/package.py index ad828d18ed..a26df20d51 100644 --- a/var/spack/repos/builtin/packages/py-scipy/package.py +++ b/var/spack/repos/builtin/packages/py-scipy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-seaborn/package.py b/var/spack/repos/builtin/packages/py-seaborn/package.py index d0bd755343..6783e79a9f 100644 --- a/var/spack/repos/builtin/packages/py-seaborn/package.py +++ b/var/spack/repos/builtin/packages/py-seaborn/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-setuptools-git/package.py b/var/spack/repos/builtin/packages/py-setuptools-git/package.py index 232eb774f5..a072d02f47 100644 --- a/var/spack/repos/builtin/packages/py-setuptools-git/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools-git/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-setuptools-scm/package.py b/var/spack/repos/builtin/packages/py-setuptools-scm/package.py index b4b19e7d38..a1f2aa074f 100644 --- a/var/spack/repos/builtin/packages/py-setuptools-scm/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools-scm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-setuptools/package.py b/var/spack/repos/builtin/packages/py-setuptools/package.py index c6fb8b18d0..de9e3ef073 100644 --- a/var/spack/repos/builtin/packages/py-setuptools/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-sfepy/package.py b/var/spack/repos/builtin/packages/py-sfepy/package.py index 2f2732be55..48b9dd891d 100644 --- a/var/spack/repos/builtin/packages/py-sfepy/package.py +++ b/var/spack/repos/builtin/packages/py-sfepy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-sh/package.py b/var/spack/repos/builtin/packages/py-sh/package.py index 8dc74c0740..71a9d9fe64 100644 --- a/var/spack/repos/builtin/packages/py-sh/package.py +++ b/var/spack/repos/builtin/packages/py-sh/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-shiboken/package.py b/var/spack/repos/builtin/packages/py-shiboken/package.py index cf04385c62..f6d0630fb5 100644 --- a/var/spack/repos/builtin/packages/py-shiboken/package.py +++ b/var/spack/repos/builtin/packages/py-shiboken/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-simplegeneric/package.py b/var/spack/repos/builtin/packages/py-simplegeneric/package.py index a704436281..9ad021845a 100644 --- a/var/spack/repos/builtin/packages/py-simplegeneric/package.py +++ b/var/spack/repos/builtin/packages/py-simplegeneric/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-simplejson/package.py b/var/spack/repos/builtin/packages/py-simplejson/package.py index 6894d62044..95a73d6e94 100644 --- a/var/spack/repos/builtin/packages/py-simplejson/package.py +++ b/var/spack/repos/builtin/packages/py-simplejson/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-singledispatch/package.py b/var/spack/repos/builtin/packages/py-singledispatch/package.py index 6007fda635..bdbbc56525 100644 --- a/var/spack/repos/builtin/packages/py-singledispatch/package.py +++ b/var/spack/repos/builtin/packages/py-singledispatch/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-sip/package.py b/var/spack/repos/builtin/packages/py-sip/package.py index 4c4a5af463..643168cf2f 100644 --- a/var/spack/repos/builtin/packages/py-sip/package.py +++ b/var/spack/repos/builtin/packages/py-sip/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-six/package.py b/var/spack/repos/builtin/packages/py-six/package.py index 2fee459770..349ea5f4b5 100644 --- a/var/spack/repos/builtin/packages/py-six/package.py +++ b/var/spack/repos/builtin/packages/py-six/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-slepc4py/package.py b/var/spack/repos/builtin/packages/py-slepc4py/package.py index f9603abd9b..0ad7085eef 100644 --- a/var/spack/repos/builtin/packages/py-slepc4py/package.py +++ b/var/spack/repos/builtin/packages/py-slepc4py/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-sncosmo/package.py b/var/spack/repos/builtin/packages/py-sncosmo/package.py index 87c1f44fad..061ee3cdbf 100644 --- a/var/spack/repos/builtin/packages/py-sncosmo/package.py +++ b/var/spack/repos/builtin/packages/py-sncosmo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-snowballstemmer/package.py b/var/spack/repos/builtin/packages/py-snowballstemmer/package.py index 5122d4600a..79f8355702 100644 --- a/var/spack/repos/builtin/packages/py-snowballstemmer/package.py +++ b/var/spack/repos/builtin/packages/py-snowballstemmer/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-snuggs/package.py b/var/spack/repos/builtin/packages/py-snuggs/package.py index c489d830b7..69711908c8 100644 --- a/var/spack/repos/builtin/packages/py-snuggs/package.py +++ b/var/spack/repos/builtin/packages/py-snuggs/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-spectra/package.py b/var/spack/repos/builtin/packages/py-spectra/package.py index 9584b659f8..13593b435e 100644 --- a/var/spack/repos/builtin/packages/py-spectra/package.py +++ b/var/spack/repos/builtin/packages/py-spectra/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-spefile/package.py b/var/spack/repos/builtin/packages/py-spefile/package.py index dbb8937dc8..618e17c34d 100644 --- a/var/spack/repos/builtin/packages/py-spefile/package.py +++ b/var/spack/repos/builtin/packages/py-spefile/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-spglib/package.py b/var/spack/repos/builtin/packages/py-spglib/package.py index 604aa0faf2..7ea44c9b43 100644 --- a/var/spack/repos/builtin/packages/py-spglib/package.py +++ b/var/spack/repos/builtin/packages/py-spglib/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-sphinx-bootstrap-theme/package.py b/var/spack/repos/builtin/packages/py-sphinx-bootstrap-theme/package.py index faaa9811df..5a1c0fc748 100644 --- a/var/spack/repos/builtin/packages/py-sphinx-bootstrap-theme/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx-bootstrap-theme/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-sphinx-rtd-theme/package.py b/var/spack/repos/builtin/packages/py-sphinx-rtd-theme/package.py index bd922fadf7..e0bdf96d32 100644 --- a/var/spack/repos/builtin/packages/py-sphinx-rtd-theme/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx-rtd-theme/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-sphinx/package.py b/var/spack/repos/builtin/packages/py-sphinx/package.py index d99ee12f0e..801653b1a0 100644 --- a/var/spack/repos/builtin/packages/py-sphinx/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-bibtex/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-bibtex/package.py index e643a8d933..91f242a24c 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-bibtex/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-bibtex/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-programoutput/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-programoutput/package.py index d9dbafb3e3..23ffd12ebc 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-programoutput/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-programoutput/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-websupport/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-websupport/package.py index b75f894c1d..49c1b26143 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-websupport/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-websupport/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-spyder/package.py b/var/spack/repos/builtin/packages/py-spyder/package.py index 58bc3f9fce..6a3d8b3ccd 100644 --- a/var/spack/repos/builtin/packages/py-spyder/package.py +++ b/var/spack/repos/builtin/packages/py-spyder/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-spykeutils/package.py b/var/spack/repos/builtin/packages/py-spykeutils/package.py index cdccc3be67..830d84e0a6 100644 --- a/var/spack/repos/builtin/packages/py-spykeutils/package.py +++ b/var/spack/repos/builtin/packages/py-spykeutils/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-sqlalchemy/package.py b/var/spack/repos/builtin/packages/py-sqlalchemy/package.py index 8f60538c77..ed70309a1a 100644 --- a/var/spack/repos/builtin/packages/py-sqlalchemy/package.py +++ b/var/spack/repos/builtin/packages/py-sqlalchemy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-statsmodels/package.py b/var/spack/repos/builtin/packages/py-statsmodels/package.py index 641dc197af..c4d73ad91d 100644 --- a/var/spack/repos/builtin/packages/py-statsmodels/package.py +++ b/var/spack/repos/builtin/packages/py-statsmodels/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-stevedore/package.py b/var/spack/repos/builtin/packages/py-stevedore/package.py index 1ca49d7df3..05640c31f8 100644 --- a/var/spack/repos/builtin/packages/py-stevedore/package.py +++ b/var/spack/repos/builtin/packages/py-stevedore/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-storm/package.py b/var/spack/repos/builtin/packages/py-storm/package.py index 8552413694..a893b4efdc 100644 --- a/var/spack/repos/builtin/packages/py-storm/package.py +++ b/var/spack/repos/builtin/packages/py-storm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-subprocess32/package.py b/var/spack/repos/builtin/packages/py-subprocess32/package.py index 66c6e3b86d..22ff245f73 100644 --- a/var/spack/repos/builtin/packages/py-subprocess32/package.py +++ b/var/spack/repos/builtin/packages/py-subprocess32/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-symengine/package.py b/var/spack/repos/builtin/packages/py-symengine/package.py index 6de1c159c3..86625127fa 100644 --- a/var/spack/repos/builtin/packages/py-symengine/package.py +++ b/var/spack/repos/builtin/packages/py-symengine/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-symfit/package.py b/var/spack/repos/builtin/packages/py-symfit/package.py index 6ecf2ebee6..df39927ccc 100644 --- a/var/spack/repos/builtin/packages/py-symfit/package.py +++ b/var/spack/repos/builtin/packages/py-symfit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-sympy/package.py b/var/spack/repos/builtin/packages/py-sympy/package.py index 2a6758bbf6..b921431099 100644 --- a/var/spack/repos/builtin/packages/py-sympy/package.py +++ b/var/spack/repos/builtin/packages/py-sympy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-tabulate/package.py b/var/spack/repos/builtin/packages/py-tabulate/package.py index 7083d69506..fe3466d7b6 100644 --- a/var/spack/repos/builtin/packages/py-tabulate/package.py +++ b/var/spack/repos/builtin/packages/py-tabulate/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-tappy/package.py b/var/spack/repos/builtin/packages/py-tappy/package.py index 3600e56fc8..ee495cc78f 100644 --- a/var/spack/repos/builtin/packages/py-tappy/package.py +++ b/var/spack/repos/builtin/packages/py-tappy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-terminado/package.py b/var/spack/repos/builtin/packages/py-terminado/package.py index 0cf4e582f2..9962f4190b 100644 --- a/var/spack/repos/builtin/packages/py-terminado/package.py +++ b/var/spack/repos/builtin/packages/py-terminado/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-tetoolkit/package.py b/var/spack/repos/builtin/packages/py-tetoolkit/package.py index 3467489182..e242ae52df 100644 --- a/var/spack/repos/builtin/packages/py-tetoolkit/package.py +++ b/var/spack/repos/builtin/packages/py-tetoolkit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-theano/package.py b/var/spack/repos/builtin/packages/py-theano/package.py index 4acceaa7a5..3648ce687f 100644 --- a/var/spack/repos/builtin/packages/py-theano/package.py +++ b/var/spack/repos/builtin/packages/py-theano/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-tifffile/package.py b/var/spack/repos/builtin/packages/py-tifffile/package.py index b0dfb7ed1d..740f94170e 100644 --- a/var/spack/repos/builtin/packages/py-tifffile/package.py +++ b/var/spack/repos/builtin/packages/py-tifffile/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-toml/package.py b/var/spack/repos/builtin/packages/py-toml/package.py index 50e2bde91d..e006681bd5 100644 --- a/var/spack/repos/builtin/packages/py-toml/package.py +++ b/var/spack/repos/builtin/packages/py-toml/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-tomopy/package.py b/var/spack/repos/builtin/packages/py-tomopy/package.py index acba1ddcac..bafa041a8d 100644 --- a/var/spack/repos/builtin/packages/py-tomopy/package.py +++ b/var/spack/repos/builtin/packages/py-tomopy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-tornado/package.py b/var/spack/repos/builtin/packages/py-tornado/package.py index ce1c88a2bb..5d11e28877 100644 --- a/var/spack/repos/builtin/packages/py-tornado/package.py +++ b/var/spack/repos/builtin/packages/py-tornado/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-tqdm/package.py b/var/spack/repos/builtin/packages/py-tqdm/package.py index 1d1b2486c3..00ec4c4946 100644 --- a/var/spack/repos/builtin/packages/py-tqdm/package.py +++ b/var/spack/repos/builtin/packages/py-tqdm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-traceback2/package.py b/var/spack/repos/builtin/packages/py-traceback2/package.py index ff897cbeb7..1b8394614c 100644 --- a/var/spack/repos/builtin/packages/py-traceback2/package.py +++ b/var/spack/repos/builtin/packages/py-traceback2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-traitlets/package.py b/var/spack/repos/builtin/packages/py-traitlets/package.py index db90d28a66..be45542a25 100644 --- a/var/spack/repos/builtin/packages/py-traitlets/package.py +++ b/var/spack/repos/builtin/packages/py-traitlets/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-tuiview/package.py b/var/spack/repos/builtin/packages/py-tuiview/package.py index 1223666d90..76cfc9bd8d 100644 --- a/var/spack/repos/builtin/packages/py-tuiview/package.py +++ b/var/spack/repos/builtin/packages/py-tuiview/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-twisted/package.py b/var/spack/repos/builtin/packages/py-twisted/package.py index e596adec97..91a66c5a43 100644 --- a/var/spack/repos/builtin/packages/py-twisted/package.py +++ b/var/spack/repos/builtin/packages/py-twisted/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-typing/package.py b/var/spack/repos/builtin/packages/py-typing/package.py index 656eabe6f6..35a6f44216 100644 --- a/var/spack/repos/builtin/packages/py-typing/package.py +++ b/var/spack/repos/builtin/packages/py-typing/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-tzlocal/package.py b/var/spack/repos/builtin/packages/py-tzlocal/package.py index fad9c19f3b..758a0573e3 100644 --- a/var/spack/repos/builtin/packages/py-tzlocal/package.py +++ b/var/spack/repos/builtin/packages/py-tzlocal/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-umi-tools/package.py b/var/spack/repos/builtin/packages/py-umi-tools/package.py index 0d1a7f21c7..3c896cf261 100644 --- a/var/spack/repos/builtin/packages/py-umi-tools/package.py +++ b/var/spack/repos/builtin/packages/py-umi-tools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-unittest2/package.py b/var/spack/repos/builtin/packages/py-unittest2/package.py index 8aa4a3e705..0f0cc89512 100644 --- a/var/spack/repos/builtin/packages/py-unittest2/package.py +++ b/var/spack/repos/builtin/packages/py-unittest2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-unittest2py3k/package.py b/var/spack/repos/builtin/packages/py-unittest2py3k/package.py index 1c30595d97..6b114a7e85 100644 --- a/var/spack/repos/builtin/packages/py-unittest2py3k/package.py +++ b/var/spack/repos/builtin/packages/py-unittest2py3k/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-urllib3/package.py b/var/spack/repos/builtin/packages/py-urllib3/package.py index 000c6ef1e6..f43510c492 100644 --- a/var/spack/repos/builtin/packages/py-urllib3/package.py +++ b/var/spack/repos/builtin/packages/py-urllib3/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-urwid/package.py b/var/spack/repos/builtin/packages/py-urwid/package.py index 46895ac2ee..70021a68c8 100644 --- a/var/spack/repos/builtin/packages/py-urwid/package.py +++ b/var/spack/repos/builtin/packages/py-urwid/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-vcversioner/package.py b/var/spack/repos/builtin/packages/py-vcversioner/package.py index fa4e2565b8..b77108a52b 100644 --- a/var/spack/repos/builtin/packages/py-vcversioner/package.py +++ b/var/spack/repos/builtin/packages/py-vcversioner/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-virtualenv-clone/package.py b/var/spack/repos/builtin/packages/py-virtualenv-clone/package.py index 046518137a..9bdd320701 100644 --- a/var/spack/repos/builtin/packages/py-virtualenv-clone/package.py +++ b/var/spack/repos/builtin/packages/py-virtualenv-clone/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-virtualenv/package.py b/var/spack/repos/builtin/packages/py-virtualenv/package.py index a91117e616..bc9057307d 100644 --- a/var/spack/repos/builtin/packages/py-virtualenv/package.py +++ b/var/spack/repos/builtin/packages/py-virtualenv/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-virtualenvwrapper/package.py b/var/spack/repos/builtin/packages/py-virtualenvwrapper/package.py index 0f898aa040..ada01af35f 100644 --- a/var/spack/repos/builtin/packages/py-virtualenvwrapper/package.py +++ b/var/spack/repos/builtin/packages/py-virtualenvwrapper/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-vmd-python/package.py b/var/spack/repos/builtin/packages/py-vmd-python/package.py index 86c33b3fdd..65c59a1aaf 100644 --- a/var/spack/repos/builtin/packages/py-vmd-python/package.py +++ b/var/spack/repos/builtin/packages/py-vmd-python/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-wcsaxes/package.py b/var/spack/repos/builtin/packages/py-wcsaxes/package.py index 16fa376dc7..ed8c0c3f99 100644 --- a/var/spack/repos/builtin/packages/py-wcsaxes/package.py +++ b/var/spack/repos/builtin/packages/py-wcsaxes/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-wcwidth/package.py b/var/spack/repos/builtin/packages/py-wcwidth/package.py index ca4b7740b5..a3d9ba980b 100644 --- a/var/spack/repos/builtin/packages/py-wcwidth/package.py +++ b/var/spack/repos/builtin/packages/py-wcwidth/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-webkit-server/package.py b/var/spack/repos/builtin/packages/py-webkit-server/package.py index 66850b9682..7bf3ddde40 100644 --- a/var/spack/repos/builtin/packages/py-webkit-server/package.py +++ b/var/spack/repos/builtin/packages/py-webkit-server/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-werkzeug/package.py b/var/spack/repos/builtin/packages/py-werkzeug/package.py index 30573a7ff2..4ca81b762c 100644 --- a/var/spack/repos/builtin/packages/py-werkzeug/package.py +++ b/var/spack/repos/builtin/packages/py-werkzeug/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-wheel/package.py b/var/spack/repos/builtin/packages/py-wheel/package.py index f0a15f0886..e3464971eb 100644 --- a/var/spack/repos/builtin/packages/py-wheel/package.py +++ b/var/spack/repos/builtin/packages/py-wheel/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-widgetsnbextension/package.py b/var/spack/repos/builtin/packages/py-widgetsnbextension/package.py index 206f940b57..fbfc971abc 100644 --- a/var/spack/repos/builtin/packages/py-widgetsnbextension/package.py +++ b/var/spack/repos/builtin/packages/py-widgetsnbextension/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-wrapt/package.py b/var/spack/repos/builtin/packages/py-wrapt/package.py index 5b81eef2e1..44d1f19e3d 100644 --- a/var/spack/repos/builtin/packages/py-wrapt/package.py +++ b/var/spack/repos/builtin/packages/py-wrapt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-xarray/package.py b/var/spack/repos/builtin/packages/py-xarray/package.py index 27017a9227..a2a42c4dcd 100644 --- a/var/spack/repos/builtin/packages/py-xarray/package.py +++ b/var/spack/repos/builtin/packages/py-xarray/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-xattr/package.py b/var/spack/repos/builtin/packages/py-xattr/package.py index 0eb256b436..188e077811 100644 --- a/var/spack/repos/builtin/packages/py-xattr/package.py +++ b/var/spack/repos/builtin/packages/py-xattr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-xlrd/package.py b/var/spack/repos/builtin/packages/py-xlrd/package.py index 3fc22a7865..1a915d084e 100644 --- a/var/spack/repos/builtin/packages/py-xlrd/package.py +++ b/var/spack/repos/builtin/packages/py-xlrd/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-xlsxwriter/package.py b/var/spack/repos/builtin/packages/py-xlsxwriter/package.py index 97170d76d5..0922950951 100644 --- a/var/spack/repos/builtin/packages/py-xlsxwriter/package.py +++ b/var/spack/repos/builtin/packages/py-xlsxwriter/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-xmlrunner/package.py b/var/spack/repos/builtin/packages/py-xmlrunner/package.py index 104d6113c0..274962748f 100644 --- a/var/spack/repos/builtin/packages/py-xmlrunner/package.py +++ b/var/spack/repos/builtin/packages/py-xmlrunner/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-xopen/package.py b/var/spack/repos/builtin/packages/py-xopen/package.py index 4b6df42419..b380244f6c 100644 --- a/var/spack/repos/builtin/packages/py-xopen/package.py +++ b/var/spack/repos/builtin/packages/py-xopen/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-xpyb/package.py b/var/spack/repos/builtin/packages/py-xpyb/package.py index 60f69610c3..6d59a2a084 100644 --- a/var/spack/repos/builtin/packages/py-xpyb/package.py +++ b/var/spack/repos/builtin/packages/py-xpyb/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-xvfbwrapper/package.py b/var/spack/repos/builtin/packages/py-xvfbwrapper/package.py index 09c9f6da47..c4c93410cc 100644 --- a/var/spack/repos/builtin/packages/py-xvfbwrapper/package.py +++ b/var/spack/repos/builtin/packages/py-xvfbwrapper/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-yapf/package.py b/var/spack/repos/builtin/packages/py-yapf/package.py index 76121cf2d2..0ae6a0a424 100644 --- a/var/spack/repos/builtin/packages/py-yapf/package.py +++ b/var/spack/repos/builtin/packages/py-yapf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-yt/package.py b/var/spack/repos/builtin/packages/py-yt/package.py index 472acb8255..5f059c04b5 100644 --- a/var/spack/repos/builtin/packages/py-yt/package.py +++ b/var/spack/repos/builtin/packages/py-yt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/py-zmq/package.py b/var/spack/repos/builtin/packages/py-zmq/package.py index d5734d8a33..b6a7c7cd0c 100644 --- a/var/spack/repos/builtin/packages/py-zmq/package.py +++ b/var/spack/repos/builtin/packages/py-zmq/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index c045e50df4..87038810e7 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/qbank/package.py b/var/spack/repos/builtin/packages/qbank/package.py index b56be62bad..09357ad76c 100644 --- a/var/spack/repos/builtin/packages/qbank/package.py +++ b/var/spack/repos/builtin/packages/qbank/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/qbox/package.py b/var/spack/repos/builtin/packages/qbox/package.py index 7945370997..19d83773a8 100644 --- a/var/spack/repos/builtin/packages/qbox/package.py +++ b/var/spack/repos/builtin/packages/qbox/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/qhull/package.py b/var/spack/repos/builtin/packages/qhull/package.py index 3e3e033025..006b3284af 100644 --- a/var/spack/repos/builtin/packages/qhull/package.py +++ b/var/spack/repos/builtin/packages/qhull/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/qmcpack/package.py b/var/spack/repos/builtin/packages/qmcpack/package.py index fbb7e2636f..4a638f854a 100644 --- a/var/spack/repos/builtin/packages/qmcpack/package.py +++ b/var/spack/repos/builtin/packages/qmcpack/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/qrupdate/package.py b/var/spack/repos/builtin/packages/qrupdate/package.py index 3f655f5dbf..aaeb5565e1 100644 --- a/var/spack/repos/builtin/packages/qrupdate/package.py +++ b/var/spack/repos/builtin/packages/qrupdate/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/qt-creator/package.py b/var/spack/repos/builtin/packages/qt-creator/package.py index c7484f9643..2f1d15b219 100644 --- a/var/spack/repos/builtin/packages/qt-creator/package.py +++ b/var/spack/repos/builtin/packages/qt-creator/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index c345e693f1..a9ce442966 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/qtgraph/package.py b/var/spack/repos/builtin/packages/qtgraph/package.py index 742b51dd1f..30e0e40829 100644 --- a/var/spack/repos/builtin/packages/qtgraph/package.py +++ b/var/spack/repos/builtin/packages/qtgraph/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/qthreads/package.py b/var/spack/repos/builtin/packages/qthreads/package.py index b06e824681..e089f5546c 100644 --- a/var/spack/repos/builtin/packages/qthreads/package.py +++ b/var/spack/repos/builtin/packages/qthreads/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/qwt/package.py b/var/spack/repos/builtin/packages/qwt/package.py index cef42d73e1..3c30e26461 100644 --- a/var/spack/repos/builtin/packages/qwt/package.py +++ b/var/spack/repos/builtin/packages/qwt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-a4/package.py b/var/spack/repos/builtin/packages/r-a4/package.py index 248e0c41f8..312df82954 100644 --- a/var/spack/repos/builtin/packages/r-a4/package.py +++ b/var/spack/repos/builtin/packages/r-a4/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-a4base/package.py b/var/spack/repos/builtin/packages/r-a4base/package.py index bc18cae16d..3eaf8fa1cf 100644 --- a/var/spack/repos/builtin/packages/r-a4base/package.py +++ b/var/spack/repos/builtin/packages/r-a4base/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-a4classif/package.py b/var/spack/repos/builtin/packages/r-a4classif/package.py index 18a2e1b390..2f7d609d0c 100644 --- a/var/spack/repos/builtin/packages/r-a4classif/package.py +++ b/var/spack/repos/builtin/packages/r-a4classif/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-a4core/package.py b/var/spack/repos/builtin/packages/r-a4core/package.py index d01514d499..ab35a2f241 100644 --- a/var/spack/repos/builtin/packages/r-a4core/package.py +++ b/var/spack/repos/builtin/packages/r-a4core/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-a4preproc/package.py b/var/spack/repos/builtin/packages/r-a4preproc/package.py index 3410b0640b..a03ce0e524 100644 --- a/var/spack/repos/builtin/packages/r-a4preproc/package.py +++ b/var/spack/repos/builtin/packages/r-a4preproc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-a4reporting/package.py b/var/spack/repos/builtin/packages/r-a4reporting/package.py index 352d35b38a..091da1f5d1 100644 --- a/var/spack/repos/builtin/packages/r-a4reporting/package.py +++ b/var/spack/repos/builtin/packages/r-a4reporting/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-abadata/package.py b/var/spack/repos/builtin/packages/r-abadata/package.py index 0d92e3e540..c44c7110c8 100644 --- a/var/spack/repos/builtin/packages/r-abadata/package.py +++ b/var/spack/repos/builtin/packages/r-abadata/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-abaenrichment/package.py b/var/spack/repos/builtin/packages/r-abaenrichment/package.py index c3e903e248..50b2e64a69 100644 --- a/var/spack/repos/builtin/packages/r-abaenrichment/package.py +++ b/var/spack/repos/builtin/packages/r-abaenrichment/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-abind/package.py b/var/spack/repos/builtin/packages/r-abind/package.py index 768e930f4b..92859458bc 100644 --- a/var/spack/repos/builtin/packages/r-abind/package.py +++ b/var/spack/repos/builtin/packages/r-abind/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-absseq/package.py b/var/spack/repos/builtin/packages/r-absseq/package.py index e3a094c97c..72c825df6b 100644 --- a/var/spack/repos/builtin/packages/r-absseq/package.py +++ b/var/spack/repos/builtin/packages/r-absseq/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-acde/package.py b/var/spack/repos/builtin/packages/r-acde/package.py index fd8677d42e..22342d9790 100644 --- a/var/spack/repos/builtin/packages/r-acde/package.py +++ b/var/spack/repos/builtin/packages/r-acde/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-acepack/package.py b/var/spack/repos/builtin/packages/r-acepack/package.py index be5d20f6ad..787cfc3bc1 100644 --- a/var/spack/repos/builtin/packages/r-acepack/package.py +++ b/var/spack/repos/builtin/packages/r-acepack/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-acgh/package.py b/var/spack/repos/builtin/packages/r-acgh/package.py index f2e923ca3e..ee941c33d2 100644 --- a/var/spack/repos/builtin/packages/r-acgh/package.py +++ b/var/spack/repos/builtin/packages/r-acgh/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-acme/package.py b/var/spack/repos/builtin/packages/r-acme/package.py index 168f2044d5..d815249e48 100644 --- a/var/spack/repos/builtin/packages/r-acme/package.py +++ b/var/spack/repos/builtin/packages/r-acme/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-ada/package.py b/var/spack/repos/builtin/packages/r-ada/package.py index fbd4c0f167..c17af7f7e5 100644 --- a/var/spack/repos/builtin/packages/r-ada/package.py +++ b/var/spack/repos/builtin/packages/r-ada/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-adabag/package.py b/var/spack/repos/builtin/packages/r-adabag/package.py index 407d0ad1ab..265a2e835c 100644 --- a/var/spack/repos/builtin/packages/r-adabag/package.py +++ b/var/spack/repos/builtin/packages/r-adabag/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-ade4/package.py b/var/spack/repos/builtin/packages/r-ade4/package.py index 39b21c3373..60bae43832 100644 --- a/var/spack/repos/builtin/packages/r-ade4/package.py +++ b/var/spack/repos/builtin/packages/r-ade4/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-adegenet/package.py b/var/spack/repos/builtin/packages/r-adegenet/package.py index 64c475bc1f..de4b358cfb 100644 --- a/var/spack/repos/builtin/packages/r-adegenet/package.py +++ b/var/spack/repos/builtin/packages/r-adegenet/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-adsplit/package.py b/var/spack/repos/builtin/packages/r-adsplit/package.py index f862b1e581..4405026fd2 100644 --- a/var/spack/repos/builtin/packages/r-adsplit/package.py +++ b/var/spack/repos/builtin/packages/r-adsplit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-affxparser/package.py b/var/spack/repos/builtin/packages/r-affxparser/package.py index 1fd1dc5e85..fc36c42cfa 100644 --- a/var/spack/repos/builtin/packages/r-affxparser/package.py +++ b/var/spack/repos/builtin/packages/r-affxparser/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-affy/package.py b/var/spack/repos/builtin/packages/r-affy/package.py index 6be405c38b..5b169f8175 100644 --- a/var/spack/repos/builtin/packages/r-affy/package.py +++ b/var/spack/repos/builtin/packages/r-affy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-affycomp/package.py b/var/spack/repos/builtin/packages/r-affycomp/package.py index 16593472ad..8d023f346e 100644 --- a/var/spack/repos/builtin/packages/r-affycomp/package.py +++ b/var/spack/repos/builtin/packages/r-affycomp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-affycompatible/package.py b/var/spack/repos/builtin/packages/r-affycompatible/package.py index 68f6f5c450..f0eea26606 100644 --- a/var/spack/repos/builtin/packages/r-affycompatible/package.py +++ b/var/spack/repos/builtin/packages/r-affycompatible/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-affycontam/package.py b/var/spack/repos/builtin/packages/r-affycontam/package.py index c2c08be3d6..1c39f1f357 100644 --- a/var/spack/repos/builtin/packages/r-affycontam/package.py +++ b/var/spack/repos/builtin/packages/r-affycontam/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-affycoretools/package.py b/var/spack/repos/builtin/packages/r-affycoretools/package.py index 303b7255f8..1e838948b3 100644 --- a/var/spack/repos/builtin/packages/r-affycoretools/package.py +++ b/var/spack/repos/builtin/packages/r-affycoretools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-affydata/package.py b/var/spack/repos/builtin/packages/r-affydata/package.py index 9fa647f282..194f90cd08 100644 --- a/var/spack/repos/builtin/packages/r-affydata/package.py +++ b/var/spack/repos/builtin/packages/r-affydata/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-affyexpress/package.py b/var/spack/repos/builtin/packages/r-affyexpress/package.py index 0e3a8f19d7..e5e591eb91 100644 --- a/var/spack/repos/builtin/packages/r-affyexpress/package.py +++ b/var/spack/repos/builtin/packages/r-affyexpress/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-affyilm/package.py b/var/spack/repos/builtin/packages/r-affyilm/package.py index 7b854bc262..946785eb6f 100644 --- a/var/spack/repos/builtin/packages/r-affyilm/package.py +++ b/var/spack/repos/builtin/packages/r-affyilm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-affyio/package.py b/var/spack/repos/builtin/packages/r-affyio/package.py index ed1f9ff265..5e3d66dbfb 100644 --- a/var/spack/repos/builtin/packages/r-affyio/package.py +++ b/var/spack/repos/builtin/packages/r-affyio/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-affypdnn/package.py b/var/spack/repos/builtin/packages/r-affypdnn/package.py index 6fa1136468..24442119f6 100644 --- a/var/spack/repos/builtin/packages/r-affypdnn/package.py +++ b/var/spack/repos/builtin/packages/r-affypdnn/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-affyplm/package.py b/var/spack/repos/builtin/packages/r-affyplm/package.py index f73b7ca19f..57f7c1ba44 100644 --- a/var/spack/repos/builtin/packages/r-affyplm/package.py +++ b/var/spack/repos/builtin/packages/r-affyplm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-affyqcreport/package.py b/var/spack/repos/builtin/packages/r-affyqcreport/package.py index a7b9f2aa3c..8b87830561 100644 --- a/var/spack/repos/builtin/packages/r-affyqcreport/package.py +++ b/var/spack/repos/builtin/packages/r-affyqcreport/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-affyrnadegradation/package.py b/var/spack/repos/builtin/packages/r-affyrnadegradation/package.py index 0a5d5f315c..d05f8965c6 100644 --- a/var/spack/repos/builtin/packages/r-affyrnadegradation/package.py +++ b/var/spack/repos/builtin/packages/r-affyrnadegradation/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-agdex/package.py b/var/spack/repos/builtin/packages/r-agdex/package.py index 8abec46a01..64a9a4f229 100644 --- a/var/spack/repos/builtin/packages/r-agdex/package.py +++ b/var/spack/repos/builtin/packages/r-agdex/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-agilp/package.py b/var/spack/repos/builtin/packages/r-agilp/package.py index 15aba2cdce..e4ab94f979 100644 --- a/var/spack/repos/builtin/packages/r-agilp/package.py +++ b/var/spack/repos/builtin/packages/r-agilp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-agimicrorna/package.py b/var/spack/repos/builtin/packages/r-agimicrorna/package.py index b672f784bc..e5b17dc0ef 100644 --- a/var/spack/repos/builtin/packages/r-agimicrorna/package.py +++ b/var/spack/repos/builtin/packages/r-agimicrorna/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-aims/package.py b/var/spack/repos/builtin/packages/r-aims/package.py index 4a724804ae..fc7883f7f7 100644 --- a/var/spack/repos/builtin/packages/r-aims/package.py +++ b/var/spack/repos/builtin/packages/r-aims/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-aldex2/package.py b/var/spack/repos/builtin/packages/r-aldex2/package.py index ab046f82ec..80a9fd07ba 100644 --- a/var/spack/repos/builtin/packages/r-aldex2/package.py +++ b/var/spack/repos/builtin/packages/r-aldex2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-allelicimbalance/package.py b/var/spack/repos/builtin/packages/r-allelicimbalance/package.py index f7e95e519c..961c07a0c8 100644 --- a/var/spack/repos/builtin/packages/r-allelicimbalance/package.py +++ b/var/spack/repos/builtin/packages/r-allelicimbalance/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-alpine/package.py b/var/spack/repos/builtin/packages/r-alpine/package.py index 9d28ec66e7..100008c502 100644 --- a/var/spack/repos/builtin/packages/r-alpine/package.py +++ b/var/spack/repos/builtin/packages/r-alpine/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-als/package.py b/var/spack/repos/builtin/packages/r-als/package.py index 12f1905614..3198ebc44f 100644 --- a/var/spack/repos/builtin/packages/r-als/package.py +++ b/var/spack/repos/builtin/packages/r-als/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-alsace/package.py b/var/spack/repos/builtin/packages/r-alsace/package.py index 0573dde123..aebffee9ac 100644 --- a/var/spack/repos/builtin/packages/r-alsace/package.py +++ b/var/spack/repos/builtin/packages/r-alsace/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-altcdfenvs/package.py b/var/spack/repos/builtin/packages/r-altcdfenvs/package.py index 8f9770d68a..78d661cce6 100644 --- a/var/spack/repos/builtin/packages/r-altcdfenvs/package.py +++ b/var/spack/repos/builtin/packages/r-altcdfenvs/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-ampliqueso/package.py b/var/spack/repos/builtin/packages/r-ampliqueso/package.py index a703caf19e..d6f5b6899f 100644 --- a/var/spack/repos/builtin/packages/r-ampliqueso/package.py +++ b/var/spack/repos/builtin/packages/r-ampliqueso/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-analysispageserver/package.py b/var/spack/repos/builtin/packages/r-analysispageserver/package.py index 4245dbed56..401cc4cedb 100644 --- a/var/spack/repos/builtin/packages/r-analysispageserver/package.py +++ b/var/spack/repos/builtin/packages/r-analysispageserver/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-anaquin/package.py b/var/spack/repos/builtin/packages/r-anaquin/package.py index 678084df09..21938a4ea3 100644 --- a/var/spack/repos/builtin/packages/r-anaquin/package.py +++ b/var/spack/repos/builtin/packages/r-anaquin/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-aneufinder/package.py b/var/spack/repos/builtin/packages/r-aneufinder/package.py index 6be07235a1..9113851ff8 100644 --- a/var/spack/repos/builtin/packages/r-aneufinder/package.py +++ b/var/spack/repos/builtin/packages/r-aneufinder/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-aneufinderdata/package.py b/var/spack/repos/builtin/packages/r-aneufinderdata/package.py index a61e7cd4cd..7482c6c83a 100644 --- a/var/spack/repos/builtin/packages/r-aneufinderdata/package.py +++ b/var/spack/repos/builtin/packages/r-aneufinderdata/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-annaffy/package.py b/var/spack/repos/builtin/packages/r-annaffy/package.py index f4bfd87d3e..4769d335c5 100644 --- a/var/spack/repos/builtin/packages/r-annaffy/package.py +++ b/var/spack/repos/builtin/packages/r-annaffy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-annotate/package.py b/var/spack/repos/builtin/packages/r-annotate/package.py index 7c49849f01..dc07740c87 100644 --- a/var/spack/repos/builtin/packages/r-annotate/package.py +++ b/var/spack/repos/builtin/packages/r-annotate/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-annotationdbi/package.py b/var/spack/repos/builtin/packages/r-annotationdbi/package.py index 2b55b95a63..da5b9d3186 100644 --- a/var/spack/repos/builtin/packages/r-annotationdbi/package.py +++ b/var/spack/repos/builtin/packages/r-annotationdbi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-annotationfilter/package.py b/var/spack/repos/builtin/packages/r-annotationfilter/package.py index ff82f8a3c0..072c43ab0d 100644 --- a/var/spack/repos/builtin/packages/r-annotationfilter/package.py +++ b/var/spack/repos/builtin/packages/r-annotationfilter/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-annotationforge/package.py b/var/spack/repos/builtin/packages/r-annotationforge/package.py index 57a69306c3..12555c1138 100644 --- a/var/spack/repos/builtin/packages/r-annotationforge/package.py +++ b/var/spack/repos/builtin/packages/r-annotationforge/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-annotationhub/package.py b/var/spack/repos/builtin/packages/r-annotationhub/package.py index ccda18a203..e4a42dce9e 100644 --- a/var/spack/repos/builtin/packages/r-annotationhub/package.py +++ b/var/spack/repos/builtin/packages/r-annotationhub/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-ape/package.py b/var/spack/repos/builtin/packages/r-ape/package.py index bb225a501a..dc9664c9f9 100644 --- a/var/spack/repos/builtin/packages/r-ape/package.py +++ b/var/spack/repos/builtin/packages/r-ape/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-assertthat/package.py b/var/spack/repos/builtin/packages/r-assertthat/package.py index 37e0424d1a..61655cf630 100644 --- a/var/spack/repos/builtin/packages/r-assertthat/package.py +++ b/var/spack/repos/builtin/packages/r-assertthat/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-backports/package.py b/var/spack/repos/builtin/packages/r-backports/package.py index 02c0c6fc1b..8eee7cdbbc 100644 --- a/var/spack/repos/builtin/packages/r-backports/package.py +++ b/var/spack/repos/builtin/packages/r-backports/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-bamsignals/package.py b/var/spack/repos/builtin/packages/r-bamsignals/package.py index 29a7fda80d..abc3b50d96 100644 --- a/var/spack/repos/builtin/packages/r-bamsignals/package.py +++ b/var/spack/repos/builtin/packages/r-bamsignals/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-base64/package.py b/var/spack/repos/builtin/packages/r-base64/package.py index 6a693e12a7..8b889fa427 100644 --- a/var/spack/repos/builtin/packages/r-base64/package.py +++ b/var/spack/repos/builtin/packages/r-base64/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-base64enc/package.py b/var/spack/repos/builtin/packages/r-base64enc/package.py index 3566baab7a..4b895fc1e5 100644 --- a/var/spack/repos/builtin/packages/r-base64enc/package.py +++ b/var/spack/repos/builtin/packages/r-base64enc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-beanplot/package.py b/var/spack/repos/builtin/packages/r-beanplot/package.py index 3ddb95f59e..99f2a26062 100644 --- a/var/spack/repos/builtin/packages/r-beanplot/package.py +++ b/var/spack/repos/builtin/packages/r-beanplot/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-bh/package.py b/var/spack/repos/builtin/packages/r-bh/package.py index bcf4f600a6..cb1192d7e4 100644 --- a/var/spack/repos/builtin/packages/r-bh/package.py +++ b/var/spack/repos/builtin/packages/r-bh/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-bindr/package.py b/var/spack/repos/builtin/packages/r-bindr/package.py index c3a9dec9df..36dc37655c 100644 --- a/var/spack/repos/builtin/packages/r-bindr/package.py +++ b/var/spack/repos/builtin/packages/r-bindr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-bindrcpp/package.py b/var/spack/repos/builtin/packages/r-bindrcpp/package.py index ab355b70e8..6b850006cb 100644 --- a/var/spack/repos/builtin/packages/r-bindrcpp/package.py +++ b/var/spack/repos/builtin/packages/r-bindrcpp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-biobase/package.py b/var/spack/repos/builtin/packages/r-biobase/package.py index 035d0ddcad..4dcdb6adcb 100644 --- a/var/spack/repos/builtin/packages/r-biobase/package.py +++ b/var/spack/repos/builtin/packages/r-biobase/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-biocgenerics/package.py b/var/spack/repos/builtin/packages/r-biocgenerics/package.py index 2d101b09e1..21b075e460 100644 --- a/var/spack/repos/builtin/packages/r-biocgenerics/package.py +++ b/var/spack/repos/builtin/packages/r-biocgenerics/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-biocinstaller/package.py b/var/spack/repos/builtin/packages/r-biocinstaller/package.py index b2248f87ac..afc83961e6 100644 --- a/var/spack/repos/builtin/packages/r-biocinstaller/package.py +++ b/var/spack/repos/builtin/packages/r-biocinstaller/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-biocparallel/package.py b/var/spack/repos/builtin/packages/r-biocparallel/package.py index 769c8b9b16..cb2ac2e9a6 100644 --- a/var/spack/repos/builtin/packages/r-biocparallel/package.py +++ b/var/spack/repos/builtin/packages/r-biocparallel/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-biocstyle/package.py b/var/spack/repos/builtin/packages/r-biocstyle/package.py index 43700bb717..51c02c7615 100644 --- a/var/spack/repos/builtin/packages/r-biocstyle/package.py +++ b/var/spack/repos/builtin/packages/r-biocstyle/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-biomart/package.py b/var/spack/repos/builtin/packages/r-biomart/package.py index d9c15151bd..db5dabcd10 100644 --- a/var/spack/repos/builtin/packages/r-biomart/package.py +++ b/var/spack/repos/builtin/packages/r-biomart/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-biomformat/package.py b/var/spack/repos/builtin/packages/r-biomformat/package.py index fe290c1fd9..545a61e582 100644 --- a/var/spack/repos/builtin/packages/r-biomformat/package.py +++ b/var/spack/repos/builtin/packages/r-biomformat/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-biostrings/package.py b/var/spack/repos/builtin/packages/r-biostrings/package.py index fee137c11b..f28424421c 100644 --- a/var/spack/repos/builtin/packages/r-biostrings/package.py +++ b/var/spack/repos/builtin/packages/r-biostrings/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-biovizbase/package.py b/var/spack/repos/builtin/packages/r-biovizbase/package.py index ee87f87625..239bb12164 100644 --- a/var/spack/repos/builtin/packages/r-biovizbase/package.py +++ b/var/spack/repos/builtin/packages/r-biovizbase/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-bit/package.py b/var/spack/repos/builtin/packages/r-bit/package.py index aed6d724a6..e4e85cdfeb 100644 --- a/var/spack/repos/builtin/packages/r-bit/package.py +++ b/var/spack/repos/builtin/packages/r-bit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-bit64/package.py b/var/spack/repos/builtin/packages/r-bit64/package.py index 85c631e1ba..0b2e1ed795 100644 --- a/var/spack/repos/builtin/packages/r-bit64/package.py +++ b/var/spack/repos/builtin/packages/r-bit64/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-bitops/package.py b/var/spack/repos/builtin/packages/r-bitops/package.py index ec0b45f454..a64a0a9f8b 100644 --- a/var/spack/repos/builtin/packages/r-bitops/package.py +++ b/var/spack/repos/builtin/packages/r-bitops/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-blob/package.py b/var/spack/repos/builtin/packages/r-blob/package.py index b77399f775..80fc377322 100644 --- a/var/spack/repos/builtin/packages/r-blob/package.py +++ b/var/spack/repos/builtin/packages/r-blob/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-bookdown/package.py b/var/spack/repos/builtin/packages/r-bookdown/package.py index c722c9ffac..146b4dbfc8 100644 --- a/var/spack/repos/builtin/packages/r-bookdown/package.py +++ b/var/spack/repos/builtin/packages/r-bookdown/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-boot/package.py b/var/spack/repos/builtin/packages/r-boot/package.py index 2e2802893d..127c5ba7e4 100644 --- a/var/spack/repos/builtin/packages/r-boot/package.py +++ b/var/spack/repos/builtin/packages/r-boot/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-brew/package.py b/var/spack/repos/builtin/packages/r-brew/package.py index e3cf99a095..881ebafe7b 100644 --- a/var/spack/repos/builtin/packages/r-brew/package.py +++ b/var/spack/repos/builtin/packages/r-brew/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-broom/package.py b/var/spack/repos/builtin/packages/r-broom/package.py index 4ca426a3ab..f9ab50902f 100644 --- a/var/spack/repos/builtin/packages/r-broom/package.py +++ b/var/spack/repos/builtin/packages/r-broom/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-bsgenome/package.py b/var/spack/repos/builtin/packages/r-bsgenome/package.py index 3758992266..406a45ad8c 100644 --- a/var/spack/repos/builtin/packages/r-bsgenome/package.py +++ b/var/spack/repos/builtin/packages/r-bsgenome/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-bumphunter/package.py b/var/spack/repos/builtin/packages/r-bumphunter/package.py index bc36a53485..36b2797233 100644 --- a/var/spack/repos/builtin/packages/r-bumphunter/package.py +++ b/var/spack/repos/builtin/packages/r-bumphunter/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-c50/package.py b/var/spack/repos/builtin/packages/r-c50/package.py index e5ee2d285a..5f01837e98 100644 --- a/var/spack/repos/builtin/packages/r-c50/package.py +++ b/var/spack/repos/builtin/packages/r-c50/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-callr/package.py b/var/spack/repos/builtin/packages/r-callr/package.py index f69ed861ce..6c406c9872 100644 --- a/var/spack/repos/builtin/packages/r-callr/package.py +++ b/var/spack/repos/builtin/packages/r-callr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-car/package.py b/var/spack/repos/builtin/packages/r-car/package.py index aa5a776e37..effeeb6a91 100644 --- a/var/spack/repos/builtin/packages/r-car/package.py +++ b/var/spack/repos/builtin/packages/r-car/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-caret/package.py b/var/spack/repos/builtin/packages/r-caret/package.py index 89dcc691ea..af332cde36 100644 --- a/var/spack/repos/builtin/packages/r-caret/package.py +++ b/var/spack/repos/builtin/packages/r-caret/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-category/package.py b/var/spack/repos/builtin/packages/r-category/package.py index 026f0c5987..42f08d3fa6 100644 --- a/var/spack/repos/builtin/packages/r-category/package.py +++ b/var/spack/repos/builtin/packages/r-category/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-catools/package.py b/var/spack/repos/builtin/packages/r-catools/package.py index 2253b1e0ec..6573e2d41b 100644 --- a/var/spack/repos/builtin/packages/r-catools/package.py +++ b/var/spack/repos/builtin/packages/r-catools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-cellranger/package.py b/var/spack/repos/builtin/packages/r-cellranger/package.py index 5b57c221f9..c726715269 100644 --- a/var/spack/repos/builtin/packages/r-cellranger/package.py +++ b/var/spack/repos/builtin/packages/r-cellranger/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-checkmate/package.py b/var/spack/repos/builtin/packages/r-checkmate/package.py index 278937335a..d90b411189 100644 --- a/var/spack/repos/builtin/packages/r-checkmate/package.py +++ b/var/spack/repos/builtin/packages/r-checkmate/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-checkpoint/package.py b/var/spack/repos/builtin/packages/r-checkpoint/package.py index 6d3d9cc830..b9a175a358 100644 --- a/var/spack/repos/builtin/packages/r-checkpoint/package.py +++ b/var/spack/repos/builtin/packages/r-checkpoint/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-chemometrics/package.py b/var/spack/repos/builtin/packages/r-chemometrics/package.py index 6ddbe5e44d..22b16081dd 100644 --- a/var/spack/repos/builtin/packages/r-chemometrics/package.py +++ b/var/spack/repos/builtin/packages/r-chemometrics/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-chron/package.py b/var/spack/repos/builtin/packages/r-chron/package.py index 0a2566c0b1..5324a4492a 100644 --- a/var/spack/repos/builtin/packages/r-chron/package.py +++ b/var/spack/repos/builtin/packages/r-chron/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-circlize/package.py b/var/spack/repos/builtin/packages/r-circlize/package.py index 628c042d7d..b326c2226d 100644 --- a/var/spack/repos/builtin/packages/r-circlize/package.py +++ b/var/spack/repos/builtin/packages/r-circlize/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-class/package.py b/var/spack/repos/builtin/packages/r-class/package.py index 3b35634302..97816493a6 100644 --- a/var/spack/repos/builtin/packages/r-class/package.py +++ b/var/spack/repos/builtin/packages/r-class/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-classint/package.py b/var/spack/repos/builtin/packages/r-classint/package.py index 472579e65e..5eaa652928 100644 --- a/var/spack/repos/builtin/packages/r-classint/package.py +++ b/var/spack/repos/builtin/packages/r-classint/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-cli/package.py b/var/spack/repos/builtin/packages/r-cli/package.py index 657b910147..2a4f61af92 100644 --- a/var/spack/repos/builtin/packages/r-cli/package.py +++ b/var/spack/repos/builtin/packages/r-cli/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-clipr/package.py b/var/spack/repos/builtin/packages/r-clipr/package.py index a5b6ce9993..6689f8b31b 100644 --- a/var/spack/repos/builtin/packages/r-clipr/package.py +++ b/var/spack/repos/builtin/packages/r-clipr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-cluster/package.py b/var/spack/repos/builtin/packages/r-cluster/package.py index e59a486434..64fec7b0dd 100644 --- a/var/spack/repos/builtin/packages/r-cluster/package.py +++ b/var/spack/repos/builtin/packages/r-cluster/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-clusterprofiler/package.py b/var/spack/repos/builtin/packages/r-clusterprofiler/package.py index a0e40e65e1..558dbfeefc 100644 --- a/var/spack/repos/builtin/packages/r-clusterprofiler/package.py +++ b/var/spack/repos/builtin/packages/r-clusterprofiler/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-cner/package.py b/var/spack/repos/builtin/packages/r-cner/package.py index 8b920b11e1..9ba532db40 100644 --- a/var/spack/repos/builtin/packages/r-cner/package.py +++ b/var/spack/repos/builtin/packages/r-cner/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-coda/package.py b/var/spack/repos/builtin/packages/r-coda/package.py index 82c1887a32..7727074e46 100644 --- a/var/spack/repos/builtin/packages/r-coda/package.py +++ b/var/spack/repos/builtin/packages/r-coda/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-codetools/package.py b/var/spack/repos/builtin/packages/r-codetools/package.py index ce78dd590b..24dad4250d 100644 --- a/var/spack/repos/builtin/packages/r-codetools/package.py +++ b/var/spack/repos/builtin/packages/r-codetools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-coin/package.py b/var/spack/repos/builtin/packages/r-coin/package.py index 8c7a3a348e..2852e4970d 100644 --- a/var/spack/repos/builtin/packages/r-coin/package.py +++ b/var/spack/repos/builtin/packages/r-coin/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-colorspace/package.py b/var/spack/repos/builtin/packages/r-colorspace/package.py index 70e3ea63a7..dba4ffee5d 100644 --- a/var/spack/repos/builtin/packages/r-colorspace/package.py +++ b/var/spack/repos/builtin/packages/r-colorspace/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-complexheatmap/package.py b/var/spack/repos/builtin/packages/r-complexheatmap/package.py index 04c88f8ef8..5645c1a269 100644 --- a/var/spack/repos/builtin/packages/r-complexheatmap/package.py +++ b/var/spack/repos/builtin/packages/r-complexheatmap/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-corpcor/package.py b/var/spack/repos/builtin/packages/r-corpcor/package.py index b07e333ad7..a216cec782 100644 --- a/var/spack/repos/builtin/packages/r-corpcor/package.py +++ b/var/spack/repos/builtin/packages/r-corpcor/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-corrplot/package.py b/var/spack/repos/builtin/packages/r-corrplot/package.py index 52408e5ae7..fc7ffad316 100644 --- a/var/spack/repos/builtin/packages/r-corrplot/package.py +++ b/var/spack/repos/builtin/packages/r-corrplot/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-covr/package.py b/var/spack/repos/builtin/packages/r-covr/package.py index 5e3d8fff21..6e9e4c9f6e 100644 --- a/var/spack/repos/builtin/packages/r-covr/package.py +++ b/var/spack/repos/builtin/packages/r-covr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-cowplot/package.py b/var/spack/repos/builtin/packages/r-cowplot/package.py index cb49c52acb..55f2e84010 100644 --- a/var/spack/repos/builtin/packages/r-cowplot/package.py +++ b/var/spack/repos/builtin/packages/r-cowplot/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-crayon/package.py b/var/spack/repos/builtin/packages/r-crayon/package.py index de1140df3b..7e48720ab1 100644 --- a/var/spack/repos/builtin/packages/r-crayon/package.py +++ b/var/spack/repos/builtin/packages/r-crayon/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-crosstalk/package.py b/var/spack/repos/builtin/packages/r-crosstalk/package.py index db83adcf9c..773fab9df3 100644 --- a/var/spack/repos/builtin/packages/r-crosstalk/package.py +++ b/var/spack/repos/builtin/packages/r-crosstalk/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-cubature/package.py b/var/spack/repos/builtin/packages/r-cubature/package.py index 9f09069094..f01bd659a9 100644 --- a/var/spack/repos/builtin/packages/r-cubature/package.py +++ b/var/spack/repos/builtin/packages/r-cubature/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-cubist/package.py b/var/spack/repos/builtin/packages/r-cubist/package.py index 8fd4639fc5..b6fe075b4c 100644 --- a/var/spack/repos/builtin/packages/r-cubist/package.py +++ b/var/spack/repos/builtin/packages/r-cubist/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-curl/package.py b/var/spack/repos/builtin/packages/r-curl/package.py index 0b53d436fd..b67383c2aa 100644 --- a/var/spack/repos/builtin/packages/r-curl/package.py +++ b/var/spack/repos/builtin/packages/r-curl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-data-table/package.py b/var/spack/repos/builtin/packages/r-data-table/package.py index fad200eeb1..9698ea2fcd 100644 --- a/var/spack/repos/builtin/packages/r-data-table/package.py +++ b/var/spack/repos/builtin/packages/r-data-table/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-dbi/package.py b/var/spack/repos/builtin/packages/r-dbi/package.py index 00b38984e1..07dbd989df 100644 --- a/var/spack/repos/builtin/packages/r-dbi/package.py +++ b/var/spack/repos/builtin/packages/r-dbi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-dbplyr/package.py b/var/spack/repos/builtin/packages/r-dbplyr/package.py index 03fa2a9413..fe3444def7 100644 --- a/var/spack/repos/builtin/packages/r-dbplyr/package.py +++ b/var/spack/repos/builtin/packages/r-dbplyr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-delayedarray/package.py b/var/spack/repos/builtin/packages/r-delayedarray/package.py index 8cbeb0296b..b34c71ec61 100644 --- a/var/spack/repos/builtin/packages/r-delayedarray/package.py +++ b/var/spack/repos/builtin/packages/r-delayedarray/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-deldir/package.py b/var/spack/repos/builtin/packages/r-deldir/package.py index d02ecb19ce..65e899605b 100644 --- a/var/spack/repos/builtin/packages/r-deldir/package.py +++ b/var/spack/repos/builtin/packages/r-deldir/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-dendextend/package.py b/var/spack/repos/builtin/packages/r-dendextend/package.py index 5d98e012fc..ec34416a43 100644 --- a/var/spack/repos/builtin/packages/r-dendextend/package.py +++ b/var/spack/repos/builtin/packages/r-dendextend/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-deoptim/package.py b/var/spack/repos/builtin/packages/r-deoptim/package.py index 298b790693..36c0194e07 100644 --- a/var/spack/repos/builtin/packages/r-deoptim/package.py +++ b/var/spack/repos/builtin/packages/r-deoptim/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-deoptimr/package.py b/var/spack/repos/builtin/packages/r-deoptimr/package.py index af95c081e0..1a05bd9355 100644 --- a/var/spack/repos/builtin/packages/r-deoptimr/package.py +++ b/var/spack/repos/builtin/packages/r-deoptimr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-deseq/package.py b/var/spack/repos/builtin/packages/r-deseq/package.py index 900c82499a..d0d203b3ba 100644 --- a/var/spack/repos/builtin/packages/r-deseq/package.py +++ b/var/spack/repos/builtin/packages/r-deseq/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-deseq2/package.py b/var/spack/repos/builtin/packages/r-deseq2/package.py index 96a2426c4f..5a81c6699d 100644 --- a/var/spack/repos/builtin/packages/r-deseq2/package.py +++ b/var/spack/repos/builtin/packages/r-deseq2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-desolve/package.py b/var/spack/repos/builtin/packages/r-desolve/package.py index bbcbebcd53..efcf8d9791 100644 --- a/var/spack/repos/builtin/packages/r-desolve/package.py +++ b/var/spack/repos/builtin/packages/r-desolve/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-devtools/package.py b/var/spack/repos/builtin/packages/r-devtools/package.py index 7b9b789eb3..9cf97ab550 100644 --- a/var/spack/repos/builtin/packages/r-devtools/package.py +++ b/var/spack/repos/builtin/packages/r-devtools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-diagrammer/package.py b/var/spack/repos/builtin/packages/r-diagrammer/package.py index 650ab64a3f..6450f9a3b5 100644 --- a/var/spack/repos/builtin/packages/r-diagrammer/package.py +++ b/var/spack/repos/builtin/packages/r-diagrammer/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-dichromat/package.py b/var/spack/repos/builtin/packages/r-dichromat/package.py index b40cff31dd..6908cfeb7c 100644 --- a/var/spack/repos/builtin/packages/r-dichromat/package.py +++ b/var/spack/repos/builtin/packages/r-dichromat/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-diffusionmap/package.py b/var/spack/repos/builtin/packages/r-diffusionmap/package.py index 9cc6c2cf84..e92b170f49 100644 --- a/var/spack/repos/builtin/packages/r-diffusionmap/package.py +++ b/var/spack/repos/builtin/packages/r-diffusionmap/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-digest/package.py b/var/spack/repos/builtin/packages/r-digest/package.py index 78b96e03f4..6a08371197 100644 --- a/var/spack/repos/builtin/packages/r-digest/package.py +++ b/var/spack/repos/builtin/packages/r-digest/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-diptest/package.py b/var/spack/repos/builtin/packages/r-diptest/package.py index 96d9eea734..998373a71f 100644 --- a/var/spack/repos/builtin/packages/r-diptest/package.py +++ b/var/spack/repos/builtin/packages/r-diptest/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-dirichletmultinomial/package.py b/var/spack/repos/builtin/packages/r-dirichletmultinomial/package.py index ef23ae0abd..0414ef4fc3 100644 --- a/var/spack/repos/builtin/packages/r-dirichletmultinomial/package.py +++ b/var/spack/repos/builtin/packages/r-dirichletmultinomial/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-dnacopy/package.py b/var/spack/repos/builtin/packages/r-dnacopy/package.py index ade0424829..5f19298098 100644 --- a/var/spack/repos/builtin/packages/r-dnacopy/package.py +++ b/var/spack/repos/builtin/packages/r-dnacopy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-do-db/package.py b/var/spack/repos/builtin/packages/r-do-db/package.py index 689c957583..b96fec441d 100644 --- a/var/spack/repos/builtin/packages/r-do-db/package.py +++ b/var/spack/repos/builtin/packages/r-do-db/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-domc/package.py b/var/spack/repos/builtin/packages/r-domc/package.py index 9ed4841520..bad12fadb6 100644 --- a/var/spack/repos/builtin/packages/r-domc/package.py +++ b/var/spack/repos/builtin/packages/r-domc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-doparallel/package.py b/var/spack/repos/builtin/packages/r-doparallel/package.py index 1690db07a7..0a5d73b4cd 100644 --- a/var/spack/repos/builtin/packages/r-doparallel/package.py +++ b/var/spack/repos/builtin/packages/r-doparallel/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-dorng/package.py b/var/spack/repos/builtin/packages/r-dorng/package.py index 7ac9556d9b..75add98509 100644 --- a/var/spack/repos/builtin/packages/r-dorng/package.py +++ b/var/spack/repos/builtin/packages/r-dorng/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-dose/package.py b/var/spack/repos/builtin/packages/r-dose/package.py index 354120079d..d55f02dd9b 100644 --- a/var/spack/repos/builtin/packages/r-dose/package.py +++ b/var/spack/repos/builtin/packages/r-dose/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-downloader/package.py b/var/spack/repos/builtin/packages/r-downloader/package.py index d71c17e304..d43c9a2e36 100644 --- a/var/spack/repos/builtin/packages/r-downloader/package.py +++ b/var/spack/repos/builtin/packages/r-downloader/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-dplyr/package.py b/var/spack/repos/builtin/packages/r-dplyr/package.py index 15f04bbe93..b84b8739e2 100644 --- a/var/spack/repos/builtin/packages/r-dplyr/package.py +++ b/var/spack/repos/builtin/packages/r-dplyr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-dt/package.py b/var/spack/repos/builtin/packages/r-dt/package.py index a2d01900e1..6725a5ec02 100644 --- a/var/spack/repos/builtin/packages/r-dt/package.py +++ b/var/spack/repos/builtin/packages/r-dt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-dtw/package.py b/var/spack/repos/builtin/packages/r-dtw/package.py index af50941f17..29c8896811 100644 --- a/var/spack/repos/builtin/packages/r-dtw/package.py +++ b/var/spack/repos/builtin/packages/r-dtw/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-dygraphs/package.py b/var/spack/repos/builtin/packages/r-dygraphs/package.py index 91e2dc5504..0b22c96d88 100644 --- a/var/spack/repos/builtin/packages/r-dygraphs/package.py +++ b/var/spack/repos/builtin/packages/r-dygraphs/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-e1071/package.py b/var/spack/repos/builtin/packages/r-e1071/package.py index 7be5264895..9790148914 100644 --- a/var/spack/repos/builtin/packages/r-e1071/package.py +++ b/var/spack/repos/builtin/packages/r-e1071/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-edger/package.py b/var/spack/repos/builtin/packages/r-edger/package.py index 2d9da861db..7eaf61ce86 100644 --- a/var/spack/repos/builtin/packages/r-edger/package.py +++ b/var/spack/repos/builtin/packages/r-edger/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-ellipse/package.py b/var/spack/repos/builtin/packages/r-ellipse/package.py index 52393ed66a..c6e6a7eabe 100644 --- a/var/spack/repos/builtin/packages/r-ellipse/package.py +++ b/var/spack/repos/builtin/packages/r-ellipse/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-ensembldb/package.py b/var/spack/repos/builtin/packages/r-ensembldb/package.py index c6f424a855..54928bafa2 100644 --- a/var/spack/repos/builtin/packages/r-ensembldb/package.py +++ b/var/spack/repos/builtin/packages/r-ensembldb/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-ergm/package.py b/var/spack/repos/builtin/packages/r-ergm/package.py index 419119e2b0..da3b90760b 100644 --- a/var/spack/repos/builtin/packages/r-ergm/package.py +++ b/var/spack/repos/builtin/packages/r-ergm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-evaluate/package.py b/var/spack/repos/builtin/packages/r-evaluate/package.py index d32bff7319..13bdb5a721 100644 --- a/var/spack/repos/builtin/packages/r-evaluate/package.py +++ b/var/spack/repos/builtin/packages/r-evaluate/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-expm/package.py b/var/spack/repos/builtin/packages/r-expm/package.py index 48080163de..8ea19ec870 100644 --- a/var/spack/repos/builtin/packages/r-expm/package.py +++ b/var/spack/repos/builtin/packages/r-expm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-factoextra/package.py b/var/spack/repos/builtin/packages/r-factoextra/package.py index 518f4d6a63..3b386dbed8 100644 --- a/var/spack/repos/builtin/packages/r-factoextra/package.py +++ b/var/spack/repos/builtin/packages/r-factoextra/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-factominer/package.py b/var/spack/repos/builtin/packages/r-factominer/package.py index d2abf10ff7..1a819494b1 100644 --- a/var/spack/repos/builtin/packages/r-factominer/package.py +++ b/var/spack/repos/builtin/packages/r-factominer/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-fastmatch/package.py b/var/spack/repos/builtin/packages/r-fastmatch/package.py index aa13e7a01f..bbea5a81f4 100644 --- a/var/spack/repos/builtin/packages/r-fastmatch/package.py +++ b/var/spack/repos/builtin/packages/r-fastmatch/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-ff/package.py b/var/spack/repos/builtin/packages/r-ff/package.py index 1bb7250658..cbb95a1633 100644 --- a/var/spack/repos/builtin/packages/r-ff/package.py +++ b/var/spack/repos/builtin/packages/r-ff/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-fftwtools/package.py b/var/spack/repos/builtin/packages/r-fftwtools/package.py index ff8f6111a8..08d0060935 100644 --- a/var/spack/repos/builtin/packages/r-fftwtools/package.py +++ b/var/spack/repos/builtin/packages/r-fftwtools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-fgsea/package.py b/var/spack/repos/builtin/packages/r-fgsea/package.py index affbe50f07..c3b7954b5c 100644 --- a/var/spack/repos/builtin/packages/r-fgsea/package.py +++ b/var/spack/repos/builtin/packages/r-fgsea/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-filehash/package.py b/var/spack/repos/builtin/packages/r-filehash/package.py index b7cfbb19ce..68f3fbe320 100644 --- a/var/spack/repos/builtin/packages/r-filehash/package.py +++ b/var/spack/repos/builtin/packages/r-filehash/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-flashclust/package.py b/var/spack/repos/builtin/packages/r-flashclust/package.py index cfaee392db..a4318fc682 100644 --- a/var/spack/repos/builtin/packages/r-flashclust/package.py +++ b/var/spack/repos/builtin/packages/r-flashclust/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-flexmix/package.py b/var/spack/repos/builtin/packages/r-flexmix/package.py index 82ea3f068a..4c68840efa 100644 --- a/var/spack/repos/builtin/packages/r-flexmix/package.py +++ b/var/spack/repos/builtin/packages/r-flexmix/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-fnn/package.py b/var/spack/repos/builtin/packages/r-fnn/package.py index 30c31cf219..d9b6c0761f 100644 --- a/var/spack/repos/builtin/packages/r-fnn/package.py +++ b/var/spack/repos/builtin/packages/r-fnn/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-forcats/package.py b/var/spack/repos/builtin/packages/r-forcats/package.py index 727384c0b3..8ef3e805e0 100644 --- a/var/spack/repos/builtin/packages/r-forcats/package.py +++ b/var/spack/repos/builtin/packages/r-forcats/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-foreach/package.py b/var/spack/repos/builtin/packages/r-foreach/package.py index bf542efaea..6e981b5630 100644 --- a/var/spack/repos/builtin/packages/r-foreach/package.py +++ b/var/spack/repos/builtin/packages/r-foreach/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-forecast/package.py b/var/spack/repos/builtin/packages/r-forecast/package.py index e6549a30dd..105d30a727 100644 --- a/var/spack/repos/builtin/packages/r-forecast/package.py +++ b/var/spack/repos/builtin/packages/r-forecast/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-foreign/package.py b/var/spack/repos/builtin/packages/r-foreign/package.py index f43e0ad0e4..294eba97f5 100644 --- a/var/spack/repos/builtin/packages/r-foreign/package.py +++ b/var/spack/repos/builtin/packages/r-foreign/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-formatr/package.py b/var/spack/repos/builtin/packages/r-formatr/package.py index e6fa3c6824..705562dbee 100644 --- a/var/spack/repos/builtin/packages/r-formatr/package.py +++ b/var/spack/repos/builtin/packages/r-formatr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-formula/package.py b/var/spack/repos/builtin/packages/r-formula/package.py index 499ebfa8da..4438485786 100644 --- a/var/spack/repos/builtin/packages/r-formula/package.py +++ b/var/spack/repos/builtin/packages/r-formula/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-fpc/package.py b/var/spack/repos/builtin/packages/r-fpc/package.py index 4628970171..271176b8ba 100644 --- a/var/spack/repos/builtin/packages/r-fpc/package.py +++ b/var/spack/repos/builtin/packages/r-fpc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-fracdiff/package.py b/var/spack/repos/builtin/packages/r-fracdiff/package.py index c5ed63b240..089f1d3ee5 100644 --- a/var/spack/repos/builtin/packages/r-fracdiff/package.py +++ b/var/spack/repos/builtin/packages/r-fracdiff/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-futile-logger/package.py b/var/spack/repos/builtin/packages/r-futile-logger/package.py index 93d735f027..b2149b427f 100644 --- a/var/spack/repos/builtin/packages/r-futile-logger/package.py +++ b/var/spack/repos/builtin/packages/r-futile-logger/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-futile-options/package.py b/var/spack/repos/builtin/packages/r-futile-options/package.py index 9d0ee93d13..21a1d0d817 100644 --- a/var/spack/repos/builtin/packages/r-futile-options/package.py +++ b/var/spack/repos/builtin/packages/r-futile-options/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-gbm/package.py b/var/spack/repos/builtin/packages/r-gbm/package.py index cddc0c77be..7726fbac37 100644 --- a/var/spack/repos/builtin/packages/r-gbm/package.py +++ b/var/spack/repos/builtin/packages/r-gbm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-gcrma/package.py b/var/spack/repos/builtin/packages/r-gcrma/package.py index b54315796a..9767371315 100644 --- a/var/spack/repos/builtin/packages/r-gcrma/package.py +++ b/var/spack/repos/builtin/packages/r-gcrma/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-gdata/package.py b/var/spack/repos/builtin/packages/r-gdata/package.py index e07fc8d360..6ddb29bd04 100644 --- a/var/spack/repos/builtin/packages/r-gdata/package.py +++ b/var/spack/repos/builtin/packages/r-gdata/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-gdsfmt/package.py b/var/spack/repos/builtin/packages/r-gdsfmt/package.py index 4f209d4327..1e3aa44a6a 100644 --- a/var/spack/repos/builtin/packages/r-gdsfmt/package.py +++ b/var/spack/repos/builtin/packages/r-gdsfmt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-geiger/package.py b/var/spack/repos/builtin/packages/r-geiger/package.py index c2ce69ef37..3c236ac3a0 100644 --- a/var/spack/repos/builtin/packages/r-geiger/package.py +++ b/var/spack/repos/builtin/packages/r-geiger/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-genefilter/package.py b/var/spack/repos/builtin/packages/r-genefilter/package.py index e5b631d778..65df911a9c 100644 --- a/var/spack/repos/builtin/packages/r-genefilter/package.py +++ b/var/spack/repos/builtin/packages/r-genefilter/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-geneplotter/package.py b/var/spack/repos/builtin/packages/r-geneplotter/package.py index 940c87e01f..1af12fddd0 100644 --- a/var/spack/repos/builtin/packages/r-geneplotter/package.py +++ b/var/spack/repos/builtin/packages/r-geneplotter/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-genomeinfodb/package.py b/var/spack/repos/builtin/packages/r-genomeinfodb/package.py index 85a161a01b..8dff4c4c65 100644 --- a/var/spack/repos/builtin/packages/r-genomeinfodb/package.py +++ b/var/spack/repos/builtin/packages/r-genomeinfodb/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-genomeinfodbdata/package.py b/var/spack/repos/builtin/packages/r-genomeinfodbdata/package.py index 8e231ac43c..819d0a77ed 100644 --- a/var/spack/repos/builtin/packages/r-genomeinfodbdata/package.py +++ b/var/spack/repos/builtin/packages/r-genomeinfodbdata/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-genomicalignments/package.py b/var/spack/repos/builtin/packages/r-genomicalignments/package.py index 4a26b91538..ced18e624d 100644 --- a/var/spack/repos/builtin/packages/r-genomicalignments/package.py +++ b/var/spack/repos/builtin/packages/r-genomicalignments/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-genomicfeatures/package.py b/var/spack/repos/builtin/packages/r-genomicfeatures/package.py index a9e4bf5143..2b211c7c9f 100644 --- a/var/spack/repos/builtin/packages/r-genomicfeatures/package.py +++ b/var/spack/repos/builtin/packages/r-genomicfeatures/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-genomicranges/package.py b/var/spack/repos/builtin/packages/r-genomicranges/package.py index bd3f685acd..944dc5b9dd 100644 --- a/var/spack/repos/builtin/packages/r-genomicranges/package.py +++ b/var/spack/repos/builtin/packages/r-genomicranges/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-geomorph/package.py b/var/spack/repos/builtin/packages/r-geomorph/package.py index 1cb82c9d7e..33ac0317c0 100644 --- a/var/spack/repos/builtin/packages/r-geomorph/package.py +++ b/var/spack/repos/builtin/packages/r-geomorph/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-geoquery/package.py b/var/spack/repos/builtin/packages/r-geoquery/package.py index fd2c497430..b07978e7d4 100644 --- a/var/spack/repos/builtin/packages/r-geoquery/package.py +++ b/var/spack/repos/builtin/packages/r-geoquery/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-geosphere/package.py b/var/spack/repos/builtin/packages/r-geosphere/package.py index ee93217fb5..a797fdef6f 100644 --- a/var/spack/repos/builtin/packages/r-geosphere/package.py +++ b/var/spack/repos/builtin/packages/r-geosphere/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-getopt/package.py b/var/spack/repos/builtin/packages/r-getopt/package.py index 9b4881c879..a4ea28ea13 100644 --- a/var/spack/repos/builtin/packages/r-getopt/package.py +++ b/var/spack/repos/builtin/packages/r-getopt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-getoptlong/package.py b/var/spack/repos/builtin/packages/r-getoptlong/package.py index b4c4a8f4e6..822486255d 100644 --- a/var/spack/repos/builtin/packages/r-getoptlong/package.py +++ b/var/spack/repos/builtin/packages/r-getoptlong/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-ggally/package.py b/var/spack/repos/builtin/packages/r-ggally/package.py index f06d8257d3..e5bf46fdc2 100644 --- a/var/spack/repos/builtin/packages/r-ggally/package.py +++ b/var/spack/repos/builtin/packages/r-ggally/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-ggbio/package.py b/var/spack/repos/builtin/packages/r-ggbio/package.py index 8c5f27885a..c10266a86c 100644 --- a/var/spack/repos/builtin/packages/r-ggbio/package.py +++ b/var/spack/repos/builtin/packages/r-ggbio/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-ggdendro/package.py b/var/spack/repos/builtin/packages/r-ggdendro/package.py index e86180d4ac..8741d3152a 100644 --- a/var/spack/repos/builtin/packages/r-ggdendro/package.py +++ b/var/spack/repos/builtin/packages/r-ggdendro/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-ggjoy/package.py b/var/spack/repos/builtin/packages/r-ggjoy/package.py index 610a474570..3650852ee9 100644 --- a/var/spack/repos/builtin/packages/r-ggjoy/package.py +++ b/var/spack/repos/builtin/packages/r-ggjoy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-ggmap/package.py b/var/spack/repos/builtin/packages/r-ggmap/package.py index a3c16f7a45..75d338ae7a 100644 --- a/var/spack/repos/builtin/packages/r-ggmap/package.py +++ b/var/spack/repos/builtin/packages/r-ggmap/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-ggplot2/package.py b/var/spack/repos/builtin/packages/r-ggplot2/package.py index c2c5e49832..23755aa03a 100644 --- a/var/spack/repos/builtin/packages/r-ggplot2/package.py +++ b/var/spack/repos/builtin/packages/r-ggplot2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-ggpubr/package.py b/var/spack/repos/builtin/packages/r-ggpubr/package.py index ebc505bf5b..0451575333 100644 --- a/var/spack/repos/builtin/packages/r-ggpubr/package.py +++ b/var/spack/repos/builtin/packages/r-ggpubr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-ggrepel/package.py b/var/spack/repos/builtin/packages/r-ggrepel/package.py index a44a22ee1e..40f52c4604 100644 --- a/var/spack/repos/builtin/packages/r-ggrepel/package.py +++ b/var/spack/repos/builtin/packages/r-ggrepel/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-ggridges/package.py b/var/spack/repos/builtin/packages/r-ggridges/package.py index d94a2c8068..180d984b14 100644 --- a/var/spack/repos/builtin/packages/r-ggridges/package.py +++ b/var/spack/repos/builtin/packages/r-ggridges/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-ggsci/package.py b/var/spack/repos/builtin/packages/r-ggsci/package.py index 1fedf202ee..e21abc8328 100644 --- a/var/spack/repos/builtin/packages/r-ggsci/package.py +++ b/var/spack/repos/builtin/packages/r-ggsci/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-ggvis/package.py b/var/spack/repos/builtin/packages/r-ggvis/package.py index c0dab6b8e4..74f6a96330 100644 --- a/var/spack/repos/builtin/packages/r-ggvis/package.py +++ b/var/spack/repos/builtin/packages/r-ggvis/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-gistr/package.py b/var/spack/repos/builtin/packages/r-gistr/package.py index 7cbe2ecafe..ea3f5b3ab7 100644 --- a/var/spack/repos/builtin/packages/r-gistr/package.py +++ b/var/spack/repos/builtin/packages/r-gistr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-git2r/package.py b/var/spack/repos/builtin/packages/r-git2r/package.py index 3fa8baab7c..2f427b05b2 100644 --- a/var/spack/repos/builtin/packages/r-git2r/package.py +++ b/var/spack/repos/builtin/packages/r-git2r/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-glmnet/package.py b/var/spack/repos/builtin/packages/r-glmnet/package.py index 4e531165be..30c4e4d67e 100644 --- a/var/spack/repos/builtin/packages/r-glmnet/package.py +++ b/var/spack/repos/builtin/packages/r-glmnet/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-globaloptions/package.py b/var/spack/repos/builtin/packages/r-globaloptions/package.py index 7785d4f3a1..8125125d2e 100644 --- a/var/spack/repos/builtin/packages/r-globaloptions/package.py +++ b/var/spack/repos/builtin/packages/r-globaloptions/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-glue/package.py b/var/spack/repos/builtin/packages/r-glue/package.py index f7ea03f8eb..515c9f77c7 100644 --- a/var/spack/repos/builtin/packages/r-glue/package.py +++ b/var/spack/repos/builtin/packages/r-glue/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-gmodels/package.py b/var/spack/repos/builtin/packages/r-gmodels/package.py index ce4a8c9692..0a7ebc80d1 100644 --- a/var/spack/repos/builtin/packages/r-gmodels/package.py +++ b/var/spack/repos/builtin/packages/r-gmodels/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-gmp/package.py b/var/spack/repos/builtin/packages/r-gmp/package.py index 18e394f1ac..05bb2f584e 100644 --- a/var/spack/repos/builtin/packages/r-gmp/package.py +++ b/var/spack/repos/builtin/packages/r-gmp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-go-db/package.py b/var/spack/repos/builtin/packages/r-go-db/package.py index af5df1ce3b..b57a164b4e 100644 --- a/var/spack/repos/builtin/packages/r-go-db/package.py +++ b/var/spack/repos/builtin/packages/r-go-db/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-googlevis/package.py b/var/spack/repos/builtin/packages/r-googlevis/package.py index 4d7cfbd259..0568ee554e 100644 --- a/var/spack/repos/builtin/packages/r-googlevis/package.py +++ b/var/spack/repos/builtin/packages/r-googlevis/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-gosemsim/package.py b/var/spack/repos/builtin/packages/r-gosemsim/package.py index b3733bae93..9afc35eecb 100644 --- a/var/spack/repos/builtin/packages/r-gosemsim/package.py +++ b/var/spack/repos/builtin/packages/r-gosemsim/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-gostats/package.py b/var/spack/repos/builtin/packages/r-gostats/package.py index ef4231fc7d..34388f93f1 100644 --- a/var/spack/repos/builtin/packages/r-gostats/package.py +++ b/var/spack/repos/builtin/packages/r-gostats/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-gplots/package.py b/var/spack/repos/builtin/packages/r-gplots/package.py index 21c3738caa..67b70a9062 100644 --- a/var/spack/repos/builtin/packages/r-gplots/package.py +++ b/var/spack/repos/builtin/packages/r-gplots/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-graph/package.py b/var/spack/repos/builtin/packages/r-graph/package.py index a7b6140de8..3368467674 100644 --- a/var/spack/repos/builtin/packages/r-graph/package.py +++ b/var/spack/repos/builtin/packages/r-graph/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-gridbase/package.py b/var/spack/repos/builtin/packages/r-gridbase/package.py index 4353f16819..cc9ab5ffd6 100644 --- a/var/spack/repos/builtin/packages/r-gridbase/package.py +++ b/var/spack/repos/builtin/packages/r-gridbase/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-gridextra/package.py b/var/spack/repos/builtin/packages/r-gridextra/package.py index 2b64580c4e..fea484e57f 100644 --- a/var/spack/repos/builtin/packages/r-gridextra/package.py +++ b/var/spack/repos/builtin/packages/r-gridextra/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-gseabase/package.py b/var/spack/repos/builtin/packages/r-gseabase/package.py index b02b16289b..a337d38e66 100644 --- a/var/spack/repos/builtin/packages/r-gseabase/package.py +++ b/var/spack/repos/builtin/packages/r-gseabase/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-gsubfn/package.py b/var/spack/repos/builtin/packages/r-gsubfn/package.py index 858f7f2e39..e477fcb859 100644 --- a/var/spack/repos/builtin/packages/r-gsubfn/package.py +++ b/var/spack/repos/builtin/packages/r-gsubfn/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-gtable/package.py b/var/spack/repos/builtin/packages/r-gtable/package.py index 498e5ba2c3..50ad7ddd09 100644 --- a/var/spack/repos/builtin/packages/r-gtable/package.py +++ b/var/spack/repos/builtin/packages/r-gtable/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-gtools/package.py b/var/spack/repos/builtin/packages/r-gtools/package.py index 0c74d8449a..c7f947fb63 100644 --- a/var/spack/repos/builtin/packages/r-gtools/package.py +++ b/var/spack/repos/builtin/packages/r-gtools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-gtrellis/package.py b/var/spack/repos/builtin/packages/r-gtrellis/package.py index 64526035db..b4a1d90fae 100644 --- a/var/spack/repos/builtin/packages/r-gtrellis/package.py +++ b/var/spack/repos/builtin/packages/r-gtrellis/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-gviz/package.py b/var/spack/repos/builtin/packages/r-gviz/package.py index ddb56cc681..4498f0fcf5 100644 --- a/var/spack/repos/builtin/packages/r-gviz/package.py +++ b/var/spack/repos/builtin/packages/r-gviz/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-haven/package.py b/var/spack/repos/builtin/packages/r-haven/package.py index d477e42920..6bd122e5cb 100644 --- a/var/spack/repos/builtin/packages/r-haven/package.py +++ b/var/spack/repos/builtin/packages/r-haven/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-hexbin/package.py b/var/spack/repos/builtin/packages/r-hexbin/package.py index 179914fca3..22669cfa23 100644 --- a/var/spack/repos/builtin/packages/r-hexbin/package.py +++ b/var/spack/repos/builtin/packages/r-hexbin/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-highr/package.py b/var/spack/repos/builtin/packages/r-highr/package.py index cc89cfd80b..0d04a78fe9 100644 --- a/var/spack/repos/builtin/packages/r-highr/package.py +++ b/var/spack/repos/builtin/packages/r-highr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-hmisc/package.py b/var/spack/repos/builtin/packages/r-hmisc/package.py index 436c3279ec..245662f3f9 100644 --- a/var/spack/repos/builtin/packages/r-hmisc/package.py +++ b/var/spack/repos/builtin/packages/r-hmisc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-hms/package.py b/var/spack/repos/builtin/packages/r-hms/package.py index cf3a4a88c3..876c6300b0 100644 --- a/var/spack/repos/builtin/packages/r-hms/package.py +++ b/var/spack/repos/builtin/packages/r-hms/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-htmltable/package.py b/var/spack/repos/builtin/packages/r-htmltable/package.py index f142a5221a..14b91f3b5c 100644 --- a/var/spack/repos/builtin/packages/r-htmltable/package.py +++ b/var/spack/repos/builtin/packages/r-htmltable/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-htmltools/package.py b/var/spack/repos/builtin/packages/r-htmltools/package.py index 865c2f79ae..c2740f7b1c 100644 --- a/var/spack/repos/builtin/packages/r-htmltools/package.py +++ b/var/spack/repos/builtin/packages/r-htmltools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-htmlwidgets/package.py b/var/spack/repos/builtin/packages/r-htmlwidgets/package.py index 1dcbbe5062..95f6c4db21 100644 --- a/var/spack/repos/builtin/packages/r-htmlwidgets/package.py +++ b/var/spack/repos/builtin/packages/r-htmlwidgets/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-httpuv/package.py b/var/spack/repos/builtin/packages/r-httpuv/package.py index 59ba283621..316eff27e2 100644 --- a/var/spack/repos/builtin/packages/r-httpuv/package.py +++ b/var/spack/repos/builtin/packages/r-httpuv/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-httr/package.py b/var/spack/repos/builtin/packages/r-httr/package.py index a533f6cbd9..c742e99c7e 100644 --- a/var/spack/repos/builtin/packages/r-httr/package.py +++ b/var/spack/repos/builtin/packages/r-httr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-hwriter/package.py b/var/spack/repos/builtin/packages/r-hwriter/package.py index df8a2129db..bd2a072840 100644 --- a/var/spack/repos/builtin/packages/r-hwriter/package.py +++ b/var/spack/repos/builtin/packages/r-hwriter/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-hypergraph/package.py b/var/spack/repos/builtin/packages/r-hypergraph/package.py index b6fc0df172..3e9c634c51 100644 --- a/var/spack/repos/builtin/packages/r-hypergraph/package.py +++ b/var/spack/repos/builtin/packages/r-hypergraph/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-ica/package.py b/var/spack/repos/builtin/packages/r-ica/package.py index eae23428b8..5bc0897cc4 100644 --- a/var/spack/repos/builtin/packages/r-ica/package.py +++ b/var/spack/repos/builtin/packages/r-ica/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-igraph/package.py b/var/spack/repos/builtin/packages/r-igraph/package.py index 5df9b7de86..865e6121b2 100644 --- a/var/spack/repos/builtin/packages/r-igraph/package.py +++ b/var/spack/repos/builtin/packages/r-igraph/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-illuminaio/package.py b/var/spack/repos/builtin/packages/r-illuminaio/package.py index 9d0993fb8f..2653ffa8df 100644 --- a/var/spack/repos/builtin/packages/r-illuminaio/package.py +++ b/var/spack/repos/builtin/packages/r-illuminaio/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-impute/package.py b/var/spack/repos/builtin/packages/r-impute/package.py index b8bf956ac1..7fa3459467 100644 --- a/var/spack/repos/builtin/packages/r-impute/package.py +++ b/var/spack/repos/builtin/packages/r-impute/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-influencer/package.py b/var/spack/repos/builtin/packages/r-influencer/package.py index 53f1ba67a7..3b60842ce9 100644 --- a/var/spack/repos/builtin/packages/r-influencer/package.py +++ b/var/spack/repos/builtin/packages/r-influencer/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-inline/package.py b/var/spack/repos/builtin/packages/r-inline/package.py index 235aacfe19..66f283f50e 100644 --- a/var/spack/repos/builtin/packages/r-inline/package.py +++ b/var/spack/repos/builtin/packages/r-inline/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-interactivedisplaybase/package.py b/var/spack/repos/builtin/packages/r-interactivedisplaybase/package.py index 8b64962096..afe36cd49e 100644 --- a/var/spack/repos/builtin/packages/r-interactivedisplaybase/package.py +++ b/var/spack/repos/builtin/packages/r-interactivedisplaybase/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-ipred/package.py b/var/spack/repos/builtin/packages/r-ipred/package.py index 97d84f5361..b5a30b999e 100644 --- a/var/spack/repos/builtin/packages/r-ipred/package.py +++ b/var/spack/repos/builtin/packages/r-ipred/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-iranges/package.py b/var/spack/repos/builtin/packages/r-iranges/package.py index c53b2773a7..48f8d0f105 100644 --- a/var/spack/repos/builtin/packages/r-iranges/package.py +++ b/var/spack/repos/builtin/packages/r-iranges/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-irdisplay/package.py b/var/spack/repos/builtin/packages/r-irdisplay/package.py index 1edbf40c1a..42f4a23957 100644 --- a/var/spack/repos/builtin/packages/r-irdisplay/package.py +++ b/var/spack/repos/builtin/packages/r-irdisplay/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-irkernel/package.py b/var/spack/repos/builtin/packages/r-irkernel/package.py index 62daf2e0ca..5c4707165c 100644 --- a/var/spack/repos/builtin/packages/r-irkernel/package.py +++ b/var/spack/repos/builtin/packages/r-irkernel/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-irlba/package.py b/var/spack/repos/builtin/packages/r-irlba/package.py index 21e3df5e9f..821fcc8d60 100644 --- a/var/spack/repos/builtin/packages/r-irlba/package.py +++ b/var/spack/repos/builtin/packages/r-irlba/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-iso/package.py b/var/spack/repos/builtin/packages/r-iso/package.py index f4be39ee6e..20316ee995 100644 --- a/var/spack/repos/builtin/packages/r-iso/package.py +++ b/var/spack/repos/builtin/packages/r-iso/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-iterators/package.py b/var/spack/repos/builtin/packages/r-iterators/package.py index 1e864864e3..99ed47a8fa 100644 --- a/var/spack/repos/builtin/packages/r-iterators/package.py +++ b/var/spack/repos/builtin/packages/r-iterators/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-janitor/package.py b/var/spack/repos/builtin/packages/r-janitor/package.py index 30c2c785c1..c555fc2dea 100644 --- a/var/spack/repos/builtin/packages/r-janitor/package.py +++ b/var/spack/repos/builtin/packages/r-janitor/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-jaspar2018/package.py b/var/spack/repos/builtin/packages/r-jaspar2018/package.py index 832c42cb4a..1e9e92afb8 100644 --- a/var/spack/repos/builtin/packages/r-jaspar2018/package.py +++ b/var/spack/repos/builtin/packages/r-jaspar2018/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-jpeg/package.py b/var/spack/repos/builtin/packages/r-jpeg/package.py index 5a11610fc9..a97bd30c15 100644 --- a/var/spack/repos/builtin/packages/r-jpeg/package.py +++ b/var/spack/repos/builtin/packages/r-jpeg/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-jsonlite/package.py b/var/spack/repos/builtin/packages/r-jsonlite/package.py index 13f3bcd0e2..aeede2effb 100644 --- a/var/spack/repos/builtin/packages/r-jsonlite/package.py +++ b/var/spack/repos/builtin/packages/r-jsonlite/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-kegg-db/package.py b/var/spack/repos/builtin/packages/r-kegg-db/package.py index e205b1d42a..523c9a6808 100644 --- a/var/spack/repos/builtin/packages/r-kegg-db/package.py +++ b/var/spack/repos/builtin/packages/r-kegg-db/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-kegggraph/package.py b/var/spack/repos/builtin/packages/r-kegggraph/package.py index 98aee6069f..ba883e7e3c 100644 --- a/var/spack/repos/builtin/packages/r-kegggraph/package.py +++ b/var/spack/repos/builtin/packages/r-kegggraph/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-keggrest/package.py b/var/spack/repos/builtin/packages/r-keggrest/package.py index 80e7b99024..8f3c311265 100644 --- a/var/spack/repos/builtin/packages/r-keggrest/package.py +++ b/var/spack/repos/builtin/packages/r-keggrest/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-kernlab/package.py b/var/spack/repos/builtin/packages/r-kernlab/package.py index 9ff25832be..c179f08efd 100644 --- a/var/spack/repos/builtin/packages/r-kernlab/package.py +++ b/var/spack/repos/builtin/packages/r-kernlab/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-kernsmooth/package.py b/var/spack/repos/builtin/packages/r-kernsmooth/package.py index e6fd8512c2..c95a5fdff1 100644 --- a/var/spack/repos/builtin/packages/r-kernsmooth/package.py +++ b/var/spack/repos/builtin/packages/r-kernsmooth/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-kknn/package.py b/var/spack/repos/builtin/packages/r-kknn/package.py index 86d67fb4d4..84fd604fd5 100644 --- a/var/spack/repos/builtin/packages/r-kknn/package.py +++ b/var/spack/repos/builtin/packages/r-kknn/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-knitr/package.py b/var/spack/repos/builtin/packages/r-knitr/package.py index 1e0e51a3f1..9375b53ac1 100644 --- a/var/spack/repos/builtin/packages/r-knitr/package.py +++ b/var/spack/repos/builtin/packages/r-knitr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-labeling/package.py b/var/spack/repos/builtin/packages/r-labeling/package.py index 02790fe88d..8c24656a8e 100644 --- a/var/spack/repos/builtin/packages/r-labeling/package.py +++ b/var/spack/repos/builtin/packages/r-labeling/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-lambda-r/package.py b/var/spack/repos/builtin/packages/r-lambda-r/package.py index 914826af97..4e5c927670 100644 --- a/var/spack/repos/builtin/packages/r-lambda-r/package.py +++ b/var/spack/repos/builtin/packages/r-lambda-r/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-laplacesdemon/package.py b/var/spack/repos/builtin/packages/r-laplacesdemon/package.py index 3af2665c3e..547465b1ba 100644 --- a/var/spack/repos/builtin/packages/r-laplacesdemon/package.py +++ b/var/spack/repos/builtin/packages/r-laplacesdemon/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-lars/package.py b/var/spack/repos/builtin/packages/r-lars/package.py index 907c6bdc87..f03e91abc8 100644 --- a/var/spack/repos/builtin/packages/r-lars/package.py +++ b/var/spack/repos/builtin/packages/r-lars/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-lattice/package.py b/var/spack/repos/builtin/packages/r-lattice/package.py index 170e99aa9d..bd89e3a571 100644 --- a/var/spack/repos/builtin/packages/r-lattice/package.py +++ b/var/spack/repos/builtin/packages/r-lattice/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-latticeextra/package.py b/var/spack/repos/builtin/packages/r-latticeextra/package.py index 86c9d93ed7..9b9562703d 100644 --- a/var/spack/repos/builtin/packages/r-latticeextra/package.py +++ b/var/spack/repos/builtin/packages/r-latticeextra/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-lava/package.py b/var/spack/repos/builtin/packages/r-lava/package.py index ae4218e1db..1c01bc4002 100644 --- a/var/spack/repos/builtin/packages/r-lava/package.py +++ b/var/spack/repos/builtin/packages/r-lava/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-lazyeval/package.py b/var/spack/repos/builtin/packages/r-lazyeval/package.py index 3746851d00..eafa835229 100644 --- a/var/spack/repos/builtin/packages/r-lazyeval/package.py +++ b/var/spack/repos/builtin/packages/r-lazyeval/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-leaflet/package.py b/var/spack/repos/builtin/packages/r-leaflet/package.py index ef6debbdbb..5a179be965 100644 --- a/var/spack/repos/builtin/packages/r-leaflet/package.py +++ b/var/spack/repos/builtin/packages/r-leaflet/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-leaps/package.py b/var/spack/repos/builtin/packages/r-leaps/package.py index e27874ec27..2176bbabcc 100644 --- a/var/spack/repos/builtin/packages/r-leaps/package.py +++ b/var/spack/repos/builtin/packages/r-leaps/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-learnbayes/package.py b/var/spack/repos/builtin/packages/r-learnbayes/package.py index 71904b3d24..69ee46ab8d 100644 --- a/var/spack/repos/builtin/packages/r-learnbayes/package.py +++ b/var/spack/repos/builtin/packages/r-learnbayes/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-limma/package.py b/var/spack/repos/builtin/packages/r-limma/package.py index 8c4df2b059..245633e270 100644 --- a/var/spack/repos/builtin/packages/r-limma/package.py +++ b/var/spack/repos/builtin/packages/r-limma/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-lme4/package.py b/var/spack/repos/builtin/packages/r-lme4/package.py index c7565e381e..90958cc9f3 100644 --- a/var/spack/repos/builtin/packages/r-lme4/package.py +++ b/var/spack/repos/builtin/packages/r-lme4/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-lmtest/package.py b/var/spack/repos/builtin/packages/r-lmtest/package.py index 160fd3669b..8b1f0ab910 100644 --- a/var/spack/repos/builtin/packages/r-lmtest/package.py +++ b/var/spack/repos/builtin/packages/r-lmtest/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-locfit/package.py b/var/spack/repos/builtin/packages/r-locfit/package.py index 99b7af6fcf..f531526661 100644 --- a/var/spack/repos/builtin/packages/r-locfit/package.py +++ b/var/spack/repos/builtin/packages/r-locfit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-log4r/package.py b/var/spack/repos/builtin/packages/r-log4r/package.py index c6719cbe30..5c537cd606 100644 --- a/var/spack/repos/builtin/packages/r-log4r/package.py +++ b/var/spack/repos/builtin/packages/r-log4r/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-lpsolve/package.py b/var/spack/repos/builtin/packages/r-lpsolve/package.py index 996725f129..e3c225335f 100644 --- a/var/spack/repos/builtin/packages/r-lpsolve/package.py +++ b/var/spack/repos/builtin/packages/r-lpsolve/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-lsei/package.py b/var/spack/repos/builtin/packages/r-lsei/package.py index a2de608256..378512a21e 100644 --- a/var/spack/repos/builtin/packages/r-lsei/package.py +++ b/var/spack/repos/builtin/packages/r-lsei/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-lubridate/package.py b/var/spack/repos/builtin/packages/r-lubridate/package.py index bdb314e673..9877277aa6 100644 --- a/var/spack/repos/builtin/packages/r-lubridate/package.py +++ b/var/spack/repos/builtin/packages/r-lubridate/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-magic/package.py b/var/spack/repos/builtin/packages/r-magic/package.py index b6cd78be63..aabc238a69 100644 --- a/var/spack/repos/builtin/packages/r-magic/package.py +++ b/var/spack/repos/builtin/packages/r-magic/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-magrittr/package.py b/var/spack/repos/builtin/packages/r-magrittr/package.py index 528fb7ff67..8d50112795 100644 --- a/var/spack/repos/builtin/packages/r-magrittr/package.py +++ b/var/spack/repos/builtin/packages/r-magrittr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-makecdfenv/package.py b/var/spack/repos/builtin/packages/r-makecdfenv/package.py index 8c74fc532b..749801b0d8 100644 --- a/var/spack/repos/builtin/packages/r-makecdfenv/package.py +++ b/var/spack/repos/builtin/packages/r-makecdfenv/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-maldiquant/package.py b/var/spack/repos/builtin/packages/r-maldiquant/package.py index ad1e1bb95f..eed50fcd65 100644 --- a/var/spack/repos/builtin/packages/r-maldiquant/package.py +++ b/var/spack/repos/builtin/packages/r-maldiquant/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-mapproj/package.py b/var/spack/repos/builtin/packages/r-mapproj/package.py index d17ba5a8b3..f17700ed60 100644 --- a/var/spack/repos/builtin/packages/r-mapproj/package.py +++ b/var/spack/repos/builtin/packages/r-mapproj/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-maps/package.py b/var/spack/repos/builtin/packages/r-maps/package.py index f9d6a487df..e9245a0bc3 100644 --- a/var/spack/repos/builtin/packages/r-maps/package.py +++ b/var/spack/repos/builtin/packages/r-maps/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-maptools/package.py b/var/spack/repos/builtin/packages/r-maptools/package.py index e84fc2ef70..c46991273b 100644 --- a/var/spack/repos/builtin/packages/r-maptools/package.py +++ b/var/spack/repos/builtin/packages/r-maptools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-markdown/package.py b/var/spack/repos/builtin/packages/r-markdown/package.py index d58e56548c..8955fea269 100644 --- a/var/spack/repos/builtin/packages/r-markdown/package.py +++ b/var/spack/repos/builtin/packages/r-markdown/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-mass/package.py b/var/spack/repos/builtin/packages/r-mass/package.py index 5767b10be1..d4fd3a2c2f 100644 --- a/var/spack/repos/builtin/packages/r-mass/package.py +++ b/var/spack/repos/builtin/packages/r-mass/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-matrix/package.py b/var/spack/repos/builtin/packages/r-matrix/package.py index b02dd8bec8..f2c6fee3e8 100644 --- a/var/spack/repos/builtin/packages/r-matrix/package.py +++ b/var/spack/repos/builtin/packages/r-matrix/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-matrixmodels/package.py b/var/spack/repos/builtin/packages/r-matrixmodels/package.py index de309edbdd..01830f4512 100644 --- a/var/spack/repos/builtin/packages/r-matrixmodels/package.py +++ b/var/spack/repos/builtin/packages/r-matrixmodels/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-matrixstats/package.py b/var/spack/repos/builtin/packages/r-matrixstats/package.py index 177275267b..c7fa047e7f 100644 --- a/var/spack/repos/builtin/packages/r-matrixstats/package.py +++ b/var/spack/repos/builtin/packages/r-matrixstats/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-mclust/package.py b/var/spack/repos/builtin/packages/r-mclust/package.py index 30e1200da0..42a74a0a38 100644 --- a/var/spack/repos/builtin/packages/r-mclust/package.py +++ b/var/spack/repos/builtin/packages/r-mclust/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-mcmcglmm/package.py b/var/spack/repos/builtin/packages/r-mcmcglmm/package.py index 19bd61f746..b50fa81767 100644 --- a/var/spack/repos/builtin/packages/r-mcmcglmm/package.py +++ b/var/spack/repos/builtin/packages/r-mcmcglmm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-mda/package.py b/var/spack/repos/builtin/packages/r-mda/package.py index 492cc4fe13..65762ad37b 100644 --- a/var/spack/repos/builtin/packages/r-mda/package.py +++ b/var/spack/repos/builtin/packages/r-mda/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-memoise/package.py b/var/spack/repos/builtin/packages/r-memoise/package.py index 6bc766f0cd..b970c92e69 100644 --- a/var/spack/repos/builtin/packages/r-memoise/package.py +++ b/var/spack/repos/builtin/packages/r-memoise/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-mergemaid/package.py b/var/spack/repos/builtin/packages/r-mergemaid/package.py index ae6ef977c5..bfec39da95 100644 --- a/var/spack/repos/builtin/packages/r-mergemaid/package.py +++ b/var/spack/repos/builtin/packages/r-mergemaid/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-methodss3/package.py b/var/spack/repos/builtin/packages/r-methodss3/package.py index 2c1768a1b1..10c387b7ac 100644 --- a/var/spack/repos/builtin/packages/r-methodss3/package.py +++ b/var/spack/repos/builtin/packages/r-methodss3/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-mgcv/package.py b/var/spack/repos/builtin/packages/r-mgcv/package.py index 2268fdb682..43327aae55 100644 --- a/var/spack/repos/builtin/packages/r-mgcv/package.py +++ b/var/spack/repos/builtin/packages/r-mgcv/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-mime/package.py b/var/spack/repos/builtin/packages/r-mime/package.py index bb235270d7..7f7ee713d2 100644 --- a/var/spack/repos/builtin/packages/r-mime/package.py +++ b/var/spack/repos/builtin/packages/r-mime/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-minfi/package.py b/var/spack/repos/builtin/packages/r-minfi/package.py index 3621743aaa..d659b95500 100644 --- a/var/spack/repos/builtin/packages/r-minfi/package.py +++ b/var/spack/repos/builtin/packages/r-minfi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-minqa/package.py b/var/spack/repos/builtin/packages/r-minqa/package.py index 23fe7b5b5c..360c579670 100644 --- a/var/spack/repos/builtin/packages/r-minqa/package.py +++ b/var/spack/repos/builtin/packages/r-minqa/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-mixtools/package.py b/var/spack/repos/builtin/packages/r-mixtools/package.py index 91b270cece..309b13dd6f 100644 --- a/var/spack/repos/builtin/packages/r-mixtools/package.py +++ b/var/spack/repos/builtin/packages/r-mixtools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-mlbench/package.py b/var/spack/repos/builtin/packages/r-mlbench/package.py index 9d450ced9e..bedf7354c1 100644 --- a/var/spack/repos/builtin/packages/r-mlbench/package.py +++ b/var/spack/repos/builtin/packages/r-mlbench/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-mlinterfaces/package.py b/var/spack/repos/builtin/packages/r-mlinterfaces/package.py index 9c83563b8f..c1d2c5cbcd 100644 --- a/var/spack/repos/builtin/packages/r-mlinterfaces/package.py +++ b/var/spack/repos/builtin/packages/r-mlinterfaces/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-mnormt/package.py b/var/spack/repos/builtin/packages/r-mnormt/package.py index aa377f7ef6..7c7fea4750 100644 --- a/var/spack/repos/builtin/packages/r-mnormt/package.py +++ b/var/spack/repos/builtin/packages/r-mnormt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-modelmetrics/package.py b/var/spack/repos/builtin/packages/r-modelmetrics/package.py index c3625e1e37..41dbb4f635 100644 --- a/var/spack/repos/builtin/packages/r-modelmetrics/package.py +++ b/var/spack/repos/builtin/packages/r-modelmetrics/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-modelr/package.py b/var/spack/repos/builtin/packages/r-modelr/package.py index 4be6963878..eb8a0d0a6c 100644 --- a/var/spack/repos/builtin/packages/r-modelr/package.py +++ b/var/spack/repos/builtin/packages/r-modelr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-modeltools/package.py b/var/spack/repos/builtin/packages/r-modeltools/package.py index 1c0873dfae..931cf25714 100644 --- a/var/spack/repos/builtin/packages/r-modeltools/package.py +++ b/var/spack/repos/builtin/packages/r-modeltools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-mpm/package.py b/var/spack/repos/builtin/packages/r-mpm/package.py index 78b21ab11b..bc3e850806 100644 --- a/var/spack/repos/builtin/packages/r-mpm/package.py +++ b/var/spack/repos/builtin/packages/r-mpm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-msnbase/package.py b/var/spack/repos/builtin/packages/r-msnbase/package.py index fddbffdcec..7f20505f7b 100644 --- a/var/spack/repos/builtin/packages/r-msnbase/package.py +++ b/var/spack/repos/builtin/packages/r-msnbase/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-multcomp/package.py b/var/spack/repos/builtin/packages/r-multcomp/package.py index 8b5b6deff7..116c69aded 100644 --- a/var/spack/repos/builtin/packages/r-multcomp/package.py +++ b/var/spack/repos/builtin/packages/r-multcomp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-multtest/package.py b/var/spack/repos/builtin/packages/r-multtest/package.py index 04030423ee..aa6676bffd 100644 --- a/var/spack/repos/builtin/packages/r-multtest/package.py +++ b/var/spack/repos/builtin/packages/r-multtest/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-munsell/package.py b/var/spack/repos/builtin/packages/r-munsell/package.py index de729c84ef..423c430511 100644 --- a/var/spack/repos/builtin/packages/r-munsell/package.py +++ b/var/spack/repos/builtin/packages/r-munsell/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-mvtnorm/package.py b/var/spack/repos/builtin/packages/r-mvtnorm/package.py index 9806c21cb5..ac49784055 100644 --- a/var/spack/repos/builtin/packages/r-mvtnorm/package.py +++ b/var/spack/repos/builtin/packages/r-mvtnorm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-mzid/package.py b/var/spack/repos/builtin/packages/r-mzid/package.py index cb23814ea8..3a866ff705 100644 --- a/var/spack/repos/builtin/packages/r-mzid/package.py +++ b/var/spack/repos/builtin/packages/r-mzid/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-mzr/package.py b/var/spack/repos/builtin/packages/r-mzr/package.py index 282962153b..c429c9c97a 100644 --- a/var/spack/repos/builtin/packages/r-mzr/package.py +++ b/var/spack/repos/builtin/packages/r-mzr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-nanotime/package.py b/var/spack/repos/builtin/packages/r-nanotime/package.py index 2d2e43ed01..a5b6bfeaf0 100644 --- a/var/spack/repos/builtin/packages/r-nanotime/package.py +++ b/var/spack/repos/builtin/packages/r-nanotime/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-ncbit/package.py b/var/spack/repos/builtin/packages/r-ncbit/package.py index c9bc90654c..f1e90ac464 100644 --- a/var/spack/repos/builtin/packages/r-ncbit/package.py +++ b/var/spack/repos/builtin/packages/r-ncbit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-ncdf4/package.py b/var/spack/repos/builtin/packages/r-ncdf4/package.py index 8e24a0eba1..fd85c91cd5 100644 --- a/var/spack/repos/builtin/packages/r-ncdf4/package.py +++ b/var/spack/repos/builtin/packages/r-ncdf4/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-network/package.py b/var/spack/repos/builtin/packages/r-network/package.py index 867fbf41f6..40d6492396 100644 --- a/var/spack/repos/builtin/packages/r-network/package.py +++ b/var/spack/repos/builtin/packages/r-network/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-networkd3/package.py b/var/spack/repos/builtin/packages/r-networkd3/package.py index 4102dbefe4..ad2f1e91ae 100644 --- a/var/spack/repos/builtin/packages/r-networkd3/package.py +++ b/var/spack/repos/builtin/packages/r-networkd3/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-nlme/package.py b/var/spack/repos/builtin/packages/r-nlme/package.py index b50fa42c10..01d4cced45 100644 --- a/var/spack/repos/builtin/packages/r-nlme/package.py +++ b/var/spack/repos/builtin/packages/r-nlme/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-nloptr/package.py b/var/spack/repos/builtin/packages/r-nloptr/package.py index 613900c799..e5ac989522 100644 --- a/var/spack/repos/builtin/packages/r-nloptr/package.py +++ b/var/spack/repos/builtin/packages/r-nloptr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-nmf/package.py b/var/spack/repos/builtin/packages/r-nmf/package.py index 8e2806efed..b17152e3e0 100644 --- a/var/spack/repos/builtin/packages/r-nmf/package.py +++ b/var/spack/repos/builtin/packages/r-nmf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-nnet/package.py b/var/spack/repos/builtin/packages/r-nnet/package.py index 5298b38abe..44312314eb 100644 --- a/var/spack/repos/builtin/packages/r-nnet/package.py +++ b/var/spack/repos/builtin/packages/r-nnet/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-nnls/package.py b/var/spack/repos/builtin/packages/r-nnls/package.py index 44ea8174c2..691dff4267 100644 --- a/var/spack/repos/builtin/packages/r-nnls/package.py +++ b/var/spack/repos/builtin/packages/r-nnls/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-nor1mix/package.py b/var/spack/repos/builtin/packages/r-nor1mix/package.py index f02a70cc9b..005cde22fe 100644 --- a/var/spack/repos/builtin/packages/r-nor1mix/package.py +++ b/var/spack/repos/builtin/packages/r-nor1mix/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-np/package.py b/var/spack/repos/builtin/packages/r-np/package.py index 6bb788e38d..b3cbb0e5a1 100644 --- a/var/spack/repos/builtin/packages/r-np/package.py +++ b/var/spack/repos/builtin/packages/r-np/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-numderiv/package.py b/var/spack/repos/builtin/packages/r-numderiv/package.py index 86887bb1a5..a5160ef864 100644 --- a/var/spack/repos/builtin/packages/r-numderiv/package.py +++ b/var/spack/repos/builtin/packages/r-numderiv/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-oligoclasses/package.py b/var/spack/repos/builtin/packages/r-oligoclasses/package.py index 85e221e275..694277b30d 100644 --- a/var/spack/repos/builtin/packages/r-oligoclasses/package.py +++ b/var/spack/repos/builtin/packages/r-oligoclasses/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-oo/package.py b/var/spack/repos/builtin/packages/r-oo/package.py index 7f4a3e39d9..8fe36a7422 100644 --- a/var/spack/repos/builtin/packages/r-oo/package.py +++ b/var/spack/repos/builtin/packages/r-oo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-openssl/package.py b/var/spack/repos/builtin/packages/r-openssl/package.py index 4c038f29c9..edcff2f362 100644 --- a/var/spack/repos/builtin/packages/r-openssl/package.py +++ b/var/spack/repos/builtin/packages/r-openssl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-org-hs-eg-db/package.py b/var/spack/repos/builtin/packages/r-org-hs-eg-db/package.py index 64c788396e..406dd906bc 100644 --- a/var/spack/repos/builtin/packages/r-org-hs-eg-db/package.py +++ b/var/spack/repos/builtin/packages/r-org-hs-eg-db/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-organismdbi/package.py b/var/spack/repos/builtin/packages/r-organismdbi/package.py index b299c5919b..7b6672122a 100644 --- a/var/spack/repos/builtin/packages/r-organismdbi/package.py +++ b/var/spack/repos/builtin/packages/r-organismdbi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-packrat/package.py b/var/spack/repos/builtin/packages/r-packrat/package.py index c87326cacb..f7ea56475c 100644 --- a/var/spack/repos/builtin/packages/r-packrat/package.py +++ b/var/spack/repos/builtin/packages/r-packrat/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-pacman/package.py b/var/spack/repos/builtin/packages/r-pacman/package.py index c272904a2e..09dba376a7 100644 --- a/var/spack/repos/builtin/packages/r-pacman/package.py +++ b/var/spack/repos/builtin/packages/r-pacman/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-pamr/package.py b/var/spack/repos/builtin/packages/r-pamr/package.py index 9e3de93ad6..d14f717869 100644 --- a/var/spack/repos/builtin/packages/r-pamr/package.py +++ b/var/spack/repos/builtin/packages/r-pamr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-party/package.py b/var/spack/repos/builtin/packages/r-party/package.py index de9be7d79d..60ab4bdf80 100644 --- a/var/spack/repos/builtin/packages/r-party/package.py +++ b/var/spack/repos/builtin/packages/r-party/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-partykit/package.py b/var/spack/repos/builtin/packages/r-partykit/package.py index 45ce019cad..326edafa70 100644 --- a/var/spack/repos/builtin/packages/r-partykit/package.py +++ b/var/spack/repos/builtin/packages/r-partykit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-pathview/package.py b/var/spack/repos/builtin/packages/r-pathview/package.py index 13c6a27c9e..df01a762bb 100644 --- a/var/spack/repos/builtin/packages/r-pathview/package.py +++ b/var/spack/repos/builtin/packages/r-pathview/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-pbapply/package.py b/var/spack/repos/builtin/packages/r-pbapply/package.py index 4d6da2ed77..f3e71a13be 100644 --- a/var/spack/repos/builtin/packages/r-pbapply/package.py +++ b/var/spack/repos/builtin/packages/r-pbapply/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-pbdzmq/package.py b/var/spack/repos/builtin/packages/r-pbdzmq/package.py index 82adce3430..1cca47f6c1 100644 --- a/var/spack/repos/builtin/packages/r-pbdzmq/package.py +++ b/var/spack/repos/builtin/packages/r-pbdzmq/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-pbkrtest/package.py b/var/spack/repos/builtin/packages/r-pbkrtest/package.py index 4d6ae727cc..8a4af9cd80 100644 --- a/var/spack/repos/builtin/packages/r-pbkrtest/package.py +++ b/var/spack/repos/builtin/packages/r-pbkrtest/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-pcamethods/package.py b/var/spack/repos/builtin/packages/r-pcamethods/package.py index b43fac79d0..46fb07ba13 100644 --- a/var/spack/repos/builtin/packages/r-pcamethods/package.py +++ b/var/spack/repos/builtin/packages/r-pcamethods/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-pcapp/package.py b/var/spack/repos/builtin/packages/r-pcapp/package.py index 2274cead3f..1d1b6c6a2e 100644 --- a/var/spack/repos/builtin/packages/r-pcapp/package.py +++ b/var/spack/repos/builtin/packages/r-pcapp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-permute/package.py b/var/spack/repos/builtin/packages/r-permute/package.py index 846028e0da..3920ec25f1 100644 --- a/var/spack/repos/builtin/packages/r-permute/package.py +++ b/var/spack/repos/builtin/packages/r-permute/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-pfam-db/package.py b/var/spack/repos/builtin/packages/r-pfam-db/package.py index ef580a84bb..2a3e9e43f6 100644 --- a/var/spack/repos/builtin/packages/r-pfam-db/package.py +++ b/var/spack/repos/builtin/packages/r-pfam-db/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-phangorn/package.py b/var/spack/repos/builtin/packages/r-phangorn/package.py index 1710b2b75f..7997da7110 100644 --- a/var/spack/repos/builtin/packages/r-phangorn/package.py +++ b/var/spack/repos/builtin/packages/r-phangorn/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-phantompeakqualtools/package.py b/var/spack/repos/builtin/packages/r-phantompeakqualtools/package.py index d32f402974..f71129c578 100644 --- a/var/spack/repos/builtin/packages/r-phantompeakqualtools/package.py +++ b/var/spack/repos/builtin/packages/r-phantompeakqualtools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-phyloseq/package.py b/var/spack/repos/builtin/packages/r-phyloseq/package.py index 8976ec7e27..ee6be01977 100644 --- a/var/spack/repos/builtin/packages/r-phyloseq/package.py +++ b/var/spack/repos/builtin/packages/r-phyloseq/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-pkgconfig/package.py b/var/spack/repos/builtin/packages/r-pkgconfig/package.py index 56263cb210..5af625de8d 100644 --- a/var/spack/repos/builtin/packages/r-pkgconfig/package.py +++ b/var/spack/repos/builtin/packages/r-pkgconfig/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-pkgmaker/package.py b/var/spack/repos/builtin/packages/r-pkgmaker/package.py index efb91262a4..c66afec4be 100644 --- a/var/spack/repos/builtin/packages/r-pkgmaker/package.py +++ b/var/spack/repos/builtin/packages/r-pkgmaker/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-plogr/package.py b/var/spack/repos/builtin/packages/r-plogr/package.py index 0f5e1319b7..146bf7e570 100644 --- a/var/spack/repos/builtin/packages/r-plogr/package.py +++ b/var/spack/repos/builtin/packages/r-plogr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-plotly/package.py b/var/spack/repos/builtin/packages/r-plotly/package.py index 9780cf8ef7..b6eac472e9 100644 --- a/var/spack/repos/builtin/packages/r-plotly/package.py +++ b/var/spack/repos/builtin/packages/r-plotly/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-plotrix/package.py b/var/spack/repos/builtin/packages/r-plotrix/package.py index 018d68c498..dbf19cea0e 100644 --- a/var/spack/repos/builtin/packages/r-plotrix/package.py +++ b/var/spack/repos/builtin/packages/r-plotrix/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-pls/package.py b/var/spack/repos/builtin/packages/r-pls/package.py index b4d5c5c493..05299f98b3 100644 --- a/var/spack/repos/builtin/packages/r-pls/package.py +++ b/var/spack/repos/builtin/packages/r-pls/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-plyr/package.py b/var/spack/repos/builtin/packages/r-plyr/package.py index 70a2659f95..8fc68b142f 100644 --- a/var/spack/repos/builtin/packages/r-plyr/package.py +++ b/var/spack/repos/builtin/packages/r-plyr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-pmcmr/package.py b/var/spack/repos/builtin/packages/r-pmcmr/package.py index 11d8d3edfb..207361c195 100644 --- a/var/spack/repos/builtin/packages/r-pmcmr/package.py +++ b/var/spack/repos/builtin/packages/r-pmcmr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-png/package.py b/var/spack/repos/builtin/packages/r-png/package.py index 6d65cc6476..13bccf037b 100644 --- a/var/spack/repos/builtin/packages/r-png/package.py +++ b/var/spack/repos/builtin/packages/r-png/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-powerlaw/package.py b/var/spack/repos/builtin/packages/r-powerlaw/package.py index 0b05cdd128..7c3c5fac76 100644 --- a/var/spack/repos/builtin/packages/r-powerlaw/package.py +++ b/var/spack/repos/builtin/packages/r-powerlaw/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-prabclus/package.py b/var/spack/repos/builtin/packages/r-prabclus/package.py index de5b5b7db9..a32cd4fb83 100644 --- a/var/spack/repos/builtin/packages/r-prabclus/package.py +++ b/var/spack/repos/builtin/packages/r-prabclus/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-praise/package.py b/var/spack/repos/builtin/packages/r-praise/package.py index f58ba04b06..5b9eaa2926 100644 --- a/var/spack/repos/builtin/packages/r-praise/package.py +++ b/var/spack/repos/builtin/packages/r-praise/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-preprocesscore/package.py b/var/spack/repos/builtin/packages/r-preprocesscore/package.py index 95ce33d8c3..b053574b48 100644 --- a/var/spack/repos/builtin/packages/r-preprocesscore/package.py +++ b/var/spack/repos/builtin/packages/r-preprocesscore/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-prettyunits/package.py b/var/spack/repos/builtin/packages/r-prettyunits/package.py index 0741d17411..c18e83eddf 100644 --- a/var/spack/repos/builtin/packages/r-prettyunits/package.py +++ b/var/spack/repos/builtin/packages/r-prettyunits/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-prodlim/package.py b/var/spack/repos/builtin/packages/r-prodlim/package.py index b9721174d6..89727f9849 100644 --- a/var/spack/repos/builtin/packages/r-prodlim/package.py +++ b/var/spack/repos/builtin/packages/r-prodlim/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-progress/package.py b/var/spack/repos/builtin/packages/r-progress/package.py index b5a909a73d..dd155d5c85 100644 --- a/var/spack/repos/builtin/packages/r-progress/package.py +++ b/var/spack/repos/builtin/packages/r-progress/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-protgenerics/package.py b/var/spack/repos/builtin/packages/r-protgenerics/package.py index 7ec8fa8537..4fbd0c4f63 100644 --- a/var/spack/repos/builtin/packages/r-protgenerics/package.py +++ b/var/spack/repos/builtin/packages/r-protgenerics/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-proto/package.py b/var/spack/repos/builtin/packages/r-proto/package.py index 412ad956e3..499611b77a 100644 --- a/var/spack/repos/builtin/packages/r-proto/package.py +++ b/var/spack/repos/builtin/packages/r-proto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-proxy/package.py b/var/spack/repos/builtin/packages/r-proxy/package.py index 5f6057c769..f60e602c5c 100644 --- a/var/spack/repos/builtin/packages/r-proxy/package.py +++ b/var/spack/repos/builtin/packages/r-proxy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-pryr/package.py b/var/spack/repos/builtin/packages/r-pryr/package.py index b1e9ad4e9b..2c16ede1dc 100644 --- a/var/spack/repos/builtin/packages/r-pryr/package.py +++ b/var/spack/repos/builtin/packages/r-pryr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-psych/package.py b/var/spack/repos/builtin/packages/r-psych/package.py index da3e57329c..dc14656bd0 100644 --- a/var/spack/repos/builtin/packages/r-psych/package.py +++ b/var/spack/repos/builtin/packages/r-psych/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-ptw/package.py b/var/spack/repos/builtin/packages/r-ptw/package.py index 38048bc2a7..eae09c4840 100644 --- a/var/spack/repos/builtin/packages/r-ptw/package.py +++ b/var/spack/repos/builtin/packages/r-ptw/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-purrr/package.py b/var/spack/repos/builtin/packages/r-purrr/package.py index 4ef40d9480..06d1e69773 100644 --- a/var/spack/repos/builtin/packages/r-purrr/package.py +++ b/var/spack/repos/builtin/packages/r-purrr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-quadprog/package.py b/var/spack/repos/builtin/packages/r-quadprog/package.py index dc35139a65..5442156396 100644 --- a/var/spack/repos/builtin/packages/r-quadprog/package.py +++ b/var/spack/repos/builtin/packages/r-quadprog/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-quantmod/package.py b/var/spack/repos/builtin/packages/r-quantmod/package.py index 749558f894..026eaa40d0 100644 --- a/var/spack/repos/builtin/packages/r-quantmod/package.py +++ b/var/spack/repos/builtin/packages/r-quantmod/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-quantreg/package.py b/var/spack/repos/builtin/packages/r-quantreg/package.py index 6b33827526..bd81e8967c 100644 --- a/var/spack/repos/builtin/packages/r-quantreg/package.py +++ b/var/spack/repos/builtin/packages/r-quantreg/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-quantro/package.py b/var/spack/repos/builtin/packages/r-quantro/package.py index 05185abe8b..23b52f25f4 100644 --- a/var/spack/repos/builtin/packages/r-quantro/package.py +++ b/var/spack/repos/builtin/packages/r-quantro/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-qvalue/package.py b/var/spack/repos/builtin/packages/r-qvalue/package.py index f34f00c7e4..d7e16d0634 100644 --- a/var/spack/repos/builtin/packages/r-qvalue/package.py +++ b/var/spack/repos/builtin/packages/r-qvalue/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-r6/package.py b/var/spack/repos/builtin/packages/r-r6/package.py index f424b1c8e1..56e9735713 100644 --- a/var/spack/repos/builtin/packages/r-r6/package.py +++ b/var/spack/repos/builtin/packages/r-r6/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-randomforest/package.py b/var/spack/repos/builtin/packages/r-randomforest/package.py index 3fbb2a3d1e..527274251c 100644 --- a/var/spack/repos/builtin/packages/r-randomforest/package.py +++ b/var/spack/repos/builtin/packages/r-randomforest/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-ranger/package.py b/var/spack/repos/builtin/packages/r-ranger/package.py index 599d9b6209..686ff137cb 100644 --- a/var/spack/repos/builtin/packages/r-ranger/package.py +++ b/var/spack/repos/builtin/packages/r-ranger/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rappdirs/package.py b/var/spack/repos/builtin/packages/r-rappdirs/package.py index fdda21240f..e8de39f448 100644 --- a/var/spack/repos/builtin/packages/r-rappdirs/package.py +++ b/var/spack/repos/builtin/packages/r-rappdirs/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-raster/package.py b/var/spack/repos/builtin/packages/r-raster/package.py index 917adfb7d6..71d1e69cf1 100644 --- a/var/spack/repos/builtin/packages/r-raster/package.py +++ b/var/spack/repos/builtin/packages/r-raster/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rbgl/package.py b/var/spack/repos/builtin/packages/r-rbgl/package.py index 13cd4fb68e..235cc7b49b 100644 --- a/var/spack/repos/builtin/packages/r-rbgl/package.py +++ b/var/spack/repos/builtin/packages/r-rbgl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rbokeh/package.py b/var/spack/repos/builtin/packages/r-rbokeh/package.py index ee254db179..90417e8835 100644 --- a/var/spack/repos/builtin/packages/r-rbokeh/package.py +++ b/var/spack/repos/builtin/packages/r-rbokeh/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rcolorbrewer/package.py b/var/spack/repos/builtin/packages/r-rcolorbrewer/package.py index 6092e34163..c94b052126 100644 --- a/var/spack/repos/builtin/packages/r-rcolorbrewer/package.py +++ b/var/spack/repos/builtin/packages/r-rcolorbrewer/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rcpp/package.py b/var/spack/repos/builtin/packages/r-rcpp/package.py index b95626020a..88b9b709fb 100644 --- a/var/spack/repos/builtin/packages/r-rcpp/package.py +++ b/var/spack/repos/builtin/packages/r-rcpp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rcpparmadillo/package.py b/var/spack/repos/builtin/packages/r-rcpparmadillo/package.py index dba1dfe93d..eae404490a 100644 --- a/var/spack/repos/builtin/packages/r-rcpparmadillo/package.py +++ b/var/spack/repos/builtin/packages/r-rcpparmadillo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rcppblaze/package.py b/var/spack/repos/builtin/packages/r-rcppblaze/package.py index a270c7586a..8c57651b5f 100644 --- a/var/spack/repos/builtin/packages/r-rcppblaze/package.py +++ b/var/spack/repos/builtin/packages/r-rcppblaze/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rcppcctz/package.py b/var/spack/repos/builtin/packages/r-rcppcctz/package.py index 070d47806a..e8bde9f76b 100644 --- a/var/spack/repos/builtin/packages/r-rcppcctz/package.py +++ b/var/spack/repos/builtin/packages/r-rcppcctz/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rcppeigen/package.py b/var/spack/repos/builtin/packages/r-rcppeigen/package.py index 47ce27e3f5..e47b28481d 100644 --- a/var/spack/repos/builtin/packages/r-rcppeigen/package.py +++ b/var/spack/repos/builtin/packages/r-rcppeigen/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rcppprogress/package.py b/var/spack/repos/builtin/packages/r-rcppprogress/package.py index b19c323b4e..53d3c6d084 100644 --- a/var/spack/repos/builtin/packages/r-rcppprogress/package.py +++ b/var/spack/repos/builtin/packages/r-rcppprogress/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rcurl/package.py b/var/spack/repos/builtin/packages/r-rcurl/package.py index a60499330c..e7deb60f6a 100644 --- a/var/spack/repos/builtin/packages/r-rcurl/package.py +++ b/var/spack/repos/builtin/packages/r-rcurl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rda/package.py b/var/spack/repos/builtin/packages/r-rda/package.py index 614f6756ce..dd3da00eac 100644 --- a/var/spack/repos/builtin/packages/r-rda/package.py +++ b/var/spack/repos/builtin/packages/r-rda/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-readr/package.py b/var/spack/repos/builtin/packages/r-readr/package.py index bec64a6ebd..97f0df97c9 100644 --- a/var/spack/repos/builtin/packages/r-readr/package.py +++ b/var/spack/repos/builtin/packages/r-readr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-readxl/package.py b/var/spack/repos/builtin/packages/r-readxl/package.py index c70750ea69..da124a9da1 100644 --- a/var/spack/repos/builtin/packages/r-readxl/package.py +++ b/var/spack/repos/builtin/packages/r-readxl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-registry/package.py b/var/spack/repos/builtin/packages/r-registry/package.py index da252a9681..54ae92a648 100644 --- a/var/spack/repos/builtin/packages/r-registry/package.py +++ b/var/spack/repos/builtin/packages/r-registry/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rematch/package.py b/var/spack/repos/builtin/packages/r-rematch/package.py index 931f979c60..3cb7c6b5eb 100644 --- a/var/spack/repos/builtin/packages/r-rematch/package.py +++ b/var/spack/repos/builtin/packages/r-rematch/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-reordercluster/package.py b/var/spack/repos/builtin/packages/r-reordercluster/package.py index 49ab521967..9be4334ead 100644 --- a/var/spack/repos/builtin/packages/r-reordercluster/package.py +++ b/var/spack/repos/builtin/packages/r-reordercluster/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-reportingtools/package.py b/var/spack/repos/builtin/packages/r-reportingtools/package.py index db5978248c..6a0835a129 100644 --- a/var/spack/repos/builtin/packages/r-reportingtools/package.py +++ b/var/spack/repos/builtin/packages/r-reportingtools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-repr/package.py b/var/spack/repos/builtin/packages/r-repr/package.py index 056e19aedc..69c378d66a 100644 --- a/var/spack/repos/builtin/packages/r-repr/package.py +++ b/var/spack/repos/builtin/packages/r-repr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-reprex/package.py b/var/spack/repos/builtin/packages/r-reprex/package.py index a4fa82ed16..7aeb1938e5 100644 --- a/var/spack/repos/builtin/packages/r-reprex/package.py +++ b/var/spack/repos/builtin/packages/r-reprex/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-reshape/package.py b/var/spack/repos/builtin/packages/r-reshape/package.py index a4da7286ca..1e3dabf10a 100644 --- a/var/spack/repos/builtin/packages/r-reshape/package.py +++ b/var/spack/repos/builtin/packages/r-reshape/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-reshape2/package.py b/var/spack/repos/builtin/packages/r-reshape2/package.py index 204ccdee8a..07f0538da6 100644 --- a/var/spack/repos/builtin/packages/r-reshape2/package.py +++ b/var/spack/repos/builtin/packages/r-reshape2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rex/package.py b/var/spack/repos/builtin/packages/r-rex/package.py index e39976644c..be2435c74c 100644 --- a/var/spack/repos/builtin/packages/r-rex/package.py +++ b/var/spack/repos/builtin/packages/r-rex/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rgdal/package.py b/var/spack/repos/builtin/packages/r-rgdal/package.py index 3ac6469d98..648e509580 100644 --- a/var/spack/repos/builtin/packages/r-rgdal/package.py +++ b/var/spack/repos/builtin/packages/r-rgdal/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rgeos/package.py b/var/spack/repos/builtin/packages/r-rgeos/package.py index 83ccbef223..a2a667d33b 100644 --- a/var/spack/repos/builtin/packages/r-rgeos/package.py +++ b/var/spack/repos/builtin/packages/r-rgeos/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rgl/package.py b/var/spack/repos/builtin/packages/r-rgl/package.py index 97f89ed092..a68dca84a9 100644 --- a/var/spack/repos/builtin/packages/r-rgl/package.py +++ b/var/spack/repos/builtin/packages/r-rgl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rgooglemaps/package.py b/var/spack/repos/builtin/packages/r-rgooglemaps/package.py index e1665fd991..be27501def 100644 --- a/var/spack/repos/builtin/packages/r-rgooglemaps/package.py +++ b/var/spack/repos/builtin/packages/r-rgooglemaps/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rgraphviz/package.py b/var/spack/repos/builtin/packages/r-rgraphviz/package.py index 50633fb2ae..be4f12d535 100644 --- a/var/spack/repos/builtin/packages/r-rgraphviz/package.py +++ b/var/spack/repos/builtin/packages/r-rgraphviz/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rhdf5/package.py b/var/spack/repos/builtin/packages/r-rhdf5/package.py index 49cfa5d70d..24e9e7b81f 100644 --- a/var/spack/repos/builtin/packages/r-rhdf5/package.py +++ b/var/spack/repos/builtin/packages/r-rhdf5/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rhtslib/package.py b/var/spack/repos/builtin/packages/r-rhtslib/package.py index 0c52ea832e..4a43685abf 100644 --- a/var/spack/repos/builtin/packages/r-rhtslib/package.py +++ b/var/spack/repos/builtin/packages/r-rhtslib/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rinside/package.py b/var/spack/repos/builtin/packages/r-rinside/package.py index 1d744db01d..c3c527bef7 100644 --- a/var/spack/repos/builtin/packages/r-rinside/package.py +++ b/var/spack/repos/builtin/packages/r-rinside/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rjags/package.py b/var/spack/repos/builtin/packages/r-rjags/package.py index ec56d8c3af..de2b3b6b24 100644 --- a/var/spack/repos/builtin/packages/r-rjags/package.py +++ b/var/spack/repos/builtin/packages/r-rjags/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rjava/package.py b/var/spack/repos/builtin/packages/r-rjava/package.py index a1e8003343..9bcc16f3da 100644 --- a/var/spack/repos/builtin/packages/r-rjava/package.py +++ b/var/spack/repos/builtin/packages/r-rjava/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rjson/package.py b/var/spack/repos/builtin/packages/r-rjson/package.py index d22b7c780f..fa45822603 100644 --- a/var/spack/repos/builtin/packages/r-rjson/package.py +++ b/var/spack/repos/builtin/packages/r-rjson/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rjsonio/package.py b/var/spack/repos/builtin/packages/r-rjsonio/package.py index 064a50aea8..d91ccf2415 100644 --- a/var/spack/repos/builtin/packages/r-rjsonio/package.py +++ b/var/spack/repos/builtin/packages/r-rjsonio/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rlang/package.py b/var/spack/repos/builtin/packages/r-rlang/package.py index 86eb205b7c..1550c6b11b 100644 --- a/var/spack/repos/builtin/packages/r-rlang/package.py +++ b/var/spack/repos/builtin/packages/r-rlang/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rmarkdown/package.py b/var/spack/repos/builtin/packages/r-rmarkdown/package.py index 49841d213e..a308ab264f 100644 --- a/var/spack/repos/builtin/packages/r-rmarkdown/package.py +++ b/var/spack/repos/builtin/packages/r-rmarkdown/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rminer/package.py b/var/spack/repos/builtin/packages/r-rminer/package.py index 2bd9147afb..2a480ba384 100644 --- a/var/spack/repos/builtin/packages/r-rminer/package.py +++ b/var/spack/repos/builtin/packages/r-rminer/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rmpfr/package.py b/var/spack/repos/builtin/packages/r-rmpfr/package.py index 1c2e5aafe3..3de225cb11 100644 --- a/var/spack/repos/builtin/packages/r-rmpfr/package.py +++ b/var/spack/repos/builtin/packages/r-rmpfr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rmpi/package.py b/var/spack/repos/builtin/packages/r-rmpi/package.py index e7e2870975..498419b899 100644 --- a/var/spack/repos/builtin/packages/r-rmpi/package.py +++ b/var/spack/repos/builtin/packages/r-rmpi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rmysql/package.py b/var/spack/repos/builtin/packages/r-rmysql/package.py index e34677652c..b75cf81bc0 100644 --- a/var/spack/repos/builtin/packages/r-rmysql/package.py +++ b/var/spack/repos/builtin/packages/r-rmysql/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rngtools/package.py b/var/spack/repos/builtin/packages/r-rngtools/package.py index a9b06161d7..3e637f327c 100644 --- a/var/spack/repos/builtin/packages/r-rngtools/package.py +++ b/var/spack/repos/builtin/packages/r-rngtools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-robustbase/package.py b/var/spack/repos/builtin/packages/r-robustbase/package.py index 1361e289fb..e8ba4e5501 100644 --- a/var/spack/repos/builtin/packages/r-robustbase/package.py +++ b/var/spack/repos/builtin/packages/r-robustbase/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rocr/package.py b/var/spack/repos/builtin/packages/r-rocr/package.py index 9936d99dbf..b70e48dfc0 100644 --- a/var/spack/repos/builtin/packages/r-rocr/package.py +++ b/var/spack/repos/builtin/packages/r-rocr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rodbc/package.py b/var/spack/repos/builtin/packages/r-rodbc/package.py index f7364b16fc..9b5f147e07 100644 --- a/var/spack/repos/builtin/packages/r-rodbc/package.py +++ b/var/spack/repos/builtin/packages/r-rodbc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-roxygen2/package.py b/var/spack/repos/builtin/packages/r-roxygen2/package.py index 30e295fbad..ab88940199 100644 --- a/var/spack/repos/builtin/packages/r-roxygen2/package.py +++ b/var/spack/repos/builtin/packages/r-roxygen2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rpart-plot/package.py b/var/spack/repos/builtin/packages/r-rpart-plot/package.py index e7c1a09519..93bc34241c 100644 --- a/var/spack/repos/builtin/packages/r-rpart-plot/package.py +++ b/var/spack/repos/builtin/packages/r-rpart-plot/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rpart/package.py b/var/spack/repos/builtin/packages/r-rpart/package.py index adfbf3fdef..22186ed510 100644 --- a/var/spack/repos/builtin/packages/r-rpart/package.py +++ b/var/spack/repos/builtin/packages/r-rpart/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rpostgresql/package.py b/var/spack/repos/builtin/packages/r-rpostgresql/package.py index 3c8d9f0798..0c71fb2a6a 100644 --- a/var/spack/repos/builtin/packages/r-rpostgresql/package.py +++ b/var/spack/repos/builtin/packages/r-rpostgresql/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rprojroot/package.py b/var/spack/repos/builtin/packages/r-rprojroot/package.py index 75e8930679..ae3014ddbb 100644 --- a/var/spack/repos/builtin/packages/r-rprojroot/package.py +++ b/var/spack/repos/builtin/packages/r-rprojroot/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rsamtools/package.py b/var/spack/repos/builtin/packages/r-rsamtools/package.py index 41b08a95c7..0491c77933 100644 --- a/var/spack/repos/builtin/packages/r-rsamtools/package.py +++ b/var/spack/repos/builtin/packages/r-rsamtools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rsnns/package.py b/var/spack/repos/builtin/packages/r-rsnns/package.py index 92b891bf1a..7062e43242 100644 --- a/var/spack/repos/builtin/packages/r-rsnns/package.py +++ b/var/spack/repos/builtin/packages/r-rsnns/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rsqlite/package.py b/var/spack/repos/builtin/packages/r-rsqlite/package.py index 50cd4df05d..4366a07841 100644 --- a/var/spack/repos/builtin/packages/r-rsqlite/package.py +++ b/var/spack/repos/builtin/packages/r-rsqlite/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rstan/package.py b/var/spack/repos/builtin/packages/r-rstan/package.py index 50c9dbb205..44dc8d5777 100644 --- a/var/spack/repos/builtin/packages/r-rstan/package.py +++ b/var/spack/repos/builtin/packages/r-rstan/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rstudioapi/package.py b/var/spack/repos/builtin/packages/r-rstudioapi/package.py index a9d977f62e..3c3fcf0def 100644 --- a/var/spack/repos/builtin/packages/r-rstudioapi/package.py +++ b/var/spack/repos/builtin/packages/r-rstudioapi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rtracklayer/package.py b/var/spack/repos/builtin/packages/r-rtracklayer/package.py index 11f604b72f..171a49de82 100644 --- a/var/spack/repos/builtin/packages/r-rtracklayer/package.py +++ b/var/spack/repos/builtin/packages/r-rtracklayer/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rtsne/package.py b/var/spack/repos/builtin/packages/r-rtsne/package.py index f1ac7aad78..1c1014474a 100644 --- a/var/spack/repos/builtin/packages/r-rtsne/package.py +++ b/var/spack/repos/builtin/packages/r-rtsne/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rvcheck/package.py b/var/spack/repos/builtin/packages/r-rvcheck/package.py index d8982f35fb..273fb3e4ee 100644 --- a/var/spack/repos/builtin/packages/r-rvcheck/package.py +++ b/var/spack/repos/builtin/packages/r-rvcheck/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rvest/package.py b/var/spack/repos/builtin/packages/r-rvest/package.py index d35e14ace7..5865b622f6 100644 --- a/var/spack/repos/builtin/packages/r-rvest/package.py +++ b/var/spack/repos/builtin/packages/r-rvest/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-rzmq/package.py b/var/spack/repos/builtin/packages/r-rzmq/package.py index 18ef9e04f2..ea153d920c 100644 --- a/var/spack/repos/builtin/packages/r-rzmq/package.py +++ b/var/spack/repos/builtin/packages/r-rzmq/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-s4vectors/package.py b/var/spack/repos/builtin/packages/r-s4vectors/package.py index 84ee43cdfe..3a2c2ee7ea 100644 --- a/var/spack/repos/builtin/packages/r-s4vectors/package.py +++ b/var/spack/repos/builtin/packages/r-s4vectors/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-samr/package.py b/var/spack/repos/builtin/packages/r-samr/package.py index da575143e8..a3069a6202 100644 --- a/var/spack/repos/builtin/packages/r-samr/package.py +++ b/var/spack/repos/builtin/packages/r-samr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-sandwich/package.py b/var/spack/repos/builtin/packages/r-sandwich/package.py index 5f7d66dd7a..8a84e2dea8 100644 --- a/var/spack/repos/builtin/packages/r-sandwich/package.py +++ b/var/spack/repos/builtin/packages/r-sandwich/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-scales/package.py b/var/spack/repos/builtin/packages/r-scales/package.py index ebe9798e86..6d359d47db 100644 --- a/var/spack/repos/builtin/packages/r-scales/package.py +++ b/var/spack/repos/builtin/packages/r-scales/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-scatterplot3d/package.py b/var/spack/repos/builtin/packages/r-scatterplot3d/package.py index eedd61cc6e..c6bfd97ba8 100644 --- a/var/spack/repos/builtin/packages/r-scatterplot3d/package.py +++ b/var/spack/repos/builtin/packages/r-scatterplot3d/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-sdmtools/package.py b/var/spack/repos/builtin/packages/r-sdmtools/package.py index a5768981d9..5a891722e3 100644 --- a/var/spack/repos/builtin/packages/r-sdmtools/package.py +++ b/var/spack/repos/builtin/packages/r-sdmtools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-segmented/package.py b/var/spack/repos/builtin/packages/r-segmented/package.py index 784a9d55d5..df4fbe4a18 100644 --- a/var/spack/repos/builtin/packages/r-segmented/package.py +++ b/var/spack/repos/builtin/packages/r-segmented/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-selectr/package.py b/var/spack/repos/builtin/packages/r-selectr/package.py index 321a7da099..889ff9f824 100644 --- a/var/spack/repos/builtin/packages/r-selectr/package.py +++ b/var/spack/repos/builtin/packages/r-selectr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-seqinr/package.py b/var/spack/repos/builtin/packages/r-seqinr/package.py index a78e36ef74..ebbc254ec3 100644 --- a/var/spack/repos/builtin/packages/r-seqinr/package.py +++ b/var/spack/repos/builtin/packages/r-seqinr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-seqlogo/package.py b/var/spack/repos/builtin/packages/r-seqlogo/package.py index c6c77361ee..07207b2b80 100644 --- a/var/spack/repos/builtin/packages/r-seqlogo/package.py +++ b/var/spack/repos/builtin/packages/r-seqlogo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-seurat/package.py b/var/spack/repos/builtin/packages/r-seurat/package.py index 5930430b6d..cd94464bfd 100644 --- a/var/spack/repos/builtin/packages/r-seurat/package.py +++ b/var/spack/repos/builtin/packages/r-seurat/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-sf/package.py b/var/spack/repos/builtin/packages/r-sf/package.py index aba4ea42de..26a46e1242 100644 --- a/var/spack/repos/builtin/packages/r-sf/package.py +++ b/var/spack/repos/builtin/packages/r-sf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-sfsmisc/package.py b/var/spack/repos/builtin/packages/r-sfsmisc/package.py index d07abd3b44..d7b58773b0 100644 --- a/var/spack/repos/builtin/packages/r-sfsmisc/package.py +++ b/var/spack/repos/builtin/packages/r-sfsmisc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-shape/package.py b/var/spack/repos/builtin/packages/r-shape/package.py index 8f07f842e0..dd322c402c 100644 --- a/var/spack/repos/builtin/packages/r-shape/package.py +++ b/var/spack/repos/builtin/packages/r-shape/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-shiny/package.py b/var/spack/repos/builtin/packages/r-shiny/package.py index 1d42d8df23..9b84320d8c 100644 --- a/var/spack/repos/builtin/packages/r-shiny/package.py +++ b/var/spack/repos/builtin/packages/r-shiny/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-shortread/package.py b/var/spack/repos/builtin/packages/r-shortread/package.py index b2625916c8..b5a53d4c7c 100644 --- a/var/spack/repos/builtin/packages/r-shortread/package.py +++ b/var/spack/repos/builtin/packages/r-shortread/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-siggenes/package.py b/var/spack/repos/builtin/packages/r-siggenes/package.py index ec0809c9da..b3f7786a18 100644 --- a/var/spack/repos/builtin/packages/r-siggenes/package.py +++ b/var/spack/repos/builtin/packages/r-siggenes/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-simpleaffy/package.py b/var/spack/repos/builtin/packages/r-simpleaffy/package.py index 36d616fa8c..627e8982c5 100644 --- a/var/spack/repos/builtin/packages/r-simpleaffy/package.py +++ b/var/spack/repos/builtin/packages/r-simpleaffy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-sn/package.py b/var/spack/repos/builtin/packages/r-sn/package.py index 6f20f23e5b..be58d569cc 100644 --- a/var/spack/repos/builtin/packages/r-sn/package.py +++ b/var/spack/repos/builtin/packages/r-sn/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-snow/package.py b/var/spack/repos/builtin/packages/r-snow/package.py index 7be7d36018..74c731c10c 100644 --- a/var/spack/repos/builtin/packages/r-snow/package.py +++ b/var/spack/repos/builtin/packages/r-snow/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-snprelate/package.py b/var/spack/repos/builtin/packages/r-snprelate/package.py index 5b026a5831..ed97780f8a 100644 --- a/var/spack/repos/builtin/packages/r-snprelate/package.py +++ b/var/spack/repos/builtin/packages/r-snprelate/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-som/package.py b/var/spack/repos/builtin/packages/r-som/package.py index 4ac3c0061d..de3f2dfbac 100644 --- a/var/spack/repos/builtin/packages/r-som/package.py +++ b/var/spack/repos/builtin/packages/r-som/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-somaticsignatures/package.py b/var/spack/repos/builtin/packages/r-somaticsignatures/package.py index 004023fd25..7f3d2a9b58 100644 --- a/var/spack/repos/builtin/packages/r-somaticsignatures/package.py +++ b/var/spack/repos/builtin/packages/r-somaticsignatures/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-sourcetools/package.py b/var/spack/repos/builtin/packages/r-sourcetools/package.py index 87f9dfc2c9..fc529c4342 100644 --- a/var/spack/repos/builtin/packages/r-sourcetools/package.py +++ b/var/spack/repos/builtin/packages/r-sourcetools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-sp/package.py b/var/spack/repos/builtin/packages/r-sp/package.py index c085aa1521..11632a23d5 100644 --- a/var/spack/repos/builtin/packages/r-sp/package.py +++ b/var/spack/repos/builtin/packages/r-sp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-sparsem/package.py b/var/spack/repos/builtin/packages/r-sparsem/package.py index 3aac221fd1..eebd751a82 100644 --- a/var/spack/repos/builtin/packages/r-sparsem/package.py +++ b/var/spack/repos/builtin/packages/r-sparsem/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-spdep/package.py b/var/spack/repos/builtin/packages/r-spdep/package.py index f7b7a4671e..66095c6623 100644 --- a/var/spack/repos/builtin/packages/r-spdep/package.py +++ b/var/spack/repos/builtin/packages/r-spdep/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-speedglm/package.py b/var/spack/repos/builtin/packages/r-speedglm/package.py index f520965da5..a8509ca5d9 100644 --- a/var/spack/repos/builtin/packages/r-speedglm/package.py +++ b/var/spack/repos/builtin/packages/r-speedglm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-sqldf/package.py b/var/spack/repos/builtin/packages/r-sqldf/package.py index c891891221..7d4160ed74 100644 --- a/var/spack/repos/builtin/packages/r-sqldf/package.py +++ b/var/spack/repos/builtin/packages/r-sqldf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-stanheaders/package.py b/var/spack/repos/builtin/packages/r-stanheaders/package.py index 383eb82580..6ca0a0aa06 100644 --- a/var/spack/repos/builtin/packages/r-stanheaders/package.py +++ b/var/spack/repos/builtin/packages/r-stanheaders/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-statmod/package.py b/var/spack/repos/builtin/packages/r-statmod/package.py index 7eb095aa92..366765d5b6 100644 --- a/var/spack/repos/builtin/packages/r-statmod/package.py +++ b/var/spack/repos/builtin/packages/r-statmod/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-statnet-common/package.py b/var/spack/repos/builtin/packages/r-statnet-common/package.py index 2c61f23f2e..ccd25ea08b 100644 --- a/var/spack/repos/builtin/packages/r-statnet-common/package.py +++ b/var/spack/repos/builtin/packages/r-statnet-common/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-stringi/package.py b/var/spack/repos/builtin/packages/r-stringi/package.py index 55dd10e378..65d6bf274d 100644 --- a/var/spack/repos/builtin/packages/r-stringi/package.py +++ b/var/spack/repos/builtin/packages/r-stringi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-stringr/package.py b/var/spack/repos/builtin/packages/r-stringr/package.py index 64b291adc5..174c352552 100644 --- a/var/spack/repos/builtin/packages/r-stringr/package.py +++ b/var/spack/repos/builtin/packages/r-stringr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-strucchange/package.py b/var/spack/repos/builtin/packages/r-strucchange/package.py index 4f0a2bf28a..ca1252cf47 100644 --- a/var/spack/repos/builtin/packages/r-strucchange/package.py +++ b/var/spack/repos/builtin/packages/r-strucchange/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-subplex/package.py b/var/spack/repos/builtin/packages/r-subplex/package.py index 66df912a5f..43e0b66985 100644 --- a/var/spack/repos/builtin/packages/r-subplex/package.py +++ b/var/spack/repos/builtin/packages/r-subplex/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-summarizedexperiment/package.py b/var/spack/repos/builtin/packages/r-summarizedexperiment/package.py index 104a61cb8c..afc6d3964b 100644 --- a/var/spack/repos/builtin/packages/r-summarizedexperiment/package.py +++ b/var/spack/repos/builtin/packages/r-summarizedexperiment/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-survey/package.py b/var/spack/repos/builtin/packages/r-survey/package.py index 62d21bb00b..2d5f5d3b75 100644 --- a/var/spack/repos/builtin/packages/r-survey/package.py +++ b/var/spack/repos/builtin/packages/r-survey/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-survival/package.py b/var/spack/repos/builtin/packages/r-survival/package.py index c63c2eb864..6da03e884e 100644 --- a/var/spack/repos/builtin/packages/r-survival/package.py +++ b/var/spack/repos/builtin/packages/r-survival/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-sva/package.py b/var/spack/repos/builtin/packages/r-sva/package.py index 288b0dd625..01531d8a01 100644 --- a/var/spack/repos/builtin/packages/r-sva/package.py +++ b/var/spack/repos/builtin/packages/r-sva/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-tarifx/package.py b/var/spack/repos/builtin/packages/r-tarifx/package.py index b58eb5194e..3d2bfaaf2e 100644 --- a/var/spack/repos/builtin/packages/r-tarifx/package.py +++ b/var/spack/repos/builtin/packages/r-tarifx/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-tclust/package.py b/var/spack/repos/builtin/packages/r-tclust/package.py index 64d2bd5840..0f453b65cc 100644 --- a/var/spack/repos/builtin/packages/r-tclust/package.py +++ b/var/spack/repos/builtin/packages/r-tclust/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-tensora/package.py b/var/spack/repos/builtin/packages/r-tensora/package.py index c19e3604fc..e3281e679b 100644 --- a/var/spack/repos/builtin/packages/r-tensora/package.py +++ b/var/spack/repos/builtin/packages/r-tensora/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-testit/package.py b/var/spack/repos/builtin/packages/r-testit/package.py index 7a5fb607e8..0a84af16d4 100644 --- a/var/spack/repos/builtin/packages/r-testit/package.py +++ b/var/spack/repos/builtin/packages/r-testit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-testthat/package.py b/var/spack/repos/builtin/packages/r-testthat/package.py index 045f447df1..a2b679148f 100644 --- a/var/spack/repos/builtin/packages/r-testthat/package.py +++ b/var/spack/repos/builtin/packages/r-testthat/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-tfbstools/package.py b/var/spack/repos/builtin/packages/r-tfbstools/package.py index 1c8cbf6e6c..655b7a4044 100644 --- a/var/spack/repos/builtin/packages/r-tfbstools/package.py +++ b/var/spack/repos/builtin/packages/r-tfbstools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-tfmpvalue/package.py b/var/spack/repos/builtin/packages/r-tfmpvalue/package.py index 87627579a1..31bd237b67 100644 --- a/var/spack/repos/builtin/packages/r-tfmpvalue/package.py +++ b/var/spack/repos/builtin/packages/r-tfmpvalue/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-th-data/package.py b/var/spack/repos/builtin/packages/r-th-data/package.py index e5713ee9fc..30f23ff34e 100644 --- a/var/spack/repos/builtin/packages/r-th-data/package.py +++ b/var/spack/repos/builtin/packages/r-th-data/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-threejs/package.py b/var/spack/repos/builtin/packages/r-threejs/package.py index f39ede0fb7..6dce878582 100644 --- a/var/spack/repos/builtin/packages/r-threejs/package.py +++ b/var/spack/repos/builtin/packages/r-threejs/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-tibble/package.py b/var/spack/repos/builtin/packages/r-tibble/package.py index 66b9f9235a..ddd2de0125 100644 --- a/var/spack/repos/builtin/packages/r-tibble/package.py +++ b/var/spack/repos/builtin/packages/r-tibble/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-tidycensus/package.py b/var/spack/repos/builtin/packages/r-tidycensus/package.py index e02b796b24..c6f9988a7b 100644 --- a/var/spack/repos/builtin/packages/r-tidycensus/package.py +++ b/var/spack/repos/builtin/packages/r-tidycensus/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-tidyr/package.py b/var/spack/repos/builtin/packages/r-tidyr/package.py index 0e6973fd13..a2d1b55dfd 100644 --- a/var/spack/repos/builtin/packages/r-tidyr/package.py +++ b/var/spack/repos/builtin/packages/r-tidyr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-tiff/package.py b/var/spack/repos/builtin/packages/r-tiff/package.py index c751cb04e2..27e532ec32 100644 --- a/var/spack/repos/builtin/packages/r-tiff/package.py +++ b/var/spack/repos/builtin/packages/r-tiff/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-tigris/package.py b/var/spack/repos/builtin/packages/r-tigris/package.py index fd7fc50490..19d2760295 100644 --- a/var/spack/repos/builtin/packages/r-tigris/package.py +++ b/var/spack/repos/builtin/packages/r-tigris/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-timedate/package.py b/var/spack/repos/builtin/packages/r-timedate/package.py index d593b6c2bc..d8cfe70878 100644 --- a/var/spack/repos/builtin/packages/r-timedate/package.py +++ b/var/spack/repos/builtin/packages/r-timedate/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-topgo/package.py b/var/spack/repos/builtin/packages/r-topgo/package.py index 2eee5ac588..acf0b7df67 100644 --- a/var/spack/repos/builtin/packages/r-topgo/package.py +++ b/var/spack/repos/builtin/packages/r-topgo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-trimcluster/package.py b/var/spack/repos/builtin/packages/r-trimcluster/package.py index c7f6cdb179..ea8ee0bc29 100644 --- a/var/spack/repos/builtin/packages/r-trimcluster/package.py +++ b/var/spack/repos/builtin/packages/r-trimcluster/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-trust/package.py b/var/spack/repos/builtin/packages/r-trust/package.py index e83d8ad2b3..2c1c72d3af 100644 --- a/var/spack/repos/builtin/packages/r-trust/package.py +++ b/var/spack/repos/builtin/packages/r-trust/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-tseries/package.py b/var/spack/repos/builtin/packages/r-tseries/package.py index e581a77596..8e4757aca9 100644 --- a/var/spack/repos/builtin/packages/r-tseries/package.py +++ b/var/spack/repos/builtin/packages/r-tseries/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-tsne/package.py b/var/spack/repos/builtin/packages/r-tsne/package.py index 951692cf63..5733a66116 100644 --- a/var/spack/repos/builtin/packages/r-tsne/package.py +++ b/var/spack/repos/builtin/packages/r-tsne/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-ttr/package.py b/var/spack/repos/builtin/packages/r-ttr/package.py index abaac57c6f..2021765041 100644 --- a/var/spack/repos/builtin/packages/r-ttr/package.py +++ b/var/spack/repos/builtin/packages/r-ttr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-udunits2/package.py b/var/spack/repos/builtin/packages/r-udunits2/package.py index 7bc2521b51..97a45706be 100644 --- a/var/spack/repos/builtin/packages/r-udunits2/package.py +++ b/var/spack/repos/builtin/packages/r-udunits2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-units/package.py b/var/spack/repos/builtin/packages/r-units/package.py index 66f91ec56b..3edf5068be 100644 --- a/var/spack/repos/builtin/packages/r-units/package.py +++ b/var/spack/repos/builtin/packages/r-units/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-utils/package.py b/var/spack/repos/builtin/packages/r-utils/package.py index bb39da3e60..0345fe1a77 100644 --- a/var/spack/repos/builtin/packages/r-utils/package.py +++ b/var/spack/repos/builtin/packages/r-utils/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-uuid/package.py b/var/spack/repos/builtin/packages/r-uuid/package.py index ff0c13cf10..1a83583d5f 100644 --- a/var/spack/repos/builtin/packages/r-uuid/package.py +++ b/var/spack/repos/builtin/packages/r-uuid/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-variantannotation/package.py b/var/spack/repos/builtin/packages/r-variantannotation/package.py index 1b8e3da4d5..66b4ff014d 100644 --- a/var/spack/repos/builtin/packages/r-variantannotation/package.py +++ b/var/spack/repos/builtin/packages/r-variantannotation/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-varselrf/package.py b/var/spack/repos/builtin/packages/r-varselrf/package.py index 7cfb3392cd..4158c2b835 100644 --- a/var/spack/repos/builtin/packages/r-varselrf/package.py +++ b/var/spack/repos/builtin/packages/r-varselrf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-vcd/package.py b/var/spack/repos/builtin/packages/r-vcd/package.py index c0ca50a605..aa361a6dc8 100644 --- a/var/spack/repos/builtin/packages/r-vcd/package.py +++ b/var/spack/repos/builtin/packages/r-vcd/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-vegan/package.py b/var/spack/repos/builtin/packages/r-vegan/package.py index 51591ec41d..e974902e0c 100644 --- a/var/spack/repos/builtin/packages/r-vegan/package.py +++ b/var/spack/repos/builtin/packages/r-vegan/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-vgam/package.py b/var/spack/repos/builtin/packages/r-vgam/package.py index bbb0e0fcd1..06f6e61ceb 100644 --- a/var/spack/repos/builtin/packages/r-vgam/package.py +++ b/var/spack/repos/builtin/packages/r-vgam/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-viridis/package.py b/var/spack/repos/builtin/packages/r-viridis/package.py index 627ba4ac39..b1cfe05044 100644 --- a/var/spack/repos/builtin/packages/r-viridis/package.py +++ b/var/spack/repos/builtin/packages/r-viridis/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-viridislite/package.py b/var/spack/repos/builtin/packages/r-viridislite/package.py index bfdd6c3bc5..969148dbbd 100644 --- a/var/spack/repos/builtin/packages/r-viridislite/package.py +++ b/var/spack/repos/builtin/packages/r-viridislite/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-visnetwork/package.py b/var/spack/repos/builtin/packages/r-visnetwork/package.py index 5cbc427c17..8d8935414c 100644 --- a/var/spack/repos/builtin/packages/r-visnetwork/package.py +++ b/var/spack/repos/builtin/packages/r-visnetwork/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-vsn/package.py b/var/spack/repos/builtin/packages/r-vsn/package.py index 649f42ea5d..20a761b1f9 100644 --- a/var/spack/repos/builtin/packages/r-vsn/package.py +++ b/var/spack/repos/builtin/packages/r-vsn/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-whisker/package.py b/var/spack/repos/builtin/packages/r-whisker/package.py index d22b1a5209..5386eae32e 100644 --- a/var/spack/repos/builtin/packages/r-whisker/package.py +++ b/var/spack/repos/builtin/packages/r-whisker/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-withr/package.py b/var/spack/repos/builtin/packages/r-withr/package.py index 67afc532ae..0795c2f8ad 100644 --- a/var/spack/repos/builtin/packages/r-withr/package.py +++ b/var/spack/repos/builtin/packages/r-withr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-xde/package.py b/var/spack/repos/builtin/packages/r-xde/package.py index 5d4a686fb5..baac09e451 100644 --- a/var/spack/repos/builtin/packages/r-xde/package.py +++ b/var/spack/repos/builtin/packages/r-xde/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-xgboost/package.py b/var/spack/repos/builtin/packages/r-xgboost/package.py index 22f87b5c54..fd5a5ea39e 100644 --- a/var/spack/repos/builtin/packages/r-xgboost/package.py +++ b/var/spack/repos/builtin/packages/r-xgboost/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-xlconnect/package.py b/var/spack/repos/builtin/packages/r-xlconnect/package.py index 6a388c14a5..2b56f83c9a 100644 --- a/var/spack/repos/builtin/packages/r-xlconnect/package.py +++ b/var/spack/repos/builtin/packages/r-xlconnect/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-xlconnectjars/package.py b/var/spack/repos/builtin/packages/r-xlconnectjars/package.py index fd7913a296..fa6fcbb996 100644 --- a/var/spack/repos/builtin/packages/r-xlconnectjars/package.py +++ b/var/spack/repos/builtin/packages/r-xlconnectjars/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-xlsx/package.py b/var/spack/repos/builtin/packages/r-xlsx/package.py index 988fa41157..e8cbb88d11 100644 --- a/var/spack/repos/builtin/packages/r-xlsx/package.py +++ b/var/spack/repos/builtin/packages/r-xlsx/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-xlsxjars/package.py b/var/spack/repos/builtin/packages/r-xlsxjars/package.py index 8bd19f97c4..c79c922f60 100644 --- a/var/spack/repos/builtin/packages/r-xlsxjars/package.py +++ b/var/spack/repos/builtin/packages/r-xlsxjars/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-xmapbridge/package.py b/var/spack/repos/builtin/packages/r-xmapbridge/package.py index 0836eb3951..d36f6d4922 100644 --- a/var/spack/repos/builtin/packages/r-xmapbridge/package.py +++ b/var/spack/repos/builtin/packages/r-xmapbridge/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-xml/package.py b/var/spack/repos/builtin/packages/r-xml/package.py index aca86eade4..d9d8afd54b 100644 --- a/var/spack/repos/builtin/packages/r-xml/package.py +++ b/var/spack/repos/builtin/packages/r-xml/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-xml2/package.py b/var/spack/repos/builtin/packages/r-xml2/package.py index ffbe0f626f..b43c3627ac 100644 --- a/var/spack/repos/builtin/packages/r-xml2/package.py +++ b/var/spack/repos/builtin/packages/r-xml2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-xtable/package.py b/var/spack/repos/builtin/packages/r-xtable/package.py index 8f3cc65c0b..05aea7033b 100644 --- a/var/spack/repos/builtin/packages/r-xtable/package.py +++ b/var/spack/repos/builtin/packages/r-xtable/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-xts/package.py b/var/spack/repos/builtin/packages/r-xts/package.py index 1c1184428a..13fc6c35e1 100644 --- a/var/spack/repos/builtin/packages/r-xts/package.py +++ b/var/spack/repos/builtin/packages/r-xts/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-xvector/package.py b/var/spack/repos/builtin/packages/r-xvector/package.py index 4018422c18..e30f302403 100644 --- a/var/spack/repos/builtin/packages/r-xvector/package.py +++ b/var/spack/repos/builtin/packages/r-xvector/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-yaml/package.py b/var/spack/repos/builtin/packages/r-yaml/package.py index 25e60cdd9a..1cb316475f 100644 --- a/var/spack/repos/builtin/packages/r-yaml/package.py +++ b/var/spack/repos/builtin/packages/r-yaml/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-yapsa/package.py b/var/spack/repos/builtin/packages/r-yapsa/package.py index a69b745a7e..ffe5067227 100644 --- a/var/spack/repos/builtin/packages/r-yapsa/package.py +++ b/var/spack/repos/builtin/packages/r-yapsa/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-yaqcaffy/package.py b/var/spack/repos/builtin/packages/r-yaqcaffy/package.py index 1901990927..5d34329f90 100644 --- a/var/spack/repos/builtin/packages/r-yaqcaffy/package.py +++ b/var/spack/repos/builtin/packages/r-yaqcaffy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-yarn/package.py b/var/spack/repos/builtin/packages/r-yarn/package.py index 5b0a76b476..5ae0139ad1 100644 --- a/var/spack/repos/builtin/packages/r-yarn/package.py +++ b/var/spack/repos/builtin/packages/r-yarn/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-zlibbioc/package.py b/var/spack/repos/builtin/packages/r-zlibbioc/package.py index 280c7da3de..408609875b 100644 --- a/var/spack/repos/builtin/packages/r-zlibbioc/package.py +++ b/var/spack/repos/builtin/packages/r-zlibbioc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r-zoo/package.py b/var/spack/repos/builtin/packages/r-zoo/package.py index 33fa5d3353..0d9c706192 100644 --- a/var/spack/repos/builtin/packages/r-zoo/package.py +++ b/var/spack/repos/builtin/packages/r-zoo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py index 393045d3fd..09e5be5f20 100644 --- a/var/spack/repos/builtin/packages/r/package.py +++ b/var/spack/repos/builtin/packages/r/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/raft/package.py b/var/spack/repos/builtin/packages/raft/package.py index a5cc1f0ced..64313f127a 100644 --- a/var/spack/repos/builtin/packages/raft/package.py +++ b/var/spack/repos/builtin/packages/raft/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/raja/package.py b/var/spack/repos/builtin/packages/raja/package.py index 7d019821cf..29a48078d4 100644 --- a/var/spack/repos/builtin/packages/raja/package.py +++ b/var/spack/repos/builtin/packages/raja/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/randfold/package.py b/var/spack/repos/builtin/packages/randfold/package.py index 5160840332..adfb70e0bf 100644 --- a/var/spack/repos/builtin/packages/randfold/package.py +++ b/var/spack/repos/builtin/packages/randfold/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/random123/package.py b/var/spack/repos/builtin/packages/random123/package.py index 978467b457..ea5160929d 100644 --- a/var/spack/repos/builtin/packages/random123/package.py +++ b/var/spack/repos/builtin/packages/random123/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/randrproto/package.py b/var/spack/repos/builtin/packages/randrproto/package.py index 407686421d..f7b95f53d3 100644 --- a/var/spack/repos/builtin/packages/randrproto/package.py +++ b/var/spack/repos/builtin/packages/randrproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/rapidjson/package.py b/var/spack/repos/builtin/packages/rapidjson/package.py index 5c7356288c..428464a855 100644 --- a/var/spack/repos/builtin/packages/rapidjson/package.py +++ b/var/spack/repos/builtin/packages/rapidjson/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ravel/package.py b/var/spack/repos/builtin/packages/ravel/package.py index 3f03444f76..9e37d7dae9 100644 --- a/var/spack/repos/builtin/packages/ravel/package.py +++ b/var/spack/repos/builtin/packages/ravel/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/raxml/package.py b/var/spack/repos/builtin/packages/raxml/package.py index 96d6f7c95b..b98866bfe2 100644 --- a/var/spack/repos/builtin/packages/raxml/package.py +++ b/var/spack/repos/builtin/packages/raxml/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ray/package.py b/var/spack/repos/builtin/packages/ray/package.py index 45e08c74ff..37ba9a5a44 100644 --- a/var/spack/repos/builtin/packages/ray/package.py +++ b/var/spack/repos/builtin/packages/ray/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/rdp-classifier/package.py b/var/spack/repos/builtin/packages/rdp-classifier/package.py index 637e490a17..524259fd7a 100644 --- a/var/spack/repos/builtin/packages/rdp-classifier/package.py +++ b/var/spack/repos/builtin/packages/rdp-classifier/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/re2c/package.py b/var/spack/repos/builtin/packages/re2c/package.py index 19632475f7..ca6d343b4a 100644 --- a/var/spack/repos/builtin/packages/re2c/package.py +++ b/var/spack/repos/builtin/packages/re2c/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/readline/package.py b/var/spack/repos/builtin/packages/readline/package.py index ccdea0aa0f..8a48361f1b 100644 --- a/var/spack/repos/builtin/packages/readline/package.py +++ b/var/spack/repos/builtin/packages/readline/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/recordproto/package.py b/var/spack/repos/builtin/packages/recordproto/package.py index 0f44b7408b..27dead7ea6 100644 --- a/var/spack/repos/builtin/packages/recordproto/package.py +++ b/var/spack/repos/builtin/packages/recordproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/redundans/package.py b/var/spack/repos/builtin/packages/redundans/package.py index 71f83f623a..d54b54a4b4 100644 --- a/var/spack/repos/builtin/packages/redundans/package.py +++ b/var/spack/repos/builtin/packages/redundans/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/relion/package.py b/var/spack/repos/builtin/packages/relion/package.py index 1e28d32d88..abd8e82821 100644 --- a/var/spack/repos/builtin/packages/relion/package.py +++ b/var/spack/repos/builtin/packages/relion/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/rempi/package.py b/var/spack/repos/builtin/packages/rempi/package.py index f6e2a2f3e5..3958671539 100644 --- a/var/spack/repos/builtin/packages/rempi/package.py +++ b/var/spack/repos/builtin/packages/rempi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/rename/package.py b/var/spack/repos/builtin/packages/rename/package.py index 01bc35f073..7581d6f847 100644 --- a/var/spack/repos/builtin/packages/rename/package.py +++ b/var/spack/repos/builtin/packages/rename/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/rendercheck/package.py b/var/spack/repos/builtin/packages/rendercheck/package.py index 3bf4d7915e..33d8f0fcdf 100644 --- a/var/spack/repos/builtin/packages/rendercheck/package.py +++ b/var/spack/repos/builtin/packages/rendercheck/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/renderproto/package.py b/var/spack/repos/builtin/packages/renderproto/package.py index 350e9a3a3f..e1d3c8acd0 100644 --- a/var/spack/repos/builtin/packages/renderproto/package.py +++ b/var/spack/repos/builtin/packages/renderproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/repeatmasker/package.py b/var/spack/repos/builtin/packages/repeatmasker/package.py index a4c12ad22a..9829c2e85a 100644 --- a/var/spack/repos/builtin/packages/repeatmasker/package.py +++ b/var/spack/repos/builtin/packages/repeatmasker/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/resourceproto/package.py b/var/spack/repos/builtin/packages/resourceproto/package.py index fd1f13a999..cc112247b4 100644 --- a/var/spack/repos/builtin/packages/resourceproto/package.py +++ b/var/spack/repos/builtin/packages/resourceproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/revbayes/package.py b/var/spack/repos/builtin/packages/revbayes/package.py index 1ebbec534b..06bdaaa4c1 100644 --- a/var/spack/repos/builtin/packages/revbayes/package.py +++ b/var/spack/repos/builtin/packages/revbayes/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/rgb/package.py b/var/spack/repos/builtin/packages/rgb/package.py index 2b09a2c4a5..1bfef10a3c 100644 --- a/var/spack/repos/builtin/packages/rgb/package.py +++ b/var/spack/repos/builtin/packages/rgb/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/rhash/package.py b/var/spack/repos/builtin/packages/rhash/package.py index c2191f1f07..dc769071c4 100644 --- a/var/spack/repos/builtin/packages/rhash/package.py +++ b/var/spack/repos/builtin/packages/rhash/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/rlwrap/package.py b/var/spack/repos/builtin/packages/rlwrap/package.py index 33ca41aa42..521dd9d969 100644 --- a/var/spack/repos/builtin/packages/rlwrap/package.py +++ b/var/spack/repos/builtin/packages/rlwrap/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/rmlab/package.py b/var/spack/repos/builtin/packages/rmlab/package.py index d089393ab4..7a3a643ddb 100644 --- a/var/spack/repos/builtin/packages/rmlab/package.py +++ b/var/spack/repos/builtin/packages/rmlab/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/rna-seqc/package.py b/var/spack/repos/builtin/packages/rna-seqc/package.py index 389a96d428..9fe5bcc096 100644 --- a/var/spack/repos/builtin/packages/rna-seqc/package.py +++ b/var/spack/repos/builtin/packages/rna-seqc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/rockstar/package.py b/var/spack/repos/builtin/packages/rockstar/package.py index 2f8bfdc804..5b32230b59 100644 --- a/var/spack/repos/builtin/packages/rockstar/package.py +++ b/var/spack/repos/builtin/packages/rockstar/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index a19ed55a29..cf8e442799 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/rose/package.py b/var/spack/repos/builtin/packages/rose/package.py index 8a7f22cf97..ffa9a91caa 100644 --- a/var/spack/repos/builtin/packages/rose/package.py +++ b/var/spack/repos/builtin/packages/rose/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/rr/package.py b/var/spack/repos/builtin/packages/rr/package.py index 419e92f4bd..1f74a35e78 100644 --- a/var/spack/repos/builtin/packages/rr/package.py +++ b/var/spack/repos/builtin/packages/rr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/rsbench/package.py b/var/spack/repos/builtin/packages/rsbench/package.py index 91c8d6f71b..1215dd486d 100644 --- a/var/spack/repos/builtin/packages/rsbench/package.py +++ b/var/spack/repos/builtin/packages/rsbench/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/rsem/package.py b/var/spack/repos/builtin/packages/rsem/package.py index 13d5585d00..7cffb30cf2 100644 --- a/var/spack/repos/builtin/packages/rsem/package.py +++ b/var/spack/repos/builtin/packages/rsem/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/rstart/package.py b/var/spack/repos/builtin/packages/rstart/package.py index 01eda5d9a9..1c56f3a9df 100644 --- a/var/spack/repos/builtin/packages/rstart/package.py +++ b/var/spack/repos/builtin/packages/rstart/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/rsync/package.py b/var/spack/repos/builtin/packages/rsync/package.py index f375489a8a..4c7420e1b9 100644 --- a/var/spack/repos/builtin/packages/rsync/package.py +++ b/var/spack/repos/builtin/packages/rsync/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/rtags/package.py b/var/spack/repos/builtin/packages/rtags/package.py index a82a8dd1da..fcd9cca302 100644 --- a/var/spack/repos/builtin/packages/rtags/package.py +++ b/var/spack/repos/builtin/packages/rtags/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/rtax/package.py b/var/spack/repos/builtin/packages/rtax/package.py index 3e359d7346..5c471c0f74 100644 --- a/var/spack/repos/builtin/packages/rtax/package.py +++ b/var/spack/repos/builtin/packages/rtax/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ruby-gnuplot/package.py b/var/spack/repos/builtin/packages/ruby-gnuplot/package.py index fd0a589cc2..f8bf2b04aa 100644 --- a/var/spack/repos/builtin/packages/ruby-gnuplot/package.py +++ b/var/spack/repos/builtin/packages/ruby-gnuplot/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ruby-narray/package.py b/var/spack/repos/builtin/packages/ruby-narray/package.py index e25bc8d4bf..4102009dc9 100644 --- a/var/spack/repos/builtin/packages/ruby-narray/package.py +++ b/var/spack/repos/builtin/packages/ruby-narray/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ruby-rubyinline/package.py b/var/spack/repos/builtin/packages/ruby-rubyinline/package.py index bc571a3cae..cd91004bec 100644 --- a/var/spack/repos/builtin/packages/ruby-rubyinline/package.py +++ b/var/spack/repos/builtin/packages/ruby-rubyinline/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ruby-terminal-table/package.py b/var/spack/repos/builtin/packages/ruby-terminal-table/package.py index 48e3dbf3bf..62900b9851 100644 --- a/var/spack/repos/builtin/packages/ruby-terminal-table/package.py +++ b/var/spack/repos/builtin/packages/ruby-terminal-table/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ruby/package.py b/var/spack/repos/builtin/packages/ruby/package.py index a633d9d54f..c79defced1 100644 --- a/var/spack/repos/builtin/packages/ruby/package.py +++ b/var/spack/repos/builtin/packages/ruby/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/rust-bindgen/package.py b/var/spack/repos/builtin/packages/rust-bindgen/package.py index 3c7e42ca8a..d33a188dd1 100644 --- a/var/spack/repos/builtin/packages/rust-bindgen/package.py +++ b/var/spack/repos/builtin/packages/rust-bindgen/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/rust/package.py b/var/spack/repos/builtin/packages/rust/package.py index 219c82fa83..88632f0fdf 100644 --- a/var/spack/repos/builtin/packages/rust/package.py +++ b/var/spack/repos/builtin/packages/rust/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sabre/package.py b/var/spack/repos/builtin/packages/sabre/package.py index b93b07be51..d205ca5090 100644 --- a/var/spack/repos/builtin/packages/sabre/package.py +++ b/var/spack/repos/builtin/packages/sabre/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sailfish/package.py b/var/spack/repos/builtin/packages/sailfish/package.py index d25db48c6f..3be75d169d 100644 --- a/var/spack/repos/builtin/packages/sailfish/package.py +++ b/var/spack/repos/builtin/packages/sailfish/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/salmon/package.py b/var/spack/repos/builtin/packages/salmon/package.py index b4e1a4229f..d849988b4c 100644 --- a/var/spack/repos/builtin/packages/salmon/package.py +++ b/var/spack/repos/builtin/packages/salmon/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sambamba/package.py b/var/spack/repos/builtin/packages/sambamba/package.py index ad8c68547c..98e07478c7 100644 --- a/var/spack/repos/builtin/packages/sambamba/package.py +++ b/var/spack/repos/builtin/packages/sambamba/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/samblaster/package.py b/var/spack/repos/builtin/packages/samblaster/package.py index 6f571ecd16..1c28260359 100644 --- a/var/spack/repos/builtin/packages/samblaster/package.py +++ b/var/spack/repos/builtin/packages/samblaster/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/samrai/package.py b/var/spack/repos/builtin/packages/samrai/package.py index 78b674213d..4e63c6f810 100644 --- a/var/spack/repos/builtin/packages/samrai/package.py +++ b/var/spack/repos/builtin/packages/samrai/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/samtools/package.py b/var/spack/repos/builtin/packages/samtools/package.py index ae0acdde47..3db0999912 100644 --- a/var/spack/repos/builtin/packages/samtools/package.py +++ b/var/spack/repos/builtin/packages/samtools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sas/package.py b/var/spack/repos/builtin/packages/sas/package.py index f6a1cf4101..ad85f83e97 100644 --- a/var/spack/repos/builtin/packages/sas/package.py +++ b/var/spack/repos/builtin/packages/sas/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/satsuma2/package.py b/var/spack/repos/builtin/packages/satsuma2/package.py index 4859c97c0e..3bbec608c6 100644 --- a/var/spack/repos/builtin/packages/satsuma2/package.py +++ b/var/spack/repos/builtin/packages/satsuma2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/savanna/package.py b/var/spack/repos/builtin/packages/savanna/package.py index af2cdf9ed8..641560f6de 100644 --- a/var/spack/repos/builtin/packages/savanna/package.py +++ b/var/spack/repos/builtin/packages/savanna/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/saws/package.py b/var/spack/repos/builtin/packages/saws/package.py index bda54644c6..901fdd9577 100644 --- a/var/spack/repos/builtin/packages/saws/package.py +++ b/var/spack/repos/builtin/packages/saws/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sbt/package.py b/var/spack/repos/builtin/packages/sbt/package.py index baa93fa93a..a0ea9e7981 100644 --- a/var/spack/repos/builtin/packages/sbt/package.py +++ b/var/spack/repos/builtin/packages/sbt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/scala/package.py b/var/spack/repos/builtin/packages/scala/package.py index 8c36f9e981..1fda2f239f 100644 --- a/var/spack/repos/builtin/packages/scala/package.py +++ b/var/spack/repos/builtin/packages/scala/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/scalasca/package.py b/var/spack/repos/builtin/packages/scalasca/package.py index 21f50cf1fe..813ef81d13 100644 --- a/var/spack/repos/builtin/packages/scalasca/package.py +++ b/var/spack/repos/builtin/packages/scalasca/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/scalpel/package.py b/var/spack/repos/builtin/packages/scalpel/package.py index f7d2834732..cdbbab4181 100644 --- a/var/spack/repos/builtin/packages/scalpel/package.py +++ b/var/spack/repos/builtin/packages/scalpel/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/scan-for-matches/package.py b/var/spack/repos/builtin/packages/scan-for-matches/package.py index 34ec80ae52..b50c2b6d92 100644 --- a/var/spack/repos/builtin/packages/scan-for-matches/package.py +++ b/var/spack/repos/builtin/packages/scan-for-matches/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/scons/package.py b/var/spack/repos/builtin/packages/scons/package.py index 8bf6ceddcc..311fa7486f 100644 --- a/var/spack/repos/builtin/packages/scons/package.py +++ b/var/spack/repos/builtin/packages/scons/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/scorec-core/package.py b/var/spack/repos/builtin/packages/scorec-core/package.py index e629a63ebe..673749ab0e 100644 --- a/var/spack/repos/builtin/packages/scorec-core/package.py +++ b/var/spack/repos/builtin/packages/scorec-core/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/scorep/package.py b/var/spack/repos/builtin/packages/scorep/package.py index fd7da69442..16769c66e3 100644 --- a/var/spack/repos/builtin/packages/scorep/package.py +++ b/var/spack/repos/builtin/packages/scorep/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/scotch/package.py b/var/spack/repos/builtin/packages/scotch/package.py index 712cd0ca6c..0d8eaf1964 100644 --- a/var/spack/repos/builtin/packages/scotch/package.py +++ b/var/spack/repos/builtin/packages/scotch/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/scr/package.py b/var/spack/repos/builtin/packages/scr/package.py index 24b3de7102..9758db1f35 100644 --- a/var/spack/repos/builtin/packages/scr/package.py +++ b/var/spack/repos/builtin/packages/scr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/screen/package.py b/var/spack/repos/builtin/packages/screen/package.py index 34bc952ec6..7d70f276f0 100644 --- a/var/spack/repos/builtin/packages/screen/package.py +++ b/var/spack/repos/builtin/packages/screen/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/scripts/package.py b/var/spack/repos/builtin/packages/scripts/package.py index 579140fb65..bc648178ea 100644 --- a/var/spack/repos/builtin/packages/scripts/package.py +++ b/var/spack/repos/builtin/packages/scripts/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/scrnsaverproto/package.py b/var/spack/repos/builtin/packages/scrnsaverproto/package.py index 7411a8ae21..e2938c389e 100644 --- a/var/spack/repos/builtin/packages/scrnsaverproto/package.py +++ b/var/spack/repos/builtin/packages/scrnsaverproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sctk/package.py b/var/spack/repos/builtin/packages/sctk/package.py index e64d2c79aa..089b8c04fc 100644 --- a/var/spack/repos/builtin/packages/sctk/package.py +++ b/var/spack/repos/builtin/packages/sctk/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sdl2-image/package.py b/var/spack/repos/builtin/packages/sdl2-image/package.py index 3986c59c1e..30ec04d6a6 100644 --- a/var/spack/repos/builtin/packages/sdl2-image/package.py +++ b/var/spack/repos/builtin/packages/sdl2-image/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sdl2/package.py b/var/spack/repos/builtin/packages/sdl2/package.py index 272261f54c..6dcea62d54 100644 --- a/var/spack/repos/builtin/packages/sdl2/package.py +++ b/var/spack/repos/builtin/packages/sdl2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sed/package.py b/var/spack/repos/builtin/packages/sed/package.py index 84c5c94ed9..4bf6fa56d3 100644 --- a/var/spack/repos/builtin/packages/sed/package.py +++ b/var/spack/repos/builtin/packages/sed/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/seqprep/package.py b/var/spack/repos/builtin/packages/seqprep/package.py index d4c75cc5fa..fc4196514f 100644 --- a/var/spack/repos/builtin/packages/seqprep/package.py +++ b/var/spack/repos/builtin/packages/seqprep/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/seqtk/package.py b/var/spack/repos/builtin/packages/seqtk/package.py index 6393d3e587..1c65757489 100644 --- a/var/spack/repos/builtin/packages/seqtk/package.py +++ b/var/spack/repos/builtin/packages/seqtk/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/serf/package.py b/var/spack/repos/builtin/packages/serf/package.py index 5604b8b166..2b44a021f8 100644 --- a/var/spack/repos/builtin/packages/serf/package.py +++ b/var/spack/repos/builtin/packages/serf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sessreg/package.py b/var/spack/repos/builtin/packages/sessreg/package.py index da6805b65c..6791aee067 100644 --- a/var/spack/repos/builtin/packages/sessreg/package.py +++ b/var/spack/repos/builtin/packages/sessreg/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/setxkbmap/package.py b/var/spack/repos/builtin/packages/setxkbmap/package.py index d64497c269..bffc94c848 100644 --- a/var/spack/repos/builtin/packages/setxkbmap/package.py +++ b/var/spack/repos/builtin/packages/setxkbmap/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sga/package.py b/var/spack/repos/builtin/packages/sga/package.py index 2c38244675..bda253d368 100644 --- a/var/spack/repos/builtin/packages/sga/package.py +++ b/var/spack/repos/builtin/packages/sga/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/shapeit/package.py b/var/spack/repos/builtin/packages/shapeit/package.py index 4f0295cca1..0eaa9aef9b 100644 --- a/var/spack/repos/builtin/packages/shapeit/package.py +++ b/var/spack/repos/builtin/packages/shapeit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/shared-mime-info/package.py b/var/spack/repos/builtin/packages/shared-mime-info/package.py index d6d9b520ab..824df65987 100644 --- a/var/spack/repos/builtin/packages/shared-mime-info/package.py +++ b/var/spack/repos/builtin/packages/shared-mime-info/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/shiny-server/package.py b/var/spack/repos/builtin/packages/shiny-server/package.py index 2edd966825..532fa9132e 100644 --- a/var/spack/repos/builtin/packages/shiny-server/package.py +++ b/var/spack/repos/builtin/packages/shiny-server/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/shortbred/package.py b/var/spack/repos/builtin/packages/shortbred/package.py index aeccfa9378..39ddae571b 100644 --- a/var/spack/repos/builtin/packages/shortbred/package.py +++ b/var/spack/repos/builtin/packages/shortbred/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/shortstack/package.py b/var/spack/repos/builtin/packages/shortstack/package.py index 75d363e185..77fcc7df13 100644 --- a/var/spack/repos/builtin/packages/shortstack/package.py +++ b/var/spack/repos/builtin/packages/shortstack/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/showfont/package.py b/var/spack/repos/builtin/packages/showfont/package.py index f18c482925..a5b18888e8 100644 --- a/var/spack/repos/builtin/packages/showfont/package.py +++ b/var/spack/repos/builtin/packages/showfont/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sickle/package.py b/var/spack/repos/builtin/packages/sickle/package.py index 248f1ef3b9..0a0b02f343 100644 --- a/var/spack/repos/builtin/packages/sickle/package.py +++ b/var/spack/repos/builtin/packages/sickle/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/siesta/package.py b/var/spack/repos/builtin/packages/siesta/package.py index ffb8c12de1..46cf92a106 100644 --- a/var/spack/repos/builtin/packages/siesta/package.py +++ b/var/spack/repos/builtin/packages/siesta/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/signalp/package.py b/var/spack/repos/builtin/packages/signalp/package.py index 95197badfc..a59ac2311e 100644 --- a/var/spack/repos/builtin/packages/signalp/package.py +++ b/var/spack/repos/builtin/packages/signalp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/signify/package.py b/var/spack/repos/builtin/packages/signify/package.py index f2786c0352..e429b2bf60 100755 --- a/var/spack/repos/builtin/packages/signify/package.py +++ b/var/spack/repos/builtin/packages/signify/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/silo/package.py b/var/spack/repos/builtin/packages/silo/package.py index e348f0003b..a6fd19a7aa 100644 --- a/var/spack/repos/builtin/packages/silo/package.py +++ b/var/spack/repos/builtin/packages/silo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/simplemoc/package.py b/var/spack/repos/builtin/packages/simplemoc/package.py index 8f6759b019..989bb5523d 100644 --- a/var/spack/repos/builtin/packages/simplemoc/package.py +++ b/var/spack/repos/builtin/packages/simplemoc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/simul/package.py b/var/spack/repos/builtin/packages/simul/package.py index 7ef8720dc9..5b78ec2fc4 100644 --- a/var/spack/repos/builtin/packages/simul/package.py +++ b/var/spack/repos/builtin/packages/simul/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/simulationio/package.py b/var/spack/repos/builtin/packages/simulationio/package.py index b027f49584..6ed7145254 100644 --- a/var/spack/repos/builtin/packages/simulationio/package.py +++ b/var/spack/repos/builtin/packages/simulationio/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/singularity/package.py b/var/spack/repos/builtin/packages/singularity/package.py index 99836311a6..87cf8a4649 100644 --- a/var/spack/repos/builtin/packages/singularity/package.py +++ b/var/spack/repos/builtin/packages/singularity/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/slepc/package.py b/var/spack/repos/builtin/packages/slepc/package.py index 578859c179..07b60849a1 100644 --- a/var/spack/repos/builtin/packages/slepc/package.py +++ b/var/spack/repos/builtin/packages/slepc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/slurm/package.py b/var/spack/repos/builtin/packages/slurm/package.py index 06f30730e9..bfc53ae4a7 100644 --- a/var/spack/repos/builtin/packages/slurm/package.py +++ b/var/spack/repos/builtin/packages/slurm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/smalt/package.py b/var/spack/repos/builtin/packages/smalt/package.py index 4c65afe20d..5bd90c2c0c 100644 --- a/var/spack/repos/builtin/packages/smalt/package.py +++ b/var/spack/repos/builtin/packages/smalt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/smproxy/package.py b/var/spack/repos/builtin/packages/smproxy/package.py index 8a685c38b5..dd5a4a860d 100644 --- a/var/spack/repos/builtin/packages/smproxy/package.py +++ b/var/spack/repos/builtin/packages/smproxy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/snakemake/package.py b/var/spack/repos/builtin/packages/snakemake/package.py index d97dc47442..f8687c0907 100644 --- a/var/spack/repos/builtin/packages/snakemake/package.py +++ b/var/spack/repos/builtin/packages/snakemake/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/snap-berkeley/package.py b/var/spack/repos/builtin/packages/snap-berkeley/package.py index a6b1e08c47..d431bbdf8c 100644 --- a/var/spack/repos/builtin/packages/snap-berkeley/package.py +++ b/var/spack/repos/builtin/packages/snap-berkeley/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/snap-korf/package.py b/var/spack/repos/builtin/packages/snap-korf/package.py index 68fb4c61ae..37d61cd770 100644 --- a/var/spack/repos/builtin/packages/snap-korf/package.py +++ b/var/spack/repos/builtin/packages/snap-korf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/snap/package.py b/var/spack/repos/builtin/packages/snap/package.py index 7bc88b812f..d12c3520ea 100644 --- a/var/spack/repos/builtin/packages/snap/package.py +++ b/var/spack/repos/builtin/packages/snap/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/snappy/package.py b/var/spack/repos/builtin/packages/snappy/package.py index a023b2ee95..89ea5b0055 100644 --- a/var/spack/repos/builtin/packages/snappy/package.py +++ b/var/spack/repos/builtin/packages/snappy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/snbone/package.py b/var/spack/repos/builtin/packages/snbone/package.py index d1d2a63806..dd8ee25ab6 100644 --- a/var/spack/repos/builtin/packages/snbone/package.py +++ b/var/spack/repos/builtin/packages/snbone/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sniffles/package.py b/var/spack/repos/builtin/packages/sniffles/package.py index 80850e13e3..93cc71f075 100644 --- a/var/spack/repos/builtin/packages/sniffles/package.py +++ b/var/spack/repos/builtin/packages/sniffles/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/snpeff/package.py b/var/spack/repos/builtin/packages/snpeff/package.py index 9e39f0eeeb..44652ccee0 100644 --- a/var/spack/repos/builtin/packages/snpeff/package.py +++ b/var/spack/repos/builtin/packages/snpeff/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/snphylo/package.py b/var/spack/repos/builtin/packages/snphylo/package.py index 6634835ab1..2add84ad26 100644 --- a/var/spack/repos/builtin/packages/snphylo/package.py +++ b/var/spack/repos/builtin/packages/snphylo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/snptest/package.py b/var/spack/repos/builtin/packages/snptest/package.py index 57a49c5bec..313e6fb398 100644 --- a/var/spack/repos/builtin/packages/snptest/package.py +++ b/var/spack/repos/builtin/packages/snptest/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/soap2/package.py b/var/spack/repos/builtin/packages/soap2/package.py index 9b34e35320..3b330b5988 100644 --- a/var/spack/repos/builtin/packages/soap2/package.py +++ b/var/spack/repos/builtin/packages/soap2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/soapdenovo2/package.py b/var/spack/repos/builtin/packages/soapdenovo2/package.py index 27f512626d..d88a22846e 100644 --- a/var/spack/repos/builtin/packages/soapdenovo2/package.py +++ b/var/spack/repos/builtin/packages/soapdenovo2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/soapindel/package.py b/var/spack/repos/builtin/packages/soapindel/package.py index 1a6bd4ff8d..c676e02e24 100644 --- a/var/spack/repos/builtin/packages/soapindel/package.py +++ b/var/spack/repos/builtin/packages/soapindel/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/soapsnp/package.py b/var/spack/repos/builtin/packages/soapsnp/package.py index 34c56eebb2..57f928c3aa 100644 --- a/var/spack/repos/builtin/packages/soapsnp/package.py +++ b/var/spack/repos/builtin/packages/soapsnp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/somatic-sniper/package.py b/var/spack/repos/builtin/packages/somatic-sniper/package.py index 40c66af214..d33e8c8878 100644 --- a/var/spack/repos/builtin/packages/somatic-sniper/package.py +++ b/var/spack/repos/builtin/packages/somatic-sniper/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sortmerna/package.py b/var/spack/repos/builtin/packages/sortmerna/package.py index bd3136162b..501055b9ec 100644 --- a/var/spack/repos/builtin/packages/sortmerna/package.py +++ b/var/spack/repos/builtin/packages/sortmerna/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sosflow/package.py b/var/spack/repos/builtin/packages/sosflow/package.py index ee92f5aab2..ae12663204 100644 --- a/var/spack/repos/builtin/packages/sosflow/package.py +++ b/var/spack/repos/builtin/packages/sosflow/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sowing/package.py b/var/spack/repos/builtin/packages/sowing/package.py index 668038255b..6420c389cc 100644 --- a/var/spack/repos/builtin/packages/sowing/package.py +++ b/var/spack/repos/builtin/packages/sowing/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sox/package.py b/var/spack/repos/builtin/packages/sox/package.py index 64c9803d52..e9f65294d1 100644 --- a/var/spack/repos/builtin/packages/sox/package.py +++ b/var/spack/repos/builtin/packages/sox/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/spades/package.py b/var/spack/repos/builtin/packages/spades/package.py index 330fe0597e..05c9f5f410 100644 --- a/var/spack/repos/builtin/packages/spades/package.py +++ b/var/spack/repos/builtin/packages/spades/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/spark/package.py b/var/spack/repos/builtin/packages/spark/package.py index 9d7f793803..4c436d1342 100644 --- a/var/spack/repos/builtin/packages/spark/package.py +++ b/var/spack/repos/builtin/packages/spark/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sparsehash/package.py b/var/spack/repos/builtin/packages/sparsehash/package.py index 1d8b870bd5..9e8831abb3 100644 --- a/var/spack/repos/builtin/packages/sparsehash/package.py +++ b/var/spack/repos/builtin/packages/sparsehash/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sparta/package.py b/var/spack/repos/builtin/packages/sparta/package.py index cfe6658f3b..83261f3bf2 100644 --- a/var/spack/repos/builtin/packages/sparta/package.py +++ b/var/spack/repos/builtin/packages/sparta/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/spdlog/package.py b/var/spack/repos/builtin/packages/spdlog/package.py index 9d952728db..b239fb896f 100644 --- a/var/spack/repos/builtin/packages/spdlog/package.py +++ b/var/spack/repos/builtin/packages/spdlog/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/spectrum-mpi/package.py b/var/spack/repos/builtin/packages/spectrum-mpi/package.py index fff7c3f2ad..2ada9c593e 100644 --- a/var/spack/repos/builtin/packages/spectrum-mpi/package.py +++ b/var/spack/repos/builtin/packages/spectrum-mpi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at International Business Machines Corporation # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/speex/package.py b/var/spack/repos/builtin/packages/speex/package.py index 6e0f50feec..24b618ab3d 100644 --- a/var/spack/repos/builtin/packages/speex/package.py +++ b/var/spack/repos/builtin/packages/speex/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/spglib/package.py b/var/spack/repos/builtin/packages/spglib/package.py index 45f35a0cdc..e17a42ecd6 100644 --- a/var/spack/repos/builtin/packages/spglib/package.py +++ b/var/spack/repos/builtin/packages/spglib/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sph2pipe/package.py b/var/spack/repos/builtin/packages/sph2pipe/package.py index 471461249a..8f894f17e8 100644 --- a/var/spack/repos/builtin/packages/sph2pipe/package.py +++ b/var/spack/repos/builtin/packages/sph2pipe/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/spherepack/package.py b/var/spack/repos/builtin/packages/spherepack/package.py index 792853b51d..520b42d60f 100644 --- a/var/spack/repos/builtin/packages/spherepack/package.py +++ b/var/spack/repos/builtin/packages/spherepack/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/spindle/package.py b/var/spack/repos/builtin/packages/spindle/package.py index 1b863689c3..6050e3ffa7 100644 --- a/var/spack/repos/builtin/packages/spindle/package.py +++ b/var/spack/repos/builtin/packages/spindle/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/spot/package.py b/var/spack/repos/builtin/packages/spot/package.py index cd045dae68..1fdb08b44c 100644 --- a/var/spack/repos/builtin/packages/spot/package.py +++ b/var/spack/repos/builtin/packages/spot/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sqlite/package.py b/var/spack/repos/builtin/packages/sqlite/package.py index 5f359aaf1e..ab91430d37 100644 --- a/var/spack/repos/builtin/packages/sqlite/package.py +++ b/var/spack/repos/builtin/packages/sqlite/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/squid/package.py b/var/spack/repos/builtin/packages/squid/package.py index 379aff577c..2f9c9c85b9 100644 --- a/var/spack/repos/builtin/packages/squid/package.py +++ b/var/spack/repos/builtin/packages/squid/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sra-toolkit/package.py b/var/spack/repos/builtin/packages/sra-toolkit/package.py index e1d5b54300..d2dfd34681 100644 --- a/var/spack/repos/builtin/packages/sra-toolkit/package.py +++ b/var/spack/repos/builtin/packages/sra-toolkit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sspace-longread/package.py b/var/spack/repos/builtin/packages/sspace-longread/package.py index 4eac8cf177..1646efc68d 100644 --- a/var/spack/repos/builtin/packages/sspace-longread/package.py +++ b/var/spack/repos/builtin/packages/sspace-longread/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sspace-standard/package.py b/var/spack/repos/builtin/packages/sspace-standard/package.py index 2724c1022f..6b40cd9a2d 100644 --- a/var/spack/repos/builtin/packages/sspace-standard/package.py +++ b/var/spack/repos/builtin/packages/sspace-standard/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sst-dumpi/package.py b/var/spack/repos/builtin/packages/sst-dumpi/package.py index 6422013871..9c234ff158 100644 --- a/var/spack/repos/builtin/packages/sst-dumpi/package.py +++ b/var/spack/repos/builtin/packages/sst-dumpi/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sst-macro/package.py b/var/spack/repos/builtin/packages/sst-macro/package.py index 3fade2694f..a5f3b69a26 100644 --- a/var/spack/repos/builtin/packages/sst-macro/package.py +++ b/var/spack/repos/builtin/packages/sst-macro/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/stacks/package.py b/var/spack/repos/builtin/packages/stacks/package.py index 975e1c88b6..62a768fe43 100644 --- a/var/spack/repos/builtin/packages/stacks/package.py +++ b/var/spack/repos/builtin/packages/stacks/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/staden-io-lib/package.py b/var/spack/repos/builtin/packages/staden-io-lib/package.py index 3cb82061aa..1b3801ce0a 100644 --- a/var/spack/repos/builtin/packages/staden-io-lib/package.py +++ b/var/spack/repos/builtin/packages/staden-io-lib/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/star-ccm-plus/package.py b/var/spack/repos/builtin/packages/star-ccm-plus/package.py index c74479acc1..9c8c6a2ce9 100644 --- a/var/spack/repos/builtin/packages/star-ccm-plus/package.py +++ b/var/spack/repos/builtin/packages/star-ccm-plus/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/star/package.py b/var/spack/repos/builtin/packages/star/package.py index 89ffbc15f3..896b775d9a 100644 --- a/var/spack/repos/builtin/packages/star/package.py +++ b/var/spack/repos/builtin/packages/star/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/startup-notification/package.py b/var/spack/repos/builtin/packages/startup-notification/package.py index 46d677c3fe..ae85c3ca69 100644 --- a/var/spack/repos/builtin/packages/startup-notification/package.py +++ b/var/spack/repos/builtin/packages/startup-notification/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/stat/package.py b/var/spack/repos/builtin/packages/stat/package.py index f2733f8f61..1edf0dc8dc 100644 --- a/var/spack/repos/builtin/packages/stat/package.py +++ b/var/spack/repos/builtin/packages/stat/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/stc/package.py b/var/spack/repos/builtin/packages/stc/package.py index 607c34451b..b1f62b0fbf 100644 --- a/var/spack/repos/builtin/packages/stc/package.py +++ b/var/spack/repos/builtin/packages/stc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/stow/package.py b/var/spack/repos/builtin/packages/stow/package.py index 07480bf066..2e539b7e88 100644 --- a/var/spack/repos/builtin/packages/stow/package.py +++ b/var/spack/repos/builtin/packages/stow/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/stream/package.py b/var/spack/repos/builtin/packages/stream/package.py index 69ddfe5b07..f4d01faa90 100644 --- a/var/spack/repos/builtin/packages/stream/package.py +++ b/var/spack/repos/builtin/packages/stream/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/strelka/package.py b/var/spack/repos/builtin/packages/strelka/package.py index 19c5de7dc8..49176d5144 100644 --- a/var/spack/repos/builtin/packages/strelka/package.py +++ b/var/spack/repos/builtin/packages/strelka/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/stress/package.py b/var/spack/repos/builtin/packages/stress/package.py index 497853f73b..034a6b117f 100644 --- a/var/spack/repos/builtin/packages/stress/package.py +++ b/var/spack/repos/builtin/packages/stress/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/stringtie/package.py b/var/spack/repos/builtin/packages/stringtie/package.py index aa86ea05ba..d0747398a0 100644 --- a/var/spack/repos/builtin/packages/stringtie/package.py +++ b/var/spack/repos/builtin/packages/stringtie/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/structure/package.py b/var/spack/repos/builtin/packages/structure/package.py index cbfc1e9850..e92fc626cb 100644 --- a/var/spack/repos/builtin/packages/structure/package.py +++ b/var/spack/repos/builtin/packages/structure/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sublime-text/package.py b/var/spack/repos/builtin/packages/sublime-text/package.py index e28aa04c94..cba3b7508e 100644 --- a/var/spack/repos/builtin/packages/sublime-text/package.py +++ b/var/spack/repos/builtin/packages/sublime-text/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/subread/package.py b/var/spack/repos/builtin/packages/subread/package.py index e2f26377b8..762f44b35a 100644 --- a/var/spack/repos/builtin/packages/subread/package.py +++ b/var/spack/repos/builtin/packages/subread/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/subversion/package.py b/var/spack/repos/builtin/packages/subversion/package.py index d21b56e250..97cacd493e 100644 --- a/var/spack/repos/builtin/packages/subversion/package.py +++ b/var/spack/repos/builtin/packages/subversion/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/suite-sparse/package.py b/var/spack/repos/builtin/packages/suite-sparse/package.py index 64c42c36d0..7d89be0326 100644 --- a/var/spack/repos/builtin/packages/suite-sparse/package.py +++ b/var/spack/repos/builtin/packages/suite-sparse/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sumaclust/package.py b/var/spack/repos/builtin/packages/sumaclust/package.py index 923fb347b4..cc75b8eb4b 100644 --- a/var/spack/repos/builtin/packages/sumaclust/package.py +++ b/var/spack/repos/builtin/packages/sumaclust/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sundials/package.py b/var/spack/repos/builtin/packages/sundials/package.py index 73816b6224..e0c5dd92b2 100644 --- a/var/spack/repos/builtin/packages/sundials/package.py +++ b/var/spack/repos/builtin/packages/sundials/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/superlu-dist/package.py b/var/spack/repos/builtin/packages/superlu-dist/package.py index cc7058236a..2506391509 100644 --- a/var/spack/repos/builtin/packages/superlu-dist/package.py +++ b/var/spack/repos/builtin/packages/superlu-dist/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/superlu-mt/package.py b/var/spack/repos/builtin/packages/superlu-mt/package.py index 99ecdcc642..41b1265bb6 100644 --- a/var/spack/repos/builtin/packages/superlu-mt/package.py +++ b/var/spack/repos/builtin/packages/superlu-mt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/superlu/package.py b/var/spack/repos/builtin/packages/superlu/package.py index 72f13ffde7..3032e038a7 100644 --- a/var/spack/repos/builtin/packages/superlu/package.py +++ b/var/spack/repos/builtin/packages/superlu/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/swarm/package.py b/var/spack/repos/builtin/packages/swarm/package.py index 0f52b9774e..3eb196f33f 100644 --- a/var/spack/repos/builtin/packages/swarm/package.py +++ b/var/spack/repos/builtin/packages/swarm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/swiftsim/package.py b/var/spack/repos/builtin/packages/swiftsim/package.py index 4f094c561f..6241634ab2 100644 --- a/var/spack/repos/builtin/packages/swiftsim/package.py +++ b/var/spack/repos/builtin/packages/swiftsim/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/swig/package.py b/var/spack/repos/builtin/packages/swig/package.py index e9148333de..e3e427b602 100644 --- a/var/spack/repos/builtin/packages/swig/package.py +++ b/var/spack/repos/builtin/packages/swig/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/symengine/package.py b/var/spack/repos/builtin/packages/symengine/package.py index 844e0c2e5e..5c42c5f5d8 100644 --- a/var/spack/repos/builtin/packages/symengine/package.py +++ b/var/spack/repos/builtin/packages/symengine/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sympol/package.py b/var/spack/repos/builtin/packages/sympol/package.py index 215c23ae98..801878185e 100644 --- a/var/spack/repos/builtin/packages/sympol/package.py +++ b/var/spack/repos/builtin/packages/sympol/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/sz/package.py b/var/spack/repos/builtin/packages/sz/package.py index 5ff44d18b2..fbb32646c9 100644 --- a/var/spack/repos/builtin/packages/sz/package.py +++ b/var/spack/repos/builtin/packages/sz/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/tabix/package.py b/var/spack/repos/builtin/packages/tabix/package.py index 85c1b03e59..f098e465d3 100644 --- a/var/spack/repos/builtin/packages/tabix/package.py +++ b/var/spack/repos/builtin/packages/tabix/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/talloc/package.py b/var/spack/repos/builtin/packages/talloc/package.py index b2d7160a00..68465ee93b 100644 --- a/var/spack/repos/builtin/packages/talloc/package.py +++ b/var/spack/repos/builtin/packages/talloc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/tantan/package.py b/var/spack/repos/builtin/packages/tantan/package.py index b99f2c3116..162777d3bb 100644 --- a/var/spack/repos/builtin/packages/tantan/package.py +++ b/var/spack/repos/builtin/packages/tantan/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/tar/package.py b/var/spack/repos/builtin/packages/tar/package.py index d6b660016a..9e25ea7a4c 100644 --- a/var/spack/repos/builtin/packages/tar/package.py +++ b/var/spack/repos/builtin/packages/tar/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/targetp/package.py b/var/spack/repos/builtin/packages/targetp/package.py index 5b7fde557c..7e41b821ae 100644 --- a/var/spack/repos/builtin/packages/targetp/package.py +++ b/var/spack/repos/builtin/packages/targetp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/task/package.py b/var/spack/repos/builtin/packages/task/package.py index b4fdd020de..5c6efc947e 100644 --- a/var/spack/repos/builtin/packages/task/package.py +++ b/var/spack/repos/builtin/packages/task/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/taskd/package.py b/var/spack/repos/builtin/packages/taskd/package.py index 56adbf619f..7405f1f01c 100644 --- a/var/spack/repos/builtin/packages/taskd/package.py +++ b/var/spack/repos/builtin/packages/taskd/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/tasmanian/package.py b/var/spack/repos/builtin/packages/tasmanian/package.py index 3815da686f..a01781ad7d 100644 --- a/var/spack/repos/builtin/packages/tasmanian/package.py +++ b/var/spack/repos/builtin/packages/tasmanian/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/tassel/package.py b/var/spack/repos/builtin/packages/tassel/package.py index eb48897e0e..33cf6e8e80 100644 --- a/var/spack/repos/builtin/packages/tassel/package.py +++ b/var/spack/repos/builtin/packages/tassel/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/tau/package.py b/var/spack/repos/builtin/packages/tau/package.py index 26b1e38b27..84b69dfca5 100644 --- a/var/spack/repos/builtin/packages/tau/package.py +++ b/var/spack/repos/builtin/packages/tau/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/tcl-tcllib/package.py b/var/spack/repos/builtin/packages/tcl-tcllib/package.py index a9a7928a8a..c6e2c9692d 100644 --- a/var/spack/repos/builtin/packages/tcl-tcllib/package.py +++ b/var/spack/repos/builtin/packages/tcl-tcllib/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/tcl-tclxml/package.py b/var/spack/repos/builtin/packages/tcl-tclxml/package.py index 8012d67a2e..45ed50411c 100644 --- a/var/spack/repos/builtin/packages/tcl-tclxml/package.py +++ b/var/spack/repos/builtin/packages/tcl-tclxml/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/tcl/package.py b/var/spack/repos/builtin/packages/tcl/package.py index ab05352dc2..b1ddc5a141 100644 --- a/var/spack/repos/builtin/packages/tcl/package.py +++ b/var/spack/repos/builtin/packages/tcl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/tclap/package.py b/var/spack/repos/builtin/packages/tclap/package.py index c3daa1ff3c..a402b542a5 100644 --- a/var/spack/repos/builtin/packages/tclap/package.py +++ b/var/spack/repos/builtin/packages/tclap/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/tcoffee/package.py b/var/spack/repos/builtin/packages/tcoffee/package.py index 667f876dd9..a3f2bec266 100644 --- a/var/spack/repos/builtin/packages/tcoffee/package.py +++ b/var/spack/repos/builtin/packages/tcoffee/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/tcptrace/package.py b/var/spack/repos/builtin/packages/tcptrace/package.py index ff2726a6a6..f5381de833 100644 --- a/var/spack/repos/builtin/packages/tcptrace/package.py +++ b/var/spack/repos/builtin/packages/tcptrace/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/tcsh/package.py b/var/spack/repos/builtin/packages/tcsh/package.py index 84d0ed28b0..e41fd84bcc 100644 --- a/var/spack/repos/builtin/packages/tcsh/package.py +++ b/var/spack/repos/builtin/packages/tcsh/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/tealeaf/package.py b/var/spack/repos/builtin/packages/tealeaf/package.py index c5031e9bd4..17ea4f4667 100644 --- a/var/spack/repos/builtin/packages/tealeaf/package.py +++ b/var/spack/repos/builtin/packages/tealeaf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/tetgen/package.py b/var/spack/repos/builtin/packages/tetgen/package.py index b7091c097c..f75c08c886 100644 --- a/var/spack/repos/builtin/packages/tetgen/package.py +++ b/var/spack/repos/builtin/packages/tetgen/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/tethex/package.py b/var/spack/repos/builtin/packages/tethex/package.py index 4ebe564522..7f04668eb4 100644 --- a/var/spack/repos/builtin/packages/tethex/package.py +++ b/var/spack/repos/builtin/packages/tethex/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/texinfo/package.py b/var/spack/repos/builtin/packages/texinfo/package.py index f9448d9bf0..487f5f2e45 100644 --- a/var/spack/repos/builtin/packages/texinfo/package.py +++ b/var/spack/repos/builtin/packages/texinfo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/texlive/package.py b/var/spack/repos/builtin/packages/texlive/package.py index 3b26d2de94..b2b4951df0 100644 --- a/var/spack/repos/builtin/packages/texlive/package.py +++ b/var/spack/repos/builtin/packages/texlive/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/the-platinum-searcher/package.py b/var/spack/repos/builtin/packages/the-platinum-searcher/package.py index 212bc0d75e..e3f61395c2 100644 --- a/var/spack/repos/builtin/packages/the-platinum-searcher/package.py +++ b/var/spack/repos/builtin/packages/the-platinum-searcher/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/the-silver-searcher/package.py b/var/spack/repos/builtin/packages/the-silver-searcher/package.py index 0ca0a246ca..e436694946 100644 --- a/var/spack/repos/builtin/packages/the-silver-searcher/package.py +++ b/var/spack/repos/builtin/packages/the-silver-searcher/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/thrift/package.py b/var/spack/repos/builtin/packages/thrift/package.py index 9e296123fd..48841db49a 100644 --- a/var/spack/repos/builtin/packages/thrift/package.py +++ b/var/spack/repos/builtin/packages/thrift/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/thrust/package.py b/var/spack/repos/builtin/packages/thrust/package.py index c3d7c8dadb..a1a93278cd 100644 --- a/var/spack/repos/builtin/packages/thrust/package.py +++ b/var/spack/repos/builtin/packages/thrust/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/tig/package.py b/var/spack/repos/builtin/packages/tig/package.py index 18c0597c46..00b2f9eb16 100644 --- a/var/spack/repos/builtin/packages/tig/package.py +++ b/var/spack/repos/builtin/packages/tig/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/tinyxml/package.py b/var/spack/repos/builtin/packages/tinyxml/package.py index 46f3c32a75..d1f16fae57 100644 --- a/var/spack/repos/builtin/packages/tinyxml/package.py +++ b/var/spack/repos/builtin/packages/tinyxml/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/tinyxml2/package.py b/var/spack/repos/builtin/packages/tinyxml2/package.py index d54418e099..cc5bd35996 100644 --- a/var/spack/repos/builtin/packages/tinyxml2/package.py +++ b/var/spack/repos/builtin/packages/tinyxml2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/tioga/package.py b/var/spack/repos/builtin/packages/tioga/package.py index 2901f3e7ca..5d9b1bb40d 100644 --- a/var/spack/repos/builtin/packages/tioga/package.py +++ b/var/spack/repos/builtin/packages/tioga/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/tk/package.py b/var/spack/repos/builtin/packages/tk/package.py index 1b3028622b..46f2ab307f 100644 --- a/var/spack/repos/builtin/packages/tk/package.py +++ b/var/spack/repos/builtin/packages/tk/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/tmalign/package.py b/var/spack/repos/builtin/packages/tmalign/package.py index ac7df4fb15..c5c761912d 100644 --- a/var/spack/repos/builtin/packages/tmalign/package.py +++ b/var/spack/repos/builtin/packages/tmalign/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/tmhmm/package.py b/var/spack/repos/builtin/packages/tmhmm/package.py index 2fe2517444..e1462ab373 100644 --- a/var/spack/repos/builtin/packages/tmhmm/package.py +++ b/var/spack/repos/builtin/packages/tmhmm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/tmux/package.py b/var/spack/repos/builtin/packages/tmux/package.py index 5ca850a1cc..26599a7cd5 100644 --- a/var/spack/repos/builtin/packages/tmux/package.py +++ b/var/spack/repos/builtin/packages/tmux/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/tmuxinator/package.py b/var/spack/repos/builtin/packages/tmuxinator/package.py index 0f79d1f5bf..240a4b16d9 100644 --- a/var/spack/repos/builtin/packages/tmuxinator/package.py +++ b/var/spack/repos/builtin/packages/tmuxinator/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/tophat/package.py b/var/spack/repos/builtin/packages/tophat/package.py index 682e9581eb..753e1590d4 100644 --- a/var/spack/repos/builtin/packages/tophat/package.py +++ b/var/spack/repos/builtin/packages/tophat/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/tppred/package.py b/var/spack/repos/builtin/packages/tppred/package.py index 15bf756f7a..1b19461636 100644 --- a/var/spack/repos/builtin/packages/tppred/package.py +++ b/var/spack/repos/builtin/packages/tppred/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/transabyss/package.py b/var/spack/repos/builtin/packages/transabyss/package.py index 32a266f9f2..fd82270654 100644 --- a/var/spack/repos/builtin/packages/transabyss/package.py +++ b/var/spack/repos/builtin/packages/transabyss/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/transdecoder/package.py b/var/spack/repos/builtin/packages/transdecoder/package.py index 022f205d67..cbee3b5ca4 100644 --- a/var/spack/repos/builtin/packages/transdecoder/package.py +++ b/var/spack/repos/builtin/packages/transdecoder/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/transposome/package.py b/var/spack/repos/builtin/packages/transposome/package.py index 63e7d47f41..459cfd1380 100644 --- a/var/spack/repos/builtin/packages/transposome/package.py +++ b/var/spack/repos/builtin/packages/transposome/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/transset/package.py b/var/spack/repos/builtin/packages/transset/package.py index aff1273225..6e07bd4d27 100644 --- a/var/spack/repos/builtin/packages/transset/package.py +++ b/var/spack/repos/builtin/packages/transset/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/trapproto/package.py b/var/spack/repos/builtin/packages/trapproto/package.py index c7b2f3727d..cb578eb11b 100644 --- a/var/spack/repos/builtin/packages/trapproto/package.py +++ b/var/spack/repos/builtin/packages/trapproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/tree/package.py b/var/spack/repos/builtin/packages/tree/package.py index 339ce2c139..e39ad7ba7d 100644 --- a/var/spack/repos/builtin/packages/tree/package.py +++ b/var/spack/repos/builtin/packages/tree/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/trf/package.py b/var/spack/repos/builtin/packages/trf/package.py index f02e30302d..e4bab1161a 100644 --- a/var/spack/repos/builtin/packages/trf/package.py +++ b/var/spack/repos/builtin/packages/trf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/triangle/package.py b/var/spack/repos/builtin/packages/triangle/package.py index 9e20a4d964..e77539a264 100644 --- a/var/spack/repos/builtin/packages/triangle/package.py +++ b/var/spack/repos/builtin/packages/triangle/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 8defeb24a1..b199df50cc 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/trimgalore/package.py b/var/spack/repos/builtin/packages/trimgalore/package.py index e124824c16..fe51368934 100644 --- a/var/spack/repos/builtin/packages/trimgalore/package.py +++ b/var/spack/repos/builtin/packages/trimgalore/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/trimmomatic/package.py b/var/spack/repos/builtin/packages/trimmomatic/package.py index da741d5017..470ba69def 100644 --- a/var/spack/repos/builtin/packages/trimmomatic/package.py +++ b/var/spack/repos/builtin/packages/trimmomatic/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/trnascan-se/package.py b/var/spack/repos/builtin/packages/trnascan-se/package.py index 30ffc06f41..73a2bd5b54 100644 --- a/var/spack/repos/builtin/packages/trnascan-se/package.py +++ b/var/spack/repos/builtin/packages/trnascan-se/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/turbine/package.py b/var/spack/repos/builtin/packages/turbine/package.py index c7583cc40a..2289424f14 100644 --- a/var/spack/repos/builtin/packages/turbine/package.py +++ b/var/spack/repos/builtin/packages/turbine/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/turbomole/package.py b/var/spack/repos/builtin/packages/turbomole/package.py index 14af3e4bdf..1bcae3684a 100644 --- a/var/spack/repos/builtin/packages/turbomole/package.py +++ b/var/spack/repos/builtin/packages/turbomole/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/twm/package.py b/var/spack/repos/builtin/packages/twm/package.py index adaa2d863e..fd772c6fc2 100644 --- a/var/spack/repos/builtin/packages/twm/package.py +++ b/var/spack/repos/builtin/packages/twm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/typhonio/package.py b/var/spack/repos/builtin/packages/typhonio/package.py index 09396eb890..7a31e6db01 100644 --- a/var/spack/repos/builtin/packages/typhonio/package.py +++ b/var/spack/repos/builtin/packages/typhonio/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/uberftp/package.py b/var/spack/repos/builtin/packages/uberftp/package.py index 040434f1b1..6ecfefbbdc 100644 --- a/var/spack/repos/builtin/packages/uberftp/package.py +++ b/var/spack/repos/builtin/packages/uberftp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ucx/package.py b/var/spack/repos/builtin/packages/ucx/package.py index c1683d6dda..42e2dbd414 100644 --- a/var/spack/repos/builtin/packages/ucx/package.py +++ b/var/spack/repos/builtin/packages/ucx/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Los Alamos National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/udunits2/package.py b/var/spack/repos/builtin/packages/udunits2/package.py index 0e273f60ab..bfd4707490 100644 --- a/var/spack/repos/builtin/packages/udunits2/package.py +++ b/var/spack/repos/builtin/packages/udunits2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ufo-core/package.py b/var/spack/repos/builtin/packages/ufo-core/package.py index 1ccc0d73b5..87c561b380 100644 --- a/var/spack/repos/builtin/packages/ufo-core/package.py +++ b/var/spack/repos/builtin/packages/ufo-core/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/ufo-filters/package.py b/var/spack/repos/builtin/packages/ufo-filters/package.py index 675c268cac..817ffe32b9 100644 --- a/var/spack/repos/builtin/packages/ufo-filters/package.py +++ b/var/spack/repos/builtin/packages/ufo-filters/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/unblur/package.py b/var/spack/repos/builtin/packages/unblur/package.py index 0b971d756d..eed88307af 100644 --- a/var/spack/repos/builtin/packages/unblur/package.py +++ b/var/spack/repos/builtin/packages/unblur/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/uncrustify/package.py b/var/spack/repos/builtin/packages/uncrustify/package.py index fdd7a49ec7..4ef0049c73 100644 --- a/var/spack/repos/builtin/packages/uncrustify/package.py +++ b/var/spack/repos/builtin/packages/uncrustify/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/unibilium/package.py b/var/spack/repos/builtin/packages/unibilium/package.py index 74cea8c8e2..c9476ff612 100644 --- a/var/spack/repos/builtin/packages/unibilium/package.py +++ b/var/spack/repos/builtin/packages/unibilium/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/unison/package.py b/var/spack/repos/builtin/packages/unison/package.py index 3d94ca7f49..cf779e7e9d 100644 --- a/var/spack/repos/builtin/packages/unison/package.py +++ b/var/spack/repos/builtin/packages/unison/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/units/package.py b/var/spack/repos/builtin/packages/units/package.py index 502dc999b7..d5f437a6f1 100644 --- a/var/spack/repos/builtin/packages/units/package.py +++ b/var/spack/repos/builtin/packages/units/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/unixodbc/package.py b/var/spack/repos/builtin/packages/unixodbc/package.py index 30a771cdf2..acab343b5c 100644 --- a/var/spack/repos/builtin/packages/unixodbc/package.py +++ b/var/spack/repos/builtin/packages/unixodbc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/unzip/package.py b/var/spack/repos/builtin/packages/unzip/package.py index de0957978b..5ca5f5d00f 100644 --- a/var/spack/repos/builtin/packages/unzip/package.py +++ b/var/spack/repos/builtin/packages/unzip/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/usearch/package.py b/var/spack/repos/builtin/packages/usearch/package.py index b426376404..74f579e5c5 100644 --- a/var/spack/repos/builtin/packages/usearch/package.py +++ b/var/spack/repos/builtin/packages/usearch/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/util-linux/package.py b/var/spack/repos/builtin/packages/util-linux/package.py index f013737347..4ac9d653e9 100644 --- a/var/spack/repos/builtin/packages/util-linux/package.py +++ b/var/spack/repos/builtin/packages/util-linux/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/util-macros/package.py b/var/spack/repos/builtin/packages/util-macros/package.py index e49987a57f..18341a3637 100644 --- a/var/spack/repos/builtin/packages/util-macros/package.py +++ b/var/spack/repos/builtin/packages/util-macros/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/uuid/package.py b/var/spack/repos/builtin/packages/uuid/package.py index 5ad2e75341..cd6f54ce71 100644 --- a/var/spack/repos/builtin/packages/uuid/package.py +++ b/var/spack/repos/builtin/packages/uuid/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/valgrind/package.py b/var/spack/repos/builtin/packages/valgrind/package.py index dfd30dd9ad..df701e3907 100644 --- a/var/spack/repos/builtin/packages/valgrind/package.py +++ b/var/spack/repos/builtin/packages/valgrind/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/vampirtrace/package.py b/var/spack/repos/builtin/packages/vampirtrace/package.py index bc53cc6008..e999889ffb 100644 --- a/var/spack/repos/builtin/packages/vampirtrace/package.py +++ b/var/spack/repos/builtin/packages/vampirtrace/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/vardictjava/package.py b/var/spack/repos/builtin/packages/vardictjava/package.py index 8e8a29c8a5..0b03a94165 100644 --- a/var/spack/repos/builtin/packages/vardictjava/package.py +++ b/var/spack/repos/builtin/packages/vardictjava/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/varscan/package.py b/var/spack/repos/builtin/packages/varscan/package.py index 0ce5c6b634..0a67338c39 100644 --- a/var/spack/repos/builtin/packages/varscan/package.py +++ b/var/spack/repos/builtin/packages/varscan/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/vc/package.py b/var/spack/repos/builtin/packages/vc/package.py index 048955205b..5190ebaa76 100644 --- a/var/spack/repos/builtin/packages/vc/package.py +++ b/var/spack/repos/builtin/packages/vc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/vcftools/package.py b/var/spack/repos/builtin/packages/vcftools/package.py index 4813a804bb..1ad9836963 100644 --- a/var/spack/repos/builtin/packages/vcftools/package.py +++ b/var/spack/repos/builtin/packages/vcftools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/vcsh/package.py b/var/spack/repos/builtin/packages/vcsh/package.py index 76cdaf3b7b..2223887426 100644 --- a/var/spack/repos/builtin/packages/vcsh/package.py +++ b/var/spack/repos/builtin/packages/vcsh/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/vdt/package.py b/var/spack/repos/builtin/packages/vdt/package.py index 1ff2d014e3..d8dd0ed24c 100644 --- a/var/spack/repos/builtin/packages/vdt/package.py +++ b/var/spack/repos/builtin/packages/vdt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/vecgeom/package.py b/var/spack/repos/builtin/packages/vecgeom/package.py index 05c1519220..1e5a1542ff 100644 --- a/var/spack/repos/builtin/packages/vecgeom/package.py +++ b/var/spack/repos/builtin/packages/vecgeom/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/veclibfort/package.py b/var/spack/repos/builtin/packages/veclibfort/package.py index 16b1a1d7fd..1f55c1c873 100644 --- a/var/spack/repos/builtin/packages/veclibfort/package.py +++ b/var/spack/repos/builtin/packages/veclibfort/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/vegas2/package.py b/var/spack/repos/builtin/packages/vegas2/package.py index ad452b3384..80264b235e 100644 --- a/var/spack/repos/builtin/packages/vegas2/package.py +++ b/var/spack/repos/builtin/packages/vegas2/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/velvet/package.py b/var/spack/repos/builtin/packages/velvet/package.py index 45e10f4ce2..26066a4e78 100644 --- a/var/spack/repos/builtin/packages/velvet/package.py +++ b/var/spack/repos/builtin/packages/velvet/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/verilator/package.py b/var/spack/repos/builtin/packages/verilator/package.py index c2db2e02db..5810f5f412 100644 --- a/var/spack/repos/builtin/packages/verilator/package.py +++ b/var/spack/repos/builtin/packages/verilator/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/videoproto/package.py b/var/spack/repos/builtin/packages/videoproto/package.py index f6fe4c1157..859729c17f 100644 --- a/var/spack/repos/builtin/packages/videoproto/package.py +++ b/var/spack/repos/builtin/packages/videoproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/viennarna/package.py b/var/spack/repos/builtin/packages/viennarna/package.py index 79c8ff28bc..b1773d9b3b 100644 --- a/var/spack/repos/builtin/packages/viennarna/package.py +++ b/var/spack/repos/builtin/packages/viennarna/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/viewres/package.py b/var/spack/repos/builtin/packages/viewres/package.py index c48b020841..2f2051c271 100644 --- a/var/spack/repos/builtin/packages/viewres/package.py +++ b/var/spack/repos/builtin/packages/viewres/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/vim/package.py b/var/spack/repos/builtin/packages/vim/package.py index fb2ba5d437..e4aa99dd74 100644 --- a/var/spack/repos/builtin/packages/vim/package.py +++ b/var/spack/repos/builtin/packages/vim/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/virtualgl/package.py b/var/spack/repos/builtin/packages/virtualgl/package.py index c80eea5345..6ee61a312e 100644 --- a/var/spack/repos/builtin/packages/virtualgl/package.py +++ b/var/spack/repos/builtin/packages/virtualgl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/visit/package.py b/var/spack/repos/builtin/packages/visit/package.py index 7701a9ce73..f4d8ee082f 100644 --- a/var/spack/repos/builtin/packages/visit/package.py +++ b/var/spack/repos/builtin/packages/visit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/vizglow/package.py b/var/spack/repos/builtin/packages/vizglow/package.py index b35af35164..835c0250d7 100644 --- a/var/spack/repos/builtin/packages/vizglow/package.py +++ b/var/spack/repos/builtin/packages/vizglow/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/vmatch/package.py b/var/spack/repos/builtin/packages/vmatch/package.py index e58f9fbb22..40fc0f5753 100644 --- a/var/spack/repos/builtin/packages/vmatch/package.py +++ b/var/spack/repos/builtin/packages/vmatch/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/voropp/package.py b/var/spack/repos/builtin/packages/voropp/package.py index e88c20d864..ae952990b2 100644 --- a/var/spack/repos/builtin/packages/voropp/package.py +++ b/var/spack/repos/builtin/packages/voropp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/vpfft/package.py b/var/spack/repos/builtin/packages/vpfft/package.py index 1de6bdcfe4..331a55d2cc 100644 --- a/var/spack/repos/builtin/packages/vpfft/package.py +++ b/var/spack/repos/builtin/packages/vpfft/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/vsearch/package.py b/var/spack/repos/builtin/packages/vsearch/package.py index 8a69123d17..d41d5724f4 100644 --- a/var/spack/repos/builtin/packages/vsearch/package.py +++ b/var/spack/repos/builtin/packages/vsearch/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py index 3ed2016a0f..a355626bfb 100644 --- a/var/spack/repos/builtin/packages/vtk/package.py +++ b/var/spack/repos/builtin/packages/vtk/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/vtkh/package.py b/var/spack/repos/builtin/packages/vtkh/package.py index 35883547b1..117c9dc773 100644 --- a/var/spack/repos/builtin/packages/vtkh/package.py +++ b/var/spack/repos/builtin/packages/vtkh/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/vtkm/package.py b/var/spack/repos/builtin/packages/vtkm/package.py index c1bc968f85..a461c70b72 100644 --- a/var/spack/repos/builtin/packages/vtkm/package.py +++ b/var/spack/repos/builtin/packages/vtkm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/wannier90/package.py b/var/spack/repos/builtin/packages/wannier90/package.py index c940d6c171..60dcd21fff 100644 --- a/var/spack/repos/builtin/packages/wannier90/package.py +++ b/var/spack/repos/builtin/packages/wannier90/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/wcslib/package.py b/var/spack/repos/builtin/packages/wcslib/package.py index a4ff883d47..1ec63b2275 100644 --- a/var/spack/repos/builtin/packages/wcslib/package.py +++ b/var/spack/repos/builtin/packages/wcslib/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/wget/package.py b/var/spack/repos/builtin/packages/wget/package.py index 70144b3ac1..0c7301011c 100644 --- a/var/spack/repos/builtin/packages/wget/package.py +++ b/var/spack/repos/builtin/packages/wget/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/windowswmproto/package.py b/var/spack/repos/builtin/packages/windowswmproto/package.py index 70f1aae995..4f58f1a75c 100644 --- a/var/spack/repos/builtin/packages/windowswmproto/package.py +++ b/var/spack/repos/builtin/packages/windowswmproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/wt/package.py b/var/spack/repos/builtin/packages/wt/package.py index 36eefdf2c0..72851b4121 100644 --- a/var/spack/repos/builtin/packages/wt/package.py +++ b/var/spack/repos/builtin/packages/wt/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/wx/package.py b/var/spack/repos/builtin/packages/wx/package.py index 2799dd2e21..cf9312603d 100644 --- a/var/spack/repos/builtin/packages/wx/package.py +++ b/var/spack/repos/builtin/packages/wx/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/wxpropgrid/package.py b/var/spack/repos/builtin/packages/wxpropgrid/package.py index 7df30895fc..caabec4ca7 100644 --- a/var/spack/repos/builtin/packages/wxpropgrid/package.py +++ b/var/spack/repos/builtin/packages/wxpropgrid/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/x11perf/package.py b/var/spack/repos/builtin/packages/x11perf/package.py index 2dd9beff29..21bedfe824 100644 --- a/var/spack/repos/builtin/packages/x11perf/package.py +++ b/var/spack/repos/builtin/packages/x11perf/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xapian-core/package.py b/var/spack/repos/builtin/packages/xapian-core/package.py index 8ea340a55a..8e9cc9de67 100644 --- a/var/spack/repos/builtin/packages/xapian-core/package.py +++ b/var/spack/repos/builtin/packages/xapian-core/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xauth/package.py b/var/spack/repos/builtin/packages/xauth/package.py index f0a28b552d..ff1394f0e7 100644 --- a/var/spack/repos/builtin/packages/xauth/package.py +++ b/var/spack/repos/builtin/packages/xauth/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xbacklight/package.py b/var/spack/repos/builtin/packages/xbacklight/package.py index 1e29a9151e..1a2f4c2681 100644 --- a/var/spack/repos/builtin/packages/xbacklight/package.py +++ b/var/spack/repos/builtin/packages/xbacklight/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xbiff/package.py b/var/spack/repos/builtin/packages/xbiff/package.py index 257b2d6510..c1d2c1d754 100644 --- a/var/spack/repos/builtin/packages/xbiff/package.py +++ b/var/spack/repos/builtin/packages/xbiff/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xbitmaps/package.py b/var/spack/repos/builtin/packages/xbitmaps/package.py index 30a7c787bc..2237f3105f 100644 --- a/var/spack/repos/builtin/packages/xbitmaps/package.py +++ b/var/spack/repos/builtin/packages/xbitmaps/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xbraid/package.py b/var/spack/repos/builtin/packages/xbraid/package.py index d1d5fa2fed..548750282c 100644 --- a/var/spack/repos/builtin/packages/xbraid/package.py +++ b/var/spack/repos/builtin/packages/xbraid/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xcalc/package.py b/var/spack/repos/builtin/packages/xcalc/package.py index fd29564876..fff485b33b 100644 --- a/var/spack/repos/builtin/packages/xcalc/package.py +++ b/var/spack/repos/builtin/packages/xcalc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xcb-demo/package.py b/var/spack/repos/builtin/packages/xcb-demo/package.py index 921ee90711..0ae8df30d3 100644 --- a/var/spack/repos/builtin/packages/xcb-demo/package.py +++ b/var/spack/repos/builtin/packages/xcb-demo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xcb-proto/package.py b/var/spack/repos/builtin/packages/xcb-proto/package.py index 9cb2480b17..7e0249e838 100644 --- a/var/spack/repos/builtin/packages/xcb-proto/package.py +++ b/var/spack/repos/builtin/packages/xcb-proto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xcb-util-cursor/package.py b/var/spack/repos/builtin/packages/xcb-util-cursor/package.py index 33e616ccd8..cd80ce7ee5 100644 --- a/var/spack/repos/builtin/packages/xcb-util-cursor/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-cursor/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xcb-util-errors/package.py b/var/spack/repos/builtin/packages/xcb-util-errors/package.py index d38272f317..258b325524 100644 --- a/var/spack/repos/builtin/packages/xcb-util-errors/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-errors/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xcb-util-image/package.py b/var/spack/repos/builtin/packages/xcb-util-image/package.py index 2f051f67cd..605526b8cb 100644 --- a/var/spack/repos/builtin/packages/xcb-util-image/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-image/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xcb-util-keysyms/package.py b/var/spack/repos/builtin/packages/xcb-util-keysyms/package.py index ae6f7afeb3..22e1d3c776 100644 --- a/var/spack/repos/builtin/packages/xcb-util-keysyms/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-keysyms/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xcb-util-renderutil/package.py b/var/spack/repos/builtin/packages/xcb-util-renderutil/package.py index dd8760d98f..5625a3a48d 100644 --- a/var/spack/repos/builtin/packages/xcb-util-renderutil/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-renderutil/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xcb-util-wm/package.py b/var/spack/repos/builtin/packages/xcb-util-wm/package.py index bc37618fef..6d7d168676 100644 --- a/var/spack/repos/builtin/packages/xcb-util-wm/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-wm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xcb-util-xrm/package.py b/var/spack/repos/builtin/packages/xcb-util-xrm/package.py index e7e376f79d..20b0c9cd2c 100644 --- a/var/spack/repos/builtin/packages/xcb-util-xrm/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-xrm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xcb-util/package.py b/var/spack/repos/builtin/packages/xcb-util/package.py index 50d8fcc2d9..81710b7dde 100644 --- a/var/spack/repos/builtin/packages/xcb-util/package.py +++ b/var/spack/repos/builtin/packages/xcb-util/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xclip/package.py b/var/spack/repos/builtin/packages/xclip/package.py index d685d1f07c..76b8cc0d81 100644 --- a/var/spack/repos/builtin/packages/xclip/package.py +++ b/var/spack/repos/builtin/packages/xclip/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xclipboard/package.py b/var/spack/repos/builtin/packages/xclipboard/package.py index 8ce7684640..f3c32714c8 100644 --- a/var/spack/repos/builtin/packages/xclipboard/package.py +++ b/var/spack/repos/builtin/packages/xclipboard/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xclock/package.py b/var/spack/repos/builtin/packages/xclock/package.py index c9ee8d71c4..c8d21885f1 100644 --- a/var/spack/repos/builtin/packages/xclock/package.py +++ b/var/spack/repos/builtin/packages/xclock/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xcmiscproto/package.py b/var/spack/repos/builtin/packages/xcmiscproto/package.py index f18e8175de..e658883758 100644 --- a/var/spack/repos/builtin/packages/xcmiscproto/package.py +++ b/var/spack/repos/builtin/packages/xcmiscproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xcmsdb/package.py b/var/spack/repos/builtin/packages/xcmsdb/package.py index 623f8a1241..9c73581eb9 100644 --- a/var/spack/repos/builtin/packages/xcmsdb/package.py +++ b/var/spack/repos/builtin/packages/xcmsdb/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xcompmgr/package.py b/var/spack/repos/builtin/packages/xcompmgr/package.py index 9de6cb38d3..05ab4e3b53 100644 --- a/var/spack/repos/builtin/packages/xcompmgr/package.py +++ b/var/spack/repos/builtin/packages/xcompmgr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xconsole/package.py b/var/spack/repos/builtin/packages/xconsole/package.py index f04a10fb8d..7fd8bf810f 100644 --- a/var/spack/repos/builtin/packages/xconsole/package.py +++ b/var/spack/repos/builtin/packages/xconsole/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xcursor-themes/package.py b/var/spack/repos/builtin/packages/xcursor-themes/package.py index abda96d3d4..82d8f37c2d 100644 --- a/var/spack/repos/builtin/packages/xcursor-themes/package.py +++ b/var/spack/repos/builtin/packages/xcursor-themes/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xcursorgen/package.py b/var/spack/repos/builtin/packages/xcursorgen/package.py index de34fbcf33..45f2e0af6f 100644 --- a/var/spack/repos/builtin/packages/xcursorgen/package.py +++ b/var/spack/repos/builtin/packages/xcursorgen/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xdbedizzy/package.py b/var/spack/repos/builtin/packages/xdbedizzy/package.py index 7afa4dc7ba..4fdccba817 100644 --- a/var/spack/repos/builtin/packages/xdbedizzy/package.py +++ b/var/spack/repos/builtin/packages/xdbedizzy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xditview/package.py b/var/spack/repos/builtin/packages/xditview/package.py index d11f01e3eb..f4cfd71704 100644 --- a/var/spack/repos/builtin/packages/xditview/package.py +++ b/var/spack/repos/builtin/packages/xditview/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xdm/package.py b/var/spack/repos/builtin/packages/xdm/package.py index 4804e47288..8fade37f50 100644 --- a/var/spack/repos/builtin/packages/xdm/package.py +++ b/var/spack/repos/builtin/packages/xdm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xdpyinfo/package.py b/var/spack/repos/builtin/packages/xdpyinfo/package.py index 969d1b9762..cc71968b29 100644 --- a/var/spack/repos/builtin/packages/xdpyinfo/package.py +++ b/var/spack/repos/builtin/packages/xdpyinfo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xdriinfo/package.py b/var/spack/repos/builtin/packages/xdriinfo/package.py index 50245b444a..ce844ed9cc 100644 --- a/var/spack/repos/builtin/packages/xdriinfo/package.py +++ b/var/spack/repos/builtin/packages/xdriinfo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xedit/package.py b/var/spack/repos/builtin/packages/xedit/package.py index 77d7609313..fe0f021146 100644 --- a/var/spack/repos/builtin/packages/xedit/package.py +++ b/var/spack/repos/builtin/packages/xedit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xerces-c/package.py b/var/spack/repos/builtin/packages/xerces-c/package.py index 3e832784f8..bbdbd714d4 100644 --- a/var/spack/repos/builtin/packages/xerces-c/package.py +++ b/var/spack/repos/builtin/packages/xerces-c/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xev/package.py b/var/spack/repos/builtin/packages/xev/package.py index 06bac3a08a..3e7b3d06f1 100644 --- a/var/spack/repos/builtin/packages/xev/package.py +++ b/var/spack/repos/builtin/packages/xev/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xextproto/package.py b/var/spack/repos/builtin/packages/xextproto/package.py index 4c6b03390c..7d12b3cdf6 100644 --- a/var/spack/repos/builtin/packages/xextproto/package.py +++ b/var/spack/repos/builtin/packages/xextproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xeyes/package.py b/var/spack/repos/builtin/packages/xeyes/package.py index dc287c7e74..10a15460b8 100644 --- a/var/spack/repos/builtin/packages/xeyes/package.py +++ b/var/spack/repos/builtin/packages/xeyes/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xf86bigfontproto/package.py b/var/spack/repos/builtin/packages/xf86bigfontproto/package.py index 4a1315b617..ca52eb31d5 100644 --- a/var/spack/repos/builtin/packages/xf86bigfontproto/package.py +++ b/var/spack/repos/builtin/packages/xf86bigfontproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xf86dga/package.py b/var/spack/repos/builtin/packages/xf86dga/package.py index 882ac79e70..e6be26ee5b 100644 --- a/var/spack/repos/builtin/packages/xf86dga/package.py +++ b/var/spack/repos/builtin/packages/xf86dga/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xf86dgaproto/package.py b/var/spack/repos/builtin/packages/xf86dgaproto/package.py index 88cd07c286..c7d77f497b 100644 --- a/var/spack/repos/builtin/packages/xf86dgaproto/package.py +++ b/var/spack/repos/builtin/packages/xf86dgaproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xf86driproto/package.py b/var/spack/repos/builtin/packages/xf86driproto/package.py index b71d709bd5..1d321f7f54 100644 --- a/var/spack/repos/builtin/packages/xf86driproto/package.py +++ b/var/spack/repos/builtin/packages/xf86driproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xf86miscproto/package.py b/var/spack/repos/builtin/packages/xf86miscproto/package.py index 60e1db78bf..d3fa371a00 100644 --- a/var/spack/repos/builtin/packages/xf86miscproto/package.py +++ b/var/spack/repos/builtin/packages/xf86miscproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xf86rushproto/package.py b/var/spack/repos/builtin/packages/xf86rushproto/package.py index 6b29e07c6a..aaf0c31bcb 100644 --- a/var/spack/repos/builtin/packages/xf86rushproto/package.py +++ b/var/spack/repos/builtin/packages/xf86rushproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xf86vidmodeproto/package.py b/var/spack/repos/builtin/packages/xf86vidmodeproto/package.py index 1f6a4f36c9..4ee977fb27 100644 --- a/var/spack/repos/builtin/packages/xf86vidmodeproto/package.py +++ b/var/spack/repos/builtin/packages/xf86vidmodeproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xfd/package.py b/var/spack/repos/builtin/packages/xfd/package.py index 3ba1d3313a..57fa903e47 100644 --- a/var/spack/repos/builtin/packages/xfd/package.py +++ b/var/spack/repos/builtin/packages/xfd/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xfindproxy/package.py b/var/spack/repos/builtin/packages/xfindproxy/package.py index e0d9ffbc4c..9428af5036 100644 --- a/var/spack/repos/builtin/packages/xfindproxy/package.py +++ b/var/spack/repos/builtin/packages/xfindproxy/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xfontsel/package.py b/var/spack/repos/builtin/packages/xfontsel/package.py index c575b81b00..3f3b0ef1af 100644 --- a/var/spack/repos/builtin/packages/xfontsel/package.py +++ b/var/spack/repos/builtin/packages/xfontsel/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xfs/package.py b/var/spack/repos/builtin/packages/xfs/package.py index 8204d58e9f..918a18e471 100644 --- a/var/spack/repos/builtin/packages/xfs/package.py +++ b/var/spack/repos/builtin/packages/xfs/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xfsinfo/package.py b/var/spack/repos/builtin/packages/xfsinfo/package.py index 54fec32ba8..a9e6a8fdce 100644 --- a/var/spack/repos/builtin/packages/xfsinfo/package.py +++ b/var/spack/repos/builtin/packages/xfsinfo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xfwp/package.py b/var/spack/repos/builtin/packages/xfwp/package.py index 1d9cb0d1b4..9e2e6b351b 100644 --- a/var/spack/repos/builtin/packages/xfwp/package.py +++ b/var/spack/repos/builtin/packages/xfwp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xgamma/package.py b/var/spack/repos/builtin/packages/xgamma/package.py index 1d114e170b..a9b41f9885 100644 --- a/var/spack/repos/builtin/packages/xgamma/package.py +++ b/var/spack/repos/builtin/packages/xgamma/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xgc/package.py b/var/spack/repos/builtin/packages/xgc/package.py index 24b9143da8..9e4cbfcf7c 100644 --- a/var/spack/repos/builtin/packages/xgc/package.py +++ b/var/spack/repos/builtin/packages/xgc/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xhost/package.py b/var/spack/repos/builtin/packages/xhost/package.py index ff7f72fb4c..9f7bcf1234 100644 --- a/var/spack/repos/builtin/packages/xhost/package.py +++ b/var/spack/repos/builtin/packages/xhost/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xineramaproto/package.py b/var/spack/repos/builtin/packages/xineramaproto/package.py index 027f2b00de..03b6b7949b 100644 --- a/var/spack/repos/builtin/packages/xineramaproto/package.py +++ b/var/spack/repos/builtin/packages/xineramaproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xinit/package.py b/var/spack/repos/builtin/packages/xinit/package.py index b3586a6367..4d170cf319 100644 --- a/var/spack/repos/builtin/packages/xinit/package.py +++ b/var/spack/repos/builtin/packages/xinit/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xinput/package.py b/var/spack/repos/builtin/packages/xinput/package.py index 2438750be3..0a3f7a9f25 100644 --- a/var/spack/repos/builtin/packages/xinput/package.py +++ b/var/spack/repos/builtin/packages/xinput/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xios/package.py b/var/spack/repos/builtin/packages/xios/package.py index a3df5e9ca8..599b9a907e 100644 --- a/var/spack/repos/builtin/packages/xios/package.py +++ b/var/spack/repos/builtin/packages/xios/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xkbcomp/package.py b/var/spack/repos/builtin/packages/xkbcomp/package.py index 119b2cc740..e19d004ee0 100644 --- a/var/spack/repos/builtin/packages/xkbcomp/package.py +++ b/var/spack/repos/builtin/packages/xkbcomp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xkbdata/package.py b/var/spack/repos/builtin/packages/xkbdata/package.py index cb35f1ae3a..d07c6cbc12 100644 --- a/var/spack/repos/builtin/packages/xkbdata/package.py +++ b/var/spack/repos/builtin/packages/xkbdata/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xkbevd/package.py b/var/spack/repos/builtin/packages/xkbevd/package.py index 3d0339d2b1..ddd3dee54c 100644 --- a/var/spack/repos/builtin/packages/xkbevd/package.py +++ b/var/spack/repos/builtin/packages/xkbevd/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xkbprint/package.py b/var/spack/repos/builtin/packages/xkbprint/package.py index 5f87e6b32a..e369739878 100644 --- a/var/spack/repos/builtin/packages/xkbprint/package.py +++ b/var/spack/repos/builtin/packages/xkbprint/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xkbutils/package.py b/var/spack/repos/builtin/packages/xkbutils/package.py index f129c7992b..fd0f1c02af 100644 --- a/var/spack/repos/builtin/packages/xkbutils/package.py +++ b/var/spack/repos/builtin/packages/xkbutils/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xkeyboard-config/package.py b/var/spack/repos/builtin/packages/xkeyboard-config/package.py index b324cee133..49bc63daaf 100644 --- a/var/spack/repos/builtin/packages/xkeyboard-config/package.py +++ b/var/spack/repos/builtin/packages/xkeyboard-config/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xkill/package.py b/var/spack/repos/builtin/packages/xkill/package.py index 5b25a1c0e0..ef2b3bf490 100644 --- a/var/spack/repos/builtin/packages/xkill/package.py +++ b/var/spack/repos/builtin/packages/xkill/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xload/package.py b/var/spack/repos/builtin/packages/xload/package.py index e4bb88b7f2..ea6b6886a3 100644 --- a/var/spack/repos/builtin/packages/xload/package.py +++ b/var/spack/repos/builtin/packages/xload/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xlogo/package.py b/var/spack/repos/builtin/packages/xlogo/package.py index 66f55481e5..4134a676cf 100644 --- a/var/spack/repos/builtin/packages/xlogo/package.py +++ b/var/spack/repos/builtin/packages/xlogo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xlsatoms/package.py b/var/spack/repos/builtin/packages/xlsatoms/package.py index 1856a27890..e16d61d27f 100644 --- a/var/spack/repos/builtin/packages/xlsatoms/package.py +++ b/var/spack/repos/builtin/packages/xlsatoms/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xlsclients/package.py b/var/spack/repos/builtin/packages/xlsclients/package.py index 7330238af7..96f5a9798d 100644 --- a/var/spack/repos/builtin/packages/xlsclients/package.py +++ b/var/spack/repos/builtin/packages/xlsclients/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xlsfonts/package.py b/var/spack/repos/builtin/packages/xlsfonts/package.py index 15a0a5a620..d32ba86cff 100644 --- a/var/spack/repos/builtin/packages/xlsfonts/package.py +++ b/var/spack/repos/builtin/packages/xlsfonts/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xmag/package.py b/var/spack/repos/builtin/packages/xmag/package.py index 1ca15ded60..2e09582662 100644 --- a/var/spack/repos/builtin/packages/xmag/package.py +++ b/var/spack/repos/builtin/packages/xmag/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xman/package.py b/var/spack/repos/builtin/packages/xman/package.py index f24d9f0eb0..f941885aca 100644 --- a/var/spack/repos/builtin/packages/xman/package.py +++ b/var/spack/repos/builtin/packages/xman/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xmessage/package.py b/var/spack/repos/builtin/packages/xmessage/package.py index 54becc288f..3c86cf0d77 100644 --- a/var/spack/repos/builtin/packages/xmessage/package.py +++ b/var/spack/repos/builtin/packages/xmessage/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xmh/package.py b/var/spack/repos/builtin/packages/xmh/package.py index 7924db060c..167c888d32 100644 --- a/var/spack/repos/builtin/packages/xmh/package.py +++ b/var/spack/repos/builtin/packages/xmh/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xmlf90/package.py b/var/spack/repos/builtin/packages/xmlf90/package.py index 07f554eeca..005a844e9d 100644 --- a/var/spack/repos/builtin/packages/xmlf90/package.py +++ b/var/spack/repos/builtin/packages/xmlf90/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xmlto/package.py b/var/spack/repos/builtin/packages/xmlto/package.py index b1122d8ef6..3d2af2af40 100644 --- a/var/spack/repos/builtin/packages/xmlto/package.py +++ b/var/spack/repos/builtin/packages/xmlto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xmodmap/package.py b/var/spack/repos/builtin/packages/xmodmap/package.py index 66608fc353..9d660188d2 100644 --- a/var/spack/repos/builtin/packages/xmodmap/package.py +++ b/var/spack/repos/builtin/packages/xmodmap/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xmore/package.py b/var/spack/repos/builtin/packages/xmore/package.py index 56aaa83929..39e926c52b 100644 --- a/var/spack/repos/builtin/packages/xmore/package.py +++ b/var/spack/repos/builtin/packages/xmore/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xorg-cf-files/package.py b/var/spack/repos/builtin/packages/xorg-cf-files/package.py index 3c0abedce5..6e93885cae 100644 --- a/var/spack/repos/builtin/packages/xorg-cf-files/package.py +++ b/var/spack/repos/builtin/packages/xorg-cf-files/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xorg-docs/package.py b/var/spack/repos/builtin/packages/xorg-docs/package.py index 614d39da3d..b1541effce 100644 --- a/var/spack/repos/builtin/packages/xorg-docs/package.py +++ b/var/spack/repos/builtin/packages/xorg-docs/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xorg-gtest/package.py b/var/spack/repos/builtin/packages/xorg-gtest/package.py index 914cd54e46..8da1b945b7 100644 --- a/var/spack/repos/builtin/packages/xorg-gtest/package.py +++ b/var/spack/repos/builtin/packages/xorg-gtest/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xorg-server/package.py b/var/spack/repos/builtin/packages/xorg-server/package.py index 883536a587..bb1e1a26a1 100644 --- a/var/spack/repos/builtin/packages/xorg-server/package.py +++ b/var/spack/repos/builtin/packages/xorg-server/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xorg-sgml-doctools/package.py b/var/spack/repos/builtin/packages/xorg-sgml-doctools/package.py index 86e462ab42..6c20c0fea1 100644 --- a/var/spack/repos/builtin/packages/xorg-sgml-doctools/package.py +++ b/var/spack/repos/builtin/packages/xorg-sgml-doctools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xphelloworld/package.py b/var/spack/repos/builtin/packages/xphelloworld/package.py index 0697553a68..7316295c24 100644 --- a/var/spack/repos/builtin/packages/xphelloworld/package.py +++ b/var/spack/repos/builtin/packages/xphelloworld/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xplor-nih/package.py b/var/spack/repos/builtin/packages/xplor-nih/package.py index 3be84ebf22..76277142b5 100644 --- a/var/spack/repos/builtin/packages/xplor-nih/package.py +++ b/var/spack/repos/builtin/packages/xplor-nih/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xplsprinters/package.py b/var/spack/repos/builtin/packages/xplsprinters/package.py index 581a875c8b..ef58f60752 100644 --- a/var/spack/repos/builtin/packages/xplsprinters/package.py +++ b/var/spack/repos/builtin/packages/xplsprinters/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xpr/package.py b/var/spack/repos/builtin/packages/xpr/package.py index e826713961..6ed5cda7f3 100644 --- a/var/spack/repos/builtin/packages/xpr/package.py +++ b/var/spack/repos/builtin/packages/xpr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xprehashprinterlist/package.py b/var/spack/repos/builtin/packages/xprehashprinterlist/package.py index 94414a48de..d73ac5a531 100644 --- a/var/spack/repos/builtin/packages/xprehashprinterlist/package.py +++ b/var/spack/repos/builtin/packages/xprehashprinterlist/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xprop/package.py b/var/spack/repos/builtin/packages/xprop/package.py index 1bf5331964..f873e108dc 100644 --- a/var/spack/repos/builtin/packages/xprop/package.py +++ b/var/spack/repos/builtin/packages/xprop/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xproto/package.py b/var/spack/repos/builtin/packages/xproto/package.py index 5414b11c56..24fcf72d55 100644 --- a/var/spack/repos/builtin/packages/xproto/package.py +++ b/var/spack/repos/builtin/packages/xproto/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xproxymanagementprotocol/package.py b/var/spack/repos/builtin/packages/xproxymanagementprotocol/package.py index 2f70146e00..15e037913d 100644 --- a/var/spack/repos/builtin/packages/xproxymanagementprotocol/package.py +++ b/var/spack/repos/builtin/packages/xproxymanagementprotocol/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xqilla/package.py b/var/spack/repos/builtin/packages/xqilla/package.py index 0c63fa6c3f..4f4fdd154e 100644 --- a/var/spack/repos/builtin/packages/xqilla/package.py +++ b/var/spack/repos/builtin/packages/xqilla/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xrandr/package.py b/var/spack/repos/builtin/packages/xrandr/package.py index cb59ad7355..622d8442e6 100644 --- a/var/spack/repos/builtin/packages/xrandr/package.py +++ b/var/spack/repos/builtin/packages/xrandr/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xrdb/package.py b/var/spack/repos/builtin/packages/xrdb/package.py index c2de7822d2..cbb48bbca4 100644 --- a/var/spack/repos/builtin/packages/xrdb/package.py +++ b/var/spack/repos/builtin/packages/xrdb/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xrefresh/package.py b/var/spack/repos/builtin/packages/xrefresh/package.py index c1e6d8e96a..1bc54c44a6 100644 --- a/var/spack/repos/builtin/packages/xrefresh/package.py +++ b/var/spack/repos/builtin/packages/xrefresh/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xrootd/package.py b/var/spack/repos/builtin/packages/xrootd/package.py index 16a1787883..6a5058b9ff 100644 --- a/var/spack/repos/builtin/packages/xrootd/package.py +++ b/var/spack/repos/builtin/packages/xrootd/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xrx/package.py b/var/spack/repos/builtin/packages/xrx/package.py index 2aae39beac..5020f181a8 100644 --- a/var/spack/repos/builtin/packages/xrx/package.py +++ b/var/spack/repos/builtin/packages/xrx/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xsbench/package.py b/var/spack/repos/builtin/packages/xsbench/package.py index 345d566bc0..c735826f36 100644 --- a/var/spack/repos/builtin/packages/xsbench/package.py +++ b/var/spack/repos/builtin/packages/xsbench/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xscope/package.py b/var/spack/repos/builtin/packages/xscope/package.py index d00f970185..c9b2736387 100644 --- a/var/spack/repos/builtin/packages/xscope/package.py +++ b/var/spack/repos/builtin/packages/xscope/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py index 45bdd3c094..dc96b61723 100644 --- a/var/spack/repos/builtin/packages/xsdk/package.py +++ b/var/spack/repos/builtin/packages/xsdk/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xsdktrilinos/package.py b/var/spack/repos/builtin/packages/xsdktrilinos/package.py index cc75589937..a0d6713d2c 100644 --- a/var/spack/repos/builtin/packages/xsdktrilinos/package.py +++ b/var/spack/repos/builtin/packages/xsdktrilinos/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xset/package.py b/var/spack/repos/builtin/packages/xset/package.py index 8a349afb00..5bc09386f0 100644 --- a/var/spack/repos/builtin/packages/xset/package.py +++ b/var/spack/repos/builtin/packages/xset/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xsetmode/package.py b/var/spack/repos/builtin/packages/xsetmode/package.py index 57cc644a7c..7913318785 100644 --- a/var/spack/repos/builtin/packages/xsetmode/package.py +++ b/var/spack/repos/builtin/packages/xsetmode/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xsetpointer/package.py b/var/spack/repos/builtin/packages/xsetpointer/package.py index 672a172c86..4e182369bc 100644 --- a/var/spack/repos/builtin/packages/xsetpointer/package.py +++ b/var/spack/repos/builtin/packages/xsetpointer/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xsetroot/package.py b/var/spack/repos/builtin/packages/xsetroot/package.py index 428294dbce..2267f5da73 100644 --- a/var/spack/repos/builtin/packages/xsetroot/package.py +++ b/var/spack/repos/builtin/packages/xsetroot/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xsimd/package.py b/var/spack/repos/builtin/packages/xsimd/package.py index 883f15d441..6240c38a05 100644 --- a/var/spack/repos/builtin/packages/xsimd/package.py +++ b/var/spack/repos/builtin/packages/xsimd/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xsm/package.py b/var/spack/repos/builtin/packages/xsm/package.py index c35213ee7e..6262458128 100644 --- a/var/spack/repos/builtin/packages/xsm/package.py +++ b/var/spack/repos/builtin/packages/xsm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xstdcmap/package.py b/var/spack/repos/builtin/packages/xstdcmap/package.py index d4521dbc56..3ed79db269 100644 --- a/var/spack/repos/builtin/packages/xstdcmap/package.py +++ b/var/spack/repos/builtin/packages/xstdcmap/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xtensor/package.py b/var/spack/repos/builtin/packages/xtensor/package.py index 4cb2a9c5ca..d09e33edb4 100644 --- a/var/spack/repos/builtin/packages/xtensor/package.py +++ b/var/spack/repos/builtin/packages/xtensor/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xterm/package.py b/var/spack/repos/builtin/packages/xterm/package.py index 72b0cfefe7..cfc2bd99dc 100644 --- a/var/spack/repos/builtin/packages/xterm/package.py +++ b/var/spack/repos/builtin/packages/xterm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xtl/package.py b/var/spack/repos/builtin/packages/xtl/package.py index ed6f93d84b..faf6e905c8 100644 --- a/var/spack/repos/builtin/packages/xtl/package.py +++ b/var/spack/repos/builtin/packages/xtl/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xtrans/package.py b/var/spack/repos/builtin/packages/xtrans/package.py index 08739749f8..bf8c68cecc 100644 --- a/var/spack/repos/builtin/packages/xtrans/package.py +++ b/var/spack/repos/builtin/packages/xtrans/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xtrap/package.py b/var/spack/repos/builtin/packages/xtrap/package.py index 3bbeef6d70..85df34a4ab 100644 --- a/var/spack/repos/builtin/packages/xtrap/package.py +++ b/var/spack/repos/builtin/packages/xtrap/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xts/package.py b/var/spack/repos/builtin/packages/xts/package.py index 985a35bd5a..b583dfc8e7 100644 --- a/var/spack/repos/builtin/packages/xts/package.py +++ b/var/spack/repos/builtin/packages/xts/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xvidtune/package.py b/var/spack/repos/builtin/packages/xvidtune/package.py index b8075b8f9f..cab1869798 100644 --- a/var/spack/repos/builtin/packages/xvidtune/package.py +++ b/var/spack/repos/builtin/packages/xvidtune/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xvinfo/package.py b/var/spack/repos/builtin/packages/xvinfo/package.py index 77637f43bb..be6337b30d 100644 --- a/var/spack/repos/builtin/packages/xvinfo/package.py +++ b/var/spack/repos/builtin/packages/xvinfo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xwd/package.py b/var/spack/repos/builtin/packages/xwd/package.py index 47abe79692..d4071ad26e 100644 --- a/var/spack/repos/builtin/packages/xwd/package.py +++ b/var/spack/repos/builtin/packages/xwd/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xwininfo/package.py b/var/spack/repos/builtin/packages/xwininfo/package.py index 3022b8539d..e291b68f2a 100644 --- a/var/spack/repos/builtin/packages/xwininfo/package.py +++ b/var/spack/repos/builtin/packages/xwininfo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xwud/package.py b/var/spack/repos/builtin/packages/xwud/package.py index 3ad6c41283..9afa00a1cc 100644 --- a/var/spack/repos/builtin/packages/xwud/package.py +++ b/var/spack/repos/builtin/packages/xwud/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/xz/package.py b/var/spack/repos/builtin/packages/xz/package.py index 04d91c76ac..2a64e6cc4e 100644 --- a/var/spack/repos/builtin/packages/xz/package.py +++ b/var/spack/repos/builtin/packages/xz/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/yambo/package.py b/var/spack/repos/builtin/packages/yambo/package.py index 246e7f9918..7f2eca243c 100644 --- a/var/spack/repos/builtin/packages/yambo/package.py +++ b/var/spack/repos/builtin/packages/yambo/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/yaml-cpp/package.py b/var/spack/repos/builtin/packages/yaml-cpp/package.py index 2b7470eded..734d54bf2e 100644 --- a/var/spack/repos/builtin/packages/yaml-cpp/package.py +++ b/var/spack/repos/builtin/packages/yaml-cpp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/yasm/package.py b/var/spack/repos/builtin/packages/yasm/package.py index 0d35e41e04..25d8b1cad5 100644 --- a/var/spack/repos/builtin/packages/yasm/package.py +++ b/var/spack/repos/builtin/packages/yasm/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/yorick/package.py b/var/spack/repos/builtin/packages/yorick/package.py index c30f9ca4ed..6ec6139cd5 100644 --- a/var/spack/repos/builtin/packages/yorick/package.py +++ b/var/spack/repos/builtin/packages/yorick/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/z3/package.py b/var/spack/repos/builtin/packages/z3/package.py index 2234b7e596..d42c81dc9c 100644 --- a/var/spack/repos/builtin/packages/z3/package.py +++ b/var/spack/repos/builtin/packages/z3/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/zeromq/package.py b/var/spack/repos/builtin/packages/zeromq/package.py index dbf1f921b7..c734a0c644 100644 --- a/var/spack/repos/builtin/packages/zeromq/package.py +++ b/var/spack/repos/builtin/packages/zeromq/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/zfp/package.py b/var/spack/repos/builtin/packages/zfp/package.py index 25d6a53bc2..5940706ccf 100644 --- a/var/spack/repos/builtin/packages/zfp/package.py +++ b/var/spack/repos/builtin/packages/zfp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/zip/package.py b/var/spack/repos/builtin/packages/zip/package.py index 255f254dee..5473b0af0f 100644 --- a/var/spack/repos/builtin/packages/zip/package.py +++ b/var/spack/repos/builtin/packages/zip/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/zlib/package.py b/var/spack/repos/builtin/packages/zlib/package.py index e005e21f36..7ff6a9ac4b 100644 --- a/var/spack/repos/builtin/packages/zlib/package.py +++ b/var/spack/repos/builtin/packages/zlib/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/zoltan/package.py b/var/spack/repos/builtin/packages/zoltan/package.py index 7e40a3a51b..93332eaa90 100644 --- a/var/spack/repos/builtin/packages/zoltan/package.py +++ b/var/spack/repos/builtin/packages/zoltan/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/zsh/package.py b/var/spack/repos/builtin/packages/zsh/package.py index 6bcf4fddc3..3fd012c7ec 100644 --- a/var/spack/repos/builtin/packages/zsh/package.py +++ b/var/spack/repos/builtin/packages/zsh/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. diff --git a/var/spack/repos/builtin/packages/zstd/package.py b/var/spack/repos/builtin/packages/zstd/package.py index 9387311fbb..82fe0a0e4a 100644 --- a/var/spack/repos/builtin/packages/zstd/package.py +++ b/var/spack/repos/builtin/packages/zstd/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. # Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. -- cgit v1.2.3-70-g09d2 From 8890dbe3d91585ef2fbdf2797ed9a886955f1f5e Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Sun, 25 Mar 2018 03:51:02 +0800 Subject: Add a new packag: sofa-c. (#7470) --- var/spack/repos/builtin/packages/sofa-c/package.py | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 var/spack/repos/builtin/packages/sofa-c/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sofa-c/package.py b/var/spack/repos/builtin/packages/sofa-c/package.py new file mode 100644 index 0000000000..65f23e1def --- /dev/null +++ b/var/spack/repos/builtin/packages/sofa-c/package.py @@ -0,0 +1,50 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class SofaC(MakefilePackage): + "Standards of Fundamental Astronomy (SOFA) library for ANSI C." + + homepage = "http://www.iausofa.org/current_C.html" + url = "http://www.iausofa.org/2018_0130_C/sofa_c-20180130.tar.gz" + + version('20180130', '9d6903c7690e84a788b622fba6f10146') + + @property + def build_directory(self): + return join_path(self.version, 'c', 'src') + + def edit(self, spec, prefix): + makefile = FileFilter(join_path(self.build_directory, 'makefile')) + makefile.filter('CCOMPC = gcc', 'CCOMPC = {0}'.format(spack_cc)) + + def install(self, spec, prefix): + with working_dir(self.build_directory): + mkdir(prefix.include) + install('sofa.h', prefix.include) + install('sofam.h', prefix.include) + mkdir(prefix.lib) + install('libsofa_c.a', prefix.lib) -- cgit v1.2.3-70-g09d2 From dffd8f384c1bc5e8cbb82db43e47d530c739dd66 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Sun, 25 Mar 2018 09:10:40 +0200 Subject: python: added a variant to enable PGO + using --with-icc if compiled with Intel (#7496) Added a variant to enable default optimizations for production builds. Uses --with-icc if built with Intel compilers. --- var/spack/repos/builtin/packages/python/package.py | 28 +++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 87038810e7..683ce4bbbe 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -86,6 +86,11 @@ class Python(AutotoolsPackage): description='Produce position-independent code (for shared libs)') variant('dbm', default=True, description='Provide support for dbm') + variant( + 'optimizations', + default=False, + description='Enable expensive build-time optimizations, if available' + ) depends_on("openssl") depends_on("bzip2") @@ -104,10 +109,21 @@ class Python(AutotoolsPackage): patch('cray-rpath-2.3.patch', when="@2.3:3.0.1 platform=cray") patch('cray-rpath-3.1.patch', when="@3.1:3.99 platform=cray") + # For more information refer to this bug report: + # https://bugs.python.org/issue29712 + conflicts( + '@:2.8 +shared', + when='+optimizations', + msg='+optimizations is incompatible with +shared in python@2.X' + ) + _DISTUTIL_VARS_TO_SAVE = ['LDSHARED'] _DISTUTIL_CACHE_FILENAME = 'sysconfig.json' _distutil_vars = None + # An in-source build with --enable-optimizations fails for python@3.X + build_directory = 'spack-build' + @when('@2.7:2.8,3.4:') def patch(self): # NOTE: Python's default installation procedure makes it possible for a @@ -122,7 +138,6 @@ class Python(AutotoolsPackage): def setup_environment(self, spack_env, run_env): spec = self.spec - prefix = self.prefix # TODO: The '--no-user-cfg' option for Python installation is only in # Python v2.7 and v3.4+ (see https://bugs.python.org/issue1180) and @@ -133,8 +148,6 @@ class Python(AutotoolsPackage): 'user configurations are present.').format(self.version)) # Need this to allow python build to find the Python installation. - spack_env.set('PYTHONHOME', prefix) - spack_env.set('PYTHONPATH', prefix) spack_env.set('MACOSX_DEPLOYMENT_TARGET', platform.mac_ver()[0]) def configure_args(self): @@ -148,9 +161,18 @@ class Python(AutotoolsPackage): 'CPPFLAGS=-I{0}'.format(' -I'.join(dp.include for dp in dep_pfxs)), 'LDFLAGS=-L{0}'.format(' -L'.join(dp.lib for dp in dep_pfxs)), ] + + if spec.satisfies('@2.7.13:2.8,3.5.3:', strict=True) \ + and '+optimizations' in spec: + config_args.append('--enable-optimizations') + if spec.satisfies('%gcc platform=darwin'): config_args.append('--disable-toolbox-glue') + if spec.satisfies('%intel', strict=True) and \ + spec.satisfies('@2.7.12:2.8,3.5.2:', strict=True): + config_args.append('--with-icc') + if '+shared' in spec: config_args.append('--enable-shared') else: -- cgit v1.2.3-70-g09d2 From 9f7dbd7f2ddfd169d73ae086963aced0eb8f0f5d Mon Sep 17 00:00:00 2001 From: Sinan Date: Sun, 25 Mar 2018 06:50:17 -0700 Subject: new package: Seqan (bioinformatics) (#7588) * new package: Seqan (bioinformatics) * add compiler requirements as conflicts * fix typo * add dependency types * correct checksum --- var/spack/repos/builtin/packages/seqan/package.py | 52 +++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 var/spack/repos/builtin/packages/seqan/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/seqan/package.py b/var/spack/repos/builtin/packages/seqan/package.py new file mode 100644 index 0000000000..cbdba07504 --- /dev/null +++ b/var/spack/repos/builtin/packages/seqan/package.py @@ -0,0 +1,52 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class Seqan(CMakePackage): + """SeqAn is an open source C++ library of efficient algorithms and data + structures for the analysis of sequences with the focus on biological data. + Our library applies a unique generic design that guarantees high + performance, generality, extensibility, and integration with other + libraries. SeqAn is easy to use and simplifies the development of new + software tools with a minimal loss of performance""" + + homepage = "https://www.seqan.de" + url = "https://github.com/seqan/seqan/archive/seqan-v2.4.0.tar.gz" + + version('2.4.0', 'd899821e295fed0a22e08099f40cbc17') + + depends_on('cmake@3.4.0:', type='build') + depends_on('python@2.7.0:', type='build') + depends_on('py-nose', type='build') + depends_on('py-sphinx', type='build') + depends_on('boost', type=('build', 'link')) + depends_on('zlib', type=('build', 'link')) + depends_on('bzip2', type=('build', 'link')) + + conflicts('%intel@:16.0.4') + conflicts('%gcc@:4.9.4') + conflicts('%llvm@:3.5.1') -- cgit v1.2.3-70-g09d2 From a119a2d2d815618caf9b87e12b155fe9aab176e6 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Mon, 26 Mar 2018 12:19:37 +0200 Subject: mpich: added version 3.2.1 (#7598) --- var/spack/repos/builtin/packages/mpich/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mpich/package.py b/var/spack/repos/builtin/packages/mpich/package.py index df24445d4c..9398df42bb 100644 --- a/var/spack/repos/builtin/packages/mpich/package.py +++ b/var/spack/repos/builtin/packages/mpich/package.py @@ -35,6 +35,7 @@ class Mpich(AutotoolsPackage): list_url = "http://www.mpich.org/static/downloads/" list_depth = 1 + version('3.2.1', 'e175452f4d61646a52c73031683fc375') version('3.2', 'f414cfa77099cd1fa1a5ae4e22db508a') version('3.1.4', '2ab544607986486562e076b83937bba2') version('3.1.3', '93cb17f91ac758cbf9174ecb03563778') -- cgit v1.2.3-70-g09d2 From 1aed76002ad00da270fd14ed26f653a1d2512424 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Mon, 26 Mar 2018 12:20:55 +0200 Subject: openssl: Add variant to use system certificates (#6396) --- .../repos/builtin/packages/openssl/package.py | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openssl/package.py b/var/spack/repos/builtin/packages/openssl/package.py index 3fcd29e70e..f4e78c5759 100644 --- a/var/spack/repos/builtin/packages/openssl/package.py +++ b/var/spack/repos/builtin/packages/openssl/package.py @@ -27,6 +27,8 @@ import llnl.util.tty as tty from spack import * import spack.architecture +import os + class Openssl(Package): """OpenSSL is an open source project that provides a robust, @@ -61,6 +63,8 @@ class Openssl(Package): version('1.0.1r', '1abd905e079542ccae948af37e393d28') version('1.0.1h', '8d6d684a9430d5cc98a62a5d8fbda8cf') + variant('systemcerts', default=True, description='Use system certificates') + depends_on('zlib') # TODO: 'make test' requires Perl module Test::More version 0.96 @@ -111,3 +115,34 @@ class Openssl(Package): # if self.run_tests: # make('test') # 'VERBOSE=1' make('install') + + @run_after('install') + def link_system_certs(self): + if '+systemcerts' not in self.spec: + return + + system_dirs = [ + # CentOS, Fedora, RHEL + '/etc/pki/tls', + # Ubuntu + '/usr/lib/ssl' + ] + + pkg_dir = join_path(self.prefix, 'etc', 'openssl') + + for directory in system_dirs: + sys_cert = join_path(directory, 'cert.pem') + pkg_cert = join_path(pkg_dir, 'cert.pem') + # If a bundle exists, use it. This is the preferred way on Fedora, + # where the certs directory does not work. + if os.path.exists(sys_cert) and not os.path.exists(pkg_cert): + os.symlink(sys_cert, pkg_cert) + + sys_certs = join_path(directory, 'certs') + pkg_certs = join_path(pkg_dir, 'certs') + # If the certs directory exists, symlink it into the package. + # We symlink the whole directory instead of all files because + # the directory contents might change without Spack noticing. + if os.path.isdir(sys_certs) and not os.path.islink(pkg_certs): + os.rmdir(pkg_certs) + os.symlink(sys_certs, pkg_certs) -- cgit v1.2.3-70-g09d2 From aeb73f958f3731222e654a93edd7d7a62e44c51d Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Mon, 26 Mar 2018 12:22:07 +0200 Subject: zeromq: fix build (#7596) pkg-config is also required for release versions. --- var/spack/repos/builtin/packages/zeromq/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/zeromq/package.py b/var/spack/repos/builtin/packages/zeromq/package.py index c734a0c644..291d153265 100644 --- a/var/spack/repos/builtin/packages/zeromq/package.py +++ b/var/spack/repos/builtin/packages/zeromq/package.py @@ -47,7 +47,7 @@ class Zeromq(AutotoolsPackage): depends_on('autoconf', type='build', when='@develop') depends_on('automake', type='build', when='@develop') depends_on('libtool', type='build', when='@develop') - depends_on('pkgconfig', type='build', when='@develop') + depends_on('pkgconfig', type='build') @when('@develop') def autoreconf(self, spec, prefix): -- cgit v1.2.3-70-g09d2 From 658896a7a5bb527641af4cad4bb14c809958adbd Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Mon, 26 Mar 2018 19:14:51 +0800 Subject: Remove pmi from the fabric list. (#7226) --- var/spack/repos/builtin/packages/openmpi/package.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 784e38109f..0c6180923f 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -181,7 +181,7 @@ class Openmpi(AutotoolsPackage): 'fabrics', default=None if _verbs_dir() is None else 'verbs', description='List of fabrics that are enabled', - values=('psm', 'psm2', 'pmi', 'verbs', 'mxm'), + values=('psm', 'psm2', 'verbs', 'mxm'), multi=True ) @@ -200,6 +200,7 @@ class Openmpi(AutotoolsPackage): description='Enable MPI_THREAD_MULTIPLE support') variant('cuda', default=False, description='Enable CUDA support') variant('ucx', default=False, description='Enable UCX support') + variant('pmi', default=False, description='Enable PMI support') provides('mpi') provides('mpi@:2.2', when='@1.6.5') @@ -220,8 +221,10 @@ class Openmpi(AutotoolsPackage): conflicts('+cuda', when='@:1.6') # CUDA support was added in 1.7 conflicts('fabrics=psm2', when='@:1.8') # PSM2 support was added in 1.10.0 - conflicts('fabrics=pmi', when='@:1.5.4') # PMI support was added in 1.5.5 conflicts('fabrics=mxm', when='@:1.5.3') # MXM support was added in 1.5.4 + conflicts('+pmi', when='@:1.5.4') # PMI support was added in 1.5.5 + conflicts('schedulers=slurm ~pmi', when='@1.5.4:', + msg='+pmi is required for openmpi(>=1.5.5) to work with SLURM.') filter_compiler_wrappers('openmpi/*-wrapper-data*', relative_root='share') @@ -317,9 +320,12 @@ class Openmpi(AutotoolsPackage): # for Open-MPI 2.0:, C++ bindings are disabled by default. config_args.extend(['--enable-mpi-cxx']) - # Fabrics and schedulers + # Fabrics config_args.extend(self.with_or_without('fabrics')) + # Schedulers config_args.extend(self.with_or_without('schedulers')) + # PMI + config_args.extend(self.with_or_without('pmi')) # Hwloc support if spec.satisfies('@1.5.2:'): -- cgit v1.2.3-70-g09d2 From 2a36c61d0f2239493608d071222810868aa557c5 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Mon, 26 Mar 2018 16:16:38 +0200 Subject: adios2: add support for Fortran bindings (#7600) --- var/spack/repos/builtin/packages/adios2/package.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/adios2/package.py b/var/spack/repos/builtin/packages/adios2/package.py index 52a598e2be..a25ba9769e 100644 --- a/var/spack/repos/builtin/packages/adios2/package.py +++ b/var/spack/repos/builtin/packages/adios2/package.py @@ -60,6 +60,8 @@ class Adios2(CMakePackage): # language bindings variant('python', default=True, description='Enable the Python >= 2.7 bindings') + variant('fortran', default=True, + description='Enable the Fortran bindings') # requires mature C++11 implementations conflicts('%gcc@:4.7') @@ -116,7 +118,9 @@ class Adios2(CMakePackage): '-DADIOS2_USE_ADIOS1={0}'.format( 'ON' if '+adios1' in spec else 'OFF'), '-DADIOS2_USE_Python={0}'.format( - 'ON' if '+python' in spec else 'OFF') + 'ON' if '+python' in spec else 'OFF'), + '-DADIOS2_USE_Fortran={0}'.format( + 'ON' if '+fortran' in spec else 'OFF') ] if spec.satisfies('+python'): args.append('-DPYTHON_EXECUTABLE:FILEPATH=%s' -- cgit v1.2.3-70-g09d2 From 28e49fa18467aeb8f5c2dcbc9e11ef985e891174 Mon Sep 17 00:00:00 2001 From: Eric Müller Date: Mon, 26 Mar 2018 17:24:50 +0200 Subject: Add missing X-libs dependencies to vim+x (#7599) --- var/spack/repos/builtin/packages/vim/package.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/vim/package.py b/var/spack/repos/builtin/packages/vim/package.py index e4aa99dd74..54c92ce3ac 100644 --- a/var/spack/repos/builtin/packages/vim/package.py +++ b/var/spack/repos/builtin/packages/vim/package.py @@ -66,6 +66,11 @@ class Vim(AutotoolsPackage): # support for auto/no/gtk2/gnome2/gtk3/motif/athena/neXtaw/photon/carbon variant('gui', default=False, description="build with gui (gvim)") variant('x', default=False, description="use the X Window System") + depends_on('libx11', when="+x") + depends_on('libsm', when="+x") + depends_on('libxpm', when="+x") + depends_on('libxt', when="+x") + depends_on('libxtst', when="+x") depends_on('ncurses', when="@7.4:") -- cgit v1.2.3-70-g09d2 From d88f0b8e6df15f3c04e5d676902b25f33bacde08 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Mon, 26 Mar 2018 14:27:12 -0500 Subject: New package r-tidyverse and r-tidyselect (#6507) * r-rlang: added version 0.1.4 * r-lubridate: added version 1.7.1 and dependency * r-tidyselect: new package * r-dplyr: added version 0.7.4 * r-rstudioapi: added version 0.7 * r-tidyr: added version 0.7.2 and other dependencies * r-tidyverse: new package * r-tidyr: updated dependencies * r-tidyverse: added dependency r-rlang * r-tidyverse: edited docstring * r-tidyverse: fixed typo * fix typo again --- .../repos/builtin/packages/r-dplyr/package.py | 3 +- .../repos/builtin/packages/r-lubridate/package.py | 4 +- .../repos/builtin/packages/r-rlang/package.py | 3 +- .../repos/builtin/packages/r-rstudioapi/package.py | 3 +- .../repos/builtin/packages/r-tidyr/package.py | 10 +++- .../repos/builtin/packages/r-tidyselect/package.py | 42 ++++++++++++++ .../repos/builtin/packages/r-tidyverse/package.py | 65 ++++++++++++++++++++++ 7 files changed, 123 insertions(+), 7 deletions(-) create mode 100644 var/spack/repos/builtin/packages/r-tidyselect/package.py create mode 100644 var/spack/repos/builtin/packages/r-tidyverse/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-dplyr/package.py b/var/spack/repos/builtin/packages/r-dplyr/package.py index b84b8739e2..8abc3883b7 100644 --- a/var/spack/repos/builtin/packages/r-dplyr/package.py +++ b/var/spack/repos/builtin/packages/r-dplyr/package.py @@ -30,9 +30,10 @@ class RDplyr(RPackage): in memory and out of memory.""" homepage = "https://github.com/hadley/dplyr" - url = "https://cran.rstudio.com/src/contrib/dplyr_0.7.3.tar.gz" + url = "https://cran.r-project.org/src/contrib/dplyr_0.7.4.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/dplyr" + version('0.7.4', '9edee9b2db9831c2438054d0d2c1647d') version('0.7.3', 'f9760b796917747e9dcd927ebb531c7d') version('0.5.0', '1fcafcacca70806eea2e6d465cdb94ef') diff --git a/var/spack/repos/builtin/packages/r-lubridate/package.py b/var/spack/repos/builtin/packages/r-lubridate/package.py index 9877277aa6..2e8aab8e00 100644 --- a/var/spack/repos/builtin/packages/r-lubridate/package.py +++ b/var/spack/repos/builtin/packages/r-lubridate/package.py @@ -34,9 +34,11 @@ class RLubridate(RPackage): fun.""" homepage = "https://cran.r-project.org/web/packages/lubridate/index.html" - url = "https://cran.r-project.org/src/contrib/lubridate_1.5.6.tar.gz" + url = "https://cran.r-project.org/src/contrib/lubridate_1.7.1.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/lubridate" + version('1.7.1', '17dcb4c6a95189941bbdcffecf61b83b') version('1.5.6', 'a5dc44817548ee219d26a10bae92e611') + depends_on('r-rcpp@0.11:', type=('build', 'run')) depends_on('r-stringr', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-rlang/package.py b/var/spack/repos/builtin/packages/r-rlang/package.py index 1550c6b11b..69cd847f93 100644 --- a/var/spack/repos/builtin/packages/r-rlang/package.py +++ b/var/spack/repos/builtin/packages/r-rlang/package.py @@ -30,8 +30,9 @@ class RRlang(RPackage): condition system, and core 'Tidyverse' features like tidy evaluation.""" homepage = "https://cran.r-project.org/web/packages/rlang/index.html" - url = "https://cran.r-project.org/src/contrib/rlang_0.1.2.tar.gz" + url = "https://cran.r-project.org/src/contrib/rlang_0.1.4.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/rlang" + version('0.1.4', 'daed5104d557c0cbfb4a654ec8ffb579') version('0.1.2', '170f8cf7b61898040643515a1746a53a') version('0.1.1', '38a51a0b8f8487eb52b4f3d986313682') diff --git a/var/spack/repos/builtin/packages/r-rstudioapi/package.py b/var/spack/repos/builtin/packages/r-rstudioapi/package.py index 3c3fcf0def..37558bbe96 100644 --- a/var/spack/repos/builtin/packages/r-rstudioapi/package.py +++ b/var/spack/repos/builtin/packages/r-rstudioapi/package.py @@ -30,8 +30,9 @@ class RRstudioapi(RPackage): messages when it's not.""" homepage = "https://cran.r-project.org/web/packages/rstudioapi/index.html" - url = "https://cran.r-project.org/src/contrib/rstudioapi_0.5.tar.gz" + url = "https://cran.r-project.org/src/contrib/rstudioapi_0.7.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/rstudioapi" + version('0.7', 'ee4ab567a7a9fdfac1a6fd01fe38de4a') version('0.6', 'fdb13bf46aab02421557e713fceab66b') version('0.5', '6ce1191da74e7bcbf06b61339486b3ba') diff --git a/var/spack/repos/builtin/packages/r-tidyr/package.py b/var/spack/repos/builtin/packages/r-tidyr/package.py index a2d1b55dfd..743a3ac917 100644 --- a/var/spack/repos/builtin/packages/r-tidyr/package.py +++ b/var/spack/repos/builtin/packages/r-tidyr/package.py @@ -31,14 +31,18 @@ class RTidyr(RPackage): pipelines.""" homepage = "https://github.com/hadley/tidyr" - url = "https://cran.r-project.org/src/contrib/tidyr_0.5.1.tar.gz" + url = "https://cran.r-project.org/src/contrib/tidyr_0.7.2.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/tidyr" + version('0.7.2', '42d723bf04c5c1c59e27a8be14f3a6b6') version('0.5.1', '3cadc869510c054ed93d374ab44120bd') depends_on('r-tibble', type=('build', 'run')) - depends_on('r-dplyr', type=('build', 'run')) + depends_on('r-dplyr@0.7.0:', type=('build', 'run')) depends_on('r-stringi', type=('build', 'run')) - depends_on('r-lazyeval', type=('build', 'run')) depends_on('r-magrittr', type=('build', 'run')) + depends_on('r-glue', type=('build', 'run')) depends_on('r-rcpp', type=('build', 'run')) + depends_on('r-purrr', type=('build', 'run')) + depends_on('r-tidyselect', type=('build', 'run')) + depends_on('r-rlang', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-tidyselect/package.py b/var/spack/repos/builtin/packages/r-tidyselect/package.py new file mode 100644 index 0000000000..f1378c63b1 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-tidyselect/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RTidyselect(RPackage): + """A backend for the selecting functions of the 'tidyverse'. It makes it + easy to implement select-like functions in your own packages in a way + that is consistent with other 'tidyverse' interfaces for selection.""" + + homepage = "https://cran.r-project.org/package=tidyselect" + url = "https://cran.r-project.org/src/contrib/tidyselect_0.2.3.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/tidyselect" + + version('0.2.3', 'c9dbd895ad7ce209bacfad6d19de91c9') + + depends_on('r-glue', type=('build', 'run')) + depends_on('r-purrr', type=('build', 'run')) + depends_on('r-rlang@0.1:', type=('build', 'run')) + depends_on('r-rcpp@0.12.0:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-tidyverse/package.py b/var/spack/repos/builtin/packages/r-tidyverse/package.py new file mode 100644 index 0000000000..586ba8e41e --- /dev/null +++ b/var/spack/repos/builtin/packages/r-tidyverse/package.py @@ -0,0 +1,65 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RTidyverse(RPackage): + """The 'tidyverse' is a set of packages that work in harmony because they + share common data representations and 'API' design. This package is + designed to make it easy to install and load multiple 'tidyverse' + packages in a single step.""" + + homepage = "http://tidyverse.tidyverse.org/" + url = "https://cran.r-project.org/src/contrib/tidyverse_1.2.1.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/tidyverse" + + version('1.2.1', '7e2ca0b72ab668342c02fd0f52c082e1') + + depends_on('r-broom@0.4.2:', type=('build', 'run')) + depends_on('r-cli@1.0.0:', type=('build', 'run')) + depends_on('r-crayon@1.3.4:', type=('build', 'run')) + depends_on('r-dplyr@0.7.4:', type=('build', 'run')) + depends_on('r-dbplyr@1.1.0:', type=('build', 'run')) + depends_on('r-forcats@0.2.0:', type=('build', 'run')) + depends_on('r-ggplot2@2.2.1:', type=('build', 'run')) + depends_on('r-haven@1.1.0:', type=('build', 'run')) + depends_on('r-hms@0.3:', type=('build', 'run')) + depends_on('r-httr@1.3.1:', type=('build', 'run')) + depends_on('r-jsonlite@1.5:', type=('build', 'run')) + depends_on('r-lubridate@1.7.1:', type=('build', 'run')) + depends_on('r-magrittr@1.5:', type=('build', 'run')) + depends_on('r-modelr@0.1.1:', type=('build', 'run')) + depends_on('r-purrr@0.2.4:', type=('build', 'run')) + depends_on('r-readr@1.1.1:', type=('build', 'run')) + depends_on('r-readxl@1.0.0:', type=('build', 'run')) + depends_on('r-reprex@0.1.1:', type=('build', 'run')) + depends_on('r-rlang@0.1.4:', type=('build', 'run')) + depends_on('r-rstudioapi@0.7:', type=('build', 'run')) + depends_on('r-rvest@0.3.2:', type=('build', 'run')) + depends_on('r-stringr@1.2.0:', type=('build', 'run')) + depends_on('r-tibble@1.3.4:', type=('build', 'run')) + depends_on('r-tidyr@0.7.2:', type=('build', 'run')) + depends_on('r-xml2@1.1.1:', type=('build', 'run')) + depends_on('r-rlang@0.1.4:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 0d07be278a4f77a69a33a1bd8e5da930210cc239 Mon Sep 17 00:00:00 2001 From: Leonhard Reichenbach Date: Tue, 27 Mar 2018 14:22:34 +0200 Subject: spades: fix build (#7608) Version 3.11 works with gcc7 see: https://github.com/ablab/spades/issues/26 --- var/spack/repos/builtin/packages/spades/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/spades/package.py b/var/spack/repos/builtin/packages/spades/package.py index 05c9f5f410..4f2a6080ac 100644 --- a/var/spack/repos/builtin/packages/spades/package.py +++ b/var/spack/repos/builtin/packages/spades/package.py @@ -39,6 +39,6 @@ class Spades(CMakePackage): depends_on('zlib') depends_on('bzip2') - conflicts('%gcc@7.1.0:') + conflicts('%gcc@7.1.0:', when='@:3.10.1') root_cmakelists_dir = 'src' -- cgit v1.2.3-70-g09d2 From b1628f0af1c83d48175f71572c69c653d071dd2c Mon Sep 17 00:00:00 2001 From: Veselin Dobrev Date: Tue, 27 Mar 2018 14:31:00 -0700 Subject: [MUMPS] When building '+shared' put the 'inject_libs' after the object files to get proper linking - this was needed on Ubuntu 14.04. --- var/spack/repos/builtin/packages/mumps/package.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mumps/package.py b/var/spack/repos/builtin/packages/mumps/package.py index 85d2aab3b1..bff8d7af86 100644 --- a/var/spack/repos/builtin/packages/mumps/package.py +++ b/var/spack/repos/builtin/packages/mumps/package.py @@ -232,10 +232,18 @@ class Mumps(Package): else: makefile_conf.extend([ 'LIBEXT=.so', - 'AR=$(FL) -shared -Wl,-soname -Wl,%s/$(notdir $@) %s -o' % + 'AR=link_cmd() { $(FL) -shared -Wl,-soname ' + '-Wl,%s/$(notdir $@) -o "$$@" %s; }; link_cmd ' % (prefix.lib, inject_libs), - 'RANLIB=echo' + 'RANLIB=ls' ]) + # When building libpord, read AR from Makefile.inc instead of + # going through the make command line - this prevents various + # problems with the substring "$$@". + filter_file(' AR="\$\(AR\)"', '', 'Makefile') + filter_file('^(INCLUDES = -I../include)', + '\\1\ninclude ../../Makefile.inc', + join_path('PORD', 'lib', 'Makefile')) if using_xl: # The patches for xl + spectrum-mpi use SAR for linking -- cgit v1.2.3-70-g09d2 From bac47ece707ad6bc43b8513d7eb4484ef2dab42e Mon Sep 17 00:00:00 2001 From: Nils Deppe Date: Tue, 27 Mar 2018 18:40:26 -0400 Subject: Add Catch v2.2.1 and v1.12.1 (#7615) Catch v1 and v2 are maintained independently since v2 requires C++11 support. Updating both to the latest. --- var/spack/repos/builtin/packages/catch/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/catch/package.py b/var/spack/repos/builtin/packages/catch/package.py index 244730c89d..8ee1179261 100644 --- a/var/spack/repos/builtin/packages/catch/package.py +++ b/var/spack/repos/builtin/packages/catch/package.py @@ -31,8 +31,10 @@ class Catch(Package): homepage = "https://github.com/catchorg/Catch2" url = "https://github.com/catchorg/Catch2/archive/v1.3.0.tar.gz" + version('2.2.1', '54e56803c84890636bd7fe6c3856b104') version('2.1.0', '70b44068976d46d48f3cd8796f675691d3bc726b') version('2.0.1', '5c191a031edebd0525640ed2f38cbf64bacb1803') + version('1.12.1', '7d89cffd9d61f4fdcbdb373b70cc92d1') version('1.12.0', '8fb0a64144a2c1572dd930254c7bbdf504ecbe2d') version('1.11.0', '3c03a022d8ba8dbbc931e1ce9fb28faec4890b8d') version('1.10.0', 'c2033ca00b616e7e703623c68220cf5a8e12bba4') -- cgit v1.2.3-70-g09d2 From b5c02a21454651e99fefdb3f1cc01cbcbec0f736 Mon Sep 17 00:00:00 2001 From: David Orman Date: Tue, 27 Mar 2018 17:40:57 -0500 Subject: added htslib 1.7 and checksum (#7617) --- var/spack/repos/builtin/packages/htslib/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/htslib/package.py b/var/spack/repos/builtin/packages/htslib/package.py index 39497fdc3c..d2818bafd3 100644 --- a/var/spack/repos/builtin/packages/htslib/package.py +++ b/var/spack/repos/builtin/packages/htslib/package.py @@ -30,6 +30,7 @@ class Htslib(AutotoolsPackage): homepage = "https://github.com/samtools/htslib" + version('1.7', 'd3cc7e080a9a8c4161d8f62b56d3b98d') version('1.6', 'd6fd14e208aca7e08cbe9072233d0af9') version('1.4', '2a22ff382654c033c40e4ec3ea880050') version('1.3.1', '16d78f90b72f29971b042e8da8be6843') -- cgit v1.2.3-70-g09d2 From 388bb2ab3ee7f0406822d2c277b0f54b9aa0694f Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Wed, 28 Mar 2018 00:41:17 +0200 Subject: petsc: add 3.8.4 (#7616) --- var/spack/repos/builtin/packages/petsc/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index 46853b6b41..e0fb9e500b 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -42,6 +42,7 @@ class Petsc(Package): version('develop', git='https://bitbucket.org/petsc/petsc.git', tag='master') version('xsdk-0.2.0', git='https://bitbucket.org/petsc/petsc.git', tag='xsdk-0.2.0') + version('3.8.4', 'd7767fe2919536aa393eb22841899306') version('3.8.3', '322cbcf2a0f7b7bad562643b05d66f11') version('3.8.2', '00666e1c4cbfa8dd6eebf91ff8180f79') version('3.8.1', '3ed75c1147800fc156fe1f1e515a68a7') -- cgit v1.2.3-70-g09d2 From 8e998247a3ddcc2f623772f4d467c16ac829a688 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Wed, 28 Mar 2018 10:13:56 +0200 Subject: openmpi: updated package (#7574) Modifications: * Added zlib dependency, starting from version 3.0.0 * Added memchecker support for debugging * Remove mpirun and similar links if slurm is selected as a scheduler --- .../repos/builtin/packages/openmpi/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 0c6180923f..b019a118a9 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -201,6 +201,17 @@ class Openmpi(AutotoolsPackage): variant('cuda', default=False, description='Enable CUDA support') variant('ucx', default=False, description='Enable UCX support') variant('pmi', default=False, description='Enable PMI support') + # Adding support to build a debug version of OpenMPI that activates + # Memchecker, as described here: + # + # https://www.open-mpi.org/faq/?category=debugging#memchecker_what + # + # This option degrades run-time support, and thus is disabled by default + variant( + 'memchecker', + default=False, + description='Memchecker support for debugging [degrades performance]' + ) provides('mpi') provides('mpi@:2.2', when='@1.6.5') @@ -218,6 +229,8 @@ class Openmpi(AutotoolsPackage): depends_on('java', when='+java') depends_on('sqlite', when='+sqlite3@:1.11') depends_on('ucx', when='+ucx') + depends_on('zlib', when='@3.0.0:') + depends_on('valgrind~mpi', when='+memchecker') conflicts('+cuda', when='@:1.6') # CUDA support was added in 1.7 conflicts('fabrics=psm2', when='@:1.8') # PSM2 support was added in 1.10.0 @@ -320,6 +333,9 @@ class Openmpi(AutotoolsPackage): # for Open-MPI 2.0:, C++ bindings are disabled by default. config_args.extend(['--enable-mpi-cxx']) + if spec.satisfies('@3.0.0:', strict=True): + config_args.append('--with-zlib={0}'.format(spec['zlib'].prefix)) + # Fabrics config_args.extend(self.with_or_without('fabrics')) # Schedulers @@ -327,6 +343,13 @@ class Openmpi(AutotoolsPackage): # PMI config_args.extend(self.with_or_without('pmi')) + config_args.extend(self.enable_or_disable('memchecker')) + if spec.satisfies('+memchecker', strict=True): + config_args.extend([ + '--enable-debug', + '--with-valgrind={0}'.format(spec['valgrind'].prefix), + ]) + # Hwloc support if spec.satisfies('@1.5.2:'): config_args.append('--with-hwloc={0}'.format(spec['hwloc'].prefix)) @@ -398,3 +421,18 @@ class Openmpi(AutotoolsPackage): config_args.append('--without-ucx') return config_args + + @run_after('install') + def delete_mpirun_mpiexec(self): + # The preferred way to run an application when Slurm is the + # scheduler is to let Slurm manage process spawning via PMI. + # + # Deleting the links to orterun avoids users running their + # applications via mpirun or mpiexec, and leaves srun as the + # only sensible choice (orterun is still present, but normal + # users don't know about that). + if '@1.6: schedulers=slurm' in self.spec: + os.remove(self.prefix.bin.mpirun) + os.remove(self.prefix.bin.mpiexec) + os.remove(self.prefix.bin.shmemrun) + os.remove(self.prefix.bin.oshrun) -- cgit v1.2.3-70-g09d2 From 70a8219f9211ebad893d43250af732189940b09e Mon Sep 17 00:00:00 2001 From: Eric Müller Date: Wed, 28 Mar 2018 14:54:40 +0200 Subject: Adds liblockfile (and patch to avoid need for root) (#7621) * --enable-shared *additionally* builds shared libraries (and it builds fast, so no variant here) --- .../packages/liblockfile/install_as_nonroot.patch | 46 ++++++++++++++++++++++ .../repos/builtin/packages/liblockfile/package.py | 40 +++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 var/spack/repos/builtin/packages/liblockfile/install_as_nonroot.patch create mode 100644 var/spack/repos/builtin/packages/liblockfile/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/liblockfile/install_as_nonroot.patch b/var/spack/repos/builtin/packages/liblockfile/install_as_nonroot.patch new file mode 100644 index 0000000000..66c6f994eb --- /dev/null +++ b/var/spack/repos/builtin/packages/liblockfile/install_as_nonroot.patch @@ -0,0 +1,46 @@ +--- liblockfile-1.14/Makefile.in 2017-01-17 13:21:05.000000000 +0000 ++++ liblockfile-1.14/Makefile.in 2018-03-28 07:20:45.054312625 +0000 +@@ -49,35 +49,33 @@ xlockfile.o: lockfile.c + $(CC) $(CFLAGS) -c lockfile.c -o xlockfile.o + + install_static: static install_common +- install -d -m 755 -g root -p $(libdir) ++ install -d -m 755 -p $(libdir) + install -m 644 liblockfile.a $(libdir) + + install_shared: shared install_static install_common +- install -d -m 755 -g root -p $(libdir) ++ install -d -m 755 -p $(libdir) + install -m 755 liblockfile.so \ + $(libdir)/liblockfile.so.$(SOVER) + ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so.$(MAJOR) + ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so +- if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi + + install_common: +- install -d -m 755 -g root -p $(includedir) +- install -d -m 755 -g root -p $(bindir) +- install -d -m 755 -g root -p $(mandir)/man1 +- install -d -m 755 -g root -p $(mandir)/man3 ++ install -d -m 755 -p $(includedir) ++ install -d -m 755 -p $(bindir) ++ install -d -m 755 -p $(mandir)/man1 ++ install -d -m 755 -p $(mandir)/man3 + install -m 644 lockfile.h maillock.h $(includedir) + if [ "$(MAILGROUP)" != "" ]; then\ + install -g $(MAILGROUP) -m 2755 dotlockfile $(bindir);\ + else \ +- install -g root -m 755 dotlockfile $(bindir); \ ++ install -m 755 dotlockfile $(bindir); \ + fi + install -m 644 *.1 $(mandir)/man1 + install -m 644 *.3 $(mandir)/man3 + + install_nfslib: nfslib +- install -d -m 755 -g root -p $(nfslockdir) ++ install -d -m 755 -p $(nfslockdir) + install -m 755 nfslock.so.$(NFSVER) $(nfslockdir) +- if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi + + clean: + rm -f *.a *.o *.so *.so.* dotlockfile diff --git a/var/spack/repos/builtin/packages/liblockfile/package.py b/var/spack/repos/builtin/packages/liblockfile/package.py new file mode 100644 index 0000000000..6e6f092edc --- /dev/null +++ b/var/spack/repos/builtin/packages/liblockfile/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Liblockfile(AutotoolsPackage): + """NFS-safe locking library""" + + homepage = "https://github.com/miquels/liblockfile" + url = "https://github.com/miquels/liblockfile/archive/v1.14.tar.gz" + + version('1.14', '24ce9dbb34d7f508a52a91f762746ce3') + + patch('install_as_nonroot.patch') + + def configure_args(self): + args = ['--enable-shared'] + return args -- cgit v1.2.3-70-g09d2 From 843e9f13a16f6b3046a87e5307a0d01b74a929e6 Mon Sep 17 00:00:00 2001 From: "Michael F. Herbst" Date: Wed, 28 Mar 2018 17:21:36 +0200 Subject: Add recent bohrium version (#7624) --- var/spack/repos/builtin/packages/bohrium/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bohrium/package.py b/var/spack/repos/builtin/packages/bohrium/package.py index 0fcca3d7f6..445802118f 100644 --- a/var/spack/repos/builtin/packages/bohrium/package.py +++ b/var/spack/repos/builtin/packages/bohrium/package.py @@ -41,6 +41,7 @@ class Bohrium(CMakePackage, CudaPackage): # version("develop", git="https://github.com/bh107/bohrium.git", branch="master") + version('0.9.0', checksum="6f6379f1555de5a6a19138beac891a470df7df1fc9594e2b9404cf01b6e17d93") # # Variants @@ -54,7 +55,7 @@ class Bohrium(CMakePackage, CudaPackage): variant('node', default=True, description="Build the node vector engine manager") - variant('proxy', default=True, + variant('proxy', default=False, description="Build the proxy vector engine manager") variant('python', default=True, description="Build the numpy-like bridge " -- cgit v1.2.3-70-g09d2 From 4230c95093a6fb8062bbd83d459a9f5b23c016b7 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 28 Mar 2018 10:29:44 -0500 Subject: Fix download URL for SCons and add latest version (#7614) --- var/spack/repos/builtin/packages/scons/package.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/scons/package.py b/var/spack/repos/builtin/packages/scons/package.py index 311fa7486f..6ebdeaf09f 100644 --- a/var/spack/repos/builtin/packages/scons/package.py +++ b/var/spack/repos/builtin/packages/scons/package.py @@ -29,10 +29,14 @@ class Scons(PythonPackage): """SCons is a software construction tool""" homepage = "http://scons.org" - url = "https://pypi.io/packages/source/s/scons/scons-2.5.1.tar.gz" + url = "https://pypi.io/packages/source/s/scons/scons-3.0.1.tar.gz" - version('2.5.1', '3eac81e5e8206304a9b4683c57665aa4') - version('2.5.0', 'bda5530a70a41a7831d83c8b191c021e') + version('3.0.1', 'b6a292e251b34b82c203b56cfa3968b3', + url="https://pypi.python.org/packages/c1/0a/520a3c86ce5cff36e81af5e91d4dcd741ebc189c2f0f42d54cc12a8a7519/scons-3.0.1.tar.gz") + version('2.5.1', '3eac81e5e8206304a9b4683c57665aa4', + url="https://pypi.python.org/packages/2c/ee/a9601b958c94e93410e635a5d67ed95300998ffdc36127b16d322b054ff0/scons-2.5.1.tar.gz") + version('2.5.0', 'bda5530a70a41a7831d83c8b191c021e', + url="https://pypi.python.org/packages/17/f0/60464796a3fd16899a2cf54e22615c38bbe8124386cf3763c17ff367c2af/scons-2.5.0.tar.gz") - # Python 3 is not supported - depends_on('python@:2.8', type=('build', 'run')) + # Python 3 support was added in SCons 3.0.0 + depends_on('python@:2', when='@:2', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 16f93464e741764927d5de69a635fbfb83e229ed Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 28 Mar 2018 10:30:38 -0500 Subject: R-snowfall: new package (#7464) * r-snowfall: dep for phantompeakqualtools * r-snowfall: fix version number * r-snowfall: fix hash --- .../repos/builtin/packages/r-snowfall/package.py | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-snowfall/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-snowfall/package.py b/var/spack/repos/builtin/packages/r-snowfall/package.py new file mode 100644 index 0000000000..355595c9bf --- /dev/null +++ b/var/spack/repos/builtin/packages/r-snowfall/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RSnowfall(RPackage): + """Usability wrapper around snow for easier development of parallel R + programs. This package offers e.g. extended error checks, and additional + functions. All functions work in sequential mode, too, if no cluster is + present or wished. Package is also designed as connector to the cluster + management tool sfCluster, but can also used without it.""" + + homepage = "https://cran.r-project.org/web/packages/snowfall/index.html" + url = "https://cran.r-project.org/src/contrib/snowfall_1.84-6.1.tar.gz" + + version('1.84-6.1', '5ec38116aa9cac237d56f59ba5bd60e3') + + depends_on('r-snow', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From a6aa17207247704caa61f93ed582cc7607756611 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 28 Mar 2018 10:45:47 -0500 Subject: gmap-gsnap: new version with numerous bug fixes (#7625) --- var/spack/repos/builtin/packages/gmap-gsnap/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gmap-gsnap/package.py b/var/spack/repos/builtin/packages/gmap-gsnap/package.py index ce777edd72..b653513f6a 100644 --- a/var/spack/repos/builtin/packages/gmap-gsnap/package.py +++ b/var/spack/repos/builtin/packages/gmap-gsnap/package.py @@ -33,6 +33,7 @@ class GmapGsnap(AutotoolsPackage): homepage = "http://research-pub.gene.com/gmap/" url = "http://research-pub.gene.com/gmap/src/gmap-gsnap-2017-06-16.tar.gz" + version('2018-03-25', 'f08e65c1e4d9574a3eb7f15f8ca6af16') version('2018-02-12', '13152aedeef9ac66be915fc6bf6464f2') version('2017-06-16', 'fcc91b8bdd4bf12ae3124de0c00db0c0') version('2014-12-28', '1ab07819c9e5b5b8970716165ccaa7da') -- cgit v1.2.3-70-g09d2 From fa7e92fa0ae7aeb417d9cd6854f46e72f06d1d38 Mon Sep 17 00:00:00 2001 From: "Michael F. Herbst" Date: Wed, 28 Mar 2018 17:46:07 +0200 Subject: Update libcint versions (#7623) --- var/spack/repos/builtin/packages/libcint/package.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libcint/package.py b/var/spack/repos/builtin/packages/libcint/package.py index fe771bc244..498f29b8b6 100644 --- a/var/spack/repos/builtin/packages/libcint/package.py +++ b/var/spack/repos/builtin/packages/libcint/package.py @@ -35,7 +35,12 @@ class Libcint(CMakePackage): # # Versions # - version('3.0.4', '55607a61313225ef4434d3e96624a008') + version('3.0.10', 'b368e257dba99febf1cdd1391f2e58a3') + version('3.0.8', '61f415ad9c7854963136c6bba7a661eb') + version('3.0.7', 'f0f3c971c0d5bb5565ac9ab5e271aa79') + version('3.0.6', '1aafd91107e2418f794ce02b9d88ea8b') + version('3.0.5', 'facb1ddabd9497e99d22176a9b9a895f') + version('3.0.4', '55607a61313225ef4434d3e96624a008') # # Variants -- cgit v1.2.3-70-g09d2 From cdd3f76bd18a7d0a42433075a60e075c535d14a4 Mon Sep 17 00:00:00 2001 From: Howard Pritchard Date: Wed, 28 Mar 2018 19:20:46 -0600 Subject: libhio: add libhio package to spack (#7468) spack brought out some configury/make issues with libhio, so some patches come along for the ride. Signed-off-by: Howard Pritchard --- ...onfigury-fix-a-problem-with-bz2-configury.patch | 38 +++++++++++++++++ .../libhio/0001-hdf5-make-docs-optional.patch | 37 ++++++++++++++++ var/spack/repos/builtin/packages/libhio/package.py | 49 +++++++++++++++++++--- 3 files changed, 118 insertions(+), 6 deletions(-) create mode 100644 var/spack/repos/builtin/packages/libhio/0001-configury-fix-a-problem-with-bz2-configury.patch create mode 100644 var/spack/repos/builtin/packages/libhio/0001-hdf5-make-docs-optional.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libhio/0001-configury-fix-a-problem-with-bz2-configury.patch b/var/spack/repos/builtin/packages/libhio/0001-configury-fix-a-problem-with-bz2-configury.patch new file mode 100644 index 0000000000..b5cf61bdc6 --- /dev/null +++ b/var/spack/repos/builtin/packages/libhio/0001-configury-fix-a-problem-with-bz2-configury.patch @@ -0,0 +1,38 @@ +From 3a7b7432a7354661d0a971b074c30529f5db457c Mon Sep 17 00:00:00 2001 +From: Howard Pritchard +Date: Sat, 10 Mar 2018 13:51:41 -0800 +Subject: [PATCH] configury: fix a problem with bz2 configury + +turns out by default spack wants to use a non-default +location bz2, or we have to turn it off. either way +the bz2 configury is wrong and needs to be fixed. + +Signed-off-by: Howard Pritchard + +diff --git a/m4/hio_check_bz2.m4 b/m4/hio_check_bz2.m4 +index 3a373ad1..b7dfdb75 100644 +--- a/m4/hio_check_bz2.m4 ++++ b/m4/hio_check_bz2.m4 +@@ -1,9 +1,9 @@ + # -*- mode: shell-script -*- +-# Copyright 2015-2016 Los Alamos National Security, LLC. All rights ++# Copyright 2015-2018 Los Alamos National Security, LLC. All rights + # reserved. + + AC_DEFUN([HIO_CHECK_BZ2],[ +- AC_ARG_WITH(bz2, [AS_HELP_STRING([--with-external-bz2=PATH], ++ AC_ARG_WITH(external-bz2, [AS_HELP_STRING([--with-external_bz2=PATH], + [use external bzip2. pass yes to use default version @<:@default=no@:>@])], + [], [with_external_bz2=no]) + +@@ -14,6 +14,7 @@ AC_DEFUN([HIO_CHECK_BZ2],[ + else + LDFLAGS="$LDFLAGS -L$with_external_bz2/lib64" + fi ++ LIBS="$LIBS -lbz2" + fi + + AC_CHECK_LIB([bz2],[BZ2_bzBuffToBuffCompress],[hio_have_bz2=1]) +-- +2.4.0.rc3.16.g0ab00b9 + diff --git a/var/spack/repos/builtin/packages/libhio/0001-hdf5-make-docs-optional.patch b/var/spack/repos/builtin/packages/libhio/0001-hdf5-make-docs-optional.patch new file mode 100644 index 0000000000..588edec602 --- /dev/null +++ b/var/spack/repos/builtin/packages/libhio/0001-hdf5-make-docs-optional.patch @@ -0,0 +1,37 @@ +From 6aec1b94fe84f2fe3a82e3ff338fd4721c84db34 Mon Sep 17 00:00:00 2001 +From: Howard Pritchard +Date: Mon, 12 Mar 2018 14:19:28 -0700 +Subject: [PATCH] hdf5: make docs optional + +With the current makefile, configuring in hdf5 +hio plugin always ends up trying to generate docs. +Make generating hdf5/hio plugin docs optional with + +make docs + +Signed-off-by: Howard Pritchard + +diff --git a/hdf5-hio/Makefile.am b/hdf5-hio/Makefile.am +index e4c93b77..1733866d 100644 +--- a/hdf5-hio/Makefile.am ++++ b/hdf5-hio/Makefile.am +@@ -1,6 +1,6 @@ + # -*- Makefile.am -*- + # +-# Copyright (c) 2014-2016 Los Alamos National Security, LLC. All rights ++# Copyright (c) 2014-2018 Los Alamos National Security, LLC. All rights + # reserved. + # $COPYRIGHT$ + # +@@ -11,7 +11,7 @@ + + ACLOCAL_AMFLAGS=-I m4 + +-SUBDIRS = src test doc ++SUBDIRS = src test + + EXTRA_DIST = + DISTCLEANFILES = +-- +2.4.0.rc3.16.g0ab00b9 + diff --git a/var/spack/repos/builtin/packages/libhio/package.py b/var/spack/repos/builtin/packages/libhio/package.py index 19faadb4aa..50e6d9b775 100644 --- a/var/spack/repos/builtin/packages/libhio/package.py +++ b/var/spack/repos/builtin/packages/libhio/package.py @@ -22,20 +22,57 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## + from spack import * class Libhio(AutotoolsPackage): - """ - A library for writing to hierarchical data store systems. + """libHIO is a flexible, high-performance parallel IO package developed + at LANL. libHIO supports IO to either a conventional PFS or to Cray + DataWarp with management of Cray DataWarp space and stage-in and + stage-out from and to the PFS. """ - homepage = "https://github.com/hpc/libhio/" - url = "https://github.com/hpc/libhio/releases/download/hio.1.3.0.1/libhio-1.3.0.1.tar.gz" + homepage = "https://github.com/hpc/libhio" + url = "https://github.com/hpc/libhio/releases/download/hio.1.4.1.0/libhio-1.4.1.0.tar.bz2" - version('1.4.0.0', 'a223effbfd50efd452053e6954e3ccf5') - version('1.3.0.1', 'c073541de8dd70aeb8878bd00d6d877f') + # + # We don't include older versions since they are missing features + # needed by current and future consumers of libhio + # + version('1.4.1.0', '6ef566fd8cf31fdcd05fab01dd3fae44') + + # + # main users of libhio thru spack will want to use HFDF5 plugin, + # so make hdf5 variant a default + # + variant('hdf5', default=True, description='Enable HDF5 support') depends_on("json-c") depends_on("bzip2") depends_on("pkgconfig", type="build") + depends_on('mpi') + + # + # libhio depends on hdf5+mpi if hdf5 is being used since it + # autodetects the presence of an MPI and/or uses mpicc by default to build + depends_on('hdf5+mpi', when='+hdf5') + + # + # wow, we need to patch libhio + # + patch('0001-configury-fix-a-problem-with-bz2-configury.patch', when="@1.4.1.0") + patch('0001-hdf5-make-docs-optional.patch', when="@1.4.1.0") + + def autoreconf(self, spec, prefix): + autoreconf = which('autoreconf') + autoreconf('-ifv') + + def configure_args(self): + spec = self.spec + args = [] + + args.append('--with-external_bz2={0}'.format(spec['bzip2'].prefix)) + if '+hdf5' in spec: + args.append('--with-hdf5={0}'.format(spec['hdf5'].prefix)) + return args -- cgit v1.2.3-70-g09d2 From 1dc7b3d3460e8ec45f1dcef86f3e089f425def05 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Thu, 29 Mar 2018 04:36:55 -0500 Subject: cmake: update package (#7633) --- var/spack/repos/builtin/packages/cmake/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index cc6a607766..2990a849bc 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -33,6 +33,7 @@ class Cmake(Package): list_url = 'https://cmake.org/files/' list_depth = 1 + version('3.11.0', 'f3ebc79b5dec85b49abe75958ffa1a03') version('3.10.2', '732808e17fc14dc8cee50d51518c34eb') version('3.10.1', '9a726e5ec69618b172aa4b06d18c3998') version('3.10.0', 'f3f8e70ca3055f3cd288f89ff233057e') -- cgit v1.2.3-70-g09d2 From e4b50973751ff5be499d99dca702d9b18588392f Mon Sep 17 00:00:00 2001 From: Will Furnass Date: Thu, 29 Mar 2018 10:44:25 +0100 Subject: Add Julia 0.6.2 + checksum (#7577) --- var/spack/repos/builtin/packages/julia/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/julia/package.py b/var/spack/repos/builtin/packages/julia/package.py index f6d363ddb8..5cc134de61 100644 --- a/var/spack/repos/builtin/packages/julia/package.py +++ b/var/spack/repos/builtin/packages/julia/package.py @@ -37,7 +37,8 @@ class Julia(Package): git='https://github.com/JuliaLang/julia.git', branch='master') version('release-0.5', git='https://github.com/JuliaLang/julia.git', branch='release-0.5') - version('0.5.2', '8c3fff150a6f96cf0536fb3b4eaa5cbb', preferred=True) + version('0.6.2', '255d80bc8d56d5f059fe18f0798e32f6') + version('0.5.2', '8c3fff150a6f96cf0536fb3b4eaa5cbb') version('0.5.1', 'bce119b98f274e0f07ce01498c463ad5') version('0.5.0', 'b61385671ba74767ab452363c43131fb') version('release-0.4', -- cgit v1.2.3-70-g09d2 From 90c0c12f2ac45fdf1019bf797ee2053ac48a2990 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Thu, 29 Mar 2018 14:42:36 -0500 Subject: gurobi: new package (#7639) * gurobi: new pacakge * fixed flake8 errors --- var/spack/repos/builtin/packages/gurobi/package.py | 62 ++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 var/spack/repos/builtin/packages/gurobi/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gurobi/package.py b/var/spack/repos/builtin/packages/gurobi/package.py new file mode 100644 index 0000000000..aebb6bf6c6 --- /dev/null +++ b/var/spack/repos/builtin/packages/gurobi/package.py @@ -0,0 +1,62 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +from distutils.dir_util import copy_tree +import os + + +class Gurobi(Package): + """The Gurobi Optimizer was designed from the ground up to be the fastest, + most powerful solver available for your LP, QP, QCP, and MIP (MILP, MIQP, + and MIQCP) problems. + + Note: Gurobi is licensed software. You will need to create an account on + the Gurobi homepage and download Gurobi Optimizer yourself. Spack will + search your current directory for the download file. Alternatively, add + this file to a mirror so that Spack can find it. For instructions on how to + set up a mirror, see http://spack.readthedocs.io/en/latest/mirrors.html + + Please set the path to licence file with the following command (for bash) + export GRB_LICENSE_FILE=/path/to/gurobi/license/. See section 4 in + $GUROBI_HOME/docs/quickstart_linux.pdf for more details.""" + + homepage = "http://www.gurobi.com/index" + + version('7.5.2', '01f6dbb8d165838cca1664a1a14e4a85') + + # Licensing + license_required = True + license_vars = ['GRB_LICENSE_FILE'] + license_url = 'http://www.gurobi.com/downloads/download-center' + + def url_for_version(self, version): + return "file://{0}/gurobi{1}_linux64.tar.gz".format(os.getcwd(), version) + + def setup_environment(self, spack_env, run_env): + run_env.set('GUROBI_HOME', self.prefix) + + def install(self, spec, prefix): + with working_dir('linux64'): + copy_tree('.', prefix) -- cgit v1.2.3-70-g09d2 From 499ed2385cfe67ba1ace536dc73d0206304aed60 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 29 Mar 2018 14:43:12 -0500 Subject: Fix Python3 bug in tut (#7627) * Fix Python3 bug in tut * Revert URL change --- var/spack/repos/builtin/packages/tut/package.py | 2 ++ var/spack/repos/builtin/packages/tut/python3-octal.patch | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 var/spack/repos/builtin/packages/tut/python3-octal.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/tut/package.py b/var/spack/repos/builtin/packages/tut/package.py index c0d2bbcc8f..02773c8ffa 100644 --- a/var/spack/repos/builtin/packages/tut/package.py +++ b/var/spack/repos/builtin/packages/tut/package.py @@ -33,6 +33,8 @@ class Tut(WafPackage): version('2016-12-19', '8b1967fa295ae1ce4d4431c2f811e521') + patch('python3-octal.patch', when='@2016-12-19') + def build_args(self): args = [] diff --git a/var/spack/repos/builtin/packages/tut/python3-octal.patch b/var/spack/repos/builtin/packages/tut/python3-octal.patch new file mode 100644 index 0000000000..d6d9b14273 --- /dev/null +++ b/var/spack/repos/builtin/packages/tut/python3-octal.patch @@ -0,0 +1,11 @@ +--- a/waftools/gcov.py 2016-12-19 04:55:44.000000000 -0600 ++++ b/waftools/gcov.py 2018-03-28 10:42:53.000000000 -0500 +@@ -13,7 +13,7 @@ + wrapper = NamedTemporaryFile(delete=False) + wrapper.write(script) + wrapper.close() +- os.chmod(wrapper.name, 0777) ++ os.chmod(wrapper.name, 0o777) + + yield wrapper.name + -- cgit v1.2.3-70-g09d2 From 9fa169baa670b27968271779f38194f126c7d221 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Thu, 29 Mar 2018 17:03:33 -0500 Subject: strace: create new package (#7640) --- var/spack/repos/builtin/packages/strace/package.py | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/strace/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/strace/package.py b/var/spack/repos/builtin/packages/strace/package.py new file mode 100644 index 0000000000..5cc1cc82b4 --- /dev/null +++ b/var/spack/repos/builtin/packages/strace/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Strace(AutotoolsPackage): + """Strace is a diagnostic, debugging and instructional userspace + utility for Linux. It is used to monitor and tamper with interactions + between processes and the Linux kernel, which include system calls, + signal deliveries, and changes of process state.""" + + homepage = "https://strace.io" + url = "https://strace.io/files/4.21/strace-4.21.tar.xz" + + conflicts('platform=darwin', msg='strace runs only on Linux.') + + version('4.21', '785b679a75e9758ebeb66816f315b9fe') -- cgit v1.2.3-70-g09d2 From d71386cb536cf9330df0413a999395610f5b1292 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Thu, 29 Mar 2018 17:48:34 -0500 Subject: ltrace: create new package (#7641) * ltrace: create new package * Update package.py * Update package.py --- var/spack/repos/builtin/packages/ltrace/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/ltrace/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ltrace/package.py b/var/spack/repos/builtin/packages/ltrace/package.py new file mode 100644 index 0000000000..e2bec7e38f --- /dev/null +++ b/var/spack/repos/builtin/packages/ltrace/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Ltrace(AutotoolsPackage): + """Ltrace intercepts and records dynamic library calls which are called + by an executed process and the signals received by that process. It + can also intercept and print the system calls executed by the program.""" + + homepage = "https://www.ltrace.org" + url = "https://www.ltrace.org/ltrace_0.7.3.orig.tar.bz2" + + version('0.7.3', 'b3dd199af8f18637f7d4ef97fdfb9d14') + + conflicts('platform=darwin', msg='ltrace runs only on Linux.') -- cgit v1.2.3-70-g09d2 From 9b5492ca1902257f0f80a99be471b2010107dfd9 Mon Sep 17 00:00:00 2001 From: healther Date: Fri, 30 Mar 2018 12:20:16 +0200 Subject: add version 3.6.5 to python (#7643) --- var/spack/repos/builtin/packages/python/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 683ce4bbbe..3e0f038768 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -46,6 +46,7 @@ class Python(AutotoolsPackage): list_url = "https://www.python.org/downloads/" list_depth = 1 + version('3.6.5', 'ab25d24b1f8cc4990ade979f6dc37883') version('3.6.4', '9de6494314ea199e3633211696735f65') version('3.6.3', 'e9180c69ed9a878a4a8a3ab221e32fa9') version('3.6.2', 'e1a36bfffdd1d3a780b1825daf16e56c') -- cgit v1.2.3-70-g09d2 From d414d302f67a3f2cbce69bb15c55dc53ce351425 Mon Sep 17 00:00:00 2001 From: healther Date: Fri, 30 Mar 2018 21:58:08 +0200 Subject: Fix log4cxx dependencies (#7570) * Add ignore_conflicts to package activation includes: * with_dependency flag for do_activate * ignore_conflicts flag for do_activate * start of cleanup of activate cmd * ensure that apr is picked up * Update package.py * add apr explicitly as dependency * remove unnecessary newlines * Update package.py fixing dependencies --- var/spack/repos/builtin/packages/log4cxx/package.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/log4cxx/package.py b/var/spack/repos/builtin/packages/log4cxx/package.py index ac7be7f4a2..f3372b3542 100644 --- a/var/spack/repos/builtin/packages/log4cxx/package.py +++ b/var/spack/repos/builtin/packages/log4cxx/package.py @@ -33,8 +33,9 @@ class Log4cxx(AutotoolsPackage): version('0.10.0', 'b30ffb8da3665178e68940ff7a61084c') - depends_on('libxml2') depends_on('apr-util') + depends_on('apr') + depends_on('zip') build_directory = 'spack-build' @@ -43,8 +44,6 @@ class Log4cxx(AutotoolsPackage): patch('log4cxx-0.10.0-narrowing-fixes-from-upstream.patch') def configure_args(self): - args = ['--disable-static', - # 'apr''s 'bin' isn't pulled (via apr-util) into build env - '--with-apr={0}'.format(self.spec['apr'].prefix)] + args = ['--disable-static'] return args -- cgit v1.2.3-70-g09d2 From 87e2e66417d078cc280a04f450b7c0d22daeef2f Mon Sep 17 00:00:00 2001 From: David Orman Date: Fri, 30 Mar 2018 15:21:14 -0500 Subject: Features/mindthegap (#7648) * added htslib 1.7 and checksum * mindthegap: New package --- .../repos/builtin/packages/mindthegap/package.py | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 var/spack/repos/builtin/packages/mindthegap/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mindthegap/package.py b/var/spack/repos/builtin/packages/mindthegap/package.py new file mode 100644 index 0000000000..a9b9fbdf7a --- /dev/null +++ b/var/spack/repos/builtin/packages/mindthegap/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Mindthegap(CMakePackage): + """MindTheGap is a software that performs integrated detection and + assembly of genomic insertion variants in NGS read datasets with + respect to a reference genome.""" + + homepage = "https://gatb.inria.fr/software/mind-the-gap/" + url = "https://github.com/GATB/MindTheGap.git" + + version('2.0.2', + tags='v2.0.2', + git='https://github.com/GATB/MindTheGap.git', + submodules=True) + + depends_on('zlib') -- cgit v1.2.3-70-g09d2 From b62ed20f3ff4052a6fb6a6fd81e70f3fc9b7dfdf Mon Sep 17 00:00:00 2001 From: Aaron Fisher Date: Sat, 31 Mar 2018 00:47:32 -0700 Subject: CEED 1.0 (#7423) * ceed bundle package including OCCA, MAGMA, Nek5000, mfem, and PETSc Very preliminary, a lot of ad hoc decisions, fragile, missing functionality All packages do build on my MacOS laptop with Cuda Funded-by: ECP Project: CEED Time: 4 hours Reported-by: Tzanio Kolev * Some adjustments in a few CEED-related packages. This is still very preliminary, but with these changes I'm able to build from scratch on a Mac laptop and a Linux desktop (RHEL7). Note that there doesn't seem to be a good way to support CUDA in Spack, so you'll have to install that manually yourself. You will also need a Fortran compiler, in particular on a Mac where you also have to make sure that it is being picked up in ~/.spack/darwin/compilers.yaml. * ceed bundle package including OCCA, MAGMA, Nek5000, mfem, and PETSc Very preliminary, a lot of ad hoc decisions, fragile, missing functionality All packages do build on my MacOS laptop with Cuda Funded-by: ECP Project: CEED Time: 4 hours Reported-by: Tzanio Kolev * Reverting Mac-related CUDA checks in the OCCA and MAGMA packages. A much better solution is to install CUDA manually and add it to ~/.spack/darwin/packages.yaml: packages: cuda: paths: cuda@8.0.54: /usr/local/cuda * Fix flake8 warnings Funded-by: CEED Project: CEED/Spack * remove unneeded commented out code Funded-by: CEED Project: CEED/Spack * Don't have PETSc use MUMPS to speedup install time, try parallel installs for Magma Funded-by: CEED Project: CEED/Spack * Added libceed package and made changes to get the ceed metapackage up and running. * Get the ceed package up and running and added installing the .h file in the libceed package. * All packages are now pointed at specific versions (either tagged or git hashed. * Changed some of the specific versions in the CEED metapackage. * Some version updates. * Applied Cameron Smith's patch for the latest pumi. * Merge * Nek5000: Use tarball instead of git tag * Major update of the mfem package - needs more testing. Add a testing shell script for mfem, test_builds.sh, in the mfem directory. It builds a number of mfem configurations to ensure they all work. Add 'suite-sparse' variant to petsc. Add 'develop' version of libceed. Add 'metis' variant of laghos. Update the dependencies of ceed. * Changes in petsc's handling of zlib to make the latest build work on Mac. * [MFEM] When using '+libunwind', mfem needs '-ldl'. * [OCCA] Remove debug print statements. * [PETSc] Replace the check ('zlib' in spec) with ('+zlib' in spec) - the latter checks if 'zlib' variant of petsc is enabled which is incorrect; the former checks if petsc is configured to depend on 'zlib'. * [MFEM] Add conduit variant. * [libCEED] Enable testing using 'make prove'. * [MFEM] Tweak test_builds.sh - all builds pass on fedora 27. * Add a post install test * Add a post installation check for NekCEM * pumi: bump git hash, remove unused patch * Fixed testing of Laghos package * Adding variants in CEED package * Empty file for URL didn't work on LLNL/LC. Replacing with bundle-package.txt -> README.md. * [MFEM] If the spec defines the 'cxxflags' compiler flags, use that value to set the CXXFLAGS value in the mfem build system. * Disabling HDF5 by default. You can still build it with "spack install ceed+hdf5". * libceed: fix use of prefix versus DESTDIR * Added cuda variant for libCEED (off by default) * [libCEED] When building v0.1, fix ceed.pc before installing it. * [CEED] Add variants for OCCA and PUMI. Replace the hdf5 variant with a variant called quickbuild that disables variants in packages to speedup the build - currently hdf5, boost, and superlu-dist in PETSc. * [libCEED] Remove unused 'import os'. * [MAGMA] Add version 2.3.0. * [OCCA] Major update of occa/package.py. * [libCEED] Several improvements. * [CEED] Use fixed versions for occa and libceed. * [OCCA] Fix a bug in CUDA setup. * NekCEM doesn't need depends_on('python') * [OCCA,libCEED,MFEM,CEED] Update occa and libceed versions plus a few tweaks in occa and mfem. * Switching to gslib-1.0.2 to fix summitdev bug. * [Nek5000] Use the Fortran 77 compiler instead of the 'fc' compiler. Propagate any 'fflags' and 'cflags' specifications to the Nek tools. * [MFEM] Tweak for 'ppc64le'. * attempt to override fips compatibility error for md5 * Compiler option changes in libCEED to fix summitdev build. * Disable the nekcem install test until it can be fixed. * [NekCEM] Major update of the package to fix various issues. * [NekCEM] Fix formatting * zoltan: remove non-portable -g0 flag the pgi compiler does not accept it * pumi: specify dependency on cmake > 3 * [Nek5000] Add dependency on libx11 when needed. Various hacks to support IBM XL compilers. * [NekCEM] Link with the pthreads library - it is required. * [MAGMA] Add a patch for magma v2.3.0 when building with gcc <= 4.8. Add dependency on BLAS. * [CEED] Update to magma 2.3.0. When building with gcc < 4.9 constrain the used suite-sparse version to <= 5.1.0 - starting with v5.2.0, suite-sparse requires gcc >= 4.9. * Small updates * [libceed, gslib] Fix style * [Nek5000] Need 'libxt' as a dependency as well. * [MUMPS] Temporary workaround for ray. * Updating occa and libceed to laters pre-1.0.0 and pre-0.2 hashes * petsc: add pkg-config patch for variable quoting Variable definitions in pkg-config are processed more like make than a shell, so don't need quoting. Older versions of pkg-config (<= 0.28) did not remove the quotes when printing the value. Freedesktop #67904 (https://bugs.freedesktop.org/show_bug.cgi?id=67904) Reported-by: Tzanio Kolev * petsc: add 3.8.4 and myself as co-maintainer * Updating libceed to latest pre-0.2 hash. * [PETSc] Add the 'headers' and 'libs' properties. * [MFEM] Explicitly add rpaths to link flags for external packages. This is necessary when MFEM's exported options (in config.mk) are used outside of Spack for linking against MFEM. * Unset MFEM_DIR before building MFEM * [PETSc] As observed by @jedbrown, there is no need to define the 'libs' property explicitly - the default handler works fine too. * Build MAGMA shared by default, install a few additional headers * Forgot a self * Switching to OCCA tag v1.0.0-alpha.4. Adding urls for OCCA and libCEED ('spack uninstall' complains otherwise). * Removed FIXMEs for OCCA tag * [occa] Cleaned up tagged versions * [libceed] Updated occa to v1.0.0-alpha.5 * [ceed] Updated occa to v1.0.0-alpha.5 * [libCEED] Always define the 'NDEBUG' makefile option based on the 'debug' variant setting - this should always work regardless of the default setting inside the libceed makefile. * [MUMPS] Revert a temporary workaround. * [CEED, libCEED] Minor tweaks. * libCEED v0.2 release * [CEED] Use version 0.2 of libCEED. * [HPGMG] Remove duplicate version. * [CEED] Update the hpgmg version * hpgmg: use tarball for 0.3 The Git repository contains somewhat heavy documentation so the tarballs are much faster. * hpgmg: +fe was default for the 0.3 release * hpgmg: explicitly name build directory to avoid use of ambient PETSC_ARCH * [HPGMG] Fix flake8 formatting * libceed@0.2: work around occaFree issue --- var/spack/repos/builtin/packages/ceed/README.md | 3 + var/spack/repos/builtin/packages/ceed/package.py | 111 ++++++ var/spack/repos/builtin/packages/gslib/package.py | 11 +- var/spack/repos/builtin/packages/hpgmg/package.py | 32 +- var/spack/repos/builtin/packages/laghos/package.py | 26 +- .../builtin/packages/libceed/occaFree-0.2.diff | 41 ++ .../repos/builtin/packages/libceed/package.py | 81 ++++ .../packages/magma/magma-2.3.0-gcc-4.8.patch | 24 ++ var/spack/repos/builtin/packages/magma/package.py | 44 ++- var/spack/repos/builtin/packages/mfem/package.py | 423 +++++++++++++++------ .../repos/builtin/packages/mfem/test_builds.sh | 72 ++++ .../repos/builtin/packages/nek5000/package.py | 128 ++++++- var/spack/repos/builtin/packages/nekcem/package.py | 76 +++- var/spack/repos/builtin/packages/occa/package.py | 138 +++++++ var/spack/repos/builtin/packages/petsc/package.py | 38 +- .../packages/petsc/pkg-config-3.7.6-3.8.4.diff | 29 ++ var/spack/repos/builtin/packages/pumi/package.py | 9 +- .../packages/pumi/phiotimer.cc.darwin.patch | 21 - var/spack/repos/builtin/packages/zoltan/package.py | 4 +- 19 files changed, 1099 insertions(+), 212 deletions(-) create mode 100644 var/spack/repos/builtin/packages/ceed/README.md create mode 100644 var/spack/repos/builtin/packages/ceed/package.py create mode 100644 var/spack/repos/builtin/packages/libceed/occaFree-0.2.diff create mode 100644 var/spack/repos/builtin/packages/libceed/package.py create mode 100644 var/spack/repos/builtin/packages/magma/magma-2.3.0-gcc-4.8.patch create mode 100755 var/spack/repos/builtin/packages/mfem/test_builds.sh create mode 100644 var/spack/repos/builtin/packages/occa/package.py create mode 100644 var/spack/repos/builtin/packages/petsc/pkg-config-3.7.6-3.8.4.diff delete mode 100644 var/spack/repos/builtin/packages/pumi/phiotimer.cc.darwin.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ceed/README.md b/var/spack/repos/builtin/packages/ceed/README.md new file mode 100644 index 0000000000..74bcae1d17 --- /dev/null +++ b/var/spack/repos/builtin/packages/ceed/README.md @@ -0,0 +1,3 @@ +This is a bundle for the CEED software suite. + +See https://ceed.exascaleproject.org for details. diff --git a/var/spack/repos/builtin/packages/ceed/package.py b/var/spack/repos/builtin/packages/ceed/package.py new file mode 100644 index 0000000000..f6569a324c --- /dev/null +++ b/var/spack/repos/builtin/packages/ceed/package.py @@ -0,0 +1,111 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import os + + +class Ceed(Package): + """Ceed is a collection of benchmarks, miniapps, software libraries and + APIs for efficient high-order finite element and spectral element + discretizations for exascale applications developed in the Department of + Energy (DOE) and partially supported by the Exascale Computing Project + (ECP). This is a Spack bundle package that installs the CEED software + components.""" + + homepage = "https://ceed.exascaleproject.org" + + url = 'file://' + os.path.dirname(__file__) + '/README.md' + sha1 = 'b2eefd95c09ba573f663a761b84811a2d7e39788' + + version('1.0.0', sha1, expand=False) + + variant('cuda', default=False, + description='Build MAGMA; enable CUDA support in libCEED and OCCA') + variant('mfem', default=True, description='Build MFEM and Laghos') + variant('nek', default=True, + description='Build Nek5000, GSLIB, Nekbone, and NekCEM') + variant('occa', default=True, + description='Build OCCA; enable OCCA support in libCEED') + variant('petsc', default=True, + description='Build PETSc and HPGMG') + variant('pumi', default=True, + description='Build PUMI') + variant('quickbuild', default=True, + description='Speed-up the build by disabling variants in packages') + # TODO: Add 'int64' variant? + + # LibCEED + depends_on('libceed@0.2~cuda', when='@1.0.0~cuda') + depends_on('libceed@0.2+cuda', when='@1.0.0+cuda') + depends_on('libceed@0.2+occa', when='@1.0.0+occa') + depends_on('libceed@0.2~occa', when='@1.0.0~occa') + + # OCCA + depends_on('occa@v1.0.0-alpha.5~cuda', when='@1.0.0+occa~cuda') + depends_on('occa@v1.0.0-alpha.5+cuda', when='@1.0.0+occa+cuda') + + # Nek5000, GSLIB, Nekbone, and NekCEM + depends_on('nek5000@17.0', when='@1.0.0+nek') + depends_on('gslib@1.0.2', when='@1.0.0+nek') + depends_on('nekbone@17.0', when='@1.0.0+nek') + depends_on('nekcem@0b8bedd', when='@1.0.0+nek') + + # PETSc, HPGMG + # For a +quickbuild we disable boost, hdf5, and superlu-dist in PETSc. + # Ideally, these can be turned into recommendations to Spack for + # concretizing the PETSc spec, if Spack ever supports recommendations. + depends_on('petsc@3.8.3~boost~hdf5~superlu-dist', + when='@1.0.0+petsc+quickbuild') + depends_on('petsc@3.8.3+mpi+double~int64', when='@1.0.0+petsc~mfem') + # The mfem petsc examples need the petsc variants +hypre, +suite-sparse, + # and +mumps: + depends_on('petsc@3.8.3+mpi+hypre+suite-sparse+mumps+double~int64', + when='@1.0.0+petsc+mfem') + depends_on('hpgmg@a0a5510df23b+fe', when='@1.0.0+petsc') + + # MAGMA + depends_on('magma@2.3.0', when='@1.0.0+cuda') + + # PUMI + depends_on('pumi@2.1.0', when='@1.0.0+pumi') + + # MFEM, Laghos + depends_on('mfem@3.3.2+mpi+examples+miniapps', when='@1.0.0+mfem~petsc') + depends_on('mfem@3.3.2+mpi+petsc+examples+miniapps', + when='@1.0.0+mfem+petsc') + depends_on('laghos@1.0', when='@1.0.0+mfem') + # The next line seems to be necessary because the concretizer somehow + # decides that mfem requires 'hypre+internal-superlu' even though the mfem + # package lists simply 'hypre' as dependency. This is only an issue because + # petsc explicitly requires 'hypre~internal-superlu' which for the + # concretizer is a conflict. + depends_on('hypre~internal-superlu', when='@1.0.0+mfem') + + # If using gcc version <= 4.8 build suite-sparse version <= 5.1.0 + depends_on('suite-sparse@:5.1.0', when='@1.0.0%gcc@:4.8+mfem+petsc') + + # Dummy install + def install(self, spec, prefix): + install('README.md', prefix) diff --git a/var/spack/repos/builtin/packages/gslib/package.py b/var/spack/repos/builtin/packages/gslib/package.py index 5af8408aae..055aa50120 100644 --- a/var/spack/repos/builtin/packages/gslib/package.py +++ b/var/spack/repos/builtin/packages/gslib/package.py @@ -31,10 +31,9 @@ class Gslib(Package): homepage = "https://github.com/gslib/gslib" url = "https://github.com/gslib/gslib" - version('1.0.1', git='https://github.com/gslib/gslib.git', - commit='d16685f24551b7efd69e58d96dc76aec75239ea3') - version('1.0.0', git='https://github.com/gslib/gslib.git', - commit='9533e652320a3b26a72c36487ae265b02072cd48') + version('1.0.2', git='https://github.com/gslib/gslib.git', tag='v1.0.2') + version('1.0.1', git='https://github.com/gslib/gslib.git', tag='v1.0.1') + version('1.0.0', git='https://github.com/gslib/gslib.git', tag='v1.0.0') variant('mpi', default=True, description='Build with MPI') variant('mpiio', default=True, description='Build with MPI I/O') @@ -85,6 +84,6 @@ class Gslib(Package): mkdir(prefix.lib) install(libname, prefix.lib) - # Should only install the headers (this will - # be fixed in gslib on future releases. + # Should only install the headers (this will be fixed in gslib on + # future releases). install_tree(srcDir, prefix.include) diff --git a/var/spack/repos/builtin/packages/hpgmg/package.py b/var/spack/repos/builtin/packages/hpgmg/package.py index 3a5208493f..2a43115799 100644 --- a/var/spack/repos/builtin/packages/hpgmg/package.py +++ b/var/spack/repos/builtin/packages/hpgmg/package.py @@ -26,22 +26,22 @@ from spack import * class Hpgmg(Package): - """HPGMG implements full multigrid (FMG) algorithms using - finite-volume and finite-element methods. - Different algorithmic variants adjust the arithmetic intensity - and architectural properties that are tested. These FMG methods - converge up to discretization error in one F-cycle, - thus may be considered direct solvers. An F-cycle visits - the finest level a total of two times, - the first coarsening (8x smaller) 4 times, - the second coarsening 6 times, etc.""" + """HPGMG implements full multigrid (FMG) algorithms using finite-volume and + finite-element methods. Different algorithmic variants adjust the + arithmetic intensity and architectural properties that are tested. These + FMG methods converge up to discretization error in one F-cycle, thus may + be considered direct solvers. An F-cycle visits the finest level a total + of two times, the first coarsening (8x smaller) 4 times, the second + coarsening 6 times, etc. + """ homepage = "https://bitbucket.org/hpgmg/hpgmg" url = "https://hpgmg.org/static/hpgmg-0.tar.gz" tags = ['proxy-app'] - version('a0a5510df23b', 'b9c50f25e541428d4735fb07344d1d0ed9fc821bdde918d8e0defa78c0d9b4f9') version('develop', git='https://bitbucket.org/hpgmg/hpgmg.git', branch='master') + version('a0a5510df23b', 'b9c50f25e541428d4735fb07344d1d0ed9fc821bdde918d8e0defa78c0d9b4f9') + version('0.3', '12a65da216fec91daea78594ae4b5a069c8f1a700f1ba21eed9f45a79a68c793') variant( 'fe', default=False, description='Build finite element solver') @@ -61,7 +61,7 @@ class Hpgmg(Package): def configure_args(self): args = [] - if '+fe' in self.spec: + if '+fe' in self.spec and not ('@0.3' in self.spec): args.append('--fe') if 'fv=serial' in self.spec: @@ -74,7 +74,9 @@ class Hpgmg(Package): if 'fv=none' in self.spec: args.append('--no-fv') else: - cflags.append(self.compiler.openmp_flag) + # Apple's Clang doesn't support OpenMP + if not (self.spec.satisfies('%clang') and self.compiler.is_apple): + cflags.append(self.compiler.openmp_flag) if '+debug' in self.spec: cflags.append('-g') @@ -83,13 +85,17 @@ class Hpgmg(Package): args.append('--CFLAGS=' + ' '.join(cflags)) + # Explicitly specify the build directory to ensure that + # PETSC_ARCH is not used from the environment. + args.append('--arch=build') + return args def configure(self, spec, prefix): configure(*self.configure_args()) def build(self, spec, prefix): - make() + make('-C', 'build') def install(self, spec, prefix): install_tree('build/bin', prefix.bin) diff --git a/var/spack/repos/builtin/packages/laghos/package.py b/var/spack/repos/builtin/packages/laghos/package.py index c13e1a010d..e828904bdd 100644 --- a/var/spack/repos/builtin/packages/laghos/package.py +++ b/var/spack/repos/builtin/packages/laghos/package.py @@ -40,8 +40,12 @@ class Laghos(MakefilePackage): version('1.0', '4c091e115883c79bed81c557ef16baff') version('develop', git=git, branch='master') - depends_on('mpi') - depends_on('mfem@laghos-v1.0', when='@1.0') + variant('metis', default=True, description='Enable/disable METIS support') + + depends_on('mfem@develop+mpi+metis', when='@develop+metis') + depends_on('mfem@develop+mpi~metis', when='@develop~metis') + depends_on('mfem@laghos-v1.0,3.3.2:+mpi+metis', when='@1.0+metis') + depends_on('mfem@laghos-v1.0,3.3.2:+mpi~metis', when='@1.0~metis') @property def build_targets(self): @@ -49,14 +53,24 @@ class Laghos(MakefilePackage): spec = self.spec targets.append('MFEM_DIR=%s' % spec['mfem'].prefix) - targets.append('CONFIG_MK=%s' % join_path(spec['mfem'].prefix, - 'share/mfem/config.mk')) - targets.append('TEST_MK=%s' % join_path(spec['mfem'].prefix, - 'share/mfem/test.mk')) + targets.append('CONFIG_MK=%s' % spec['mfem'].package.config_mk) + targets.append('TEST_MK=%s' % spec['mfem'].package.test_mk) targets.append('CXX=%s' % spec['mpi'].mpicxx) return targets + # See lib/spack/spack/build_systems/makefile.py + def check(self): + targets = [] + spec = self.spec + + targets.append('MFEM_DIR=%s' % spec['mfem'].prefix) + targets.append('CONFIG_MK=%s' % spec['mfem'].package.config_mk) + targets.append('TEST_MK=%s' % spec['mfem'].package.test_mk) + + with working_dir(self.build_directory): + make('test', *targets) + def install(self, spec, prefix): mkdirp(prefix.bin) install('laghos', prefix.bin) diff --git a/var/spack/repos/builtin/packages/libceed/occaFree-0.2.diff b/var/spack/repos/builtin/packages/libceed/occaFree-0.2.diff new file mode 100644 index 0000000000..060710d4ad --- /dev/null +++ b/var/spack/repos/builtin/packages/libceed/occaFree-0.2.diff @@ -0,0 +1,41 @@ +diff --git a/backends/occa/ceed-occa-basis.c b/backends/occa/ceed-occa-basis.c +index 85ec292..86a46ee 100644 +--- a/backends/occa/ceed-occa-basis.c ++++ b/backends/occa/ceed-occa-basis.c +@@ -293,10 +293,6 @@ static int CeedBasisDestroy_Occa(CeedBasis basis) { + const Ceed ceed = basis->ceed; + CeedBasis_Occa *data = basis->data; + dbg("[CeedBasis][Destroy]"); +- occaFree(data->kZero); +- occaFree(data->kInterp); +- occaFree(data->kGrad); +- occaFree(data->kWeight); + occaFree(data->qref1d); + occaFree(data->qweight1d); + occaFree(data->interp1d); +diff --git a/backends/occa/ceed-occa-qfunction.c b/backends/occa/ceed-occa-qfunction.c +index a2776c3..abf7de0 100644 +--- a/backends/occa/ceed-occa-qfunction.c ++++ b/backends/occa/ceed-occa-qfunction.c +@@ -154,7 +154,6 @@ static int CeedQFunctionDestroy_Occa(CeedQFunction qf) { + CeedQFunction_Occa *data=qf->data; + free(data->oklPath); + dbg("[CeedQFunction][Destroy]"); +- occaFree(data->kQFunctionApply); + if (data->ready) { + if (!data->op) occaFree(data->d_q); + occaFree(data->d_u); +diff --git a/backends/occa/ceed-occa-restrict.c b/backends/occa/ceed-occa-restrict.c +index 6b7786c..c5360dc 100644 +--- a/backends/occa/ceed-occa-restrict.c ++++ b/backends/occa/ceed-occa-restrict.c +@@ -95,9 +95,6 @@ static int CeedElemRestrictionDestroy_Occa(CeedElemRestriction r) { + const Ceed ceed = r->ceed; + CeedElemRestriction_Occa *data = r->data; + dbg("[CeedElemRestriction][Destroy]"); +- for (int i=0; i<9; i++) { +- occaFree(data->kRestrict[i]); +- } + ierr = CeedFree(&data); CeedChk(ierr); + return 0; + } diff --git a/var/spack/repos/builtin/packages/libceed/package.py b/var/spack/repos/builtin/packages/libceed/package.py new file mode 100644 index 0000000000..e3967b4a0f --- /dev/null +++ b/var/spack/repos/builtin/packages/libceed/package.py @@ -0,0 +1,81 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Libceed(Package): + """The CEED API Library: Code for Efficient Extensible Discretizations + """ + + homepage = "https://github.com/CEED/libCEED" + url = 'https://github.com/CEED/libCEED' + + version('develop', git='https://github.com/CEED/libCEED.git', + branch='master') + version('0.2', git='https://github.com/CEED/libCEED.git', tag='v0.2') + version('0.1', git='https://github.com/CEED/libCEED.git', tag='v0.1') + + variant('occa', default=True, description='Enable OCCA backends') + variant('cuda', default=False, description='Enable CUDA support') + variant('debug', default=False, description='Enable debug build') + + depends_on('occa@v1.0.0-alpha.5,develop', when='+occa') + depends_on('occa@develop', when='@develop+occa') + depends_on('occa+cuda', when='+occa+cuda') + depends_on('occa~cuda', when='+occa~cuda') + + # occa: do not occaFree kernels + # Repeated creation and freeing of kernels appears to expose a caching + # bug in Occa. + patch('occaFree-0.2.diff', when='@0.2') + + phases = ['build', 'install'] + + def build(self, spec, prefix): + # Note: The occa package exports OCCA_DIR in the environment + + makeopts = ['V=1'] + makeopts += ['NDEBUG=%s' % ('' if '+debug' in spec else '1')] + make(*makeopts) + + if self.run_tests: + make('prove', *makeopts, parallel=False) + + def install(self, spec, prefix): + make('install', 'prefix=%s' % prefix, parallel=False) + + @when('@0.1') + def install(self, spec, prefix): + mkdirp(prefix.include) + install('ceed.h', prefix.include) + mkdirp(prefix.lib) + install('libceed.%s' % dso_suffix, prefix.lib) + filter_file('^prefix=.*$', 'prefix=%s' % prefix, 'ceed.pc') + filter_file('^includedir=\$\{prefix\}$', + 'includedir=${prefix}/include', 'ceed.pc') + filter_file('^libdir=\$\{prefix\}$', 'libdir=${prefix}/lib', 'ceed.pc') + filter_file('Version:.*$', 'Version: 0.1', 'ceed.pc') + mkdirp(prefix.lib.pkgconfig) + install('ceed.pc', prefix.lib.pkgconfig) diff --git a/var/spack/repos/builtin/packages/magma/magma-2.3.0-gcc-4.8.patch b/var/spack/repos/builtin/packages/magma/magma-2.3.0-gcc-4.8.patch new file mode 100644 index 0000000000..f734a5f16a --- /dev/null +++ b/var/spack/repos/builtin/packages/magma/magma-2.3.0-gcc-4.8.patch @@ -0,0 +1,24 @@ +diff -ru magma-2.3.0/testing/testings.h magma-2.3.0-patched/testing/testings.h +--- magma-2.3.0/testing/testings.h 2017-11-14 21:34:00.000000000 -0800 ++++ magma-2.3.0-patched/testing/testings.h 2018-03-23 20:41:16.459934643 -0700 +@@ -269,4 +269,20 @@ + typename blas::traits::real_t* sigma, + FloatT* A, magma_int_t lda ); + ++// This overload for the case sigma = nullptr is a workaround for an issue ++// when building with gcc 4.8.5. This is not an issue with gcc 4.9.2. ++template< typename FloatT > ++void magma_generate_matrix( ++ magma_opts& opts, ++ magma_int_t m, magma_int_t n, ++ std::nullptr_t sigma, ++ FloatT* A, magma_int_t lda ) ++{ ++ magma_generate_matrix( ++ opts, ++ m, n, ++ (typename blas::traits::real_t*) sigma, ++ A, lda ); ++} ++ + #endif /* TESTINGS_H */ diff --git a/var/spack/repos/builtin/packages/magma/package.py b/var/spack/repos/builtin/packages/magma/package.py index 7481afab16..fe04b3c47d 100644 --- a/var/spack/repos/builtin/packages/magma/package.py +++ b/var/spack/repos/builtin/packages/magma/package.py @@ -22,28 +22,37 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## + from spack import * class Magma(CMakePackage): - """The MAGMA project aims to develop a dense linear algebra library - similar to LAPACK but for heterogeneous/hybrid architectures, - starting with current "Multicore+GPU" systems. + """The MAGMA project aims to develop a dense linear algebra library similar to + LAPACK but for heterogeneous/hybrid architectures, starting with current + "Multicore+GPU" systems. """ homepage = "http://icl.cs.utk.edu/magma/" url = "http://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-2.2.0.tar.gz" + version('2.3.0', '9aaf85a338d3a17303e0c69f86f0ec52') version('2.2.0', '6c1ebf4cdf63eb302ff6258ff8c49217') variant('fortran', default=True, description='Enable Fortran bindings support') + variant('shared', default=True, + description='Enable shared library') + depends_on('blas') depends_on('lapack') - depends_on('cuda@9.0:', when='%gcc@6.0:6.9.9') - depends_on('cuda@8.0:', when='%gcc@5.0:') + depends_on('cuda') + + conflicts('%gcc@6:', when='^cuda@:8') + conflicts('%gcc@7:', when='^cuda@:9') + patch('ibm-xl.patch', when='@2.2:%xl') patch('ibm-xl.patch', when='@2.2:%xl_r') + patch('magma-2.3.0-gcc-4.8.patch', when='@2.3.0%gcc@:4.8') def cmake_args(self): spec = self.spec @@ -52,10 +61,17 @@ class Magma(CMakePackage): options.extend([ '-DCMAKE_INSTALL_PREFIX=%s' % prefix, '-DCMAKE_INSTALL_NAME_DIR:PATH=%s/lib' % prefix, - '-DLAPACK_LIBRARIES=%s;%s' % (spec['blas'].libs, - spec['lapack'].libs) + '-DBLAS_LIBRARIES=%s' % spec['blas'].libs.joined(';'), + # As of MAGMA v2.3.0, CMakeLists.txt does not use the variable + # BLAS_LIBRARIES, but only LAPACK_LIBRARIES, so we need to + # explicitly add blas to LAPACK_LIBRARIES. + '-DLAPACK_LIBRARIES=%s' % + (spec['lapack'].libs + spec['blas'].libs).joined(';') ]) + options += ['-DBUILD_SHARED_LIBS=%s' % + ('ON' if ('+shared' in spec) else 'OFF')] + if '+fortran' in spec: options.extend([ '-DUSE_FORTRAN=yes' @@ -66,8 +82,16 @@ class Magma(CMakePackage): ]) if spec.satisfies('^cuda@9.0:'): - options.extend([ - '-DGPU_TARGET=sm30' - ]) + if '@:2.2.0' in spec: + options.extend(['-DGPU_TARGET=sm30']) + else: + options.extend(['-DGPU_TARGET=sm_30']) return options + + @run_after('install') + def post_install(self): + install('magmablas/atomics.cuh', self.prefix.include) + install('control/magma_threadsetting.h', self.prefix.include) + install('control/pthread_barrier.h', self.prefix.include) + install('control/magma_internal.h', self.prefix.include) diff --git a/var/spack/repos/builtin/packages/mfem/package.py b/var/spack/repos/builtin/packages/mfem/package.py index a7be7fba8b..2f25a7cc21 100644 --- a/var/spack/repos/builtin/packages/mfem/package.py +++ b/var/spack/repos/builtin/packages/mfem/package.py @@ -22,22 +22,31 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## -import re from spack import * +import os +import shutil class Mfem(Package): """Free, lightweight, scalable C++ library for finite element methods.""" + tags = ['FEM', 'finite elements', 'high-order', 'AMR', 'HPC'] + homepage = 'http://www.mfem.org' url = 'https://github.com/mfem/mfem' + maintainers = ['goxberry', 'tzanio', 'markcmiller86', 'acfisher', + 'v-dobrev'] + + # Recommended mfem builds to test when updating this file: see the shell + # script 'test_builds.sh' in the same directory as this file. + # mfem is downloaded from a URL shortener at request of upstream # author Tzanio Kolev . See here: # https://github.com/mfem/mfem/issues/53 # # The following procedure should be used to verify security when a - # new verison is added: + # new version is added: # # 1. Verify that no checksums on old versions have changed. # @@ -51,6 +60,11 @@ class Mfem(Package): # If this quick verification procedure fails, additional discussion # will be required to verify the new version. + # 'develop' is a special version that is always larger (or newer) than any + # other version. + version('develop', + git='https://github.com/mfem/mfem', branch='master') + version('3.3.2', '01a762a5d0a2bc59ce4e2f59009045a4', url='https://goo.gl/Kd7Jk8', extension='.tar.gz', @@ -71,8 +85,19 @@ class Mfem(Package): '841ea5cf58de6fae4de0f553b0e01ebaab9cd9c67fa821e8a715666ecf18fc57', url='http://goo.gl/xrScXn', extension='.tar.gz') + variant('static', default=True, + description='Build static library') + variant('shared', default=False, + description='Build shared library') variant('mpi', default=True, description='Enable MPI parallelism') + # Can we make the default value for 'metis' to depend on the 'mpi' value? + variant('metis', default=True, + description='Enable METIS support') + # TODO: The 'hypre' variant is the same as 'mpi', we may want to remove it. + # For now, keep the 'hypre' variant while ignoring its setting. This + # is done to preserve compatibility with other packages that refer to + # it, e.g. xSDK. variant('hypre', default=True, description='Required for MPI parallelism') variant('openmp', default=False, @@ -83,10 +108,13 @@ class Mfem(Package): ' May cause minor performance issues.')) variant('superlu-dist', default=False, description='Enable MPI parallel, sparse direct solvers') + # Placeholder for STRUMPACK, support added in mfem v3.3.2: + # variant('strumpack', default=False, + # description='Enable support for STRUMPACK') variant('suite-sparse', default=False, description='Enable serial, sparse direct solvers') variant('petsc', default=False, - description='Enable PETSc solvers, preconditioners, etc..') + description='Enable PETSc solvers, preconditioners, etc.') variant('sundials', default=False, description='Enable Sundials time integrators') variant('mpfr', default=False, @@ -97,43 +125,77 @@ class Mfem(Package): description='Build debug instead of optimized version') variant('netcdf', default=False, description='Enable Cubit/Genesis reader') + variant('conduit', default=False, + description='Enable binary data I/O using Conduit') variant('gzstream', default=True, description='Support zip\'d streams for I/O') + variant('gnutls', default=False, + description='Enable secure sockets using GnuTLS') + variant('libunwind', default=False, + description='Enable backtrace on error support using Libunwind') + variant('timer', default='auto', + values=('auto', 'std', 'posix', 'mac', 'mpi'), + description='Timing functions to use in mfem::StopWatch') variant('examples', default=False, description='Build and install examples') variant('miniapps', default=False, description='Build and install miniapps') - conflicts('+mpi', when='~hypre') - conflicts('+suite-sparse', when='~lapack') - conflicts('+superlu-dist', when='@:3.1') + conflicts('+shared', when='@:3.3.2') + conflicts('~static~shared') + conflicts('~threadsafe', when='+openmp') + conflicts('+netcdf', when='@:3.1') + conflicts('+superlu-dist', when='@:3.1') + conflicts('+gnutls', when='@:3.1') + conflicts('+gzstream', when='@:3.2') + conflicts('+mpfr', when='@:3.2') + conflicts('+petsc', when='@:3.2') + conflicts('+sundials', when='@:3.2') + conflicts('timer=mac', when='@:3.3.0') + conflicts('timer=mpi', when='@:3.3.0') + conflicts('~metis+mpi', when='@:3.3.0') + conflicts('+metis~mpi', when='@:3.3.0') + conflicts('+conduit', when='@:3.3.2') + + conflicts('+superlu-dist', when='~mpi') + conflicts('+petsc', when='~mpi') + conflicts('timer=mpi', when='~mpi') - depends_on('hypre', when='+hypre') + depends_on('mpi', when='+mpi') + depends_on('hypre', when='+mpi') + depends_on('metis', when='+metis') depends_on('blas', when='+lapack') - depends_on('blas', when='+suite-sparse') depends_on('lapack', when='+lapack') - depends_on('lapack', when='+suite-sparse') - - depends_on('mpi', when='+mpi') - depends_on('metis') - depends_on('parmetis', when='+superlu-dist') - depends_on('metis@5:', when='+superlu-dist') - depends_on('metis@5:', when='+suite-sparse ^suite-sparse@4.5:') - depends_on('sundials@2.7:+hypre', when='+sundials') + depends_on('sundials@2.7.0', when='@:3.3.0+sundials~mpi') + depends_on('sundials@2.7.0+mpi+hypre', when='@:3.3.0+sundials+mpi') + depends_on('sundials@2.7.0:', when='@3.3.2:+sundials~mpi') + depends_on('sundials@2.7.0:+mpi+hypre', when='@3.3.2:+sundials+mpi') depends_on('suite-sparse', when='+suite-sparse') - depends_on('superlu-dist', when='@3.2: +superlu-dist') - depends_on('petsc@3.8:', when='+petsc') - + depends_on('superlu-dist', when='+superlu-dist') + # The PETSc tests in MFEM will fail if PETSc is not configured with + # SuiteSparse and MUMPS. On the other hand, if we require the variants + # '+suite-sparse+mumps' of PETSc, the xsdk package concretization fails. + depends_on('petsc@3.8:+mpi+double+hypre', when='+petsc') + # Recommended when building outside of xsdk: + # depends_on('petsc@3.8:+mpi+double+hypre+suite-sparse+mumps', + # when='+petsc') depends_on('mpfr', when='+mpfr') - depends_on('netcdf', when='@3.2: +netcdf') - depends_on('zlib', when='@3.2: +netcdf') - depends_on('hdf5', when='@3.2: +netcdf') - depends_on('libunwind', when='+debug') + depends_on('netcdf', when='+netcdf') + depends_on('libunwind', when='+libunwind') depends_on('zlib', when='+gzstream') + depends_on('gnutls', when='+gnutls') + depends_on('conduit@0.3.1:', when='+conduit') + depends_on('conduit+mpi', when='+conduit+mpi') + + patch('mfem_ppc_build.patch', when='@3.2:3.3.0 arch=ppc64le') + + phases = ['configure', 'build', 'install'] - patch('mfem_ppc_build.patch', when='@3.2:3.3 arch=ppc64le') + def setup_environment(self, spack_env, run_env): + spack_env.unset('MFEM_DIR') + spack_env.unset('MFEM_BUILD_DIR') # # Note: Although MFEM does support CMake configuration, MFEM @@ -142,30 +204,42 @@ class Mfem(Package): # likely to be up to date in supporting *all* of MFEM's # configuration options. So, don't use CMake # - def install(self, spec, prefix): + def configure(self, spec, prefix): def yes_no(varstr): return 'YES' if varstr in self.spec else 'NO' - metis5_str = 'NO' - if '+superlu-dist' in spec or \ - spec.satisfies('+suite-sparse ^suite-sparse@4.5:') or \ - spec['metis'].satisfies('@5:'): - metis5_str = 'YES' + # We need to add rpaths explicitly to allow proper export of link flags + # from within MFEM. - threadsafe_str = 'NO' - if '+openmp' in spec or '+threadsafe' in spec: - threadsafe_str = 'YES' + # Similar to spec[pkg].libs.ld_flags but prepends rpath flags too. + def ld_flags_from_LibraryList(libs_list): + flags = ['-Wl,-rpath,%s' % dir for dir in libs_list.directories] + flags += [libs_list.ld_flags] + return ' '.join(flags) + + def ld_flags_from_dirs(pkg_dirs_list, pkg_libs_list): + flags = ['-Wl,-rpath,%s' % dir for dir in pkg_dirs_list] + flags += ['-L%s' % dir for dir in pkg_dirs_list] + flags += ['-l%s' % lib for lib in pkg_libs_list] + return ' '.join(flags) + + metis5_str = 'NO' + if ('+metis' in spec) and spec['metis'].satisfies('@5:'): + metis5_str = 'YES' options = [ 'PREFIX=%s' % prefix, 'MFEM_USE_MEMALLOC=YES', 'MFEM_DEBUG=%s' % yes_no('+debug'), + # NOTE: env['CXX'] is the spack c++ compiler wrapper. The real + # compiler is defined by env['SPACK_CXX']. 'CXX=%s' % env['CXX'], - 'MFEM_USE_LIBUNWIND=%s' % yes_no('+debug'), + 'MFEM_USE_LIBUNWIND=%s' % yes_no('+libunwind'), 'MFEM_USE_GZSTREAM=%s' % yes_no('+gzstream'), + 'MFEM_USE_METIS=%s' % yes_no('+metis'), 'MFEM_USE_METIS_5=%s' % metis5_str, - 'MFEM_THREAD_SAFE=%s' % threadsafe_str, + 'MFEM_THREAD_SAFE=%s' % yes_no('+threadsafe'), 'MFEM_USE_MPI=%s' % yes_no('+mpi'), 'MFEM_USE_LAPACK=%s' % yes_no('+lapack'), 'MFEM_USE_SUPERLU=%s' % yes_no('+superlu-dist'), @@ -174,115 +248,175 @@ class Mfem(Package): 'MFEM_USE_PETSC=%s' % yes_no('+petsc'), 'MFEM_USE_NETCDF=%s' % yes_no('+netcdf'), 'MFEM_USE_MPFR=%s' % yes_no('+mpfr'), - 'MFEM_USE_OPENMP=%s' % yes_no('+openmp')] + 'MFEM_USE_GNUTLS=%s' % yes_no('+gnutls'), + 'MFEM_USE_OPENMP=%s' % yes_no('+openmp'), + 'MFEM_USE_CONDUIT=%s' % yes_no('+conduit')] + + cxxflags = spec.compiler_flags['cxxflags'] + if cxxflags: + # The cxxflags are set by the spack c++ compiler wrapper. We also + # set CXXFLAGS explicitly, for clarity, and to properly export the + # cxxflags in the variable MFEM_CXXFLAGS in config.mk. + options += ['CXXFLAGS=%s' % ' '.join(cxxflags)] + + if '~static' in spec: + options += ['STATIC=NO'] + if '+shared' in spec: + options += ['SHARED=YES', 'PICFLAG=%s' % self.compiler.pic_flag] if '+mpi' in spec: options += ['MPICXX=%s' % spec['mpi'].mpicxx] - - if '+hypre' in spec: hypre = spec['hypre'] - hypre_flag_list = (hypre.libs + - hypre['lapack'].libs + - hypre['blas'].libs) - options += ['HYPRE_DIR=%s' % hypre.prefix, - 'HYPRE_OPT=-I%s' % hypre.prefix.include, - 'HYPRE_LIB=%s' % hypre_flag_list.ld_flags] + # The hypre package always links with 'blas' and 'lapack'. + all_hypre_libs = hypre.libs + hypre['lapack'].libs + \ + hypre['blas'].libs + options += [ + 'HYPRE_OPT=-I%s' % hypre.prefix.include, + 'HYPRE_LIB=%s' % ld_flags_from_LibraryList(all_hypre_libs)] + + if '+metis' in spec: + options += [ + 'METIS_OPT=-I%s' % spec['metis'].prefix.include, + 'METIS_LIB=%s' % + ld_flags_from_dirs([spec['metis'].prefix.lib], ['metis'])] if '+lapack' in spec: - lapack_lib = (spec['lapack'].libs + spec['blas'].libs).ld_flags # NOQA: ignore=E501 + lapack_blas = spec['lapack'].libs + spec['blas'].libs options += [ - 'LAPACK_OPT=-I%s' % spec['lapack'].prefix.include, - 'LAPACK_LIB=%s' % lapack_lib] + # LAPACK_OPT is not used + 'LAPACK_LIB=%s' % ld_flags_from_LibraryList(lapack_blas)] if '+superlu-dist' in spec: - metis_lib = '-L%s -lparmetis -lmetis' % spec['parmetis'].prefix.lib - options += [ - 'METIS_DIR=%s' % spec['parmetis'].prefix, - 'METIS_OPT=-I%s' % spec['parmetis'].prefix.include, - 'METIS_LIB=%s' % metis_lib] - superlu_lib = '-L%s' % spec['superlu-dist'].prefix.lib - superlu_lib += ' -lsuperlu_dist' options += [ - 'SUPERLU_DIR=%s' % spec['superlu-dist'].prefix, - 'SUPERLU_OPT=-I%s' % spec['superlu-dist'].prefix.include, - 'SUPERLU_LIB=%s' % superlu_lib] - else: - metis_lib = '-L%s -lmetis' % spec['metis'].prefix.lib - options += [ - 'METIS_DIR=%s' % spec['metis'].prefix, - 'METIS_OPT=-I%s' % spec['metis'].prefix.include, - 'METIS_LIB=%s' % metis_lib] + 'SUPERLU_OPT=-I%s -I%s' % + (spec['superlu-dist'].prefix.include, + spec['parmetis'].prefix.include), + 'SUPERLU_LIB=-L%s -L%s -lsuperlu_dist -lparmetis' % + (spec['superlu-dist'].prefix.lib, + spec['parmetis'].prefix.lib)] if '+suite-sparse' in spec: - ssp = spec['suite-sparse'].prefix - ss_lib = '-L%s' % ssp.lib - if '@3.2:' in spec: - ss_lib += ' -lklu -lbtf' - ss_lib += (' -lumfpack -lcholmod -lcolamd' + - ' -lamd -lcamd -lccolamd -lsuitesparseconfig') - no_rt = spec.satisfies('platform=darwin') - if not no_rt: - ss_lib += ' -lrt' - ss_lib += (' ' + metis_lib + ' ' + lapack_lib) + ss_spec = 'suite-sparse:' + self.suitesparse_components options += [ - 'SUITESPARSE_DIR=%s' % ssp, - 'SUITESPARSE_OPT=-I%s' % ssp.include, - 'SUITESPARSE_LIB=%s' % ss_lib] + 'SUITESPARSE_OPT=-I%s' % spec[ss_spec].prefix.include, + 'SUITESPARSE_LIB=%s' % + ld_flags_from_LibraryList(spec[ss_spec].libs)] if '+sundials' in spec: - sundials_libs = ( - '-lsundials_arkode -lsundials_cvode' - ' -lsundials_nvecserial -lsundials_kinsol') - if '+mpi' in spec: - sundials_libs += ( - ' -lsundials_nvecparhyp -lsundials_nvecparallel') + sun_spec = 'sundials:' + self.sundials_components options += [ - 'SUNDIALS_DIR=%s' % spec['sundials'].prefix, - 'SUNDIALS_OPT=-I%s' % spec['sundials'].prefix.include, - 'SUNDIALS_LIB=-L%s %s' % (spec['sundials'].prefix.lib, - sundials_libs)] + 'SUNDIALS_OPT=%s' % spec[sun_spec].headers.cpp_flags, + 'SUNDIALS_LIB=%s' % + ld_flags_from_LibraryList(spec[sun_spec].libs)] if '+petsc' in spec: - f = open('%s/lib/pkgconfig/PETSc.pc' % spec['petsc'].prefix, 'r') - for line in f: - if re.search('^\s*Cflags: ', line): - petsc_opts = re.sub('^\s*Cflags: (.*)', '\\1', line) - elif re.search('^\s*Libs.*: ', line): - petsc_libs = re.sub('^\s*Libs.*: (.*)', '\\1', line) - f.close() + # options += ['PETSC_DIR=%s' % spec['petsc'].prefix] options += [ - 'PETSC_DIR=%s' % spec['petsc'].prefix, - 'PETSC_OPT=%s' % petsc_opts, - 'PETSC_LIB=-L%s -lpetsc %s' % - (spec['petsc'].prefix.lib, petsc_libs)] + 'PETSC_OPT=%s' % spec['petsc'].headers.cpp_flags, + 'PETSC_LIB=%s' % + ld_flags_from_LibraryList(spec['petsc'].libs)] if '+netcdf' in spec: - np = spec['netcdf'].prefix - zp = spec['zlib'].prefix - h5p = spec['hdf5'].prefix - nlib = '-L%s -lnetcdf ' % np.lib - nlib += '-L%s -lhdf5_hl -lhdf5 ' % h5p.lib - nlib += '-L%s -lz' % zp.lib options += [ - 'NETCDF_DIR=%s' % np, - 'HDF5_DIR=%s' % h5p, - 'ZLIB_DIR=%s' % zp, - 'NETCDF_OPT=-I%s' % np.include, - 'NETCDF_LIB=%s' % nlib] + 'NETCDF_OPT=-I%s' % spec['netcdf'].prefix.include, + 'NETCDF_LIB=%s' % + ld_flags_from_dirs([spec['netcdf'].prefix.lib], ['netcdf'])] + + if '+gzstream' in spec: + if "@:3.3.2" in spec: + options += ['ZLIB_DIR=%s' % spec['zlib'].prefix] + else: + options += [ + 'ZLIB_OPT=-I%s' % spec['zlib'].prefix.include, + 'ZLIB_LIB=%s' % + ld_flags_from_LibraryList(spec['zlib'].libs)] if '+mpfr' in spec: - options += ['MPFR_LIB=-L%s -lmpfr' % spec['mpfr'].prefix.lib] + options += [ + 'MPFR_OPT=-I%s' % spec['mpfr'].prefix.include, + 'MPFR_LIB=%s' % + ld_flags_from_dirs([spec['mpfr'].prefix.lib], ['mpfr'])] + + if '+gnutls' in spec: + options += [ + 'GNUTLS_OPT=-I%s' % spec['gnutls'].prefix.include, + 'GNUTLS_LIB=%s' % + ld_flags_from_dirs([spec['gnutls'].prefix.lib], ['gnutls'])] + + if '+libunwind' in spec: + libunwind = spec['libunwind'] + headers = find_headers('libunwind', libunwind.prefix.include) + headers.add_macro('-g') + libs = find_libraries('libunwind', libunwind.prefix.lib, + shared=True, recursive=True) + if not libs: + libs = find_libraries('libunwind', libunwind.prefix.lib, + shared=False, recursive=True) + # When mfem uses libunwind, it also needs 'libdl'. + libs += LibraryList(find_system_libraries('libdl')) + options += [ + 'LIBUNWIND_OPT=%s' % headers.cpp_flags, + 'LIBUNWIND_LIB=%s' % ld_flags_from_LibraryList(libs)] if '+openmp' in spec: - options += ['OPENMP_OPT = %s' % self.compiler.openmp_flag] + options += ['OPENMP_OPT=%s' % self.compiler.openmp_flag] + + timer_ids = {'std': '0', 'posix': '2', 'mac': '4', 'mpi': '6'} + timer = spec.variants['timer'].value + if timer != 'auto': + options += ['MFEM_TIMER_TYPE=%s' % timer_ids[timer]] + + if '+conduit' in spec: + conduit = spec['conduit'] + headers = HeaderList(find(conduit.prefix.include, 'conduit.hpp', + recursive=True)) + conduit_libs = ['libconduit', 'libconduit_relay', + 'libconduit_blueprint'] + libs = find_libraries(conduit_libs, conduit.prefix.lib, + shared=('+shared' in conduit)) + libs += LibraryList(find_system_libraries('libdl')) + if '+hdf5' in conduit: + hdf5 = conduit['hdf5'] + headers += find_headers('hdf5', hdf5.prefix.include) + libs += hdf5.libs + options += [ + 'CONDUIT_OPT=%s' % headers.cpp_flags, + 'CONDUIT_LIB=%s' % ld_flags_from_LibraryList(libs)] - make('config', *options) + make('config', *options, parallel=False) + make('info', parallel=False) + + def build(self, spec, prefix): make('lib') - if self.run_tests: - make('check') + @run_after('build') + def check_or_test(self): + # Running 'make check' or 'make test' may fail if MFEM_MPIEXEC or + # MFEM_MPIEXEC_NP are not set appropriately. + if not self.run_tests: + # check we can build ex1 (~mpi) or ex1p (+mpi). + make('-C', 'examples', 'ex1p' if ('+mpi' in self.spec) else 'ex1', + parallel=False) + # make('check', parallel=False) + else: + make('all') + make('test', parallel=False) - make('install') + def install(self, spec, prefix): + make('install', parallel=False) + + # TODO: The way the examples and miniapps are being installed is not + # perfect. For example, the makefiles do not work. + + install_em = ('+examples' in spec) or ('+miniapps' in spec) + if install_em and ('+shared' in spec): + make('examples/clean', 'miniapps/clean') + # This is a hack to get the examples and miniapps to link with the + # installed shared mfem library: + with working_dir('config'): + os.rename('config.mk', 'config.mk.orig') + shutil.copyfile(str(self.config_mk), 'config.mk') + shutil.copystat('config.mk.orig', 'config.mk') if '+examples' in spec: make('examples') @@ -291,3 +425,64 @@ class Mfem(Package): if '+miniapps' in spec: make('miniapps') install_tree('miniapps', join_path(prefix, 'miniapps')) + + if install_em: + install_tree('data', join_path(prefix, 'data')) + + @property + def suitesparse_components(self): + """Return the SuiteSparse components needed by MFEM.""" + ss_comps = 'umfpack,cholmod,colamd,amd,camd,ccolamd,suitesparseconfig' + if self.spec.satisfies('@3.2:'): + ss_comps = 'klu,btf,' + ss_comps + return ss_comps + + @property + def sundials_components(self): + """Return the SUNDIALS components needed by MFEM.""" + sun_comps = 'arkode,cvode,nvecserial,kinsol' + if '+mpi' in self.spec: + sun_comps += ',nvecparhyp,nvecparallel' + return sun_comps + + @property + def headers(self): + """Export the main mfem header, mfem.hpp. + """ + hdrs = HeaderList(find(self.prefix.include, 'mfem.hpp', + recursive=False)) + return hdrs or None + + @property + def libs(self): + """Export the mfem library file. + """ + libs = find_libraries('libmfem', root=self.prefix.lib, + shared=('+shared' in self.spec), recursive=False) + return libs or None + + @property + def config_mk(self): + """Export the location of the config.mk file. + This property can be accessed using spec['mfem'].package.config_mk + """ + dirs = [self.prefix, self.prefix.share.mfem] + for d in dirs: + f = join_path(d, 'config.mk') + if os.access(f, os.R_OK): + return FileList(f) + return FileList(find(self.prefix, 'config.mk', recursive=True)) + + @property + def test_mk(self): + """Export the location of the test.mk file. + This property can be accessed using spec['mfem'].package.test_mk. + In version 3.3.2 and newer, the location of test.mk is also defined + inside config.mk, variable MFEM_TEST_MK. + """ + dirs = [self.prefix, self.prefix.share.mfem] + for d in dirs: + f = join_path(d, 'test.mk') + if os.access(f, os.R_OK): + return FileList(f) + return FileList(find(self.prefix, 'test.mk', recursive=True)) diff --git a/var/spack/repos/builtin/packages/mfem/test_builds.sh b/var/spack/repos/builtin/packages/mfem/test_builds.sh new file mode 100755 index 0000000000..5b8dd7ba0f --- /dev/null +++ b/var/spack/repos/builtin/packages/mfem/test_builds.sh @@ -0,0 +1,72 @@ +#!/bin/bash + +builds=( + # preferred version: + 'mfem' + 'mfem~mpi~metis~gzstream' + 'mfem+mpi+superlu-dist+suite-sparse+petsc \ + +sundials+mpfr+netcdf+gzstream+gnutls+libunwind \ + ^hypre~internal-superlu ^petsc~boost+suite-sparse+mumps' + 'mfem~mpi+suite-sparse+sundials+mpfr+netcdf \ + +gzstream+gnutls+libunwind' + # develop version: + 'mfem@develop+shared~static' + 'mfem@develop+shared~static~mpi~metis~gzstream' + # TODO: Replace '^conduit~python~hdf5' with '^conduit~python' when conduit + # is fixed to accept '^hdf5+mpi'. + 'mfem@develop+shared~static+mpi \ + +superlu-dist+suite-sparse+petsc+sundials+mpfr+netcdf+gzstream \ + +gnutls+libunwind+conduit ^hypre~internal-superlu \ + ^petsc~boost+suite-sparse+mumps ^conduit~python~hdf5' + # TODO: The options '^netcdf~mpi ^hdf5@1.8.19~mpi' are added just to make + # conduit happy. + 'mfem@develop+shared~static~mpi \ + +suite-sparse+sundials+mpfr+netcdf+gzstream+gnutls+libunwind \ + +conduit ^conduit~python ^netcdf~mpi ^hdf5@1.8.19~mpi' +) + +builds2=( + # preferred version + 'mfem+superlu-dist' + 'mfem+suite-sparse~mpi' + 'mfem+suite-sparse' + 'mfem+sundials~mpi' + 'mfem+sundials' + 'mfem+netcdf~mpi' + 'mfem+netcdf' + 'mfem+mpfr' + 'mfem+gnutls' + 'mfem+petsc+mpi ^hypre~internal-superlu ^petsc~boost+suite-sparse+mumps' + # develop version + 'mfem@develop+superlu-dist' + 'mfem@develop+suite-sparse~mpi' + 'mfem@develop+suite-sparse' + 'mfem@develop+sundials~mpi' + 'mfem@develop+sundials' + 'mfem@develop+netcdf~mpi' + 'mfem@develop+netcdf' + 'mfem@develop+mpfr' + 'mfem@develop+gnutls' + 'mfem@develop+conduit~mpi ^conduit~python' + 'mfem@develop+conduit ^conduit~python' + 'mfem@develop+petsc+mpi ^hypre~internal-superlu \ + ^petsc~boost+suite-sparse+mumps' +) + +trap 'printf "\nScript interrupted.\n"; exit 33' INT + +SEP='==========================================================================' +sep='--------------------------------------------------------------------------' + +for bld in "${builds[@]}" "${builds2[@]}"; do + printf "\n%s\n" "${SEP}" + printf " %s\n" "${bld}" + printf "%s\n" "${SEP}" + eval bbb="\"${bld}\"" + spack spec -I $bbb || exit 1 + printf "%s\n" "${sep}" + spack install --test=root $bbb || exit 2 +done + +# Uninstall all mfem builds: +# spack uninstall --all mfem diff --git a/var/spack/repos/builtin/packages/nek5000/package.py b/var/spack/repos/builtin/packages/nek5000/package.py index 3084a202bc..2ea0654a2b 100644 --- a/var/spack/repos/builtin/packages/nek5000/package.py +++ b/var/spack/repos/builtin/packages/nek5000/package.py @@ -25,6 +25,7 @@ from spack import * import numbers +import os def is_integral(x): @@ -46,8 +47,9 @@ class Nek5000(Package): tags = ['cfd', 'flow', 'hpc', 'solver', 'navier-stokes', 'spectral-elements', 'fluid'] - version('17.0', git='https://github.com/Nek5000/Nek5000.git', - commit='469daf94d3f9aa3ba9d258d8eee9ebde6893a702') + version('17.0', '6a13bfad2ce023897010dd88f54a0a87', + url="https://github.com/Nek5000/Nek5000/releases/download/" + "v17.0/Nek5000-v17.0.tar.gz") version('develop', git='https://github.com/Nek5000/Nek5000.git', branch='master') @@ -56,6 +58,9 @@ class Nek5000(Package): variant('profiling', default=True, description='Build with profiling data.') variant('visit', default=False, description='Build with Visit.') + # TODO: add a variant 'blas' or 'external-blas' to enable the usage of + # Spack installed/configured blas. + # Variant for MAXNEL, we need to read this from user variant( 'MAXNEL', @@ -76,27 +81,106 @@ class Nek5000(Package): # Dependencies depends_on('mpi', when="+mpi") + depends_on('libx11', when="+prenek") + depends_on('libx11', when="+postnek") + # libxt is needed for X11/Intrinsic.h but not for linking + depends_on('libxt', when="+prenek") + depends_on('libxt', when="+postnek") depends_on('visit', when="+visit") @run_before('install') def fortran_check(self): - if not self.compiler.fc: - msg = 'Cannot build Nek5000 without a Fortran compiler.' + if not self.compiler.f77: + msg = 'Cannot build Nek5000 without a Fortran 77 compiler.' + raise RuntimeError(msg) + + @run_after('install') + def test_install(self): + currentDir = os.getcwd() + eddyDir = 'short_tests/eddy' + os.chdir(eddyDir) + + os.system(join_path(self.prefix.bin, 'makenek') + ' eddy_uv') + if not os.path.isfile(join_path(os.getcwd(), 'nek5000')): + msg = 'Cannot build example: short_tests/eddy.' raise RuntimeError(msg) + os.chdir(currentDir) + def install(self, spec, prefix): toolsDir = 'tools' binDir = 'bin' - FC = self.compiler.fc + # Do not use the Spack compiler wrappers. + # Use directly the compilers: + FC = self.compiler.f77 CC = self.compiler.cc + fflags = spec.compiler_flags['fflags'] + cflags = spec.compiler_flags['cflags'] + if ('+prenek' in spec) or ('+postnek' in spec): + libx11_h = find_headers('Xlib', spec['libx11'].prefix.include, + recursive=True) + if not libx11_h: + raise RuntimeError('Xlib.h not found in %s' % + spec['libx11'].prefix.include) + cflags += ['-I%s' % os.path.dirname(libx11_h.directories[0])] + libxt_h = find_headers('Intrinsic', spec['libxt'].prefix.include, + recursive=True) + if not libxt_h: + raise RuntimeError('X11/Intrinsic.h not found in %s' % + spec['libxt'].prefix.include) + cflags += ['-I%s' % os.path.dirname(libxt_h.directories[0])] + if self.compiler.name in ['xl', 'xl_r']: + # Use '-qextname' to add underscores. + # Use '-WF,-qnotrigraph' to fix an error about a string: '... ??' + fflags += ['-qextname', '-WF,-qnotrigraph'] + fflags = ' '.join(fflags) + cflags = ' '.join(cflags) + # Build the tools, maketools copy them to Nek5000/bin by default. # We will then install Nek5000/bin under prefix after that. with working_dir(toolsDir): # Update the maketools script to use correct compilers - filter_file(r'^FC\s*=.*', 'FC="{0}"'.format(FC), 'maketools') - filter_file(r'^CC\s*=.*', 'CC="{0}"'.format(CC), 'maketools') + filter_file(r'^#FC\s*=.*', 'FC="{0}"'.format(FC), 'maketools') + filter_file(r'^#CC\s*=.*', 'CC="{0}"'.format(CC), 'maketools') + if fflags: + filter_file(r'^#FFLAGS=.*', 'FFLAGS="{0}"'.format(fflags), + 'maketools') + if cflags: + filter_file(r'^#CFLAGS=.*', 'CFLAGS="{0}"'.format(cflags), + 'maketools') + + if self.compiler.name in ['xl', 'xl_r']: + # Patch 'maketools' to use '-qextname' when checking for + # underscore becasue 'xl'/'xl_r' use this option to enable the + # addition of the underscore. + filter_file(r'^\$FC -c ', '$FC -qextname -c ', 'maketools') + + libx11_lib = find_libraries('libX11', spec['libx11'].prefix.lib, + shared=True, recursive=True) + if not libx11_lib: + libx11_lib = \ + find_libraries('libX11', spec['libx11'].prefix.lib64, + shared=True, recursive=True) + if not libx11_lib: + raise RuntimeError('libX11 not found in %s/{lib,lib64}' % + spec['libx11'].prefix) + # There is no other way to set the X11 library path except brute + # force: + filter_file(r'-L\$\(X\)', libx11_lib.search_flags, + join_path('prenek', 'makefile')) + filter_file(r'-L\$\(X\)', libx11_lib.search_flags, + join_path('postnek', 'makefile')) + + if self.compiler.name in ['xl', 'xl_r']: + # Use '-qextname' when compiling mxm.f + filter_file('\$\(OLAGS\)', '-qextname $(OLAGS)', + join_path('postnek', 'makefile')) + # Define 'rename_' function that calls 'rename' + with open(join_path('postnek', 'xdriver.c'), 'a') as xdriver: + xdriver.write('\nvoid rename_(char *from, char *to)\n{\n' + ' rename(from, to);\n}\n') maxnel = self.spec.variants['MAXNEL'].value filter_file(r'^#MAXNEL\s*=.*', 'MAXNEL=' + maxnel, 'maketools') @@ -106,8 +190,9 @@ class Nek5000(Package): # Build the tools if '+genbox' in spec: makeTools('genbox') - if '+int_tp' in spec and self.version == Version('17.0.0-beta2'): - makeTools('int_tp') + # "ERROR: int_tp does not exist!" + # if '+int_tp' in spec: + # makeTools('int_tp') if '+n2to3' in spec: makeTools('n2to3') if '+postnek' in spec: @@ -138,11 +223,26 @@ class Nek5000(Package): # Update the makenek to use correct compilers and # Nek5000 source. - if self.version >= Version('17.0'): - filter_file(r'^#FC\s*=.*', 'FC="{0}"'.format(FC), 'makenek') - filter_file(r'^#CC\s*=.*', 'CC="{0}"'.format(CC), 'makenek') - filter_file(r'^#SOURCE_ROOT\s*=\"\$H.*', 'SOURCE_ROOT=\"' + - prefix.bin.Nek5000 + '\"', 'makenek') + filter_file(r'^#FC\s*=.*', 'FC="{0}"'.format(FC), 'makenek') + filter_file(r'^#CC\s*=.*', 'CC="{0}"'.format(CC), 'makenek') + filter_file(r'^#SOURCE_ROOT\s*=\"\$H.*', 'SOURCE_ROOT=\"' + + prefix.bin.Nek5000 + '\"', 'makenek') + if fflags: + filter_file(r'^#FFLAGS=.*', 'FFLAGS="{0}"'.format(fflags), + 'makenek') + if cflags: + filter_file(r'^#CFLAGS=.*', 'CFLAGS="{0}"'.format(cflags), + 'makenek') + + with working_dir('core'): + if self.compiler.name in ['xl', 'xl_r']: + # Patch 'core/makenek.inc' and 'makefile.template' to use + # '-qextname' when checking for underscore becasue 'xl'/'xl_r' + # use this option to enable the addition of the underscore. + filter_file(r'^\$FCcomp -c ', '$FCcomp -qextname -c ', + 'makenek.inc') + filter_file(r'\$\(FC\) -c \$\(L0\)', + '$(FC) -c -qextname $(L0)', 'makefile.template') # Install Nek5000/bin in prefix/bin install_tree(binDir, prefix.bin) diff --git a/var/spack/repos/builtin/packages/nekcem/package.py b/var/spack/repos/builtin/packages/nekcem/package.py index b9de121249..c4e236bf38 100644 --- a/var/spack/repos/builtin/packages/nekcem/package.py +++ b/var/spack/repos/builtin/packages/nekcem/package.py @@ -24,6 +24,7 @@ ############################################################################## from spack import * import os +import json class Nekcem(Package): @@ -39,10 +40,11 @@ class Nekcem(Package): # We only have a development version version('develop', git='https://github.com/NekCEM/NekCEM.git') + version('0b8bedd', git='https://github.com/NekCEM/NekCEM.git', + commit='0b8beddfdcca646bfcc866dfda1c5f893338399b') # dependencies depends_on('mpi', when='+mpi') - depends_on('python@2.7:') depends_on('blas') depends_on('lapack') @@ -52,39 +54,77 @@ class Nekcem(Package): msg = 'NekCEM can not be built without a Fortran compiler.' raise RuntimeError(msg) + @run_after('install') + def test_install(self): + NekCEM_test = join_path(self.prefix.bin, 'NekCEM', 'tests', '2dboxpec') + with working_dir(NekCEM_test): + makenek = Executable(join_path(self.prefix.bin, 'makenek')) + makenek(os.path.basename(NekCEM_test)) + if not os.path.isfile('nekcem'): + msg = 'Cannot build example: %s' % NekCEM_test + raise RuntimeError(msg) + def install(self, spec, prefix): binDir = 'bin' nek = 'nek' cNek = 'configurenek' mNek = 'makenek' - FC = self.compiler.fc + FC = self.compiler.f77 CC = self.compiler.cc + fflags = spec.compiler_flags['fflags'] + cflags = spec.compiler_flags['cflags'] + ldflags = spec.compiler_flags['ldflags'] + if '+mpi' in spec: FC = spec['mpi'].mpif77 CC = spec['mpi'].mpicc with working_dir(binDir): - filter_file(r'^FC\s*=.*', 'FC=\"' + FC + '\"', 'makenek') - filter_file(r'^CC\s*=.*', 'CC=\"' + CC + '\"', 'makenek') - filter_file(r'^NEK\s*=.*', 'NEK=\"' + prefix.bin.NekCEM + - '\"', 'makenek') + fflags = ['-O3'] + fflags + cflags = ['-O3'] + cflags + fflags += ['-I.'] + cflags += ['-I.', '-DGLOBAL_LONG_LONG'] + + if self.compiler.name == 'gcc' or self.compiler.name == 'clang': + # assuming 'clang' uses 'gfortran' + fflags += ['-fdefault-real-8', '-fdefault-double-8'] + cflags += ['-DUNDERSCORE'] + elif self.compiler.name == 'intel': + fflags += ['-r8'] + cflags += ['-DUNDERSCORE'] + elif self.compiler.name == 'xl' or self.compiler.name == 'xl_r': + fflags += ['-qrealsize=8'] + cflags += ['-DPREFIX=jl_', '-DIBM'] + elif self.compiler.name == 'pgi': + fflags += ['-r8'] + cflags += ['-DUNDERSCORE'] + if '+mpi' in spec: + fflags += ['-DMPI', '-DMPIIO'] + cflags += ['-DMPI', '-DMPIIO'] blasLapack = spec['lapack'].libs + spec['blas'].libs - ldFlags = blasLapack.ld_flags - # Temporary workaround, we should use LDFLAGS when - # configurenek in Nekcem is fixed. - # See issue: https://github.com/NekCEM/NekCEM/issues/200 - filter_file(r'^EXTRALDFLAGS\s*=.*', 'EXTRALDFLAGS=\"' + ldFlags + - '\"', 'makenek') + pthread_lib = find_system_libraries('libpthread') + ldflags += (blasLapack + pthread_lib).ld_flags.split() + all_arch = { + 'spack-arch': { + 'FC': FC, 'FFLAGS': fflags, + 'CC': CC, 'CFLAGS': cflags, + 'LD': FC, 'LDFLAGS': ldflags + } + } + os.rename('arch.json', 'arch.json.orig') + with open('arch.json', 'w') as file: + file.write(json.dumps(all_arch)) + filter_file(r'^ARCH=.*$', 'ARCH=spack-arch', 'makenek') + filter_file(r'^NEK=.*', 'NEK="%s"' % prefix.bin.NekCEM, + 'makenek') # Install NekCEM in prefix/bin install_tree('../NekCEM', prefix.bin.NekCEM) # Create symlinks to makenek, nek and configurenek scripts - os.symlink(os.path.join(prefix.bin.NekCEM, binDir, mNek), - os.path.join(prefix.bin, mNek)) - os.symlink(os.path.join(prefix.bin.NekCEM, binDir, cNek), - os.path.join(prefix.bin, cNek)) - os.symlink(os.path.join(prefix.bin.NekCEM, binDir, nek), - os.path.join(prefix.bin, nek)) + with working_dir(prefix.bin): + os.symlink(os.path.join('NekCEM', binDir, mNek), mNek) + os.symlink(os.path.join('NekCEM', binDir, cNek), cNek) + os.symlink(os.path.join('NekCEM', binDir, nek), nek) diff --git a/var/spack/repos/builtin/packages/occa/package.py b/var/spack/repos/builtin/packages/occa/package.py new file mode 100644 index 0000000000..df00f80e6f --- /dev/null +++ b/var/spack/repos/builtin/packages/occa/package.py @@ -0,0 +1,138 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import os +import shutil + + +class Occa(Package): + """OCCA is an open-source (MIT license) library used to program current + multi-core/many-core architectures. Devices (such as CPUs, GPUs, + Intel's Xeon Phi, FPGAs, etc) are abstracted using an offload-model + for application development and programming for the devices is done + through a C-based (OKL) or Fortran-based kernel language (OFL). + OCCA gives developers the ability to target devices at run-time by + using run-time compilation for device kernels. + """ + + homepage = "http://libocca.org" + url = 'https://github.com/libocca/occa' + git_url = 'https://github.com/libocca/occa.git' + + version('develop', git='https://github.com/libocca/occa.git') + version('v1.0.0-alpha.5', git=git_url, tag='v1.0.0-alpha.5') + version('v0.2.0', git=git_url, tag='v0.2.0') + version('v0.1.0', git=git_url, tag='v0.1.0') + + variant('cuda', + default=True, + description='Activates support for CUDA') + variant('openmp', + default=True, + description='Activates support for OpenMP') + variant('opencl', + default=True, + description='Activates support for OpenCL') + + depends_on('cuda', when='+cuda') + + conflicts('%gcc@6:', when='^cuda@:8') + conflicts('%gcc@7:', when='^cuda@:9') + + def install(self, spec, prefix): + # The build environment is set by the 'setup_environment' method. + # Copy the source to the installation directory and build OCCA there. + for file in os.listdir('.'): + dest = join_path(prefix, os.path.basename(file)) + if os.path.isdir(file): + shutil.copytree(file, dest) + else: + shutil.copy2(file, dest) + make('-C', prefix) + + if self.run_tests: + make('-C', prefix, 'test', parallel=False) + + def _setup_runtime_flags(self, s_env): + spec = self.spec + s_env.set('OCCA_DIR', self.prefix) + s_env.set('OCCA_CXX', self.compiler.cxx) + + cxxflags = spec.compiler_flags['cxxflags'] + if cxxflags: + # Run-time compiler flags: + s_env.set('OCCA_CXXFLAGS', ' '.join(cxxflags)) + + if '+cuda' in spec: + cuda_dir = spec['cuda'].prefix + # Run-time CUDA compiler: + s_env.set('OCCA_CUDA_COMPILER', + join_path(cuda_dir, 'bin', 'nvcc')) + + def setup_environment(self, spack_env, run_env): + spec = self.spec + # The environment variable CXX is automatically set to the Spack + # compiler wrapper. + + # The cxxflags, if specified, will be set by the Spack compiler wrapper + # while the environment variable CXXFLAGS will remain undefined. + # We define CXXFLAGS in the environment to tell OCCA to use the user + # specified flags instead of its defaults. This way the compiler will + # get the cxxflags twice - once from the Spack compiler wrapper and + # second time from OCCA - however, only the second one will be seen in + # the verbose output, so we keep both. + cxxflags = spec.compiler_flags['cxxflags'] + if cxxflags: + spack_env.set('CXXFLAGS', ' '.join(cxxflags)) + + # For the cuda, openmp, and opencl variants, set the environment + # variable OCCA_{CUDA,OPENMP,OPENCL}_ENABLED only if the variant is + # disabled. Otherwise, let OCCA autodetect what is available. + + if '+cuda' in spec: + cuda_dir = spec['cuda'].prefix + cuda_libs_list = ['libcuda', 'libcudart', 'libOpenCL'] + cuda_libs = find_libraries(cuda_libs_list, + cuda_dir, + shared=True, + recursive=True) + spack_env.set('OCCA_INCLUDE_PATH', cuda_dir.include) + spack_env.set('OCCA_LIBRARY_PATH', ':'.join(cuda_libs.directories)) + else: + spack_env.set('OCCA_CUDA_ENABLED', '0') + + if '~opencl' in spec: + spack_env.set('OCCA_OPENCL_ENABLED', '0') + + # Setup run-time environment for testing. + spack_env.set('OCCA_VERBOSE', '1') + self._setup_runtime_flags(spack_env) + # The 'run_env' is included in the Spack generated module files. + self._setup_runtime_flags(run_env) + + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): + # Export OCCA_* variables for everyone using this package from within + # Spack. + self._setup_runtime_flags(spack_env) diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index e0fb9e500b..54b0c59b83 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -37,7 +37,7 @@ class Petsc(Package): homepage = "http://www.mcs.anl.gov/petsc/index.html" url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-3.5.3.tar.gz" - maintainers = ['balay', 'barrysmith'] + maintainers = ['balay', 'barrysmith', 'jedbrown'] version('develop', git='https://bitbucket.org/petsc/petsc.git', tag='master') version('xsdk-0.2.0', git='https://bitbucket.org/petsc/petsc.git', tag='xsdk-0.2.0') @@ -88,6 +88,8 @@ class Petsc(Package): variant('clanguage', default='C', values=('C', 'C++'), description='Specify C (recommended) or C++ to compile PETSc', multi=False) + variant('suite-sparse', default=False, + description='Activates support for SuiteSparse') # 3.8.0 has a build issue with MKL - so list this conflict explicitly conflicts('^intel-mkl', when='@3.8.0') @@ -98,6 +100,7 @@ class Petsc(Package): if sys.platform == "darwin": patch('macos-clang-8.1.0.diff', when='@3.7.5%clang@8.1.0:') + patch('pkg-config-3.7.6-3.8.4.diff', when='@3.7.6:3.8.4') # Virtual dependencies # Git repository needs sowing to build Fortran interface @@ -150,6 +153,7 @@ class Petsc(Package): depends_on('trilinos@12.6.2:', when='@3.7.0:+trilinos+mpi') depends_on('trilinos@xsdk-0.2.0', when='@xsdk-0.2.0+trilinos+mpi') depends_on('trilinos@develop', when='@xdevelop+trilinos+mpi') + depends_on('suite-sparse', when='+suite-sparse') def mpi_dependent_options(self): if '~mpi' in self.spec: @@ -226,7 +230,7 @@ class Petsc(Package): # Activates library support if needed for library in ('metis', 'boost', 'hdf5', 'hypre', 'parmetis', - 'mumps', 'trilinos', 'zlib'): + 'mumps', 'trilinos'): options.append( '--with-{library}={value}'.format( library=library, value=('1' if library in spec else '0')) @@ -251,6 +255,29 @@ class Petsc(Package): options.append( '--with-superlu_dist=0' ) + # SuiteSparse: configuring using '--with-suitesparse-dir=...' has some + # issues, so specify directly the include path and the libraries. + if '+suite-sparse' in spec: + ss_spec = 'suite-sparse:umfpack,klu,cholmod,btf,ccolamd,colamd,' \ + 'camd,amd,suitesparseconfig' + options.extend([ + '--with-suitesparse-include=%s' % spec[ss_spec].prefix.include, + '--with-suitesparse-lib=%s' % spec[ss_spec].libs.ld_flags, + '--with-suitesparse=1' + ]) + else: + options.append('--with-suitesparse=0') + + # zlib: configuring using '--with-zlib-dir=...' has some issues with + # SuiteSparse so specify directly the include path and the libraries. + if 'zlib' in spec: + options.extend([ + '--with-zlib-include=%s' % spec['zlib'].prefix.include, + '--with-zlib-lib=%s' % spec['zlib'].libs.ld_flags, + '--with-zlib=1' + ]) + else: + options.append('--with-zlib=0') python('configure', '--prefix=%s' % prefix, *options) @@ -301,3 +328,10 @@ class Petsc(Package): # Set up PETSC_DIR for everyone using PETSc package spack_env.set('PETSC_DIR', self.prefix) spack_env.unset('PETSC_ARCH') + + @property + def headers(self): + return find_headers('petsc', self.prefix.include, recursive=False) \ + or None # return None to indicate failure + + # For the 'libs' property - use the default handler. diff --git a/var/spack/repos/builtin/packages/petsc/pkg-config-3.7.6-3.8.4.diff b/var/spack/repos/builtin/packages/petsc/pkg-config-3.7.6-3.8.4.diff new file mode 100644 index 0000000000..a0c960dcae --- /dev/null +++ b/var/spack/repos/builtin/packages/petsc/pkg-config-3.7.6-3.8.4.diff @@ -0,0 +1,29 @@ +diff --git c/config/PETSc/Configure.py w/config/PETSc/Configure.py +index ca65368e54..995afd0799 100644 +--- c/config/PETSc/Configure.py ++++ w/config/PETSc/Configure.py +@@ -174,19 +174,19 @@ class Configure(config.base.Configure): + + self.setCompilers.pushLanguage('C') + fd.write('ccompiler='+self.setCompilers.getCompiler()+'\n') +- fd.write('cflags_extra="'+self.setCompilers.getCompilerFlags().strip()+'"\n') +- fd.write('cflags_dep="'+self.compilers.dependenciesGenerationFlag.get('C','')+'"\n') +- fd.write('ldflag_rpath="'+self.setCompilers.CSharedLinkerFlag+'"\n') ++ fd.write('cflags_extra='+self.setCompilers.getCompilerFlags().strip()+'\n') ++ fd.write('cflags_dep='+self.compilers.dependenciesGenerationFlag.get('C','')+'\n') ++ fd.write('ldflag_rpath='+self.setCompilers.CSharedLinkerFlag+'\n') + self.setCompilers.popLanguage() + if hasattr(self.compilers, 'C++'): + self.setCompilers.pushLanguage('C++') + fd.write('cxxcompiler='+self.setCompilers.getCompiler()+'\n') +- fd.write('cxxflags_extra="'+self.setCompilers.getCompilerFlags().strip()+'"\n') ++ fd.write('cxxflags_extra='+self.setCompilers.getCompilerFlags().strip()+'\n') + self.setCompilers.popLanguage() + if hasattr(self.compilers, 'FC'): + self.setCompilers.pushLanguage('FC') + fd.write('fcompiler='+self.setCompilers.getCompiler()+'\n') +- fd.write('fflags_extra="'+self.setCompilers.getCompilerFlags().strip()+'"\n') ++ fd.write('fflags_extra='+self.setCompilers.getCompilerFlags().strip()+'\n') + self.setCompilers.popLanguage() + + fd.write('\n') diff --git a/var/spack/repos/builtin/packages/pumi/package.py b/var/spack/repos/builtin/packages/pumi/package.py index bfbc296a1b..3866501409 100644 --- a/var/spack/repos/builtin/packages/pumi/package.py +++ b/var/spack/repos/builtin/packages/pumi/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -import sys class Pumi(CMakePackage): @@ -39,17 +38,15 @@ class Pumi(CMakePackage): homepage = "https://www.scorec.rpi.edu/pumi" url = "https://github.com/SCOREC/core.git" - version('0.0.1', git='https://github.com/SCOREC/core.git', - commit='0c315e82b3f2478dc18bdd6cfa89f1cddb85cd6a') + version('2.1.0', git='https://github.com/SCOREC/core.git', + commit='840fbf6ec49a63aeaa3945f11ddb224f6055ac9f') version('develop', git='https://github.com/SCOREC/core.git', branch='master') - if sys.platform == 'darwin': - patch('phiotimer.cc.darwin.patch', level=0) # !clock_gettime - variant('zoltan', default=False, description='Enable Zoltan Features') depends_on('mpi') + depends_on('cmake@3:', type='build') depends_on('zoltan', when='+zoltan') def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/pumi/phiotimer.cc.darwin.patch b/var/spack/repos/builtin/packages/pumi/phiotimer.cc.darwin.patch deleted file mode 100644 index 52c6e63fca..0000000000 --- a/var/spack/repos/builtin/packages/pumi/phiotimer.cc.darwin.patch +++ /dev/null @@ -1,21 +0,0 @@ -*** ./phasta/phiotimer.cc 2017-05-03 12:26:25.000000000 -0700 ---- ./phasta/phiotimer.cc.patched 2017-05-03 12:26:11.000000000 -0700 -*************** -*** 56,63 **** - } - #else - void phastaio_time(phastaioTime* t) { -! int err; -! err = clock_gettime(CLOCK_MONOTONIC,t); - PCU_ALWAYS_ASSERT(!err); - } - /*return elapsed time in micro seconds*/ ---- 56,63 ---- - } - #else - void phastaio_time(phastaioTime* t) { -! int err=0; -! /*err = clock_gettime(CLOCK_MONOTONIC,t);*/ - PCU_ALWAYS_ASSERT(!err); - } - /*return elapsed time in micro seconds*/ diff --git a/var/spack/repos/builtin/packages/zoltan/package.py b/var/spack/repos/builtin/packages/zoltan/package.py index 93332eaa90..13c0f4838a 100644 --- a/var/spack/repos/builtin/packages/zoltan/package.py +++ b/var/spack/repos/builtin/packages/zoltan/package.py @@ -33,7 +33,7 @@ class Zoltan(Package): """The Zoltan library is a toolkit of parallel combinatorial algorithms for parallel, unstructured, and/or adaptive scientific applications. Zoltan's largest component is a suite of dynamic - load-balancing and paritioning algorithms that increase + load-balancing and partitioning algorithms that increase applications' parallel performance by reducing idle time. Zoltan also has graph coloring and graph ordering algorithms, which are useful in task schedulers and parallel preconditioners. @@ -75,7 +75,7 @@ class Zoltan(Package): ] config_cflags = [ '-O0' if '+debug' in spec else '-O3', - '-g' if '+debug' in spec else '-g0', + '-g' if '+debug' in spec else '', ] if '+shared' in spec: -- cgit v1.2.3-70-g09d2 From 42c14e0fdbfe6ed477925ad21de77ac15ae9fdcf Mon Sep 17 00:00:00 2001 From: healther Date: Sat, 31 Mar 2018 14:36:56 +0200 Subject: Fix build of boost@:1.58.999 +python (and +mpi) (#7630) * explicitly specify user-config.jam as it isn't found via the environment variable on older boost versions (cf. what debian/rules does) => fixes +mpi build * fix "error: Ambiguous key" error on :1.58.999 boost (cf. https://github.com/boostorg/boost/blob/boost-1.59.0/bootstrap.sh#L357) --- var/spack/repos/builtin/packages/boost/package.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index b34b3e5a7f..fdee5af217 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -194,6 +194,10 @@ class Boost(Package): return 'gcc' def bjam_python_line(self, spec): + # avoid "ambiguous key" error + if spec.satisfies('@:1.58'): + return '' + return 'using python : {0} : {1} : {2} : {3} ;\n'.format( spec['python'].version.up_to(2), spec['python'].command.path, @@ -350,7 +354,7 @@ class Boost(Package): withLibs.append('graph_parallel') # to make Boost find the user-config.jam - env['BOOST_BUILD_PATH'] = './' + env['BOOST_BUILD_PATH'] = self.stage.source_path bootstrap = Executable('./bootstrap.sh') @@ -367,7 +371,12 @@ class Boost(Package): # in 1.59 max jobs became dynamic if jobs > 64 and spec.satisfies('@:1.58'): jobs = 64 - b2_options = ['-j', '%s' % jobs] + + b2_options = [ + '-j', '%s' % jobs, + '--user-config=%s' % os.path.join( + self.stage.source_path, 'user-config.jam') + ] threadingOpts = self.determine_b2_options(spec, b2_options) -- cgit v1.2.3-70-g09d2 From c032b2d9dbe31077f29762f81da0357710c447bd Mon Sep 17 00:00:00 2001 From: David Orman Date: Sat, 31 Mar 2018 10:24:16 -0500 Subject: Features/py breakseq2 (#7642) * added htslib 1.7 and checksum * py-breakseq2: new package!!!! * py-breakseq2: fixed whitespace * py-breakseq2: added additional dependencies * py-breakseq2: fixed build/run depends * py-breakseq2: added additonal dependencies --- .../repos/builtin/packages/py-breakseq2/package.py | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-breakseq2/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-breakseq2/package.py b/var/spack/repos/builtin/packages/py-breakseq2/package.py new file mode 100644 index 0000000000..2c5a5fb693 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-breakseq2/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyBreakseq2(PythonPackage): + """nucleotide-resolution analysis of structural variants""" + + homepage = "http://bioinform.github.io/breakseq2/" + url = "https://github.com/bioinform/breakseq2/archive/2.2.tar.gz" + + version('2.2', '6fd5a103c2781717b0b1d0efcbdc17e7') + + depends_on('py-setuptools', type='build') + depends_on('py-biopython@1.65', type=('build', 'run')) + depends_on('py-cython', type='build') + depends_on('py-pysam@0.7.7', type=('build', 'run')) + depends_on('bwa', type='run') + depends_on('samtools', type='run') -- cgit v1.2.3-70-g09d2 From 5106efe495125659f693cd919e6927a8b9108120 Mon Sep 17 00:00:00 2001 From: David Orman Date: Sat, 31 Mar 2018 10:24:47 -0500 Subject: Features/pindel (#7619) * added htslib 1.7 and checksum * pindel: added new package pindel * pindel: added package pindel * removed py-pybind11 edit * made flake8 happy * fixed additional flake8 errors * added comments about Makefile2 and removed FIXME template section * spelling --- var/spack/repos/builtin/packages/pindel/package.py | 74 ++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 var/spack/repos/builtin/packages/pindel/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pindel/package.py b/var/spack/repos/builtin/packages/pindel/package.py new file mode 100644 index 0000000000..479128707b --- /dev/null +++ b/var/spack/repos/builtin/packages/pindel/package.py @@ -0,0 +1,74 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +from shutil import copytree, copyfile + + +class Pindel(MakefilePackage): + """Pindel can detect breakpoints from next-gen sequence data.""" + + homepage = "http://gmt.genome.wustl.edu/packages/pindel/" + url = "https://github.com/genome/pindel/archive/v0.2.5.tar.gz" + + version('0.2.5b8', 'e6de2ffb38ba1cb89351cdccabe78cde') + version('0.2.5b6', 'dc2febb18c203f0ef1ba02b7b882e94b') + version('0.2.5b5', '73e964bc19de9ab9e6e8a316353e3184') + version('0.2.5b4', 'b4aefd538d9f62578f46440c4bce497e') + version('0.2.5b1', 'a8e53e8919aa29093db13fad5ede93a5') + version('0.2.5a7', '5fb2bac6108547b5d60c38fc66abdfc4') + version('0.2.5', 'd4568cbb83ec25ef9f9f6f058b30053e') + + depends_on('htslib@1.7:') + # + # This Makefile2 stuff is due to the original installer, + # The author wants to run make twice, the first + # time generates a Makefile.local then returns "false" + # User is then suppose to run make again and the + # package will compile. This is an attempt to + # stay as close to the original installer as possible + # + + def edit(self, spec, prefix): + makefile2 = join_path(self.build_directory, 'Makefile2') + copyfile(join_path(self.build_directory, 'Makefile'), makefile2) + myedit = FileFilter(makefile2) + myedit.filter('-include Makefile.local', '#removed include') + myedit.filter('@false', '#removed autofailure') + + def build(self, spec, prefix): + make("Makefile.local", "-f", + "Makefile2", + "HTSLIB=%s" % spec['htslib'].prefix) + make("HTSLIB=%s" % spec['htslib'].prefix) + + def install(self, spec, prefix): + mkdirp(prefix.bin) + install('src/pindel', prefix.bin) + install('src/pindel2vcf', prefix.bin) + install('src/sam2pindel', prefix.bin) + install('src/pindel2vcf4tcga', prefix.bin) + copytree(join_path(self.build_directory, 'demo'), + prefix.doc, + symlinks=True) -- cgit v1.2.3-70-g09d2 From 9d8ab78b32a98105eac3c07743c8113ebc8a286f Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Mon, 2 Apr 2018 16:29:20 -0500 Subject: r-gss: new package (#7655) --- var/spack/repos/builtin/packages/r-gss/package.py | 36 +++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-gss/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-gss/package.py b/var/spack/repos/builtin/packages/r-gss/package.py new file mode 100644 index 0000000000..a6d3dff37f --- /dev/null +++ b/var/spack/repos/builtin/packages/r-gss/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RGss(RPackage): + """A comprehensive package for structural multivariate function + estimation using smoothing splines.""" + + homepage = "https://cran.r-project.org/package=gss" + url = "https://cran.rstudio.com/src/contrib/gss_2.1-7.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/gss" + + version('2.1-7', '4a6bd96339d22b40c932895b64504fb2') -- cgit v1.2.3-70-g09d2 From d9e057842a7a790b1fc1317ac431832056ed9dd1 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Mon, 2 Apr 2018 16:29:59 -0500 Subject: r-flexclust: new package (#7656) --- .../repos/builtin/packages/r-flexclust/package.py | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-flexclust/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-flexclust/package.py b/var/spack/repos/builtin/packages/r-flexclust/package.py new file mode 100644 index 0000000000..9d89e3c1fb --- /dev/null +++ b/var/spack/repos/builtin/packages/r-flexclust/package.py @@ -0,0 +1,44 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RFlexclust(RPackage): + """The main function kcca implements a general framework for k-centroids + cluster analysis supporting arbitrary distance measures and centroid + computation. Further cluster methods include hard competitive learning, + neural gas, and QT clustering. There are numerous visualization methods for + cluster results (neighborhood graphs, convex cluster hulls, barcharts of + centroids, ...), and bootstrap methods for the analysis of cluster + stability.""" + + homepage = "https://cran.r-project.org/package=flexclust" + url = "https://cran.rstudio.com/src/contrib/flexclust_1.3-5.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/flexclust" + + version('1.3-5', '90226a0e3a4f256f392a278e9543f8f4') + + depends_on('r-lattice', type=('build', 'run')) + depends_on('r-modeltools', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From a759fcf33ed6159e8a2fe4cd7efdffbc5c540046 Mon Sep 17 00:00:00 2001 From: Robert Pavel Date: Mon, 2 Apr 2018 18:22:46 -0600 Subject: Current versions of kokkos conflict with hwloc 2.x (#7654) * Current versions of kokkos conflict with hwloc 2.x Current versions of kokkos cannot build with hwloc v2.x due to changes in the associated structs. Requiring v1.11.9 for the time being until it becomes clear what the kokkos model will be * Explicitly commenting fix for posterity Explicitly commented version number of hwloc dependency for kokkos for posterity purposes and to pass code coverage for speedy merging * Generalized Kokkos's Hwloc Dependency Generalized dependency to v1.x of hwloc * Fixed Flake8 issue Fixed comment to conform to flake8 * Fixed ordering for Version Requirements Fixed ordering to indicate <= 1.11.9, not >1 * Generalized kokkos dependency --- var/spack/repos/builtin/packages/kokkos/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/kokkos/package.py b/var/spack/repos/builtin/packages/kokkos/package.py index 0494ab938c..5512b84f4a 100644 --- a/var/spack/repos/builtin/packages/kokkos/package.py +++ b/var/spack/repos/builtin/packages/kokkos/package.py @@ -37,7 +37,8 @@ class Kokkos(Package): variant('qthreads', default=False, description="enable Qthreads backend") variant('cuda', default=False, description="enable Cuda backend") - depends_on('hwloc') + # Specify that v1.x is required as v2.x has API changes + depends_on('hwloc@:1') depends_on('qthreads', when='+qthreads') depends_on('cuda', when='+cuda') -- cgit v1.2.3-70-g09d2 From 32c823725646e868074208ac66d88245714b64c1 Mon Sep 17 00:00:00 2001 From: Howard Pritchard Date: Mon, 2 Apr 2018 18:22:59 -0600 Subject: Open MPI: add 3.0.1 (#7661) Open MPI 3.0.1 bug fix release is out the door! Signed-off-by: Howard Pritchard --- var/spack/repos/builtin/packages/openmpi/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index b019a118a9..05cbd1f5d5 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -82,9 +82,10 @@ class Openmpi(AutotoolsPackage): list_url = "http://www.open-mpi.org/software/ompi/" # Current - version('3.0.0', '757d51719efec08f9f1a7f32d58b3305') # libmpi.so.40.00.0 + version('3.0.1', '565f5060e080b0871a64b295c3d4426a') # libmpi.so.40.00.1 # Still supported + version('3.0.0', '757d51719efec08f9f1a7f32d58b3305') # libmpi.so.40.00.0 version('2.1.3', '46079b6f898a412240a0bf523e6cd24b') # libmpi.so.20.10.2 version('2.1.2', 'ff2e55cc529802e7b0738cf87acd3ee4') # libmpi.so.20.10.2 version('2.1.1', 'ae542f5cf013943ffbbeb93df883731b') # libmpi.so.20.10.1 -- cgit v1.2.3-70-g09d2 From 17ace14751f5f34f47957037b192dd46b307ff86 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Mon, 2 Apr 2018 21:29:19 -0500 Subject: lsof: create new package (#7660) --- var/spack/repos/builtin/packages/lsof/package.py | 47 ++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 var/spack/repos/builtin/packages/lsof/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lsof/package.py b/var/spack/repos/builtin/packages/lsof/package.py new file mode 100644 index 0000000000..8d63cc1b97 --- /dev/null +++ b/var/spack/repos/builtin/packages/lsof/package.py @@ -0,0 +1,47 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Lsof(Package): + """Lsof displays information about files open to Unix processes.""" + + homepage = "https://people.freebsd.org/~abe/" + url = "https://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.89.tar.gz" + + version('4.89', '8afbaff3ee308edc130bdc5df0801c8f') + + def install(self, spec, prefix): + tar = which('tar') + tar('xf', 'lsof_{0}_src.tar'.format(self.version)) + + with working_dir('lsof_{0}_src'.format(self.version)): + configure = Executable('./Configure') + configure('-n', 'linux') + + make() + + mkdir(prefix.bin) + install('lsof', prefix.bin) -- cgit v1.2.3-70-g09d2 From 338fa8d7d6a3cabcb167063db44f9a00edb7088d Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Tue, 3 Apr 2018 17:15:09 +0200 Subject: fix dealii dependencies for Clang 9.1.0 C++17 (#7644) * fix boost and muparser for Clang 9.1.0 with C++17 * muparser: add C++11 flags * dealii: temporary disable python by default * dealii: make CMake find right python --- .../builtin/packages/boost/array_binary_tree.patch | 12 +++++ var/spack/repos/builtin/packages/boost/package.py | 7 ++- var/spack/repos/builtin/packages/dealii/package.py | 15 +++++-- .../repos/builtin/packages/muparser/auto_ptr.patch | 52 ++++++++++++++++++++++ .../repos/builtin/packages/muparser/package.py | 6 +++ 5 files changed, 88 insertions(+), 4 deletions(-) create mode 100644 var/spack/repos/builtin/packages/boost/array_binary_tree.patch create mode 100644 var/spack/repos/builtin/packages/muparser/auto_ptr.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/boost/array_binary_tree.patch b/var/spack/repos/builtin/packages/boost/array_binary_tree.patch new file mode 100644 index 0000000000..51e1950528 --- /dev/null +++ b/var/spack/repos/builtin/packages/boost/array_binary_tree.patch @@ -0,0 +1,12 @@ +diff --git a/boost/graph/detail/array_binary_tree.hpp b/boost/graph/detail/array_binary_tree.hpp +index e59da9e..fd403d1 100644 +--- a/boost/graph/detail/array_binary_tree.hpp ++++ b/boost/graph/detail/array_binary_tree.hpp +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + + namespace boost { + diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index fdee5af217..09e71023b1 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -46,8 +46,10 @@ class Boost(Package): branch='develop', submodules=True) + version('1.67.0.b1', '3423a4a3ec5297051fd27091864630e2dce4c159', + url='https://dl.bintray.com/boostorg/beta/1.67.0.beta.1/source/boost_1_67_0_b1.tar.gz') version('1.66.0', 'b6b284acde2ad7ed49b44e856955d7b1ea4e9459', - url='https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2') + url='https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2', preferred=True) version('1.65.1', '41d7542ce40e171f3f7982aff008ff0d', url='https://dl.bintray.com/boostorg/release/1.65.1/source/boost_1_65_1.tar.bz2') version('1.65.0', '5512d3809801b0a1b9dd58447b70915d', @@ -151,6 +153,9 @@ class Boost(Package): conflicts('+taggedlayout', when='+versionedlayout') + # temporary fix https://svn.boost.org/trac10/ticket/13505 + patch('array_binary_tree.patch', when='@1.67.0.b1') + # Patch fix from https://svn.boost.org/trac/boost/ticket/11856 patch('boost_11856.patch', when='@1.60.0%gcc@4.4.7') diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index b45bb09041..77cd58f9db 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -77,7 +77,7 @@ class Dealii(CMakePackage, CudaPackage): description='Compile with Slepc (only with Petsc and MPI)') variant('trilinos', default=True, description='Compile with Trilinos (only with MPI)') - variant('python', default=True, + variant('python', default=False, description='Compile with Python bindings') variant('int64', default=False, description='Compile with 64 bit indices support') @@ -95,12 +95,12 @@ class Dealii(CMakePackage, CudaPackage): # https://github.com/dealii/dealii/issues/5262 # we take the patch from https://github.com/boostorg/serialization/pull/79 # more precisely its variation https://github.com/dealii/dealii/pull/5572#issuecomment-349742019 - depends_on('boost@1.59.0:1.63,1.65.1+thread+system+serialization+iostreams', + depends_on('boost@1.59.0:1.63,1.65.1,1.67.0:+thread+system+serialization+iostreams', patches=patch('boost_1.65.1_singleton.patch', level=1, when='@1.65.1'), when='~python') - depends_on('boost@1.59.0:1.63,1.65.1+thread+system+serialization+iostreams+python', + depends_on('boost@1.59.0:1.63,1.65.1,1.67.0:+thread+system+serialization+iostreams+python', patches=patch('boost_1.65.1_singleton.patch', level=1, when='@1.65.1'), @@ -223,6 +223,15 @@ class Dealii(CMakePackage, CudaPackage): '-DDEAL_II_COMPONENT_PYTHON_BINDINGS=%s' % ('ON' if '+python' in spec else 'OFF') ]) + if '+python' in spec: + python_exe = spec['python'].command.path + python_library = spec['python'].libs[0] + python_include = spec['python'].headers.directories[0] + options.extend([ + '-DPYTHON_EXECUTABLE=%s' % python_exe, + '-DPYTHON_INCLUDE_DIR=%s' % python_include, + '-DPYTHON_LIBRARY=%s' % python_library + ]) # Set directory structure: if spec.satisfies('@:8.2.1'): diff --git a/var/spack/repos/builtin/packages/muparser/auto_ptr.patch b/var/spack/repos/builtin/packages/muparser/auto_ptr.patch new file mode 100644 index 0000000000..7e39ea603f --- /dev/null +++ b/var/spack/repos/builtin/packages/muparser/auto_ptr.patch @@ -0,0 +1,52 @@ +diff --git a/include/muParserBase.h b/include/muParserBase.h +index beb15bb..685f59f 100644 +--- a/include/muParserBase.h ++++ b/include/muParserBase.h +@@ -288,7 +288,7 @@ private: + mutable stringbuf_type m_vStringBuf; ///< String buffer, used for storing string function arguments + stringbuf_type m_vStringVarBuf; + +- std::auto_ptr m_pTokenReader; ///< Managed pointer to the token reader object. ++ std::unique_ptr m_pTokenReader; ///< Managed pointer to the token reader object. + + funmap_type m_FunDef; ///< Map of function names and pointers. + funmap_type m_PostOprtDef; ///< Postfix operator callbacks +diff --git a/include/muParserToken.h b/include/muParserToken.h +index fc91d78..0cca469 100644 +--- a/include/muParserToken.h ++++ b/include/muParserToken.h +@@ -69,7 +69,7 @@ namespace mu + TString m_strTok; ///< Token string + TString m_strVal; ///< Value for string variables + value_type m_fVal; ///< the value +- std::auto_ptr m_pCallback; ++ std::unique_ptr m_pCallback; + + public: + +diff --git a/src/muParserTest.cpp b/src/muParserTest.cpp +index 4006b27..8feaa2c 100644 +--- a/src/muParserTest.cpp ++++ b/src/muParserTest.cpp +@@ -1258,7 +1258,7 @@ namespace mu + + try + { +- std::auto_ptr p1; ++ std::unique_ptr p1; + Parser p2, p3; // three parser objects + // they will be used for testing copy and assignment operators + // p1 is a pointer since i'm going to delete it in order to test if +diff --git a/src/muParserTokenReader.cpp b/src/muParserTokenReader.cpp +index 8da1e40..49cee68 100644 +--- a/src/muParserTokenReader.cpp ++++ b/src/muParserTokenReader.cpp +@@ -147,7 +147,7 @@ namespace mu + */ + ParserTokenReader* ParserTokenReader::Clone(ParserBase *a_pParent) const + { +- std::auto_ptr ptr(new ParserTokenReader(*this)); ++ std::unique_ptr ptr(new ParserTokenReader(*this)); + ptr->SetParent(a_pParent); + return ptr.release(); + } diff --git a/var/spack/repos/builtin/packages/muparser/package.py b/var/spack/repos/builtin/packages/muparser/package.py index e2e6c22f72..964f47b0cf 100644 --- a/var/spack/repos/builtin/packages/muparser/package.py +++ b/var/spack/repos/builtin/packages/muparser/package.py @@ -32,9 +32,15 @@ class Muparser(Package): version('2.2.5', '02dae671aa5ad955fdcbcd3fee313fb7') + # Replace std::auto_ptr by std::unique_ptr + # https://github.com/beltoforion/muparser/pull/46 + patch('auto_ptr.patch', + when='@2.2.5') + def install(self, spec, prefix): options = ['--disable-debug', '--disable-dependency-tracking', + 'CXXFLAGS=-std=c++11', '--prefix=%s' % prefix] configure(*options) -- cgit v1.2.3-70-g09d2 From b1a5764956e0f569b4955dbf43e5656873c903f6 Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Tue, 3 Apr 2018 17:46:25 -0500 Subject: soapdenovo-trans: Create new package. (#7649) * soapdenovo-trans: Create new package. * change header * soapdenovo-trans: change package type to makefile. * soapdenovo-trans: fix flake8 error. --- .../builtin/packages/soapdenovo-trans/package.py | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 var/spack/repos/builtin/packages/soapdenovo-trans/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/soapdenovo-trans/package.py b/var/spack/repos/builtin/packages/soapdenovo-trans/package.py new file mode 100644 index 0000000000..7b2ffd4185 --- /dev/null +++ b/var/spack/repos/builtin/packages/soapdenovo-trans/package.py @@ -0,0 +1,52 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class SoapdenovoTrans(MakefilePackage): + """SOAPdenovo-Trans is a de novo transcriptome assembler basing on the + SOAPdenovo framework, adapt to alternative splicing and different + expression level among transcripts.""" + + homepage = "http://soap.genomics.org.cn/SOAPdenovo-Trans.html" + url = "https://github.com/aquaskyline/SOAPdenovo-Trans/archive/1.0.4.tar.gz" + + version('1.0.4', 'a3b00b0f743b96141c4d5f1b49f2918c') + + build_directory = 'src' + + def edit(self, spec, prefix): + with working_dir(self.build_directory): + makefile = FileFilter('Makefile') + makefile.filter('CFLAGS= -O3 -fomit-frame-pointer -static', + 'CFLAGS= -O3 -fomit-frame-pointer') + + def build(self, spec, prefix): + with working_dir(self.build_directory): + make() + make('127mer=1', parallel=False) + + def install(self, spec, prefix): + install_tree('.', prefix.bin) -- cgit v1.2.3-70-g09d2 From 79251dde406b67ce696759a37cee6b46a410962a Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Wed, 4 Apr 2018 09:41:37 +0200 Subject: mvapich2: added version 2.3rc1 + variant to use alloca if available (#7595) * mvapich2: added version 2.3rc1 + variant to use alloca if available * mvapich2: removed version 1.9 + cleaned recipe --- .../mvapich2/ad_lustre_rwcontig_open_source.patch | 11 ------ .../repos/builtin/packages/mvapich2/package.py | 40 +++++++++------------- 2 files changed, 16 insertions(+), 35 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/mvapich2/ad_lustre_rwcontig_open_source.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mvapich2/ad_lustre_rwcontig_open_source.patch b/var/spack/repos/builtin/packages/mvapich2/ad_lustre_rwcontig_open_source.patch deleted file mode 100644 index ff85845cf8..0000000000 --- a/var/spack/repos/builtin/packages/mvapich2/ad_lustre_rwcontig_open_source.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/mpi/romio/adio/ad_lustre/ad_lustre_rwcontig.c 2013-12-10 12:05:44.806417000 -0800 -+++ b/src/mpi/romio/adio/ad_lustre/ad_lustre_rwcontig.c 2013-12-10 11:53:03.295622000 -0800 -@@ -8,7 +8,7 @@ - * Copyright (C) 2008 Sun Microsystems, Lustre group - */ - --#define _XOPEN_SOURCE 600 -+//#define _XOPEN_SOURCE 600 - #include - #include - #include "ad_lustre.h" diff --git a/var/spack/repos/builtin/packages/mvapich2/package.py b/var/spack/repos/builtin/packages/mvapich2/package.py index a141277ea4..e9864b90fc 100644 --- a/var/spack/repos/builtin/packages/mvapich2/package.py +++ b/var/spack/repos/builtin/packages/mvapich2/package.py @@ -41,20 +41,16 @@ class Mvapich2(AutotoolsPackage): url = "http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-2.2.tar.gz" list_url = "http://mvapich.cse.ohio-state.edu/downloads/" - # Newer alpha release + version('2.3rc1', '386d79ae36b2136d203826465ad8b6cc') version('2.3a', '87c3fbf8a755b53806fa9ecb21453445') # Prefer the latest stable release version('2.2', '939b65ebe5b89a5bc822cdab0f31f96e', preferred=True) version('2.1', '0095ceecb19bbb7fb262131cb9c2cdd6') version('2.0', '9fbb68a4111a8b6338e476dc657388b4') - version('1.9', '5dc58ed08fd3142c260b70fe297e127c') - - patch('ad_lustre_rwcontig_open_source.patch', when='@1.9') provides('mpi') - provides('mpi@:2.2', when='@1.9') # MVAPICH2-1.9 supports MPI 2.2 - provides('mpi@:3.0', when='@2.0:') # MVAPICH2-2.0 supports MPI 3.0 + provides('mpi@:3.0') variant('debug', default=False, description='Enable debug info and error messages at run-time') @@ -103,6 +99,12 @@ class Mvapich2(AutotoolsPackage): ) ) + variant( + 'alloca', + default=False, + description='Use alloca to allocate temporary memory if available' + ) + depends_on('bison', type='build') depends_on('libpciaccess', when=(sys.platform != 'darwin')) depends_on('cuda', when='+cuda') @@ -111,13 +113,6 @@ class Mvapich2(AutotoolsPackage): 'mpicc', 'mpicxx', 'mpif77', 'mpif90', 'mpifort', relative_root='bin' ) - def url_for_version(self, version): - base_url = "http://mvapich.cse.ohio-state.edu/download" - if version < Version('2.0'): - return "%s/mvapich2/mv2/mvapich2-%s.tar.gz" % (base_url, version) - else: - return "%s/mvapich/mv2/mvapich2-%s.tar.gz" % (base_url, version) - @property def process_manager_options(self): spec = self.spec @@ -130,16 +125,10 @@ class Mvapich2(AutotoolsPackage): # See: http://slurm.schedmd.com/mpi_guide.html#mvapich2 if 'process_managers=slurm' in spec: - if self.version > Version('2.0'): - opts = [ - '--with-pmi=pmi2', - '--with-pm=slurm' - ] - else: - opts = [ - '--with-pmi=slurm', - '--with-pm=no' - ] + opts = [ + '--with-pmi=pmi2', + '--with-pm=slurm' + ] return opts @@ -165,7 +154,7 @@ class Mvapich2(AutotoolsPackage): def setup_environment(self, spack_env, run_env): spec = self.spec - if 'process_managers=slurm' in spec and spec.satisfies('@2.0:'): + if 'process_managers=slurm' in spec: run_env.set('SLURM_MPI_TYPE', 'pmi2') def setup_dependent_environment(self, spack_env, run_env, dependent_spec): @@ -206,12 +195,15 @@ class Mvapich2(AutotoolsPackage): '--enable-shared', '--enable-romio', '-disable-silent-rules', + '--disable-new-dtags', '--enable-fortran=all', "--enable-threads={0}".format(spec.variants['threads'].value), "--with-ch3-rank-bits={0}".format( spec.variants['ch3_rank_bits'].value), ] + args.extend(self.enable_or_disable('alloca')) + if '+debug' in self.spec: args.extend([ '--disable-fast', -- cgit v1.2.3-70-g09d2 From 3f14212dede2444fdbb85065d9b5f55f73b210e4 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Wed, 4 Apr 2018 16:35:03 +0200 Subject: octopus: add 7.3 (#7666) --- var/spack/repos/builtin/packages/octopus/package.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/octopus/package.py b/var/spack/repos/builtin/packages/octopus/package.py index a3d4a30ffa..bca0900399 100644 --- a/var/spack/repos/builtin/packages/octopus/package.py +++ b/var/spack/repos/builtin/packages/octopus/package.py @@ -32,12 +32,13 @@ class Octopus(Package): homepage = "http://www.tddft.org/programs/octopus/" url = "http://www.tddft.org/programs/octopus/down.php?file=6.0/octopus-6.0.tar.gz" + version('7.3', '87e51fa4a3a999706ea4ea5e9136996f') version('6.0', '5d1168c2a8d7fd9cb9492eaebaa7182e') version('5.0.1', '2b6392ab67b843f9d4ca7413fc07e822') variant('scalapack', default=False, description='Compile with Scalapack') - variant('metis', default=True, + variant('metis', default=False, description='Compile with METIS') variant('parmetis', default=False, description='Compile with ParMETIS') @@ -47,11 +48,11 @@ class Octopus(Package): description='Compile with ARPACK') depends_on('blas') - depends_on('gsl') + depends_on('gsl@1.9:') depends_on('lapack') depends_on('libxc') depends_on('mpi') - depends_on('fftw+mpi') + depends_on('fftw@3:+mpi+openmp') depends_on('metis@5:', when='+metis') depends_on('parmetis', when='+parmetis') depends_on('scalapack', when='+scalapack') @@ -59,7 +60,7 @@ class Octopus(Package): depends_on('arpack-ng', when='+arpack') # optional dependencies: - # TODO: parmetis, etsf-io, sparskit, + # TODO: etsf-io, sparskit, # feast, libfm, pfft, isf, pnfft def install(self, spec, prefix): @@ -75,7 +76,7 @@ class Octopus(Package): 'CC=%s' % spec['mpi'].mpicc, 'FC=%s' % spec['mpi'].mpifc, '--enable-mpi', - '--with-fft-lib=-L%s -lfftw3' % spec['fftw'].prefix.lib, + '--with-fftw-prefix==%s' % spec['fftw'].prefix, ]) if '+metis' in spec: args.extend([ -- cgit v1.2.3-70-g09d2 From ceab7e5f54bba4f23b80ec44d9bf80b682d320ab Mon Sep 17 00:00:00 2001 From: peetsv <32349688+peetsv@users.noreply.github.com> Date: Wed, 4 Apr 2018 16:13:50 -0700 Subject: rsync: adding version 3.1.3 (#7669) --- var/spack/repos/builtin/packages/rsync/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/rsync/package.py b/var/spack/repos/builtin/packages/rsync/package.py index 4c7420e1b9..660d1bcb76 100644 --- a/var/spack/repos/builtin/packages/rsync/package.py +++ b/var/spack/repos/builtin/packages/rsync/package.py @@ -30,5 +30,6 @@ class Rsync(AutotoolsPackage): homepage = "https://rsync.samba.org" url = "https://download.samba.org/pub/rsync/src/rsync-3.1.2.tar.gz" + version('3.1.3', '1581a588fde9d89f6bc6201e8129afaf') version('3.1.2', '0f758d7e000c0f7f7d3792610fad70cb') version('3.1.1', '43bd6676f0b404326eee2d63be3cdcfe') -- cgit v1.2.3-70-g09d2 From a63450bc4537f8db04530d0dacdc98babbdd38f2 Mon Sep 17 00:00:00 2001 From: healther Date: Thu, 5 Apr 2018 16:18:07 +0200 Subject: add package py-discover (#7671) Change-Id: I67b9e4eb4dfd3a962b7fe8840f5eb012fcd009cc --- .../repos/builtin/packages/py-discover/package.py | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-discover/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-discover/package.py b/var/spack/repos/builtin/packages/py-discover/package.py new file mode 100644 index 0000000000..ae26c934b3 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-discover/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyDiscover(PythonPackage): + """Test discovery for unittest.""" + + homepage = "https://pypi.python.org/pypi/discover" + url = "https://pypi.io/packages/source/d/discover/discover-0.4.0.tar.gz" + + version('0.4.0', '30bb643af4f5ea47fff572b5c346207d') -- cgit v1.2.3-70-g09d2 From bde69177becaff1ea9fea19014261ffb919e716a Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 5 Apr 2018 16:39:05 -0500 Subject: Don't prepend Tcl/Python to PATH if in system directory (#7677) --- var/spack/repos/builtin/packages/python/package.py | 6 +++++- var/spack/repos/builtin/packages/tcl/package.py | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 3e0f038768..8dc46f113d 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -34,6 +34,7 @@ from llnl.util.filesystem import force_remove import spack from spack import * +from spack.util.environment import is_system_path from spack.util.prefix import Prefix import spack.util.spack_json as sjson @@ -543,7 +544,10 @@ class Python(AutotoolsPackage): # where a system provided python is run against the standard libraries # of a Spack built python. See issue #7128 spack_env.set('PYTHONHOME', self.home) - spack_env.prepend_path('PATH', os.path.dirname(self.command.path)) + + path = os.path.dirname(self.command.path) + if not is_system_path(path): + spack_env.prepend_path('PATH', path) python_paths = [] for d in dependent_spec.traverse( diff --git a/var/spack/repos/builtin/packages/tcl/package.py b/var/spack/repos/builtin/packages/tcl/package.py index b1ddc5a141..15891af2e1 100644 --- a/var/spack/repos/builtin/packages/tcl/package.py +++ b/var/spack/repos/builtin/packages/tcl/package.py @@ -24,6 +24,7 @@ ############################################################################## import os +from spack.util.environment import is_system_path from spack import * @@ -102,7 +103,9 @@ class Tcl(AutotoolsPackage): # where a system provided tcl is run against the standard libraries # of a Spack built tcl. See issue #7128 that relates to python but # it boils down to the same situation we have here. - spack_env.prepend_path('PATH', os.path.dirname(self.command.path)) + path = os.path.dirname(self.command.path) + if not is_system_path(path): + spack_env.prepend_path('PATH', path) tcl_paths = [join_path(self.prefix, self.tcl_builtin_lib_dir)] -- cgit v1.2.3-70-g09d2 From 27b1069e0c392dbd709700e30cd51f95ae9ed84f Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Thu, 5 Apr 2018 17:23:25 -0500 Subject: readfq: Create new package. (#7673) * readfq: Create new package. * fix flake8 error --- var/spack/repos/builtin/packages/readfq/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/readfq/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/readfq/package.py b/var/spack/repos/builtin/packages/readfq/package.py new file mode 100644 index 0000000000..0550f0cc40 --- /dev/null +++ b/var/spack/repos/builtin/packages/readfq/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Readfq(Package): + """Readfq is a collection of routines for parsing the FASTA/FASTQ format. + It seamlessly parses both FASTA and multi-line FASTQ with a simple + interface.""" + + homepage = "https://github.com/lh3/readfq" + + version('2013.04.10', git='https://github.com/lh3/readfq.git', commit='4fb766095d8f459e0f8025be70f9173673905d12') + + def install(self, spec, prefix): + install_tree('.', prefix.bin) -- cgit v1.2.3-70-g09d2 From fa3edd4af094bd6bf6f5a56668302eef19284bb3 Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Fri, 6 Apr 2018 15:40:58 -0500 Subject: hapdip: Create new package and its dependency k8. (#7685) * k8: Create new package. * hapdip: Create new package. * Change description. --- var/spack/repos/builtin/packages/hapdip/package.py | 39 ++++++++++++++++++ var/spack/repos/builtin/packages/k8/package.py | 46 ++++++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100644 var/spack/repos/builtin/packages/hapdip/package.py create mode 100644 var/spack/repos/builtin/packages/k8/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hapdip/package.py b/var/spack/repos/builtin/packages/hapdip/package.py new file mode 100644 index 0000000000..066282c461 --- /dev/null +++ b/var/spack/repos/builtin/packages/hapdip/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Hapdip(Package): + """The CHM1-NA12878 benchmark for single-sample SNP/INDEL calling from + WGS Illumina data.""" + + homepage = "https://github.com/lh3/hapdip" + + version('2018.02.20', git='https://github.com/lh3/hapdip.git', commit='7c12f684471999a543fdacce972c9c86349758a3') + + depends_on('k8', type='run') + + def install(self, spec, prefix): + install_tree('.', prefix.bin) diff --git a/var/spack/repos/builtin/packages/k8/package.py b/var/spack/repos/builtin/packages/k8/package.py new file mode 100644 index 0000000000..801323229d --- /dev/null +++ b/var/spack/repos/builtin/packages/k8/package.py @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +import sys +import os +from spack import * + + +class K8(Package): + """K8 is a Javascript shell based on Google's V8 Javascript engine.""" + + homepage = "https://github.com/attractivechaos/k8" + url = "https://github.com/attractivechaos/k8/releases/download/v0.2.4/k8-0.2.4.tar.bz2" + + version('0.2.4', 'edc5579ff18842a2a59aa92ce8bab8b4') + + depends_on('zlib', type='run') + + def install(self, spec, prefix): + if (sys.platform == 'darwin'): + os.rename('k8-Darwin', 'k8') + + if (sys.platform != 'darwin'): + os.rename('k8-Linux', 'k8') + install_tree('.', prefix.bin) -- cgit v1.2.3-70-g09d2 From c328c667c0aae1c5f3171ce7b0a3779a2e27c60f Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Fri, 6 Apr 2018 22:44:39 +0200 Subject: Package 'serf': link to the spack provided zlib installation. (#7667) --- var/spack/repos/builtin/packages/serf/package.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/serf/package.py b/var/spack/repos/builtin/packages/serf/package.py index 2b44a021f8..a0a10fedf1 100644 --- a/var/spack/repos/builtin/packages/serf/package.py +++ b/var/spack/repos/builtin/packages/serf/package.py @@ -54,6 +54,19 @@ class Serf(SConsPackage): 'ZLIB={0}'.format(spec['zlib'].prefix), ] + # ZLIB variable is ignored on non-Windows platforms before and + # including the version 1.3.9: + # https://www.mail-archive.com/dev@serf.apache.org/msg01359.html + # The issue is fixed in the trunk. Hopefully, the next stable version + # will work properly. + if '@:1.3.9' in self.spec: + zlib_spec = self.spec['zlib'] + link_flags = [zlib_spec.libs.search_flags] + link_flags.extend([self.compiler.cc_rpath_arg + d + for d in zlib_spec.libs.directories]) + args.append('LINKFLAGS=' + ' '.join(link_flags)) + args.append('CPPFLAGS=' + zlib_spec.headers.cpp_flags) + if '+debug' in spec: args.append('DEBUG=yes') else: -- cgit v1.2.3-70-g09d2 From 58a57bf391fe376d529b8afda8b5381c09638c56 Mon Sep 17 00:00:00 2001 From: Eric Müller Date: Fri, 6 Apr 2018 22:46:47 +0200 Subject: Fix build of xerces-c (#7611) The build requires libiconv (but it doesn't find it when not providing LDFLAGS). --- var/spack/repos/builtin/packages/xerces-c/package.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/xerces-c/package.py b/var/spack/repos/builtin/packages/xerces-c/package.py index bbdbd714d4..5aae3bb92f 100644 --- a/var/spack/repos/builtin/packages/xerces-c/package.py +++ b/var/spack/repos/builtin/packages/xerces-c/package.py @@ -37,5 +37,10 @@ class XercesC(AutotoolsPackage): version('3.1.4', 'd04ae9d8b2dee2157c6db95fa908abfd') + depends_on('libiconv') + + def setup_environment(self, spack_env, run_env): + spack_env.append_flags('LDFLAGS', self.spec['libiconv'].libs.ld_flags) + def configure_args(self): return ['--disable-network'] -- cgit v1.2.3-70-g09d2 From e1856f31293a23d34e0a779ca608b2ae6d9c73a9 Mon Sep 17 00:00:00 2001 From: carns Date: Fri, 6 Apr 2018 17:49:07 -0400 Subject: Darshan 3.1.6 (#7686) * update darshan-util to 3.1.6, add bzip2 option * add darshan-runtime 3.1.6 --- var/spack/repos/builtin/packages/darshan-runtime/package.py | 1 + var/spack/repos/builtin/packages/darshan-util/package.py | 3 +++ 2 files changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/darshan-runtime/package.py b/var/spack/repos/builtin/packages/darshan-runtime/package.py index d87ce88503..24e96e2817 100644 --- a/var/spack/repos/builtin/packages/darshan-runtime/package.py +++ b/var/spack/repos/builtin/packages/darshan-runtime/package.py @@ -36,6 +36,7 @@ class DarshanRuntime(Package): homepage = "http://www.mcs.anl.gov/research/projects/darshan/" url = "http://ftp.mcs.anl.gov/pub/darshan/releases/darshan-3.1.0.tar.gz" + version('3.1.6', 'ce5b8f1e69d602edd4753b57258b57c1') version('3.1.0', '439d717323e6265b2612ed127886ae52') version('3.0.0', '732577fe94238936268d74d7d74ebd08') diff --git a/var/spack/repos/builtin/packages/darshan-util/package.py b/var/spack/repos/builtin/packages/darshan-util/package.py index c68dd9b136..261aca8f6b 100644 --- a/var/spack/repos/builtin/packages/darshan-util/package.py +++ b/var/spack/repos/builtin/packages/darshan-util/package.py @@ -34,10 +34,13 @@ class DarshanUtil(Package): homepage = "http://www.mcs.anl.gov/research/projects/darshan/" url = "http://ftp.mcs.anl.gov/pub/darshan/releases/darshan-3.1.0.tar.gz" + version('3.1.6', 'ce5b8f1e69d602edd4753b57258b57c1') version('3.1.0', '439d717323e6265b2612ed127886ae52') version('3.0.0', '732577fe94238936268d74d7d74ebd08') + variant('bzip2', default=False, description="Enable bzip2 compression") depends_on('zlib') + depends_on('bzip2', when="+bzip2", type=("build", "link", "run")) def install(self, spec, prefix): -- cgit v1.2.3-70-g09d2 From 3bf863bb068536ff82a20201a83a6f7f56c7fd03 Mon Sep 17 00:00:00 2001 From: peetsv <32349688+peetsv@users.noreply.github.com> Date: Fri, 6 Apr 2018 18:07:35 -0700 Subject: py-pyfaidx: adding new package (#7684) * py-pyfaidx: adding new package * updating the url --- .../repos/builtin/packages/py-pyfaidx/package.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-pyfaidx/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pyfaidx/package.py b/var/spack/repos/builtin/packages/py-pyfaidx/package.py new file mode 100644 index 0000000000..deee8cb745 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pyfaidx/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPyfaidx(PythonPackage): + """pyfaidx: efficient pythonic random access to fasta subsequences""" + + homepage = "https://pypi.python.org/pypi/pyfaidx" + url = "https://pypi.io/packages/source/p/pyfaidx/pyfaidx-0.5.3.1.tar.gz" + + version('0.5.3.1', '128074c48fdef23d41e47af73b45f040') + + depends_on('py-setuptools@0.7:', type='build') + depends_on('py-six', type='build') -- cgit v1.2.3-70-g09d2 From 5c98b8bde5e7e584e94f97c90605b9e627f07772 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Sat, 7 Apr 2018 10:36:10 +0200 Subject: Catch2: make install (#7668) Add a proper install variant for Catch(2). This allows to use Catch2 downstram with `pkg-config` and CMake's `find_package` commands via standard environment hints. --- var/spack/repos/builtin/packages/catch/package.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/catch/package.py b/var/spack/repos/builtin/packages/catch/package.py index 8ee1179261..fdb8c09bd9 100644 --- a/var/spack/repos/builtin/packages/catch/package.py +++ b/var/spack/repos/builtin/packages/catch/package.py @@ -25,12 +25,20 @@ from spack import * -class Catch(Package): +class Catch(CMakePackage): """Catch tests""" homepage = "https://github.com/catchorg/Catch2" url = "https://github.com/catchorg/Catch2/archive/v1.3.0.tar.gz" + variant('single_header', default=True, + description='Install a single header only.') + + # - "make install" was added in 1.7.0 + # - pkg-config package was added in 2.0.1 + # - CMake config package was added in 2.1.2 + conflicts('~single_header', when='@:1.6.1') + version('2.2.1', '54e56803c84890636bd7fe6c3856b104') version('2.1.0', '70b44068976d46d48f3cd8796f675691d3bc726b') version('2.0.1', '5c191a031edebd0525640ed2f38cbf64bacb1803') @@ -60,6 +68,15 @@ class Catch(Package): version('1.3.5', '2cfd78bce21368355c7d3880df88716084df2186') version('1.3.0', '24cd4e6518273fea20becd47a2e1edbee7ec209a') + @when('+single_header') + def cmake(self, spec, prefix): + pass + + @when('+single_header') + def build(self, spec, prefix): + pass + + @when('+single_header') def install(self, spec, prefix): mkdirp(prefix.include) install(join_path('single_include', 'catch.hpp'), prefix.include) -- cgit v1.2.3-70-g09d2 From 2b0252ccb3e827a9cde9d15c778b17b34d2e86c7 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Sat, 7 Apr 2018 18:00:00 +0200 Subject: Add Package: nlohmann_json (#7690) Adds a spack package for the JSON C++ library https://github.com/nlohmann/json --- var/spack/repos/builtin/packages/adios2/package.py | 2 +- .../builtin/packages/nlohmann-json/package.py | 60 ++++++++++++++++++++++ 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 var/spack/repos/builtin/packages/nlohmann-json/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/adios2/package.py b/var/spack/repos/builtin/packages/adios2/package.py index a25ba9769e..2ba986af86 100644 --- a/var/spack/repos/builtin/packages/adios2/package.py +++ b/var/spack/repos/builtin/packages/adios2/package.py @@ -77,7 +77,7 @@ class Adios2(CMakePackage): # depends_on('googletest') # depends_on('pugixml') # depends_on('kwsys') - # depends_on('nlohmannjson') + # depends_on('nlohmann-json') # depends_on('pybind11@2.1.1:', when='+python') depends_on('mpi', when='+mpi') diff --git a/var/spack/repos/builtin/packages/nlohmann-json/package.py b/var/spack/repos/builtin/packages/nlohmann-json/package.py new file mode 100644 index 0000000000..75102675f7 --- /dev/null +++ b/var/spack/repos/builtin/packages/nlohmann-json/package.py @@ -0,0 +1,60 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class NlohmannJson(CMakePackage): + """JSON for Modern C++""" + + homepage = "https://nlohmann.github.io/json/" + url = "https://github.com/nlohmann/json/archive/v3.1.2.tar.gz" + maintainers = ['ax3l'] + + version('3.1.2', '557651b017c36ad596ba3b577ba1b539') + + variant('single_header', default=True, + description='Use amalgamated single-header') + variant('test', default=True, + description='Build the tests') + + depends_on('cmake@3.8:', type='build') + + # requires mature C++11 implementations + conflicts('%gcc@:4.8') + conflicts('%gcc@:3.3') + conflicts('%intel@:16') + conflicts('%pgi@:14') + + def cmake_args(self): + spec = self.spec + + args = [ + '-DJSON_MultipleHeaders:BOOL={0}'.format( + 'ON' if '~single_header' in spec else 'OFF'), + '-DBUILD_TESTING:BOOL={0}'.format( + 'ON' if '+test' in spec else 'OFF') + ] + + return args -- cgit v1.2.3-70-g09d2 From c1e3e5de5c7949071a3df4d0cad692fb982452cf Mon Sep 17 00:00:00 2001 From: Sinan Date: Sun, 8 Apr 2018 06:21:02 -0700 Subject: new package "DSRC" (bioinformatics) (#7680) * new package "DSRC" (bioinformatics) * remove uncommented line * get rid of unnecessary import * convert to MakefilePackage class * get rid of make() in install phase, remove spaces * make flake8 happy! --- var/spack/repos/builtin/packages/dsrc/package.py | 45 ++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 var/spack/repos/builtin/packages/dsrc/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dsrc/package.py b/var/spack/repos/builtin/packages/dsrc/package.py new file mode 100644 index 0000000000..6bdf4faf55 --- /dev/null +++ b/var/spack/repos/builtin/packages/dsrc/package.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class Dsrc(MakefilePackage): + """DNA Sequence Reads Compression is an application designed for + compression of data files containing reads from DNA sequencing in + FASTQ format.""" + + homepage = "http://sun.aei.polsl.pl/dsrc" + url = "https://github.com/refresh-bio/DSRC/archive/v2.0.2.tar.gz" + + version('2.0.2', '0a75deb6db948f9179df0756c259b870') + + parallel = False + + def install(self, spec, prefix): + install_tree('bin', prefix.bin) + install_tree('lib', prefix.lib) + install_tree('include', prefix.include) + install_tree('examples', prefix.examples) -- cgit v1.2.3-70-g09d2 From dc8c8311c6d1c2f8989b0bac89176d48dcb59a41 Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Mon, 9 Apr 2018 14:23:11 -0500 Subject: wgsim: Create new package. (#7674) * wgsim: Create new package. * fix flake8 error. * wgsim: change cc compiler to spack_cc. * add missing dependency. --- var/spack/repos/builtin/packages/wgsim/package.py | 47 +++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 var/spack/repos/builtin/packages/wgsim/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/wgsim/package.py b/var/spack/repos/builtin/packages/wgsim/package.py new file mode 100644 index 0000000000..fa3cc8c13e --- /dev/null +++ b/var/spack/repos/builtin/packages/wgsim/package.py @@ -0,0 +1,47 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Wgsim(Package): + """Wgsim is a small tool for simulating sequence reads from a reference + genome. + + It is able to simulate diploid genomes with SNPs and insertion/deletion + (INDEL) polymorphisms, and simulate reads with uniform substitution + sequencing errors. It does not generate INDEL sequencing errors, but this + can be partly compensated by simulating INDEL polymorphisms.""" + + homepage = "https://github.com/lh3/wgsim" + + version('2011.10.17', git='https://github.com/lh3/wgsim.git', commit='a12da3375ff3b51a5594d4b6fa35591173ecc229') + + depends_on('zlib') + + def install(self, spec, prefix): + cc = Executable(spack_cc) + cc('-g', '-O2', '-Wall', '-o', 'wgsim', 'wgsim.c', '-lz', '-lm') + + install_tree(self.stage.source_path, prefix.bin) -- cgit v1.2.3-70-g09d2 From ecc481a9a7fc538a82a06bd116a02cdc73ac9763 Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Tue, 10 Apr 2018 08:52:21 -0500 Subject: fermi: Create new package. (#7702) * fermi: Create new package. * fermi: Add missing dependency. * fermi: Change dependency type of perl to run. --- var/spack/repos/builtin/packages/fermi/package.py | 42 +++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 var/spack/repos/builtin/packages/fermi/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fermi/package.py b/var/spack/repos/builtin/packages/fermi/package.py new file mode 100644 index 0000000000..03aea8a716 --- /dev/null +++ b/var/spack/repos/builtin/packages/fermi/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Fermi(MakefilePackage): + """A WGS de novo assembler based on the FMD-index for large genomes.""" + + homepage = "https://github.com/lh3/fermi" + url = "https://github.com/downloads/lh3/fermi/fermi-1.1.tar.bz2" + + version('1.1', 'd5f006315652b6f18070b31474ca5ebb') + + depends_on('zlib') + depends_on('perl', type='run') + + def install(self, spec, prefix): + mkdir(prefix.bin) + install('fermi', prefix.bin) + install('run-fermi.pl', prefix.bin) -- cgit v1.2.3-70-g09d2 From 69f94f18a3bf4de9a98a25de75984ee9e62093d1 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Tue, 10 Apr 2018 11:46:44 -0500 Subject: Fix GCC 6/7 build on APFS (#7696) --- var/spack/repos/builtin/packages/gcc/package.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py index 00e31fe325..3620ebabce 100644 --- a/var/spack/repos/builtin/packages/gcc/package.py +++ b/var/spack/repos/builtin/packages/gcc/package.py @@ -102,13 +102,12 @@ class Gcc(AutotoolsPackage): # depends_on('ppl') # depends_on('cloog') - # TODO: Add a 'test' deptype - # https://github.com/spack/spack/issues/1279 - # depends_on('dejagnu@1.4.4', type='test') - # depends_on('expect', type='test') - # depends_on('tcl', type='test') - # depends_on('autogen@5.5.4:', type='test') - # depends_on('guile@1.4.1:', type='test') + # https://gcc.gnu.org/install/test.html + depends_on('dejagnu@1.4.4', type='test') + depends_on('expect', type='test') + depends_on('tcl', type='test') + depends_on('autogen@5.5.4:', type='test') + depends_on('guile@1.4.1:', type='test') # See https://golang.org/doc/install/gccgo#Releases provides('golang', when='languages=go @4.6:') @@ -158,7 +157,7 @@ class Gcc(AutotoolsPackage): # Fix parallel build on APFS filesystem # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81797 if macOS_version() >= Version('10.13'): - patch('darwin/apfs.patch', when='@7.2.0') + patch('darwin/apfs.patch', when='@6.1:6.4,7.1:7.3') patch('darwin/gcc-7.1.0-headerpad.patch', when='@5:') patch('darwin/gcc-6.1.0-jit.patch', when='@5:') patch('darwin/gcc-4.9.patch1', when='@4.9.0:4.9.3') -- cgit v1.2.3-70-g09d2 From eac2defed58409d3c9ea8800095fbe3e261e803c Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Tue, 10 Apr 2018 11:47:02 -0500 Subject: Add latest versions of libxcb and xcb-proto (#7650) --- var/spack/repos/builtin/packages/libxcb/package.py | 18 ++++++++++++++---- var/spack/repos/builtin/packages/xcb-proto/package.py | 4 +++- 2 files changed, 17 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libxcb/package.py b/var/spack/repos/builtin/packages/libxcb/package.py index 441a5416d5..61f92d4f00 100644 --- a/var/spack/repos/builtin/packages/libxcb/package.py +++ b/var/spack/repos/builtin/packages/libxcb/package.py @@ -32,19 +32,29 @@ class Libxcb(AutotoolsPackage): extensibility.""" homepage = "https://xcb.freedesktop.org/" - url = "https://xcb.freedesktop.org/dist/libxcb-1.11.tar.gz" + url = "https://xcb.freedesktop.org/dist/libxcb-1.13.tar.gz" - version('1.12', '95eee7c28798e16ba5443f188b27a476') - version('1.11', '1698dd837d7e6e94d029dbe8b3a82deb') + version('1.13', '3ba7fe0a7d60650bfb73fbf623aa57cc') + version('1.12', '95eee7c28798e16ba5443f188b27a476') version('1.11.1', '118623c15a96b08622603a71d8789bf3') + version('1.11', '1698dd837d7e6e94d029dbe8b3a82deb') depends_on('libpthread-stubs') depends_on('libxau@0.99.2:') depends_on('libxdmcp') + # libxcb 1.X requires xcb-proto >= 1.X depends_on('xcb-proto', type='build') + depends_on('xcb-proto@1.13:', when='@1.13:1.13.999', type='build') + depends_on('xcb-proto@1.12:', when='@1.12:1.12.999', type='build') + depends_on('xcb-proto@1.11:', when='@1.11:1.11.999', type='build') + # TODO: uncomment once build deps can be resolved separately - # depends_on('python@2:2.8', type='build') + # See #7646, #4145, #4063, and #2548 for details + # libxcb 1.13 added Python 3 support + # depends_on('python', type='build') + # depends_on('python@2:2.8', when='@:1.12', type='build') + depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/xcb-proto/package.py b/var/spack/repos/builtin/packages/xcb-proto/package.py index 7e0249e838..b9f042452e 100644 --- a/var/spack/repos/builtin/packages/xcb-proto/package.py +++ b/var/spack/repos/builtin/packages/xcb-proto/package.py @@ -30,12 +30,14 @@ class XcbProto(AutotoolsPackage): generate the majority of its code and API.""" homepage = "http://xcb.freedesktop.org/" - url = "http://xcb.freedesktop.org/dist/xcb-proto-1.11.tar.gz" + url = "http://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.gz" + version('1.13', '0cc0294eb97e4af3a743e470e6a9d910') version('1.12', '5ee1ec124ea8d56bd9e83b8e9e0b84c4') version('1.11', 'c8c6cb72c84f58270f4db1f39607f66a') # TODO: uncomment once build deps can be resolved separately + # See #7646, #4145, #4063, and #2548 for details # extends('python') patch('xcb-proto-1.12-schema-1.patch', when='@1.12') -- cgit v1.2.3-70-g09d2 From f8765593e0c7af183c09983adb83bde50afa7b69 Mon Sep 17 00:00:00 2001 From: peetsv <32349688+peetsv@users.noreply.github.com> Date: Tue, 10 Apr 2018 09:48:02 -0700 Subject: Perl file copy recursive 0.40 (#7718) * perl-file-copy-recursive: add newer version v0.40 --- var/spack/repos/builtin/packages/perl-file-copy-recursive/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-file-copy-recursive/package.py b/var/spack/repos/builtin/packages/perl-file-copy-recursive/package.py index b9b87ce2eb..75b2df580d 100644 --- a/var/spack/repos/builtin/packages/perl-file-copy-recursive/package.py +++ b/var/spack/repos/builtin/packages/perl-file-copy-recursive/package.py @@ -31,4 +31,5 @@ class PerlFileCopyRecursive(PerlPackage): homepage = "http://search.cpan.org/~dmuey/File-Copy-Recursive-0.38/Recursive.pm" url = "http://search.cpan.org/CPAN/authors/id/D/DM/DMUEY/File-Copy-Recursive-0.38.tar.gz" + version('0.40', '659c634f248885c4b3876b15baf56c79') version('0.38', 'e76dc75ab456510d67c6c3a95183f72f') -- cgit v1.2.3-70-g09d2 From 431a3068b6b6f8533bd74ed31e20f506fbc5b637 Mon Sep 17 00:00:00 2001 From: healther Date: Tue, 10 Apr 2018 18:57:06 +0200 Subject: add package py-flask-socketio (#7714) * add package py-flask-socketio Change-Id: Ib9bb41b9c3de06f07ffb47449edf02476827b610 * fix alignment * add missing werkzeug dependency --- .../builtin/packages/py-flask-socketio/package.py | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-flask-socketio/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-flask-socketio/package.py b/var/spack/repos/builtin/packages/py-flask-socketio/package.py new file mode 100644 index 0000000000..cf78678ad4 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-flask-socketio/package.py @@ -0,0 +1,44 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyFlaskSocketio(PythonPackage): + """Flask-SocketIO gives Flask applications access to low latency + bi-directional communications between the clients and the server. + The client-side application can use any of the SocketIO official clients + libraries in Javascript, C++, Java and Swift, or any compatible client to + establish a permanent connection to the server. + """ + + homepage = "https://flask-socketio.readthedocs.io" + url = "https://pypi.io/packages/source/F/Flask-SocketIO/Flask-SocketIO-2.9.6.tar.gz" + + version('2.9.6', 'bca83faf38355bd91911f2f140f9b50f') + + depends_on('py-setuptools', type='build') + depends_on('py-flask@0.9:', type=('build', 'run')) + depends_on('py-python-socketio@1.6.1:', type=('build', 'run')) + depends_on('py-werkzeug', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From a59aef7c780c4d940ff56fa34ddf38de46056a6f Mon Sep 17 00:00:00 2001 From: healther Date: Tue, 10 Apr 2018 18:58:35 +0200 Subject: add package py-flask-compress (#7713) * add package py-flaks-compress Change-Id: Ia67f292364f339907c7c0a5bd707a7a1e69877be * fix alignment * linebreak to make flake8 happy --- .../builtin/packages/py-flask-compress/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-flask-compress/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-flask-compress/package.py b/var/spack/repos/builtin/packages/py-flask-compress/package.py new file mode 100644 index 0000000000..eef67368f1 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-flask-compress/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyFlaskCompress(PythonPackage): + """Flask-Compress allows you to easily compress your Flask application's + responses with gzip.""" + + homepage = "https://github.com/libwilliam/flask-compress" + url = "https://pypi.io/packages/source/F/Flask-Compress/Flask-Compress-1.4.0.tar.gz" + + version('1.4.0', 'd997f73e4ed5793ec526c135aa765e15') + + depends_on('py-setuptools', type='build') + depends_on('py-flask@0.9:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From ab7e2a5c9e154be5a56757860e21ec6f685b5c1b Mon Sep 17 00:00:00 2001 From: healther Date: Tue, 10 Apr 2018 19:03:17 +0200 Subject: add py-flask@0.12.2 (#7710) Change-Id: I51887f661e6dd896a9f740b51f4e81bdf532f9b4 --- var/spack/repos/builtin/packages/py-flask/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-flask/package.py b/var/spack/repos/builtin/packages/py-flask/package.py index 7e32f5f607..310f589e77 100644 --- a/var/spack/repos/builtin/packages/py-flask/package.py +++ b/var/spack/repos/builtin/packages/py-flask/package.py @@ -31,6 +31,7 @@ class PyFlask(PythonPackage): homepage = "http://github.com/pallets/flask" url = "https://pypi.io/packages/source/F/Flask/Flask-0.11.1.tar.gz" + version('0.12.2', '97278dfdafda98ba7902e890b0289177') version('0.12.1', '76e9fee5c3afcf4634b9baf96c578207') version('0.11.1', 'd2af95d8fe79cf7da099f062dd122a08') -- cgit v1.2.3-70-g09d2 From f278f512ccee8523fc89496281ef1fae6efb27bb Mon Sep 17 00:00:00 2001 From: healther Date: Tue, 10 Apr 2018 19:03:51 +0200 Subject: add py-cython@0.28.1 (#7709) Change-Id: I7e3931f8224a367ce1657256b3100139abcc4f86 --- var/spack/repos/builtin/packages/py-cython/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-cython/package.py b/var/spack/repos/builtin/packages/py-cython/package.py index f0a38b627b..7bd7b462b7 100644 --- a/var/spack/repos/builtin/packages/py-cython/package.py +++ b/var/spack/repos/builtin/packages/py-cython/package.py @@ -30,8 +30,8 @@ class PyCython(PythonPackage): homepage = "https://pypi.python.org/pypi/cython" url = "https://pypi.io/packages/source/c/cython/Cython-0.25.2.tar.gz" + version('0.28.1', 'c549effadb52d90bdcb1affc1e5dbb97') version('0.25.2', '642c81285e1bb833b14ab3f439964086') - version('0.23.5', '66b62989a67c55af016c916da36e7514') version('0.23.4', '157df1f69bcec6b56fd97e0f2e057f6e') -- cgit v1.2.3-70-g09d2 From 3bd74f18589109391b852bd9428526345344c499 Mon Sep 17 00:00:00 2001 From: thecorkscrew Date: Tue, 10 Apr 2018 19:05:05 +0200 Subject: Added C-Lime Package (#7707) * Added C-Lime Package * Small fix --- var/spack/repos/builtin/packages/c-lime/package.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 var/spack/repos/builtin/packages/c-lime/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/c-lime/package.py b/var/spack/repos/builtin/packages/c-lime/package.py new file mode 100644 index 0000000000..e6cd3a660f --- /dev/null +++ b/var/spack/repos/builtin/packages/c-lime/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class CLime(AutotoolsPackage): + """LIME (which can stand for Lattice QCD Interchange Message Encapsulation + or more generally, Large Internet Message Encapsulation) is a simple + packaging scheme for combining records containing ASCII and/or binary + data.""" + + homepage = "https://usqcd-software.github.io/c-lime/" + url = "https://github.com/usqcd-software/c-lime/archive/qio2-3-9.tar.gz" + + version('2-3-9', '28257e7ae75dc68c7c920e3e16db0ec9') -- cgit v1.2.3-70-g09d2 From 8dac669a878c9a3e6b430f2d27fd46e47deeca03 Mon Sep 17 00:00:00 2001 From: healther Date: Tue, 10 Apr 2018 21:35:26 +0200 Subject: add package py-pygdbmi (#7711) * add package py-pygdbmi Change-Id: I9850ccecebb1d46e983cda39c371caab23ad61e9 * add runtime setuptools dependency (from distutils import) * remove unnecessary run dependency --- .../repos/builtin/packages/py-pygdbmi/package.py | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-pygdbmi/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pygdbmi/package.py b/var/spack/repos/builtin/packages/py-pygdbmi/package.py new file mode 100644 index 0000000000..059554974c --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pygdbmi/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPygdbmi(PythonPackage): + """Parse gdb machine interface output with Python""" + + homepage = "https://github.com/cs01/pygdbmi" + url = "https://pypi.io/packages/source/p/pygdbmi/pygdbmi-0.8.2.0.tar.gz" + + version('0.8.2.0', 'e74d3d02fa5eef1223b5dedb13f9bbad') + + depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From e7760f1f59ddde6bff98ffaf224a3394bf377e93 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Tue, 10 Apr 2018 21:41:52 +0200 Subject: go: Update to 1.10.1 (#7708) Also update go-bootstrap to the 20171003 snapshot. --- .../repos/builtin/packages/go-bootstrap/package.py | 4 +++- var/spack/repos/builtin/packages/go/package.py | 22 ++++++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/go-bootstrap/package.py b/var/spack/repos/builtin/packages/go-bootstrap/package.py index 37cf69cb70..3e7784c22d 100644 --- a/var/spack/repos/builtin/packages/go-bootstrap/package.py +++ b/var/spack/repos/builtin/packages/go-bootstrap/package.py @@ -46,12 +46,14 @@ class GoBootstrap(Package): # See: https://golang.org/doc/install/source#go14 and # https://github.com/golang/go/issues/17545 and # https://github.com/golang/go/issues/16352 + version('1.4-bootstrap-20171003', 'dbf727a4b0e365bf88d97cbfde590016', + url='https://dl.google.com/go/go1.4-bootstrap-20171003.tar.gz') version('1.4-bootstrap-20170531', 'd2cc61cb9f829b3510ee39c0c5568014', url='https://storage.googleapis.com/golang/go1.4-bootstrap-20170531.tar.gz') version('1.4-bootstrap-20161024', '76e42c8152e8560ded880a6d1d1f53cb', url='https://storage.googleapis.com/golang/go1.4-bootstrap-20161024.tar.gz') - provides('golang@:1.4-bootstrap-20170531') + provides('golang@:1.4-bootstrap-20171003') depends_on('git', type=('build', 'link', 'run')) diff --git a/var/spack/repos/builtin/packages/go/package.py b/var/spack/repos/builtin/packages/go/package.py index 4649850bd6..cb5e744af2 100644 --- a/var/spack/repos/builtin/packages/go/package.py +++ b/var/spack/repos/builtin/packages/go/package.py @@ -52,19 +52,21 @@ from spack import * class Go(Package): """The golang compiler and build environment""" homepage = "https://golang.org" - url = 'https://storage.googleapis.com/golang/go1.7.4.src.tar.gz' + url = 'https://dl.google.com/go/go1.10.1.src.tar.gz' extendable = True - version('1.9.2', '44105c865a1a810464df79233a05a568') - version('1.9.1', '27bce1ffb05f4f6bd90d90081e5d4169') - version('1.9', 'da2d44ea384076efec43ee1f8b7d45d2') - version('1.8.3', '64e9380e07bba907e26a00cf5fcbe77e') - version('1.8.1', '409dd21e7347dd1ea9efe64a700073cc') - version('1.8', '7743960c968760437b6e39093cfe6f67') - version('1.7.5', '506de2d870409e9003e1440bcfeb3a65') - version('1.7.4', '49c1076428a5d3b5ad7ac65233fcca2f') - version('1.6.4', 'b023240be707b34059d2c114d3465c92') + version('1.10.1', '589449ff6c3ccbff1d391d4e7ab5bb5d5643a5a41a04c99315e55c16bbf73ddc') + version('1.9.5', 'f1c2bb7f32bbd8fa7a19cc1608e0d06582df32ff5f0340967d83fb0017c49fbc') + version('1.9.2', '44105c865a1a810464df79233a05a568') + version('1.9.1', '27bce1ffb05f4f6bd90d90081e5d4169') + version('1.9', 'da2d44ea384076efec43ee1f8b7d45d2') + version('1.8.3', '64e9380e07bba907e26a00cf5fcbe77e') + version('1.8.1', '409dd21e7347dd1ea9efe64a700073cc') + version('1.8', '7743960c968760437b6e39093cfe6f67') + version('1.7.5', '506de2d870409e9003e1440bcfeb3a65') + version('1.7.4', '49c1076428a5d3b5ad7ac65233fcca2f') + version('1.6.4', 'b023240be707b34059d2c114d3465c92') provides('golang') -- cgit v1.2.3-70-g09d2 From dbb7f8e13abba9da32502c501af5374ff19961ea Mon Sep 17 00:00:00 2001 From: Daniel Topa Date: Tue, 10 Apr 2018 19:20:09 -0600 Subject: hwloc: add v 2.0.1 (#7724) Signed-off-by: Dan Topa --- var/spack/repos/builtin/packages/hwloc/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hwloc/package.py b/var/spack/repos/builtin/packages/hwloc/package.py index 6e5d2d7ebc..87f65b148d 100644 --- a/var/spack/repos/builtin/packages/hwloc/package.py +++ b/var/spack/repos/builtin/packages/hwloc/package.py @@ -48,7 +48,8 @@ class Hwloc(AutotoolsPackage): list_url = "http://www.open-mpi.org/software/hwloc/" list_depth = 2 - version('2.0.0', '027e6928ae0b5b64c821d0a71a61cd82') + version('2.0.1', '442b2482bb5b81983ed256522aadbf94') + version('2.0.0', '027e6928ae0b5b64c821d0a71a61cd82') version('1.11.9', '4d5f5da8b1d09731d82e865ecf3fa399') version('1.11.8', 'a0fa1c9109a4d8b4b6568e62cc9b6e30') version('1.11.7', '867a5266675e5bf1ef4ab66c459653f8') -- cgit v1.2.3-70-g09d2 From 45ddfe83efd1a594d2ed126120f7f894877d709c Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Tue, 10 Apr 2018 19:21:35 -0600 Subject: lammps: add v20180316 (#7725) * lammps: add v20180316 * add latte@1.1.1 and make lammps use it --- var/spack/repos/builtin/packages/lammps/package.py | 4 +++- var/spack/repos/builtin/packages/latte/package.py | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lammps/package.py b/var/spack/repos/builtin/packages/lammps/package.py index d555899d04..688b629393 100644 --- a/var/spack/repos/builtin/packages/lammps/package.py +++ b/var/spack/repos/builtin/packages/lammps/package.py @@ -36,6 +36,7 @@ class Lammps(CMakePackage): homepage = "http://lammps.sandia.gov/" url = "https://github.com/lammps/lammps/archive/patch_1Sep2017.tar.gz" + version('20180316', '25bad35679583e0dd8cb8753665bb84b') version('20180222', '4d0513e3183bd57721814d217fdaf957') version('20170922', '4306071f919ec7e759bda195c26cfd9a') version('20170901', '767e7f07289663f033474dfe974974e7') @@ -69,7 +70,8 @@ class Lammps(CMakePackage): depends_on('netcdf+mpi', when='+user-netcdf') depends_on('blas', when='+user-atc') depends_on('lapack', when='+user-atc') - depends_on('latte', when='+latte') + depends_on('latte@1.0.1', when='@:20180222+latte') + depends_on('latte@1.1.1:', when='@20180316:+latte') depends_on('blas', when='+latte') depends_on('lapack', when='+latte') depends_on('python', when='+python') diff --git a/var/spack/repos/builtin/packages/latte/package.py b/var/spack/repos/builtin/packages/latte/package.py index 7e3c9afa61..606bd99dda 100644 --- a/var/spack/repos/builtin/packages/latte/package.py +++ b/var/spack/repos/builtin/packages/latte/package.py @@ -32,8 +32,9 @@ class Latte(CMakePackage): homepage = "https://github.com/lanl/latte" url = "https://github.com/lanl/latte/tarball/v1.0" - version('develop', git='https://github.com/lanl/latte', branch='master') + version('1.1.1', 'ab11867ba6235189681cf6e50a50cc50') version('1.0.1', 'd0b99edbcf7a19abe0a68a192d6f6234') + version('develop', git='https://github.com/lanl/latte', branch='master') variant('mpi', default=True, description='Build with mpi') -- cgit v1.2.3-70-g09d2 From 6508a2c3d30d8bfc5894d3b0e132603cf81c8c51 Mon Sep 17 00:00:00 2001 From: healther Date: Wed, 11 Apr 2018 03:21:57 +0200 Subject: add package py-python-engineio (#7723) * add package py-python-engineio * flake8 fix --- .../builtin/packages/py-python-engineio/package.py | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-python-engineio/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-python-engineio/package.py b/var/spack/repos/builtin/packages/py-python-engineio/package.py new file mode 100644 index 0000000000..85c1d8eafc --- /dev/null +++ b/var/spack/repos/builtin/packages/py-python-engineio/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPythonEngineio(PythonPackage): + """Engine.IO is the implementation of transport-based + cross-browser/cross-device bi-directional communication + layer for Socket.IO.""" + + homepage = "http://python-engineio.readthedocs.io/en/latest/" + url = "https://github.com/miguelgrinberg/python-engineio/archive/v2.0.2.tar.gz" + + version('2.0.2', 'b91c6fa900905f9a96b86c3e141e2754') + + depends_on('py-setuptools', type='build') + depends_on('py-six@1.9.0:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 70754c5d21e3cc995a44d770d58ec35013e718c4 Mon Sep 17 00:00:00 2001 From: healther Date: Wed, 11 Apr 2018 03:22:28 +0200 Subject: add package py-greenlet (#7720) * add package py-greenlet * remove optional setuptools dependency --- .../repos/builtin/packages/py-greenlet/package.py | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-greenlet/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-greenlet/package.py b/var/spack/repos/builtin/packages/py-greenlet/package.py new file mode 100644 index 0000000000..ff9589824f --- /dev/null +++ b/var/spack/repos/builtin/packages/py-greenlet/package.py @@ -0,0 +1,33 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +from spack import * + + +class PyGreenlet(PythonPackage): + """Lightweight in-process concurrent programming""" + + homepage = "https://github.com/python-greenlet/greenlet" + url = "https://pypi.io/packages/source/g/greenlet/greenlet-0.4.13.tar.gz" + + version('0.4.13', '6e0b9dd5385f81d478451ec8ed1d62b3') -- cgit v1.2.3-70-g09d2 From 4eeec729ea6d36b0eb26700e3ce4bfade65ad045 Mon Sep 17 00:00:00 2001 From: healther Date: Wed, 11 Apr 2018 03:22:45 +0200 Subject: add package py-eventlet (#7722) --- .../repos/builtin/packages/py-eventlet/package.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-eventlet/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-eventlet/package.py b/var/spack/repos/builtin/packages/py-eventlet/package.py new file mode 100644 index 0000000000..2617891b87 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-eventlet/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +from spack import * + + +class PyEventlet(PythonPackage): + """Concurrent networking library for Python""" + + homepage = "https://github.com/eventlet/eventlet" + url = "https://github.com/eventlet/eventlet/releases/download/v0.22.0/eventlet-0.22.0.tar.gz" + + version('0.22.0', 'a1199cecd44d7ce2ea624ac6c21db877') + + depends_on('py-setuptools', type='build') + depends_on('py-greenlet@0.3:') + depends_on('py-enum34', type=('build', 'run'), when='^python@:3.3.99') -- cgit v1.2.3-70-g09d2 From 9ba7ecb1defe96325ee0c56be34aae807527265f Mon Sep 17 00:00:00 2001 From: healther Date: Wed, 11 Apr 2018 03:24:11 +0200 Subject: add package py-gevent (#7712) * add package py-gevent Change-Id: I49722e02a961f20b9177ae8575b78b42bf6c01c9 * fix alignment * add cffi dependency --- .../repos/builtin/packages/py-gevent/package.py | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-gevent/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-gevent/package.py b/var/spack/repos/builtin/packages/py-gevent/package.py new file mode 100644 index 0000000000..4143a46559 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-gevent/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyGevent(PythonPackage): + """gevent is a coroutine-based Python networking library.""" + + homepage = "http://www.gevent.org" + url = "https://pypi.io/packages/source/g/gevent/gevent-1.3a2.tar.gz" + + version('1.3a2', '8d73a7b0ceb0ca791b22e6f7b7061e9e') + + depends_on('py-setuptools@24.2:', type='build') + depends_on('py-cython@0.27:', type='build') + depends_on('py-cffi@1.4.0:', type=('build', 'run')) + depends_on('py-greenlet@0.4.13:', type=('build', 'run')) + depends_on('python@2.7:2.8,3.4:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From af13236d68b433fc2f70057a6157582a4975467c Mon Sep 17 00:00:00 2001 From: peetsv <32349688+peetsv@users.noreply.github.com> Date: Tue, 10 Apr 2018 18:25:32 -0700 Subject: py-cnvkit: add new package (#7688) * py-cnvkit: add new package * updating dependencies * correcting flake8 error * adding py-setuptools dependency --- .../repos/builtin/packages/py-cnvkit/package.py | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-cnvkit/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-cnvkit/package.py b/var/spack/repos/builtin/packages/py-cnvkit/package.py new file mode 100644 index 0000000000..ed5313f2db --- /dev/null +++ b/var/spack/repos/builtin/packages/py-cnvkit/package.py @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyCnvkit(PythonPackage): + """A command-line toolkit and Python library for detecting copy number + variants and alterations genome-wide from high-throughput sequencing.""" + + homepage = "http://cnvkit.readthedocs.io/en/stable/" + url = "https://github.com/etal/cnvkit/archive/v0.9.2.tar.gz" + + version('0.9.2', '16612c4dcc9570f6ef9fecc42caf1745') + + depends_on('py-setuptools', type='build') + depends_on('py-biopython@1.62:', type=('build', 'run')) + depends_on('py-future@0.15.2:', type=('build', 'run')) + depends_on('py-matplotlib@1.3.1:', type=('build', 'run')) + depends_on('py-numpy@1.9:', type=('build', 'run')) + depends_on('py-pandas@0.18.1:', type=('build', 'run')) + depends_on('py-pyfaidx@0.4.7:', type=('build', 'run')) + depends_on('py-pysam@0.10.0:', type=('build', 'run')) + depends_on('py-reportlab@3.0:', type=('build', 'run')) + depends_on('py-scipy@0.15.0:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From a23e319daccf1b1689aa43fb1b92c12ee5d475a6 Mon Sep 17 00:00:00 2001 From: healther Date: Wed, 11 Apr 2018 21:21:37 +0200 Subject: add package py-python-socketio (#7721) * add package py-python-socketio * fix indention * add description to eventlet variant * fix dependencies Change-Id: I425ae165dfcce30df6cbbd671cd6ef1bef5078dc * Update package.py * Update package.py * Update package.py * Update package.py --- .../builtin/packages/py-python-socketio/package.py | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-python-socketio/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-python-socketio/package.py b/var/spack/repos/builtin/packages/py-python-socketio/package.py new file mode 100644 index 0000000000..f44c535e3e --- /dev/null +++ b/var/spack/repos/builtin/packages/py-python-socketio/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPythonSocketio(PythonPackage): + """Python implementation of the Socket.IO realtime server.""" + + homepage = "https://github.com/miguelgrinberg/python-socketio" + url = "https://pypi.io/packages/source/p/python-socketio/python-socketio-1.8.4.tar.gz" + + version('1.8.4', '9de73990f6c32c701278c01b0fa1a0c3') + + variant('eventlet', default=True, + description="Pulls in optional eventlet dependency, required" + " for using the zmq implementation.") + + depends_on('py-setuptools', type='build') + depends_on('py-six@1.9.0:', type=("build", "run")) + depends_on('py-python-engineio@1.2.1:', type=("build", "run")) + depends_on('py-eventlet', when='+eventlet', type=("build", "run")) -- cgit v1.2.3-70-g09d2 From ed5f68211e93df983a5e15c7f1ce812b810b49c0 Mon Sep 17 00:00:00 2001 From: Simon Flood Date: Wed, 11 Apr 2018 20:22:23 +0100 Subject: Add ANTs package (#7717) * Add ants package Add a package for ANTs (version 2.2.0) * Update package.py * Update package.py * Update package.py * Update package.py * Update package.py --- var/spack/repos/builtin/packages/ants/package.py | 48 ++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 var/spack/repos/builtin/packages/ants/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ants/package.py b/var/spack/repos/builtin/packages/ants/package.py new file mode 100644 index 0000000000..45207f4acb --- /dev/null +++ b/var/spack/repos/builtin/packages/ants/package.py @@ -0,0 +1,48 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Ants(CMakePackage): + """ANTs extracts information from complex datasets that include imaging. + Paired with ANTsR (answer), ANTs is useful for managing, interpreting + and visualizing multidimensional data. ANTs is popularly considered a + state-of-the-art medical image registration and segmentation toolkit. + ANTs depends on the Insight ToolKit (ITK), a widely used medical image + processing library to which ANTs developers contribute. + """ + + homepage = "http://stnava.github.io/ANTs/" + url = "https://github.com/ANTsX/ANTs/archive/v2.2.0.tar.gz" + + version('2.2.0', '5661b949268100ac0f7baf6d2702b4dd') + + def install(self, spec, prefix): + with working_dir(join_path('spack-build', 'ANTS-build'), create=False): + make("install") + install_tree('Scripts', prefix.bin) + + def setup_environment(self, spack_env, run_env): + run_env.set('ANTSPATH', self.prefix.bin) -- cgit v1.2.3-70-g09d2 From 3b44a2ff404d33cf7533621dcd36afef430d8389 Mon Sep 17 00:00:00 2001 From: healther Date: Wed, 11 Apr 2018 21:25:08 +0200 Subject: Add package py-slurm-pipeline (#7681) * add package py-slurm-pipeline Change-Id: Iade405a7e96f04e476cea76e460cac2ebdf21f95 * add missing py-six dependency Change-Id: I382fa4139880c1a61af3f314c74ed6e7c2e88c5b * Update package.py * Update package.py * Update package.py * fix flake8 --- .../builtin/packages/py-slurm-pipeline/package.py | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-slurm-pipeline/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-slurm-pipeline/package.py b/var/spack/repos/builtin/packages/py-slurm-pipeline/package.py new file mode 100644 index 0000000000..3a0521530d --- /dev/null +++ b/var/spack/repos/builtin/packages/py-slurm-pipeline/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PySlurmPipeline(PythonPackage): + """A Python class for scheduling SLURM jobs""" + + homepage = "https://github.com/acorg/slurm-pipeline" + url = "https://pypi.io/packages/source/s/slurm-pipeline/slurm-pipeline-1.1.13.tar.gz" + + version('1.1.13', 'd1f8c78a64718ec5e2e40ba1b6816017') + + depends_on('py-setuptools', type='build') + # using open range although requirements*.txt give explicit versions + # test dependencies are omitted, see #7681 + depends_on('py-six@1.10.0:', type=('build', 'run')) + # six only required for python 2, change when ^-dependencies work, cf #2793 + # depends_on('py-six@1.10.0:', type=('build', 'run'), when='^python@:2.8') -- cgit v1.2.3-70-g09d2 From 3608c4d3b559ba7fa1bd9629231e98196681caa4 Mon Sep 17 00:00:00 2001 From: healther Date: Thu, 12 Apr 2018 04:30:23 +0200 Subject: add package py-gdbgui (#7715) * add package py-gdbgui Change-Id: I553e1e4c4f6385348190817199e05b25522b57b4 * fix alignment * add setuptool runtimedependency * add gdb run dependency --- .../repos/builtin/packages/py-gdbgui/package.py | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-gdbgui/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-gdbgui/package.py b/var/spack/repos/builtin/packages/py-gdbgui/package.py new file mode 100644 index 0000000000..2e35909900 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-gdbgui/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyGdbgui(PythonPackage): + """gdbgui is a modern, free, browser-based frontend to gdb""" + + homepage = "https://gdbgui.com" + url = "https://pypi.io/packages/source/g/gdbgui/gdbgui-0.11.2.1.tar.gz" + + version('0.11.2.1', 'c15dd3f60fe372b2e93f705c7ee75f51') + + depends_on('py-setuptools', type=('build', 'run')) + depends_on('py-flask@0.12.2:', type=('build', 'run')) + depends_on('py-flask-compress@1.4.0:', type=('build', 'run')) + depends_on('py-flask-socketio@2.9.3:', type=('build', 'run')) + depends_on('py-gevent@1.2.2:', type=('build', 'run')) + depends_on('py-pygdbmi@0.8.2.0:', type=('build', 'run')) + depends_on('py-pygments@2.2.0:', type=('build', 'run')) + depends_on('gdb', type='run') -- cgit v1.2.3-70-g09d2 From 0e4e7d05e4f93fa46df2b6b7d1958cbef624706b Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Thu, 12 Apr 2018 07:14:38 -0700 Subject: opengl: make error throw on install, not fetch (#7063) * opengl: make error throw on install, not fetch * opengl: add configuration advice for darwin * opengl: add more versions of GL/OpenGL * opengl: improve documentation in comments * [OpenGL] Fix formatting --- var/spack/repos/builtin/packages/opengl/package.py | 38 ++++++++++++++++++++-- 1 file changed, 35 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/opengl/package.py b/var/spack/repos/builtin/packages/opengl/package.py index b2c234ee6f..2859cf9138 100644 --- a/var/spack/repos/builtin/packages/opengl/package.py +++ b/var/spack/repos/builtin/packages/opengl/package.py @@ -31,13 +31,23 @@ class Opengl(Package): homepage = "https://www.opengl.org/" url = "https://www.opengl.org/" - version('3.2', 'N/A') + # A second argument (usually the hash) must be supplied to the + # version directive, but 'n/a' is used here because this package + # is a placeholder for a system/vendor installation of OpenGL + version('3.2', 'n/a') provides('gl@:4.5', when='@4.5:') provides('gl@:4.4', when='@4.4:') provides('gl@:4.3', when='@4.3:') + provides('gl@:4.2', when='@4.2:') + provides('gl@:4.1', when='@4.1:') + provides('gl@:3.3', when='@3.3:') - def install(self, spec, prefix): + # Override the fetcher method to throw a useful error message; + # fixes GitHub issue (#7061) in which this package threw a + # generic, uninformative error during the `fetch` step, + @property + def fetcher(self): msg = """This package is intended to be a placeholder for system-provided OpenGL libraries from hardware vendors. Please download and install OpenGL drivers/libraries for your graphics @@ -53,6 +63,28 @@ class Opengl(Package): In that case, /opt/opengl/ should contain these two folders: include/GL/ (opengl headers, including "gl.h") - lib (opengl libraries, including "libGL.so")""" + lib (opengl libraries, including "libGL.so") + + On Apple Darwin (e.g., OS X, macOS) systems, this package is + normally installed as part of the XCode Command Line Tools in + /usr/X11R6, so a working packages.yaml would be + packages: + opengl: + paths: + opengl@4.1: /usr/X11R6 + buildable: False + + In that case, /usr/X11R6 should contain + + include/GL/ (OpenGL headers, including "gl.h") + lib (OpenGL libraries, including "libGL.dylib") + + On OS X/macOS, note that the version of OpenGL provided + depends on your hardware. Look at + https://support.apple.com/en-us/HT202823 to see what version + of OpenGL your Mac uses.""" raise InstallError(msg) + + def install(self, spec, prefix): + pass -- cgit v1.2.3-70-g09d2 From bbdf586d14ef9c5d873bcce8a8a872f629be5062 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Thu, 12 Apr 2018 07:16:16 -0700 Subject: glu: new virtual package; openglu: new package (#7162) * mesa-glu: now provides 'glu' (GL Utility library) * openglu: add package, provides glu * openglu: add custom fetcher, remove nonsense url Change openglu package to look like the opengl package in GitHub PR * [OpenGLU] Fix a typo --- .../repos/builtin/packages/mesa-glu/package.py | 2 + .../repos/builtin/packages/openglu/package.py | 86 ++++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 var/spack/repos/builtin/packages/openglu/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mesa-glu/package.py b/var/spack/repos/builtin/packages/mesa-glu/package.py index 9d8125242e..608a23cd8b 100644 --- a/var/spack/repos/builtin/packages/mesa-glu/package.py +++ b/var/spack/repos/builtin/packages/mesa-glu/package.py @@ -37,3 +37,5 @@ class MesaGlu(AutotoolsPackage): variant('mesa', default=True, description='Usually depends on mesa, disable for accelerated OpenGL') depends_on('mesa', when='+mesa') + + provides('glu@1.3') diff --git a/var/spack/repos/builtin/packages/openglu/package.py b/var/spack/repos/builtin/packages/openglu/package.py new file mode 100644 index 0000000000..a27441f901 --- /dev/null +++ b/var/spack/repos/builtin/packages/openglu/package.py @@ -0,0 +1,86 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Openglu(Package): + """Placeholder for external OpenGL utility library (GLU) from hardware + vendors""" + + homepage = "https://www.opengl.org/resources/libraries" + url = "https://www.opengl.org/resources/libraries" + + # A second argument (usually the has) must be supplied to the + # version directive, but 'n/a' is used here because this package + # is a placeholder for a system/vendor installation of OpenGL + version('1.3', 'n/a') + + provides('glu@:1.3', when='@1.3:') + provides('glu@:1.2', when='@1.2:') + provides('glu@:1.1', when='@1.1:') + provides('glu@:1.0', when='@1.0:') + + # Override the fetcher method to throw a useful error message; + # fixes an issue similar to Github issue (#7061), in which the + # opengl package threw a generic, uninformative error message + # during the `fetch` step + @property + def fetcher(self): + msg = """This package is intended to be a placeholder for + system-provided OpenGL utility (GLU) libraries from hardware vendors. + Please download and install the GLU drivers/libraries for your + graphics hardware separately, and then set that up as an external + package. An example of a working packages.yaml: + + packages: + openglu: + paths: + openglu@1.3: /opt/opengl + buildable: False + + In that case, /opt/opengl/ should contain these two folders: + + include/GL/ (opengl headers, including "glu.h") + lib (opengl libraries, including "libGLU.so") + + On Apple Darwin (OS X, macOS) systems, this package is + normally installed as part of the XCode Command Line Tools in + /usr/X11R6, so a working packages.yaml would be + + packages: + openglu: + paths: + openglu@1.3: /usr/X11R6 + buildable: False + + In that case, /usr/X11R6 should contain + + include/GL (GLU headers, including "glu.h") + lib (GLU libraries, including "libGLU.dylib")""" + + raise InstallError(msg) + + def install(self, spec, prefix): + pass -- cgit v1.2.3-70-g09d2 From 41867cf007e2c99b4a8cd46f51ba3cfae55ac2b9 Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 12 Apr 2018 12:24:28 -0500 Subject: perl-want: Create new package (#7734) --- .../repos/builtin/packages/perl-want/package.py | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-want/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-want/package.py b/var/spack/repos/builtin/packages/perl-want/package.py new file mode 100644 index 0000000000..d61fc68241 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-want/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlWant(PerlPackage): + """A generalisation of wantarray.""" + + homepage = "search.cpan.org/~robin/Want/Want.pm" + url = "http://search.cpan.org/CPAN/authors/id/R/RO/ROBIN/Want-0.29.tar.gz" + + version('0.29', '33b2dae5db59781b9a0434fa1db04aab') -- cgit v1.2.3-70-g09d2 From bc379ab919340b8f629e39bbec9a779decf53ec7 Mon Sep 17 00:00:00 2001 From: healther Date: Thu, 12 Apr 2018 19:53:30 +0200 Subject: fix dependencies for matplotlib@2.2.2 (#7735) --- .../builtin/packages/py-kiwisolver/package.py | 36 ++++++++++++++++++++++ .../builtin/packages/py-matplotlib/package.py | 1 + 2 files changed, 37 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-kiwisolver/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-kiwisolver/package.py b/var/spack/repos/builtin/packages/py-kiwisolver/package.py new file mode 100644 index 0000000000..aa4f5637fa --- /dev/null +++ b/var/spack/repos/builtin/packages/py-kiwisolver/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyKiwisolver(PythonPackage): + """A fast implementation of the Cassowary constraint solver""" + + homepage = "https://github.com/nucleic/kiwi" + url = "https://pypi.io/packages/source/k/kiwisolver/kiwisolver-1.0.1.tar.gz" + + version('1.0.1', 'e2a1718b837e2cd001f7c06934616fcd') + + depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-matplotlib/package.py b/var/spack/repos/builtin/packages/py-matplotlib/package.py index 8b819de9ab..914a3dfce6 100644 --- a/var/spack/repos/builtin/packages/py-matplotlib/package.py +++ b/var/spack/repos/builtin/packages/py-matplotlib/package.py @@ -76,6 +76,7 @@ class PyMatplotlib(PythonPackage): depends_on('py-cycler@0.9:', type=('build', 'run')) depends_on('py-subprocess32', type=('build', 'run'), when='^python@:2.7') depends_on('py-functools32', type=('build', 'run'), when='^python@2.7') + depends_on('py-kiwisolver', type=('build', 'run'), when='@2.2.0:') # ------ Optional GUI frameworks depends_on('tk@8.3:', when='+tk') # not 8.6.0 or 8.6.1 -- cgit v1.2.3-70-g09d2 From 61875784df490bd7ed3acb1dfc82c7725a04f227 Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 12 Apr 2018 12:53:53 -0500 Subject: perl-math-matrixreal: Create new package (#7737) --- .../packages/perl-math-matrixreal/package.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-math-matrixreal/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-math-matrixreal/package.py b/var/spack/repos/builtin/packages/perl-math-matrixreal/package.py new file mode 100644 index 0000000000..860351bc5e --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-math-matrixreal/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlMathMatrixreal(PerlPackage): + """Implements the data type "matrix of real numbers" (and consequently + also "vector of real numbers").""" + + homepage = "http://search.cpan.org/~leto/Math-MatrixReal/lib/Math/MatrixReal.pm" + url = "http://search.cpan.org/CPAN/authors/id/L/LE/LETO/Math-MatrixReal-2.13.tar.gz" + + version('2.13', 'cf9d6ff71f2df075559ea752104ca199') + + depends_on('perl-module-build', type='build') -- cgit v1.2.3-70-g09d2 From 8a4268837e1475c5986a119ce66a8ffa8a9ae5d2 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Thu, 12 Apr 2018 12:55:10 -0500 Subject: New package r-spem (#7657) * r-truncnorm: new package added * r-solnp: new package added * r-spem: new package added * r-truncnorm: removed dependency r-testthat --- .../repos/builtin/packages/r-rsolnp/package.py | 38 ++++++++++++++++++++ var/spack/repos/builtin/packages/r-spem/package.py | 40 ++++++++++++++++++++++ .../repos/builtin/packages/r-truncnorm/package.py | 36 +++++++++++++++++++ 3 files changed, 114 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-rsolnp/package.py create mode 100644 var/spack/repos/builtin/packages/r-spem/package.py create mode 100644 var/spack/repos/builtin/packages/r-truncnorm/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-rsolnp/package.py b/var/spack/repos/builtin/packages/r-rsolnp/package.py new file mode 100644 index 0000000000..0fa1caa755 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-rsolnp/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RRsolnp(RPackage): + """General Non-linear Optimization Using Augmented Lagrange Multiplier + Method.""" + + homepage = "https://cran.r-project.org/package=Rsolnp" + url = "https://cran.rstudio.com/src/contrib/Rsolnp_1.16.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/Rsolnp" + + version('1.16', '507e1e1a64f5f1d32b7e4e12ed19599f') + + depends_on('r-truncnorm', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-spem/package.py b/var/spack/repos/builtin/packages/r-spem/package.py new file mode 100644 index 0000000000..bcc7e4716e --- /dev/null +++ b/var/spack/repos/builtin/packages/r-spem/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RSpem(RPackage): + """This package can optimize the parameter in S-system models given time + series data""" + + homepage = "https://bioconductor.org/packages/SPEM/" + url = "https://git.bioconductor.org/packages/SPEM" + + version('1.18.0', git='https://git.bioconductor.org/packages/SPEM', + commit='3ab425dd9889885eac328d26b73366a875cd250b') + + depends_on('r-rsolnp', type=('build', 'run')) + depends_on('r-biobase', type=('build', 'run')) + depends_on('r@3.4.3:3.4.9', when='@1.18.0') diff --git a/var/spack/repos/builtin/packages/r-truncnorm/package.py b/var/spack/repos/builtin/packages/r-truncnorm/package.py new file mode 100644 index 0000000000..579ee65130 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-truncnorm/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RTruncnorm(RPackage): + """Density, probability, quantile and random number generation functions + for the truncated normal distribution.""" + + homepage = "https://cran.r-project.org/package=truncnorm" + url = "https://cran.rstudio.com/src/contrib/truncnorm_1.0-8.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/truncnorm" + + version('1.0-8', 'c60cd6555be0dd2ea91e61757439282d') -- cgit v1.2.3-70-g09d2 From 89b5403b795bad2cb4b44948147f7c3fdafe3f1a Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 12 Apr 2018 13:29:51 -0500 Subject: perl-text-simpletable: Create new package (#7739) --- .../packages/perl-text-simpletable/package.py | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-text-simpletable/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-text-simpletable/package.py b/var/spack/repos/builtin/packages/perl-text-simpletable/package.py new file mode 100644 index 0000000000..3c02252354 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-text-simpletable/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlTextSimpletable(PerlPackage): + """Simple Eyecandy ASCII Tables""" + + homepage = "http://search.cpan.org/~mramberg/Text-SimpleTable/lib/Text/SimpleTable.pm" + url = "http://search.cpan.org/CPAN/authors/id/M/MR/MRAMBERG/Text-SimpleTable-2.04.tar.gz" + + version('2.04', '550136523c8da37b616988f9a5f58d59') -- cgit v1.2.3-70-g09d2 From fde1e0ecb88fee713b7e9cd6b076f496ec1e8d24 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Thu, 12 Apr 2018 13:31:18 -0500 Subject: supernova: new package (#7719) * runing a test * supernova: new package * removed with working_dir line --- .../repos/builtin/packages/supernova/package.py | 65 ++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 var/spack/repos/builtin/packages/supernova/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/supernova/package.py b/var/spack/repos/builtin/packages/supernova/package.py new file mode 100644 index 0000000000..3e6ac97bc2 --- /dev/null +++ b/var/spack/repos/builtin/packages/supernova/package.py @@ -0,0 +1,65 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +from distutils.dir_util import copy_tree +import os + + +class Supernova(Package): + """Supernova is a software package for de novo assembly from Chromium + Linked-Reads that are made from a single whole-genome library from an + individual DNA source. + + A key feature of Supernova is that it creates diploid assemblies, thus + separately representing maternal and paternal chromosomes over very long + distances. Almost all other methods instead merge homologous chromosomes + into single incorrect 'consensus' sequences. Supernova is the only + practical method for creating diploid assemblies of large genomes. + + To install this package, you will need to go to the supernova download + page of supernova, register with your email address and download + supernova yourself. Spack will search your current directory for the + download file. Alternatively, add this file yo a mirror so that Spack + can find it. For instructions on how to set up a mirror, see + http://spack.readthedocs.io/en/latest/mirrors.html""" + + homepage = "https://support.10xgenomics.com/de-novo-assembly/software/overview/latest/welcome" + + version('2.0.1', '3697ce043c798fcb672fe0a66c56d6f0') + + depends_on('bcl2fastq2') + + def url_for_version(self, version): + return "file://{0}/supernova-{1}.tar.gz".format(os.getcwd(), version) + + def setup_environment(self, spack_env, run_env): + run_env.prepend_path('PATH', self.prefix) + + def install(self, spec, prefix): + rm = which('rm') + # remove the broken symlinks + rm('anaconda-cs/2.2.0-anaconda-cs-c7/lib/libtcl.so', + 'anaconda-cs/2.2.0-anaconda-cs-c7/lib/libtk.so') + copy_tree('.', prefix, preserve_symlinks=1) -- cgit v1.2.3-70-g09d2 From 11cbee6e92d0e8790b902ac22a829d96ed4ca581 Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 12 Apr 2018 14:02:37 -0500 Subject: perl-perlio-utf8-strict: Create new package (#7738) --- .../packages/perl-perlio-utf8-strict/package.py | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-perlio-utf8-strict/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-perlio-utf8-strict/package.py b/var/spack/repos/builtin/packages/perl-perlio-utf8-strict/package.py new file mode 100644 index 0000000000..67c76973ca --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-perlio-utf8-strict/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlPerlioUtf8Strict(PerlPackage): + """This module provides a fast and correct UTF-8 PerlIO layer.""" + + homepage = "http://search.cpan.org/~leont/PerlIO-utf8_strict/lib/PerlIO/utf8_strict.pm" + url = "http://search.cpan.org/CPAN/authors/id/L/LE/LEONT/PerlIO-utf8_strict-0.002.tar.gz" + + version('0.002', '2e5b13efe6dfd7748e44e47f6dedb1da') -- cgit v1.2.3-70-g09d2 From f5e4befcacbb73f93538bcea4eb308488082fed1 Mon Sep 17 00:00:00 2001 From: Howard Pritchard Date: Thu, 12 Apr 2018 13:51:25 -0600 Subject: UCX: update for release 1.3.0 (#7740) Signed-off-by: Howard Pritchard --- var/spack/repos/builtin/packages/ucx/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ucx/package.py b/var/spack/repos/builtin/packages/ucx/package.py index 42e2dbd414..e5635c28cb 100644 --- a/var/spack/repos/builtin/packages/ucx/package.py +++ b/var/spack/repos/builtin/packages/ucx/package.py @@ -33,7 +33,8 @@ class Ucx(AutotoolsPackage): url = "https://github.com/openucx/ucx/releases/download/v1.2.1/ucx-1.2.1.tar.gz" # Current - version('1.2.2', 'ff3fe65e4ebe78408fc3151a9ce5d286') + version('1.3.0', '2fdc3028eac3ef3ee1b1b523d170c071') # Still supported + version('1.2.2', 'ff3fe65e4ebe78408fc3151a9ce5d286') version('1.2.1', '697c2fd7912614fb5a1dadff3bfa485c') -- cgit v1.2.3-70-g09d2 From 7d8e6b2edacc5c973c867fef4db7a319c94ba11d Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Thu, 12 Apr 2018 14:51:51 -0500 Subject: New package r-tmixclust (#7658) * r-tmixclust: new package * r-cluster: hash changed * r-cluster: removed 2.0.6 and added the latest 2.0.7-1 --- .../repos/builtin/packages/r-cluster/package.py | 2 +- .../repos/builtin/packages/r-tmixclust/package.py | 49 ++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 var/spack/repos/builtin/packages/r-tmixclust/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-cluster/package.py b/var/spack/repos/builtin/packages/r-cluster/package.py index 64fec7b0dd..5a7e222a14 100644 --- a/var/spack/repos/builtin/packages/r-cluster/package.py +++ b/var/spack/repos/builtin/packages/r-cluster/package.py @@ -34,6 +34,6 @@ class RCluster(RPackage): url = "https://cran.rstudio.com/src/contrib/cluster_2.0.6.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/cluster" - version('2.0.6', 'e7d0660b05c65f4d886ebf7f046939ab') + version('2.0.7-1', 'a37add21b91d3e4f3883d005331e0d45') version('2.0.5', '7330f209ebce960bdee1a6d6679cb85a') version('2.0.4', 'bb4deceaafb1c42bb1278d5d0dc11e59') diff --git a/var/spack/repos/builtin/packages/r-tmixclust/package.py b/var/spack/repos/builtin/packages/r-tmixclust/package.py new file mode 100644 index 0000000000..d36787c8b9 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-tmixclust/package.py @@ -0,0 +1,49 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RTmixclust(RPackage): + """Implementation of a clustering method for time series gene expression + data based on mixed-effects models with Gaussian variables and + non-parametric cubic splines estimation. The method can robustly account + for the high levels of noise present in typical gene expression time + series datasets.""" + + homepage = "https://bioconductor.org/packages/TMixClust/" + url = "https://git.bioconductor.org/packages/TMixClust" + + version('1.0.1', git='https://git.bioconductor.org/packages/TMixClust', + commit='0ac800210e3eb9da911767a80fb5582ab33c0cad') + + depends_on('r-gss', type=('build', 'run')) + depends_on('r-mvtnorm', type=('build', 'run')) + depends_on('r-zoo', type=('build', 'run')) + depends_on('r-cluster', type=('build', 'run')) + depends_on('r-biocparallel', type=('build', 'run')) + depends_on('r-flexclust', type=('build', 'run')) + depends_on('r-biobase', type=('build', 'run')) + depends_on('r-spem', type=('build', 'run')) + depends_on('r@3.4.3:3.4.9', when='@1.0.1') -- cgit v1.2.3-70-g09d2 From 0091fda57bd358f55ff9e6d9523bb13a632d40db Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 12 Apr 2018 15:56:07 -0500 Subject: perl-contextual-return: Create new package (#7741) * perl-contextual-return: Create new package * perl-contextual-return: Fix homepage url --- .../packages/perl-contextual-return/package.py | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-contextual-return/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-contextual-return/package.py b/var/spack/repos/builtin/packages/perl-contextual-return/package.py new file mode 100644 index 0000000000..8ed3db939a --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-contextual-return/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlContextualReturn(PerlPackage): + """Create context-sensitive return values""" + + homepage = "http://search.cpan.org/~dconway/Contextual-Return/lib/Contextual/Return.pm" + url = "http://search.cpan.org/CPAN/authors/id/D/DC/DCONWAY/Contextual-Return-0.004008.tar.gz" + + version('0.004014', '5cb31f1637c17af6a8e5b852d820af79') + + depends_on('perl-want') -- cgit v1.2.3-70-g09d2 From 21914d36beb54b0f59638584ceafeb6b28ff97e0 Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 12 Apr 2018 22:45:21 -0500 Subject: py-illumina-utils: Create new package (#7745) * py-illumina-utils: Create new package * fix dependency types --- .../builtin/packages/py-illumina-utils/package.py | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-illumina-utils/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-illumina-utils/package.py b/var/spack/repos/builtin/packages/py-illumina-utils/package.py new file mode 100644 index 0000000000..1fec2f5ae7 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-illumina-utils/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyIlluminaUtils(PythonPackage): + """A library and collection of scripts to work with Illumina paired-end + data (for CASAVA 1.8+).""" + + homepage = "https://github.com/meren/illumina-utils" + url = "https://pypi.io/packages/source/i/illumina-utils/illumina-utils-2.2.tar.gz" + + version('2.3', 'c0af71723e52ab2b14660d2138620e39') + version('2.2', '9e19cf112ccc38a903fc41f431804d21') + + depends_on('python@3:', type=('build', 'run')) + depends_on('py-pip', type='build') + depends_on('py-setuptools', type='build') + depends_on('py-matplotlib', type=('build', 'run')) + depends_on('py-numpy', type=('build', 'run')) + depends_on('py-python-levenshtein', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From b9b19e1660b92090cb519b8eccba46c08104edd8 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Fri, 13 Apr 2018 00:08:10 -0500 Subject: Fix www.example.com homepages (#7744) --- var/spack/repos/builtin/packages/py-editdistance/package.py | 2 +- var/spack/repos/builtin/packages/r-cner/package.py | 2 +- var/spack/repos/builtin/packages/r-genomeinfodbdata/package.py | 2 +- var/spack/repos/builtin/packages/r-org-hs-eg-db/package.py | 2 +- var/spack/repos/builtin/packages/r-phangorn/package.py | 2 +- var/spack/repos/builtin/packages/r-yarn/package.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-editdistance/package.py b/var/spack/repos/builtin/packages/py-editdistance/package.py index a36b40ea9b..a62c6e49c5 100644 --- a/var/spack/repos/builtin/packages/py-editdistance/package.py +++ b/var/spack/repos/builtin/packages/py-editdistance/package.py @@ -28,7 +28,7 @@ from spack import * class PyEditdistance(PythonPackage): """Fast implementation of the edit distance (Levenshtein distance).""" - homepage = "http://www.example.com://github.com/aflc/editdistance" + homepage = "https://github.com/aflc/editdistance" url = "https://pypi.io/packages/source/e/editdistance/editdistance-0.4.tar.gz" version('0.4', '27434720ca0930a9b6974b182b6237bc') diff --git a/var/spack/repos/builtin/packages/r-cner/package.py b/var/spack/repos/builtin/packages/r-cner/package.py index 9ba532db40..3af527dec1 100644 --- a/var/spack/repos/builtin/packages/r-cner/package.py +++ b/var/spack/repos/builtin/packages/r-cner/package.py @@ -29,7 +29,7 @@ class RCner(RPackage): """"Large-scale identification and advanced visualization of sets of conserved noncoding elements.""" - homepage = "http://www.example.co://bioconductor.org/packages/CNEr/" + homepage = "https://bioconductor.org/packages/CNEr/" url = "https://git.bioconductor.org/packages/CNEr" version('1.14.0', git='https://git.bioconductor.org/packages/CNEr', commit='b8634d65c51728c815127e22b45eba7c9b9db897') diff --git a/var/spack/repos/builtin/packages/r-genomeinfodbdata/package.py b/var/spack/repos/builtin/packages/r-genomeinfodbdata/package.py index 819d0a77ed..92e6ba4089 100644 --- a/var/spack/repos/builtin/packages/r-genomeinfodbdata/package.py +++ b/var/spack/repos/builtin/packages/r-genomeinfodbdata/package.py @@ -29,7 +29,7 @@ class RGenomeinfodbdata(RPackage): """for mapping between NCBI taxonomy ID and species. Used by functions in the GenomeInfoDb package.""" - homepage = "http://www.example.co://bioconductor.org/packages/3.5/data/annotation/html/GenomeInfoDbData.html" + homepage = "https://bioconductor.org/packages/GenomeInfoDbData/" url = "https://bioconductor.org/packages/3.5/data/annotation/src/contrib/GenomeInfoDbData_0.99.0.tar.gz" version('0.99.0', '85977b51061dd02a90153db887040d05') diff --git a/var/spack/repos/builtin/packages/r-org-hs-eg-db/package.py b/var/spack/repos/builtin/packages/r-org-hs-eg-db/package.py index 406dd906bc..a781deb8d0 100644 --- a/var/spack/repos/builtin/packages/r-org-hs-eg-db/package.py +++ b/var/spack/repos/builtin/packages/r-org-hs-eg-db/package.py @@ -29,7 +29,7 @@ class ROrgHsEgDb(RPackage): """Genome wide annotation for Human, primarily based on mapping using Entrez Gene identifiers.""" - homepage = "http://www.example.co://www.bioconductor.org/packages/org.Hs.eg.db/i" + homepage = "https://bioconductor.org/packages/org.Hs.eg.db/" url = "https://www.bioconductor.org/packages/3.5/data/annotation/src/contrib/org.Hs.eg.db_3.4.1.tar.gz" version('3.4.1', '0a987ef7d6167df70e91e6f48145e41c') diff --git a/var/spack/repos/builtin/packages/r-phangorn/package.py b/var/spack/repos/builtin/packages/r-phangorn/package.py index 7997da7110..b43c9ce825 100644 --- a/var/spack/repos/builtin/packages/r-phangorn/package.py +++ b/var/spack/repos/builtin/packages/r-phangorn/package.py @@ -31,7 +31,7 @@ class RPhangorn(RPackage): and Hadamard conjugation. Allows to compare trees, models selection and offers visualizations for trees and split networks.""" - homepage = "http://www.example.co://github.com/KlausVigo/phangorn" + homepage = "https://cran.r-project.org/package=phangorn" url = "https://cran.r-project.org/src/contrib/phangorn_2.3.1.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/phangorn" diff --git a/var/spack/repos/builtin/packages/r-yarn/package.py b/var/spack/repos/builtin/packages/r-yarn/package.py index 5ae0139ad1..6744f9cde1 100644 --- a/var/spack/repos/builtin/packages/r-yarn/package.py +++ b/var/spack/repos/builtin/packages/r-yarn/package.py @@ -33,7 +33,7 @@ class RYarn(RPackage): and statistical techniques to account for the large heterogeneity and sparsity found in very large RNA-seq experiments.""" - homepage = "http://www.example.co://www.bioconductor.org/packages/yarn/" + homepage = "https://bioconductor.org/packages/yarn/" url = "https://git.bioconductor.org/packages/yarn" list_url = homepage -- cgit v1.2.3-70-g09d2 From ef253f9db4b742f2ce0d97d99cce9d3140b9b9c9 Mon Sep 17 00:00:00 2001 From: Raghu Raja Date: Fri, 13 Apr 2018 01:09:54 -0600 Subject: libfabric: added v1.6.0 and v1.5.3 (#7742) --- var/spack/repos/builtin/packages/libfabric/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libfabric/package.py b/var/spack/repos/builtin/packages/libfabric/package.py index 27e686db3c..7a6c57a3b5 100644 --- a/var/spack/repos/builtin/packages/libfabric/package.py +++ b/var/spack/repos/builtin/packages/libfabric/package.py @@ -30,8 +30,10 @@ class Libfabric(AutotoolsPackage): fabric communication services to applications.""" homepage = "https://libfabric.org/" - url = "https://github.com/ofiwg/libfabric/releases/download/v1.5.0/libfabric-1.5.0.tar.gz" + url = "https://github.com/ofiwg/libfabric/releases/download/v1.6.0/libfabric-1.6.0.tar.gz" + version('1.6.0', '91d63ab3c0b9724a4db660019f928cab') + version('1.5.3', '1fe07e972fe487c6a3e44c0fb68b49a2') version('1.5.0', 'fda3e9b31ebe184f5157288d059672d6') version('1.4.2', '2009c8e0817060fb99606ddbf6c5ccf8') -- cgit v1.2.3-70-g09d2 From 94fbd7b60d3610d4fdb6a4d55bca5158b6e1d29a Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Fri, 13 Apr 2018 15:58:58 +0200 Subject: flux: changed default value for doc variant to False (#7749) fixes #2095 --- var/spack/repos/builtin/packages/flux/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/flux/package.py b/var/spack/repos/builtin/packages/flux/package.py index 22c919f25b..2e8ab8c889 100644 --- a/var/spack/repos/builtin/packages/flux/package.py +++ b/var/spack/repos/builtin/packages/flux/package.py @@ -36,7 +36,7 @@ class Flux(AutotoolsPackage): version('master', branch='master', git='https://github.com/flux-framework/flux-core') - variant('doc', default=True, description='Build flux manpages') + variant('doc', default=False, description='Build flux manpages') depends_on("zeromq@4.0.4:") depends_on("czmq@2.2:") -- cgit v1.2.3-70-g09d2 From eaaf1666ba0c247bc728c9df285cf2694411c53f Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 13 Apr 2018 16:58:13 -0500 Subject: tk: Add version 8.6.8 (#7757) --- var/spack/repos/builtin/packages/tk/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/tk/package.py b/var/spack/repos/builtin/packages/tk/package.py index 46f2ab307f..d765514bcf 100644 --- a/var/spack/repos/builtin/packages/tk/package.py +++ b/var/spack/repos/builtin/packages/tk/package.py @@ -35,6 +35,7 @@ class Tk(AutotoolsPackage): homepage = "http://www.tcl.tk" url = "http://prdownloads.sourceforge.net/tcl/tk8.6.5-src.tar.gz" + version('8.6.8', '5e0faecba458ee1386078fb228d008ba') version('8.6.6', 'dd7dbb3a6523c42d05f6ab6e86096e99') version('8.6.5', '11dbbd425c3e0201f20d6a51482ce6c4') version('8.6.3', '85ca4dbf4dcc19777fd456f6ee5d0221') -- cgit v1.2.3-70-g09d2 From d602d04d466a161b22963918752fa961b06aed90 Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 13 Apr 2018 16:58:25 -0500 Subject: tcl: Add version 8.6.8 (#7756) --- var/spack/repos/builtin/packages/tcl/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/tcl/package.py b/var/spack/repos/builtin/packages/tcl/package.py index 15891af2e1..6c4278d514 100644 --- a/var/spack/repos/builtin/packages/tcl/package.py +++ b/var/spack/repos/builtin/packages/tcl/package.py @@ -39,6 +39,7 @@ class Tcl(AutotoolsPackage): homepage = "http://www.tcl.tk" url = "http://prdownloads.sourceforge.net/tcl/tcl8.6.5-src.tar.gz" + version('8.6.8', '81656d3367af032e0ae6157eff134f89') version('8.6.6', '5193aea8107839a79df8ac709552ecb7') version('8.6.5', '0e6426a4ca9401825fbc6ecf3d89a326') version('8.6.4', 'd7cbb91f1ded1919370a30edd1534304') -- cgit v1.2.3-70-g09d2 From b6a130703d1065a00f48588c4cf94d6be5de8733 Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 13 Apr 2018 16:58:39 -0500 Subject: prank: Add version 170427 (#7755) --- var/spack/repos/builtin/packages/prank/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/prank/package.py b/var/spack/repos/builtin/packages/prank/package.py index 8c3ae1805d..7d34baf695 100644 --- a/var/spack/repos/builtin/packages/prank/package.py +++ b/var/spack/repos/builtin/packages/prank/package.py @@ -31,6 +31,7 @@ class Prank(Package): homepage = "http://wasabiapp.org/software/prank/" url = "http://wasabiapp.org/download/prank/prank.source.150803.tgz" + version('170427', 'a5cda14dc4e5efe1f14b84eb7a7caabd') version('150803', '71ac2659e91c385c96473712c0a23e8a') depends_on('mafft') -- cgit v1.2.3-70-g09d2 From 1d0ecce49f276a868517dd1d166874542f99228d Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 13 Apr 2018 16:58:51 -0500 Subject: perl-devel-overloadinfo: Add version 0.005 (#7754) --- var/spack/repos/builtin/packages/perl-devel-overloadinfo/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-devel-overloadinfo/package.py b/var/spack/repos/builtin/packages/perl-devel-overloadinfo/package.py index 4383af4a83..eac454c8bc 100644 --- a/var/spack/repos/builtin/packages/perl-devel-overloadinfo/package.py +++ b/var/spack/repos/builtin/packages/perl-devel-overloadinfo/package.py @@ -31,6 +31,7 @@ class PerlDevelOverloadinfo(PerlPackage): homepage = "http://search.cpan.org/~ilmari/Devel-OverloadInfo-0.004/lib/Devel/OverloadInfo.pm" url = "http://search.cpan.org/CPAN/authors/id/I/IL/ILMARI/Devel-OverloadInfo-0.004.tar.gz" + version('0.005', '607b65dfe9fdb47df780f3b22dcb7917') version('0.004', '97a27e31858b073daba54121d57be705') depends_on('perl-mro-compat', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From c8f78676ebbcfa83ce9989b397fbd4a49e9cd541 Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 13 Apr 2018 19:08:13 -0500 Subject: perl-moose: Add versions 2.2007,2.2009,2.2010 (#7758) --- var/spack/repos/builtin/packages/perl-moose/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-moose/package.py b/var/spack/repos/builtin/packages/perl-moose/package.py index d5920bfcd6..7854e834de 100644 --- a/var/spack/repos/builtin/packages/perl-moose/package.py +++ b/var/spack/repos/builtin/packages/perl-moose/package.py @@ -31,6 +31,9 @@ class PerlMoose(PerlPackage): homepage = "http://search.cpan.org/~ether/Moose-2.2006/lib/Moose.pm" url = "http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/Moose-2.2006.tar.gz" + version('2.2010', '636238ac384818ee1e92eff6b9ecc50a') + version('2.2009', '5527b1a5abc29b5c57fc488447e76ccd') + version('2.2007', 'de487ae226003f7e7f22c0fd8f0074e6') version('2.2006', '929c6b3877a6054ef617cf7ef1e220b5') depends_on('perl-cpan-meta-check', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From dae4653920c6b32525dedb5b123072eeb869b5cd Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Sat, 14 Apr 2018 13:14:38 -0600 Subject: eospac: initial commit (#7761) * eospac: initial commit * eospac: add stable version --- var/spack/repos/builtin/packages/eospac/package.py | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 var/spack/repos/builtin/packages/eospac/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/eospac/package.py b/var/spack/repos/builtin/packages/eospac/package.py new file mode 100644 index 0000000000..f2ac07bcdc --- /dev/null +++ b/var/spack/repos/builtin/packages/eospac/package.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2018, Los Alamos National Security, LLC +# Produced at the Los Alamos National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class Eospac(Package): + """A collection of C routines that can be used to access the Sesame data + library. + """ + + homepage = "https://laws.lanl.gov/projects/data/eos.html" + list_url = "https://laws.lanl.gov/projects/data/eos/eospacReleases.php" + + version('6.4.0beta.1_r20171213193219', 'e4e4beabf946f0b8953532832002afc2') + version('6.3.1_r20161202150449', '549fda008c4169a69b02ec2a9de1e434', preferred=True) + + def url_for_version(self, version): + return "https://laws.lanl.gov/projects/data/eos/get_file.php?package=eospac&filename=eospac_v{0}.tgz".format(version) + + def install(self, spec, prefix): + with working_dir('Source'): + make('prefix=%s' % self.spec.prefix, 'install') -- cgit v1.2.3-70-g09d2 From 826c1f88a32a210074f32230556f38816f45fd9e Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Sat, 14 Apr 2018 16:18:11 -0600 Subject: votca-moo: removal (#7762) votca-moo is now part of votca-ctp (see votca/ctp#93) --- .../repos/builtin/packages/votca-ctp/package.py | 1 - .../repos/builtin/packages/votca-moo/package.py | 43 ---------------------- .../repos/builtin/packages/votca-xtp/package.py | 1 - 3 files changed, 45 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/votca-moo/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/votca-ctp/package.py b/var/spack/repos/builtin/packages/votca-ctp/package.py index f02c7eb564..0d56af5319 100644 --- a/var/spack/repos/builtin/packages/votca-ctp/package.py +++ b/var/spack/repos/builtin/packages/votca-ctp/package.py @@ -42,4 +42,3 @@ class VotcaCtp(CMakePackage): depends_on("cmake@2.8:", type='build') depends_on("votca-tools@develop", when='@develop') depends_on("votca-csg@develop", when='@develop') - depends_on("votca-moo@develop", when='@develop') diff --git a/var/spack/repos/builtin/packages/votca-moo/package.py b/var/spack/repos/builtin/packages/votca-moo/package.py deleted file mode 100644 index 308d28aab1..0000000000 --- a/var/spack/repos/builtin/packages/votca-moo/package.py +++ /dev/null @@ -1,43 +0,0 @@ -############################################################################# -# Copyright (c) 2017, The VOTCA Development Team (http://www.votca.org) -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## - -from spack import * - - -class VotcaMoo(CMakePackage): - """Versatile Object-oriented Toolkit for Coarse-graining - Applications (VOTCA) is a package intended to reduce the amount of - routine work when doing systematic coarse-graining of various - systems. The core is written in C++. - - This package contains the VOTCA molecular orbital module. - """ - homepage = "http://www.votca.org" - # No release yet - # url = "https://github.com/votca/moo/tarball/v1.4" - - version('develop', git='https://github.com/votca/moo', branch='master') - - depends_on("cmake@2.8:", type='build') - depends_on("votca-tools@develop", when='@develop') diff --git a/var/spack/repos/builtin/packages/votca-xtp/package.py b/var/spack/repos/builtin/packages/votca-xtp/package.py index e2b8ee059e..8723001a2e 100644 --- a/var/spack/repos/builtin/packages/votca-xtp/package.py +++ b/var/spack/repos/builtin/packages/votca-xtp/package.py @@ -45,4 +45,3 @@ class VotcaXtp(CMakePackage): depends_on("votca-csg@develop", when='@develop') depends_on("votca-csg@1.4:1.4.999", when='@1.4:1.4.999') depends_on("votca-ctp@develop", when='@develop') - depends_on("votca-moo@develop", when='@develop') -- cgit v1.2.3-70-g09d2 From d0c388ca68c28a297f46d662cba272bd5136bc78 Mon Sep 17 00:00:00 2001 From: healther Date: Mon, 16 Apr 2018 17:13:06 +0200 Subject: add version 2.0.9 to py-slurm-pipeline (#7771) Change-Id: I6b597076b0740d65b8aeaebf95f459745b1b1503 --- var/spack/repos/builtin/packages/py-slurm-pipeline/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-slurm-pipeline/package.py b/var/spack/repos/builtin/packages/py-slurm-pipeline/package.py index 3a0521530d..c12092d9dc 100644 --- a/var/spack/repos/builtin/packages/py-slurm-pipeline/package.py +++ b/var/spack/repos/builtin/packages/py-slurm-pipeline/package.py @@ -31,6 +31,7 @@ class PySlurmPipeline(PythonPackage): homepage = "https://github.com/acorg/slurm-pipeline" url = "https://pypi.io/packages/source/s/slurm-pipeline/slurm-pipeline-1.1.13.tar.gz" + version('2.0.9', '7f97d2410db441081b79ac5c3395b8d0') version('1.1.13', 'd1f8c78a64718ec5e2e40ba1b6816017') depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From 33f2200bf768354a9ad96ff868bcadf19c28e98a Mon Sep 17 00:00:00 2001 From: Matteo Guglielmi Date: Mon, 16 Apr 2018 17:13:45 +0200 Subject: r-deseq2: package update (#7770) --- var/spack/repos/builtin/packages/r-deseq2/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-deseq2/package.py b/var/spack/repos/builtin/packages/r-deseq2/package.py index 5a81c6699d..b9007190f2 100644 --- a/var/spack/repos/builtin/packages/r-deseq2/package.py +++ b/var/spack/repos/builtin/packages/r-deseq2/package.py @@ -34,9 +34,10 @@ class RDeseq2(RPackage): homepage = "https://www.bioconductor.org/packages/DESeq2/" url = "https://git.bioconductor.org/packages/DESeq2" + version('1.18.1', git='https://git.bioconductor.org/packages/DESeq2', commit='ef65091d46436af68915124b752f5e1cc55e93a7') version('1.16.1', git='https://git.bioconductor.org/packages/DESeq2', commit='0a815574382704a08ef8b906eceb0296f81cded5') - depends_on('r@3.4.0:3.4.9', when='@1.16.1') + depends_on('r@3.4.0:3.4.9', when='@1.16.1:') depends_on("r-rcpparmadillo", type=('build', 'run')) depends_on('r-s4vectors', type=('build', 'run')) depends_on('r-iranges', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 3ae6dd9f64ad6063910c8aeec048ca41839068f1 Mon Sep 17 00:00:00 2001 From: Matteo Guglielmi Date: Mon, 16 Apr 2018 17:14:00 +0200 Subject: r-matrix: package update (#7769) --- var/spack/repos/builtin/packages/r-matrix/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-matrix/package.py b/var/spack/repos/builtin/packages/r-matrix/package.py index f2c6fee3e8..bd6b5dfd4a 100644 --- a/var/spack/repos/builtin/packages/r-matrix/package.py +++ b/var/spack/repos/builtin/packages/r-matrix/package.py @@ -30,9 +30,10 @@ class RMatrix(RPackage): using 'LAPACK' and 'SuiteSparse'.""" homepage = "http://matrix.r-forge.r-project.org/" - url = "https://cran.rstudio.com/src/contrib/Matrix_1.2-11.tar.gz" + url = "https://cran.rstudio.com/src/contrib/Matrix_1.2-14.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/Matrix" + version('1.2-14', 'b2babcf1515625196b75592c9b345bba') version('1.2-12', '0ade6e374716f08650cc8b8da99a313c') version('1.2-11', 'b7d2a639aa52228dfde7c3c3ee68b38e') version('1.2-8', '4a6406666bf97d3ec6b698eea5d9c0f5') -- cgit v1.2.3-70-g09d2 From be934c5781e5ed4d9a935025564662702001696e Mon Sep 17 00:00:00 2001 From: Matteo Guglielmi Date: Mon, 16 Apr 2018 17:14:20 +0200 Subject: r-data-table: package update (#7768) --- var/spack/repos/builtin/packages/r-data-table/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-data-table/package.py b/var/spack/repos/builtin/packages/r-data-table/package.py index 9698ea2fcd..6080989f79 100644 --- a/var/spack/repos/builtin/packages/r-data-table/package.py +++ b/var/spack/repos/builtin/packages/r-data-table/package.py @@ -35,6 +35,7 @@ class RDataTable(RPackage): url = "https://cran.r-project.org/src/contrib/data.table_1.10.0.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/data.table" + version('1.10.4-3', '081da241d06f30ae4a2bc60efb409893') version('1.10.4-2', '4a2d3541f241088d0979522b4083a765') version('1.10.0', 'f0e08dd5ba1b3f46c59dd1574fe497c1') version('1.9.6', 'b1c0c7cce490bdf42ab288541cc55372') -- cgit v1.2.3-70-g09d2 From 63d8f87f54f6536e3d00b66a8a02449a65a996fc Mon Sep 17 00:00:00 2001 From: Matteo Guglielmi Date: Mon, 16 Apr 2018 17:16:00 +0200 Subject: r-hmisc: package update (#7766) --- var/spack/repos/builtin/packages/r-hmisc/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-hmisc/package.py b/var/spack/repos/builtin/packages/r-hmisc/package.py index 245662f3f9..a3824c3789 100644 --- a/var/spack/repos/builtin/packages/r-hmisc/package.py +++ b/var/spack/repos/builtin/packages/r-hmisc/package.py @@ -34,9 +34,10 @@ class RHmisc(RPackage): code, and recoding variables.""" homepage = "http://biostat.mc.vanderbilt.edu/Hmisc" - url = "https://cran.rstudio.com/src/contrib/Hmisc_4.0-3.tar.gz" + url = "https://cran.rstudio.com/src/contrib/Hmisc_4.1-1.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/Hmisc" + version('4.1-1', 'd255611f2b108d3cc0212b8a98fef6e3') version('4.0-3', '7091924db1e473419d8116c3335f82da') depends_on('r-lattice', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 61b3e60f1fd5f9fac4986be8e28d538b14e097ea Mon Sep 17 00:00:00 2001 From: "Michael F. Herbst" Date: Mon, 16 Apr 2018 18:49:13 +0200 Subject: Add libcint version 3.0.11 (#7764) --- var/spack/repos/builtin/packages/libcint/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libcint/package.py b/var/spack/repos/builtin/packages/libcint/package.py index 498f29b8b6..e074367aa0 100644 --- a/var/spack/repos/builtin/packages/libcint/package.py +++ b/var/spack/repos/builtin/packages/libcint/package.py @@ -35,6 +35,7 @@ class Libcint(CMakePackage): # # Versions # + version('3.0.11', '1fb1db5a426280d38cddbb0098f6c678') version('3.0.10', 'b368e257dba99febf1cdd1391f2e58a3') version('3.0.8', '61f415ad9c7854963136c6bba7a661eb') version('3.0.7', 'f0f3c971c0d5bb5565ac9ab5e271aa79') -- cgit v1.2.3-70-g09d2 From 385a209ff928019536d598b06f3effcdf808f278 Mon Sep 17 00:00:00 2001 From: Matteo Guglielmi Date: Mon, 16 Apr 2018 18:49:40 +0200 Subject: r-limma: package update (#7763) * r-limma: package update * r-limma: dependency fix --- var/spack/repos/builtin/packages/r-limma/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-limma/package.py b/var/spack/repos/builtin/packages/r-limma/package.py index 245633e270..78d513b80c 100644 --- a/var/spack/repos/builtin/packages/r-limma/package.py +++ b/var/spack/repos/builtin/packages/r-limma/package.py @@ -33,7 +33,8 @@ class RLimma(RPackage): url = "https://git.bioconductor.org/packages/limma" list_url = homepage + version('3.34.9', git='https://git.bioconductor.org/packages/limma', commit='6755278a929f942a49e2441fb002a3ed393e1139') version('3.32.10', git='https://git.bioconductor.org/packages/limma', commit='593edf28e21fe054d64137ae271b8a52ab05bc60') version('3.32.6', 'df5dc2b85189a24e939efa3a8e6abc41') - depends_on('r@3.4.0:3.4.9', when='@3.32.10') + depends_on('r@3.4.0:3.4.9', when='@3.32.10:') -- cgit v1.2.3-70-g09d2 From 625ead40e37596dc3ec99c12a9951bb77f768357 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Mon, 16 Apr 2018 15:54:05 -0500 Subject: fermikit: new package (#7775) --- .../repos/builtin/packages/fermikit/package.py | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/fermikit/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fermikit/package.py b/var/spack/repos/builtin/packages/fermikit/package.py new file mode 100644 index 0000000000..3ad9f6689d --- /dev/null +++ b/var/spack/repos/builtin/packages/fermikit/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Fermikit(MakefilePackage): + """De novo assembly based variant calling pipeline for Illumina short + reads""" + + homepage = "https://github.com/lh3/fermikit" + + version('2017-11-7', git='https://github.com/lh3/fermikit.git', commit='bf9c7112221577ba110665bddca8f1987250bdc7', submodules=True) + + depends_on('zlib') + + def install(self, spec, prefix): + install_tree('fermi.kit', prefix.bin) -- cgit v1.2.3-70-g09d2 From e94808a56000054c29da57c6e5bce09da335a2ee Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Mon, 16 Apr 2018 16:06:09 -0500 Subject: miniasm: new package (#7772) --- .../repos/builtin/packages/miniasm/package.py | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/miniasm/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/miniasm/package.py b/var/spack/repos/builtin/packages/miniasm/package.py new file mode 100644 index 0000000000..0de8451fe2 --- /dev/null +++ b/var/spack/repos/builtin/packages/miniasm/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Miniasm(MakefilePackage): + """Miniasm is a very fast OLC-based de novo assembler for noisy long + reads.""" + + homepage = "http://www.example.co://github.com/lh3/miniasm" + + version('2018-3-30', git='https://github.com/lh3/miniasm.git', commit='55cf0189e2f7d5bda5868396cebe066eec0a9547') + + depends_on('zlib') + + def install(self, spec, prefix): + install_tree('.', prefix.bin) -- cgit v1.2.3-70-g09d2 From b6d3feba20fc4eaf687925ce24ad3637b9479184 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Mon, 16 Apr 2018 15:56:37 -0600 Subject: ospac: fix compiler usage and install (#7776) --- var/spack/repos/builtin/packages/eospac/package.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/eospac/package.py b/var/spack/repos/builtin/packages/eospac/package.py index f2ac07bcdc..b3eb1f84ab 100644 --- a/var/spack/repos/builtin/packages/eospac/package.py +++ b/var/spack/repos/builtin/packages/eospac/package.py @@ -42,4 +42,13 @@ class Eospac(Package): def install(self, spec, prefix): with working_dir('Source'): - make('prefix=%s' % self.spec.prefix, 'install') + make('install', + 'CC={0}'.format(spack_cc), + 'CXX={0}'.format(spack_cxx), + 'F77={0}'.format(spack_f77), + 'F90={0}'.format(spack_fc), + 'prefix={0}'.format(prefix), + 'INSTALLED_LIBRARY_DIR={0}'.format(prefix.lib), + 'INSTALLED_INCLUDE_DIR={0}'.format(prefix.include), + 'INSTALLED_EXAMPLE_DIR={0}'.format(prefix.example), + 'INSTALLED_BIN_DIR={0}'.format(prefix.bin)) -- cgit v1.2.3-70-g09d2 From 1c8df39024347c3b9359e91f985828bedc0c7782 Mon Sep 17 00:00:00 2001 From: Matteo Guglielmi Date: Tue, 17 Apr 2018 14:26:37 +0200 Subject: r-htmltable: package update (#7767) * r-htmltable: package update * r-htmltable: dependency fix * r-htmltable: dependency fix #2 * r-htmltable: dependency fix #3 --- var/spack/repos/builtin/packages/r-htmltable/package.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-htmltable/package.py b/var/spack/repos/builtin/packages/r-htmltable/package.py index 14b91f3b5c..f13f8dd488 100644 --- a/var/spack/repos/builtin/packages/r-htmltable/package.py +++ b/var/spack/repos/builtin/packages/r-htmltable/package.py @@ -35,13 +35,15 @@ class RHtmltable(RPackage): compatible with HTML/'LaTeX'.""" homepage = "https://CRAN.R-project.org/package=htmlTable" - url = "https://cran.rstudio.com/src/contrib/htmlTable_1.9.tar.gz" + url = "https://cran.rstudio.com/src/contrib/htmlTable_1.11.2.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/htmlTable" + version('1.11.2', '473e6d486e7714f8dd7f16a31480c896') version('1.9', '08c62c19e1ffe570e7d8fa57db5094b9') depends_on('r-stringr', type=('build', 'run')) - depends_on('r-knitr', type=('build', 'run')) - depends_on('r-magrittr', type=('build', 'run')) + depends_on('r-knitr@1.6:', type=('build', 'run')) + depends_on('r-magrittr@1.5:', type=('build', 'run')) depends_on('r-checkmate', type=('build', 'run')) depends_on('r-htmlwidgets', type=('build', 'run')) + depends_on('r-rstudioapi@0.6:', type=('build', 'run'), when="@1.11.0:") -- cgit v1.2.3-70-g09d2 From f4cc57261b14b081f908349a15ab9f725daf7bdb Mon Sep 17 00:00:00 2001 From: Matteo Guglielmi Date: Tue, 17 Apr 2018 14:43:11 +0200 Subject: r-genomeinfodb: package update (#7781) --- var/spack/repos/builtin/packages/r-genomeinfodb/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-genomeinfodb/package.py b/var/spack/repos/builtin/packages/r-genomeinfodb/package.py index 8dff4c4c65..6619a0b59f 100644 --- a/var/spack/repos/builtin/packages/r-genomeinfodb/package.py +++ b/var/spack/repos/builtin/packages/r-genomeinfodb/package.py @@ -35,6 +35,7 @@ class RGenomeinfodb(RPackage): url = "https://git.bioconductor.org/packages/GenomeInfoDb" list_url = homepage + version('1.14.0', git='https://git.bioconductor.org/packages/GenomeInfoDb', commit='4978308a57d887b764cc4ce83724ca1758f580f6') version('1.12.3', git='https://git.bioconductor.org/packages/GenomeInfoDb', commit='2deef3f0571b7f622483257bc22d2509ab5a0369') depends_on('r-biocgenerics', type=('build', 'run')) @@ -42,4 +43,4 @@ class RGenomeinfodb(RPackage): depends_on('r-iranges', type=('build', 'run')) depends_on('r-rcurl', type=('build', 'run')) depends_on('r-genomeinfodbdata', type=('build', 'run')) - depends_on('r@3.4.0:3.4.9', when='@1.12.3') + depends_on('r@3.4.0:3.4.9', when='@1.12.3:') -- cgit v1.2.3-70-g09d2 From 07ebcb7f6be809be0a68cf78a96200c500007e3f Mon Sep 17 00:00:00 2001 From: Matteo Guglielmi Date: Tue, 17 Apr 2018 14:43:26 +0200 Subject: r-biocgenerics: package update (#7778) --- var/spack/repos/builtin/packages/r-biocgenerics/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-biocgenerics/package.py b/var/spack/repos/builtin/packages/r-biocgenerics/package.py index 21b075e460..cba33db40d 100644 --- a/var/spack/repos/builtin/packages/r-biocgenerics/package.py +++ b/var/spack/repos/builtin/packages/r-biocgenerics/package.py @@ -32,6 +32,7 @@ class RBiocgenerics(RPackage): url = "https://git.bioconductor.org/packages/BiocGenerics" list_url = homepage + version('0.24.0', git='https://git.bioconductor.org/packages/BiocGenerics', commit='3db111e8c1f876267da89f4f0c5406a9d5c31cd1') version('0.22.1', git='https://git.bioconductor.org/packages/BiocGenerics', commit='9c90bb8926885289d596a81ff318ee3745cbb6ad') - depends_on('r@3.4.0:3.4.9', when='@0.22.1') + depends_on('r@3.4.0:3.4.9', when='@0.22.1:') -- cgit v1.2.3-70-g09d2 From 40f0305bfabf818a297ea7073b817a59aa111e7b Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Tue, 17 Apr 2018 05:48:48 -0700 Subject: glvis@3.3: new package (#7166) * glvis@3.3: new package * mesa-glu: now provides 'glu' (GL Utility library) * openglu: add package, provides glu * [GLVis] Use MakefilePackage as base. Add 'develop' version. Small tweaks in the makefile arguments. * [GLVis] Locate the X11, GL and GLU libraries within their respective prefixes. Set the C compiler in the makefile arguments. * [GLVis] Fix a bug: the same variable was used for two different things. * [libx11] Add the libs property * [OpenGL] Add the libs property * [OpenGLU] Add the libs property * [GLVis] Use the libs properties of libx11, opengl, and openglu --- var/spack/repos/builtin/packages/glvis/package.py | 136 +++++++++++++++++++++ var/spack/repos/builtin/packages/libx11/package.py | 9 ++ var/spack/repos/builtin/packages/opengl/package.py | 9 ++ .../repos/builtin/packages/openglu/package.py | 9 ++ 4 files changed, 163 insertions(+) create mode 100644 var/spack/repos/builtin/packages/glvis/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/glvis/package.py b/var/spack/repos/builtin/packages/glvis/package.py new file mode 100644 index 0000000000..42844a739c --- /dev/null +++ b/var/spack/repos/builtin/packages/glvis/package.py @@ -0,0 +1,136 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Glvis(MakefilePackage): + """GLVis: an OpenGL tool for visualization of FEM meshes and functions""" + + homepage = "http://glvis.org/" + url = "https://github.com/GLvis/glvis/archive/v3.3.tar.gz" + + # glvis (like mfem) is downloaded from a URL shortener at request + # of upstream author Tzanio Kolev . See here: + # https://github.com/mfem/mfem/issues/53 + # + # The following procedure should be used to verify security when a + # new version is added: + # + # 1. Verify that no checksums on old versions have changed. + # + # 2. Verify that the shortened URL for the new version is listed at: + # http://glvis.org/download/ + # + # 3. Use http://getlinkinfo.com or similar to verify that the + # underling download link for the latest version comes has the + # prefix: http://glvis.github.io/releases + # + # If this quick verification procedure fails, additional discussion + # will be required to verify the new version. + + version('develop', git='https://github.com/glvis/glvis', branch='master') + + version('3.3', + '1201a76d1b0c38240186c06f6478de77', + url='http://goo.gl/C0Oadw', + extension='.tar.gz') + + version('3.2', + '4575a03a50d4730c07b5d4018e936707', + url='http://goo.gl/hzupg1', + extension='.tar.gz') + + version('3.1', + '3ce8a53209c6593e066e568dbbf2bbf6', + url='http://goo.gl/gQZuu9', + extension='tar.gz') + + variant('screenshots', + default='png', + values=('xwd', 'png', 'tiff'), + description='Backend used for screenshots') + variant('fonts', default=True, + description='Use antialiased fonts via freetype & fontconfig') + + depends_on('mfem@develop', when='@develop') + depends_on('mfem@3.3', when='@3.3') + depends_on('mfem@3.2', when='@3.2') + depends_on('mfem@3.1', when='@3.1') + + depends_on('gl') + depends_on('glu') + depends_on('libx11') + + depends_on('libpng', when='screenshots=png') + depends_on('libtiff', when='screenshots=tiff') + depends_on('freetype', when='+fonts') + depends_on('fontconfig', when='+fonts') + + def edit(self, spec, prefix): + + def yes_no(s): + return 'YES' if self.spec.satisfies(s) else 'NO' + + mfem = spec['mfem'] + config_mk = mfem.package.config_mk + + gl_libs = spec['glu'].libs + spec['gl'].libs + spec['libx11'].libs + args = ['CC={0}'.format(env['CC']), + 'PREFIX={0}'.format(prefix.bin), + 'MFEM_DIR={0}'.format(mfem.prefix), + 'CONFIG_MK={0}'.format(config_mk), + 'GL_OPTS=-I{0} -I{1} -I{2}'.format( + spec['libx11'].prefix.include, + spec['gl'].prefix.include, + spec['glu'].prefix.include), + 'GL_LIBS={0}'.format(gl_libs.ld_flags)] + + if 'screenshots=png' in spec: + args += [ + 'USE_LIBPNG=YES', 'USE_LIBTIFF=NO', + 'PNG_OPTS=-DGLVIS_USE_LIBPNG -I{0}'.format( + spec['libpng'].prefix.include), + 'PNG_LIBS={0}'.format(spec['libpng'].libs.ld_flags)] + elif 'screenshots=tiff' in spec: + args += [ + 'USE_LIBPNG=NO', 'USE_LIBTIFF=YES', + 'TIFF_OPTS=-DGLVIS_USE_LIBTIFF -I{0}'.format( + spec['libtiff'].prefix.include), + 'TIFF_LIBS={0}'.format(spec['libtiff'].libs.ld_flags)] + else: + args += ['USE_LIBPNG=NO', 'USE_LIBTIFF=NO'] + + args.append('USE_FREETYPE={0}'.format(yes_no('+fonts'))) + if '+fonts' in spec: + args += [ + 'FT_OPTS=-DGLVIS_USE_FREETYPE -I{0} -I{1}'.format( + spec['freetype'].prefix.include.freetype2, + spec['fontconfig'].prefix.include), + 'FT_LIBS={0} {1}'.format( + spec['freetype'].libs.ld_flags, + spec['fontconfig'].libs.ld_flags)] + + self.build_targets = args + self.install_targets += args diff --git a/var/spack/repos/builtin/packages/libx11/package.py b/var/spack/repos/builtin/packages/libx11/package.py index 0fa29e8dfe..9a526f394d 100644 --- a/var/spack/repos/builtin/packages/libx11/package.py +++ b/var/spack/repos/builtin/packages/libx11/package.py @@ -44,3 +44,12 @@ class Libx11(AutotoolsPackage): depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') depends_on('perl', type='build') + + @property + def libs(self): + for dir in ['lib64', 'lib']: + libs = find_libraries('libX11', join_path(self.prefix, dir), + shared=True, recursive=False) + if libs: + return libs + return None diff --git a/var/spack/repos/builtin/packages/opengl/package.py b/var/spack/repos/builtin/packages/opengl/package.py index 2859cf9138..ddcc273c3e 100644 --- a/var/spack/repos/builtin/packages/opengl/package.py +++ b/var/spack/repos/builtin/packages/opengl/package.py @@ -88,3 +88,12 @@ class Opengl(Package): def install(self, spec, prefix): pass + + @property + def libs(self): + for dir in ['lib64', 'lib']: + libs = find_libraries('libGL', join_path(self.prefix, dir), + shared=True, recursive=False) + if libs: + return libs + return None diff --git a/var/spack/repos/builtin/packages/openglu/package.py b/var/spack/repos/builtin/packages/openglu/package.py index a27441f901..a6e3283f30 100644 --- a/var/spack/repos/builtin/packages/openglu/package.py +++ b/var/spack/repos/builtin/packages/openglu/package.py @@ -84,3 +84,12 @@ class Openglu(Package): def install(self, spec, prefix): pass + + @property + def libs(self): + for dir in ['lib64', 'lib']: + libs = find_libraries('libGLU', join_path(self.prefix, dir), + shared=True, recursive=False) + if libs: + return libs + return None -- cgit v1.2.3-70-g09d2 From ed4d0c5a87a9bcb51f65790169f088926791ddc5 Mon Sep 17 00:00:00 2001 From: Matthias Maiterth Date: Tue, 17 Apr 2018 14:51:56 +0200 Subject: Package/geopm (#7560) * geopm: Added initial files for package geopm and py-natsort dependency * geopm: Updated variants for hwloc and mpi defaults * geopm: Cleaned up unwanted hyphenation in description. * geopm: updates according to change request. * geopm: Updated minor change requests. Clarification for ruby-ronn dependency included as a TODO. This requires changes in the current configure and build process which will be changed in a future version. * geopm: changed to AutotoolsPackage and fixed hwloc The changes for hwloc required to add a specific version bc of a conflicting version of openmpi's hwloc dependency being below 1.99. This works but updates to this package should check if this restriction is still required. (Thus TODO added) * geopm: Added link dependencies (thanks for pointing this out). Also removed empty line below class definition. * geopm: Fixed depends_on according to package guide. Removed wrong type 'run' and removed types for numactl, mpi and hwloc to use default build & link type. * geopm: Fixed and updated +doc dependencies new pacakge ruby-ronn (package specified as in ruby-narray package) Updated second +doc dependency doxygen. * geopm: Changed args for Autotools specific feature. Added enable_or_disable and with_or_without instead of if cascade. Added overhead variant. Also added missing dependency (default: build&link) for json-c). --- var/spack/repos/builtin/packages/geopm/package.py | 94 ++++++++++++++++++++++ .../repos/builtin/packages/py-natsort/package.py | 45 +++++++++++ .../repos/builtin/packages/ruby-ronn/package.py | 42 ++++++++++ 3 files changed, 181 insertions(+) create mode 100644 var/spack/repos/builtin/packages/geopm/package.py create mode 100644 var/spack/repos/builtin/packages/py-natsort/package.py create mode 100644 var/spack/repos/builtin/packages/ruby-ronn/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/geopm/package.py b/var/spack/repos/builtin/packages/geopm/package.py new file mode 100644 index 0000000000..6895291c16 --- /dev/null +++ b/var/spack/repos/builtin/packages/geopm/package.py @@ -0,0 +1,94 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Geopm(AutotoolsPackage): + """GEOPM is an extensible power management framework targeting HPC. + The GEOPM package provides libgeopm, libgeopmpolicy and applications + geopmctl and geopmpolicy, as well as tools for postprocessing. + GEOPM is designed to be extended for new control algorithms and new + hardware power management features via its plugin infrastructure. + + Note: GEOPM interfaces with hardware using Model Specific Registers (MSRs). + For propper usage make sure MSRs are made available directly or via the + msr-safe kernel module by your administrator.""" + + homepage = "https://geopm.github.io" + url = "https://github.com/geopm/geopm/releases/download/v0.4.0/geopm-0.4.0.tar.gz" + + # Add additional proper versions and checksums here. "spack checksum geopm" + version('0.4.0', 'd4cc8fffe521296dab379857d7e2064d') + version('0.3.0', '568fd37234396fff134f8d57b60f2b83') + version('master', git='https://github.com/geopm/geopm.git', branch='master') + version('develop', git='https://github.com/geopm/geopm.git', branch='dev') + + # Variants reflecting most ./configure --help options + variant('debug', default=False, description='Enable debug.') + variant('coverage', default=False, description='Enable test coverage support, enables debug by default.') + variant('overhead', default=False, description='Enable GEOPM to calculate and display time spent in GEOPM API calls.') + variant('procfs', default=True, description='Enable procfs (disable for OSes not using procfs).') + variant('mpi', default=True, description='Enable MPI dependent components.') + variant('fortran', default=True, description='Build fortran interface.') + variant('doc', default=True, description='Create man pages with ruby-ronn.') + variant('openmp', default=True, description='Build with OpenMP.') + variant('ompt', default=False, description='Use OpenMP Tools Interface.') + variant('hwloc', default=True, description='Build with hwloc.') + variant('gnu-ld', default=False, description='Assume C compiler uses gnu-ld.') + + # Added dependencies. + depends_on('m4', type='build') + depends_on('automake', type='build') + depends_on('autoconf', type='build') + depends_on('libtool', type='build') + depends_on('ruby-ronn', type='build', when='+doc') + depends_on('doxygen', type='build', when='+doc') + depends_on('numactl') + depends_on('mpi', when='+mpi') + # TODO: check if hwloc@specific-version still required with future openmpi + depends_on('hwloc@1.11.9', when='+hwloc') + depends_on('json-c') + depends_on('py-pandas', type='run') + depends_on('py-numpy', type='run') + depends_on('py-natsort', type='run') + depends_on('py-matplotlib', type='run') + + parallel = False + + def configure_args(self): + args = [] + args.extend(self.enable_or_disable('debug')) + args.extend(self.enable_or_disable('coverage')) + args.extend(self.enable_or_disable('overhead')) + args.extend(self.enable_or_disable('procfs')) + args.extend(self.enable_or_disable('mpi')) + args.extend(self.enable_or_disable('fortran')) + args.extend(self.enable_or_disable('doc')) + args.extend(self.enable_or_disable('openmp')) + args.extend(self.enable_or_disable('ompt')) + args.extend(self.with_or_without('hwloc', activation_value='prefix')) + args.extend(self.with_or_without('gnu-ld')) + + return args diff --git a/var/spack/repos/builtin/packages/py-natsort/package.py b/var/spack/repos/builtin/packages/py-natsort/package.py new file mode 100644 index 0000000000..bc7303d3ac --- /dev/null +++ b/var/spack/repos/builtin/packages/py-natsort/package.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyNatsort(PythonPackage): + """Simple yet flexible natural sorting in Python.""" + + homepage = "https://pypi.org/project/natsort/" + url = "https://github.com/SethMMorton/natsort/archive/5.2.0.zip" + + version('5.2.0', '2ed2826550eef1f9ea3dd04f08b5da8b') + version('5.1.1', '0525d4897fc98f40df5cc5a4a05f3c82') + version('5.1.0', '518688548936d548775fb00afba999fb') + version('5.0.3', '11147d75693995a946656927df7617d0') + version('5.0.2', '1eb11a69086a5fb21d03f8189f1afed3') + version('5.0.1', 'ca21c728bb3dd5dcfb010fa50b9c5e3c') + version('5.0.0', 'fc7800fea50dcccbf8b116e1dff2ebf8') + version('4.0.4', '7478ba31ec7fe554fcbfda41bb01f5ef') + version('4.0.3', '2dc4fb1eb6ebfe4c9d95a12c2406df33') + version('4.0.1', '659cf6ce95951003de0c85fc80b9f135') + + depends_on('py-setuptools', type=('build')) diff --git a/var/spack/repos/builtin/packages/ruby-ronn/package.py b/var/spack/repos/builtin/packages/ruby-ronn/package.py new file mode 100644 index 0000000000..af3776a5a3 --- /dev/null +++ b/var/spack/repos/builtin/packages/ruby-ronn/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RubyRonn(Package): + """Ronn builds manuals. It converts simple, human readable textfiles to + roff for terminal display, and also to HTML for the web.""" + + homepage = "https://rubygems.org/gems/ronn" + url = "https://github.com/rtomayko/ronn/archive/0.7.3.tar.gz" + + version('0.7.3', '90cdedb42920c8c2a74e2d177e9535b6') + version('0.7.0', '34ad78510a75e46904629631f5335e06') + + extends('ruby') + + def install(self, spec, prefix): + gem('build', 'ronn.gemspec') + gem('install', 'ronn-{0}.gem'.format(self.version)) -- cgit v1.2.3-70-g09d2 From c2559bdef32e60a01f967a4de023fd583bf94c19 Mon Sep 17 00:00:00 2001 From: Matteo Guglielmi Date: Tue, 17 Apr 2018 16:33:24 +0200 Subject: r-genomicranges: package update (#7782) * r-genomicranges: package update * r-genomicranges: dependencies fix --- var/spack/repos/builtin/packages/r-genomicranges/package.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-genomicranges/package.py b/var/spack/repos/builtin/packages/r-genomicranges/package.py index 944dc5b9dd..d3941e81a6 100644 --- a/var/spack/repos/builtin/packages/r-genomicranges/package.py +++ b/var/spack/repos/builtin/packages/r-genomicranges/package.py @@ -41,11 +41,14 @@ class RGenomicranges(RPackage): url = "https://git.bioconductor.org/packages/GenomicRanges" list_url = homepage + version('1.30.3', git='https://git.bioconductor.org/packages/GenomicRanges', commit='e99979054bc50ed8c0109bc54563036c1b368997') version('1.28.6', git='https://git.bioconductor.org/packages/GenomicRanges', commit='197472d618f3ed04c795dc6ed435500c29619563') - depends_on('r-biocgenerics', type=('build', 'run')) - depends_on('r-s4vectors', type=('build', 'run')) - depends_on('r-iranges', type=('build', 'run')) - depends_on('r-genomeinfodb', type=('build', 'run')) + depends_on('r-biocgenerics@0.21.2:', type=('build', 'run')) + depends_on('r-s4vectors@0.9.47:', type=('build', 'run')) + depends_on('r-iranges@2.9.11:', type=('build', 'run'), when='@1.28.6') + depends_on('r-iranges@2.11.16:', type=('build', 'run'), when='@1.30.3') + depends_on('r-genomeinfodb@1.11.5:', type=('build', 'run'), when='@1.28.6') + depends_on('r-genomeinfodb@1.13.1:', type=('build', 'run'), when='@1.30.3') depends_on('r-xvector', type=('build', 'run')) - depends_on('r@3.4.0:3.4.9', when='@1.28.6') + depends_on('r@3.4.0:3.4.9', when='@1.28.6:') -- cgit v1.2.3-70-g09d2 From 8907161c93aea55b1f3e1e4259018b5571b4229c Mon Sep 17 00:00:00 2001 From: Matteo Guglielmi Date: Tue, 17 Apr 2018 16:36:12 +0200 Subject: Package/r-iranges (#7780) * r-iranges: package update * r-iranges: package update * r-iranges: dependencies fix --- var/spack/repos/builtin/packages/r-iranges/package.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-iranges/package.py b/var/spack/repos/builtin/packages/r-iranges/package.py index 48f8d0f105..d4375d7f8b 100644 --- a/var/spack/repos/builtin/packages/r-iranges/package.py +++ b/var/spack/repos/builtin/packages/r-iranges/package.py @@ -40,8 +40,12 @@ class RIranges(RPackage): homepage = "https://www.bioconductor.org/packages/IRanges/" url = "https://git.bioconductor.org/packages/IRanges" list_url = homepage + + version('2.12.0', git='https://git.bioconductor.org/packages/IRanges', commit='1b1748655a8529ba87ad0f223f035ef0c08e7fcd') version('2.10.5', git='https://git.bioconductor.org/packages/IRanges', commit='b00d1d5025e3c480d17c13100f0da5a0132b1614') - depends_on('r-biocgenerics', type=('build', 'run')) - depends_on('r-s4vectors', type=('build', 'run')) - depends_on('r@3.4.0:3.4.9', when='@2.10.5') + depends_on('r-biocgenerics@0.21.1:', type=('build', 'run'), when='@2.10.5') + depends_on('r-biocgenerics@0.23.3:', type=('build', 'run'), when='@2.12.0') + depends_on('r-s4vectors@0.13.17:', type=('build', 'run'), when='@2.10.5') + depends_on('r-s4vectors@0.15.5:', type=('build', 'run'), when='@2.12.0') + depends_on('r@3.4.0:3.4.9', when='@2.10.5:') -- cgit v1.2.3-70-g09d2 From 5272ed5ad0620bcdd5208fc1fb4ccdc984fa0348 Mon Sep 17 00:00:00 2001 From: Matteo Guglielmi Date: Tue, 17 Apr 2018 17:04:24 +0200 Subject: r-biobase: package update (#7785) --- var/spack/repos/builtin/packages/r-biobase/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-biobase/package.py b/var/spack/repos/builtin/packages/r-biobase/package.py index 4dcdb6adcb..ef6a84d090 100644 --- a/var/spack/repos/builtin/packages/r-biobase/package.py +++ b/var/spack/repos/builtin/packages/r-biobase/package.py @@ -34,7 +34,8 @@ class RBiobase(RPackage): url = "https://git.bioconductor.org/packages/Biobase" list_url = homepage + version('2.38.0', git='https://git.bioconductor.org/packages/Biobase', commit='83f89829e0278ac014b0bc6664e621ac147ba424') version('2.36.2', git='https://git.bioconductor.org/packages/Biobase', commit='15f50912f3fa08ccb15c33b7baebe6b8a59ce075') - depends_on('r-biocgenerics', type=('build', 'run')) - depends_on('r@3.4.0:3.4.9', when='@2.36.2') + depends_on('r-biocgenerics@0.16.1:', type=('build', 'run')) + depends_on('r@3.4.0:3.4.9', when='@2.36.2:') -- cgit v1.2.3-70-g09d2 From c392bfc7d631a4ca4600b9ee410fc3db8c560394 Mon Sep 17 00:00:00 2001 From: Matteo Guglielmi Date: Tue, 17 Apr 2018 17:04:37 +0200 Subject: r-s4vectors: package update (#7779) * r-s4vectors: package update * r-s4vectors: dependencies fix --- var/spack/repos/builtin/packages/r-s4vectors/package.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-s4vectors/package.py b/var/spack/repos/builtin/packages/r-s4vectors/package.py index 3a2c2ee7ea..d6b6293f99 100644 --- a/var/spack/repos/builtin/packages/r-s4vectors/package.py +++ b/var/spack/repos/builtin/packages/r-s4vectors/package.py @@ -39,7 +39,9 @@ class RS4vectors(RPackage): url = "https://git.bioconductor.org/packages/S4Vectors" list_url = homepage + version('0.16.0', git='https://git.bioconductor.org/packages/S4Vectors', commit='00fec03fcbcb7cff37917fab0da28d91fdf9dc3d') version('0.14.7', git='https://git.bioconductor.org/packages/S4Vectors', commit='40af17fe0b8e93b6a72fc787540d2961773b8e23') - depends_on('r-biocgenerics', type=('build', 'run')) - depends_on('r@3.4.0:3.4.9', when='@0.14.7') + depends_on('r-biocgenerics@0.21.1:', type=('build', 'run'), when='@0.14.7') + depends_on('r-biocgenerics@0.23.3:', type=('build', 'run'), when='@0.16.0') + depends_on('r@3.4.0:3.4.9', when='@0.14.7:') -- cgit v1.2.3-70-g09d2 From 7171f314256aec63b10c40a54cdd4d062ef3bbb1 Mon Sep 17 00:00:00 2001 From: Matteo Guglielmi Date: Tue, 17 Apr 2018 19:53:37 +0200 Subject: r-topgo: package update (#7793) --- var/spack/repos/builtin/packages/r-topgo/package.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-topgo/package.py b/var/spack/repos/builtin/packages/r-topgo/package.py index acf0b7df67..bf901d7a3a 100644 --- a/var/spack/repos/builtin/packages/r-topgo/package.py +++ b/var/spack/repos/builtin/packages/r-topgo/package.py @@ -34,15 +34,16 @@ class RTopgo(RPackage): homepage = "https://www.bioconductor.org/packages/topGO/" url = "https://git.bioconductor.org/packages/topGO" + version('2.30.1', git='https://git.bioconductor.org/packages/topGO', commit='b1469ce1d198ccb73ef79ca22cab81659e16dbaa') version('2.28.0', git='https://git.bioconductor.org/packages/topGO', commit='066a975d460046cce33fb27e74e6a0ebc33fd716') depends_on('r@3.4.0:3.4.9') depends_on('r-dbi', type=('build', 'run')) depends_on('r-matrixstats', type=('build', 'run')) depends_on('r-lattice', type=('build', 'run')) - depends_on('r-sparsem', type=('build', 'run')) - depends_on('r-annotationdbi', type=('build', 'run')) - depends_on('r-go-db', type=('build', 'run')) - depends_on('r-biobase', type=('build', 'run')) - depends_on('r-graph', type=('build', 'run')) - depends_on('r-biocgenerics', type=('build', 'run')) + depends_on('r-sparsem@0.73:', type=('build', 'run')) + depends_on('r-annotationdbi@1.7.19:', type=('build', 'run')) + depends_on('r-go-db@2.3.0:', type=('build', 'run')) + depends_on('r-biobase@2.0.0:', type=('build', 'run')) + depends_on('r-graph@1.14.0:', type=('build', 'run')) + depends_on('r-biocgenerics@0.13.6:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 025e608fd5a7d43a10254bb8f0fcae3de6eb7028 Mon Sep 17 00:00:00 2001 From: Matteo Guglielmi Date: Tue, 17 Apr 2018 19:54:04 +0200 Subject: r-bsgenome: package update (#7792) --- .../repos/builtin/packages/r-bsgenome/package.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-bsgenome/package.py b/var/spack/repos/builtin/packages/r-bsgenome/package.py index 406a45ad8c..35eaf00e21 100644 --- a/var/spack/repos/builtin/packages/r-bsgenome/package.py +++ b/var/spack/repos/builtin/packages/r-bsgenome/package.py @@ -33,15 +33,19 @@ class RBsgenome(RPackage): url = "https://git.bioconductor.org/packages/BSgenome" list_url = homepage + version('1.46.0', git='https://git.bioconductor.org/packages/BSgenome', commit='bdfbd6d09820993585b8231ddea5e11c99008dc5') version('1.44.2', git='https://git.bioconductor.org/packages/BSgenome', commit='105b00588a758d5ec7c347a7dff2756aea4516a0') - depends_on('r-biocgenerics', type=('build', 'run')) - depends_on('r-s4vectors', type=('build', 'run')) - depends_on('r-iranges', type=('build', 'run')) - depends_on('r-genomeinfodb', type=('build', 'run')) - depends_on('r-genomicranges', type=('build', 'run')) - depends_on('r-biostrings', type=('build', 'run')) - depends_on('r-rtracklayer', type=('build', 'run')) + depends_on('r-biocgenerics@0.13.8:', type=('build', 'run')) + depends_on('r-s4vectors@0.9.36:', type=('build', 'run')) + depends_on('r-iranges@2.1.33:', type=('build', 'run'), when='@1.44.2') + depends_on('r-iranges@2.11.16:', type=('build', 'run'), when='@1.46.0') + depends_on('r-genomeinfodb@1.11.4:', type=('build', 'run'), when='@1.44.2') + depends_on('r-genomeinfodb@1.13.1:', type=('build', 'run'), when='@1.46.0') + depends_on('r-genomicranges@1.27.6:', type=('build', 'run'), when='@1.44.2') + depends_on('r-genomicranges@1.29.14:', type=('build', 'run'), when='@1.46.0') + depends_on('r-biostrings@2.35.3:', type=('build', 'run')) + depends_on('r-rtracklayer@1.25.8:', type=('build', 'run')) depends_on('r-rsamtools', type=('build', 'run')) depends_on('r-xvector', type=('build', 'run')) - depends_on('r@3.4.0:3.4.9', when='@1.44.2') + depends_on('r@3.4.0:3.4.9', when='@1.44.2:') -- cgit v1.2.3-70-g09d2 From 02181c951a4ae8ddfca6209a3b1cbb07638a617a Mon Sep 17 00:00:00 2001 From: Matteo Guglielmi Date: Tue, 17 Apr 2018 19:54:36 +0200 Subject: r-genomicalignments: package update (#7791) --- .../packages/r-genomicalignments/package.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-genomicalignments/package.py b/var/spack/repos/builtin/packages/r-genomicalignments/package.py index ced18e624d..2c58758efb 100644 --- a/var/spack/repos/builtin/packages/r-genomicalignments/package.py +++ b/var/spack/repos/builtin/packages/r-genomicalignments/package.py @@ -35,15 +35,19 @@ class RGenomicalignments(RPackage): url = "https://git.bioconductor.org/packages/GenomicAlignments" list_url = homepage + version('1.14.2', git='https://git.bioconductor.org/packages/GenomicAlignments', commit='57b0b35d8b36069d4d94af86af051f0129b28eef') version('1.12.2', git='https://git.bioconductor.org/packages/GenomicAlignments', commit='b5d6f19e4a89b6c1c3e9e58e5ea4eb13870874ef') - depends_on('r-biocgenerics', type=('build', 'run')) - depends_on('r-s4vectors', type=('build', 'run')) - depends_on('r-iranges', type=('build', 'run')) - depends_on('r-genomeinfodb', type=('build', 'run')) - depends_on('r-genomicranges', type=('build', 'run')) - depends_on('r-summarizedexperiment', type=('build', 'run')) - depends_on('r-biostrings', type=('build', 'run')) - depends_on('r-rsamtools', type=('build', 'run')) + depends_on('r-biocgenerics@0.15.3:', type=('build', 'run')) + depends_on('r-s4vectors@0.13.13:', type=('build', 'run')) + depends_on('r-iranges@2.5.36:', type=('build', 'run'), when='@1.12.2') + depends_on('r-iranges@2.11.16:', type=('build', 'run'), when='@1.14.2') + depends_on('r-genomeinfodb@1.11.5:', type=('build', 'run'), when='@1.12.2') + depends_on('r-genomeinfodb@1.13.1:', type=('build', 'run'), when='@1.14.2') + depends_on('r-genomicranges@1.27.19:', type=('build', 'run'), when='@1.12.2') + depends_on('r-genomicranges@1.29.14:', type=('build', 'run'), when='@1.14.2') + depends_on('r-summarizedexperiment@1.5.3:', type=('build', 'run')) + depends_on('r-biostrings@2.37.1:', type=('build', 'run')) + depends_on('r-rsamtools@1.21.4:', type=('build', 'run')) depends_on('r-biocparallel', type=('build', 'run')) - depends_on('r@3.4.0:3.4.9', when='@1.12.2') + depends_on('r@3.4.0:3.4.9', when='@1.12.2:') -- cgit v1.2.3-70-g09d2 From abbd51cd211242930687456d8fe2734e4acb5e4d Mon Sep 17 00:00:00 2001 From: Matteo Guglielmi Date: Tue, 17 Apr 2018 19:54:56 +0200 Subject: r-summarizedexperiment: package update (#7790) --- .../repos/builtin/packages/r-summarizedexperiment/package.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-summarizedexperiment/package.py b/var/spack/repos/builtin/packages/r-summarizedexperiment/package.py index afc6d3964b..f06523e96d 100644 --- a/var/spack/repos/builtin/packages/r-summarizedexperiment/package.py +++ b/var/spack/repos/builtin/packages/r-summarizedexperiment/package.py @@ -35,13 +35,16 @@ class RSummarizedexperiment(RPackage): url = "https://git.bioconductor.org/packages/SummarizedExperiment" list_url = homepage + version('1.8.1', git='https://git.bioconductor.org/packages/SummarizedExperiment', commit='9d8a29aa9c78bbc7dcc6472537e13fc0d11dc1f7') version('1.6.5', git='https://git.bioconductor.org/packages/SummarizedExperiment', commit='ec69cd5cfbccaef148a9f6abdfb3e22e888695d0') - depends_on('r-genomicranges', type=('build', 'run')) + depends_on('r-genomicranges@1.27.22:', type=('build', 'run'), when='@1.6.5') + depends_on('r-genomicranges@1.29.14:', type=('build', 'run'), when='@1.8.1') depends_on('r-biobase', type=('build', 'run')) - depends_on('r-delayedarray', type=('build', 'run')) + depends_on('r-delayedarray@0.1.9:', type=('build', 'run'), when='@1.6.5') + depends_on('r-delayedarray@0.3.20', type=('build', 'run'), when='@1.8.1') depends_on('r-matrix', type=('build', 'run')) depends_on('r-s4vectors', type=('build', 'run')) depends_on('r-iranges', type=('build', 'run')) depends_on('r-genomeinfodb', type=('build', 'run')) - depends_on('r@3.4.0:3.4.9', when='@1.6.5') + depends_on('r@3.4.0:3.4.9', when='@1.6.5:') -- cgit v1.2.3-70-g09d2 From d49182cb7ab19b5a3efdfc6f6bb27d79d4238bbd Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 17 Apr 2018 12:55:08 -0500 Subject: DIAMOND: add versions 0.9.19, 0.8.38, 0.8.26 (#7789) --- var/spack/repos/builtin/packages/diamond/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/diamond/package.py b/var/spack/repos/builtin/packages/diamond/package.py index 5233e0e9ba..48706ea944 100644 --- a/var/spack/repos/builtin/packages/diamond/package.py +++ b/var/spack/repos/builtin/packages/diamond/package.py @@ -32,4 +32,7 @@ class Diamond(CMakePackage): homepage = "https://ab.inf.uni-tuebingen.de/software/diamond" url = "https://github.com/bbuchfink/diamond/archive/v0.9.14.tar.gz" + version('0.9.19', '8565d2d3bfe407ee778eeabe7c6a7fde') version('0.9.14', 'b9e1d0bc57f07afa05dbfbb53c31aae2') + version('0.8.38', 'd4719c8a7947ba9f743446ac95cfe644') + version('0.8.26', '0d86305ab25cc9b3bb3564188d30fff2') -- cgit v1.2.3-70-g09d2 From 65da62751f39dc01b67bf3788361c28351d4aadf Mon Sep 17 00:00:00 2001 From: Matteo Guglielmi Date: Tue, 17 Apr 2018 19:55:20 +0200 Subject: r-delayedarray: package update (#7788) --- var/spack/repos/builtin/packages/r-delayedarray/package.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-delayedarray/package.py b/var/spack/repos/builtin/packages/r-delayedarray/package.py index b34c71ec61..94aa4beeb2 100644 --- a/var/spack/repos/builtin/packages/r-delayedarray/package.py +++ b/var/spack/repos/builtin/packages/r-delayedarray/package.py @@ -46,10 +46,13 @@ class RDelayedarray(RPackage): url = "https://git.bioconductor.org/packages/DelayedArray" list_url = homepage + version('0.4.1', git='https://git.bioconductor.org/packages/DelayedArray', commit='ffe932ef8c255614340e4856fc6e0b44128a27a1') version('0.2.7', git='https://git.bioconductor.org/packages/DelayedArray', commit='909c2ce1665ebae2543172ead50abbe10bd42bc4') depends_on('r-biocgenerics', type=('build', 'run')) - depends_on('r-s4vectors', type=('build', 'run')) + depends_on('r-s4vectors@0.14.3:', type=('build', 'run'), when='@0.2.7') + depends_on('r-s4vectors@0.15.3:', type=('build', 'run'), when='@0.4.1') depends_on('r-iranges', type=('build', 'run')) + depends_on('r-iranges@2.11.17:', type=('build', 'run'), when='@0.4.1') depends_on('r-matrixstats', type=('build', 'run')) - depends_on('r@3.4.0:3.4.9', when='@0.2.7') + depends_on('r@3.4.0:3.4.9', when='@0.2.7:') -- cgit v1.2.3-70-g09d2 From 8afdf3d148026ffa0a9b1c02001f98159155997b Mon Sep 17 00:00:00 2001 From: Matteo Guglielmi Date: Tue, 17 Apr 2018 19:55:36 +0200 Subject: r-biomart: package update (#7787) --- var/spack/repos/builtin/packages/r-biomart/package.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-biomart/package.py b/var/spack/repos/builtin/packages/r-biomart/package.py index db5dabcd10..d327e47ee7 100644 --- a/var/spack/repos/builtin/packages/r-biomart/package.py +++ b/var/spack/repos/builtin/packages/r-biomart/package.py @@ -42,9 +42,13 @@ class RBiomart(RPackage): homepage = "https://bioconductor.org/packages/biomaRt/" url = "https://git.bioconductor.org/packages/biomaRt" + version('2.34.2', git='https://git.bioconductor.org/packages/biomaRt', commit='a7030915fbc6120cc6812aefdedba423a207459b') version('2.32.1', git='https://git.bioconductor.org/packages/biomaRt', commit='f84d74424fa599f6d08f8db4612ca09914a9087f') depends_on('r-xml', type=('build', 'run')) depends_on('r-rcurl', type=('build', 'run')) depends_on('r-annotationdbi', type=('build', 'run')) - depends_on('r@3.4.0:3.4.9', when='@2.32.1') + depends_on('r-progress', type=('build', 'run'), when='@2.34.2') + depends_on('r-stringr', type=('build', 'run'), when='@2.34.2') + depends_on('r-httr', type=('build', 'run'), when='@2.34.2') + depends_on('r@3.4.0:3.4.9', when='@2.32.1:') -- cgit v1.2.3-70-g09d2 From 8e58bf21cf39892df07d42d650619e2292b8efb5 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 17 Apr 2018 13:30:12 -0500 Subject: perl-statistics-pca: Create new package (#7796) * perl-statistics-pca: Create new package * perl-statistics-pca: fix dependency types --- .../packages/perl-statistics-pca/package.py | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-statistics-pca/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-statistics-pca/package.py b/var/spack/repos/builtin/packages/perl-statistics-pca/package.py new file mode 100644 index 0000000000..7ef7ca5eb6 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-statistics-pca/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlStatisticsPca(PerlPackage): + """A simple Perl implementation of Principal Component Analysis.""" + + homepage = "http://search.cpan.org/~dsth/Statistics-PCA/lib/Statistics/PCA.pm" + url = "http://search.cpan.org/CPAN/authors/id/D/DS/DSTH/Statistics-PCA-0.0.1.tar.gz" + + version('0.0.1', '6e0e05fe13f6becea525b973a0c29001') + + depends_on('perl-module-build', type='build') + depends_on('perl-contextual-return', type=('build', 'run')) + depends_on('perl-text-simpletable', type=('build', 'run')) + depends_on('perl-math-matrixreal', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From b4bdf0db8073469b98465106f1931cac7f812e1e Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Tue, 17 Apr 2018 13:30:30 -0500 Subject: psmc: new package (#7773) * psmc: new package * psmc: changed version number * psmc: overwrite build phase --- var/spack/repos/builtin/packages/psmc/package.py | 45 ++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 var/spack/repos/builtin/packages/psmc/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/psmc/package.py b/var/spack/repos/builtin/packages/psmc/package.py new file mode 100644 index 0000000000..45dfeff9ec --- /dev/null +++ b/var/spack/repos/builtin/packages/psmc/package.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Psmc(MakefilePackage): + """mplementation of the Pairwise Sequentially Markovian Coalescent + (PSMC) model""" + + homepage = "https://github.com/lh3/psmc" + + version('2016-1-21', git='https://github.com/lh3/psmc.git', commit='e5f7df5d00bb75ec603ae0beff62c0d7e37640b9') + + def setup_environment(self, spack_env, run_env): + run_env.prepend_path('PATH', prefix.bin.utils) + + def build(self, spec, prefix): + make() + with working_dir('utils'): + make() + + def install(self, spec, prefix): + install_tree(self.build_directory, prefix.bin) -- cgit v1.2.3-70-g09d2 From b84424e8790030e2428570cf1ddd94fb2b46657a Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 17 Apr 2018 14:45:10 -0500 Subject: bismark: Create new package (#7795) * bismark: Create new package * bismark: fix dependency types --- .../repos/builtin/packages/bismark/package.py | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 var/spack/repos/builtin/packages/bismark/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bismark/package.py b/var/spack/repos/builtin/packages/bismark/package.py new file mode 100644 index 0000000000..62cb5a0ce9 --- /dev/null +++ b/var/spack/repos/builtin/packages/bismark/package.py @@ -0,0 +1,54 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Bismark(Package): + """A tool to map bisulfite converted sequence reads and determine cytosine + methylation states""" + + homepage = "https://www.bioinformatics.babraham.ac.uk/projects/bismark" + url = "https://github.com/FelixKrueger/Bismark/archive/0.19.0.tar.gz" + + version('0.19.0', 'f403654aded77bf0d1dac1203867ded1') + version('0.18.2', '42334b7e3ed53ba246f30f1f846b4af8') + + depends_on('bowtie2', type='run') + depends_on('perl', type='run') + depends_on('samtools', type='run') + + def install(self, spec, prefix): + mkdirp(prefix.bin) + install('bam2nuc', prefix.bin) + install('bismark', prefix.bin) + install('bismark_genome_preparation', prefix.bin) + install('bismark_methylation_extractor', prefix.bin) + install('bismark2bedGraph', prefix.bin) + install('bismark2report', prefix.bin) + install('bismark2summary', prefix.bin) + install('coverage2cytosine', prefix.bin) + install('deduplicate_bismark', prefix.bin) + install('filter_non_conversion', prefix.bin) + install('NOMe_filtering', prefix.bin) -- cgit v1.2.3-70-g09d2 From 5854acd23320e59fc60c67d856b44f3e154206d4 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Tue, 17 Apr 2018 15:33:08 -0500 Subject: Add latest version of cURL (#7800) --- var/spack/repos/builtin/packages/curl/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/curl/package.py b/var/spack/repos/builtin/packages/curl/package.py index ae575e4644..be7a0f659f 100644 --- a/var/spack/repos/builtin/packages/curl/package.py +++ b/var/spack/repos/builtin/packages/curl/package.py @@ -33,6 +33,7 @@ class Curl(AutotoolsPackage): # URL must remain http:// so Spack can bootstrap curl url = "http://curl.haxx.se/download/curl-7.54.0.tar.bz2" + version('7.59.0', 'a2192804f7c2636a09320416afcf888e') version('7.56.0', 'e0caf257103e0c77cee5be7e9ac66ca4') version('7.54.0', '89bb7ba87384dfbf4f1a3f953da42458') version('7.53.1', 'fb1f03a142236840c1a77c035fa4c542') @@ -49,7 +50,7 @@ class Curl(AutotoolsPackage): version('7.42.1', '296945012ce647b94083ed427c1877a8') variant('nghttp2', default=False, description='build nghttp2 library (requires C++11)') - variant('libssh2', default=True, description='enable libssh2 support') + variant('libssh2', default=False, description='enable libssh2 support') depends_on('openssl') depends_on('zlib') -- cgit v1.2.3-70-g09d2 From 1b32a4e3a50013b682852b8059807e7be8c8e655 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 17 Apr 2018 15:59:23 -0500 Subject: DIAMOND: add zlib dependency (#7801) --- var/spack/repos/builtin/packages/diamond/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/diamond/package.py b/var/spack/repos/builtin/packages/diamond/package.py index 48706ea944..1dd509433e 100644 --- a/var/spack/repos/builtin/packages/diamond/package.py +++ b/var/spack/repos/builtin/packages/diamond/package.py @@ -36,3 +36,5 @@ class Diamond(CMakePackage): version('0.9.14', 'b9e1d0bc57f07afa05dbfbb53c31aae2') version('0.8.38', 'd4719c8a7947ba9f743446ac95cfe644') version('0.8.26', '0d86305ab25cc9b3bb3564188d30fff2') + + depends_on('zlib') -- cgit v1.2.3-70-g09d2 From d950aeee095ce789e0d4458d6c506adba61f2ae5 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Tue, 17 Apr 2018 17:26:03 -0500 Subject: cmake: update version (#7802) --- var/spack/repos/builtin/packages/cmake/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index 2990a849bc..e5dadb2d84 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -33,6 +33,7 @@ class Cmake(Package): list_url = 'https://cmake.org/files/' list_depth = 1 + version('3.11.1', '12a3177477e4e2c7bc514193d421dafe') version('3.11.0', 'f3ebc79b5dec85b49abe75958ffa1a03') version('3.10.2', '732808e17fc14dc8cee50d51518c34eb') version('3.10.1', '9a726e5ec69618b172aa4b06d18c3998') -- cgit v1.2.3-70-g09d2 From 87747b888f54522c333705ad25c1611982732a29 Mon Sep 17 00:00:00 2001 From: Loic Hausammann Date: Wed, 18 Apr 2018 14:23:09 +0200 Subject: Add grackle 3.1 (#7805) --- var/spack/repos/builtin/packages/grackle/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/grackle/package.py b/var/spack/repos/builtin/packages/grackle/package.py index 885434f61d..e88041dd8b 100644 --- a/var/spack/repos/builtin/packages/grackle/package.py +++ b/var/spack/repos/builtin/packages/grackle/package.py @@ -35,9 +35,10 @@ class Grackle(Package): generalized and trimmed down version of the chemistry network of the Enzo simulation code """ - homepage = 'http://grackle.readthedocs.io/en/grackle-3.0/' - url = 'https://bitbucket.org/grackle/grackle/get/grackle-3.0.tar.bz2' + homepage = 'http://grackle.readthedocs.io/en/grackle-3.1/' + url = 'https://bitbucket.org/grackle/grackle/get/grackle-3.1.tar.bz2' + version('3.1', 'cee7799dc505010e2e875950561bbbe1') version('3.0', 'dc85e664da7e70b65b3ef7164477a959') version('2.2', 'ec49ed1db5a42db21f478285150c2ba3') version('2.0.1', 'a9624ad13a60c592c1a0a4ea8e1ae86d') -- cgit v1.2.3-70-g09d2 From 247f24e0158c78d7c67924a7517fa68f6b034047 Mon Sep 17 00:00:00 2001 From: Matteo Guglielmi Date: Wed, 18 Apr 2018 17:11:44 +0200 Subject: bcl2fastq2: package update (#7794) * bcl2fastq2: package update * package/bcl2fastq2: homepage fix * package/bcl2fastq2: glob fix * package/bcl2fastq2: code clean up * package/bcl2fastq2: code clean up #2 --- .../repos/builtin/packages/bcl2fastq2/package.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bcl2fastq2/package.py b/var/spack/repos/builtin/packages/bcl2fastq2/package.py index 5655a8462b..b6e476b55c 100644 --- a/var/spack/repos/builtin/packages/bcl2fastq2/package.py +++ b/var/spack/repos/builtin/packages/bcl2fastq2/package.py @@ -25,6 +25,7 @@ from spack import * import os import shutil +import glob import llnl.util.tty as tty @@ -36,8 +37,9 @@ class Bcl2fastq2(Package): call (BCL) files from a sequencing run into FASTQ files.""" - homepage = "https://support.illumina.com/downloads/bcl2fastq-conversion-software-v2-18.html" + homepage = "https://support.illumina.com/downloads/bcl2fastq-conversion-software-v2-20.html" + version('2.20.0.422', '4dc99f1af208498b7279b66556329488') version('2.19.1.403', 'baba7a02767fd868e87cb36781d2be26') version('2.18.0.12', 'fbe06492117f65609c41be0c27e3215c') # 2.17.1.14 is no longer distributed. If you have a copy of the @@ -65,12 +67,11 @@ class Bcl2fastq2(Package): # v2.19.1.403 is only available via ftp. # who knows what the future will hold. def url_for_version(self, version): + url = "ftp://webdata2:webdata2@ussd-ftp.illumina.com/downloads/software/bcl2fastq/bcl2fastq2-v{0}-tar.zip" if version.string == '2.19.1.403': - return "ftp://webdata2:webdata2@ussd-ftp.illumina.com/downloads/software/bcl2fastq/bcl2fastq2-v2.19.1-tar.zip" + return url.format(version.up_to(3).dotted) else: - url = "https://support.illumina.com/content/dam/illumina-support/documents/downloads/software/bcl2fastq/bcl2fastq2-v{0}-tar.zip" - # - required to change the version from dots to dashes. - return url.format(version.dashed) + return url.format(version.up_to(3).dashed) # Illumina tucks the source inside a gzipped tarball inside a zip # file. We let the normal Spack expansion bit unzip the zip file, @@ -91,12 +92,12 @@ class Bcl2fastq2(Package): else: tty.msg("Unpacking bcl2fastq2 tarball") tty.msg("cwd sez: {0}".format(os.getcwd())) - tarball = 'bcl2fastq2-v{0}.tar.gz'.format( - self.version.dotted) - shutil.move(join_path('spack-expanded-archive', tarball), - '.') + tarball = glob.glob(join_path('spack-expanded-archive', + 'bcl2fastq2*.tar.gz'))[0] + shutil.move(tarball, '.') os.rmdir('spack-expanded-archive') tar = which('tar') + tarball = os.path.basename(tarball) tar('-xf', tarball) tty.msg("Finished unpacking bcl2fastq2 tarball") return wrap -- cgit v1.2.3-70-g09d2 From 5f73c2759d7ae0884d3b69fa5f3f309321272e9b Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 18 Apr 2018 17:52:13 +0200 Subject: ADIOS 1.13.1 & SZ 1.4.12.3 (#7808) * ADIOS 1.13.1 ADIOS 1.13.1 fixes several issues with zero-sized block reading and writing when compression transports are used. * SZ 1.4.12.3 Add the lastest SZ release used in ADIOS1. --- var/spack/repos/builtin/packages/adios/package.py | 4 +++- var/spack/repos/builtin/packages/sz/package.py | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/adios/package.py b/var/spack/repos/builtin/packages/adios/package.py index b56505af73..2536ee8130 100644 --- a/var/spack/repos/builtin/packages/adios/package.py +++ b/var/spack/repos/builtin/packages/adios/package.py @@ -38,6 +38,7 @@ class Adios(AutotoolsPackage): version('develop', git='https://github.com/ornladios/ADIOS.git', branch='master') + version('1.13.1', '958aed11240d7f5a065ab5ee271ecb44') version('1.13.0', '68af36b821debbdf4748b20320a990ce') version('1.12.0', '84a1c71b6698009224f6f748c5257fc9') version('1.11.1', '5639bfc235e50bf17ba9dafb14ea4185') @@ -97,7 +98,8 @@ class Adios(AutotoolsPackage): depends_on('bzip2', when='+bzip2') depends_on('szip', when='+szip') depends_on('sz@:1.4.10', when='@:1.12.0 +sz') - depends_on('sz@1.4.11.0:', when='@1.13.0: +sz') + depends_on('sz@1.4.11.0:', when='@1.13.0 +sz') + depends_on('sz@1.4.12.3:', when='@1.13.1: +sz') depends_on('zfp@:0.5.0', when='+zfp') depends_on('lz4', when='+lz4') depends_on('c-blosc@1.12.0:', when='+blosc') diff --git a/var/spack/repos/builtin/packages/sz/package.py b/var/spack/repos/builtin/packages/sz/package.py index fbb32646c9..c84c753788 100644 --- a/var/spack/repos/builtin/packages/sz/package.py +++ b/var/spack/repos/builtin/packages/sz/package.py @@ -34,6 +34,7 @@ class Sz(AutotoolsPackage): version('develop', git='https://github.com/disheng222/SZ.git', branch='master') + version('1.4.12.3', '5f51be8530cdfa5280febb410ac6dd94') version('1.4.11.0', '10dee28b3503821579ce35a50e352cc6') version('1.4.10.0', '82e23dc5a51bcce1f70ba7e3b68a5965') version('1.4.9.2', '028ce90165b7a4c4051d4c0189f193c0') -- cgit v1.2.3-70-g09d2 From 5d39e763539cc3acc0bc9a077c06f3123b0d1a3f Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 18 Apr 2018 14:02:04 -0500 Subject: xrandr: needs randrproto (#7814) * xrandr: needs xrandrproto * xrandr: fix typo --- var/spack/repos/builtin/packages/xrandr/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/xrandr/package.py b/var/spack/repos/builtin/packages/xrandr/package.py index 622d8442e6..92af005ca7 100644 --- a/var/spack/repos/builtin/packages/xrandr/package.py +++ b/var/spack/repos/builtin/packages/xrandr/package.py @@ -37,6 +37,7 @@ class Xrandr(AutotoolsPackage): depends_on('libxrandr@1.5:') depends_on('libxrender') depends_on('libx11') + depends_on('randrproto') depends_on('xproto@7.0.17:', type='build') depends_on('pkgconfig', type='build') -- cgit v1.2.3-70-g09d2 From 0fc51a9c3eb8d6632b7cec18cd38758d03b77b57 Mon Sep 17 00:00:00 2001 From: Jim Galarowicz Date: Wed, 18 Apr 2018 14:05:53 -0500 Subject: Simple updates to the Krell Institute OpenSpeedShop and CBTF components build package files. (#7812) --- var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py | 4 ++-- var/spack/repos/builtin/packages/cbtf-argonavis/package.py | 2 +- var/spack/repos/builtin/packages/cbtf-krell/package.py | 4 ++-- var/spack/repos/builtin/packages/cbtf/package.py | 2 +- var/spack/repos/builtin/packages/openspeedshop/package.py | 6 ++++-- 5 files changed, 10 insertions(+), 8 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py index 05b8ebe537..c4154592fa 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py @@ -52,10 +52,10 @@ class CbtfArgonavisGui(QMakePackage): version('1.3.0', branch='master', git='https://github.com/OpenSpeedShop/cbtf-argonavis-gui.git') - depends_on("cmake@3.0.2", type='build') + depends_on("cmake@3.0.2:", type='build') depends_on("openspeedshop+cuda gui='qt4'") depends_on('qt@4.8.6:') - depends_on("boost@1.50.0:1.59.0") + depends_on("boost@1.50.0:") depends_on("cbtf") depends_on("cbtf-krell") depends_on("cbtf-argonavis") diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py index b7b2dfa52a..de65bca6de 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py @@ -65,7 +65,7 @@ class CbtfArgonavis(CMakePackage): description='CMake build type') depends_on("cmake@3.0.2:", type='build') - depends_on("boost@1.50.0:1.59.0") + depends_on("boost@1.50.0:") depends_on("papi") depends_on("libmonitor") depends_on("mrnet@5.0.1:+lwthreads") diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py index 42938c3713..862250e002 100644 --- a/var/spack/repos/builtin/packages/cbtf-krell/package.py +++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py @@ -87,8 +87,8 @@ class CbtfKrell(CMakePackage): depends_on("binutils") # collectionTool - depends_on("boost@1.50.0:1.59.0") - depends_on("dyninst@9.3.2") + depends_on("boost@1.50.0:") + depends_on("dyninst@9.3.2:") depends_on("mrnet@5.0.1:+cti", when='+cti') depends_on("mrnet@5.0.1:+lwthreads") diff --git a/var/spack/repos/builtin/packages/cbtf/package.py b/var/spack/repos/builtin/packages/cbtf/package.py index 4e68e21d5b..97d94ff20e 100644 --- a/var/spack/repos/builtin/packages/cbtf/package.py +++ b/var/spack/repos/builtin/packages/cbtf/package.py @@ -64,7 +64,7 @@ class Cbtf(CMakePackage): description='CMake build type') depends_on("cmake@3.0.2:", type='build') - depends_on("boost@1.50.0:1.59.0") + depends_on("boost@1.50.0:") depends_on("mrnet@5.0.1:+lwthreads") depends_on("mrnet@5.0.1:+cti", when='+cti') depends_on("xerces-c@3.1.1:") diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py index 39df30afd2..d848df1073 100644 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop/package.py @@ -121,8 +121,8 @@ class Openspeedshop(CMakePackage): depends_on("elf", type="link") depends_on("libdwarf") depends_on("sqlite") - depends_on("boost@1.50.0:1.59.0") - depends_on("dyninst@9.3.2") + depends_on("boost@1.50.0:") + depends_on("dyninst@9.3.2:") depends_on("python") depends_on("libxml2+python") depends_on("qt@3.3.8b+krellpatch", when='gui=qt3') @@ -362,6 +362,7 @@ class Openspeedshop(CMakePackage): join_path(oss_libdir + '/openspeedshop')) run_env.prepend_path('PATH', self.spec['papi'].prefix.bin) run_env.prepend_path('PATH', self.spec['libdwarf'].prefix.bin) + run_env.prepend_path('PATH', self.spec['python'].prefix.bin) if '+mpich' in self.spec: run_env.set('OPENSS_MPI_IMPLEMENTATION', 'mpich') @@ -382,3 +383,4 @@ class Openspeedshop(CMakePackage): run_env.prepend_path('PATH', self.spec['mrnet'].prefix.bin) run_env.prepend_path('PATH', self.spec['cbtf-krell'].prefix.bin) run_env.prepend_path('PATH', self.spec['cbtf-krell'].prefix.sbin) + run_env.prepend_path('PATH', self.spec['python'].prefix.bin) -- cgit v1.2.3-70-g09d2 From ecdb3065edf0e37c3d5b48466a21f9e92f0f0e56 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 18 Apr 2018 17:58:45 -0500 Subject: glew: adding gl dependency (#7817) --- var/spack/repos/builtin/packages/glew/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/glew/package.py b/var/spack/repos/builtin/packages/glew/package.py index 529506a416..7901fd5e67 100644 --- a/var/spack/repos/builtin/packages/glew/package.py +++ b/var/spack/repos/builtin/packages/glew/package.py @@ -34,6 +34,7 @@ class Glew(Package): version('2.0.0', '2a2cd7c98f13854d2fcddae0d2b20411') depends_on("cmake", type='build') + depends_on("gl") def install(self, spec, prefix): options = [] -- cgit v1.2.3-70-g09d2 From 4ed613d7e1beb089b78cd7aa8112424db1af36b0 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 18 Apr 2018 19:49:42 -0500 Subject: freeglut: new package (#7820) --- .../repos/builtin/packages/freeglut/package.py | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 var/spack/repos/builtin/packages/freeglut/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/freeglut/package.py b/var/spack/repos/builtin/packages/freeglut/package.py new file mode 100644 index 0000000000..eabe21949a --- /dev/null +++ b/var/spack/repos/builtin/packages/freeglut/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Freeglut(CMakePackage): + """FreeGLUT is a free-software/open-source alternative to the OpenGL + Utility Toolkit (GLUT) library""" + + homepage = "http://freeglut.sourceforge.net/" + url = "http://prdownloads.sourceforge.net/freeglut/freeglut-3.0.0.tar.gz" + + version('3.0.0', '90c3ca4dd9d51cf32276bc5344ec9754') + + depends_on('gl') + depends_on('glu') + depends_on('libx11') + depends_on('libxrandr') + depends_on('libxi') + depends_on('xrandr') + depends_on('inputproto') -- cgit v1.2.3-70-g09d2 From 6d1097f99be31e7764e649d6ae67bb9391e0b001 Mon Sep 17 00:00:00 2001 From: healther Date: Thu, 19 Apr 2018 14:23:16 +0200 Subject: add variants and conflicts for curl (#7804) * add variants and conflicts for curl * darwinssl - Apple's SSL/TLS implementation * libssh - use libssh implementation * add darwin conflict for libssh{,2} * add linux conflict for darwinssl * remove openssl when +darwinssl * Update package.py * Update package.py * Update package.py * Update package.py --- var/spack/repos/builtin/packages/curl/package.py | 31 ++++++++++++++---- var/spack/repos/builtin/packages/libssh/package.py | 37 ++++++++++++++++++++++ 2 files changed, 61 insertions(+), 7 deletions(-) create mode 100644 var/spack/repos/builtin/packages/libssh/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/curl/package.py b/var/spack/repos/builtin/packages/curl/package.py index be7a0f659f..90f6110372 100644 --- a/var/spack/repos/builtin/packages/curl/package.py +++ b/var/spack/repos/builtin/packages/curl/package.py @@ -23,6 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * +import sys class Curl(AutotoolsPackage): @@ -49,21 +50,37 @@ class Curl(AutotoolsPackage): version('7.43.0', '11bddbb452a8b766b932f859aaeeed39') version('7.42.1', '296945012ce647b94083ed427c1877a8') - variant('nghttp2', default=False, description='build nghttp2 library (requires C++11)') - variant('libssh2', default=False, description='enable libssh2 support') + variant('nghttp2', default=False, description='build nghttp2 library (requires C++11)') + variant('libssh2', default=False, description='enable libssh2 support') + variant('libssh', default=False, description='enable libssh support') # , when='7.58:') + variant('darwinssl', default=sys.platform == 'darwin', description="use Apple's SSL/TLS implementation") - depends_on('openssl') + conflicts('+libssh', when='@:7.57.99') + # on OSX and --with-ssh the configure steps fails with + # one or more libs available at link-time are not available run-time + # unless the libssh are installed externally (e.g. via homebrew), even + # though spack isn't supposed to know about such a libssh installation. + # C.f. https://github.com/spack/spack/issues/7777 + conflicts('platform=darwin', when='+libssh2') + conflicts('platform=darwin', when='+libssh') + conflicts('platform=linux', when='+darwinssl') + + depends_on('openssl', when='~darwinssl') depends_on('zlib') depends_on('nghttp2', when='+nghttp2') depends_on('libssh2', when='+libssh2') + depends_on('libssh', when='+libssh') def configure_args(self): spec = self.spec - args = [ - '--with-zlib={0}'.format(spec['zlib'].prefix), - '--with-ssl={0}'.format(spec['openssl'].prefix) - ] + args = ['--with-zlib={0}'.format(spec['zlib'].prefix)] + if self.satisfies('+darwinssl'): + args.append('--with-darwinssl') + else: + args.append('--with-ssl={0}'.format(spec['openssl'].prefix)) + args += self.with_or_without('nghttp2') args += self.with_or_without('libssh2') + args += self.with_or_without('libssh') return args diff --git a/var/spack/repos/builtin/packages/libssh/package.py b/var/spack/repos/builtin/packages/libssh/package.py new file mode 100644 index 0000000000..7a99ebbd65 --- /dev/null +++ b/var/spack/repos/builtin/packages/libssh/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Libssh(CMakePackage): + """libssh: the SSH library""" + + homepage = "https://www.libssh.org" + url = "https://red.libssh.org/attachments/download/218/libssh-0.7.5.tar.xz" + + version('0.7.5', 'd3fc864208bf607ad87cdee836894feb') + + depends_on('openssl') + depends_on('zlib') -- cgit v1.2.3-70-g09d2 From 4869b7312a000421074ad43233aa1264a2fb8ca4 Mon Sep 17 00:00:00 2001 From: "Kelly (KT) Thompson" Date: Thu, 19 Apr 2018 07:59:55 -0600 Subject: Suite-sparse: provide patch to fix builts with clang@6.0.0. (#7811) + I am unable to build suite-sparse@5.2.0 with clang@6.0.0. The build fails with the error: ``` 2397 [ 99%] Linking C executable wildtype_demo 2398 make[4]: Leaving directory `/tmp/kellyt/spack-stage/spack-stage-w0XYhK/SuiteSparse/GraphBLAS/build' >> 2399 libgraphblas.so.2.0.1: undefined reference to `__fpclassify' >> 2400 clang-6.0: error: linker command failed with exit code 1 (use -v to see invocation) >> 2401 make[4]: *** [wildtype_demo] Error 1 ``` + This error appears because libgraphblas.so requires `-lm`, but that link dependency is not explicitly listed in GraphBLAS\CMakeLists.txt. + A patch file is provided to add this dependency. The patch is only applied when the compiler is `%clang`. --- .../builtin/packages/suite-sparse/graphblas_libm_dep.patch | 10 ++++++++++ var/spack/repos/builtin/packages/suite-sparse/package.py | 4 ++++ 2 files changed, 14 insertions(+) create mode 100644 var/spack/repos/builtin/packages/suite-sparse/graphblas_libm_dep.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/suite-sparse/graphblas_libm_dep.patch b/var/spack/repos/builtin/packages/suite-sparse/graphblas_libm_dep.patch new file mode 100644 index 0000000000..441b0eff87 --- /dev/null +++ b/var/spack/repos/builtin/packages/suite-sparse/graphblas_libm_dep.patch @@ -0,0 +1,10 @@ +--- a/GraphBLAS/CMakeLists.txt ++++ b/GraphBLAS/CMakeLists.txt +@@ -87,6 +87,7 @@ + C_STANDARD_REQUIRED 11 + PUBLIC_HEADER "Include/GraphBLAS.h" ) + set_property ( TARGET graphblas PROPERTY C_STANDARD 11 ) ++target_link_libraries ( graphblas m ) + + # create the static graphblas library. Requires ANSI C11 + add_library ( graphblas_static STATIC ${GRAPHBLAS_SOURCES} ) diff --git a/var/spack/repos/builtin/packages/suite-sparse/package.py b/var/spack/repos/builtin/packages/suite-sparse/package.py index 7d89be0326..6b22e76f0e 100644 --- a/var/spack/repos/builtin/packages/suite-sparse/package.py +++ b/var/spack/repos/builtin/packages/suite-sparse/package.py @@ -60,6 +60,10 @@ class SuiteSparse(Package): # This patch removes unsupported flags for pgi compiler patch('pgi.patch', when='%pgi') + # This patch adds '-lm' when linking libgraphblas and when using clang. + # Fixes 'libgraphblas.so.2.0.1: undefined reference to `__fpclassify'' + patch('graphblas_libm_dep.patch', when='@5.2.0:%clang') + def install(self, spec, prefix): # The build system of SuiteSparse is quite old-fashioned. # It's basically a plain Makefile which include an header -- cgit v1.2.3-70-g09d2 From 7219f4a2aa7ee6a47091aa15b3ad226af34e53f7 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Thu, 19 Apr 2018 09:00:49 -0500 Subject: freetype: adding subdir to cpath for deps (#7818) * freetype: adding subdir to cpath for deps * freetype: no join_path * freetype: fix cpath for run_env --- var/spack/repos/builtin/packages/freetype/package.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/freetype/package.py b/var/spack/repos/builtin/packages/freetype/package.py index 7102e3429f..0791568e32 100644 --- a/var/spack/repos/builtin/packages/freetype/package.py +++ b/var/spack/repos/builtin/packages/freetype/package.py @@ -44,3 +44,7 @@ class Freetype(AutotoolsPackage): def configure_args(self): return ['--with-harfbuzz=no'] + + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): + spack_env.prepend_path('CPATH', self.prefix.include.freetype2) + run_env.prepend_path('CPATH', self.prefix.include.freetype2) -- cgit v1.2.3-70-g09d2 From d65fbf4c68deec40f27186fa0af7bf6a4ef99700 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Thu, 19 Apr 2018 09:01:11 -0500 Subject: libxml2: adding subdir to cpath for deps (#7819) * libxml2: adding subdir to cpath for deps * libxml2: no join_path * libxml2: fix cpath for run_env * libxml2: typo --- var/spack/repos/builtin/packages/libxml2/package.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libxml2/package.py b/var/spack/repos/builtin/packages/libxml2/package.py index 43a7e999d2..d0fcb36c99 100644 --- a/var/spack/repos/builtin/packages/libxml2/package.py +++ b/var/spack/repos/builtin/packages/libxml2/package.py @@ -60,3 +60,7 @@ class Libxml2(AutotoolsPackage): args.append('--without-python') return args + + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): + spack_env.prepend_path('CPATH', self.prefix.include.libxml2) + run_env.prepend_path('CPATH', self.prefix.include.libxml2) -- cgit v1.2.3-70-g09d2 From 26e9b3b74dc7de0561aafe16ff11547e2e28303c Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Thu, 19 Apr 2018 16:04:07 +0200 Subject: openPMD-api (#7765) * openPMD-api Add a new package for openPMD-api. openPMD is a meta-data standard (markup, schema) for hierarchical, scientific particle and mesh based data. openPMD-api is a library wrapping the underlying backends (HDF5, ADIOS, ...) into a single, object-aware API. * Repository: https://github.com/openPMD/openPMD-api * Project: https://github.com/openPMD http://www.openPMD.org * mpi variant forwarding: fix concretization --- .../repos/builtin/packages/openpmd-api/package.py | 102 +++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 var/spack/repos/builtin/packages/openpmd-api/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openpmd-api/package.py b/var/spack/repos/builtin/packages/openpmd-api/package.py new file mode 100644 index 0000000000..e9aae9308f --- /dev/null +++ b/var/spack/repos/builtin/packages/openpmd-api/package.py @@ -0,0 +1,102 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class OpenpmdApi(CMakePackage): + """API for easy reading and writing of openPMD files""" + + homepage = "http://www.openPMD.org" + url = "https://github.com/openPMD/openPMD-api/archive/1.0.0.tar.gz" + maintainers = ['ax3l'] + + version('develop', branch='dev', + git='https://github.com/openPMD/openPMD-api.git') + + variant('mpi', default=True, + description='Enable parallel I/O') + variant('hdf5', default=True, + description='Enable HDF5 support') + variant('adios1', default=False, + description='Enable ADIOS1 support') + variant('adios2', default=False, + description='Enable ADIOS2 support') + # variant('json', default=True, + # description='Enable JSON support') + variant('python', default=True, + description='Enable Python bindings') + variant('test', default=True, + description='Build the tests') + + depends_on('cmake@3.10.0:', type='build') + depends_on('boost@1.62.0:') + depends_on('mpark-variant@1.3.0:') + depends_on('catch@2.2.1: ~single_header', when='+test', type='build') + depends_on('mpi@2.3:', when='+mpi') # might become MPI 3.0+ + depends_on('hdf5@1.8.6:', when='+hdf5') + depends_on('hdf5@1.8.6: ~mpi', when='~mpi +hdf5') + depends_on('hdf5@1.8.6: +mpi', when='+mpi +hdf5') + depends_on('adios@1.10.0:', when='+adios1') + depends_on('adios@1.10.0: ~mpi', when='~mpi +adios1') + depends_on('adios@1.10.0: +mpi', when='+mpi +adios1') + depends_on('adios2@2.1.0:', when='+adios2') + depends_on('adios2@2.1.0: ~mpi', when='~mpi +adios2') + depends_on('adios2@2.1.0: +mpi', when='+mpi +adios2') + # ideally we want 2.3.0+ for full C++11 CT function signature support + depends_on('py-pybind11@2.2.1:', when='+python') + + extends('python', when='+python') + + def cmake_args(self): + spec = self.spec + + args = [ + # variants + '-DopenPMD_USE_MPI:BOOL={0}'.format( + 'ON' if '+mpi' in spec else 'OFF'), + '-DopenPMD_USE_HDF5:BOOL={0}'.format( + 'ON' if '+hdf5' in spec else 'OFF'), + '-DopenPMD_USE_ADIOS1:BOOL={0}'.format( + 'ON' if '+adios1' in spec else 'OFF'), + '-DopenPMD_USE_ADIOS2:BOOL={0}'.format( + 'ON' if '+adios2' in spec else 'OFF'), + # '-DopenPMD_USE_JSON:BOOL={0}'.format( + # 'ON' if '+json' in spec else 'OFF'), + '-DopenPMD_USE_PYTHON:BOOL={0}'.format( + 'ON' if '+python' in spec else 'OFF'), + '-DBUILD_TESTING:BOOL={0}'.format( + 'ON' if '+test' in spec else 'OFF') + ] + + if spec.satisfies('+python'): + args.append('-DPYTHON_EXECUTABLE:FILEPATH={0}'.format( + self.spec['python'].command.path)) + + # switch internally shipped third-party libraries for spack + args.append('-DopenPMD_USE_INTERNAL_VARIANT:BOOL=OFF') + if spec.satisfies('+test'): + args.append('-DopenPMD_USE_INTERNAL_CATCH:BOOL=OFF') + + return args -- cgit v1.2.3-70-g09d2 From c8e3c94c6ffa8a5f24423e53958ee71cf98a60d6 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Fri, 20 Apr 2018 01:43:12 +0800 Subject: self has no attribute named satisfies. (#7826) --- var/spack/repos/builtin/packages/curl/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/curl/package.py b/var/spack/repos/builtin/packages/curl/package.py index 90f6110372..41f3547a79 100644 --- a/var/spack/repos/builtin/packages/curl/package.py +++ b/var/spack/repos/builtin/packages/curl/package.py @@ -75,7 +75,7 @@ class Curl(AutotoolsPackage): spec = self.spec args = ['--with-zlib={0}'.format(spec['zlib'].prefix)] - if self.satisfies('+darwinssl'): + if spec.satisfies('+darwinssl'): args.append('--with-darwinssl') else: args.append('--with-ssl={0}'.format(spec['openssl'].prefix)) -- cgit v1.2.3-70-g09d2 From 5ae960c4767164de12adff1a145c7ab0ae916bd1 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Sat, 21 Apr 2018 09:56:38 -0500 Subject: jellyfish: fixing url for v2 package retrieval (#7849) --- var/spack/repos/builtin/packages/jellyfish/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/jellyfish/package.py b/var/spack/repos/builtin/packages/jellyfish/package.py index e3c31566c1..41f5830c50 100644 --- a/var/spack/repos/builtin/packages/jellyfish/package.py +++ b/var/spack/repos/builtin/packages/jellyfish/package.py @@ -33,7 +33,8 @@ class Jellyfish(AutotoolsPackage): url = "https://github.com/gmarcais/Jellyfish/releases/download/v2.2.7/jellyfish-2.2.7.tar.gz" list_url = "http://www.cbcb.umd.edu/software/jellyfish/" - version('2.2.7', 'f741192d9061f28e34cb67c86a1027ab') + version('2.2.7', 'f741192d9061f28e34cb67c86a1027ab', + url='https://github.com/gmarcais/Jellyfish/releases/download/v2.2.7/jellyfish-2.2.7.tar.gz') version('1.1.11', 'dc994ea8b0896156500ea8c648f24846', url='http://www.cbcb.umd.edu/software/jellyfish/jellyfish-1.1.11.tar.gz') -- cgit v1.2.3-70-g09d2 From a808553fa13a72fbcd36cafaa7dd9a337f506125 Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 21 Apr 2018 09:57:06 -0500 Subject: DIAMOND: Add version 0.9.20 (#7847) * DIAMOND: Add version 0.9.20 * DIAMOND: add version 0.9.21 --- var/spack/repos/builtin/packages/diamond/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/diamond/package.py b/var/spack/repos/builtin/packages/diamond/package.py index 1dd509433e..936e4b0acc 100644 --- a/var/spack/repos/builtin/packages/diamond/package.py +++ b/var/spack/repos/builtin/packages/diamond/package.py @@ -32,6 +32,8 @@ class Diamond(CMakePackage): homepage = "https://ab.inf.uni-tuebingen.de/software/diamond" url = "https://github.com/bbuchfink/diamond/archive/v0.9.14.tar.gz" + version('0.9.21', '6f3c53520f3dad37dfa3183d61f21dd5') + version('0.9.20', 'd73f4955909d16456d83b30d9c294b2b') version('0.9.19', '8565d2d3bfe407ee778eeabe7c6a7fde') version('0.9.14', 'b9e1d0bc57f07afa05dbfbb53c31aae2') version('0.8.38', 'd4719c8a7947ba9f743446ac95cfe644') -- cgit v1.2.3-70-g09d2 From 2dfd61080bdd9855fd142d4cd4994b7e4de9dfe6 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Sat, 21 Apr 2018 17:22:10 +0200 Subject: dealii: disable +slepc with ~petsc (#7832) --- var/spack/repos/builtin/packages/dealii/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 77cd58f9db..2e8db4f505 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -159,6 +159,7 @@ class Dealii(CMakePackage, CudaPackage): conflicts('+scalapack', when='@:8.5.1') conflicts('+sundials', when='@:8.5.1') conflicts('+adol-c', when='@:8.5.1') + conflicts('+slepc', when='~petsc') conflicts('+gsl', when='@:8.4.2') conflicts('+python', when='@:8.4.2') for p in ['+arpack', '+hdf5', '+netcdf', '+p4est', '+petsc', '+scalapack', -- cgit v1.2.3-70-g09d2 From 5794f432a951f5d7ceb90357a793acba6322876e Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Sat, 21 Apr 2018 17:24:36 +0200 Subject: gnuplot: add 5.2.2 (#7831) --- var/spack/repos/builtin/packages/gnuplot/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gnuplot/package.py b/var/spack/repos/builtin/packages/gnuplot/package.py index e8c747bef1..e71bef0758 100644 --- a/var/spack/repos/builtin/packages/gnuplot/package.py +++ b/var/spack/repos/builtin/packages/gnuplot/package.py @@ -45,6 +45,7 @@ class Gnuplot(AutotoolsPackage): # dependency of readline. Fix it with a small patch patch('term_include.patch') + version('5.2.2', '60aedd08998160593199459dea8467fe') version('5.2.0', '0bd8f9af84c0ad2fa9de16772c366416') version('5.0.7', '8eaafddb0b12795f82ed6dd2a6ebbe80') version('5.0.6', '8ec46520a86a61163a701b00404faf1a') -- cgit v1.2.3-70-g09d2 From 8cc24fa20bb4b805d6bf0a854c15bd375e614c00 Mon Sep 17 00:00:00 2001 From: healther Date: Sat, 21 Apr 2018 17:26:37 +0200 Subject: add variant htmlreport to package cppcheck (#7824) Change-Id: I31766d3ceb4fa8852b9bdc82444e36514e760f4b --- var/spack/repos/builtin/packages/cppcheck/package.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cppcheck/package.py b/var/spack/repos/builtin/packages/cppcheck/package.py index ef8a849a1e..6286941b84 100644 --- a/var/spack/repos/builtin/packages/cppcheck/package.py +++ b/var/spack/repos/builtin/packages/cppcheck/package.py @@ -37,6 +37,10 @@ class Cppcheck(Package): version('1.72', '2bd36f91ae0191ef5273bb7f6dc0d72e') version('1.68', 'c015195f5d61a542f350269030150708') + variant('htmlreport', default=False, description="Install cppcheck-htmlreport") + + depends_on('py-pygments', when='+htmlreport', type='run') + def install(self, spec, prefix): # cppcheck does not have a configure script make("CFGDIR=%s" % os.path.join(prefix, 'cfg')) @@ -44,3 +48,5 @@ class Cppcheck(Package): mkdirp(prefix.bin) install('cppcheck', prefix.bin) shutil.copytree('cfg', os.path.join(prefix, 'cfg')) + if spec.satisfies('+htmlreport'): + install('htmlreport/cppcheck-htmlreport', prefix.bin) -- cgit v1.2.3-70-g09d2 From 3274f16780e6e625198f5178c3da27f021f06bda Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Sat, 21 Apr 2018 10:28:09 -0500 Subject: py-pymol: new package (#7823) * py-pymol: new package * py-pymol: needs python+tk --- .../repos/builtin/packages/py-pymol/package.py | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-pymol/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pymol/package.py b/var/spack/repos/builtin/packages/py-pymol/package.py new file mode 100644 index 0000000000..5ba09f1bc9 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pymol/package.py @@ -0,0 +1,51 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPymol(PythonPackage): + """PyMOL is a Python-enhanced molecular graphics tool. It excels at 3D + visualization of proteins, small molecules, density, surfaces, and + trajectories. It also includes molecular editing, ray tracing, and + movies. Open Source PyMOL is free to everyone!""" + + homepage = "https://pymol.org" + url = "https://sourceforge.net/projects/pymol/files/pymol/2/pymol-v2.1.0.tar.bz2" + + version('2.1.0', 'ef2ab2ce11d65785ca3258b4e6982dfb') + + depends_on('python+tk', type=('build', 'run')) + depends_on('tcl') + depends_on('tk') + depends_on('py-pmw') + depends_on('gl') + depends_on('glu') + depends_on('glew') + depends_on('libpng') + depends_on('freetype') + depends_on('libxml2') + depends_on('msgpack-c') + depends_on('py-pyqt', type=('build', 'run')) + depends_on('freeglut') -- cgit v1.2.3-70-g09d2 From f939895b1bf714f870c4f03aedecf844d55e75fd Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Sat, 21 Apr 2018 10:28:44 -0500 Subject: py-mg-rast-tools: Create new package and its dependencies. (#7816) * r-matr: Create new package. * shocklibs: Create new package. * r-biom-utils: Create new package. * r-mgraster: Create new package * py-poster: Create new package. * py-requests-toolbelt: Create new package. * perl-libwww-perl: Create new package. * py-mg-rast-tools: Create new package. * mg-rast-tools: Fix version constraints for dependencies. * Change dependency type of py-setuptools. --- .../builtin/packages/perl-libwww-perl/package.py | 37 ++++++++++++++++ .../builtin/packages/py-mg-rast-tools/package.py | 50 ++++++++++++++++++++++ .../repos/builtin/packages/py-poster/package.py | 36 ++++++++++++++++ .../packages/py-requests-toolbelt/package.py | 38 ++++++++++++++++ .../repos/builtin/packages/r-biom-utils/package.py | 38 ++++++++++++++++ var/spack/repos/builtin/packages/r-matr/package.py | 42 ++++++++++++++++++ .../repos/builtin/packages/r-mgraster/package.py | 38 ++++++++++++++++ .../repos/builtin/packages/shocklibs/package.py | 37 ++++++++++++++++ 8 files changed, 316 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-libwww-perl/package.py create mode 100644 var/spack/repos/builtin/packages/py-mg-rast-tools/package.py create mode 100644 var/spack/repos/builtin/packages/py-poster/package.py create mode 100644 var/spack/repos/builtin/packages/py-requests-toolbelt/package.py create mode 100644 var/spack/repos/builtin/packages/r-biom-utils/package.py create mode 100644 var/spack/repos/builtin/packages/r-matr/package.py create mode 100644 var/spack/repos/builtin/packages/r-mgraster/package.py create mode 100644 var/spack/repos/builtin/packages/shocklibs/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-libwww-perl/package.py b/var/spack/repos/builtin/packages/perl-libwww-perl/package.py new file mode 100644 index 0000000000..bf6a277bb6 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-libwww-perl/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlLibwwwPerl(PerlPackage): + """The libwww-perl collection is a set of Perl modules which provides + a simple and consistent application programming interface to the + World-Wide Web. The main focus of the library is to provide classes and + functions that allow you to write WWW clients.""" + + homepage = "https://github.com/libwww-perl/libwww-perl" + url = "http://search.cpan.org/CPAN/authors/id/O/OA/OALDERS/libwww-perl-6.33.tar.gz" + + version('6.33', '2e15c1c789ac9036c99d094e47e3da23') diff --git a/var/spack/repos/builtin/packages/py-mg-rast-tools/package.py b/var/spack/repos/builtin/packages/py-mg-rast-tools/package.py new file mode 100644 index 0000000000..4b23651842 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-mg-rast-tools/package.py @@ -0,0 +1,50 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyMgRastTools(PythonPackage): + """Repository of scripts and libraries for using the MG-RAST API and + MG-RAST data.""" + + homepage = "https://github.com/MG-RAST/MG-RAST-Tools" + + version('2018.04.17', git='https://github.com/MG-RAST/MG-RAST-Tools.git', commit='a40c6e6539ad0bc1c08e1b03dfc0a9759755a326') + + depends_on('perl', type=('build', 'run')) + depends_on('py-setuptools@28.0:', type='build') + depends_on('py-prettytable@0.7:', type=('build', 'run')) + depends_on('py-poster@0.8.1:', type=('build', 'run')) + depends_on('py-requests', type=('build', 'run')) + depends_on('py-requests-toolbelt@0.8:', type=('build', 'run')) + depends_on('py-scipy', type=('build', 'run')) + depends_on('py-numpy', type=('build', 'run')) + depends_on('r-matr', type=('build', 'run')) + depends_on('shocklibs@0.1.30:') + depends_on('perl-list-moreutils', type=('build', 'run')) + depends_on('perl-exporter-tiny', type=('build', 'run')) + depends_on('perl-libwww-perl', type=('build', 'run')) + depends_on('perl-http-message', type=('build', 'run')) + depends_on('perl-json', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-poster/package.py b/var/spack/repos/builtin/packages/py-poster/package.py new file mode 100644 index 0000000000..100f11fe33 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-poster/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPoster(PythonPackage): + """Streaming HTTP uploads and multipart/form-data encoding.""" + + homepage = "https://pypi.org/project/poster/" + url = "https://atlee.ca/software/poster/dist/0.8.1/poster-0.8.1.tar.gz" + + version('0.8.1', '2db12704538781fbaa7e63f1505d6fc8') + + depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-requests-toolbelt/package.py b/var/spack/repos/builtin/packages/py-requests-toolbelt/package.py new file mode 100644 index 0000000000..8d46e8d544 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-requests-toolbelt/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyRequestsToolbelt(PythonPackage): + """A toolbelt of useful classes and functions to be used with + python-requests""" + + homepage = "https://toolbelt.readthedocs.org/" + url = "https://github.com/requests/toolbelt/archive/0.8.0.tar.gz" + + version('0.8.0', 'de9bf7fbcc6ae341a5c4fd9f8912bcac') + + depends_on('py-setuptools', type='build') + depends_on('py-requests@2.0.1:3.0.0', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-biom-utils/package.py b/var/spack/repos/builtin/packages/r-biom-utils/package.py new file mode 100644 index 0000000000..fb27071d49 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-biom-utils/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RBiomUtils(RPackage): + """Provides utilities to facilitate import, export and computation with + the BIOM (Biological Observation Matrix) format (http://biom-format.org). + """ + + homepage = "https://github.com/braithwaite/BIOM.utils/" + url = "https://cran.r-project.org/src/contrib/BIOM.utils_0.9.tar.gz" + + version('0.9', '980f08fd9848242007753cd27a998060') + + depends_on('r@3:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-matr/package.py b/var/spack/repos/builtin/packages/r-matr/package.py new file mode 100644 index 0000000000..b7a146c324 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-matr/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RMatr(RPackage): + """Package matR (Metagenomics Analysis Tools for R) is an analysis + client for the MG-RAST metagenome annotation engine, part of the US + Department of Energy (DOE) Systems Biology Knowledge Base (KBase). + Customized analysis and visualization tools securely access remote + data and metadata within the popular open source R language and + environment for statistical computing.""" + + homepage = "https://github.com/MG-RAST/matR" + url = "https://cran.r-project.org/src/contrib/Archive/matR/matR_0.9.tar.gz" + + version('0.9', 'e2be8734009f5c5b9c1f6b677a77220a') + + depends_on('r-mgraster', type=('build', 'run')) + depends_on('r-biom-utils', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-mgraster/package.py b/var/spack/repos/builtin/packages/r-mgraster/package.py new file mode 100644 index 0000000000..bca66dc250 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-mgraster/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RMgraster(RPackage): + """Convenience Functions for R Language Access to the v.1 API of the + MG-RAST Metagenome Annotation Server, part of the US Department of Energy + (DOE) Systems Biology Knowledge Base (KBase).""" + + homepage = "https://github.com/braithwaite/MGRASTer/" + url = "https://cran.r-project.org/src/contrib/MGRASTer_0.9.tar.gz" + + version('0.9', '902c7ad4180b858d6b6428ea26d7652a') + + depends_on('r@3:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/shocklibs/package.py b/var/spack/repos/builtin/packages/shocklibs/package.py new file mode 100644 index 0000000000..7f399de02c --- /dev/null +++ b/var/spack/repos/builtin/packages/shocklibs/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of99c6c1b375f7f3 Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Shocklibs(Package): + """The lib for shock: An object store for scientific data.""" + + homepage = "https://github.com/MG-RAST/Shock" + url = "https://github.com/MG-RAST/Shock/archive/v0.9.24.tar.gz" + + version('0.9.24', '98b2e91e2726c7165f75afaf0ca51a5b') + + def install(self, spec, prefix): + install_tree('libs', prefix.libs) -- cgit v1.2.3-70-g09d2 From b91b4a6c4da2370edcbbe336ff77b413145bf8dd Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Sun, 22 Apr 2018 02:08:44 +0800 Subject: A new pacakge: IMP. (#7859) --- var/spack/repos/builtin/packages/imp/package.py | 40 +++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 var/spack/repos/builtin/packages/imp/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/imp/package.py b/var/spack/repos/builtin/packages/imp/package.py new file mode 100644 index 0000000000..28ddc388bc --- /dev/null +++ b/var/spack/repos/builtin/packages/imp/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Imp(CMakePackage): + """IMP, the Integrative Modeling Platform.""" + + homepage = "https://integrativemodeling.org" + url = "https://github.com/salilab/imp/archive/2.8.0.tar.gz" + + version('2.8.0', 'bc985d40dc63bb12e09d6d7403954645') + + depends_on('python@2.7:') + depends_on('swig') + depends_on('boost@1.40:') + depends_on('hdf5') + depends_on('eigen') -- cgit v1.2.3-70-g09d2 From 708fe9f6765717e1f1dabce1f9ac9ed56a7cc769 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Sun, 22 Apr 2018 02:08:56 +0800 Subject: Add a new pacakage: HiC-Pro. (#7858) * HiC-Pro: a new package. * Flake8. * Update. * Remove nektar. --- .../repos/builtin/packages/hic-pro/package.py | 80 ++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 var/spack/repos/builtin/packages/hic-pro/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hic-pro/package.py b/var/spack/repos/builtin/packages/hic-pro/package.py new file mode 100644 index 0000000000..11d4c4db86 --- /dev/null +++ b/var/spack/repos/builtin/packages/hic-pro/package.py @@ -0,0 +1,80 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class HicPro(MakefilePackage): + """HiC-Pro is a package designed to process Hi-C data, + from raw fastq files (paired-end Illumina data) + to the normalized contact maps""" + + homepage = "https://github.com/nservant/HiC-Pro" + url = "https://github.com/nservant/HiC-Pro/archive/v2.10.0.tar.gz" + + version('2.10.0', '6ae2213dcc984b722d1a1f65fcbb21a2') + + depends_on('bowtie2') + depends_on('samtools') + depends_on('python@2.7:2.8') + depends_on('r') + depends_on('py-numpy', type=('build', 'run')) + depends_on('py-scipy', type=('build', 'run')) + depends_on('py-pysam', type=('build', 'run')) + depends_on('py-bx-python', type=('build', 'run')) + depends_on('r-rcolorbrewer', type=('build', 'run')) + depends_on('r-ggplot2', type=('build', 'run')) + + def edit(self, spec, prefix): + config = FileFilter('config-install.txt') + config.filter('PREFIX =.*', 'PREFIX = {0}'.format(prefix)) + config.filter('BOWTIE2 PATH =.*', + 'BOWTIE2_PATH = {0}'.format(spec['bowtie2'].prefix)) + config.filter('SAMTOOLS_PATH =.*', + 'SAMTOOLS_PATH = {0}'.format(spec['samtools'].prefix)) + config.filter('R_PATH =.*', + 'R_RPTH ={0}'.format(spec['r'].prefix)) + config.filter('PYTHON_PATH =.*', + 'PYTHON_RPTH ={0}'.format(spec['python'].prefix)) + + def build(self, spec, preifx): + make('-f', './scripts/install/Makefile', + 'CONFIG_SYS=./config-install.txt') + make('mapbuilder') + make('readstrimming') + make('iced') + + def install(sefl, spec, prefix): + # Patch INSTALLPATH in config-system.txt + config = FileFilter('config-system.txt') + config.filter('/HiC-Pro_2.10.0', '') + # Install + install('config-hicpro.txt', prefix) + install('config-install.txt', prefix) + install('config-system.txt', prefix) + install_tree('bin', prefix.bin) + install_tree('annotation', prefix.annotation) + install_tree('doc', prefix.doc) + install_tree('scripts', prefix.scripts) + install_tree('test-op', join_path(prefix, 'test-op')) -- cgit v1.2.3-70-g09d2 From af82f5529ded81a4015b6c5c8028c90d251d1f16 Mon Sep 17 00:00:00 2001 From: Sinan Date: Sun, 22 Apr 2018 05:54:48 -0700 Subject: new package: racon (bioinformatics) (#7726) * new package: racon (bioinformatics) * add cmake_arg method --- var/spack/repos/builtin/packages/racon/package.py | 51 +++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 var/spack/repos/builtin/packages/racon/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/racon/package.py b/var/spack/repos/builtin/packages/racon/package.py new file mode 100644 index 0000000000..2ea3730087 --- /dev/null +++ b/var/spack/repos/builtin/packages/racon/package.py @@ -0,0 +1,51 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class Racon(CMakePackage): + """Ultrafast consensus module for raw de novo genome assembly of long + uncorrected reads.""" + + homepage = "https://github.com/isovic/racon" + url = "https://github.com/isovic/racon/releases/download/1.2.1/racon-v1.2.1.tar.gz" + + version('1.3.0', 'e00d61f391bce2af20ebd2a3aee1e05a') + version('1.2.1', '7bf273b965a5bd0f41342a9ffe5c7639') + + depends_on('cmake@3.2:', type='build') + depends_on('python', type='build') + + conflicts('%gcc@:4.7') + conflicts('%clang@:3.1') + + def cmake_args(self): + args = ['-Dracon_build_wrapper=ON'] + return args + + def install(self, spec, prefix): + install_tree('spack-build/bin', prefix.bin) + install_tree('spack-build/lib', prefix.lib) -- cgit v1.2.3-70-g09d2 From 130d0c8b2ed905b7224e7c4ba997bbb9f4478011 Mon Sep 17 00:00:00 2001 From: Dan Ibanez Date: Sun, 22 Apr 2018 16:26:52 -0600 Subject: omega-h: new package (#7861) * omega-h: new package * omega-h: fix multiple package.py issues * omega-h: use tarball checksum to avoid warning * omega-h: wrap lines for flake8 --- .../repos/builtin/packages/omega-h/package.py | 67 ++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 var/spack/repos/builtin/packages/omega-h/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/omega-h/package.py b/var/spack/repos/builtin/packages/omega-h/package.py new file mode 100644 index 0000000000..89d9223750 --- /dev/null +++ b/var/spack/repos/builtin/packages/omega-h/package.py @@ -0,0 +1,67 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class OmegaH(CMakePackage): + """Omega_h is a C++11 library providing data structures and algorithms + for adaptive discretizations. Its specialty is anisotropic triangle and + tetrahedral mesh adaptation. It runs efficiently on most modern HPC + hardware including GPUs. + """ + + homepage = "https://github.com/ibaned/omega_h" + url = "https://github.com/ibaned/omega_h/archive/v9.13.4.tar.gz" + + version('9.13.4', '035f9986ec07ad97ae0aa1e171872307') + + variant('shared', default=True, description='Build shared libraries') + variant('mpi', default=True, description='Activates MPI support') + variant('zlib', default=True, description='Activates ZLib support') + + depends_on('mpi', when='+mpi') + depends_on('zlib', when='+zlib') + + def cmake_args(self): + args = ['-DUSE_XSDK_DEFAULTS:BOOL=ON'] + if '+shared' in self.spec: + args.append('-DBUILD_SHARED_LIBS:BOOL=ON') + else: + args.append('-DBUILD_SHARED_LIBS:BOOL=OFF') + if '+mpi' in self.spec: + args.append('-DOmega_h_USE_MPI:BOOL=ON') + args.append('-DCMAKE_CXX_COMPILER:FILEPATH={0}'.format( + self.spec['mpi'].mpicxx)) + else: + args.append('-DOmega_h_USE_MPI:BOOL=OFF') + if '+zlib' in self.spec: + args.append('-DTPL_ENABLE_ZLIB:BOOL=ON') + args.append('-DTPL_ZLIB_INCLUDE_DIRS:STRING={0}'.format( + self.spec['zlib'].prefix.include)) + args.append('-DTPL_ZLIB_LIBRARIES:STRING={0}'.format( + self.spec['zlib'].libs)) + else: + args.append('-DTPL_ENABLE_ZLIB:BOOL=OFF') + return args -- cgit v1.2.3-70-g09d2 From b33f01c799d692511c2687d69a36b15ac2f47f86 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Mon, 23 Apr 2018 20:31:29 +0800 Subject: Add a new version 5.4.1.7 for mono. (#7866) --- var/spack/repos/builtin/packages/mono/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mono/package.py b/var/spack/repos/builtin/packages/mono/package.py index 4bc593d37c..182a3cf96b 100644 --- a/var/spack/repos/builtin/packages/mono/package.py +++ b/var/spack/repos/builtin/packages/mono/package.py @@ -47,6 +47,7 @@ class Mono(AutotoolsPackage): depends_on('libiconv') depends_on('perl', type=('build')) + version('5.4.1.7', '28a82df5d0b7854b387d4f21d852ac70') version('5.4.0.167', '103c7a737632046a9e9a0b039d752ee1') version('5.0.1.1', '17692c7a797f95ee6f9a0987fda3d486') version('4.8.0.524', 'baeed5b8139a85ad7e291d402a4bcccb') -- cgit v1.2.3-70-g09d2 From 50fb9352f0687a2c7f7ec2827ca8d69d9a61dc3a Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 23 Apr 2018 17:50:58 +0200 Subject: New colm, ragel packages (#7867) - Ragel is a parser and finite state machine generator that can be used as an alternative means for solving parsing problems without Flex. --- var/spack/repos/builtin/packages/colm/package.py | 38 ++++++++++++++++++++ var/spack/repos/builtin/packages/ragel/package.py | 43 +++++++++++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 var/spack/repos/builtin/packages/colm/package.py create mode 100644 var/spack/repos/builtin/packages/ragel/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/colm/package.py b/var/spack/repos/builtin/packages/colm/package.py new file mode 100644 index 0000000000..795fcc43d2 --- /dev/null +++ b/var/spack/repos/builtin/packages/colm/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Colm(AutotoolsPackage): + """Colm Programming Language + Colm is a programming language designed for the analysis and + transformation of computer languages. Colm is influenced primarily + by TXL. It is in the family of program transformation languages. + """ + + homepage = "http://www.colm.net/open-source/colm" + url = "http://www.colm.net/files/colm/colm-0.12.0.tar.gz" + + version('0.12.0', '079a1ed44f71d48a349d954096c8e411') diff --git a/var/spack/repos/builtin/packages/ragel/package.py b/var/spack/repos/builtin/packages/ragel/package.py new file mode 100644 index 0000000000..92497082c3 --- /dev/null +++ b/var/spack/repos/builtin/packages/ragel/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Ragel(AutotoolsPackage): + """Ragel State Machine Compiler + Ragel compiles executable finite state machines from regular + languages. Ragel targets C, C++ and ASM. Ragel state machines can + not only recognize byte sequences as regular expression machines + do, but can also execute code at arbitrary points in the + recognition of a regular language. Code embedding is done using + inline operators that do not disrupt the regular language syntax. + """ + homepage = "http://www.colm.net/open-source/ragel" + git = "git://colm.net/ragel.git" + url = "http://www.colm.net/files/ragel/ragel-6.10.tar.gz" + + version('6.10', '748cae8b50cffe9efcaa5acebc6abf0d') + + depends_on('colm', type='build') -- cgit v1.2.3-70-g09d2 From b5d9a44e1767a66fede811ddd7c0cdbaeb253c76 Mon Sep 17 00:00:00 2001 From: Ross Miller Date: Mon, 23 Apr 2018 15:09:52 -0400 Subject: 7851 pmix aarch64 (#7852) * Fix build issue with PMIx on aarch64 Work around a bug in PMIx that causes build issues on aarch64. Bug was fixed in PMIx 2.1.1, so the spack package checks both the architecture and the PMIx version. Workaround is to just not build the PMIx test and example code. * Minor code cleanups Minor corrections to make 'spack flake8' happy. * Add support for version 2.1.1 --- var/spack/repos/builtin/packages/pmix/package.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pmix/package.py b/var/spack/repos/builtin/packages/pmix/package.py index 375b125741..402cd9e248 100644 --- a/var/spack/repos/builtin/packages/pmix/package.py +++ b/var/spack/repos/builtin/packages/pmix/package.py @@ -24,6 +24,7 @@ ############################################################################## from spack import * +import spack.architecture class Pmix(AutotoolsPackage): @@ -48,6 +49,7 @@ class Pmix(AutotoolsPackage): homepage = "https://pmix.github.io/pmix" url = "https://github.com/pmix/pmix/releases/download/v2.0.1/pmix-2.0.1.tar.bz2" + version('2.1.1', 'f9f109421661b757245d5e0bd44a38b3') version('2.1.0', 'fc97513b601d78fe7c6bb20c6a21df3c') version('2.0.2', 'e3ed1deed87c84f9b43da2621c6ad689') version('2.0.1', 'ba3193b485843516e6b4e8641e443b1e') @@ -61,6 +63,7 @@ class Pmix(AutotoolsPackage): depends_on('libevent') def configure_args(self): + spec = self.spec config_args = [ '--enable-shared', @@ -71,4 +74,11 @@ class Pmix(AutotoolsPackage): config_args.append( '--with-libevent={0}'.format(spec['libevent'].prefix)) + # Versions < 2.1.1 have a bug in the test code that *sometimes* + # causes problems on strict alignment architectures such as + # aarch64. Work-around is to just not build the test code. + if 'aarch64' in spack.architecture.sys_type() and \ + self.spec.version < Version('2.1.1'): + config_args.append('--without-tests-examples') + return config_args -- cgit v1.2.3-70-g09d2 From e3c708fafedb9313eb4d34fec1e271ffb290de06 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 23 Apr 2018 16:11:27 -0500 Subject: prinseq-lite: Create new package (#7873) * prinseq-lite: Create new package * prinseq-lite: set variant description and add dependency type --- .../repos/builtin/packages/prinseq-lite/package.py | 60 ++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 var/spack/repos/builtin/packages/prinseq-lite/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/prinseq-lite/package.py b/var/spack/repos/builtin/packages/prinseq-lite/package.py new file mode 100644 index 0000000000..164044ec96 --- /dev/null +++ b/var/spack/repos/builtin/packages/prinseq-lite/package.py @@ -0,0 +1,60 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PrinseqLite(Package): + """PRINSEQ will help you to preprocess your genomic or metagenomic + sequence data in FASTA or FASTQ format.""" + + homepage = "http://prinseq.sourceforge.net" + url = "https://sourceforge.net/projects/prinseq/files/standalone/prinseq-lite-0.20.4.tar.gz" + + version('0.20.4', '3be1a572073ebbbecfeba42a42853ff5') + + variant('nopca', default=True, description="Graphs version without PCA") + + depends_on('perl', type='run') + depends_on('perl-cairo', type='run') + depends_on('perl-digest-md5', type='run') + depends_on('perl-json', type='run') + + def install(self, spec, prefix): + mkdirp(prefix.bin) + + filter_file(r'#!/usr/bin/perl', + '#!/usr/bin/env perl', + 'prinseq-graphs-noPCA.pl') + + filter_file(r'#!/usr/bin/perl', + '#!/usr/bin/env perl', + 'prinseq-lite.pl') + + install('prinseq-graphs-noPCA.pl', prefix.bin) + install('prinseq-lite.pl', prefix.bin) + + chmod = which('chmod') + chmod('+x', join_path(self.prefix.bin, 'prinseq-graphs-noPCA.pl')) + chmod('+x', join_path(self.prefix.bin, 'prinseq-lite.pl')) -- cgit v1.2.3-70-g09d2 From 8e1a7eaafa886fe6a416ce26a915724118cf4274 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 23 Apr 2018 16:51:42 -0500 Subject: ARAGORN: Create new package (#7875) --- .../repos/builtin/packages/aragorn/package.py | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 var/spack/repos/builtin/packages/aragorn/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/aragorn/package.py b/var/spack/repos/builtin/packages/aragorn/package.py new file mode 100644 index 0000000000..d9e992db26 --- /dev/null +++ b/var/spack/repos/builtin/packages/aragorn/package.py @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Aragorn(Package): + """ARAGORN, a program to detect tRNA genes and tmRNA genes in nucleotide + sequences.""" + + homepage = "http://mbio-serv2.mbioekol.lu.se/ARAGORN" + url = "http://mbio-serv2.mbioekol.lu.se/ARAGORN/Downloads/aragorn1.2.38.tgz" + + version('1.2.38', '1df0ed600069e6f520e5cd989de1eaf0') + + phases = ['build', 'install'] + + def build(self, spec, prefix): + cc = Executable(spack_cc) + cc('-O3', '-ffast-math', '-finline-functions', + '-oaragorn', 'aragorn' + format(spec.version.dotted) + '.c') + + def install(self, spec, prefix): + mkdirp(prefix.bin) + install('aragorn', prefix.bin) -- cgit v1.2.3-70-g09d2 From f7da156879328c7b25758db359d2235af9d245e3 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Tue, 24 Apr 2018 14:10:46 +0200 Subject: petsc and slepc: add 3.9.0; hypre: add 2.14 (needed by petsc) (#7877) --- var/spack/repos/builtin/packages/hypre/package.py | 1 + var/spack/repos/builtin/packages/petsc/package.py | 7 +++++-- var/spack/repos/builtin/packages/slepc/package.py | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hypre/package.py b/var/spack/repos/builtin/packages/hypre/package.py index d95de54d68..4f60b84427 100644 --- a/var/spack/repos/builtin/packages/hypre/package.py +++ b/var/spack/repos/builtin/packages/hypre/package.py @@ -35,6 +35,7 @@ class Hypre(Package): homepage = "http://computation.llnl.gov/project/linear_solvers/software.php" url = "http://computation.llnl.gov/project/linear_solvers/download/hypre-2.10.0b.tar.gz" + version('2.14.0', 'ecde5cc807ec45bfb647e9f28d2eaea1', url='https://github.com/LLNL/hypre/archive/v2.14.0.tar.gz') version('2.13.0', '4b688a5c15b6b5e3de5e045ae081b89b', url='https://github.com/LLNL/hypre/archive/v2.13.0.tar.gz') version('2.12.1', 'c6fcb6d7e57cec1c7ce4a44da885068c', url='https://github.com/LLNL/hypre/archive/v2.12.1.tar.gz') version('2.11.2', 'd507943a1a3ce5681c3308e2f3a6dd34') diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index 54b0c59b83..13fb5ca018 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -42,6 +42,7 @@ class Petsc(Package): version('develop', git='https://bitbucket.org/petsc/petsc.git', tag='master') version('xsdk-0.2.0', git='https://bitbucket.org/petsc/petsc.git', tag='xsdk-0.2.0') + version('3.9.0', '34b8a81814ca050a96d58e53a2f0ac7a') version('3.8.4', 'd7767fe2919536aa393eb22841899306') version('3.8.3', '322cbcf2a0f7b7bad562643b05d66f11') version('3.8.2', '00666e1c4cbfa8dd6eebf91ff8180f79') @@ -132,12 +133,14 @@ class Petsc(Package): # Also PETSc prefer to build it without internal superlu, likely due to # conflict in headers see # https://bitbucket.org/petsc/petsc/src/90564b43f6b05485163c147b464b5d6d28cde3ef/config/BuildSystem/config/packages/hypre.py - depends_on('hypre~internal-superlu~int64', when='+hypre+mpi~complex~int64') + depends_on('hypre@:2.13.99~internal-superlu~int64', when='@:3.8.99+hypre+mpi~complex~int64') + depends_on('hypre@:2.13.99~internal-superlu+int64', when='@:3.8.99+hypre+mpi~complex+int64') + depends_on('hypre@2.14:~internal-superlu~int64', when='@3.9:+hypre+mpi~complex~int64') + depends_on('hypre@2.14:~internal-superlu+int64', when='@3.9+hypre+mpi~complex+int64') depends_on('hypre@xsdk-0.2.0~internal-superlu+int64', when='@xsdk-0.2.0+hypre+mpi~complex+int64') depends_on('hypre@xsdk-0.2.0~internal-superlu~int64', when='@xsdk-0.2.0+hypre+mpi~complex~int64') depends_on('hypre@develop~internal-superlu+int64', when='@develop+hypre+mpi~complex+int64') depends_on('hypre@develop~internal-superlu~int64', when='@develop+hypre+mpi~complex~int64') - depends_on('hypre~internal-superlu+int64', when='+hypre+mpi~complex+int64') depends_on('superlu-dist@:4.3~int64', when='@3.4.4:3.6.4+superlu-dist+mpi~int64') depends_on('superlu-dist@:4.3+int64', when='@3.4.4:3.6.4+superlu-dist+mpi+int64') depends_on('superlu-dist@5.0.0:~int64', when='@3.7:3.7.99+superlu-dist+mpi~int64') diff --git a/var/spack/repos/builtin/packages/slepc/package.py b/var/spack/repos/builtin/packages/slepc/package.py index 07b60849a1..0fb73ddca6 100644 --- a/var/spack/repos/builtin/packages/slepc/package.py +++ b/var/spack/repos/builtin/packages/slepc/package.py @@ -34,6 +34,7 @@ class Slepc(Package): homepage = "http://www.grycap.upv.es/slepc" url = "http://slepc.upv.es/download/distrib/slepc-3.6.2.tar.gz" + version('3.9.0', '1f3930db56b4065aaf214ea758ddff1a70bf19d45544cbdfd19d2787db4bfe0b') version('3.8.2', '1e7d20d20eb26da307d36017461fe4a55f40e947e232739179dbe6412e22ed13') version('3.8.0', 'c58ccc4e852d1da01112466c48efa41f0839649f3a265925788237d76cd3d963') version('3.7.4', '2fb782844e3bc265a8d181c3c3e2632a4ca073111c874c654f1365d33ca2eb8a') @@ -49,6 +50,7 @@ class Slepc(Package): depends_on('python@2.6:2.8', type='build') # Cannot mix release and development versions of SLEPc and PETSc: depends_on('petsc@develop', when='@develop') + depends_on('petsc@3.9:3.9.99', when='@3.9:3.9.99') depends_on('petsc@3.8:3.8.99', when='@3.8:3.8.99') depends_on('petsc@3.7:3.7.7', when='@3.7.1:3.7.4') depends_on('petsc@3.6.3:3.6.4', when='@3.6.2:3.6.3') -- cgit v1.2.3-70-g09d2 From 5f04b0c53877cfbe070126c7ac5920a1fe90515b Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 24 Apr 2018 21:31:37 -0500 Subject: new package: py-weblogo (#7886) --- .../repos/builtin/packages/pdf2svg/package.py | 38 ++++++++++++++++++++ .../repos/builtin/packages/poppler/package.py | 36 +++++++++++++++++++ .../repos/builtin/packages/py-weblogo/package.py | 40 ++++++++++++++++++++++ 3 files changed, 114 insertions(+) create mode 100644 var/spack/repos/builtin/packages/pdf2svg/package.py create mode 100644 var/spack/repos/builtin/packages/poppler/package.py create mode 100644 var/spack/repos/builtin/packages/py-weblogo/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pdf2svg/package.py b/var/spack/repos/builtin/packages/pdf2svg/package.py new file mode 100644 index 0000000000..40626e2700 --- /dev/null +++ b/var/spack/repos/builtin/packages/pdf2svg/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Pdf2svg(AutotoolsPackage): + """A simple PDF to SVG converter using the Poppler and Cairo libraries.""" + + homepage = "http://www.cityinthesky.co.uk/opensource/pdf2svg" + url = "https://github.com/dawbarton/pdf2svg/archive/v0.2.3.tar.gz" + + version('0.2.3', 'd398b3b1c1979f554596238a44f12123') + version('0.2.2', 'f7e0d2213f9e1422cee9421e18f72553') + + depends_on('cairo', type='run') + depends_on('poppler', type='run') diff --git a/var/spack/repos/builtin/packages/poppler/package.py b/var/spack/repos/builtin/packages/poppler/package.py new file mode 100644 index 0000000000..8a8f9d3cf9 --- /dev/null +++ b/var/spack/repos/builtin/packages/poppler/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Poppler(CMakePackage): + """Poppler is a PDF rendering library based on the xpdf-3.0 code base.""" + + homepage = "http://poppler.freedesktop.org" + url = "https://poppler.freedesktop.org/poppler-0.64.0.tar.xz" + + version('0.64.0', 'f7f687ebb60004f8ad61994575018044') + + depends_on('openjpeg', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-weblogo/package.py b/var/spack/repos/builtin/packages/py-weblogo/package.py new file mode 100644 index 0000000000..fd01da070c --- /dev/null +++ b/var/spack/repos/builtin/packages/py-weblogo/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyWeblogo(PythonPackage): + """WebLogo is a web based application designed to make the generation of + sequence logos as easy and painless as possible.""" + + homepage = "http://weblogo.threeplusone.com" + url = "https://pypi.io/packages/source/w/weblogo/weblogo-3.6.0.tar.gz" + + version('3.6.0', 'd0764f218057543fa664d2ae17d37b6d') + + depends_on('py-setuptools', type='build') + depends_on('ghostscript', type=('build', 'run')) + depends_on('pdf2svg', type=('build', 'run')) + depends_on('py-numpy', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 82ac1571c227adb0af665332396b9b3afff5853f Mon Sep 17 00:00:00 2001 From: Daniel Topa Date: Tue, 24 Apr 2018 23:01:17 -0600 Subject: Openmpi update multithread (#7893) --enable-mpi-thread-multiple option not viable in Open MPI 3.0+ Signed-off-by: Dan Topa --- var/spack/repos/builtin/packages/openmpi/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 05cbd1f5d5..1daa3b455b 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -382,7 +382,7 @@ class Openmpi(AutotoolsPackage): config_args.append('--enable-contrib-no-build=vt') # Multithreading support - if spec.satisfies('@1.5.4:'): + if spec.satisfies('@1.5.4:2.999'): if '+thread_multiple' in spec: config_args.append('--enable-mpi-thread-multiple') else: -- cgit v1.2.3-70-g09d2 From 7095d4f414292c2e29bc8fc79de351002cff1ab2 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Wed, 25 Apr 2018 20:30:07 +0800 Subject: Add a new package: fp16. (#7896) --- var/spack/repos/builtin/packages/fp16/package.py | 38 ++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/fp16/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fp16/package.py b/var/spack/repos/builtin/packages/fp16/package.py new file mode 100644 index 0000000000..c1f0dbf625 --- /dev/null +++ b/var/spack/repos/builtin/packages/fp16/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Fp16(Package): + """FP16 is a header-only library for + conversion to/from half-precision floating point formats""" + + homepage = "https://github.com/Maratyszcza/FP16/" + url = "https://github.com/Maratyszcza/FP16.git" + + version('master', git='https://github.com/Maratyszcza/FP16.git') + + def install(self, spec, prefix): + install_tree('include', prefix.include) -- cgit v1.2.3-70-g09d2 From fca267468e699899ae820c5b994fa98969befb4c Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Wed, 25 Apr 2018 23:04:45 +0800 Subject: Add a new package: cpuinfo. (#7895) --- .../repos/builtin/packages/cpuinfo/package.py | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 var/spack/repos/builtin/packages/cpuinfo/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cpuinfo/package.py b/var/spack/repos/builtin/packages/cpuinfo/package.py new file mode 100644 index 0000000000..fbc375f607 --- /dev/null +++ b/var/spack/repos/builtin/packages/cpuinfo/package.py @@ -0,0 +1,35 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Cpuinfo(CMakePackage): + """cpuinfo is a library to detect essential + for performance optimization information about host CPU.""" + + homepage = "https://github.com/Maratyszcza/cpuinfo/" + url = "https://github.com/Maratyszcza/cpuinfo.git" + + version('master', git='https://github.com/Maratyszcza/cpuinfo.git') -- cgit v1.2.3-70-g09d2 From 48a3cc67fc7b50645613a84522ec82be87039849 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Wed, 25 Apr 2018 23:05:16 +0800 Subject: Add a new package: gloo. (#7894) * Add a new package: gloo. * Remove dependencies. --- var/spack/repos/builtin/packages/gloo/package.py | 34 ++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 var/spack/repos/builtin/packages/gloo/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gloo/package.py b/var/spack/repos/builtin/packages/gloo/package.py new file mode 100644 index 0000000000..5fe40d7a22 --- /dev/null +++ b/var/spack/repos/builtin/packages/gloo/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Gloo(CMakePackage): + """Gloo is a collective communications library.""" + + homepage = "https://github.com/facebookincubator/gloo" + url = "https://github.com/facebookincubator/gloo.git" + + version('master', git='https://github.com/facebookincubator/gloo.git') -- cgit v1.2.3-70-g09d2 From 0d5dd96762bc0d3c0854397fa5b3fcd8373e31d9 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 25 Apr 2018 10:29:29 -0500 Subject: fabtests: new package (#7837) * fabtests: new package * fabtests: fix hashes for github archive behavior & add libfabric dep * fabtests: both versions confirmed working * fabtests: use developer provided archive --- .../repos/builtin/packages/fabtests/package.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 var/spack/repos/builtin/packages/fabtests/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fabtests/package.py b/var/spack/repos/builtin/packages/fabtests/package.py new file mode 100644 index 0000000000..4e85d91e35 --- /dev/null +++ b/var/spack/repos/builtin/packages/fabtests/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Fabtests(AutotoolsPackage): + """Fabtests provides a set of examples that uses libfabric""" + + homepage = "http://libfabric.org" + url = "https://github.com/ofiwg/fabtests/releases/download/v1.5.3/fabtests-1.5.3.tar.gz" + + version('1.6.0', '0441aa0aeda391b1bf1eb71250a4afbc') + version('1.5.3', 'f60cb95843ebf62e4eaa128e08ccdc7d') + + depends_on('libfabric') -- cgit v1.2.3-70-g09d2 From 4fdd24effa5e8f5fdc5d65f60fe6e2dfa6130d9f Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 25 Apr 2018 10:29:45 -0500 Subject: py-testinfra: Create new package (#7883) * py-testinfra: Create new package * py-testinfra: flake8 fixes * py-testinfra: fix pytest version dependency * py-testinfra: fix py-importlib version dependency --- .../repos/builtin/packages/py-testinfra/package.py | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-testinfra/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-testinfra/package.py b/var/spack/repos/builtin/packages/py-testinfra/package.py new file mode 100644 index 0000000000..c936a1955e --- /dev/null +++ b/var/spack/repos/builtin/packages/py-testinfra/package.py @@ -0,0 +1,47 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyTestinfra(PythonPackage): + """With Testinfra you can write unit tests in Python to test actual state + of your servers configured by management tools like Salt, Ansible, Puppet, + Chef and so on.""" + + homepage = "https://testinfra.readthedocs.io" + url = "https://pypi.python.org/packages/source/t/testinfra/testinfra-1.11.1.tar.gz" + + version('1.11.1', 'c64ce6b16661d647c62c9508de419f5f') + + depends_on('py-setuptools', type='build') + depends_on('py-importlib', when='^python@2.6.0:2.6.999', type=('build', 'run')) + depends_on('py-pytest@:3.0.1,3.0.3:', type=('build', 'run')) + depends_on('py-six@1.4:', type=('build', 'run')) + + # Required for testing remote systems + depends_on('py-paramiko', type=('build', 'run')) + + # Required for parallel execution + depends_on('py-pytest-xdist', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 24f15a5f4bbdf94efae1ae128ec09a170d1f796c Mon Sep 17 00:00:00 2001 From: Sajid Ali <30510036+s-sajid-ali@users.noreply.github.com> Date: Wed, 25 Apr 2018 10:30:25 -0500 Subject: Added checksums for newer versions of numpy (#7853) * Committer: sajid modified: var/spack/repos/builtin/packages/py-numpy/package.py * Corrected typo * removing whitespace * remove whitespace * remove whitespace, if not will do this in vim --- var/spack/repos/builtin/packages/py-numpy/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-numpy/package.py b/var/spack/repos/builtin/packages/py-numpy/package.py index 8b18c59835..9fd0fdf38b 100644 --- a/var/spack/repos/builtin/packages/py-numpy/package.py +++ b/var/spack/repos/builtin/packages/py-numpy/package.py @@ -48,6 +48,9 @@ class PyNumpy(PythonPackage): # FIXME: numpy._build_utils and numpy.core.code_generators failed to import # FIXME: Is this expected? + version('1.14.2', '080f01a19707cf467393e426382c7619') + version('1.14.1', 'b8324ef90ac9064cd0eac46b8b388674') + version('1.14.0', 'c12d4bf380ac925fcdc8a59ada6c3298') version('1.13.3', '300a6f0528122128ac07c6deb5c95917') version('1.13.1', '2c3c0f4edf720c3a7b525dacc825b9ae') version('1.13.0', 'fd044f0b8079abeaf5e6d2e93b2c1d03') -- cgit v1.2.3-70-g09d2 From a21571e73743c8507478c518c3d7d1638bb15bb2 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 25 Apr 2018 10:33:01 -0500 Subject: libnl: new package (#7833) * libnl: new package * libnl: change platform constraint to a conflict --- var/spack/repos/builtin/packages/libnl/package.py | 42 +++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 var/spack/repos/builtin/packages/libnl/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libnl/package.py b/var/spack/repos/builtin/packages/libnl/package.py new file mode 100644 index 0000000000..40e82de161 --- /dev/null +++ b/var/spack/repos/builtin/packages/libnl/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class Libnl(AutotoolsPackage): + """libnl - Netlink Protocol Library Suite""" + + homepage = "https://www.infradead.org/~tgr/libnl/" + url = "https://github.com/thom311/libnl/releases/download/libnl3_3_0/libnl-3.3.0.tar.gz" + + version('3.3.0', 'ab3ef137cad95bdda5ff0ffa5175dfa5') + version('3.2.25', '03f74d0cd5037cadc8cdfa313bbd195c') + + depends_on('bison', type='build') + depends_on('flex', type='build') + depends_on('m4', type='build') + + conflicts('platform=darwin', msg='libnl requires FreeBSD or Linux') -- cgit v1.2.3-70-g09d2 From 0b284b45db64b5deef2973dd367846d4fc3d0d07 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 25 Apr 2018 10:33:30 -0500 Subject: rdma-core: new package (#7835) * rdma-core: new package * rdma-core: change to platform conflict --- .../repos/builtin/packages/rdma-core/package.py | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 var/spack/repos/builtin/packages/rdma-core/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/rdma-core/package.py b/var/spack/repos/builtin/packages/rdma-core/package.py new file mode 100644 index 0000000000..6548b0670c --- /dev/null +++ b/var/spack/repos/builtin/packages/rdma-core/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RdmaCore(CMakePackage): + """RDMA core userspace libraries and daemons""" + + homepage = "https://github.com/linux-rdma/rdma-core" + url = "https://github.com/linux-rdma/rdma-core/releases/download/v17.1/rdma-core-17.1.tar.gz" + + version('17.1', '1d19caf554f815990af5c21356ac4d3a') + version('13', '6b072b4307d1cfe45eba4373f68e2927') + + depends_on('libnl') + conflicts('platform=darwin', msg='rdma-core requires FreeBSD or Linux') + + def cmake_args(self): + cmake_args = ["-DCMAKE_INSTALL_SYSCONFDIR=" + + self.spec.prefix.etc] + return cmake_args -- cgit v1.2.3-70-g09d2 From a7ecb0364a85c1a588fa0dca6c8e0898be1504d5 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 25 Apr 2018 10:34:31 -0500 Subject: psm: new package (#7834) * psm: new package * psm: setting latest stable to preferred --- var/spack/repos/builtin/packages/psm/package.py | 46 +++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 var/spack/repos/builtin/packages/psm/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/psm/package.py b/var/spack/repos/builtin/packages/psm/package.py new file mode 100644 index 0000000000..ba65f963d3 --- /dev/null +++ b/var/spack/repos/builtin/packages/psm/package.py @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Psm(MakefilePackage): + """Intel Performance scaled messaging library""" + + homepage = "https://github.com/intel/psm" + url = "https://github.com/intel/psm/archive/v3.3.tar.gz" + + version('3.3', '031eb27688c932867d55054e76d00875', preferred=True) + version('2017-04-28', git='https://github.com/intel/psm.git', commit='604758e') + + conflicts('%gcc@6:', when='@3.3') + + depends_on('libuuid') + + def edit(self, spec, prefix): + makefile = FileFilter('Makefile') + makefile.filter('{DESTDIR}/usr/', '{LOCAL_PREFIX}/') + + def install(self, spec, prefix): + make('LOCAL_PREFIX=%s' % prefix, 'install') -- cgit v1.2.3-70-g09d2 From 14e0307f04216960415a562c94ebb03a89d4f793 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 25 Apr 2018 10:34:55 -0500 Subject: ucx: needs numactl and rdma-core (#7836) --- var/spack/repos/builtin/packages/ucx/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ucx/package.py b/var/spack/repos/builtin/packages/ucx/package.py index e5635c28cb..6b3e7a81c2 100644 --- a/var/spack/repos/builtin/packages/ucx/package.py +++ b/var/spack/repos/builtin/packages/ucx/package.py @@ -38,3 +38,6 @@ class Ucx(AutotoolsPackage): # Still supported version('1.2.2', 'ff3fe65e4ebe78408fc3151a9ce5d286') version('1.2.1', '697c2fd7912614fb5a1dadff3bfa485c') + + depends_on('numactl') + depends_on('rdma-core') -- cgit v1.2.3-70-g09d2 From 7120e59c6aef520ebeb3dca2d8985dce8d203693 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 25 Apr 2018 10:35:36 -0500 Subject: Libfabric: updating fabrics & adding deps (#7838) * libfabric: mxm deprecated, adding mlx aka ucx * libfabric: adding dependencies that we have in spack --- var/spack/repos/builtin/packages/libfabric/package.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libfabric/package.py b/var/spack/repos/builtin/packages/libfabric/package.py index 7a6c57a3b5..c67a8e9987 100644 --- a/var/spack/repos/builtin/packages/libfabric/package.py +++ b/var/spack/repos/builtin/packages/libfabric/package.py @@ -42,12 +42,12 @@ class Libfabric(AutotoolsPackage): 'sockets', 'verbs', 'usnic', - 'mxm', 'gni', 'xpmem', 'udp', 'rxm', - 'rxd') + 'rxd', + 'mlx') variant( 'fabrics', @@ -57,6 +57,11 @@ class Libfabric(AutotoolsPackage): multi=True ) + depends_on('rdma-core', when='fabrics=verbs') + depends_on('opa-psm2', when='fabrics=psm2') + depends_on('psm', when='fabrics=psm') + depends_on('ucx', when='fabrics=mlx') + def configure_args(self): args = [] -- cgit v1.2.3-70-g09d2 From a4e786a4156147dd308fa19dd411676c8eaeb099 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 25 Apr 2018 10:37:48 -0500 Subject: openmpi: libfabric support, ucx cleanup (#7842) * openmpi: libfabric support, ucx cleanup * openmpi: remove unnecessary parentheses --- .../repos/builtin/packages/openmpi/package.py | 24 ++++++++++++---------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 1daa3b455b..abd1fdde6e 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -24,6 +24,7 @@ ############################################################################## import os +import sys from spack import * @@ -178,11 +179,13 @@ class Openmpi(AutotoolsPackage): patch('configure.patch', when="@1.10.1") patch('fix_multidef_pmi_class.patch', when="@2.0.0:2.0.1") + fabrics = ('psm', 'psm2', 'verbs', 'mxm', 'ucx', 'libfabric') + variant( 'fabrics', default=None if _verbs_dir() is None else 'verbs', - description='List of fabrics that are enabled', - values=('psm', 'psm2', 'verbs', 'mxm'), + description="List of fabrics that are enabled", + values=fabrics, multi=True ) @@ -200,7 +203,6 @@ class Openmpi(AutotoolsPackage): variant('thread_multiple', default=False, description='Enable MPI_THREAD_MULTIPLE support') variant('cuda', default=False, description='Enable CUDA support') - variant('ucx', default=False, description='Enable UCX support') variant('pmi', default=False, description='Enable PMI support') # Adding support to build a debug version of OpenMPI that activates # Memchecker, as described here: @@ -219,6 +221,9 @@ class Openmpi(AutotoolsPackage): provides('mpi@:3.0', when='@1.7.5:') provides('mpi@:3.1', when='@2.0.0:') + if sys.platform != 'darwin': + depends_on('numactl') + depends_on('hwloc') # ompi@:3.0.0 doesn't support newer hwloc releases: # "configure: error: OMPI does not currently support hwloc v2 API" @@ -229,9 +234,10 @@ class Openmpi(AutotoolsPackage): depends_on('hwloc +cuda', when='+cuda') depends_on('java', when='+java') depends_on('sqlite', when='+sqlite3@:1.11') - depends_on('ucx', when='+ucx') depends_on('zlib', when='@3.0.0:') depends_on('valgrind~mpi', when='+memchecker') + depends_on('ucx', when='fabrics=ucx') + depends_on('libfabric', when='fabrics=libfabric') conflicts('+cuda', when='@:1.6') # CUDA support was added in 1.7 conflicts('fabrics=psm2', when='@:1.8') # PSM2 support was added in 1.10.0 @@ -241,6 +247,8 @@ class Openmpi(AutotoolsPackage): msg='+pmi is required for openmpi(>=1.5.5) to work with SLURM.') filter_compiler_wrappers('openmpi/*-wrapper-data*', relative_root='share') + conflicts('fabrics=libfabric', when='@:1.8') # libfabric support was added in 1.10.0 + # It may be worth considering making libfabric an exclusive fabrics choice def url_for_version(self, version): url = "http://www.open-mpi.org/software/ompi/v{0}/downloads/openmpi-{1}.tar.bz2" @@ -330,7 +338,7 @@ class Openmpi(AutotoolsPackage): '--enable-shared', '--enable-static' ] - if self.spec.satisfies('@2.0:'): + if spec.satisfies('@2.0:'): # for Open-MPI 2.0:, C++ bindings are disabled by default. config_args.extend(['--enable-mpi-cxx']) @@ -415,12 +423,6 @@ class Openmpi(AutotoolsPackage): else: config_args.append('--without-cuda') - # UCX support - if '+ucx' in spec: - config_args.append('--with-ucx={0}'.format(spec['ucx'].prefix)) - else: - config_args.append('--without-ucx') - return config_args @run_after('install') -- cgit v1.2.3-70-g09d2 From 28901c8104b195ee93517d17c630946740b97905 Mon Sep 17 00:00:00 2001 From: Robert Pavel Date: Wed, 25 Apr 2018 09:50:58 -0600 Subject: Added OpenMP Variant for Kokkos (#7902) Added OpenMP variant for kokkos that can be disabled to build and test on platforms where OpenMP is not available or desired. Also updated version list --- var/spack/repos/builtin/packages/kokkos/package.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/kokkos/package.py b/var/spack/repos/builtin/packages/kokkos/package.py index 5512b84f4a..7f61270327 100644 --- a/var/spack/repos/builtin/packages/kokkos/package.py +++ b/var/spack/repos/builtin/packages/kokkos/package.py @@ -32,10 +32,21 @@ class Kokkos(Package): homepage = "https://github.com/kokkos/kokkos" url = "https://github.com/kokkos/kokkos/archive/2.03.00.tar.gz" + version('2.5.00', '2db83c56587cb83b772d0c81a3228a21') + version('2.04.11', 'd4849cee6eb9001d61c30f1d9fe74336') + version('2.04.04', '2c6d1c2569b91c9fcd4117296438e65c') + version('2.04.00', 'd99ac790ff5f29545d8eb53de90c0a85') + version('2.03.13', '3874a159a517384541ea5b52f85501ba') + version('2.03.05', '8727d783453f719eec392e10a36b49fd') version('2.03.00', 'f205d659d4304747759fabfba32d43c3') + version('2.02.15', 'de41e38f452a50bb03363c519fe20769') + version('2.02.07', 'd5baeea70109249f7dca763074ffb202') + version('develop', git='https://github.com/kokkos/kokkos', + branch='develop') variant('qthreads', default=False, description="enable Qthreads backend") variant('cuda', default=False, description="enable Cuda backend") + variant('openmp', default=True, description="enable OpenMP backend") # Specify that v1.x is required as v2.x has API changes depends_on('hwloc@:1') @@ -49,9 +60,10 @@ class Kokkos(Package): g_args = [ '--prefix=%s' % prefix, '--with-hwloc=%s' % spec['hwloc'].prefix, - '--with-serial', - '--with-openmp', + '--with-serial' ] + if '+openmp' in spec: + g_args.append('--with-openmp') if 'qthreads' in spec: g_args.append('--with-qthreads=%s' % spec['qthreads'].prefix) if 'cuda' in spec: -- cgit v1.2.3-70-g09d2 From 94afb2430c137825125a216a299cb0de62cd03a8 Mon Sep 17 00:00:00 2001 From: mcneish1 <35310375+mcneish1@users.noreply.github.com> Date: Wed, 25 Apr 2018 18:59:46 -0700 Subject: Additional r packages (#7892) * Add r-bbmisc * Add r-dicekriging * Add r-lhs * Add r-mco * Add r-misc3d * Add r-mlr * Remove boilerplate from r-mlr package * Add r-mlrMBO * Add r-parallelmap * Add r-paramhelpers * Add r-plot3d * Add r-rgenoud * Add r-smoof * Add r-rinside 0.2.14 * Fix flake8 issues * Add specific required versions * Add more up-to-date versions of r-{mco, mlr, mlrMBO, smoof} --- .../repos/builtin/packages/r-bbmisc/package.py | 38 ++++++++++++++ .../builtin/packages/r-dicekriging/package.py | 36 ++++++++++++++ var/spack/repos/builtin/packages/r-lhs/package.py | 36 ++++++++++++++ var/spack/repos/builtin/packages/r-mco/package.py | 37 ++++++++++++++ .../repos/builtin/packages/r-misc3d/package.py | 35 +++++++++++++ var/spack/repos/builtin/packages/r-mlr/package.py | 55 ++++++++++++++++++++ .../repos/builtin/packages/r-mlrmbo/package.py | 58 ++++++++++++++++++++++ .../builtin/packages/r-parallelmap/package.py | 43 ++++++++++++++++ .../builtin/packages/r-paramhelpers/package.py | 42 ++++++++++++++++ .../repos/builtin/packages/r-plot3d/package.py | 39 +++++++++++++++ .../repos/builtin/packages/r-rgenoud/package.py | 35 +++++++++++++ .../repos/builtin/packages/r-rinside/package.py | 6 +-- .../repos/builtin/packages/r-smoof/package.py | 52 +++++++++++++++++++ 13 files changed, 509 insertions(+), 3 deletions(-) create mode 100644 var/spack/repos/builtin/packages/r-bbmisc/package.py create mode 100644 var/spack/repos/builtin/packages/r-dicekriging/package.py create mode 100644 var/spack/repos/builtin/packages/r-lhs/package.py create mode 100644 var/spack/repos/builtin/packages/r-mco/package.py create mode 100644 var/spack/repos/builtin/packages/r-misc3d/package.py create mode 100644 var/spack/repos/builtin/packages/r-mlr/package.py create mode 100644 var/spack/repos/builtin/packages/r-mlrmbo/package.py create mode 100644 var/spack/repos/builtin/packages/r-parallelmap/package.py create mode 100644 var/spack/repos/builtin/packages/r-paramhelpers/package.py create mode 100644 var/spack/repos/builtin/packages/r-plot3d/package.py create mode 100644 var/spack/repos/builtin/packages/r-rgenoud/package.py create mode 100644 var/spack/repos/builtin/packages/r-smoof/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-bbmisc/package.py b/var/spack/repos/builtin/packages/r-bbmisc/package.py new file mode 100644 index 0000000000..2b29dcfcc7 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-bbmisc/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RBbmisc(RPackage): + """Miscellaneous helper functions for and from B. Bischl and some other + guys, mainly for package development.""" + + homepage = "https://github.com/berndbischl/BBmisc" + url = "https://cran.r-project.org/src/contrib/BBmisc_1.11.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/BBmisc" + + version('1.11', '681642628037406beb6088d5f773473d') + + depends_on('r-checkmate@1.8.0:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-dicekriging/package.py b/var/spack/repos/builtin/packages/r-dicekriging/package.py new file mode 100644 index 0000000000..4a192efbc9 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-dicekriging/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RDicekriging(RPackage): + """Estimation, validation and prediction of kriging models. Important + functions : km, print.km, plot.km, predict.km.""" + + homepage = "http://dice.emse.fr/" + url = "https://cran.r-project.org/src/contrib/DiceKriging_1.5.5.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/DiceKriging" + + version('1.5.5', 'ee3e2d7a91d4a712467ef4f0b69c2844') diff --git a/var/spack/repos/builtin/packages/r-lhs/package.py b/var/spack/repos/builtin/packages/r-lhs/package.py new file mode 100644 index 0000000000..ac464e734b --- /dev/null +++ b/var/spack/repos/builtin/packages/r-lhs/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RLhs(RPackage): + """Provides a number of methods for creating and augmenting Latin Hypercube + Samples.""" + + homepage = "http://lhs.r-forge.r-project.org/" + url = "https://cran.r-project.org/src/contrib/lhs_0.16.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/lhs" + + version('0.16', '088e593e5283414951e7e541a50ec2d1') diff --git a/var/spack/repos/builtin/packages/r-mco/package.py b/var/spack/repos/builtin/packages/r-mco/package.py new file mode 100644 index 0000000000..d35103d9dc --- /dev/null +++ b/var/spack/repos/builtin/packages/r-mco/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RMco(RPackage): + """Functions for multiple criteria optimization using genetic algorithms + and related test problems""" + + homepage = "https://github.com/cran/mco" + url = "https://cran.r-project.org/src/contrib/mco_1.0-15.1.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/mco" + + version('1.0-15.1', '1768dea61d0561d71be2bbc6ac3dccfa') + version('1.0-15', '0b444e085c59d919611224e86b5637f8') diff --git a/var/spack/repos/builtin/packages/r-misc3d/package.py b/var/spack/repos/builtin/packages/r-misc3d/package.py new file mode 100644 index 0000000000..c4893d4919 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-misc3d/package.py @@ -0,0 +1,35 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RMisc3d(RPackage): + """A collection of miscellaneous 3d plots, including isosurfaces.""" + + homepage = "http://www.example.com" + url = "https://cran.r-project.org/src/contrib/misc3d_0.8-4.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/misc3d" + + version('0.8-4', 'aefa27e67a243c21a1046868540343fe') diff --git a/var/spack/repos/builtin/packages/r-mlr/package.py b/var/spack/repos/builtin/packages/r-mlr/package.py new file mode 100644 index 0000000000..029a5e07cd --- /dev/null +++ b/var/spack/repos/builtin/packages/r-mlr/package.py @@ -0,0 +1,55 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RMlr(RPackage): + """Interface to a large number of classification and regression techniques, + including machine-readable parameter descriptions. There is also an + experimental extension for survival analysis, clustering and general, + example-specific cost-sensitive learning. Generic resampling, + including cross-validation, bootstrapping and subsampling. + Hyperparameter tuning with modern optimization techniques, + for single- and multi-objective problems. Filter and wrapper methods for + feature selection. Extension of basic learners with additional + operations common in machine learning, also allowing for easy nested + resampling. Most operations can be parallelized.""" + + homepage = "https://github.com/mlr-org/mlr/" + url = "https://cran.r-project.org/src/contrib/mlr_2.12.1.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/mlr" + + version('2.12.1', 'abddfc9dfe95f290a233ecd97969a4ec') + version('2.12', '94ee7495aeafb432c8af5a8bdd26c25f') + + depends_on('r-paramhelpers@1.10:', type=('build', 'run')) + depends_on('r-bbmisc@1.11:', type=('build', 'run')) + depends_on('r-backports@1.1.0:', type=('build', 'run')) + depends_on('r-ggplot2', type=('build', 'run')) + depends_on('r-stringi', type=('build', 'run')) + depends_on('r-checkmate@1.8.2:', type=('build', 'run')) + depends_on('r-data-table', type=('build', 'run')) + depends_on('r-parallelmap@1.3:', type=('build', 'run')) + depends_on('r-xml', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-mlrmbo/package.py b/var/spack/repos/builtin/packages/r-mlrmbo/package.py new file mode 100644 index 0000000000..41cdb96ff9 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-mlrmbo/package.py @@ -0,0 +1,58 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RMlrmbo(RPackage): + """Flexible and comprehensive R toolbox for model-based optimization + ('MBO'), also known as Bayesian optimization. It is designed for both + single- and multi-objective optimization with mixed continuous, + categorical and conditional parameters. The machine learning toolbox + 'mlr' provide dozens of regression learners to model the performance of + the target algorithm with respect to the parameter settings. It provides + many different infill criteria to guide the search process. Additional + features include multi-point batch proposal, parallel execution as well + as visualization and sophisticated logging mechanisms, which is + especially useful for teaching and understanding of algorithm behavior. + 'mlrMBO' is implemented in a modular fashion, such that single + components can be easily replaced or adapted by the user for specific + use cases.""" + + homepage = "https://github.com/mlr-org/mlrMBO/" + url = "https://cran.r-project.org/src/contrib/mlrMBO_1.1.1.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/mlrMBO" + + version('1.1.1', '9a35b41ceb8754111af294dee0ae76e0') + version('1.1.0', '9e27ff8498225d24863b8da758d2918e') + + depends_on('r-mlr@2.10:', type=('build', 'run')) + depends_on('r-paramhelpers@1.10:', type=('build', 'run')) + depends_on('r-smoof@1.5.1:', type=('build', 'run')) + depends_on('r-backports@1.1.0:', type=('build', 'run')) + depends_on('r-bbmisc@1.11:', type=('build', 'run')) + depends_on('r-checkmate@1.8.2:', type=('build', 'run')) + depends_on('r-data-table', type=('build', 'run')) + depends_on('r-lhs', type=('build', 'run')) + depends_on('r-parallelmap@1.3:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-parallelmap/package.py b/var/spack/repos/builtin/packages/r-parallelmap/package.py new file mode 100644 index 0000000000..92e1dd7d97 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-parallelmap/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RParallelmap(RPackage): + """Unified parallelization framework for multiple back-end, designed for + internal package and interactive usage. The main operation is a parallel + "map" over lists. Supports local, multicore, mpi and BatchJobs mode. + Allows "tagging" of the parallel operation with a level name that can be + later selected by the user to switch on parallel execution for exactly + this operation.""" + + homepage = "https://github.com/berndbischl/parallelMap" + url = "https://cran.r-project.org/src/contrib/parallelMap_1.3.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/parallelMap" + + version('1.3', 'dd62866b395847b0bd5b13bed98c0081') + + depends_on('r-bbmisc@1.8:', type=('build', 'run')) + depends_on('r-checkmate@1.5.1:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-paramhelpers/package.py b/var/spack/repos/builtin/packages/r-paramhelpers/package.py new file mode 100644 index 0000000000..af48d808ef --- /dev/null +++ b/var/spack/repos/builtin/packages/r-paramhelpers/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RParamhelpers(RPackage): + """Functions for parameter descriptions and operations in black-box + optimization, tuning and machine learning. Parameters can be described + (type, constraints, defaults, etc.), combined to parameter sets and can + in general be programmed on. A useful OptPath object (archive) to log + function evaluations is also provided.""" + + homepage = "https://github.com/berndbischl/ParamHelpers" + url = "https://cran.r-project.org/src/contrib/ParamHelpers_1.10.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/ParamHelpers" + + version('1.10', '36e9060488ebd484d62cd991a4693332') + + depends_on('r-bbmisc@1.10:', type=('build', 'run')) + depends_on('r-checkmate@1.8.1:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-plot3d/package.py b/var/spack/repos/builtin/packages/r-plot3d/package.py new file mode 100644 index 0000000000..cae7579574 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-plot3d/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RPlot3d(RPackage): + """Functions for viewing 2-D and 3-D data, including perspective plots, + slice plots, surface plots, scatter plots, etc. Includes data sets from + oceanography.""" + + homepage = "https://CRAN.R-project.org/package=plot3D" + url = "https://cran.r-project.org/src/contrib/plot3D_1.1.1.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/plot3D" + + version('1.1.1', '5135aa1f3cf6106f2ded3f393a24e75d') + + depends_on('r-misc3d', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-rgenoud/package.py b/var/spack/repos/builtin/packages/r-rgenoud/package.py new file mode 100644 index 0000000000..03a5554ce6 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-rgenoud/package.py @@ -0,0 +1,35 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RRgenoud(RPackage): + """A genetic algorithm plus derivative optimizer.""" + + homepage = "http://sekhon.berkeley.edu/rgenoud/" + url = "https://cran.r-project.org/src/contrib/rgenoud_5.8-1.0.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/rgenoud" + + version('5.8-1.0', '85801093d2f1e6789683b46ab4a7d70f') diff --git a/var/spack/repos/builtin/packages/r-rinside/package.py b/var/spack/repos/builtin/packages/r-rinside/package.py index c3c527bef7..deff9d8144 100644 --- a/var/spack/repos/builtin/packages/r-rinside/package.py +++ b/var/spack/repos/builtin/packages/r-rinside/package.py @@ -22,7 +22,6 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## - from spack import * @@ -43,9 +42,10 @@ class RRinside(RPackage): available at the 'RInside' website as well.""" homepage = "http://dirk.eddelbuettel.com/code/rinside.html" - url = "https://cran.r-project.org/src/contrib/RInside_0.2.13.tar.gz" + url = "https://cran.r-project.org/src/contrib/RInside_0.2.14.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/RInside" + version('0.2.14', 'fc72761e22b1f597433eb53d6eb122ff') version('0.2.13', '2e3c35a7bd648e9bef98d0afcc02cf88') - depends_on('r-rcpp', type=('build', 'run')) + depends_on('r-rcpp@0.11.0:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-smoof/package.py b/var/spack/repos/builtin/packages/r-smoof/package.py new file mode 100644 index 0000000000..ac3209ff16 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-smoof/package.py @@ -0,0 +1,52 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RSmoof(RPackage): + """Provides generators for a high number of both single- and + multi- objective test functions which are frequently used for the + benchmarking of (numerical) optimization algorithms. Moreover, it offers + a set of convenient functions to generate, plot and work with objective + functions.""" + + homepage = "http://github.com/jakobbossek/smoof" + url = "https://cran.r-project.org/src/contrib/smoof_1.5.1.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/smoof" + + version('1.5.1', 'c3e3b5dafed34608f933ae255cf49054') + version('1.5', 'b371bde2724eade5a6d4d808fa3ad269') + + depends_on('r-paramhelpers@1.8:', type=('build', 'run')) + depends_on('r-bbmisc@1.6:', type=('build', 'run')) + depends_on('r-checkmate@1.1:', type=('build', 'run')) + depends_on('r-ggplot2@2.2.1:', type=('build', 'run')) + depends_on('r-rcolorbrewer', type=('build', 'run')) + depends_on('r-plot3d', type=('build', 'run')) + depends_on('r-plotly', type=('build', 'run')) + depends_on('r-mco', type=('build', 'run')) + depends_on('r-rcpp@0.11.0:', type=('build', 'run')) + depends_on('r-rjsonio', type=('build', 'run')) + depends_on('r-rcpparmadillo', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From de9894a063ae0ed1ffe157e7629e223657dfad1d Mon Sep 17 00:00:00 2001 From: Bruno Turcksin Date: Wed, 25 Apr 2018 22:00:22 -0400 Subject: Add boost 1.67.0 (#7889) * Add boost 1.67.0 * Remove boost 1.67.0 release candidate and the associated patch --- .../repos/builtin/packages/boost/array_binary_tree.patch | 12 ------------ var/spack/repos/builtin/packages/boost/package.py | 9 +++------ 2 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/boost/array_binary_tree.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/boost/array_binary_tree.patch b/var/spack/repos/builtin/packages/boost/array_binary_tree.patch deleted file mode 100644 index 51e1950528..0000000000 --- a/var/spack/repos/builtin/packages/boost/array_binary_tree.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/boost/graph/detail/array_binary_tree.hpp b/boost/graph/detail/array_binary_tree.hpp -index e59da9e..fd403d1 100644 ---- a/boost/graph/detail/array_binary_tree.hpp -+++ b/boost/graph/detail/array_binary_tree.hpp -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - - namespace boost { - diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index 09e71023b1..fb1ade8bcc 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -46,10 +46,10 @@ class Boost(Package): branch='develop', submodules=True) - version('1.67.0.b1', '3423a4a3ec5297051fd27091864630e2dce4c159', - url='https://dl.bintray.com/boostorg/beta/1.67.0.beta.1/source/boost_1_67_0_b1.tar.gz') + version('1.67.0', '694ae3f4f899d1a80eb7a3b31b33be73c423c1ae', + url='https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.tar.bz2') version('1.66.0', 'b6b284acde2ad7ed49b44e856955d7b1ea4e9459', - url='https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2', preferred=True) + url='https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2') version('1.65.1', '41d7542ce40e171f3f7982aff008ff0d', url='https://dl.bintray.com/boostorg/release/1.65.1/source/boost_1_65_1.tar.bz2') version('1.65.0', '5512d3809801b0a1b9dd58447b70915d', @@ -153,9 +153,6 @@ class Boost(Package): conflicts('+taggedlayout', when='+versionedlayout') - # temporary fix https://svn.boost.org/trac10/ticket/13505 - patch('array_binary_tree.patch', when='@1.67.0.b1') - # Patch fix from https://svn.boost.org/trac/boost/ticket/11856 patch('boost_11856.patch', when='@1.60.0%gcc@4.4.7') -- cgit v1.2.3-70-g09d2 From e2092896b97753478df2f770d851e9e36a2bb60c Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Thu, 26 Apr 2018 13:17:15 +0800 Subject: A new package: openslide. (#7906) --- .../repos/builtin/packages/openslide/package.py | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 var/spack/repos/builtin/packages/openslide/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openslide/package.py b/var/spack/repos/builtin/packages/openslide/package.py new file mode 100644 index 0000000000..4e463d4051 --- /dev/null +++ b/var/spack/repos/builtin/packages/openslide/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Openslide(AutotoolsPackage): + """OpenSlide reads whole slide image files.""" + + homepage = "http://openslide.org/" + url = "https://github.com/openslide/openslide/releases/download/v3.4.1/openslide-3.4.1.tar.xz" + + version('3.4.1', 'ad9fa84775ed6b505d6f50bf6420c6bf') + + depends_on('openjpeg') + depends_on('jpeg') + depends_on('libtiff') + depends_on('libxml2') + depends_on('sqlite@3.6:') -- cgit v1.2.3-70-g09d2 From 50122a585acc254378dbfe6fe1f0461b666ed8fe Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Thu, 26 Apr 2018 14:46:45 +0200 Subject: Added the latest versions of a few packages (#7910) * automake: added version 1.16.1 * lmod: added version 7.7.29 * git: added version 2.17.0 * tmux: added version 2.7 * scala: added version 2.12.5, fixed typo in version 2.10.6 * Added spark@2.3.0, hadoop@3.1.0, jdk@8u172-b11 * picard: added version 2.18.3 * tar: added version 1.30 --- var/spack/repos/builtin/packages/automake/package.py | 7 ++++++- var/spack/repos/builtin/packages/git/package.py | 5 +++++ var/spack/repos/builtin/packages/hadoop/package.py | 1 + var/spack/repos/builtin/packages/jdk/package.py | 2 ++ var/spack/repos/builtin/packages/lmod/package.py | 1 + var/spack/repos/builtin/packages/picard/package.py | 1 + var/spack/repos/builtin/packages/scala/package.py | 3 ++- var/spack/repos/builtin/packages/spark/package.py | 1 + var/spack/repos/builtin/packages/tar/package.py | 1 + var/spack/repos/builtin/packages/tmux/package.py | 1 + 10 files changed, 21 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/automake/package.py b/var/spack/repos/builtin/packages/automake/package.py index 8121626f5c..e25a3264a0 100644 --- a/var/spack/repos/builtin/packages/automake/package.py +++ b/var/spack/repos/builtin/packages/automake/package.py @@ -31,6 +31,7 @@ class Automake(AutotoolsPackage): homepage = 'http://www.gnu.org/software/automake/' url = 'http://ftp.gnu.org/gnu/automake/automake-1.15.tar.gz' + version('1.16.1', '83cc2463a4080efd46a72ba2c9f6b8f5') version('1.15.1', '95df3f2d6eb8f81e70b8cb63a93c8853') version('1.15', '716946a105ca228ab545fc37a70df3a3') version('1.14.1', 'd052a3e884631b9c7892f2efce542d75') @@ -43,10 +44,14 @@ class Automake(AutotoolsPackage): def patch(self): # The full perl shebang might be too long + files_to_be_patched_fmt = 'bin/{0}.in' + if '@:1.15.1' in self.spec: + files_to_be_patched_fmt = 't/wrap/{0}.in' + for file in ('aclocal', 'automake'): filter_file('^#!@PERL@ -w', '#!/usr/bin/env perl', - 't/wrap/{0}.in'.format(file)) + files_to_be_patched_fmt.format(file)) def _make_executable(self, name): return Executable(join_path(self.prefix.bin, name)) diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index a31d7034d8..be4bc12e66 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -43,6 +43,11 @@ class Git(AutotoolsPackage): # https://www.kernel.org/pub/software/scm/git/git-manpages-{version}.tar.xz releases = [ + { + 'version': '2.17.0', + 'md5': '8e0f5253eef3abeb76bd9c55386d3bee', + 'md5_manpages': '1ce1ae78a559032810af8b455535935f' + }, { 'version': '2.15.1', 'md5': 'da59fc6baa55ab44684011e369af397d', diff --git a/var/spack/repos/builtin/packages/hadoop/package.py b/var/spack/repos/builtin/packages/hadoop/package.py index 29fead0755..013f1ebcbf 100644 --- a/var/spack/repos/builtin/packages/hadoop/package.py +++ b/var/spack/repos/builtin/packages/hadoop/package.py @@ -34,6 +34,7 @@ class Hadoop(Package): homepage = "http://hadoop.apache.org/" url = "http://mirrors.ocf.berkeley.edu/apache/hadoop/common/hadoop-2.9.0/hadoop-2.9.0.tar.gz" + version('3.1.0', 'f036ebd3fa0ef66ee1819e351d15b6cb') version('2.9.0', 'b443ead81aa2bd5086f99e62e66a8f64') depends_on('java', type='run') diff --git a/var/spack/repos/builtin/packages/jdk/package.py b/var/spack/repos/builtin/packages/jdk/package.py index d377b67ee5..b39c32bc07 100644 --- a/var/spack/repos/builtin/packages/jdk/package.py +++ b/var/spack/repos/builtin/packages/jdk/package.py @@ -48,6 +48,8 @@ class Jdk(Package): # For instructions on how to find the magic URL, see: # https://gist.github.com/P7h/9741922 # https://linuxconfig.org/how-to-install-java-se-development-kit-on-debian-linux + version('8u172-b11', 'eda2945e8c02b84adbf78f46c37b71c1', curl_options=curl_options, + url='http://download.oracle.com/otn-pub/java/jdk/8u172-b11/a58eab1ec242421181065cdc37240b08/jdk-8u172-linux-x64.tar.gz') version('8u141-b15', '8cf4c4e00744bfafc023d770cb65328c', curl_options=curl_options, url='http://download.oracle.com/otn-pub/java/jdk/8u141-b15/336fa29ff2bb4ef291e347e091f7f4a7/jdk-8u141-linux-x64.tar.gz') version('8u131-b11', '75b2cb2249710d822a60f83e28860053', curl_options=curl_options, diff --git a/var/spack/repos/builtin/packages/lmod/package.py b/var/spack/repos/builtin/packages/lmod/package.py index ab7edf0db6..98a62466b8 100644 --- a/var/spack/repos/builtin/packages/lmod/package.py +++ b/var/spack/repos/builtin/packages/lmod/package.py @@ -38,6 +38,7 @@ class Lmod(AutotoolsPackage): homepage = 'https://www.tacc.utexas.edu/research-development/tacc-projects/lmod' url = 'https://github.com/TACC/Lmod/archive/7.4.11.tar.gz' + version('7.7.29', 'bd3f171995e6863505e8a958d158ced1') version('7.7.13', 'e1d222fa04148707dceb08c82d7e9fa5') version('7.7', '8ac594401716c6d1b40cac22bc1030ca') version('7.6.14', '60726c991038b6337fbb27b6a333a2d4') diff --git a/var/spack/repos/builtin/packages/picard/package.py b/var/spack/repos/builtin/packages/picard/package.py index b82f98eeee..e4dc41a4ea 100644 --- a/var/spack/repos/builtin/packages/picard/package.py +++ b/var/spack/repos/builtin/packages/picard/package.py @@ -41,6 +41,7 @@ class Picard(Package): # They started distributing a single jar file at v2.6.0, prior to # that it was a .zip file with multiple .jar and .so files + version('2.18.3', '181b1b0731fd35f0d8bd44677d8787e9') version('2.18.0', '20045ff141e4a67512365f0b6bbd8229', expand=False) version('2.17.0', '72cc527f1e4ca6a799ae0117af60b54e', expand=False) version('2.16.0', 'fed8928b03bb36e355656f349e579083', expand=False) diff --git a/var/spack/repos/builtin/packages/scala/package.py b/var/spack/repos/builtin/packages/scala/package.py index 1fda2f239f..3a036d99f8 100644 --- a/var/spack/repos/builtin/packages/scala/package.py +++ b/var/spack/repos/builtin/packages/scala/package.py @@ -36,9 +36,10 @@ class Scala(Package): homepage = "https://www.scala-lang.org/" url = "https://downloads.lightbend.com/scala/2.12.1/scala-2.12.1.tgz" + version('2.12.5', '25cf4989d061c585bd0a3fa357ccf0a6') version('2.12.1', '3eaecbce019b0fa3067503846e292b32') version('2.11.11', '3f5b76001f60cbc31111ddb81de5ea07') - version('2.20.6', 'd79dc9fdc627b73289306bdaec81ca98') + version('2.10.6', 'd79dc9fdc627b73289306bdaec81ca98') depends_on('java') diff --git a/var/spack/repos/builtin/packages/spark/package.py b/var/spack/repos/builtin/packages/spark/package.py index 4c436d1342..7cdd6b175f 100644 --- a/var/spack/repos/builtin/packages/spark/package.py +++ b/var/spack/repos/builtin/packages/spark/package.py @@ -42,6 +42,7 @@ class Spark(Package): depends_on('java', type=('build', 'run')) depends_on('hadoop', when='+hadoop', type=('build', 'run')) + version('2.3.0', 'db21021b8e877b219ab886097ef42344') version('2.1.0', '21d4471e78250775b1fa7c0e6c3a1326') version('2.0.2', '32110c1bb8f081359738742bd26bced1') version('2.0.0', '8a5307d973da6949a385aefb6ff747bb') diff --git a/var/spack/repos/builtin/packages/tar/package.py b/var/spack/repos/builtin/packages/tar/package.py index 9e25ea7a4c..af78a051bd 100644 --- a/var/spack/repos/builtin/packages/tar/package.py +++ b/var/spack/repos/builtin/packages/tar/package.py @@ -32,6 +32,7 @@ class Tar(AutotoolsPackage): homepage = "https://www.gnu.org/software/tar/" url = "https://ftp.gnu.org/gnu/tar/tar-1.29.tar.gz" + version('1.30', 'e0c5ed59e4dd33d765d6c90caadd3c73') version('1.29', 'cae466e6e58c7292355e7080248f244db3a4cf755f33f4fa25ca7f9a7ed09af0') version('1.28', '6ea3dbea1f2b0409b234048e021a9fd7') diff --git a/var/spack/repos/builtin/packages/tmux/package.py b/var/spack/repos/builtin/packages/tmux/package.py index 26599a7cd5..324705e810 100644 --- a/var/spack/repos/builtin/packages/tmux/package.py +++ b/var/spack/repos/builtin/packages/tmux/package.py @@ -36,6 +36,7 @@ class Tmux(AutotoolsPackage): homepage = "http://tmux.github.io" url = "https://github.com/tmux/tmux/releases/download/2.6/tmux-2.6.tar.gz" + version('2.7', 'bcdfcf910c94c3e02ce6b1c035880306') version('2.6', 'd541ff392249f94c4f3635793556f827') version('2.5', '4a5d73d96d8f11b0bdf9b6f15ab76d15') version('2.4', '6165d3aca811a3225ef8afbd1afcf1c5') -- cgit v1.2.3-70-g09d2 From 3b82124d9653f4986dc5d23a1370d32f636d6483 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Thu, 26 Apr 2018 21:37:03 +0800 Subject: A new package: loki. (#7908) * A new package: loki. * Flake8. --- var/spack/repos/builtin/packages/loki/package.py | 50 ++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 var/spack/repos/builtin/packages/loki/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/loki/package.py b/var/spack/repos/builtin/packages/loki/package.py new file mode 100644 index 0000000000..77f3e31f58 --- /dev/null +++ b/var/spack/repos/builtin/packages/loki/package.py @@ -0,0 +1,50 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Loki(MakefilePackage): + """Loki is a C++ library of designs, containing flexible implementations + of common design patterns and idioms.""" + + homepage = "http://loki-lib.sourceforge.net" + url = "https://downloads.sourceforge.net/project/loki-lib/Loki/Loki%200.1.7/loki-0.1.7.tar.bz2" + + version('0.1.7', '33a24bcbb99fa2ec8fcbbab65649f3f6') + + variant('shared', default=True, description="Build shared libraries") + + def build(self, spec, prefix): + if '+shared' in spec: + make('-C', 'src', 'build-shared') + else: + make('-C', 'src', 'build-static') + + def install(self, spec, prefix): + make('-C', 'include', 'install', 'prefix={0}'.format(prefix)) + if '+shared' in spec: + make('-C', 'src', 'install-shared', 'prefix={0}'.format(prefix)) + else: + make('-C', 'src', 'install-static', 'prefix={0}'.format(prefix)) -- cgit v1.2.3-70-g09d2 From 2ec701d1dd35088e2aa264c55ad6de646d615329 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Thu, 26 Apr 2018 15:42:03 +0200 Subject: adol-c: add boost optional dependency (#7905) --- var/spack/repos/builtin/packages/adol-c/package.py | 42 ++++++++++++++++------ 1 file changed, 32 insertions(+), 10 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/adol-c/package.py b/var/spack/repos/builtin/packages/adol-c/package.py index dd173795dd..2947556f80 100644 --- a/var/spack/repos/builtin/packages/adol-c/package.py +++ b/var/spack/repos/builtin/packages/adol-c/package.py @@ -46,6 +46,7 @@ class AdolC(AutotoolsPackage): variant('openmp', default=False, description='Enable OpenMP support') variant('sparse', default=False, description='Enable sparse drivers') variant('examples', default=True, description='Install examples') + variant('boost', default=False, description='Enable boost') # Build dependencies depends_on('automake', type='build', when='@develop') @@ -53,6 +54,18 @@ class AdolC(AutotoolsPackage): depends_on('libtool', type='build', when='@develop') depends_on('m4', type='build', when='@develop') + # Link dependencies + depends_on('boost+system', when='+boost') + + # FIXME: add + # --with-colpack=DIR path to the colpack library and headers + # [default=system libraries] + # --with-mpi-root=MPIROOT absolute path to the MPI root directory + # --with-mpicc=MPICC name of the MPI C++ compiler (default mpicc) + # --with-mpicxx=MPICXX name of the MPI C++ compiler (default mpicxx) + # --with-ampi=AMPI_DIR full path to the installation of adjoinable MPI + # (AMPI) + patch('openmp_exam_261.patch', when='@2.6.1') def configure_args(self): @@ -60,25 +73,34 @@ class AdolC(AutotoolsPackage): configure_args = [] + if '+boost' in spec: + configure_args.append( + '--with-boost={0}'.format(spec['boost'].prefix) + ) + else: + configure_args.append( + '--with-boost=no' + ) + if '+advanced_branching' in spec: - configure_args.extend([ + configure_args.append( '--enable-advanced-branching' - ]) + ) if '+atrig_erf' in spec: - configure_args.extend([ + configure_args.append( '--enable-atrig-erf' - ]) + ) if '+openmp' in spec: - configure_args.extend([ + configure_args.append( '--with-openmp-flag={0}'.format(self.compiler.openmp_flag) - ]) + ) if '+sparse' in spec: - configure_args.extend([ + configure_args.append( '--enable-sparse' - ]) + ) # We can simply use the bundled examples to check # whether Adol-C works as expected @@ -88,9 +110,9 @@ class AdolC(AutotoolsPackage): '--enable-addexa' # Additional examples ]) if '+openmp' in spec: - configure_args.extend([ + configure_args.append( '--enable-parexa' # Parallel examples - ]) + ) return configure_args -- cgit v1.2.3-70-g09d2 From d54ceb6ce70ba8ff0cc729b0199ed9db1c953729 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Thu, 26 Apr 2018 06:43:20 -0700 Subject: mfem: add valid range of hypre version numbers (#7903) This commit fixes #7900. In short: in the absence of constraints to the contrary, spack will download the preferred version of a package, which is usually the most recent non-develop version. On a clean spack installation without hypre installed, `spack install mfem` will download hypre 2.14.0, which is API-incompatible with mfem 3.3.2 (and earlier versions of mfem), so spack will throw compiler errors re: the API mismatch. This commit fixes that error by restricting mfem release versions 3.3.2 and earlier to hypre version 2.10.b to 2.13.999 (only 2.13.0 currently exists, but if it has a non-2.14.x maintenance release, these versions of hypre should also be permitted). --- var/spack/repos/builtin/packages/mfem/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mfem/package.py b/var/spack/repos/builtin/packages/mfem/package.py index 2f25a7cc21..541f535353 100644 --- a/var/spack/repos/builtin/packages/mfem/package.py +++ b/var/spack/repos/builtin/packages/mfem/package.py @@ -164,6 +164,8 @@ class Mfem(Package): depends_on('mpi', when='+mpi') depends_on('hypre', when='+mpi') + depends_on('hypre@2.10.0:2.13.999', when='@:3.3.2') + depends_on('metis', when='+metis') depends_on('blas', when='+lapack') depends_on('lapack', when='+lapack') -- cgit v1.2.3-70-g09d2 From fd85c1f0c07023284b5b86b2e2fe6d07de631d74 Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Thu, 26 Apr 2018 15:44:17 +0200 Subject: Package 'gdbm': do not set CC. (#7912) --- var/spack/repos/builtin/packages/gdbm/package.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gdbm/package.py b/var/spack/repos/builtin/packages/gdbm/package.py index 70754388aa..bbe9698b38 100644 --- a/var/spack/repos/builtin/packages/gdbm/package.py +++ b/var/spack/repos/builtin/packages/gdbm/package.py @@ -45,12 +45,5 @@ class Gdbm(AutotoolsPackage): depends_on("readline") - def setup_environment(self, spack_env, run_env): - spack_env.set('CC', spack_cc) - def configure_args(self): - config_args = [ - '--enable-libgdbm-compat', - ] - - return config_args + return ['--enable-libgdbm-compat'] -- cgit v1.2.3-70-g09d2 From 6a99ca362f722bd8769e7cca0eafbbd6a8901f4e Mon Sep 17 00:00:00 2001 From: Simon Flood Date: Thu, 26 Apr 2018 15:11:58 +0100 Subject: Add Trinity package (#7828) * Add Trinity package New package to install Trinity - another odd installer (assumes installation to /usr/local/bin and doesn't copy dot files hence deleting them) * Update package.py added dependencies from https://github.com/trinityrnaseq/trinityrnaseq/wiki/Installing-Trinity * Update package.py Copy tree to prefix.bin so that PATH can correctly be set for the Trinity command - can't split it off as it seems everything needs to stay together. * Update package.py Fixed over-length lines and space before comma --- .../repos/builtin/packages/trinity/package.py | 74 ++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 var/spack/repos/builtin/packages/trinity/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trinity/package.py b/var/spack/repos/builtin/packages/trinity/package.py new file mode 100644 index 0000000000..493bf2f345 --- /dev/null +++ b/var/spack/repos/builtin/packages/trinity/package.py @@ -0,0 +1,74 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +from distutils.dir_util import copy_tree + + +class Trinity(MakefilePackage): + """Trinity, developed at the Broad Institute and the Hebrew University of + Jerusalem, represents a novel method for the efficient and robust de + novo reconstruction of transcriptomes from RNA-seq data. Trinity + combines three independent software modules: Inchworm, Chrysalis, and + Butterfly, applied sequentially to process large volumes of RNA-seq + reads. Trinity partitions the sequence data into many individual de + Bruijn graphs, each representing the transcriptional complexity at a + given gene or locus, and then processes each graph independently to + extract full-length splicing isoforms and to tease apart transcripts + derived from paralogous genes. + """ + + homepage = "http://trinityrnaseq.github.io/" + url = "https://github.com/trinityrnaseq/trinityrnaseq/archive/Trinity-v2.6.6.tar.gz" + + version('2.6.6', 'b7472e98ab36655a6d9296d965471a56') + + depends_on("jdk@8") + depends_on("bowtie2") + depends_on("jellyfish") + depends_on("salmon") + + def build(self, spec, prefix): + make + make("plugins") + + def install(self, spec, prefix): + copy_tree('.', prefix.bin, preserve_symlinks=1) + force_remove(join_path(prefix.bin, '.gitmodules')) + force_remove(join_path(prefix.bin, 'Butterfly', '.err')) + force_remove(join_path(prefix.bin, 'Butterfly', 'src', '.classpath')) + force_remove(join_path(prefix.bin, 'Butterfly', 'src', '.err')) + force_remove(join_path(prefix.bin, 'Butterfly', 'src', '.project')) + remove_linked_tree(join_path(prefix.bin, 'Butterfly', 'src', + '.settings')) + remove_linked_tree(join_path(prefix.bin, 'Inchworm', 'src', '.deps')) + remove_linked_tree(join_path(prefix.bin, 'trinity-plugins', + 'ParaFly-0.1.0', 'src', '.deps')) + force_remove(join_path(prefix.bin, 'trinity-plugins', + 'seqtk-trinity-0.0.2', '.gitignore')) + force_remove(join_path(prefix.bin, 'trinity-plugins', 'slclust', 'bin', + '.hidden')) + + def setup_environment(self, spack_env, run_env): + run_env.set('TRINITY_HOME', self.prefix.bin) -- cgit v1.2.3-70-g09d2 From 8afdaa58056744a556c74dd938a6f66cf2ac28c5 Mon Sep 17 00:00:00 2001 From: healther Date: Thu, 26 Apr 2018 22:19:52 +0200 Subject: add patch to get aspell to build on OSX (#7919) --- var/spack/repos/builtin/packages/aspell/darwin.patch | 20 ++++++++++++++++++++ var/spack/repos/builtin/packages/aspell/package.py | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 var/spack/repos/builtin/packages/aspell/darwin.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/aspell/darwin.patch b/var/spack/repos/builtin/packages/aspell/darwin.patch new file mode 100644 index 0000000000..54ec257637 --- /dev/null +++ b/var/spack/repos/builtin/packages/aspell/darwin.patch @@ -0,0 +1,20 @@ ++++ a/interfaces/cc/aspell.h +--- b/interfaces/cc/aspell.h +@@ -236,7 +236,7 @@ + + /******************************** errors ********************************/ + +- ++#ifndef __cplusplus + extern const struct AspellErrorInfo * const aerror_other; + extern const struct AspellErrorInfo * const aerror_operation_not_supported; + extern const struct AspellErrorInfo * const aerror_cant_copy; +@@ -322,7 +322,7 @@ + extern const struct AspellErrorInfo * const aerror_bad_magic; + extern const struct AspellErrorInfo * const aerror_expression; + extern const struct AspellErrorInfo * const aerror_invalid_expression; +- ++#endif + + /******************************* speller *******************************/ + diff --git a/var/spack/repos/builtin/packages/aspell/package.py b/var/spack/repos/builtin/packages/aspell/package.py index 9038c7d0cf..66eeb9e7cb 100644 --- a/var/spack/repos/builtin/packages/aspell/package.py +++ b/var/spack/repos/builtin/packages/aspell/package.py @@ -40,6 +40,8 @@ class Aspell(AutotoolsPackage): version('0.60.6.1', 'e66a9c9af6a60dc46134fdacf6ce97d7') + patch('darwin.patch', when='platform=darwin') + # The dictionaries install all their bits into their prefix.lib dir, # we want to link them into aspell's dict-dir. # These are identical to what's in spack/package.py except -- cgit v1.2.3-70-g09d2 From 0f35f00b6e2e5e8d9f58ca8d899c84ca9da71fb8 Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Thu, 26 Apr 2018 23:40:11 +0200 Subject: Use GitLab's API endpoint for fetching a git snapshot. (#7881) * Use GitLab's API endpoint for fetching a git snapshot. * More GitLab packages use the API. * find_list_url for GitLab's API URLs. * Flake8 * Url for 'hacckernels'. * Check GitLab API regexps before the non-API ones. --- lib/spack/spack/test/url_parse.py | 9 +++++++++ lib/spack/spack/url.py | 20 ++++++++++++++++---- var/spack/repos/builtin/packages/busco/package.py | 12 +++++++++--- .../repos/builtin/packages/hacckernels/package.py | 2 +- var/spack/repos/builtin/packages/icet/package.py | 2 +- var/spack/repos/builtin/packages/libaec/package.py | 2 +- .../repos/builtin/packages/parsplice/package.py | 2 +- var/spack/repos/builtin/packages/swfft/package.py | 3 +-- var/spack/repos/builtin/packages/swiftsim/package.py | 5 ++--- var/spack/repos/builtin/packages/vecgeom/package.py | 4 ++-- var/spack/repos/builtin/packages/vtkm/package.py | 2 +- 11 files changed, 44 insertions(+), 19 deletions(-) (limited to 'var') diff --git a/lib/spack/spack/test/url_parse.py b/lib/spack/spack/test/url_parse.py index d030e769a4..d9b4352686 100644 --- a/lib/spack/spack/test/url_parse.py +++ b/lib/spack/spack/test/url_parse.py @@ -167,6 +167,7 @@ def test_url_strip_name_suffixes(url, version, expected): ('libxc', 58, '2.2.2', 64, 'http://www.tddft.org/programs/octopus/down.php?file=libxc/libxc-2.2.2.tar.gz'), # Version in suffix ('swiftsim', 36, '0.3.0', 76, 'http://gitlab.cosma.dur.ac.uk/swift/swiftsim/repository/archive.tar.gz?ref=v0.3.0'), + ('swiftsim', 55, '0.3.0', 95, 'https://gitlab.cosma.dur.ac.uk/api/v4/projects/swift%2Fswiftsim/repository/archive.tar.gz?sha=v0.3.0'), ('sionlib', 30, '1.7.1', 59, 'http://apps.fz-juelich.de/jsc/sionlib/download.php?version=1.7.1'), # Regex in name ('voro++', 40, '0.4.6', 47, 'http://math.lbl.gov/voro++/download/dir/voro++-0.4.6.tar.gz'), @@ -207,14 +208,21 @@ def test_url_parse_offset(name, noffset, ver, voffset, path): ('git', '2.7.1', 'https://github.com/git/git/tarball/v2.7.1'), # name/zipball/vver.ver ('git', '2.7.1', 'https://github.com/git/git/zipball/v2.7.1'), + # Common Repositories - gitlab downloads # name/repository/archive.ext?ref=vver.ver ('swiftsim', '0.3.0', 'http://gitlab.cosma.dur.ac.uk/swift/swiftsim/repository/archive.tar.gz?ref=v0.3.0'), + # /api/v4/projects/NAMESPACE%2Fname/repository/archive.ext?sha=vver.ver + ('swiftsim', '0.3.0', + 'https://gitlab.cosma.dur.ac.uk/api/v4/projects/swift%2Fswiftsim/repository/archive.tar.gz?sha=v0.3.0'), # name/repository/archive.ext?ref=name-ver.ver ('icet', '1.2.3', 'https://gitlab.kitware.com/icet/icet/repository/archive.tar.gz?ref=IceT-1.2.3'), + # /api/v4/projects/NAMESPACE%2Fname/repository/archive.ext?sha=name-ver.ver + ('icet', '1.2.3', + 'https://gitlab.kitware.com/api/v4/projects/icet%2Ficet/repository/archive.tar.bz2?sha=IceT-1.2.3'), # Common Repositories - bitbucket downloads @@ -370,6 +378,7 @@ def test_url_parse_offset(name, noffset, ver, voffset, path): ('nextflow', '0.20.1', 'https://github.com/nextflow-io/nextflow/releases/download/v0.20.1/nextflow'), # suffix queries ('swiftsim', '0.3.0', 'http://gitlab.cosma.dur.ac.uk/swift/swiftsim/repository/archive.tar.gz?ref=v0.3.0'), + ('swiftsim', '0.3.0', 'https://gitlab.cosma.dur.ac.uk/api/v4/projects/swift%2Fswiftsim/repository/archive.tar.gz?sha=v0.3.0'), ('sionlib', '1.7.1', 'http://apps.fz-juelich.de/jsc/sionlib/download.php?version=1.7.1'), # stem queries ('slepc', '3.6.2', 'http://slepc.upv.es/download/download.php?filename=slepc-3.6.2.tar.gz'), diff --git a/lib/spack/spack/url.py b/lib/spack/spack/url.py index efc1a325e2..329772e17d 100644 --- a/lib/spack/spack/url.py +++ b/lib/spack/spack/url.py @@ -90,9 +90,14 @@ def find_list_url(url): (r'(.*github\.com/[^/]+/[^/]+)', lambda m: m.group(1) + '/releases'), - # GitLab + # GitLab API endpoint + # e.g. https://gitlab.dkrz.de/api/v4/projects/k202009%2Flibaec/repository/archive.tar.gz?sha=v1.0.2 + (r'(.*gitlab[^/]+)/api/v4/projects/([^/]+)%2F([^/]+)', + lambda m: m.group(1) + '/' + m.group(2) + '/' + m.group(3) + '/tags'), + + # GitLab non-API endpoint # e.g. https://gitlab.dkrz.de/k202009/libaec/uploads/631e85bcf877c2dcaca9b2e6d6526339/libaec-1.0.0.tar.gz - (r'(.*gitlab[^/]+/[^/]+/[^/]+)', + (r'(.*gitlab[^/]+/(?!api/v4/projects)[^/]+/[^/]+)', lambda m: m.group(1) + '/tags'), # BitBucket @@ -529,6 +534,9 @@ def parse_version_offset(path): # 9th Pass: Query strings + # e.g. https://gitlab.cosma.dur.ac.uk/api/v4/projects/swift%2Fswiftsim/repository/archive.tar.gz?sha=v0.3.0 + (r'\?sha=[a-zA-Z+._-]*v?(\d[\da-zA-Z._-]*)$', suffix), + # e.g. http://gitlab.cosma.dur.ac.uk/swift/swiftsim/repository/archive.tar.gz?ref=v0.3.0 (r'\?ref=[a-zA-Z+._-]*v?(\d[\da-zA-Z._-]*)$', suffix), @@ -640,9 +648,13 @@ def parse_name_offset(path, v=None): # e.g. https://github.com/nco/nco/archive/4.6.2.tar.gz (r'github\.com/[^/]+/([^/]+)', path), - # GitLab: gitlab.*/repo/name/ + # GitLab API endpoint: gitlab.*/api/v4/projects/NAMESPACE%2Fname/ + # e.g. https://gitlab.cosma.dur.ac.uk/api/v4/projects/swift%2Fswiftsim/repository/archive.tar.gz?sha=v0.3.0 + (r'gitlab[^/]+/api/v4/projects/[^/]+%2F([^/]+)', path), + + # GitLab non-API endpoint: gitlab.*/repo/name/ # e.g. http://gitlab.cosma.dur.ac.uk/swift/swiftsim/repository/archive.tar.gz?ref=v0.3.0 - (r'gitlab[^/]+/[^/]+/([^/]+)', path), + (r'gitlab[^/]+/(?!api/v4/projects)[^/]+/([^/]+)', path), # Bitbucket: bitbucket.org/repo/name/ # e.g. https://bitbucket.org/glotzer/hoomd-blue/get/v1.3.3.tar.bz2 diff --git a/var/spack/repos/builtin/packages/busco/package.py b/var/spack/repos/builtin/packages/busco/package.py index ca4220f29d..48c4c50719 100644 --- a/var/spack/repos/builtin/packages/busco/package.py +++ b/var/spack/repos/builtin/packages/busco/package.py @@ -30,10 +30,16 @@ class Busco(PythonPackage): Universal Single-Copy Orthologs""" homepage = "http://busco.ezlab.org/" - url = "https://gitlab.com/ezlab/busco" + url = "https://gitlab.com/api/v4/projects/ezlab%2Fbusco/repository/archive.tar.gz?sha=2.0.1" - version('3.0.1', git='https://gitlab.com/ezlab/busco.git', commit='078252e00399550d7b0e8941cd4d986c8e868a83') - version('2.0.1', git='https://gitlab.com/ezlab/busco.git', commit='89aa1ab2527f03a87a214ca90a504ad236582a11') + # TODO: check the installation procedure for version 3.0.2 + # and uncomment the following line + # version('3.0.2', '31d80042bb7e96422843fa43d0acbd21') + + # There is no tag for version 3.0.1 + version('3.0.1', git='https://gitlab.com/ezlab/busco.git', + commit='078252e00399550d7b0e8941cd4d986c8e868a83') + version('2.0.1', '4dbcc8a0c18fa8f8312c103eb2fbb4e2') depends_on('python', type=('build', 'run')) depends_on('blast-plus') diff --git a/var/spack/repos/builtin/packages/hacckernels/package.py b/var/spack/repos/builtin/packages/hacckernels/package.py index 39a11c7011..e3a5c3cc12 100644 --- a/var/spack/repos/builtin/packages/hacckernels/package.py +++ b/var/spack/repos/builtin/packages/hacckernels/package.py @@ -33,7 +33,7 @@ class Hacckernels(CMakePackage): cores and beyond.""" homepage = "https://xgitlab.cels.anl.gov/hacc/HACCKernels" - url = "https://xgitlab.cels.anl.gov/hacc/HACCKernels.git" + url = "https://xgitlab.cels.anl.gov/api/v4/projects/hacc%2FHACCKernels/repository/archive.tar.gz" tags = ['proxy-app'] diff --git a/var/spack/repos/builtin/packages/icet/package.py b/var/spack/repos/builtin/packages/icet/package.py index ff934c553e..1a2181c24f 100644 --- a/var/spack/repos/builtin/packages/icet/package.py +++ b/var/spack/repos/builtin/packages/icet/package.py @@ -30,7 +30,7 @@ class Icet(CMakePackage): sort-last parallel rendering library.""" homepage = "http://icet.sandia.gov" - url = "https://gitlab.kitware.com/icet/icet/repository/archive.tar.bz2?ref=IceT-2.1.1" + url = "https://gitlab.kitware.com/api/v4/projects/icet%2Ficet/repository/archive.tar.bz2?sha=IceT-2.1.1" version('develop', branch='master', git='https://gitlab.kitware.com/icet/icet.git') diff --git a/var/spack/repos/builtin/packages/libaec/package.py b/var/spack/repos/builtin/packages/libaec/package.py index f6b349942b..b89723131f 100644 --- a/var/spack/repos/builtin/packages/libaec/package.py +++ b/var/spack/repos/builtin/packages/libaec/package.py @@ -33,7 +33,7 @@ class Libaec(CMakePackage): """ homepage = 'https://gitlab.dkrz.de/k202009/libaec' - url = 'https://gitlab.dkrz.de/k202009/libaec/repository/archive.tar.gz?ref=v1.0.2' + url = 'https://gitlab.dkrz.de/api/v4/projects/k202009%2Flibaec/repository/archive.tar.gz?sha=v1.0.2' list_url = 'https://gitlab.dkrz.de/k202009/libaec/tags' provides('szip') diff --git a/var/spack/repos/builtin/packages/parsplice/package.py b/var/spack/repos/builtin/packages/parsplice/package.py index 24b950548f..10b81171de 100644 --- a/var/spack/repos/builtin/packages/parsplice/package.py +++ b/var/spack/repos/builtin/packages/parsplice/package.py @@ -30,7 +30,7 @@ class Parsplice(CMakePackage): """ParSplice code implements the Parallel Trajectory Splicing algorithm""" homepage = "https://gitlab.com/exaalt/parsplice" - url = "https://gitlab.com/exaalt/parsplice/repository/archive.tar.gz?ref=v1.1" + url = "https://gitlab.com/api/v4/projects/exaalt%2Fparsplice/repository/archive.tar.gz?sha=v1.1" version('1.1', '3a72340d49d731a076e8942f2ae2f4e9') version('develop', git='https://gitlab.com/exaalt/parsplice', branch='master') diff --git a/var/spack/repos/builtin/packages/swfft/package.py b/var/spack/repos/builtin/packages/swfft/package.py index ce0b027c9e..ba77704770 100644 --- a/var/spack/repos/builtin/packages/swfft/package.py +++ b/var/spack/repos/builtin/packages/swfft/package.py @@ -31,8 +31,7 @@ class Swfft(MakefilePackage): parallel 3D FFT.""" homepage = 'https://xgitlab.cels.anl.gov/hacc/SWFFT' - - url = "https://xgitlab.cels.anl.gov/hacc/SWFFT/repository/v1.0/archive.tar.gz" + url = "https://xgitlab.cels.anl.gov/api/v4/projects/hacc%2FSWFFT/repository/archive.tar.gz?sha=v1.0" version('1.0', '0fbc34544b97ba9c3fb19ef2d7a0f076') version('develop', git='https://xgitlab.cels.anl.gov/hacc/SWFFT', diff --git a/var/spack/repos/builtin/packages/swiftsim/package.py b/var/spack/repos/builtin/packages/swiftsim/package.py index 6241634ab2..602a03fd73 100644 --- a/var/spack/repos/builtin/packages/swiftsim/package.py +++ b/var/spack/repos/builtin/packages/swiftsim/package.py @@ -33,10 +33,9 @@ class Swiftsim(AutotoolsPackage): """ homepage = 'http://icc.dur.ac.uk/swift/' - url = 'http://gitlab.cosma.dur.ac.uk/swift/swiftsim/repository/archive.tar.gz?ref=v0.3.0' + url = 'https://gitlab.cosma.dur.ac.uk/api/v4/projects/swift%2Fswiftsim/repository/archive.tar.gz?sha=v0.3.0' - version('0.3.0', git='https://gitlab.cosma.dur.ac.uk/swift/swiftsim.git', - commit='254cc1b563b2f88ddcf437b1f71da123bb9db733') + version('0.3.0', '162ec2bdfdf44a31a08b3fcee23a886a') variant('mpi', default=True, description='Enable distributed memory parallelism') diff --git a/var/spack/repos/builtin/packages/vecgeom/package.py b/var/spack/repos/builtin/packages/vecgeom/package.py index 1e5a1542ff..8945f07ea5 100644 --- a/var/spack/repos/builtin/packages/vecgeom/package.py +++ b/var/spack/repos/builtin/packages/vecgeom/package.py @@ -32,9 +32,9 @@ class Vecgeom(CMakePackage): (toolkits).""" homepage = "https://gitlab.cern.ch/VecGeom/VecGeom" + url = "https://gitlab.cern.ch/api/v4/projects/VecGeom%2FVecGeom/repository/archive.tar.gz?sha=v0.3.rc" - version('0.3.rc', git='https://gitlab.cern.ch/VecGeom/VecGeom.git', - tag='v0.3.rc') + version('0.3.rc', 'c1f5d620f655f3c0610a44e7735203b5') depends_on('cmake@3.5:', type='build') diff --git a/var/spack/repos/builtin/packages/vtkm/package.py b/var/spack/repos/builtin/packages/vtkm/package.py index a461c70b72..f9075b33da 100644 --- a/var/spack/repos/builtin/packages/vtkm/package.py +++ b/var/spack/repos/builtin/packages/vtkm/package.py @@ -36,7 +36,7 @@ class Vtkm(Package): architectures.""" homepage = "https://m.vtk.org/" - url = "https://gitlab.kitware.com/vtk/vtk-m/repository/v1.1.0/archive.tar.gz" + url = "https://gitlab.kitware.com/api/v4/projects/vtk%2Fvtk-m/repository/archive.tar.gz?sha=v1.1.0" version('1.1.0', "6aab1c0885f6ffaaffcf07930873d0df") -- cgit v1.2.3-70-g09d2 From 310addea9160b45a22c3d74cdf57006836b75922 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Thu, 26 Apr 2018 17:17:00 -0500 Subject: samtools: new version (#7921) --- var/spack/repos/builtin/packages/samtools/package.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/samtools/package.py b/var/spack/repos/builtin/packages/samtools/package.py index 3db0999912..7e912e832c 100644 --- a/var/spack/repos/builtin/packages/samtools/package.py +++ b/var/spack/repos/builtin/packages/samtools/package.py @@ -33,6 +33,7 @@ class Samtools(Package): homepage = "www.htslib.org" url = "https://github.com/samtools/samtools/releases/download/1.3.1/samtools-1.3.1.tar.bz2" + version('1.7', '2240175242b5183bfa6baf1483f68023') version('1.6', 'b756f05fd5d1a7042074417edb8c9aea') version('1.4', '8cbd7d2a0ec16d834babcd6c6d85d691') version('1.3.1', 'a7471aa5a1eb7fc9cc4c6491d73c2d88') @@ -40,9 +41,12 @@ class Samtools(Package): depends_on('ncurses') # htslib became standalone @1.3.1, must use corresponding version + depends_on('htslib@1.7', when='@1.7') depends_on('htslib@1.6', when='@1.6') depends_on('htslib@1.4', when='@1.4') depends_on('htslib@1.3.1', when='@1.3.1') + depends_on('zlib', when='@1.7:') + depends_on('bzip2', when='@1.7:') def install(self, spec, prefix): if self.spec.version >= Version('1.3.1'): -- cgit v1.2.3-70-g09d2 From 581a240c86c460943babd9f8e04a6973735e4bad Mon Sep 17 00:00:00 2001 From: Sinan Date: Thu, 26 Apr 2018 19:12:17 -0700 Subject: add versions 3.4.3. and 3.5.0 (#7929) --- var/spack/repos/builtin/packages/r/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py index 09e5be5f20..46c56787aa 100644 --- a/var/spack/repos/builtin/packages/r/package.py +++ b/var/spack/repos/builtin/packages/r/package.py @@ -40,6 +40,8 @@ class R(AutotoolsPackage): extendable = True + version('3.5.0', 'c0455dbfa76ca807e4dfa93d49dcc817') + version('3.4.4', '9d6f73be072531e95884c7965ff80cd8') version('3.4.3', 'bc55db54f992fda9049201ca62d2a584') version('3.4.2', '1cd6d37850188e7f190f1eb94a24ca1f') version('3.4.1', '3a79c01dc0527c62e80ffb1c489297ea') -- cgit v1.2.3-70-g09d2 From dfc4a2aef1b3fd8c5ac94eda7bd1b882f0c31e91 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Thu, 26 Apr 2018 22:48:01 -0500 Subject: bcftools: new version (#7930) --- var/spack/repos/builtin/packages/bcftools/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bcftools/package.py b/var/spack/repos/builtin/packages/bcftools/package.py index 08a2b37896..8b57c0e1dc 100644 --- a/var/spack/repos/builtin/packages/bcftools/package.py +++ b/var/spack/repos/builtin/packages/bcftools/package.py @@ -34,11 +34,13 @@ class Bcftools(AutotoolsPackage): homepage = "http://samtools.github.io/bcftools/" url = "https://github.com/samtools/bcftools/releases/download/1.3.1/bcftools-1.3.1.tar.bz2" + version('1.7', 'c972db68d17af9da3a18963f4e5aeca8') version('1.6', 'c4dba1e8cb55db0f94b4c47724b4f9fa') version('1.4', '50ccf0a073bd70e99cdb3c8be830416e') version('1.3.1', '575001e9fca37cab0c7a7287ad4b1cdb') version('1.2', '8044bed8fce62f7072fc6835420f0906') + depends_on('htslib@1.7', when='@1.7') depends_on('htslib@1.6', when='@1.6') depends_on('htslib@1.4', when='@1.4') depends_on('htslib@1.3.1', when='@1.3.1') -- cgit v1.2.3-70-g09d2 From dec7a102490812e7ea8609fbbfcfb18428869a8b Mon Sep 17 00:00:00 2001 From: Chris Green Date: Fri, 27 Apr 2018 10:11:33 -0500 Subject: Update with recent versions through 4.8.3 and add variants. (#7933) Add configurable HTTP, Python and readline support. Add previously missing dependencies. Minor patch to improve Python support (see https://github.com/xrootd/xrootd/pull/695). --- var/spack/repos/builtin/packages/xrootd/package.py | 39 +++++++++++++++++++++- .../builtin/packages/xrootd/python-support.patch | 30 +++++++++++++++++ 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 var/spack/repos/builtin/packages/xrootd/python-support.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/xrootd/package.py b/var/spack/repos/builtin/packages/xrootd/package.py index 6a5058b9ff..24c6c513ff 100644 --- a/var/spack/repos/builtin/packages/xrootd/package.py +++ b/var/spack/repos/builtin/packages/xrootd/package.py @@ -32,12 +32,49 @@ class Xrootd(CMakePackage): homepage = "http://xrootd.org" url = "http://xrootd.org/download/v4.6.0/xrootd-4.6.0.tar.gz" + version('4.8.3', 'bb6302703ffc123f7f9141ddb589435e') + version('4.8.2', '531b632191b59c2cf76ab8d31af4a866') + version('4.8.1', 'a307973f7f43b0cc2688dfe502e17709') + version('4.8.0', '4349e7f664e686b72855e894b49063ad') + version('4.7.1', '4006422bcf99e0a19996ace4ebb99175') + version('4.7.0', '2a92ba483f574c6ba6a9ff061878af22') + version('4.6.1', '70c6f6e1f5f2b4eeb3c7d2c41a36bb2c') version('4.6.0', '5d60aade2d995b68fe0c46896bc4a5d1') version('4.5.0', 'd485df3d4a991e1c35efa4bf9ef663d7') version('4.4.1', '72b0842f802ccc94dede4ac5ab2a589e') version('4.4.0', '58f55e56801d3661d753ff5fd33dbcc9') version('4.3.0', '39c2fab9f632f35e12ff607ccaf9e16c') + variant('http', default=True, + description='Build with HTTP support') + + variant('python', default=False, + description='Build pyxroot Python extension') + + variant('readline', default=True, + description='Use readline') + + depends_on('bzip2') depends_on('cmake@2.6:', type='build') - depends_on('zlib') + depends_on('libxml2', when='+http') depends_on('openssl') + depends_on('python', when='+python') + depends_on('readline', when='+readline') + depends_on('xz') + depends_on('zlib') + + extends('python', when='+python') + patch('python-support.patch', level=1, when='+python') + + def cmake_args(self): + spec = self.spec + options = [ + '-DENABLE_HTTP:BOOL={0}'. + format('ON' if '+http' in spec else 'OFF'), + '-DENABLE_PYTHON:BOOL={0}'. + format('ON' if '+python' in spec else 'OFF'), + '-DENABLE_READLINE:BOOL={0}'. + format('ON' if '+readline' in spec else 'OFF'), + '-DENABLE_CEPH:BOOL=OFF' + ] + return options diff --git a/var/spack/repos/builtin/packages/xrootd/python-support.patch b/var/spack/repos/builtin/packages/xrootd/python-support.patch new file mode 100644 index 0000000000..eef580641c --- /dev/null +++ b/var/spack/repos/builtin/packages/xrootd/python-support.patch @@ -0,0 +1,30 @@ +diff -Naur xrootd-4.8.0/bindings/python/setup.py.in xrootd-4.8.0/bindings/python/setup.py.in +--- xrootd-4.8.0/bindings/python/setup.py.in 2017-12-13 11:28:52.000000000 -0600 ++++ xrootd-4.8.0/bindings/python/setup.py.in 2017-12-21 17:47:51.378701139 -0600 +@@ -16,6 +16,13 @@ + py_cflags = cfg_vars["PY_CFLAGS"] + cfg_vars["PY_CFLAGS"] = " ".join( flag for flag in py_cflags.split() if flag not in ['-Wstrict-prototypes' ${CLANG_PROHIBITED} ] ) + ++ccl=cfg_vars["CC"].split() ++ccl[0]="${CMAKE_C_COMPILER}" ++cfg_vars["CC"] = " ".join(ccl) ++cxxl=cfg_vars["CXX"].split() ++cxxl[0]="${CMAKE_CXX_COMPILER}" ++cfg_vars["CXX"] = " ".join(cxxl) ++cfg_vars["PY_CXXFLAGS"] = "${CMAKE_CXX_FLAGS}" + + sources = list() + depends = list() +diff -Naur xrootd-4.8.0/cmake/XRootDFindLibs.cmake xrootd-4.8.0/cmake/XRootDFindLibs.cmake +--- xrootd-4.8.0/cmake/XRootDFindLibs.cmake 2017-12-13 11:28:52.000000000 -0600 ++++ xrootd-4.8.0/cmake/XRootDFindLibs.cmake 2017-12-21 17:47:51.379701131 -0600 +@@ -85,8 +85,8 @@ + endif() + + if( ENABLE_PYTHON AND (Linux OR APPLE) ) +- find_package( PythonLibs ${XRD_PYTHON_REQ_VERSION} ) + find_package( PythonInterp ${XRD_PYTHON_REQ_VERSION} ) ++ find_package( PythonLibs ${XRD_PYTHON_REQ_VERSION} ) + if( PYTHONINTERP_FOUND AND PYTHONLIBS_FOUND ) + set( BUILD_PYTHON TRUE ) + set( PYTHON_FOUND TRUE ) -- cgit v1.2.3-70-g09d2 From 810fe884d0a8a778701306e7149b19c1cf0b6a73 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Sat, 28 Apr 2018 06:16:43 -0600 Subject: mfem: fix concretization (#7923) * mfem: fix concretization * Fix hypre deps again * Update package.py --- var/spack/repos/builtin/packages/mfem/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mfem/package.py b/var/spack/repos/builtin/packages/mfem/package.py index 541f535353..4ad659d16b 100644 --- a/var/spack/repos/builtin/packages/mfem/package.py +++ b/var/spack/repos/builtin/packages/mfem/package.py @@ -163,8 +163,8 @@ class Mfem(Package): conflicts('timer=mpi', when='~mpi') depends_on('mpi', when='+mpi') - depends_on('hypre', when='+mpi') - depends_on('hypre@2.10.0:2.13.999', when='@:3.3.2') + depends_on('hypre@2.10.0:2.13.999', when='@:3.3.999+mpi') + depends_on('hypre', when='@3.4:+mpi') depends_on('metis', when='+metis') depends_on('blas', when='+lapack') -- cgit v1.2.3-70-g09d2 From d02b5b96d3a49c6cd08cd458ae85892cf78a6115 Mon Sep 17 00:00:00 2001 From: "Kelly (KT) Thompson" Date: Sun, 29 Apr 2018 18:40:27 -0600 Subject: Patch eospac package to allow compilation with %clang. (#7928) When building eospac with %clang, spack's Fortran compiler wrapper is called 'flang', which is rejected by the eospac build system..Allow compilation with %clang by patching the eospac build system. My testing only covers %clang where flang is actually gfortran. However, this patch only registers 'flang' as a known Fortran compiler and does not set any flags or options that are compiler specific. . --- .../repos/builtin/packages/eospac/flang.patch | 62 ++++++++++++++++++++++ var/spack/repos/builtin/packages/eospac/package.py | 3 ++ 2 files changed, 65 insertions(+) create mode 100644 var/spack/repos/builtin/packages/eospac/flang.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/eospac/flang.patch b/var/spack/repos/builtin/packages/eospac/flang.patch new file mode 100644 index 0000000000..dcde70ff50 --- /dev/null +++ b/var/spack/repos/builtin/packages/eospac/flang.patch @@ -0,0 +1,62 @@ +--- a/Source/config/Makefile.-linux-gnu.detect ++++ b/Source/config/Makefile.-linux-gnu.detect +@@ -19,7 +19,7 @@ + # Compiler suite configurations based upon F90 ### + ################################################################## + # Default: use the first F90 compiler found from F90_List +-F90_List = gfortran pgfortran pgf90 lf95 f90 ifort g95 ftn pathf90 ++F90_List = gfortran pgfortran pgf90 lf95 f90 ifort g95 ftn pathf90 flang + F90_Found_List = $(foreach compiler,$(F90_List),$(call pathsearch,$(compiler))) + F90 = $(firstword $(F90_Found_List)) + F90_Key = $(strip $(firstword $(foreach compiler,$(F90_List),$(call match_r1,$(compiler),$(F90))))) + +--- a/Source/config/Makefile.-linux-gnu.hashes ++++ b/Source/config/Makefile.-linux-gnu.hashes +@@ -32,6 +32,7 @@ + $(call set,_CC,g95, gcc ) # G95 + $(call set,_CC,gfortran, gcc ) # gfortran + $(call set,_CC,ftn, cc gcc ) # Cray Computing Environment (cce) ++$(call set,_CC,flang, clang ) # flang/clang + + $(call set,_CXX,pgfortran, pgCC g++ ) # PGI + $(call set,_CXX,pgf90, pgCC g++ ) # PGI +@@ -42,6 +43,7 @@ + $(call set,_CXX,g95, g++ ) # G95 + $(call set,_CXX,gfortran, g++ ) # gfortran + $(call set,_CXX,ftn, CC g++ ) # Cray Computing Environment (cce) ++$(call set,_CC,flang, clang++ ) # flang/clang++ + + $(call set,_F77,pgfortran, pgfortran pgf77 pgf90 ) # PGI + $(call set,_F77,pgf90, pgfortran pgf77 pgf90 ) # PGI +@@ -52,6 +54,7 @@ + $(call set,_F77,g95, $(F90) ) # G95 + $(call set,_F77,gfortran, $(F90) ) # gfortran + $(call set,_F77,ftn, $(F90) ) # Cray Computing Environment (cce) ++$(call set,_CC,flang, flang ) # flang + + ################################################################## + ### Define CC, CXX and F77 according to $(F90_Key). ### +@@ -94,6 +97,7 @@ + $(call set,_COMP_FLAGS,gfortran, -I"$(INCDIR)" -Wno-c-binding-type) # gfortran + $(call set,_COMP_FLAGS,ppu-gfortran, -I"$(INCDIR)" ) # ppu-gfortran + $(call set,_COMP_FLAGS,ftn, -e m -I"$(INCDIR)" -hfp0 ) # Cray Computing Environment (cce) ++$(call set,_COMP_FLAGS,flang, -I"$(INCDIR)" ) # flang + + # define define_module_subdir script options + $(call set,_DEFINE_MODULE_SUBDIR_FLAGS,f90,) # Absoft f90 +@@ -105,6 +109,7 @@ + $(call set,_DEFINE_MODULE_SUBDIR_FLAGS,g95,) # G95 + $(call set,_DEFINE_MODULE_SUBDIR_FLAGS,gfortran,) # gfortran + $(call set,_DEFINE_MODULE_SUBDIR_FLAGS,ftn,) # Cray Computing Environment (cce) ++$(call set,_DEFINE_MODULE_SUBDIR_FLAGS,flang,) # flang + + # define define_module_subdir script patterns + $(call set,_DEFINE_MODULE_SUBDIR_PATTS,f90,absoft) # Absoft f90 +@@ -116,6 +121,7 @@ + $(call set,_DEFINE_MODULE_SUBDIR_PATTS,g95,$(F90_Key)) # G95 + $(call set,_DEFINE_MODULE_SUBDIR_PATTS,gfortran,gcc) # gfortran + $(call set,_DEFINE_MODULE_SUBDIR_PATTS,ftn,cce) # Cray Computing Environment (cce) ++$(call set,_DEFINE_MODULE_SUBDIR_PATTS,flang,clang) # flang/clang + + # define optional modules for cross-compiling + X_Compile_Module_List = craype-haswell craype-mic-knl diff --git a/var/spack/repos/builtin/packages/eospac/package.py b/var/spack/repos/builtin/packages/eospac/package.py index b3eb1f84ab..222a7ee4db 100644 --- a/var/spack/repos/builtin/packages/eospac/package.py +++ b/var/spack/repos/builtin/packages/eospac/package.py @@ -37,6 +37,9 @@ class Eospac(Package): version('6.4.0beta.1_r20171213193219', 'e4e4beabf946f0b8953532832002afc2') version('6.3.1_r20161202150449', '549fda008c4169a69b02ec2a9de1e434', preferred=True) + # This patch allows the use of spack's compile wrapper 'flang' + patch('flang.patch', when='%clang') + def url_for_version(self, version): return "https://laws.lanl.gov/projects/data/eos/get_file.php?package=eospac&filename=eospac_v{0}.tgz".format(version) -- cgit v1.2.3-70-g09d2 From 094eb5f9a852ae75591cf278bd3182b5a37e8af0 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Mon, 30 Apr 2018 23:03:24 +0800 Subject: Build shared libs for tinyxml. (#7914) --- .../repos/builtin/packages/tinyxml/CMakeLists.txt | 22 +++++++++++++--------- .../repos/builtin/packages/tinyxml/package.py | 7 +++++++ 2 files changed, 20 insertions(+), 9 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/tinyxml/CMakeLists.txt b/var/spack/repos/builtin/packages/tinyxml/CMakeLists.txt index 93f124d716..32db119762 100644 --- a/var/spack/repos/builtin/packages/tinyxml/CMakeLists.txt +++ b/var/spack/repos/builtin/packages/tinyxml/CMakeLists.txt @@ -1,17 +1,21 @@ cmake_minimum_required(VERSION 2.6) project(TinyXml) + OPTION(TIXML_USE_STL "Use STL with TIXML" ON) +OPTION(BUILD_SHARED_LIBS "build as shared library" ON) + if(TIXML_USE_STL) add_definitions(-DTIXML_USE_STL) endif(TIXML_USE_STL) -add_library( - tinyxml - tinyxml.cpp - tinystr.cpp - tinyxmlerror.cpp - tinyxmlparser.cpp -) -INSTALL( FILES tinyxml.h tinystr.h DESTINATION include ) -INSTALL( TARGETS tinyxml ARCHIVE DESTINATION lib ) +if(BUILD_SHARED_LIBS) + add_library(tinyxml SHARED tinyxml.cpp tinystr.cpp tinyxmlerror.cpp tinyxmlparser.cpp) + install(TARGETS tinyxml LIBRARY DESTINATION lib) +else() + add_library(tinyxml_static STATIC tinyxml.cpp tinystr.cpp tinyxmlerror.cpp tinyxmlparser.cpp) + set_target_properties(tinyxml_static PROPERTIES OUTPUT_NAME tinyxml) + install(TARGETS tinyxml_static ARCHIVE DESTINATION lib) +endif(BUILD_SHARED_LIBS) + +install(FILES tinyxml.h tinystr.h DESTINATION include) diff --git a/var/spack/repos/builtin/packages/tinyxml/package.py b/var/spack/repos/builtin/packages/tinyxml/package.py index d1f16fae57..e34315882f 100644 --- a/var/spack/repos/builtin/packages/tinyxml/package.py +++ b/var/spack/repos/builtin/packages/tinyxml/package.py @@ -35,6 +35,8 @@ class Tinyxml(CMakePackage): version('2.6.2', 'cba3f50dd657cb1434674a03b21394df9913d764') + variant('shared', default=True, description='Build a shared library') + def url_for_version(self, version): url = "https://sourceforge.net/projects/tinyxml/files/tinyxml/{0}/tinyxml_{1}.tar.gz" return url.format(version.dotted, version.underscored) @@ -42,3 +44,8 @@ class Tinyxml(CMakePackage): def patch(self): copyfile(join_path(os.path.dirname(__file__), "CMakeLists.txt"), "CMakeLists.txt") + + def cmake_args(self): + spec = self.spec + return [ + '-DBUILD_SHARED_LIBS=%s' % ('YES' if '+shared' in spec else 'NO')] -- cgit v1.2.3-70-g09d2 From 7088e547a356f41883a60e66a61e255d501043b1 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 30 Apr 2018 12:11:06 -0500 Subject: vt: Create new package (#7947) --- var/spack/repos/builtin/packages/vt/package.py | 38 ++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/vt/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/vt/package.py b/var/spack/repos/builtin/packages/vt/package.py new file mode 100644 index 0000000000..33077d900e --- /dev/null +++ b/var/spack/repos/builtin/packages/vt/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Vt(MakefilePackage): + """A tool set for short variant discovery in genetic sequence data.""" + + homepage = "http://genome.sph.umich.edu/wiki/vt" + url = "https://github.com/atks/vt/archive/0.577.tar.gz" + + version('0.577', '59807456022bcecf978314c93254fe15') + + def install(self, spec, spack): + mkdirp(prefix.bin) + install('vt', prefix.bin) -- cgit v1.2.3-70-g09d2 From 2db4beac12caf535fff4d5206780ca46fcc881c4 Mon Sep 17 00:00:00 2001 From: Adam Moody Date: Mon, 30 Apr 2018 16:46:17 -0700 Subject: mpifileutils: roll back to dtcmp v1.0.3, add option to build master branch (#7949) * mpifileutils: roll back to dtcmp v1.0.3 due to API change, add option to build master branch * add comment to explain why certain dtcmp is required, rename version for git branch * dtcmp v1.0.2 is missing github tarball --- var/spack/repos/builtin/packages/mpifileutils/package.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mpifileutils/package.py b/var/spack/repos/builtin/packages/mpifileutils/package.py index 65625ff0cb..b59e34768e 100644 --- a/var/spack/repos/builtin/packages/mpifileutils/package.py +++ b/var/spack/repos/builtin/packages/mpifileutils/package.py @@ -38,13 +38,18 @@ class Mpifileutils(AutotoolsPackage): homepage = "https://github.com/hpc/mpifileutils" url = "https://github.com/hpc/mpifileutils/releases/download/v0.6/mpifileutils-0.6.tar.gz" + version('develop', git='https://github.com/hpc/mpifileutils.git') version('0.7', 'c081f7f72c4521dddccdcf9e087c5a2b') version('0.6', '620bcc4966907481f1b1a965b28fc9bf') depends_on('mpi') depends_on('libcircle') depends_on('lwgrp') - depends_on('dtcmp') + + # need precise version of dtcmp, since DTCMP_Segmented_exscan added + # in v1.0.3 but renamed in v1.1.0 and later + depends_on('dtcmp@1.0.3') + depends_on('libarchive') variant('xattr', default=True, -- cgit v1.2.3-70-g09d2 From 29b47e0e01af72beb8aeb4f136a3ab0af3d15715 Mon Sep 17 00:00:00 2001 From: Adam Moody Date: Mon, 30 Apr 2018 18:12:13 -0700 Subject: mvapich2: add registration cache and file systems variants (#7948) * mvapich2: add registration cache and file systems variants, avoid empty --with-pm= if no process manager is specified, add missing leading dash in --disable-silent-rules --- .../repos/builtin/packages/mvapich2/package.py | 38 ++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mvapich2/package.py b/var/spack/repos/builtin/packages/mvapich2/package.py index e9864b90fc..441ad27927 100644 --- a/var/spack/repos/builtin/packages/mvapich2/package.py +++ b/var/spack/repos/builtin/packages/mvapich2/package.py @@ -58,6 +58,9 @@ class Mvapich2(AutotoolsPackage): variant('cuda', default=False, description='Enable CUDA extension') + variant('regcache', default=True, + description='Enable memory registration cache') + # Accepted values are: # single - No threads (MPI_THREAD_SINGLE) # funneled - Only the main thread calls MPI (MPI_THREAD_FUNNELED) @@ -105,6 +108,13 @@ class Mvapich2(AutotoolsPackage): description='Use alloca to allocate temporary memory if available' ) + variant( + 'file_systems', + description='List of the ROMIO file systems to activate', + values=('lustre', 'gpfs', 'nfs', 'ufs'), + multi=True + ) + depends_on('bison', type='build') depends_on('libpciaccess', when=(sys.platform != 'darwin')) depends_on('cuda', when='+cuda') @@ -121,7 +131,10 @@ class Mvapich2(AutotoolsPackage): for x in ('hydra', 'gforker', 'remshell'): if 'process_managers={0}'.format(x) in spec: other_pms.append(x) - opts = ['--with-pm=%s' % ':'.join(other_pms)] + + opts = [] + if len(other_pms) > 0: + opts = ['--with-pm=%s' % ':'.join(other_pms)] # See: http://slurm.schedmd.com/mpi_guide.html#mvapich2 if 'process_managers=slurm' in spec: @@ -152,6 +165,21 @@ class Mvapich2(AutotoolsPackage): opts = ["--with-device=ch3:mrail", "--with-rdma=gen2"] return opts + @property + def file_system_options(self): + spec = self.spec + + fs = [] + for x in ('lustre', 'gpfs', 'nfs', 'ufs'): + if 'file_systems={0}'.format(x) in spec: + fs.append(x) + + opts = [] + if len(fs) > 0: + opts.append('--with-file-system=%s' % '+'.join(fs)) + + return opts + def setup_environment(self, spack_env, run_env): spec = self.spec if 'process_managers=slurm' in spec: @@ -194,7 +222,7 @@ class Mvapich2(AutotoolsPackage): args = [ '--enable-shared', '--enable-romio', - '-disable-silent-rules', + '--disable-silent-rules', '--disable-new-dtags', '--enable-fortran=all', "--enable-threads={0}".format(spec.variants['threads'].value), @@ -224,6 +252,12 @@ class Mvapich2(AutotoolsPackage): else: args.append('--disable-cuda') + if '+regcache' in self.spec: + args.append('--enable-registration-cache') + else: + args.append('--disable-registration-cache') + args.extend(self.process_manager_options) args.extend(self.network_options) + args.extend(self.file_system_options) return args -- cgit v1.2.3-70-g09d2 From 9d1456393f3f2f0b0b0358b5d6c69642ec84d56a Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Wed, 2 May 2018 06:48:16 -0600 Subject: openmc is not a proxy (#7968) https://github.com/spack/spack/issues/7965#issuecomment-385953224 --- var/spack/repos/builtin/packages/openmc/package.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openmc/package.py b/var/spack/repos/builtin/packages/openmc/package.py index ed6229cfdd..d83aaf0732 100644 --- a/var/spack/repos/builtin/packages/openmc/package.py +++ b/var/spack/repos/builtin/packages/openmc/package.py @@ -36,8 +36,6 @@ class Openmc(MakefilePackage): homepage = "https://github.com/ANL-CESAR/" url = "https://github.com/ANL-CESAR/openmc.git" - tags = ['proxy-app'] - version('develop', git='https://github.com/ANL-CESAR/openmc.git') build_directory = 'src' -- cgit v1.2.3-70-g09d2 From c23387e89b418e5baaa2334290faa1f8a072b69b Mon Sep 17 00:00:00 2001 From: David Wootton <38671868+dwootton-ny@users.noreply.github.com> Date: Wed, 2 May 2018 09:12:08 -0400 Subject: Fix Spectrum MPI package spec file for PGI compilers (#7964) * Added magma package * Incorporated Serban's change * Remove deleted files * argparse.py * Sync forked Spack repo in github * Use reported version of IBM XL Fortran compiler for compiler versions >= 16.0. Starting with the April 2018 release, the IBM XL C and Fortran compilers report the same version, 16.0. Consequently, there is no need to downgrade the Fortran compiler version to match that of the C compiler. * Eliminate blank lines. * Update the Spectrum MPI package.py file to specify the correct compilation scripts for the PGI compilers. --- var/spack/repos/builtin/packages/spectrum-mpi/package.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/spectrum-mpi/package.py b/var/spack/repos/builtin/packages/spectrum-mpi/package.py index 2ada9c593e..e094f1c3ad 100644 --- a/var/spack/repos/builtin/packages/spectrum-mpi/package.py +++ b/var/spack/repos/builtin/packages/spectrum-mpi/package.py @@ -46,6 +46,11 @@ class SpectrumMpi(Package): self.spec.mpicxx = join_path(self.prefix.bin, 'mpixlC') self.spec.mpif77 = join_path(self.prefix.bin, 'mpixlf') self.spec.mpifc = join_path(self.prefix.bin, 'mpixlf') + elif '%pgi' in dependent_spec: + self.spec.mpicc = join_path(self.prefix.bin, 'mpipgicc') + self.spec.mpicxx = join_path(self.prefix.bin, 'mpipgic++') + self.spec.mpif77 = join_path(self.prefix.bin, 'mpipgifort') + self.spec.mpifc = join_path(self.prefix.bin, 'mpipgifort') else: self.spec.mpicc = join_path(self.prefix.bin, 'mpicc') self.spec.mpicxx = join_path(self.prefix.bin, 'mpicxx') @@ -58,6 +63,11 @@ class SpectrumMpi(Package): spack_env.set('MPICXX', join_path(self.prefix.bin, 'mpixlC')) spack_env.set('MPIF77', join_path(self.prefix.bin, 'mpixlf')) spack_env.set('MPIF90', join_path(self.prefix.bin, 'mpixlf')) + elif '%pgi' in dependent_spec: + spack_env.set('MPICC', join_path(self.prefix.bin, 'mpipgicc')) + spack_env.set('MPICXX', join_path(self.prefix.bin, 'mpipgic++')) + spack_env.set('MPIF77', join_path(self.prefix.bin, 'mpipgifort')) + spack_env.set('MPIF90', join_path(self.prefix.bin, 'mpipgifort')) else: spack_env.set('MPICC', join_path(self.prefix.bin, 'mpicc')) spack_env.set('MPICXX', join_path(self.prefix.bin, 'mpic++')) -- cgit v1.2.3-70-g09d2 From fdc6ea064524045842cd1f57538582e6247fdab2 Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 2 May 2018 08:14:00 -0500 Subject: bedops: Create new package (#7956) * bedops: Create new package * fix install method --- var/spack/repos/builtin/packages/bedops/package.py | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 var/spack/repos/builtin/packages/bedops/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bedops/package.py b/var/spack/repos/builtin/packages/bedops/package.py new file mode 100644 index 0000000000..6757d082d8 --- /dev/null +++ b/var/spack/repos/builtin/packages/bedops/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Bedops(MakefilePackage): + """BEDOPS is an open-source command-line toolkit that performs highly + efficient and scalable Boolean and other set operations, statistical + calculations, archiving, conversion and other management of genomic data of + arbitrary scale.""" + + homepage = "https://bedops.readthedocs.io" + url = "https://github.com/bedops/bedops/archive/v2.4.30.tar.gz" + + version('2.4.34', 'fc467d96134a0efe8b134e638af87a1a') + version('2.4.30', '4e5d9f7b7e5432b28aef8d17a22cffab') + + def install(self, spec, prefix): + mkdirp(prefix.bin) + make('install', "BINDIR=%s" % prefix.bin) -- cgit v1.2.3-70-g09d2 From f1ce2e335186bfc363ebbf0762be6bd75d0f3325 Mon Sep 17 00:00:00 2001 From: "Michael F. Herbst" Date: Wed, 2 May 2018 17:44:58 +0200 Subject: Add libcint version 3.0.12 (#7972) --- var/spack/repos/builtin/packages/libcint/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libcint/package.py b/var/spack/repos/builtin/packages/libcint/package.py index e074367aa0..863603182e 100644 --- a/var/spack/repos/builtin/packages/libcint/package.py +++ b/var/spack/repos/builtin/packages/libcint/package.py @@ -35,6 +35,7 @@ class Libcint(CMakePackage): # # Versions # + version('3.0.12', 'e69117782ff9f443373f30c80ecb6ab7') version('3.0.11', '1fb1db5a426280d38cddbb0098f6c678') version('3.0.10', 'b368e257dba99febf1cdd1391f2e58a3') version('3.0.8', '61f415ad9c7854963136c6bba7a661eb') -- cgit v1.2.3-70-g09d2 From 73ded1a60cf1ee4062899b18229c821dc1b1f17f Mon Sep 17 00:00:00 2001 From: Tim Law Date: Wed, 2 May 2018 16:45:30 +0100 Subject: Added BookLeaf_Cpp and Typhon packages. (#7969) --- .../repos/builtin/packages/bookleaf-cpp/package.py | 66 ++++++++++++++++++++++ var/spack/repos/builtin/packages/typhon/package.py | 39 +++++++++++++ 2 files changed, 105 insertions(+) create mode 100644 var/spack/repos/builtin/packages/bookleaf-cpp/package.py create mode 100644 var/spack/repos/builtin/packages/typhon/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bookleaf-cpp/package.py b/var/spack/repos/builtin/packages/bookleaf-cpp/package.py new file mode 100644 index 0000000000..b9674bd810 --- /dev/null +++ b/var/spack/repos/builtin/packages/bookleaf-cpp/package.py @@ -0,0 +1,66 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class BookleafCpp(CMakePackage): + """ + BookLeaf is a 2D unstructured hydrodynamics mini-app. + """ + + homepage = "https://github.com/UK-MAC/BookLeaf_Cpp" + url = "https://github.com/UK-MAC/BookLeaf_Cpp/archive/v2.0.tar.gz" + + version('2.0', '69819ebcbae5eaa63d1a4de2c77cac85') + + variant('typhon', default=True, description='Use Typhon') + variant('parmetis', default=False, description='Use ParMETIS') + variant('silo', default=False, description='Use Silo') + variant('caliper', default=False, description='Use Caliper') + + depends_on('caliper', when='+caliper') + depends_on('parmetis', when='+parmetis') + depends_on('silo', when='+silo') + depends_on('typhon', when='+typhon') + depends_on('mpi', when='+typhon') + depends_on('yaml-cpp@0.6.0:') + + def cmake_args(self): + spec = self.spec + cmake_args = [] + + if '+typhon' in spec: + cmake_args.append('-DENABLE_TYPHON=ON') + + if '+parmetis' in spec: + cmake_args.append('-DENABLE_PARMETIS=ON') + + if '+silo' in spec: + cmake_args.append('-DENABLE_SILO=ON') + + if '+caliper' in spec: + cmake_args.append('-DENABLE_CALIPER=ON') + + return cmake_args diff --git a/var/spack/repos/builtin/packages/typhon/package.py b/var/spack/repos/builtin/packages/typhon/package.py new file mode 100644 index 0000000000..69fe48b38d --- /dev/null +++ b/var/spack/repos/builtin/packages/typhon/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Typhon(CMakePackage): + """ + Typhon is a distributed communications library for unstructured mesh + applications. + """ + + homepage = "https://github.com/UK-MAC/Typhon" + url = "https://github.com/UK-MAC/Typhon/archive/v3.0.tar.gz" + + version('3.0', 'ec67cd1aa585ce2410d4fa50514a916f') + + depends_on('mpi') -- cgit v1.2.3-70-g09d2 From f054fa2f43951ef70b6ce223e8f9cf23064f11b9 Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Wed, 2 May 2018 15:23:02 -0400 Subject: sphinx: Updated to v1.7.4 (#7977) * sphinx: Updated to v1.7.4 * Update package.py --- var/spack/repos/builtin/packages/py-sphinx/package.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-sphinx/package.py b/var/spack/repos/builtin/packages/py-sphinx/package.py index 801653b1a0..e4be436a7f 100644 --- a/var/spack/repos/builtin/packages/py-sphinx/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx/package.py @@ -40,6 +40,7 @@ class PySphinx(PythonPackage): 'sphinx.environment.collectors', 'sphinx.environment.adapters' ] + version('1.7.4', '95f3b83f521314600e5b09e99cf32c46') version('1.6.3', 'c5ad61f4e0974375ca2c2b58ef8d5411') version('1.6.1', '26cb1cdca7aa4afc8c925d926b6268e7') version('1.5.5', 'f9581b3556df9722143c47290273bcf8') @@ -51,6 +52,9 @@ class PySphinx(PythonPackage): # Sphinx requires at least Python 2.7 or 3.4 to run depends_on('python@2.7:2.8,3.4:', type=('build', 'run')) + # See here for upstream list of dependencies: + # https://github.com/sphinx-doc/sphinx/blob/master/setup.py + # Most Python packages only require py-setuptools as a build dependency. # However, py-sphinx requires py-setuptools during runtime as well. depends_on('py-setuptools', type=('build', 'run')) @@ -65,6 +69,8 @@ class PySphinx(PythonPackage): depends_on('py-imagesize', when='@1.4:', type=('build', 'run')) depends_on('py-requests@2.0.0:', type=('build', 'run')) depends_on('py-sphinx-rtd-theme@0.1:', type=('build', 'run')) # optional as of 1.4 + # See: https://github.com/sphinx-doc/sphinx/commit/854a227501a7582510eba41a208d25816f754e0c + depends_on('py-packaging', type=('build', 'run'), when='@1.7.4:') # Sphinx v1.6+ no longer includes websupport by default: # http://www.sphinx-doc.org/en/stable/changes.html -- cgit v1.2.3-70-g09d2 From 7909e15d834c5ff53b10f06ac00f888cbaee6b32 Mon Sep 17 00:00:00 2001 From: Adam Moody Date: Wed, 2 May 2018 12:23:32 -0700 Subject: mvapich2: add 2.3rc2 (#7976) --- var/spack/repos/builtin/packages/mvapich2/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mvapich2/package.py b/var/spack/repos/builtin/packages/mvapich2/package.py index 441ad27927..bd453647e5 100644 --- a/var/spack/repos/builtin/packages/mvapich2/package.py +++ b/var/spack/repos/builtin/packages/mvapich2/package.py @@ -41,6 +41,7 @@ class Mvapich2(AutotoolsPackage): url = "http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-2.2.tar.gz" list_url = "http://mvapich.cse.ohio-state.edu/downloads/" + version('2.3rc2', '6fcf22fe2a16023b462ef57614daa357') version('2.3rc1', '386d79ae36b2136d203826465ad8b6cc') version('2.3a', '87c3fbf8a755b53806fa9ecb21453445') -- cgit v1.2.3-70-g09d2 From cbd77e3a8d22f389041c216ba743eda601fe3754 Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Wed, 2 May 2018 15:26:30 -0400 Subject: make symlinking python3->python optional (#7960) * Make symlinking python3->python optional * Added reference to PEP 394 --- var/spack/repos/builtin/packages/python/package.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 8dc46f113d..30774332fd 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -93,6 +93,10 @@ class Python(AutotoolsPackage): default=False, description='Enable expensive build-time optimizations, if available' ) + # See https://legacy.python.org/dev/peps/pep-0394/ + variant('pythoncmd', default=True, + description="Symlink 'python3' executable to 'python' " + "(not PEP 394 compliant)") depends_on("openssl") depends_on("bzip2") @@ -231,7 +235,7 @@ class Python(AutotoolsPackage): os.symlink(os.path.join(src, f), os.path.join(dst, f)) - if spec.satisfies('@3:'): + if spec.satisfies('@3:') and spec.satisfies('+pythoncmd'): os.symlink(os.path.join(prefix.bin, 'python3'), os.path.join(prefix.bin, 'python')) os.symlink(os.path.join(prefix.bin, 'python3-config'), -- cgit v1.2.3-70-g09d2 From 937ab7d5cc32d7d011d9e9b3194a7e3152966259 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Thu, 3 May 2018 12:14:52 +0200 Subject: go: Update to 1.10.2 (#7982) --- var/spack/repos/builtin/packages/go/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/go/package.py b/var/spack/repos/builtin/packages/go/package.py index cb5e744af2..b75dcbf46b 100644 --- a/var/spack/repos/builtin/packages/go/package.py +++ b/var/spack/repos/builtin/packages/go/package.py @@ -56,6 +56,7 @@ class Go(Package): extendable = True + version('1.10.2', '6264609c6b9cd8ed8e02ca84605d727ce1898d74efa79841660b2e3e985a98bd') version('1.10.1', '589449ff6c3ccbff1d391d4e7ab5bb5d5643a5a41a04c99315e55c16bbf73ddc') version('1.9.5', 'f1c2bb7f32bbd8fa7a19cc1608e0d06582df32ff5f0340967d83fb0017c49fbc') version('1.9.2', '44105c865a1a810464df79233a05a568') -- cgit v1.2.3-70-g09d2 From fb9898230e39c973d5b570c0b146fa92fa46abd6 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Thu, 3 May 2018 21:37:52 +0800 Subject: A new package: py-openslide-python. (#7907) * A new package: py-openslide-python. * Update. * Remove py-pytorch package. * Remove nektar package. * Remove install_time_test_callbacks --- .../packages/py-openslide-python/package.py | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-openslide-python/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-openslide-python/package.py b/var/spack/repos/builtin/packages/py-openslide-python/package.py new file mode 100644 index 0000000000..22ee356fe5 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-openslide-python/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyOpenslidePython(PythonPackage): + """OpenSlide Python is a Python interface to the OpenSlide library.""" + + homepage = "https://github.com/openslide/openslide-python" + url = "https://github.com/openslide/openslide-python/archive/v1.1.1.tar.gz" + + version('1.1.1', '8c207e48069887b63ea1c7bc9eb7dfc0') + + import_modules = ['openslide'] + + depends_on('openslide@3.4.0:') + depends_on('python@2.6:2.8,3.3:') + depends_on('py-setuptools', type='build') + depends_on('py-pillow+jpeg+jpeg2000+tiff', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 05f51c46ddfcc0c854a49323bac234aa65051281 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Thu, 3 May 2018 23:08:48 +0800 Subject: Bump gatk version to 4.0.4.0. (#7985) * Bump gatk version to 4.0.4.0. * Update. * Fixed. * Fixed. --- var/spack/repos/builtin/packages/gatk/package.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gatk/package.py b/var/spack/repos/builtin/packages/gatk/package.py index 8ac97bae8b..8ca12f133a 100644 --- a/var/spack/repos/builtin/packages/gatk/package.py +++ b/var/spack/repos/builtin/packages/gatk/package.py @@ -33,23 +33,31 @@ class Gatk(Package): """Genome Analysis Toolkit Variant Discovery in High-Throughput Sequencing Data """ - homepage = "http://broadinstitute.github.io/gatk/" - url = "https://software.broadinstitute.org/gatk/download/auth?package=GATK" - _urlfmt = "https://github.com/broadgsa/gatk-protected/archive/{0}.tar.gz" + homepage = "https://software.broadinstitute.org/gatk/" + url = "https://github.com/broadinstitute/gatk/releases/download/4.0.4.0/gatk-4.0.4.0.zip" + version('4.0.4.0', '083d655883fb251e837eb2458141fc2b', + url="https://github.com/broadinstitute/gatk/releases/download/4.0.4.0/gatk-4.0.4.0.zip") version('3.8-0', '0581308d2a25f10d11d3dfd0d6e4d28e', extension='tar.gz', url="https://software.broadinstitute.org/gatk/download/auth?package=GATK") depends_on('java@8:', type='run') + depends_on('python@2.6:2.8,3.6:', type='run', when='@4.0:') + depends_on('r@3.2:', type='run', when='@4.0:') def install(self, spec, prefix): mkdirp(prefix.bin) # The list of files to install varies with release... - # ... but skip the spack-{build.env}.out files. - files = [x for x in glob.glob("*") if not re.match("^spack-", x)] + # ... but skip the spack-{build.env}.out files and gatkdoc directory. + files = [x for x in glob.glob("*") + if not re.match("^spack-", x) and not re.match("^gatkdoc", x)] for f in files: install(f, prefix.bin) + # Skip helper script settings + if spec.satisfies('@:4.0'): + return + # Set up a helper script to call java on the jar file, # explicitly codes the path for java and the jar file. script_sh = join_path(os.path.dirname(__file__), "gatk.sh") -- cgit v1.2.3-70-g09d2 From 78d8bd7d403462b85ee66abad0fb31ce9349ad71 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Thu, 3 May 2018 23:12:17 +0800 Subject: Bump pgi to 18.4. (#7980) * Bump pgi to 18.4. * Remove the empty line. * Update. --- var/spack/repos/builtin/packages/pgi/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pgi/package.py b/var/spack/repos/builtin/packages/pgi/package.py index c8a73b8783..5c4f023b0a 100644 --- a/var/spack/repos/builtin/packages/pgi/package.py +++ b/var/spack/repos/builtin/packages/pgi/package.py @@ -39,6 +39,7 @@ class Pgi(Package): homepage = "http://www.pgroup.com/" + version('18.4', 'b55461f9f0986acbd51902c51c2074b9') version('17.10', '85ad6506e7ada610ab11ddb35d697efa') version('17.4', 'a311d2756ddda657860bad8e5725597b') version('17.3', '6eefc42f85e756cbaba76467ed640902') -- cgit v1.2.3-70-g09d2 From c8157e31e19fe55d90f729d9f6ed669554bdd53a Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Thu, 3 May 2018 23:12:37 +0800 Subject: A new package: nanopb. (#7981) * A new package: nanopb. * flake8. * Remove py-pytorch. --- var/spack/repos/builtin/packages/nanopb/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/nanopb/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nanopb/package.py b/var/spack/repos/builtin/packages/nanopb/package.py new file mode 100644 index 0000000000..c5cfc9c135 --- /dev/null +++ b/var/spack/repos/builtin/packages/nanopb/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Nanopb(CMakePackage): + """Nanopb is a small code-size Protocol Buffers implementation + in ansi C.""" + + homepage = "https://jpa.kapsi.fi/nanopb/" + url = "https://github.com/nanopb/nanopb/archive/0.3.9.1.tar.gz" + + version('0.3.9.1', '08d71b315819626366b0303f8658fc68') + + depends_on('protobuf', type=('build')) + depends_on('py-protobuf', type=('build')) -- cgit v1.2.3-70-g09d2 From 7846dfa817f486af0ede8e75950d3a8b42590bc7 Mon Sep 17 00:00:00 2001 From: "Kelly (KT) Thompson" Date: Thu, 3 May 2018 09:12:57 -0600 Subject: New Package: ruby-svn2git (#7979) * New Package: svn2git https://github.com/nirvdrum/svn2git svn2git is a tiny utility for migrating projects from Subversion to Git while keeping the trunk, branches and tags where they should be. It uses git-svn to clone an svn repository and does some clean-up to make sure branches and tags are imported in a meaningful way, and that the code checked into master ends up being what's currently in your svn trunk rather than whichever svn branch your last commit was in. * Actually requires +perl variant of subversion. * fix style issue. --- .../repos/builtin/packages/ruby-svn2git/package.py | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 var/spack/repos/builtin/packages/ruby-svn2git/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ruby-svn2git/package.py b/var/spack/repos/builtin/packages/ruby-svn2git/package.py new file mode 100644 index 0000000000..292c736a30 --- /dev/null +++ b/var/spack/repos/builtin/packages/ruby-svn2git/package.py @@ -0,0 +1,48 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RubySvn2git(Package): + """svn2git is a tiny utility for migrating projects from Subversion to Git + while keeping the trunk, branches and tags where they should be. It uses + git-svn to clone an svn repository and does some clean-up to make sure + branches and tags are imported in a meaningful way, and that the code + checked into master ends up being what's currently in your svn trunk rather + than whichever svn branch your last commit was in.""" + + homepage = "https://github.com/nirvdrum/svn2git/" + url = "https://github.com/nirvdrum/svn2git/archive/v2.4.0.tar.gz" + + version('2.4.0', 'f19ac6eb0634aa1fed31a1e40a2aeaa2') + + depends_on('git') + depends_on('subversion+perl') + + extends('ruby') + + def install(self, spec, prefix): + gem('build', 'svn2git.gemspec') + gem('install', 'svn2git-{0}.gem'.format(self.version)) -- cgit v1.2.3-70-g09d2 From a128fa88c58cb8d9f8c958dd84885e93562e78ed Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 3 May 2018 13:09:59 -0500 Subject: py-crispresso: Create new package (#7990) * py-crispresso: Create new package * py-crispresso: Create new package --- .../builtin/packages/py-crispresso/package.py | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-crispresso/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-crispresso/package.py b/var/spack/repos/builtin/packages/py-crispresso/package.py new file mode 100644 index 0000000000..78ff71f921 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-crispresso/package.py @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyCrispresso(PythonPackage): + """Software pipeline for the analysis of CRISPR-Cas9 genome editing + outcomes from deep sequencing data.""" + + homepage = "https://github.com/lucapinello/CRISPResso" + url = "https://pypi.io/packages/source/C/CRISPResso/CRISPResso-1.0.8.tar.gz" + + version('1.0.8', '2f9b52fe62cf49012a9525845f4aea45') + + depends_on('py-setuptools', type='build') + depends_on('python@2.7.0:2.7.999', type=('build', 'run')) + depends_on('py-biopython@1.6.5:', type=('build', 'run')) + depends_on('py-matplotlib@1.3.1:', type=('build', 'run')) + depends_on('py-numpy@1.9:', type=('build', 'run')) + depends_on('py-pandas@0.15:', type=('build', 'run')) + depends_on('py-seaborn@0.7.1:', type=('build', 'run')) + depends_on('emboss@6:', type=('build', 'run')) + depends_on('flash', type=('build', 'run')) + depends_on('java', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 2aea56da0785206028c9f5b3abc141114022b054 Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 3 May 2018 13:11:00 -0500 Subject: genomefinisher: Create new package (#7989) --- .../packages/genomefinisher/genomefinisher.sh | 3 ++ .../builtin/packages/genomefinisher/package.py | 62 ++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 var/spack/repos/builtin/packages/genomefinisher/genomefinisher.sh create mode 100644 var/spack/repos/builtin/packages/genomefinisher/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/genomefinisher/genomefinisher.sh b/var/spack/repos/builtin/packages/genomefinisher/genomefinisher.sh new file mode 100644 index 0000000000..b44c048751 --- /dev/null +++ b/var/spack/repos/builtin/packages/genomefinisher/genomefinisher.sh @@ -0,0 +1,3 @@ +#!/bin/sh +# convenience wrapper for the GenomeFinisher jar file +java $JAVA_ARGS $JAVA_OPTS -jar GenomeFinisher.jar "$@" diff --git a/var/spack/repos/builtin/packages/genomefinisher/package.py b/var/spack/repos/builtin/packages/genomefinisher/package.py new file mode 100644 index 0000000000..7599c37505 --- /dev/null +++ b/var/spack/repos/builtin/packages/genomefinisher/package.py @@ -0,0 +1,62 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +from shutil import copyfile +import os + + +class Genomefinisher(Package): + """GFinisher is an application tools for refinement and finalization of + prokaryotic genomes assemblies using the bias of GC Skew to identify + assembly errors and organizes the contigs/scaffolds with genomes + references.""" + + homepage = "http://gfinisher.sourceforge.net" + url = "https://sourceforge.net/projects/gfinisher/files/GenomeFinisher_1.4.zip" + + version('1.4', 'bd9bbca656fe15ecbe615c4732714bc7') + + depends_on('java@8:', type='run') + + def install(self, spec, prefix): + mkdirp(prefix.bin) + jar_file = 'GenomeFinisher.jar' + install(jar_file, prefix.bin) + install_tree('lib', prefix.lib) + + # Set up a helper script to call java on the jar file, + # explicitly codes the path for java and the jar file. + script_sh = join_path(os.path.dirname(__file__), "genomefinisher.sh") + script = join_path(prefix.bin, "genomefinisher") + copyfile(script_sh, script) + set_executable(script) + + # Munge the helper script to explicitly point to java and the jar file + # jar file. + java = join_path(self.spec['jdk'].prefix, 'bin', 'java') + kwargs = {'ignore_absent': False, 'backup': False, 'string': False} + filter_file('^java', java, script, **kwargs) + filter_file(jar_file, join_path(prefix.bin, jar_file), + script, **kwargs) -- cgit v1.2.3-70-g09d2 From ebca867496366dd6ee0011500ac54eb446026297 Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Thu, 3 May 2018 17:46:15 -0400 Subject: py-cython: update (#8005) --- var/spack/repos/builtin/packages/py-cython/package.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-cython/package.py b/var/spack/repos/builtin/packages/py-cython/package.py index 7bd7b462b7..57cdf1cae9 100644 --- a/var/spack/repos/builtin/packages/py-cython/package.py +++ b/var/spack/repos/builtin/packages/py-cython/package.py @@ -38,3 +38,8 @@ class PyCython(PythonPackage): # These versions contain illegal Python3 code... version('0.22', '1ae25add4ef7b63ee9b4af697300d6b6') version('0.21.2', 'd21adb870c75680dc857cd05d41046a4') + + @property + def command(self): + """Returns the Cython command""" + return Executable(self.prefix.bin.cython) -- cgit v1.2.3-70-g09d2 From e93c880a79f5ddc47b61b912ff0cf4d67af8c9cc Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Thu, 3 May 2018 17:50:55 -0400 Subject: py-pyside: update (#8002) --- var/spack/repos/builtin/packages/py-pyside/package.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pyside/package.py b/var/spack/repos/builtin/packages/py-pyside/package.py index b38550e73f..0d7fae8271 100644 --- a/var/spack/repos/builtin/packages/py-pyside/package.py +++ b/var/spack/repos/builtin/packages/py-pyside/package.py @@ -31,7 +31,21 @@ class PyPyside(PythonPackage): homepage = "https://pypi.python.org/pypi/pyside" url = "https://pypi.io/packages/source/P/PySide/PySide-1.2.2.tar.gz" + # More recent versions of PySide2 (for Qt5) have been taken under + # the offical Qt umbrella. For more information, see: + # http://wiki.qt.io/Qt_for_Python_Development_Getting_Started + + # Version 1.2.4 claims to not work with Python 3.5, mostly + # because it hasn't been tested. Otherwise, it's the same as v1.2.3 + # https://github.com/PySide/pyside-setup/issues/58 + # Meanwhile, developers have moved onto pyside2 (for Qt5), + # and show little interest in certifying PySide 1.2.4 for Python. version('1.2.4', '3cb7174c13bd45e3e8f77638926cb8c0') # rpath problems + + # This is not available from pypi + # version('1.2.3', 'fa5d5438b045ede36104bba25a6ccc10') + + # v1.2.2 does not work with Python3 version('1.2.2', 'c45bc400c8a86d6b35f34c29e379e44d', preferred=True) depends_on('cmake', type='build') -- cgit v1.2.3-70-g09d2 From bf896c5a4350de0904c6c0ba3c48185696fc5d9d Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Thu, 3 May 2018 17:52:46 -0400 Subject: py-scipy: update (#8000) --- var/spack/repos/builtin/packages/py-scipy/package.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-scipy/package.py b/var/spack/repos/builtin/packages/py-scipy/package.py index a26df20d51..cbe23fe69d 100644 --- a/var/spack/repos/builtin/packages/py-scipy/package.py +++ b/var/spack/repos/builtin/packages/py-scipy/package.py @@ -62,6 +62,7 @@ class PyScipy(PythonPackage): depends_on('python@2.6:2.8,3.2:') depends_on('py-setuptools', type='build') + depends_on('py-nose', type='test') depends_on('py-numpy@1.7.1:+blas+lapack', type=('build', 'run')) # NOTE: scipy picks up Blas/Lapack from numpy, see @@ -69,10 +70,6 @@ class PyScipy(PythonPackage): depends_on('blas') depends_on('lapack') - # Tests require: - # TODO: Add a 'test' deptype - # depends_on('py-nose', type='test') - def build_args(self, spec, prefix): args = [] -- cgit v1.2.3-70-g09d2 From 5656529974df48f91bb1919806cfd2ea0653f6aa Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Thu, 3 May 2018 17:53:19 -0400 Subject: gmp: update (#7999) --- var/spack/repos/builtin/packages/gmp/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gmp/package.py b/var/spack/repos/builtin/packages/gmp/package.py index bfafabaa0b..df0b3865d7 100644 --- a/var/spack/repos/builtin/packages/gmp/package.py +++ b/var/spack/repos/builtin/packages/gmp/package.py @@ -38,6 +38,8 @@ class Gmp(AutotoolsPackage): version('6.0.0a', 'b7ff2d88cae7f8085bd5006096eed470') version('6.0.0', '6ef5869ae735db9995619135bd856b84') version('5.1.3', 'a082867cbca5e898371a97bb27b31fea') + # Old version needed for a binary package in ghc-bootstrap + version('4.3.2', 'dd60683d7057917e34630b4a787932e8') depends_on('autoconf', type='build') depends_on('automake', type='build') -- cgit v1.2.3-70-g09d2 From 7542fbfefd7b95c0e304e70452473c4ccdcd2f44 Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Thu, 3 May 2018 17:58:40 -0400 Subject: py-yamlreader: new package (#7997) --- .../builtin/packages/py-yamlreader/package.py | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-yamlreader/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-yamlreader/package.py b/var/spack/repos/builtin/packages/py-yamlreader/package.py new file mode 100644 index 0000000000..1ec242856b --- /dev/null +++ b/var/spack/repos/builtin/packages/py-yamlreader/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyYamlreader(PythonPackage): + """Yamlreader merges YAML data from a directory, a list of files or a + file glob.""" + + homepage = "http://pyyaml.org/wiki/PyYAML" + url = "https://pypi.io/packages/source/y/yamlreader/yamlreader-3.0.4.tar.gz" + + version('3.0.4', '542179b5b5bedae941245b8b673119db') + + depends_on('py-setuptools', type=('build', 'run')) + depends_on('py-pyyaml', type=('build', 'run')) + depends_on('py-six', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 28adaa4e55de7dda5d5d0b6bd353be7e6119fc74 Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Thu, 3 May 2018 18:00:21 -0400 Subject: Everytrace: update (#7995) --- var/spack/repos/builtin/packages/everytrace/package.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/everytrace/package.py b/var/spack/repos/builtin/packages/everytrace/package.py index 0724e4a97c..e0cb9630ff 100644 --- a/var/spack/repos/builtin/packages/everytrace/package.py +++ b/var/spack/repos/builtin/packages/everytrace/package.py @@ -29,15 +29,18 @@ class Everytrace(CMakePackage): """Get stack trace EVERY time a program exits.""" homepage = "https://github.com/citibeth/everytrace" - url = "https://github.com/citibeth/everytrace/tarball/0.2.0" + url = "https://github.com/citibeth/everytrace/archive/0.2.2.tar.gz" - version('0.2.0', '2af0e5b6255064d5191accebaa70d222') + maintainers = ['citibeth'] + + version('0.2.2', 'dd60b8bf68cbf3dc2be305a040f2fe3e') version('develop', git='https://github.com/citibeth/everytrace.git', branch='develop') variant('mpi', default=True, description='Enables MPI parallelism') variant('fortran', default=True, description='Enable use with Fortran programs') + variant('cxx', default=True, description='Enable C++ Exception-based features') depends_on('mpi', when='+mpi') @@ -45,7 +48,8 @@ class Everytrace(CMakePackage): spec = self.spec return [ '-DUSE_MPI=%s' % ('YES' if '+mpi' in spec else 'NO'), - '-DUSE_FORTRAN=%s' % ('YES' if '+fortran' in spec else 'NO')] + '-DUSE_FORTRAN=%s' % ('YES' if '+fortran' in spec else 'NO'), + '-DUSE_CXX=%s' % ('YES' if '+cxx' in spec else 'NO')] def setup_environment(self, spack_env, run_env): run_env.prepend_path('PATH', join_path(self.prefix, 'bin')) -- cgit v1.2.3-70-g09d2 From ffcf3ef2c80bfe9cb3036c4570a8ca715fdbda85 Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Thu, 3 May 2018 18:02:20 -0400 Subject: pfunit: update (#7994) --- var/spack/repos/builtin/packages/pfunit/package.py | 27 ++++++++++++---------- 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pfunit/package.py b/var/spack/repos/builtin/packages/pfunit/package.py index f71a8193d1..e24b1c27d9 100644 --- a/var/spack/repos/builtin/packages/pfunit/package.py +++ b/var/spack/repos/builtin/packages/pfunit/package.py @@ -32,18 +32,19 @@ class Pfunit(CMakePackage): serial and MPI-parallel software written in Fortran.""" homepage = "http://pfunit.sourceforge.net/" - url = "https://downloads.sourceforge.net/project/pfunit/Source/pFUnit.tar.gz" - giturl = "https://git.code.sf.net/p/pfunit/code" + url = "https://github.com/Goddard-Fortran-Ecosystem/pFUnit/archive/3.2.9.tar.gz" - version('3.2.9', git=giturl, - commit='3c1d47f594a7e756f21be59074cb730d1a1e9a79') - version('develop', git=giturl, branch='master') + maintainers = ['citibeth'] + version('3.2.9', 'e13d8362284b13b7c863e2fe769a9d5c') + + variant('shared', default=True, + description='Build shared library in addition to static') variant('mpi', default=False, description='Enable MPI') variant('openmp', default=False, description='Enable OpenMP') + variant('docs', default=False, description='Build docs') - depends_on('python', type=('build', 'run')) - depends_on('py-unittest2', type=('run')) + depends_on('python@2.7:', type=('build', 'run')) # python3 too! depends_on('mpi', when='+mpi') def patch(self): @@ -54,16 +55,18 @@ class Pfunit(CMakePackage): def cmake_args(self): spec = self.spec - args = ['-DCMAKE_Fortran_MODULE_DIRECTORY=%s' % spec.prefix.include] + args = [ + '-DPYTHON_EXECUTABLE=%s' % spec['python'].command, + '-DBUILD_SHARED=%s' % ('YES' if '+shared' in spec else 'NO'), + '-DCMAKE_Fortran_MODULE_DIRECTORY=%s' % spec.prefix.include, + '-DBUILD_DOCS=%s' % ('YES' if '+docs' in spec else 'NO'), + '-DOPENMP=%s' % ('YES' if '+openmp' in spec else 'NO')] + if spec.satisfies('+mpi'): args.extend(['-DMPI=YES', '-DMPI_USE_MPIEXEC=YES', '-DMPI_Fortran_COMPILER=%s' % spec['mpi'].mpifc]) else: args.append('-DMPI=NO') - if spec.satisfies('+openmp'): - args.append('-DOPENMP=YES') - else: - args.append('-DOPENMP=NO') return args def check(self): -- cgit v1.2.3-70-g09d2 From 60c1e41e4c343a053e5084312c3b7e86b526a597 Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Thu, 3 May 2018 20:20:14 -0400 Subject: py-bsddb3: update (#8006) * py-bsddb3: update * Change py-setuptools to build dependency --- var/spack/repos/builtin/packages/py-bsddb3/package.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-bsddb3/package.py b/var/spack/repos/builtin/packages/py-bsddb3/package.py index c4ad7bf5ff..ff2db9aeba 100644 --- a/var/spack/repos/builtin/packages/py-bsddb3/package.py +++ b/var/spack/repos/builtin/packages/py-bsddb3/package.py @@ -37,4 +37,8 @@ class PyBsddb3(PythonPackage): version('6.2.5', '610267c189964c905a931990e1ba438c') depends_on('python@2.6:') - depends_on('py-setuptools') + depends_on('py-setuptools', type='build') + depends_on('berkeley-db') + + # For testing... see here for an example that uses BerkeleyDB + # http://code.activestate.com/recipes/189060-using-berkeley-db-database/ -- cgit v1.2.3-70-g09d2 From d52eb8b34def086464ae857e11e4c3a25a7cef75 Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Thu, 3 May 2018 23:53:41 -0400 Subject: py-numpy: update (#8003) * py-numpy: update * Better constrain when can / cannot parallel build. * Update SciPy parallel logic to be specific to Python 3.5+, same as in Numpy. --- var/spack/repos/builtin/packages/py-numpy/package.py | 8 ++++++-- var/spack/repos/builtin/packages/py-scipy/package.py | 5 +++-- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-numpy/package.py b/var/spack/repos/builtin/packages/py-numpy/package.py index 9fd0fdf38b..42cc6be231 100644 --- a/var/spack/repos/builtin/packages/py-numpy/package.py +++ b/var/spack/repos/builtin/packages/py-numpy/package.py @@ -149,9 +149,13 @@ class PyNumpy(PythonPackage): def build_args(self, spec, prefix): args = [] - # From NumPy 1.10.0 on it's possible to do a parallel build + # From NumPy 1.10.0 on it's possible to do a parallel build. if self.version >= Version('1.10.0'): - args = ['-j', str(make_jobs)] + # But Parallel build in Python 3.5+ is broken. See: + # https://github.com/spack/spack/issues/7927 + # https://github.com/scipy/scipy/issues/7112 + if spec['python'].version < Version('3.5'): + args = ['-j', str(make_jobs)] return args diff --git a/var/spack/repos/builtin/packages/py-scipy/package.py b/var/spack/repos/builtin/packages/py-scipy/package.py index cbe23fe69d..b26ac618e7 100644 --- a/var/spack/repos/builtin/packages/py-scipy/package.py +++ b/var/spack/repos/builtin/packages/py-scipy/package.py @@ -74,9 +74,10 @@ class PyScipy(PythonPackage): args = [] # Build in parallel - # Known problems with Python 3 + # Known problems with Python 3.5+ + # https://github.com/spack/spack/issues/7927 # https://github.com/scipy/scipy/issues/7112 - if not spec.satisfies('^python@3:'): + if not spec.satisfies('^python@3.5:'): args.extend(['-j', str(make_jobs)]) return args -- cgit v1.2.3-70-g09d2 From ea4829880f69e28c5f7499859f25a591f535287e Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Thu, 3 May 2018 23:54:00 -0400 Subject: pism: new package (#8010) * pism: new package * Implement code review * Remove pointless docstring5 * Fixed missing trailing quote --- var/spack/repos/builtin/packages/pism/package.py | 171 +++++++++++++++++++++++ 1 file changed, 171 insertions(+) create mode 100644 var/spack/repos/builtin/packages/pism/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pism/package.py b/var/spack/repos/builtin/packages/pism/package.py new file mode 100644 index 0000000000..fd9f2a30fb --- /dev/null +++ b/var/spack/repos/builtin/packages/pism/package.py @@ -0,0 +1,171 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Pism(CMakePackage): + """Parallel Ice Sheet Model""" + + homepage = "http://pism-docs.org/wiki/doku.php:=" + url = "https://github.com/pism/pism/archive/v0.7.3.tar.gz" + + maintainers = ['citibeth'] + + version('0.7.3', '7cfb034100d99d5c313c4ac06b7f17b6') + + version('0.7.x', git='https://github.com/pism/pism.git', + branch='stable0.7') + + version('icebin', git='https://github.com/pism/pism.git', + branch='efischer/dev') + + version('develop', git='https://github.com/pism/pism.git', + branch='dev') + + variant('extra', default=False, + description='Build extra executables (testing/verification)') + variant('shared', default=True, + description='Build shared Pism libraries') + variant('python', default=False, + description='Build python bindings') + variant('icebin', default=False, + description='Build classes needed by IceBin') + variant('proj', default=True, + description='Use Proj.4 to compute cell areas, ' + 'longitudes, and latitudes.') + variant('parallel-netcdf4', default=False, + description='Enables parallel NetCDF-4 I/O.') + variant('parallel-netcdf3', default=False, + description='Enables parallel NetCDF-3 I/O using PnetCDF.') + variant('parallel-hdf5', default=False, + description='Enables parallel HDF5 I/O.') + # variant('tao', default=False, + # description='Use TAO in inverse solvers.') + + description = 'Build PISM documentation (requires LaTeX and Doxygen)' + variant('doc', default=False, description=description) + + variant('examples', default=False, + description='Install examples directory') + + description = 'Report errors through Everytrace (requires Everytrace)' + variant('everytrace', default=False, description=description) + + # CMake build options not transferred to Spack variants + # (except from CMakeLists.txt) + # + # option (Pism_TEST_USING_VALGRIND "Add extra regression tests + # using valgrind" OFF) + # mark_as_advanced (Pism_TEST_USING_VALGRIND) + # + # option (Pism_ADD_FPIC "Add -fPIC to C++ compiler flags + # (CMAKE_CXX_FLAGS). Try turning it off if it does not work." ON) + # option (Pism_LINK_STATICALLY + # "Set CMake flags to try to ensure that everything is + # linked statically") + # option (Pism_LOOK_FOR_LIBRARIES + # "Specifies whether PISM should look for libraries. (Disable + # this on Crays.)" ON) + # option (Pism_USE_TR1 + # "Use the std::tr1 namespace to access shared pointer + # definitions. Disable to get shared pointers from the std + # namespace (might be needed with some compilers)." ON) + # option (Pism_USE_TAO "Use TAO in inverse solvers." OFF) + + depends_on('fftw') + depends_on('gsl') + depends_on('mpi') + depends_on('netcdf') # Only the C interface is used, no netcdf-cxx4 + depends_on('petsc') + depends_on('udunits2') + depends_on('proj') + depends_on('everytrace', when='+everytrace') + + extends('python', when='+python') + depends_on('python@2.7:2.8', when='+python') + depends_on('py-matplotlib', when='+python') + depends_on('py-numpy', when='+python') + + def cmake_args(self): + spec = self.spec + + return [ + '-DCMAKE_C_COMPILER=%s' % spec['mpi'].mpicc, + '-DCMAKE_CXX_COMPILER=%s' % spec['mpi'].mpicxx, + # Fortran not needed for PISM... + # '-DCMAKE_Fortran_COMPILER=%s' % spec['mpi'].mpifc, + '-DPism_BUILD_EXTRA_EXECS=%s' % + ('YES' if '+extra' in spec else 'NO'), + '-DBUILD_SHARED_LIBS=%s' % + ('YES' if '+shared' in spec else 'NO'), + '-DPism_BUILD_PYTHON_BINDINGS=%s' % + ('YES' if '+python' in spec else 'NO'), + '-DPism_BUILD_ICEBIN=%s' % + ('YES' if '+icebin' in spec else 'NO'), + '-DPism_USE_PROJ4=%s' % + ('YES' if '+proj' in spec else 'NO'), + '-DPism_USE_PARALLEL_NETCDF4=%s' % + ('YES' if '+parallel-netcdf4' in spec else 'NO'), + '-DPism_USE_PNETCDF=%s' % + ('YES' if '+parallel-netcdf3' in spec else 'NO'), + '-DPism_USE_PARALLEL_HDF5=%s' % + ('YES' if '+parallel-hdf5' in spec else 'NO'), + '-DPism_BUILD_PDFS=%s' % + ('YES' if '+doc' in spec else 'NO'), + '-DPism_INSTALL_EXAMPLES=%s' % + ('YES' if '+examples' in spec else 'NO'), + '-DPism_USE_EVERYTRACE=%s' % + ('YES' if '+everytrace' in spec else 'NO')] + + def setup_environment(self, spack_env, env): + env.set('PISM_PREFIX', self.prefix) + env.set('PISM_BIN', self.prefix.bin) + + +# From email correspondence with Constantine Khroulev: +# +# > Do you have handy a table of which versions of PETSc are required +# > for which versions of PISM? +# +# We don't. The installation manual [1] specifies the minimum PETSc +# version for the latest "stable" release (currently PETSc 3.3). The +# stable PISM version should support all PETSc versions starting from the +# one specified in the manual and up to the latest PETSc release. +# +# The current development PISM version should be built with the latest +# PETSc release at the time (the "maint" branch of PETSc). +# +# Thanks to Git it is relatively easy to find this info, though: +# +# | PISM version | PETSc version | +# |--------------+---------------| +# | 0.7 | 3.3 and later | +# | 0.6 | 3.3 | +# | new_bc | 3.4.4 | +# | 0.5 | 3.2 | +# | 0.4 | 3.1 | +# | 0.3 | 2.3.3 to 3.1 | +# | 0.2 | 2.3.3 to 3.0 | +# | 0.1 | 2.3.3-p2 | -- cgit v1.2.3-70-g09d2 From 0812fd1635911d3600e27dc9000ea1050516b125 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Fri, 4 May 2018 11:54:45 +0800 Subject: Bump r-rcpp versions. (#8016) --- var/spack/repos/builtin/packages/r-rcpp/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-rcpp/package.py b/var/spack/repos/builtin/packages/r-rcpp/package.py index 88b9b709fb..4edc6e8709 100644 --- a/var/spack/repos/builtin/packages/r-rcpp/package.py +++ b/var/spack/repos/builtin/packages/r-rcpp/package.py @@ -40,6 +40,8 @@ class RRcpp(RPackage): url = "https://cran.rstudio.com/src/contrib/Rcpp_0.12.13.tar.gz" list_url = "https://cran.rstudio.com/src/contrib/Archive/Rcpp" + version('0.12.16', 'ab5107766c63d66065ed1a92a4cab1b7') + version('0.12.15', 'bebac0782862c15c2944764343e55582') version('0.12.14', '89a3dbad0aa3e345b9d0b862fa1fc56a') version('0.12.13', '5186d119132bfe07f66da74c50b190a4') version('0.12.12', '97b36a3b567e3438067c4a7d0075fd90') -- cgit v1.2.3-70-g09d2 From 593ad23a9f4f51e3ff4231a894ba1998e212fdc4 Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Thu, 3 May 2018 23:55:31 -0400 Subject: gdal: update (#8008) * gdal: update * Remove unneeded depends(python) --- var/spack/repos/builtin/packages/gdal/package.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gdal/package.py b/var/spack/repos/builtin/packages/gdal/package.py index b62ea01af1..3a22739a81 100644 --- a/var/spack/repos/builtin/packages/gdal/package.py +++ b/var/spack/repos/builtin/packages/gdal/package.py @@ -44,16 +44,17 @@ class Gdal(AutotoolsPackage): version('2.1.2', 'ae85b78888514c75e813d658cac9478e') version('2.0.2', '940208e737c87d31a90eaae43d0efd65') - extends('python') + extends('python', when='+python') variant('hdf5', default=False, description='Enable HDF5 support') variant('hdf', default=False, description='Enable HDF4 support') variant('openjpeg', default=False, description='Enable JPEG2000 support') variant('geos', default=False, description='Enable GEOS support') variant('kea', default=False, description='Enable KEA support') - variant('netcdf', default=False, description='Enable netcdf support') + variant('netcdf', default=False, description='Enable NetCDF support') + variant('python', default=False, description='Enable Python support') - depends_on('swig') + depends_on('swig', when='+python') depends_on("hdf5", when='+hdf5') depends_on("hdf", when='+hdf') depends_on("openjpeg", when='+openjpeg') @@ -74,9 +75,13 @@ class Gdal(AutotoolsPackage): args = [] args.append("--with-liblzma=yes") args.append("--with-zlib=%s" % spec['zlib'].prefix) - args.append("--with-python=%s" % spec['python'].command.path) args.append("--without-libtool") + if '+python' in spec: + args.append("--with-python=%s" % spec['python'].command.path) + else: + args.append("--with-python=no") + if '+geos' in spec: args.append('--with-geos=yes') if '+hdf' in spec: -- cgit v1.2.3-70-g09d2 From 0570b075d4793f0e137f70d9ff741c95bd6d9053 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Fri, 4 May 2018 16:27:54 +0200 Subject: openmpi: don't build static libraries if slurm is activated (#8021) According to this comment: https://github.com/open-mpi/ompi/issues/4338#issuecomment-383982008 on an OpenMPI issue, using `--enable-static` silently disable slurm support. --- var/spack/repos/builtin/packages/openmpi/package.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index abd1fdde6e..9731558eb0 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -336,8 +336,16 @@ class Openmpi(AutotoolsPackage): spec = self.spec config_args = [ '--enable-shared', - '--enable-static' ] + + # According to this comment on github: + # + # https://github.com/open-mpi/ompi/issues/4338#issuecomment-383982008 + # + # adding --enable-static silently disables slurm support via pmi/pmi2 + if not spec.satisfies('schedulers=slurm'): + config_args.append('--enable-static') + if spec.satisfies('@2.0:'): # for Open-MPI 2.0:, C++ bindings are disabled by default. config_args.extend(['--enable-mpi-cxx']) -- cgit v1.2.3-70-g09d2 From 51c2dbb707cee378c760672a95785fdb0513a5e5 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Fri, 4 May 2018 23:56:04 +0800 Subject: Hic-Pro: fix a typo and replace hard-coded version. (#8022) * Fix a typo and replace hard-coded version. * version -> self.version. --- var/spack/repos/builtin/packages/hic-pro/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hic-pro/package.py b/var/spack/repos/builtin/packages/hic-pro/package.py index 11d4c4db86..d79b19e16b 100644 --- a/var/spack/repos/builtin/packages/hic-pro/package.py +++ b/var/spack/repos/builtin/packages/hic-pro/package.py @@ -65,10 +65,10 @@ class HicPro(MakefilePackage): make('readstrimming') make('iced') - def install(sefl, spec, prefix): + def install(self, spec, prefix): # Patch INSTALLPATH in config-system.txt config = FileFilter('config-system.txt') - config.filter('/HiC-Pro_2.10.0', '') + config.filter('/HiC-Pro_%s' % self.version, '') # Install install('config-hicpro.txt', prefix) install('config-install.txt', prefix) -- cgit v1.2.3-70-g09d2 From 490cde87dd56fe106e89640aa6af494a375a1a01 Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Fri, 4 May 2018 17:27:14 -0400 Subject: py-more-itertools: new package (#8004) * py-more-itertools: new package * code review --- .../builtin/packages/py-more-itertools/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-more-itertools/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-more-itertools/package.py b/var/spack/repos/builtin/packages/py-more-itertools/package.py new file mode 100644 index 0000000000..736b908600 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-more-itertools/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyMoreItertools(PythonPackage): + """Additions to the standard Python itertools package.""" + + homepage = "https://github.com/erikrose/more-itertools" + url = "https://pypi.io/packages/source/m/more-itertools/more-itertools-4.1.0.tar.gz" + + version('4.1.0', '246f46686d95879fbad37855c115dc52') + version('2.2', 'b8d328a33f966bf40bb829bcf8da35ce') + + depends_on('py-setuptools', type='build') + depends_on('py-six@1.0.0:1.999', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From c53541e448729119a8e71dd7a52b3e7f3ffecc45 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Sat, 5 May 2018 05:27:54 +0800 Subject: Bump samtools, hstlib and bcftools to version 1.8. (#8020) * Bump samtools and hstlib to version 1.8. * rm .bak. * Bump bcftools to 1.8. * bcftools@1.8 depends on libzip. --- var/spack/repos/builtin/packages/bcftools/package.py | 4 ++++ var/spack/repos/builtin/packages/htslib/package.py | 1 + var/spack/repos/builtin/packages/samtools/package.py | 2 ++ 3 files changed, 7 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bcftools/package.py b/var/spack/repos/builtin/packages/bcftools/package.py index 8b57c0e1dc..2e2a33f9aa 100644 --- a/var/spack/repos/builtin/packages/bcftools/package.py +++ b/var/spack/repos/builtin/packages/bcftools/package.py @@ -34,12 +34,16 @@ class Bcftools(AutotoolsPackage): homepage = "http://samtools.github.io/bcftools/" url = "https://github.com/samtools/bcftools/releases/download/1.3.1/bcftools-1.3.1.tar.bz2" + version('1.8', 'ba6c2fb7eb6dcb208f00ab8b22df475c') version('1.7', 'c972db68d17af9da3a18963f4e5aeca8') version('1.6', 'c4dba1e8cb55db0f94b4c47724b4f9fa') version('1.4', '50ccf0a073bd70e99cdb3c8be830416e') version('1.3.1', '575001e9fca37cab0c7a7287ad4b1cdb') version('1.2', '8044bed8fce62f7072fc6835420f0906') + depends_on('libzip', when='@1.8:') + + depends_on('htslib@1.8', when='@1.8') depends_on('htslib@1.7', when='@1.7') depends_on('htslib@1.6', when='@1.6') depends_on('htslib@1.4', when='@1.4') diff --git a/var/spack/repos/builtin/packages/htslib/package.py b/var/spack/repos/builtin/packages/htslib/package.py index d2818bafd3..ba9fcc5edb 100644 --- a/var/spack/repos/builtin/packages/htslib/package.py +++ b/var/spack/repos/builtin/packages/htslib/package.py @@ -30,6 +30,7 @@ class Htslib(AutotoolsPackage): homepage = "https://github.com/samtools/htslib" + version('1.8', '54e9b3a04251fa59b1878f6b546b5c79') version('1.7', 'd3cc7e080a9a8c4161d8f62b56d3b98d') version('1.6', 'd6fd14e208aca7e08cbe9072233d0af9') version('1.4', '2a22ff382654c033c40e4ec3ea880050') diff --git a/var/spack/repos/builtin/packages/samtools/package.py b/var/spack/repos/builtin/packages/samtools/package.py index 7e912e832c..a442229e8a 100644 --- a/var/spack/repos/builtin/packages/samtools/package.py +++ b/var/spack/repos/builtin/packages/samtools/package.py @@ -33,6 +33,7 @@ class Samtools(Package): homepage = "www.htslib.org" url = "https://github.com/samtools/samtools/releases/download/1.3.1/samtools-1.3.1.tar.bz2" + version('1.8', 'c6e981c92ca00a44656a708c4b52aba3') version('1.7', '2240175242b5183bfa6baf1483f68023') version('1.6', 'b756f05fd5d1a7042074417edb8c9aea') version('1.4', '8cbd7d2a0ec16d834babcd6c6d85d691') @@ -41,6 +42,7 @@ class Samtools(Package): depends_on('ncurses') # htslib became standalone @1.3.1, must use corresponding version + depends_on('htslib@1.8', when='@1.8') depends_on('htslib@1.7', when='@1.7') depends_on('htslib@1.6', when='@1.6') depends_on('htslib@1.4', when='@1.4') -- cgit v1.2.3-70-g09d2 From cd80c7cf1836a6c6127d3f65462fd29bb30b4aef Mon Sep 17 00:00:00 2001 From: Jungwon Kim Date: Fri, 4 May 2018 19:51:37 -0400 Subject: a new package: papyrus. (#8023) * a new package: papyrus. * removed the empty cmake_args * changed md5 checksum for v1.0.0 * make a long line short * one long line url --- .../repos/builtin/packages/papyrus/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/papyrus/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/papyrus/package.py b/var/spack/repos/builtin/packages/papyrus/package.py new file mode 100644 index 0000000000..bfe3807fab --- /dev/null +++ b/var/spack/repos/builtin/packages/papyrus/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Papyrus(CMakePackage): + """Parallel Aggregate Persistent Storage""" + + homepage = "https://code.ornl.gov/eck/papyrus" + url = "https://code.ornl.gov/eck/papyrus/repository/archive.tar.bz2?ref=v1.0.0" + + version('develop', branch='master', + git='https://code.ornl.gov/eck/papyrus.git') + version('1.0.0', 'fe0fca073c3604110f0507f375d71e64') + + depends_on('mpi') -- cgit v1.2.3-70-g09d2 From 4fe6d9aceea5fefd8cc9779228c3a0671fed79d5 Mon Sep 17 00:00:00 2001 From: sknigh Date: Fri, 4 May 2018 16:52:03 -0700 Subject: Added GCC 8.1.0 (#8026) Built once on Centos 7 w/ external GCC 4.8.5 compiler --- var/spack/repos/builtin/packages/gcc/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py index 3620ebabce..57975d7348 100644 --- a/var/spack/repos/builtin/packages/gcc/package.py +++ b/var/spack/repos/builtin/packages/gcc/package.py @@ -41,6 +41,7 @@ class Gcc(AutotoolsPackage): list_url = 'http://ftp.gnu.org/gnu/gcc/' list_depth = 1 + version('8.1.0', '65f7c65818dc540b3437605026d329fc') version('7.3.0', 'be2da21680f27624f3a87055c4ba5af2') version('7.2.0', 'ff370482573133a7fcdd96cd2f552292') version('7.1.0', '6bf56a2bca9dac9dbbf8e8d1036964a8') -- cgit v1.2.3-70-g09d2 From dfe0752807783099d9bb7c5ae7d21a9b1ed155fc Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Sat, 5 May 2018 11:11:26 +0800 Subject: Bump pysam to 0.14.1. (#7988) * py-pysam requires curl. * py-pysam conflicts with htslib@1.7. * Bump py-pysam versions. * Add more dependencies. --- var/spack/repos/builtin/packages/py-pysam/package.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pysam/package.py b/var/spack/repos/builtin/packages/py-pysam/package.py index 8b98f5a4e8..945855947b 100644 --- a/var/spack/repos/builtin/packages/py-pysam/package.py +++ b/var/spack/repos/builtin/packages/py-pysam/package.py @@ -30,12 +30,18 @@ class PyPysam(PythonPackage): sets.""" homepage = "https://pypi.python.org/pypi/pysam" - url = "https://pypi.io/packages/source/p/pysam/pysam-0.11.2.2.tar.gz" + url = "https://github.com/pysam-developers/pysam/archive/v0.14.1.tar.gz" + version('0.14.1', 'ad88fa5bbcc0fdf4a936734691d9c9d1') version('0.13', 'a9b502dd1a7e6403e35e6972211688a2') version('0.11.2.2', '56230cd5f55b503845915b76c22d620a') version('0.7.7', 'eaf9f37cbccc5e2708754d045909c1a0') depends_on('py-setuptools', type='build') depends_on('py-cython@0.21:', type='build') + depends_on('curl') depends_on('bcftools') + depends_on('htslib') + depends_on('samtools') + + depends_on('htslib@:1.6', when='@:0.13') -- cgit v1.2.3-70-g09d2 From e499a4d071c41baaad84f6d1bb9416d4815764c6 Mon Sep 17 00:00:00 2001 From: 健美猫 Date: Sun, 6 May 2018 06:16:48 +0800 Subject: A new library: libshm. (#8028) --- var/spack/repos/builtin/packages/libshm/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/libshm/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libshm/package.py b/var/spack/repos/builtin/packages/libshm/package.py new file mode 100644 index 0000000000..99b415b313 --- /dev/null +++ b/var/spack/repos/builtin/packages/libshm/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Libshm(Package): + """Libshm is a header library + making an easy C++11 access to a shared memory.""" + + homepage = "https://github.com/afeldman/libshm" + url = "https://github.com/afeldman/libshm.git" + + version('master', git='https://github.com/afeldman/libshm.git') + + def install(self, spec, prefix): + install_tree('include', prefix.include) -- cgit v1.2.3-70-g09d2 From f3c9b98bbd8fa0ae2d2fd84965341a1eed94b5fc Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Sat, 5 May 2018 18:33:44 -0400 Subject: py-udunits: New package (#7998) * py-udunits: update * Use standard py-netcdf4 * Remove unnecssary import? * Suggested simplifications * flake8 --- .../repos/builtin/packages/py-udunits/package.py | 69 ++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-udunits/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-udunits/package.py b/var/spack/repos/builtin/packages/py-udunits/package.py new file mode 100644 index 0000000000..b585fcbfd9 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-udunits/package.py @@ -0,0 +1,69 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import os + + +class PyUdunits(PythonPackage): + """The MetOffice cf_units Python interface to the UDUNITS-2 Library.""" + homepage = "https://github.com/SciTools/cf_units" + url = "https://github.com/SciTools/cf_units/archive/v1.1.3.tar.gz" + + version('1.1.3', '61ea2239c87b4c1d5d30147800a9e750') + + maintainers = ['citibeth'] + + depends_on('py-setuptools', type='build') + depends_on('py-six', type=('build', 'run')) + depends_on('py-netcdf4', type=('build', 'run')) + depends_on('udunits2') + + # See: https://github.com/SciTools/cf_units/blob/master/cf_units/etc/site.cfg.template + # udunits2_path = /path/to/libudunits2.so + # udunits2_xml_path = /path/to/udunits2.xml + site_cfg_template = """[System] +udunits2_path = %s +udunits2_xml_path = %s +""" + + @run_after('install') + def configure_template(self): + spec = self.spec + + cfg_templates = find(spec.prefix, ['site.cfg.template']) + if len(cfg_templates) != 1: + tty.die( + 'Found %d instances of site.cfg.template, wanted 1' % + len(cfg_templates)) + cfg_template = cfg_templates[0] + + cfg = os.path.join(os.path.split(cfg_template)[0], 'site.cfg') + + udunits2_xml_path = os.path.join( + spec['udunits2'].prefix, 'share', 'udunits', 'udunits2.xml') + + with open(cfg, 'w') as fout: + fout.write(self.site_cfg_template % + (spec['udunits2'].libs, udunits2_xml_path)) -- cgit v1.2.3-70-g09d2 From b83be5f2d4c84b17f0761388c3cedb5f2d4926f7 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sun, 6 May 2018 09:28:33 -0500 Subject: macOS-specific patch no longer applies to GCC 8 (#8029) --- var/spack/repos/builtin/packages/gcc/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py index 57975d7348..acc7eb36fb 100644 --- a/var/spack/repos/builtin/packages/gcc/package.py +++ b/var/spack/repos/builtin/packages/gcc/package.py @@ -160,7 +160,7 @@ class Gcc(AutotoolsPackage): if macOS_version() >= Version('10.13'): patch('darwin/apfs.patch', when='@6.1:6.4,7.1:7.3') patch('darwin/gcc-7.1.0-headerpad.patch', when='@5:') - patch('darwin/gcc-6.1.0-jit.patch', when='@5:') + patch('darwin/gcc-6.1.0-jit.patch', when='@5:7') patch('darwin/gcc-4.9.patch1', when='@4.9.0:4.9.3') patch('darwin/gcc-4.9.patch2', when='@4.9.0:4.9.3') -- cgit v1.2.3-70-g09d2 From 17ce5fd91283cb0cc05376083e5f6b2db78805b1 Mon Sep 17 00:00:00 2001 From: healther Date: Sun, 6 May 2018 16:32:06 +0200 Subject: Add package wireshark and dependencies (#8024) * add wireshark Change-Id: I1ef674ff286db2e06baaf9fca65982d1145cfa79 * fix qt4 build Change-Id: Ieb9989b9fec1a0e02388197f971ee66b591d45c5 * remove commented lines Change-Id: Ia67bfaf1beba06dd710cee56aec06bc36b293d34 * flake8 fix Change-Id: Ica1b2cce2be2faca82a4177c3cdc3a0bb005c031 * remove clutter Change-Id: I6061fe56a88f8c7b7e03fdce5e3eae04036ad2d8 * fix dependencies Change-Id: I8160c70c9333c9f5e82ed5fc73633455df568972 * use dot syntax instead of join_path Change-Id: Id1f737299b603fa4093b58571d46a64b0dd84895 --- var/spack/repos/builtin/packages/krb5/package.py | 46 ++++++++ .../repos/builtin/packages/libmaxminddb/package.py | 40 +++++++ .../repos/builtin/packages/wireshark/package.py | 124 +++++++++++++++++++++ 3 files changed, 210 insertions(+) create mode 100644 var/spack/repos/builtin/packages/krb5/package.py create mode 100644 var/spack/repos/builtin/packages/libmaxminddb/package.py create mode 100644 var/spack/repos/builtin/packages/wireshark/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/krb5/package.py b/var/spack/repos/builtin/packages/krb5/package.py new file mode 100644 index 0000000000..3930adf7d8 --- /dev/null +++ b/var/spack/repos/builtin/packages/krb5/package.py @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Krb5(AutotoolsPackage): + """Network authentication protocol""" + + homepage = "https://kerberos.org" + url = "https://kerberos.org/dist/krb5/1.16/krb5-1.16.1.tar.gz" + + version('1.16.1', '848e9b80d6aaaa798e3f3df24b83c407') + + depends_on('openssl') + + configure_directory = 'src' + build_directory = 'src' + + def configure_args(self): + args = ['--disable-debug', + '--disable-dependency-tracking', + '--disable-silent-rules', + '--without-system-verto'] + return args diff --git a/var/spack/repos/builtin/packages/libmaxminddb/package.py b/var/spack/repos/builtin/packages/libmaxminddb/package.py new file mode 100644 index 0000000000..9006bb8f8c --- /dev/null +++ b/var/spack/repos/builtin/packages/libmaxminddb/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Libmaxminddb(AutotoolsPackage): + """C library for the MaxMind DB file format""" + + homepage = "https://github.com/maxmind/libmaxminddb" + url = "https://github.com/maxmind/libmaxminddb/releases/download/1.3.2/libmaxminddb-1.3.2.tar.gz" + + version('1.3.2', '67a861965b30d045bf29a2126bcc05ed') + + def configure_args(self): + args = ['--disable-debug', + '--disable-dependency-tracking', + '--disable-silent-rules'] + return args diff --git a/var/spack/repos/builtin/packages/wireshark/package.py b/var/spack/repos/builtin/packages/wireshark/package.py new file mode 100644 index 0000000000..3324c26921 --- /dev/null +++ b/var/spack/repos/builtin/packages/wireshark/package.py @@ -0,0 +1,124 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import glob + + +class Wireshark(CMakePackage): + """Graphical network analyzer and capture tool""" + + homepage = "https://www.wireshark.org" + url = "https://www.wireshark.org/download/src/all-versions/wireshark-2.6.0.tar.xz" + + version('2.6.0', 'd9f9e206977da14427bfd66b582601ae') + + variant('smi', default=False, description='Build with libsmi') + variant('libssh', default=False, description='Build with libssh') + variant('nghttp2', default=False, description='Build with nghttp2') + variant('qt', default=False, description='Build with qt') + variant('gtk3', default=False, description='Build with gtk3') + variant('gtk', default=False, description='Build with gtk') + variant('headers', default=True, description='Install headers') + + depends_on('cares') + depends_on('doxygen', type='build') + depends_on('flex', type='build') + depends_on('glib') + depends_on('gnutls') + depends_on('libgcrypt@1.4.2:') + depends_on('libmaxminddb') + depends_on('lua') + depends_on('krb5') + depends_on('libsmi', when='+smi') + depends_on('libssh', when='+libssh') + depends_on('nghttp2', when='+nghttp2') + depends_on('portaudio', when='+gtk') + depends_on('portaudio', when='+gtk3') + depends_on('qt@4.8:', when='+qt') + depends_on('gtkplus3', when='+gtk3') + depends_on('gtkplus', when='+gtk') + depends_on('adwaita-icon-theme', when='+gtk3') + + def cmake_args(self): + args = ['-DENEABLE_CARES=ON', + '-DENABLE_GNUTLS=ON', + '-DENABLE_LUA=ON', + '-DENABLE_MAXMINDDB=ON'] + if self.spec.satisfies('+qt'): + args.append('-DBUILD_wireshark=ON') + args.append('-DENABLE_APPLICATION_BUNDLE=ON') + if self.spec['qt'].version >= Version(5): + args.append('-DENABLE_QT5=ON') + else: + args.append('-DENABLE_QT5=OFF') + else: + args.append('-DBUILD_wireshark=OFF') + args.append('-DENABLE_APPLICATION_BUNDLE=OFF') + args.append('-DENABLE_QT5=OFF') + + if self.spec.satisfies('+gtk3') or self.spec.satisfies('+gtk'): + args.append('-DBUILD_wireshark_gtk=ON') + args.append('-DENABLE_PORTAUDIO=ON') + else: + args.append('-DBUILD_wireshark_gtk=OFF') + args.append('-DENABLE_PORTAUDIO=OFF') + if self.spec.satisfies('+gtk3'): + args.append('-DENABLE_GTK3=ON') + + if self.spec.satisfies('+libssh'): + args.append('-DBUILD_sshdump=ON') + args.append('-DBUILD_ciscodump=ON') + else: + args.append('-DBUILD_sshdump=OFF') + args.append('-DBUILD_ciscodump=OFF') + + if self.spec.satisfies('+smi'): + args.append('-DBUILD_SMI=ON') + else: + args.append('-DBUILD_SMI=OFF') + + if self.spec.satisfies('+nghttp2'): + args.append('-DBUILD_NGHTTP2=ON') + else: + args.append('-DBUILD_NGHTTP2=OFF') + + return args + + @run_after('install') + def symlink(self): + if self.spec.satisfies('platform=darwin'): + link(join_path(self.prefix, + 'Wireshark.app/Contents/MacOS/Wireshark'), + self.prefix.bin.wireshark) + + @run_after('install') + def install_headers(self): + if self.spec.satisfies('+headers'): + folders = ['.', 'epan/crypt', 'epan/dfilter', 'epan/dissectors', + 'epan/ftypes', 'epan/wmem', 'wiretap', 'wsutil'] + for folder in folders: + headers = glob.glob(join_path(folder, '*.h')) + for h in headers: + install(h, join_path(prefix.include, 'wireshark', folder)) -- cgit v1.2.3-70-g09d2 From 0dddb988696f3c90ea3c14c48346c265d744e2f2 Mon Sep 17 00:00:00 2001 From: Eric Date: Sun, 6 May 2018 10:56:03 -0500 Subject: metabat: Create new package (#7991) * metabat: Create new package * fix Perl script shebangs and BOOST_ROOT environment * add perl script fix function * add perl dependency and fix positional argument for Python 2.6 --- .../repos/builtin/packages/metabat/package.py | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 var/spack/repos/builtin/packages/metabat/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/metabat/package.py b/var/spack/repos/builtin/packages/metabat/package.py new file mode 100644 index 0000000000..3d00c2dbe6 --- /dev/null +++ b/var/spack/repos/builtin/packages/metabat/package.py @@ -0,0 +1,54 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Metabat(SConsPackage): + """MetaBAT, an efficient tool for accurately reconstructing single + genomes from complex microbial communities.""" + + homepage = "https://bitbucket.org/berkeleylab/metabat" + url = "https://bitbucket.org/berkeleylab/metabat/get/v2.12.1.tar.gz" + + version('2.12.1', 'c032f47a8b24e58a5a9fefe52cb6e0f8') + + depends_on('boost@1.55.0:', type=('build', 'run')) + depends_on('perl', type='run') + + def setup_environment(self, spack_env, run_env): + spack_env.set('BOOST_ROOT', self.spec['boost'].prefix) + + def install_args(self, spec, prefix): + return ["PREFIX={0}".format(prefix)] + + @run_after('build') + def fix_perl_scripts(self): + filter_file(r'#!/usr/bin/perl', + '#!/usr/bin/env perl', + 'aggregateBinDepths.pl') + + filter_file(r'#!/usr/bin/perl', + '#!/usr/bin/env perl', + 'aggregateContigOverlapsByBin.pl') -- cgit v1.2.3-70-g09d2 From 506f8e9f3ea5b04ab4a63888fd143e1f2d864a83 Mon Sep 17 00:00:00 2001 From: Stephen McDowell Date: Sun, 6 May 2018 19:40:27 -0700 Subject: add opencv 3.4.1 (#8031) --- var/spack/repos/builtin/packages/opencv/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index 920a029c8c..7d0c4559b5 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -43,6 +43,7 @@ class Opencv(CMakePackage): url = 'https://github.com/Itseez/opencv/archive/3.1.0.tar.gz' version('master', git="https://github.com/opencv/opencv.git", branch="master") + version('3.4.1', 'a0b7a47899e67b3490ea31edc4f6e8e6') version('3.3.0', '98a4e4c6f23ec725e808a891dc11eec4') version('3.2.0', 'a43b65488124ba33dde195fea9041b70') version('3.1.0', '70e1dd07f0aa06606f1bc0e3fa15abd3') -- cgit v1.2.3-70-g09d2 From df575382ba21b9338bb6a0565b759e5df01631ef Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 7 May 2018 06:44:16 -0500 Subject: py-dlcpar: Add package description (#8032) --- var/spack/repos/builtin/packages/py-dlcpar/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-dlcpar/package.py b/var/spack/repos/builtin/packages/py-dlcpar/package.py index e299245542..8afe4fe6fe 100644 --- a/var/spack/repos/builtin/packages/py-dlcpar/package.py +++ b/var/spack/repos/builtin/packages/py-dlcpar/package.py @@ -26,7 +26,8 @@ from spack import * class PyDlcpar(PythonPackage): - """FIXME: Put a proper description of your package here.""" + """DLCpar is a reconciliation method for inferring gene duplications, + losses, and coalescence (accounting for incomplete lineage sorting).""" homepage = "https://www.cs.hmc.edu/~yjw/software/dlcpar/" url = "https://www.cs.hmc.edu/~yjw/software/dlcpar/pub/sw/dlcpar-1.0.tar.gz" -- cgit v1.2.3-70-g09d2 From 231664e22cfcc6f72fcd9d67b718d6723fdb29b2 Mon Sep 17 00:00:00 2001 From: Andrey Prokopenko Date: Mon, 7 May 2018 07:45:49 -0400 Subject: trilinos: minor cleanup (#7987) --- .../repos/builtin/packages/trilinos/package.py | 211 +++++++++++---------- 1 file changed, 115 insertions(+), 96 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index b199df50cc..7b36aa19ab 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -72,100 +72,111 @@ class Trilinos(CMakePackage): # ###################### Variants ########################## - variant('alloptpkgs', default=False, - description='Compile with all optional packages') - variant('xsdkflags', default=False, - description='Compile using the default xSDK configuration') - variant('metis', default=True, - description='Compile with METIS and ParMETIS') - variant('mumps', default=True, - description='Compile with support for MUMPS solvers') - variant('superlu-dist', default=True, - description='Compile with SuperluDist solvers') - variant('superlu', default=False, - description='Compile with SuperLU solvers') - variant('hypre', default=True, - description='Compile with Hypre preconditioner') - variant('hdf5', default=True, - description='Compile with HDF5') - variant('suite-sparse', default=True, - description='Compile with SuiteSparse solvers') + # Other # not everyone has py-numpy activated, keep it disabled by default to avoid # configure errors variant('python', default=False, description='Build python wrappers') + + # Build options + variant('fortran', default=True, + description='Compile with Fortran support') + variant('instantiate', default=True, + description='Compile with explicit instantiation') + variant('instantiate_cmplx', default=False, + description='Compile with explicit instantiation for complex') + variant('openmp', default=False, + description='Enable OpenMP') variant('shared', default=True, description='Enables the build of shared libraries') + variant('xsdkflags', default=False, + description='Compile using the default xSDK configuration') + + # TPLs (alphabet order) variant('boost', default=True, description='Compile with Boost') - variant('tpetra', default=True, - description='Compile with Tpetra') - variant('epetra', default=True, - description='Compile with Epetra') - variant('epetraext', default=True, - description='Compile with EpetraExt') + variant('cgns', default=False, + description='Enable CGNS') variant('exodus', default=True, description='Compile with Exodus from SEACAS') + variant('gtest', default=True, + description='Compile with Gtest') + variant('hdf5', default=True, + description='Compile with HDF5') + variant('hypre', default=True, + description='Compile with Hypre preconditioner') + variant('metis', default=True, + description='Compile with METIS and ParMETIS') + variant('mumps', default=True, + description='Compile with support for MUMPS solvers') variant('pnetcdf', default=False, description='Compile with parallel-netcdf') + variant('suite-sparse', default=True, + description='Compile with SuiteSparse solvers') + variant('superlu-dist', default=True, + description='Compile with SuperluDist solvers') + variant('superlu', default=False, + description='Compile with SuperLU solvers') + variant('x11', default=False, + description='Compile with X11') variant('zlib', default=False, description='Compile with zlib') - variant('stk', default=False, - description='Compile with STK') - variant('teuchos', default=True, - description='Compile with Teuchos') - variant('belos', default=True, - description='Compile with Belos') - variant('zoltan', default=True, - description='Compile with Zoltan') - variant('zoltan2', default=True, - description='Compile with Zoltan2') + + # Package options (alphabet order) + variant('alloptpkgs', default=False, + description='Compile with all optional packages') variant('amesos', default=True, description='Compile with Amesos') variant('amesos2', default=True, description='Compile with Amesos2') variant('anasazi', default=True, description='Compile with Anasazi') + variant('aztec', default=True, + description='Compile with Aztec') + variant('belos', default=True, + description='Compile with Belos') + variant('epetra', default=True, + description='Compile with Epetra') + variant('epetraext', default=True, + description='Compile with EpetraExt') variant('ifpack', default=True, description='Compile with Ifpack') variant('ifpack2', default=True, description='Compile with Ifpack2') - variant('muelu', default=True, - description='Compile with Muelu') - variant('fortran', default=True, - description='Compile with Fortran support') + variant('intrepid', default=False, + description='Enable Intrepid') + variant('intrepid2', default=False, + description='Enable Intrepid2') + variant('kokkos', default=True, + description='Compile with Kokkos') variant('ml', default=True, description='Compile with ML') - variant('gtest', default=True, - description='Compile with Gtest') - variant('aztec', default=True, - description='Compile with Aztec') + variant('muelu', default=True, + description='Compile with Muelu') + variant('nox', default=False, + description='Enable NOX') + variant('rol', default=False, + description='Enable ROL') variant('sacado', default=True, description='Compile with Sacado') - variant('x11', default=False, - description='Compile with X11') - variant('instantiate', default=True, - description='Compile with explicit instantiation') - variant('instantiate_cmplx', default=False, - description='Compile with explicit instantiation for complex') + variant('stk', default=False, + description='Compile with STK') + variant('shards', default=False, + description='Enable Shards') + variant('teuchos', default=True, + description='Compile with Teuchos') + variant('tpetra', default=True, + description='Compile with Tpetra') + variant('zoltan', default=True, + description='Compile with Zoltan') + variant('zoltan2', default=True, + description='Compile with Zoltan2') + + # External package options variant('dtk', default=False, description='Enable DataTransferKit') variant('fortrilinos', default=False, description='Enable ForTrilinos') - variant('openmp', default=False, - description='Enable OpenMP') - variant('rol', default=False, - description='Enable ROL') - variant('nox', default=False, - description='Enable NOX') - variant('shards', default=False, - description='Enable Shards') - variant('intrepid', default=False, - description='Enable Intrepid') - variant('intrepid2', default=False, - description='Enable Intrepid2') - variant('cgns', default=False, - description='Enable CGNS') resource(name='dtk', git='https://github.com/ornl-cees/DataTransferKit', @@ -178,6 +189,12 @@ class Trilinos(CMakePackage): placement='packages/ForTrilinos', when='+fortrilinos') + conflicts('+tpetra', when='~kokkos') + conflicts('+intrepid2', when='~kokkos') + conflicts('+amesos2', when='~tpetra') + conflicts('+ifpack2', when='~tpetra') + conflicts('+zoltan2', when='~tpetra') + conflicts('+dtk', when='~tpetra') conflicts('+fortrilinos', when='~fortran') conflicts('+fortrilinos', when='@:99') @@ -281,50 +298,52 @@ class Trilinos(CMakePackage): options.extend([ '-DTrilinos_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=%s' % ( 'ON' if '+alloptpkgs' in spec else 'OFF'), - '-DTrilinos_ENABLE_Tpetra:BOOL=%s' % ( - 'ON' if '+tpetra' in spec else 'OFF'), - '-DTrilinos_ENABLE_Epetra:BOOL=%s' % ( - 'ON' if '+epetra' in spec else 'OFF'), - '-DTrilinos_ENABLE_EpetraExt:BOOL=%s' % ( - 'ON' if '+epetraext' in spec else 'OFF'), - '-DTrilinos_ENABLE_ML:BOOL=%s' % ( - 'ON' if '+ml' in spec else 'OFF'), - '-DTrilinos_ENABLE_AztecOO:BOOL=%s' % ( - 'ON' if '+aztec' in spec else 'OFF'), - '-DTrilinos_ENABLE_Sacado:BOOL=%s' % ( - 'ON' if '+sacado' in spec else 'OFF'), - '-DTrilinos_ENABLE_Belos:BOOL=%s' % ( - 'ON' if '+belos' in spec else 'OFF'), - '-DTrilinos_ENABLE_Zoltan:BOOL=%s' % ( - 'ON' if '+zoltan' in spec else 'OFF'), - '-DTrilinos_ENABLE_Zoltan2:BOOL=%s' % ( - 'ON' if '+zoltan2' in spec else 'OFF'), '-DTrilinos_ENABLE_Amesos:BOOL=%s' % ( 'ON' if '+amesos' in spec else 'OFF'), '-DTrilinos_ENABLE_Amesos2:BOOL=%s' % ( 'ON' if '+amesos2' in spec else 'OFF'), - '-DTrilinos_ENABLE_MueLu:BOOL=%s' % ( - 'ON' if '+muelu' in spec else 'OFF'), + '-DTrilinos_ENABLE_Anasazi:BOOL=%s' % ( + 'ON' if '+anasazi' in spec else 'OFF'), + '-DTrilinos_ENABLE_AztecOO:BOOL=%s' % ( + 'ON' if '+aztec' in spec else 'OFF'), + '-DTrilinos_ENABLE_Belos:BOOL=%s' % ( + 'ON' if '+belos' in spec else 'OFF'), + '-DTrilinos_ENABLE_Epetra:BOOL=%s' % ( + 'ON' if '+epetra' in spec else 'OFF'), + '-DTrilinos_ENABLE_EpetraExt:BOOL=%s' % ( + 'ON' if '+epetraext' in spec else 'OFF'), '-DTrilinos_ENABLE_Ifpack:BOOL=%s' % ( 'ON' if '+ifpack' in spec else 'OFF'), '-DTrilinos_ENABLE_Ifpack2:BOOL=%s' % ( 'ON' if '+ifpack2' in spec else 'OFF'), - '-DTrilinos_ENABLE_Gtest:BOOL=%s' % ( - 'ON' if '+gtest' in spec else 'OFF'), - '-DTrilinos_ENABLE_Teuchos:BOOL=%s' % ( - 'ON' if '+teuchos' in spec else 'OFF'), - '-DTrilinos_ENABLE_Anasazi:BOOL=%s' % ( - 'ON' if '+anasazi' in spec else 'OFF'), - '-DTrilinos_ENABLE_ROL:BOOL=%s' % ( - 'ON' if '+rol' in spec else 'OFF'), - '-DTrilinos_ENABLE_NOX:BOOL=%s' % ( - 'ON' if '+nox' in spec else 'OFF'), - '-DTrilinos_ENABLE_Shards=%s' % ( - 'ON' if '+shards' in spec else 'OFF'), '-DTrilinos_ENABLE_Intrepid=%s' % ( 'ON' if '+intrepid' in spec else 'OFF'), '-DTrilinos_ENABLE_Intrepid2=%s' % ( 'ON' if '+intrepid2' in spec else 'OFF'), + '-DTrilinos_ENABLE_Kokkos:BOOL=%s' % ( + 'ON' if '+kokkos' in spec else 'OFF'), + '-DTrilinos_ENABLE_ML:BOOL=%s' % ( + 'ON' if '+ml' in spec else 'OFF'), + '-DTrilinos_ENABLE_MueLu:BOOL=%s' % ( + 'ON' if '+muelu' in spec else 'OFF'), + '-DTrilinos_ENABLE_NOX:BOOL=%s' % ( + 'ON' if '+nox' in spec else 'OFF'), + '-DTrilinos_ENABLE_PyTrilinos:BOOL=%s' % ( + 'ON' if '+python' in spec else 'OFF'), + '-DTrilinos_ENABLE_ROL:BOOL=%s' % ( + 'ON' if '+rol' in spec else 'OFF'), + '-DTrilinos_ENABLE_Sacado:BOOL=%s' % ( + 'ON' if '+sacado' in spec else 'OFF'), + '-DTrilinos_ENABLE_Shards=%s' % ( + 'ON' if '+shards' in spec else 'OFF'), + '-DTrilinos_ENABLE_Teuchos:BOOL=%s' % ( + 'ON' if '+teuchos' in spec else 'OFF'), + '-DTrilinos_ENABLE_Tpetra:BOOL=%s' % ( + 'ON' if '+tpetra' in spec else 'OFF'), + '-DTrilinos_ENABLE_Zoltan:BOOL=%s' % ( + 'ON' if '+zoltan' in spec else 'OFF'), + '-DTrilinos_ENABLE_Zoltan2:BOOL=%s' % ( + 'ON' if '+zoltan2' in spec else 'OFF'), ]) if '+xsdkflags' in spec: @@ -388,8 +407,8 @@ class Trilinos(CMakePackage): '-DNetCDF_ROOT:PATH=%s' % spec['netcdf'].prefix, '-DTPL_ENABLE_X11:BOOL=%s' % ( 'ON' if '+x11' in spec else 'OFF'), - '-DTrilinos_ENABLE_PyTrilinos:BOOL=%s' % ( - 'ON' if '+python' in spec else 'OFF'), + '-DTrilinos_ENABLE_Gtest:BOOL=%s' % ( + 'ON' if '+gtest' in spec else 'OFF'), ]) if '+hypre' in spec: -- cgit v1.2.3-70-g09d2 From 9557a6881f9ee4d4ce1147516d6afe3a2cb8b977 Mon Sep 17 00:00:00 2001 From: anne-glerum Date: Mon, 7 May 2018 16:51:27 +0200 Subject: Add patch (#8034) --- .../repos/builtin/packages/pixman/clang.patch | 28 ++++++++++++++++++++++ var/spack/repos/builtin/packages/pixman/package.py | 7 ++++++ 2 files changed, 35 insertions(+) create mode 100644 var/spack/repos/builtin/packages/pixman/clang.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pixman/clang.patch b/var/spack/repos/builtin/packages/pixman/clang.patch new file mode 100644 index 0000000000..9de9c1be60 --- /dev/null +++ b/var/spack/repos/builtin/packages/pixman/clang.patch @@ -0,0 +1,28 @@ +--- pixman-0.34.0/test/utils-prng.c.bak 2018-02-01 00:34:15.757691302 +0100 ++++ pixman-0.34.0/test/utils-prng.c 2018-02-01 00:36:38.285690995 +0100 +@@ -199,12 +199,24 @@ + } + else + { ++ ++#ifndef __has_builtin ++#define __has_builtin(x) 0 ++#endif ++ + #ifdef HAVE_GCC_VECTOR_EXTENSIONS ++# if !defined(__clang__) || __has_builtin(__builtin_shuffle) + const uint8x16 bswap_shufflemask = + { + 3, 2, 1, 0, 7, 6, 5, 4, 11, 10, 9, 8, 15, 14, 13, 12 + }; + randdata.vb = __builtin_shuffle (randdata.vb, bswap_shufflemask); ++# elif __has_builtin(__builtin_shufflevector) ++ randdata.vb = __builtin_shufflevector(randdata.vb, randdata.vb, 3, 2, 1, 0, 7, 6, 5, 4, 11, 10, 9, 8, 15, 14, 13, 12); ++# else ++# error "GCC_VECTOR_EXTENSION is defined, but neither __builtin_shuffle nor __builtin_shufflevector is supported!" ++# endif ++ + store_rand_128_data (buf, &randdata, aligned); + buf += 16; + #else + diff --git a/var/spack/repos/builtin/packages/pixman/package.py b/var/spack/repos/builtin/packages/pixman/package.py index d6cab39732..7107148688 100644 --- a/var/spack/repos/builtin/packages/pixman/package.py +++ b/var/spack/repos/builtin/packages/pixman/package.py @@ -40,6 +40,13 @@ class Pixman(AutotoolsPackage): depends_on('pkgconfig', type='build') depends_on('libpng') + # As discussed here: + # https://bugs.freedesktop.org/show_bug.cgi?id=104886 + # __builtin_shuffle was removed in clang 5.0. + # From version 9.1 apple-clang is based on clang 5.0. + # Patch is obtained from above link. + patch('clang.patch', when='%clang@9.1.0-apple:') + def configure_args(self): args = [ '--enable-libpng', -- cgit v1.2.3-70-g09d2 From b5c6bbb2a261abf87db0860f0e37a9d234cdafbc Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Mon, 7 May 2018 10:46:58 -0600 Subject: pkgconf: use alpine linux mirror to avoid ssl error (#8039) --- var/spack/repos/builtin/packages/pkgconf/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pkgconf/package.py b/var/spack/repos/builtin/packages/pkgconf/package.py index 01f147d71b..b046e74ea0 100644 --- a/var/spack/repos/builtin/packages/pkgconf/package.py +++ b/var/spack/repos/builtin/packages/pkgconf/package.py @@ -32,7 +32,7 @@ class Pkgconf(AutotoolsPackage): maintaining compatibility.""" homepage = "http://pkgconf.org/" - url = "https://distfiles.dereferenced.org/pkgconf/pkgconf-1.3.10.tar.xz" + url = "http://distfiles.alpinelinux.org/distfiles/pkgconf-1.3.10.tar.xz" version('1.4.0', 'c509c0dad5a70aa4bc3210557b7eafce') version('1.3.10', '9b63707bf6f8da6efb3868101d7525fe') -- cgit v1.2.3-70-g09d2 From 3a88227c83b17ef01325d92193a1c387ed6fb4e0 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Mon, 7 May 2018 20:40:32 +0200 Subject: perl: add 5.26.2 (#7984) * perl: add 5.26.2 * perl: add 5.22.4 * move Misc releases to EOL --- var/spack/repos/builtin/packages/perl/package.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl/package.py b/var/spack/repos/builtin/packages/perl/package.py index 90a85fdf83..332b5121e7 100644 --- a/var/spack/repos/builtin/packages/perl/package.py +++ b/var/spack/repos/builtin/packages/perl/package.py @@ -45,19 +45,22 @@ class Perl(Package): # Perl doesn't use Autotools, it should subclass Package # URL must remain http:// so Spack can bootstrap curl url = "http://www.cpan.org/src/5.0/perl-5.24.1.tar.gz" - # Development releases + # see http://www.cpan.org/src/README.html for + # explanation of version numbering scheme + + # Development releases (odd numbers) version('5.25.11', '37a398682c36cd85992b34b5c1c25dc1') - # Maintenance releases (recommended) - version('5.24.1', '765ef511b5b87a164e2531403ee16b3c', preferred=True) - version('5.22.3', 'aa4f236dc2fc6f88b871436b8d0fda95') + # Maintenance releases (even numbers, recommended) + version('5.26.2', 'dc0fea097f3992a8cd53f8ac0810d523', preferred=True) + version('5.24.1', '765ef511b5b87a164e2531403ee16b3c') - # Misc releases that people need + # End of life releases + version('5.22.4', '31a71821682e02378fcdadeed85688b8') + version('5.22.3', 'aa4f236dc2fc6f88b871436b8d0fda95') version('5.22.2', '5767e2a10dd62a46d7b57f74a90d952b') version('5.22.1', '19295bbb775a3c36123161b9bf4892f1') version('5.22.0', 'e32cb6a8dda0084f2a43dac76318d68d') - - # End of life releases version('5.20.3', 'd647d0ea5a7a8194c34759ab9f2610cd') version('5.18.4', '1f9334ff730adc05acd3dd7130d295db') version('5.16.3', 'eb5c40f2575df6c155bc99e3fe0a9d82') -- cgit v1.2.3-70-g09d2 From fa93df49bdde936eda25eec14eb81de3ffe4dd37 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 7 May 2018 13:42:24 -0500 Subject: py-pysqlite: Create new package (#8042) --- .../repos/builtin/packages/py-pysqlite/package.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-pysqlite/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pysqlite/package.py b/var/spack/repos/builtin/packages/py-pysqlite/package.py new file mode 100644 index 0000000000..c12b378a2f --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pysqlite/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPysqlite(PythonPackage): + """Python DB-API module for SQLite 3.""" + + homepage = "https://github.com/ghaering/pysqlite" + url = "https://pypi.io/packages/source/p/pysqlite/pysqlite-2.8.3.tar.gz" + + version('2.8.3', '033f17b8644577715aee55e8832ac9fc') + + depends_on('python@2.7.0:2.7.999', type=('build', 'run')) + depends_on('sqlite', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From d6c6a7016f0a65cf7c9f9fa447f1d46fc9c240b7 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 7 May 2018 17:22:43 -0500 Subject: manta: Create new package (#8043) * manta: Create new package * manta: Create new package * manta: fix dependency types --- var/spack/repos/builtin/packages/manta/package.py | 41 +++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 var/spack/repos/builtin/packages/manta/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/manta/package.py b/var/spack/repos/builtin/packages/manta/package.py new file mode 100644 index 0000000000..5a0afd9c32 --- /dev/null +++ b/var/spack/repos/builtin/packages/manta/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Manta(CMakePackage): + """Structural variant and indel caller for mapped sequencing data""" + + homepage = "https://github.com/Illumina/manta" + url = "https://github.com/Illumina/manta/releases/download/v1.3.2/manta-1.3.2.release_src.tar.bz2" + + depends_on('boost@1.58.0:', type='build') + depends_on('cmake@2.8.12:', type='build') + depends_on('python@2.7.0:2.7.999', type=('build', 'run')) + + version('1.4.0', '582d10f3bc56aecfa5c24931af3742b4') + version('1.3.2', '83f43fe1a12605c1e9803d1020b24bd1') + version('1.3.1', 'e315caff775878872ee300ed34e8adae') + version('1.3.0', '1243e2bb58ca7c9d69bbfbe528f492ec') -- cgit v1.2.3-70-g09d2 From 3a5f68c07876ea06d0df9c4dedb3d23c2c22fd71 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Mon, 7 May 2018 17:23:45 -0500 Subject: r-genie3: new package (#8044) --- .../repos/builtin/packages/r-genie3/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-genie3/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-genie3/package.py b/var/spack/repos/builtin/packages/r-genie3/package.py new file mode 100644 index 0000000000..49dc72debc --- /dev/null +++ b/var/spack/repos/builtin/packages/r-genie3/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RGenie3(RPackage): + """This package implements the GENIE3 algorithm for inferring gene + regulatory networks from expression data.""" + + homepage = "https://bioconductor.org/packages/GENIE3/" + + version('1.2.0', git='https://git.bioconductor.org/packages/GENIE3', + commit='cafe6a1a85095cda6cc3c812eb6f53501fcbaf93') + + depends_on('r-reshape2', type=('build', 'run')) + depends_on('r@3.5.0:', when='@1.2.0') -- cgit v1.2.3-70-g09d2 From 0ac777b88ed947eae25d38e92cc7fcc37fe1741a Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Tue, 8 May 2018 12:35:44 -0500 Subject: openmpi: new version (#8055) --- var/spack/repos/builtin/packages/openmpi/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 9731558eb0..2e97975304 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -83,9 +83,10 @@ class Openmpi(AutotoolsPackage): list_url = "http://www.open-mpi.org/software/ompi/" # Current - version('3.0.1', '565f5060e080b0871a64b295c3d4426a') # libmpi.so.40.00.1 + version('3.1.0', '0895e268ca27735d7654bf64cee6c256') # libmpi.so.40.10.0 # Still supported + version('3.0.1', '565f5060e080b0871a64b295c3d4426a') # libmpi.so.40.00.1 version('3.0.0', '757d51719efec08f9f1a7f32d58b3305') # libmpi.so.40.00.0 version('2.1.3', '46079b6f898a412240a0bf523e6cd24b') # libmpi.so.20.10.2 version('2.1.2', 'ff2e55cc529802e7b0738cf87acd3ee4') # libmpi.so.20.10.2 -- cgit v1.2.3-70-g09d2 From ca9ce8048c5d25eff33fe57691c86c0ae3103e58 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Tue, 8 May 2018 10:42:57 -0700 Subject: googletest: add variant to enable/disable threads (#8052) Add Google Test variant to enable/disable building with threads. --- var/spack/repos/builtin/packages/googletest/package.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/googletest/package.py b/var/spack/repos/builtin/packages/googletest/package.py index bb9661a3db..4651ea7c3e 100644 --- a/var/spack/repos/builtin/packages/googletest/package.py +++ b/var/spack/repos/builtin/packages/googletest/package.py @@ -37,6 +37,9 @@ class Googletest(CMakePackage): variant('gmock', default=False, description='Build with gmock') conflicts('+gmock', when='@:1.7.0') + variant('pthreads', default=True, + description='Build multithreaded version with pthreads') + def cmake_args(self): spec = self.spec if '@1.8.0:' in spec: @@ -49,6 +52,9 @@ class Googletest(CMakePackage): else: # Old style (contains only GTest) options = [] + + options.append('-Dgtest_disable_pthreads={0}'.format( + 'ON' if '+pthreads' in spec else 'OFF')) return options @when('@:1.7.0') -- cgit v1.2.3-70-g09d2 From 7ff034a55dae27d3ca038124cf3b416d917e0f3c Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Tue, 8 May 2018 19:43:38 +0200 Subject: pybind11: v2.2.3 (#8051) * pybind11: 2.2.3 new release for pybind11, v.2.2.3: https://github.com/pybind/pybind11/blob/v2.2.3/docs/changelog.rst#v223-april-29-2018 * pybind11: compiler support mark older versions as conflicts --- var/spack/repos/builtin/packages/py-pybind11/package.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pybind11/package.py b/var/spack/repos/builtin/packages/py-pybind11/package.py index 252ad0db70..c995660d71 100644 --- a/var/spack/repos/builtin/packages/py-pybind11/package.py +++ b/var/spack/repos/builtin/packages/py-pybind11/package.py @@ -39,6 +39,7 @@ class PyPybind11(CMakePackage): version('develop', branch='master', git='https://github.com/pybind/pybind11.git') + version('2.2.3', '55b637945bbf47d99d2c906bf0c13f49') version('2.2.2', 'fc174e1bbfe7ec069af7eea86ec37b5c') version('2.2.1', 'bab1d46bbc465af5af3a4129b12bfa3b') version('2.2.0', '978b26aea1c6bfc4f88518ef33771af2') @@ -49,6 +50,11 @@ class PyPybind11(CMakePackage): extends('python') + # compiler support + conflicts('%gcc@:4.7') + conflicts('%clang@:3.2') + conflicts('%intel@:16') + def cmake_args(self): args = [] args.append('-DPYTHON_EXECUTABLE:FILEPATH=%s' -- cgit v1.2.3-70-g09d2 From bb5ef39ad2a1e23874374b4a45c57939358c027a Mon Sep 17 00:00:00 2001 From: Ce Qin Date: Wed, 9 May 2018 01:44:38 +0800 Subject: Fix superlu-dist with PETSc 3.9.0 (#8048) --- var/spack/repos/builtin/packages/petsc/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index 13fb5ca018..ba120aac8f 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -145,8 +145,8 @@ class Petsc(Package): depends_on('superlu-dist@:4.3+int64', when='@3.4.4:3.6.4+superlu-dist+mpi+int64') depends_on('superlu-dist@5.0.0:~int64', when='@3.7:3.7.99+superlu-dist+mpi~int64') depends_on('superlu-dist@5.0.0:+int64', when='@3.7:3.7.99+superlu-dist+mpi+int64') - depends_on('superlu-dist@5.2:5.2.99~int64', when='@3.8:3.8.99+superlu-dist+mpi~int64') - depends_on('superlu-dist@5.2:5.2.99+int64', when='@3.8:3.8.99+superlu-dist+mpi+int64') + depends_on('superlu-dist@5.2:5.2.99~int64', when='@3.8:3.9.99+superlu-dist+mpi~int64') + depends_on('superlu-dist@5.2:5.2.99+int64', when='@3.8:3.9.99+superlu-dist+mpi+int64') depends_on('superlu-dist@xsdk-0.2.0~int64', when='@xsdk-0.2.0+superlu-dist+mpi~int64') depends_on('superlu-dist@xsdk-0.2.0+int64', when='@xsdk-0.2.0+superlu-dist+mpi+int64') depends_on('superlu-dist@develop~int64', when='@develop+superlu-dist+mpi~int64') -- cgit v1.2.3-70-g09d2 From 29b11f624fb9da4309611d5add76dc030c185d96 Mon Sep 17 00:00:00 2001 From: Andrew Gaspar Date: Tue, 8 May 2018 12:04:19 -0600 Subject: Updates to Google Benchmark package: (#8056) - Adds v1.3.0 and v1.4.0 - List explicit CMake version dependency (from Benchmark CMake files) - Disable the building of tests. Starting in v1.4.0 this introduced a dependency on GoogleTest Tested by building all versions on macOS High Sierra --- var/spack/repos/builtin/packages/benchmark/package.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/benchmark/package.py b/var/spack/repos/builtin/packages/benchmark/package.py index 6099a6e866..98a309aeb3 100644 --- a/var/spack/repos/builtin/packages/benchmark/package.py +++ b/var/spack/repos/builtin/packages/benchmark/package.py @@ -36,6 +36,8 @@ class Benchmark(CMakePackage): # first properly installed CMake config packages in # 1.2.0 release: https://github.com/google/benchmark/issues/363 + version('1.4.0', 'ccfaf2cd93ae20191b94f730b945423e') + version('1.3.0', '19ce86516ab82d6ad3b17173cf307aac') version('1.2.0', '48d0b090cd7a84af2c4a28c8dc963c74') version('1.1.0', '66b2a23076cf70739525be0092fc3ae3') version('1.0.0', '1474ff826f8cd68067258db75a0835b8') @@ -45,6 +47,14 @@ class Benchmark(CMakePackage): values=('Debug', 'Release', 'RelWithDebInfo', 'MinSizeRel', 'Coverage')) + depends_on("cmake@2.8.11:", type="build", when="@:1.1.0") + depends_on("cmake@2.8.12:", type="build", when="@1.2.0:") + + def cmake_args(self): + # No need for testing for the install + args = ["-DBENCHMARK_ENABLE_TESTING=OFF"] + return args + def patch(self): filter_file( r'add_cxx_compiler_flag..fstrict.aliasing.', -- cgit v1.2.3-70-g09d2 From 16adf144c2f02ff5a14194ed6583b14559493454 Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Tue, 8 May 2018 15:52:02 -0700 Subject: added shared-mime-info version 1.9 (#8063) --- var/spack/repos/builtin/packages/shared-mime-info/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/shared-mime-info/package.py b/var/spack/repos/builtin/packages/shared-mime-info/package.py index 824df65987..15cc97a0e6 100644 --- a/var/spack/repos/builtin/packages/shared-mime-info/package.py +++ b/var/spack/repos/builtin/packages/shared-mime-info/package.py @@ -32,6 +32,7 @@ class SharedMimeInfo(AutotoolsPackage): homepage = "https://freedesktop.org/wiki/Software/shared-mime-info" url = "http://freedesktop.org/~hadess/shared-mime-info-1.8.tar.xz" + version('1.9', '45103889b91242850aa47f09325e798b') version('1.8', 'f6dcadce764605552fc956563efa058c') parallel = False -- cgit v1.2.3-70-g09d2 From 804a7991e06d6195b5c840c72d7a2f15c7159cc9 Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Tue, 8 May 2018 15:52:38 -0700 Subject: added stat version 4.0.0 (#8062) --- var/spack/repos/builtin/packages/stat/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/stat/package.py b/var/spack/repos/builtin/packages/stat/package.py index 1edf0dc8dc..a39228f93b 100644 --- a/var/spack/repos/builtin/packages/stat/package.py +++ b/var/spack/repos/builtin/packages/stat/package.py @@ -31,6 +31,8 @@ class Stat(AutotoolsPackage): homepage = "http://paradyn.org/STAT/STAT.html" url = "https://github.com/lee218llnl/stat/archive/v2.0.0.tar.gz" + version('4.0.0', 'b357160662ced251bc55cb1b884c3407', + url='https://github.com/LLNL/STAT/releases/download/v4.0.0/stat-4.0.0.tar.gz') version('3.0.1', 'dac6f23c3639a0b21f923dc6219ba385', url='https://github.com/LLNL/STAT/files/911503/stat-3.0.1.zip') version('3.0.0', 'a97cb235c266371c4a26329112de48a2', -- cgit v1.2.3-70-g09d2 From c12dd6135827b5dc42dc2d845df26f580e4b2f39 Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Tue, 8 May 2018 15:53:50 -0700 Subject: intltool requires patching for newer perl versions (#8061) --- var/spack/repos/builtin/packages/intltool/package.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/intltool/package.py b/var/spack/repos/builtin/packages/intltool/package.py index fdb94d625f..963843ca5e 100644 --- a/var/spack/repos/builtin/packages/intltool/package.py +++ b/var/spack/repos/builtin/packages/intltool/package.py @@ -39,6 +39,12 @@ class Intltool(AutotoolsPackage): depends_on('perl-xml-parser', type=('build', 'run')) depends_on('perl@5.8.1:', type=('build', 'run')) + # patch for "Unescaped left brace in regex is illegal here in regex" + # warnings witn perl 5.22 and errors with perl 5.26 and newer + patch('https://launchpadlibrarian.net/216052398/intltool-perl-5.22.patch', + sha256='ca9d6562f29f06c64150f50369a24402b7aa01a3a0dc73dce55106f3224330a1', + level=0) + def check(self): # `make check` passes but causes `make install` to fail pass -- cgit v1.2.3-70-g09d2 From 50a95c57c7a016f7ffeaa360240139f74eaa34a4 Mon Sep 17 00:00:00 2001 From: peetsv <32349688+peetsv@users.noreply.github.com> Date: Tue, 8 May 2018 15:54:15 -0700 Subject: Py cnvkit: updating dependencies (#8057) * py-pyfaidx: adding new package * updating the url * identifying dependencies --- var/spack/repos/builtin/packages/py-cnvkit/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-cnvkit/package.py b/var/spack/repos/builtin/packages/py-cnvkit/package.py index ed5313f2db..045c940206 100644 --- a/var/spack/repos/builtin/packages/py-cnvkit/package.py +++ b/var/spack/repos/builtin/packages/py-cnvkit/package.py @@ -41,6 +41,8 @@ class PyCnvkit(PythonPackage): depends_on('py-numpy@1.9:', type=('build', 'run')) depends_on('py-pandas@0.18.1:', type=('build', 'run')) depends_on('py-pyfaidx@0.4.7:', type=('build', 'run')) - depends_on('py-pysam@0.10.0:', type=('build', 'run')) + depends_on('py-pysam@0.10.0:0.13', type=('build', 'run')) depends_on('py-reportlab@3.0:', type=('build', 'run')) depends_on('py-scipy@0.15.0:', type=('build', 'run')) + depends_on('bcftools@1.6', type=('build', 'run')) + depends_on('samtools@1.6', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From b4859e10e2d1c61750474ae66fa36dd02b0906a4 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Wed, 9 May 2018 02:40:53 +0200 Subject: Packages can tune the list of files to be archived at the end of install (#7760) Fixes #2781 This PR introduces a new attribute for packages called `archive_files`, which designates files that should be saved from a package build (e.g. the config.log generated during autotools builds). The attribute contains a list of glob expressions; Any file that matches will be archived in the `/.spack/archived-files` directory. Errors that occur when archiving files are collected and reported in a file named `/.spack/archived-files/errors.txt`. `AutotoolsPackage` and `CMakePackage` provide a sensible default override for this attribute. --- lib/spack/spack/build_systems/autotools.py | 5 ++ lib/spack/spack/build_systems/cmake.py | 5 ++ lib/spack/spack/package.py | 52 +++++++++++++++++++++ lib/spack/spack/test/cmd/install.py | 19 ++++++++ .../builtin.mock/packages/archive-files/package.py | 53 ++++++++++++++++++++++ 5 files changed, 134 insertions(+) create mode 100644 var/spack/repos/builtin.mock/packages/archive-files/package.py (limited to 'var') diff --git a/lib/spack/spack/build_systems/autotools.py b/lib/spack/spack/build_systems/autotools.py index 0c8d392f01..0c9760faa5 100644 --- a/lib/spack/spack/build_systems/autotools.py +++ b/lib/spack/spack/build_systems/autotools.py @@ -94,6 +94,11 @@ class AutotoolsPackage(PackageBase): #: Options to be passed to autoreconf when using the default implementation autoreconf_extra_args = [] + @property + def archive_files(self): + """Files to archive for packages based on autotools""" + return [os.path.join(self.build_directory, 'config.log')] + @run_after('autoreconf') def _do_patch_config_guess(self): """Some packages ship with an older config.guess and need to have diff --git a/lib/spack/spack/build_systems/cmake.py b/lib/spack/spack/build_systems/cmake.py index 8f0d3cd021..27b3e56a81 100644 --- a/lib/spack/spack/build_systems/cmake.py +++ b/lib/spack/spack/build_systems/cmake.py @@ -90,6 +90,11 @@ class CMakePackage(PackageBase): depends_on('cmake', type='build') + @property + def archive_files(self): + """Files to archive for packages based on CMake""" + return [os.path.join(self.build_directory, 'CMakeCache.txt')] + @property def root_cmakelists_dir(self): """The relative path to the directory containing CMakeLists.txt diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py index 9117cbbaea..c7313e956a 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -37,6 +37,7 @@ import base64 import contextlib import copy import functools +import glob import hashlib import inspect import itertools @@ -529,6 +530,12 @@ class PackageBase(with_metaclass(PackageMeta, object)): #: directories, sanity checks will fail. sanity_check_is_dir = [] + #: List of glob expressions. Each expression must either be + #: absolute or relative to the package source path. + #: Matching artifacts found at the end of the build process will + #: be copied in the same directory tree as build.env and build.out. + archive_files = [] + # # Set default licensing information # @@ -1647,8 +1654,53 @@ class PackageBase(with_metaclass(PackageMeta, object)): # FIXME : this potentially catches too many things... pass + # Archive the whole stdout + stderr for the package install(self.log_path, log_install_path) + # Archive the environment used for the build install(self.env_path, env_install_path) + # Finally, archive files that are specific to each package + with working_dir(self.stage.source_path): + errors = StringIO() + target_dir = os.path.join( + spack.store.layout.metadata_path(self.spec), 'archived-files' + ) + for glob_expr in self.archive_files: + # Check that we are trying to copy things that are + # in the source_path tree (not arbitrary files) + abs_expr = os.path.realpath(glob_expr) + if os.path.realpath(self.stage.source_path) not in abs_expr: + errors.write( + '[OUTSIDE SOURCE PATH]: {0}\n'.format(glob_expr) + ) + continue + # Now that we are sure that the path is within the correct + # folder, make it relative and check for matches + if os.path.isabs(glob_expr): + glob_expr = os.path.relpath( + glob_expr, self.stage.source_path + ) + files = glob.glob(glob_expr) + for f in files: + try: + target = os.path.join(target_dir, f) + # We must ensure that the directory exists before + # copying a file in + mkdirp(os.path.dirname(target)) + install(f, target) + except Exception: + # Here try to be conservative, and avoid discarding + # the whole install procedure because of copying a + # single file failed + errors.write('[FAILED TO ARCHIVE]: {0}'.format(f)) + + if errors.getvalue(): + error_file = os.path.join(target_dir, 'errors.txt') + mkdirp(target_dir) + with open(error_file, 'w') as err: + err.write(errors.getvalue()) + tty.warn('Errors occurred when archiving files.\n\t' + 'See: {0}'.format(error_file)) + dump_packages(self.spec, packages_dir) def sanity_check_prefix(self): diff --git a/lib/spack/spack/test/cmd/install.py b/lib/spack/spack/test/cmd/install.py index 91d2bbc7ed..12e933a842 100644 --- a/lib/spack/spack/test/cmd/install.py +++ b/lib/spack/spack/test/cmd/install.py @@ -376,3 +376,22 @@ def test_install_mix_cli_and_files(clispecs, filespecs, tmpdir): install(*args, fail_on_error=False) assert install.returncode == 0 + + +@pytest.mark.usefixtures( + 'builtin_mock', 'mock_archive', 'mock_fetch', 'config', 'install_mockery' +) +def test_extra_files_are_archived(): + s = Spec('archive-files') + s.concretize() + + install('archive-files') + + archive_dir = os.path.join( + spack.store.layout.metadata_path(s), 'archived-files' + ) + config_log = os.path.join(archive_dir, 'config.log') + assert os.path.exists(config_log) + + errors_txt = os.path.join(archive_dir, 'errors.txt') + assert os.path.exists(errors_txt) diff --git a/var/spack/repos/builtin.mock/packages/archive-files/package.py b/var/spack/repos/builtin.mock/packages/archive-files/package.py new file mode 100644 index 0000000000..aef08454d8 --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/archive-files/package.py @@ -0,0 +1,53 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class ArchiveFiles(AutotoolsPackage): + """Simple package with one optional dependency""" + + homepage = "http://www.example.com" + url = "http://www.example.com/a-1.0.tar.gz" + + version('1.0', '0123456789abcdef0123456789abcdef') + version('2.0', '2.0_a_hash') + + @property + def archive_files(self): + return super(ArchiveFiles, self).archive_files + ['../../outside.log'] + + def autoreconf(self, spec, prefix): + pass + + def configure(self, spec, prefix): + pass + + def build(self, spec, prefix): + mkdirp(self.build_directory) + config_log = join_path(self.build_directory, 'config.log') + touch(config_log) + + def install(self, spec, prefix): + touch(join_path(prefix, 'deleteme')) -- cgit v1.2.3-70-g09d2 From a9e47b763e8c78d948e7bf325cb98558605d0a58 Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Tue, 8 May 2018 17:55:12 -0700 Subject: opencv updates for lbann (#6502) Add variants to control building of many 3rd-party modules in opencv. They are enabled by default, which matches the defaults chosen by opencv when these options are not set explicitly. This also updates the lbann opencv dependency to disable most of these new variants by default in order to build faster. --- var/spack/repos/builtin/packages/lbann/package.py | 11 +- var/spack/repos/builtin/packages/opencv/package.py | 143 ++++++++++++++++----- 2 files changed, 122 insertions(+), 32 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index 5ebf90d1c4..0d9b6532a6 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -59,7 +59,16 @@ class Lbann(CMakePackage): depends_on('cub', when='+gpu') depends_on('mpi') depends_on('hwloc ~pci ~libxml2') - depends_on('opencv@3.2.0: +openmp +core +highgui +imgproc +jpeg +png +tiff +zlib ~eigen', when='+opencv') + # LBANN wraps OpenCV calls in OpenMP parallel loops, build without OpenMP + # Additionally disable video related options, they incorrectly link in a + # bad OpenMP library when building with clang or Intel compilers + depends_on('opencv@3.2.0: +core +highgui +imgproc +jpeg +png +tiff +zlib ' + '+fast-math +powerpc +vsx ~calib3d ~cuda ~dnn ~eigen' + '~features2d ~flann ~gtk ~ipp ~ipp_iw ~jasper ~java ~lapack ~ml' + '~openmp ~opencl ~opencl_svm ~openclamdblas ~openclamdfft' + '~pthreads_pf ~python ~qt ~stitching ~superres ~ts ~video' + '~videostab ~videoio ~vtk', when='+opencv') + depends_on('protobuf@3.0.2:') depends_on('cnpy') depends_on('nccl', when='+gpu +nccl') diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index 7d0c4559b5..cfda9f0786 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -44,6 +44,8 @@ class Opencv(CMakePackage): version('master', git="https://github.com/opencv/opencv.git", branch="master") version('3.4.1', 'a0b7a47899e67b3490ea31edc4f6e8e6') + version('3.4.0', '170732dc760e5f7ddeccbe53ba5d16a6') + version('3.3.1', 'b1ed9aea030bb5bd9df28524d97de84c') version('3.3.0', '98a4e4c6f23ec725e808a891dc11eec4') version('3.2.0', 'a43b65488124ba33dde195fea9041b70') version('3.1.0', '70e1dd07f0aa06606f1bc0e3fa15abd3') @@ -54,29 +56,54 @@ class Opencv(CMakePackage): version('2.4.12.2', 'bc0c60c2ea1cf4078deef99569912fc7') version('2.4.12.1', '7192f51434710904b5e3594872b897c3') + # Standard variants variant('shared', default=True, description='Enables the build of shared libraries') + variant('lapack', default=True, description='Include Lapack library support') + variant('powerpc', default=False, description='Enable PowerPC for GCC') + variant('vsx', default=False, description='Enable POWER8 and above VSX (64-bit little-endian)') + variant('fast-math', default=False, + description='Enable -ffast-math (not recommended for GCC 4.6.x)') + # OpenCV modules + variant('calib3d', default=True, description='calib3d module') + variant('core', default=True, description='Include opencv_core module into the OpenCV build') + variant('dnn', default=True, description='Build DNN support') + variant('features2d', default=True, description='features2d module') + variant('flann', default=True, description='flann module') + variant('highgui', default=True, description='Include opencv_highgui module into the OpenCV build') + variant('imgproc', default=True, description='Include opencv_imgproc module into the OpenCV build') + variant('java', default=True, + description='Activates support for Java') + variant('ml', default=True, description='Build ML support') + variant('python', default=True, + description='Enables the build of Python extensions') + variant('stitching', default=True, description='stitching module') + variant('superres', default=True, description='superres module') + variant('ts', default=True, description='Include opencv_ts module into the OpenCV build') + variant('video', default=True, description='video module') + variant('videostab', default=True, description='videostab module') + variant('videoio', default=True, description='videoio module') + + # Optional 3rd party components + variant('cuda', default=True, description='Activates support for CUDA') variant('eigen', default=True, description='Activates support for eigen') variant('ipp', default=True, description='Activates support for IPP') + variant('ipp_iw', default=True, description='Build IPP IW from source') variant('jasper', default=True, description='Activates support for JasPer') - variant('cuda', default=False, description='Activates support for CUDA') - variant('gtk', default=False, description='Activates support for GTK') - variant('vtk', default=False, description='Activates support for VTK') + variant('jpeg', default=True, description='Include JPEG support') + variant('opencl', default=True, description='Include OpenCL Runtime support') + variant('opencl_svm', default=True, description='Include OpenCL Shared Virtual Memory support') + variant('openclamdfft', default=True, description='Include OpenCL AMD OpenCL FFT library support') + variant('openclamdblas', default=True, description='Include OpenCL AMD OpenCL BLAS library support') + variant('openmp', default=True, description='Activates support for OpenMP threads') + variant('pthreads_pf', default=True, description='Use pthreads-based parallel_for') + variant('png', default=True, description='Include PNG support') variant('qt', default=False, description='Activates support for QT') - variant('python', default=False, - description='Enables the build of Python extensions') - variant('java', default=False, - description='Activates support for Java') - variant('openmp', default=False, description='Activates support for OpenMP threads') - variant('core', default=True, description='Include opencv_core module into the OpenCV build') - variant('highgui', default=False, description='Include opencv_highgui module into the OpenCV build') - variant('imgproc', default=False, description='Include opencv_imgproc module into the OpenCV build') - variant('jpeg', default=False, description='Include JPEG support') - variant('png', default=False, description='Include PNG support') - variant('tiff', default=False, description='Include TIFF support') - variant('zlib', default=False, description='Build zlib from source') - variant('dnn', default=False, description='Build DNN support') + variant('gtk', default=True, description='Activates support for GTK') + variant('tiff', default=True, description='Include TIFF support') + variant('vtk', default=True, description='Activates support for VTK') + variant('zlib', default=True, description='Build zlib from source') depends_on('eigen~mpfr', when='+eigen', type='build') @@ -94,44 +121,98 @@ class Opencv(CMakePackage): depends_on('py-numpy', when='+python', type=('build', 'run')) depends_on('protobuf@3.1.0', when='@3.3.0: +dnn') + depends_on('ffmpeg', when='+videoio') + depends_on('mpi', when='+videoio') + extends('python', when='+python') def cmake_args(self): spec = self.spec + # Standard variants args = [ '-DBUILD_SHARED_LIBS:BOOL={0}'.format(( 'ON' if '+shared' in spec else 'OFF')), '-DENABLE_PRECOMPILED_HEADERS:BOOL=OFF', - '-DWITH_IPP:BOOL={0}'.format(( - 'ON' if '+ipp' in spec else 'OFF')), - '-DWITH_CUDA:BOOL={0}'.format(( - 'ON' if '+cuda' in spec else 'OFF')), - '-DWITH_QT:BOOL={0}'.format(( - 'ON' if '+qt' in spec else 'OFF')), - '-DWITH_VTK:BOOL={0}'.format(( - 'ON' if '+vtk' in spec else 'OFF')), - '-DBUILD_opencv_java:BOOL={0}'.format(( - 'ON' if '+java' in spec else 'OFF')), + '-DWITH_LAPACK={0}'.format(( + 'ON' if '+lapack' in spec else 'OFF')), + '-DENABLE_POWERPC={0}'.format(( + 'ON' if '+powerpc' in spec else 'OFF')), + '-DENABLE_VSX={0}'.format(( + 'ON' if '+vsx' in spec else 'OFF')), + '-DENABLE_FAST_MATH={0}'.format(( + 'ON' if '+fast-math' in spec else 'OFF')), + ] + + # modules + args.extend([ + '-DBUILD_opencv_calib3d={0}'.format(( + 'ON' if '+calib3d' in spec else 'OFF')), '-DBUILD_opencv_core:BOOL={0}'.format(( 'ON' if '+core' in spec else 'OFF')), + '-DBUILD_opencv_dnn:BOOL={0}'.format(( + 'ON' if '+dnn' in spec else 'OFF')), + '-DBUILD_opencv_features2d={0}'.format(( + 'ON' if '+features2d' in spec else 'OFF')), + '-DBUILD_opencv_flann={0}'.format(( + 'ON' if '+flann' in spec else 'OFF')), '-DBUILD_opencv_highgui:BOOL={0}'.format(( 'ON' if '+highgui' in spec else 'OFF')), '-DBUILD_opencv_imgproc:BOOL={0}'.format(( 'ON' if '+imgproc' in spec else 'OFF')), + '-DBUILD_opencv_java:BOOL={0}'.format(( + 'ON' if '+java' in spec else 'OFF')), + '-DBUILD_opencv_ml={0}'.format(( + 'ON' if '+ml' in spec else 'OFF')), + '-DBUILD_opencv_stitching={0}'.format(( + 'ON' if '+stitching' in spec else 'OFF')), + '-DBUILD_opencv_superres={0}'.format(( + 'ON' if '+superres' in spec else 'OFF')), + '-DBUILD_opencv_ts={0}'.format(( + 'ON' if '+ts' in spec else 'OFF')), + '-DBUILD_opencv_video={0}'.format(( + 'ON' if '+video' in spec else 'OFF')), + '-DBUILD_opencv_videostab={0}'.format(( + 'ON' if '+videostab' in spec else 'OFF')), + '-DBUILD_opencv_videoio={0}'.format(( + 'ON' if '+videoio' in spec else 'OFF')), + ]) + + # 3rd party components + args.extend([ + '-DWITH_CUDA:BOOL={0}'.format(( + 'ON' if '+cuda' in spec else 'OFF')), + '-DWITH_EIGEN={0}'.format(( + 'ON' if '+eigen' in spec else 'OFF')), + '-DWITH_IPP:BOOL={0}'.format(( + 'ON' if '+ipp' in spec else 'OFF')), + '-DBUILD_IPP_IW:BOOL={0}'.format(( + 'ON' if '+ipp_iw' in spec else 'OFF')), '-DWITH_JPEG:BOOL={0}'.format(( 'ON' if '+jpeg' in spec else 'OFF')), + '-DWITH_OPENCL={0}'.format(( + 'ON' if '+opencl' in spec else 'OFF')), + '-DWITH_OPENCL_SVM={0}'.format(( + 'ON' if '+opencl_svm' in spec else 'OFF')), + '-DWITH_OPENCLAMDFFT={0}'.format(( + 'ON' if '+openclamdfft' in spec else 'OFF')), + '-DWITH_OPENCLAMDBLAS={0}'.format(( + 'ON' if '+openclamdblas' in spec else 'OFF')), + '-DWITH_OPENMP:BOOL={0}'.format(( + 'ON' if '+openmp' in spec else 'OFF')), + '-DWITH_PTHREADS_PF={0}'.format(( + 'ON' if '+pthreads_pf' in spec else 'OFF')), '-DWITH_PNG:BOOL={0}'.format(( 'ON' if '+png' in spec else 'OFF')), + '-DWITH_QT:BOOL={0}'.format(( + 'ON' if '+qt' in spec else 'OFF')), '-DWITH_TIFF:BOOL={0}'.format(( 'ON' if '+tiff' in spec else 'OFF')), + '-DWITH_VTK:BOOL={0}'.format(( + 'ON' if '+vtk' in spec else 'OFF')), '-DWITH_ZLIB:BOOL={0}'.format(( 'ON' if '+zlib' in spec else 'OFF')), - '-DWITH_OPENMP:BOOL={0}'.format(( - 'ON' if '+openmp' in spec else 'OFF')), - '-DBUILD_opencv_dnn:BOOL={0}'.format(( - 'ON' if '+dnn' in spec else 'OFF')), - ] + ]) # Media I/O if '+zlib' in spec: -- cgit v1.2.3-70-g09d2 From 4277b42ddc6512d0fe04da45dc75e4eacf61a365 Mon Sep 17 00:00:00 2001 From: mcneish1 <35310375+mcneish1@users.noreply.github.com> Date: Tue, 8 May 2018 19:08:39 -0700 Subject: Add gdb@8.1; add optional lzma dependency for debug information support (#8068) --- var/spack/repos/builtin/packages/gdb/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gdb/package.py b/var/spack/repos/builtin/packages/gdb/package.py index 18b9d8ae8b..15dfb1d491 100644 --- a/var/spack/repos/builtin/packages/gdb/package.py +++ b/var/spack/repos/builtin/packages/gdb/package.py @@ -34,6 +34,7 @@ class Gdb(AutotoolsPackage): homepage = "https://www.gnu.org/software/gdb" url = "http://ftp.gnu.org/gnu/gdb/gdb-7.10.tar.gz" + version('8.1', '0c85ecbb43569ec43b1c9230622e84ab') version('8.0.1', 'bb45869f8126a84ea2ba13a8c0e7c90e') version('8.0', '9bb49d134916e73b2c01d01bf20363df') version('7.12.1', '06c8f40521ed65fe36ebc2be29b56942') @@ -45,12 +46,14 @@ class Gdb(AutotoolsPackage): version('7.8.2', '8b0ea8b3559d3d90b3ff4952f0aeafbc') variant('python', default=True, description='Compile with Python support') + variant('xz', default=False, description='Compile with lzma support') # Required dependency depends_on('texinfo', type='build') - # Optional dependency + # Optional dependencies depends_on('python', when='+python') + depends_on('xz', when='+xz') def configure_args(self): args = [] -- cgit v1.2.3-70-g09d2 From 7dfc0278e7c828a96ac6592869edd2d8fb99695b Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Wed, 9 May 2018 06:04:06 -0700 Subject: llvm+lldb plaform=darwin: check for lldb_codesign certificate (#7012) * llvm+lldb plaform=darwin: check for lldb_codesign Building LLVM with LLDB requires that the "lldb_codesign" code certificate be created (see https://llvm.org/svn/llvm-project/lldb/trunk/docs/code-signing.txt for details). This commit checks for this certificate on Darwin if LLDB is to be built, and returns an informative error message if this certificate is unavailable. --- var/spack/repos/builtin/packages/llvm/package.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index 448b601c22..7182b5b158 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -415,6 +415,26 @@ class Llvm(CMakePackage): # Github issue #4986 patch('llvm_gcc7.patch', when='@4.0.0:4.0.1+lldb %gcc@7.0:') + @when('+lldb platform=darwin') + @run_before('cmake') + def check_darwin_lldb_codesign_requirement(self): + codesign = which('codesign') + cp = which('cp') + mkdir('tmp') + llvm_check_file = join_path('tmp', 'llvm_check') + cp('/usr/bin/false', llvm_check_file) + + try: + codesign('-f', '-s', 'lldb_codesign', '--dryrun', + llvm_check_file) + + except ProcessError: + explanation = ('The "lldb_codesign" identity must be available' + ' to build LLVM with LLDB. See https://llvm.org/' + 'svn/llvm-project/lldb/trunk/docs/code-signing' + '.txt for details on how to create this identity.') + raise RuntimeError(explanation) + def setup_environment(self, spack_env, run_env): spack_env.append_flags('CXXFLAGS', self.compiler.cxx11_flag) -- cgit v1.2.3-70-g09d2 From ef731cc5115d8336881cf19576362f772921d3c8 Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 9 May 2018 13:10:36 -0500 Subject: perl-extutils-pkgconfig: Add pkg-config dependency (#8045) * perl-extutils-pkgconfig: Add pkg-config dependency * perl-extutils-pkgconfig: fix build dependency * perl-extutils-pkgconfig: fix build dependency --- var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py b/var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py index c383966440..50cbd959e1 100644 --- a/var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py +++ b/var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py @@ -32,3 +32,5 @@ class PerlExtutilsPkgconfig(PerlPackage): url = "http://search.cpan.org/CPAN/authors/id/X/XA/XAOC/ExtUtils-PkgConfig-1.16.tar.gz" version('1.16', 'b86318f2b6ac6af3ee985299e1e38fe5') + + depends_on('pkg-config', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From cadf9242ba6a5385055775a28bc1bf05c15230fa Mon Sep 17 00:00:00 2001 From: mcneish1 <35310375+mcneish1@users.noreply.github.com> Date: Wed, 9 May 2018 18:52:39 -0700 Subject: Add 3.5.2; Add optional cpp implementation enable for py-protobuf (#8069) * Add 3.5.2; Add optional cpp implementation enable for py-protobuf * Make flake8 happy * Give all required install_args --- var/spack/repos/builtin/packages/protobuf/package.py | 1 + var/spack/repos/builtin/packages/py-protobuf/package.py | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/protobuf/package.py b/var/spack/repos/builtin/packages/protobuf/package.py index ec60a0e6d4..a430ff2f11 100644 --- a/var/spack/repos/builtin/packages/protobuf/package.py +++ b/var/spack/repos/builtin/packages/protobuf/package.py @@ -34,6 +34,7 @@ class Protobuf(CMakePackage): url = "https://github.com/google/protobuf/archive/v3.2.0.tar.gz" root_cmakelists_dir = "cmake" + version('3.5.2', 'ff6742018c172c66ecc627029ad54280') version('3.5.1.1', '5005003ae6b94773c4bbca87a644b131') version('3.5.1', '710f1a75983092c9b45ecef207236104') version('3.5.0.1', 'b3ed2401acf167207277b254fd7f9638') diff --git a/var/spack/repos/builtin/packages/py-protobuf/package.py b/var/spack/repos/builtin/packages/py-protobuf/package.py index 7cf2dad7f2..9353cc5925 100644 --- a/var/spack/repos/builtin/packages/py-protobuf/package.py +++ b/var/spack/repos/builtin/packages/py-protobuf/package.py @@ -36,6 +36,12 @@ class PyProtobuf(PythonPackage): homepage = 'https://developers.google.com/protocol-buffers/' url = 'https://pypi.io/packages/source/p/protobuf/protobuf-3.0.0b2.tar.gz' + variant('cpp', default=False, + description='Enable the cpp implementation') + + version('3.5.2.post1', '3b60685732bd0cbdc802dfcb6071efbcf5d927ce3127c13c33ea1a8efae3aa76') + version('3.5.2', '09879a295fd7234e523b62066223b128c5a8a88f682e3aff62fb115e4a0d8be0') + version('3.5.1', '95b78959572de7d7fafa3acb718ed71f482932ddddddbd29ba8319c10639d863') version('3.0.0b2', 'f0d3bd2394345a9af4a277cd0302ae83') version('2.6.1', '6bf843912193f70073db7f22e2ea55e2') version('2.5.0', '338813f3629d59e9579fed9035ecd457') @@ -43,3 +49,13 @@ class PyProtobuf(PythonPackage): version('2.3.0', 'bb020c962f252fe81bfda8fb433bafdd') depends_on('py-setuptools', type='build') + depends_on('protobuf', when='+cpp') + + @when('+cpp') + def build_args(self, spec, prefix): + return ['--cpp_implementation'] + + @when('+cpp') + def install_args(self, spec, prefix): + args = super(PyProtobuf, self).install_args(spec, prefix) + return args + ['--cpp_implementation'] -- cgit v1.2.3-70-g09d2 From 1f8fc574d9e5e6b079da5d2dad8479cde7c1b103 Mon Sep 17 00:00:00 2001 From: David Gardner Date: Wed, 9 May 2018 18:53:25 -0700 Subject: Add new Sundials versions (#8075) * Add new Sundials versions, update minimum cmake version required * specify which versions require a newer cmake * revise cmake dependency * remove develop, add 4.0.0-dev version --- var/spack/repos/builtin/packages/sundials/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sundials/package.py b/var/spack/repos/builtin/packages/sundials/package.py index e0c5dd92b2..138304c660 100644 --- a/var/spack/repos/builtin/packages/sundials/package.py +++ b/var/spack/repos/builtin/packages/sundials/package.py @@ -39,6 +39,8 @@ class Sundials(CMakePackage): # Versions # ========================================================================== + version('4.0.0-dev', '1d4b538721b84ebc91ce7ad92d94beae') + version('3.1.1', 'e63f4de0be5be97f750b30b0fa11ef34', preferred=True) version('3.1.0', '1a84ca41c7f71067e03d519ddbcd9dae') version('3.0.0', '5163a44cedd7398bddda442ba00313b8') version('2.7.0', 'c304631b9bc82877d7b0e9f4d4fd94d3') @@ -164,6 +166,7 @@ class Sundials(CMakePackage): # Build dependencies depends_on('cmake@2.8.1:', type='build') + depends_on('cmake@3.0.2:', type='build', when='@4.0.0:') # MPI related dependencies depends_on('mpi', when='+mpi') -- cgit v1.2.3-70-g09d2 From f4a46f4fc394147f4f8d7820cb432fcbdfb3d0b3 Mon Sep 17 00:00:00 2001 From: healther Date: Thu, 10 May 2018 13:58:43 +0200 Subject: wireshark: stop cmake from picking up /usr paths (#8053) * stop cmake from picking up /usr paths if spack has corresponding packages Change-Id: I7217122562697c7a642cded2b4bfb606d2e35ffb * add libpcap dependency Change-Id: If0d5c2c94b2c2d1cbb9b19e31e44f870b71ba88b * make cmake actually pick up pcap Change-Id: I67b87fd9282c26f5ff4e0a5aedd8bbbae39a5960 * add libtool build dependency Change-Id: I5c6d14dca7ccbe457318903dd170bb19d004e952 * use .libs for pcap Change-Id: Ibe78f8765524385f9da4a8f9963f2c61632cc9f7 * explicitly add bison build dependency Change-Id: I47112778abdf4c0de81789685a7eca4dddb20f77 * add lua explicitly Change-Id: I8e306e1e4cfa0e16138f3a5109ddcfe912120946 * fix libs usage Change-Id: I8c1e03f10df69e3ef74326a13cacaf0e5498e6aa * add minimal version requirement Change-Id: I4dd181389f9a63067df541b982bc0727f974d4ce --- var/spack/repos/builtin/packages/wireshark/package.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/wireshark/package.py b/var/spack/repos/builtin/packages/wireshark/package.py index 3324c26921..939a632043 100644 --- a/var/spack/repos/builtin/packages/wireshark/package.py +++ b/var/spack/repos/builtin/packages/wireshark/package.py @@ -42,15 +42,20 @@ class Wireshark(CMakePackage): variant('gtk', default=False, description='Build with gtk') variant('headers', default=True, description='Install headers') + depends_on('bison', type='build') depends_on('cares') depends_on('doxygen', type='build') depends_on('flex', type='build') + depends_on('git', type='build') depends_on('glib') depends_on('gnutls') depends_on('libgcrypt@1.4.2:') depends_on('libmaxminddb') - depends_on('lua') + depends_on('libtool@2.2.2:', type='build') + depends_on('libpcap') + depends_on('lua@5.0.0:5.2.99') depends_on('krb5') + depends_on('pkg-config', type='build') depends_on('libsmi', when='+smi') depends_on('libssh', when='+libssh') depends_on('nghttp2', when='+nghttp2') @@ -65,7 +70,14 @@ class Wireshark(CMakePackage): args = ['-DENEABLE_CARES=ON', '-DENABLE_GNUTLS=ON', '-DENABLE_LUA=ON', - '-DENABLE_MAXMINDDB=ON'] + '-DENABLE_MAXMINDDB=ON', + '-DYACC_EXECUTABLE=' + self.spec['bison'].prefix.bin.yacc, + '-DGIT_EXECUTABLE=' + self.spec['git'].prefix.bin.git, + '-DPCAP_INCLUDE_DIR=' + self.spec['libpcap'].prefix.include, + '-DPCAP_LIB=' + str(self.spec['libpcap'].libs), + '-DLUA_INCLUDE_DIR=' + self.spec['lua'].prefix.include, + '-DLUA_LIBRARY=' + str(self.spec['lua'].libs) + ] if self.spec.satisfies('+qt'): args.append('-DBUILD_wireshark=ON') args.append('-DENABLE_APPLICATION_BUNDLE=ON') -- cgit v1.2.3-70-g09d2 From 9c4522ecbd8601c46158c2498adb6168f5476754 Mon Sep 17 00:00:00 2001 From: David Wootton <38671868+dwootton-ny@users.noreply.github.com> Date: Thu, 10 May 2018 13:49:18 -0400 Subject: petsc: specify number of processors used for test case (#8015) For Spectrum MPI, if -np is omitted, the default behavior is to assign one process per process slot, where the default process slot allocation is one per core. On systems with many cores, the number of processes can exceed the size of the grid specified when the testcase is run and the test case fails. This specifies a small number of processes when running the test case to prevent failure. --- var/spack/repos/builtin/packages/petsc/package.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index ba120aac8f..6ad968bbe4 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -296,6 +296,18 @@ class Petsc(Package): cc('ex50.c', '-I%s' % prefix.include, '-L%s' % prefix.lib, '-lpetsc', '-lm', '-o', 'ex50') run = Executable(join_path(spec['mpi'].prefix.bin, 'mpirun')) + # For Spectrum MPI, if -np is omitted, the default behavior is + # to assign one process per process slot, where the default + # process slot allocation is one per core. On systems with + # many cores, the number of processes can exceed the size of + # the grid specified when the testcase is run and the test case + # fails. Specify a small number of processes to prevent + # failure. + # For more information about Spectrum MPI invocation, see URL + # https://www.ibm.com/support/knowledgecenter/en/SSZTET_10.1.0/smpi02/smpi02_mpirun_options.html + if ('spectrum-mpi' in spec): + run.add_default_arg('-np') + run.add_default_arg('4') run('ex50', '-da_grid_x', '4', '-da_grid_y', '4') if 'superlu-dist' in spec: run('ex50', -- cgit v1.2.3-70-g09d2 From 55473dd32162c3506e4bd8881ae3b0424f2f0d5b Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Thu, 10 May 2018 17:32:58 -0500 Subject: r-mmwrweek: new pacakge (#8086) --- .../repos/builtin/packages/r-mmwrweek/package.py | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-mmwrweek/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-mmwrweek/package.py b/var/spack/repos/builtin/packages/r-mmwrweek/package.py new file mode 100644 index 0000000000..4a5f3e7cdf --- /dev/null +++ b/var/spack/repos/builtin/packages/r-mmwrweek/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RMmwrweek(RPackage): + """The first day of any MMWR week is Sunday. MMWR week numbering is + sequential beginning with 1 and incrementing with each week to a maximum + of 52 or 53. MMWR week #1 of an MMWR year is the first week of the year + that has at least four days in the calendar year. This package provides + functionality to convert Dates to MMWR day, week, and year and the + reverse.""" + + homepage = "https://cran.r-project.org/package=MMWRweek" + url = "https://cran.r-project.org/src/contrib/MMWRweek_0.1.1.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/MMWRweek" + + version('0.1.1', 'a1245025126f8a96c72be8f7b06b0499') -- cgit v1.2.3-70-g09d2 From 206e61bafdde19b6ec28583386e08917aefb91b0 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Fri, 11 May 2018 14:22:12 +0200 Subject: gmsh: add netgen and tetgen (#8060) * gmsh: add netgen and tetgen dealii: require gmsh+netgen+tetgen netgen: use http instead of https * dealii: add oce requirement to gmsh --- var/spack/repos/builtin/packages/dealii/package.py | 2 +- var/spack/repos/builtin/packages/gmsh/package.py | 45 ++++++++++++++-------- var/spack/repos/builtin/packages/netgen/package.py | 2 +- 3 files changed, 31 insertions(+), 18 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 2e8db4f505..f6b8ba449e 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -120,7 +120,7 @@ class Dealii(CMakePackage, CudaPackage): depends_on('assimp', when='@9.0:+assimp') depends_on('doxygen+graphviz', when='+doc') depends_on('graphviz', when='+doc') - depends_on('gmsh', when='@9.0:+gmsh', type=('build', 'run')) + depends_on('gmsh+tetgen+netgen+oce', when='@9.0:+gmsh', type=('build', 'run')) depends_on('gsl', when='@8.5.0:+gsl') depends_on('hdf5+mpi+hl', when='+hdf5+mpi') depends_on('cuda@8:', when='+cuda') diff --git a/var/spack/repos/builtin/packages/gmsh/package.py b/var/spack/repos/builtin/packages/gmsh/package.py index f798bd1e7f..ece75c4bde 100644 --- a/var/spack/repos/builtin/packages/gmsh/package.py +++ b/var/spack/repos/builtin/packages/gmsh/package.py @@ -45,19 +45,16 @@ class Gmsh(CMakePackage): version('2.12.0', '7fbd2ec8071e79725266e72744d21e902d4fe6fa9e7c52340ad5f4be5c159d09') version('2.11.0', 'f15b6e7ac9ca649c9a74440e1259d0db') - variant('shared', default=True, - description='Enables the build of shared libraries') - variant('mpi', default=True, - description='Builds MPI support for parser and solver') - variant('fltk', default=False, - description='Enables the build of the FLTK GUI') + variant('shared', default=True, description='Enables the build of shared libraries') + variant('mpi', default=True, description='Builds MPI support for parser and solver') + variant('fltk', default=False, description='Enables the build of the FLTK GUI') variant('hdf5', default=False, description='Enables HDF5 support') - variant('compression', default=True, - description='Enables IO compression through zlib') + variant('compression', default=True, description='Enables IO compression through zlib') + variant('netgen', default=False, description='Build with Netgen') variant('oce', default=False, description='Build with OCE') variant('petsc', default=False, description='Build with PETSc') - variant('slepc', default=False, - description='Build with SLEPc (only when PETSc is enabled)') + variant('slepc', default=False, description='Build with SLEPc (only when PETSc is enabled)') + variant('tetgen', default=False, description='Build with Tetgen') depends_on('blas') depends_on('lapack') @@ -67,12 +64,16 @@ class Gmsh(CMakePackage): # Assumes OpenGL with GLU is already provided by the system: depends_on('fltk', when='+fltk') depends_on('hdf5', when='+hdf5') + depends_on('netgen', when='+netgen') depends_on('oce', when='+oce') depends_on('petsc+mpi', when='+petsc+mpi') depends_on('petsc', when='+petsc~mpi') depends_on('slepc', when='+slepc+petsc') + depends_on('tetgen', when='+tetgen') depends_on('zlib', when='+compression') + conflicts('+slepc', when='~petsc') + def cmake_args(self): spec = self.spec prefix = self.prefix @@ -103,21 +104,33 @@ class Gmsh(CMakePackage): if '+oce' in spec: env['CASROOT'] = self.spec['oce'].prefix - options.extend(['-DENABLE_OCC=ON']) + options.append('-DENABLE_OCC=ON') else: - options.extend(['-DENABLE_OCC=OFF']) + options.append('-DENABLE_OCC=OFF') if '+petsc' in spec: env['PETSC_DIR'] = self.spec['petsc'].prefix - options.extend(['-DENABLE_PETSC=ON']) + options.append('-DENABLE_PETSC=ON') + else: + options.append('-DENABLE_PETSC=OFF') + + if '+tetgen' in spec: + env['TETGEN_DIR'] = self.spec['tetgen'].prefix + options.append('-DENABLE_TETGEN=ON') + else: + options.append('-DENABLE_TETGEN=OFF') + + if '+netgen' in spec: + env['NETGEN_DIR'] = self.spec['netgen'].prefix + options.append('-DENABLE_NETGEN=ON') else: - options.extend(['-DENABLE_PETSC=OFF']) + options.append('-DENABLE_NETGEN=OFF') if '+slepc' in spec: env['SLEPC_DIR'] = self.spec['slepc'].prefix - options.extend(['-DENABLE_SLEPC=ON']) + options.append('-DENABLE_SLEPC=ON') else: - options.extend(['-DENABLE_SLEPC=OFF']) + options.append('-DENABLE_SLEPC=OFF') if '+shared' in spec: # Builds dynamic executable and installs shared library diff --git a/var/spack/repos/builtin/packages/netgen/package.py b/var/spack/repos/builtin/packages/netgen/package.py index ef9d448b6e..6273d5ae18 100644 --- a/var/spack/repos/builtin/packages/netgen/package.py +++ b/var/spack/repos/builtin/packages/netgen/package.py @@ -48,7 +48,7 @@ class Netgen(AutotoolsPackage): depends_on('metis', when='+metis') def url_for_version(self, version): - url = "https://gigenet.dl.sourceforge.net/project/netgen-mesher/netgen-mesher/{0}/netgen-{1}.tar.gz" + url = "http://gigenet.dl.sourceforge.net/project/netgen-mesher/netgen-mesher/{0}/netgen-{1}.tar.gz" return url.format(version.up_to(2), version) def configure_args(self): -- cgit v1.2.3-70-g09d2 From 28bebe13a8e0fcce716c6adb6789f43e99f4665d Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Fri, 11 May 2018 15:50:35 +0200 Subject: dealii: disable tpetra when +cuda; check for '' in cuda_arch (#7958) * dealii: disable tpetra when +cuda; check for '' in cuda_arch * trilinos: fix Kokkos CUDA * Revert "trilinos: fix Kokkos CUDA" This reverts commit 6aae894bc7d49c9e736c06f65b81b8c219443920. * update according to @aprokop comments * minor * fix flake8 --- var/spack/repos/builtin/packages/dealii/package.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index f6b8ba449e..3bb377aab3 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -146,8 +146,12 @@ class Dealii(CMakePackage, CudaPackage): depends_on('slepc@:3.6.3', when='@:8.4.1+slepc+petsc+mpi') depends_on('slepc~arpack', when='+slepc+petsc+mpi+int64') depends_on('sundials~pthread', when='@9.0:+sundials') - depends_on('trilinos+amesos+aztec+epetra+ifpack+ml+muelu+rol+sacado+teuchos', when='+trilinos+mpi~int64') - depends_on('trilinos+amesos+aztec+epetra+ifpack+ml+muelu+rol+sacado+teuchos~hypre', when='+trilinos+mpi+int64') + depends_on('trilinos+amesos+aztec+epetra+ifpack+ml+muelu+rol+sacado+teuchos', when='+trilinos+mpi~int64~cuda') + depends_on('trilinos+amesos+aztec+epetra+ifpack+ml+muelu+rol+sacado+teuchos~hypre', when='+trilinos+mpi+int64~cuda') + # FIXME: temporary disable Tpetra when using CUDA due to + # namespace "Kokkos::Impl" has no member "cuda_abort" + depends_on('trilinos@master+amesos+aztec+epetra+ifpack+ml+muelu+rol+sacado+teuchos~amesos2~ifpack2~intrepid2~kokkos~tpetra~zoltan2', when='+trilinos+mpi~int64+cuda') + depends_on('trilinos@master+amesos+aztec+epetra+ifpack+ml+muelu+rol+sacado+teuchos~hypre~amesos2~ifpack2~intrepid2~kokkos~tpetra~zoltan2', when='+trilinos+mpi+int64+cuda') # check that the combination of variants makes sense conflicts('^openblas+ilp64', when='@:8.5.1') @@ -252,15 +256,15 @@ class Dealii(CMakePackage, CudaPackage): if not spec.satisfies('^cuda@9:'): options.append('-DDEAL_II_WITH_CXX14=OFF') cuda_arch = spec.variants['cuda_arch'].value - if cuda_arch is not None: + if cuda_arch is not None and cuda_arch[0] is not '': if len(cuda_arch) > 1: raise InstallError( 'deal.II only supports compilation for a single GPU!' ) flags = '-arch=sm_{0}'.format(cuda_arch[0]) # FIXME: there are some compiler errors in dealii - # with flags below. Stick with -arch=sm_xy for now. - # flags = ' '.join(self.cuda_flags(cuda_arch)) + # with: flags = ' '.join(self.cuda_flags(cuda_arch)) + # Stick with -arch=sm_xy for now. options.append( '-DDEAL_II_CUDA_FLAGS={0}'.format(flags) ) -- cgit v1.2.3-70-g09d2 From 5bc970f9b664f73e03e4825891fa7b39b82dd846 Mon Sep 17 00:00:00 2001 From: Mayeul d'Avezac Date: Fri, 11 May 2018 16:32:31 +0100 Subject: adds new version to swiftsim (#8093) --- var/spack/repos/builtin/packages/swiftsim/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/swiftsim/package.py b/var/spack/repos/builtin/packages/swiftsim/package.py index 602a03fd73..81b0aced07 100644 --- a/var/spack/repos/builtin/packages/swiftsim/package.py +++ b/var/spack/repos/builtin/packages/swiftsim/package.py @@ -35,6 +35,7 @@ class Swiftsim(AutotoolsPackage): homepage = 'http://icc.dur.ac.uk/swift/' url = 'https://gitlab.cosma.dur.ac.uk/api/v4/projects/swift%2Fswiftsim/repository/archive.tar.gz?sha=v0.3.0' + version('0.7.0', '1c703d7e20a31a3896e1c291bddd71ab') version('0.3.0', '162ec2bdfdf44a31a08b3fcee23a886a') variant('mpi', default=True, -- cgit v1.2.3-70-g09d2 From 79669ac6474943dc4f6f27e847fbd04515f43bb1 Mon Sep 17 00:00:00 2001 From: scheibelp Date: Fri, 11 May 2018 12:32:26 -0700 Subject: llvm: replace @when with internal check in @run_before (#8092) Fixes #8088 #7012 added a @when condition for a @run_before check to constrain that check to only run on Darwin. @when is intended to be used to choose one of several different implementations of a given function and cannot be used to conditionally deactivate a check altogether. This replaces the external decorator with a check that executes at the beginning of the function. --- var/spack/repos/builtin/packages/llvm/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index 7182b5b158..8d5d2a6ec8 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -415,9 +415,10 @@ class Llvm(CMakePackage): # Github issue #4986 patch('llvm_gcc7.patch', when='@4.0.0:4.0.1+lldb %gcc@7.0:') - @when('+lldb platform=darwin') @run_before('cmake') def check_darwin_lldb_codesign_requirement(self): + if not self.spec.satisfies('+lldb platform=darwin'): + return codesign = which('codesign') cp = which('cp') mkdir('tmp') -- cgit v1.2.3-70-g09d2 From 35e1af9acca29d4bf88d593e46b24396622182e6 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Fri, 11 May 2018 14:43:21 -0500 Subject: masurca: new version (#8094) * masurca: new version * masurca: reorder versions --- var/spack/repos/builtin/packages/masurca/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/masurca/package.py b/var/spack/repos/builtin/packages/masurca/package.py index b62c741864..9c35f45657 100644 --- a/var/spack/repos/builtin/packages/masurca/package.py +++ b/var/spack/repos/builtin/packages/masurca/package.py @@ -34,6 +34,7 @@ class Masurca(Package): homepage = "http://www.genome.umd.edu/masurca.html" url = "ftp://ftp.genome.umd.edu/pub/MaSuRCA/latest/MaSuRCA-3.2.3.tar.gz" + version('3.2.6', 'f068f91e33fd7381de406a7a954bfe01') version('3.2.3', 'd9b4419adfe6b64e42ce986253a50ff5') depends_on('perl', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From efbc2307426d6544a4b64c7d995084c6c382036c Mon Sep 17 00:00:00 2001 From: Howard Pritchard Date: Fri, 11 May 2018 20:58:29 -0600 Subject: pmix: add 1.2.5 and 2.0.3 bug fix releases (#8097) Signed-off-by: Howard Pritchard --- var/spack/repos/builtin/packages/pmix/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pmix/package.py b/var/spack/repos/builtin/packages/pmix/package.py index 402cd9e248..a5de237e9c 100644 --- a/var/spack/repos/builtin/packages/pmix/package.py +++ b/var/spack/repos/builtin/packages/pmix/package.py @@ -51,9 +51,11 @@ class Pmix(AutotoolsPackage): version('2.1.1', 'f9f109421661b757245d5e0bd44a38b3') version('2.1.0', 'fc97513b601d78fe7c6bb20c6a21df3c') + version('2.0.3', 'fae199c9fa1d1f1bc20c336f1292f950') version('2.0.2', 'e3ed1deed87c84f9b43da2621c6ad689') version('2.0.1', 'ba3193b485843516e6b4e8641e443b1e') version('2.0.0', '3e047c2ea0ba8ee9925ed92b205fd92e') + version('1.2.5', 'c3d20cd9d365a813dc367afdf0f41c37') version('1.2.4', '242a812e206e7c5948f1f5c9688eb2a7') version('1.2.3', '102b1cc650018b62348b45d572b158e9') version('1.2.2', 'd85c8fd437bd88f984549425ad369e9f') -- cgit v1.2.3-70-g09d2 From e271f14493ecd0305ac073914e451b6bcc50e3ba Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Sat, 12 May 2018 04:59:25 +0200 Subject: dealii: add 9.0.0 (#8096) --- var/spack/repos/builtin/packages/dealii/package.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 3bb377aab3..e36a5a204e 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -37,6 +37,7 @@ class Dealii(CMakePackage, CudaPackage): # only add for immediate deps. transitive_rpaths = False + version('9.0.0', 'de44a8fdc72646be6585d8bc836ac9d9') version('8.5.1', '39b9ebd6ab083d63cfc9044319aaa2ee') version('8.5.0', 'ef999cc310b007559a6343bf5b1759bc') version('8.4.2', '84c6bd3f250d3e0681b645d24cb987a7') @@ -48,20 +49,20 @@ class Dealii(CMakePackage, CudaPackage): version('develop', git='https://github.com/dealii/dealii.git', branch='master') variant('mpi', default=True, description='Compile with MPI') - variant('assimp', default=False, + variant('assimp', default=True, description='Compile with Assimp') variant('arpack', default=True, description='Compile with Arpack and PArpack (only with MPI)') - variant('adol-c', default=False, + variant('adol-c', default=True, description='Compile with Adol-c') variant('doc', default=False, description='Compile with documentation') - variant('gmsh', default=False, description='Compile with GMSH') + variant('gmsh', default=True, description='Compile with GMSH') variant('gsl', default=True, description='Compile with GSL') variant('hdf5', default=True, description='Compile with HDF5 (only with MPI)') variant('metis', default=True, description='Compile with Metis') - variant('nanoflann', default=False, description='Compile with Nanoflann') + variant('nanoflann', default=True, description='Compile with Nanoflann') variant('netcdf', default=True, description='Compile with Netcdf (only with MPI)') variant('oce', default=True, description='Compile with OCE') @@ -69,9 +70,9 @@ class Dealii(CMakePackage, CudaPackage): description='Compile with P4est (only with MPI)') variant('petsc', default=True, description='Compile with Petsc (only with MPI)') - variant('scalapack', default=False, + variant('scalapack', default=True, description='Compile with ScaLAPACK (only with MPI)') - variant('sundials', default=False, + variant('sundials', default=True, description='Compile with Sundials') variant('slepc', default=True, description='Compile with Slepc (only with Petsc and MPI)') -- cgit v1.2.3-70-g09d2 From 262de647926c877ecbe60518eee14c0023190fb3 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Sat, 12 May 2018 01:22:45 -0500 Subject: shoremap: new package (#7343) --- var/spack/repos/builtin/packages/dislin/package.py | 23 +++++++++ var/spack/repos/builtin/packages/libxt/package.py | 6 +++ .../repos/builtin/packages/shoremap/package.py | 54 ++++++++++++++++++++++ 3 files changed, 83 insertions(+) create mode 100644 var/spack/repos/builtin/packages/shoremap/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dislin/package.py b/var/spack/repos/builtin/packages/dislin/package.py index 05f8cfa153..f662f0b4fc 100644 --- a/var/spack/repos/builtin/packages/dislin/package.py +++ b/var/spack/repos/builtin/packages/dislin/package.py @@ -33,11 +33,31 @@ class Dislin(Package): homepage = "http://www.mps.mpg.de/dislin" url = "ftp://ftp.gwdg.de/pub/grafik/dislin/linux/i586_64/dislin-11.0.linux.i586_64.tar.gz" + version('11.1.linux.i586_64', '34218c257efedaf706f058bdf111ce9d') version('11.0.linux.i586_64', '6fb099b54f41db009cafc702eebb5bc6') depends_on('motif') depends_on('mesa') + @property + def libs(self): + query_parameters = self.spec.last_query.extra_parameters + query2libraries = { + tuple(): ['libdislin'], + ('d',): ['libdislin_d'], + ('c', ): ['libdislnc'], + ('cd',): ['libdislnc_d'], + ('cxx',): ['libdiscpp'], + ('java',): ['libdisjava'] + } + + key = tuple(query_parameters) + libraries = query2libraries[key] + + return find_libraries( + libraries, root=self.prefix, shared=True, recursive=True + ) + def setup_environment(self, spack_env, run_env): spack_env.set('DISLIN', self.prefix) run_env.set('DISLIN', self.prefix) @@ -46,6 +66,9 @@ class Dislin(Package): run_env.prepend_path('LD_LIBRARY_PATH', self.spec['motif'].prefix.lib) run_env.prepend_path('LD_LIBRARY_PATH', self.spec['mesa'].prefix.lib) + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): + run_env.prepend_path('LD_LIBRARY_PATH', self.prefix) + def install(self, spec, prefix): INSTALL = Executable('./INSTALL') INSTALL() diff --git a/var/spack/repos/builtin/packages/libxt/package.py b/var/spack/repos/builtin/packages/libxt/package.py index b50871fe9f..2b09c57de4 100644 --- a/var/spack/repos/builtin/packages/libxt/package.py +++ b/var/spack/repos/builtin/packages/libxt/package.py @@ -41,3 +41,9 @@ class Libxt(AutotoolsPackage): depends_on('kbproto', type='build') depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') + + @property + def libs(self): + return find_libraries( + 'libXt', root=self.prefix, shared=True, recursive=True + ) diff --git a/var/spack/repos/builtin/packages/shoremap/package.py b/var/spack/repos/builtin/packages/shoremap/package.py new file mode 100644 index 0000000000..663c2d48f4 --- /dev/null +++ b/var/spack/repos/builtin/packages/shoremap/package.py @@ -0,0 +1,54 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Shoremap(MakefilePackage): + """SHOREmap is a computational tool implementing a method that enables + simple and straightforward mapping-by-sequencing analysis. + + Whole genome resequencing of pools of recombinant mutant genomes allows + directly linking phenotypic traits to causal mutations. Such an + analysis, called mapping-by-sequencing, combines classical genetic + mapping and next generation sequencing by relying on selection-induced + patterns within genome-wide allele frequency in pooled genomes.""" + + homepage = "http://bioinfo.mpipz.mpg.de/shoremap/" + url = "http://bioinfo.mpipz.mpg.de/shoremap/SHOREmap_v3.6.tar.gz" + + version('3.6', 'ccc9331189705a139d50f2c161178cb1') + + depends_on('dislin') + + def edit(self, spec, prefix): + makefile = FileFilter('makefile') + makefile.filter(r'-L/usr/lib/', + self.spec['libxt'].libs.search_flags) + makefile.filter(r'-L\./dislin.* -ldislin_d', + self.spec['dislin:d'].libs.ld_flags) + + def install(self, spec, prefix): + mkdirp(prefix.bin) + install('SHOREmap', prefix.bin) -- cgit v1.2.3-70-g09d2 From 36ee0cbf883f72e88caaa05441dfbcadba406991 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Sat, 12 May 2018 17:24:59 +0200 Subject: netcdf: added version 4.6.1 (#8098) --- var/spack/repos/builtin/packages/netcdf/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/netcdf/package.py b/var/spack/repos/builtin/packages/netcdf/package.py index c68950a855..43e910893f 100644 --- a/var/spack/repos/builtin/packages/netcdf/package.py +++ b/var/spack/repos/builtin/packages/netcdf/package.py @@ -45,6 +45,7 @@ class Netcdf(AutotoolsPackage): # Version 4.4.1.1 is having problems in tests # https://github.com/Unidata/netcdf-c/issues/343 + version('4.6.1', 'ee81c593efc8a6229d9bcb350b6d7849') version('4.4.1.1', '503a2d6b6035d116ed53b1d80c811bda') # netcdf@4.4.1 can crash on you (in real life and in tests). See: # https://github.com/Unidata/netcdf-c/issues/282 -- cgit v1.2.3-70-g09d2 From 867bd9b48cf4027698cef65bb6e625bcabaf190a Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Sat, 12 May 2018 17:25:28 +0200 Subject: nfft: added version 3.4.1 Moved package to github (#8099) --- var/spack/repos/builtin/packages/nfft/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nfft/package.py b/var/spack/repos/builtin/packages/nfft/package.py index 8321d76845..b373584d51 100644 --- a/var/spack/repos/builtin/packages/nfft/package.py +++ b/var/spack/repos/builtin/packages/nfft/package.py @@ -31,9 +31,10 @@ class Nfft(AutotoolsPackage): size, and of complex data.""" homepage = "https://www-user.tu-chemnitz.de/~potts/nfft" - url = "https://www-user.tu-chemnitz.de/~potts/nfft/download/nfft-3.3.2.tar.gz" + url = "https://github.com/NFFT/nfft/releases/download/3.4.1/nfft-3.4.1.tar.gz" - version('3.3.2', '550737c06f4d6ea6c156800169d8f0d9') + version('3.4.1', '9c2ad6cf86fe4a7bc0de8d2d92b101f4') + version('3.3.2', '13e48b923501ed6feb5130c3be115fc8') depends_on('fftw') -- cgit v1.2.3-70-g09d2 From 97f1b36c07702c8c29617e9b618e2b12b7062eaa Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Sat, 12 May 2018 18:28:18 -0500 Subject: r-cdcfluview: new package (#8089) * r-cdcfluview: new package * updated package.py --- .../repos/builtin/packages/r-cdcfluview/package.py | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-cdcfluview/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-cdcfluview/package.py b/var/spack/repos/builtin/packages/r-cdcfluview/package.py new file mode 100644 index 0000000000..ccb914dacf --- /dev/null +++ b/var/spack/repos/builtin/packages/r-cdcfluview/package.py @@ -0,0 +1,51 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RCdcfluview(RPackage): + """The 'U.S.' Centers for Disease Control ('CDC') maintains a portal + for accessing + state, regional and national influenza statistics as well as Mortality + Surveillance Data. The web interface makes it difficult and time-consuming + to select and retrieve influenza data. Tools are provided to access the + data provided by the portal's underlying 'API'.""" + + homepage = "https://cran.r-project.org/package=cdcfluview" + url = "https://cran.r-project.org/src/contrib/cdcfluview_0.7.0.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/cdcfluview" + + version('0.7.0', 'd592606fab3da3536f39a15c0fdbcd17') + + depends_on('r-httr', type=('build', 'run')) + depends_on('r-dplyr', type=('build', 'run')) + depends_on('r-jsonlite', type=('build', 'run')) + depends_on('r-sf', type=('build', 'run')) + depends_on('r-xml2', type=('build', 'run')) + depends_on('r-purrr', type=('build', 'run')) + depends_on('r-readr', type=('build', 'run')) + depends_on('r-mmwrweek', type=('build', 'run')) + depends_on('r-units@0.4-6:', type=('build', 'run')) + depends_on('r@3.2.0:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 8dd5ac357cc2f62770effc377c640c76f0acf0df Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Sat, 12 May 2018 16:37:10 -0700 Subject: Add package for "bumpversion" (#8078) * Add package for "bumpversion" bumpversion is a tool that automagically increments version numbers for projects. It can update files and do other magic along the way. * Remove py- package prefix and use pypi.io URL Renamed the package 'bumpversion'. Fetch the package from pypi.io. * Add version info for bumpverion@0.5.3 --- .../repos/builtin/packages/bumpversion/package.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 var/spack/repos/builtin/packages/bumpversion/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bumpversion/package.py b/var/spack/repos/builtin/packages/bumpversion/package.py new file mode 100644 index 0000000000..2be81abb25 --- /dev/null +++ b/var/spack/repos/builtin/packages/bumpversion/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Bumpversion(PythonPackage): + """Version-bump your software with a single command.""" + + homepage = "https://pypi.python.org/pypi/bumpversion" + url = "https://pypi.io/packages/source/b/bumpversion/bumpversion-0.5.0.tar.gz" + + version('0.5.3', 'c66a3492eafcf5ad4b024be9fca29820') + version('0.5.0', '222ba619283d6408ce1bfbb0b5b542f3') + + depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From 8270344042d89f4c0b789dfeead991d30c701787 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Sat, 12 May 2018 18:38:22 -0500 Subject: plink: new source version 1.9-beta5 (#8076) * plink: new source version 1.9-beta5 * plink: replace version 1.9 with 1.07 --- var/spack/repos/builtin/packages/plink/package.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/plink/package.py b/var/spack/repos/builtin/packages/plink/package.py index 2ebc7a0242..7a6c47d47c 100644 --- a/var/spack/repos/builtin/packages/plink/package.py +++ b/var/spack/repos/builtin/packages/plink/package.py @@ -32,10 +32,22 @@ class Plink(Package): homepage = "https://www.cog-genomics.org/plink/1.9/" - version('1.9', 'a2325881594856c0f1b7523290d1e04f', - url='https://www.cog-genomics.org/static/bin/plink170815/plink_linux_x86_64.zip') + version('1.9-beta5', '737545504ae19348a44a05fa69b75c28', + url='https://github.com/chrchang/plink-ng/archive/b15c19f.tar.gz') + version('1.07', 'fd0bafeda42151b20534e4f97b0d97df', + url='http://zzz.bwh.harvard.edu/plink/dist/plink-1.07-x86_64.zip', + preferred=True) + + depends_on('atlas', when='@1.9-beta5') + depends_on('netlib-lapack', when='@1.9-beta5') def install(self, spec, prefix): mkdirp(prefix.bin) - install('plink', prefix.bin) - install('prettify', prefix.bin) + if spec.version == Version('1.07'): + install('plink', prefix.bin) + install('gPLINK.jar', prefix.bin) + if spec.version == Version('1.9-beta5'): + with working_dir('1.9'): + first_compile = Executable('./plink_first_compile') + first_compile() + install('plink', prefix.bin) -- cgit v1.2.3-70-g09d2 From 2d53043361559714161be43b0e3e5e24464b5b6a Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Sat, 12 May 2018 17:40:36 -0600 Subject: Create custom PATH that texlive requires in its module. (#8064) * Create custom PATH that texlive requires in its module. * Updating texlive to 2018 distribution. * Using platform instead of sys for easier portability across linux and osx. --- var/spack/repos/builtin/packages/texlive/package.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/texlive/package.py b/var/spack/repos/builtin/packages/texlive/package.py index b2b4951df0..1fdc41cc5f 100644 --- a/var/spack/repos/builtin/packages/texlive/package.py +++ b/var/spack/repos/builtin/packages/texlive/package.py @@ -24,6 +24,7 @@ ############################################################################## from spack import * import os +import platform class Texlive(Package): @@ -44,8 +45,8 @@ class Texlive(Package): # itself is stable. Don't let that fool you though, it's still # installing TeX **LIVE** from e.g. ctan.math.... below, which is # not reproducible. - version('live', '8f8fc301514c08a89a2e97197369c648', - url='ftp://tug.org/historic/systems/texlive/2017/install-tl-unx.tar.gz') + version('live', '946701aa28ca1f93e55e8310ce63fbf8', + url='ftp://tug.org/historic/systems/texlive/2018/install-tl-unx.tar.gz') # There does not seem to be a complete list of schemes. # Examples include: @@ -65,6 +66,10 @@ class Texlive(Package): depends_on('perl', type='build') + def setup_environment(self, spack_env, run_env): + suffix = "%s-%s" % (platform.machine(), platform.system().lower()) + run_env.prepend_path('PATH', join_path(self.prefix.bin, suffix)) + def install(self, spec, prefix): # Using texlive's mirror system leads to mysterious problems, # in lieu of being able to specify a repository as a variant, hardwire -- cgit v1.2.3-70-g09d2 From e758820ed72cc8bbd7ac5157b9e00ba6f369b7db Mon Sep 17 00:00:00 2001 From: dorier Date: Mon, 14 May 2018 03:54:12 +0100 Subject: boost: added the +numpy variant which enables building libboost_numpy (#8104) * added the +numpy variant which enables building the libboost_numpy libraries * Update package.py Added `type=('build', 'run')` --- var/spack/repos/builtin/packages/boost/package.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index fb1ade8bcc..5666df8baa 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -144,14 +144,18 @@ class Boost(Package): description="Augment library layout with versioned subdirs") variant('clanglibcpp', default=False, description='Compile with clang libc++ instead of libstdc++') + variant('numpy', default=False, + description='Build the Boost NumPy library (requires +python)') depends_on('icu4c', when='+icu') depends_on('python', when='+python') depends_on('mpi', when='+mpi') depends_on('bzip2', when='+iostreams') depends_on('zlib', when='+iostreams') + depends_on('py-numpy', when='+numpy', type=('build', 'run')) conflicts('+taggedlayout', when='+versionedlayout') + conflicts('+numpy', when='~python') # Patch fix from https://svn.boost.org/trac/boost/ticket/11856 patch('boost_11856.patch', when='@1.60.0%gcc@4.4.7') -- cgit v1.2.3-70-g09d2 From 9f4c2a65a888f7eda9bbe7d86bb24f345c05994c Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Sun, 13 May 2018 21:00:18 -0600 Subject: charliecloud: initial commit (#8106) --- .../repos/builtin/packages/charliecloud/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/charliecloud/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/charliecloud/package.py b/var/spack/repos/builtin/packages/charliecloud/package.py new file mode 100644 index 0000000000..6d3ab479d5 --- /dev/null +++ b/var/spack/repos/builtin/packages/charliecloud/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Los Alamos National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Charliecloud(MakefilePackage): + """Lightweight user-defined software stacks for HPC.""" + + homepage = "https://hpc.github.io/charliecloud" + url = "https://github.com/hpc/charliecloud/archive/v0.2.4.tar.gz" + + version('0.2.4', 'b112de661c2c360174b42c99022c1967') + + @property + def install_targets(self): + return ['install', 'PREFIX=%s' % self.prefix] -- cgit v1.2.3-70-g09d2 From 36b4c899fbd06a99f671948160182d185b61b04f Mon Sep 17 00:00:00 2001 From: Sajid Ali <30510036+s-sajid-ali@users.noreply.github.com> Date: Sun, 13 May 2018 22:01:36 -0500 Subject: Add cmake for newer version of libjpeg-turbo (#8102) * modified: package.py * add official build reference. * Update package.py * Update package.py * Update package.py * fixed with pep8online.com * update make to make() * change homepage --- .../builtin/packages/libjpeg-turbo/package.py | 25 ++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libjpeg-turbo/package.py b/var/spack/repos/builtin/packages/libjpeg-turbo/package.py index 109a68e996..a9e7e235ea 100644 --- a/var/spack/repos/builtin/packages/libjpeg-turbo/package.py +++ b/var/spack/repos/builtin/packages/libjpeg-turbo/package.py @@ -25,15 +25,16 @@ from spack import * -class LibjpegTurbo(AutotoolsPackage): +class LibjpegTurbo(Package): """libjpeg-turbo is a fork of the original IJG libjpeg which uses SIMD to accelerate baseline JPEG compression and decompression. libjpeg is a library that implements JPEG image encoding, decoding and transcoding.""" + # https://github.com/libjpeg-turbo/libjpeg-turbo/blob/master/BUILDING.md + homepage = "https://libjpeg-turbo.org/" + url = "https://github.com/libjpeg-turbo/libjpeg-turbo/archive/1.5.90.tar.gz" - homepage = "http://libjpeg-turbo.virtualgl.org" - url = "https://sourceforge.net/projects/libjpeg-turbo/files/1.5.3/libjpeg-turbo-1.5.3.tar.gz" - + version('1.5.90', '85f7f9c377b70cbf48e61726097d4efa') version('1.5.3', '7c82f0f6a3130ec06b8a4d0b321cbca3') version('1.5.0', '3fc5d9b6a8bce96161659ae7a9939257') version('1.3.1', '2c3a68129dac443a72815ff5bb374b05') @@ -46,3 +47,19 @@ class LibjpegTurbo(AutotoolsPackage): # TODO: Implement the selection between two supported assemblers. # depends_on("yasm", type='build') depends_on("nasm", type='build') + depends_on('cmake', type='build', when="@1.5.90:") + + @when('@:1.5.3') + def install(self, spec, prefix): + configure('--prefix=%s' % prefix) + make() + make('install') + + @when('@1.5.90:') + def install(self, spec, prefix): + cmake_args = ['-GUnix Makefiles'] + cmake_args.extend(std_cmake_args) + with working_dir('spack-build', create=True): + cmake('..', *cmake_args) + make() + make('install') -- cgit v1.2.3-70-g09d2 From 05cd983e108764d288798784508249726b0ffd70 Mon Sep 17 00:00:00 2001 From: healther Date: Mon, 14 May 2018 10:44:27 +0200 Subject: add version 0.6.2 to yaml-cpp (#7931) --- var/spack/repos/builtin/packages/yaml-cpp/package.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/yaml-cpp/package.py b/var/spack/repos/builtin/packages/yaml-cpp/package.py index 734d54bf2e..c9141e3201 100644 --- a/var/spack/repos/builtin/packages/yaml-cpp/package.py +++ b/var/spack/repos/builtin/packages/yaml-cpp/package.py @@ -31,6 +31,7 @@ class YamlCpp(CMakePackage): homepage = "https://github.com/jbeder/yaml-cpp" url = "https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.5.3.tar.gz" + version('0.6.2', '5b943e9af0060d0811148b037449ef82') version('0.5.3', '2bba14e6a7f12c7272f87d044e4a7211') version('develop', git='https://github.com/jbeder/yaml-cpp', branch='master') @@ -39,7 +40,16 @@ class YamlCpp(CMakePackage): variant('pic', default=True, description='Build with position independent code') - depends_on('boost', when='@:0.5.3') + depends_on('boost@:1.66.99', when='@:0.5.3') + + conflicts('%gcc@:4.8', when='@0.6.0:', msg="versions 0.6.0: require c++11 support") + conflicts('%clang@:3.3.0', when='@0.6.0:', msg="versions 0.6.0: require c++11 support") + # currently we can't check for apple-clang's version + # conflicts('%clang@:4.0.0-apple', when='@0.6.0:', + # msg="versions 0.6.0: require c++11 support") + conflicts('%intel@:11.1', when='@0.6.0:', msg="versions 0.6.0: require c++11 support") + conflicts('%xl@:13.1', when='@0.6.0:', msg="versions 0.6.0: require c++11 support") + conflicts('%xl_r@:13.1', when='@0.6.0:', msg="versions 0.6.0: require c++11 support") def cmake_args(self): spec = self.spec -- cgit v1.2.3-70-g09d2 From 635f3e2969763b9dcf07c7a6e5cc63d6ed35eafe Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Mon, 14 May 2018 10:49:26 +0200 Subject: dealii: update hash due to upstream changes (#8105) --- var/spack/repos/builtin/packages/dealii/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index e36a5a204e..6c2eb44f75 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -37,7 +37,7 @@ class Dealii(CMakePackage, CudaPackage): # only add for immediate deps. transitive_rpaths = False - version('9.0.0', 'de44a8fdc72646be6585d8bc836ac9d9') + version('9.0.0', 'a714efc1979c55f69152d2742864bfaf') version('8.5.1', '39b9ebd6ab083d63cfc9044319aaa2ee') version('8.5.0', 'ef999cc310b007559a6343bf5b1759bc') version('8.4.2', '84c6bd3f250d3e0681b645d24cb987a7') -- cgit v1.2.3-70-g09d2 From 0dabe81a203fdc0580f22800927eca5cd1ed1506 Mon Sep 17 00:00:00 2001 From: Sajid Ali <30510036+s-sajid-ali@users.noreply.github.com> Date: Mon, 14 May 2018 09:46:14 -0500 Subject: Add numexpr 3 (#8107) * new file: package.py * corrected using pep8online.com * Update package.py * correct typo * as requested --- .../repos/builtin/packages/py-numexpr3/package.py | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-numexpr3/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-numexpr3/package.py b/var/spack/repos/builtin/packages/py-numexpr3/package.py new file mode 100644 index 0000000000..3b27238ef1 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-numexpr3/package.py @@ -0,0 +1,48 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyNumexpr3(PythonPackage): + """Numexpr3 is a fast numerical expression evaluator for NumPy. With it, + expressions that operate on arrays (like "3*a+4*b") are accelerated and + use less memory than doing the same calculation in Python. + In addition, its multi-threaded capabilities can make use of all your + cores, which may accelerate computations, most specially if they are not + memory-bounded (e.g. those using transcendental functions). + Compared to NumExpr 2.6, functions have been re-written in a fashion such + that gcc can auto-vectorize them with SIMD instruction sets such as + SSE2 or AVX2, if your processor supports them. Use of a newer version of + gcc such as 5.4 is strongly recommended.""" + homepage = "https://github.com/pydata/numexpr/tree/numexpr-3.0" + url = "https://pypi.io/packages/source/n/numexpr3/numexpr3-3.0.1a1.tar.gz" + + version('3.0.1.a1', '9fa8dc59b149aa1956fc755f982a78ad') + # TODO: Add CMake build system for better control of passing flags related + # to CPU ISA. + + depends_on('python@2.6:2.8,3.3:', type=('build', 'run')) + depends_on('py-numpy@1.7:', type=('build', 'run')) + depends_on('py-setuptools@18.2:', type='build') -- cgit v1.2.3-70-g09d2 From 32662c4edb655ab3b10a8611c473173bbcc1cb50 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Mon, 14 May 2018 09:46:54 -0500 Subject: hisea: new package (#8112) --- var/spack/repos/builtin/packages/hisea/package.py | 43 +++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 var/spack/repos/builtin/packages/hisea/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hisea/package.py b/var/spack/repos/builtin/packages/hisea/package.py new file mode 100644 index 0000000000..5910b91f8b --- /dev/null +++ b/var/spack/repos/builtin/packages/hisea/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Hisea(MakefilePackage): + """HISEA is an efficient all-vs-all long read aligner for SMRT sequencing + data. Its algorithm is designed to produce highest alignment sensitivity + among others.""" + + homepage = "https://doi.org/10.1186/s12859-017-1953-9" + url = "https://github.com/lucian-ilie/HISEA" + + version('2017.12.26', '54211bdc33b7ce52a8f1e76845935eb8', + url='https://github.com/lucian-ilie/HISEA/tarball/39e01e98caa0f2101da806ca59306296effe789c') + + depends_on('boost') + + def install(self, spec, prefix): + mkdirp(prefix.bin) + install('hisea', prefix.bin) -- cgit v1.2.3-70-g09d2 From 341132a87fa9d32d45c81627d8cc290d40046fe5 Mon Sep 17 00:00:00 2001 From: 健美猞猁 Date: Tue, 15 May 2018 00:07:00 +0800 Subject: A new pacakge: Kaiju. (#8111) * A new package: kaiju. * Replace ftp:// with https://. --- var/spack/repos/builtin/packages/kaiju/package.py | 48 +++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 var/spack/repos/builtin/packages/kaiju/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/kaiju/package.py b/var/spack/repos/builtin/packages/kaiju/package.py new file mode 100644 index 0000000000..e77e3f529d --- /dev/null +++ b/var/spack/repos/builtin/packages/kaiju/package.py @@ -0,0 +1,48 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Kaiju(MakefilePackage): + """Kaiju is a program for the taxonomic classification + of high-throughput sequencing reads.""" + + homepage = "https://github.com/bioinformatics-centre/kaiju" + url = "https://github.com/bioinformatics-centre/kaiju/archive/v1.6.2.zip" + + version('1.6.2', '0bd85368954837aa31f3de8b87ea410b') + + build_directory = 'src' + + depends_on('perl-io-compress', type='run') + depends_on('py-htseq', type='run') + + def edit(self, spec, prefix): + # Replace ftp:// with https:// + makedb = FileFilter('util/makeDB.sh') + makedb.filter('ftp://', 'https://', string=True) + + def install(self, spec, prefix): + install_tree('bin', prefix.bin) -- cgit v1.2.3-70-g09d2 From 42137d59ef7b147d200864ba000b40d2fd9ac8ea Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Mon, 14 May 2018 18:07:19 +0200 Subject: dealii: another fix for quick tests only in 9.0 and thus hash (#8114) --- var/spack/repos/builtin/packages/dealii/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 6c2eb44f75..2c1daab97c 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -37,7 +37,7 @@ class Dealii(CMakePackage, CudaPackage): # only add for immediate deps. transitive_rpaths = False - version('9.0.0', 'a714efc1979c55f69152d2742864bfaf') + version('9.0.0', 'a4d45a67b2b028ecf81a6cb621cfaf84') version('8.5.1', '39b9ebd6ab083d63cfc9044319aaa2ee') version('8.5.0', 'ef999cc310b007559a6343bf5b1759bc') version('8.4.2', '84c6bd3f250d3e0681b645d24cb987a7') -- cgit v1.2.3-70-g09d2 From 1aef372fbf0e0b207a643c3750e67d0ab26292b1 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Mon, 14 May 2018 10:09:57 -0600 Subject: charliecloud: fix copyright (#8115) --- var/spack/repos/builtin/packages/charliecloud/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/charliecloud/package.py b/var/spack/repos/builtin/packages/charliecloud/package.py index 6d3ab479d5..70d538af28 100644 --- a/var/spack/repos/builtin/packages/charliecloud/package.py +++ b/var/spack/repos/builtin/packages/charliecloud/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Copyright (c) 2018, Los Alamos National Security, LLC # Produced at the Los Alamos National Laboratory. # # This file is part of Spack. -- cgit v1.2.3-70-g09d2 From b5d578a5e183f88ba48b73d2271c95ea49a6567a Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Mon, 14 May 2018 11:10:19 -0500 Subject: Aegean: new package (#8113) * aegean: new package * genometools: set dependent env for aegean --- var/spack/repos/builtin/packages/aegean/package.py | 43 ++++++++++++++++++++++ .../repos/builtin/packages/genometools/package.py | 3 ++ 2 files changed, 46 insertions(+) create mode 100644 var/spack/repos/builtin/packages/aegean/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/aegean/package.py b/var/spack/repos/builtin/packages/aegean/package.py new file mode 100644 index 0000000000..8ec71982e5 --- /dev/null +++ b/var/spack/repos/builtin/packages/aegean/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Aegean(MakefilePackage): + """The AEGeAn Toolkit is designed for the Analysis and Evaluation of + Genome Annotations. The toolkit includes a variety of analysis programs + as well as a C library whose API provides access to AEGeAn's core + functions and data structures.""" + + homepage = "http://brendelgroup.github.io/AEGeAn/" + url = "https://github.com/BrendelGroup/AEGeAn/archive/v0.15.2.tar.gz" + + version('0.15.2', 'd7d73f5f132ff52340975b636564e949') + + depends_on('genometools') + + def edit(self, spec, prefix): + makefile = FileFilter('Makefile') + makefile.filter('/usr/local', prefix) diff --git a/var/spack/repos/builtin/packages/genometools/package.py b/var/spack/repos/builtin/packages/genometools/package.py index e08a97b9b4..86e092e7b0 100644 --- a/var/spack/repos/builtin/packages/genometools/package.py +++ b/var/spack/repos/builtin/packages/genometools/package.py @@ -43,3 +43,6 @@ class Genometools(MakefilePackage): def install(self, spec, prefix): make('install', 'prefix=%s' % prefix) + + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): + spack_env.set('CPATH', self.prefix.include.genometools) -- cgit v1.2.3-70-g09d2 From a47ff73c6e740015d21f15e1b426c057c4b42940 Mon Sep 17 00:00:00 2001 From: Sajid Ali <30510036+s-sajid-ali@users.noreply.github.com> Date: Mon, 14 May 2018 11:26:01 -0500 Subject: Update py-llvmlite to reflect llvm@6 requirement for versions >0.23.0 (#8109) * new file: package.py * corrected using pep8online.com * Update package.py * correct typo * as requested * modified: package.py * Update package.py --- var/spack/repos/builtin/packages/py-llvmlite/package.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-llvmlite/package.py b/var/spack/repos/builtin/packages/py-llvmlite/package.py index 3e82c4ee38..b5248d496f 100644 --- a/var/spack/repos/builtin/packages/py-llvmlite/package.py +++ b/var/spack/repos/builtin/packages/py-llvmlite/package.py @@ -29,11 +29,14 @@ class PyLlvmlite(PythonPackage): """A lightweight LLVM python binding for writing JIT compilers""" homepage = "http://llvmlite.readthedocs.io/en/latest/index.html" - url = "https://pypi.io/packages/source/l/llvmlite/llvmlite-0.20.0.tar.gz" + url = "https://pypi.io/packages/source/l/llvmlite/llvmlite-0.23.0.tar.gz" + version('0.23.0', '6fc856576a11dbeef71de862f7c419de') version('0.20.0', 'f2aa60d0981842b7930ba001b03679ab') depends_on('py-setuptools', type='build') - depends_on('py-enum34', type=('build', 'run'), when='^python@:3.3.99') + depends_on('python@2.6:2.8,3.4:', type=('build', 'run')) + depends_on('py-enum34', type=('build', 'run'), when='^python@:3.3.99') + depends_on('llvm@6.0:', when='@0.23.0:') depends_on('llvm@4.0:4.99', when='@0.17.0:0.20.99') depends_on('binutils', type='build') -- cgit v1.2.3-70-g09d2 From f2cc7f769b1d4a2c3c528d3f7efe41dc93560da2 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 14 May 2018 12:59:49 -0500 Subject: r-squash: Create new package (#8118) * r-squash: Create new package * Remove dependency already included in RPackage base class * remove extra file --- .../repos/builtin/packages/r-squash/package.py | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-squash/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-squash/package.py b/var/spack/repos/builtin/packages/r-squash/package.py new file mode 100644 index 0000000000..053b59c82e --- /dev/null +++ b/var/spack/repos/builtin/packages/r-squash/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RSquash(RPackage): + """Color-Based Plots for Multivariate Visualization""" + + homepage = "https://cran.r-project.org/package=squash" + url = "https://cran.r-project.org/src/contrib/squash_1.0.8.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/squash" + + version('1.0.8', '50d5743d306fa11cfa1a3c4daa75e508') + version('1.0.7', '4ac381b17d4d7b77bdaa6f824fbb03ab') -- cgit v1.2.3-70-g09d2 From 28982bd1035f2d6393b94acd1d1b797d6f54807a Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 14 May 2018 13:00:03 -0500 Subject: r-picante: Create new package (#8117) * r-picante: Create new package * Remove dependency already included in RPackage base class --- .../repos/builtin/packages/r-picante/package.py | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-picante/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-picante/package.py b/var/spack/repos/builtin/packages/r-picante/package.py new file mode 100644 index 0000000000..d213bfea8e --- /dev/null +++ b/var/spack/repos/builtin/packages/r-picante/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RPicante(RPackage): + """R tools for integrating phylogenies and ecology""" + + homepage = "https://cran.r-project.org/package=picante" + url = "https://cran.r-project.org/src/contrib/picante_1.6-2.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/picante" + + version('1.6-2', 'e3eba6ef254068d2cfa9e96760bcd7a3') + version('1.6-1', '73d86b90eceda582654e995d47236d6e') + + depends_on('r-ape', type=('build', 'run')) + depends_on('r-nlme', type=('build', 'run')) + depends_on('r-vegan', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From e7a737621f81b7d532aeed733df5fc9e215fc93a Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 14 May 2018 13:00:18 -0500 Subject: r-shinydashboard: Create new package (#8116) --- .../builtin/packages/r-shinydashboard/package.py | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-shinydashboard/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-shinydashboard/package.py b/var/spack/repos/builtin/packages/r-shinydashboard/package.py new file mode 100644 index 0000000000..9ac12623ea --- /dev/null +++ b/var/spack/repos/builtin/packages/r-shinydashboard/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RShinydashboard(RPackage): + """Create Dashboards with 'Shiny'""" + + homepage = "https://cran.r-project.org/package=shinydashboard" + url = "https://cran.r-project.org/src/contrib/shinydashboard_0.7.0.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/shinydashboard" + + version('0.7.0', 'a572695884e3b45320b0ab5a7b364ffd') + version('0.6.1', '0f6ad0448237e10d53d4d27ade1c6863') + + depends_on('r@3.3.0:', type=('build', 'run')) + depends_on('r-htmltools@0.2.6:', type=('build', 'run')) + depends_on('r-shiny@1.0.0:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 281e22ed7324c0efeea27709762102f098af7fa9 Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Mon, 14 May 2018 11:58:34 -0700 Subject: LBANN: add hydrogen as optional dependency (#8085) Add Hydrogen package for fork of Elemental library. Update LBANN to use either Hydrogen or Elemental. --- .../repos/builtin/packages/hydrogen/package.py | 158 +++++++++++++++++++++ var/spack/repos/builtin/packages/lbann/package.py | 36 ++++- 2 files changed, 188 insertions(+), 6 deletions(-) create mode 100644 var/spack/repos/builtin/packages/hydrogen/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hydrogen/package.py b/var/spack/repos/builtin/packages/hydrogen/package.py new file mode 100644 index 0000000000..449e29a999 --- /dev/null +++ b/var/spack/repos/builtin/packages/hydrogen/package.py @@ -0,0 +1,158 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +import os +import sys +from spack import * +from spack.spec import UnsupportedCompilerError + + +class Hydrogen(CMakePackage): + """Hydrogen: Distributed-memory dense and sparse-direct linear algebra + and optimization library. Based on the Elemental library.""" + + homepage = "http://libelemental.org" + url = "https://github.com/LLNL/Elemental/archive/0.99.tar.gz" + + version('develop', git='https://github.com/LLNL/Elemental.git', branch='hydrogen') + version('0.99', 'b678433ab1d498da47acf3dc5e056c23') + + variant('shared', default=True, + description='Enables the build of shared libraries') + variant('hybrid', default=True, + description='Make use of OpenMP within MPI packing/unpacking') + variant('openmp_blas', default=False, + description='Use OpenMP for threading in the BLAS library') + variant('quad', default=False, + description='Enable quad precision') + variant('int64', default=False, + description='Use 64bit integers') + variant('int64_blas', default=False, + description='Use 64bit integers for BLAS.') + variant('scalapack', default=False, + description='Build with ScaLAPACK library') + variant('build_type', default='Release', + description='The build type to build', + values=('Debug', 'Release')) + variant('blas', default='openblas', values=('openblas', 'mkl', 'accelerate', 'essl'), + description='Enable the use of OpenBlas/MKL/Accelerate/ESSL') + variant('mpfr', default=False, + description='Support GNU MPFR\'s' + 'arbitrary-precision floating-point arithmetic') + variant('cuda', default=False, + description='Builds with support for GPUs via CUDA and cuDNN') + variant('test', default=False, + description='Builds test suite') + + # Note that #1712 forces us to enumerate the different blas variants + depends_on('openblas', when='blas=openblas ~openmp_blas ~int64_blas') + depends_on('openblas +ilp64', when='blas=openblas ~openmp_blas +int64_blas') + depends_on('openblas threads=openmp', when='blas=openblas +openmp_blas ~int64_blas') + depends_on('openblas threads=openmp +lip64', when='blas=openblas +openmp_blas +int64_blas') + + depends_on('intel-mkl', when="blas=mkl ~openmp_blas ~int64_blas") + depends_on('intel-mkl +ilp64', when="blas=mkl ~openmp_blas +int64_blas") + depends_on('intel-mkl threads=openmp', when='blas=mkl +openmp_blas ~int64_blas') + depends_on('intel-mkl@2017.1 +openmp +ilp64', when='blas=mkl +openmp_blas +int64_blas') + + depends_on('veclibfort', when='blas=accelerate') + conflicts('blas=accelerate +openmp_blas') + + depends_on('essl -cuda', when='blas=essl -openmp_blas ~int64_blas') + depends_on('essl -cuda +ilp64', when='blas=essl -openmp_blas +int64_blas') + depends_on('essl threads=openmp', when='blas=essl +openmp_blas ~int64_blas') + depends_on('essl threads=openmp +ilp64', when='blas=essl +openmp_blas +int64_blas') + depends_on('netlib-lapack +external-blas', when='blas=essl') + + # Note that this forces us to use OpenBLAS until #1712 is fixed + depends_on('lapack', when='blas=openblas ~openmp_blas') + + depends_on('mpi', when='~cuda') + depends_on('mpi +cuda', when='+cuda') + + depends_on('scalapack', when='+scalapack') + depends_on('gmp', when='+mpfr') + depends_on('mpc', when='+mpfr') + depends_on('mpfr', when='+mpfr') + + depends_on('cuda', when='+cuda') + depends_on('cudnn', when='+cuda') + depends_on('cub', when='+cuda') + + @property + def libs(self): + shared = True if '+shared' in self.spec else False + return find_libraries( + 'libEl', root=self.prefix, shared=shared, recursive=True + ) + + @when('@:0.84' or '@0.99:') + def cmake_args(self): + spec = self.spec + + if '@:0.87.7' in spec and '%intel@:17.0.2' in spec: + raise UnsupportedCompilerError( + "Elemental {0} has a known bug with compiler: {1} {2}".format( + spec.version, spec.compiler.name, spec.compiler.version)) + + args = [ + '-DCMAKE_INSTALL_MESSAGE:STRING=LAZY', + '-DCMAKE_C_COMPILER=%s' % spec['mpi'].mpicc, + '-DCMAKE_CXX_COMPILER=%s' % spec['mpi'].mpicxx, + '-DCMAKE_Fortran_COMPILER=%s' % spec['mpi'].mpifc, + '-DBUILD_SHARED_LIBS:BOOL=%s' % ('+shared' in spec), + '-DHydrogen_ENABLE_OPENMP:BOOL=%s' % ('+hybrid' in spec), + '-DHydrogen_ENABLE_QUADMATH:BOOL=%s' % ('+quad' in spec), + '-DHydrogen_USE_64BIT_INTS:BOOL=%s' % ('+int64' in spec), + '-DHydrogen_USE_64BIT_BLAS_INTS:BOOL=%s' % ('+int64_blas' in spec), + '-DHydrogen_ENABLE_MPC:BOOL=%s' % ('+mpfr' in spec), + '-DHydrogen_GENERAL_LAPACK_FALLBACK=ON', + '-DHydrogen_ENABLE_CUDA=%s' % ('+cuda' in spec), + '-DHydrogen_ENABLE_TESTING=%s' % ('+test' in spec), + ] + + # Add support for OS X to find OpenMP + if (self.spec.satisfies('%clang')): + if (sys.platform == 'darwin'): + clang = self.compiler.cc + clang_bin = os.path.dirname(clang) + clang_root = os.path.dirname(clang_bin) + args.extend([ + '-DOpenMP_DIR={0}'.format(clang_root)]) + + if 'blas=openblas' in spec: + args.extend([ + '-DHydrogen_USE_OpenBLAS:BOOL=%s' % ('blas=openblas' in spec), + '-DOpenBLAS_DIR:STRING={0}'.format( + spec['hydrogen'].prefix)]) + elif 'blas=mkl' in spec: + args.extend([ + '-DHydrogen_USE_MKL:BOOL=%s' % ('blas=mkl' in spec)]) + elif 'blas=accelerate' in spec: + args.extend(['-DHydrogen_USE_ACCELERATE:BOOL=TRUE']) + elif 'blas=essl' in spec: + args.extend([ + '-DHydrogen_USE_ESSL:BOOL=%s' % ('blas=essl' in spec)]) + + return args diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index 0d9b6532a6..55a966e9a9 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -51,13 +51,30 @@ class Lbann(CMakePackage): description='The build type to build', values=('Debug', 'Release')) - depends_on('elemental +openmp_blas +shared +int64') + # It seems that there is a need for one statement per version bounds + depends_on('hydrogen +openmp_blas +shared +int64', when='@0.95:') + depends_on('hydrogen +openmp_blas +shared +int64', when='@:0.90') + depends_on('hydrogen +openmp_blas +shared +int64 build_type=Debug', + when=('build_type=Debug' '@0.95:')) + depends_on('hydrogen +openmp_blas +shared +int64 build_type=Debug', + when=('build_type=Debug' '@:0.90')) + depends_on('hydrogen +openmp_blas +shared +int64 +cuda', + when=('+gpu' '@0.95:')) + depends_on('hydrogen +openmp_blas +shared +int64 +cuda', + when=('+gpu' '@:0.90')) + depends_on('hydrogen +openmp_blas +shared +int64 +cuda build_type=Debug', + when=('build_type=Debug' '@0.95:' '+gpu')) + depends_on('hydrogen +openmp_blas +shared +int64 +cuda build_type=Debug', + when=('build_type=Debug' '@:0.90' '+gpu')) + depends_on('elemental +openmp_blas +shared +int64', when=('@0.91:0.94')) depends_on('elemental +openmp_blas +shared +int64 build_type=Debug', - when=('build_type=Debug')) + when=('build_type=Debug' '@0.91:0.94')) + depends_on('cuda', when='+gpu') depends_on('cudnn', when='+gpu') depends_on('cub', when='+gpu') - depends_on('mpi') + depends_on('mpi', when='~gpu') + depends_on('mpi +cuda', when='+gpu') depends_on('hwloc ~pci ~libxml2') # LBANN wraps OpenCV calls in OpenMP parallel loops, build without OpenMP # Additionally disable video related options, they incorrectly link in a @@ -89,7 +106,7 @@ class Lbann(CMakePackage): # Get any recent versions or non-numeric version # Note that develop > numeric and non-develop < numeric - @when('@:0.91' or '@0.94:') + @when('@:0.90' or '@0.94:') def cmake_args(self): spec = self.spec args = self.common_config_args @@ -99,11 +116,18 @@ class Lbann(CMakePackage): ('+seq_init' in spec), '-DLBANN_WITH_TBINF=OFF', '-DLBANN_WITH_VTUNE=OFF', - '-DElemental_DIR={0}/CMake/elemental'.format( - spec['elemental'].prefix), '-DLBANN_DATATYPE={0}'.format(spec.variants['dtype'].value), '-DLBANN_VERBOSE=0']) + if self.spec.satisfies('@:0.90') or self.spec.satisfies('@0.95:'): + args.extend([ + '-DHydrogen_DIR={0}/CMake/hydrogen'.format( + spec['hydrogen'].prefix)]) + elif self.spec.satisfies('@0.94'): + args.extend([ + '-DElemental_DIR={0}/CMake/elemental'.format( + spec['elemental'].prefix)]) + # Add support for OpenMP if (self.spec.satisfies('%clang')): if (sys.platform == 'darwin'): -- cgit v1.2.3-70-g09d2 From c5b1336b6974a37c4da1ae1b8e2e265825be9942 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 14 May 2018 16:38:59 -0500 Subject: r-vipor: Create new package (#8128) --- .../repos/builtin/packages/r-vipor/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-vipor/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-vipor/package.py b/var/spack/repos/builtin/packages/r-vipor/package.py new file mode 100644 index 0000000000..a0423eb251 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-vipor/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RVipor(RPackage): + """Plot Categorical Data Using Quasirandom Noise and Density Estimates""" + + homepage = "https://cran.r-project.org/package=vipor" + url = "https://cran.r-project.org/src/contrib/vipor_0.4.5.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/vipor" + + version('0.4.5', 'd08bc95b3aaf1574bf41b7eb41b67ce4') + version('0.4.4', '834212e3971787809ba9737744d54dee') + + depends_on('r@3.0.0:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 6cf1d25d14e9f9a56212b9c2ad1f16d80bdcd913 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 14 May 2018 16:50:54 -0500 Subject: r-fit-models: Create new package (#8122) --- .../repos/builtin/packages/r-fit-models/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-fit-models/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-fit-models/package.py b/var/spack/repos/builtin/packages/r-fit-models/package.py new file mode 100644 index 0000000000..4627fab93e --- /dev/null +++ b/var/spack/repos/builtin/packages/r-fit-models/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RFitModels(RPackage): + """Compare Fitted Models""" + + homepage = "https://cran.r-project.org/package=fit.models" + url = "https://cran.r-project.org/src/contrib/fit.models_0.5-14.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/fit.models" + + version('0.5-14', '159b5c57953db4c917bc186ddacdff51') + version('0.5-13', 'c9ff87e98189bcc3be597e3833408497') + + depends_on('r-lattice', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 34a2d35e50f88679f8c98285c1a4c4d2391c6311 Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Mon, 14 May 2018 16:56:49 -0500 Subject: lordec: Create new package. (#8095) * lordec: Create new package. * lordec: Add homepage, change to MakefilePackage. * Modify dependency type. --- var/spack/repos/builtin/packages/lordec/package.py | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 var/spack/repos/builtin/packages/lordec/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lordec/package.py b/var/spack/repos/builtin/packages/lordec/package.py new file mode 100644 index 0000000000..ba20910c05 --- /dev/null +++ b/var/spack/repos/builtin/packages/lordec/package.py @@ -0,0 +1,44 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Lordec(MakefilePackage): + """LoRDEC is a program to correct sequencing errors in long reads from + 3rd generation sequencing with high error rate, and is especially + intended for PacBio reads.""" + + homepage = "http://www.atgc-montpellier.fr/lordec/" + url = "https://gite.lirmm.fr/lordec/lordec-releases/uploads/e3116a5f251e46e47f7a3b7ddb2bd7f6/lordec-src_0.8.tar.gz" + + version('0.8', 'd5a57db681d1cd31c516aa780ce53f9d') + + depends_on('boost') + depends_on('cmake@3.1.0:', type='build') + + build_targets = ['clean', 'all'] + + def install(self, spec, prefix): + install_tree('.', prefix.bin) -- cgit v1.2.3-70-g09d2 From 3a7fadd67e881af6b6cf3d2588dcec6ced6b2c8e Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Mon, 14 May 2018 19:19:46 -0400 Subject: prenek missing X.h (#8121) --- var/spack/repos/builtin/packages/nek5000/package.py | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nek5000/package.py b/var/spack/repos/builtin/packages/nek5000/package.py index 2ea0654a2b..b18d220bb1 100644 --- a/var/spack/repos/builtin/packages/nek5000/package.py +++ b/var/spack/repos/builtin/packages/nek5000/package.py @@ -85,6 +85,7 @@ class Nek5000(Package): depends_on('libx11', when="+postnek") # libxt is needed for X11/Intrinsic.h but not for linking depends_on('libxt', when="+prenek") + depends_on('xproto', when="+prenek") depends_on('libxt', when="+postnek") depends_on('visit', when="+visit") @@ -125,6 +126,14 @@ class Nek5000(Package): raise RuntimeError('Xlib.h not found in %s' % spec['libx11'].prefix.include) cflags += ['-I%s' % os.path.dirname(libx11_h.directories[0])] + + xproto_h = find_headers('X', spec['xproto'].prefix.include, + recursive=True) + if not xproto_h: + raise RuntimeError('X.h not found in %s' % + spec['xproto'].prefix.include) + cflags += ['-I%s' % os.path.dirname(xproto_h.directories[0])] + libxt_h = find_headers('Intrinsic', spec['libxt'].prefix.include, recursive=True) if not libxt_h: -- cgit v1.2.3-70-g09d2 From 538d617d142ab672b1ee8385a2f422519f43fcec Mon Sep 17 00:00:00 2001 From: snehring Date: Mon, 14 May 2018 18:48:28 -0500 Subject: salmon: adding in version restriction for boost (#8129) 1.67 does not work with this --- var/spack/repos/builtin/packages/salmon/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/salmon/package.py b/var/spack/repos/builtin/packages/salmon/package.py index d849988b4c..552a1c44ac 100644 --- a/var/spack/repos/builtin/packages/salmon/package.py +++ b/var/spack/repos/builtin/packages/salmon/package.py @@ -36,7 +36,7 @@ class Salmon(CMakePackage): version('0.8.2', 'ee512697bc44b13661a16d4e14cf0a00') depends_on('tbb') - depends_on('boost') + depends_on('boost@:1.66.0') def cmake_args(self): args = ['-DBOOST_ROOT=%s' % self.spec['boost'].prefix] -- cgit v1.2.3-70-g09d2 From b95660863186e78cdd05cf05d121d1be83468f50 Mon Sep 17 00:00:00 2001 From: Robert Pavel Date: Mon, 14 May 2018 19:29:03 -0600 Subject: Added Shim to Support hdf5+mpi in Spack Silo (#8130) * Added Shim to Support hdf5+mpi in Spack Silo Added compatibility for hdf5+mpi to silo spackage to support spackages with dependency chains that include silo and hf5+mpi * Fixed fixable flake8 issue with silo spackage Fixed missing whitespace around operator * Setting MPI Variant to Default to True As per guidance changing variant to default to MPI builds --- var/spack/repos/builtin/packages/silo/package.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/silo/package.py b/var/spack/repos/builtin/packages/silo/package.py index a6fd19a7aa..add7b781bb 100644 --- a/var/spack/repos/builtin/packages/silo/package.py +++ b/var/spack/repos/builtin/packages/silo/package.py @@ -42,8 +42,11 @@ class Silo(Package): description='Builds Silex, a GUI for viewing Silo files') variant('pic', default=True, description='Produce position-independent code (for shared libs)') + variant('mpi', default=True, + description='Compile with MPI Compatibility') - depends_on('hdf5~mpi') + depends_on('hdf5~mpi', when='~mpi') + depends_on('hdf5+mpi', when='+mpi') depends_on('qt', when='+silex') patch('remove-mpiposix.patch', when='@4.8:4.10.2') @@ -69,6 +72,11 @@ class Silo(Package): 'CXXFLAGS={0}'.format(self.compiler.pic_flag), 'FCFLAGS={0}'.format(self.compiler.pic_flag)] + if '+mpi' in spec: + config_args.append('CC=%s' % spec['mpi'].mpicc) + config_args.append('CXX=%s' % spec['mpi'].mpicxx) + config_args.append('FC=%s' % spec['mpi'].mpifc) + configure( '--prefix=%s' % prefix, '--with-hdf5=%s,%s' % (spec['hdf5'].prefix.include, -- cgit v1.2.3-70-g09d2 From 0598f70de2b3e78b5f81af96a272c637a54f4d74 Mon Sep 17 00:00:00 2001 From: Serban Maerean Date: Tue, 15 May 2018 02:53:05 -0400 Subject: patch petsc test cases for XL compiler (#8091) - After spack install, these test cases are built in a seperate step, outside of spack, but they need to patched after staging so users don't have to do it in a seperate step. - The test cases are installed under `/share/petsc/examples` and can be built and executed by invoking `gmake -f gmakefile.test` in that directory. --- var/spack/repos/builtin/packages/petsc/package.py | 2 + .../builtin/packages/petsc/xlc-test-3.9.0.diff | 60 ++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 var/spack/repos/builtin/packages/petsc/xlc-test-3.9.0.diff (limited to 'var') diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index 6ad968bbe4..a54661643b 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -102,6 +102,8 @@ class Petsc(Package): patch('macos-clang-8.1.0.diff', when='@3.7.5%clang@8.1.0:') patch('pkg-config-3.7.6-3.8.4.diff', when='@3.7.6:3.8.4') + patch('xlc-test-3.9.0.diff', when='@3.9: %xl') + patch('xlc-test-3.9.0.diff', when='@3.9: %xl_r') # Virtual dependencies # Git repository needs sowing to build Fortran interface diff --git a/var/spack/repos/builtin/packages/petsc/xlc-test-3.9.0.diff b/var/spack/repos/builtin/packages/petsc/xlc-test-3.9.0.diff new file mode 100644 index 0000000000..ce41cfaed5 --- /dev/null +++ b/var/spack/repos/builtin/packages/petsc/xlc-test-3.9.0.diff @@ -0,0 +1,60 @@ +--- a/gmakefile.test ++++ b/gmakefile.test +@@ -123,15 +123,16 @@ + ifeq ($(FC_MODULE_OUTPUT_FLAG),) + $(call quiet,FCMOD) $(MODDIR) && $(FC) -c $(FC_FLAGS) $(FFLAGS) $(FCPPFLAGS) $(FC_DEPFLAGS) -I$(dir $<) $(abspath $<) -o $(abspath $@) + else +- $(PETSC_COMPILE.F) -I$(dir $<) $(abspath $<) -o $@ $(FC_MODULE_OUTPUT_FLAG)$(MODDIR) ++ $(PETSC_COMPILE.F) -I$(dir $<) -I$(MODDIR) $(abspath $<) -o $@ $(FC_MODULE_OUTPUT_FLAG)$(MODDIR) + endif + -@$(GFORTRAN_DEP_CLEANUP) + ++XLF2003FLAGS = "-qxlf2003=polymorphic:bozlitargs:stopexcept:volatile:autorealloc" + $(TESTDIR)/%.o : $(EXAMPLESDIR)/%.F90 | $$(@D)/.DIR + ifeq ($(FC_MODULE_OUTPUT_FLAG),) + $(call quiet,FCMOD) $(MODDIR) && $(FC) -c $(FC_FLAGS) $(FFLAGS) $(FCPPFLAGS) $(FC_DEPFLAGS) -I$(dir $<) $(abspath $<) -o $(abspath $@) + else +- $(PETSC_COMPILE.F) -I$(dir $<) $(abspath $<) -o $@ $(FC_MODULE_OUTPUT_FLAG)$(MODDIR) ++ $(PETSC_COMPILE.F) ${XLF2003FLAGS} -I$(dir $<) -I$(MODDIR) $(abspath $<) -o $@ $(FC_MODULE_OUTPUT_FLAG)$(MODDIR) + endif + -@$(GFORTRAN_DEP_CLEANUP) + +--- a/src/ksp/ksp/examples/tutorials/ex6f.F90 ++++ b/src/ksp/ksp/examples/tutorials/ex6f.F90 +@@ -173,7 +173,7 @@ + call PetscOptionsHasName(PETSC_NULL_OPTIONS,PETSC_NULL_CHARACTER,'-mat_view',pflag,ierr) + if (pflag) then + if (rank .eq. 0) write(6,100) +- call flush(6) ++ call flush_(6) + endif + call MatConvert(A,MATSAME,MAT_INITIAL_MATRIX,A2,ierr) + ! All other times: Set previous solution as initial guess for next solve. +@@ -190,7 +190,7 @@ + call MatAssemblyBegin(A,MAT_FINAL_ASSEMBLY,ierr) + if (pflag) then + if (rank .eq. 0) write(6,110) +- call flush(6) ++ call flush_(6) + endif + call MatAssemblyEnd(A,MAT_FINAL_ASSEMBLY,ierr) + +--- a/src/vec/vec/examples/tutorials/ex21.c ++++ b/src/vec/vec/examples/tutorials/ex21.c +@@ -8,13 +8,13 @@ + #define f90array1daccessmystruct_ F90ARRAY1DACCESSMYSTRUCT + #define f90array1ddestroymystruct_ F90ARRAY1DDESTROYMYSTRUCT + #define f90array1dgetaddrmystruct_ F90ARRAY1DGETADDRMYSTRUCT +-#elif !defined(PETSC_HAVE_FORTRAN_UNDERSCORE) ++#elif defined(PETSC_HAVE_FORTRAN_NOUNDERSCORE) + #define vecgetarraymystruct_ vecgetarraymystruct + #define vecrestorearraymystruct_ vecrestorearraymystruct + #define f90array1dcreatemystruct_ f90array1dcreatemystruct + #define f90array1daccessmystruct_ f90array1daccessmystruct + #define f90array1ddestroymystruct_ f90array1ddestroymystruct +-#define f90array1dgetaddrmystruc_ f90array1dgetaddrmystruct ++#define f90array1dgetaddrmystruct_ f90array1dgetaddrmystruct + #endif + + PETSC_EXTERN void PETSC_STDCALL f90array1dcreatemystruct_(void *,PetscInt *,PetscInt *,F90Array1d * PETSC_F90_2PTR_PROTO_NOVAR); + -- cgit v1.2.3-70-g09d2 From e0dcd87af95d72795368e69c9d4f70c3d5418975 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Tue, 15 May 2018 16:43:27 +0200 Subject: astyle: add 3.1 (#8137) --- var/spack/repos/builtin/packages/astyle/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/astyle/package.py b/var/spack/repos/builtin/packages/astyle/package.py index d3c8bb72cf..8558b73dac 100644 --- a/var/spack/repos/builtin/packages/astyle/package.py +++ b/var/spack/repos/builtin/packages/astyle/package.py @@ -38,6 +38,7 @@ class Astyle(MakefilePackage): maintainers = ['davydden'] + version('3.1', '7712622f62661b1d8cb1062d7fedc390') version('3.0.1', 'c301f09679efa2e1eb6e6b5fd33788b4') version('2.06', 'ff588e7fcede824591cf5b9085df109d') version('2.05.1', '4142d178047d7040da3e0e2f1b030a1a') -- cgit v1.2.3-70-g09d2 From e3035fb91a96a3ff5627b6847203e3dc11fbc78f Mon Sep 17 00:00:00 2001 From: David Böhme Date: Tue, 15 May 2018 13:54:23 -0700 Subject: Add libunwind-1.2.1 (#8145) --- var/spack/repos/builtin/packages/libunwind/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libunwind/package.py b/var/spack/repos/builtin/packages/libunwind/package.py index 1f69a1f9ec..6a78fe1ca8 100644 --- a/var/spack/repos/builtin/packages/libunwind/package.py +++ b/var/spack/repos/builtin/packages/libunwind/package.py @@ -31,4 +31,5 @@ class Libunwind(AutotoolsPackage): homepage = "http://www.nongnu.org/libunwind/" url = "http://download.savannah.gnu.org/releases/libunwind/libunwind-1.1.tar.gz" + version('1.2.1', '06ba9e60d92fd6f55cd9dadb084df19e') version('1.1', 'fb4ea2f6fbbe45bf032cd36e586883ce') -- cgit v1.2.3-70-g09d2 From 218e32991d1aa064548de06df7e1e1b0cdb31e24 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 15 May 2018 22:10:20 -0500 Subject: Add list_url to allow download of prior versions from cran archive (#8141) --- var/spack/repos/builtin/packages/r-futile-options/package.py | 1 + var/spack/repos/builtin/packages/r-lambda-r/package.py | 1 + 2 files changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-futile-options/package.py b/var/spack/repos/builtin/packages/r-futile-options/package.py index 21a1d0d817..e254610bc6 100644 --- a/var/spack/repos/builtin/packages/r-futile-options/package.py +++ b/var/spack/repos/builtin/packages/r-futile-options/package.py @@ -30,5 +30,6 @@ class RFutileOptions(RPackage): homepage = "https://cran.rstudio.com/web/packages/futile.options/index.html" url = "https://cran.rstudio.com/src/contrib/futile.options_1.0.0.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/futile.options" version('1.0.0', '8fd845774bbce56f41f7c43c3b4c13ba') diff --git a/var/spack/repos/builtin/packages/r-lambda-r/package.py b/var/spack/repos/builtin/packages/r-lambda-r/package.py index 4e5c927670..79dc5e1bc6 100644 --- a/var/spack/repos/builtin/packages/r-lambda-r/package.py +++ b/var/spack/repos/builtin/packages/r-lambda-r/package.py @@ -32,5 +32,6 @@ class RLambdaR(RPackage): homepage = "https://cran.rstudio.com/web/packages/lambda.r/index.html" url = "https://cran.rstudio.com/src/contrib/lambda.r_1.2.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/lambda.r" version('1.2', 'bda49898b85ad5902880a31f43b432e2') -- cgit v1.2.3-70-g09d2 From b895386fd7baad2fdcc01dea3bac5299bbb64b0e Mon Sep 17 00:00:00 2001 From: 健美猞猁 Date: Thu, 17 May 2018 01:45:24 +0800 Subject: r-rcppcnpy: a new package. (#8139) * r-rcppcnpy: a new package. * Specify dependency versions. * Update dependency. --- .../repos/builtin/packages/r-rcppcnpy/package.py | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-rcppcnpy/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-rcppcnpy/package.py b/var/spack/repos/builtin/packages/r-rcppcnpy/package.py new file mode 100644 index 0000000000..8bdb452242 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-rcppcnpy/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RRcppcnpy(RPackage): + """Rcpp bindings for NumPy files.""" + + homepage = "https://github.com/eddelbuettel/rcppcnpy" + url = "https://cran.r-project.org/src/contrib/RcppCNPy_0.2.9.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/RcppCNPy" + + version('0.2.9', '7f63354d15928b6716830c2975b3baf0') + + depends_on('r@3.1.0:', type=('build', 'run')) + depends_on('cnpy') + depends_on('r-rcpp', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From de7d13b0e8dea4affd1ff40ff4d9ae62b27f3af0 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 16 May 2018 22:54:33 -0500 Subject: Add dependencies for py-dask (#8120) --- .../repos/builtin/packages/py-attrs/package.py | 16 +++++-- .../builtin/packages/py-cloudpickle/package.py | 42 +++++++++++++++++ .../repos/builtin/packages/py-dask/package.py | 55 ++++++++++++++++++++-- .../repos/builtin/packages/py-locket/package.py | 36 ++++++++++++++ .../repos/builtin/packages/py-partd/package.py | 40 ++++++++++++++++ .../repos/builtin/packages/py-pluggy/package.py | 40 ++++++++++++++++ var/spack/repos/builtin/packages/py-py/package.py | 7 ++- .../repos/builtin/packages/py-pytest/package.py | 22 +++++---- .../repos/builtin/packages/py-toolz/package.py | 38 +++++++++++++++ .../builtin/packages/py-zope-event/package.py | 40 ++++++++++++++++ .../builtin/packages/py-zope-interface/package.py | 48 +++++++++++++++++++ 11 files changed, 367 insertions(+), 17 deletions(-) create mode 100644 var/spack/repos/builtin/packages/py-cloudpickle/package.py create mode 100644 var/spack/repos/builtin/packages/py-locket/package.py create mode 100644 var/spack/repos/builtin/packages/py-partd/package.py create mode 100644 var/spack/repos/builtin/packages/py-pluggy/package.py create mode 100644 var/spack/repos/builtin/packages/py-toolz/package.py create mode 100644 var/spack/repos/builtin/packages/py-zope-event/package.py create mode 100644 var/spack/repos/builtin/packages/py-zope-interface/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-attrs/package.py b/var/spack/repos/builtin/packages/py-attrs/package.py index c3091c9e12..074b7fc29e 100644 --- a/var/spack/repos/builtin/packages/py-attrs/package.py +++ b/var/spack/repos/builtin/packages/py-attrs/package.py @@ -26,11 +26,21 @@ from spack import * class PyAttrs(PythonPackage): - """Python Attributes Without Boilerplate""" + """Classes Without Boilerplate""" homepage = "http://attrs.org/" - url = "https://pypi.io/packages/source/a/attrs/attrs-16.3.0.tar.gz" + url = "https://pypi.io/packages/source/a/attrs/attrs-18.1.0.tar.gz" + import_modules = ['attr'] + + version('18.1.0', '3f3f3e0750dab74cfa1dc8b0fd7a5f86') version('16.3.0', '4ec003c49360853cf935113d1ae56151') - depends_on('py-setuptools', type='build') + depends_on('py-setuptools', type='build') + + depends_on('py-coverage', type='test') + depends_on('py-hypothesis', type='test') + depends_on('py-pympler', type='test') + depends_on('py-pytest', type='test') + depends_on('py-six', type='test') + depends_on('py-zope-interface', type='test') diff --git a/var/spack/repos/builtin/packages/py-cloudpickle/package.py b/var/spack/repos/builtin/packages/py-cloudpickle/package.py new file mode 100644 index 0000000000..f4a22c0f7c --- /dev/null +++ b/var/spack/repos/builtin/packages/py-cloudpickle/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyCloudpickle(PythonPackage): + """Extended pickling support for Python objects.""" + + homepage = "https://github.com/cloudpipe/cloudpickle" + url = "https://pypi.io/packages/source/c/cloudpickle/cloudpickle-0.5.2.tar.gz" + + import_modules = ['cloudpickle'] + + version('0.5.2', 'd0f6fc27882f865f2eb185fb0a32c84b') + + depends_on('py-setuptools', type='build') + + def test(self): + # PyPI tarball does not come with unit tests + pass diff --git a/var/spack/repos/builtin/packages/py-dask/package.py b/var/spack/repos/builtin/packages/py-dask/package.py index 485ae9addc..f956efcc6c 100644 --- a/var/spack/repos/builtin/packages/py-dask/package.py +++ b/var/spack/repos/builtin/packages/py-dask/package.py @@ -26,10 +26,57 @@ from spack import * class PyDask(PythonPackage): - """Minimal task scheduling abstraction""" + """Dask is a flexible parallel computing library for analytics.""" + homepage = "https://github.com/dask/dask/" - url = "https://pypi.io/packages/source/d/dask/dask-0.8.1.tar.gz" + url = "https://pypi.io/packages/source/d/dask/dask-0.17.4.tar.gz" + + version('0.17.4', '4a7b9c5d7ddf52639b1c6b9e8a68d146') + version('0.8.1', '5dd8e3a3823b3bc62c9a6d192e2cb5b4') + + variant('array', default=True, description='Install requirements for dask.array') + variant('bag', default=True, description='Install requirements for dask.bag') + variant('dataframe', default=True, description='Install requirements for dask.dataframe') + variant('delayed', default=True, description='Install requirements for dask.delayed') + + depends_on('py-setuptools', type='build') + depends_on('py-pytest@3.1.0:', type='test') + depends_on('py-requests', type='test') + + # Requirements for dask.array + depends_on('py-numpy@1.11.0:', type=('build', 'run'), when='+array') + depends_on('py-toolz@0.7.3:', type=('build', 'run'), when='+array') + + # Requirements for dask.bag + depends_on('py-cloudpickle@0.2.1:', type=('build', 'run'), when='+bag') + depends_on('py-toolz@0.7.3:', type=('build', 'run'), when='+bag') + depends_on('py-partd@0.3.8:', type=('build', 'run'), when='+bag') + + # Requirements for dask.dataframe + depends_on('py-numpy@1.11.0:', type=('build', 'run'), when='+dataframe') + depends_on('py-pandas@0.19.0:', type=('build', 'run'), when='+dataframe') + depends_on('py-toolz@0.7.3:', type=('build', 'run'), when='+dataframe') + depends_on('py-partd@0.3.8:', type=('build', 'run'), when='+dataframe') + depends_on('py-cloudpickle@0.2.1:', type=('build', 'run'), when='+dataframe') + + # Requirements for dask.delayed + depends_on('py-toolz@0.7.3:', type=('build', 'run'), when='+delayed') + + @property + def import_modules(self): + modules = [ + 'dask', 'dask.bytes', 'dask.diagnostics', 'dask.store' + ] + + if '+array' in self.spec: + modules.append('dask.array') + + if '+bag' in self.spec: + modules.append('dask.bag') - version('0.8.1', '5dd8e3a3823b3bc62c9a6d192e2cb5b4') + if '+dataframe' in self.spec: + modules.extend([ + 'dask.dataframe', 'dask.dataframe.io', 'dask.dataframe.tseries' + ]) - depends_on('py-setuptools', type='build') + return modules diff --git a/var/spack/repos/builtin/packages/py-locket/package.py b/var/spack/repos/builtin/packages/py-locket/package.py new file mode 100644 index 0000000000..dfe683a4b0 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-locket/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyLocket(PythonPackage): + """File-based locks for Python for Linux and Windows.""" + + homepage = "http://github.com/mwilliamson/locket.py" + url = "https://pypi.io/packages/source/l/locket/locket-0.2.0.tar.gz" + + import_modules = ['locket'] + + version('0.2.0', 'fe870949c513d8f7079ba352463833ca') diff --git a/var/spack/repos/builtin/packages/py-partd/package.py b/var/spack/repos/builtin/packages/py-partd/package.py new file mode 100644 index 0000000000..f80537c7fa --- /dev/null +++ b/var/spack/repos/builtin/packages/py-partd/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPartd(PythonPackage): + """Key-value byte store with appendable values.""" + + homepage = "http://github.com/dask/partd/" + url = "https://pypi.io/packages/source/p/partd/partd-0.3.8.tar.gz" + + import_modules = ['partd'] + + version('0.3.8', '554d0e6511c0df4c907f034858be847f') + + depends_on('py-setuptools', type='build') + depends_on('py-locket', type=('build', 'run')) + depends_on('py-toolz', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pluggy/package.py b/var/spack/repos/builtin/packages/py-pluggy/package.py new file mode 100644 index 0000000000..6e77c7a8f2 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pluggy/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPluggy(PythonPackage): + """Plugin and hook calling mechanisms for python.""" + + homepage = "https://github.com/pytest-dev/pluggy" + url = "https://pypi.io/packages/source/p/pluggy/pluggy-0.6.0.tar.gz" + + import_modules = ['pluggy'] + + version('0.6.0', 'ffdde7c3a5ba9a440404570366ffb6d5') + + depends_on('python@2.7:2.8,3.4:', type=('build', 'run')) + + depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-py/package.py b/var/spack/repos/builtin/packages/py-py/package.py index 0c6bd8ecac..f585c84616 100644 --- a/var/spack/repos/builtin/packages/py-py/package.py +++ b/var/spack/repos/builtin/packages/py-py/package.py @@ -26,16 +26,19 @@ from spack import * class PyPy(PythonPackage): - """library with cross-python path, ini-parsing, io, code, log facilities""" + """Library with cross-python path, ini-parsing, io, code, log facilities""" homepage = "http://pylib.readthedocs.io/en/latest/" - url = "https://pypi.io/packages/source/p/py/py-1.4.33.tar.gz" + url = "https://pypi.io/packages/source/p/py/py-1.5.3.tar.gz" import_modules = [ 'py', 'py._code', 'py._io', 'py._log', 'py._path', 'py._process', ] + version('1.5.3', '667d37a148ad9fb81266492903f2d880') version('1.4.33', '15d7107cbb8b86593bf9afa16e56da65') version('1.4.31', '5d2c63c56dc3f2115ec35c066ecd582b') + depends_on('python@2.7:2.8,3.4:', type=('build', 'run')) + depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-pytest/package.py b/var/spack/repos/builtin/packages/py-pytest/package.py index 30aa0972d0..d41a19c432 100644 --- a/var/spack/repos/builtin/packages/py-pytest/package.py +++ b/var/spack/repos/builtin/packages/py-pytest/package.py @@ -29,23 +29,29 @@ class PyPytest(PythonPackage): """pytest: simple powerful testing with Python.""" homepage = "http://pytest.org/" - url = "https://pypi.io/packages/source/p/pytest/pytest-3.0.7.tar.gz" + url = "https://pypi.io/packages/source/p/pytest/pytest-3.5.1.tar.gz" import_modules = [ '_pytest', '_pytest.assertion', '_pytest._code', - '_pytest.vendored_packages', 'pytest' + '_pytest.mark', 'pytest' ] + version('3.5.1', 'ffd870ee3ca561695d2f916f0f0f3c0b') version('3.0.7', '89c60546507dc7eb6e9e40a6e9f720bd') version('3.0.2', '61dc36e65a6f6c11c53b1388e043a9f5') + depends_on('python@2.7:2.8,3.4:', type=('build', 'run')) + # Most Python packages only require setuptools as a build dependency. # However, pytest requires setuptools during runtime as well. depends_on('py-setuptools', type=('build', 'run')) - depends_on('py-py@1.4.29:', type=('build', 'run')) - depends_on('py-hypothesis@3.5.2:', type=('build', 'run')) + depends_on('py-py@1.5.0:', type=('build', 'run')) + depends_on('py-six@1.10.0:', type=('build', 'run')) + depends_on('py-attrs@17.4.0:', type=('build', 'run')) + depends_on('py-more-itertools@4.0.0:', type=('build', 'run')) + depends_on('py-pluggy@0.5:0.6', type=('build', 'run')) + depends_on('py-funcsigs', type=('build', 'run'), when='^python@:2') - # TODO: Add a 'test' deptype - # depends_on('py-nose', type='test') - # depends_on('py-mock', type='test') - # depends_on('py-requests', type='test') + depends_on('py-nose', type='test') + depends_on('py-mock', type='test') + depends_on('py-requests', type='test') diff --git a/var/spack/repos/builtin/packages/py-toolz/package.py b/var/spack/repos/builtin/packages/py-toolz/package.py new file mode 100644 index 0000000000..45305af961 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-toolz/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyToolz(PythonPackage): + """A set of utility functions for iterators, functions, and dictionaries""" + + homepage = "http://github.com/pytoolz/toolz/" + url = "https://pypi.io/packages/source/t/toolz/toolz-0.9.0.tar.gz" + + import_modules = ['toolz', 'tlz', 'toolz.curried', 'toolz.sandbox'] + + version('0.9.0', '6fd07249389dd0b3bfe71d4282314328') + + depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-zope-event/package.py b/var/spack/repos/builtin/packages/py-zope-event/package.py new file mode 100644 index 0000000000..ab017b3d02 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-zope-event/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyZopeEvent(PythonPackage): + """Very basic event publishing system.""" + + homepage = "http://github.com/zopefoundation/zope.event" + url = "https://pypi.io/packages/source/z/zope.event/zope.event-4.3.0.tar.gz" + + # FIXME: No idea why this import test fails. + # Maybe some kind of namespace issue? + # import_modules = ['zope.event'] + + version('4.3.0', '8ca737960741c6fd112972f3313303bd') + + depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-zope-interface/package.py b/var/spack/repos/builtin/packages/py-zope-interface/package.py new file mode 100644 index 0000000000..001ba23f3d --- /dev/null +++ b/var/spack/repos/builtin/packages/py-zope-interface/package.py @@ -0,0 +1,48 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyZopeInterface(PythonPackage): + """This package provides an implementation of "object interfaces" for + Python. Interfaces are a mechanism for labeling objects as conforming to a + given API or contract. So, this package can be considered as implementation + of the Design By Contract methodology support in Python.""" + + homepage = "https://github.com/zopefoundation/zope.interface" + url = "https://pypi.io/packages/source/z/zope.interface/zope.interface-4.5.0.tar.gz" + + # FIXME: No idea why these import tests fail. + # Maybe some kind of namespace issue? + # import_modules = ['zope.interface', 'zope.interface.common'] + + version('4.5.0', '7b669cd692d817772c61d2e3ad0f1e71') + + depends_on('python@2.7:2.8,3.4:', type=('build', 'run')) + + depends_on('py-setuptools', type='build') + depends_on('py-zope-event', type='test') + depends_on('py-nose', type='test') + depends_on('py-coverage', type='test') -- cgit v1.2.3-70-g09d2 From dfd168d557f1acc981c9939526b3ab3f160bee5a Mon Sep 17 00:00:00 2001 From: Jim Galarowicz Date: Thu, 17 May 2018 14:04:33 -0500 Subject: cbtf-argonavis-gui: add openspeedshop-utils package to address qt conflicts (#8066) Fixes #7946 Creates an openspeedshop-utils package that does not depend on qt3 and can be used to resolve the needs of cbtf-argonavis-gui. Changes for creating a release versus develop build are also included. There are package versions which are no longer relevant (e.g. 1.3.0 for cbtf-argonavis-gui has been replaced with 1.3.0.0) but these versions need to be kept to allow uninstalling them; issue #8173 has been created to investigate this. --- .../builtin/packages/cbtf-argonavis-gui/package.py | 59 +++- .../builtin/packages/cbtf-argonavis/package.py | 70 +++-- .../repos/builtin/packages/cbtf-krell/package.py | 60 +++- .../repos/builtin/packages/cbtf-lanl/package.py | 51 ++- var/spack/repos/builtin/packages/cbtf/package.py | 35 ++- .../packages/openspeedshop-utils/package.py | 344 +++++++++++++++++++++ .../builtin/packages/openspeedshop/package.py | 267 +++++++--------- .../repos/builtin/packages/qtgraph/package.py | 14 +- 8 files changed, 689 insertions(+), 211 deletions(-) create mode 100644 var/spack/repos/builtin/packages/openspeedshop-utils/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py index c4154592fa..8ba4e23267 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py @@ -49,20 +49,55 @@ class CbtfArgonavisGui(QMakePackage): """ homepage = "http://sourceforge.net/p/cbtf/wiki/Home/" + version('1.3.0.0', branch='1.3.0.0', + git='https://github.com/OpenSpeedShop/cbtf-argonavis-gui.git') + version('1.3.0', branch='master', git='https://github.com/OpenSpeedShop/cbtf-argonavis-gui.git') - depends_on("cmake@3.0.2:", type='build') - depends_on("openspeedshop+cuda gui='qt4'") - depends_on('qt@4.8.6:') - depends_on("boost@1.50.0:") - depends_on("cbtf") - depends_on("cbtf-krell") - depends_on("cbtf-argonavis") + version('develop', branch='master', + git='https://github.com/OpenSpeedShop/cbtf-argonavis-gui.git') + + depends_on("cmake@3.0.2:", when='@develop', type='build') + depends_on("cmake@3.11.1", when='@1.3.0.0', type='build') + + # To specify ^elfutils@0.170 on the command line spack + # apparently needs/wants this dependency explicity here + # even though it is referenced downstream + depends_on("elf", type="link") + + depends_on('qt@4.8.6:', when='@develop') + depends_on('qt@5.10.0', when='@1.3.0.0') + + depends_on("boost@1.50.0:", when='@develop') + depends_on("boost@1.66.0", when='@1.3.0.0') + + # For MRNet + depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop') + depends_on("mrnet@5.0.1-3+lwthreads", when='@1.3.0.0') + + # Dependencies for the openspeedshop cbtf packages. + depends_on("cbtf@develop", when='@develop') + depends_on("cbtf@1.9.1.0", when='@1.3.0.0') + + depends_on("cbtf-krell@develop", when='@develop') + depends_on("cbtf-krell@1.9.1.0", when='@1.3.0.0') + + depends_on("cbtf-argonavis@develop", when='@develop') + depends_on("cbtf-argonavis@1.9.1.0", when='@1.3.0.0') + depends_on("cuda") - depends_on("mrnet@5.0.1:+lwthreads") - depends_on("xerces-c@3.1.1:") - depends_on("graphviz") + + depends_on("openspeedshop-utils+cuda@develop", when='@develop') + depends_on("openspeedshop-utils@2.3.1.3+cuda", when='@1.3.0.0') + + # For Xerces-C + depends_on("xerces-c@3.1.1:", when='@develop') + depends_on("xerces-c@3.1.4", when='@1.3.0.0') + + depends_on("graphviz@2.40.1:", when='@develop') + depends_on("graphviz@2.40.1", when='@1.3.0.0') + depends_on("qtgraph") parallel = False @@ -74,7 +109,7 @@ class CbtfArgonavisGui(QMakePackage): spack_env.set('CBTF_KRELL_ROOT', self.spec['cbtf-krell'].prefix) spack_env.set('CBTF_ARGONAVIS_ROOT', self.spec['cbtf-argonavis'].prefix) - spack_env.set('OSS_CBTF_ROOT', self.spec['openspeedshop'].prefix) + spack_env.set('OSS_CBTF_ROOT', self.spec['openspeedshop-utils'].prefix) spack_env.set('GRAPHVIZ_ROOT', self.spec['graphviz'].prefix) spack_env.set('QTGRAPHLIB_ROOT', self.spec['qtgraph'].prefix) spack_env.set('KRELL_ROOT_MRNET', self.spec['mrnet'].prefix) @@ -90,7 +125,7 @@ class CbtfArgonavisGui(QMakePackage): # The openspeedshop libraries are needed to actually load the # performance information into the GUI. run_env.prepend_path( - 'LD_LIBRARY_PATH', self.spec['openspeedshop'].prefix.lib64) + 'LD_LIBRARY_PATH', self.spec['openspeedshop-utils'].prefix.lib64) def qmake_args(self): options = ['-o', 'Makefile', 'openss-gui.pro'] diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py index de65bca6de..0bffad266c 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py @@ -41,7 +41,6 @@ ########################################################################## from spack import * -import os class CbtfArgonavis(CMakePackage): @@ -51,9 +50,15 @@ class CbtfArgonavis(CMakePackage): """ homepage = "http://sourceforge.net/p/cbtf/wiki/Home/" + version('1.9.1.0', branch='1.9.1.0', + git='https://github.com/OpenSpeedShop/cbtf-argonavis.git') + version('1.9.1', branch='master', git='https://github.com/OpenSpeedShop/cbtf-argonavis.git') + version('develop', branch='master', + git='https://github.com/OpenSpeedShop/cbtf-argonavis.git') + variant('cti', default=False, description="Build MRNet with the CTI startup option") variant('crayfe', default=False, @@ -65,17 +70,52 @@ class CbtfArgonavis(CMakePackage): description='CMake build type') depends_on("cmake@3.0.2:", type='build') - depends_on("boost@1.50.0:") - depends_on("papi") - depends_on("libmonitor") - depends_on("mrnet@5.0.1:+lwthreads") - depends_on("mrnet@5.0.1:+cti", when='+cti') - depends_on("cbtf") - depends_on("cbtf+cti", when='+cti') - depends_on("cbtf+runtime", when='+runtime') - depends_on("cbtf-krell") - depends_on("cbtf-krell+cti", when="+cti") - depends_on("cbtf-krell+runtime", when="+runtime") + + # To specify ^elfutils@0.170 on the command line spack + # apparently needs/wants this dependency explicity here + # even though it is referenced downstream + depends_on("elf", type="link") + + # For boost + depends_on("boost@1.50.0:", when='@develop') + depends_on("boost@1.66.0", when='@1.9.1.0') + + # For MRNet + depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti') + depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop~cti') + depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0+cti') + depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0~cti') + + # For CBTF + depends_on("cbtf@develop", when='@develop') + depends_on("cbtf@1.9.1.0", when='@1.9.1.0') + + # For CBTF with cti + depends_on("cbtf@develop+cti", when='@develop+cti') + depends_on("cbtf@1.9.1.0+cti", when='@1.9.1.0+cti') + + # For CBTF with runtime + depends_on("cbtf@develop+runtime", when='@develop+runtime') + depends_on("cbtf@1.9.1.0+runtime", when='@1.9.1.0+runtime') + + # For libmonitor + depends_on("libmonitor+krellpatch") + + # For PAPI + depends_on("papi", when='@develop') + depends_on("papi@5.5.1", when='@1.9.1.0') + + # For CBTF-KRELL + depends_on("cbtf-krell@develop", when='@develop') + depends_on("cbtf-krell@1.9.1.0", when='@1.9.1.0') + + depends_on('cbtf-krell@develop+cti', when='@develop+cti') + depends_on('cbtf-krell@1.9.1.0+cti', when='@1.9.1.0+cti') + + depends_on('cbtf-krell@develop+runtime', when='@develop+runtime') + depends_on('cbtf-krell@1.9.1.0+runtime', when='@1.9.1.0+runtime') + + # For CUDA depends_on("cuda") parallel = False @@ -109,12 +149,6 @@ class CbtfArgonavis(CMakePackage): def setup_environment(self, spack_env, run_env): """Set up the compile and runtime environments for a package.""" - if os.environ.get('LD_LIBRARY_PATH'): - cupti_path = self.spec['cuda'].prefix + '/extras/CUPTI/lib64' - os.environ['LD_LIBRARY_PATH'] += cupti_path - else: - os.environ['LD_LIBRARY_PATH'] = cupti_path - run_env.prepend_path( 'LD_LIBRARY_PATH', self.spec['cuda'].prefix + '/extras/CUPTI/lib64') diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py index 862250e002..7e7facc93a 100644 --- a/var/spack/repos/builtin/packages/cbtf-krell/package.py +++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py @@ -54,9 +54,15 @@ class CbtfKrell(CMakePackage): """ homepage = "http://sourceforge.net/p/cbtf/wiki/Home/" + version('1.9.1.0', branch='1.9.1.0', + git='https://github.com/OpenSpeedShop/cbtf-krell.git') + version('1.9.1', branch='master', git='https://github.com/OpenSpeedShop/cbtf-krell.git') + version('develop', branch='master', + git='https://github.com/OpenSpeedShop/cbtf-krell.git') + # MPI variants variant('openmpi', default=False, description="Build mpi experiment collector for openmpi MPI..") @@ -83,29 +89,53 @@ class CbtfKrell(CMakePackage): # Dependencies for cbtf-krell depends_on("cmake@3.0.2:", type='build') - # For binutils service - depends_on("binutils") + # For binutils + depends_on("binutils", when='@develop') + depends_on("binutils@2.29.1", when='@1.9.1.0') + + # For boost + depends_on("boost@1.50.0:", when='@develop') + depends_on("boost@1.66.0", when='@1.9.1.0') + + # For Dyninst + depends_on("dyninst@9.3.2:", when='@develop') + depends_on("dyninst@9.3.2", when='@1.9.1.0') + + # For MRNet + depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti') + depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop') - # collectionTool - depends_on("boost@1.50.0:") - depends_on("dyninst@9.3.2:") - depends_on("mrnet@5.0.1:+cti", when='+cti') - depends_on("mrnet@5.0.1:+lwthreads") + depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0+cti') + depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0') - depends_on("xerces-c@3.1.1:") - depends_on("cbtf") - depends_on("cbtf+cti", when='+cti') - depends_on("cbtf+runtime", when='+runtime') + # For Xerces-C + depends_on("xerces-c@3.1.1:", when='@develop') + depends_on("xerces-c@3.1.4", when='@1.9.1.0') + + # For CBTF + depends_on("cbtf@develop", when='@develop') + depends_on("cbtf@1.9.1.0", when='@1.9.1.0') + + # For CBTF with cti + depends_on("cbtf@develop+cti", when='@develop+cti') + depends_on("cbtf@1.9.1.0+cti", when='@1.9.1.0+cti') + + # For CBTF with runtime + depends_on("cbtf@develop+runtime", when='@develop+runtime') + depends_on("cbtf@1.9.1.0+runtime", when='@1.9.1.0+runtime') # for services and collectors depends_on("libmonitor+krellpatch") - depends_on("libunwind") - depends_on("papi") + + depends_on("libunwind", when='@develop') + depends_on("libunwind@1.1", when='@1.9.1.0') + + depends_on("papi", when='@develop') + depends_on("papi@5.5.1", when='@1.9.1.0') + depends_on("llvm-openmp-ompt@tr6_forwards+standalone") # MPI Installations - # These have not worked either for build or execution, commenting out for - # now depends_on("openmpi", when='+openmpi') depends_on("mpich", when='+mpich') depends_on("mpich2", when='+mpich2') diff --git a/var/spack/repos/builtin/packages/cbtf-lanl/package.py b/var/spack/repos/builtin/packages/cbtf-lanl/package.py index 0c6bf54b4c..d327537cc3 100644 --- a/var/spack/repos/builtin/packages/cbtf-lanl/package.py +++ b/var/spack/repos/builtin/packages/cbtf-lanl/package.py @@ -48,26 +48,57 @@ class CbtfLanl(CMakePackage): command monitoring tool.""" homepage = "http://sourceforge.net/p/cbtf/wiki/Home/" + version('1.9.1.0', branch='1.9.1.0', + git='https://github.com/OpenSpeedShop/cbtf-lanl.git') + version('1.9.1', branch='master', - git='http://git.code.sf.net/p/cbtf-lanl/cbtf-lanl') + git='https://github.com/OpenSpeedShop/cbtf-lanl.git') + + version('develop', branch='master', + git='https://github.com/OpenSpeedShop/cbtf-lanl.git') variant('build_type', default='None', values=('None'), description='CMake build type') + variant('runtime', default=False, description="build only the runtime libraries and collectors.") + variant('cti', default=False, description="Build MRNet with the CTI startup option") depends_on("cmake@3.0.2:", type='build') - # Dependencies for cbtf-krell - depends_on("mrnet@5.0.1:+lwthreads") - depends_on("xerces-c@3.1.1:") - depends_on("cbtf") - depends_on("cbtf+cti", when='+cti') - depends_on("cbtf+runtime", when='+runtime') - depends_on("cbtf-krell") - depends_on("cbtf-krell+cti", when='+cti') - depends_on("cbtf-krell+runtime", when='+runtime') + + # For MRNet + depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti') + depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop') + depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0+cti') + depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0') + + # For Xerces-C + depends_on("xerces-c@3.1.1:", when='@develop') + depends_on("xerces-c@3.1.4", when='@1.9.1.0') + + # For CBTF + depends_on("cbtf@develop", when='@develop') + depends_on("cbtf@1.9.1.0", when='@1.9.1.0') + + # For CBTF with cti + depends_on("cbtf@develop+cti", when='@develop+cti') + depends_on("cbtf@1.9.1.0+cti", when='@1.9.1.0+cti') + + # For CBTF with runtime + depends_on("cbtf@develop+runtime", when='@develop+runtime') + depends_on("cbtf@1.9.1.0+runtime", when='@1.9.1.0+runtime') + + # For CBTF-KRELL + depends_on("cbtf-krell@develop", when='@develop') + depends_on("cbtf-krell@1.9.1.0", when='@1.9.1.0') + + depends_on('cbtf-krell@develop+cti', when='@develop+cti') + depends_on('cbtf-krell@1.9.1.0+cti', when='@1.9.1.0+cti') + + depends_on('cbtf-krell@develop+runtime', when='@develop+runtime') + depends_on('cbtf-krell@1.9.1.0+runtime', when='@1.9.1.0+runtime') parallel = False diff --git a/var/spack/repos/builtin/packages/cbtf/package.py b/var/spack/repos/builtin/packages/cbtf/package.py index 97d94ff20e..73e7227aba 100644 --- a/var/spack/repos/builtin/packages/cbtf/package.py +++ b/var/spack/repos/builtin/packages/cbtf/package.py @@ -53,23 +53,44 @@ class Cbtf(CMakePackage): homepage = "http://sourceforge.net/p/cbtf/wiki/Home" # Use when the git repository is available + + version('1.9.1.0', branch='1.9.1.0', + git='https://github.com/OpenSpeedShop/cbtf.git') + version('1.9.1', branch='master', git='https://github.com/OpenSpeedShop/cbtf.git') + version('develop', branch='master', + git='https://github.com/OpenSpeedShop/cbtf.git') + variant('cti', default=False, description="Build MRNet with the CTI startup option") + variant('runtime', default=False, description="build only the runtime libraries and collectors.") + variant('build_type', default='None', values=('None'), description='CMake build type') - depends_on("cmake@3.0.2:", type='build') - depends_on("boost@1.50.0:") - depends_on("mrnet@5.0.1:+lwthreads") - depends_on("mrnet@5.0.1:+cti", when='+cti') - depends_on("xerces-c@3.1.1:") - # Work around for spack libxml2 package bug, take off python when fixed - depends_on("libxml2+python") + depends_on("cmake@3.11.1", when='@1.9.1.0:', type='build') + depends_on("cmake@3.0.2:", when='@develop', type='build') + + depends_on("boost@1.66.0", when='@1.9.1.0:') + depends_on("boost@1.50.0:", when='@develop') + + # For MRNet + depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti') + depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop') + depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0:+cti') + depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0:') + + # For Xerces-C + depends_on("xerces-c@3.1.1:", when='@develop') + depends_on("xerces-c@3.1.4", when='@1.9.1.0:') + + # For XML2 + depends_on("libxml2", when='@develop') + depends_on("libxml2@2.9.4", when='@1.9.1.0:') parallel = False diff --git a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py new file mode 100644 index 0000000000..12eee7c8b1 --- /dev/null +++ b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py @@ -0,0 +1,344 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +############################################################################## +# Copyright (c) 2015-2018 Krell Institute. All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the Free +# Software Foundation; either version 2 of the License, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, write to the Free Software Foundation, Inc., 59 Temple +# Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + +import spack +import spack.store + +import os +import os.path + + +class OpenspeedshopUtils(CMakePackage): + """OpenSpeedShop is a community effort by The Krell Institute with + current direct funding from DOEs NNSA. It builds on top of a + broad list of community infrastructures, most notably Dyninst + and MRNet from UW, libmonitor from Rice, and PAPI from UTK. + OpenSpeedShop is an open source multi platform Linux performance + tool which is targeted to support performance analysis of + applications running on both single node and large scale IA64, + IA32, EM64T, AMD64, PPC, ARM, Power8, Intel Phi, Blue Gene and + Cray platforms. OpenSpeedShop development is hosted by the Krell + Institute. The infrastructure and base components of OpenSpeedShop + are released as open source code primarily under LGPL. + openspeedshop-utils is a package that does not have the + qt3 gui. It was created to avoid a conflict between + openspeedshop and cbtf-argonavis-gui based on the fact + that spack will not allow a qt3 and qt4/qt5 dependency in a packages + dependency tree. + """ + + homepage = "http://www.openspeedshop.org" + url = "https://github.com/OpenSpeedShop/openspeedshop.git" + + # Use when the git repository is available + version('2.3.1.3', git='https://github.com/OpenSpeedShop/openspeedshop.git', tag='2.3.1.3') + + version('develop', branch='master', + git='https://github.com/OpenSpeedShop/openspeedshop.git') + + variant('runtime', default=False, + description="build only the runtime libraries and collectors.") + variant('cti', default=False, + description="Build MRNet with the CTI startup option") + variant('crayfe', default=False, + description="build only the FE tool using the runtime_dir \ + to point to target build.") + variant('cuda', default=False, + description="build with cuda packages included.") + + variant('build_type', default='None', values=('None'), + description='CMake build type') + + # MPI variants + variant('openmpi', default=False, + description="Build mpi collector for openmpi \ + MPI when variant is enabled.") + variant('mpt', default=False, + description="Build mpi collector for SGI \ + MPT MPI when variant is enabled.") + variant('mvapich2', default=False, + description="Build mpi collector for mvapich2\ + MPI when variant is enabled.") + variant('mvapich', default=False, + description="Build mpi collector for mvapich\ + MPI when variant is enabled.") + variant('mpich2', default=False, + description="Build mpi collector for mpich2\ + MPI when variant is enabled.") + variant('mpich', default=False, + description="Build mpi collector for mpich\ + MPI when variant is enabled.") + + depends_on("cmake@3.0.2:", type='build') + + # Dependencies for openspeedshop that are common to all + # the variants of the OpenSpeedShop build + depends_on("libtool", type='build') + depends_on("bison", type='build') + depends_on("flex", type='build') + + # For binutils + depends_on("binutils", when='@develop', type='build') + depends_on("binutils@2.29.1", when='@2.3.1.3', type='build') + + depends_on("elf", type="link") + depends_on("libdwarf") + + depends_on("sqlite") + + # For boost + depends_on("boost@1.50.0:", when='@develop') + depends_on("boost@1.66.0", when='@2.3.1.3') + + depends_on("dyninst@9.3.2:", when='@develop') + depends_on("dyninst@9.3.2", when='@2.3.1.3') + + depends_on("python", when='@develop') + depends_on("python@2.7.14", when='@2.3.1.3') + + depends_on("libxml2", when='@develop') + depends_on("libxml2@2.9.4", when='@2.3.1.3') + + # Dependencies for the openspeedshop cbtf packages. + depends_on("cbtf@develop", when='@develop') + depends_on("cbtf@1.9.1.0", when='@2.3.1.3') + + depends_on("cbtf-krell@develop", when='@develop') + depends_on("cbtf-krell@1.9.1.0", when='@2.3.1.3') + + depends_on('cbtf-krell@develop+crayfe', when='@develop+crayfe') + depends_on('cbtf-krell@1.9.1.0+crayfe', when='@2.3.1.3+crayfe') + + depends_on('cbtf-krell@develop+cti', when='@develop+cti') + depends_on('cbtf-krell@1.9.1.0+cti', when='@2.3.1.3+cti') + + depends_on('cbtf-krell@develop+mpich', when='@develop+mpich') + depends_on('cbtf-krell@1.9.1.0+mpich', when='@2.3.1.3+mpich') + + depends_on('cbtf-krell@develop+mpich2', when='@develop+mpich2') + depends_on('cbtf-krell@1.9.1.0+mpich2', when='@2.3.1.3+mpich2') + + depends_on('cbtf-krell@develop+mpt', when='@develop+mpt') + depends_on('cbtf-krell@1.9.1.0+mpt', when='@2.3.1.3+mpt') + + depends_on('cbtf-krell@develop+mvapich', when='@develop+mvapich') + depends_on('cbtf-krell@1.9.1.0+mvapich', when='@2.3.1.3+mvapich') + + depends_on('cbtf-krell@develop+mvapich2', when='@develop+mvapich2') + depends_on('cbtf-krell@1.9.1.0+mvapich2', when='@2.3.1.3+mvapich2') + + depends_on('cbtf-krell@develop+openmpi', when='@develop+openmpi') + depends_on('cbtf-krell@1.9.1.0+openmpi', when='@2.3.1.3+openmpi') + + depends_on("cbtf-argonavis@develop", when='@develop+cuda') + depends_on("cbtf-argonavis@1.9.1.0", when='@2.3.1.3+cuda') + + # For MRNet + depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti') + depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop') + + depends_on("mrnet@5.0.1-3:+cti", when='@2.3.1.3+cti') + depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.3.1.3') + + parallel = False + + build_directory = 'build_openspeedshop' + + def set_CrayLoginNode_cmakeOptions(self, spec, cmakeOptions): + # Appends to cmakeOptions the options that will enable the appropriate + # Cray login node libraries + + CrayLoginNodeOptions = [] + rt_platform = "cray" + + # How do we get the compute node (CNL) cbtf package install + # directory path? + # spec['cbtf'].prefix is the login node value for this build, as + # we only get here when building the login node components and + # that is all that is known to spack. + be_ck = spack.store.db.query_one('cbtf-krell arch=cray-CNL-haswell') + + # Equivalent to install-tool cmake arg: + # '-DCBTF_KRELL_CN_RUNTIME_DIR=%s' + # % /cbtf_v2.3.1.release/compute) + CrayLoginNodeOptions.append('-DCBTF_KRELL_CN_RUNTIME_DIR=%s' + % be_ck.prefix) + CrayLoginNodeOptions.append('-DRUNTIME_PLATFORM=%s' + % rt_platform) + + cmakeOptions.extend(CrayLoginNodeOptions) + + def cmake_args(self): + # Appends base options to cmake_args + spec = self.spec + + compile_flags = "-O2 -g" + + cmake_args = [] + + # Indicate building cbtf vers (transfer rawdata files) + instrumentor_setting = "cbtf" + + if spec.satisfies('+runtime'): + self.set_defaultbase_cmakeOptions(spec, cmake_args) + + cmake_args.extend( + ['-DCMAKE_CXX_FLAGS=%s' % compile_flags, + '-DCMAKE_C_FLAGS=%s' % compile_flags, + '-DINSTRUMENTOR=%s' % instrumentor_setting, + '-DCBTF_DIR=%s' % spec['cbtf'].prefix, + '-DCBTF_KRELL_DIR=%s' % spec['cbtf-krell'].prefix, + '-DMRNET_DIR=%s' % spec['mrnet'].prefix]) + + else: + + # Appends base options to cmake_args + self.set_defaultbase_cmakeOptions(spec, cmake_args) + cmake_args.extend( + ['-DCMAKE_CXX_FLAGS=%s' % compile_flags, + '-DCMAKE_C_FLAGS=%s' % compile_flags, + '-DINSTRUMENTOR=%s' % instrumentor_setting, + '-DSQLITE3_DIR=%s' % spec['sqlite'].prefix, + '-DCBTF_DIR=%s' % spec['cbtf'].prefix, + '-DCBTF_KRELL_DIR=%s' % spec['cbtf-krell'].prefix, + '-DMRNET_DIR=%s' % spec['mrnet'].prefix]) + + if spec.satisfies('+crayfe'): + # We need to build target/compute node + # components/libraries first then pass + # those libraries to the openspeedshop + # login node build + self.set_CrayLoginNode_cmakeOptions(spec, cmake_args) + + cmake_args.extend(['-DBUILD_QT3_GUI=FALSE']) + + return cmake_args + + def set_defaultbase_cmakeOptions(self, spec, cmakeOptions): + # Appends to cmakeOptions the options that will enable + # the appropriate base level options to the openspeedshop + # cmake build. + python_exe = spec['python'].command.path + python_library = spec['python'].libs[0] + python_include = spec['python'].headers.directories[0] + + BaseOptions = [] + + BaseOptions.append('-DBINUTILS_DIR=%s' % spec['binutils'].prefix) + BaseOptions.append('-DLIBELF_DIR=%s' % spec['elf'].prefix) + BaseOptions.append('-DLIBDWARF_DIR=%s' % spec['libdwarf'].prefix) + BaseOptions.append('-DPYTHON_EXECUTABLE=%s' % python_exe) + BaseOptions.append('-DPYTHON_INCLUDE_DIR=%s' % python_include) + BaseOptions.append('-DPYTHON_LIBRARY=%s' % python_library) + BaseOptions.append('-DBoost_NO_SYSTEM_PATHS=TRUE') + BaseOptions.append('-DBoost_NO_BOOST_CMAKE=TRUE') + BaseOptions.append('-DBOOST_ROOT=%s' % spec['boost'].prefix) + BaseOptions.append('-DBoost_DIR=%s' % spec['boost'].prefix) + BaseOptions.append('-DBOOST_LIBRARYDIR=%s' % spec['boost'].prefix.lib) + BaseOptions.append('-DDYNINST_DIR=%s' % spec['dyninst'].prefix) + + cmakeOptions.extend(BaseOptions) + + def set_mpi_cmakeOptions(self, spec, cmakeOptions): + # Appends to cmakeOptions the options that will enable + # the appropriate MPI implementations + + MPIOptions = [] + + # openmpi + if spec.satisfies('+openmpi'): + MPIOptions.append('-DOPENMPI_DIR=%s' % spec['openmpi'].prefix) + # mpich + if spec.satisfies('+mpich'): + MPIOptions.append('-DMPICH_DIR=%s' % spec['mpich'].prefix) + # mpich2 + if spec.satisfies('+mpich2'): + MPIOptions.append('-DMPICH2_DIR=%s' % spec['mpich2'].prefix) + # mvapich + if spec.satisfies('+mvapich'): + MPIOptions.append('-DMVAPICH_DIR=%s' % spec['mvapich'].prefix) + # mvapich2 + if spec.satisfies('+mvapich2'): + MPIOptions.append('-DMVAPICH2_DIR=%s' % spec['mvapich2'].prefix) + # mpt + if spec.satisfies('+mpt'): + MPIOptions.append('-DMPT_DIR=%s' % spec['mpt'].prefix) + + cmakeOptions.extend(MPIOptions) + + def setup_environment(self, spack_env, run_env): + """Set up the compile and runtime environments for a package.""" + + # Find Dyninst library path, this is needed to + # set the DYNINSTAPI_RT_LIB library which is + # required for OpenSpeedShop to find loop level + # performance information + dyninst_libdir = find_libraries('libdyninstAPI_RT', + root=self.spec['dyninst'].prefix, + shared=True, recursive=True) + + # Set Dyninst RT library path to support OSS loop resolution code + run_env.set('DYNINSTAPI_RT_LIB', dyninst_libdir) + + # Find openspeedshop library path + oss_libdir = find_libraries( + 'libopenss-framework', + root=self.spec['openspeedshop-utils'].prefix, + shared=True, recursive=True) + run_env.prepend_path('LD_LIBRARY_PATH', + os.path.dirname(oss_libdir.joined())) + + run_env.set('OPENSS_RAWDATA_DIR', '.') + + cbtf_mc = '/sbin/cbtf_mrnet_commnode' + cbtf_lmb = '/sbin/cbtf_libcbtf_mrnet_backend' + run_env.set('XPLAT_RSH', 'ssh') + run_env.set('MRNET_COMM_PATH', + join_path(self.spec['cbtf-krell'].prefix + cbtf_mc)) + run_env.set('CBTF_MRNET_BACKEND_PATH', + join_path(self.spec['cbtf-krell'].prefix + cbtf_lmb)) + run_env.prepend_path('PATH', self.spec['mrnet'].prefix.bin) + run_env.prepend_path('PATH', self.spec['cbtf-krell'].prefix.bin) + run_env.prepend_path('PATH', self.spec['cbtf-krell'].prefix.sbin) + run_env.prepend_path('PATH', self.spec['python'].prefix.bin) diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py index d848df1073..7347280159 100644 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop/package.py @@ -64,16 +64,14 @@ class Openspeedshop(CMakePackage): """ homepage = "http://www.openspeedshop.org" - url = "https://github.com/OpenSpeedShop" + url = "https://github.com/OpenSpeedShop/openspeedshop.git" # Use when the git repository is available - version('2.3.1', branch='master', + version('2.3.1.3', git='https://github.com/OpenSpeedShop/openspeedshop.git', tag='2.3.1.3') + + version('develop', branch='master', git='https://github.com/OpenSpeedShop/openspeedshop.git') - variant('offline', default=False, - description="build with offline instrumentor enabled.") - variant('cbtf', default=True, - description="build with cbtf instrumentor enabled.") variant('runtime', default=False, description="build only the runtime libraries and collectors.") variant('cti', default=False, @@ -112,48 +110,77 @@ class Openspeedshop(CMakePackage): MPI when variant is enabled.") depends_on("cmake@3.0.2:", type='build') + # Dependencies for openspeedshop that are common to all # the variants of the OpenSpeedShop build depends_on("libtool", type='build') depends_on("bison", type='build') depends_on("flex", type='build') - depends_on("binutils", type='build') + + # For binutils + depends_on("binutils", when='@develop', type='build') + depends_on("binutils@2.29.1", when='@2.3.1.3', type='build') + depends_on("elf", type="link") depends_on("libdwarf") + depends_on("sqlite") - depends_on("boost@1.50.0:") - depends_on("dyninst@9.3.2:") - depends_on("python") - depends_on("libxml2+python") + + # For boost + depends_on("boost@1.50.0:", when='@develop') + depends_on("boost@1.66.0", when='@2.3.1.3') + + depends_on("dyninst@9.3.2:", when='@develop') + depends_on("dyninst@9.3.2", when='@2.3.1.3') + + depends_on("python", when='@develop') + depends_on("python@2.7.14", when='@2.3.1.3') + + depends_on("libxml2", when='@develop') + depends_on("libxml2@2.9.4", when='@2.3.1.3') + depends_on("qt@3.3.8b+krellpatch", when='gui=qt3') - # Actively working on adding this gui package - # depends_on("cbtf-argonavis-gui", when='gui=qt4') - - # Dependencies only for the openspeedshop offline package. - depends_on("libunwind", when='+offline') - depends_on("papi", when='+offline') - depends_on("libmonitor+krellpatch", when='+offline') - depends_on("openmpi", when='+offline+openmpi') - depends_on("mpich", when='+offline+mpich') - depends_on("mpich2", when='+offline+mpich2') - depends_on("mvapich2", when='+offline+mvapich2') - depends_on("mvapich", when='+offline+mvapich') - depends_on("mpt", when='+offline+mpt') - - # Dependencies only for the openspeedshop cbtf package. - depends_on("cbtf", when='+cbtf') - depends_on('cbtf-krell', when='+cbtf') - depends_on('cbtf-krell+crayfe', when='+crayfe') - depends_on('cbtf-krell+cti', when='+cti') - depends_on('cbtf-krell+mpich', when='+cbtf+mpich') - depends_on('cbtf-krell+mpich2', when='+cbtf+mpich2') - depends_on('cbtf-krell+mpt', when='+cbtf+mpt') - depends_on('cbtf-krell+mvapich', when='+cbtf+mvapich') - depends_on('cbtf-krell+mvapich2', when='+cbtf+mvapich2') - depends_on('cbtf-krell+openmpi', when='+cbtf+openmpi') - depends_on("cbtf-argonavis", when='+cbtf+cuda') - depends_on("mrnet@5.0.1:+lwthreads", when='+cbtf') - depends_on("mrnet@5.0.1:+cti", when='+cti+cbtf') + + # Dependencies for the openspeedshop cbtf packages. + depends_on("cbtf@develop", when='@develop') + depends_on("cbtf@1.9.1.0", when='@2.3.1.3') + + depends_on("cbtf-krell@develop", when='@develop') + depends_on("cbtf-krell@1.9.1.0", when='@2.3.1.3') + + depends_on('cbtf-krell@develop+crayfe', when='@develop+crayfe') + depends_on('cbtf-krell@1.9.1.0+crayfe', when='@2.3.1.3+crayfe') + + depends_on('cbtf-krell@develop+cti', when='@develop+cti') + depends_on('cbtf-krell@1.9.1.0+cti', when='@2.3.1.3+cti') + + depends_on('cbtf-krell@develop+mpich', when='@develop+mpich') + depends_on('cbtf-krell@1.9.1.0+mpich', when='@2.3.1.3+mpich') + + depends_on('cbtf-krell@develop+mpich2', when='@develop+mpich2') + depends_on('cbtf-krell@1.9.1.0+mpich2', when='@2.3.1.3+mpich2') + + depends_on('cbtf-krell@develop+mpt', when='@develop+mpt') + depends_on('cbtf-krell@1.9.1.0+mpt', when='@2.3.1.3+mpt') + + depends_on('cbtf-krell@develop+mvapich', when='@develop+mvapich') + depends_on('cbtf-krell@1.9.1.0+mvapich', when='@2.3.1.3+mvapich') + + depends_on('cbtf-krell@develop+mvapich2', when='@develop+mvapich2') + depends_on('cbtf-krell@1.9.1.0+mvapich2', when='@2.3.1.3+mvapich2') + + depends_on('cbtf-krell@develop+openmpi', when='@develop+openmpi') + depends_on('cbtf-krell@1.9.1.0+openmpi', when='@2.3.1.3+openmpi') + + depends_on("cbtf-argonavis@develop", when='@develop+cuda') + depends_on("cbtf-argonavis@1.9.1.0", when='@2.3.1.3+cuda') + + # For MRNet + depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti') + depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop') + + depends_on("mrnet@5.0.1-3:+cti", when='@2.3.1.3+cti') + depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.3.1.3') parallel = False @@ -165,6 +192,7 @@ class Openspeedshop(CMakePackage): CrayLoginNodeOptions = [] rt_platform = "cray" + # How do we get the compute node (CNL) cbtf package install # directory path? # spec['cbtf'].prefix is the login node value for this build, as @@ -188,89 +216,54 @@ class Openspeedshop(CMakePackage): compile_flags = "-O2 -g" - if spec.satisfies('+offline'): - # Indicate building offline vers (writes rawdata files) - instrumentor_setting = "offline" - if spec.satisfies('+runtime'): - cmake_args = [ - '-DCMAKE_CXX_FLAGS=%s' % compile_flags, - '-DCMAKE_C_FLAGS=%s' % compile_flags, - '-DINSTRUMENTOR=%s' % instrumentor_setting, - '-DLIBMONITOR_DIR=%s' % spec['libmonitor'].prefix, - '-DLIBUNWIND_DIR=%s' % spec['libunwind'].prefix, - '-DPAPI_DIR=%s' % spec['papi'].prefix] - - # Add any MPI implementations coming from variant settings - self.set_mpi_cmakeOptions(spec, cmake_args) - - else: - cmake_args = [] - - # Appends base options to cmake_args - self.set_defaultbase_cmakeOptions(spec, cmake_args) - cmake_args.extend( - ['-DCMAKE_CXX_FLAGS=%s' % compile_flags, - '-DCMAKE_C_FLAGS=%s' % compile_flags, - '-DINSTRUMENTOR=%s' % instrumentor_setting, - '-DLIBMONITOR_DIR=%s' % spec['libmonitor'].prefix, - '-DLIBUNWIND_DIR=%s' % spec['libunwind'].prefix, - '-DPAPI_DIR=%s' % spec['papi'].prefix, - '-DSQLITE3_DIR=%s' % spec['sqlite'].prefix, - '-DQTLIB_DIR=%s' % spec['qt'].prefix]) - - # Add any MPI implementations coming from variant settings - self.set_mpi_cmakeOptions(spec, cmake_args) + cmake_args = [] - elif spec.satisfies('+cbtf'): + # Indicate building cbtf vers (transfer rawdata files) + instrumentor_setting = "cbtf" - cmake_args = [] + if spec.satisfies('+runtime'): + # Appends base options to cmake_args + self.set_defaultbase_cmakeOptions(spec, cmake_args) - # Indicate building cbtf vers (transfer rawdata files) - instrumentor_setting = "cbtf" + cmake_args.extend( + ['-DCMAKE_CXX_FLAGS=%s' % compile_flags, + '-DCMAKE_C_FLAGS=%s' % compile_flags, + '-DINSTRUMENTOR=%s' % instrumentor_setting, + '-DCBTF_DIR=%s' % spec['cbtf'].prefix, + '-DCBTF_KRELL_DIR=%s' % spec['cbtf-krell'].prefix, + '-DMRNET_DIR=%s' % spec['mrnet'].prefix]) - if spec.satisfies('+runtime'): - # Appends base options to cmake_args - self.set_defaultbase_cmakeOptions(spec, cmake_args) + else: + # Appends base options to cmake_args + self.set_defaultbase_cmakeOptions(spec, cmake_args) + guitype = self.spec.variants['gui'].value + cmake_args.extend( + ['-DCMAKE_CXX_FLAGS=%s' % compile_flags, + '-DCMAKE_C_FLAGS=%s' % compile_flags, + '-DINSTRUMENTOR=%s' % instrumentor_setting, + '-DSQLITE3_DIR=%s' % spec['sqlite'].prefix, + '-DCBTF_DIR=%s' % spec['cbtf'].prefix, + '-DCBTF_KRELL_DIR=%s' % spec['cbtf-krell'].prefix, + '-DMRNET_DIR=%s' % spec['mrnet'].prefix]) + + if guitype == 'none': + cmake_args.extend( + ['-DBUILD_QT3_GUI=FALSE']) + elif guitype == 'qt4': cmake_args.extend( - ['-DCMAKE_CXX_FLAGS=%s' % compile_flags, - '-DCMAKE_C_FLAGS=%s' % compile_flags, - '-DINSTRUMENTOR=%s' % instrumentor_setting, - '-DCBTF_DIR=%s' % spec['cbtf'].prefix, - '-DCBTF_KRELL_DIR=%s' % spec['cbtf-krell'].prefix, - '-DMRNET_DIR=%s' % spec['mrnet'].prefix]) - - else: - - # Appends base options to cmake_args - self.set_defaultbase_cmakeOptions(spec, cmake_args) - guitype = self.spec.variants['gui'].value + ['-DBUILD_QT3_GUI=FALSE']) + elif guitype == 'qt3': cmake_args.extend( - ['-DCMAKE_CXX_FLAGS=%s' % compile_flags, - '-DCMAKE_C_FLAGS=%s' % compile_flags, - '-DINSTRUMENTOR=%s' % instrumentor_setting, - '-DSQLITE3_DIR=%s' % spec['sqlite'].prefix, - '-DCBTF_DIR=%s' % spec['cbtf'].prefix, - '-DCBTF_KRELL_DIR=%s' % spec['cbtf-krell'].prefix, - '-DMRNET_DIR=%s' % spec['mrnet'].prefix]) - - if guitype == 'none': - cmake_args.extend( - ['-DBUILD_QT3_GUI=FALSE']) - elif guitype == 'qt4': - cmake_args.extend( - ['-DBUILD_QT3_GUI=FALSE']) - elif guitype == 'qt3': - cmake_args.extend( - ['-DQTLIB_DIR=%s' - % spec['qt'].prefix]) - - if spec.satisfies('+crayfe'): - # We need to build target/compute node - # components/libraries first then pass - # those libraries to the openspeedshop - # login node build - self.set_CrayLoginNode_cmakeOptions(spec, cmake_args) + ['-DQTLIB_DIR=%s' + % spec['qt'].prefix]) + + if spec.satisfies('+crayfe'): + # We need to build target/compute node + # components/libraries first then pass + # those libraries to the openspeedshop + # login node build + self.set_CrayLoginNode_cmakeOptions(spec, cmake_args) return cmake_args @@ -352,35 +345,15 @@ class Openspeedshop(CMakePackage): os.path.dirname(oss_libdir.joined())) run_env.set('OPENSS_RAWDATA_DIR', '.') - # Settings specific to the version, checking here - # for the offline instrumentor, otherwise use cbtf instrumentor - # settings. MPI for the cbtf instrumentor is setup in cbtf-krell - if '+offline' in self.spec: - # Had to use this form of syntax self.prefix.lib and - # self.prefix.lib64 returned None all the time - run_env.set('OPENSS_PLUGIN_PATH', - join_path(oss_libdir + '/openspeedshop')) - run_env.prepend_path('PATH', self.spec['papi'].prefix.bin) - run_env.prepend_path('PATH', self.spec['libdwarf'].prefix.bin) - run_env.prepend_path('PATH', self.spec['python'].prefix.bin) - - if '+mpich' in self.spec: - run_env.set('OPENSS_MPI_IMPLEMENTATION', 'mpich') - if '+mpich2' in self.spec: - run_env.set('OPENSS_MPI_IMPLEMENTATION', 'mpich2') - if '+mvapich2' in self.spec: - run_env.set('OPENSS_MPI_IMPLEMENTATION', 'mvapich2') - if '+openmpi' in self.spec: - run_env.set('OPENSS_MPI_IMPLEMENTATION', 'openmpi') - else: - cbtf_mc = '/sbin/cbtf_mrnet_commnode' - cbtf_lmb = '/sbin/cbtf_libcbtf_mrnet_backend' - run_env.set('XPLAT_RSH', 'ssh') - run_env.set('MRNET_COMM_PATH', - join_path(self.spec['cbtf-krell'].prefix + cbtf_mc)) - run_env.set('CBTF_MRNET_BACKEND_PATH', - join_path(self.spec['cbtf-krell'].prefix + cbtf_lmb)) - run_env.prepend_path('PATH', self.spec['mrnet'].prefix.bin) - run_env.prepend_path('PATH', self.spec['cbtf-krell'].prefix.bin) - run_env.prepend_path('PATH', self.spec['cbtf-krell'].prefix.sbin) - run_env.prepend_path('PATH', self.spec['python'].prefix.bin) + + cbtf_mc = '/sbin/cbtf_mrnet_commnode' + cbtf_lmb = '/sbin/cbtf_libcbtf_mrnet_backend' + run_env.set('XPLAT_RSH', 'ssh') + run_env.set('MRNET_COMM_PATH', + join_path(self.spec['cbtf-krell'].prefix + cbtf_mc)) + run_env.set('CBTF_MRNET_BACKEND_PATH', + join_path(self.spec['cbtf-krell'].prefix + cbtf_lmb)) + run_env.prepend_path('PATH', self.spec['mrnet'].prefix.bin) + run_env.prepend_path('PATH', self.spec['cbtf-krell'].prefix.bin) + run_env.prepend_path('PATH', self.spec['cbtf-krell'].prefix.sbin) + run_env.prepend_path('PATH', self.spec['python'].prefix.bin) diff --git a/var/spack/repos/builtin/packages/qtgraph/package.py b/var/spack/repos/builtin/packages/qtgraph/package.py index 30e0e40829..f4ffbaefcf 100644 --- a/var/spack/repos/builtin/packages/qtgraph/package.py +++ b/var/spack/repos/builtin/packages/qtgraph/package.py @@ -51,12 +51,22 @@ class Qtgraph(QMakePackage): homepage = "https://github.com/OpenSpeedShop/QtGraph" url = "https://github.com/OpenSpeedShop/QtGraph.git" + + version('1.0.0.0', branch='1.0.0.0', + git='https://github.com/OpenSpeedShop/QtGraph.git') + version('1.0.0', branch='master', git='https://github.com/OpenSpeedShop/QtGraph.git') + version('develop', branch='master', + git='https://github.com/OpenSpeedShop/QtGraph.git') + # qtgraph depends on these packages - depends_on('qt@4.8.6:') - depends_on('graphviz') + depends_on('qt@4.8.6:', when='@develop') + depends_on('qt@5.10.0', when='@1.0.0.0') + + depends_on("graphviz@2.40.1:", when='@develop') + depends_on("graphviz@2.40.1", when='@1.0.0.0') def setup_environment(self, spack_env, run_env): """Set up the compile and runtime environments for a package.""" -- cgit v1.2.3-70-g09d2 From e24a56b8cbbde1d91f75be8dca3956d184ce9e3c Mon Sep 17 00:00:00 2001 From: Serban Maerean Date: Thu, 17 May 2018 16:04:28 -0400 Subject: Add version 6.1. to ESSL spackage file. (#8170) --- var/spack/repos/builtin/packages/essl/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/essl/package.py b/var/spack/repos/builtin/packages/essl/package.py index 115b0ca4ae..f153735699 100644 --- a/var/spack/repos/builtin/packages/essl/package.py +++ b/var/spack/repos/builtin/packages/essl/package.py @@ -31,6 +31,7 @@ class Essl(Package): homepage = "https://www.ibm.com/systems/power/software/essl/" url = "ibm-essl" + version('6.1') version('5.5') variant('ilp64', default=False, description='64 bit integers') -- cgit v1.2.3-70-g09d2 From 0141581a6659f044476d549061f268777430a71e Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Thu, 17 May 2018 15:26:38 -0500 Subject: r-rstan: new version and dependents (#8158) * r-stanheaders: new version * r-rstan: new version * r-rcppeigen: new version * r-rstan: requires newer version of r-rcppeigen --- var/spack/repos/builtin/packages/r-rcppeigen/package.py | 1 + var/spack/repos/builtin/packages/r-rstan/package.py | 2 ++ var/spack/repos/builtin/packages/r-stanheaders/package.py | 1 + 3 files changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-rcppeigen/package.py b/var/spack/repos/builtin/packages/r-rcppeigen/package.py index e47b28481d..69e2a86d48 100644 --- a/var/spack/repos/builtin/packages/r-rcppeigen/package.py +++ b/var/spack/repos/builtin/packages/r-rcppeigen/package.py @@ -44,6 +44,7 @@ class RRcppeigen(RPackage): url = "https://cran.r-project.org/src/contrib/RcppEigen_0.3.2.9.0.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/RcppEigen" + version('0.3.3.3.1', '1a5ae17828813e40e6b3e7400e408a2b') version('0.3.2.9.0', '14a7786882a5d9862d53c4b2217df318') version('0.3.2.8.1', '4146e06e4fdf7f4d08db7839069d479f') diff --git a/var/spack/repos/builtin/packages/r-rstan/package.py b/var/spack/repos/builtin/packages/r-rstan/package.py index 44dc8d5777..875fa1f203 100644 --- a/var/spack/repos/builtin/packages/r-rstan/package.py +++ b/var/spack/repos/builtin/packages/r-rstan/package.py @@ -40,6 +40,7 @@ class RRstan(RPackage): url = "https://cran.r-project.org/src/contrib/rstan_2.10.1.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/rstan" + version('2.17.2', '60f4a0284c58f5efc1b1cbf488d7edda') version('2.10.1', 'f5d212f6f8551bdb91fe713d05d4052a') depends_on('r-ggplot2', type=('build', 'run')) @@ -48,4 +49,5 @@ class RRstan(RPackage): depends_on('r-gridextra', type=('build', 'run')) depends_on('r-rcpp', type=('build', 'run')) depends_on('r-rcppeigen', type=('build', 'run')) + depends_on('r-rcppeigen@0.3.3.3.0:', type=('build', 'run'), when='@2.17.2:') depends_on('r-bh', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-stanheaders/package.py b/var/spack/repos/builtin/packages/r-stanheaders/package.py index 6ca0a0aa06..898c15f297 100644 --- a/var/spack/repos/builtin/packages/r-stanheaders/package.py +++ b/var/spack/repos/builtin/packages/r-stanheaders/package.py @@ -46,4 +46,5 @@ class RStanheaders(RPackage): url = "https://cran.r-project.org/src/contrib/StanHeaders_2.10.0-2.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/StanHeaders" + version('2.17.1', '11d8770277dd18e563852852633c6c25') version('2.10.0-2', '9d09b1e9278f08768f7a988ad9082d57') -- cgit v1.2.3-70-g09d2 From 110511da92043542d8ed248897406e35d219b846 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Thu, 17 May 2018 14:40:54 -0600 Subject: pv: initial commit (#8147) --- var/spack/repos/builtin/packages/pv/package.py | 36 ++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 var/spack/repos/builtin/packages/pv/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pv/package.py b/var/spack/repos/builtin/packages/pv/package.py new file mode 100644 index 0000000000..e241dca24c --- /dev/null +++ b/var/spack/repos/builtin/packages/pv/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2018, Los Alamos National Security, LLC +# Produced at the Los Alamos National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Pv(AutotoolsPackage): + """ Pipe Viewer - is a terminal-based tool for monitoring the progress + of data through a pipeline + """ + + homepage = "http://www.ivarch.com/programs/pv.shtml" + url = "http://www.ivarch.com/programs/sources/pv-1.6.6.tar.bz2" + + version('1.6.6', 'ff3564fddcc2b9bd4a9c1d143aba4b4c') -- cgit v1.2.3-70-g09d2 From a46f2b8e42852b3c51d31c9402328c82d5d1f78c Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Thu, 17 May 2018 15:43:30 -0500 Subject: swap-assembler: Create new package. (#8144) * swap-assembler: Create new package. * swap-assembler: fix flake8 error. --- .../builtin/packages/swap-assembler/package.py | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 var/spack/repos/builtin/packages/swap-assembler/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/swap-assembler/package.py b/var/spack/repos/builtin/packages/swap-assembler/package.py new file mode 100644 index 0000000000..a96fb949ea --- /dev/null +++ b/var/spack/repos/builtin/packages/swap-assembler/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class SwapAssembler(MakefilePackage): + """A scalable and fully parallelized genome assembler.""" + + homepage = "https://sourceforge.net/projects/swapassembler/" + url = "https://sourceforge.net/projects/swapassembler/files/SWAP_Assembler-0.4.tar.bz2/download" + + version('0.4', '944f2aeae4f451be81160bb625304fc3') + + depends_on('mpich') + + def edit(self, spec, prefix): + makefile = FileFilter('Makefile') + makefile.filter('$(CC) -O2', '$(CC) -pthread -O2', string=True) + + def install(self, spec, prefix): + install_tree('.', prefix.bin) -- cgit v1.2.3-70-g09d2 From d579231967d502b56b6254c660e6dfddc4f2ba3a Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Thu, 17 May 2018 22:58:29 +0200 Subject: flex: use 2.6.3. by default (#8154) Fixes #8152 Flex 2.6.4 doesn't build with gcc@7:. This sets Flex 2.6.3 as the preferred version. The flex package had a conflict directive for this but originally the recorded conflict was specific to ubuntu; this appears to be an issue on multiple operating systems so this also updates the conflict to be more general and adds a comment which links to the relevant issues. --- var/spack/repos/builtin/packages/flex/package.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/flex/package.py b/var/spack/repos/builtin/packages/flex/package.py index 01545fc9f4..b847de22d0 100644 --- a/var/spack/repos/builtin/packages/flex/package.py +++ b/var/spack/repos/builtin/packages/flex/package.py @@ -33,7 +33,10 @@ class Flex(AutotoolsPackage): url = "https://github.com/westes/flex/releases/download/v2.6.1/flex-2.6.1.tar.gz" version('2.6.4', '2882e3179748cc9f9c23ec593d6adc8d') - version('2.6.3', 'a5f65570cd9107ec8a8ec88f17b31bb1') + # 2.6.4 fails to compile with gcc@7.2: + # see https://github.com/spack/spack/issues/8152 and + # https://github.com/spack/spack/issues/6942 + version('2.6.3', 'a5f65570cd9107ec8a8ec88f17b31bb1', preferred=True) # Avoid flex '2.6.2' (major bug) # See issue #2554; https://github.com/westes/flex/issues/113 version('2.6.1', '05bcd8fb629e0ae130311e8a6106fa82') @@ -53,9 +56,9 @@ class Flex(AutotoolsPackage): depends_on('automake', type='build', when='@:2.6.0') depends_on('libtool', type='build', when='@:2.6.0') - # Build issue for v2.6.4 when gcc 7.2.0 is used on Ubuntu 17.10. + # Build issue for v2.6.4 when gcc@7.2.0: is used # See issue #219; https://github.com/westes/flex/issues/219 - conflicts('%gcc@7.2.0: os=ubuntu17.10', when='@2.6.4') + conflicts('%gcc@7.2.0:', when='@2.6.4') def url_for_version(self, version): url = "https://github.com/westes/flex" -- cgit v1.2.3-70-g09d2 From a4d276fbe4ec45c7ac4d9315d0f803a223096d18 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Sun, 8 Apr 2018 21:10:05 -0500 Subject: init: factor paths out of spack/__init__.py and into spack.paths module --- lib/spack/spack/__init__.py | 47 +------------ lib/spack/spack/architecture.py | 6 +- lib/spack/spack/build_environment.py | 42 ++++++------ lib/spack/spack/cmd/__init__.py | 8 +-- lib/spack/spack/cmd/blame.py | 6 +- lib/spack/spack/cmd/clone.py | 4 +- lib/spack/spack/cmd/common/__init__.py | 9 +-- lib/spack/spack/cmd/debug.py | 4 +- lib/spack/spack/cmd/edit.py | 16 ++--- lib/spack/spack/cmd/flake8.py | 19 ++--- lib/spack/spack/cmd/gpg.py | 9 +-- lib/spack/spack/cmd/install.py | 4 +- lib/spack/spack/cmd/location.py | 8 +-- lib/spack/spack/cmd/pkg.py | 12 ++-- lib/spack/spack/cmd/test.py | 4 +- lib/spack/spack/compilers/__init__.py | 9 +-- lib/spack/spack/compilers/clang.py | 11 +-- lib/spack/spack/compilers/gcc.py | 4 +- lib/spack/spack/compilers/intel.py | 2 +- lib/spack/spack/compilers/nag.py | 2 +- lib/spack/spack/compilers/pgi.py | 2 +- lib/spack/spack/compilers/xl.py | 2 +- lib/spack/spack/compilers/xl_r.py | 2 +- lib/spack/spack/config.py | 10 +-- lib/spack/spack/hooks/__init__.py | 6 +- lib/spack/spack/hooks/sbang.py | 4 +- lib/spack/spack/main.py | 29 ++++---- lib/spack/spack/modules/common.py | 5 +- lib/spack/spack/package.py | 19 ++--- lib/spack/spack/paths.py | 80 ++++++++++++++++++++++ lib/spack/spack/platforms/cray.py | 2 +- lib/spack/spack/spec.py | 3 +- lib/spack/spack/stage.py | 26 +++---- lib/spack/spack/store.py | 4 +- lib/spack/spack/test/build_environment.py | 8 +-- lib/spack/spack/test/cc.py | 12 ++-- lib/spack/spack/test/cmd/blame.py | 4 +- lib/spack/spack/test/cmd/flake8.py | 6 +- lib/spack/spack/test/cmd/gpg.py | 11 +-- lib/spack/spack/test/cmd/url.py | 15 ++-- lib/spack/spack/test/config.py | 19 ++--- lib/spack/spack/test/conftest.py | 19 ++--- lib/spack/spack/test/directory_layout.py | 3 +- lib/spack/spack/test/environment.py | 2 +- lib/spack/spack/test/llnl/util/file_list.py | 11 +-- lib/spack/spack/test/modules/conftest.py | 13 ++-- lib/spack/spack/test/package_sanity.py | 4 +- lib/spack/spack/test/packages.py | 12 ++-- lib/spack/spack/test/packaging.py | 3 +- lib/spack/spack/test/patch.py | 6 +- lib/spack/spack/test/python_version.py | 32 +++++---- lib/spack/spack/test/repo.py | 7 +- lib/spack/spack/test/sbang.py | 4 +- lib/spack/spack/test/stage.py | 13 ++-- lib/spack/spack/test/web.py | 4 +- lib/spack/spack/util/executable.py | 2 +- lib/spack/spack/util/gpg.py | 5 +- lib/spack/spack/util/naming.py | 2 +- lib/spack/spack/util/path.py | 6 +- .../builtin.mock/packages/url-list-test/package.py | 4 +- .../repos/builtin/packages/cbtf-krell/package.py | 1 - .../packages/gobject-introspection/package.py | 2 +- .../builtin/packages/openspeedshop/package.py | 1 - var/spack/repos/builtin/packages/perl/package.py | 6 +- var/spack/repos/builtin/packages/python/package.py | 6 +- 65 files changed, 367 insertions(+), 296 deletions(-) create mode 100644 lib/spack/spack/paths.py (limited to 'var') diff --git a/lib/spack/spack/__init__.py b/lib/spack/spack/__init__.py index bc41c9ff23..e0ed62c0fd 100644 --- a/lib/spack/spack/__init__.py +++ b/lib/spack/spack/__init__.py @@ -27,51 +27,7 @@ import os import sys import multiprocessing -from llnl.util.filesystem import ancestor - -#----------------------------------------------------------------------------- -# Variables describing how Spack is laid out in its prefix. -#----------------------------------------------------------------------------- -# This file lives in $prefix/lib/spack/spack/__file__ -spack_root = ancestor(__file__, 4) - -# The spack script itself -spack_file = os.path.join(spack_root, "bin", "spack") - -# spack directory hierarchy -lib_path = os.path.join(spack_root, "lib", "spack") -external_path = os.path.join(lib_path, "external") -build_env_path = os.path.join(lib_path, "env") -module_path = os.path.join(lib_path, "spack") -platform_path = os.path.join(module_path, 'platforms') -compilers_path = os.path.join(module_path, "compilers") -build_systems_path = os.path.join(module_path, 'build_systems') -operating_system_path = os.path.join(module_path, 'operating_systems') -test_path = os.path.join(module_path, "test") -hooks_path = os.path.join(module_path, "hooks") -var_path = os.path.join(spack_root, "var", "spack") -stage_path = os.path.join(var_path, "stage") -repos_path = os.path.join(var_path, "repos") -share_path = os.path.join(spack_root, "share", "spack") - -# Paths to built-in Spack repositories. -packages_path = os.path.join(repos_path, "builtin") -mock_packages_path = os.path.join(repos_path, "builtin.mock") - -# User configuration location -user_config_path = os.path.expanduser('~/.spack') - -prefix = spack_root -opt_path = os.path.join(prefix, "opt") -etc_path = os.path.join(prefix, "etc") -system_etc_path = '/etc' - -# GPG paths. -gpg_keys_path = os.path.join(var_path, "gpg") -mock_gpg_data_path = os.path.join(var_path, "gpg.mock", "data") -mock_gpg_keys_path = os.path.join(var_path, "gpg.mock", "keys") -gpg_path = os.path.join(opt_path, "spack", "gpg") - +from spack.paths import var_path, user_config_path #----------------------------------------------------------------------------- # Below code imports spack packages. @@ -280,4 +236,3 @@ __all__ += [ # Add default values for attributes that would otherwise be modified from # Spack main script debug = False -spack_working_dir = None diff --git a/lib/spack/spack/architecture.py b/lib/spack/spack/architecture.py index 900747bedc..a3407b95d1 100644 --- a/lib/spack/spack/architecture.py +++ b/lib/spack/spack/architecture.py @@ -83,12 +83,12 @@ from llnl.util.lang import memoized, list_modules, key_ordering from llnl.util.filesystem import join_path import llnl.util.tty as tty -import spack +import spack.paths +import spack.error as serr from spack.util.naming import mod_to_class from spack.util.environment import get_path from spack.util.multiproc import parmap from spack.util.spack_yaml import syaml_dict -import spack.error as serr class NoPlatformError(serr.SpackError): @@ -463,7 +463,7 @@ def arch_for_spec(arch_spec): @memoized def all_platforms(): classes = [] - mod_path = spack.platform_path + mod_path = spack.paths.platform_path parent_module = "spack.platforms" for name in list_modules(mod_path): diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py index 2bb54ab680..fc7b12f8fd 100644 --- a/lib/spack/spack/build_environment.py +++ b/lib/spack/spack/build_environment.py @@ -63,9 +63,10 @@ from six import StringIO import llnl.util.tty as tty from llnl.util.tty.color import colorize -from llnl.util.filesystem import join_path, mkdirp, install, install_tree +from llnl.util.filesystem import mkdirp, install, install_tree -import spack +import spack.main +import spack.paths import spack.store from spack.environment import EnvironmentModifications, validate from spack.util.environment import env_flag, filter_system_paths, get_path @@ -138,21 +139,21 @@ def set_compiler_environment_variables(pkg, env): # and return it # TODO : add additional kwargs for better diagnostics, like requestor, # ttyout, ttyerr, etc. - link_dir = spack.build_env_path + link_dir = spack.paths.build_env_path # Set SPACK compiler variables so that our wrapper knows what to call if compiler.cc: env.set('SPACK_CC', compiler.cc) - env.set('CC', join_path(link_dir, compiler.link_paths['cc'])) + env.set('CC', os.path.join(link_dir, compiler.link_paths['cc'])) if compiler.cxx: env.set('SPACK_CXX', compiler.cxx) - env.set('CXX', join_path(link_dir, compiler.link_paths['cxx'])) + env.set('CXX', os.path.join(link_dir, compiler.link_paths['cxx'])) if compiler.f77: env.set('SPACK_F77', compiler.f77) - env.set('F77', join_path(link_dir, compiler.link_paths['f77'])) + env.set('F77', os.path.join(link_dir, compiler.link_paths['f77'])) if compiler.fc: env.set('SPACK_FC', compiler.fc) - env.set('FC', join_path(link_dir, compiler.link_paths['fc'])) + env.set('FC', os.path.join(link_dir, compiler.link_paths['fc'])) # Set SPACK compiler rpath flags so that our wrapper knows what to use env.set('SPACK_CC_RPATH_ARG', compiler.cc_rpath_arg) @@ -302,20 +303,21 @@ def set_build_environment_variables(pkg, env, dirty): env.prepend_path('PATH', bin_dir) # Add spack build environment path with compiler wrappers first in - # the path. We add both spack.env_path, which includes default + # the path. We add the compiler wrapper path, which includes default # wrappers (cc, c++, f77, f90), AND a subdirectory containing # compiler-specific symlinks. The latter ensures that builds that - # are sensitive to the *name* of the compiler see the right name - # when we're building with the wrappers. + # are sensitive to the *name* of the compiler see the right name when + # we're building with the wrappers. # # Conflicts on case-insensitive systems (like "CC" and "cc") are # handled by putting one in the /case-insensitive # directory. Add that to the path too. env_paths = [] - compiler_specific = join_path(spack.build_env_path, pkg.compiler.name) - for item in [spack.build_env_path, compiler_specific]: + compiler_specific = os.path.join( + spack.paths.build_env_path, pkg.compiler.name) + for item in [spack.paths.build_env_path, compiler_specific]: env_paths.append(item) - ci = join_path(item, 'case-insensitive') + ci = os.path.join(item, 'case-insensitive') if os.path.isdir(ci): env_paths.append(ci) @@ -328,12 +330,12 @@ def set_build_environment_variables(pkg, env, dirty): env.set(SPACK_DEBUG, 'TRUE') env.set(SPACK_SHORT_SPEC, pkg.spec.short_spec) env.set(SPACK_DEBUG_LOG_ID, pkg.spec.format('${PACKAGE}-${HASH:7}')) - env.set(SPACK_DEBUG_LOG_DIR, spack.spack_working_dir) + env.set(SPACK_DEBUG_LOG_DIR, spack.main.spack_working_dir) # Add any pkgconfig directories to PKG_CONFIG_PATH for prefix in build_link_prefixes: for directory in ('lib', 'lib64', 'share'): - pcdir = join_path(prefix, directory, 'pkgconfig') + pcdir = os.path.join(prefix, directory, 'pkgconfig') if os.path.isdir(pcdir): env.prepend_path('PKG_CONFIG_PATH', pcdir) @@ -374,11 +376,11 @@ def set_module_variables_for_package(pkg, module): m.std_cmake_args = spack.CMakePackage._std_args(pkg) # Put spack compiler paths in module scope. - link_dir = spack.build_env_path - m.spack_cc = join_path(link_dir, pkg.compiler.link_paths['cc']) - m.spack_cxx = join_path(link_dir, pkg.compiler.link_paths['cxx']) - m.spack_f77 = join_path(link_dir, pkg.compiler.link_paths['f77']) - m.spack_fc = join_path(link_dir, pkg.compiler.link_paths['fc']) + link_dir = spack.paths.build_env_path + m.spack_cc = os.path.join(link_dir, pkg.compiler.link_paths['cc']) + m.spack_cxx = os.path.join(link_dir, pkg.compiler.link_paths['cxx']) + m.spack_f77 = os.path.join(link_dir, pkg.compiler.link_paths['f77']) + m.spack_fc = os.path.join(link_dir, pkg.compiler.link_paths['fc']) # Emulate some shell commands for convenience m.pwd = os.getcwd diff --git a/lib/spack/spack/cmd/__init__.py b/lib/spack/spack/cmd/__init__.py index 3f713287e6..6c6bb8496e 100644 --- a/lib/spack/spack/cmd/__init__.py +++ b/lib/spack/spack/cmd/__init__.py @@ -33,8 +33,8 @@ from llnl.util.tty.colify import colify from llnl.util.tty.color import colorize from llnl.util.filesystem import working_dir -import spack import spack.config +import spack.paths import spack.spec import spack.store from spack.error import SpackError @@ -58,8 +58,6 @@ ignore_files = r'^\.|^__init__.py$|^#' SETUP_PARSER = "setup_parser" DESCRIPTION = "description" -command_path = os.path.join(spack.lib_path, "spack", "cmd") - #: Names of all commands all_commands = [] @@ -74,7 +72,7 @@ def cmd_name(python_name): return python_name.replace('_', '-') -for file in os.listdir(command_path): +for file in os.listdir(spack.paths.command_path): if file.endswith(".py") and not re.search(ignore_files, file): cmd = re.sub(r'.py$', '', file) all_commands.append(cmd_name(cmd)) @@ -320,5 +318,5 @@ def display_specs(specs, args=None, **kwargs): def spack_is_git_repo(): """Ensure that this instance of Spack is a git clone.""" - with working_dir(spack.prefix): + with working_dir(spack.paths.prefix): return os.path.isdir('.git') diff --git a/lib/spack/spack/cmd/blame.py b/lib/spack/spack/cmd/blame.py index 28dcdd27ad..38b2a13879 100644 --- a/lib/spack/spack/cmd/blame.py +++ b/lib/spack/spack/cmd/blame.py @@ -30,7 +30,7 @@ from llnl.util.lang import pretty_date from llnl.util.filesystem import working_dir from llnl.util.tty.colify import colify_table -import spack +import spack.paths from spack.util.executable import which from spack.cmd import spack_is_git_repo @@ -67,7 +67,7 @@ def blame(parser, args): blame_file = None if os.path.isfile(args.package_name): path = os.path.realpath(args.package_name) - if path.startswith(spack.prefix): + if path.startswith(spack.paths.prefix): blame_file = path if not blame_file: @@ -75,7 +75,7 @@ def blame(parser, args): blame_file = pkg.module.__file__.rstrip('c') # .pyc -> .py # get git blame for the package - with working_dir(spack.prefix): + with working_dir(spack.paths.prefix): if args.view == 'git': git('blame', blame_file) return diff --git a/lib/spack/spack/cmd/clone.py b/lib/spack/spack/cmd/clone.py index 3c548c66ed..f8b3f899ee 100644 --- a/lib/spack/spack/cmd/clone.py +++ b/lib/spack/spack/cmd/clone.py @@ -27,7 +27,7 @@ import os import llnl.util.tty as tty from llnl.util.filesystem import mkdirp, working_dir -import spack +import spack.paths from spack.util.executable import ProcessError, which _SPACK_UPSTREAM = 'https://github.com/spack/spack' @@ -47,7 +47,7 @@ def setup_parser(subparser): def get_origin_info(remote): - git_dir = os.path.join(spack.prefix, '.git') + git_dir = os.path.join(spack.paths.prefix, '.git') git = which('git', required=True) try: branch = git('symbolic-ref', '--short', 'HEAD', output=str) diff --git a/lib/spack/spack/cmd/common/__init__.py b/lib/spack/spack/cmd/common/__init__.py index e7e2b142f8..25cfdf4398 100644 --- a/lib/spack/spack/cmd/common/__init__.py +++ b/lib/spack/spack/cmd/common/__init__.py @@ -23,7 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## -import spack +import spack.paths from llnl.util import tty @@ -35,9 +35,10 @@ def print_module_placeholder_help(): "To initialize spack's shell commands, you must run one of", "the commands below. Choose the right command for your shell.", "", "For bash and zsh:", - " . %s/setup-env.sh" % spack.share_path, "", - "For csh and tcsh:", " setenv SPACK_ROOT %s" % spack.prefix, - " source %s/setup-env.csh" % spack.share_path, "", + " . %s/setup-env.sh" % spack.paths.share_path, "", + "For csh and tcsh:", + " setenv SPACK_ROOT %s" % spack.paths.prefix, + " source %s/setup-env.csh" % spack.paths.share_path, "", "This exposes a 'spack' shell function, which you can use like", " $ spack load package-foo", "", "Running the Spack executable directly (for example, invoking", diff --git a/lib/spack/spack/cmd/debug.py b/lib/spack/spack/cmd/debug.py index db8180621a..2a85be8a00 100644 --- a/lib/spack/spack/cmd/debug.py +++ b/lib/spack/spack/cmd/debug.py @@ -30,7 +30,7 @@ from glob import glob import llnl.util.tty as tty from llnl.util.filesystem import working_dir -import spack +import spack.paths from spack.util.executable import which description = "debugging commands for troubleshooting Spack" @@ -52,7 +52,7 @@ def _debug_tarball_suffix(): if not git: return 'nobranch-nogit-%s' % suffix - with working_dir(spack.spack_root): + with working_dir(spack.paths.prefix): if not os.path.isdir('.git'): return 'nobranch.nogit.%s' % suffix diff --git a/lib/spack/spack/cmd/edit.py b/lib/spack/spack/cmd/edit.py index 32a892e565..0b555d50e1 100644 --- a/lib/spack/spack/cmd/edit.py +++ b/lib/spack/spack/cmd/edit.py @@ -27,8 +27,8 @@ import glob import llnl.util.tty as tty -import spack import spack.cmd +import spack.paths from spack.spec import Spec from spack.repository import Repo @@ -74,23 +74,23 @@ def setup_parser(subparser): # Edits package files by default excl_args.add_argument( '-b', '--build-system', dest='path', action='store_const', - const=spack.build_systems_path, + const=spack.paths.build_systems_path, help="Edit the build system with the supplied name.") excl_args.add_argument( '-c', '--command', dest='path', action='store_const', - const=spack.cmd.command_path, + const=spack.paths.command_path, help="edit the command with the supplied name") excl_args.add_argument( '-d', '--docs', dest='path', action='store_const', - const=os.path.join(spack.lib_path, 'docs'), + const=os.path.join(spack.paths.lib_path, 'docs'), help="edit the docs with the supplied name") excl_args.add_argument( '-t', '--test', dest='path', action='store_const', - const=spack.test_path, + const=spack.paths.test_path, help="edit the test with the supplied name") excl_args.add_argument( '-m', '--module', dest='path', action='store_const', - const=spack.module_path, + const=spack.paths.module_path, help="edit the main spack module with the supplied name") # Options for editing packages @@ -110,14 +110,14 @@ def edit(parser, args): name = args.name # By default, edit package files - path = spack.packages_path + path = spack.paths.packages_path # If `--command`, `--test`, or `--module` is chosen, edit those instead if args.path: path = args.path if name: # convert command names to python module name - if path == spack.cmd.command_path: + if path == spack.paths.command_path: name = spack.cmd.python_name(name) path = os.path.join(path, name) diff --git a/lib/spack/spack/cmd/flake8.py b/lib/spack/spack/cmd/flake8.py index 40eac23034..c6fe19f30c 100644 --- a/lib/spack/spack/cmd/flake8.py +++ b/lib/spack/spack/cmd/flake8.py @@ -33,7 +33,7 @@ import argparse from llnl.util.filesystem import working_dir, mkdirp -import spack +import spack.paths from spack.util.executable import which @@ -53,7 +53,7 @@ def is_package(f): #: List of directories to exclude from checks. -exclude_directories = [spack.external_path] +exclude_directories = [spack.paths.external_path] #: This is a dict that maps: @@ -243,11 +243,12 @@ def flake8(parser, args): if file_list: def prefix_relative(path): return os.path.relpath( - os.path.abspath(os.path.realpath(path)), spack.prefix) + os.path.abspath(os.path.realpath(path)), + spack.paths.prefix) file_list = [prefix_relative(p) for p in file_list] - with working_dir(spack.prefix): + with working_dir(spack.paths.prefix): if not file_list: file_list = changed_files(args) @@ -261,7 +262,7 @@ def flake8(parser, args): # filter files into a temporary directory with exemptions added. for filename in file_list: - src_path = os.path.join(spack.prefix, filename) + src_path = os.path.join(spack.paths.prefix, filename) dest_path = os.path.join(temp, filename) filter_file(src_path, dest_path, args.output) @@ -275,13 +276,14 @@ def flake8(parser, args): if file_list: output += flake8( '--format', 'pylint', - '--config=%s' % os.path.join(spack.prefix, '.flake8'), + '--config=%s' % os.path.join(spack.paths.prefix, + '.flake8'), *file_list, fail_on_error=False, output=str) returncode |= flake8.returncode if package_file_list: output += flake8( '--format', 'pylint', - '--config=%s' % os.path.join(spack.prefix, + '--config=%s' % os.path.join(spack.paths.prefix, '.flake8_packages'), *package_file_list, fail_on_error=False, output=str) returncode |= flake8.returncode @@ -293,7 +295,8 @@ def flake8(parser, args): # print results relative to current working directory def cwd_relative(path): return '{0}: ['.format(os.path.relpath( - os.path.join(spack.prefix, path.group(1)), os.getcwd())) + os.path.join( + spack.paths.prefix, path.group(1)), os.getcwd())) for line in output.split('\n'): print(re.sub(r'^(.*): \[', cwd_relative, line)) diff --git a/lib/spack/spack/cmd/gpg.py b/lib/spack/spack/cmd/gpg.py index e23cfd25de..e6ff1510a2 100644 --- a/lib/spack/spack/cmd/gpg.py +++ b/lib/spack/spack/cmd/gpg.py @@ -22,10 +22,11 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## -from spack.util.gpg import Gpg -import argparse -import spack import os +import argparse + +import spack.paths +from spack.util.gpg import Gpg description = "handle GPG actions for spack" section = "packaging" @@ -148,7 +149,7 @@ def gpg_trust(args): def gpg_init(args): import_dir = args.import_dir if import_dir is None: - import_dir = spack.gpg_keys_path + import_dir = spack.paths.gpg_keys_path for root, _, filenames in os.walk(import_dir): for filename in filenames: diff --git a/lib/spack/spack/cmd/install.py b/lib/spack/spack/cmd/install.py index 36459afd64..05998b0815 100644 --- a/lib/spack/spack/cmd/install.py +++ b/lib/spack/spack/cmd/install.py @@ -30,7 +30,7 @@ import sys import llnl.util.filesystem as fs import llnl.util.tty as tty -import spack +import spack.paths import spack.build_environment import spack.cmd import spack.cmd.common.arguments as arguments @@ -137,7 +137,7 @@ def default_log_file(spec): """ fmt = 'test-{x.name}-{x.version}-{hash}.xml' basename = fmt.format(x=spec, hash=spec.dag_hash()) - dirname = fs.join_path(spack.var_path, 'junit-report') + dirname = fs.join_path(spack.paths.var_path, 'junit-report') fs.mkdirp(dirname) return fs.join_path(dirname, basename) diff --git a/lib/spack/spack/cmd/location.py b/lib/spack/spack/cmd/location.py index 719a4699db..ab3faef7f5 100644 --- a/lib/spack/spack/cmd/location.py +++ b/lib/spack/spack/cmd/location.py @@ -27,7 +27,7 @@ from __future__ import print_function import argparse import llnl.util.tty as tty -import spack +import spack.paths import spack.cmd description = "print out locations of various directories used by Spack" @@ -73,16 +73,16 @@ def setup_parser(subparser): def location(parser, args): if args.module_dir: - print(spack.module_path) + print(spack.paths.module_path) elif args.spack_root: - print(spack.prefix) + print(spack.paths.prefix) elif args.packages: print(spack.repo.first_repo().root) elif args.stages: - print(spack.stage_path) + print(spack.paths.stage_path) else: specs = spack.cmd.parse_specs(args.spec) diff --git a/lib/spack/spack/cmd/pkg.py b/lib/spack/spack/cmd/pkg.py index ec48bf0c55..cdb4e92682 100644 --- a/lib/spack/spack/cmd/pkg.py +++ b/lib/spack/spack/cmd/pkg.py @@ -31,7 +31,7 @@ import llnl.util.tty as tty from llnl.util.tty.colify import colify from llnl.util.filesystem import working_dir -import spack +import spack.paths from spack.util.executable import which from spack.cmd import spack_is_git_repo @@ -78,11 +78,11 @@ def setup_parser(subparser): def list_packages(rev): - pkgpath = os.path.join(spack.packages_path, 'packages') - relpath = pkgpath[len(spack.prefix + os.path.sep):] + os.path.sep + pkgpath = os.path.join(spack.paths.packages_path, 'packages') + relpath = pkgpath[len(spack.paths.prefix + os.path.sep):] + os.path.sep git = which('git', required=True) - with working_dir(spack.prefix): + with working_dir(spack.paths.prefix): output = git('ls-tree', '--full-tree', '--name-only', rev, relpath, output=str) return sorted(line[len(relpath):] for line in output.split('\n') if line) @@ -96,8 +96,8 @@ def pkg_add(args): pkg_name, filename) git = which('git', required=True) - with working_dir(spack.prefix): - git('-C', spack.packages_path, 'add', filename) + with working_dir(spack.paths.prefix): + git('-C', spack.paths.packages_path, 'add', filename) def pkg_list(args): diff --git a/lib/spack/spack/cmd/test.py b/lib/spack/spack/cmd/test.py index 9fd53d8ae9..9d4d9e6bc8 100644 --- a/lib/spack/spack/cmd/test.py +++ b/lib/spack/spack/cmd/test.py @@ -34,7 +34,7 @@ from six import StringIO from llnl.util.filesystem import working_dir from llnl.util.tty.colify import colify -import spack +import spack.paths description = "run spack's unit tests" section = "developer" @@ -97,7 +97,7 @@ def test(parser, args, unknown_args): return # pytest.ini lives in the root of the spack repository. - with working_dir(spack.prefix): + with working_dir(spack.paths.prefix): # --list and --long-list print the test output better. if args.list or args.long_list: do_list(args, unknown_args) diff --git a/lib/spack/spack/compilers/__init__.py b/lib/spack/spack/compilers/__init__.py index bf3a11fa2f..d83941c161 100644 --- a/lib/spack/spack/compilers/__init__.py +++ b/lib/spack/spack/compilers/__init__.py @@ -25,12 +25,12 @@ """This module contains functions related to finding compilers on the system and configuring Spack to use multiple compilers. """ +import os import imp from llnl.util.lang import list_modules -from llnl.util.filesystem import join_path -import spack +import spack.paths import spack.error import spack.spec import spack.config @@ -204,7 +204,8 @@ def supported_compilers(): See available_compilers() to get a list of all the available versions of supported compilers. """ - return sorted(name for name in list_modules(spack.compilers_path)) + return sorted( + name for name in list_modules(spack.paths.compilers_path)) @_auto_compiler_spec @@ -357,7 +358,7 @@ def class_for_compiler_name(compiler_name): """Given a compiler module name, get the corresponding Compiler class.""" assert(supported(compiler_name)) - file_path = join_path(spack.compilers_path, compiler_name + ".py") + file_path = os.path.join(spack.paths.compilers_path, compiler_name + ".py") compiler_mod = imp.load_source(_imported_compilers_module, file_path) cls = getattr(compiler_mod, mod_to_class(compiler_name)) diff --git a/lib/spack/spack/compilers/clang.py b/lib/spack/spack/compilers/clang.py index 81dbadfd69..ce54e49c79 100644 --- a/lib/spack/spack/compilers/clang.py +++ b/lib/spack/spack/compilers/clang.py @@ -29,7 +29,7 @@ from shutil import copytree, ignore_patterns import llnl.util.tty as tty -import spack +import spack.paths from spack.compiler import Compiler, _version_cache from spack.util.executable import Executable from spack.version import ver @@ -48,7 +48,7 @@ class Clang(Compiler): # Subclasses use possible names of Fortran 90 compiler fc_names = ['flang', 'gfortran'] - # Named wrapper links within spack.build_env_path + # Named wrapper links within lib/spack/env link_paths = {'cc': 'clang/clang', 'cxx': 'clang/clang++'} @@ -228,7 +228,7 @@ class Clang(Compiler): raise OSError(msg) real_root = os.path.dirname(os.path.dirname(real_root)) - developer_root = os.path.join(spack.stage_path, + developer_root = os.path.join(spack.paths.stage_path, 'xcode-select', self.name, str(self.version)) @@ -267,8 +267,9 @@ class Clang(Compiler): for fname in os.listdir(dev_dir): if fname in bins: os.unlink(os.path.join(dev_dir, fname)) - os.symlink(os.path.join(spack.build_env_path, 'cc'), - os.path.join(dev_dir, fname)) + os.symlink( + os.path.join(spack.paths.build_env_path, 'cc'), + os.path.join(dev_dir, fname)) os.symlink(developer_root, xcode_link) diff --git a/lib/spack/spack/compilers/gcc.py b/lib/spack/spack/compilers/gcc.py index 71ae6187ea..e52dd5c047 100644 --- a/lib/spack/spack/compilers/gcc.py +++ b/lib/spack/spack/compilers/gcc.py @@ -24,7 +24,7 @@ ############################################################################## import llnl.util.tty as tty -import spack +import spack.compilers.clang from spack.compiler import Compiler, get_compiler_version from spack.version import ver @@ -47,7 +47,7 @@ class Gcc(Compiler): # Old compatibility versions may contain XY suffixes. suffixes = [r'-mp-\d\.\d', r'-\d\.\d', r'-\d', r'\d\d'] - # Named wrapper links within spack.build_env_path + # Named wrapper links within build_env_path link_paths = {'cc': 'gcc/gcc', 'cxx': 'gcc/g++', 'f77': 'gcc/gfortran', diff --git a/lib/spack/spack/compilers/intel.py b/lib/spack/spack/compilers/intel.py index e18a30587e..0c5ba3ab40 100644 --- a/lib/spack/spack/compilers/intel.py +++ b/lib/spack/spack/compilers/intel.py @@ -41,7 +41,7 @@ class Intel(Compiler): # Subclasses use possible names of Fortran 90 compiler fc_names = ['ifort'] - # Named wrapper links within spack.build_env_path + # Named wrapper links within build_env_path link_paths = {'cc': 'intel/icc', 'cxx': 'intel/icpc', 'f77': 'intel/ifort', diff --git a/lib/spack/spack/compilers/nag.py b/lib/spack/spack/compilers/nag.py index 1204218b8a..dbe7ae55cf 100644 --- a/lib/spack/spack/compilers/nag.py +++ b/lib/spack/spack/compilers/nag.py @@ -38,7 +38,7 @@ class Nag(Compiler): # Subclasses use possible names of Fortran 90 compiler fc_names = ['nagfor'] - # Named wrapper links within spack.build_env_path + # Named wrapper links within build_env_path # Use default wrappers for C and C++, in case provided in compilers.yaml link_paths = { 'cc': 'cc', diff --git a/lib/spack/spack/compilers/pgi.py b/lib/spack/spack/compilers/pgi.py index c33589e092..3693b3a4a6 100644 --- a/lib/spack/spack/compilers/pgi.py +++ b/lib/spack/spack/compilers/pgi.py @@ -38,7 +38,7 @@ class Pgi(Compiler): # Subclasses use possible names of Fortran 90 compiler fc_names = ['pgfortran', 'pgf95', 'pgf90'] - # Named wrapper links within spack.build_env_path + # Named wrapper links within build_env_path link_paths = {'cc': 'pgi/pgcc', 'cxx': 'pgi/pgc++', 'f77': 'pgi/pgfortran', diff --git a/lib/spack/spack/compilers/xl.py b/lib/spack/spack/compilers/xl.py index 1e5ca52d33..7b5bd3994b 100644 --- a/lib/spack/spack/compilers/xl.py +++ b/lib/spack/spack/compilers/xl.py @@ -41,7 +41,7 @@ class Xl(Compiler): # Subclasses use possible names of Fortran 90 compiler fc_names = ['xlf90', 'xlf95', 'xlf2003', 'xlf2008'] - # Named wrapper links within spack.build_env_path + # Named wrapper links within build_env_path link_paths = {'cc': 'xl/xlc', 'cxx': 'xl/xlc++', 'f77': 'xl/xlf', diff --git a/lib/spack/spack/compilers/xl_r.py b/lib/spack/spack/compilers/xl_r.py index 717d631873..774db363af 100644 --- a/lib/spack/spack/compilers/xl_r.py +++ b/lib/spack/spack/compilers/xl_r.py @@ -42,7 +42,7 @@ class XlR(Compiler): # Subclasses use possible names of Fortran 90 compiler fc_names = ['xlf90_r', 'xlf95_r', 'xlf2003_r', 'xlf2008_r'] - # Named wrapper links within spack.build_env_path + # Named wrapper links within build_env_path link_paths = {'cc': 'xl_r/xlc_r', 'cxx': 'xl_r/xlc++_r', 'f77': 'xl_r/xlf_r', diff --git a/lib/spack/spack/config.py b/lib/spack/spack/config.py index a83eaf4fb6..ba08977e72 100644 --- a/lib/spack/spack/config.py +++ b/lib/spack/spack/config.py @@ -64,7 +64,7 @@ from jsonschema import Draft4Validator, validators import llnl.util.tty as tty from llnl.util.filesystem import mkdirp -import spack +import spack.paths import spack.architecture import spack.schema from spack.error import SpackError @@ -218,24 +218,24 @@ _platform = spack.architecture.platform().name #: Default configuration scope is the lowest-level scope. These are #: versioned with Spack and can be overridden by systems, sites or users. -_defaults_path = os.path.join(spack.etc_path, 'spack', 'defaults') +_defaults_path = os.path.join(spack.paths.etc_path, 'spack', 'defaults') ConfigScope('defaults', _defaults_path) ConfigScope('defaults/%s' % _platform, os.path.join(_defaults_path, _platform)) #: System configuration is per machine. #: No system-level configs should be checked into spack by default -_system_path = os.path.join(spack.system_etc_path, 'spack') +_system_path = os.path.join(spack.paths.system_etc_path, 'spack') ConfigScope('system', _system_path) ConfigScope('system/%s' % _platform, os.path.join(_system_path, _platform)) #: Site configuration is per spack instance, for sites or projects. #: No site-level configs should be checked into spack by default. -_site_path = os.path.join(spack.etc_path, 'spack') +_site_path = os.path.join(spack.paths.etc_path, 'spack') ConfigScope('site', _site_path) ConfigScope('site/%s' % _platform, os.path.join(_site_path, _platform)) #: User configuration can override both spack defaults and site config. -_user_path = spack.user_config_path +_user_path = spack.paths.user_config_path ConfigScope('user', _user_path) ConfigScope('user/%s' % _platform, os.path.join(_user_path, _platform)) diff --git a/lib/spack/spack/hooks/__init__.py b/lib/spack/spack/hooks/__init__.py index 4d36719aeb..66386c6d22 100644 --- a/lib/spack/spack/hooks/__init__.py +++ b/lib/spack/spack/hooks/__init__.py @@ -43,7 +43,7 @@ """ import imp -import spack +import spack.paths from llnl.util.filesystem import join_path from llnl.util.lang import memoized, list_modules @@ -51,9 +51,9 @@ from llnl.util.lang import memoized, list_modules @memoized def all_hook_modules(): modules = [] - for name in list_modules(spack.hooks_path): + for name in list_modules(spack.paths.hooks_path): mod_name = __name__ + '.' + name - path = join_path(spack.hooks_path, name) + ".py" + path = join_path(spack.paths.hooks_path, name) + ".py" mod = imp.load_source(mod_name, path) modules.append(mod) diff --git a/lib/spack/spack/hooks/sbang.py b/lib/spack/spack/hooks/sbang.py index 412aa5c083..0fdb77e1a9 100644 --- a/lib/spack/spack/hooks/sbang.py +++ b/lib/spack/spack/hooks/sbang.py @@ -28,7 +28,7 @@ import re import llnl.util.tty as tty -import spack +import spack.paths import spack.modules # Character limit for shebang line. Using Linux's 127 characters @@ -56,7 +56,7 @@ def filter_shebang(path): original = original_file.read() # This line will be prepended to file - new_sbang_line = '#!/bin/bash %s/bin/sbang\n' % spack.spack_root + new_sbang_line = '#!/bin/bash %s/bin/sbang\n' % spack.paths.prefix # Skip files that are already using sbang. if original.startswith(new_sbang_line): diff --git a/lib/spack/spack/main.py b/lib/spack/spack/main.py index 7e2b447501..c8ccf2447e 100644 --- a/lib/spack/spack/main.py +++ b/lib/spack/spack/main.py @@ -41,28 +41,29 @@ import llnl.util.tty as tty from llnl.util.tty.log import log_output import spack +import spack.paths from spack.error import SpackError -# names of profile statistics +#: names of profile statistics stat_names = pstats.Stats.sort_arg_dict_default -# help levels in order of detail (i.e., number of commands shown) +#: help levels in order of detail (i.e., number of commands shown) levels = ['short', 'long'] -# intro text for help at different levels +#: intro text for help at different levels intro_by_level = { 'short': 'These are common spack commands:', 'long': 'Complete list of spack commands:', } -# control top-level spack options shown in basic vs. advanced help +#: control top-level spack options shown in basic vs. advanced help options_by_level = { 'short': ['h', 'k', 'V', 'color'], 'long': 'all' } -# Longer text for each section, to show in help +#: Longer text for each section, to show in help section_descriptions = { 'admin': 'administration', 'basic': 'query packages', @@ -76,8 +77,8 @@ section_descriptions = { 'system': 'system', } -# preferential command order for some sections (e.g., build pipeline is -# in execution order, not alphabetical) +#: preferential command order for some sections (e.g., build pipeline is +#: in execution order, not alphabetical) section_order = { 'basic': ['list', 'info', 'find'], 'build': ['fetch', 'stage', 'patch', 'configure', 'build', 'restage', @@ -85,17 +86,21 @@ section_order = { 'packaging': ['create', 'edit'] } -# Properties that commands are required to set. +#: Properties that commands are required to set. required_command_properties = ['level', 'section', 'description'] +#: Recorded directory where spack command was originally invoked +spack_working_dir = None + def set_working_dir(): """Change the working directory to getcwd, or spack prefix if no cwd.""" + global spack_working_dir try: - spack.spack_working_dir = os.getcwd() + spack_working_dir = os.getcwd() except OSError: - os.chdir(spack.spack_prefix) - spack.spack_working_dir = spack.spack_prefix + os.chdir(spack.paths.prefix) + spack_working_dir = spack.paths.prefix def add_all_commands(parser): @@ -347,7 +352,7 @@ def setup_main_options(args): if args.mock: from spack.repository import RepoPath - spack.repo.swap(RepoPath(spack.mock_packages_path)) + spack.repo.swap(RepoPath(spack.paths.mock_packages_path)) # If the user asked for it, don't check ssl certs. if args.insecure: diff --git a/lib/spack/spack/modules/common.py b/lib/spack/spack/modules/common.py index c77678903b..dfb5e6ab24 100644 --- a/lib/spack/spack/modules/common.py +++ b/lib/spack/spack/modules/common.py @@ -56,7 +56,8 @@ import re import six import llnl.util.filesystem import llnl.util.tty as tty -import spack + +import spack.paths import spack.build_environment as build_environment import spack.environment import spack.tengine as tengine @@ -229,7 +230,7 @@ def root_path(name): Returns: root folder for module file installation """ - path = roots.get(name, os.path.join(spack.share_path, name)) + path = roots.get(name, os.path.join(spack.paths.share_path, name)) return spack.util.path.canonicalize_path(path) diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py index c7313e956a..0fdb544b8f 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -52,7 +52,9 @@ from six import string_types from six import with_metaclass import llnl.util.tty as tty + import spack +import spack.paths import spack.store import spack.compilers import spack.directives @@ -67,7 +69,7 @@ import spack.util.web import spack.multimethod import spack.binary_distribution as binary_distribution -from llnl.util.filesystem import mkdirp, join_path, touch, ancestor +from llnl.util.filesystem import mkdirp, join_path, touch from llnl.util.filesystem import working_dir, install_tree, install from llnl.util.lang import memoized from llnl.util.link_tree import LinkTree @@ -688,8 +690,7 @@ class PackageBase(with_metaclass(PackageMeta, object)): def global_license_dir(self): """Returns the directory where global license files for all packages are stored.""" - spack_root = ancestor(__file__, 4) - return join_path(spack_root, 'etc', 'spack', 'licenses') + return os.path.join(spack.paths.prefix, 'etc', 'spack', 'licenses') @property def global_license_file(self): @@ -697,8 +698,8 @@ class PackageBase(with_metaclass(PackageMeta, object)): particular package should be stored.""" if not self.license_files: return - return join_path(self.global_license_dir, self.name, - os.path.basename(self.license_files[0])) + return os.path.join(self.global_license_dir, self.name, + os.path.basename(self.license_files[0])) @property def version(self): @@ -1107,9 +1108,9 @@ class PackageBase(with_metaclass(PackageMeta, object)): # Construct paths to special files in the archive dir used to # keep track of whether patches were successfully applied. archive_dir = self.stage.source_path - good_file = join_path(archive_dir, '.spack_patched') - no_patches_file = join_path(archive_dir, '.spack_no_patches') - bad_file = join_path(archive_dir, '.spack_patch_failed') + good_file = os.path.join(archive_dir, '.spack_patched') + no_patches_file = os.path.join(archive_dir, '.spack_no_patches') + bad_file = os.path.join(archive_dir, '.spack_patch_failed') # If we encounter an archive that failed to patch, restage it # so that we can apply all the patches again. @@ -1619,7 +1620,7 @@ class PackageBase(with_metaclass(PackageMeta, object)): partial = True stage_is_managed_in_spack = self.stage.path.startswith( - spack.stage_path) + spack.paths.stage_path) if restage and stage_is_managed_in_spack: self.stage.destroy() self.stage.create() diff --git a/lib/spack/spack/paths.py b/lib/spack/spack/paths.py new file mode 100644 index 0000000000..f1954cda74 --- /dev/null +++ b/lib/spack/spack/paths.py @@ -0,0 +1,80 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +"""Defines paths that are part of Spack's directory structure. + +Do not import other ``spack`` modules here. This module is used +throughout Spack and should bring in a minimal number of external +dependencies. +""" +import os +from llnl.util.filesystem import ancestor + + +#: This file lives in $prefix/lib/spack/spack/__file__ +prefix = ancestor(__file__, 4) + +#: synonym for prefix +spack_root = prefix + +#: bin directory in the spack prefix +bin_path = os.path.join(prefix, "bin") + +#: The spack script itself +spack_script = os.path.join(bin_path, "spack") + +# spack directory hierarchy +lib_path = os.path.join(prefix, "lib", "spack") +external_path = os.path.join(lib_path, "external") +build_env_path = os.path.join(lib_path, "env") +module_path = os.path.join(lib_path, "spack") +command_path = os.path.join(module_path, "cmd") +platform_path = os.path.join(module_path, 'platforms') +compilers_path = os.path.join(module_path, "compilers") +build_systems_path = os.path.join(module_path, 'build_systems') +operating_system_path = os.path.join(module_path, 'operating_systems') +test_path = os.path.join(module_path, "test") +hooks_path = os.path.join(module_path, "hooks") +var_path = os.path.join(prefix, "var", "spack") +stage_path = os.path.join(var_path, "stage") +repos_path = os.path.join(var_path, "repos") +share_path = os.path.join(prefix, "share", "spack") + +# Paths to built-in Spack repositories. +packages_path = os.path.join(repos_path, "builtin") +mock_packages_path = os.path.join(repos_path, "builtin.mock") + +#: User configuration location +user_config_path = os.path.expanduser('~/.spack') + + +opt_path = os.path.join(prefix, "opt") +etc_path = os.path.join(prefix, "etc") +system_etc_path = '/etc' + +# GPG paths. +gpg_keys_path = os.path.join(var_path, "gpg") +mock_gpg_data_path = os.path.join(var_path, "gpg.mock", "data") +mock_gpg_keys_path = os.path.join(var_path, "gpg.mock", "keys") +gpg_path = os.path.join(opt_path, "spack", "gpg") diff --git a/lib/spack/spack/platforms/cray.py b/lib/spack/spack/platforms/cray.py index 78c8ef377f..92f2254429 100644 --- a/lib/spack/spack/platforms/cray.py +++ b/lib/spack/spack/platforms/cray.py @@ -25,7 +25,7 @@ import os import re import llnl.util.tty as tty -from spack import build_env_path +from spack.paths import build_env_path from spack.util.executable import which from spack.architecture import Platform, Target, NoPlatformError from spack.operating_systems.cray_frontend import CrayFrontend diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py index 59df9e3867..72b83440df 100644 --- a/lib/spack/spack/spec.py +++ b/lib/spack/spack/spec.py @@ -115,6 +115,7 @@ from llnl.util.lang import check_kwargs from llnl.util.tty.color import cwrite, colorize, cescape, get_color_when import spack + import spack.architecture import spack.compilers as compilers import spack.error @@ -3090,7 +3091,7 @@ class Spec(object): if self.dependencies: out.write(fmt % token_transform(str(self.dag_hash(7)))) elif named_str == 'SPACK_ROOT': - out.write(fmt % token_transform(spack.prefix)) + out.write(fmt % token_transform(spack.paths.prefix)) elif named_str == 'SPACK_INSTALL': out.write(fmt % token_transform(spack.store.root)) elif named_str == 'PREFIX': diff --git a/lib/spack/spack/stage.py b/lib/spack/spack/stage.py index b771e046b5..d282786370 100644 --- a/lib/spack/spack/stage.py +++ b/lib/spack/spack/stage.py @@ -38,7 +38,7 @@ import llnl.util.lock from llnl.util.filesystem import mkdirp, join_path, can_access from llnl.util.filesystem import remove_if_dead_link, remove_linked_tree -import spack +import spack.paths import spack.config import spack.error import spack.fetch_strategy as fs @@ -93,7 +93,7 @@ def get_tmp_root(): raise StageError("No accessible stage paths in %s", candidates) # Return None to indicate we're using a local staging area. - if path == canonicalize_path(spack.stage_path): + if path == canonicalize_path(spack.paths.stage_path): _use_tmp_stage = False return None @@ -147,7 +147,7 @@ class Stage(object): If spack.use_tmp_stage is True, spack will attempt to create stages in a tmp directory. Otherwise, stages are created directly - in spack.stage_path. + in spack.paths.stage_path. There are two kinds of stages: named and unnamed. Named stages can persist between runs of spack, e.g. if you fetched a tarball @@ -216,7 +216,7 @@ class Stage(object): if path is not None: self.path = path else: - self.path = join_path(spack.stage_path, self.name) + self.path = join_path(spack.paths.stage_path, self.name) # Flag to decide whether to delete the stage folder on exit or not self.keep = keep @@ -229,7 +229,7 @@ class Stage(object): if self.name not in Stage.stage_locks: sha1 = hashlib.sha1(self.name.encode('utf-8')).digest() lock_id = prefix_bits(sha1, bit_length(sys.maxsize)) - stage_lock_path = join_path(spack.stage_path, '.lock') + stage_lock_path = join_path(spack.paths.stage_path, '.lock') Stage.stage_locks[self.name] = llnl.util.lock.Lock( stage_lock_path, lock_id, 1) @@ -478,17 +478,17 @@ class Stage(object): """Creates the stage directory. If get_tmp_root() is None, the stage directory is created - directly under spack.stage_path, otherwise this will attempt to + directly under spack.paths.stage_path, otherwise this will attempt to create a stage in a temporary directory and link it into - spack.stage_path. + spack.paths.stage_path. Spack will use the first writable location in spack.tmp_dirs to create a stage. If there is no valid location in tmp_dirs, - fall back to making the stage inside spack.stage_path. + fall back to making the stage inside spack.paths.stage_path. """ # Create the top-level stage directory - mkdirp(spack.stage_path) + mkdirp(spack.paths.stage_path) remove_if_dead_link(self.path) # If a tmp_root exists then create a directory there and then link it @@ -655,7 +655,7 @@ def _get_mirrors(): return [val for name, val in iteritems(config)] -def ensure_access(file=spack.stage_path): +def ensure_access(file=spack.paths.stage_path): """Ensure we can access a directory and die with an error if we can't.""" if not can_access(file): tty.die("Insufficient permissions for %s" % file) @@ -663,9 +663,9 @@ def ensure_access(file=spack.stage_path): def purge(): """Remove all build directories in the top-level stage path.""" - if os.path.isdir(spack.stage_path): - for stage_dir in os.listdir(spack.stage_path): - stage_path = join_path(spack.stage_path, stage_dir) + if os.path.isdir(spack.paths.stage_path): + for stage_dir in os.listdir(spack.paths.stage_path): + stage_path = join_path(spack.paths.stage_path, stage_dir) remove_linked_tree(stage_path) diff --git a/lib/spack/spack/store.py b/lib/spack/spack/store.py index 2e86b9dd83..5b16fd45d6 100644 --- a/lib/spack/spack/store.py +++ b/lib/spack/spack/store.py @@ -43,7 +43,7 @@ configuration. """ import os -import spack +import spack.paths import spack.config from spack.util.path import canonicalize_path from spack.database import Database @@ -62,7 +62,7 @@ config = spack.config.get_config("config") # Set up the install path # root = canonicalize_path( - config.get('install_tree', os.path.join(spack.opt_path, 'spack'))) + config.get('install_tree', os.path.join(spack.paths.opt_path, 'spack'))) # # Set up the installed packages database diff --git a/lib/spack/spack/test/build_environment.py b/lib/spack/spack/test/build_environment.py index f0aa1b1fc6..653a283b1b 100644 --- a/lib/spack/spack/test/build_environment.py +++ b/lib/spack/spack/test/build_environment.py @@ -25,7 +25,7 @@ import os import pytest -import spack +from spack.paths import build_env_path from llnl.util.filesystem import join_path from spack.build_environment import dso_suffix, _static_to_shared_library from spack.util.executable import Executable @@ -33,9 +33,9 @@ from spack.util.executable import Executable @pytest.fixture def build_environment(): - cc = Executable(join_path(spack.build_env_path, "cc")) - cxx = Executable(join_path(spack.build_env_path, "c++")) - fc = Executable(join_path(spack.build_env_path, "fc")) + cc = Executable(join_path(build_env_path, "cc")) + cxx = Executable(join_path(build_env_path, "c++")) + fc = Executable(join_path(build_env_path, "fc")) realcc = "/bin/mycc" prefix = "/spack-test-prefix" diff --git a/lib/spack/spack/test/cc.py b/lib/spack/spack/test/cc.py index 8290020662..25bb01cd05 100644 --- a/lib/spack/spack/test/cc.py +++ b/lib/spack/spack/test/cc.py @@ -31,7 +31,7 @@ import unittest import tempfile import shutil -import spack +from spack.paths import build_env_path from llnl.util.filesystem import mkdirp, join_path from spack.util.executable import Executable @@ -54,11 +54,11 @@ test_command = [ class CompilerWrapperTest(unittest.TestCase): def setUp(self): - self.cc = Executable(join_path(spack.build_env_path, "cc")) - self.ld = Executable(join_path(spack.build_env_path, "ld")) - self.cpp = Executable(join_path(spack.build_env_path, "cpp")) - self.cxx = Executable(join_path(spack.build_env_path, "c++")) - self.fc = Executable(join_path(spack.build_env_path, "fc")) + self.cc = Executable(join_path(build_env_path, "cc")) + self.ld = Executable(join_path(build_env_path, "ld")) + self.cpp = Executable(join_path(build_env_path, "cpp")) + self.cxx = Executable(join_path(build_env_path, "c++")) + self.fc = Executable(join_path(build_env_path, "fc")) self.realcc = "/bin/mycc" self.prefix = "/spack-test-prefix" diff --git a/lib/spack/spack/test/cmd/blame.py b/lib/spack/spack/test/cmd/blame.py index ea56cd327a..7c793f0694 100644 --- a/lib/spack/spack/test/cmd/blame.py +++ b/lib/spack/spack/test/cmd/blame.py @@ -26,7 +26,7 @@ import pytest from llnl.util.filesystem import working_dir -import spack +import spack.paths import spack.cmd from spack.main import SpackCommand from spack.util.executable import which @@ -56,7 +56,7 @@ def test_blame_by_percent(builtin_mock): def test_blame_file(builtin_mock): """Sanity check the blame command to make sure it works.""" - with working_dir(spack.prefix): + with working_dir(spack.paths.prefix): out = blame('bin/spack') assert 'LAST_COMMIT' in out assert 'AUTHOR' in out diff --git a/lib/spack/spack/test/cmd/flake8.py b/lib/spack/spack/test/cmd/flake8.py index 8d77f2300f..646568117b 100644 --- a/lib/spack/spack/test/cmd/flake8.py +++ b/lib/spack/spack/test/cmd/flake8.py @@ -29,7 +29,7 @@ import sys from llnl.util.filesystem import FileFilter -import spack +import spack.paths from spack.cmd.flake8 import flake8, setup_parser, changed_files from spack.repository import Repo from spack.util.executable import which @@ -50,7 +50,7 @@ def flake8_package(): mock package, yields the filename, then undoes the change on cleanup. """ - repo = Repo(spack.mock_packages_path) + repo = Repo(spack.paths.mock_packages_path) filename = repo.filename_for_package_name('flake8') package = FileFilter(filename) @@ -69,7 +69,7 @@ def test_changed_files(parser, flake8_package): # changed_files returns file paths relative to the root # directory of Spack. Convert to absolute file paths. files = changed_files(args) - files = [os.path.join(spack.spack_root, path) for path in files] + files = [os.path.join(spack.paths.prefix, path) for path in files] # There will likely be other files that have changed # when these tests are run diff --git a/lib/spack/spack/test/cmd/gpg.py b/lib/spack/spack/test/cmd/gpg.py index a3d4cff837..f4e4fc4ec6 100644 --- a/lib/spack/spack/test/cmd/gpg.py +++ b/lib/spack/spack/test/cmd/gpg.py @@ -25,7 +25,8 @@ import os import pytest -import spack + +from spack.paths import mock_gpg_data_path, mock_gpg_keys_path import spack.util.gpg as gpg_util from spack.main import SpackCommand from spack.util.executable import ProcessError @@ -58,10 +59,10 @@ def has_gnupg2(): def test_gpg(gpg, tmpdir, testing_gpg_directory): # Verify a file with an empty keyring. with pytest.raises(ProcessError): - gpg('verify', os.path.join(spack.mock_gpg_data_path, 'content.txt')) + gpg('verify', os.path.join(mock_gpg_data_path, 'content.txt')) # Import the default key. - gpg('init', '--from', spack.mock_gpg_keys_path) + gpg('init', '--from', mock_gpg_keys_path) # List the keys. # TODO: Test the output here. @@ -69,14 +70,14 @@ def test_gpg(gpg, tmpdir, testing_gpg_directory): gpg('list', '--signing') # Verify the file now that the key has been trusted. - gpg('verify', os.path.join(spack.mock_gpg_data_path, 'content.txt')) + gpg('verify', os.path.join(mock_gpg_data_path, 'content.txt')) # Untrust the default key. gpg('untrust', 'Spack testing') # Now that the key is untrusted, verification should fail. with pytest.raises(ProcessError): - gpg('verify', os.path.join(spack.mock_gpg_data_path, 'content.txt')) + gpg('verify', os.path.join(mock_gpg_data_path, 'content.txt')) # Create a file to test signing. test_path = tmpdir.join('to-sign.txt') diff --git a/lib/spack/spack/test/cmd/url.py b/lib/spack/spack/test/cmd/url.py index a12880728b..6347f636af 100644 --- a/lib/spack/spack/test/cmd/url.py +++ b/lib/spack/spack/test/cmd/url.py @@ -44,8 +44,9 @@ def test_name_parsed_correctly(): assert name_parsed_correctly(MyPackage('r-devtools', []), 'devtools') assert name_parsed_correctly(MyPackage('py-numpy', []), 'numpy') assert name_parsed_correctly(MyPackage('octave-splines', []), 'splines') - assert name_parsed_correctly(MyPackage('imagemagick', []), 'ImageMagick') # noqa assert name_parsed_correctly(MyPackage('th-data', []), 'TH.data') + assert name_parsed_correctly( + MyPackage('imagemagick', []), 'ImageMagick') # Expected False assert not name_parsed_correctly(MyPackage('', []), 'hdf5') @@ -53,7 +54,8 @@ def test_name_parsed_correctly(): assert not name_parsed_correctly(MyPackage('yaml-cpp', []), 'yamlcpp') assert not name_parsed_correctly(MyPackage('yamlcpp', []), 'yaml-cpp') assert not name_parsed_correctly(MyPackage('r-py-parser', []), 'parser') - assert not name_parsed_correctly(MyPackage('oce', []), 'oce-0.18.0') # noqa + assert not name_parsed_correctly( + MyPackage('oce', []), 'oce-0.18.0') def test_version_parsed_correctly(): @@ -70,7 +72,8 @@ def test_version_parsed_correctly(): assert not version_parsed_correctly(MyPackage('', ['1.2.3']), '1.2.4') assert not version_parsed_correctly(MyPackage('', ['3.4a']), '3.4') assert not version_parsed_correctly(MyPackage('', ['3.4']), '3.4b') - assert not version_parsed_correctly(MyPackage('', ['0.18.0']), 'oce-0.18.0') # noqa + assert not version_parsed_correctly( + MyPackage('', ['0.18.0']), 'oce-0.18.0') def test_url_parse(): @@ -120,8 +123,10 @@ def test_url_summary(): (total_urls, correct_names, correct_versions, name_count_dict, version_count_dict) = url_summary(None) - assert 0 < correct_names <= sum(name_count_dict.values()) <= total_urls # noqa - assert 0 < correct_versions <= sum(version_count_dict.values()) <= total_urls # noqa + assert (0 < correct_names <= + sum(name_count_dict.values()) <= total_urls) + assert (0 < correct_versions <= + sum(version_count_dict.values()) <= total_urls) # make sure it agrees with the actual command. out = url('summary') diff --git a/lib/spack/spack/test/config.py b/lib/spack/spack/test/config.py index 5188af5465..270161cfa8 100644 --- a/lib/spack/spack/test/config.py +++ b/lib/spack/spack/test/config.py @@ -22,17 +22,18 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## +import os import collections import getpass -import os import tempfile -import spack.util.ordereddict import pytest -import spack -import spack.config import yaml + +import spack.paths +import spack.config from spack.util.path import canonicalize_path +from spack.util.ordereddict import OrderedDict # Some sample compiler config data a_comps = { @@ -242,7 +243,7 @@ def config(tmpdir): """Mocks the configuration scope.""" spack.config.clear_config_caches() real_scope = spack.config.config_scopes - spack.config.config_scopes = spack.util.ordereddict.OrderedDict() + spack.config.config_scopes = OrderedDict() for priority in ['low', 'high']: spack.config.ConfigScope(priority, str(tmpdir.join(priority))) Config = collections.namedtuple('Config', ['real', 'mock']) @@ -336,14 +337,14 @@ class TestConfig(object): expected + path) def test_substitute_config_variables(self): - prefix = spack.prefix.lstrip('/') + prefix = spack.paths.prefix.lstrip('/') assert os.path.join( '/foo/bar/baz', prefix ) == canonicalize_path('/foo/bar/baz/$spack') assert os.path.join( - spack.prefix, 'foo/bar/baz' + spack.paths.prefix, 'foo/bar/baz' ) == canonicalize_path('$spack/foo/bar/baz/') assert os.path.join( @@ -355,7 +356,7 @@ class TestConfig(object): ) == canonicalize_path('/foo/bar/baz/${spack}') assert os.path.join( - spack.prefix, 'foo/bar/baz' + spack.paths.prefix, 'foo/bar/baz' ) == canonicalize_path('${spack}/foo/bar/baz/') assert os.path.join( @@ -432,7 +433,7 @@ def test_keys_are_ordered(): config_scope = spack.config.ConfigScope( 'modules', - os.path.join(spack.test_path, 'data', 'config') + os.path.join(spack.paths.test_path, 'data', 'config') ) data = config_scope.get_section('modules') diff --git a/lib/spack/spack/test/conftest.py b/lib/spack/spack/test/conftest.py index 3cee46cbf2..311c57a4ce 100644 --- a/lib/spack/spack/test/conftest.py +++ b/lib/spack/spack/test/conftest.py @@ -36,6 +36,7 @@ import pytest from llnl.util.filesystem import remove_linked_tree import spack +import spack.paths import spack.architecture import spack.database import spack.directory_layout @@ -77,11 +78,11 @@ def no_chdir(): @pytest.fixture(scope='session', autouse=True) def mock_stage(tmpdir_factory): """Mocks up a fake stage directory for use by tests.""" - stage_path = spack.stage_path + stage_path = spack.paths.stage_path new_stage = str(tmpdir_factory.mktemp('mock_stage')) - spack.stage_path = new_stage + spack.paths.stage_path = new_stage yield new_stage - spack.stage_path = stage_path + spack.paths.stage_path = stage_path @pytest.fixture(scope='session') @@ -118,14 +119,14 @@ def check_for_leftover_stage_files(request, mock_stage, _ignore_stage_files): yield files_in_stage = set() - if os.path.exists(spack.stage_path): + if os.path.exists(spack.paths.stage_path): files_in_stage = set( - os.listdir(spack.stage_path)) - _ignore_stage_files + os.listdir(spack.paths.stage_path)) - _ignore_stage_files if 'disable_clean_stage_check' in request.keywords: # clean up after tests that are expected to be dirty for f in files_in_stage: - path = os.path.join(spack.stage_path, f) + path = os.path.join(spack.paths.stage_path, f) remove_whatever_it_is(path) else: _ignore_stage_files |= files_in_stage @@ -134,7 +135,7 @@ def check_for_leftover_stage_files(request, mock_stage, _ignore_stage_files): @pytest.fixture(autouse=True) def mock_fetch_cache(monkeypatch): - """Substitutes spack.fetch_cache with a mock object that does nothing + """Substitutes spack.paths.fetch_cache with a mock object that does nothing and raises on fetch. """ class MockCache(object): @@ -171,7 +172,7 @@ spack.architecture.platform = lambda: spack.platforms.test.Test() @pytest.fixture(scope='session') def repo_path(): """Session scoped RepoPath object pointing to the mock repository""" - return spack.repository.RepoPath(spack.mock_packages_path) + return spack.repository.RepoPath(spack.paths.mock_packages_path) @pytest.fixture(scope='module') @@ -216,7 +217,7 @@ def configuration_dir(tmpdir_factory, linux_os): """ tmpdir = tmpdir_factory.mktemp('configurations') # Name of the yaml files in the test/data folder - test_path = py.path.local(spack.test_path) + test_path = py.path.local(spack.paths.test_path) compilers_yaml = test_path.join('data', 'compilers.yaml') packages_yaml = test_path.join('data', 'packages.yaml') config_yaml = test_path.join('data', 'config.yaml') diff --git a/lib/spack/spack/test/directory_layout.py b/lib/spack/spack/test/directory_layout.py index 269f98b49c..0adbf12aaa 100644 --- a/lib/spack/spack/test/directory_layout.py +++ b/lib/spack/spack/test/directory_layout.py @@ -31,6 +31,7 @@ import pytest from llnl.util.filesystem import join_path import spack +import spack.paths from spack.directory_layout import YamlDirectoryLayout from spack.directory_layout import InvalidDirectoryLayoutParametersError from spack.repository import RepoPath @@ -186,7 +187,7 @@ def test_handle_unknown_package( or query them again if the package goes away. """ layout, _ = layout_and_dir - mock_db = RepoPath(spack.mock_packages_path) + mock_db = RepoPath(spack.paths.mock_packages_path) not_in_mock = set.difference( set(spack.repo.all_package_names()), diff --git a/lib/spack/spack/test/environment.py b/lib/spack/spack/test/environment.py index 6f4af17e1c..bc1b6da3a8 100644 --- a/lib/spack/spack/test/environment.py +++ b/lib/spack/spack/test/environment.py @@ -26,7 +26,7 @@ import os import pytest import spack.environment as environment -from spack import spack_root +from spack.paths import spack_root from spack.environment import EnvironmentModifications from spack.environment import RemovePath, PrependPath, AppendPath from spack.environment import SetEnv, UnsetEnv diff --git a/lib/spack/spack/test/llnl/util/file_list.py b/lib/spack/spack/test/llnl/util/file_list.py index 9d000da5be..5671661435 100644 --- a/lib/spack/spack/test/llnl/util/file_list.py +++ b/lib/spack/spack/test/llnl/util/file_list.py @@ -22,16 +22,17 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## - -import fnmatch import os +import fnmatch -import pytest import six -import spack +import pytest + from llnl.util.filesystem import LibraryList, HeaderList from llnl.util.filesystem import find_libraries, find_headers, find +import spack.paths + @pytest.fixture() def library_list(): @@ -211,7 +212,7 @@ class TestHeaderList(object): #: Directory where the data for the test below is stored -search_dir = os.path.join(spack.test_path, 'data', 'directory_search') +search_dir = os.path.join(spack.paths.test_path, 'data', 'directory_search') @pytest.mark.parametrize('search_fn,search_list,root,kwargs', [ diff --git a/lib/spack/spack/test/modules/conftest.py b/lib/spack/spack/test/modules/conftest.py index 28b672879a..b08a943c72 100644 --- a/lib/spack/spack/test/modules/conftest.py +++ b/lib/spack/spack/test/modules/conftest.py @@ -22,16 +22,17 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## - +import os.path import collections import contextlib import inspect -import os.path -import yaml -from six import StringIO +import yaml import pytest -import spack +from six import StringIO + +import spack.paths +import spack.spec import spack.modules.common import spack.util.path @@ -110,7 +111,7 @@ def patch_configuration(monkeypatch, request): writer_key = str(writer_mod.__name__).split('.')[-1] # Root folder for configuration root_for_conf = os.path.join( - spack.test_path, 'data', 'modules', writer_key + spack.paths.test_path, 'data', 'modules', writer_key ) def _impl(filename): diff --git a/lib/spack/spack/test/package_sanity.py b/lib/spack/spack/test/package_sanity.py index fc27f831c3..30c6794c2a 100644 --- a/lib/spack/spack/test/package_sanity.py +++ b/lib/spack/spack/test/package_sanity.py @@ -23,12 +23,12 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## """This test does sanity checks on Spack's builtin package database.""" - import re import pytest import spack +from spack.paths import mock_packages_path from spack.repository import RepoPath @@ -46,7 +46,7 @@ def test_get_all_packages(): def test_get_all_mock_packages(): """Get the mock packages once each too.""" - db = RepoPath(spack.mock_packages_path) + db = RepoPath(mock_packages_path) spack.repo.swap(db) check_db() spack.repo.swap(db) diff --git a/lib/spack/spack/test/packages.py b/lib/spack/spack/test/packages.py index 0ef76ae355..2d99b20788 100644 --- a/lib/spack/spack/test/packages.py +++ b/lib/spack/spack/test/packages.py @@ -22,10 +22,12 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## -import spack import pytest from llnl.util.filesystem import join_path + +import spack +from spack.paths import mock_packages_path from spack.repository import Repo from spack.util.naming import mod_to_class from spack.spec import Spec @@ -42,20 +44,20 @@ class TestPackage(object): assert pkg.name == 'mpich' def test_package_filename(self): - repo = Repo(spack.mock_packages_path) + repo = Repo(mock_packages_path) filename = repo.filename_for_package_name('mpich') assert filename == join_path( - spack.mock_packages_path, + mock_packages_path, 'packages', 'mpich', 'package.py' ) def test_nonexisting_package_filename(self): - repo = Repo(spack.mock_packages_path) + repo = Repo(mock_packages_path) filename = repo.filename_for_package_name('some-nonexisting-package') assert filename == join_path( - spack.mock_packages_path, + mock_packages_path, 'packages', 'some-nonexisting-package', 'package.py' diff --git a/lib/spack/spack/test/packaging.py b/lib/spack/spack/test/packaging.py index a58d9f274e..3cedec3955 100644 --- a/lib/spack/spack/test/packaging.py +++ b/lib/spack/spack/test/packaging.py @@ -39,6 +39,7 @@ import spack.store import spack.binary_distribution as bindist import spack.cmd.buildcache as buildcache from spack.spec import Spec +from spack.paths import mock_gpg_keys_path from spack.fetch_strategy import URLFetchStrategy, FetchStrategyComposite from spack.util.executable import ProcessError from spack.relocate import needs_binary_relocation, needs_text_relocation @@ -201,7 +202,7 @@ echo $PATH""" buildcache.buildcache(parser, args) # Copy a key to the mirror to have something to download - shutil.copyfile(spack.mock_gpg_keys_path + '/external.key', + shutil.copyfile(mock_gpg_keys_path + '/external.key', mirror_path + '/external.key') args = parser.parse_args(['keys']) diff --git a/lib/spack/spack/test/patch.py b/lib/spack/spack/test/patch.py index 1a03199ca0..e9c92235af 100644 --- a/lib/spack/spack/test/patch.py +++ b/lib/spack/spack/test/patch.py @@ -29,7 +29,7 @@ import pytest from llnl.util.filesystem import working_dir, mkdirp -import spack +import spack.paths import spack.util.compression from spack.stage import Stage from spack.spec import Spec @@ -39,11 +39,11 @@ from spack.spec import Spec def mock_stage(tmpdir, monkeypatch): # don't disrupt the spack install directory with tests. mock_path = str(tmpdir) - monkeypatch.setattr(spack, 'stage_path', mock_path) + monkeypatch.setattr(spack.paths, 'stage_path', mock_path) return mock_path -data_path = os.path.join(spack.test_path, 'data', 'patch') +data_path = os.path.join(spack.paths.test_path, 'data', 'patch') @pytest.mark.parametrize('filename, sha256, archive_sha256', [ diff --git a/lib/spack/spack/test/python_version.py b/lib/spack/spack/test/python_version.py index 36fc138ae2..312e6ce37a 100644 --- a/lib/spack/spack/test/python_version.py +++ b/lib/spack/spack/test/python_version.py @@ -40,7 +40,10 @@ import re import pytest import llnl.util.tty as tty -import spack + +import spack.paths +from spack.paths import lib_path as spack_lib_path + # # This test uses pyqver, by Greg Hewgill, which is a dual-source module. @@ -55,10 +58,10 @@ if sys.version_info[0] < 3: exclude_paths = [ # Jinja 2 has some 'async def' functions that are not treated correctly # by pyqver.py - os.path.join(spack.lib_path, 'external', 'jinja2', 'asyncfilters.py'), - os.path.join(spack.lib_path, 'external', 'jinja2', 'asyncsupport.py'), - os.path.join(spack.lib_path, 'external', 'yaml', 'lib3'), - os.path.join(spack.lib_path, 'external', 'pyqver3.py')] + os.path.join(spack_lib_path, 'external', 'jinja2', 'asyncfilters.py'), + os.path.join(spack_lib_path, 'external', 'jinja2', 'asyncsupport.py'), + os.path.join(spack_lib_path, 'external', 'yaml', 'lib3'), + os.path.join(spack_lib_path, 'external', 'pyqver3.py')] else: import pyqver3 as pyqver @@ -68,10 +71,10 @@ else: exclude_paths = [ # Jinja 2 has some 'async def' functions that are not treated correctly # by pyqver.py - os.path.join(spack.lib_path, 'external', 'jinja2', 'asyncfilters.py'), - os.path.join(spack.lib_path, 'external', 'jinja2', 'asyncsupport.py'), - os.path.join(spack.lib_path, 'external', 'yaml', 'lib'), - os.path.join(spack.lib_path, 'external', 'pyqver2.py')] + os.path.join(spack_lib_path, 'external', 'jinja2', 'asyncfilters.py'), + os.path.join(spack_lib_path, 'external', 'jinja2', 'asyncsupport.py'), + os.path.join(spack_lib_path, 'external', 'yaml', 'lib'), + os.path.join(spack_lib_path, 'external', 'pyqver2.py')] def pyfiles(search_paths, exclude=()): @@ -85,7 +88,7 @@ def pyfiles(search_paths, exclude=()): python files in the search path. """ # first file is the spack script. - yield spack.spack_file + yield spack.paths.spack_script # Iterate through the whole spack source tree. for path in search_paths: @@ -135,8 +138,8 @@ def check_python_versions(files): messages = [] for path in sorted(all_issues[v].keys()): short_path = path - if path.startswith(spack.prefix): - short_path = path[len(spack.prefix):] + if path.startswith(spack.paths.prefix): + short_path = path[len(spack.paths.prefix):] reasons = [r for r in set(all_issues[v][path]) if r] for lineno, cause in reasons: @@ -159,10 +162,11 @@ def check_python_versions(files): @pytest.mark.maybeslow def test_core_module_compatibility(): """Test that all core spack modules work with supported Python versions.""" - check_python_versions(pyfiles([spack.lib_path], exclude=exclude_paths)) + check_python_versions( + pyfiles([spack_lib_path], exclude=exclude_paths)) @pytest.mark.maybeslow def test_package_module_compatibility(): """Test that all spack packages work with supported Python versions.""" - check_python_versions(pyfiles([spack.packages_path])) + check_python_versions(pyfiles([spack.paths.packages_path])) diff --git a/lib/spack/spack/test/repo.py b/lib/spack/spack/test/repo.py index 570bd0c469..27b5830d98 100644 --- a/lib/spack/spack/test/repo.py +++ b/lib/spack/spack/test/repo.py @@ -22,17 +22,18 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## -import spack - import pytest +import spack.repository +import spack.paths + # Unlike the repo_path fixture defined in conftest, this has a test-level # scope rather than a session level scope, since we want to edit the # given RepoPath @pytest.fixture() def repo_for_test(): - return spack.repository.RepoPath(spack.mock_packages_path) + return spack.repository.RepoPath(spack.paths.mock_packages_path) @pytest.fixture() diff --git a/lib/spack/spack/test/sbang.py b/lib/spack/spack/test/sbang.py index ffa99428ed..71212afabd 100644 --- a/lib/spack/spack/test/sbang.py +++ b/lib/spack/spack/test/sbang.py @@ -34,7 +34,7 @@ import filecmp from llnl.util.filesystem import mkdirp -import spack +import spack.paths from spack.hooks.sbang import shebang_too_long, filter_shebangs_in_directory from spack.util.executable import which @@ -47,7 +47,7 @@ lua_line_patched = "--!/this/" + ('x' * 200) + "/is/lua\n" node_line = "#!/this/" + ('x' * 200) + "/is/node\n" node_in_text = ("line\n") * 100 + "lua\n" + ("line\n" * 100) node_line_patched = "//!/this/" + ('x' * 200) + "/is/node\n" -sbang_line = '#!/bin/bash %s/bin/sbang\n' % spack.spack_root +sbang_line = '#!/bin/bash %s/bin/sbang\n' % spack.paths.prefix last_line = "last!\n" diff --git a/lib/spack/spack/test/stage.py b/lib/spack/spack/test/stage.py index 1fb3aada77..966c97ab5f 100644 --- a/lib/spack/spack/test/stage.py +++ b/lib/spack/spack/test/stage.py @@ -23,13 +23,14 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## """Test that the Stage class works correctly.""" -import collections import os +import collections + +import pytest from llnl.util.filesystem import join_path, working_dir -import pytest -import spack +import spack.paths import spack.stage import spack.util.executable from spack.stage import Stage @@ -101,18 +102,18 @@ def get_stage_path(stage, stage_name): """ if stage_name is not None: # If it is a named stage, we know where the stage should be - return join_path(spack.stage_path, stage_name) + return os.path.join(spack.paths.stage_path, stage_name) else: # If it's unnamed, ensure that we ran mkdtemp in the right spot. assert stage.path is not None - assert stage.path.startswith(spack.stage_path) + assert stage.path.startswith(spack.paths.stage_path) return stage.path @pytest.fixture() def tmpdir_for_stage(mock_archive): """Uses a temporary directory for staging""" - current = spack.stage_path + current = spack.paths.stage_path spack.config.update_config( 'config', {'build_stage': [str(mock_archive.test_tmp_dir)]}, diff --git a/lib/spack/spack/test/web.py b/lib/spack/spack/test/web.py index 6d9b106ea1..82f9b9bbdc 100644 --- a/lib/spack/spack/test/web.py +++ b/lib/spack/spack/test/web.py @@ -25,12 +25,12 @@ """Tests for web.py.""" import os -import spack +import spack.paths from spack.util.web import spider, find_versions_of_archive from spack.version import ver -web_data_path = os.path.join(spack.test_path, 'data', 'web') +web_data_path = os.path.join(spack.paths.test_path, 'data', 'web') root = 'file://' + web_data_path + '/index.html' root_tarball = 'file://' + web_data_path + '/foo-0.0.0.tar.gz' diff --git a/lib/spack/spack/util/executable.py b/lib/spack/spack/util/executable.py index 35d43cec65..e80848b882 100644 --- a/lib/spack/spack/util/executable.py +++ b/lib/spack/spack/util/executable.py @@ -29,7 +29,7 @@ from six import string_types import sys import llnl.util.tty as tty -import spack + import spack.error __all__ = ['Executable', 'which', 'ProcessError'] diff --git a/lib/spack/spack/util/gpg.py b/lib/spack/spack/util/gpg.py index 09e7ded412..62f9bd76ef 100644 --- a/lib/spack/spack/util/gpg.py +++ b/lib/spack/spack/util/gpg.py @@ -22,14 +22,13 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## - import os -import spack +import spack.paths from spack.util.executable import Executable -GNUPGHOME = spack.gpg_path +GNUPGHOME = spack.paths.gpg_path class Gpg(object): diff --git a/lib/spack/spack/util/naming.py b/lib/spack/spack/util/naming.py index 1dd95fbcde..98d4081868 100644 --- a/lib/spack/spack/util/naming.py +++ b/lib/spack/spack/util/naming.py @@ -29,7 +29,7 @@ import itertools import re from six import StringIO -import spack +import spack.error __all__ = [ 'mod_to_class', diff --git a/lib/spack/spack/util/path.py b/lib/spack/spack/util/path.py index a030c1160b..91126e5d31 100644 --- a/lib/spack/spack/util/path.py +++ b/lib/spack/spack/util/path.py @@ -28,17 +28,19 @@ TODO: this is really part of spack.config. Consolidate it. """ import os import re -import spack import getpass import tempfile +import spack.paths + + __all__ = [ 'substitute_config_variables', 'canonicalize_path'] # Substitutions to perform replacements = { - 'spack': spack.prefix, + 'spack': spack.paths.prefix, 'user': getpass.getuser(), 'tempdir': tempfile.gettempdir(), } diff --git a/var/spack/repos/builtin.mock/packages/url-list-test/package.py b/var/spack/repos/builtin.mock/packages/url-list-test/package.py index 75377873b7..fff04d7a9e 100644 --- a/var/spack/repos/builtin.mock/packages/url-list-test/package.py +++ b/var/spack/repos/builtin.mock/packages/url-list-test/package.py @@ -25,14 +25,14 @@ from spack import * import os -import spack +import spack.paths class UrlListTest(Package): """Mock package with url_list.""" homepage = "http://www.url-list-example.com" - web_data_path = os.path.join(spack.test_path, 'data', 'web') + web_data_path = os.path.join(spack.paths.test_path, 'data', 'web') url = 'file://' + web_data_path + '/foo-0.0.0.tar.gz' list_url = 'file://' + web_data_path + '/index.html' list_depth = 3 diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py index 7e7facc93a..15ea33dd79 100644 --- a/var/spack/repos/builtin/packages/cbtf-krell/package.py +++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py @@ -41,7 +41,6 @@ ########################################################################## from spack import * -import spack import spack.store diff --git a/var/spack/repos/builtin/packages/gobject-introspection/package.py b/var/spack/repos/builtin/packages/gobject-introspection/package.py index 350105af32..436949290c 100644 --- a/var/spack/repos/builtin/packages/gobject-introspection/package.py +++ b/var/spack/repos/builtin/packages/gobject-introspection/package.py @@ -23,7 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from spack import spack_root +from spack.paths import spack_root class GobjectIntrospection(Package): diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py index 7347280159..237784e42d 100644 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop/package.py @@ -42,7 +42,6 @@ from spack import * -import spack import spack.store import os diff --git a/var/spack/repos/builtin/packages/perl/package.py b/var/spack/repos/builtin/packages/perl/package.py index 332b5121e7..1759c15d86 100644 --- a/var/spack/repos/builtin/packages/perl/package.py +++ b/var/spack/repos/builtin/packages/perl/package.py @@ -30,12 +30,14 @@ # Author: Justin Too # Date: September 6, 2015 # -from spack import * import os from contextlib import contextmanager -import spack + from llnl.util.lang import match_predicate +import spack.store +from spack import * + class Perl(Package): # Perl doesn't use Autotools, it should subclass Package """Perl 5 is a highly capable, feature-rich programming language with over diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 30774332fd..34e1e0ea6d 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -32,11 +32,11 @@ import llnl.util.tty as tty from llnl.util.lang import match_predicate from llnl.util.filesystem import force_remove -import spack -from spack import * +import spack.store +import spack.util.spack_json as sjson from spack.util.environment import is_system_path from spack.util.prefix import Prefix -import spack.util.spack_json as sjson +from spack import * class Python(AutotoolsPackage): -- cgit v1.2.3-70-g09d2 From 6f2cac9565cd50cded141533b1594faa02c4b2f6 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Thu, 10 May 2018 11:45:44 -0700 Subject: init: initialize spack.store lazily - spack.store was previously initialized at the spack.store module level, but this means the store has to be initialized on every spack call. - this moves the state in spack.store to a singleton so that the store is only initialized when needed. --- lib/spack/spack/binary_distribution.py | 18 ++--- lib/spack/spack/build_environment.py | 2 +- lib/spack/spack/cmd/__init__.py | 2 +- lib/spack/spack/cmd/activate.py | 5 +- lib/spack/spack/cmd/bootstrap.py | 2 +- lib/spack/spack/cmd/buildcache.py | 4 +- lib/spack/spack/cmd/common/arguments.py | 4 +- lib/spack/spack/cmd/deactivate.py | 7 +- lib/spack/spack/cmd/debug.py | 6 +- lib/spack/spack/cmd/dependencies.py | 2 +- lib/spack/spack/cmd/dependents.py | 2 +- lib/spack/spack/cmd/extensions.py | 9 +-- lib/spack/spack/cmd/graph.py | 2 +- lib/spack/spack/cmd/install.py | 2 +- lib/spack/spack/cmd/reindex.py | 2 +- lib/spack/spack/cmd/setup.py | 2 +- lib/spack/spack/cmd/uninstall.py | 7 +- lib/spack/spack/cmd/view.py | 4 +- lib/spack/spack/database.py | 10 +-- lib/spack/spack/filesystem_view.py | 15 ++-- lib/spack/spack/package.py | 80 ++++++++++++---------- lib/spack/spack/relocate.py | 18 ++--- lib/spack/spack/spec.py | 10 +-- lib/spack/spack/store.py | 75 +++++++++++++------- lib/spack/spack/test/cmd/dependencies.py | 4 +- lib/spack/spack/test/cmd/dependents.py | 6 +- lib/spack/spack/test/cmd/install.py | 2 +- lib/spack/spack/test/cmd/uninstall.py | 2 +- lib/spack/spack/test/conftest.py | 51 +++++++------- lib/spack/spack/test/database.py | 32 ++++----- lib/spack/spack/test/spec_syntax.py | 4 +- var/spack/repos/builtin/packages/aspell/package.py | 12 ++-- .../repos/builtin/packages/cbtf-krell/package.py | 19 ++--- .../builtin/packages/openspeedshop/package.py | 3 +- var/spack/repos/builtin/packages/perl/package.py | 4 +- var/spack/repos/builtin/packages/python/package.py | 8 +-- 36 files changed, 239 insertions(+), 198 deletions(-) (limited to 'var') diff --git a/lib/spack/spack/binary_distribution.py b/lib/spack/spack/binary_distribution.py index 2a0dd7633d..a5bce56c79 100644 --- a/lib/spack/spack/binary_distribution.py +++ b/lib/spack/spack/binary_distribution.py @@ -148,8 +148,8 @@ def write_buildinfo_file(prefix, workdir, rel=False): # Check if the file contains a string with the installroot. # This cuts down on the number of files added to the list # of files potentially needing relocation - if relocate.strings_contains_installroot(path_name, - spack.store.layout.root): + if relocate.strings_contains_installroot( + path_name, spack.store.store().layout.root): filetype = relocate.get_filetype(path_name) if relocate.needs_binary_relocation(filetype, os_id): rel_path_name = os.path.relpath(path_name, prefix) @@ -161,9 +161,9 @@ def write_buildinfo_file(prefix, workdir, rel=False): # Create buildinfo data and write it to disk buildinfo = {} buildinfo['relative_rpaths'] = rel - buildinfo['buildpath'] = spack.store.layout.root - buildinfo['relative_prefix'] = os.path.relpath(prefix, - spack.store.layout.root) + buildinfo['buildpath'] = spack.store.store().layout.root + buildinfo['relative_prefix'] = os.path.relpath( + prefix, spack.store.store().layout.root) buildinfo['relocate_textfiles'] = text_to_relocate buildinfo['relocate_binaries'] = binary_to_relocate filename = buildinfo_file_name(workdir) @@ -333,8 +333,8 @@ def build_tarball(spec, outdir, force=False, rel=False, unsigned=False, # Add original install prefix relative to layout root to spec.yaml. # This will be used to determine is the directory layout has changed. buildinfo = {} - buildinfo['relative_prefix'] = os.path.relpath(spec.prefix, - spack.store.layout.root) + buildinfo['relative_prefix'] = os.path.relpath( + spec.prefix, spack.store.store().layout.root) spec_dict['buildinfo'] = buildinfo with open(specfile_path, 'w') as outfile: outfile.write(yaml.dump(spec_dict)) @@ -414,7 +414,7 @@ def relocate_package(workdir, allow_root): Relocate the given package """ buildinfo = read_buildinfo_file(workdir) - new_path = spack.store.layout.root + new_path = spack.store.store().layout.root old_path = buildinfo['buildpath'] rel = buildinfo.get('relative_rpaths', False) if rel: @@ -493,7 +493,7 @@ def extract_tarball(spec, filename, allow_root=False, unsigned=False, "It cannot be installed.") new_relative_prefix = str(os.path.relpath(spec.prefix, - spack.store.layout.root)) + spack.store.store().layout.root)) # if the original relative prefix is in the spec file use it buildinfo = spec_dict.get('buildinfo', {}) old_relative_prefix = buildinfo.get('relative_prefix', new_relative_prefix) diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py index cdf3e86577..4619c4c206 100644 --- a/lib/spack/spack/build_environment.py +++ b/lib/spack/spack/build_environment.py @@ -256,7 +256,7 @@ def set_build_environment_variables(pkg, env, dirty): env.set(SPACK_PREFIX, pkg.prefix) # Install root prefix - env.set(SPACK_INSTALL, spack.store.root) + env.set(SPACK_INSTALL, spack.store.store().root) # Stuff in here sanitizes the build environment to eliminate # anything the user has set that may interfere. diff --git a/lib/spack/spack/cmd/__init__.py b/lib/spack/spack/cmd/__init__.py index f57e86ee27..8aab63d4f3 100644 --- a/lib/spack/spack/cmd/__init__.py +++ b/lib/spack/spack/cmd/__init__.py @@ -182,7 +182,7 @@ def elide_list(line_list, max_num=10): def disambiguate_spec(spec): - matching_specs = spack.store.db.query(spec) + matching_specs = spack.store.store().db.query(spec) if not matching_specs: tty.die("Spec '%s' matches no installed packages." % spec) diff --git a/lib/spack/spack/cmd/activate.py b/lib/spack/spack/cmd/activate.py index b7b953d153..6c0e5f767d 100644 --- a/lib/spack/spack/cmd/activate.py +++ b/lib/spack/spack/cmd/activate.py @@ -54,9 +54,10 @@ def activate(parser, args): if not spec.package.is_extension: tty.die("%s is not an extension." % spec.name) - layout = spack.store.extensions + layout = spack.store.store().extensions if args.view is not None: - layout = YamlViewExtensionsLayout(args.view, spack.store.layout) + layout = YamlViewExtensionsLayout( + args.view, spack.store.store().layout) if spec.package.is_activated(extensions_layout=layout): tty.msg("Package %s is already activated." % specs[0].short_spec) diff --git a/lib/spack/spack/cmd/bootstrap.py b/lib/spack/spack/cmd/bootstrap.py index 80abbd8045..650e0a8e8d 100644 --- a/lib/spack/spack/cmd/bootstrap.py +++ b/lib/spack/spack/cmd/bootstrap.py @@ -68,7 +68,7 @@ def bootstrap(parser, args, **kwargs): requirement_dict = {'environment-modules': 'environment-modules~X'} for requirement in requirement_dict: - installed_specs = spack.store.db.query(requirement) + installed_specs = spack.store.store().db.query(requirement) if(len(installed_specs) > 0): tty.msg("Requirement %s is satisfied with installed " "package %s" % (requirement, installed_specs[0])) diff --git a/lib/spack/spack/cmd/buildcache.py b/lib/spack/spack/cmd/buildcache.py index a9f9b6d6b8..6d6c49c5bd 100644 --- a/lib/spack/spack/cmd/buildcache.py +++ b/lib/spack/spack/cmd/buildcache.py @@ -116,7 +116,7 @@ def find_matching_specs(pkgs, allow_multiple_matches=False, force=False): has_errors = False specs = spack.cmd.parse_specs(pkgs) for spec in specs: - matching = spack.store.db.query(spec) + matching = spack.store.store().db.query(spec) # For each spec provided, make sure it refers to only one package. # Fail and ask user to be unambiguous if it doesn't if not allow_multiple_matches and len(matching) > 1: @@ -254,7 +254,7 @@ def install_tarball(spec, args): tty.msg('Installing buildcache for spec %s' % spec.format()) bindist.extract_tarball(spec, tarball, args.allow_root, args.unsigned, args.force) - spack.store.db.reindex(spack.store.layout) + spack.store.store().reindex() else: tty.die('Download of binary cache file for spec %s failed.' % spec.format()) diff --git a/lib/spack/spack/cmd/common/arguments.py b/lib/spack/spack/cmd/common/arguments.py index ea5bc1c25d..2b1a47c8df 100644 --- a/lib/spack/spack/cmd/common/arguments.py +++ b/lib/spack/spack/cmd/common/arguments.py @@ -73,12 +73,12 @@ class ConstraintAction(argparse.Action): # return everything for an empty query. if not qspecs: - return spack.store.db.query(**kwargs) + return spack.store.store().db.query(**kwargs) # Return only matching stuff otherwise. specs = set() for spec in qspecs: - for s in spack.store.db.query(spec, **kwargs): + for s in spack.store.store().db.query(spec, **kwargs): specs.add(s) return sorted(specs) diff --git a/lib/spack/spack/cmd/deactivate.py b/lib/spack/spack/cmd/deactivate.py index 575ba05a1d..adac9e5e0f 100644 --- a/lib/spack/spack/cmd/deactivate.py +++ b/lib/spack/spack/cmd/deactivate.py @@ -60,14 +60,15 @@ def deactivate(parser, args): spec = spack.cmd.disambiguate_spec(specs[0]) pkg = spec.package - layout = spack.store.extensions + layout = spack.store.store().extensions if args.view is not None: - layout = YamlViewExtensionsLayout(args.view, spack.store.layout) + layout = YamlViewExtensionsLayout( + args.view, spack.store.store().layout) if args.all: if pkg.extendable: tty.msg("Deactivating all extensions of %s" % pkg.spec.short_spec) - ext_pkgs = spack.store.db.activated_extensions_for( + ext_pkgs = spack.store.store().db.activated_extensions_for( spec, extensions_layout=layout) for ext_pkg in ext_pkgs: diff --git a/lib/spack/spack/cmd/debug.py b/lib/spack/spack/cmd/debug.py index 2a85be8a00..4aa6f25fa0 100644 --- a/lib/spack/spack/cmd/debug.py +++ b/lib/spack/spack/cmd/debug.py @@ -76,16 +76,16 @@ def create_db_tarball(args): tarball_name = "spack-db.%s.tar.gz" % _debug_tarball_suffix() tarball_path = os.path.abspath(tarball_name) - base = os.path.basename(spack.store.root) + base = os.path.basename(spack.store.store().root) transform_args = [] if 'GNU' in tar('--version', output=str): transform_args = ['--transform', 's/^%s/%s/' % (base, tarball_name)] else: transform_args = ['-s', '/^%s/%s/' % (base, tarball_name)] - wd = os.path.dirname(spack.store.root) + wd = os.path.dirname(spack.store.store().root) with working_dir(wd): - files = [spack.store.db._index_path] + files = [spack.store.store().db._index_path] files += glob('%s/*/*/*/.spack/spec.yaml' % base) files = [os.path.relpath(f) for f in files] diff --git a/lib/spack/spack/cmd/dependencies.py b/lib/spack/spack/cmd/dependencies.py index ad34fa16ce..f39ddb4dab 100644 --- a/lib/spack/spack/cmd/dependencies.py +++ b/lib/spack/spack/cmd/dependencies.py @@ -60,7 +60,7 @@ def dependencies(parser, args): spec = spack.cmd.disambiguate_spec(specs[0]) tty.msg("Dependencies of %s" % spec.format('$_$@$%@$/', color=True)) - deps = spack.store.db.installed_relatives( + deps = spack.store.store().db.installed_relatives( spec, 'children', args.transitive) if deps: spack.cmd.display_specs(deps, long=True) diff --git a/lib/spack/spack/cmd/dependents.py b/lib/spack/spack/cmd/dependents.py index 602d386c0a..129ee56435 100644 --- a/lib/spack/spack/cmd/dependents.py +++ b/lib/spack/spack/cmd/dependents.py @@ -103,7 +103,7 @@ def dependents(parser, args): spec = spack.cmd.disambiguate_spec(specs[0]) tty.msg("Dependents of %s" % spec.cformat('$_$@$%@$/')) - deps = spack.store.db.installed_relatives( + deps = spack.store.store().db.installed_relatives( spec, 'parents', args.transitive) if deps: spack.cmd.display_specs(deps, long=True) diff --git a/lib/spack/spack/cmd/extensions.py b/lib/spack/spack/cmd/extensions.py index 6ea115e42f..56463ae7c2 100644 --- a/lib/spack/spack/cmd/extensions.py +++ b/lib/spack/spack/cmd/extensions.py @@ -113,16 +113,17 @@ def extensions(parser, args): tty.msg("%d extensions:" % len(extensions)) colify(ext.name for ext in extensions) - layout = spack.store.extensions + layout = spack.store.store().extensions if args.view is not None: - layout = YamlViewExtensionsLayout(args.view, spack.store.layout) + layout = YamlViewExtensionsLayout( + args.view, spack.store.store().layout) if show_installed: # # List specs of installed extensions. # - installed = [s.spec - for s in spack.store.db.installed_extensions_for(spec)] + store = spack.store.store() + installed = [s.spec for s in store.db.installed_extensions_for(spec)] if show_all: print diff --git a/lib/spack/spack/cmd/graph.py b/lib/spack/spack/cmd/graph.py index 305835ff34..81e6e6119c 100644 --- a/lib/spack/spack/cmd/graph.py +++ b/lib/spack/spack/cmd/graph.py @@ -77,7 +77,7 @@ def graph(parser, args): if args.specs: tty.die("Can't specify specs with --installed") args.dot = True - specs = spack.store.db.query() + specs = spack.store.store().db.query() else: specs = spack.cmd.parse_specs( diff --git a/lib/spack/spack/cmd/install.py b/lib/spack/spack/cmd/install.py index 93aeb1009a..9c074a5794 100644 --- a/lib/spack/spack/cmd/install.py +++ b/lib/spack/spack/cmd/install.py @@ -244,7 +244,7 @@ def install(parser, args, **kwargs): "only one spec is allowed when overwriting an installation" spec = specs[0] - t = spack.store.db.query(spec) + t = spack.store.store().db.query(spec) assert len(t) == 1, "to overwrite a spec you must install it first" # Give the user a last chance to think about overwriting an already diff --git a/lib/spack/spack/cmd/reindex.py b/lib/spack/spack/cmd/reindex.py index 33207d5ddf..647c4b73a9 100644 --- a/lib/spack/spack/cmd/reindex.py +++ b/lib/spack/spack/cmd/reindex.py @@ -31,4 +31,4 @@ level = "long" def reindex(parser, args): - spack.store.db.reindex(spack.store.layout) + spack.store.store().reindex() diff --git a/lib/spack/spack/cmd/setup.py b/lib/spack/spack/cmd/setup.py index abf1e2957b..60b814b6c2 100644 --- a/lib/spack/spack/cmd/setup.py +++ b/lib/spack/spack/cmd/setup.py @@ -135,7 +135,7 @@ def setup(self, args): tty.die("spack setup only takes one spec.") # Take a write lock before checking for existence. - with spack.store.db.write_transaction(): + with spack.store.store().db.write_transaction(): spec = specs[0] if not spack.repo.path().exists(spec.name): tty.die("No package for '{0}' was found.".format(spec.name), diff --git a/lib/spack/spack/cmd/uninstall.py b/lib/spack/spack/cmd/uninstall.py index b9f3833999..f3c7b77b1d 100644 --- a/lib/spack/spack/cmd/uninstall.py +++ b/lib/spack/spack/cmd/uninstall.py @@ -93,7 +93,7 @@ def find_matching_specs(specs, allow_multiple_matches=False, force=False): specs_from_cli = [] has_errors = False for spec in specs: - matching = spack.store.db.query(spec) + matching = spack.store.store().db.query(spec) # For each spec provided, make sure it refers to only one package. # Fail and ask user to be unambiguous if it doesn't if not allow_multiple_matches and len(matching) > 1: @@ -128,7 +128,8 @@ def installed_dependents(specs): """ dependents = {} for item in specs: - installed = spack.store.db.installed_relatives(item, 'parents', True) + installed = spack.store.store().db.installed_relatives( + item, 'parents', True) lst = [x for x in installed if x not in specs] if lst: lst = list(set(lst)) @@ -157,7 +158,7 @@ def do_uninstall(specs, force): # Sort packages to be uninstalled by the number of installed dependents # This ensures we do things in the right order def num_installed_deps(pkg): - dependents = spack.store.db.installed_relatives( + dependents = spack.store.store().db.installed_relatives( pkg.spec, 'parents', True) return len(dependents) diff --git a/lib/spack/spack/cmd/view.py b/lib/spack/spack/cmd/view.py index 71333a088f..009529d848 100644 --- a/lib/spack/spack/cmd/view.py +++ b/lib/spack/spack/cmd/view.py @@ -93,7 +93,7 @@ def relaxed_disambiguate(specs, view): return matching_specs[0] # make function always return a list to keep consistency between py2/3 - return list(map(squash, map(spack.store.db.query, specs))) + return list(map(squash, map(spack.store.store().db.query, specs))) def setup_parser(sp): @@ -176,7 +176,7 @@ def view(parser, args): path = args.path[0] view = YamlFilesystemView( - path, spack.store.layout, + path, spack.store.store().layout, ignore_conflicts=getattr(args, "ignore_conflicts", False), link=os.link if args.action in ["hardlink", "hard"] else os.symlink, diff --git a/lib/spack/spack/database.py b/lib/spack/spack/database.py index 0e98cffc69..97954d67f9 100644 --- a/lib/spack/spack/database.py +++ b/lib/spack/spack/database.py @@ -223,7 +223,7 @@ class Database(object): Prefix lock is a byte range lock on the nth byte of a file. - The lock file is ``spack.store.db.prefix_lock`` -- the DB + The lock file is ``spack.store.store().db.prefix_lock`` -- the DB tells us what to call it and it lives alongside the install DB. n is the sys.maxsize-bit prefix of the DAG hash. This makes @@ -366,7 +366,7 @@ class Database(object): if version > _db_version: raise InvalidDatabaseVersionError(_db_version, version) elif version < _db_version: - self.reindex(spack.store.layout) + self.reindex(spack.store.store().layout) installs = dict((k, v.to_dict()) for k, v in self._data.items()) def invalid_record(hash_key, error): @@ -499,7 +499,7 @@ class Database(object): tty.debug( 'RECONSTRUCTING FROM OLD DB: {0}'.format(entry.spec)) try: - layout = spack.store.layout + layout = spack.store.store().layout if entry.spec.external: layout = None install_check = True @@ -609,7 +609,7 @@ class Database(object): # reindex() takes its own write lock, so no lock here. with WriteTransaction(self.lock, timeout=_db_lock_timeout): self._write(None, None, None) - self.reindex(spack.store.layout) + self.reindex(spack.store.store().layout) def _add( self, @@ -823,7 +823,7 @@ class Database(object): the given spec """ if extensions_layout is None: - extensions_layout = spack.store.extensions + extensions_layout = spack.store.store().extensions for spec in self.query(): try: extensions_layout.check_activated(extendee_spec, spec) diff --git a/lib/spack/spack/filesystem_view.py b/lib/spack/spack/filesystem_view.py index f374bccd1f..0c5f9a6a6c 100644 --- a/lib/spack/spack/filesystem_view.py +++ b/lib/spack/spack/filesystem_view.py @@ -267,7 +267,7 @@ class YamlFilesystemView(FilesystemView): # Check for globally activated extensions in the extendee that # we're looking at. activated = [p.spec for p in - spack.store.db.activated_extensions_for(spec)] + spack.store.store().db.activated_extensions_for(spec)] if activated: tty.error("Globally activated extensions cannot be used in " "conjunction with filesystem views. " @@ -390,7 +390,8 @@ class YamlFilesystemView(FilesystemView): tty.info(self._croot + 'Removed package: %s' % colorize_spec(spec)) def get_all_specs(self): - dotspack = join_path(self.root, spack.store.layout.metadata_dir) + dotspack = join_path(self.root, + spack.store.store().layout.metadata_dir) if os.path.exists(dotspack): return list(filter(None, map(self.get_spec, os.listdir(dotspack)))) else: @@ -407,12 +408,14 @@ class YamlFilesystemView(FilesystemView): def get_path_meta_folder(self, spec): "Get path to meta folder for either spec or spec name." - return join_path(self.root, spack.store.layout.metadata_dir, + return join_path(self.root, + spack.store.store().layout.metadata_dir, getattr(spec, "name", spec)) def get_spec(self, spec): dotspack = self.get_path_meta_folder(spec) - filename = join_path(dotspack, spack.store.layout.spec_file_name) + filename = join_path(dotspack, + spack.store.store().layout.spec_file_name) try: with open(filename, "r") as f: @@ -421,7 +424,7 @@ class YamlFilesystemView(FilesystemView): return None def link_meta_folder(self, spec): - src = spack.store.layout.metadata_path(spec) + src = spack.store.store().layout.metadata_path(spec) tgt = self.get_path_meta_folder(spec) tree = LinkTree(src) @@ -547,4 +550,4 @@ def get_dependencies(specs): def ignore_metadata_dir(f): - return f in spack.store.layout.hidden_file_paths + return f in spack.store.store().layout.hidden_file_paths diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py index b046a6c661..f361763878 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -949,7 +949,7 @@ class PackageBase(with_metaclass(PackageMeta, object)): raise ValueError( "is_extension called on package that is not an extension.") if extensions_layout is None: - extensions_layout = spack.store.extensions + extensions_layout = spack.store.store().extensions exts = extensions_layout.extension_map(self.extendee_spec) return (self.name in exts) and (exts[self.name] == self.spec) @@ -1003,7 +1003,7 @@ class PackageBase(with_metaclass(PackageMeta, object)): Removes the prefix for a package along with any empty parent directories """ - spack.store.layout.remove_install_directory(self.spec) + spack.store.store().layout.remove_install_directory(self.spec) def do_fetch(self, mirror_only=False): """ @@ -1241,7 +1241,8 @@ class PackageBase(with_metaclass(PackageMeta, object)): # Install fake man page mkdirp(self.prefix.man.man1) - packages_dir = spack.store.layout.build_packages_path(self.spec) + store = spack.store.store() + packages_dir = store.layout.build_packages_path(self.spec) dump_packages(self.spec, packages_dir) def _if_make_target_execute(self, target): @@ -1304,7 +1305,7 @@ class PackageBase(with_metaclass(PackageMeta, object)): def _stage_and_write_lock(self): """Prefix lock nested in a stage.""" with self.stage: - with spack.store.db.prefix_write_lock(self.spec): + with spack.store.store().db.prefix_write_lock(self.spec): yield def _process_external_package(self, explicit): @@ -1328,7 +1329,7 @@ class PackageBase(with_metaclass(PackageMeta, object)): try: # Check if the package was already registered in the DB # If this is the case, then just exit - rec = spack.store.db.get_record(self.spec) + rec = spack.store.store().db.get_record(self.spec) message = '{s.name}@{s.version} : already registered in DB' tty.msg(message.format(s=self)) # Update the value of rec.explicit if it is necessary @@ -1344,12 +1345,12 @@ class PackageBase(with_metaclass(PackageMeta, object)): # Add to the DB message = '{s.name}@{s.version} : registering into DB' tty.msg(message.format(s=self)) - spack.store.db.add(self.spec, None, explicit=explicit) + spack.store.store().db.add(self.spec, None, explicit=explicit) def _update_explicit_entry_in_db(self, rec, explicit): if explicit and not rec.explicit: - with spack.store.db.write_transaction(): - rec = spack.store.db.get_record(self.spec) + with spack.store.store().db.write_transaction(): + rec = spack.store.store().db.get_record(self.spec) rec.explicit = True message = '{s.name}@{s.version} : marking the package explicit' tty.msg(message.format(s=self)) @@ -1366,7 +1367,8 @@ class PackageBase(with_metaclass(PackageMeta, object)): binary_distribution.extract_tarball( binary_spec, tarball, allow_root=False, unsigned=False, force=False) - spack.store.db.add(self.spec, spack.store.layout, explicit=explicit) + spack.store.store().db.add( + self.spec, spack.store.layout, explicit=explicit) return True def do_install(self, @@ -1423,15 +1425,15 @@ class PackageBase(with_metaclass(PackageMeta, object)): partial = self.check_for_unfinished_installation(keep_prefix, restage) # Ensure package is not already installed - layout = spack.store.layout - with spack.store.db.prefix_read_lock(self.spec): + layout = spack.store.store().layout + with spack.store.store().db.prefix_read_lock(self.spec): if partial: tty.msg( "Continuing from partial install of %s" % self.name) elif layout.check_installed(self.spec): msg = '{0.name} is already installed in {0.prefix}' tty.msg(msg.format(self)) - rec = spack.store.db.get_record(self.spec) + rec = spack.store.store().db.get_record(self.spec) # In case the stage directory has already been created, # this ensures it's removed after we checked that the spec # is installed @@ -1566,7 +1568,7 @@ class PackageBase(with_metaclass(PackageMeta, object)): try: # Create the install prefix and fork the build process. if not os.path.exists(self.prefix): - spack.store.layout.create_install_directory(self.spec) + spack.store.store().layout.create_install_directory(self.spec) # Fork a child to do the actual installation # we preserve verbosity settings across installs. @@ -1577,8 +1579,8 @@ class PackageBase(with_metaclass(PackageMeta, object)): keep_prefix = self.last_phase is None or keep_prefix # note: PARENT of the build process adds the new package to # the database, so that we don't need to re-read from file. - spack.store.db.add( - self.spec, spack.store.layout, explicit=explicit + spack.store.store().db.add( + self.spec, spack.store.store().layout, explicit=explicit ) except directory_layout.InstallDirectoryAlreadyExistsError: # Abort install if install directory exists. @@ -1632,9 +1634,9 @@ class PackageBase(with_metaclass(PackageMeta, object)): raise ExternalPackageError("Attempted to repair external spec %s" % self.spec.name) - with spack.store.db.prefix_write_lock(self.spec): + with spack.store.store().db.prefix_write_lock(self.spec): try: - record = spack.store.db.get_record(self.spec) + record = spack.store.store().db.get_record(self.spec) installed_in_db = record.installed if record else False except KeyError: installed_in_db = False @@ -1669,9 +1671,10 @@ class PackageBase(with_metaclass(PackageMeta, object)): def log(self): # Copy provenance into the install directory on success - log_install_path = spack.store.layout.build_log_path(self.spec) - env_install_path = spack.store.layout.build_env_path(self.spec) - packages_dir = spack.store.layout.build_packages_path(self.spec) + store = spack.store.store() + log_install_path = store.layout.build_log_path(self.spec) + env_install_path = store.layout.build_env_path(self.spec) + packages_dir = store.layout.build_packages_path(self.spec) # Remove first if we're overwriting another build # (can happen with spack setup) @@ -1690,8 +1693,9 @@ class PackageBase(with_metaclass(PackageMeta, object)): with working_dir(self.stage.source_path): errors = StringIO() target_dir = os.path.join( - spack.store.layout.metadata_path(self.spec), 'archived-files' - ) + spack.store.store().layout.metadata_path(self.spec), + 'archived-files') + for glob_expr in self.archive_files: # Check that we are trying to copy things that are # in the source_path tree (not arbitrary files) @@ -1750,7 +1754,7 @@ class PackageBase(with_metaclass(PackageMeta, object)): installed = set(os.listdir(self.prefix)) installed.difference_update( - spack.store.layout.hidden_file_paths) + spack.store.store().layout.hidden_file_paths) if not installed: raise InstallError( "Install failed for %s. Nothing was installed!" % self.name) @@ -1758,7 +1762,7 @@ class PackageBase(with_metaclass(PackageMeta, object)): @property def build_log_path(self): if self.installed: - return spack.store.layout.build_log_path(self.spec) + return spack.store.store().layout.build_log_path(self.spec) else: return join_path(self.stage.source_path, 'spack-build.out') @@ -1916,16 +1920,16 @@ class PackageBase(with_metaclass(PackageMeta, object)): if not os.path.isdir(spec.prefix): # prefix may not exist, but DB may be inconsistent. Try to fix by # removing, but omit hooks. - specs = spack.store.db.query(spec, installed=True) + specs = spack.store.store().db.query(spec, installed=True) if specs: - spack.store.db.remove(specs[0]) + spack.store.store().db.remove(specs[0]) tty.msg("Removed stale DB entry for %s" % spec.short_spec) return else: raise InstallError(str(spec) + " is not installed.") if not force: - dependents = spack.store.db.installed_relatives( + dependents = spack.store.store().db.installed_relatives( spec, 'parents', True) if dependents: raise PackageStillNeededError(spec, dependents) @@ -1937,7 +1941,7 @@ class PackageBase(with_metaclass(PackageMeta, object)): pkg = None # Pre-uninstall hook runs first. - with spack.store.db.prefix_write_lock(spec): + with spack.store.store().db.prefix_write_lock(spec): if pkg is not None: spack.hooks.pre_uninstall(spec) @@ -1946,11 +1950,11 @@ class PackageBase(with_metaclass(PackageMeta, object)): if not spec.external: msg = 'Deleting package prefix [{0}]' tty.debug(msg.format(spec.short_spec)) - spack.store.layout.remove_install_directory(spec) + spack.store.store().layout.remove_install_directory(spec) # Delete DB entry msg = 'Deleting DB entry [{0}]' tty.debug(msg.format(spec.short_spec)) - spack.store.db.remove(spec) + spack.store.store().db.remove(spec) if pkg is not None: spack.hooks.post_uninstall(spec) @@ -1996,7 +2000,7 @@ class PackageBase(with_metaclass(PackageMeta, object)): self._sanity_check_extension() if extensions_layout is None: - extensions_layout = spack.store.extensions + extensions_layout = spack.store.store().extensions extensions_layout.check_extension_conflict( self.extendee_spec, self.spec) @@ -2040,11 +2044,11 @@ class PackageBase(with_metaclass(PackageMeta, object)): """ extensions_layout = kwargs.get("extensions_layout", - spack.store.extensions) + spack.store.store().extensions) target = extensions_layout.extendee_target_directory(self) def ignore(filename): - return (filename in spack.store.layout.hidden_file_paths or + return (filename in spack.store.store().layout.hidden_file_paths or kwargs.get('ignore', lambda f: False)(filename)) tree = LinkTree(extension.prefix) @@ -2072,7 +2076,7 @@ class PackageBase(with_metaclass(PackageMeta, object)): verbose = kwargs.get("verbose", True) remove_dependents = kwargs.get("remove_dependents", False) extensions_layout = kwargs.get("extensions_layout", - spack.store.extensions) + spack.store.store().extensions) # Allow a force deactivate to happen. This can unlink # spurious files if something was corrupted. @@ -2124,11 +2128,11 @@ class PackageBase(with_metaclass(PackageMeta, object)): """ extensions_layout = kwargs.get("extensions_layout", - spack.store.extensions) + spack.store.store().extensions) target = extensions_layout.extendee_target_directory(self) def ignore(filename): - return (filename in spack.store.layout.hidden_file_paths or + return (filename in spack.store.store().layout.hidden_file_paths or kwargs.get('ignore', lambda f: False)(filename)) tree = LinkTree(extension.prefix) @@ -2273,7 +2277,7 @@ def flatten_dependencies(spec, flat_dir): for dep in spec.traverse(root=False): name = dep.name - dep_path = spack.store.layout.path_for_spec(dep) + dep_path = spack.store.store().layout.path_for_spec(dep) dep_files = LinkTree(dep_path) os.mkdir(flat_dir + '/' + name) @@ -2302,7 +2306,7 @@ def dump_packages(spec, path): if node is not spec: # Locate the dependency package in the install tree and find # its provenance information. - source = spack.store.layout.build_packages_path(node) + source = spack.store.store().layout.build_packages_path(node) source_repo_root = join_path(source, node.namespace) # There's no provenance installed for the source package. Skip it. diff --git a/lib/spack/spack/relocate.py b/lib/spack/spack/relocate.py index ffda18f350..303776557b 100644 --- a/lib/spack/spack/relocate.py +++ b/lib/spack/spack/relocate.py @@ -110,7 +110,7 @@ def get_placeholder_rpaths(path_name, orig_rpaths): Replaces original layout root dir with a placeholder string in all rpaths. """ rel_rpaths = [] - orig_dir = spack.store.layout.root + orig_dir = spack.store.store().layout.root for rpath in orig_rpaths: if re.match(orig_dir, rpath): placeholder = set_placeholder(orig_dir) @@ -186,7 +186,7 @@ def macho_make_paths_placeholder(rpaths, deps, idpath): replacement are returned. """ new_idpath = None - old_dir = spack.store.layout.root + old_dir = spack.store.store().layout.root placeholder = set_placeholder(old_dir) if idpath: new_idpath = re.sub(old_dir, placeholder, idpath) @@ -425,9 +425,9 @@ def make_binary_placeholder(cur_path_names, allow_root): new_rpaths, new_deps, new_idpath) if (not allow_root and strings_contains_installroot(cur_path, - spack.store.layout.root)): - raise InstallRootStringException(cur_path, - spack.store.layout.root) + spack.store.store().layout.root)): + raise InstallRootStringException( + cur_path, spack.store.store().layout.root) elif platform.system() == 'Linux': for cur_path in cur_path_names: orig_rpaths = get_existing_elf_rpaths(cur_path) @@ -435,10 +435,10 @@ def make_binary_placeholder(cur_path_names, allow_root): new_rpaths = get_placeholder_rpaths(cur_path, orig_rpaths) modify_elf_object(cur_path, new_rpaths) if (not allow_root and - strings_contains_installroot(cur_path, - spack.store.layout.root)): - raise InstallRootStringException(cur_path, - spack.store.layout.root) + strings_contains_installroot( + cur_path, spack.store.store().layout.root)): + raise InstallRootStringException( + cur_path, spack.store.store().layout.root) else: tty.die("Placeholder not implemented for %s" % platform.system()) diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py index 896927e3fd..e81d913631 100644 --- a/lib/spack/spack/spec.py +++ b/lib/spack/spack/spec.py @@ -1402,7 +1402,7 @@ class Spec(object): @property def prefix(self): if self._prefix is None: - self.prefix = spack.store.layout.path_for_spec(self) + self.prefix = spack.store.store().layout.path_for_spec(self) return self._prefix @prefix.setter @@ -3107,7 +3107,7 @@ class Spec(object): elif named_str == 'SPACK_ROOT': out.write(fmt % token_transform(spack.paths.prefix)) elif named_str == 'SPACK_INSTALL': - out.write(fmt % token_transform(spack.store.root)) + out.write(fmt % token_transform(spack.store.store().root)) elif named_str == 'PREFIX': out.write(fmt % token_transform(self.prefix)) elif named_str.startswith('HASH'): @@ -3149,7 +3149,7 @@ class Spec(object): if not self.concrete: return None try: - record = spack.store.db.get_record(self) + record = spack.store.store().db.get_record(self) return record.installed except KeyError: return None @@ -3159,7 +3159,7 @@ class Spec(object): if not self.concrete: return None try: - record = spack.store.db.get_record(self) + record = spack.store.store().db.get_record(self) return record.explicit except KeyError: return None @@ -3382,7 +3382,7 @@ class SpecParser(spack.parse.Parser): def spec_by_hash(self): self.expect(ID) - specs = spack.store.db.query() + specs = spack.store.store().db.query() matches = [spec for spec in specs if spec.dag_hash()[:len(self.token.value)] == self.token.value] diff --git a/lib/spack/spack/store.py b/lib/spack/spack/store.py index ca6eb37361..9bd8166c16 100644 --- a/lib/spack/spack/store.py +++ b/lib/spack/spack/store.py @@ -45,32 +45,59 @@ configuration. import os import spack.paths import spack.config -from spack.util.path import canonicalize_path -from spack.database import Database -from spack.directory_layout import YamlDirectoryLayout -from spack.directory_layout import YamlExtensionsLayout +import spack.util.path +import spack.database +import spack.directory_layout -__author__ = "Benedikt Hegner (CERN)" -__all__ = ['db', 'extensions', 'layout', 'root'] +#: default installation root, relative to the Spack install path +default_root = os.path.join(spack.paths.opt_path, 'spack') -# -# Set up the install path -# -root = canonicalize_path(spack.config.get( - 'config:install_tree', os.path.join(spack.paths.opt_path, 'spack'))) -# -# Set up the installed packages database -# -db = Database(root) +class Store(object): + """A store is a path full of installed Spack packages. -# -# This controls how spack lays out install prefixes and -# stage directories. -# -layout = YamlDirectoryLayout( - root, - hash_len=spack.config.get('config:install_hash_length'), - path_scheme=spack.config.get('config:install_path_scheme')) + Stores consist of packages installed according to a + ``DirectoryLayout``, along with an index, or _database_ of their + contents. The directory layout controls what paths look like and how + Spack ensures that each uniqe spec gets its own unique directory (or + not, though we don't recommend that). The database is a signle file + that caches metadata for the entire Spack installation. It prevents + us from having to spider the install tree to figure out what's there. + + Args: + root (str): path to the root of the install tree + path_scheme (str): expression according to guidelines in + ``spack.util.path`` that describes how to construct a path to + a package prefix in this store + hash_length (int): length of the hashes used in the directory + layout; spec hash suffixes will be truncated to this length + """ + def __init__(self, root, path_scheme, hash_length): + self.root = root + self.db = spack.database.Database(root) + self.layout = spack.directory_layout.YamlDirectoryLayout( + root, hash_len=hash_length, path_scheme=path_scheme) + self.extensions = spack.directory_layout.YamlExtensionsLayout( + root, self.layout) + + def reindex(self): + """Convenience function to reindex the store DB with its own layout.""" + return self.db.reindex(self.layout) + + +#: Singleton store instance +_store = None + + +def store(): + """Get the singleton store instance.""" + global _store + + if _store is None: + root = spack.config.get('config:install_tree', default_root) + root = spack.util.path.canonicalize_path(root) -extensions = YamlExtensionsLayout(root, layout) + _store = Store(root, + spack.config.get('config:install_path_scheme'), + spack.config.get('config:install_hash_length')) + return _store diff --git a/lib/spack/spack/test/cmd/dependencies.py b/lib/spack/spack/test/cmd/dependencies.py index 015eac589c..f211737e4b 100644 --- a/lib/spack/spack/test/cmd/dependencies.py +++ b/lib/spack/spack/test/cmd/dependencies.py @@ -60,7 +60,7 @@ def test_immediate_installed_dependencies(mock_packages, database): lines = [l for l in out.strip().split('\n') if not l.startswith('--')] hashes = set([re.split(r'\s+', l)[0] for l in lines]) - expected = set([spack.store.db.query_one(s).dag_hash(7) + expected = set([spack.store.store().db.query_one(s).dag_hash(7) for s in ['mpich', 'callpath^mpich']]) assert expected == hashes @@ -74,7 +74,7 @@ def test_transitive_installed_dependencies(mock_packages, database): lines = [l for l in out.strip().split('\n') if not l.startswith('--')] hashes = set([re.split(r'\s+', l)[0] for l in lines]) - expected = set([spack.store.db.query_one(s).dag_hash(7) + expected = set([spack.store.store().db.query_one(s).dag_hash(7) for s in ['zmpi', 'callpath^zmpi', 'fake', 'dyninst', 'libdwarf', 'libelf']]) diff --git a/lib/spack/spack/test/cmd/dependents.py b/lib/spack/spack/test/cmd/dependents.py index c6a5b01111..6d85596c37 100644 --- a/lib/spack/spack/test/cmd/dependents.py +++ b/lib/spack/spack/test/cmd/dependents.py @@ -58,10 +58,10 @@ def test_immediate_installed_dependents(mock_packages, database): lines = [l for l in out.strip().split('\n') if not l.startswith('--')] hashes = set([re.split(r'\s+', l)[0] for l in lines]) - expected = set([spack.store.db.query_one(s).dag_hash(7) + expected = set([spack.store.store().db.query_one(s).dag_hash(7) for s in ['dyninst', 'libdwarf']]) - libelf = spack.store.db.query_one('libelf') + libelf = spack.store.store().db.query_one('libelf') expected = set([d.dag_hash(7) for d in libelf.dependents()]) assert expected == hashes @@ -75,7 +75,7 @@ def test_transitive_installed_dependents(mock_packages, database): lines = [l for l in out.strip().split('\n') if not l.startswith('--')] hashes = set([re.split(r'\s+', l)[0] for l in lines]) - expected = set([spack.store.db.query_one(s).dag_hash(7) + expected = set([spack.store.store().db.query_one(s).dag_hash(7) for s in ['zmpi', 'callpath^zmpi', 'mpileaks^zmpi']]) assert expected == hashes diff --git a/lib/spack/spack/test/cmd/install.py b/lib/spack/spack/test/cmd/install.py index e7b0fb9693..5635fbdf09 100644 --- a/lib/spack/spack/test/cmd/install.py +++ b/lib/spack/spack/test/cmd/install.py @@ -387,7 +387,7 @@ def test_extra_files_are_archived(mock_packages, mock_archive, mock_fetch, install('archive-files') archive_dir = os.path.join( - spack.store.layout.metadata_path(s), 'archived-files' + spack.store.store().layout.metadata_path(s), 'archived-files' ) config_log = os.path.join(archive_dir, 'config.log') assert os.path.exists(config_log) diff --git a/lib/spack/spack/test/cmd/uninstall.py b/lib/spack/spack/test/cmd/uninstall.py index 1c187431d1..d81ab13a57 100644 --- a/lib/spack/spack/test/cmd/uninstall.py +++ b/lib/spack/spack/test/cmd/uninstall.py @@ -61,7 +61,7 @@ def test_recursive_uninstall(): """Test recursive uninstall.""" uninstall('-y', '-a', '--dependents', 'callpath') - all_specs = spack.store.layout.all_specs() + all_specs = spack.store.store().layout.all_specs() assert len(all_specs) == 8 # query specs with multiple configurations mpileaks_specs = [s for s in all_specs if s.satisfies('mpileaks')] diff --git a/lib/spack/spack/test/conftest.py b/lib/spack/spack/test/conftest.py index 46767133b2..c405d1246a 100644 --- a/lib/spack/spack/test/conftest.py +++ b/lib/spack/spack/test/conftest.py @@ -283,18 +283,18 @@ def database(tmpdir_factory, mock_packages, config): # Make a fake install directory install_path = tmpdir_factory.mktemp('install_for_database') - spack_install_path = spack.store.root + spack_install_path = spack.store.store().root - spack.store.root = str(install_path) + spack.store.store().root = str(install_path) install_layout = spack.directory_layout.YamlDirectoryLayout( str(install_path)) - spack_install_layout = spack.store.layout - spack.store.layout = install_layout + spack_install_layout = spack.store.store().layout + spack.store.store().layout = install_layout # Make fake database and fake install directory. install_db = spack.database.Database(str(install_path)) - spack_install_db = spack.store.db - spack.store.db = install_db + spack_install_db = spack.store.store().db + spack.store.store().db = install_db Entry = collections.namedtuple('Entry', ['path', 'layout', 'db']) Database = collections.namedtuple( @@ -316,8 +316,8 @@ def database(tmpdir_factory, mock_packages, config): spec.package.do_uninstall(spec) def _refresh(): - with spack.store.db.write_transaction(): - for spec in spack.store.db.query(): + with spack.store.store().db.write_transaction(): + for spec in spack.store.store().db.query(): _uninstall(spec) _install('mpileaks ^mpich') _install('mpileaks ^mpich2') @@ -332,7 +332,7 @@ def database(tmpdir_factory, mock_packages, config): refresh=_refresh) # Transaction used to avoid repeated writes. - with spack.store.db.write_transaction(): + with spack.store.store().db.write_transaction(): t.install('mpileaks ^mpich') t.install('mpileaks ^mpich2') t.install('mpileaks ^zmpi') @@ -340,17 +340,17 @@ def database(tmpdir_factory, mock_packages, config): yield t - with spack.store.db.write_transaction(): - for spec in spack.store.db.query(): + with spack.store.store().db.write_transaction(): + for spec in spack.store.store().db.query(): if spec.package.installed: t.uninstall(spec) else: - spack.store.db.remove(spec) + spack.store.store().db.remove(spec) install_path.remove(rec=1) - spack.store.root = spack_install_path - spack.store.layout = spack_install_layout - spack.store.db = spack_install_db + spack.store.store().root = spack_install_path + spack.store.store().layout = spack_install_layout + spack.store.store().db = spack_install_db @pytest.fixture() @@ -363,26 +363,27 @@ def refresh_db_on_exit(database): @pytest.fixture() def install_mockery(tmpdir, config, mock_packages): """Hooks a fake install directory, DB, and stage directory into Spack.""" - layout = spack.store.layout - extensions = spack.store.extensions - db = spack.store.db + layout = spack.store.store().layout + extensions = spack.store.store().extensions + db = spack.store.store().db new_opt = str(tmpdir.join('opt')) # Use a fake install directory to avoid conflicts bt/w # installed pkgs and mock packages. - spack.store.layout = spack.directory_layout.YamlDirectoryLayout(new_opt) - spack.store.extensions = spack.directory_layout.YamlExtensionsLayout( - new_opt, spack.store.layout) - spack.store.db = spack.database.Database(new_opt) + store = spack.store.store() + store.layout = spack.directory_layout.YamlDirectoryLayout(new_opt) + store.extensions = spack.directory_layout.YamlExtensionsLayout( + new_opt, spack.store.store().layout) + store.db = spack.database.Database(new_opt) # We use a fake package, so temporarily disable checksumming with spack.config.override('config:checksum', False): yield # Restore Spack's layout. - spack.store.layout = layout - spack.store.extensions = extensions - spack.store.db = db + store.layout = layout + store.extensions = extensions + store.db = db @pytest.fixture() diff --git a/lib/spack/spack/test/database.py b/lib/spack/spack/test/database.py index 147a61ad81..b0ee343095 100644 --- a/lib/spack/spack/test/database.py +++ b/lib/spack/spack/test/database.py @@ -47,16 +47,16 @@ def _print_ref_counts(): recs = [] def add_rec(spec): - cspecs = spack.store.db.query(spec, installed=any) + cspecs = spack.store.store().db.query(spec, installed=any) if not cspecs: recs.append("[ %-7s ] %-20s-" % ('', spec)) else: key = cspecs[0].dag_hash() - rec = spack.store.db.get_record(cspecs[0]) + rec = spack.store.store().db.get_record(cspecs[0]) recs.append("[ %-7s ] %-20s%d" % (key[:7], spec, rec.ref_count)) - with spack.store.db.read_transaction(): + with spack.store.store().db.read_transaction(): add_rec('mpileaks ^mpich') add_rec('callpath ^mpich') add_rec('mpich') @@ -79,7 +79,7 @@ def _print_ref_counts(): def _check_merkleiness(): """Ensure the spack database is a valid merkle graph.""" - all_specs = spack.store.db.query(installed=any) + all_specs = spack.store.store().db.query(installed=any) seen = {} for spec in all_specs: @@ -93,7 +93,7 @@ def _check_merkleiness(): def _check_db_sanity(install_db): """Utiilty function to check db against install layout.""" - pkg_in_layout = sorted(spack.store.layout.all_specs()) + pkg_in_layout = sorted(spack.store.store().layout.all_specs()) actual = sorted(install_db.query()) externals = sorted([x for x in actual if x.external]) @@ -129,7 +129,7 @@ def _check_remove_and_add_package(install_db, spec): assert concrete_spec not in remaining # add it back and make sure everything is ok. - install_db.add(concrete_spec, spack.store.layout) + install_db.add(concrete_spec, spack.store.store().layout) installed = install_db.query() assert concrete_spec in installed assert installed == original @@ -147,7 +147,7 @@ def _mock_install(spec): def _mock_remove(spec): - specs = spack.store.db.query(spec) + specs = spack.store.store().db.query(spec) assert len(specs) == 1 spec = specs[0] spec.package.do_uninstall(spec) @@ -206,7 +206,7 @@ def test_005_db_exists(database): def test_010_all_install_sanity(database): """Ensure that the install layout reflects what we think it does.""" - all_specs = spack.store.layout.all_specs() + all_specs = spack.store.store().layout.all_specs() assert len(all_specs) == 14 # Query specs with multiple configurations @@ -241,12 +241,12 @@ def test_010_all_install_sanity(database): def test_015_write_and_read(database): # write and read DB - with spack.store.db.write_transaction(): - specs = spack.store.db.query() - recs = [spack.store.db.get_record(s) for s in specs] + with spack.store.store().db.write_transaction(): + specs = spack.store.store().db.query() + recs = [spack.store.store().db.get_record(s) for s in specs] for spec, rec in zip(specs, recs): - new_rec = spack.store.db.get_record(spec) + new_rec = spack.store.store().db.get_record(spec) assert new_rec.ref_count == rec.ref_count assert new_rec.spec == rec.spec assert new_rec.path == rec.path @@ -262,7 +262,7 @@ def test_020_db_sanity(database): def test_025_reindex(database): """Make sure reindex works and ref counts are valid.""" install_db = database.mock.db - spack.store.db.reindex(spack.store.layout) + spack.store.store().reindex() _check_db_sanity(install_db) @@ -293,7 +293,7 @@ def test_050_basic_query(database): """Ensure querying database is consistent with what is installed.""" install_db = database.mock.db # query everything - assert len(spack.store.db.query()) == 16 + assert len(spack.store.store().db.query()) == 16 # query specs with multiple configurations mpileaks_specs = install_db.query('mpileaks') @@ -350,7 +350,7 @@ def test_080_root_ref_counts(database): assert install_db.get_record('mpich').ref_count == 1 # Put the spec back - install_db.add(rec.spec, spack.store.layout) + install_db.add(rec.spec, spack.store.store().layout) # record is present again assert len(install_db.query('mpileaks ^mpich', installed=any)) == 1 @@ -436,7 +436,7 @@ def test_115_reindex_with_packages_not_in_repo(database, refresh_db_on_exit): # packages should not have to be defined in the repository once they # are installed with spack.repo.swap(MockPackageMultiRepo([])): - spack.store.db.reindex(spack.store.layout) + spack.store.store().reindex() _check_db_sanity(install_db) diff --git a/lib/spack/spack/test/spec_syntax.py b/lib/spack/spack/test/spec_syntax.py index 76867cec73..5f5c1fd3ee 100644 --- a/lib/spack/spack/test/spec_syntax.py +++ b/lib/spack/spack/test/spec_syntax.py @@ -336,8 +336,8 @@ class TestSpecSyntax(object): x2 = Spec('a') x2._hash = 'xx' x2._concrete = True - database.mock.db.add(x1, spack.store.layout) - database.mock.db.add(x2, spack.store.layout) + database.mock.db.add(x1, spack.store.store().layout) + database.mock.db.add(x2, spack.store.store().layout) # ambiguity in first hash character self._check_raises(AmbiguousHashError, ['/x']) diff --git a/var/spack/repos/builtin/packages/aspell/package.py b/var/spack/repos/builtin/packages/aspell/package.py index 66eeb9e7cb..1b23258099 100644 --- a/var/spack/repos/builtin/packages/aspell/package.py +++ b/var/spack/repos/builtin/packages/aspell/package.py @@ -50,8 +50,8 @@ class Aspell(AutotoolsPackage): # - dest_dir instead of self.prefix in tree.(find_conflict|merge)() def activate(self, extension, **kwargs): extensions_layout = kwargs.get("extensions_layout", - spack.store.extensions) - if extensions_layout is not spack.store.extensions: + spack.store.store().extensions) + if extensions_layout is not spack.store.store().extensions: raise ExtensionError( 'aspell does not support non-global extensions') @@ -60,7 +60,7 @@ class Aspell(AutotoolsPackage): tree = LinkTree(extension.prefix.lib) def ignore(filename): - return (filename in spack.store.layout.hidden_file_paths or + return (filename in spack.store.store().layout.hidden_file_paths or kwargs.get('ignore', lambda f: False)(filename)) conflict = tree.find_conflict(dest_dir, ignore=ignore) @@ -71,8 +71,8 @@ class Aspell(AutotoolsPackage): def deactivate(self, extension, **kwargs): extensions_layout = kwargs.get("extensions_layout", - spack.store.extensions) - if extensions_layout is not spack.store.extensions: + spack.store.store().extensions) + if extensions_layout is not spack.store.store().extensions: raise ExtensionError( 'aspell does not support non-global extensions') @@ -80,7 +80,7 @@ class Aspell(AutotoolsPackage): dest_dir = aspell('dump', 'config', 'dict-dir', output=str).strip() def ignore(filename): - return (filename in spack.store.layout.hidden_file_paths or + return (filename in spack.store.store().layout.hidden_file_paths or kwargs.get('ignore', lambda f: False)(filename)) tree = LinkTree(extension.prefix.lib) diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py index 15ea33dd79..9ec7853abf 100644 --- a/var/spack/repos/builtin/packages/cbtf-krell/package.py +++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py @@ -193,15 +193,16 @@ class CbtfKrell(CMakePackage): # the login node components with this spack invocation. We # need these paths to be the ones created in the CNL # spack invocation. - be_cbtf = spack.store.db.query_one('cbtf arch=cray-CNL-haswell') - be_cbtfk = spack.store.db.query_one('cbtf-krell arch=cray-CNL-haswell') - be_papi = spack.store.db.query_one('papi arch=cray-CNL-haswell') - be_boost = spack.store.db.query_one('boost arch=cray-CNL-haswell') - be_mont = spack.store.db.query_one('libmonitor arch=cray-CNL-haswell') - be_unw = spack.store.db.query_one('libunwind arch=cray-CNL-haswell') - be_xer = spack.store.db.query_one('xerces-c arch=cray-CNL-haswell') - be_dyn = spack.store.db.query_one('dyninst arch=cray-CNL-haswell') - be_mrnet = spack.store.db.query_one('mrnet arch=cray-CNL-haswell') + store = spack.store.store() + be_cbtf = store.db.query_one('cbtf arch=cray-CNL-haswell') + be_cbtfk = store.db.query_one('cbtf-krell arch=cray-CNL-haswell') + be_papi = store.db.query_one('papi arch=cray-CNL-haswell') + be_boost = store.db.query_one('boost arch=cray-CNL-haswell') + be_mont = store.db.query_one('libmonitor arch=cray-CNL-haswell') + be_unw = store.db.query_one('libunwind arch=cray-CNL-haswell') + be_xer = store.db.query_one('xerces-c arch=cray-CNL-haswell') + be_dyn = store.db.query_one('dyninst arch=cray-CNL-haswell') + be_mrnet = store.db.query_one('mrnet arch=cray-CNL-haswell') CrayLoginNodeOptions.append('-DCN_RUNTIME_PLATFORM=%s' % rt_platform) diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py index 237784e42d..2663a3ff33 100644 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop/package.py @@ -197,7 +197,8 @@ class Openspeedshop(CMakePackage): # spec['cbtf'].prefix is the login node value for this build, as # we only get here when building the login node components and # that is all that is known to spack. - be_ck = spack.store.db.query_one('cbtf-krell arch=cray-CNL-haswell') + store = spack.store.store() + be_ck = store.db.query_one('cbtf-krell arch=cray-CNL-haswell') # Equivalent to install-tool cmake arg: # '-DCBTF_KRELL_CN_RUNTIME_DIR=%s' diff --git a/var/spack/repos/builtin/packages/perl/package.py b/var/spack/repos/builtin/packages/perl/package.py index 1759c15d86..192e31f32f 100644 --- a/var/spack/repos/builtin/packages/perl/package.py +++ b/var/spack/repos/builtin/packages/perl/package.py @@ -264,7 +264,7 @@ class Perl(Package): # Perl doesn't use Autotools, it should subclass Package super(Perl, self).activate(ext_pkg, **args) extensions_layout = args.get("extensions_layout", - spack.store.extensions) + spack.store.store().extensions) exts = extensions_layout.extension_map(self.spec) exts[ext_pkg.name] = ext_pkg.spec @@ -276,7 +276,7 @@ class Perl(Package): # Perl doesn't use Autotools, it should subclass Package super(Perl, self).deactivate(ext_pkg, **args) extensions_layout = args.get("extensions_layout", - spack.store.extensions) + spack.store.store().extensions) exts = extensions_layout.extension_map(self.spec) # Make deactivate idempotent diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 34e1e0ea6d..b2ca9a29b4 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -320,7 +320,7 @@ class Python(AutotoolsPackage): output_filename = None try: output_filename = join_path( - spack.store.layout.metadata_path(self.spec), + spack.store.store().layout.metadata_path(self.spec), Python._DISTUTIL_CACHE_FILENAME) with open(output_filename, 'w') as output_file: sjson.dump(self._distutil_vars, output_file) @@ -342,7 +342,7 @@ class Python(AutotoolsPackage): if not self._distutil_vars and self.installed: try: input_filename = join_path( - spack.store.layout.metadata_path(self.spec), + spack.store.store().layout.metadata_path(self.spec), Python._DISTUTIL_CACHE_FILENAME) if os.path.isfile(input_filename): with open(input_filename) as input_file: @@ -680,7 +680,7 @@ class Python(AutotoolsPackage): args.update(ignore=ignore) extensions_layout = args.get("extensions_layout", - spack.store.extensions) + spack.store.store().extensions) super(Python, self).activate(ext_pkg, **args) @@ -696,7 +696,7 @@ class Python(AutotoolsPackage): super(Python, self).deactivate(ext_pkg, **args) extensions_layout = args.get("extensions_layout", - spack.store.extensions) + spack.store.store().extensions) exts = extensions_layout.extension_map(self.spec) # Make deactivate idempotent -- cgit v1.2.3-70-g09d2 From f202198777b4353c57c26fa87739b306070fd960 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Wed, 16 May 2018 10:57:40 -0700 Subject: Convert lazy singleton functions to Singleton object - simplify the singleton pattern across the codebase - reduce lines of code needed for crufty initialization - reduce functions that need to mess with a global - Singletons whose semantics changed: - spack.store.store() -> spack.store - spack.repo.path() -> spack.repo.path - spack.config.config() -> spack.config.config - spack.caches.fetch_cache() -> spack.caches.fetch_cache - spack.caches.misc_cache() -> spack.caches.misc_cache --- lib/spack/llnl/util/lang.py | 45 +++++ lib/spack/spack/binary_distribution.py | 12 +- lib/spack/spack/build_environment.py | 2 +- lib/spack/spack/caches.py | 45 +++-- lib/spack/spack/cmd/__init__.py | 4 +- lib/spack/spack/cmd/activate.py | 4 +- lib/spack/spack/cmd/bootstrap.py | 2 +- lib/spack/spack/cmd/buildcache.py | 4 +- lib/spack/spack/cmd/clean.py | 4 +- lib/spack/spack/cmd/common/arguments.py | 4 +- lib/spack/spack/cmd/compiler.py | 2 +- lib/spack/spack/cmd/config.py | 4 +- lib/spack/spack/cmd/create.py | 4 +- lib/spack/spack/cmd/deactivate.py | 6 +- lib/spack/spack/cmd/debug.py | 6 +- lib/spack/spack/cmd/dependencies.py | 4 +- lib/spack/spack/cmd/dependents.py | 8 +- lib/spack/spack/cmd/diy.py | 2 +- lib/spack/spack/cmd/edit.py | 4 +- lib/spack/spack/cmd/extensions.py | 10 +- lib/spack/spack/cmd/find.py | 2 +- lib/spack/spack/cmd/graph.py | 2 +- lib/spack/spack/cmd/install.py | 2 +- lib/spack/spack/cmd/list.py | 2 +- lib/spack/spack/cmd/location.py | 4 +- lib/spack/spack/cmd/module.py | 2 +- lib/spack/spack/cmd/pkg.py | 2 +- lib/spack/spack/cmd/providers.py | 4 +- lib/spack/spack/cmd/reindex.py | 2 +- lib/spack/spack/cmd/setup.py | 4 +- lib/spack/spack/cmd/uninstall.py | 6 +- lib/spack/spack/cmd/url.py | 4 +- lib/spack/spack/cmd/view.py | 4 +- lib/spack/spack/compilers/__init__.py | 4 +- lib/spack/spack/concretize.py | 28 +-- lib/spack/spack/config.py | 57 +++--- lib/spack/spack/database.py | 12 +- lib/spack/spack/filesystem_view.py | 12 +- lib/spack/spack/hooks/yaml_version_check.py | 2 +- lib/spack/spack/package.py | 82 +++++---- lib/spack/spack/package_prefs.py | 2 +- lib/spack/spack/relocate.py | 12 +- lib/spack/spack/repo.py | 72 ++++---- lib/spack/spack/reporters/junit.py | 2 +- lib/spack/spack/spec.py | 20 +-- lib/spack/spack/stage.py | 4 +- lib/spack/spack/store.py | 31 ++-- lib/spack/spack/test/cmd/clean.py | 8 +- lib/spack/spack/test/cmd/dependencies.py | 4 +- lib/spack/spack/test/cmd/dependents.py | 6 +- lib/spack/spack/test/cmd/install.py | 20 +-- lib/spack/spack/test/cmd/uninstall.py | 2 +- lib/spack/spack/test/concretize.py | 4 +- lib/spack/spack/test/concretize_preferences.py | 2 +- lib/spack/spack/test/config.py | 18 +- lib/spack/spack/test/conftest.py | 174 +++++++----------- lib/spack/spack/test/database.py | 199 +++++++++------------ lib/spack/spack/test/directory_layout.py | 4 +- lib/spack/spack/test/package_sanity.py | 2 +- lib/spack/spack/test/spec_syntax.py | 34 ++-- lib/spack/spack/util/package_hash.py | 2 +- var/spack/repos/builtin/packages/aspell/package.py | 12 +- .../repos/builtin/packages/cbtf-krell/package.py | 2 +- .../builtin/packages/openspeedshop/package.py | 2 +- var/spack/repos/builtin/packages/perl/package.py | 4 +- var/spack/repos/builtin/packages/python/package.py | 8 +- 66 files changed, 512 insertions(+), 551 deletions(-) (limited to 'var') diff --git a/lib/spack/llnl/util/lang.py b/lib/spack/llnl/util/lang.py index 087a6b6be9..de5fdc52f1 100644 --- a/lib/spack/llnl/util/lang.py +++ b/lib/spack/llnl/util/lang.py @@ -531,3 +531,48 @@ class ObjectWrapper(object): self.__class__ = type(wrapped_name, (wrapped_cls,), {}) self.__dict__ = wrapped_object.__dict__ + + +class Singleton(object): + """Simple wrapper for lazily initialized singleton objects.""" + + def __init__(self, factory): + """Create a new singleton to be inited with the factory function. + + Args: + factory (function): function taking no arguments that + creates the singleton instance. + """ + self.factory = factory + self._instance = None + + @property + def instance(self): + if self._instance is None: + self._instance = self.factory() + return self._instance + + def __getattr__(self, name): + return getattr(self.instance, name) + + def __str__(self): + return str(self.instance) + + def __repr__(self): + return repr(self.instance) + + +class LazyReference(object): + """Lazily evaluated reference to part of a singleton.""" + + def __init__(self, ref_function): + self.ref_function = ref_function + + def __getattr__(self, name): + return getattr(self.ref_function(), name) + + def __str__(self): + return str(self.ref_function()) + + def __repr__(self): + return repr(self.ref_function()) diff --git a/lib/spack/spack/binary_distribution.py b/lib/spack/spack/binary_distribution.py index a5bce56c79..5c4e913692 100644 --- a/lib/spack/spack/binary_distribution.py +++ b/lib/spack/spack/binary_distribution.py @@ -149,7 +149,7 @@ def write_buildinfo_file(prefix, workdir, rel=False): # This cuts down on the number of files added to the list # of files potentially needing relocation if relocate.strings_contains_installroot( - path_name, spack.store.store().layout.root): + path_name, spack.store.layout.root): filetype = relocate.get_filetype(path_name) if relocate.needs_binary_relocation(filetype, os_id): rel_path_name = os.path.relpath(path_name, prefix) @@ -161,9 +161,9 @@ def write_buildinfo_file(prefix, workdir, rel=False): # Create buildinfo data and write it to disk buildinfo = {} buildinfo['relative_rpaths'] = rel - buildinfo['buildpath'] = spack.store.store().layout.root + buildinfo['buildpath'] = spack.store.layout.root buildinfo['relative_prefix'] = os.path.relpath( - prefix, spack.store.store().layout.root) + prefix, spack.store.layout.root) buildinfo['relocate_textfiles'] = text_to_relocate buildinfo['relocate_binaries'] = binary_to_relocate filename = buildinfo_file_name(workdir) @@ -334,7 +334,7 @@ def build_tarball(spec, outdir, force=False, rel=False, unsigned=False, # This will be used to determine is the directory layout has changed. buildinfo = {} buildinfo['relative_prefix'] = os.path.relpath( - spec.prefix, spack.store.store().layout.root) + spec.prefix, spack.store.layout.root) spec_dict['buildinfo'] = buildinfo with open(specfile_path, 'w') as outfile: outfile.write(yaml.dump(spec_dict)) @@ -414,7 +414,7 @@ def relocate_package(workdir, allow_root): Relocate the given package """ buildinfo = read_buildinfo_file(workdir) - new_path = spack.store.store().layout.root + new_path = spack.store.layout.root old_path = buildinfo['buildpath'] rel = buildinfo.get('relative_rpaths', False) if rel: @@ -493,7 +493,7 @@ def extract_tarball(spec, filename, allow_root=False, unsigned=False, "It cannot be installed.") new_relative_prefix = str(os.path.relpath(spec.prefix, - spack.store.store().layout.root)) + spack.store.layout.root)) # if the original relative prefix is in the spec file use it buildinfo = spec_dict.get('buildinfo', {}) old_relative_prefix = buildinfo.get('relative_prefix', new_relative_prefix) diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py index 4619c4c206..cdf3e86577 100644 --- a/lib/spack/spack/build_environment.py +++ b/lib/spack/spack/build_environment.py @@ -256,7 +256,7 @@ def set_build_environment_variables(pkg, env, dirty): env.set(SPACK_PREFIX, pkg.prefix) # Install root prefix - env.set(SPACK_INSTALL, spack.store.store().root) + env.set(SPACK_INSTALL, spack.store.root) # Stuff in here sanitizes the build environment to eliminate # anything the user has set that may interfere. diff --git a/lib/spack/spack/caches.py b/lib/spack/spack/caches.py index 196cbb8bad..5f3d7406de 100644 --- a/lib/spack/spack/caches.py +++ b/lib/spack/spack/caches.py @@ -24,48 +24,47 @@ ############################################################################## """Caches used by Spack to store data""" import os + +import llnl.util.lang + import spack.paths import spack.config import spack.fetch_strategy +import spack.util.file_cache from spack.util.path import canonicalize_path -from spack.util.file_cache import FileCache - -_misc_cache = None -_fetch_cache = None - -def misc_cache(): +def _misc_cache(): """The ``misc_cache`` is Spack's cache for small data. Currently the ``misc_cache`` stores indexes for virtual dependency providers and for which packages provide which tags. """ - global _misc_cache + path = spack.config.get('config:misc_cache') + if not path: + path = os.path.join(spack.paths.user_config_path, 'cache') + path = canonicalize_path(path) + + return spack.util.file_cache.FileCache(path) - if _misc_cache is None: - path = spack.config.get('config:misc_cache') - if not path: - path = os.path.join(spack.paths.user_config_path, 'cache') - path = canonicalize_path(path) - _misc_cache = FileCache(path) - return _misc_cache +#: Spack's cache for small data +misc_cache = llnl.util.lang.Singleton(_misc_cache) -def fetch_cache(): +def _fetch_cache(): """Filesystem cache of downloaded archives. This prevents Spack from repeatedly fetch the same files when building the same package different ways or multiple times. """ - global _fetch_cache + path = spack.config.get('config:source_cache') + if not path: + path = os.path.join(spack.paths.var_path, "cache") + path = canonicalize_path(path) + + return spack.fetch_strategy.FsCache(path) - if _fetch_cache is None: - path = spack.config.get('config:source_cache') - if not path: - path = os.path.join(spack.paths.var_path, "cache") - path = canonicalize_path(path) - _fetch_cache = spack.fetch_strategy.FsCache(path) - return _fetch_cache +#: Spack's local cache for downloaded source archives +fetch_cache = llnl.util.lang.Singleton(_fetch_cache) diff --git a/lib/spack/spack/cmd/__init__.py b/lib/spack/spack/cmd/__init__.py index 6c71cf7de9..1a58560f66 100644 --- a/lib/spack/spack/cmd/__init__.py +++ b/lib/spack/spack/cmd/__init__.py @@ -49,7 +49,7 @@ def default_modify_scope(): Commands that modify configuration by default modify the *highest* priority scope. """ - return spack.config.config().highest_precedence_scope().name + return spack.config.config.highest_precedence_scope().name def default_list_scope(): @@ -197,7 +197,7 @@ def elide_list(line_list, max_num=10): def disambiguate_spec(spec): - matching_specs = spack.store.store().db.query(spec) + matching_specs = spack.store.db.query(spec) if not matching_specs: tty.die("Spec '%s' matches no installed packages." % spec) diff --git a/lib/spack/spack/cmd/activate.py b/lib/spack/spack/cmd/activate.py index 6c0e5f767d..34cf2ee720 100644 --- a/lib/spack/spack/cmd/activate.py +++ b/lib/spack/spack/cmd/activate.py @@ -54,10 +54,10 @@ def activate(parser, args): if not spec.package.is_extension: tty.die("%s is not an extension." % spec.name) - layout = spack.store.store().extensions + layout = spack.store.extensions if args.view is not None: layout = YamlViewExtensionsLayout( - args.view, spack.store.store().layout) + args.view, spack.store.layout) if spec.package.is_activated(extensions_layout=layout): tty.msg("Package %s is already activated." % specs[0].short_spec) diff --git a/lib/spack/spack/cmd/bootstrap.py b/lib/spack/spack/cmd/bootstrap.py index 650e0a8e8d..80abbd8045 100644 --- a/lib/spack/spack/cmd/bootstrap.py +++ b/lib/spack/spack/cmd/bootstrap.py @@ -68,7 +68,7 @@ def bootstrap(parser, args, **kwargs): requirement_dict = {'environment-modules': 'environment-modules~X'} for requirement in requirement_dict: - installed_specs = spack.store.store().db.query(requirement) + installed_specs = spack.store.db.query(requirement) if(len(installed_specs) > 0): tty.msg("Requirement %s is satisfied with installed " "package %s" % (requirement, installed_specs[0])) diff --git a/lib/spack/spack/cmd/buildcache.py b/lib/spack/spack/cmd/buildcache.py index 6d6c49c5bd..a8ee3ae581 100644 --- a/lib/spack/spack/cmd/buildcache.py +++ b/lib/spack/spack/cmd/buildcache.py @@ -116,7 +116,7 @@ def find_matching_specs(pkgs, allow_multiple_matches=False, force=False): has_errors = False specs = spack.cmd.parse_specs(pkgs) for spec in specs: - matching = spack.store.store().db.query(spec) + matching = spack.store.db.query(spec) # For each spec provided, make sure it refers to only one package. # Fail and ask user to be unambiguous if it doesn't if not allow_multiple_matches and len(matching) > 1: @@ -254,7 +254,7 @@ def install_tarball(spec, args): tty.msg('Installing buildcache for spec %s' % spec.format()) bindist.extract_tarball(spec, tarball, args.allow_root, args.unsigned, args.force) - spack.store.store().reindex() + spack.store.store.reindex() else: tty.die('Download of binary cache file for spec %s failed.' % spec.format()) diff --git a/lib/spack/spack/cmd/clean.py b/lib/spack/spack/cmd/clean.py index df0f62e167..fd122714a9 100644 --- a/lib/spack/spack/cmd/clean.py +++ b/lib/spack/spack/cmd/clean.py @@ -83,8 +83,8 @@ def clean(parser, args): if args.downloads: tty.msg('Removing cached downloads') - spack.caches.fetch_cache().destroy() + spack.caches.fetch_cache.destroy() if args.misc_cache: tty.msg('Removing cached information on repositories') - spack.caches.misc_cache().destroy() + spack.caches.misc_cache.destroy() diff --git a/lib/spack/spack/cmd/common/arguments.py b/lib/spack/spack/cmd/common/arguments.py index 2b1a47c8df..ea5bc1c25d 100644 --- a/lib/spack/spack/cmd/common/arguments.py +++ b/lib/spack/spack/cmd/common/arguments.py @@ -73,12 +73,12 @@ class ConstraintAction(argparse.Action): # return everything for an empty query. if not qspecs: - return spack.store.store().db.query(**kwargs) + return spack.store.db.query(**kwargs) # Return only matching stuff otherwise. specs = set() for spec in qspecs: - for s in spack.store.store().db.query(spec, **kwargs): + for s in spack.store.db.query(spec, **kwargs): specs.add(s) return sorted(specs) diff --git a/lib/spack/spack/cmd/compiler.py b/lib/spack/spack/cmd/compiler.py index e16cb90a6c..186e6adf7f 100644 --- a/lib/spack/spack/cmd/compiler.py +++ b/lib/spack/spack/cmd/compiler.py @@ -115,7 +115,7 @@ def compiler_find(args): n = len(new_compilers) s = 's' if n > 1 else '' - config = spack.config.config() + config = spack.config.config filename = config.get_config_filename(args.scope, 'compilers') tty.msg("Added %d new compiler%s to %s" % (n, s, filename)) colify(reversed(sorted(c.spec for c in new_compilers)), indent=4) diff --git a/lib/spack/spack/cmd/config.py b/lib/spack/spack/cmd/config.py index 984126f215..39728e4dc6 100644 --- a/lib/spack/spack/cmd/config.py +++ b/lib/spack/spack/cmd/config.py @@ -56,7 +56,7 @@ def setup_parser(subparser): def config_get(args): - spack.config.config().print_section(args.section) + spack.config.config.print_section(args.section) def config_edit(args): @@ -68,7 +68,7 @@ def config_edit(args): if not args.section: args.section = None - config = spack.config.config() + config = spack.config.config config_file = config.get_config_filename(args.scope, args.section) spack.editor(config_file) diff --git a/lib/spack/spack/cmd/create.py b/lib/spack/spack/cmd/create.py index 6eab4e4834..899868ba12 100644 --- a/lib/spack/spack/cmd/create.py +++ b/lib/spack/spack/cmd/create.py @@ -654,11 +654,11 @@ def get_repository(args, name): "namespace {1}".format(spec.namespace, repo.namespace)) else: if spec.namespace: - repo = spack.repo.path().get_repo(spec.namespace, None) + repo = spack.repo.path.get_repo(spec.namespace, None) if not repo: tty.die("Unknown namespace: '{0}'".format(spec.namespace)) else: - repo = spack.repo.path().first_repo() + repo = spack.repo.path.first_repo() # Set the namespace on the spec if it's not there already if not spec.namespace: diff --git a/lib/spack/spack/cmd/deactivate.py b/lib/spack/spack/cmd/deactivate.py index adac9e5e0f..841a295cdb 100644 --- a/lib/spack/spack/cmd/deactivate.py +++ b/lib/spack/spack/cmd/deactivate.py @@ -60,15 +60,15 @@ def deactivate(parser, args): spec = spack.cmd.disambiguate_spec(specs[0]) pkg = spec.package - layout = spack.store.store().extensions + layout = spack.store.extensions if args.view is not None: layout = YamlViewExtensionsLayout( - args.view, spack.store.store().layout) + args.view, spack.store.layout) if args.all: if pkg.extendable: tty.msg("Deactivating all extensions of %s" % pkg.spec.short_spec) - ext_pkgs = spack.store.store().db.activated_extensions_for( + ext_pkgs = spack.store.db.activated_extensions_for( spec, extensions_layout=layout) for ext_pkg in ext_pkgs: diff --git a/lib/spack/spack/cmd/debug.py b/lib/spack/spack/cmd/debug.py index 4aa6f25fa0..2a85be8a00 100644 --- a/lib/spack/spack/cmd/debug.py +++ b/lib/spack/spack/cmd/debug.py @@ -76,16 +76,16 @@ def create_db_tarball(args): tarball_name = "spack-db.%s.tar.gz" % _debug_tarball_suffix() tarball_path = os.path.abspath(tarball_name) - base = os.path.basename(spack.store.store().root) + base = os.path.basename(spack.store.root) transform_args = [] if 'GNU' in tar('--version', output=str): transform_args = ['--transform', 's/^%s/%s/' % (base, tarball_name)] else: transform_args = ['-s', '/^%s/%s/' % (base, tarball_name)] - wd = os.path.dirname(spack.store.store().root) + wd = os.path.dirname(spack.store.root) with working_dir(wd): - files = [spack.store.store().db._index_path] + files = [spack.store.db._index_path] files += glob('%s/*/*/*/.spack/spec.yaml' % base) files = [os.path.relpath(f) for f in files] diff --git a/lib/spack/spack/cmd/dependencies.py b/lib/spack/spack/cmd/dependencies.py index f39ddb4dab..d36b1c5f71 100644 --- a/lib/spack/spack/cmd/dependencies.py +++ b/lib/spack/spack/cmd/dependencies.py @@ -60,7 +60,7 @@ def dependencies(parser, args): spec = spack.cmd.disambiguate_spec(specs[0]) tty.msg("Dependencies of %s" % spec.format('$_$@$%@$/', color=True)) - deps = spack.store.store().db.installed_relatives( + deps = spack.store.db.installed_relatives( spec, 'children', args.transitive) if deps: spack.cmd.display_specs(deps, long=True) @@ -75,7 +75,7 @@ def dependencies(parser, args): else: packages = [ spack.repo.get(s.name) - for s in spack.repo.path().providers_for(spec)] + for s in spack.repo.path.providers_for(spec)] dependencies = set() for pkg in packages: diff --git a/lib/spack/spack/cmd/dependents.py b/lib/spack/spack/cmd/dependents.py index 129ee56435..89d2f42dfa 100644 --- a/lib/spack/spack/cmd/dependents.py +++ b/lib/spack/spack/cmd/dependents.py @@ -57,14 +57,14 @@ def inverted_dependencies(): actual dependents. """ dag = {} - for pkg in spack.repo.path().all_packages(): + for pkg in spack.repo.path.all_packages(): dag.setdefault(pkg.name, set()) for dep in pkg.dependencies: deps = [dep] # expand virtuals if necessary - if spack.repo.path().is_virtual(dep): - deps += [s.name for s in spack.repo.path().providers_for(dep)] + if spack.repo.path.is_virtual(dep): + deps += [s.name for s in spack.repo.path.providers_for(dep)] for d in deps: dag.setdefault(d, set()).add(pkg.name) @@ -103,7 +103,7 @@ def dependents(parser, args): spec = spack.cmd.disambiguate_spec(specs[0]) tty.msg("Dependents of %s" % spec.cformat('$_$@$%@$/')) - deps = spack.store.store().db.installed_relatives( + deps = spack.store.db.installed_relatives( spec, 'parents', args.transitive) if deps: spack.cmd.display_specs(deps, long=True) diff --git a/lib/spack/spack/cmd/diy.py b/lib/spack/spack/cmd/diy.py index eec6f3159c..b6d3bfdfd3 100644 --- a/lib/spack/spack/cmd/diy.py +++ b/lib/spack/spack/cmd/diy.py @@ -78,7 +78,7 @@ def diy(self, args): tty.die("spack diy only takes one spec.") spec = specs[0] - if not spack.repo.path().exists(spec.name): + if not spack.repo.path.exists(spec.name): tty.die("No package for '{0}' was found.".format(spec.name), " Use `spack create` to create a new package") diff --git a/lib/spack/spack/cmd/edit.py b/lib/spack/spack/cmd/edit.py index cd9a5ccee7..4031e5549a 100644 --- a/lib/spack/spack/cmd/edit.py +++ b/lib/spack/spack/cmd/edit.py @@ -50,9 +50,9 @@ def edit_package(name, repo_path, namespace): if repo_path: repo = spack.repo.Repo(repo_path) elif namespace: - repo = spack.repo.path().get_repo(namespace) + repo = spack.repo.path.get_repo(namespace) else: - repo = spack.repo.path() + repo = spack.repo.path path = repo.filename_for_package_name(name) spec = Spec(name) diff --git a/lib/spack/spack/cmd/extensions.py b/lib/spack/spack/cmd/extensions.py index 56463ae7c2..a428e85035 100644 --- a/lib/spack/spack/cmd/extensions.py +++ b/lib/spack/spack/cmd/extensions.py @@ -105,7 +105,7 @@ def extensions(parser, args): if show_packages: # # List package names of extensions - extensions = spack.repo.path().extensions_for(spec) + extensions = spack.repo.path.extensions_for(spec) if not extensions: tty.msg("%s has no extensions." % spec.cshort_spec) else: @@ -113,17 +113,17 @@ def extensions(parser, args): tty.msg("%d extensions:" % len(extensions)) colify(ext.name for ext in extensions) - layout = spack.store.store().extensions + layout = spack.store.extensions if args.view is not None: layout = YamlViewExtensionsLayout( - args.view, spack.store.store().layout) + args.view, spack.store.layout) if show_installed: # # List specs of installed extensions. # - store = spack.store.store() - installed = [s.spec for s in store.db.installed_extensions_for(spec)] + installed = [ + s.spec for s in spack.store.db.installed_extensions_for(spec)] if show_all: print diff --git a/lib/spack/spack/cmd/find.py b/lib/spack/spack/cmd/find.py index 3b6de0ca84..63e1fe0475 100644 --- a/lib/spack/spack/cmd/find.py +++ b/lib/spack/spack/cmd/find.py @@ -147,7 +147,7 @@ def find(parser, args): # If tags have been specified on the command line, filter by tags if args.tags: - packages_with_tags = spack.repo.path().packages_with_tags(*args.tags) + packages_with_tags = spack.repo.path.packages_with_tags(*args.tags) query_specs = [x for x in query_specs if x.name in packages_with_tags] # Display the result diff --git a/lib/spack/spack/cmd/graph.py b/lib/spack/spack/cmd/graph.py index 81e6e6119c..305835ff34 100644 --- a/lib/spack/spack/cmd/graph.py +++ b/lib/spack/spack/cmd/graph.py @@ -77,7 +77,7 @@ def graph(parser, args): if args.specs: tty.die("Can't specify specs with --installed") args.dot = True - specs = spack.store.store().db.query() + specs = spack.store.db.query() else: specs = spack.cmd.parse_specs( diff --git a/lib/spack/spack/cmd/install.py b/lib/spack/spack/cmd/install.py index 9c074a5794..93aeb1009a 100644 --- a/lib/spack/spack/cmd/install.py +++ b/lib/spack/spack/cmd/install.py @@ -244,7 +244,7 @@ def install(parser, args, **kwargs): "only one spec is allowed when overwriting an installation" spec = specs[0] - t = spack.store.store().db.query(spec) + t = spack.store.db.query(spec) assert len(t) == 1, "to overwrite a spec you must install it first" # Give the user a last chance to think about overwriting an already diff --git a/lib/spack/spack/cmd/list.py b/lib/spack/spack/cmd/list.py index 42370d1a10..c32f3556c2 100644 --- a/lib/spack/spack/cmd/list.py +++ b/lib/spack/spack/cmd/list.py @@ -303,7 +303,7 @@ def list(parser, args): # Filter by tags if args.tags: packages_with_tags = set( - spack.repo.path().packages_with_tags(*args.tags)) + spack.repo.path.packages_with_tags(*args.tags)) sorted_packages = set(sorted_packages) & packages_with_tags sorted_packages = sorted(sorted_packages) diff --git a/lib/spack/spack/cmd/location.py b/lib/spack/spack/cmd/location.py index 847a56bd5e..308047c40f 100644 --- a/lib/spack/spack/cmd/location.py +++ b/lib/spack/spack/cmd/location.py @@ -80,7 +80,7 @@ def location(parser, args): print(spack.paths.prefix) elif args.packages: - print(spack.repo.path().first_repo().root) + print(spack.repo.path.first_repo().root) elif args.stages: print(spack.paths.stage_path) @@ -102,7 +102,7 @@ def location(parser, args): if args.package_dir: # This one just needs the spec name. - print(spack.repo.path().dirname_for_package_name(spec.name)) + print(spack.repo.path.dirname_for_package_name(spec.name)) else: # These versions need concretized specs. diff --git a/lib/spack/spack/cmd/module.py b/lib/spack/spack/cmd/module.py index 6ec069e50f..11bbaf7759 100644 --- a/lib/spack/spack/cmd/module.py +++ b/lib/spack/spack/cmd/module.py @@ -283,7 +283,7 @@ def refresh(module_types, specs, args): # skip unknown packages. writers = [ cls(spec) for spec in specs - if spack.repo.path().exists(spec.name)] + if spack.repo.path.exists(spec.name)] # Filter blacklisted packages early writers = [x for x in writers if not x.conf.blacklisted] diff --git a/lib/spack/spack/cmd/pkg.py b/lib/spack/spack/cmd/pkg.py index 2562a3a58a..0d64e9900d 100644 --- a/lib/spack/spack/cmd/pkg.py +++ b/lib/spack/spack/cmd/pkg.py @@ -91,7 +91,7 @@ def list_packages(rev): def pkg_add(args): for pkg_name in args.packages: - filename = spack.repo.path().filename_for_package_name(pkg_name) + filename = spack.repo.path.filename_for_package_name(pkg_name) if not os.path.isfile(filename): tty.die("No such package: %s. Path does not exist:" % pkg_name, filename) diff --git a/lib/spack/spack/cmd/providers.py b/lib/spack/spack/cmd/providers.py index d9622ea0d3..c18cac10c5 100644 --- a/lib/spack/spack/cmd/providers.py +++ b/lib/spack/spack/cmd/providers.py @@ -46,7 +46,7 @@ def setup_parser(subparser): def providers(parser, args): - valid_virtuals = sorted(spack.repo.path().provider_index.providers.keys()) + valid_virtuals = sorted(spack.repo.path.provider_index.providers.keys()) buffer = six.StringIO() isatty = sys.stdout.isatty() @@ -77,5 +77,5 @@ def providers(parser, args): for spec in specs: if sys.stdout.isatty(): print("{0}:".format(spec)) - spack.cmd.display_specs(sorted(spack.repo.path().providers_for(spec))) + spack.cmd.display_specs(sorted(spack.repo.path.providers_for(spec))) print('') diff --git a/lib/spack/spack/cmd/reindex.py b/lib/spack/spack/cmd/reindex.py index 647c4b73a9..580fa977b4 100644 --- a/lib/spack/spack/cmd/reindex.py +++ b/lib/spack/spack/cmd/reindex.py @@ -31,4 +31,4 @@ level = "long" def reindex(parser, args): - spack.store.store().reindex() + spack.store.store.reindex() diff --git a/lib/spack/spack/cmd/setup.py b/lib/spack/spack/cmd/setup.py index 60b814b6c2..ad603704a3 100644 --- a/lib/spack/spack/cmd/setup.py +++ b/lib/spack/spack/cmd/setup.py @@ -135,9 +135,9 @@ def setup(self, args): tty.die("spack setup only takes one spec.") # Take a write lock before checking for existence. - with spack.store.store().db.write_transaction(): + with spack.store.db.write_transaction(): spec = specs[0] - if not spack.repo.path().exists(spec.name): + if not spack.repo.path.exists(spec.name): tty.die("No package for '{0}' was found.".format(spec.name), " Use `spack create` to create a new package") if not spec.versions.concrete: diff --git a/lib/spack/spack/cmd/uninstall.py b/lib/spack/spack/cmd/uninstall.py index f3c7b77b1d..31cbd80d2e 100644 --- a/lib/spack/spack/cmd/uninstall.py +++ b/lib/spack/spack/cmd/uninstall.py @@ -93,7 +93,7 @@ def find_matching_specs(specs, allow_multiple_matches=False, force=False): specs_from_cli = [] has_errors = False for spec in specs: - matching = spack.store.store().db.query(spec) + matching = spack.store.db.query(spec) # For each spec provided, make sure it refers to only one package. # Fail and ask user to be unambiguous if it doesn't if not allow_multiple_matches and len(matching) > 1: @@ -128,7 +128,7 @@ def installed_dependents(specs): """ dependents = {} for item in specs: - installed = spack.store.store().db.installed_relatives( + installed = spack.store.db.installed_relatives( item, 'parents', True) lst = [x for x in installed if x not in specs] if lst: @@ -158,7 +158,7 @@ def do_uninstall(specs, force): # Sort packages to be uninstalled by the number of installed dependents # This ensures we do things in the right order def num_installed_deps(pkg): - dependents = spack.store.store().db.installed_relatives( + dependents = spack.store.db.installed_relatives( pkg.spec, 'parents', True) return len(dependents) diff --git a/lib/spack/spack/cmd/url.py b/lib/spack/spack/cmd/url.py index cb2695833d..133cea0257 100644 --- a/lib/spack/spack/cmd/url.py +++ b/lib/spack/spack/cmd/url.py @@ -144,7 +144,7 @@ def url_list(args): urls = set() # Gather set of URLs from all packages - for pkg in spack.repo.path().all_packages(): + for pkg in spack.repo.path.all_packages(): url = getattr(pkg.__class__, 'url', None) urls = url_list_parsing(args, urls, url, pkg) @@ -178,7 +178,7 @@ def url_summary(args): tty.msg('Generating a summary of URL parsing in Spack...') # Loop through all packages - for pkg in spack.repo.path().all_packages(): + for pkg in spack.repo.path.all_packages(): urls = set() url = getattr(pkg.__class__, 'url', None) diff --git a/lib/spack/spack/cmd/view.py b/lib/spack/spack/cmd/view.py index 009529d848..71333a088f 100644 --- a/lib/spack/spack/cmd/view.py +++ b/lib/spack/spack/cmd/view.py @@ -93,7 +93,7 @@ def relaxed_disambiguate(specs, view): return matching_specs[0] # make function always return a list to keep consistency between py2/3 - return list(map(squash, map(spack.store.store().db.query, specs))) + return list(map(squash, map(spack.store.db.query, specs))) def setup_parser(sp): @@ -176,7 +176,7 @@ def view(parser, args): path = args.path[0] view = YamlFilesystemView( - path, spack.store.store().layout, + path, spack.store.layout, ignore_conflicts=getattr(args, "ignore_conflicts", False), link=os.link if args.action in ["hardlink", "hard"] else os.symlink, diff --git a/lib/spack/spack/compilers/__init__.py b/lib/spack/spack/compilers/__init__.py index c45e838374..45245e56c4 100644 --- a/lib/spack/spack/compilers/__init__.py +++ b/lib/spack/spack/compilers/__init__.py @@ -116,7 +116,7 @@ def get_compiler_config(scope=None, init_config=True): def compiler_config_files(): config_files = list() - config = spack.config.config() + config = spack.config.config for scope in config.file_scopes: name = scope.name compiler_config = config.get('compilers', scope=name) @@ -339,7 +339,7 @@ def compiler_for_spec(compiler_spec, arch_spec): @_auto_compiler_spec def get_compiler_duplicates(compiler_spec, arch_spec): - config = spack.config.config() + config = spack.config.config scope_to_compilers = {} for scope in config.scopes: diff --git a/lib/spack/spack/concretize.py b/lib/spack/spack/concretize.py index d9880e3755..2f57cb7504 100644 --- a/lib/spack/spack/concretize.py +++ b/lib/spack/spack/concretize.py @@ -39,6 +39,8 @@ from functools_backport import reverse_order from contextlib import contextmanager from six import iteritems +import llnl.util.lang + import spack.repo import spack.abi import spack.spec @@ -54,27 +56,11 @@ check_for_compiler_existence = True #: Concretizer singleton -_concretizer = None +concretizer = llnl.util.lang.Singleton(lambda: Concretizer()) #: impements rudimentary logic for ABI compatibility -_abi_checker = None - - -def _abi(): - """Get an ABI checker object.""" - global _abi_checker - if _abi_checker is None: - _abi_checker = spack.abi.ABI() - return _abi_checker - - -def concretizer(): - """Get concretizer singleton.""" - global _concretizer - if _concretizer is None: - _concretizer = Concretizer() - return _concretizer +_abi = llnl.util.lang.Singleton(lambda: spack.abi.ABI()) @contextmanager @@ -102,7 +88,7 @@ class Concretizer(object): pref_key = lambda spec: 0 # no-op pref key if spec.virtual: - candidates = spack.repo.path().providers_for(spec) + candidates = spack.repo.path.providers_for(spec) if not candidates: raise spack.spec.UnsatisfiableProviderSpecError( candidates[0], spec) @@ -163,8 +149,8 @@ class Concretizer(object): return sorted(candidates, reverse=True, key=lambda spec: ( - _abi().compatible(spec, abi_exemplar, loose=True), - _abi().compatible(spec, abi_exemplar))) + _abi.compatible(spec, abi_exemplar, loose=True), + _abi.compatible(spec, abi_exemplar))) def concretize_version(self, spec): """If the spec is already concrete, return. Otherwise take diff --git a/lib/spack/spack/config.py b/lib/spack/spack/config.py index 149ed5088d..5157e918aa 100644 --- a/lib/spack/spack/config.py +++ b/lib/spack/spack/config.py @@ -61,6 +61,7 @@ from six import iteritems import yaml from yaml.error import MarkedYAMLError +import llnl.util.lang import llnl.util.tty as tty from llnl.util.filesystem import mkdirp @@ -456,17 +457,16 @@ def override(path, value): """Simple way to override config settings within a context.""" overrides = InternalConfigScope('overrides') - cfg = config() - cfg.push_scope(overrides) - cfg.set(path, value, scope='overrides') + config.push_scope(overrides) + config.set(path, value, scope='overrides') - yield cfg + yield config - scope = cfg.pop_scope() + scope = config.pop_scope() assert scope is overrides -def config(): +def _config(): """Singleton Configuration instance. This constructs one instance associated with this module and returns @@ -477,40 +477,37 @@ def config(): (Configuration): object for accessing spack configuration """ - global _configuration - if not _configuration: - _configuration = Configuration() + cfg = Configuration() - # first do the builtin, hardcoded defaults - defaults = InternalConfigScope('_builtin', config_defaults) - _configuration.push_scope(defaults) + # first do the builtin, hardcoded defaults + defaults = InternalConfigScope('_builtin', config_defaults) + cfg.push_scope(defaults) - # Each scope can have per-platfom overrides in subdirectories - platform = spack.architecture.platform().name + # Each scope can have per-platfom overrides in subdirectories + platform = spack.architecture.platform().name - # add each scope and its platform-specific directory - for name, path in configuration_paths: - _configuration.push_scope(ConfigScope(name, path)) + # add each scope and its platform-specific directory + for name, path in configuration_paths: + cfg.push_scope(ConfigScope(name, path)) - plat_name = '%s/%s' % (name, platform) - plat_path = os.path.join(path, platform) - _configuration.push_scope(ConfigScope(plat_name, plat_path)) + plat_name = '%s/%s' % (name, platform) + plat_path = os.path.join(path, platform) + cfg.push_scope(ConfigScope(plat_name, plat_path)) - # we make a special scope for spack commands so that they can - # override configuration options. - _configuration.push_scope(InternalConfigScope('command_line')) + # we make a special scope for spack commands so that they can + # override configuration options. + cfg.push_scope(InternalConfigScope('command_line')) - return _configuration + return cfg -#: This is the global singleton configuration for Spack. -#: TODO: consider making this NOT global and associate it with a spack instance -_configuration = None +#: This is the singleton configuration instance for Spack. +config = llnl.util.lang.Singleton(_config) def get(path, default=None, scope=None): """Module-level wrapper for ``Configuration.get()``.""" - return config().get(path, default, scope) + return config.get(path, default, scope) def set(path, value, scope=None): @@ -518,12 +515,12 @@ def set(path, value, scope=None): Accepts the path syntax described in ``get()``. """ - return config().set(path, value, scope) + return config.set(path, value, scope) def scopes(): """Convenience function to get list of configuration scopes.""" - return config().scopes + return config.scopes def _validate_section_name(section): diff --git a/lib/spack/spack/database.py b/lib/spack/spack/database.py index 97954d67f9..3a5f4b73cb 100644 --- a/lib/spack/spack/database.py +++ b/lib/spack/spack/database.py @@ -223,7 +223,7 @@ class Database(object): Prefix lock is a byte range lock on the nth byte of a file. - The lock file is ``spack.store.store().db.prefix_lock`` -- the DB + The lock file is ``spack.store.db.prefix_lock`` -- the DB tells us what to call it and it lives alongside the install DB. n is the sys.maxsize-bit prefix of the DAG hash. This makes @@ -366,7 +366,7 @@ class Database(object): if version > _db_version: raise InvalidDatabaseVersionError(_db_version, version) elif version < _db_version: - self.reindex(spack.store.store().layout) + self.reindex(spack.store.layout) installs = dict((k, v.to_dict()) for k, v in self._data.items()) def invalid_record(hash_key, error): @@ -499,7 +499,7 @@ class Database(object): tty.debug( 'RECONSTRUCTING FROM OLD DB: {0}'.format(entry.spec)) try: - layout = spack.store.store().layout + layout = spack.store.layout if entry.spec.external: layout = None install_check = True @@ -609,7 +609,7 @@ class Database(object): # reindex() takes its own write lock, so no lock here. with WriteTransaction(self.lock, timeout=_db_lock_timeout): self._write(None, None, None) - self.reindex(spack.store.store().layout) + self.reindex(spack.store.layout) def _add( self, @@ -823,7 +823,7 @@ class Database(object): the given spec """ if extensions_layout is None: - extensions_layout = spack.store.store().extensions + extensions_layout = spack.store.extensions for spec in self.query(): try: extensions_layout.check_activated(extendee_spec, spec) @@ -903,7 +903,7 @@ class Database(object): if explicit is not any and rec.explicit != explicit: continue - if known is not any and spack.repo.path().exists( + if known is not any and spack.repo.path.exists( rec.spec.name) != known: continue diff --git a/lib/spack/spack/filesystem_view.py b/lib/spack/spack/filesystem_view.py index 0c5f9a6a6c..51a673d486 100644 --- a/lib/spack/spack/filesystem_view.py +++ b/lib/spack/spack/filesystem_view.py @@ -267,7 +267,7 @@ class YamlFilesystemView(FilesystemView): # Check for globally activated extensions in the extendee that # we're looking at. activated = [p.spec for p in - spack.store.store().db.activated_extensions_for(spec)] + spack.store.db.activated_extensions_for(spec)] if activated: tty.error("Globally activated extensions cannot be used in " "conjunction with filesystem views. " @@ -391,7 +391,7 @@ class YamlFilesystemView(FilesystemView): def get_all_specs(self): dotspack = join_path(self.root, - spack.store.store().layout.metadata_dir) + spack.store.layout.metadata_dir) if os.path.exists(dotspack): return list(filter(None, map(self.get_spec, os.listdir(dotspack)))) else: @@ -409,13 +409,13 @@ class YamlFilesystemView(FilesystemView): def get_path_meta_folder(self, spec): "Get path to meta folder for either spec or spec name." return join_path(self.root, - spack.store.store().layout.metadata_dir, + spack.store.layout.metadata_dir, getattr(spec, "name", spec)) def get_spec(self, spec): dotspack = self.get_path_meta_folder(spec) filename = join_path(dotspack, - spack.store.store().layout.spec_file_name) + spack.store.layout.spec_file_name) try: with open(filename, "r") as f: @@ -424,7 +424,7 @@ class YamlFilesystemView(FilesystemView): return None def link_meta_folder(self, spec): - src = spack.store.store().layout.metadata_path(spec) + src = spack.store.layout.metadata_path(spec) tgt = self.get_path_meta_folder(spec) tree = LinkTree(src) @@ -550,4 +550,4 @@ def get_dependencies(specs): def ignore_metadata_dir(f): - return f in spack.store.store().layout.hidden_file_paths + return f in spack.store.layout.hidden_file_paths diff --git a/lib/spack/spack/hooks/yaml_version_check.py b/lib/spack/spack/hooks/yaml_version_check.py index af9d2443ca..0471712332 100644 --- a/lib/spack/spack/hooks/yaml_version_check.py +++ b/lib/spack/spack/hooks/yaml_version_check.py @@ -36,7 +36,7 @@ def pre_run(): def check_compiler_yaml_version(): - config = spack.config.config() + config = spack.config.config for scope in config.file_scopes: file_name = os.path.join(scope.path, 'compilers.yaml') diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py index f361763878..9e4150b9b3 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -661,9 +661,9 @@ class PackageBase(with_metaclass(PackageMeta, object)): visited = set([self.name]) for i, name in enumerate(self.dependencies): - if spack.repo.path().is_virtual(name): + if spack.repo.path.is_virtual(name): if expand_virtuals: - providers = spack.repo.path().providers_for(name) + providers = spack.repo.path.providers_for(name) dep_names = [spec.name for spec in providers] else: visited.add(name) @@ -949,7 +949,7 @@ class PackageBase(with_metaclass(PackageMeta, object)): raise ValueError( "is_extension called on package that is not an extension.") if extensions_layout is None: - extensions_layout = spack.store.store().extensions + extensions_layout = spack.store.extensions exts = extensions_layout.extension_map(self.extendee_spec) return (self.name in exts) and (exts[self.name] == self.spec) @@ -1003,7 +1003,7 @@ class PackageBase(with_metaclass(PackageMeta, object)): Removes the prefix for a package along with any empty parent directories """ - spack.store.store().layout.remove_install_directory(self.spec) + spack.store.layout.remove_install_directory(self.spec) def do_fetch(self, mirror_only=False): """ @@ -1241,8 +1241,7 @@ class PackageBase(with_metaclass(PackageMeta, object)): # Install fake man page mkdirp(self.prefix.man.man1) - store = spack.store.store() - packages_dir = store.layout.build_packages_path(self.spec) + packages_dir = spack.store.layout.build_packages_path(self.spec) dump_packages(self.spec, packages_dir) def _if_make_target_execute(self, target): @@ -1305,7 +1304,7 @@ class PackageBase(with_metaclass(PackageMeta, object)): def _stage_and_write_lock(self): """Prefix lock nested in a stage.""" with self.stage: - with spack.store.store().db.prefix_write_lock(self.spec): + with spack.store.db.prefix_write_lock(self.spec): yield def _process_external_package(self, explicit): @@ -1329,7 +1328,7 @@ class PackageBase(with_metaclass(PackageMeta, object)): try: # Check if the package was already registered in the DB # If this is the case, then just exit - rec = spack.store.store().db.get_record(self.spec) + rec = spack.store.db.get_record(self.spec) message = '{s.name}@{s.version} : already registered in DB' tty.msg(message.format(s=self)) # Update the value of rec.explicit if it is necessary @@ -1345,12 +1344,12 @@ class PackageBase(with_metaclass(PackageMeta, object)): # Add to the DB message = '{s.name}@{s.version} : registering into DB' tty.msg(message.format(s=self)) - spack.store.store().db.add(self.spec, None, explicit=explicit) + spack.store.db.add(self.spec, None, explicit=explicit) def _update_explicit_entry_in_db(self, rec, explicit): if explicit and not rec.explicit: - with spack.store.store().db.write_transaction(): - rec = spack.store.store().db.get_record(self.spec) + with spack.store.db.write_transaction(): + rec = spack.store.db.get_record(self.spec) rec.explicit = True message = '{s.name}@{s.version} : marking the package explicit' tty.msg(message.format(s=self)) @@ -1367,7 +1366,7 @@ class PackageBase(with_metaclass(PackageMeta, object)): binary_distribution.extract_tarball( binary_spec, tarball, allow_root=False, unsigned=False, force=False) - spack.store.store().db.add( + spack.store.db.add( self.spec, spack.store.layout, explicit=explicit) return True @@ -1425,15 +1424,15 @@ class PackageBase(with_metaclass(PackageMeta, object)): partial = self.check_for_unfinished_installation(keep_prefix, restage) # Ensure package is not already installed - layout = spack.store.store().layout - with spack.store.store().db.prefix_read_lock(self.spec): + layout = spack.store.layout + with spack.store.db.prefix_read_lock(self.spec): if partial: tty.msg( "Continuing from partial install of %s" % self.name) elif layout.check_installed(self.spec): msg = '{0.name} is already installed in {0.prefix}' tty.msg(msg.format(self)) - rec = spack.store.store().db.get_record(self.spec) + rec = spack.store.db.get_record(self.spec) # In case the stage directory has already been created, # this ensures it's removed after we checked that the spec # is installed @@ -1568,7 +1567,7 @@ class PackageBase(with_metaclass(PackageMeta, object)): try: # Create the install prefix and fork the build process. if not os.path.exists(self.prefix): - spack.store.store().layout.create_install_directory(self.spec) + spack.store.layout.create_install_directory(self.spec) # Fork a child to do the actual installation # we preserve verbosity settings across installs. @@ -1579,8 +1578,8 @@ class PackageBase(with_metaclass(PackageMeta, object)): keep_prefix = self.last_phase is None or keep_prefix # note: PARENT of the build process adds the new package to # the database, so that we don't need to re-read from file. - spack.store.store().db.add( - self.spec, spack.store.store().layout, explicit=explicit + spack.store.db.add( + self.spec, spack.store.layout, explicit=explicit ) except directory_layout.InstallDirectoryAlreadyExistsError: # Abort install if install directory exists. @@ -1634,9 +1633,9 @@ class PackageBase(with_metaclass(PackageMeta, object)): raise ExternalPackageError("Attempted to repair external spec %s" % self.spec.name) - with spack.store.store().db.prefix_write_lock(self.spec): + with spack.store.db.prefix_write_lock(self.spec): try: - record = spack.store.store().db.get_record(self.spec) + record = spack.store.db.get_record(self.spec) installed_in_db = record.installed if record else False except KeyError: installed_in_db = False @@ -1671,10 +1670,9 @@ class PackageBase(with_metaclass(PackageMeta, object)): def log(self): # Copy provenance into the install directory on success - store = spack.store.store() - log_install_path = store.layout.build_log_path(self.spec) - env_install_path = store.layout.build_env_path(self.spec) - packages_dir = store.layout.build_packages_path(self.spec) + log_install_path = spack.store.layout.build_log_path(self.spec) + env_install_path = spack.store.layout.build_env_path(self.spec) + packages_dir = spack.store.layout.build_packages_path(self.spec) # Remove first if we're overwriting another build # (can happen with spack setup) @@ -1693,7 +1691,7 @@ class PackageBase(with_metaclass(PackageMeta, object)): with working_dir(self.stage.source_path): errors = StringIO() target_dir = os.path.join( - spack.store.store().layout.metadata_path(self.spec), + spack.store.layout.metadata_path(self.spec), 'archived-files') for glob_expr in self.archive_files: @@ -1754,7 +1752,7 @@ class PackageBase(with_metaclass(PackageMeta, object)): installed = set(os.listdir(self.prefix)) installed.difference_update( - spack.store.store().layout.hidden_file_paths) + spack.store.layout.hidden_file_paths) if not installed: raise InstallError( "Install failed for %s. Nothing was installed!" % self.name) @@ -1762,7 +1760,7 @@ class PackageBase(with_metaclass(PackageMeta, object)): @property def build_log_path(self): if self.installed: - return spack.store.store().layout.build_log_path(self.spec) + return spack.store.layout.build_log_path(self.spec) else: return join_path(self.stage.source_path, 'spack-build.out') @@ -1920,16 +1918,16 @@ class PackageBase(with_metaclass(PackageMeta, object)): if not os.path.isdir(spec.prefix): # prefix may not exist, but DB may be inconsistent. Try to fix by # removing, but omit hooks. - specs = spack.store.store().db.query(spec, installed=True) + specs = spack.store.db.query(spec, installed=True) if specs: - spack.store.store().db.remove(specs[0]) + spack.store.db.remove(specs[0]) tty.msg("Removed stale DB entry for %s" % spec.short_spec) return else: raise InstallError(str(spec) + " is not installed.") if not force: - dependents = spack.store.store().db.installed_relatives( + dependents = spack.store.db.installed_relatives( spec, 'parents', True) if dependents: raise PackageStillNeededError(spec, dependents) @@ -1941,7 +1939,7 @@ class PackageBase(with_metaclass(PackageMeta, object)): pkg = None # Pre-uninstall hook runs first. - with spack.store.store().db.prefix_write_lock(spec): + with spack.store.db.prefix_write_lock(spec): if pkg is not None: spack.hooks.pre_uninstall(spec) @@ -1950,11 +1948,11 @@ class PackageBase(with_metaclass(PackageMeta, object)): if not spec.external: msg = 'Deleting package prefix [{0}]' tty.debug(msg.format(spec.short_spec)) - spack.store.store().layout.remove_install_directory(spec) + spack.store.layout.remove_install_directory(spec) # Delete DB entry msg = 'Deleting DB entry [{0}]' tty.debug(msg.format(spec.short_spec)) - spack.store.store().db.remove(spec) + spack.store.db.remove(spec) if pkg is not None: spack.hooks.post_uninstall(spec) @@ -2000,7 +1998,7 @@ class PackageBase(with_metaclass(PackageMeta, object)): self._sanity_check_extension() if extensions_layout is None: - extensions_layout = spack.store.store().extensions + extensions_layout = spack.store.extensions extensions_layout.check_extension_conflict( self.extendee_spec, self.spec) @@ -2044,11 +2042,11 @@ class PackageBase(with_metaclass(PackageMeta, object)): """ extensions_layout = kwargs.get("extensions_layout", - spack.store.store().extensions) + spack.store.extensions) target = extensions_layout.extendee_target_directory(self) def ignore(filename): - return (filename in spack.store.store().layout.hidden_file_paths or + return (filename in spack.store.layout.hidden_file_paths or kwargs.get('ignore', lambda f: False)(filename)) tree = LinkTree(extension.prefix) @@ -2076,7 +2074,7 @@ class PackageBase(with_metaclass(PackageMeta, object)): verbose = kwargs.get("verbose", True) remove_dependents = kwargs.get("remove_dependents", False) extensions_layout = kwargs.get("extensions_layout", - spack.store.store().extensions) + spack.store.extensions) # Allow a force deactivate to happen. This can unlink # spurious files if something was corrupted. @@ -2128,11 +2126,11 @@ class PackageBase(with_metaclass(PackageMeta, object)): """ extensions_layout = kwargs.get("extensions_layout", - spack.store.store().extensions) + spack.store.extensions) target = extensions_layout.extendee_target_directory(self) def ignore(filename): - return (filename in spack.store.store().layout.hidden_file_paths or + return (filename in spack.store.layout.hidden_file_paths or kwargs.get('ignore', lambda f: False)(filename)) tree = LinkTree(extension.prefix) @@ -2277,7 +2275,7 @@ def flatten_dependencies(spec, flat_dir): for dep in spec.traverse(root=False): name = dep.name - dep_path = spack.store.store().layout.path_for_spec(dep) + dep_path = spack.store.layout.path_for_spec(dep) dep_files = LinkTree(dep_path) os.mkdir(flat_dir + '/' + name) @@ -2306,7 +2304,7 @@ def dump_packages(spec, path): if node is not spec: # Locate the dependency package in the install tree and find # its provenance information. - source = spack.store.store().layout.build_packages_path(node) + source = spack.store.layout.build_packages_path(node) source_repo_root = join_path(source, node.namespace) # There's no provenance installed for the source package. Skip it. @@ -2334,7 +2332,7 @@ def dump_packages(spec, path): if node is not spec: install_tree(source_pkg_dir, dest_pkg_dir) else: - spack.repo.path().dump_provenance(node, dest_pkg_dir) + spack.repo.path.dump_provenance(node, dest_pkg_dir) def print_pkg(message): diff --git a/lib/spack/spack/package_prefs.py b/lib/spack/spack/package_prefs.py index ce84606b00..f8e2499bb1 100644 --- a/lib/spack/spack/package_prefs.py +++ b/lib/spack/spack/package_prefs.py @@ -51,7 +51,7 @@ def get_packages_config(): # by sometihng, not just packages/names that don't exist. # So, this won't include, e.g., 'all'. virtuals = [(pkg_name, pkg_name._start_mark) for pkg_name in config - if spack.repo.path().is_virtual(pkg_name)] + if spack.repo.path.is_virtual(pkg_name)] # die if there are virtuals in `packages.py` if virtuals: diff --git a/lib/spack/spack/relocate.py b/lib/spack/spack/relocate.py index 303776557b..f90556b7b1 100644 --- a/lib/spack/spack/relocate.py +++ b/lib/spack/spack/relocate.py @@ -110,7 +110,7 @@ def get_placeholder_rpaths(path_name, orig_rpaths): Replaces original layout root dir with a placeholder string in all rpaths. """ rel_rpaths = [] - orig_dir = spack.store.store().layout.root + orig_dir = spack.store.layout.root for rpath in orig_rpaths: if re.match(orig_dir, rpath): placeholder = set_placeholder(orig_dir) @@ -186,7 +186,7 @@ def macho_make_paths_placeholder(rpaths, deps, idpath): replacement are returned. """ new_idpath = None - old_dir = spack.store.store().layout.root + old_dir = spack.store.layout.root placeholder = set_placeholder(old_dir) if idpath: new_idpath = re.sub(old_dir, placeholder, idpath) @@ -425,9 +425,9 @@ def make_binary_placeholder(cur_path_names, allow_root): new_rpaths, new_deps, new_idpath) if (not allow_root and strings_contains_installroot(cur_path, - spack.store.store().layout.root)): + spack.store.layout.root)): raise InstallRootStringException( - cur_path, spack.store.store().layout.root) + cur_path, spack.store.layout.root) elif platform.system() == 'Linux': for cur_path in cur_path_names: orig_rpaths = get_existing_elf_rpaths(cur_path) @@ -436,9 +436,9 @@ def make_binary_placeholder(cur_path_names, allow_root): modify_elf_object(cur_path, new_rpaths) if (not allow_root and strings_contains_installroot( - cur_path, spack.store.store().layout.root)): + cur_path, spack.store.layout.root)): raise InstallRootStringException( - cur_path, spack.store.store().layout.root) + cur_path, spack.store.layout.root) else: tty.die("Placeholder not implemented for %s" % platform.system()) diff --git a/lib/spack/spack/repo.py b/lib/spack/spack/repo.py index 448d31ae1d..dd6b6ac71d 100644 --- a/lib/spack/spack/repo.py +++ b/lib/spack/spack/repo.py @@ -224,7 +224,7 @@ class TagIndex(Mapping): pkg_name (str): name of the package to be removed from the index """ - package = path().get(pkg_name) + package = path.get(pkg_name) # Remove the package from the list of packages, if present for pkg_list in self._tag_dict.values(): @@ -255,7 +255,7 @@ def make_provider_index_cache(packages_path, namespace): cache_filename = 'providers/{0}-index.yaml'.format(namespace) # Compute which packages needs to be updated in the cache - misc_cache = spack.caches.misc_cache() + misc_cache = spack.caches.misc_cache index_mtime = misc_cache.mtime(cache_filename) needs_update = [ @@ -309,7 +309,7 @@ def make_tag_index_cache(packages_path, namespace): cache_filename = 'tags/{0}-index.json'.format(namespace) # Compute which packages needs to be updated in the cache - misc_cache = spack.caches.misc_cache() + misc_cache = spack.caches.misc_cache index_mtime = misc_cache.mtime(cache_filename) needs_update = [ @@ -1079,60 +1079,60 @@ def create_repo(root, namespace=None): return full_path, namespace -#: Singleton repo path instance -_path = None - - -def set_path(repo): - """Set the path() singleton to a specific value. - - Overwrite _path and register it as an importer in sys.meta_path if - it is a ``Repo`` or ``RepoPath``. - """ - global _path - _path = repo - - # make the new repo_path an importer if needed - append = isinstance(repo, (Repo, RepoPath)) - if append: - sys.meta_path.append(_path) - return append - - -def path(): +def _path(): """Get the singleton RepoPath instance for Spack. Create a RepoPath, add it to sys.meta_path, and return it. TODO: consider not making this a singleton. """ - if _path is None: - repo_dirs = spack.config.get('repos') - if not repo_dirs: - raise NoRepoConfiguredError( - "Spack configuration contains no package repositories.") - set_path(RepoPath(*repo_dirs)) + repo_dirs = spack.config.get('repos') + if not repo_dirs: + raise NoRepoConfiguredError( + "Spack configuration contains no package repositories.") - return _path + path = RepoPath(*repo_dirs) + sys.meta_path.append(path) + return path + + +#: Singleton repo path instance +path = llnl.util.lang.Singleton(_path) def get(spec): """Convenience wrapper around ``spack.repo.get()``.""" - return path().get(spec) + return path.get(spec) def all_package_names(): """Convenience wrapper around ``spack.repo.all_package_names()``.""" - return path().all_package_names() + return path.all_package_names() + + +def set_path(repo): + """Set the path singleton to a specific value. + + Overwrite ``path`` and register it as an importer in + ``sys.meta_path`` if it is a ``Repo`` or ``RepoPath``. + """ + global path + path = repo + + # make the new repo_path an importer if needed + append = isinstance(repo, (Repo, RepoPath)) + if append: + sys.meta_path.append(repo) + return append @contextmanager def swap(repo_path): """Temporarily use another RepoPath.""" - global _path + global path # swap out _path for repo_path - saved = _path + saved = path remove_from_meta = set_path(repo_path) yield @@ -1140,7 +1140,7 @@ def swap(repo_path): # restore _path and sys.meta_path if remove_from_meta: sys.meta_path.remove(repo_path) - _path = saved + path = saved class RepoError(spack.error.SpackError): diff --git a/lib/spack/spack/reporters/junit.py b/lib/spack/spack/reporters/junit.py index e8b69f8240..2072cf7576 100644 --- a/lib/spack/spack/reporters/junit.py +++ b/lib/spack/spack/reporters/junit.py @@ -22,7 +22,7 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## - +import os import os.path import spack.build_environment diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py index e81d913631..596cef1306 100644 --- a/lib/spack/spack/spec.py +++ b/lib/spack/spack/spec.py @@ -1228,7 +1228,7 @@ class Spec(object): """Internal package call gets only the class object for a package. Use this to just get package metadata. """ - return spack.repo.path().get_pkg_class(self.fullname) + return spack.repo.path.get_pkg_class(self.fullname) @property def virtual(self): @@ -1244,7 +1244,7 @@ class Spec(object): @staticmethod def is_virtual(name): """Test if a name is virtual without requiring a Spec.""" - return (name is not None) and (not spack.repo.path().exists(name)) + return (name is not None) and (not spack.repo.path.exists(name)) @property def concrete(self): @@ -1402,7 +1402,7 @@ class Spec(object): @property def prefix(self): if self._prefix is None: - self.prefix = spack.store.store().layout.path_for_spec(self) + self.prefix = spack.store.layout.path_for_spec(self) return self._prefix @prefix.setter @@ -1675,7 +1675,7 @@ class Spec(object): # still need to select a concrete package later. if not self.virtual: import spack.concretize - concretizer = spack.concretize.concretizer() + concretizer = spack.concretize.concretizer changed |= any( (concretizer.concretize_architecture(self), concretizer.concretize_compiler(self), @@ -1744,7 +1744,7 @@ class Spec(object): # Get a list of possible replacements in order of # preference. import spack.concretize - concretizer = spack.concretize.concretizer() + concretizer = spack.concretize.concretizer candidates = concretizer.choose_virtual_or_external(spec) # Try the replacements in order, skipping any that cause @@ -1849,7 +1849,7 @@ class Spec(object): # we can do it as late as possible to allow as much # compatibility across repositories as possible. if s.namespace is None: - s.namespace = spack.repo.path().repo_for_pkg(s.name).namespace + s.namespace = spack.repo.path.repo_for_pkg(s.name).namespace if s.concrete: continue @@ -3107,7 +3107,7 @@ class Spec(object): elif named_str == 'SPACK_ROOT': out.write(fmt % token_transform(spack.paths.prefix)) elif named_str == 'SPACK_INSTALL': - out.write(fmt % token_transform(spack.store.store().root)) + out.write(fmt % token_transform(spack.store.root)) elif named_str == 'PREFIX': out.write(fmt % token_transform(self.prefix)) elif named_str.startswith('HASH'): @@ -3149,7 +3149,7 @@ class Spec(object): if not self.concrete: return None try: - record = spack.store.store().db.get_record(self) + record = spack.store.db.get_record(self) return record.installed except KeyError: return None @@ -3159,7 +3159,7 @@ class Spec(object): if not self.concrete: return None try: - record = spack.store.store().db.get_record(self) + record = spack.store.db.get_record(self) return record.explicit except KeyError: return None @@ -3382,7 +3382,7 @@ class SpecParser(spack.parse.Parser): def spec_by_hash(self): self.expect(ID) - specs = spack.store.store().db.query() + specs = spack.store.db.query() matches = [spec for spec in specs if spec.dag_hash()[:len(self.token.value)] == self.token.value] diff --git a/lib/spack/spack/stage.py b/lib/spack/spack/stage.py index c4acebf1de..9c384d8aec 100644 --- a/lib/spack/spack/stage.py +++ b/lib/spack/spack/stage.py @@ -408,7 +408,7 @@ class Stage(object): url, digest, expand=expand, extension=extension)) if self.default_fetcher.cachable: fetchers.insert( - 0, spack.caches.fetch_cache().fetcher( + 0, spack.caches.fetch_cache.fetcher( self.mirror_path, digest, expand=expand, extension=extension)) @@ -455,7 +455,7 @@ class Stage(object): self.fetcher.check() def cache_local(self): - spack.caches.fetch_cache().store(self.fetcher, self.mirror_path) + spack.caches.fetch_cache.store(self.fetcher, self.mirror_path) def expand_archive(self): """Changes to the stage directory and attempt to expand the downloaded diff --git a/lib/spack/spack/store.py b/lib/spack/spack/store.py index 9bd8166c16..f5111e7f46 100644 --- a/lib/spack/spack/store.py +++ b/lib/spack/spack/store.py @@ -43,6 +43,9 @@ configuration. """ import os + +import llnl.util.lang + import spack.paths import spack.config import spack.util.path @@ -72,7 +75,7 @@ class Store(object): hash_length (int): length of the hashes used in the directory layout; spec hash suffixes will be truncated to this length """ - def __init__(self, root, path_scheme, hash_length): + def __init__(self, root, path_scheme=None, hash_length=None): self.root = root self.db = spack.database.Database(root) self.layout = spack.directory_layout.YamlDirectoryLayout( @@ -85,19 +88,21 @@ class Store(object): return self.db.reindex(self.layout) -#: Singleton store instance -_store = None +def _store(): + """Get the singleton store instance.""" + root = spack.config.get('config:install_tree', default_root) + root = spack.util.path.canonicalize_path(root) + return Store(root, + spack.config.get('config:install_path_scheme'), + spack.config.get('config:install_hash_length')) -def store(): - """Get the singleton store instance.""" - global _store - if _store is None: - root = spack.config.get('config:install_tree', default_root) - root = spack.util.path.canonicalize_path(root) +#: Singleton store instance +store = llnl.util.lang.Singleton(_store) - _store = Store(root, - spack.config.get('config:install_path_scheme'), - spack.config.get('config:install_hash_length')) - return _store +# convenience accessors for parts of the singleton store +root = llnl.util.lang.LazyReference(lambda: store.root) +db = llnl.util.lang.LazyReference(lambda: store.db) +layout = llnl.util.lang.LazyReference(lambda: store.layout) +extensions = llnl.util.lang.LazyReference(lambda: store.extensions) diff --git a/lib/spack/spack/test/cmd/clean.py b/lib/spack/spack/test/cmd/clean.py index 3e189531ff..cb4339c333 100644 --- a/lib/spack/spack/test/cmd/clean.py +++ b/lib/spack/spack/test/cmd/clean.py @@ -44,9 +44,9 @@ def mock_calls_for_clean(monkeypatch): monkeypatch.setattr(spack.package.PackageBase, 'do_clean', Counter()) monkeypatch.setattr(spack.stage, 'purge', Counter()) monkeypatch.setattr( - spack.caches._fetch_cache, 'destroy', Counter(), raising=False) + spack.caches.fetch_cache, 'destroy', Counter(), raising=False) monkeypatch.setattr( - spack.caches._misc_cache, 'destroy', Counter()) + spack.caches.misc_cache, 'destroy', Counter()) @pytest.mark.usefixtures( @@ -69,5 +69,5 @@ def test_function_calls(command_line, counters): # number of times assert spack.package.PackageBase.do_clean.call_count == counters[0] assert spack.stage.purge.call_count == counters[1] - assert spack.caches.fetch_cache().destroy.call_count == counters[2] - assert spack.caches.misc_cache().destroy.call_count == counters[3] + assert spack.caches.fetch_cache.destroy.call_count == counters[2] + assert spack.caches.misc_cache.destroy.call_count == counters[3] diff --git a/lib/spack/spack/test/cmd/dependencies.py b/lib/spack/spack/test/cmd/dependencies.py index f211737e4b..015eac589c 100644 --- a/lib/spack/spack/test/cmd/dependencies.py +++ b/lib/spack/spack/test/cmd/dependencies.py @@ -60,7 +60,7 @@ def test_immediate_installed_dependencies(mock_packages, database): lines = [l for l in out.strip().split('\n') if not l.startswith('--')] hashes = set([re.split(r'\s+', l)[0] for l in lines]) - expected = set([spack.store.store().db.query_one(s).dag_hash(7) + expected = set([spack.store.db.query_one(s).dag_hash(7) for s in ['mpich', 'callpath^mpich']]) assert expected == hashes @@ -74,7 +74,7 @@ def test_transitive_installed_dependencies(mock_packages, database): lines = [l for l in out.strip().split('\n') if not l.startswith('--')] hashes = set([re.split(r'\s+', l)[0] for l in lines]) - expected = set([spack.store.store().db.query_one(s).dag_hash(7) + expected = set([spack.store.db.query_one(s).dag_hash(7) for s in ['zmpi', 'callpath^zmpi', 'fake', 'dyninst', 'libdwarf', 'libelf']]) diff --git a/lib/spack/spack/test/cmd/dependents.py b/lib/spack/spack/test/cmd/dependents.py index 6d85596c37..c6a5b01111 100644 --- a/lib/spack/spack/test/cmd/dependents.py +++ b/lib/spack/spack/test/cmd/dependents.py @@ -58,10 +58,10 @@ def test_immediate_installed_dependents(mock_packages, database): lines = [l for l in out.strip().split('\n') if not l.startswith('--')] hashes = set([re.split(r'\s+', l)[0] for l in lines]) - expected = set([spack.store.store().db.query_one(s).dag_hash(7) + expected = set([spack.store.db.query_one(s).dag_hash(7) for s in ['dyninst', 'libdwarf']]) - libelf = spack.store.store().db.query_one('libelf') + libelf = spack.store.db.query_one('libelf') expected = set([d.dag_hash(7) for d in libelf.dependents()]) assert expected == hashes @@ -75,7 +75,7 @@ def test_transitive_installed_dependents(mock_packages, database): lines = [l for l in out.strip().split('\n') if not l.startswith('--')] hashes = set([re.split(r'\s+', l)[0] for l in lines]) - expected = set([spack.store.store().db.query_one(s).dag_hash(7) + expected = set([spack.store.db.query_one(s).dag_hash(7) for s in ['zmpi', 'callpath^zmpi', 'mpileaks^zmpi']]) assert expected == hashes diff --git a/lib/spack/spack/test/cmd/install.py b/lib/spack/spack/test/cmd/install.py index 5635fbdf09..88f0247cfa 100644 --- a/lib/spack/spack/test/cmd/install.py +++ b/lib/spack/spack/test/cmd/install.py @@ -25,6 +25,7 @@ import argparse import os import filecmp +from six.moves import builtins import pytest @@ -316,28 +317,23 @@ def test_junit_output_with_failures(tmpdir, exc_typename, msg): @pytest.mark.disable_clean_stage_check -@pytest.mark.usefixtures( - 'mock_packages', 'mock_archive', 'mock_fetch', 'config', 'install_mockery' -) @pytest.mark.parametrize('exc_typename,msg', [ - ('RuntimeError', 'something weird happened'), +# ('RuntimeError', 'something weird happened'), ('KeyboardInterrupt', 'Ctrl-C strikes again') ]) -def test_junit_output_with_errors(tmpdir, monkeypatch, exc_typename, msg): +def test_junit_output_with_errors( + exc_typename, msg, + mock_packages, mock_archive, mock_fetch, install_mockery, + config, tmpdir, monkeypatch): def just_throw(*args, **kwargs): - from six.moves import builtins exc_type = getattr(builtins, exc_typename) raise exc_type(msg) monkeypatch.setattr(spack.package.PackageBase, 'do_install', just_throw) with tmpdir.as_cwd(): - install( - '--log-format=junit', '--log-file=test.xml', - 'libdwarf', - fail_on_error=False - ) + install('--log-format=junit', '--log-file=test.xml', 'libdwarf') files = tmpdir.listdir() filename = tmpdir.join('test.xml') @@ -387,7 +383,7 @@ def test_extra_files_are_archived(mock_packages, mock_archive, mock_fetch, install('archive-files') archive_dir = os.path.join( - spack.store.store().layout.metadata_path(s), 'archived-files' + spack.store.layout.metadata_path(s), 'archived-files' ) config_log = os.path.join(archive_dir, 'config.log') assert os.path.exists(config_log) diff --git a/lib/spack/spack/test/cmd/uninstall.py b/lib/spack/spack/test/cmd/uninstall.py index d81ab13a57..1c187431d1 100644 --- a/lib/spack/spack/test/cmd/uninstall.py +++ b/lib/spack/spack/test/cmd/uninstall.py @@ -61,7 +61,7 @@ def test_recursive_uninstall(): """Test recursive uninstall.""" uninstall('-y', '-a', '--dependents', 'callpath') - all_specs = spack.store.store().layout.all_specs() + all_specs = spack.store.layout.all_specs() assert len(all_specs) == 8 # query specs with multiple configurations mpileaks_specs = [s for s in all_specs if s.satisfies('mpileaks')] diff --git a/lib/spack/spack/test/concretize.py b/lib/spack/spack/test/concretize.py index 2a7943c894..028bc23583 100644 --- a/lib/spack/spack/test/concretize.py +++ b/lib/spack/spack/test/concretize.py @@ -162,7 +162,7 @@ class TestConcretize(object): """Make sure insufficient versions of MPI are not in providers list when we ask for some advanced version. """ - repo = spack.repo.path() + repo = spack.repo.path assert not any( s.satisfies('mpich2@:1.0') for s in repo.providers_for('mpi@2.1') ) @@ -182,7 +182,7 @@ class TestConcretize(object): def test_provides_handles_multiple_providers_of_same_vesrion(self): """ """ - providers = spack.repo.path().providers_for('mpi@3.0') + providers = spack.repo.path.providers_for('mpi@3.0') # Note that providers are repo-specific, so we don't misinterpret # providers, but vdeps are not namespace-specific, so we can diff --git a/lib/spack/spack/test/concretize_preferences.py b/lib/spack/spack/test/concretize_preferences.py index a7ac13a64a..6156b53ef0 100644 --- a/lib/spack/spack/test/concretize_preferences.py +++ b/lib/spack/spack/test/concretize_preferences.py @@ -42,7 +42,7 @@ def concretize_scope(config, tmpdir): config.pop_scope() spack.package_prefs.PackagePrefs.clear_caches() - spack.repo.path()._provider_index = None + spack.repo.path._provider_index = None def concretize(abstract_spec): diff --git a/lib/spack/spack/test/config.py b/lib/spack/spack/test/config.py index 5893e13a9c..0d2359c1ab 100644 --- a/lib/spack/spack/test/config.py +++ b/lib/spack/spack/test/config.py @@ -61,15 +61,15 @@ config_override_list = { @pytest.fixture() def config(tmpdir): """Mocks the configuration scope.""" - real_configuration = spack.config._configuration - scopes = [spack.config.ConfigScope(name, str(tmpdir.join(name))) - for name in ['low', 'high']] - config = spack.config.Configuration(*scopes) - spack.config._configuration = config + real_configuration = spack.config.config - yield config + spack.config.config = spack.config.Configuration( + *[spack.config.ConfigScope(name, str(tmpdir.join(name))) + for name in ['low', 'high']]) - spack.config._configuration = real_configuration + yield spack.config.config + + spack.config.config = real_configuration @pytest.fixture() @@ -242,7 +242,7 @@ def test_write_key_to_disk(config, compiler_specs): spack.config.set('compilers', b_comps['compilers'], scope='high') # Clear caches so we're forced to read from disk. - spack.config.config().clear_caches() + spack.config.config.clear_caches() # Same check again, to ensure consistency. check_compiler_config(a_comps['compilers'], *compiler_specs.a) @@ -255,7 +255,7 @@ def test_write_to_same_priority_file(config, compiler_specs): spack.config.set('compilers', b_comps['compilers'], scope='low') # Clear caches so we're forced to read from disk. - spack.config.config().clear_caches() + spack.config.config.clear_caches() # Same check again, to ensure consistency. check_compiler_config(a_comps['compilers'], *compiler_specs.a) diff --git a/lib/spack/spack/test/conftest.py b/lib/spack/spack/test/conftest.py index c405d1246a..a003df40c8 100644 --- a/lib/spack/spack/test/conftest.py +++ b/lib/spack/spack/test/conftest.py @@ -155,7 +155,7 @@ def mock_fetch_cache(monkeypatch): def __str__(self): return "[mock fetch cache]" - monkeypatch.setattr(spack.caches, '_fetch_cache', MockCache()) + monkeypatch.setattr(spack.caches, 'fetch_cache', MockCache()) # FIXME: The lines below should better be added to a fixture with @@ -242,148 +242,104 @@ def config(configuration_dir): # Set up a mock config scope spack.package_prefs.PackagePrefs.clear_caches() - real_configuration = spack.config._configuration + real_configuration = spack.config.config - scopes = [ - spack.config.ConfigScope(name, str(configuration_dir.join(name))) - for name in ['site', 'system', 'user']] - config = spack.config.Configuration(*scopes) - spack.config._configuration = config + spack.config.config = spack.config.Configuration( + *[spack.config.ConfigScope(name, str(configuration_dir.join(name))) + for name in ['site', 'system', 'user']]) - yield config + yield spack.config.config - spack.config._configuration = real_configuration + spack.config.config = real_configuration spack.package_prefs.PackagePrefs.clear_caches() +def _populate(mock_db): + """Populate a mock database with packages. + + Here is what the mock DB looks like: + + o mpileaks o mpileaks' o mpileaks'' + |\ |\ |\ + | o callpath | o callpath' | o callpath'' + |/| |/| |/| + o | mpich o | mpich2 o | zmpi + | | o | fake + | | | + | |______________/ + | .____________/ + |/ + o dyninst + |\ + | o libdwarf + |/ + o libelf + """ + def _install(spec): + s = spack.spec.Spec(spec).concretized() + pkg = spack.repo.get(s) + pkg.do_install(fake=True) + + # Transaction used to avoid repeated writes. + with mock_db.write_transaction(): + _install('mpileaks ^mpich') + _install('mpileaks ^mpich2') + _install('mpileaks ^zmpi') + _install('externaltest') + + @pytest.fixture(scope='module') def database(tmpdir_factory, mock_packages, config): """Creates a mock database with some packages installed note that the ref count for dyninst here will be 3, as it's recycled across each install. """ - - # Here is what the mock DB looks like: - # - # o mpileaks o mpileaks' o mpileaks'' - # |\ |\ |\ - # | o callpath | o callpath' | o callpath'' - # |/| |/| |/| - # o | mpich o | mpich2 o | zmpi - # | | o | fake - # | | | - # | |______________/ - # | .____________/ - # |/ - # o dyninst - # |\ - # | o libdwarf - # |/ - # o libelf + # save the real store + real_store = spack.store.store # Make a fake install directory install_path = tmpdir_factory.mktemp('install_for_database') - spack_install_path = spack.store.store().root - - spack.store.store().root = str(install_path) - install_layout = spack.directory_layout.YamlDirectoryLayout( - str(install_path)) - spack_install_layout = spack.store.store().layout - spack.store.store().layout = install_layout - - # Make fake database and fake install directory. - install_db = spack.database.Database(str(install_path)) - spack_install_db = spack.store.store().db - spack.store.store().db = install_db - - Entry = collections.namedtuple('Entry', ['path', 'layout', 'db']) - Database = collections.namedtuple( - 'Database', ['real', 'mock', 'install', 'uninstall', 'refresh']) - real = Entry( - path=spack_install_path, - layout=spack_install_layout, - db=spack_install_db) - mock = Entry(path=install_path, layout=install_layout, db=install_db) + # Make fake store (database and install layout) + tmp_store = spack.store.Store(str(install_path)) + spack.store.store = tmp_store - def _install(spec): - s = spack.spec.Spec(spec) - s.concretize() - pkg = spack.repo.get(s) - pkg.do_install(fake=True) - - def _uninstall(spec): - spec.package.do_uninstall(spec) - - def _refresh(): - with spack.store.store().db.write_transaction(): - for spec in spack.store.store().db.query(): - _uninstall(spec) - _install('mpileaks ^mpich') - _install('mpileaks ^mpich2') - _install('mpileaks ^zmpi') - _install('externaltest') - - t = Database( - real=real, - mock=mock, - install=_install, - uninstall=_uninstall, - refresh=_refresh) - - # Transaction used to avoid repeated writes. - with spack.store.store().db.write_transaction(): - t.install('mpileaks ^mpich') - t.install('mpileaks ^mpich2') - t.install('mpileaks ^zmpi') - t.install('externaltest') + _populate(tmp_store.db) - yield t + yield tmp_store.db - with spack.store.store().db.write_transaction(): - for spec in spack.store.store().db.query(): + with tmp_store.db.write_transaction(): + for spec in tmp_store.db.query(): if spec.package.installed: - t.uninstall(spec) + PackageBase.uninstall_by_spec(spec, force=True) else: - spack.store.store().db.remove(spec) + tmp_store.db.remove(spec) install_path.remove(rec=1) - spack.store.store().root = spack_install_path - spack.store.store().layout = spack_install_layout - spack.store.store().db = spack_install_db + spack.store.store = real_store -@pytest.fixture() -def refresh_db_on_exit(database): - """"Restores the state of the database after a test.""" - yield - database.refresh() +@pytest.fixture(scope='function') +def mutable_database(database): + """For tests that need to modify the database instance.""" + yield database + with database.write_transaction(): + for spec in spack.store.db.query(): + PackageBase.uninstall_by_spec(spec, force=True) + _populate(database) -@pytest.fixture() +@pytest.fixture(scope='function') def install_mockery(tmpdir, config, mock_packages): """Hooks a fake install directory, DB, and stage directory into Spack.""" - layout = spack.store.store().layout - extensions = spack.store.store().extensions - db = spack.store.store().db - new_opt = str(tmpdir.join('opt')) - - # Use a fake install directory to avoid conflicts bt/w - # installed pkgs and mock packages. - store = spack.store.store() - store.layout = spack.directory_layout.YamlDirectoryLayout(new_opt) - store.extensions = spack.directory_layout.YamlExtensionsLayout( - new_opt, spack.store.store().layout) - store.db = spack.database.Database(new_opt) + real_store = spack.store.store + spack.store.store = spack.store.Store(str(tmpdir.join('opt'))) # We use a fake package, so temporarily disable checksumming with spack.config.override('config:checksum', False): yield - # Restore Spack's layout. - store.layout = layout - store.extensions = extensions - store.db = db + spack.store.store = real_store @pytest.fixture() diff --git a/lib/spack/spack/test/database.py b/lib/spack/spack/test/database.py index b0ee343095..2e61853349 100644 --- a/lib/spack/spack/test/database.py +++ b/lib/spack/spack/test/database.py @@ -47,16 +47,16 @@ def _print_ref_counts(): recs = [] def add_rec(spec): - cspecs = spack.store.store().db.query(spec, installed=any) + cspecs = spack.store.db.query(spec, installed=any) if not cspecs: recs.append("[ %-7s ] %-20s-" % ('', spec)) else: key = cspecs[0].dag_hash() - rec = spack.store.store().db.get_record(cspecs[0]) + rec = spack.store.db.get_record(cspecs[0]) recs.append("[ %-7s ] %-20s%d" % (key[:7], spec, rec.ref_count)) - with spack.store.store().db.read_transaction(): + with spack.store.db.read_transaction(): add_rec('mpileaks ^mpich') add_rec('callpath ^mpich') add_rec('mpich') @@ -79,7 +79,7 @@ def _print_ref_counts(): def _check_merkleiness(): """Ensure the spack database is a valid merkle graph.""" - all_specs = spack.store.store().db.query(installed=any) + all_specs = spack.store.db.query(installed=any) seen = {} for spec in all_specs: @@ -91,10 +91,10 @@ def _check_merkleiness(): assert seen[hash_key] == id(dep) -def _check_db_sanity(install_db): +def _check_db_sanity(database): """Utiilty function to check db against install layout.""" - pkg_in_layout = sorted(spack.store.store().layout.all_specs()) - actual = sorted(install_db.query()) + pkg_in_layout = sorted(spack.store.layout.all_specs()) + actual = sorted(database.query()) externals = sorted([x for x in actual if x.external]) nexpected = len(pkg_in_layout) + len(externals) @@ -109,19 +109,19 @@ def _check_db_sanity(install_db): _check_merkleiness() -def _check_remove_and_add_package(install_db, spec): +def _check_remove_and_add_package(database, spec): """Remove a spec from the DB, then add it and make sure everything's still ok once it is added. This checks that it was removed, that it's back when added again, and that ref counts are consistent. """ - original = install_db.query() - install_db._check_ref_counts() + original = database.query() + database._check_ref_counts() # Remove spec - concrete_spec = install_db.remove(spec) - install_db._check_ref_counts() - remaining = install_db.query() + concrete_spec = database.remove(spec) + database._check_ref_counts() + remaining = database.query() # ensure spec we removed is gone assert len(original) - 1 == len(remaining) @@ -129,14 +129,14 @@ def _check_remove_and_add_package(install_db, spec): assert concrete_spec not in remaining # add it back and make sure everything is ok. - install_db.add(concrete_spec, spack.store.store().layout) - installed = install_db.query() + database.add(concrete_spec, spack.store.layout) + installed = database.query() assert concrete_spec in installed assert installed == original # sanity check against direcory layout and check ref counts. - _check_db_sanity(install_db) - install_db._check_ref_counts() + _check_db_sanity(database) + database._check_ref_counts() def _mock_install(spec): @@ -147,7 +147,7 @@ def _mock_install(spec): def _mock_remove(spec): - specs = spack.store.store().db.query(spec) + specs = spack.store.db.query(spec) assert len(specs) == 1 spec = specs[0] spec.package.do_uninstall(spec) @@ -156,8 +156,7 @@ def _mock_remove(spec): def test_default_queries(database): # Testing a package whose name *doesn't* start with 'lib' # to ensure the library has 'lib' prepended to the name - install_db = database.mock.db - rec = install_db.get_record('zmpi') + rec = database.get_record('zmpi') spec = rec.spec @@ -176,8 +175,7 @@ def test_default_queries(database): # Testing a package whose name *does* start with 'lib' # to ensure the library doesn't have a double 'lib' prefix - install_db = database.mock.db - rec = install_db.get_record('libelf') + rec = database.get_record('libelf') spec = rec.spec @@ -197,16 +195,15 @@ def test_default_queries(database): def test_005_db_exists(database): """Make sure db cache file exists after creating.""" - install_path = database.mock.path - index_file = install_path.join('.spack-db', 'index.json') - lock_file = install_path.join('.spack-db', 'lock') + index_file = os.path.join(database.root, '.spack-db', 'index.json') + lock_file = os.path.join(database.root, '.spack-db', 'lock') assert os.path.exists(str(index_file)) assert os.path.exists(str(lock_file)) def test_010_all_install_sanity(database): """Ensure that the install layout reflects what we think it does.""" - all_specs = spack.store.store().layout.all_specs() + all_specs = spack.store.layout.all_specs() assert len(all_specs) == 14 # Query specs with multiple configurations @@ -241,12 +238,12 @@ def test_010_all_install_sanity(database): def test_015_write_and_read(database): # write and read DB - with spack.store.store().db.write_transaction(): - specs = spack.store.store().db.query() - recs = [spack.store.store().db.get_record(s) for s in specs] + with spack.store.db.write_transaction(): + specs = spack.store.db.query() + recs = [spack.store.db.get_record(s) for s in specs] for spec, rec in zip(specs, recs): - new_rec = spack.store.store().db.get_record(spec) + new_rec = spack.store.db.get_record(spec) assert new_rec.ref_count == rec.ref_count assert new_rec.spec == rec.spec assert new_rec.path == rec.path @@ -255,23 +252,20 @@ def test_015_write_and_read(database): def test_020_db_sanity(database): """Make sure query() returns what's actually in the db.""" - install_db = database.mock.db - _check_db_sanity(install_db) + _check_db_sanity(database) def test_025_reindex(database): """Make sure reindex works and ref counts are valid.""" - install_db = database.mock.db - spack.store.store().reindex() - _check_db_sanity(install_db) + spack.store.store.reindex() + _check_db_sanity(database) -def test_030_db_sanity_from_another_process(database, refresh_db_on_exit): - install_db = database.mock.db - +def test_030_db_sanity_from_another_process(mutable_database): def read_and_modify(): - _check_db_sanity(install_db) # check that other process can read DB - with install_db.write_transaction(): + # check that other process can read DB + _check_db_sanity(mutable_database) + with mutable_database.write_transaction(): _mock_remove('mpileaks ^zmpi') p = multiprocessing.Process(target=read_and_modify, args=()) @@ -279,181 +273,166 @@ def test_030_db_sanity_from_another_process(database, refresh_db_on_exit): p.join() # ensure child process change is visible in parent process - with install_db.read_transaction(): - assert len(install_db.query('mpileaks ^zmpi')) == 0 + with mutable_database.read_transaction(): + assert len(mutable_database.query('mpileaks ^zmpi')) == 0 def test_040_ref_counts(database): """Ensure that we got ref counts right when we read the DB.""" - install_db = database.mock.db - install_db._check_ref_counts() + database._check_ref_counts() def test_050_basic_query(database): """Ensure querying database is consistent with what is installed.""" - install_db = database.mock.db # query everything - assert len(spack.store.store().db.query()) == 16 + assert len(spack.store.db.query()) == 16 # query specs with multiple configurations - mpileaks_specs = install_db.query('mpileaks') - callpath_specs = install_db.query('callpath') - mpi_specs = install_db.query('mpi') + mpileaks_specs = database.query('mpileaks') + callpath_specs = database.query('callpath') + mpi_specs = database.query('mpi') assert len(mpileaks_specs) == 3 assert len(callpath_specs) == 3 assert len(mpi_specs) == 3 # query specs with single configurations - dyninst_specs = install_db.query('dyninst') - libdwarf_specs = install_db.query('libdwarf') - libelf_specs = install_db.query('libelf') + dyninst_specs = database.query('dyninst') + libdwarf_specs = database.query('libdwarf') + libelf_specs = database.query('libelf') assert len(dyninst_specs) == 1 assert len(libdwarf_specs) == 1 assert len(libelf_specs) == 1 # Query by dependency - assert len(install_db.query('mpileaks ^mpich')) == 1 - assert len(install_db.query('mpileaks ^mpich2')) == 1 - assert len(install_db.query('mpileaks ^zmpi')) == 1 + assert len(database.query('mpileaks ^mpich')) == 1 + assert len(database.query('mpileaks ^mpich2')) == 1 + assert len(database.query('mpileaks ^zmpi')) == 1 # Query by date - assert len(install_db.query(start_date=datetime.datetime.min)) == 16 - assert len(install_db.query(start_date=datetime.datetime.max)) == 0 - assert len(install_db.query(end_date=datetime.datetime.min)) == 0 - assert len(install_db.query(end_date=datetime.datetime.max)) == 16 + assert len(database.query(start_date=datetime.datetime.min)) == 16 + assert len(database.query(start_date=datetime.datetime.max)) == 0 + assert len(database.query(end_date=datetime.datetime.min)) == 0 + assert len(database.query(end_date=datetime.datetime.max)) == 16 def test_060_remove_and_add_root_package(database): - install_db = database.mock.db - _check_remove_and_add_package(install_db, 'mpileaks ^mpich') + _check_remove_and_add_package(database, 'mpileaks ^mpich') def test_070_remove_and_add_dependency_package(database): - install_db = database.mock.db - _check_remove_and_add_package(install_db, 'dyninst') + _check_remove_and_add_package(database, 'dyninst') def test_080_root_ref_counts(database): - install_db = database.mock.db - rec = install_db.get_record('mpileaks ^mpich') + rec = database.get_record('mpileaks ^mpich') # Remove a top-level spec from the DB - install_db.remove('mpileaks ^mpich') + database.remove('mpileaks ^mpich') # record no longer in DB - assert install_db.query('mpileaks ^mpich', installed=any) == [] + assert database.query('mpileaks ^mpich', installed=any) == [] # record's deps have updated ref_counts - assert install_db.get_record('callpath ^mpich').ref_count == 0 - assert install_db.get_record('mpich').ref_count == 1 + assert database.get_record('callpath ^mpich').ref_count == 0 + assert database.get_record('mpich').ref_count == 1 # Put the spec back - install_db.add(rec.spec, spack.store.store().layout) + database.add(rec.spec, spack.store.layout) # record is present again - assert len(install_db.query('mpileaks ^mpich', installed=any)) == 1 + assert len(database.query('mpileaks ^mpich', installed=any)) == 1 # dependencies have ref counts updated - assert install_db.get_record('callpath ^mpich').ref_count == 1 - assert install_db.get_record('mpich').ref_count == 2 + assert database.get_record('callpath ^mpich').ref_count == 1 + assert database.get_record('mpich').ref_count == 2 def test_090_non_root_ref_counts(database): - install_db = database.mock.db - - install_db.get_record('mpileaks ^mpich') - install_db.get_record('callpath ^mpich') + database.get_record('mpileaks ^mpich') + database.get_record('callpath ^mpich') # "force remove" a non-root spec from the DB - install_db.remove('callpath ^mpich') + database.remove('callpath ^mpich') # record still in DB but marked uninstalled - assert install_db.query('callpath ^mpich', installed=True) == [] - assert len(install_db.query('callpath ^mpich', installed=any)) == 1 + assert database.query('callpath ^mpich', installed=True) == [] + assert len(database.query('callpath ^mpich', installed=any)) == 1 # record and its deps have same ref_counts - assert install_db.get_record( + assert database.get_record( 'callpath ^mpich', installed=any ).ref_count == 1 - assert install_db.get_record('mpich').ref_count == 2 + assert database.get_record('mpich').ref_count == 2 # remove only dependent of uninstalled callpath record - install_db.remove('mpileaks ^mpich') + database.remove('mpileaks ^mpich') # record and parent are completely gone. - assert install_db.query('mpileaks ^mpich', installed=any) == [] - assert install_db.query('callpath ^mpich', installed=any) == [] + assert database.query('mpileaks ^mpich', installed=any) == [] + assert database.query('callpath ^mpich', installed=any) == [] # mpich ref count updated properly. - mpich_rec = install_db.get_record('mpich') + mpich_rec = database.get_record('mpich') assert mpich_rec.ref_count == 0 def test_100_no_write_with_exception_on_remove(database): - install_db = database.mock.db - def fail_while_writing(): - with install_db.write_transaction(): + with database.write_transaction(): _mock_remove('mpileaks ^zmpi') raise Exception() - with install_db.read_transaction(): - assert len(install_db.query('mpileaks ^zmpi', installed=any)) == 1 + with database.read_transaction(): + assert len(database.query('mpileaks ^zmpi', installed=any)) == 1 with pytest.raises(Exception): fail_while_writing() # reload DB and make sure zmpi is still there. - with install_db.read_transaction(): - assert len(install_db.query('mpileaks ^zmpi', installed=any)) == 1 + with database.read_transaction(): + assert len(database.query('mpileaks ^zmpi', installed=any)) == 1 def test_110_no_write_with_exception_on_install(database): - install_db = database.mock.db - def fail_while_writing(): - with install_db.write_transaction(): + with database.write_transaction(): _mock_install('cmake') raise Exception() - with install_db.read_transaction(): - assert install_db.query('cmake', installed=any) == [] + with database.read_transaction(): + assert database.query('cmake', installed=any) == [] with pytest.raises(Exception): fail_while_writing() # reload DB and make sure cmake was not written. - with install_db.read_transaction(): - assert install_db.query('cmake', installed=any) == [] - + with database.read_transaction(): + assert database.query('cmake', installed=any) == [] -def test_115_reindex_with_packages_not_in_repo(database, refresh_db_on_exit): - install_db = database.mock.db +def test_115_reindex_with_packages_not_in_repo(mutable_database): # Dont add any package definitions to this repository, the idea is that # packages should not have to be defined in the repository once they # are installed with spack.repo.swap(MockPackageMultiRepo([])): - spack.store.store().reindex() - _check_db_sanity(install_db) + spack.store.store.reindex() + _check_db_sanity(mutable_database) def test_external_entries_in_db(database): - install_db = database.mock.db - - rec = install_db.get_record('mpileaks ^zmpi') + rec = database.get_record('mpileaks ^zmpi') assert rec.spec.external_path is None assert rec.spec.external_module is None - rec = install_db.get_record('externaltool') + rec = database.get_record('externaltool') assert rec.spec.external_path == '/path/to/external_tool' assert rec.spec.external_module is None assert rec.explicit is False rec.spec.package.do_install(fake=True, explicit=True) - rec = install_db.get_record('externaltool') + rec = database.get_record('externaltool') assert rec.spec.external_path == '/path/to/external_tool' assert rec.spec.external_module is None assert rec.explicit is True diff --git a/lib/spack/spack/test/directory_layout.py b/lib/spack/spack/test/directory_layout.py index de4000b651..ac12381e75 100644 --- a/lib/spack/spack/test/directory_layout.py +++ b/lib/spack/spack/test/directory_layout.py @@ -104,7 +104,7 @@ def test_read_and_write_spec( layout. """ layout, tmpdir = layout_and_dir - packages = list(spack.repo.path().all_packages())[:max_packages] + packages = list(spack.repo.path.all_packages())[:max_packages] for pkg in packages: if pkg.name.startswith('external'): @@ -226,7 +226,7 @@ def test_handle_unknown_package( def test_find(layout_and_dir, config, mock_packages): """Test that finding specs within an install layout works.""" layout, _ = layout_and_dir - packages = list(spack.repo.path().all_packages())[:max_packages] + packages = list(spack.repo.path.all_packages())[:max_packages] # Create install prefixes for all packages in the list installed_specs = {} diff --git a/lib/spack/spack/test/package_sanity.py b/lib/spack/spack/test/package_sanity.py index 849ebc9053..3f56b7c6ba 100644 --- a/lib/spack/spack/test/package_sanity.py +++ b/lib/spack/spack/test/package_sanity.py @@ -65,7 +65,7 @@ def test_all_virtual_packages_have_default_providers(): """All virtual packages must have a default provider explicitly set.""" defaults = spack.config.get('packages', scope='defaults') default_providers = defaults['all']['providers'] - providers = spack.repo.path().provider_index.providers + providers = spack.repo.path.provider_index.providers for provider in providers: assert provider in default_providers diff --git a/lib/spack/spack/test/spec_syntax.py b/lib/spack/spack/test/spec_syntax.py index 5f5c1fd3ee..168fb4fc68 100644 --- a/lib/spack/spack/test/spec_syntax.py +++ b/lib/spack/spack/test/spec_syntax.py @@ -261,7 +261,7 @@ class TestSpecSyntax(object): @pytest.mark.db def test_spec_by_hash(self, database): - specs = database.mock.db.query() + specs = database.query() assert len(specs) # make sure something's in the DB for spec in specs: @@ -269,9 +269,9 @@ class TestSpecSyntax(object): @pytest.mark.db def test_dep_spec_by_hash(self, database): - mpileaks_zmpi = database.mock.db.query_one('mpileaks ^zmpi') - zmpi = database.mock.db.query_one('zmpi') - fake = database.mock.db.query_one('fake') + mpileaks_zmpi = database.query_one('mpileaks ^zmpi') + zmpi = database.query_one('zmpi') + fake = database.query_one('fake') assert 'fake' in mpileaks_zmpi assert 'zmpi' in mpileaks_zmpi @@ -297,8 +297,8 @@ class TestSpecSyntax(object): @pytest.mark.db def test_multiple_specs_with_hash(self, database): - mpileaks_zmpi = database.mock.db.query_one('mpileaks ^zmpi') - callpath_mpich2 = database.mock.db.query_one('callpath ^mpich2') + mpileaks_zmpi = database.query_one('mpileaks ^zmpi') + callpath_mpich2 = database.query_one('callpath ^mpich2') # name + hash + separate hash specs = sp.parse('mpileaks /' + mpileaks_zmpi.dag_hash() + @@ -336,8 +336,8 @@ class TestSpecSyntax(object): x2 = Spec('a') x2._hash = 'xx' x2._concrete = True - database.mock.db.add(x1, spack.store.store().layout) - database.mock.db.add(x2, spack.store.store().layout) + database.add(x1, spack.store.layout) + database.add(x2, spack.store.layout) # ambiguity in first hash character self._check_raises(AmbiguousHashError, ['/x']) @@ -347,11 +347,11 @@ class TestSpecSyntax(object): @pytest.mark.db def test_invalid_hash(self, database): - mpileaks_zmpi = database.mock.db.query_one('mpileaks ^zmpi') - zmpi = database.mock.db.query_one('zmpi') + mpileaks_zmpi = database.query_one('mpileaks ^zmpi') + zmpi = database.query_one('zmpi') - mpileaks_mpich = database.mock.db.query_one('mpileaks ^mpich') - mpich = database.mock.db.query_one('mpich') + mpileaks_mpich = database.query_one('mpileaks ^mpich') + mpich = database.query_one('mpich') # name + incompatible hash self._check_raises(InvalidHashError, [ @@ -366,7 +366,7 @@ class TestSpecSyntax(object): @pytest.mark.db def test_nonexistent_hash(self, database): """Ensure we get errors for nonexistant hashes.""" - specs = database.mock.db.query() + specs = database.query() # This hash shouldn't be in the test DB. What are the odds :) no_such_hash = 'aaaaaaaaaaaaaaa' @@ -385,11 +385,11 @@ class TestSpecSyntax(object): specs only raise errors if constraints cause a contradiction? """ - mpileaks_zmpi = database.mock.db.query_one('mpileaks ^zmpi') - callpath_zmpi = database.mock.db.query_one('callpath ^zmpi') - dyninst = database.mock.db.query_one('dyninst') + mpileaks_zmpi = database.query_one('mpileaks ^zmpi') + callpath_zmpi = database.query_one('callpath ^zmpi') + dyninst = database.query_one('dyninst') - mpileaks_mpich2 = database.mock.db.query_one('mpileaks ^mpich2') + mpileaks_mpich2 = database.query_one('mpileaks ^mpich2') redundant_specs = [ # redudant compiler diff --git a/lib/spack/spack/util/package_hash.py b/lib/spack/spack/util/package_hash.py index fe5316ca0a..0acb211312 100644 --- a/lib/spack/spack/util/package_hash.py +++ b/lib/spack/spack/util/package_hash.py @@ -131,7 +131,7 @@ def package_hash(spec, content=None): def package_ast(spec): spec = Spec(spec) - filename = spack.repo.path().filename_for_package_name(spec.name) + filename = spack.repo.path.filename_for_package_name(spec.name) with open(filename) as f: text = f.read() root = ast.parse(text) diff --git a/var/spack/repos/builtin/packages/aspell/package.py b/var/spack/repos/builtin/packages/aspell/package.py index 1b23258099..66eeb9e7cb 100644 --- a/var/spack/repos/builtin/packages/aspell/package.py +++ b/var/spack/repos/builtin/packages/aspell/package.py @@ -50,8 +50,8 @@ class Aspell(AutotoolsPackage): # - dest_dir instead of self.prefix in tree.(find_conflict|merge)() def activate(self, extension, **kwargs): extensions_layout = kwargs.get("extensions_layout", - spack.store.store().extensions) - if extensions_layout is not spack.store.store().extensions: + spack.store.extensions) + if extensions_layout is not spack.store.extensions: raise ExtensionError( 'aspell does not support non-global extensions') @@ -60,7 +60,7 @@ class Aspell(AutotoolsPackage): tree = LinkTree(extension.prefix.lib) def ignore(filename): - return (filename in spack.store.store().layout.hidden_file_paths or + return (filename in spack.store.layout.hidden_file_paths or kwargs.get('ignore', lambda f: False)(filename)) conflict = tree.find_conflict(dest_dir, ignore=ignore) @@ -71,8 +71,8 @@ class Aspell(AutotoolsPackage): def deactivate(self, extension, **kwargs): extensions_layout = kwargs.get("extensions_layout", - spack.store.store().extensions) - if extensions_layout is not spack.store.store().extensions: + spack.store.extensions) + if extensions_layout is not spack.store.extensions: raise ExtensionError( 'aspell does not support non-global extensions') @@ -80,7 +80,7 @@ class Aspell(AutotoolsPackage): dest_dir = aspell('dump', 'config', 'dict-dir', output=str).strip() def ignore(filename): - return (filename in spack.store.store().layout.hidden_file_paths or + return (filename in spack.store.layout.hidden_file_paths or kwargs.get('ignore', lambda f: False)(filename)) tree = LinkTree(extension.prefix.lib) diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py index 9ec7853abf..5baaa2ba98 100644 --- a/var/spack/repos/builtin/packages/cbtf-krell/package.py +++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py @@ -193,7 +193,7 @@ class CbtfKrell(CMakePackage): # the login node components with this spack invocation. We # need these paths to be the ones created in the CNL # spack invocation. - store = spack.store.store() + store = spack.store be_cbtf = store.db.query_one('cbtf arch=cray-CNL-haswell') be_cbtfk = store.db.query_one('cbtf-krell arch=cray-CNL-haswell') be_papi = store.db.query_one('papi arch=cray-CNL-haswell') diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py index 2663a3ff33..dd9e8e8503 100644 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop/package.py @@ -197,7 +197,7 @@ class Openspeedshop(CMakePackage): # spec['cbtf'].prefix is the login node value for this build, as # we only get here when building the login node components and # that is all that is known to spack. - store = spack.store.store() + store = spack.store be_ck = store.db.query_one('cbtf-krell arch=cray-CNL-haswell') # Equivalent to install-tool cmake arg: diff --git a/var/spack/repos/builtin/packages/perl/package.py b/var/spack/repos/builtin/packages/perl/package.py index 192e31f32f..1759c15d86 100644 --- a/var/spack/repos/builtin/packages/perl/package.py +++ b/var/spack/repos/builtin/packages/perl/package.py @@ -264,7 +264,7 @@ class Perl(Package): # Perl doesn't use Autotools, it should subclass Package super(Perl, self).activate(ext_pkg, **args) extensions_layout = args.get("extensions_layout", - spack.store.store().extensions) + spack.store.extensions) exts = extensions_layout.extension_map(self.spec) exts[ext_pkg.name] = ext_pkg.spec @@ -276,7 +276,7 @@ class Perl(Package): # Perl doesn't use Autotools, it should subclass Package super(Perl, self).deactivate(ext_pkg, **args) extensions_layout = args.get("extensions_layout", - spack.store.store().extensions) + spack.store.extensions) exts = extensions_layout.extension_map(self.spec) # Make deactivate idempotent diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index b2ca9a29b4..34e1e0ea6d 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -320,7 +320,7 @@ class Python(AutotoolsPackage): output_filename = None try: output_filename = join_path( - spack.store.store().layout.metadata_path(self.spec), + spack.store.layout.metadata_path(self.spec), Python._DISTUTIL_CACHE_FILENAME) with open(output_filename, 'w') as output_file: sjson.dump(self._distutil_vars, output_file) @@ -342,7 +342,7 @@ class Python(AutotoolsPackage): if not self._distutil_vars and self.installed: try: input_filename = join_path( - spack.store.store().layout.metadata_path(self.spec), + spack.store.layout.metadata_path(self.spec), Python._DISTUTIL_CACHE_FILENAME) if os.path.isfile(input_filename): with open(input_filename) as input_file: @@ -680,7 +680,7 @@ class Python(AutotoolsPackage): args.update(ignore=ignore) extensions_layout = args.get("extensions_layout", - spack.store.store().extensions) + spack.store.extensions) super(Python, self).activate(ext_pkg, **args) @@ -696,7 +696,7 @@ class Python(AutotoolsPackage): super(Python, self).deactivate(ext_pkg, **args) extensions_layout = args.get("extensions_layout", - spack.store.store().extensions) + spack.store.extensions) exts = extensions_layout.extension_map(self.spec) # Make deactivate idempotent -- cgit v1.2.3-70-g09d2 From f3f9d04c3290716a56569582b56c8b03ab4585cc Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Thu, 17 May 2018 19:48:46 -0500 Subject: cmake: update version (#8178) --- var/spack/repos/builtin/packages/cmake/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index e5dadb2d84..7875e6b18f 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -33,6 +33,7 @@ class Cmake(Package): list_url = 'https://cmake.org/files/' list_depth = 1 + version('3.11.2', 'd2d554c05fc07cfae7846d2aa205f12a') version('3.11.1', '12a3177477e4e2c7bc514193d421dafe') version('3.11.0', 'f3ebc79b5dec85b49abe75958ffa1a03') version('3.10.2', '732808e17fc14dc8cee50d51518c34eb') -- cgit v1.2.3-70-g09d2 From 9f12b5aed61ad2a5d1330224267a8ff94136a03e Mon Sep 17 00:00:00 2001 From: peetsv <32349688+peetsv@users.noreply.github.com> Date: Thu, 17 May 2018 17:50:19 -0700 Subject: R dismo 1 1 4 - new package (#8176) * py-pyfaidx: adding new package * updating the url * r-dismo: new package --- .../repos/builtin/packages/r-dismo/package.py | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-dismo/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-dismo/package.py b/var/spack/repos/builtin/packages/r-dismo/package.py new file mode 100644 index 0000000000..01c5a70413 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-dismo/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RDismo(RPackage): + """Functions for species distribution modeling, that is, predicting + entire geographic distributions form occurrences at a number of + sites and the environment at these sites""" + + homepage = "http://rspatial.org/sdm" + url = "https://cran.r-project.org/src/contrib/dismo_1.1-4.tar.gz" + + version('1.1-4', '0ed11729bcf4c2ffa01a3e2ac88dabfc') + + depends_on('r@3.2:', type=('build', 'run')) + depends_on('r-raster@2.5-2:', type=('build', 'run')) + depends_on('r-sp@1.2-0:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From a020a41298e2a03dc96468fd65d93c51e1fe7743 Mon Sep 17 00:00:00 2001 From: Serban Maerean Date: Thu, 17 May 2018 20:51:34 -0400 Subject: Changed netlib-lapack to fix an error in the CMake setup. (#8172) * Changed netlib-lapack to fix an error in their CMake setup. Changed netlib-lapack spackage file to add Fortran flags correctly for XL compiler. * Fixed line length -- forgot abt flake8... * Fix the package version where the ibm patch applies. --- .../builtin/packages/netlib-lapack/ibm-xl.patch | 20 +++++++++++++++++--- .../repos/builtin/packages/netlib-lapack/package.py | 7 ++++--- 2 files changed, 21 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/netlib-lapack/ibm-xl.patch b/var/spack/repos/builtin/packages/netlib-lapack/ibm-xl.patch index c9598a4e7c..fcb44af5a3 100644 --- a/var/spack/repos/builtin/packages/netlib-lapack/ibm-xl.patch +++ b/var/spack/repos/builtin/packages/netlib-lapack/ibm-xl.patch @@ -1,6 +1,5 @@ -diff -Naur lapack-3.6.1/CMAKE/CheckLAPACKCompilerFlags.cmake lapack-3.6.1-patched/CMAKE/CheckLAPACKCompilerFlags.cmake ---- lapack-3.6.1/CMAKE/CheckLAPACKCompilerFlags.cmake 2017-01-27 17:14:37.414854283 -0500 -+++ lapack-3.6.1-patched/CMAKE/CheckLAPACKCompilerFlags.cmake 2017-01-27 17:14:24.754719546 -0500 +--- a/CMAKE/CheckLAPACKCompilerFlags.cmake ++++ b/CMAKE/CheckLAPACKCompilerFlags.cmake @@ -43,12 +43,6 @@ if( "${CMAKE_Fortran_FLAGS}" MATCHES "-qflttrap=[a-zA-Z:]:enable" ) set( FPE_EXIT TRUE ) @@ -14,3 +13,18 @@ diff -Naur lapack-3.6.1/CMAKE/CheckLAPACKCompilerFlags.cmake lapack-3.6.1-patche # HP Fortran elseif( CMAKE_Fortran_COMPILER_ID STREQUAL "HP" ) + +--- a/CBLAS/CMakeLists.txt ++++ b/CBLAS/CMakeLists.txt +@@ -12,8 +12,8 @@ + SYMBOL_NAMESPACE "F77_") + if(NOT FortranCInterface_GLOBAL_FOUND OR NOT FortranCInterface_MODULE_FOUND) + message(WARNING "Reverting to pre-defined include/lapacke_mangling.h") +- configure_file(include/lapacke_mangling_with_flags.h.in +- ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h) ++ configure_file(include/cblas_mangling_with_flags.h.in ++ ${LAPACK_BINARY_DIR}/include/cblas_mangling.h) + endif() + + include_directories(include ${LAPACK_BINARY_DIR}/include) + diff --git a/var/spack/repos/builtin/packages/netlib-lapack/package.py b/var/spack/repos/builtin/packages/netlib-lapack/package.py index 8c5336cf04..c99b3fc91a 100644 --- a/var/spack/repos/builtin/packages/netlib-lapack/package.py +++ b/var/spack/repos/builtin/packages/netlib-lapack/package.py @@ -59,8 +59,8 @@ class NetlibLapack(Package): variant('xblas', default=False, description='Builds extended precision routines using XBLAS') - patch('ibm-xl.patch', when='@3:6%xl') - patch('ibm-xl.patch', when='@3:6%xl_r') + patch('ibm-xl.patch', when='@3.7: %xl') + patch('ibm-xl.patch', when='@3.7: %xl_r') # virtual dependency provides('blas', when='~external-blas') @@ -153,7 +153,8 @@ class NetlibLapack(Package): # use F77 compiler if IBM XL cmake_args.extend([ '-DCMAKE_Fortran_COMPILER=%s' % self.compiler.f77, - '-DCMAKE_Fortran_FLAGS=-qzerosize' + '-DCMAKE_Fortran_FLAGS=%s' % ( + ' '.join(self.spec.compiler_flags['fflags'])), ]) # deprecated routines are commonly needed by, for example, suitesparse -- cgit v1.2.3-70-g09d2 From c80333704c73c7ebd85cb4343e3d70f3217f9fd4 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Fri, 18 May 2018 02:52:01 +0200 Subject: Update scorep and friends to newest versions (#8171) --- var/spack/repos/builtin/packages/cube/package.py | 12 +++++++++--- var/spack/repos/builtin/packages/opari2/package.py | 1 + var/spack/repos/builtin/packages/otf2/package.py | 1 + var/spack/repos/builtin/packages/scorep/package.py | 13 +++++++++---- 4 files changed, 20 insertions(+), 7 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cube/package.py b/var/spack/repos/builtin/packages/cube/package.py index ac1236d5cd..89bdcd873b 100644 --- a/var/spack/repos/builtin/packages/cube/package.py +++ b/var/spack/repos/builtin/packages/cube/package.py @@ -34,8 +34,9 @@ class Cube(AutotoolsPackage): """ homepage = "http://www.scalasca.org/software/cube-4.x/download.html" - url = "http://apps.fz-juelich.de/scalasca/releases/cube/4.2/dist/cube-4.2.3.tar.gz" + url = "http://apps.fz-juelich.de/scalasca/releases/cube/4.4/dist/CubeBundle-4.4.tar.gz" + version('4.4', 'f4f0544883bdd5bad9e11a4a692858bf') version('4.3.5', 'e5dce986e3c6381ea3a5fcb66c553adc') version('4.3.4', '50f73060f55311cb12c5b3cb354d59fa') version('4.3.3', '07e109248ed8ffc7bdcce614264a2909') @@ -48,11 +49,16 @@ class Cube(AutotoolsPackage): depends_on('zlib') - depends_on('qt@5:', when='@4.3.0:4.3.999 +gui') + depends_on('qt@5:', when='@4.3.0: +gui') depends_on('qt@4.8:', when='@4.2.0:4.2.999 +gui') def url_for_version(self, version): - return 'http://apps.fz-juelich.de/scalasca/releases/cube/{0}/dist/cube-{1}.tar.gz'.format(version.up_to(2), version) + if version >= Version('4.4'): + filename = 'CubeBundle-{0}.tar.gz'.format(version) + else: + filename = 'cube-{0}.tar.gz'.format(version) + + return 'http://apps.fz-juelich.de/scalasca/releases/cube/{0}/dist/{1}'.format(version.up_to(2), filename) def configure_args(self): spec = self.spec diff --git a/var/spack/repos/builtin/packages/opari2/package.py b/var/spack/repos/builtin/packages/opari2/package.py index 695b6fe6eb..2f1b89bd98 100644 --- a/var/spack/repos/builtin/packages/opari2/package.py +++ b/var/spack/repos/builtin/packages/opari2/package.py @@ -39,6 +39,7 @@ class Opari2(AutotoolsPackage): homepage = "http://www.vi-hps.org/projects/score-p" url = "http://www.vi-hps.org/upload/packages/opari2/opari2-1.1.2.tar.gz" + version('2.0.3', 'f34674718ffdb098a48732a1eb9c1aa2') version('2.0.1', '74af78f1f27b8caaa4271e0b97fb0fba') version('2.0', '72350dbdb6139f2e68a5055a4f0ba16c') version('1.1.4', '245d3d11147a06de77909b0805f530c0') diff --git a/var/spack/repos/builtin/packages/otf2/package.py b/var/spack/repos/builtin/packages/otf2/package.py index ce9776ad36..5868214afe 100644 --- a/var/spack/repos/builtin/packages/otf2/package.py +++ b/var/spack/repos/builtin/packages/otf2/package.py @@ -34,6 +34,7 @@ class Otf2(AutotoolsPackage): homepage = "http://www.vi-hps.org/projects/score-p" url = "http://www.vi-hps.org/upload/packages/otf2/otf2-1.4.tar.gz" + version('2.1.1', 'e51ad0d8ca374d25f47426746ca629e7') version('2.1', 'e2994e53d9b7c2cbd0c4f564d638751e') version('2.0', '5b546188b25bc1c4e285e06dddf75dfc') version('1.5.1', '16a9df46e0da78e374f5d12c8cdc1109') diff --git a/var/spack/repos/builtin/packages/scorep/package.py b/var/spack/repos/builtin/packages/scorep/package.py index 16769c66e3..246ff59192 100644 --- a/var/spack/repos/builtin/packages/scorep/package.py +++ b/var/spack/repos/builtin/packages/scorep/package.py @@ -34,21 +34,26 @@ class Scorep(AutotoolsPackage): homepage = "http://www.vi-hps.org/projects/score-p" url = "http://www.vi-hps.org/upload/packages/scorep/scorep-2.0.2.tar.gz" + version('4.0', 'f04478e0407d67eeb8c49c3c51d91e12') version('3.1', '065bf8eb08398e8146c895718ddb9145') version('3.0', '44da8beaa3f71436a5f6fe51938aab2f') version('2.0.2', '8f00e79e1b5b96e511c5ebecd10b2888') version('1.4.2', '3b9a042b13bdd5836452354e6567f71e') version('1.3', '9db6f957b7f51fa01377a9537867a55c') - patch('gcc7.patch') + patch('gcc7.patch', when='@:3') ########## # Dependencies for SCORE-P are quite tight. See the homepage for more # information. + # SCOREP 4 + depends_on('otf2@2.1:', when='@4:') + depends_on('opari2@2.0:', when='@4:') + depends_on('cube@4.4:', when='@4:') # SCOREP 3 - depends_on('otf2@2:', when='@3:') - depends_on('opari2@2:', when='@3:') - depends_on('cube@4.3:', when='@3:') + depends_on('otf2@2:', when='@3:3.99') + depends_on('opari2@2:', when='@3:3.99') + depends_on('cube@4.3:', when='@3:3.99') # SCOREP 2.0.2 depends_on('otf2@2.0', when='@2.0.2') depends_on('opari2@2.0', when='@2.0.2') -- cgit v1.2.3-70-g09d2 From 457dadaac88bd60d337071e45a6bce6058c58b64 Mon Sep 17 00:00:00 2001 From: "Daryl W. Grunau" Date: Thu, 17 May 2018 18:55:00 -0600 Subject: silo: support version 4.10.2-bsd (#8164) --- var/spack/repos/builtin/packages/silo/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/silo/package.py b/var/spack/repos/builtin/packages/silo/package.py index add7b781bb..e9261822f0 100644 --- a/var/spack/repos/builtin/packages/silo/package.py +++ b/var/spack/repos/builtin/packages/silo/package.py @@ -32,7 +32,9 @@ class Silo(Package): homepage = "http://wci.llnl.gov/simulation/computer-codes/silo" url = "https://wci.llnl.gov/content/assets/docs/simulation/computer-codes/silo/silo-4.10.2/silo-4.10.2.tar.gz" - version('4.10.2', '9ceac777a2f2469ac8cef40f4fab49c8') + version('4.10.2', '9ceac777a2f2469ac8cef40f4fab49c8', preferred=True) + version('4.10.2-bsd', '60fef9ce373daf1e9cc8320cfa509bc5', + url="https://wci.llnl.gov/content/assets/docs/simulation/computer-codes/silo/silo-4.10.2/silo-4.10.2-bsd.tar.gz") version('4.9', 'a83eda4f06761a86726e918fc55e782a') version('4.8', 'b1cbc0e7ec435eb656dc4b53a23663c9') -- cgit v1.2.3-70-g09d2 From c06174a0814896a5f168fb1e524ab7462d04e46a Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Thu, 17 May 2018 20:02:07 -0500 Subject: perl: adding threads variant (#8142) --- var/spack/repos/builtin/packages/perl/package.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl/package.py b/var/spack/repos/builtin/packages/perl/package.py index 1759c15d86..ebfa514ce2 100644 --- a/var/spack/repos/builtin/packages/perl/package.py +++ b/var/spack/repos/builtin/packages/perl/package.py @@ -86,6 +86,9 @@ class Perl(Package): # Perl doesn't use Autotools, it should subclass Package variant('shared', default=True, description='Build a shared libperl.so library') + variant('threads', default=True, + description='Build perl with threads support') + resource( name="cpanm", url="http://search.cpan.org/CPAN/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7042.tar.gz", @@ -133,6 +136,9 @@ class Perl(Package): # Perl doesn't use Autotools, it should subclass Package if '+shared' in spec: config_args.append('-Duseshrplib') + if '+threads' in spec: + config_args.append('-Dusethreads') + return config_args def configure(self, spec, prefix): -- cgit v1.2.3-70-g09d2 From e7d5421baf335f5bdba3b5e9277714393c933e20 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Thu, 17 May 2018 20:03:36 -0500 Subject: trinity: fixing jdk dependency (#8140) --- var/spack/repos/builtin/packages/trinity/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trinity/package.py b/var/spack/repos/builtin/packages/trinity/package.py index 493bf2f345..840803b594 100644 --- a/var/spack/repos/builtin/packages/trinity/package.py +++ b/var/spack/repos/builtin/packages/trinity/package.py @@ -44,7 +44,7 @@ class Trinity(MakefilePackage): version('2.6.6', 'b7472e98ab36655a6d9296d965471a56') - depends_on("jdk@8") + depends_on("java@8:") depends_on("bowtie2") depends_on("jellyfish") depends_on("salmon") -- cgit v1.2.3-70-g09d2 From 99f678035a279cf85a32a4fdbd98a117b9c1832f Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Thu, 17 May 2018 21:04:57 -0400 Subject: libexpat: Fix for older systems, move to GitHub (#8135) * PR #4945 did not make this work on SuSE 11. Adding the latest version of libexpat did. Also update for Expat's move to GitHub. * Update package.py * Update package.py Move to url_for_version() --- var/spack/repos/builtin/packages/expat/package.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/expat/package.py b/var/spack/repos/builtin/packages/expat/package.py index 2b5f1c63f2..7ba3faf8b0 100644 --- a/var/spack/repos/builtin/packages/expat/package.py +++ b/var/spack/repos/builtin/packages/expat/package.py @@ -29,8 +29,8 @@ import sys class Expat(AutotoolsPackage): """Expat is an XML parser library written in C.""" - homepage = "http://expat.sourceforge.net/" - url = "https://sourceforge.net/projects/expat/files/expat/2.2.2/expat-2.2.2.tar.bz2" + homepage = "https://libexpat.github.io/" + url = "https://github.com/libexpat/libexpat/releases/download/R_2_2_2/expat-2.2.2.tar.bz2" # Version 2.2.2 introduced a requirement for a high quality # entropy source. "Older" linux systems (aka CentOS 7) do not @@ -44,9 +44,14 @@ class Expat(AutotoolsPackage): description="Use libbsd (for high quality randomness)") depends_on('libbsd', when="@2.2.1:+libbsd") + version('2.2.5', '789e297f547980fc9ecc036f9a070d49') version('2.2.2', '1ede9a41223c78528b8c5d23e69a2667') version('2.2.0', '2f47841c829facb346eb6e3fab5212e2') + def url_for_version(self, version): + url = 'https://github.com/libexpat/libexpat/releases/download/R_{0}/expat-{1}.tar.bz2' + return url.format(version.underscored, version.dotted) + def configure_args(self): spec = self.spec args = [] -- cgit v1.2.3-70-g09d2 From 29b695ed404d820a9d64f15110bf39bfeffd5a4c Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Fri, 18 May 2018 07:47:33 -0500 Subject: trinity: add perl+threads dependency (#8143) --- var/spack/repos/builtin/packages/trinity/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trinity/package.py b/var/spack/repos/builtin/packages/trinity/package.py index 840803b594..a4fc604a17 100644 --- a/var/spack/repos/builtin/packages/trinity/package.py +++ b/var/spack/repos/builtin/packages/trinity/package.py @@ -48,6 +48,7 @@ class Trinity(MakefilePackage): depends_on("bowtie2") depends_on("jellyfish") depends_on("salmon") + depends_on("perl+threads") def build(self, spec, prefix): make -- cgit v1.2.3-70-g09d2 From 6d2617b05dd02a25fbc9ae3fc3a7070b4bd368db Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Fri, 18 May 2018 08:51:21 -0400 Subject: nco: Find NetCDF (#8159) * nco: Find NetCDF properly * flake8 --- var/spack/repos/builtin/packages/nco/package.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nco/package.py b/var/spack/repos/builtin/packages/nco/package.py index 47a9c57d60..b1b6d116d0 100644 --- a/var/spack/repos/builtin/packages/nco/package.py +++ b/var/spack/repos/builtin/packages/nco/package.py @@ -60,3 +60,10 @@ class Nco(AutotoolsPackage): def configure_args(self): spec = self.spec return ['--{0}-doc'.format('enable' if '+doc' in spec else 'disable')] + + def setup_environment(self, spack_env, run_env): + spec = self.spec + spack_env.set('NETCDF_INC', spec['netcdf'].prefix.include) + spack_env.set('NETCDF_LIB', spec['netcdf'].prefix.lib) + spack_env.set('ANTLR_ROOT', spec['antlr'].prefix) + spack_env.set('UDUNITS2_PATH', spec['udunits2'].prefix) -- cgit v1.2.3-70-g09d2 From e5b81dd5669ec88e40bc14b9e0c377c3d5fd7cda Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 18 May 2018 10:28:19 -0500 Subject: task: Add version 2.5.1 (#8184) --- var/spack/repos/builtin/packages/task/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/task/package.py b/var/spack/repos/builtin/packages/task/package.py index 5c6efc947e..a92dccd203 100644 --- a/var/spack/repos/builtin/packages/task/package.py +++ b/var/spack/repos/builtin/packages/task/package.py @@ -30,6 +30,7 @@ class Task(CMakePackage): homepage = "http://www.taskwarrior.org" url = "http://taskwarrior.org/download/task-2.4.4.tar.gz" + version('2.5.1', 'bcd984a00d6d1eb6b40faf567419f784') version('2.4.4', '517450c4a23a5842df3e9905b38801b3') depends_on('cmake@2.8:', type='build') -- cgit v1.2.3-70-g09d2 From c4cc6cde30fd3af2b2fb2a027fbe97edd899ad78 Mon Sep 17 00:00:00 2001 From: sknigh Date: Fri, 18 May 2018 10:07:05 -0700 Subject: Added vim 8.1 (#8185) --- var/spack/repos/builtin/packages/vim/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/vim/package.py b/var/spack/repos/builtin/packages/vim/package.py index 54c92ce3ac..407ad12df9 100644 --- a/var/spack/repos/builtin/packages/vim/package.py +++ b/var/spack/repos/builtin/packages/vim/package.py @@ -37,6 +37,7 @@ class Vim(AutotoolsPackage): homepage = "http://www.vim.org" url = "https://github.com/vim/vim/archive/v8.0.1376.tar.gz" + version('8.1.0001', 'edb6f5c67cb3100ea9e3966a43b9c9da') version('8.0.1376', '62855881a2d96d48956859d74cfb8a3b') version('8.0.0503', '82b77bd5cb38b70514bed47cfe033b8c') version('8.0.0454', '4030bf677bdfbd14efb588e4d9a24128') -- cgit v1.2.3-70-g09d2 From 5641c1923b3b4c312cb7f7a37000b3666cadcd0d Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Fri, 18 May 2018 11:12:43 -0600 Subject: Turning off parallel during make install for parallel-netcdf. (#8186) --- var/spack/repos/builtin/packages/parallel-netcdf/package.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/parallel-netcdf/package.py b/var/spack/repos/builtin/packages/parallel-netcdf/package.py index 01fee69574..599bf925da 100644 --- a/var/spack/repos/builtin/packages/parallel-netcdf/package.py +++ b/var/spack/repos/builtin/packages/parallel-netcdf/package.py @@ -73,3 +73,7 @@ class ParallelNetcdf(AutotoolsPackage): args.append('--disable-fortran') return args + + def install(self, spec, prefix): + # Installation fails in parallel + make('install', parallel=False) -- cgit v1.2.3-70-g09d2 From 780cc9d72da9165470290393aeee278ad04e93de Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Fri, 18 May 2018 13:39:30 -0400 Subject: antlr: Turn off CSharp (#8157) Spack doesn't have a CSharp package, so the only time ANTLR would succeed is if a system-installed CSharp was available. This disables CSharp support, which enables building on systems without system-installed CSharp. --- var/spack/repos/builtin/packages/antlr/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/antlr/package.py b/var/spack/repos/builtin/packages/antlr/package.py index 706adda2e3..0455a257b6 100644 --- a/var/spack/repos/builtin/packages/antlr/package.py +++ b/var/spack/repos/builtin/packages/antlr/package.py @@ -51,6 +51,7 @@ class Antlr(AutotoolsPackage): spec = self.spec return [ + '--disable-csharp', '--{0}-cxx'.format('enable' if '+cxx' in spec else 'disable'), '--{0}-java'.format('enable' if '+java' in spec else 'disable'), '--{0}-python'.format('enable' if '+python' in spec else 'disable') -- cgit v1.2.3-70-g09d2 From f2eb71ca2086a77a2ebd8d08afb564991ef00b43 Mon Sep 17 00:00:00 2001 From: mcneish1 <35310375+mcneish1@users.noreply.github.com> Date: Fri, 18 May 2018 15:30:25 -0700 Subject: Fix libjpeg library finding and opencv build with nonstandard library directories (#8160) (#8179) * Use libs[0] and headers.directories[0] instead of hardcoded paths in opencv dependencies * Fix library finding in libjpeg-turbo * Use build_type=Debug instead of +debug to determine build_type --- .../builtin/packages/libjpeg-turbo/package.py | 4 +++ var/spack/repos/builtin/packages/opencv/package.py | 39 +++++++++++----------- 2 files changed, 23 insertions(+), 20 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libjpeg-turbo/package.py b/var/spack/repos/builtin/packages/libjpeg-turbo/package.py index a9e7e235ea..543e87d81a 100644 --- a/var/spack/repos/builtin/packages/libjpeg-turbo/package.py +++ b/var/spack/repos/builtin/packages/libjpeg-turbo/package.py @@ -49,6 +49,10 @@ class LibjpegTurbo(Package): depends_on("nasm", type='build') depends_on('cmake', type='build', when="@1.5.90:") + @property + def libs(self): + return find_libraries("libjpeg*", root=self.prefix, recursive=True) + @when('@:1.5.3') def install(self, spec, prefix): configure('--prefix=%s' % prefix) diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index cfda9f0786..5821380827 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -219,50 +219,49 @@ class Opencv(CMakePackage): zlib = spec['zlib'] args.extend([ '-DZLIB_LIBRARY_{0}:FILEPATH={1}'.format(( - 'DEBUG' if '+debug' in spec else 'RELEASE'), - join_path(zlib.prefix.lib, - 'libz.{0}'.format(dso_suffix))), - '-DZLIB_INCLUDE_DIR:PATH={0}'.format(zlib.prefix.include) + 'DEBUG' if 'build_type=Debug' in spec else 'RELEASE'), + zlib.libs[0]), + '-DZLIB_INCLUDE_DIR:PATH={0}'.format( + zlib.headers.directories[0]) ]) if '+png' in spec: libpng = spec['libpng'] args.extend([ '-DPNG_LIBRARY_{0}:FILEPATH={1}'.format(( - 'DEBUG' if '+debug' in spec else 'RELEASE'), - join_path(libpng.prefix.lib, - 'libpng.{0}'.format(dso_suffix))), - '-DPNG_INCLUDE_DIR:PATH={0}'.format(libpng.prefix.include) + 'DEBUG' if 'build_type=Debug' in spec else 'RELEASE'), + libpng.libs[0]), + '-DPNG_INCLUDE_DIR:PATH={0}'.format( + libpng.headers.directories[0]) ]) if '+jpeg' in spec: libjpeg = spec['jpeg'] args.extend([ '-DBUILD_JPEG:BOOL=OFF', - '-DJPEG_LIBRARY:FILEPATH={0}'.format( - join_path(libjpeg.prefix.lib, - 'libjpeg.{0}'.format(dso_suffix))), - '-DJPEG_INCLUDE_DIR:PATH={0}'.format(libjpeg.prefix.include) + '-DJPEG_LIBRARY:FILEPATH={0}'.format(libjpeg.libs[0]), + '-DJPEG_INCLUDE_DIR:PATH={0}'.format( + libjpeg.headers.directories[0]) ]) if '+tiff' in spec: libtiff = spec['libtiff'] args.extend([ '-DTIFF_LIBRARY_{0}:FILEPATH={1}'.format(( - 'DEBUG' if '+debug' in spec else 'RELEASE'), - join_path(libtiff.prefix.lib, - 'libtiff.{0}'.format(dso_suffix))), - '-DTIFF_INCLUDE_DIR:PATH={0}'.format(libtiff.prefix.include) + 'DEBUG' if 'build_type=Debug' in spec else 'RELEASE'), + libtiff.libs[0]), + '-DTIFF_INCLUDE_DIR:PATH={0}'.format( + libtiff.headers.directories[0]) ]) if '+jasper' in spec: jasper = spec['jasper'] args.extend([ '-DJASPER_LIBRARY_{0}:FILEPATH={1}'.format(( - 'DEBUG' if '+debug' in spec else 'RELEASE'), - join_path(jasper.prefix.lib, - 'libjasper.{0}'.format(dso_suffix))), - '-DJASPER_INCLUDE_DIR:PATH={0}'.format(jasper.prefix.include) + 'DEBUG' if 'build_type=Debug' in spec else 'RELEASE'), + jasper.libs[0]), + '-DJASPER_INCLUDE_DIR:PATH={0}'.format( + jasper.headers.directories[0]) ]) # GUI -- cgit v1.2.3-70-g09d2 From 9f85ad84ef0214fd47b5bb4fb14eb2543c6dd8db Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Fri, 18 May 2018 18:29:32 -0700 Subject: neovim: add info for v0.2.2 (#8189) --- var/spack/repos/builtin/packages/neovim/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/neovim/package.py b/var/spack/repos/builtin/packages/neovim/package.py index d65c608847..f7919cd70b 100644 --- a/var/spack/repos/builtin/packages/neovim/package.py +++ b/var/spack/repos/builtin/packages/neovim/package.py @@ -32,6 +32,7 @@ class Neovim(CMakePackage): homepage = "http://neovim.io" url = "https://github.com/neovim/neovim/archive/v0.2.0.tar.gz" + version('0.2.2', '44b69f8ace88b646ec890670f1e462c4') version('0.2.1', 'f4271f22d2a46fa18dace42849c56a98') version('0.2.0', '9af7f61f9f0b1a2891147a479d185aa2') -- cgit v1.2.3-70-g09d2 From 2f5c4be3bfc6e759c265212063402e05cd5bf21f Mon Sep 17 00:00:00 2001 From: 健美猞猁 Date: Sun, 20 May 2018 00:26:31 +0800 Subject: sleef: a new library. (#8198) --- var/spack/repos/builtin/packages/sleef/package.py | 35 +++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 var/spack/repos/builtin/packages/sleef/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sleef/package.py b/var/spack/repos/builtin/packages/sleef/package.py new file mode 100644 index 0000000000..769e43c29b --- /dev/null +++ b/var/spack/repos/builtin/packages/sleef/package.py @@ -0,0 +1,35 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Sleef(CMakePackage): + """SIMD Library for Evaluating Elementary Functions, + vectorized libm and DFT.""" + + homepage = "http://sleef.org" + url = "https://github.com/shibatch/sleef/archive/3.2.tar.gz" + + version('3.2', '459215058f2c8d55cd2b644d56c8c4f0') -- cgit v1.2.3-70-g09d2 From 96aedae886b555013981dffbc366e22e08f1ae6c Mon Sep 17 00:00:00 2001 From: peetsv <32349688+peetsv@users.noreply.github.com> Date: Sat, 19 May 2018 09:26:44 -0700 Subject: r-proc v1 12 1 - New package (#8191) * py-pyfaidx: adding new package * updating the url * r-proc v1.12.1 new package * adding list_url --- var/spack/repos/builtin/packages/r-proc/package.py | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-proc/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-proc/package.py b/var/spack/repos/builtin/packages/r-proc/package.py new file mode 100644 index 0000000000..d06e823000 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-proc/package.py @@ -0,0 +1,44 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RProc(RPackage): + """Tools for visualizing, smoothing and comparing receiver operating + characteristic (ROC curves). (Partial) area under the curve (AUC) + can be compared with statistical tests based on U-statistics or + bootstrap. Confidence intervals can be computed for (p)AUC or + ROC curves.""" + + homepage = "https://web.expasy.org/pROC/" + url = "https://cran.r-project.org/src/contrib/pROC_1.12.1.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/pROC" + + version('1.12.1', 'ef5fb446fd75c1a3a5e7abf9b7aa4f75') + + depends_on('r@2.14:', type=('build', 'run')) + depends_on('r-plyr', type=('build', 'run')) + depends_on('r-rcpp@0.11.1:', type=('build', 'run')) + depends_on('r-ggplot2', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From f9c35b2f048cbba137a9b03335f2072067d6b837 Mon Sep 17 00:00:00 2001 From: peetsv <32349688+peetsv@users.noreply.github.com> Date: Sat, 19 May 2018 11:12:47 -0700 Subject: r-spatial v7.3.11 - New package (#8204) * py-pyfaidx: adding new package * updating the url * r-spatial v7.3.11 - New package --- .../repos/builtin/packages/r-spatial/package.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-spatial/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-spatial/package.py b/var/spack/repos/builtin/packages/r-spatial/package.py new file mode 100644 index 0000000000..cad613f7a4 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-spatial/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RSpatial(RPackage): + """Functions for kriging and point pattern analysis.""" + + homepage = "http://www.stats.ox.ac.uk/pub/MASS4/" + url = "https://cran.r-project.org/src/contrib/spatial_7.3-11.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/spatial" + + version('7.3-10', 'e544e3e3fd92e6868f29b8da2925b214') + + depends_on('r@3.0.0:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 1ec0f3789791ff22beb7eb68a580b5551b9fa6a8 Mon Sep 17 00:00:00 2001 From: peetsv <32349688+peetsv@users.noreply.github.com> Date: Sat, 19 May 2018 14:23:03 -0700 Subject: r-utf8 v1.1.3 - New package (#8206) * py-pyfaidx: adding new package * updating the url * r-utf8 v1.1.3 - New package * adding list_url --- var/spack/repos/builtin/packages/r-utf8/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-utf8/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-utf8/package.py b/var/spack/repos/builtin/packages/r-utf8/package.py new file mode 100644 index 0000000000..bd5e5fd7c6 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-utf8/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RUtf8(RPackage): + """Process and print 'UTF-8' encoded international text (Unicode). + Input, validate, normalize, encode, format, and display.""" + + homepage = "https://github.com/patperry/r-utf8" + url = "https://cran.r-project.org/src/contrib/utf8_1.1.3.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/utf8" + + version('1.1.3', '3a4d84328eb3314e8ebb84d3553f7015') + + depends_on('r@2.1.0:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 17e6260d4b9a154cbc0fbfcb6b1c33d519b81212 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sun, 20 May 2018 15:01:11 -0500 Subject: Add libtiff 4.0.9 (#8201) --- var/spack/repos/builtin/packages/libtiff/package.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libtiff/package.py b/var/spack/repos/builtin/packages/libtiff/package.py index 08682ac62d..0876b0fc23 100644 --- a/var/spack/repos/builtin/packages/libtiff/package.py +++ b/var/spack/repos/builtin/packages/libtiff/package.py @@ -26,10 +26,12 @@ from spack import * class Libtiff(AutotoolsPackage): - """libtiff graphics format library""" + """LibTIFF - Tag Image File Format (TIFF) Library and Utilities.""" + homepage = "http://www.simplesystems.org/libtiff/" - url = "http://download.osgeo.org/libtiff/tiff-4.0.8.tar.gz" + url = "http://download.osgeo.org/libtiff/tiff-4.0.9.tar.gz" + version('4.0.9', '54bad211279cc93eb4fca31ba9bfdc79') version('4.0.8', '2a7d1c1318416ddf36d5f6fa4600069b') version('4.0.7', '77ae928d2c6b7fb46a21c3a29325157b') version('4.0.6', 'd1d2e940dea0b5ad435f21f03d96dd72') -- cgit v1.2.3-70-g09d2 From 0a47db508885427602d4d37ed0a8417840e4624a Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sun, 20 May 2018 15:01:33 -0500 Subject: Add xz 5.2.4 (#8202) --- var/spack/repos/builtin/packages/xz/package.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/xz/package.py b/var/spack/repos/builtin/packages/xz/package.py index 2a64e6cc4e..a3ff4be7e7 100644 --- a/var/spack/repos/builtin/packages/xz/package.py +++ b/var/spack/repos/builtin/packages/xz/package.py @@ -27,13 +27,15 @@ from spack import * class Xz(AutotoolsPackage): """XZ Utils is free general-purpose data compression software with - high compression ratio. XZ Utils were written for POSIX-like - systems, but also work on some not-so-POSIX systems. XZ Utils are - the successor to LZMA Utils.""" + high compression ratio. XZ Utils were written for POSIX-like systems, + but also work on some not-so-POSIX systems. XZ Utils are the successor + to LZMA Utils.""" + homepage = "http://tukaani.org/xz/" - url = "http://tukaani.org/xz/xz-5.2.0.tar.bz2" + url = "http://tukaani.org/xz/xz-5.2.4.tar.bz2" list_url = "http://tukaani.org/xz/old.html" + version('5.2.4', 'b3264b15ab1db04c8c428dc81838d4eb') version('5.2.3', '1592e7ca3eece099b03b35f4d9179e7c') version('5.2.2', 'f90c9a0c8b259aee2234c4e0d7fd70af') version('5.2.0', '867cc8611760240ebf3440bd6e170bb9') -- cgit v1.2.3-70-g09d2 From 04687598c923eae0c41be9ebc09637d3936c1ac9 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sun, 20 May 2018 15:02:49 -0500 Subject: Add libgeotiff package (#8203) --- .../repos/builtin/packages/libgeotiff/package.py | 70 ++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 var/spack/repos/builtin/packages/libgeotiff/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libgeotiff/package.py b/var/spack/repos/builtin/packages/libgeotiff/package.py new file mode 100644 index 0000000000..e56737ca26 --- /dev/null +++ b/var/spack/repos/builtin/packages/libgeotiff/package.py @@ -0,0 +1,70 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Libgeotiff(AutotoolsPackage): + """GeoTIFF represents an effort by over 160 different remote sensing, GIS, + cartographic, and surveying related companies and organizations to + establish a TIFF based interchange format for georeferenced raster imagery. + """ + + homepage = "https://trac.osgeo.org/geotiff/" + url = "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.4.2.tar.gz" + + version('1.4.2', '96ab80e0d4eff7820579957245d844f8') + + variant('zlib', default=True, description='Include zlib support') + variant('jpeg', default=True, description='Include jpeg support') + variant('proj', default=True, description='Use PROJ.4 library') + + depends_on('zlib', when='+zlib') + depends_on('jpeg', when='+jpeg') + depends_on('libtiff') + depends_on('proj', when='+proj') + + def configure_args(self): + spec = self.spec + + args = [ + '--with-libtiff={0}'.format(spec['libtiff'].prefix), + ] + + if '+zlib' in spec: + args.append('--with-zlib={0}'.format(spec['zlib'].prefix)) + else: + args.append('--with-zlib=no') + + if '+jpeg' in spec: + args.append('--with-jpeg={0}'.format(spec['jpeg'].prefix)) + else: + args.append('--with-jpeg=no') + + if '+proj' in spec: + args.append('--with-proj={0}'.format(spec['proj'].prefix)) + else: + args.append('--with-proj=no') + + return args -- cgit v1.2.3-70-g09d2 From 15d102acecbaf52c5c949d79e5732922759b28f8 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sun, 20 May 2018 15:03:38 -0500 Subject: Add FYBA package (#8205) --- var/spack/repos/builtin/packages/fyba/package.py | 48 ++++++++++++++++++++++ .../builtin/packages/fyba/vfs-mount-darwin.patch | 48 ++++++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 var/spack/repos/builtin/packages/fyba/package.py create mode 100644 var/spack/repos/builtin/packages/fyba/vfs-mount-darwin.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fyba/package.py b/var/spack/repos/builtin/packages/fyba/package.py new file mode 100644 index 0000000000..914de4aef4 --- /dev/null +++ b/var/spack/repos/builtin/packages/fyba/package.py @@ -0,0 +1,48 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Fyba(AutotoolsPackage): + """OpenFYBA is the source code release of the FYBA library, distributed + by the National Mapping Authority of Norway (Statens kartverk) to read + and write files in the National geodata standard format SOSI.""" + + homepage = "https://github.com/kartverket/fyba" + url = "https://github.com/kartverket/fyba/archive/4.1.1.tar.gz" + + version('4.1.1', 'ab687582efdef26593796271529a10cb') + + # configure: error: cannot find install-sh or install.sh + force_autoreconf = True + + depends_on('autoconf', type='build') + depends_on('automake', type='build') + depends_on('libtool', type='build') + depends_on('m4', type='build') + + # fatal error: 'sys/vfs.h' file not found + # https://github.com/kartverket/fyba/issues/12 + patch('vfs-mount-darwin.patch', when='platform=darwin') diff --git a/var/spack/repos/builtin/packages/fyba/vfs-mount-darwin.patch b/var/spack/repos/builtin/packages/fyba/vfs-mount-darwin.patch new file mode 100644 index 0000000000..134db87a1c --- /dev/null +++ b/var/spack/repos/builtin/packages/fyba/vfs-mount-darwin.patch @@ -0,0 +1,48 @@ +diff -Naur a/configure.ac b/configure.ac +--- a/configure.ac 2014-09-22 00:36:49.000000000 -0500 ++++ b/configure.ac 2018-05-19 12:37:15.000000000 -0500 +@@ -18,7 +18,7 @@ + # Checks for libraries. + + # Checks for header files. +-AC_CHECK_HEADERS([fcntl.h float.h inttypes.h limits.h locale.h memory.h stdint.h stdlib.h string.h sys/ioctl.h sys/statvfs.h sys/time.h sys/vfs.h termios.h unistd.h]) ++AC_CHECK_HEADERS([fcntl.h float.h inttypes.h limits.h locale.h memory.h stdint.h stdlib.h string.h sys/ioctl.h sys/statvfs.h sys/time.h sys/mount.h termios.h unistd.h]) + + # Checks for typedefs, structures, and compiler characteristics. + AC_HEADER_STDBOOL +diff -Naur a/src/UT/DISKINFO.cpp b/src/UT/DISKINFO.cpp +--- a/src/UT/DISKINFO.cpp 2014-09-22 00:36:49.000000000 -0500 ++++ b/src/UT/DISKINFO.cpp 2018-05-19 12:38:08.000000000 -0500 +@@ -17,7 +17,7 @@ + # include + # else + # include +-# include ++# include + # endif + + # include +diff -Naur a/src/UT/INQSIZE.cpp b/src/UT/INQSIZE.cpp +--- a/src/UT/INQSIZE.cpp 2014-09-22 00:36:49.000000000 -0500 ++++ b/src/UT/INQSIZE.cpp 2018-05-19 12:37:45.000000000 -0500 +@@ -16,7 +16,7 @@ + # include + # include + # include +-# include ++# include + # include + # include + # include +diff -Naur a/src/UT/INQTID.cpp b/src/UT/INQTID.cpp +--- a/src/UT/INQTID.cpp 2014-09-22 00:36:49.000000000 -0500 ++++ b/src/UT/INQTID.cpp 2018-05-19 12:37:57.000000000 -0500 +@@ -15,7 +15,7 @@ + # include + # include + # include +-# include ++# include + # include + # include + # include -- cgit v1.2.3-70-g09d2 From e0dad09ea21bc214b7e9b825c49d7923f946dcc1 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sun, 20 May 2018 15:04:06 -0500 Subject: Add Xerces-C++ 3.2.1 (#8208) --- var/spack/repos/builtin/packages/xerces-c/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/xerces-c/package.py b/var/spack/repos/builtin/packages/xerces-c/package.py index 5aae3bb92f..8733289069 100644 --- a/var/spack/repos/builtin/packages/xerces-c/package.py +++ b/var/spack/repos/builtin/packages/xerces-c/package.py @@ -33,8 +33,9 @@ class XercesC(AutotoolsPackage): APIs.""" homepage = "https://xerces.apache.org/xerces-c" - url = "https://archive.apache.org/dist/xerces/c/3/sources/xerces-c-3.1.4.tar.bz2" + url = "https://archive.apache.org/dist/xerces/c/3/sources/xerces-c-3.2.1.tar.bz2" + version('3.2.1', '8f98a81a3589bbc2dad9837452f7d319') version('3.1.4', 'd04ae9d8b2dee2157c6db95fa908abfd') depends_on('libiconv') -- cgit v1.2.3-70-g09d2 From 478c99ce012c09c2e42847860c9d8f6f3171fa39 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sun, 20 May 2018 15:04:28 -0500 Subject: Add cURL 7.60.0 (#8210) --- var/spack/repos/builtin/packages/curl/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/curl/package.py b/var/spack/repos/builtin/packages/curl/package.py index 41f3547a79..77dcc12744 100644 --- a/var/spack/repos/builtin/packages/curl/package.py +++ b/var/spack/repos/builtin/packages/curl/package.py @@ -32,8 +32,9 @@ class Curl(AutotoolsPackage): homepage = "http://curl.haxx.se" # URL must remain http:// so Spack can bootstrap curl - url = "http://curl.haxx.se/download/curl-7.54.0.tar.bz2" + url = "http://curl.haxx.se/download/curl-7.60.0.tar.bz2" + version('7.60.0', 'bd2aabf78ded6a9aec8a54532fd6b5d7') version('7.59.0', 'a2192804f7c2636a09320416afcf888e') version('7.56.0', 'e0caf257103e0c77cee5be7e9ac66ca4') version('7.54.0', '89bb7ba87384dfbf4f1a3f953da42458') -- cgit v1.2.3-70-g09d2 From a5d2e59320eea514249656e96d7d2e9d71bc6f1c Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sun, 20 May 2018 15:04:47 -0500 Subject: Add libxml2 2.9.8 (#8211) --- var/spack/repos/builtin/packages/libxml2/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libxml2/package.py b/var/spack/repos/builtin/packages/libxml2/package.py index d0fcb36c99..1faffe1351 100644 --- a/var/spack/repos/builtin/packages/libxml2/package.py +++ b/var/spack/repos/builtin/packages/libxml2/package.py @@ -29,9 +29,11 @@ class Libxml2(AutotoolsPackage): """Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform), it is free software available under the MIT License.""" + homepage = "http://xmlsoft.org" - url = "http://xmlsoft.org/sources/libxml2-2.9.2.tar.gz" + url = "http://xmlsoft.org/sources/libxml2-2.9.8.tar.gz" + version('2.9.8', 'b786e353e2aa1b872d70d5d1ca0c740d') version('2.9.4', 'ae249165c173b1ff386ee8ad676815f5') version('2.9.2', '9e6a9aca9d155737868b3dc5fd82f788') version('2.7.8', '8127a65e8c3b08856093099b52599c86') -- cgit v1.2.3-70-g09d2 From e0d7e8ebd2ce837a609ce8ce4a882867fc3e0b3c Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sun, 20 May 2018 15:05:11 -0500 Subject: Add sqlite 3.23.1 (#8212) --- var/spack/repos/builtin/packages/sqlite/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sqlite/package.py b/var/spack/repos/builtin/packages/sqlite/package.py index ab91430d37..f70bbfe3bd 100644 --- a/var/spack/repos/builtin/packages/sqlite/package.py +++ b/var/spack/repos/builtin/packages/sqlite/package.py @@ -33,6 +33,8 @@ class Sqlite(AutotoolsPackage): """ homepage = "www.sqlite.org" + version('3.23.1', '0edbfd75ececb95e8e6448d6ff33df82774c9646', + url='https://www.sqlite.org/2018/sqlite-autoconf-3230100.tar.gz') version('3.22.0', '2fb24ec12001926d5209d2da90d252b9825366ac', url='https://www.sqlite.org/2018/sqlite-autoconf-3220000.tar.gz') version('3.21.0', '7913de4c3126ba3c24689cb7a199ea31', -- cgit v1.2.3-70-g09d2 From 7b5c76552a5dd80844f30b58c7b2fb0e61fb2a54 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sun, 20 May 2018 15:05:29 -0500 Subject: Add PCRE 8.42 (#8213) --- var/spack/repos/builtin/packages/pcre/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pcre/package.py b/var/spack/repos/builtin/packages/pcre/package.py index 692d847b52..410beedea2 100644 --- a/var/spack/repos/builtin/packages/pcre/package.py +++ b/var/spack/repos/builtin/packages/pcre/package.py @@ -31,8 +31,9 @@ class Pcre(AutotoolsPackage): pattern matching using the same syntax and semantics as Perl 5.""" homepage = "http://www.pcre.org" - url = "https://ftp.pcre.org/pub/pcre/pcre-8.40.tar.bz2" + url = "https://ftp.pcre.org/pub/pcre/pcre-8.42.tar.bz2" + version('8.42', '085b6aa253e0f91cae70b3cdbe8c1ac2') version('8.41', 'c160d22723b1670447341b08c58981c1') version('8.40', '41a842bf7dcecd6634219336e2167d1d') version('8.39', 'e3fca7650a0556a2647821679d81f585') -- cgit v1.2.3-70-g09d2 From 7e04b20f3eb65575141fed4a0b7881954403ecd5 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sun, 20 May 2018 15:05:47 -0500 Subject: Add PCRE2 10.31 (#8214) --- var/spack/repos/builtin/packages/pcre2/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pcre2/package.py b/var/spack/repos/builtin/packages/pcre2/package.py index e9295d3241..3a624db048 100644 --- a/var/spack/repos/builtin/packages/pcre2/package.py +++ b/var/spack/repos/builtin/packages/pcre2/package.py @@ -29,7 +29,9 @@ class Pcre2(AutotoolsPackage): """The PCRE2 package contains Perl Compatible Regular Expression libraries. These are useful for implementing regular expression pattern matching using the same syntax and semantics as Perl 5.""" + homepage = "http://www.pcre.org""" - url = "https://ftp.pcre.org/pub/pcre/pcre2-10.20.tar.bz2" + url = "https://ftp.pcre.org/pub/pcre/pcre2-10.31.tar.bz2" + version('10.31', 'e0b91c891a3c49050f7fd15de33d0ba4') version('10.20', 'dcd027c57ecfdc8a6c3af9d0acf5e3f7') -- cgit v1.2.3-70-g09d2 From e933ed2b5093ae98b2608af49b81a2190e7a6547 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Mon, 21 May 2018 16:58:23 +0200 Subject: Updated sbt to point to github. Added versions 1.1.4, 0.13.17. (#7951) --- var/spack/repos/builtin/packages/sbt/package.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sbt/package.py b/var/spack/repos/builtin/packages/sbt/package.py index a0ea9e7981..1e46b8104d 100644 --- a/var/spack/repos/builtin/packages/sbt/package.py +++ b/var/spack/repos/builtin/packages/sbt/package.py @@ -29,10 +29,11 @@ import shutil class Sbt(Package): """Scala Build Tool""" - homepage = "http://www.scala-sbt.org" - url = "https://dl.bintray.com/sbt/native-packages/sbt/0.13.12/sbt-0.13.12.tgz" + homepage = 'http://www.scala-sbt.org' + url = 'https://github.com/sbt/sbt/releases/download/v1.1.4/sbt-1.1.4.tgz' - version('0.13.12', 'cec3071d46ef13334c8097cc3467ff28') + version('1.1.4', 'c71e5fa846164d14d4cd450520d66c6a') + version('0.13.17', 'c52c6152cc7aadfd1f0736a1a5d0a5b8') depends_on('java') -- cgit v1.2.3-70-g09d2 From 6bf9f6656716d76f573167ef9a1220ac9ca9be77 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 21 May 2018 11:52:25 -0500 Subject: Add cryptopp 7.0.0 (#8224) --- .../repos/builtin/packages/cryptopp/package.py | 29 ++++++++-------------- 1 file changed, 11 insertions(+), 18 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cryptopp/package.py b/var/spack/repos/builtin/packages/cryptopp/package.py index 171fa388ad..8e8eaafdc8 100644 --- a/var/spack/repos/builtin/packages/cryptopp/package.py +++ b/var/spack/repos/builtin/packages/cryptopp/package.py @@ -22,36 +22,29 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## -import glob from spack import * -class Cryptopp(Package): +class Cryptopp(MakefilePackage): """Crypto++ is an open-source C++ library of cryptographic schemes. The - library supports a number of different cryptography algorithms, - including authenticated encryption schemes (GCM, CCM), hash - functions (SHA-1, SHA2), public-key encryption (RSA, DSA), and a - few obsolete/historical encryption algorithms (MD5, Panama). - - """ + library supports a number of different cryptography algorithms, including + authenticated encryption schemes (GCM, CCM), hash functions (SHA-1, SHA2), + public-key encryption (RSA, DSA), and a few obsolete/historical encryption + algorithms (MD5, Panama).""" homepage = "http://www.cryptopp.com" - url = "http://www.cryptopp.com/cryptopp563.zip" + url = "http://www.cryptopp.com/cryptopp700.zip" + version('7.0.0', '8f34884b572901b6ede89bd18f1c7ef6') version('5.6.3', '3c5b70e2ec98b7a24988734446242d07') version('5.6.2', '7ed022585698df48e65ce9218f6c6a67') version('5.6.1', '96cbeba0907562b077e26bcffb483828') + depends_on('gmake', type='build') + def url_for_version(self, version): - url = "{0}/{1}{2}.zip" + url = '{0}/{1}{2}.zip' return url.format(self.homepage, self.name, version.joined) def install(self, spec, prefix): - make() - - mkdirp(prefix.include) - for hfile in glob.glob('*.h*'): - install(hfile, prefix.include) - - mkdirp(prefix.lib) - install('libcryptopp.a', prefix.lib) + make('install', 'PREFIX={0}'.format(prefix)) -- cgit v1.2.3-70-g09d2 From 15634c20fee713f0c0b8e76107654ba9e7294e6c Mon Sep 17 00:00:00 2001 From: mcneish1 <35310375+mcneish1@users.noreply.github.com> Date: Mon, 21 May 2018 13:53:55 -0700 Subject: Update the hash of libjpeg v9c. (#8230) The maintainer redid the archive in March, removing a .directory file. --- var/spack/repos/builtin/packages/libjpeg/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libjpeg/package.py b/var/spack/repos/builtin/packages/libjpeg/package.py index 9a378157da..c3386c5ee1 100644 --- a/var/spack/repos/builtin/packages/libjpeg/package.py +++ b/var/spack/repos/builtin/packages/libjpeg/package.py @@ -33,7 +33,7 @@ class Libjpeg(AutotoolsPackage): homepage = "http://www.ijg.org" url = "http://www.ijg.org/files/jpegsrc.v9c.tar.gz" - version('9c', '7794e558c60605424fb1025d836fbf47') + version('9c', '93c62597eeef81a84d988bccbda1e990') version('9b', '6a9996ce116ec5c52b4870dbcd6d3ddb') version('9a', '3353992aecaee1805ef4109aadd433e7') -- cgit v1.2.3-70-g09d2 From 6ec603860a91f5ade3b3bb785bf801a9fb838c0b Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 21 May 2018 15:57:25 -0500 Subject: py-testinfra: Add versions 1.12.0 and 1.13.0 (#8222) --- var/spack/repos/builtin/packages/py-testinfra/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-testinfra/package.py b/var/spack/repos/builtin/packages/py-testinfra/package.py index c936a1955e..50e098bb7e 100644 --- a/var/spack/repos/builtin/packages/py-testinfra/package.py +++ b/var/spack/repos/builtin/packages/py-testinfra/package.py @@ -33,6 +33,8 @@ class PyTestinfra(PythonPackage): homepage = "https://testinfra.readthedocs.io" url = "https://pypi.python.org/packages/source/t/testinfra/testinfra-1.11.1.tar.gz" + version('1.13.0', '1e0a135c784207f8609e7730901f1291') + version('1.12.0', '9784c01d7af3d624c6ec3cd25cce2011') version('1.11.1', 'c64ce6b16661d647c62c9508de419f5f') depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From 729c3f916870f478cd6262fb8d6dbbd2813cc2f3 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 21 May 2018 15:58:11 -0500 Subject: Add bmake 20180512 (#8221) * Add bmake 20180512 * Re-add manpage patch --- var/spack/repos/builtin/packages/bmake/package.py | 34 ++++++++++++----------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bmake/package.py b/var/spack/repos/builtin/packages/bmake/package.py index c590c6143a..8dd5950de6 100644 --- a/var/spack/repos/builtin/packages/bmake/package.py +++ b/var/spack/repos/builtin/packages/bmake/package.py @@ -23,29 +23,31 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -import re class Bmake(Package): - """bmake: portable BSD make + """Portable version of NetBSD make(1).""" - bmake is the BSD make(1) utility ported to several non-BSD - systems. It supports GNU's autoconf.""" - - homepage = "http://www.crufty.net/FreeWare/" - url = "ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg/bmake-20171207.tar.gz" + homepage = "http://www.crufty.net/help/sjg/bmake.htm" + url = "http://www.crufty.net/ftp/pub/sjg/bmake-20180512.tar.gz" + version('20180512', '48ba5933833a7f224d76ce482eedfec0') version('20171207', '5d7f2f85f16c4a6ba34ceea68957447f') - def install(self, spec, prefix): + phases = ['configure', 'build', 'install'] + + def patch(self): # Do not pre-roff cat pages - mk_file = FileFilter('mk/man.mk') - mk_file.filter(re.escape(r'MANTARGET?'), 'MANTARGET') + filter_file('MANTARGET?', 'MANTARGET', 'mk/man.mk', string=True) + + def configure(self, spec, prefix): + sh = which('sh') + sh('boot-strap', 'op=configure') + + def build(self, spec, prefix): + sh = which('sh') + sh('boot-strap', 'op=build') - # -DWITHOUT_PROG_LINK does not symlink bmake as - # -"bmake-VERSION" + def install(self, spec, prefix): sh = which('sh') - sh('boot-strap', '--prefix={0}'.format(prefix), - '-DWITHOUT_PROG_LINK', '--install') - mkdirp(prefix.man1) - install('bmake.1', join_path(prefix.man1, 'bmake.1')) + sh('boot-strap', '--prefix={0}'.format(prefix), 'op=install') -- cgit v1.2.3-70-g09d2 From ed0f5e9b4cdf42daffec36372a6c212f66ef896f Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 21 May 2018 15:58:51 -0500 Subject: Add missing dependencies to poppler package (#8220) --- .../repos/builtin/packages/poppler-data/package.py | 41 +++++++ .../repos/builtin/packages/poppler/package.py | 124 ++++++++++++++++++++- 2 files changed, 162 insertions(+), 3 deletions(-) create mode 100644 var/spack/repos/builtin/packages/poppler-data/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/poppler-data/package.py b/var/spack/repos/builtin/packages/poppler-data/package.py new file mode 100644 index 0000000000..76052bc530 --- /dev/null +++ b/var/spack/repos/builtin/packages/poppler-data/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PopplerData(CMakePackage): + """This package consists of encoding files for use with poppler. The + encoding files are optional and poppler will automatically read them if + they are present. When installed, the encoding files enables poppler to + correctly render CJK and Cyrrilic properly. While poppler is licensed + under the GPL, these encoding files have different license, and thus + distributed separately.""" + + homepage = "https://poppler.freedesktop.org/" + url = "https://poppler.freedesktop.org/poppler-data-0.4.9.tar.gz" + + version('0.4.9', '35cc7beba00aa174631466f06732be40') + + depends_on('cmake@2.6:', type='build') diff --git a/var/spack/repos/builtin/packages/poppler/package.py b/var/spack/repos/builtin/packages/poppler/package.py index 8a8f9d3cf9..3feb832778 100644 --- a/var/spack/repos/builtin/packages/poppler/package.py +++ b/var/spack/repos/builtin/packages/poppler/package.py @@ -28,9 +28,127 @@ from spack import * class Poppler(CMakePackage): """Poppler is a PDF rendering library based on the xpdf-3.0 code base.""" - homepage = "http://poppler.freedesktop.org" - url = "https://poppler.freedesktop.org/poppler-0.64.0.tar.xz" + homepage = "https://poppler.freedesktop.org" + url = "https://poppler.freedesktop.org/poppler-0.65.0.tar.xz" + list_url = "https://poppler.freedesktop.org/releases.html" + version('0.65.0', 'b9a0af02e43deb26265f130343e90d78') version('0.64.0', 'f7f687ebb60004f8ad61994575018044') - depends_on('openjpeg', type=('build', 'run')) + variant('cms', default=False, description='Use color management system') + variant('glib', default=False, description='Compile poppler glib wrapper') + variant('gobject', default=False, description='Generate GObject introspection') + variant('libcurl', default=False, description='Build libcurl based HTTP support') + variant('openjpeg', default=False, description='Use libopenjpeg for JPX streams') + variant('qt5', default=False, description='Compile poppler qt5 wrapper') + variant('zlib', default=False, description='Build with zlib') + variant('cairo', default=False, description='Search for Cairo package') + variant('iconv', default=False, description='Search for Iconv package') + variant('jpeg', default=False, description='Search for JPEG package') + variant('png', default=False, description='Search for PNG package') + variant('tiff', default=False, description='Search for TIFF package') + + depends_on('cmake@3.1.0:', type='build') + depends_on('pkgconfig', type='build') + depends_on('poppler-data', type=('build', 'run')) + depends_on('fontconfig') + depends_on('freetype') + + depends_on('lcms', when='+cms') + depends_on('glib', when='+glib') + depends_on('gobject-introspection', when='+gobject') + depends_on('curl', when='+libcurl') + depends_on('openjpeg', when='+openjpeg') + depends_on('qt@5.0:5.999', when='+qt5') + depends_on('zlib', when='+zlib') + depends_on('cairo', when='+cairo') + depends_on('libiconv', when='+iconv') + depends_on('jpeg', when='+jpeg') + depends_on('libpng', when='+png') + depends_on('libtiff', when='+tiff') + + # Only needed to run `make test` + resource( + name='test', + git='git://git.freedesktop.org/git/poppler/test', + placement='testdata' + ) + + def cmake_args(self): + spec = self.spec + + args = [ + '-DTESTDATADIR={0}'.format( + join_path(self.stage.source_path, 'testdata')), + # TODO: Add packages for these missing dependencies + '-DENABLE_SPLASH=OFF', + '-DWITH_NSS3=OFF', + ] + + if '+cms' in spec: + args.append('-DENABLE_CMS=lcms2') + else: + args.append('-DENABLE_CMS=none') + + if '+glib' in spec: + args.append('-DENABLE_GLIB=ON') + else: + args.append('-DENABLE_GLIB=OFF') + + if '+gobject' in spec: + args.append('-DENABLE_GOBJECT_INTROSPECTION=ON') + else: + args.append('-DENABLE_GOBJECT_INTROSPECTION=OFF') + + if '+libcurl' in spec: + args.append('-DENABLE_LIBCURL=ON') + else: + args.append('-DENABLE_LIBCURL=OFF') + + if '+openjpeg' in spec: + args.append('-DENABLE_LIBOPENJPEG=openjpeg2') + else: + args.append('-DENABLE_LIBOPENJPEG=none') + + if '+qt5' in spec: + args.append('-DENABLE_QT5=ON') + else: + args.append('-DENABLE_QT5=OFF') + + if '+zlib' in spec: + args.append('-DENABLE_ZLIB=ON') + else: + args.append('-DENABLE_ZLIB=OFF') + + if '+cairo' in spec: + args.append('-DWITH_Cairo=ON') + else: + args.append('-DWITH_Cairo=OFF') + + if '+iconv' in spec: + args.append('-DWITH_Iconv=ON') + else: + args.append('-DWITH_Iconv=OFF') + + if '+jpeg' in spec: + args.extend([ + '-DENABLE_DCTDECODER=libjpeg', + '-DWITH_JPEG=ON' + ]) + else: + args.extend([ + '-DENABLE_DCTDECODER=none', + '-DWITH_JPEG=OFF' + ]) + + if '+png' in spec: + args.append('-DWITH_PNG=ON') + else: + args.append('-DWITH_PNG=OFF') + + if '+tiff' in spec: + args.append('-DWITH_TIFF=ON') + else: + args.append('-DWITH_TIFF=OFF') + + return args -- cgit v1.2.3-70-g09d2 From ac2b0f3ac091a93cf19ccf473e76ce228f1e82cd Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 21 May 2018 15:59:11 -0500 Subject: Add lcms 2.9 (#8219) --- var/spack/repos/builtin/packages/lcms/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lcms/package.py b/var/spack/repos/builtin/packages/lcms/package.py index ca54ebf25f..8ae900aaa0 100644 --- a/var/spack/repos/builtin/packages/lcms/package.py +++ b/var/spack/repos/builtin/packages/lcms/package.py @@ -29,9 +29,11 @@ class Lcms(AutotoolsPackage): """Little cms is a color management library. Implements fast transforms between ICC profiles. It is focused on speed, and is portable across several platforms (MIT license).""" + homepage = "http://www.littlecms.com" - url = "http://downloads.sourceforge.net/project/lcms/lcms/2.8/lcms2-2.8.tar.gz" + url = "http://downloads.sourceforge.net/project/lcms/lcms/2.9/lcms2-2.9.tar.gz" + version('2.9', '8de1b7724f578d2995c8fdfa35c3ad0e') version('2.8', '87a5913f1a52464190bb655ad230539c') version('2.6', 'f4c08d38ceade4a664ebff7228910a33') -- cgit v1.2.3-70-g09d2 From fba365dc6abf8f2ccbc535f8ab81abeaa7e8add4 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 21 May 2018 15:59:50 -0500 Subject: Add Python/Ruby bindings to GEOS package (#8218) * Add python/ruby bindings to GEOS package * Add comment on Python 3 support --- var/spack/repos/builtin/packages/geos/package.py | 55 +++++++++++++++--------- 1 file changed, 35 insertions(+), 20 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/geos/package.py b/var/spack/repos/builtin/packages/geos/package.py index 609073cc99..4589a05e30 100644 --- a/var/spack/repos/builtin/packages/geos/package.py +++ b/var/spack/repos/builtin/packages/geos/package.py @@ -25,7 +25,7 @@ from spack import * -class Geos(Package): +class Geos(AutotoolsPackage): """GEOS (Geometry Engine - Open Source) is a C++ port of the Java Topology Suite (JTS). As such, it aims to contain the complete functionality of JTS in C++. This includes all the OpenGIS @@ -33,15 +33,12 @@ class Geos(Package): operators, as well as specific JTS enhanced topology functions.""" homepage = "http://trac.osgeo.org/geos/" - url = "http://download.osgeo.org/geos/geos-3.4.2.tar.bz2" + url = "http://download.osgeo.org/geos/geos-3.6.2.tar.bz2" - # Versions from 3.5.1 support Autotools and CMake version('3.6.2', 'a32142343c93d3bf151f73db3baa651f') version('3.6.1', 'c97e338b3bc81f9848656e9d693ca6cc') version('3.6.0', '55de5fdf075c608d2d7b9348179ee649') version('3.5.1', '2e3e1ccbd42fee9ec427106b65e43dc0') - - # Versions through 3.5.0 have CMake, but only Autotools is supported version('3.5.0', '136842690be7f504fba46b3c539438dd') version('3.4.3', '77f2c2cca1e9f49bc1bece9037ac7a7a') version('3.4.2', 'fc5df2d926eb7e67f988a43a92683bae') @@ -55,21 +52,39 @@ class Geos(Package): version('3.3.4', '1bb9f14d57ef06ffa41cb1d67acb55a1') version('3.3.3', '8454e653d7ecca475153cc88fd1daa26') -# # Python3 is not supported. -# variant('python', default=False, description='Enable Python support') + # Ruby bindings are fully supported + variant('ruby', default=False, description='Enable Ruby support') -# extends('python', when='+python') -# depends_on('python', when='+python') -# depends_on('swig', when='+python') + # Since version 3.0, the Python bindings are unsupported + variant('python', default=False, description='Enable Python support') - def install(self, spec, prefix): - args = ["--prefix=%s" % prefix] -# if '+python' in spec: -# os.environ['PYTHON'] = spec['python'].command.path -# os.environ['SWIG'] = spec['swig'].command.path -# -# args.append("--enable-python") + extends('ruby', when='+ruby') + + # Python 3 is supposedly supported, but I couldn't get it to work + # https://trac.osgeo.org/geos/ticket/774 + extends('python@:2', when='+python') + + depends_on('swig', type='build', when='+ruby') + depends_on('swig', type='build', when='+python') + + # `make check` fails with: + # FAIL: geos_unit + + # I wasn't able to get the ruby bindings working. + # It resulted in "Undefined symbols for architecture x86_64". + + def configure_args(self): + spec = self.spec + args = [] + + if '+ruby' in spec: + args.append('--enable-ruby') + else: + args.append('--disable-ruby') + + if '+python' in spec: + args.append('--enable-python') + else: + args.append('--disable-python') - configure(*args) - make() - make("install") + return args -- cgit v1.2.3-70-g09d2 From 8564be5479fade304379f6461ece03b8740230b4 Mon Sep 17 00:00:00 2001 From: Dan FitzGerald <38731008+basicmanfitz@users.noreply.github.com> Date: Mon, 21 May 2018 17:00:10 -0400 Subject: Rename Tpetra C wrappers for *gemm Fortran functions in Trilinos 12.12.1 (#8228) * Updated trilinos to compile/install with xl_r * Undo PGI patch added as part of Trilinos XL fix * Remove PGI related changes in Trilinos XL fix --- .../repos/builtin/packages/trilinos/package.py | 6 +- .../builtin/packages/trilinos/xlf_tpetra.patch | 289 +++++++++++++++++++++ 2 files changed, 293 insertions(+), 2 deletions(-) create mode 100644 var/spack/repos/builtin/packages/trilinos/xlf_tpetra.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 7b36aa19ab..21cae3a7a9 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -251,8 +251,10 @@ class Trilinos(CMakePackage): depends_on('swig', when='+python') patch('umfpack_from_suitesparse.patch', when='@11.14.1:12.8.1') - patch('xlf_seacas.patch', when='@12.10.1%xl') - patch('xlf_seacas.patch', when='@12.10.1%xl_r') + patch('xlf_seacas.patch', when='@12.10.1:%xl') + patch('xlf_seacas.patch', when='@12.10.1:%xl_r') + patch('xlf_tpetra.patch', when='@12.12.1:%xl') + patch('xlf_tpetra.patch', when='@12.12.1:%xl_r') def url_for_version(self, version): url = "https://github.com/trilinos/Trilinos/archive/trilinos-release-{0}.tar.gz" diff --git a/var/spack/repos/builtin/packages/trilinos/xlf_tpetra.patch b/var/spack/repos/builtin/packages/trilinos/xlf_tpetra.patch new file mode 100644 index 0000000000..364bd28cb0 --- /dev/null +++ b/var/spack/repos/builtin/packages/trilinos/xlf_tpetra.patch @@ -0,0 +1,289 @@ +--- a/packages/tpetra/core/src/Tpetra_Details_libGemm.cpp ++++ b/packages/tpetra/core/src/Tpetra_Details_libGemm.cpp +@@ -108,19 +108,19 @@ + namespace Impl { + + void +-cgemm (const char transA, +- const char transB, +- const int m, +- const int n, +- const int k, +- const ::Kokkos::complex& alpha, +- const ::Kokkos::complex A[], +- const int lda, +- const ::Kokkos::complex B[], +- const int ldb, +- const ::Kokkos::complex& beta, +- ::Kokkos::complex C[], +- const int ldc) ++cgemm_fwrap (const char transA, ++ const char transB, ++ const int m, ++ const int n, ++ const int k, ++ const ::Kokkos::complex& alpha, ++ const ::Kokkos::complex A[], ++ const int lda, ++ const ::Kokkos::complex B[], ++ const int ldb, ++ const ::Kokkos::complex& beta, ++ ::Kokkos::complex C[], ++ const int ldc) + { + #ifdef HAVE_TPETRA_INST_COMPLEX_FLOAT + TPETRACORE_CGEMM (&transA, &transB, &m, &n, &k, &alpha, A, &lda, B, &ldb, &beta, C, &ldc); +@@ -131,55 +131,55 @@ + } + + void +-dgemm (const char transA, +- const char transB, +- const int m, +- const int n, +- const int k, +- const double alpha, +- const double A[], +- const int lda, +- const double B[], +- const int ldb, +- const double beta, +- double C[], +- const int ldc) ++dgemm_fwrap (const char transA, ++ const char transB, ++ const int m, ++ const int n, ++ const int k, ++ const double alpha, ++ const double A[], ++ const int lda, ++ const double B[], ++ const int ldb, ++ const double beta, ++ double C[], ++ const int ldc) + { + TPETRACORE_DGEMM (&transA, &transB, &m, &n, &k, &alpha, A, &lda, B, &ldb, &beta, C, &ldc); + } + + void +-sgemm (const char transA, +- const char transB, +- const int m, +- const int n, +- const int k, +- const float alpha, +- const float A[], +- const int lda, +- const float B[], +- const int ldb, +- const float beta, +- float C[], +- const int ldc) ++sgemm_fwrap (const char transA, ++ const char transB, ++ const int m, ++ const int n, ++ const int k, ++ const float alpha, ++ const float A[], ++ const int lda, ++ const float B[], ++ const int ldb, ++ const float beta, ++ float C[], ++ const int ldc) + { + TPETRACORE_SGEMM (&transA, &transB, &m, &n, &k, &alpha, A, &lda, B, &ldb, &beta, C, &ldc); + } + + void +-zgemm (const char transA, +- const char transB, +- const int m, +- const int n, +- const int k, +- const ::Kokkos::complex& alpha, +- const ::Kokkos::complex A[], +- const int lda, +- const ::Kokkos::complex B[], +- const int ldb, +- const ::Kokkos::complex& beta, +- ::Kokkos::complex C[], +- const int ldc) ++zgemm_fwrap (const char transA, ++ const char transB, ++ const int m, ++ const int n, ++ const int k, ++ const ::Kokkos::complex& alpha, ++ const ::Kokkos::complex A[], ++ const int lda, ++ const ::Kokkos::complex B[], ++ const int ldb, ++ const ::Kokkos::complex& beta, ++ ::Kokkos::complex C[], ++ const int ldc) + { + #ifdef HAVE_TPETRA_INST_COMPLEX_DOUBLE + TPETRACORE_ZGEMM (&transA, &transB, &m, &n, &k, &alpha, A, &lda, B, &ldb, &beta, C, &ldc); + +--- a/packages/tpetra/core/src/Tpetra_Details_libGemm.hpp ++++ b/packages/tpetra/core/src/Tpetra_Details_libGemm.hpp +@@ -99,67 +99,67 @@ + + /// \brief Wrapped version of the BLAS library's cgemm. + void +-cgemm (const char char_transA, +- const char char_transB, +- const int m, +- const int n, +- const int k, +- const ::Kokkos::complex& alpha, +- const ::Kokkos::complex A[], +- const int lda, +- const ::Kokkos::complex B[], +- const int ldb, +- const ::Kokkos::complex& beta, +- ::Kokkos::complex C[], +- const int ldc); ++cgemm_fwrap (const char char_transA, ++ const char char_transB, ++ const int m, ++ const int n, ++ const int k, ++ const ::Kokkos::complex& alpha, ++ const ::Kokkos::complex A[], ++ const int lda, ++ const ::Kokkos::complex B[], ++ const int ldb, ++ const ::Kokkos::complex& beta, ++ ::Kokkos::complex C[], ++ const int ldc); + + /// \brief Wrapped version of the BLAS library's dgemm. + void +-dgemm (const char char_transA, +- const char char_transB, +- const int m, +- const int n, +- const int k, +- const double alpha, +- const double A[], +- const int lda, +- const double B[], +- const int ldb, +- const double beta, +- double C[], +- const int ldc); ++dgemm_fwrap (const char char_transA, ++ const char char_transB, ++ const int m, ++ const int n, ++ const int k, ++ const double alpha, ++ const double A[], ++ const int lda, ++ const double B[], ++ const int ldb, ++ const double beta, ++ double C[], ++ const int ldc); + + /// \brief Wrapped version of the BLAS library's sgemm. + void +-sgemm (const char char_transA, +- const char char_transB, +- const int m, +- const int n, +- const int k, +- const float alpha, +- const float A[], +- const int lda, +- const float B[], +- const int ldb, +- const float beta, +- float C[], +- const int ldc); ++sgemm_fwrap (const char char_transA, ++ const char char_transB, ++ const int m, ++ const int n, ++ const int k, ++ const float alpha, ++ const float A[], ++ const int lda, ++ const float B[], ++ const int ldb, ++ const float beta, ++ float C[], ++ const int ldc); + + /// \brief Wrapped version of the BLAS library's zgemm. + void +-zgemm (const char char_transA, +- const char char_transB, +- const int m, +- const int n, +- const int k, +- const ::Kokkos::complex& alpha, +- const ::Kokkos::complex A[], +- const int lda, +- const ::Kokkos::complex B[], +- const int ldb, +- const ::Kokkos::complex& beta, +- ::Kokkos::complex C[], +- const int ldc); ++zgemm_fwrap (const char char_transA, ++ const char char_transB, ++ const int m, ++ const int n, ++ const int k, ++ const ::Kokkos::complex& alpha, ++ const ::Kokkos::complex A[], ++ const int lda, ++ const ::Kokkos::complex B[], ++ const int ldb, ++ const ::Kokkos::complex& beta, ++ ::Kokkos::complex C[], ++ const int ldc); + + /// \brief Wrapper for the above wrappers, templated on scalar type + /// (the type of each entry in the matrices). +@@ -184,7 +184,7 @@ + scalar_type C[], + const int ldc) + { +- return cgemm (transA, transB, m, n, k, alpha, A, lda, B, ldb, beta, C, ldc); ++ return cgemm_fwrap (transA, transB, m, n, k, alpha, A, lda, B, ldb, beta, C, ldc); + } + }; + +@@ -207,7 +207,7 @@ + scalar_type C[], + const int ldc) + { +- return dgemm (transA, transB, m, n, k, alpha, A, lda, B, ldb, beta, C, ldc); ++ return dgemm_fwrap (transA, transB, m, n, k, alpha, A, lda, B, ldb, beta, C, ldc); + } + }; + +@@ -230,7 +230,7 @@ + scalar_type C[], + const int ldc) + { +- return sgemm (transA, transB, m, n, k, alpha, A, lda, B, ldb, beta, C, ldc); ++ return sgemm_fwrap (transA, transB, m, n, k, alpha, A, lda, B, ldb, beta, C, ldc); + } + }; + +@@ -253,7 +253,7 @@ + scalar_type C[], + const int ldc) + { +- return zgemm (transA, transB, m, n, k, alpha, A, lda, B, ldb, beta, C, ldc); ++ return zgemm_fwrap (transA, transB, m, n, k, alpha, A, lda, B, ldb, beta, C, ldc); + } + }; + -- cgit v1.2.3-70-g09d2 From d7aaf4e19341ae4cd9fb57f5c2b456e0c7caa267 Mon Sep 17 00:00:00 2001 From: Jim Galarowicz Date: Mon, 21 May 2018 16:03:31 -0500 Subject: Add urls into cbtf* and openspeedshop* package files and update the release versions for the Krell products (#8188) --- .../builtin/packages/cbtf-argonavis-gui/package.py | 24 +++++------ .../builtin/packages/cbtf-argonavis/package.py | 28 ++++++------ .../repos/builtin/packages/cbtf-krell/package.py | 50 +++++++++++----------- .../repos/builtin/packages/cbtf-lanl/package.py | 26 +++++------ var/spack/repos/builtin/packages/cbtf/package.py | 6 +-- .../packages/openspeedshop-utils/package.py | 45 ++++++++++--------- .../builtin/packages/openspeedshop/package.py | 46 +++++++++++--------- .../repos/builtin/packages/qtgraph/package.py | 8 +--- 8 files changed, 121 insertions(+), 112 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py index 8ba4e23267..4f2d7645e8 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py @@ -48,18 +48,16 @@ class CbtfArgonavisGui(QMakePackage): performance information by loading in the Sqlite database files. """ homepage = "http://sourceforge.net/p/cbtf/wiki/Home/" + url = "https://github.com/OpenSpeedShop/cbtf-argonavis-gui.git" version('1.3.0.0', branch='1.3.0.0', git='https://github.com/OpenSpeedShop/cbtf-argonavis-gui.git') - version('1.3.0', branch='master', - git='https://github.com/OpenSpeedShop/cbtf-argonavis-gui.git') - version('develop', branch='master', git='https://github.com/OpenSpeedShop/cbtf-argonavis-gui.git') depends_on("cmake@3.0.2:", when='@develop', type='build') - depends_on("cmake@3.11.1", when='@1.3.0.0', type='build') + depends_on("cmake@3.11.1", when='@1.3.0.0:', type='build') # To specify ^elfutils@0.170 on the command line spack # apparently needs/wants this dependency explicity here @@ -67,36 +65,36 @@ class CbtfArgonavisGui(QMakePackage): depends_on("elf", type="link") depends_on('qt@4.8.6:', when='@develop') - depends_on('qt@5.10.0', when='@1.3.0.0') + depends_on('qt@5.10.0', when='@1.3.0.0:') depends_on("boost@1.50.0:", when='@develop') - depends_on("boost@1.66.0", when='@1.3.0.0') + depends_on("boost@1.66.0", when='@1.3.0.0:') # For MRNet depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop') - depends_on("mrnet@5.0.1-3+lwthreads", when='@1.3.0.0') + depends_on("mrnet@5.0.1-3+lwthreads", when='@1.3.0.0:') # Dependencies for the openspeedshop cbtf packages. depends_on("cbtf@develop", when='@develop') - depends_on("cbtf@1.9.1.0", when='@1.3.0.0') + depends_on("cbtf@1.9.1.0:", when='@1.3.0.0:') depends_on("cbtf-krell@develop", when='@develop') - depends_on("cbtf-krell@1.9.1.0", when='@1.3.0.0') + depends_on("cbtf-krell@1.9.1.0:", when='@1.3.0.0:') depends_on("cbtf-argonavis@develop", when='@develop') - depends_on("cbtf-argonavis@1.9.1.0", when='@1.3.0.0') + depends_on("cbtf-argonavis@1.9.1.0:", when='@1.3.0.0:') depends_on("cuda") depends_on("openspeedshop-utils+cuda@develop", when='@develop') - depends_on("openspeedshop-utils@2.3.1.3+cuda", when='@1.3.0.0') + depends_on("openspeedshop-utils@2.3.1.3:+cuda", when='@1.3.0.0:') # For Xerces-C depends_on("xerces-c@3.1.1:", when='@develop') - depends_on("xerces-c@3.1.4", when='@1.3.0.0') + depends_on("xerces-c@3.1.4", when='@1.3.0.0:') depends_on("graphviz@2.40.1:", when='@develop') - depends_on("graphviz@2.40.1", when='@1.3.0.0') + depends_on("graphviz@2.40.1", when='@1.3.0.0:') depends_on("qtgraph") diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py index 0bffad266c..62b42dc6da 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py @@ -49,11 +49,12 @@ class CbtfArgonavis(CMakePackage): """ homepage = "http://sourceforge.net/p/cbtf/wiki/Home/" + url = "https://github.com/OpenSpeedShop/cbtf-argonavis.git" - version('1.9.1.0', branch='1.9.1.0', + version('1.9.1.1', branch='1.9.1.1', git='https://github.com/OpenSpeedShop/cbtf-argonavis.git') - version('1.9.1', branch='master', + version('1.9.1.0', branch='1.9.1.0', git='https://github.com/OpenSpeedShop/cbtf-argonavis.git') version('develop', branch='master', @@ -69,7 +70,8 @@ class CbtfArgonavis(CMakePackage): variant('build_type', default='None', values=('None'), description='CMake build type') - depends_on("cmake@3.0.2:", type='build') + depends_on("cmake@3.11.1", when='@1.9.1.0:', type='build') + depends_on("cmake@3.0.2:", when='@develop', type='build') # To specify ^elfutils@0.170 on the command line spack # apparently needs/wants this dependency explicity here @@ -78,42 +80,42 @@ class CbtfArgonavis(CMakePackage): # For boost depends_on("boost@1.50.0:", when='@develop') - depends_on("boost@1.66.0", when='@1.9.1.0') + depends_on("boost@1.66.0", when='@1.9.1.0:') # For MRNet depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti') depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop~cti') - depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0+cti') - depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0~cti') + depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0:+cti') + depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0:~cti') # For CBTF depends_on("cbtf@develop", when='@develop') - depends_on("cbtf@1.9.1.0", when='@1.9.1.0') + depends_on("cbtf@1.9.1.0:", when='@1.9.1.0:') # For CBTF with cti depends_on("cbtf@develop+cti", when='@develop+cti') - depends_on("cbtf@1.9.1.0+cti", when='@1.9.1.0+cti') + depends_on("cbtf@1.9.1.0:+cti", when='@1.9.1.0:+cti') # For CBTF with runtime depends_on("cbtf@develop+runtime", when='@develop+runtime') - depends_on("cbtf@1.9.1.0+runtime", when='@1.9.1.0+runtime') + depends_on("cbtf@1.9.1.0:+runtime", when='@1.9.1.0:+runtime') # For libmonitor depends_on("libmonitor+krellpatch") # For PAPI depends_on("papi", when='@develop') - depends_on("papi@5.5.1", when='@1.9.1.0') + depends_on("papi@5.5.1", when='@1.9.1.0:') # For CBTF-KRELL depends_on("cbtf-krell@develop", when='@develop') - depends_on("cbtf-krell@1.9.1.0", when='@1.9.1.0') + depends_on("cbtf-krell@1.9.1.0:", when='@1.9.1.0:') depends_on('cbtf-krell@develop+cti', when='@develop+cti') - depends_on('cbtf-krell@1.9.1.0+cti', when='@1.9.1.0+cti') + depends_on('cbtf-krell@1.9.1.0:+cti', when='@1.9.1.0:+cti') depends_on('cbtf-krell@develop+runtime', when='@develop+runtime') - depends_on('cbtf-krell@1.9.1.0+runtime', when='@1.9.1.0+runtime') + depends_on('cbtf-krell@1.9.1.0:+runtime', when='@1.9.1.0:+runtime') # For CUDA depends_on("cuda") diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py index 5baaa2ba98..e7da53d7ba 100644 --- a/var/spack/repos/builtin/packages/cbtf-krell/package.py +++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py @@ -41,6 +41,7 @@ ########################################################################## from spack import * +import spack import spack.store @@ -52,11 +53,12 @@ class CbtfKrell(CMakePackage): """ homepage = "http://sourceforge.net/p/cbtf/wiki/Home/" + url = "https://github.com/OpenSpeedShop/cbtf-krell.git" - version('1.9.1.0', branch='1.9.1.0', + version('1.9.1.1', branch='1.9.1.1', git='https://github.com/OpenSpeedShop/cbtf-krell.git') - version('1.9.1', branch='master', + version('1.9.1.0', branch='1.9.1.0', git='https://github.com/OpenSpeedShop/cbtf-krell.git') version('develop', branch='master', @@ -86,51 +88,52 @@ class CbtfKrell(CMakePackage): to point to target build.") # Dependencies for cbtf-krell - depends_on("cmake@3.0.2:", type='build') + depends_on("cmake@3.11.1", when='@1.9.1.0:', type='build') + depends_on("cmake@3.0.2:", when='@develop', type='build') # For binutils depends_on("binutils", when='@develop') - depends_on("binutils@2.29.1", when='@1.9.1.0') + depends_on("binutils@2.29.1", when='@1.9.1.0:') # For boost depends_on("boost@1.50.0:", when='@develop') - depends_on("boost@1.66.0", when='@1.9.1.0') + depends_on("boost@1.66.0", when='@1.9.1.0:') # For Dyninst depends_on("dyninst@9.3.2:", when='@develop') - depends_on("dyninst@9.3.2", when='@1.9.1.0') + depends_on("dyninst@9.3.2", when='@1.9.1.0:') # For MRNet depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti') depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop') - depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0+cti') - depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0') + depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0:+cti') + depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0:') # For Xerces-C depends_on("xerces-c@3.1.1:", when='@develop') - depends_on("xerces-c@3.1.4", when='@1.9.1.0') + depends_on("xerces-c@3.1.4", when='@1.9.1.0:') # For CBTF depends_on("cbtf@develop", when='@develop') - depends_on("cbtf@1.9.1.0", when='@1.9.1.0') + depends_on("cbtf@1.9.1.0:", when='@1.9.1.0:') # For CBTF with cti depends_on("cbtf@develop+cti", when='@develop+cti') - depends_on("cbtf@1.9.1.0+cti", when='@1.9.1.0+cti') + depends_on("cbtf@1.9.1.0:+cti", when='@1.9.1.0:+cti') # For CBTF with runtime depends_on("cbtf@develop+runtime", when='@develop+runtime') - depends_on("cbtf@1.9.1.0+runtime", when='@1.9.1.0+runtime') + depends_on("cbtf@1.9.1.0:+runtime", when='@1.9.1.0:+runtime') # for services and collectors depends_on("libmonitor+krellpatch") depends_on("libunwind", when='@develop') - depends_on("libunwind@1.1", when='@1.9.1.0') + depends_on("libunwind@1.1", when='@1.9.1.0:') depends_on("papi", when='@develop') - depends_on("papi@5.5.1", when='@1.9.1.0') + depends_on("papi@5.5.1", when='@1.9.1.0:') depends_on("llvm-openmp-ompt@tr6_forwards+standalone") @@ -193,16 +196,15 @@ class CbtfKrell(CMakePackage): # the login node components with this spack invocation. We # need these paths to be the ones created in the CNL # spack invocation. - store = spack.store - be_cbtf = store.db.query_one('cbtf arch=cray-CNL-haswell') - be_cbtfk = store.db.query_one('cbtf-krell arch=cray-CNL-haswell') - be_papi = store.db.query_one('papi arch=cray-CNL-haswell') - be_boost = store.db.query_one('boost arch=cray-CNL-haswell') - be_mont = store.db.query_one('libmonitor arch=cray-CNL-haswell') - be_unw = store.db.query_one('libunwind arch=cray-CNL-haswell') - be_xer = store.db.query_one('xerces-c arch=cray-CNL-haswell') - be_dyn = store.db.query_one('dyninst arch=cray-CNL-haswell') - be_mrnet = store.db.query_one('mrnet arch=cray-CNL-haswell') + be_cbtf = spack.store.db.query_one('cbtf arch=cray-CNL-haswell') + be_cbtfk = spack.store.db.query_one('cbtf-krell arch=cray-CNL-haswell') + be_papi = spack.store.db.query_one('papi arch=cray-CNL-haswell') + be_boost = spack.store.db.query_one('boost arch=cray-CNL-haswell') + be_mont = spack.store.db.query_one('libmonitor arch=cray-CNL-haswell') + be_unw = spack.store.db.query_one('libunwind arch=cray-CNL-haswell') + be_xer = spack.store.db.query_one('xerces-c arch=cray-CNL-haswell') + be_dyn = spack.store.db.query_one('dyninst arch=cray-CNL-haswell') + be_mrnet = spack.store.db.query_one('mrnet arch=cray-CNL-haswell') CrayLoginNodeOptions.append('-DCN_RUNTIME_PLATFORM=%s' % rt_platform) diff --git a/var/spack/repos/builtin/packages/cbtf-lanl/package.py b/var/spack/repos/builtin/packages/cbtf-lanl/package.py index d327537cc3..e39a7cec5a 100644 --- a/var/spack/repos/builtin/packages/cbtf-lanl/package.py +++ b/var/spack/repos/builtin/packages/cbtf-lanl/package.py @@ -47,11 +47,12 @@ class CbtfLanl(CMakePackage): """CBTF LANL project contains a memory tool and data center type system command monitoring tool.""" homepage = "http://sourceforge.net/p/cbtf/wiki/Home/" + url = "https://github.com/OpenSpeedShop/cbtf-lanl.git" - version('1.9.1.0', branch='1.9.1.0', + version('1.9.1.1', branch='1.9.1.1', git='https://github.com/OpenSpeedShop/cbtf-lanl.git') - version('1.9.1', branch='master', + version('1.9.1.0', branch='1.9.1.0', git='https://github.com/OpenSpeedShop/cbtf-lanl.git') version('develop', branch='master', @@ -66,39 +67,40 @@ class CbtfLanl(CMakePackage): variant('cti', default=False, description="Build MRNet with the CTI startup option") - depends_on("cmake@3.0.2:", type='build') + depends_on("cmake@3.0.2:", when='@develop', type='build') + depends_on("cmake@3.11.1", when='@1.9.1.0:', type='build') # For MRNet depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti') depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop') - depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0+cti') - depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0') + depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0:+cti') + depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0:') # For Xerces-C depends_on("xerces-c@3.1.1:", when='@develop') - depends_on("xerces-c@3.1.4", when='@1.9.1.0') + depends_on("xerces-c@3.1.4", when='@1.9.1.0:') # For CBTF depends_on("cbtf@develop", when='@develop') - depends_on("cbtf@1.9.1.0", when='@1.9.1.0') + depends_on("cbtf@1.9.1.0:", when='@1.9.1.0:') # For CBTF with cti depends_on("cbtf@develop+cti", when='@develop+cti') - depends_on("cbtf@1.9.1.0+cti", when='@1.9.1.0+cti') + depends_on("cbtf@1.9.1.0:+cti", when='@1.9.1.0:+cti') # For CBTF with runtime depends_on("cbtf@develop+runtime", when='@develop+runtime') - depends_on("cbtf@1.9.1.0+runtime", when='@1.9.1.0+runtime') + depends_on("cbtf@1.9.1.0:+runtime", when='@1.9.1.0:+runtime') # For CBTF-KRELL depends_on("cbtf-krell@develop", when='@develop') - depends_on("cbtf-krell@1.9.1.0", when='@1.9.1.0') + depends_on("cbtf-krell@1.9.1.0:", when='@1.9.1.0:') depends_on('cbtf-krell@develop+cti', when='@develop+cti') - depends_on('cbtf-krell@1.9.1.0+cti', when='@1.9.1.0+cti') + depends_on('cbtf-krell@1.9.1.0:+cti', when='@1.9.1.0:+cti') depends_on('cbtf-krell@develop+runtime', when='@develop+runtime') - depends_on('cbtf-krell@1.9.1.0+runtime', when='@1.9.1.0+runtime') + depends_on('cbtf-krell@1.9.1.0:+runtime', when='@1.9.1.0:+runtime') parallel = False diff --git a/var/spack/repos/builtin/packages/cbtf/package.py b/var/spack/repos/builtin/packages/cbtf/package.py index 73e7227aba..2845efd446 100644 --- a/var/spack/repos/builtin/packages/cbtf/package.py +++ b/var/spack/repos/builtin/packages/cbtf/package.py @@ -51,13 +51,13 @@ class Cbtf(CMakePackage): """ homepage = "http://sourceforge.net/p/cbtf/wiki/Home" + url = "https://github.com/OpenSpeedShop/cbtf.git" # Use when the git repository is available - - version('1.9.1.0', branch='1.9.1.0', + version('1.9.1.1', branch='1.9.1.1', git='https://github.com/OpenSpeedShop/cbtf.git') - version('1.9.1', branch='master', + version('1.9.1.0', branch='1.9.1.0', git='https://github.com/OpenSpeedShop/cbtf.git') version('develop', branch='master', diff --git a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py index 12eee7c8b1..ab5bf2a791 100644 --- a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py @@ -72,7 +72,11 @@ class OpenspeedshopUtils(CMakePackage): url = "https://github.com/OpenSpeedShop/openspeedshop.git" # Use when the git repository is available - version('2.3.1.3', git='https://github.com/OpenSpeedShop/openspeedshop.git', tag='2.3.1.3') + version('2.3.1.4', branch='2.3.1.4', + git='https://github.com/OpenSpeedShop/openspeedshop.git') + + version('2.3.1.3', branch='2.3.1.3', + git='https://github.com/OpenSpeedShop/openspeedshop.git') version('develop', branch='master', git='https://github.com/OpenSpeedShop/openspeedshop.git') @@ -110,7 +114,8 @@ class OpenspeedshopUtils(CMakePackage): description="Build mpi collector for mpich\ MPI when variant is enabled.") - depends_on("cmake@3.0.2:", type='build') + depends_on("cmake@3.11.1", when='@2.3.1.3:', type='build') + depends_on("cmake@3.0.2:", when='@develop', type='build') # Dependencies for openspeedshop that are common to all # the variants of the OpenSpeedShop build @@ -120,7 +125,7 @@ class OpenspeedshopUtils(CMakePackage): # For binutils depends_on("binutils", when='@develop', type='build') - depends_on("binutils@2.29.1", when='@2.3.1.3', type='build') + depends_on("binutils@2.29.1", when='@2.3.1.3:', type='build') depends_on("elf", type="link") depends_on("libdwarf") @@ -129,57 +134,57 @@ class OpenspeedshopUtils(CMakePackage): # For boost depends_on("boost@1.50.0:", when='@develop') - depends_on("boost@1.66.0", when='@2.3.1.3') + depends_on("boost@1.66.0", when='@2.3.1.3:') depends_on("dyninst@9.3.2:", when='@develop') - depends_on("dyninst@9.3.2", when='@2.3.1.3') + depends_on("dyninst@9.3.2", when='@2.3.1.3:') depends_on("python", when='@develop') - depends_on("python@2.7.14", when='@2.3.1.3') + depends_on("python@2.7.14", when='@2.3.1.3:') depends_on("libxml2", when='@develop') - depends_on("libxml2@2.9.4", when='@2.3.1.3') + depends_on("libxml2@2.9.4", when='@2.3.1.3:') # Dependencies for the openspeedshop cbtf packages. depends_on("cbtf@develop", when='@develop') - depends_on("cbtf@1.9.1.0", when='@2.3.1.3') + depends_on("cbtf@1.9.1.0:", when='@2.3.1.3:') depends_on("cbtf-krell@develop", when='@develop') - depends_on("cbtf-krell@1.9.1.0", when='@2.3.1.3') + depends_on("cbtf-krell@1.9.1.0:", when='@2.3.1.3:') depends_on('cbtf-krell@develop+crayfe', when='@develop+crayfe') - depends_on('cbtf-krell@1.9.1.0+crayfe', when='@2.3.1.3+crayfe') + depends_on('cbtf-krell@1.9.1.0:+crayfe', when='@2.3.1.3:+crayfe') depends_on('cbtf-krell@develop+cti', when='@develop+cti') - depends_on('cbtf-krell@1.9.1.0+cti', when='@2.3.1.3+cti') + depends_on('cbtf-krell@1.9.1.0:+cti', when='@2.3.1.3:+cti') depends_on('cbtf-krell@develop+mpich', when='@develop+mpich') - depends_on('cbtf-krell@1.9.1.0+mpich', when='@2.3.1.3+mpich') + depends_on('cbtf-krell@1.9.1.0:+mpich', when='@2.3.1.3:+mpich') depends_on('cbtf-krell@develop+mpich2', when='@develop+mpich2') - depends_on('cbtf-krell@1.9.1.0+mpich2', when='@2.3.1.3+mpich2') + depends_on('cbtf-krell@1.9.1.0:+mpich2', when='@2.3.1.3:+mpich2') depends_on('cbtf-krell@develop+mpt', when='@develop+mpt') - depends_on('cbtf-krell@1.9.1.0+mpt', when='@2.3.1.3+mpt') + depends_on('cbtf-krell@1.9.1.0:+mpt', when='@2.3.1.3:+mpt') depends_on('cbtf-krell@develop+mvapich', when='@develop+mvapich') - depends_on('cbtf-krell@1.9.1.0+mvapich', when='@2.3.1.3+mvapich') + depends_on('cbtf-krell@1.9.1.0:+mvapich', when='@2.3.1.3:+mvapich') depends_on('cbtf-krell@develop+mvapich2', when='@develop+mvapich2') - depends_on('cbtf-krell@1.9.1.0+mvapich2', when='@2.3.1.3+mvapich2') + depends_on('cbtf-krell@1.9.1.0:+mvapich2', when='@2.3.1.3:+mvapich2') depends_on('cbtf-krell@develop+openmpi', when='@develop+openmpi') - depends_on('cbtf-krell@1.9.1.0+openmpi', when='@2.3.1.3+openmpi') + depends_on('cbtf-krell@1.9.1.0:+openmpi', when='@2.3.1.3:+openmpi') depends_on("cbtf-argonavis@develop", when='@develop+cuda') - depends_on("cbtf-argonavis@1.9.1.0", when='@2.3.1.3+cuda') + depends_on("cbtf-argonavis@1.9.1.0:", when='@2.3.1.3:+cuda') # For MRNet depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti') depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop') - depends_on("mrnet@5.0.1-3:+cti", when='@2.3.1.3+cti') - depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.3.1.3') + depends_on("mrnet@5.0.1-3:+cti", when='@2.3.1.3:+cti') + depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.3.1.3:') parallel = False diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py index dd9e8e8503..28938399a4 100644 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop/package.py @@ -66,7 +66,11 @@ class Openspeedshop(CMakePackage): url = "https://github.com/OpenSpeedShop/openspeedshop.git" # Use when the git repository is available - version('2.3.1.3', git='https://github.com/OpenSpeedShop/openspeedshop.git', tag='2.3.1.3') + version('2.3.1.4', branch='2.3.1.4', + git='https://github.com/OpenSpeedShop/openspeedshop.git') + + version('2.3.1.3', branch='2.3.1.3', + git='https://github.com/OpenSpeedShop/openspeedshop.git') version('develop', branch='master', git='https://github.com/OpenSpeedShop/openspeedshop.git') @@ -108,7 +112,8 @@ class Openspeedshop(CMakePackage): description="Build mpi collector for mpich\ MPI when variant is enabled.") - depends_on("cmake@3.0.2:", type='build') + depends_on("cmake@3.11.1", when='@2.3.1.3:', type='build') + depends_on("cmake@3.0.2:", when='@develop', type='build') # Dependencies for openspeedshop that are common to all # the variants of the OpenSpeedShop build @@ -118,7 +123,7 @@ class Openspeedshop(CMakePackage): # For binutils depends_on("binutils", when='@develop', type='build') - depends_on("binutils@2.29.1", when='@2.3.1.3', type='build') + depends_on("binutils@2.29.1", when='@2.3.1.3:', type='build') depends_on("elf", type="link") depends_on("libdwarf") @@ -127,59 +132,59 @@ class Openspeedshop(CMakePackage): # For boost depends_on("boost@1.50.0:", when='@develop') - depends_on("boost@1.66.0", when='@2.3.1.3') + depends_on("boost@1.66.0", when='@2.3.1.3:') depends_on("dyninst@9.3.2:", when='@develop') - depends_on("dyninst@9.3.2", when='@2.3.1.3') + depends_on("dyninst@9.3.2", when='@2.3.1.3:') depends_on("python", when='@develop') - depends_on("python@2.7.14", when='@2.3.1.3') + depends_on("python@2.7.14", when='@2.3.1.3:') depends_on("libxml2", when='@develop') - depends_on("libxml2@2.9.4", when='@2.3.1.3') + depends_on("libxml2@2.9.4", when='@2.3.1.3:') depends_on("qt@3.3.8b+krellpatch", when='gui=qt3') # Dependencies for the openspeedshop cbtf packages. depends_on("cbtf@develop", when='@develop') - depends_on("cbtf@1.9.1.0", when='@2.3.1.3') + depends_on("cbtf@1.9.1.0:", when='@2.3.1.3:') depends_on("cbtf-krell@develop", when='@develop') - depends_on("cbtf-krell@1.9.1.0", when='@2.3.1.3') + depends_on("cbtf-krell@1.9.1.0:", when='@2.3.1.3:') depends_on('cbtf-krell@develop+crayfe', when='@develop+crayfe') - depends_on('cbtf-krell@1.9.1.0+crayfe', when='@2.3.1.3+crayfe') + depends_on('cbtf-krell@1.9.1.0:+crayfe', when='@2.3.1.3:+crayfe') depends_on('cbtf-krell@develop+cti', when='@develop+cti') - depends_on('cbtf-krell@1.9.1.0+cti', when='@2.3.1.3+cti') + depends_on('cbtf-krell@1.9.1.0:+cti', when='@2.3.1.3:+cti') depends_on('cbtf-krell@develop+mpich', when='@develop+mpich') - depends_on('cbtf-krell@1.9.1.0+mpich', when='@2.3.1.3+mpich') + depends_on('cbtf-krell@1.9.1.0:+mpich', when='@2.3.1.3:+mpich') depends_on('cbtf-krell@develop+mpich2', when='@develop+mpich2') - depends_on('cbtf-krell@1.9.1.0+mpich2', when='@2.3.1.3+mpich2') + depends_on('cbtf-krell@1.9.1.0:+mpich2', when='@2.3.1.3:+mpich2') depends_on('cbtf-krell@develop+mpt', when='@develop+mpt') - depends_on('cbtf-krell@1.9.1.0+mpt', when='@2.3.1.3+mpt') + depends_on('cbtf-krell@1.9.1.0:+mpt', when='@2.3.1.3:+mpt') depends_on('cbtf-krell@develop+mvapich', when='@develop+mvapich') - depends_on('cbtf-krell@1.9.1.0+mvapich', when='@2.3.1.3+mvapich') + depends_on('cbtf-krell@1.9.1.0:+mvapich', when='@2.3.1.3:+mvapich') depends_on('cbtf-krell@develop+mvapich2', when='@develop+mvapich2') - depends_on('cbtf-krell@1.9.1.0+mvapich2', when='@2.3.1.3+mvapich2') + depends_on('cbtf-krell@1.9.1.0:+mvapich2', when='@2.3.1.3:+mvapich2') depends_on('cbtf-krell@develop+openmpi', when='@develop+openmpi') - depends_on('cbtf-krell@1.9.1.0+openmpi', when='@2.3.1.3+openmpi') + depends_on('cbtf-krell@1.9.1.0:+openmpi', when='@2.3.1.3:+openmpi') depends_on("cbtf-argonavis@develop", when='@develop+cuda') - depends_on("cbtf-argonavis@1.9.1.0", when='@2.3.1.3+cuda') + depends_on("cbtf-argonavis@1.9.1.0:", when='@2.3.1.3:+cuda') # For MRNet depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti') depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop') - depends_on("mrnet@5.0.1-3:+cti", when='@2.3.1.3+cti') - depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.3.1.3') + depends_on("mrnet@5.0.1-3:+cti", when='@2.3.1.3:+cti') + depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.3.1.3:') parallel = False @@ -345,7 +350,6 @@ class Openspeedshop(CMakePackage): os.path.dirname(oss_libdir.joined())) run_env.set('OPENSS_RAWDATA_DIR', '.') - cbtf_mc = '/sbin/cbtf_mrnet_commnode' cbtf_lmb = '/sbin/cbtf_libcbtf_mrnet_backend' run_env.set('XPLAT_RSH', 'ssh') diff --git a/var/spack/repos/builtin/packages/qtgraph/package.py b/var/spack/repos/builtin/packages/qtgraph/package.py index f4ffbaefcf..d151c98076 100644 --- a/var/spack/repos/builtin/packages/qtgraph/package.py +++ b/var/spack/repos/builtin/packages/qtgraph/package.py @@ -49,24 +49,20 @@ class Qtgraph(QMakePackage): libgvc within the Qt Graphics View Framework.""" homepage = "https://github.com/OpenSpeedShop/QtGraph" - url = "https://github.com/OpenSpeedShop/QtGraph.git" version('1.0.0.0', branch='1.0.0.0', git='https://github.com/OpenSpeedShop/QtGraph.git') - version('1.0.0', branch='master', - git='https://github.com/OpenSpeedShop/QtGraph.git') - version('develop', branch='master', git='https://github.com/OpenSpeedShop/QtGraph.git') # qtgraph depends on these packages depends_on('qt@4.8.6:', when='@develop') - depends_on('qt@5.10.0', when='@1.0.0.0') + depends_on('qt@5.10.0', when='@1.0.0.0:') depends_on("graphviz@2.40.1:", when='@develop') - depends_on("graphviz@2.40.1", when='@1.0.0.0') + depends_on("graphviz@2.40.1", when='@1.0.0.0:') def setup_environment(self, spack_env, run_env): """Set up the compile and runtime environments for a package.""" -- cgit v1.2.3-70-g09d2 From 2cfde03a60f1ed819812e67b36d6c0906d1b1b0a Mon Sep 17 00:00:00 2001 From: peetsv <32349688+peetsv@users.noreply.github.com> Date: Mon, 21 May 2018 14:12:35 -0700 Subject: r-cghflasso v0 2 1 - new package (#8177) * py-pyfaidx: adding new package * updating the url * r-cghflasso v0.2-1 new package * correcting copy/paste error * adding list_url --- .../repos/builtin/packages/r-cghflasso/package.py | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-cghflasso/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-cghflasso/package.py b/var/spack/repos/builtin/packages/r-cghflasso/package.py new file mode 100644 index 0000000000..7ef6fe07d7 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-cghflasso/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RCghflasso(RPackage): + """Spatial smoothing and hot spot detection using the fused + lasso regression""" + + homepage = "https://cran.r-project.org/package=cghFLasso" + url = "https://cran.r-project.org/src/contrib/cghFLasso_0.2-1.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/cghFLasso" + + version('0.2-1', '9a714a6dda3de9e905d23dadfa5d37f1') -- cgit v1.2.3-70-g09d2 From 646771300dce1c3a46a9c24813a14c89018d560c Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Mon, 21 May 2018 16:13:05 -0500 Subject: Create new package: fastgbs and its dependency platypus. (#8174) * pushing partially done recipe for fast-gbs and platypus * modify platypus * change header * fast-gbs: change dependency type. * modify dependency type. * modify dependency type. * fast-gbs: Change dependency type to run. --- .../repos/builtin/packages/fast-gbs/package.py | 54 ++++++++++++++++++++++ .../repos/builtin/packages/platypus/package.py | 43 +++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 var/spack/repos/builtin/packages/fast-gbs/package.py create mode 100644 var/spack/repos/builtin/packages/platypus/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fast-gbs/package.py b/var/spack/repos/builtin/packages/fast-gbs/package.py new file mode 100644 index 0000000000..0805539630 --- /dev/null +++ b/var/spack/repos/builtin/packages/fast-gbs/package.py @@ -0,0 +1,54 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class FastGbs(Package): + """A bioinformatic pipeline designed to extract a high-quality SNP catalog + starting from FASTQ files obtained from sequencing + genotyping-by-sequencing (GBS) libraries.""" + + homepage = "https://bitbucket.org/jerlar73/fast-gbs" + url = "https://bitbucket.org/jerlar73/fast-gbs" + + version('2017-01-25', git='https://bitbucket.org/jerlar73/fast-gbs.git', commit='3b3cbffa84d269419692067c6a3de08b3b88849c') + + depends_on('parallel', type='run') + depends_on('python@2.7:', type='run') + depends_on('sabre', type='run') + depends_on('py-cutadapt', type='run') + depends_on('bwa', type='run') + depends_on('samtools', type='run') + depends_on('platypus', type='run') + depends_on('py-pyvcf', type='run') + + def install(self, spec, prefix): + mkdirp(prefix.bin) + install('fastgbs.sh', prefix.bin) + install('parameters.txt', prefix.bin) + install('makeDir.sh', prefix.bin) + install('makeBarcodeSabre.py', prefix.bin) + install('vcf2txt.py', prefix.bin) + install('txt2unix.sh', prefix.bin) diff --git a/var/spack/repos/builtin/packages/platypus/package.py b/var/spack/repos/builtin/packages/platypus/package.py new file mode 100644 index 0000000000..26a20d9576 --- /dev/null +++ b/var/spack/repos/builtin/packages/platypus/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Platypus(Package): + """A Haplotype-Based Variant Caller For Next Generation Sequence Data""" + + homepage = "http://www.well.ox.ac.uk/platypus" + url = "http://www.well.ox.ac.uk/bioinformatics/Software/Platypus-latest.tgz" + + version('0.8.1', 'edf3fb5bf080241ddb75a413c8529d57') + + depends_on('python@2.6:', type=('build', 'run')) + depends_on('py-cython', type='build') + depends_on('htslib') + + def install(self, spec, prefix): + buildPlatypus = Executable('./buildPlatypus.sh') + buildPlatypus() + install_tree('.', prefix.bin) -- cgit v1.2.3-70-g09d2 From 90d36016efd67b33e3f7142b156a4447e6265a70 Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Mon, 21 May 2018 17:23:35 -0400 Subject: netcdf-cxx4: Update to use CPPFLAGS (#8148) * Fix bug; don't know why this ever worked in the first place. * Add fix to netcdf-fortran too; flake8 * Simplify configure_args() * netcdf-fortran: simplify that too --- var/spack/repos/builtin/packages/netcdf-cxx4/package.py | 3 +++ var/spack/repos/builtin/packages/netcdf-fortran/package.py | 3 +++ 2 files changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/netcdf-cxx4/package.py b/var/spack/repos/builtin/packages/netcdf-cxx4/package.py index 1b308d6ada..4b586d9a14 100644 --- a/var/spack/repos/builtin/packages/netcdf-cxx4/package.py +++ b/var/spack/repos/builtin/packages/netcdf-cxx4/package.py @@ -41,6 +41,9 @@ class NetcdfCxx4(AutotoolsPackage): force_autoreconf = True + def configure_args(self): + return ['CPPFLAGS=-I' + self.spec['netcdf'].prefix.include] + @property def libs(self): shared = True diff --git a/var/spack/repos/builtin/packages/netcdf-fortran/package.py b/var/spack/repos/builtin/packages/netcdf-fortran/package.py index 818115b187..a923bb0e81 100644 --- a/var/spack/repos/builtin/packages/netcdf-fortran/package.py +++ b/var/spack/repos/builtin/packages/netcdf-fortran/package.py @@ -36,6 +36,9 @@ class NetcdfFortran(AutotoolsPackage): depends_on('netcdf') + def configure_args(self): + return ['CPPFLAGS=-I' + self.spec['netcdf'].prefix.include] + @property def libs(self): libraries = ['libnetcdff'] -- cgit v1.2.3-70-g09d2 From 68e7fd053e94746c3e02a0a798ab9b6de9cc5114 Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Mon, 21 May 2018 17:24:38 -0400 Subject: gdbm: Get working on CentOS5 and Other Older Systems (#8134) * Fix #7691 * flake8 * code review --- var/spack/repos/builtin/packages/gdbm/package.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gdbm/package.py b/var/spack/repos/builtin/packages/gdbm/package.py index bbe9698b38..5898d8ca78 100644 --- a/var/spack/repos/builtin/packages/gdbm/package.py +++ b/var/spack/repos/builtin/packages/gdbm/package.py @@ -46,4 +46,12 @@ class Gdbm(AutotoolsPackage): depends_on("readline") def configure_args(self): - return ['--enable-libgdbm-compat'] + + # GDBM uses some non-standard GNU extensions, + # enabled with -D_GNU_SOURCE. See: + # https://patchwork.ozlabs.org/patch/771300/ + # https://stackoverflow.com/questions/5582211 + # https://www.gnu.org/software/automake/manual/html_node/Flag-Variables-Ordering.html + return [ + '--enable-libgdbm-compat', + 'CPPFLAGS=-D_GNU_SOURCE'] -- cgit v1.2.3-70-g09d2 From b61175aebadd54a893c8eab43048a074d7aa7b2f Mon Sep 17 00:00:00 2001 From: Tim Stavenger Date: Mon, 21 May 2018 18:06:29 -0700 Subject: Update GlobalArrays package to new releases (#7840) * update globalarrays package to current releases * rename class to Globalarrays to match package folder * rename bytes to int64, minor cleanup of descriptions * int64 False by default * remove reference to external as we aren't supplying paths, and use args.append() * correcting args.append syntax * add conflicts --- .../builtin/packages/globalarrays/ibm-xl.patch | 250 --------------------- .../repos/builtin/packages/globalarrays/package.py | 74 +++--- 2 files changed, 45 insertions(+), 279 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/globalarrays/ibm-xl.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/globalarrays/ibm-xl.patch b/var/spack/repos/builtin/packages/globalarrays/ibm-xl.patch deleted file mode 100644 index 644e3a559a..0000000000 --- a/var/spack/repos/builtin/packages/globalarrays/ibm-xl.patch +++ /dev/null @@ -1,250 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2022280..dac3b7f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -174,6 +174,15 @@ option (F2C_HIDDEN_STRING_LENGTH_AFTER_ARGS "Set F77 macros" ON) - if (ENABLE_FORTRAN) - include( FortranCInterface ) - FortranCInterface_HEADER(${CMAKE_SOURCE_DIR}/f2c_cmake.h MACRO_NAMESPACE F77_FUNC_) -+ add_custom_command( -+ OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/f2c_cmake.fh -+ COMMAND ${CMAKE_COMMAND} -D INPUT:PATH="${CMAKE_CURRENT_SOURCE_DIR}/f2c_cmake.h" -D OUTPUT:PATH="${CMAKE_CURRENT_SOURCE_DIR}/f2c_cmake.fh" -P ${PROJECT_SOURCE_DIR}/tools/f2c_cmake_fh_from_h.cmake DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/f2c_cmake.h -+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/f2c_cmake.h -+ ) -+ add_custom_target( -+ GenerateF2c_cmakeFH ALL -+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/f2c_cmake.fh -+ ) - else() - CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/cmake/f2c_dummy.h.in - ${CMAKE_SOURCE_DIR}/f2c_cmake.h ) -@@ -336,6 +345,15 @@ if (ENABLE_FORTRAN) - set (F77_IARGC IARGC) - set (F77_FLUSH flush) - set (HAVE_F77_FLUSH 1) -+ elseif (CMAKE_Fortran_COMPILER MATCHES "xlf.*") -+ message(STATUS "Using IBM XL Fortran compiler settings") -+ set (F90_MODULE ) -+ set (F77_GETARG GETARG) -+ set (F77_GETARG_ARGS "i,s") -+ set (F77_GETARG_DECLS "intrinsic GETARG") -+ set (F77_IARGC IARGC) -+ set (F77_FLUSH flush_) -+ set (HAVE_F77_FLUSH 1) - endif() - else() - # need to set these variable even if only compiling C/C++ -diff --git a/cmake/config.h.in b/cmake/config.h.in -index 3ce6a32..9ad868f 100644 ---- a/cmake/config.h.in -+++ b/cmake/config.h.in -@@ -58,11 +58,11 @@ - - #cmakedefine01 F2C_HIDDEN_STRING_LENGTH_AFTER_ARGS - --/*#define F77_FUNC(name,NAME) F77_FUNC_GLOBAL(name,NAME)*/ --/*#define F77_FUNC_(name,NAME) F77_FUNC_GLOBAL_(name,NAME)*/ -+#define F77_FUNC(name,NAME) F77_FUNC_GLOBAL(name,NAME) -+#define F77_FUNC_(name,NAME) F77_FUNC_GLOBAL_(name,NAME) - --#define F77_FUNC(name,NAME) name ## _ --#define F77_FUNC_(name,NAME) name ## _ -+/* #define F77_FUNC(name,NAME) name ## _ */ -+/* #define F77_FUNC_(name,NAME) name ## _ */ - - #define FXX_MODULE ${F90_MODULE} - #define F77_GETARG ${F77_GETARG} -diff --git a/tools/config_fh_from_h.cmake b/tools/config_fh_from_h.cmake -index acdf776..fb10422 100644 ---- a/tools/config_fh_from_h.cmake -+++ b/tools/config_fh_from_h.cmake -@@ -7,6 +7,13 @@ if (INPUT) - foreach (l in ${in0}) - # Only retain lines that start with "#" - set(found "") -+ string(REGEX MATCH "^#include" found "${l}") -+ if (found) -+ # don't include f2c_cmake.h -+ set(out "#include \"f2c_cmake.fh\"\n") -+ continue () -+ endif () -+ set(found "") - string(REGEX MATCH "^#" found "${l}") - if (found) - set(out "${out}${l}\n") -diff --git a/tools/f2c_cmake_fh_from_h.cmake b/tools/f2c_cmake_fh_from_h.cmake -new file mode 100644 -index 0000000..acdf776 ---- /dev/null -+++ b/tools/f2c_cmake_fh_from_h.cmake -@@ -0,0 +1,21 @@ -+if (INPUT) -+ if (OUTPUT) -+ file(READ "${INPUT}" in0) -+# replace carriage returns with a semi-colon -+ string (REGEX REPLACE "\n" ";" in0 "${in0}") -+ set(out "") -+ foreach (l in ${in0}) -+ # Only retain lines that start with "#" -+ set(found "") -+ string(REGEX MATCH "^#" found "${l}") -+ if (found) -+ set(out "${out}${l}\n") -+ endif () -+ endforeach () -+ file(WRITE "${OUTPUT}" "${out}") -+ else (OUTPUT) -+ message(ERROR "OUTPUT variable must be set") -+ endif (OUTPUT) -+else (INPUT) -+ message(ERROR "INPUT variable must be set") -+endif (INPUT) -diff --git a/global/src/cnames.h b/global/src/cnames.h -index efdec60..cadfd0a 100644 ---- a/global/src/cnames.h -+++ b/global/src/cnames.h -@@ -2268,6 +2268,7 @@ - #define nga_iupdate_ghosts_ F77_FUNC_(nga_iupdate_ghosts,NGA_IUPDATE_GHOSTS) - #define nga_supdate_ghosts_ F77_FUNC_(nga_supdate_ghosts,NGA_SUPDATE_GHOSTS) - #define nga_zupdate_ghosts_ F77_FUNC_(nga_zupdate_ghosts,NGA_ZUPDATE_GHOSTS) -+#define nga_update_ghosts_nb_ F77_FUNC_(nga_update_ghosts_nb, NGA_UPDATE_GHOSTS_NB) - #define ga_update6_ghosts_ F77_FUNC_(ga_update6_ghosts, GA_UPDATE6_GHOSTS) - #define ga_cupdate6_ghosts_ F77_FUNC_(ga_cupdate6_ghosts,GA_CUPDATE6_GHOSTS) - #define ga_dupdate6_ghosts_ F77_FUNC_(ga_dupdate6_ghosts,GA_DUPDATE6_GHOSTS) -diff --git a/global/testing/perform.F b/global/testing/perform.F -index b18146d..e1b9641 100644 ---- a/global/testing/perform.F -+++ b/global/testing/perform.F -@@ -110,7 +110,7 @@ c - & ilo,ihi,jlo,jhi - write(6,*)'bytes loop get put', - & ' accumulate' -- call flush(6) -+ call F77_FLUSH(6) - endif - call ga_sync() - c -@@ -145,7 +145,7 @@ c - if (me .eq. 0) then - write(6,77)bytes, count, tg, 1d-6*bytes/tg, - & tp, 1d-6*bytes/tp, ta, 1d-6*bytes/ta -- call flush(6) -+ call F77_FLUSH(6) - endif - enddo - c -diff --git a/global/testing/mir_perf1.F b/global/testing/mir_perf1.F -index 074e838..3548552 100644 ---- a/global/testing/mir_perf1.F -+++ b/global/testing/mir_perf1.F -@@ -133,7 +133,7 @@ c - & ' accumulate' - write(6,*)' bytes dim sec MB/s sec MB/s', - & ' sec MB/s' -- call flush(6) -+ call F77_FLUSH(6) - endif - call ga_sync() - c -@@ -174,7 +174,7 @@ c - if (me .eq. 0) then - write(6,77)bytes, chunk(loop), tg, - & 1d-6*bytes/tg,tp, 1d-6*bytes/tp, ta, 1d-6*bytes/ta -- call flush(6) -+ call F77_FLUSH(6) - endif - enddo - c -@@ -388,7 +388,7 @@ c - & ' accumulate' - write(6,*)' bytes dim sec MB/s sec MB/s', - & ' sec MB/s' -- call flush(6) -+ call F77_FLUSH(6) - endif - call ga_sync() - c -@@ -427,7 +427,7 @@ c - if (me .eq. 0) then - write(6,77)bytes, chunk(loop), tg, - & 1d-6*bytes/tg,tp, 1d-6*bytes/tp, ta, 1d-6*bytes/ta -- call flush(6) -+ call F77_FLUSH(6) - endif - enddo - c -diff --git a/global/testing/mir_perf2.F b/global/testing/mir_perf2.F -index fb50398..3b3bed6 100644 ---- a/global/testing/mir_perf2.F -+++ b/global/testing/mir_perf2.F -@@ -124,7 +124,7 @@ c - & ' accumulate' - write(6,*)' bytes dim sec MB/s sec MB/s', - & ' sec MB/s' -- call flush(6) -+ call F77_FLUSH(6) - endif - call ga_sync() - c -@@ -163,7 +163,7 @@ c - if (me .eq. 0) then - write(6,77)bytes, chunk(loop), tg, - & 1d-6*bytes/tg,tp, 1d-6*bytes/tp, ta, 1d-6*bytes/ta -- call flush(6) -+ call F77_FLUSH(6) - endif - enddo - c -@@ -377,7 +377,7 @@ c - & ' accumulate' - write(6,*)' bytes dim sec MB/s sec MB/s', - & ' sec MB/s' -- call flush(6) -+ call F77_FLUSH(6) - endif - call ga_sync() - c -@@ -416,7 +416,7 @@ c - if (me .eq. 0) then - write(6,77)bytes, chunk(loop), tg, - & 1d-6*bytes/tg,tp, 1d-6*bytes/tp, ta, 1d-6*bytes/ta -- call flush(6) -+ call F77_FLUSH(6) - endif - enddo - c -diff --git a/global/testing/perfmod.F b/global/testing/perfmod.F -index ec3fe37..7770be7 100644 ---- a/global/testing/perfmod.F -+++ b/global/testing/perfmod.F -@@ -119,7 +119,7 @@ c - - write(6,*)'bytes loop get put', - & ' accumulate' -- call flush(6) -+ call F77_FLUSH(6) - endif - call ga_sync() - c -@@ -157,7 +157,7 @@ c - if (me .eq. 0) then - write(6,77)bytes, count, tg, 1d-6*bytes/tg, - & tp, 1d-6*bytes/tp, ta, 1d-6*bytes/ta -- call flush(6) -+ call F77_FLUSH(6) - endif - enddo - c -diff --git a/global/testing/sprsmatmult.F b/global/testing/sprsmatmult.F -index 3fdeb3f..3682c3b 100644 ---- a/global/testing/sprsmatmult.F -+++ b/global/testing/sprsmatmult.F -@@ -108,7 +108,7 @@ c - print *,'Comparing distributed multiply with serial multiply' - print * - #endif -- call flush(6) -+ call F77_FLUSH(6) - endif - c - c*** Initialize the MA package diff --git a/var/spack/repos/builtin/packages/globalarrays/package.py b/var/spack/repos/builtin/packages/globalarrays/package.py index 2fe46e7b93..bd6f92168f 100644 --- a/var/spack/repos/builtin/packages/globalarrays/package.py +++ b/var/spack/repos/builtin/packages/globalarrays/package.py @@ -1,9 +1,9 @@ ############################################################################## # Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at IBM. +# Produced at the Lawrence Livermore National Laboratory. # # This file is part of Spack. -# Created by Serban Maerean, serban@ibm.com, All rights reserved. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. # LLNL-CODE-647188 # # For details, see https://github.com/spack/spack @@ -25,42 +25,58 @@ from spack import * -class Globalarrays(CMakePackage): - """The Global Arrays (GA) toolkit provides a shared memory style - programming environment in the context of distributed array data - structures. - """ +class Globalarrays(AutotoolsPackage): + """Global Arrays (GA) is a Partitioned Global Address Space (PGAS) + programming model. It provides primitives for one-sided communication + (Get, Put, Accumulate) and Atomic Operations (read increment). + It supports blocking and non-blocking primtives, and supports location + consistency.""" homepage = "http://hpc.pnl.gov/globalarrays/" - url = "https://github.com/GlobalArrays/ga" + url = "https://github.com/GlobalArrays/ga/releases/download/v5.7/ga-5.7.tar.gz" - version('master', git='https://github.com/GlobalArrays/ga', branch='master') + version('5.7', 'bb9a441a6b4fbb8b52b58c2d3f4cd07f') + version('5.6.5', '90da628dc72048deeda3f0cd095cb5b3') + version('5.6.4', '051901b316c9766b8ba54306bff7f6b3') + version('5.6.3', 'df3cf6cc8288d9f202b7fd0ea82f5491') + version('5.6.2', '901e4612203bac45059be524fc1abfb7') + version('5.6.1', '674c0ea9bf413840b1ff1e669de73fca') + version('5.6', '49d7e997daed094eeb9565423879ba36') - variant('i8', default=False, description='Build with 8 byte integers') + variant('int64', default=False, description='Compile with 64 bit indices support') + variant('blas', default=False, description='Enable BLAS') + variant('lapack', default=False, description='Enable LAPACK') + variant('scalapack', default=False, description='Enable SCALAPACK') + variant('armci', values=('mpi-ts', 'mpi-pr', 'mpi3', 'openib', 'ofi'), + default='mpi-ts', description='ARMCI runtime') - depends_on('blas') - depends_on('lapack') depends_on('mpi') + depends_on('blas', when='+blas') + depends_on('lapack', when='+lapack') + depends_on('scalapack', when='+scalapack') - patch('ibm-xl.patch', when='%xl') - patch('ibm-xl.patch', when='%xl_r') + conflicts('+lapack', when='~blas') + conflicts('+scalapack', when='~blas') + conflicts('+scalapack', when='~lapack') - def cmake_args(self): - options = [] + def configure_args(self): + args = ['--with-mpi'] - options.extend([ - '-DENABLE_FORTRAN=ON', - '-DENABLE_BLAS=ON', - ]) + if '+blas' in self.spec: + if '+int64' in self.spec: + args.append('--with-blas8') + else: + args.append('--with-blas') - if self.compiler.name == 'xl' or self.compiler.name == 'xl_r': - # use F77 compiler if IBM XL - options.extend([ - '-DCMAKE_Fortran_COMPILER=%s' % self.compiler.f77, - '-DCMAKE_Fortran_FLAGS=-qzerosize' - ]) + if '+lapack' in self.spec: + args.append('--with-lapack') - if "+i8" in self.spec: - options.extend(['-DENABLE_I8=ON']) + if '+scalapack' in self.spec: + if '+int64' in self.spec: + args.append('--with-scalapack8') + else: + args.append('--with-scalapack') - return options + args.append('--with-' + self.spec.variants['armci'].value) + + return args -- cgit v1.2.3-70-g09d2 From cd72312940267e9ec6c8105d74a208521a7075b0 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Tue, 22 May 2018 12:45:47 +0200 Subject: CUDA 9.2 (#8238) Add the latest CUDA release, v9.2 and updated CUDA Compatibility Matrix --- lib/spack/spack/build_systems/cuda.py | 11 +++++++---- var/spack/repos/builtin/packages/cuda/package.py | 7 ++++--- 2 files changed, 11 insertions(+), 7 deletions(-) (limited to 'var') diff --git a/lib/spack/spack/build_systems/cuda.py b/lib/spack/spack/build_systems/cuda.py index 9f8bb67183..4fad073d71 100644 --- a/lib/spack/spack/build_systems/cuda.py +++ b/lib/spack/spack/build_systems/cuda.py @@ -60,16 +60,19 @@ class CudaPackage(PackageBase): depends_on("cuda@8:", when='cuda_arch=62') depends_on("cuda@9:", when='cuda_arch=70') - depends_on('cuda@:8.99', when='cuda_arch=20') + depends_on('cuda@:8', when='cuda_arch=20') # Compiler conflicts: # https://gist.github.com/ax3l/9489132 conflicts('%gcc@5:', when='+cuda ^cuda@:7.5') - conflicts('%gcc@6:', when='+cuda ^cuda@:8.99') - conflicts('%gcc@7:', when='+cuda ^cuda@:9.99') + conflicts('%gcc@6:', when='+cuda ^cuda@:8') + conflicts('%gcc@7:', when='+cuda ^cuda@:9.1') + conflicts('%gcc@8:', when='+cuda ^cuda@:9.99') if (platform.system() != "Darwin"): conflicts('%clang@:3.4,3.7:', when='+cuda ^cuda@7.5') - conflicts('%clang@:3.7,4:', when='+cuda ^cuda@8:9') + conflicts('%clang@:3.7,4:', when='+cuda ^cuda@8:9.0') + conflicts('%clang@:3.7,5:', when='+cuda ^cuda@9.1') + conflicts('%clang@:3.7,6:', when='+cuda ^cuda@9.2') conflicts('%intel@:14,16:', when='+cuda ^cuda@7.5') conflicts('%intel@:14,17:', when='+cuda ^cuda@8.0.44') conflicts('%intel@:14,18:', when='+cuda ^cuda@8.0.61:9') diff --git a/var/spack/repos/builtin/packages/cuda/package.py b/var/spack/repos/builtin/packages/cuda/package.py index 25871c907a..80e3d1cf67 100644 --- a/var/spack/repos/builtin/packages/cuda/package.py +++ b/var/spack/repos/builtin/packages/cuda/package.py @@ -33,11 +33,12 @@ class Cuda(Package): Note: This package does not currently install the drivers necessary to run CUDA. These will need to be installed manually. See: - http://docs.nvidia.com/cuda/cuda-getting-started-guide-for-linux for - details.""" + https://docs.nvidia.com/cuda/ for details.""" - homepage = "http://www.nvidia.com/object/cuda_home_new.html" + homepage = "https://developer.nvidia.com/cuda-zone" + version('9.2.88', 'dd6e33e10d32a29914b7700c7b3d1ca0', expand=False, + url="https://developer.nvidia.com/compute/cuda/9.2/Prod/local_installers/cuda_9.2.88_396.26_linux") version('9.1.85', '67a5c3933109507df6b68f80650b4b4a', expand=False, url="https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_9.1.85_387.26_linux") version('9.0.176', '7a00187b2ce5c5e350e68882f42dd507', expand=False, -- cgit v1.2.3-70-g09d2 From 0106c6cab7c287c3037838df46178edeb5cbbf9e Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Tue, 22 May 2018 14:16:06 +0200 Subject: subread: added version 1.6.2 (#8239) --- var/spack/repos/builtin/packages/subread/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/subread/package.py b/var/spack/repos/builtin/packages/subread/package.py index 762f44b35a..1fdf52d4da 100644 --- a/var/spack/repos/builtin/packages/subread/package.py +++ b/var/spack/repos/builtin/packages/subread/package.py @@ -33,6 +33,7 @@ class Subread(MakefilePackage): homepage = "http://subread.sourceforge.net/" url = "https://downloads.sourceforge.net/project/subread/subread-1.5.2/subread-1.5.2-source.tar.gz" + version('1.6.2', '70125531737fe9ba2be83622ca236e5e') version('1.6.0', 'ed7e32c56bda1e769703e0a4db5a89a7') version('1.5.2', '817d2a46d87fcef885c8832475b8b247') -- cgit v1.2.3-70-g09d2 From 4d3ed1ff13cde88abe695c724d7c8946578cde21 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Tue, 22 May 2018 10:49:12 -0500 Subject: Add py-docopt package (#8236) --- .../repos/builtin/packages/py-docopt/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-docopt/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-docopt/package.py b/var/spack/repos/builtin/packages/py-docopt/package.py new file mode 100644 index 0000000000..40c83b9916 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-docopt/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyDocopt(PythonPackage): + """Command-line interface description language.""" + + homepage = "http://docopt.org/" + url = "https://pypi.io/packages/source/d/docopt/docopt-0.6.2.tar.gz" + + import_modules = ['docopt'] + + version('0.6.2', '4bc74561b37fad5d3e7d037f82a4c3b1') + + depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From 3712ac1f663a0c06765daced44f6a4e2f986c9f4 Mon Sep 17 00:00:00 2001 From: Leonhard Reichenbach Date: Tue, 22 May 2018 20:37:03 +0200 Subject: Create new package: memkind (#8242) * Create new package: memkind * some style changes * fix type of numactl dependency * fix flake8 errors * use patch() instead of a custom build phase --- .../repos/builtin/packages/memkind/package.py | 68 ++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 var/spack/repos/builtin/packages/memkind/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/memkind/package.py b/var/spack/repos/builtin/packages/memkind/package.py new file mode 100644 index 0000000000..6c27e62a03 --- /dev/null +++ b/var/spack/repos/builtin/packages/memkind/package.py @@ -0,0 +1,68 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import os + + +class Memkind(AutotoolsPackage): + """The memkind library is a user extensible heap manager built on top of + jemalloc which enables control of memory characteristics and a partitioning + of the heap between kinds of memory. The kinds of memory are defined by + operating system memory policies that have been applied to virtual address + ranges. Memory characteristics supported by memkind without user extension + include control of NUMA and page size features. The jemalloc non-standard + interface has been extended to enable specialized arenas to make requests + for virtual memory from the operating system through the memkind partition + interface. Through the other memkind interfaces the user can control and + extend memory partition features and allocate memory while selecting + enabled features.""" + + homepage = "https://github.com/memkind/memkind" + url = "https://github.com/memkind/memkind/archive/v1.7.0.tar.gz" + + version('1.7.0', 'bfbbb9226d40fd12ae1822a8be4c9207') + + depends_on('autoconf', type='build') + depends_on('automake', type='build') + depends_on('libtool', type='build') + depends_on('m4', type='build') + depends_on('numactl') + + phases = ['build_jemalloc', 'autoreconf', 'configure', 'build', + 'install'] + + def patch(self): + with open('VERSION', 'w') as version_file: + version_file.write('{0}\n'.format(self.version)) + + def build_jemalloc(self, spec, prefix): + if os.path.exists('build_jemalloc.sh'): + bash = which('bash') + bash('./build_jemalloc.sh') + + def autoreconf(self, spec, prefix): + if os.path.exists('autogen.sh'): + bash = which('bash') + bash('./autogen.sh') -- cgit v1.2.3-70-g09d2 From bc73e85af8fe4d3e4fef13fa3a1d7031a5cd9cd4 Mon Sep 17 00:00:00 2001 From: Sinan Date: Wed, 23 May 2018 05:25:42 -0700 Subject: Package/mirdeep/fix for new url take2 (#8247) * rename: mirdeep -> mirdeep2 * fixes for new url --- .../repos/builtin/packages/mirdeep/package.py | 67 ---------------------- .../repos/builtin/packages/mirdeep2/package.py | 67 ++++++++++++++++++++++ 2 files changed, 67 insertions(+), 67 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/mirdeep/package.py create mode 100644 var/spack/repos/builtin/packages/mirdeep2/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mirdeep/package.py b/var/spack/repos/builtin/packages/mirdeep/package.py deleted file mode 100644 index 60f5aaaac9..0000000000 --- a/var/spack/repos/builtin/packages/mirdeep/package.py +++ /dev/null @@ -1,67 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -from spack import * -import glob - - -class Mirdeep(Package): - """miRDeep2 is a completely overhauled tool which discovers microRNA genes - by analyzing sequenced RNAs.""" - - homepage = "https://www.mdc-berlin.de/8551903/en/" - url = "https://www.mdc-berlin.de/45995549/en/research/research_teams/systems_biology_of_gene_regulatory_elements/projects/miRDeep/mirdeep2_0_0_8.zip" - - version('2.0.0.8', 'a707f7d7ad4a2975fb8b2e78c5bcf483') - - depends_on('perl', type=('build', 'run')) - depends_on('perl-pdf-api2', type=('build', 'run')) - depends_on('bowtie') - depends_on('viennarna') - depends_on('squid') - depends_on('randfold') - - def url_for_version(self, version): - url = 'https://www.mdc-berlin.de/45995549/en/research/research_teams/systems_biology_of_gene_regulatory_elements/projects/miRDeep/mirdeep{0}.zip' - return url.format(version.underscored) - - def patch(self): - with working_dir('src'): - files = glob.iglob("*.pl") - for file in files: - change = FileFilter(file) - change.filter('usr/bin/perl', 'usr/bin/env perl') - change.filter('perl -W', 'perl') - change.filter("../Rfam_for_miRDeep.fa", - "Rfam_for_miRDeep.fa") - change.filter("../install_successful", - "install_successful") - - def install(self, spec, prefix): - install_tree('src', prefix.bin) - install('Rfam_for_miRDeep.fa', prefix.bin) - # miRDeep looks for the install_sucessful file to check if you used - # their automated install script which we'll just be kind of hacking - # around - touch(prefix.bin.install_successful) diff --git a/var/spack/repos/builtin/packages/mirdeep2/package.py b/var/spack/repos/builtin/packages/mirdeep2/package.py new file mode 100644 index 0000000000..02218c4da4 --- /dev/null +++ b/var/spack/repos/builtin/packages/mirdeep2/package.py @@ -0,0 +1,67 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import glob + + +class Mirdeep2(Package): + """miRDeep2 is a completely overhauled tool which discovers microRNA genes + by analyzing sequenced RNAs.""" + + homepage = "https://www.mdc-berlin.de/8551903/en/" + url = "https://www.mdc-berlin.de/system/files/migrated_files/fiona/mirdeep2_0_0_8.zip" + + version('0.0.8', 'a707f7d7ad4a2975fb8b2e78c5bcf483') + + depends_on('perl', type=('build', 'run')) + depends_on('perl-pdf-api2', type=('build', 'run')) + depends_on('bowtie') + depends_on('viennarna') + depends_on('squid') + depends_on('randfold') + + def url_for_version(self, version): + url = 'https://www.mdc-berlin.de/system/files/migrated_files/fiona/mirdeep2_{0}.zip' + return url.format(version.underscored) + + def patch(self): + with working_dir('src'): + files = glob.iglob("*.pl") + for file in files: + change = FileFilter(file) + change.filter('usr/bin/perl', 'usr/bin/env perl') + change.filter('perl -W', 'perl') + change.filter("../Rfam_for_miRDeep.fa", + "Rfam_for_miRDeep.fa") + change.filter("../install_successful", + "install_successful") + + def install(self, spec, prefix): + install_tree('src', prefix.bin) + install('Rfam_for_miRDeep.fa', prefix.bin) + # miRDeep looks for the install_sucessful file to check if you used + # their automated install script which we'll just be kind of hacking + # around + touch(prefix.bin.install_successful) -- cgit v1.2.3-70-g09d2 From ace283d594208bf9b6d4a400a4e246c31d189330 Mon Sep 17 00:00:00 2001 From: Leonhard Reichenbach Date: Wed, 23 May 2018 14:27:45 +0200 Subject: Add latest versions of bazel (#8250) --- .../packages/bazel/fix_env_handling-0.13.0.patch | 124 +++++++++++++++++++++ var/spack/repos/builtin/packages/bazel/package.py | 9 +- 2 files changed, 130 insertions(+), 3 deletions(-) create mode 100644 var/spack/repos/builtin/packages/bazel/fix_env_handling-0.13.0.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bazel/fix_env_handling-0.13.0.patch b/var/spack/repos/builtin/packages/bazel/fix_env_handling-0.13.0.patch new file mode 100644 index 0000000000..8f1cea0e58 --- /dev/null +++ b/var/spack/repos/builtin/packages/bazel/fix_env_handling-0.13.0.patch @@ -0,0 +1,124 @@ +--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java.orig 2018-05-23 12:11:29.319402761 +0200 ++++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java 2018-05-23 12:35:21.817904301 +0200 +@@ -150,6 +150,121 @@ + builder.put("PATH", null); + builder.put("LD_LIBRARY_PATH", null); + } ++ ++ String spack_prefix = System.getenv("SPACK_PREFIX"); ++ if (spack_prefix != null) { ++ builder.put("SPACK_PREFIX", spack_prefix); ++ } ++ ++ String spack_env_path = System.getenv("SPACK_ENV_PATH"); ++ if (spack_env_path != null) { ++ builder.put("SPACK_ENV_PATH", spack_env_path); ++ } ++ ++ String spack_debug_log_id = System.getenv("SPACK_DEBUG_LOG_ID"); ++ if (spack_debug_log_id != null) { ++ builder.put("SPACK_DEBUG_LOG_ID", spack_debug_log_id); ++ } ++ ++ String spack_debug_log_dir = System.getenv("SPACK_DEBUG_LOG_DIR"); ++ if (spack_debug_log_dir != null) { ++ builder.put("SPACK_DEBUG_LOG_DIR", spack_debug_log_dir); ++ } ++ ++ String spack_compiler_spec = System.getenv("SPACK_COMPILER_SPEC"); ++ if (spack_compiler_spec != null) { ++ builder.put("SPACK_COMPILER_SPEC", spack_compiler_spec); ++ } ++ ++ String spack_cc_rpath_arg = System.getenv("SPACK_CC_RPATH_ARG"); ++ if (spack_cc_rpath_arg != null) { ++ builder.put("SPACK_CC_RPATH_ARG", spack_cc_rpath_arg); ++ } ++ ++ String spack_cxx_rpath_arg = System.getenv("SPACK_CXX_RPATH_ARG"); ++ if (spack_cxx_rpath_arg != null) { ++ builder.put("SPACK_CXX_RPATH_ARG", spack_cxx_rpath_arg); ++ } ++ ++ String spack_f77_rpath_arg = System.getenv("SPACK_F77_RPATH_ARG"); ++ if (spack_f77_rpath_arg != null) { ++ builder.put("SPACK_F77_RPATH_ARG", spack_f77_rpath_arg); ++ } ++ ++ String spack_fc_rpath_arg = System.getenv("SPACK_FC_RPATH_ARG"); ++ if (spack_fc_rpath_arg != null) { ++ builder.put("SPACK_FC_RPATH_ARG", spack_fc_rpath_arg); ++ } ++ ++ String spack_short_spec = System.getenv("SPACK_SHORT_SPEC"); ++ if (spack_short_spec != null) { ++ builder.put("SPACK_SHORT_SPEC", spack_short_spec); ++ } ++ ++ String spack_cc = System.getenv("SPACK_CC"); ++ if (spack_cc != null) { ++ builder.put("SPACK_CC", spack_cc); ++ } ++ ++ String spack_cxx = System.getenv("SPACK_CXX"); ++ if (spack_cxx != null) { ++ builder.put("SPACK_CXX", spack_cxx); ++ } ++ ++ String spack_f77 = System.getenv("SPACK_F77"); ++ if (spack_f77 != null) { ++ builder.put("SPACK_F77", spack_f77); ++ } ++ ++ String spack_fc = System.getenv("SPACK_FC"); ++ if (spack_fc != null) { ++ builder.put("SPACK_FC", spack_fc); ++ } ++ ++ String spack_cflags = System.getenv("SPACK_CFLAGS"); ++ if (spack_cflags != null) { ++ builder.put("SPACK_CFLAGS", spack_cflags); ++ } ++ ++ String spack_cxxflags = System.getenv("SPACK_CXXFLAGS"); ++ if (spack_cxxflags != null) { ++ builder.put("SPACK_CXXFLAGS", spack_cxxflags); ++ } ++ ++ String spack_fcflags = System.getenv("SPACK_FCFLAGS"); ++ if (spack_fcflags != null) { ++ builder.put("SPACK_FCFLAGS", spack_fcflags); ++ } ++ ++ String spack_fflags = System.getenv("SPACK_FFLAGS"); ++ if (spack_fflags != null) { ++ builder.put("SPACK_FFLAGS", spack_fflags); ++ } ++ ++ String spack_ldflags = System.getenv("SPACK_LDFLAGS"); ++ if (spack_ldflags != null) { ++ builder.put("SPACK_LDFLAGS", spack_ldflags); ++ } ++ ++ String spack_ldlibs = System.getenv("SPACK_LDLIBS"); ++ if (spack_ldlibs != null) { ++ builder.put("SPACK_LDLIBS", spack_ldlibs); ++ } ++ ++ String spack_debug = System.getenv("SPACK_DEBUG"); ++ if (spack_debug != null) { ++ builder.put("SPACK_DEBUG", spack_debug); ++ } ++ ++ String spack_test_command = System.getenv("SPACK_TEST_COMMAND"); ++ if (spack_test_command != null) { ++ builder.put("SPACK_TEST_COMMAND", spack_test_command); ++ } ++ ++ String spack_dependencies = System.getenv("SPACK_DEPENDENCIES"); ++ if (spack_dependencies != null) { ++ builder.put("SPACK_DEPENDENCIES", spack_dependencies); ++ } + } + + private static PathFragment determineShellExecutable(OS os, PathFragment fromOption) { diff --git a/var/spack/repos/builtin/packages/bazel/package.py b/var/spack/repos/builtin/packages/bazel/package.py index 6fd4ad731c..22f26d31b7 100644 --- a/var/spack/repos/builtin/packages/bazel/package.py +++ b/var/spack/repos/builtin/packages/bazel/package.py @@ -34,6 +34,8 @@ class Bazel(Package): homepage = "https://www.bazel.io" url = "https://github.com/bazelbuild/bazel/releases/download/0.11.1/bazel-0.11.1-dist.zip" + version('0.13.0', '64a5124025c1618b550faec64a9b6fa3') + version('0.12.0', 'b5d67564ceecfe2005a885fe2ffe0da3') version('0.11.1', '80daac6b100b7f8e2b17d133150eba44') version('0.11.0', 'e6caf93a805b45c33367028e575b91dd') version('0.10.1', 'a7e5b9576993b752e31bd2d3259a14c5') @@ -51,7 +53,8 @@ class Bazel(Package): depends_on('zip') patch('fix_env_handling.patch', when='@:0.4.5') - patch('fix_env_handling-0.9.0.patch', when='@0.9.0:') + patch('fix_env_handling-0.9.0.patch', when='@0.9.0:0.12.0') + patch('fix_env_handling-0.13.0.patch', when='@0.13.0:') patch('link.patch') patch('cc_configure.patch', when='@:0.4.5') patch('unix_cc_configure.patch', when='@0.9.0') @@ -88,8 +91,8 @@ class Bazel(Package): def __call__(self, *args, **kwargs): disable = env_flag(SPACK_NO_PARALLEL_MAKE) - parallel = ((not disable) and - kwargs.get('parallel', self.jobs > 1)) + parallel = ((not disable) and kwargs.get('parallel', + self.jobs > 1)) jobs = "--jobs=1" if parallel: -- cgit v1.2.3-70-g09d2 From 60df20664874d76d26633ae4f7a4a56fd1b11854 Mon Sep 17 00:00:00 2001 From: Tim Law Date: Wed, 23 May 2018 13:28:15 +0100 Subject: Update BookLeaf_Cpp and Typhon packages. (#8249) --- var/spack/repos/builtin/packages/bookleaf-cpp/package.py | 1 + var/spack/repos/builtin/packages/typhon/package.py | 1 + 2 files changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bookleaf-cpp/package.py b/var/spack/repos/builtin/packages/bookleaf-cpp/package.py index b9674bd810..df0a26bab6 100644 --- a/var/spack/repos/builtin/packages/bookleaf-cpp/package.py +++ b/var/spack/repos/builtin/packages/bookleaf-cpp/package.py @@ -33,6 +33,7 @@ class BookleafCpp(CMakePackage): homepage = "https://github.com/UK-MAC/BookLeaf_Cpp" url = "https://github.com/UK-MAC/BookLeaf_Cpp/archive/v2.0.tar.gz" + version('2.0.1', '34a5a9e7b2b5ffc98562656a4406ba5b') version('2.0', '69819ebcbae5eaa63d1a4de2c77cac85') variant('typhon', default=True, description='Use Typhon') diff --git a/var/spack/repos/builtin/packages/typhon/package.py b/var/spack/repos/builtin/packages/typhon/package.py index 69fe48b38d..21fa80adb5 100644 --- a/var/spack/repos/builtin/packages/typhon/package.py +++ b/var/spack/repos/builtin/packages/typhon/package.py @@ -34,6 +34,7 @@ class Typhon(CMakePackage): homepage = "https://github.com/UK-MAC/Typhon" url = "https://github.com/UK-MAC/Typhon/archive/v3.0.tar.gz" + version('3.0.1', '89045decfba5fd468ef05ad4c924df8c') version('3.0', 'ec67cd1aa585ce2410d4fa50514a916f') depends_on('mpi') -- cgit v1.2.3-70-g09d2 From 251019c5e41a0138b1bed6ae82541bd9d1456e57 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Wed, 23 May 2018 17:11:03 +0200 Subject: cgal: added version 4.12 (#8252) --- var/spack/repos/builtin/packages/cgal/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cgal/package.py b/var/spack/repos/builtin/packages/cgal/package.py index ae4ee4879d..b99e5cf575 100644 --- a/var/spack/repos/builtin/packages/cgal/package.py +++ b/var/spack/repos/builtin/packages/cgal/package.py @@ -35,6 +35,7 @@ class Cgal(CMakePackage): homepage = 'http://www.cgal.org/' url = 'https://github.com/CGAL/cgal/releases/download/releases/CGAL-4.11/CGAL-4.11.tar.xz' + version('4.12', 'b12fd24dedfa889a04abfaea565a88bd') version('4.11', '0e9566046e402f8dc514caef11155864') version('4.9.1', '820ef17ffa7ed87af6cc9918a961d966') version('4.9', 'ee31343dbc4bf7b5b7501ec1650e9233') -- cgit v1.2.3-70-g09d2 From 9fee111741f1fb70ee95e17ac9949a8eb53be2b9 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Wed, 23 May 2018 17:13:09 +0200 Subject: gromacs: added version 2018.1 (#8251) --- var/spack/repos/builtin/packages/gromacs/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gromacs/package.py b/var/spack/repos/builtin/packages/gromacs/package.py index d65dffd55b..6416ce4dce 100644 --- a/var/spack/repos/builtin/packages/gromacs/package.py +++ b/var/spack/repos/builtin/packages/gromacs/package.py @@ -41,6 +41,7 @@ class Gromacs(CMakePackage): homepage = 'http://www.gromacs.org' url = 'http://ftp.gromacs.org/gromacs/gromacs-5.1.2.tar.gz' + version('2018.1', '7ee393fa3c6b7ae351d47eae2adf980e') version('2018', '6467ffb1575b8271548a13abfba6374c') version('2016.4', '19c8b5c85f3ec62df79d2249a3c272f8') version('2016.3', 'e9e3a41bd123b52fbcc6b32d09f8202b') -- cgit v1.2.3-70-g09d2 From 011d1245fb95354ba074398eeaa9e6b7447d4203 Mon Sep 17 00:00:00 2001 From: Edward Kim Date: Wed, 23 May 2018 13:26:59 -0500 Subject: charm: Update install script (#7291) * charm: Update install script * Addressed PR comments * Removed destination and suffix variants * Added back parallel support --- var/spack/repos/builtin/packages/charm/package.py | 139 +++++++++++++++------- 1 file changed, 94 insertions(+), 45 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/charm/package.py b/var/spack/repos/builtin/packages/charm/package.py index 1395326767..b52d11aa6e 100644 --- a/var/spack/repos/builtin/packages/charm/package.py +++ b/var/spack/repos/builtin/packages/charm/package.py @@ -37,8 +37,11 @@ class Charm(Package): (your laptop) to the largest supercomputers.""" homepage = "http://charmplusplus.org" - url = "http://charm.cs.illinois.edu/distrib/charm-6.7.1.tar.gz" + url = "http://charm.cs.illinois.edu/distrib/charm-6.8.2.tar.gz" + version("6.8.2", "a887a34b638a5b2f7fcf7ff3c262496d") + version("6.8.1", "3e95ffa760909154ef16b643c9bb8193") + version("6.8.0", "54df066a5aefb0bbc1a263c2383c2bba") version("6.7.1", "a8e20cf85e9c8721158f5bbd0ade48d9") version("6.7.0", "35a39a7975f1954a7db2d76736158231") version("6.6.1", "9554230f741e2599deaaac4d9d93d7ab") @@ -47,63 +50,106 @@ class Charm(Package): # Support OpenMPI; see # - patch("mpi.patch") + # Patch is no longer needed in versions 6.8.0+ + patch("mpi.patch", when="@:6.7.1") + # Ignore compiler warnings while configuring patch("strictpass.patch") + # Build targets + # "target" is reserved, so we have to use something else. + variant( + "build-target", + default="LIBS", + values=("charm++", "AMPI", "LIBS"), + description="Specify the target to build" + ) + # Communication mechanisms (choose exactly one) - # TODO: Support Blue Gene/Q PAMI, Cray GNI, Cray shmem, CUDA variant( - 'backend', - default='mpi', - values=('mpi', 'multicore', 'net', 'netlrts', 'verbs'), - description='Set the backend to use' + "backend", + default="mpi", + values=("mpi", "multicore", "netlrts", "verbs", "gni", + "ofi", "pami", "pamilrts"), + description="Set the backend to use" ) # Other options - # Something is off with PAPI -- there are build errors. Maybe - # Charm++ expects a particular version? variant("papi", default=False, description="Enable PAPI integration") + variant("syncft", default=False, description="Compile with Charm++ fault tolerance support") variant("smp", default=True, description=( "Enable SMP parallelism (does not work with +multicore)")) variant("tcp", default=False, description="Use TCP as transport mechanism (requires +net)") - variant("shared", default=True, description="Enable shared link support") + variant("omp", default=False, description="Support for the integrated LLVM OpenMP runtime") + variant("pthreads", default=False, description="Compile with pthreads Converse threads") + variant("cuda", default=False, description="Enable CUDA toolkit") - # Note: We could add variants for AMPI, LIBS, bigemulator, msa, Tau + variant("shared", default=True, description="Enable shared link support") + variant("production", default=True, description="Build charm++ with all optimizations") + variant("tracing", default=False, description="Enable tracing modules") - depends_on('mpi', when='backend=mpi') + depends_on("mpi", when="backend=mpi") depends_on("papi", when="+papi") + depends_on("cuda", when="+cuda") - def install(self, spec, prefix): - target = "charm++" + conflicts("~tracing", "+papi") - comm = spec.variants['backend'].value + conflicts("backend=multicore", "+smp") + + def install(self, spec, prefix): + target = spec.variants["build-target"].value plat = sys.platform if plat.startswith("linux"): plat = "linux" + elif plat.startswith("win"): + plat = "win" + elif plat.startswith("cnl"): + plat = "cnl" + elif plat.startswith("cnk"): + plat = "cnk" + mach = platform.machine() + if mach.startswith("ppc"): + mach = "ppc" + elif mach.startswith("arm"): + mach = "arm" + + comm = spec.variants['backend'].value # Define Charm++ version names for various (plat, mach, comm) # combinations. Note that not all combinations are supported. versions = { - ("darwin", "i386", "multicore"): "multicore-darwin-x86", - ("darwin", "i386", "net"): "net-darwin-x86", - ("darwin", "x86_64", "mpi"): "mpi-darwin-x86_64", - ("darwin", "x86_64", "multicore"): "multicore-darwin-x86_64", - ("darwin", "x86_64", "net"): "net-darwin-x86_64", - ("darwin", "x86_64", "netlrts"): "netlrts-darwin-x86_64", - ("linux", "i386", "mpi"): "mpi-linux", - ("linux", "i386", "multicore"): "multicore-linux32", - ("linux", "i386", "net"): "net-linux", - ("linux", "i386", "netlrts"): "netlrts-linux", - ("linux", "x86_64", "mpi"): "mpi-linux-x86_64", - ("linux", "x86_64", "multicore"): "multicore-linux64", - ("linux", "x86_64", "net"): "net-linux-x86_64", - ("linux", "x86_64", "netlrts"): "netlrts-linux-x86_64", - ("linux", "x86_64", "verbs"): "verbs-linux-x86_64", + ("darwin", "x86_64", "mpi"): "mpi-darwin-x86_64", + ("darwin", "x86_64", "multicore"): "multicore-darwin-x86_64", + ("darwin", "x86_64", "netlrts"): "netlrts-darwin-x86_64", + ("linux", "i386", "mpi"): "mpi-linux", + ("linux", "i386", "multicore"): "multicore-linux", + ("linux", "i386", "netlrts"): "netlrts-linux", + ("linux", "i386", "uth"): "uth-linux", + ("linux", "x86_64", "mpi"): "mpi-linux-x86_64", + ("linux", "x86_64", "multicore"): "multicore-linux-x86_64", + ("linux", "x86_64", "netlrts"): "netlrts-linux-x86_64", + ("linux", "x86_64", "verbs"): "verbs-linux-x86_64", + ("linux", "x86_64", "ofi"): "ofi-linux-x86_64", + ("linux", "x86_64", "uth"): "uth-linux-x86_64", + ("linux", "ppc", "mpi"): "mpi-linux-ppc", + ("linux", "ppc", "multicore"): "multicore-linux-ppc", + ("linux", "ppc", "netlrts"): "netlrts-linux-ppc", + ("linux", "ppc", "pami"): "pami-linux-ppc64le", + ("linux", "ppc", "verbs"): "verbs-linux-ppc64le", + ("linux", "arm", "netlrts"): "netlrts-linux-arm7", + ("linux", "arm", "multicore"): "multicore-arm7", + ("win", "x86_64", "mpi"): "mpi-win-x86_64", + ("win", "x86_64", "multicore"): "multicore-win-x86_64", + ("win", "x86_64", "netlrts"): "netlrts-win-x86_64", + ("cnl", "x86_64", "gni"): "gni-crayxc", + ("cnl", "x86_64", "mpi"): "mpi-crayxc", + ("cnk", "x86_64", "mpi"): "mpi-bluegeneq", + ("cnk", "x86_64", "pami"): "pami-bluegeneq", + ("cnk", "x86_64", "pamilrts"): "pamilrts-bluegeneq", } if (plat, mach, comm) not in versions: raise InstallError( @@ -115,16 +161,12 @@ class Charm(Package): # We assume that Spack's compiler wrappers make this work. If # not, then we need to query the compiler vendor from Spack # here. - compiler = os.path.basename(self.compiler.cc) - - options = [compiler] - if compiler == 'icc': - options.append('ifort') - - options.extend([ - "--with-production", # Note: turn this into a variant + options = [ + os.path.basename(self.compiler.cc), + os.path.basename(self.compiler.fc), "-j%d" % make_jobs, - "--destination=%s" % prefix]) + "--destination=%s" % prefix, + ] if 'backend=mpi' in spec: # in intelmpi /include and /lib fails so --basedir @@ -140,21 +182,28 @@ class Charm(Package): if "+papi" in spec: options.extend(["papi", "--basedir=%s" % spec["papi"].prefix]) if "+smp" in spec: - if 'backend=multicore' in spec: - # This is a Charm++ limitation; it would lead to a - # build error - raise InstallError("Cannot combine +smp with +multicore") options.append("smp") if "+tcp" in spec: - if 'backend=net' not in spec: + if 'backend=netlrts' not in spec: # This is a Charm++ limitation; it would lead to a # build error raise InstallError( "The +tcp variant requires " - "the backend=net communication mechanism") + "the backend=netlrts communication mechanism") options.append("tcp") + if "+omp" in spec: + options.append("omp") + if "+pthreads" in spec: + options.append("pthreads") + if "+cuda" in spec: + options.append("cuda") + if "+shared" in spec: options.append("--build-shared") + if "+production" in spec: + options.append("--with-production") + if "+tracing" in spec: + options.append("--enable-tracing") # Call "make" via the build script # Note: This builds Charm++ in the "tmp" subdirectory of the -- cgit v1.2.3-70-g09d2 From f57ce38c41c36aa71d558fe6dba048bbf38e5d7d Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 23 May 2018 13:27:22 -0500 Subject: Add ncurses 6.1 (#8257) --- var/spack/repos/builtin/packages/ncurses/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ncurses/package.py b/var/spack/repos/builtin/packages/ncurses/package.py index f4ac9972e1..c54cbcd71f 100644 --- a/var/spack/repos/builtin/packages/ncurses/package.py +++ b/var/spack/repos/builtin/packages/ncurses/package.py @@ -37,8 +37,9 @@ class Ncurses(AutotoolsPackage): SYSV-curses enhancements over BSD curses.""" homepage = "http://invisible-island.net/ncurses/ncurses.html" - url = "http://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.0.tar.gz" + url = "http://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.1.tar.gz" + version('6.1', '98c889aaf8d23910d2b92d65be2e737a') version('6.0', 'ee13d052e1ead260d7c28071f46eefb1') version('5.9', '8cb9c412e5f2d96bc6f459aa8c6282a1') -- cgit v1.2.3-70-g09d2 From 13a1575452805a025550df4a40b115cb017ce222 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 23 May 2018 13:27:39 -0500 Subject: Add pkgconf 1.4.2 (#8256) --- var/spack/repos/builtin/packages/pkgconf/package.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pkgconf/package.py b/var/spack/repos/builtin/packages/pkgconf/package.py index b046e74ea0..e6961d5424 100644 --- a/var/spack/repos/builtin/packages/pkgconf/package.py +++ b/var/spack/repos/builtin/packages/pkgconf/package.py @@ -32,14 +32,18 @@ class Pkgconf(AutotoolsPackage): maintaining compatibility.""" homepage = "http://pkgconf.org/" - url = "http://distfiles.alpinelinux.org/distfiles/pkgconf-1.3.10.tar.xz" + url = "http://distfiles.alpinelinux.org/distfiles/pkgconf-1.4.2.tar.xz" - version('1.4.0', 'c509c0dad5a70aa4bc3210557b7eafce') + version('1.4.2', '678d242b4eef1754bba6a58642af10bb') + version('1.4.0', 'c509c0dad5a70aa4bc3210557b7eafce') version('1.3.10', '9b63707bf6f8da6efb3868101d7525fe') - version('1.3.8', '484ba3360d983ce07416843d5bc916a8') + version('1.3.8', '484ba3360d983ce07416843d5bc916a8') provides('pkgconfig') + # TODO: Add a package for the kyua testing framework + # depends_on('kyua', type='test') + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): """Adds the ACLOCAL path for autotools.""" spack_env.append_path('ACLOCAL_PATH', -- cgit v1.2.3-70-g09d2 From 0ea8c4f3b2d1bdb5ff7ab8e606c42355a075ede0 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Wed, 23 May 2018 20:28:21 +0200 Subject: mvapich2: added a proper libs attribute (#8253) --- var/spack/repos/builtin/packages/mvapich2/package.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mvapich2/package.py b/var/spack/repos/builtin/packages/mvapich2/package.py index bd453647e5..ffa2f6ea02 100644 --- a/var/spack/repos/builtin/packages/mvapich2/package.py +++ b/var/spack/repos/builtin/packages/mvapich2/package.py @@ -124,6 +124,18 @@ class Mvapich2(AutotoolsPackage): 'mpicc', 'mpicxx', 'mpif77', 'mpif90', 'mpifort', relative_root='bin' ) + @property + def libs(self): + query_parameters = self.spec.last_query.extra_parameters + libraries = ['libmpi'] + + if 'cxx' in query_parameters: + libraries = ['libmpicxx'] + libraries + + return find_libraries( + libraries, root=self.prefix, shared=True, recursive=True + ) + @property def process_manager_options(self): spec = self.spec -- cgit v1.2.3-70-g09d2 From 8f3d717a3019233ae1aeb888b2fa6e3c4ece7861 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 23 May 2018 13:29:08 -0500 Subject: Add PROJ 5.0.1 (#8233) * Add PROJ 5.0.1 * proj-datumgrid resource must be placed in nad directory --- var/spack/repos/builtin/packages/proj/package.py | 25 +++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/proj/package.py b/var/spack/repos/builtin/packages/proj/package.py index 4df976d149..5c017daafe 100644 --- a/var/spack/repos/builtin/packages/proj/package.py +++ b/var/spack/repos/builtin/packages/proj/package.py @@ -26,12 +26,31 @@ from spack import * class Proj(AutotoolsPackage): - """Cartographic Projections""" - homepage = "https://github.com/OSGeo/proj.4/wiki" - url = "http://download.osgeo.org/proj/proj-4.9.2.tar.gz" + """PROJ is a generic coordinate transformation software, that transforms + geospatial coordinates from one coordinate reference system (CRS) to + another. This includes cartographic projections as well as geodetic + transformations.""" + homepage = "https://proj4.org/" + url = "http://download.osgeo.org/proj/proj-5.0.1.tar.gz" + + version('5.0.1', '15c8d7d6a8cb945c7878d0ff322a232c') version('4.9.2', '9843131676e31bbd903d60ae7dc76cf9') version('4.9.1', '3cbb2a964fd19a496f5f4265a717d31c') version('4.8.0', 'd815838c92a29179298c126effbb1537') version('4.7.0', '927d34623b52e0209ba2bfcca18fe8cd') version('4.6.1', '7dbaab8431ad50c25669fd3fb28dc493') + + # https://github.com/OSGeo/proj.4#distribution-files-and-format + # https://github.com/OSGeo/proj-datumgrid + resource( + name='proj-datumgrid', + url='https://download.osgeo.org/proj/proj-datumgrid-1.7.tar.gz', + md5='6799bd8ac411b8a78724e34850c206c4', + placement='nad' + ) + + def configure_args(self): + return [ + 'PROJ_LIB={0}'.format(join_path(self.stage.source_path, 'nad')) + ] -- cgit v1.2.3-70-g09d2 From 9b9980256f83fddbdfed83e861556ee9c75d89f1 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 23 May 2018 18:36:12 -0500 Subject: Add kealib 1.4.7 (#8235) * Add kealib 1.4.7 * Fix out-of-source builds * Remove username from kealib hg clone --- .../repos/builtin/packages/kealib/cmake.patch | 73 ++++++++++++++++++++++ var/spack/repos/builtin/packages/kealib/package.py | 17 ++--- 2 files changed, 83 insertions(+), 7 deletions(-) create mode 100644 var/spack/repos/builtin/packages/kealib/cmake.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/kealib/cmake.patch b/var/spack/repos/builtin/packages/kealib/cmake.patch new file mode 100644 index 0000000000..97d7f8cc27 --- /dev/null +++ b/var/spack/repos/builtin/packages/kealib/cmake.patch @@ -0,0 +1,73 @@ +# HG changeset patch +# User Sam Gillingham +# Date 1526963592 -36000 +# Node ID d103fef327d47ba31826007f9c9ab02c1f354330 +# Parent a4e63dbb642c83516104ea82cec0e45c4caffd54 +More work on making out of tree builds work + +diff --git a/trunk/CMakeLists.txt b/trunk/CMakeLists.txt +--- a/trunk/CMakeLists.txt ++++ b/trunk/CMakeLists.txt +@@ -20,14 +20,6 @@ + set (WINDOWS ${WIN32}) + endif() + +-set (PROJECT_BINARY_DIR bin) +-set (PROJECT_LIBRARY_DIR lib) +-set (PROJECT_SOURCE_DIR src) +-set (PROJECT_TEST_DIR tests) +-set (PROJECT_HEADER_DIR include) +-set (PROJECT_TOOLS_DIR tools) +-set (PROJECT_GDAL_DIR gdal) +- + # The version number. + set (LIBKEA_HG_VERSION 289) + set (LIBKEA_VERSION_MAJOR 1) +@@ -160,8 +152,8 @@ + + ############################################################################### + # Setup configure file +-configure_file ( "${PROJECT_HEADER_DIR}/kea-config.h.in" "${PROJECT_HEADER_DIR}/libkea/kea-config.h" ) +-configure_file ( "${PROJECT_TOOLS_DIR}/kea-config.in" "${PROJECT_BINARY_DIR}/kea-config" ) ++configure_file ( "${PROJECT_SOURCE_DIR}/include/kea-config.h.in" "${PROJECT_BINARY_DIR}/include/libkea/kea-config.h" ) ++configure_file ( "${PROJECT_SOURCE_DIR}/tools/kea-config.in" "${PROJECT_BINARY_DIR}/bin/kea-config" ) + ############################################################################### + + ############################################################################### +@@ -173,11 +165,12 @@ + ############################################################################### + # Build library + +-include_directories ("${PROJECT_HEADER_DIR}") ++include_directories ("${PROJECT_SOURCE_DIR}/include") ++include_directories ("${PROJECT_BINARY_DIR}/include") # for kea-config.h + include_directories(${HDF5_INCLUDE_DIR}) +-add_subdirectory ("${PROJECT_SOURCE_DIR}") ++add_subdirectory ("${PROJECT_SOURCE_DIR}/src") + if (LIBKEA_WITH_GDAL) +- add_subdirectory ("${PROJECT_GDAL_DIR}") ++ add_subdirectory ("${PROJECT_SOURCE_DIR}/gdal") + endif(LIBKEA_WITH_GDAL) + ############################################################################### + +@@ -191,7 +184,7 @@ + ############################################################################### + # Installation + +-install (FILES "${PROJECT_BINARY_DIR}/kea-config" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) ++install (FILES "${PROJECT_BINARY_DIR}/bin/kea-config" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) + ############################################################################### + + ############################################################################### +diff --git a/trunk/src/CMakeLists.txt b/trunk/src/CMakeLists.txt +--- a/trunk/src/CMakeLists.txt ++++ b/trunk/src/CMakeLists.txt +@@ -38,7 +38,7 @@ + ############################################################################### + # Testing + # exe needs to be in 'src' otherwise it doesn't work +-add_executable (test1 ${PROJECT_TEST_DIR}/test1.cpp) ++add_executable (test1 ${PROJECT_SOURCE_DIR}/src/tests/test1.cpp) + target_link_libraries (test1 ${LIBKEA_LIB_NAME}) + if(NOT WIN32) + # set rpath so the text exe finds hdf5. Really only needed diff --git a/var/spack/repos/builtin/packages/kealib/package.py b/var/spack/repos/builtin/packages/kealib/package.py index 6610cf6745..f42ac16b99 100644 --- a/var/spack/repos/builtin/packages/kealib/package.py +++ b/var/spack/repos/builtin/packages/kealib/package.py @@ -26,7 +26,7 @@ from spack import * class Kealib(CMakePackage): - """An HDF5 Based Raster File Format + """An HDF5 Based Raster File Format. KEALib provides an implementation of the GDAL data model. The format supports raster attribute tables, image pyramids, @@ -41,18 +41,21 @@ class Kealib(CMakePackage): Development work on this project has been funded by Landcare Research. """ - homepage = "http://kealib.org/" - url = "https://bitbucket.org/chchrsc/kealib/get/kealib-1.4.5.tar.gz" + homepage = "http://www.kealib.org/" + url = "https://bitbucket.org/chchrsc/kealib/get/kealib-1.4.7.tar.gz" - version('1.4.5', '112e9c42d980b2d2987a3c15d0833a5d') + version('develop', hg='https://bitbucket.org/chchrsc/kealib') + version('1.4.7', '6139e31e50f552247ddf98f489948893') - depends_on('hdf5') depends_on('cmake@2.8.10:', type='build') + depends_on('hdf5+cxx+hl') root_cmakelists_dir = 'trunk' + patch('cmake.patch', when='@1.4.7') + def cmake_args(self): return [ - '-DHDF5_INCLUDE_DIR=%s' % self.spec['hdf5'].prefix.include, - '-DHDF5_LIB_PATH=%s' % self.spec['hdf5'].prefix.lib, + '-DHDF5_INCLUDE_DIR=%s' % self.spec['hdf5'].headers.directories[0], + '-DHDF5_LIB_PATH=%s' % self.spec['hdf5'].libs.directories[0], ] -- cgit v1.2.3-70-g09d2 From 80e4c7da0e828c4894baa42e019a85f7b9b22d80 Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Wed, 23 May 2018 16:40:14 -0700 Subject: Add info for datamash@1.3 (#8261) --- var/spack/repos/builtin/packages/datamash/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/datamash/package.py b/var/spack/repos/builtin/packages/datamash/package.py index 29a3c84a17..0b5ed4663a 100644 --- a/var/spack/repos/builtin/packages/datamash/package.py +++ b/var/spack/repos/builtin/packages/datamash/package.py @@ -33,6 +33,7 @@ class Datamash(AutotoolsPackage): homepage = "https://www.gnu.org/software/datamash/" url = "http://ftp.gnu.org/gnu/datamash/datamash-1.0.5.tar.gz" + version('1.3', '47d382090e367ddb4967d640aba77b66') version('1.1.0', '79a6affca08107a095e97e4237fc8775') version('1.0.7', '9f317bab07454032ba9c068e7f17b04b') version('1.0.6', 'ff26fdef0f343cb695cf1853e14a1a5b') -- cgit v1.2.3-70-g09d2 From fa1153d116ae139f2c1bc51a279461ae67965064 Mon Sep 17 00:00:00 2001 From: jkelling Date: Thu, 24 May 2018 15:59:11 +0200 Subject: Fix MD5 hash for opencv 3.2.0 and 3.1.0 release (#8241) --- var/spack/repos/builtin/packages/opencv/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index 5821380827..d493651747 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -47,8 +47,8 @@ class Opencv(CMakePackage): version('3.4.0', '170732dc760e5f7ddeccbe53ba5d16a6') version('3.3.1', 'b1ed9aea030bb5bd9df28524d97de84c') version('3.3.0', '98a4e4c6f23ec725e808a891dc11eec4') - version('3.2.0', 'a43b65488124ba33dde195fea9041b70') - version('3.1.0', '70e1dd07f0aa06606f1bc0e3fa15abd3') + version('3.2.0', '1ea44a1d98c126ad40079d8eb914a72e') + version('3.1.0', 'a0669e22172dfc3225835b180744c9f0') version('2.4.13.2', 'fe52791ce523681a67036def4c25261b') version('2.4.13.1', 'f6d354500d5013e60dc0fc44b07a63d1') version('2.4.13', '8feb45a71adad89b8017a777477c3eff') -- cgit v1.2.3-70-g09d2 From db4062b01fe7aa423b4d53ecbf708a7d18d70a30 Mon Sep 17 00:00:00 2001 From: Chris Hadjigeorgiou Date: Thu, 24 May 2018 16:44:41 +0100 Subject: openfoam-org: add v2.4.0 (#7850) Add 2.4.0 changes --- .../builtin/packages/openfoam-org/240-etc.patch | 88 ++++++++++++++++++++++ .../repos/builtin/packages/openfoam-org/package.py | 41 +++++++--- 2 files changed, 118 insertions(+), 11 deletions(-) create mode 100644 var/spack/repos/builtin/packages/openfoam-org/240-etc.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openfoam-org/240-etc.patch b/var/spack/repos/builtin/packages/openfoam-org/240-etc.patch new file mode 100644 index 0000000000..cc0c19c78d --- /dev/null +++ b/var/spack/repos/builtin/packages/openfoam-org/240-etc.patch @@ -0,0 +1,88 @@ +--- OpenFOAM-2.4.x.orig/etc/bashrc 2016-10-16 16:11:45.000000000 +0200 ++++ OpenFOAM-2.4.x/etc/bashrc 2017-03-24 12:41:25.233267894 +0100 +@@ -55,6 +55,8 @@ + # overridden from the prefs.sh file or from command-line specification + # + #- note the location for later use (eg, in job scripts) ++rc="${BASH_SOURCE:-${ZSH_NAME:+$0}}" ++[ -n "$rc" ] && FOAM_INST_DIR=$(\cd $(dirname $rc)/../.. && \pwd -L) || \ + : ${FOAM_INST_DIR:=$foamInstall}; export FOAM_INST_DIR + + #- Compiler location: +--- OpenFOAM-2.4.x.orig/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L 2018-04-05 14:18:12.112228183 +0100 ++++ OpenFOAM-2.4.x/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L 2018-04-05 14:19:20.795393577 +0100 +@@ -77,7 +77,7 @@ + // Dummy yywrap to keep yylex happy at compile time. + // It is called by yylex but is not used as the mechanism to change file. + // See <> +-#if YY_FLEX_SUBMINOR_VERSION < 34 ++#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34 + extern "C" int yywrap() + #else + int yyFlexLexer::yywrap() +--- OpenFOAM-2.4.x.orig/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L 2018-04-05 14:18:19.137347383 +0100 ++++ OpenFOAM-2.4.x/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L 2018-04-05 14:19:27.556508297 +0100 +@@ -54,7 +54,7 @@ + // It is called by yylex but is not used as the mechanism to change file. + // See <> + //! \cond dummy +-#if YY_FLEX_SUBMINOR_VERSION < 34 ++#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34 + extern "C" int yywrap() + #else + int yyFlexLexer::yywrap() +--- OpenFOAM-2.4.x.orig/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L 2018-04-05 14:18:45.689797916 +0100 ++++ OpenFOAM-2.4.x/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L 2018-04-05 14:19:43.195773659 +0100 +@@ -80,7 +80,7 @@ + // Dummy yywrap to keep yylex happy at compile time. + // It is called by yylex but is not used as the mechanism to change file. + // See <> +-#if YY_FLEX_SUBMINOR_VERSION < 34 ++#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34 + extern "C" int yywrap() + #else + int yyFlexLexer::yywrap() +--- OpenFOAM-2.4.x.orig/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L 2018-04-05 14:18:50.432878396 +0100 ++++ OpenFOAM-2.4.x/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L 2018-04-05 14:19:46.299826328 +0100 +@@ -55,7 +55,7 @@ + // It is called by yylex but is not used as the mechanism to change file. + // See <> + //! \cond dummy +-#if YY_FLEX_SUBMINOR_VERSION < 34 ++#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34 + extern "C" int yywrap() + #else + int yyFlexLexer::yywrap() +--- OpenFOAM-2.4.x.orig/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L 2018-04-05 14:18:57.064990927 +0100 ++++ OpenFOAM-2.4.x/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L 2018-04-05 14:19:49.258876536 +0100 +@@ -50,7 +50,7 @@ + // It is called by yylex but is not used as the mechanism to change file. + // See <> + //! \cond dummy +-#if YY_FLEX_SUBMINOR_VERSION < 34 ++#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34 + extern "C" int yywrap() + #else + int yyFlexLexer::yywrap() +--- OpenFOAM-2.4.x.orig/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L 2018-04-05 14:18:27.152483381 +0100 ++++ OpenFOAM-2.4.x/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L 2018-04-05 14:19:32.180586757 +0100 +@@ -123,7 +123,7 @@ + // Dummy yywrap to keep yylex happy at compile time. + // It is called by yylex but is not used as the mechanism to change file. + // See <> +-#if YY_FLEX_SUBMINOR_VERSION < 34 ++#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34 + extern "C" int yywrap() + #else + int yyFlexLexer::yywrap() +--- OpenFOAM-2.4.x.orig/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L. 2018-04-05 14:18:35.049617377 +0100 ++++ OpenFOAM-2.4.x/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L 2018-04-05 14:19:38.493693876 +0100 +@@ -100,7 +100,7 @@ + // Dummy yywrap to keep yylex happy at compile time. + // It is called by yylex but is not used as the mechanism to change file. + // See <> +-#if YY_FLEX_SUBMINOR_VERSION < 34 ++#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34 + extern "C" int yywrap() + #else + int yyFlexLexer::yywrap()int yyFlexLexer::yywrap() diff --git a/var/spack/repos/builtin/packages/openfoam-org/package.py b/var/spack/repos/builtin/packages/openfoam-org/package.py index cbbb45b7f5..17ea54e0c2 100644 --- a/var/spack/repos/builtin/packages/openfoam-org/package.py +++ b/var/spack/repos/builtin/packages/openfoam-org/package.py @@ -85,6 +85,8 @@ class OpenfoamOrg(Package): url=baseurl + '/OpenFOAM-5.x/archive/version-5.0.tar.gz') version('4.1', 'afd7d8e66e7db0ffaf519b14f1a8e1d4', url=baseurl + '/OpenFOAM-4.x/archive/version-4.1.tar.gz') + version('2.4.0', 'ad7d8b7b0753655b2b6fd9e92eefa92a', + url=baseurl + '/OpenFOAM-2.4.x/archive/version-2.4.0.tar.gz') version('develop', git='https://github.com/OpenFOAM/OpenFOAM-dev.git') variant('int64', default=False, @@ -112,13 +114,7 @@ class OpenfoamOrg(Package): patch('50-etc.patch', when='@5.0:') patch('41-etc.patch', when='@4.1') patch('41-site.patch', when='@4.1:') - - # Some user config settings - config = { - 'mplib': 'SYSTEMMPI', # Use system mpi for spack - # Add links into bin/, lib/ (eg, for other applications) - 'link': False - } + patch('240-etc.patch', when='@2.4.0') # The openfoam architecture, compiler information etc _foam_arch = None @@ -136,6 +132,21 @@ class OpenfoamOrg(Package): # - End of definitions / setup - # + # Some user config settings + @property + def config(self): + settings = { + # Use system mpi for spack + 'mplib': 'SYSTEMMPI', + + # Add links into bin/, lib/ (eg, for other applications) + 'link': False, + } + # OpenFOAM v2.4 and earlier lacks WM_LABEL_OPTION + if self.spec.satisfies('@:2.4'): + settings['label-size'] = False + return settings + def setup_environment(self, spack_env, run_env): # This should be similar to the openfoam-com package, # but sourcing the etc/bashrc here seems to exit with an error. @@ -266,10 +277,18 @@ class OpenfoamOrg(Package): # Adjust components to use SPACK variants for component, subdict in self.etc_config.items(): - write_environ( - subdict, - posix=join_path('etc', 'config.sh', component), - cshell=join_path('etc', 'config.csh', component)) + # Versions up to 3.0 used an etc/config/component.sh naming + # convention instead of etc/config.sh/component + if spec.satisfies('@:3.0'): + write_environ( + subdict, + posix=join_path('etc', 'config', component) + '.sh', + cshell=join_path('etc', 'config', component) + '.csh') + else: + write_environ( + subdict, + posix=join_path('etc', 'config.sh', component), + cshell=join_path('etc', 'config.csh', component)) def build(self, spec, prefix): """Build using the OpenFOAM Allwmake script, with a wrapper to source -- cgit v1.2.3-70-g09d2 From fdf889264e36e13bf432a33d902dc1a038c7630d Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Thu, 24 May 2018 10:47:17 -0500 Subject: trf: make executable (#8265) --- var/spack/repos/builtin/packages/trf/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trf/package.py b/var/spack/repos/builtin/packages/trf/package.py index e4bab1161a..ef453c8b1a 100644 --- a/var/spack/repos/builtin/packages/trf/package.py +++ b/var/spack/repos/builtin/packages/trf/package.py @@ -44,3 +44,5 @@ class Trf(Package): def install(self, spec, prefix): mkdirp(prefix.bin) install('trf409.linux64', prefix.bin.trf) + chmod = which('chmod') + chmod('+x', prefix.bin.trf) -- cgit v1.2.3-70-g09d2 From 5fff4da5b7cf98ad903883aa6a06b5dbc773e9d0 Mon Sep 17 00:00:00 2001 From: Sajid Ali <30510036+s-sajid-ali@users.noreply.github.com> Date: Thu, 24 May 2018 10:47:31 -0500 Subject: Add msgpack-c 3.0.1 (#8264) * new file: cpp-3.0.1.tar.gz modified: package.py * deleted: cpp-3.0.1.tar.gz * remove whitespace --- var/spack/repos/builtin/packages/msgpack-c/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/msgpack-c/package.py b/var/spack/repos/builtin/packages/msgpack-c/package.py index c1cff79e24..0312b874f0 100644 --- a/var/spack/repos/builtin/packages/msgpack-c/package.py +++ b/var/spack/repos/builtin/packages/msgpack-c/package.py @@ -28,8 +28,9 @@ from spack import * class MsgpackC(CMakePackage): """A small, fast binary interchange format convertible to/from JSON""" homepage = "http://www.msgpack.org" - url = "https://github.com/msgpack/msgpack-c/archive/cpp-1.4.1.tar.gz" + url = "https://github.com/msgpack/msgpack-c/archive/cpp-3.0.1.tar.gz" + version('3.0.1', 'a79f05f0dc5637c161805d6c0e9bfbe7') version('1.4.1', 'e2fd3a7419b9bc49e5017fdbefab87e0') depends_on('cmake@2.8.12:', type='build') -- cgit v1.2.3-70-g09d2 From 4c4e2866d8c47e8ed795717965d3ed9de11ac8e0 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Thu, 24 May 2018 10:48:37 -0500 Subject: Charm++: Add possibility to build git version (#8260) --- var/spack/repos/builtin/packages/charm/package.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/charm/package.py b/var/spack/repos/builtin/packages/charm/package.py index b52d11aa6e..4ca93142b4 100644 --- a/var/spack/repos/builtin/packages/charm/package.py +++ b/var/spack/repos/builtin/packages/charm/package.py @@ -39,6 +39,8 @@ class Charm(Package): homepage = "http://charmplusplus.org" url = "http://charm.cs.illinois.edu/distrib/charm-6.8.2.tar.gz" + version("develop", git="https://github.com/UIUC-PPL/charm") + version("6.8.2", "a887a34b638a5b2f7fcf7ff3c262496d") version("6.8.1", "3e95ffa760909154ef16b643c9bb8193") version("6.8.0", "54df066a5aefb0bbc1a263c2383c2bba") @@ -54,7 +56,7 @@ class Charm(Package): patch("mpi.patch", when="@:6.7.1") # Ignore compiler warnings while configuring - patch("strictpass.patch") + patch("strictpass.patch", when="@:6.8.2") # Build targets # "target" is reserved, so we have to use something else. @@ -94,6 +96,10 @@ class Charm(Package): depends_on("papi", when="+papi") depends_on("cuda", when="+cuda") + # Git versions of Charm++ require automake and autoconf + depends_on("automake", when="@develop") + depends_on("autoconf", when="@develop") + conflicts("~tracing", "+papi") conflicts("backend=multicore", "+smp") -- cgit v1.2.3-70-g09d2 From fdb2d6f493ccc67c7b21cfdfffd8655e0cdb0540 Mon Sep 17 00:00:00 2001 From: Geoff Womeldorff Date: Thu, 24 May 2018 09:53:58 -0600 Subject: kokkos: update kokkos spackage to add current host/gpu architectures. (#8226) * kokkos: update kokkos spackage to add current host/gpu architectures. * kokkos: simplify host/gpu architecture selection and make intent of arg population logic more clear. * kokkos: mollify flake8. * Make strings and logic more pythonic. Add error for GPU arch without CUDA. * kokkos: simplify conflicts behaviour. make args population more pythonic. * kokkos: move gpu values to list for use in variant and conflicts checking. * kokkos: How fortunate the man with None. * kokkos: fix gpu_arch conflict loop error. add conflict to guard against +cuda and 2.5.00:develop versions, until kokkos issue #1296 is resolved. * kokkos: mollify flake8. * kokkos: add descriptive message to version conflict with +cuda. --- var/spack/repos/builtin/packages/kokkos/package.py | 50 +++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/kokkos/package.py b/var/spack/repos/builtin/packages/kokkos/package.py index 7f61270327..51d90ffc06 100644 --- a/var/spack/repos/builtin/packages/kokkos/package.py +++ b/var/spack/repos/builtin/packages/kokkos/package.py @@ -46,7 +46,43 @@ class Kokkos(Package): variant('qthreads', default=False, description="enable Qthreads backend") variant('cuda', default=False, description="enable Cuda backend") - variant('openmp', default=True, description="enable OpenMP backend") + variant('openmp', default=False, description="enable OpenMP backend") + + gpu_values = ('Kepler30', 'Kepler32', 'Kepler35', 'Kepler37', + 'Maxwell50', 'Maxwell52', 'Maxwell53', + 'Pascal60', 'Pascal61') + + # Host architecture variant + variant( + 'host_arch', + default=None, + values=('AMDAVX', 'ARMv80', 'ARMv81', 'ARMv8-ThunderX', + 'Power7', 'Power8', 'Power9', + 'WSM', 'SNB', 'HSW', 'BDW', 'SKX', 'KNC', 'KNL'), + description='Set the host architecture to use' + ) + + # GPU architecture variant + variant( + 'gpu_arch', + default=None, + values=gpu_values, + description='Set the GPU architecture to use' + ) + + # Check that we haven't specified a gpu architecture + # without specifying CUDA + for p in gpu_values: + conflicts('gpu_arch={0}'.format(p), when='~cuda', + msg='Must specify CUDA backend to use a GPU architecture.') + + # conflicts on kokkos version and cuda enabled + # see kokkos issue #1296 + # https://github.com/kokkos/kokkos/issues/1296 + conflicts('+cuda', when='@2.5.00:develop', + msg='Kokkos build system has issue when CUDA enabled' + ' in version 2.5.00, and develop until ' + 'issue #1296 is resolved.') # Specify that v1.x is required as v2.x has API changes depends_on('hwloc@:1') @@ -62,12 +98,24 @@ class Kokkos(Package): '--with-hwloc=%s' % spec['hwloc'].prefix, '--with-serial' ] + arch_args = [] + # Backends if '+openmp' in spec: g_args.append('--with-openmp') if 'qthreads' in spec: g_args.append('--with-qthreads=%s' % spec['qthreads'].prefix) if 'cuda' in spec: g_args.append('--with-cuda=%s' % spec['cuda'].prefix) + # Host architectures + host_arch = spec.variants['host_arch'].value + # GPU architectures + gpu_arch = spec.variants['gpu_arch'].value + if host_arch: + arch_args.append(host_arch) + if gpu_arch: + arch_args.append(gpu_arch) + if arch_args: + g_args.append('--arch={0}'.format(','.join(arch_args))) generate(*g_args) make() -- cgit v1.2.3-70-g09d2 From c25759e1c88b4d588ef117cee3e42fec9671da11 Mon Sep 17 00:00:00 2001 From: Luca Heltai Date: Thu, 24 May 2018 23:24:47 +0200 Subject: Added gsl dependency to pnfft (#8255) --- var/spack/repos/builtin/packages/pnfft/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pnfft/package.py b/var/spack/repos/builtin/packages/pnfft/package.py index 0e7b3b1328..7212a2c1af 100644 --- a/var/spack/repos/builtin/packages/pnfft/package.py +++ b/var/spack/repos/builtin/packages/pnfft/package.py @@ -35,6 +35,7 @@ class Pnfft(AutotoolsPackage): version('1.0.7-alpha', '5caa7f214eed99de2281043ca2367e9e') depends_on('pfft') + depends_on('gsl') def configure(self, spec, prefix): options = ['--prefix={0}'.format(prefix)] -- cgit v1.2.3-70-g09d2 From 28e7248b0614a801b6f72c406b013138ab9f6c48 Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Thu, 24 May 2018 18:04:03 -0700 Subject: Add Tophat v2.1.2, fixes automake issues (#8266) * Add Tophat v2.1.2, fixes automake issues The Tophat team merged the patch from https://github.com/spack/spack/pull/8244 and release v2.1.2 This change requires the old automake if you're building the older release and is relaxed about the automake it requires if you're building the v2.1.2 release. Building v2.1.1 and v2.1.2 works on a CentOS 7 system, I don't have the necessary bit to actually test the resulting binaries. Here's the commit note from the change that was ultimately merged upstream. Fixes #8025 > Tophat was failing to build with automake@1.16.1, it worked with the > older automake@1.15.1. This commit adds a patch to Tophat's > src/Makefile.am which cleans up a few things. The result builds > successfully with both automake@1.15.1 and automake@1.16.1. I have no > way to check that the resulting builds Do The Right Thing. > > It changes two things: > > the original Makefile.am had a rule for $(SAMPROG) with no > actions, and since there was a directory there with a tempting name > the newer automake was trying to do something with it, but lacked > the appropriate clues. Since that target is actually made as a side > effect of making the library (sigh...), it seems to work to just > give that rule something harmless to do (the Peter Principle > triumphs again...). > > a bunch of the targets need a libtophat.a and libgc.a; the older > automake was probably able to guess what to do given the list of > sources but the newer automake apparently won't make the necessary > assumptions. This patch wires up a simple rule and cleans up the > appropriate dependencies so that things work. > > While it may appear that I'm someone who understands automake, keep in > mind that I only play such a person on a TV reality show. YMMV. * Remove extraneous when constraint --- var/spack/repos/builtin/packages/tophat/package.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/tophat/package.py b/var/spack/repos/builtin/packages/tophat/package.py index 753e1590d4..2234e9c0a0 100644 --- a/var/spack/repos/builtin/packages/tophat/package.py +++ b/var/spack/repos/builtin/packages/tophat/package.py @@ -31,10 +31,15 @@ class Tophat(AutotoolsPackage): homepage = "http://ccb.jhu.edu/software/tophat/index.shtml" url = "https://github.com/infphilo/tophat/archive/v2.1.1.tar.gz" + version('2.1.2', 'db844fd7f53c519e716cd6222e6195b2') version('2.1.1', 'ffd18de2f893a95eb7e9d0c5283d241f') depends_on('autoconf', type='build') - depends_on('automake', type='build') + # 2.1.1 only builds with automake@1.15.1. There's a patch here: + # https://github.com/spack/spack/pull/8244, which was incorporated + # upstream in 2.1.2, which is known to build with 1.16.1 and 1.15.1. + depends_on('automake', type='build') + depends_on('automake@1.15.1', when='@:2.1.1', type='build') depends_on('libtool', type='build') depends_on('m4', type='build') -- cgit v1.2.3-70-g09d2 From 468570114f1266c7a123f592e5640f88d85dc177 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Fri, 25 May 2018 16:06:50 +0200 Subject: hdf5: add 1.10.2 (#8274) --- var/spack/repos/builtin/packages/hdf5/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index 2e8ac73e79..f70e294b17 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -39,6 +39,7 @@ class Hdf5(AutotoolsPackage): list_url = "https://support.hdfgroup.org/ftp/HDF5/releases" list_depth = 3 + version('1.10.2', '8d4eae84e533efa57496638fd0dca8c3') version('1.10.1', '43a2f9466702fb1db31df98ae6677f15') version('1.10.0-patch1', '9180ff0ef8dc2ef3f61bd37a7404f295') version('1.10.0', 'bdc935337ee8282579cd6bc4270ad199') -- cgit v1.2.3-70-g09d2 From 6899c9e6c3fb6ff9884094ac2257782f6f5b8c24 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Fri, 25 May 2018 14:00:12 -0500 Subject: perl-text-soundex: new package (#8279) * perl-text-soundex: new package * perl-text-soundex: formatting --- .../builtin/packages/perl-text-soundex/package.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-text-soundex/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-text-soundex/package.py b/var/spack/repos/builtin/packages/perl-text-soundex/package.py new file mode 100644 index 0000000000..33de11f788 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-text-soundex/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlTextSoundex(PerlPackage): + """Soundex is a phonetic algorithm for indexing names by sound, as + pronounced in English. The goal is for names with the same + pronunciation to be encoded to the same representation so + that they can be matched despite minor differences in spelling""" + + homepage = "http://search.cpan.org/~rjbs/Text-Soundex-3.05/Soundex.pm" + url = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Text-Soundex-3.05.tar.gz" + + version('3.05', 'cb40ded7a5d27aa3a411d274d6ec18ae') -- cgit v1.2.3-70-g09d2 From 3c10d160d0539c8dca2a502c2bd878fc7d9aeda3 Mon Sep 17 00:00:00 2001 From: Andrey Prokopenko Date: Fri, 25 May 2018 15:01:19 -0400 Subject: flang: add non-develop version (#8276) --- var/spack/repos/builtin/packages/flang/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/flang/package.py b/var/spack/repos/builtin/packages/flang/package.py index 1b9d746087..d716ecaa06 100644 --- a/var/spack/repos/builtin/packages/flang/package.py +++ b/var/spack/repos/builtin/packages/flang/package.py @@ -30,9 +30,10 @@ import os class Flang(CMakePackage): """Flang is a Fortran compiler targeting LLVM.""" homepage = "https://github.com/flang-compiler/flang" - url = "https://github.com/flang-compiler/flang/flecsi/tarball/v1.0" + url = "https://github.com/flang-compiler/flang/archive/flang_20180319.tar.gz" version('develop', git='https://github.com/flang-compiler/flang', branch='master') + version('20180319', 'e659bad83b791f90af2c5cd672864669') depends_on( "llvm+clang@4.0.1,5.0.0", -- cgit v1.2.3-70-g09d2 From 1c2dc8f528081b699cc6d6fec2da344424fa1e22 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Fri, 25 May 2018 18:22:25 -0500 Subject: repeatmasker: fix bin location and dependency (#8286) --- var/spack/repos/builtin/packages/repeatmasker/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/repeatmasker/package.py b/var/spack/repos/builtin/packages/repeatmasker/package.py index 9829c2e85a..72aa492f3d 100644 --- a/var/spack/repos/builtin/packages/repeatmasker/package.py +++ b/var/spack/repos/builtin/packages/repeatmasker/package.py @@ -37,6 +37,7 @@ class Repeatmasker(Package): version('4.0.7', '4dcbd7c88c5343e02d819f4b3e6527c6') depends_on('perl', type=('build', 'run')) + depends_on('perl-text-soundex', type=('build', 'run')) depends_on('hmmer') depends_on('ncbi-rmblastn') depends_on('trf') @@ -77,4 +78,4 @@ class Repeatmasker(Package): with open(config_answers_filename, 'r') as f: inspect.getmodule(self).perl('configure', input=f) - distutils.dir_util.copy_tree(".", prefix) + distutils.dir_util.copy_tree(".", prefix.bin) -- cgit v1.2.3-70-g09d2 From 90d1478f50eb0269720d56f6ec04ebd8cea79a5f Mon Sep 17 00:00:00 2001 From: Nate Roberts Date: Fri, 25 May 2018 22:06:05 -0600 Subject: Added new package Camellia. (#8190) * Added new package Camellia. * Fixed an issue with a missing blank line. Added a couple more Trilinos packages (things I expect to depend on eventually). * Fixed a couple issues raised by @adamjstewart. * Specified 4.9.2 as the supported MOAB version. 5.0.0 causes build issues on Macs during the link of Camellia's drivers. The issue is that we end up with -framework -lAccelerate in the link line, where it should read -framework Accelerate, I believe. I'm not sure where this comes from, but 4.9.2 does not have this issue. * Trimmed slightly the Trilinos requirements. Also deleted a blank line that had spaces in it because the Travis-CI thing didn't like that. * Reduced length of MOAB description (Travis-CI complained). * Reduced the MOAB line further; didn't quite get there last time! This is to satisfy Travis-CI's requirement that the description be less than 80 characters long (E501). * Put in my GitHub handle, in place of an allusion to my email address. Also added a new argument for Camellia build, and made the MOAB description longer (thanks to @adamjstewart's note that long lines are allowed so long as they are not split). * Added MPI dependency. Added explicit OFF for MOAB enablement when ~moab. Swapped order of variant and version. --- .../repos/builtin/packages/camellia/package.py | 61 ++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 var/spack/repos/builtin/packages/camellia/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/camellia/package.py b/var/spack/repos/builtin/packages/camellia/package.py new file mode 100644 index 0000000000..6bdf9a61ad --- /dev/null +++ b/var/spack/repos/builtin/packages/camellia/package.py @@ -0,0 +1,61 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Camellia(CMakePackage): + """Camellia: user-friendly MPI-parallel adaptive finite element package, + with support for DPG and other hybrid methods, built atop Trilinos. + """ + + homepage = "https://bitbucket.org/nateroberts/Camellia" + url = "https://bitbucket.org/nateroberts/camellia.git" + + maintainers = ['CamelliaDPG'] + version('master', git='https://bitbucket.org/nateroberts/camellia.git', branch='master') + + variant('moab', default=True, description='Compile with MOAB to include support for reading standard mesh formats') + + depends_on('trilinos+amesos+amesos2+belos+epetra+epetraext+exodus+ifpack+ifpack2+intrepid+intrepid2+kokkos+ml+muelu+sacado+shards+teuchos+tpetra+zoltan+mumps+superlu-dist+hdf5+zlib+pnetcdf@master,12.12.1:') + depends_on('moab@:4', when='+moab') + depends_on('mpi') + + def cmake_args(self): + spec = self.spec + options = [ + '-DTrilinos_PATH:PATH=%s' % spec['trilinos'].prefix, + '-DMPI_DIR:PATH=%s' % spec['mpi'].prefix, + '-DBUILD_FOR_INSTALL:BOOL=ON' + ] + + if '+moab' in spec: + options.extend([ + '-DENABLE_MOAB:BOOL=ON', + '-DMOAB_PATH:PATH=%s' % spec['moab'].prefix + ]) + else: + options.append('-DENABLE_MOAB:BOOL=OFF') + + return options -- cgit v1.2.3-70-g09d2 From 7a741e7e082df5e6d34240445564d5c99d6702c3 Mon Sep 17 00:00:00 2001 From: Corey McNeish <35310375+mcneish1@users.noreply.github.com> Date: Fri, 25 May 2018 22:44:18 -0700 Subject: Fix OpenCV JasPer disable (#8287) The recipe previously did not include -DWITH_JASPER Other edits: * BUILD_IPP_IW is BUILD instead of WITH; it was in a different section of the CMakeLists.txt. Move it to the top * Several options were missing :BOOL, add them * -DWITH_ZLIB doesn't actually exist as an option, at least in the latest version. --- var/spack/repos/builtin/packages/opencv/package.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index d493651747..0417ae1b4c 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -180,27 +180,29 @@ class Opencv(CMakePackage): # 3rd party components args.extend([ + '-DBUILD_IPP_IW:BOOL={0}'.format(( + 'ON' if '+ipp_iw' in spec else 'OFF')), '-DWITH_CUDA:BOOL={0}'.format(( 'ON' if '+cuda' in spec else 'OFF')), - '-DWITH_EIGEN={0}'.format(( + '-DWITH_EIGEN:BOOL={0}'.format(( 'ON' if '+eigen' in spec else 'OFF')), '-DWITH_IPP:BOOL={0}'.format(( 'ON' if '+ipp' in spec else 'OFF')), - '-DBUILD_IPP_IW:BOOL={0}'.format(( - 'ON' if '+ipp_iw' in spec else 'OFF')), + '-DWITH_JASPER:BOOL={0}'.format(( + 'ON' if '+jasper' in spec else 'OFF')), '-DWITH_JPEG:BOOL={0}'.format(( 'ON' if '+jpeg' in spec else 'OFF')), - '-DWITH_OPENCL={0}'.format(( + '-DWITH_OPENCL:BOOL={0}'.format(( 'ON' if '+opencl' in spec else 'OFF')), - '-DWITH_OPENCL_SVM={0}'.format(( + '-DWITH_OPENCL_SVM:BOOL={0}'.format(( 'ON' if '+opencl_svm' in spec else 'OFF')), - '-DWITH_OPENCLAMDFFT={0}'.format(( + '-DWITH_OPENCLAMDFFT:BOOL={0}'.format(( 'ON' if '+openclamdfft' in spec else 'OFF')), - '-DWITH_OPENCLAMDBLAS={0}'.format(( + '-DWITH_OPENCLAMDBLAS:BOOL={0}'.format(( 'ON' if '+openclamdblas' in spec else 'OFF')), '-DWITH_OPENMP:BOOL={0}'.format(( 'ON' if '+openmp' in spec else 'OFF')), - '-DWITH_PTHREADS_PF={0}'.format(( + '-DWITH_PTHREADS_PF:BOOL={0}'.format(( 'ON' if '+pthreads_pf' in spec else 'OFF')), '-DWITH_PNG:BOOL={0}'.format(( 'ON' if '+png' in spec else 'OFF')), @@ -210,8 +212,6 @@ class Opencv(CMakePackage): 'ON' if '+tiff' in spec else 'OFF')), '-DWITH_VTK:BOOL={0}'.format(( 'ON' if '+vtk' in spec else 'OFF')), - '-DWITH_ZLIB:BOOL={0}'.format(( - 'ON' if '+zlib' in spec else 'OFF')), ]) # Media I/O -- cgit v1.2.3-70-g09d2 From 8203c4f55b5a411a7864ddeca62f9331d66e77fb Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Sat, 26 May 2018 11:18:14 -0400 Subject: Fix gettext: Problem with libxml2 (#8132) * See https://github.com/spack/spack/issues/2882 * code review * Correctly access lib directory --- var/spack/repos/builtin/packages/gettext/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gettext/package.py b/var/spack/repos/builtin/packages/gettext/package.py index edbe120fe6..c36d518ef3 100644 --- a/var/spack/repos/builtin/packages/gettext/package.py +++ b/var/spack/repos/builtin/packages/gettext/package.py @@ -84,8 +84,10 @@ class Gettext(AutotoolsPackage): config_args.append('--disable-curses') if '+libxml2' in spec: - config_args.append('--with-libxml2-prefix={0}'.format( + config_args.append('CPPFLAGS=-I{0}/include'.format( spec['libxml2'].prefix)) + config_args.append('LDFLAGS=-L{0} -Wl,-rpath,{0}'.format( + spec['libxml2'].libs.directories[0])) else: config_args.append('--with-included-libxml') -- cgit v1.2.3-70-g09d2 From 7602fcd4d0965fbdf34baa8b3ee69a9db8955074 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sat, 26 May 2018 10:36:34 -0500 Subject: Fix compilation of FYBA with GCC 6 (#8273) --- var/spack/repos/builtin/packages/fyba/gcc-6.patch | 18 ++++++++++++++++++ var/spack/repos/builtin/packages/fyba/package.py | 4 ++++ 2 files changed, 22 insertions(+) create mode 100644 var/spack/repos/builtin/packages/fyba/gcc-6.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fyba/gcc-6.patch b/var/spack/repos/builtin/packages/fyba/gcc-6.patch new file mode 100644 index 0000000000..33551d6546 --- /dev/null +++ b/var/spack/repos/builtin/packages/fyba/gcc-6.patch @@ -0,0 +1,18 @@ +diff -Nuar a/src/FYBA/FYLU.cpp b/src/FYBA/FYLU.cpp +--- a/src/FYBA/FYLU.cpp 2014-09-22 00:36:49.000000000 -0500 ++++ b/src/FYBA/FYLU.cpp 2018-05-24 15:35:43.584181379 -0500 +@@ -4,12 +4,12 @@ + /* Innhold: Rutiner for utvalg */ + /* ======================================================================== */ + +-#include "stdafx.h" +- + #include + #include + #include + ++#include "stdafx.h" ++ + using namespace std; + + #define U_PARA_LEN 128 /* Max lengde av parameterstreng */ diff --git a/var/spack/repos/builtin/packages/fyba/package.py b/var/spack/repos/builtin/packages/fyba/package.py index 914de4aef4..bdaece0cf5 100644 --- a/var/spack/repos/builtin/packages/fyba/package.py +++ b/var/spack/repos/builtin/packages/fyba/package.py @@ -43,6 +43,10 @@ class Fyba(AutotoolsPackage): depends_on('libtool', type='build') depends_on('m4', type='build') + # error: macro "min" passed 3 arguments, but takes just 2 + # https://github.com/kartverket/fyba/issues/21 + patch('gcc-6.patch') + # fatal error: 'sys/vfs.h' file not found # https://github.com/kartverket/fyba/issues/12 patch('vfs-mount-darwin.patch', when='platform=darwin') -- cgit v1.2.3-70-g09d2 From 1549ee76e563399dec69ed2cb16c5d10b2d7c138 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sat, 26 May 2018 10:37:22 -0500 Subject: Add GDAL 2.3.0 (#8263) * Add GDAL 2.3.0 * Add missing dependencies, change default variants, and add links * GDAL requires old hacked version of JasPer * Move JasPer patch to GDAL --- var/spack/repos/builtin/packages/gdal/package.py | 404 ++++++++++++++++++++--- var/spack/repos/builtin/packages/gdal/uuid.patch | 234 +++++++++++++ 2 files changed, 592 insertions(+), 46 deletions(-) create mode 100644 var/spack/repos/builtin/packages/gdal/uuid.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gdal/package.py b/var/spack/repos/builtin/packages/gdal/package.py index 3a22739a81..d303d26f3b 100644 --- a/var/spack/repos/builtin/packages/gdal/package.py +++ b/var/spack/repos/builtin/packages/gdal/package.py @@ -27,73 +27,385 @@ import sys class Gdal(AutotoolsPackage): - """GDAL is a translator library for raster and vector geospatial - data formats that is released under an X/MIT style Open Source - license by the Open Source Geospatial Foundation. As a library, - it presents a single raster abstract data model and vector - abstract data model to the calling application for all supported - formats. It also comes with a variety of useful command line - utilities for data translation and processing. + """GDAL (Geospatial Data Abstraction Library) is a translator library for + raster and vector geospatial data formats that is released under an X/MIT + style Open Source license by the Open Source Geospatial Foundation. As a + library, it presents a single raster abstract data model and vector + abstract data model to the calling application for all supported formats. + It also comes with a variety of useful command line utilities for data + translation and processing. """ homepage = "http://www.gdal.org/" - url = "http://download.osgeo.org/gdal/2.1.2/gdal-2.1.2.tar.xz" + url = "http://download.osgeo.org/gdal/2.3.0/gdal-2.3.0.tar.xz" list_url = "http://download.osgeo.org/gdal/" list_depth = 1 + version('2.3.0', '2fe9d64fcd9dc37645940df020d3e200') version('2.1.2', 'ae85b78888514c75e813d658cac9478e') version('2.0.2', '940208e737c87d31a90eaae43d0efd65') + variant('libtool', default=True, description='Use libtool to build the library') + variant('libz', default=True, description='Include libz support') + variant('libiconv', default=False, description='Include libiconv support') + variant('liblzma', default=True, description='Include liblzma support') + variant('zstd', default=False, description='Include zstd support') + variant('pg', default=False, description='Include PostgreSQL support') + variant('cfitsio', default=False, description='Include FITS support') + variant('png', default=False, description='Include PNG support') + variant('jpeg', default=True, description='Include JPEG support') + variant('gif', default=False, description='Include GIF support') + variant('sosi', default=False, description='Include SOSI support') + variant('hdf4', default=False, description='Include HDF4 support') + variant('hdf5', default=False, description='Include HDF5 support') + variant('kea', default=False, description='Include kealib') + variant('netcdf', default=False, description='Include netCDF support') + variant('jasper', default=False, description='Include JPEG-2000 support via JasPer library') + variant('openjpeg', default=False, description='Include JPEG-2000 support via OpenJPEG 2.x library') + variant('xerces', default=False, description='Use Xerces-C++ parser') + variant('expat', default=False, description='Use Expat XML parser') + variant('odbc', default=False, description='Include ODBC support') + variant('curl', default=False, description='Include curl') + variant('xml2', default=False, description='Include libxml2') + variant('sqlite3', default=False, description='Use SQLite 3 library') + variant('pcre', default=False, description='Include libpcre support') + variant('geos', default=False, description='Include GEOS support') + variant('qhull', default=False, description='Include QHull support') + variant('opencl', default=False, description='Include OpenCL (GPU) support') + variant('poppler', default=False, description='Include poppler (for PDF) support') + variant('proj', default=True, description='Compile with PROJ.x') + variant('perl', default=False, description='Enable perl bindings') + variant('python', default=False, description='Enable python bindings') + variant('java', default=False, description='Include Java support') + variant('armadillo', default=False, description='Include Armadillo support for faster TPS transform computation') + variant('cryptopp', default=False, description='Include cryptopp support') + variant('crypto', default=False, description='Include crypto (from openssl) support') + + extends('perl', when='+perl') extends('python', when='+python') - variant('hdf5', default=False, description='Enable HDF5 support') - variant('hdf', default=False, description='Enable HDF4 support') - variant('openjpeg', default=False, description='Enable JPEG2000 support') - variant('geos', default=False, description='Enable GEOS support') - variant('kea', default=False, description='Enable KEA support') - variant('netcdf', default=False, description='Enable NetCDF support') - variant('python', default=False, description='Enable Python support') - - depends_on('swig', when='+python') - depends_on("hdf5", when='+hdf5') - depends_on("hdf", when='+hdf') - depends_on("openjpeg", when='+openjpeg') - depends_on("geos", when='+geos') - depends_on("kealib", when='+kea') - depends_on("netcdf", when='+netcdf') - depends_on("libtiff") - depends_on("libpng") - depends_on("zlib") - depends_on("proj") - depends_on("py-numpy", type=('build', 'run')) - - parallel = False + # GDAL depends on GNUmake on Unix platforms. + # https://trac.osgeo.org/gdal/wiki/BuildingOnUnix + depends_on('gmake', type='build') + depends_on('pkg-config@0.25:', type='build') + + # Required dependencies + depends_on('libtiff@3.6.0:') # 3.9.0+ needed to pass testsuite + depends_on('libgeotiff@1.2.1:') + depends_on('json-c') + + # Optional dependencies + depends_on('libtool', type='build', when='+libtool') + depends_on('zlib', when='+libz') + depends_on('libiconv', when='+libiconv') + depends_on('xz', when='+liblzma') + depends_on('zstd', when='+zstd') + depends_on('postgresql', when='+pg') + depends_on('cfitsio', when='+cfitsio') + depends_on('libpng', when='+png') + depends_on('jpeg', when='+jpeg') + depends_on('giflib', when='+gif') + depends_on('fyba', when='+sosi') + depends_on('hdf', when='+hdf4') + depends_on('hdf5', when='+hdf5') + depends_on('kealib', when='+kea') + depends_on('netcdf', when='+netcdf') + depends_on('jasper@1.900.1', patches=patch('uuid.patch'), when='+jasper') + depends_on('openjpeg', when='+openjpeg') + depends_on('xerces-c', when='+xerces') + depends_on('expat', when='+expat') + depends_on('unixodbc', when='+odbc') + depends_on('curl@7.10.8:', when='+curl') + depends_on('libxml2', when='+xml2') + depends_on('sqlite@3:', when='+sqlite3') + depends_on('pcre', when='+pcre') + depends_on('geos', when='+geos') + depends_on('qhull', when='+qhull') + depends_on('opencl', when='+opencl') + depends_on('poppler', when='+poppler') + depends_on('proj', when='+proj') + depends_on('perl', type=('build', 'run'), when='+perl') + depends_on('python', type=('build', 'run'), when='+python') + depends_on('java', type=('build', 'run'), when='+java') + depends_on('armadillo', when='+armadillo') + depends_on('cryptopp', when='+cryptopp') + depends_on('openssl', when='+crypto') + + # https://trac.osgeo.org/gdal/wiki/SWIG + depends_on('swig', type='build', when='+python') + depends_on('swig', type='build', when='+perl') + + # https://trac.osgeo.org/gdal/wiki/SupportedCompilers + msg = 'GDAL requires C++11 support' + conflicts('%gcc@:4.8.0', msg=msg) + conflicts('%clang@:3.2', msg=msg) + conflicts('%intel@:12', msg=msg) + conflicts('%xl@:13.0', msg=msg) + conflicts('%xl_r@:13.0', msg=msg) + # https://trac.osgeo.org/gdal/wiki/BuildHints def configure_args(self): spec = self.spec - args = [] - args.append("--with-liblzma=yes") - args.append("--with-zlib=%s" % spec['zlib'].prefix) - args.append("--without-libtool") + # Required dependencies + args = [ + # https://trac.osgeo.org/gdal/wiki/TIFF + '--with-libtiff={0}'.format(spec['libtiff'].prefix), + '--with-geotiff={0}'.format(spec['libgeotiff'].prefix), + '--with-libjson-c={0}'.format(spec['json-c'].prefix), + ] - if '+python' in spec: - args.append("--with-python=%s" % spec['python'].command.path) + # Optional dependencies + if '+libtool' in spec: + args.append('--with-libtool=yes') else: - args.append("--with-python=no") + args.append('--with-libtool=no') + + if '+libz' in spec: + args.append('--with-libz={0}'.format(spec['zlib'].prefix)) + else: + args.append('--with-libz=no') + + if '+libiconv' in spec: + args.append('--with-libiconv-prefix={0}'.format( + spec['libiconv'].prefix)) + else: + args.append('--with-libiconv-prefix=no') + + if '+liblzma' in spec: + args.append('--with-liblzma=yes') + else: + args.append('--with-liblzma=no') + + if '+zstd' in spec: + args.append('--with-zstd={0}'.format(spec['zstd'].prefix)) + else: + args.append('--with-zstd=no') + + if '+pg' in spec: + args.append('--with-pg={0}'.format( + spec['postgresql'].prefix.bin.pg_config)) + else: + args.append('--with-pg=no') + + if '+cfitsio' in spec: + args.append('--with-cfitsio={0}'.format(spec['cfitsio'].prefix)) + else: + args.append('--with-cfitsio=no') + + if '+png' in spec: + args.append('--with-png={0}'.format(spec['libpng'].prefix)) + else: + args.append('--with-png=no') + + if '+jpeg' in spec: + args.append('--with-jpeg={0}'.format(spec['jpeg'].prefix)) + else: + args.append('--with-jpeg=no') + + if '+gif' in spec: + args.append('--with-gif={0}'.format(spec['giflib'].prefix)) + else: + args.append('--with-gif=no') + + # https://trac.osgeo.org/gdal/wiki/SOSI + if '+sosi' in spec: + args.append('--with-sosi={0}'.format(spec['fyba'].prefix)) + else: + args.append('--with-sosi=no') + + # https://trac.osgeo.org/gdal/wiki/HDF + if '+hdf4' in spec: + args.append('--with-hdf4={0}'.format(spec['hdf'].prefix)) + else: + args.append('--with-hdf4=no') - if '+geos' in spec: - args.append('--with-geos=yes') - if '+hdf' in spec: - args.append('--with-hdf4=%s' % spec['hdf'].prefix) if '+hdf5' in spec: - args.append('--with-hdf5=%s' % spec['hdf5'].prefix) - if '+openjpeg' in spec: - args.append('--with-openjpeg=%s' % spec['openjpeg'].prefix) + args.append('--with-hdf5={0}'.format(spec['hdf5'].prefix)) + else: + args.append('--with-hdf5=no') + if '+kea' in spec: - args.append('--with-kea=yes') + args.append('--with-kea={0}'.format( + join_path(spec['kealib'].prefix.bin, 'kea-config'))) + else: + args.append('--with-kea=no') + + # https://trac.osgeo.org/gdal/wiki/NetCDF if '+netcdf' in spec: - args.append('--with-netcdf=%s' % spec['netcdf'].prefix) + args.append('--with-netcdf={0}'.format(spec['netcdf'].prefix)) + else: + args.append('--with-netcdf=no') + + # https://trac.osgeo.org/gdal/wiki/JasPer + if '+jasper' in spec: + args.append('--with-jasper={0}'.format(spec['jasper'].prefix)) + else: + args.append('--with-jasper=no') + + if '+openjpeg' in spec: + args.append('--with-openjpeg=yes') + else: + args.append('--with-openjpeg=no') + + if '+xerces' in spec: + args.append('--with-xerces={0}'.format(spec['xerces-c'].prefix)) + else: + args.append('--with-xerces=no') + + if '+expat' in spec: + args.append('--with-expat={0}'.format(spec['expat'].prefix)) + else: + args.append('--with-expat=no') + + if '+odbc' in spec: + args.append('--with-odbc={0}'.format(spec['unixodbc'].prefix)) + else: + args.append('--with-odbc=no') + + # https://trac.osgeo.org/gdal/wiki/LibCurl + if '+curl' in spec: + args.append('--with-curl={0}'.format( + join_path(spec['curl'].prefix.bin, 'curl-config'))) + else: + args.append('--with-curl=no') + + if '+xml2' in spec: + args.append('--with-xml2={0}'.format( + join_path(spec['libxml2'].prefix.bin, 'xml2-config'))) + else: + args.append('--with-xml2=no') + + # https://trac.osgeo.org/gdal/wiki/SQLite + if '+sqlite3' in spec: + args.append('--with-sqlite3={0}'.format(spec['sqlite'].prefix)) + else: + args.append('--with-sqlite3=no') + + if '+pcre' in spec: + args.append('--with-pcre={0}'.format(spec['pcre'].prefix)) + else: + args.append('--with-pcre=no') + + if '+geos' in spec: + args.append('--with-geos={0}'.format( + join_path(spec['geos'].prefix.bin, 'geos-config'))) + else: + args.append('--with-geos=no') + + if '+qhull' in spec: + args.append('--with-qhull=yes') + else: + args.append('--with-qhull=no') + + if '+opencl' in spec: + args.append('--with-opencl={0}'.format(spec['opencl'].prefix)) + else: + args.append('--with-opencl=no') + + if '+poppler' in spec: + args.append('--with-poppler={0}'.format(spec['poppler'].prefix)) + else: + args.append('--with-poppler=no') + + if '+proj' in spec: + args.append('--with-proj={0}'.format(spec['proj'].prefix)) + if spec.satisfies('^proj@5.0:5.999'): + args.append('--with-proj5-api=yes') + else: + args.append('--with-proj5-api=no') + else: + args.append('--with-proj=no') + + if '+perl' in spec: + args.append('--with-perl=yes') + else: + args.append('--with-perl=no') + + if '+python' in spec: + args.append('--with-python={0}'.format( + spec['python'].command.path)) + else: + args.append('--with-python=no') + + if '+java' in spec: + args.append('--with-java={0}'.format(spec['java'].prefix)) + else: + args.append('--with-java=no') + + if '+armadillo' in spec: + args.append('--with-armadillo={0}'.format( + spec['armadillo'].prefix)) + else: + args.append('--with-armadillo=no') + + if '+cryptopp' in spec: + args.append('--with-cryptopp={0}'.format(spec['cryptopp'].prefix)) + else: + args.append('--with-cryptopp=no') + + if '+crypto' in spec: + args.append('--with-crypto={0}'.format(spec['openssl'].prefix)) + else: + args.append('--with-crypto=no') + + # TODO: add packages for these dependencies + args.extend([ + # https://trac.osgeo.org/gdal/wiki/GRASS + '--with-grass=no', + '--with-libgrass=no', + '--with-pcraster=no', + '--with-dds=no', + '--with-gta=no', + '--with-pcidsk=no', + '--with-ogdi=no', + '--with-fme=no', + '--with-mongocxx=no', + # https://trac.osgeo.org/gdal/wiki/FileGDB + '--with-fgdb=no', + # https://trac.osgeo.org/gdal/wiki/ECW + '--with-ecw=no', + # https://trac.osgeo.org/gdal/wiki/JP2KAK + '--with-kakadu=no', + # https://trac.osgeo.org/gdal/wiki/MrSID + '--with-mrsid=no', + '--with-jp2mrsid=no', + '--with-mrsid_lidar=no', + '--with-jp2lura=no', + # https://trac.osgeo.org/gdal/wiki/MSG + '--with-msg=no', + '--with-bsb=no', + # https://trac.osgeo.org/gdal/wiki/Oracle + '--with-oci=no', + '--with-grib=no', + '--with-gnm=no', + '--with-mysql=no', + # https://trac.osgeo.org/gdal/wiki/Ingres + '--with-ingres=no', + # https://trac.osgeo.org/gdal/wiki/LibKML + '--with-libkml=no', + '--with-dods-root=no', + '--with-spatialite=no', + '--with-rasterlite2=no', + # https://trac.osgeo.org/gdal/wiki/DxfDwg + '--with-teigha=no', + '--with-idb=no', + # https://trac.osgeo.org/gdal/wiki/ArcSDE + '--with-sde=no', + # https://trac.osgeo.org/gdal/wiki/Epsilon + '--with-epsilon=no', + '--with-webp=no', + '--with-sfcgal=no', + '--with-freexl=no', + '--with-pam=no', + '--with-podofo=no', + '--with-pdfium=no', + '--with-php=no', + # https://trac.osgeo.org/gdal/wiki/mdbtools + '--with-mdb=no', + '--with-rasdaman=no', + '--with-mrf=no', + ]) return args diff --git a/var/spack/repos/builtin/packages/gdal/uuid.patch b/var/spack/repos/builtin/packages/gdal/uuid.patch new file mode 100644 index 0000000000..3990dad0cd --- /dev/null +++ b/var/spack/repos/builtin/packages/gdal/uuid.patch @@ -0,0 +1,234 @@ +diff -Naur jasper-1.900.1/src/libjasper/jp2/jp2_cod.c jasper-1.900.1.uuid/src/libjasper/jp2/jp2_cod.c +--- jasper-1.900.1/src/libjasper/jp2/jp2_cod.c 2007-01-19 15:43:05.000000000 -0600 ++++ jasper-1.900.1.uuid/src/libjasper/jp2/jp2_cod.c 2007-03-06 07:49:58.000000000 -0600 +@@ -5,6 +5,11 @@ + * All rights reserved. + */ + ++/* ++ * Modified by Andrey Kiselev to properly handle UUID ++ * box. ++ */ ++ + /* __START_OF_JASPER_LICENSE__ + * + * JasPer License Version 2.0 +@@ -127,6 +132,9 @@ + static int jp2_pclr_getdata(jp2_box_t *box, jas_stream_t *in); + static int jp2_pclr_putdata(jp2_box_t *box, jas_stream_t *out); + static void jp2_pclr_dumpdata(jp2_box_t *box, FILE *out); ++static void jp2_uuid_destroy(jp2_box_t *box); ++static int jp2_uuid_getdata(jp2_box_t *box, jas_stream_t *in); ++static int jp2_uuid_putdata(jp2_box_t *box, jas_stream_t *out); + + /******************************************************************************\ + * Local data. +@@ -164,7 +172,7 @@ + {JP2_BOX_XML, "XML", 0, + {0, 0, 0, 0, 0}}, + {JP2_BOX_UUID, "UUID", 0, +- {0, 0, 0, 0, 0}}, ++ {0, jp2_uuid_destroy, jp2_uuid_getdata, jp2_uuid_putdata, 0}}, + {JP2_BOX_UINF, "UINF", JP2_BOX_SUPER, + {0, 0, 0, 0, 0}}, + {JP2_BOX_ULST, "ULST", 0, +@@ -271,7 +279,7 @@ + } else { + box->datalen = box->len - JP2_BOX_HDRLEN(false); + } +- if (box->len != 0 && box->len < 8) { ++ if (box->len != 0 && box->len < JP2_BOX_HDRLEN(false)) { + goto error; + } + +@@ -876,6 +884,56 @@ + } + } + ++static void jp2_uuid_destroy(jp2_box_t *box) ++{ ++ jp2_uuid_t *uuid = &box->data.uuid; ++ if (uuid->data) ++ { ++ jas_free(uuid->data); ++ uuid->data = NULL; ++ } ++} ++ ++static int jp2_uuid_getdata(jp2_box_t *box, jas_stream_t *in) ++{ ++ jp2_uuid_t *uuid = &box->data.uuid; ++ int i; ++ ++ for (i = 0; i < 16; i++) ++ { ++ if (jp2_getuint8(in, &uuid->uuid[i])) ++ return -1; ++ } ++ ++ uuid->datalen = box->datalen - 16; ++ uuid->data = jas_malloc(uuid->datalen * sizeof(uint_fast8_t)); ++ for (i = 0; i < uuid->datalen; i++) ++ { ++ if (jp2_getuint8(in, &uuid->data[i])) ++ return -1; ++ } ++ return 0; ++} ++ ++static int jp2_uuid_putdata(jp2_box_t *box, jas_stream_t *out) ++{ ++ jp2_uuid_t *uuid = &box->data.uuid; ++ int i; ++ ++ for (i = 0; i < 16; i++) ++ { ++ if (jp2_putuint8(out, uuid->uuid[i])) ++ return -1; ++ } ++ ++ for (i = 0; i < uuid->datalen; i++) ++ { ++ if (jp2_putuint8(out, uuid->data[i])) ++ return -1; ++ } ++ return 0; ++} ++ + static int jp2_getint(jas_stream_t *in, int s, int n, int_fast32_t *val) + { + int c; +diff -Naur jasper-1.900.1/src/libjasper/jp2/jp2_cod.h jasper-1.900.1.uuid/src/libjasper/jp2/jp2_cod.h +--- jasper-1.900.1/src/libjasper/jp2/jp2_cod.h 2007-01-19 15:43:05.000000000 -0600 ++++ jasper-1.900.1.uuid/src/libjasper/jp2/jp2_cod.h 2007-03-06 07:49:58.000000000 -0600 +@@ -5,6 +5,11 @@ + * All rights reserved. + */ + ++/* ++ * Modified by Andrey Kiselev to properly handle UUID ++ * box. ++ */ ++ + /* __START_OF_JASPER_LICENSE__ + * + * JasPer License Version 2.0 +@@ -229,6 +234,12 @@ + jp2_cmapent_t *ents; + } jp2_cmap_t; + ++typedef struct { ++ uint_fast32_t datalen; ++ uint_fast8_t uuid[16]; ++ uint_fast8_t *data; ++} jp2_uuid_t; ++ + #define JP2_CMAP_DIRECT 0 + #define JP2_CMAP_PALETTE 1 + +@@ -257,6 +268,7 @@ + jp2_pclr_t pclr; + jp2_cdef_t cdef; + jp2_cmap_t cmap; ++ jp2_uuid_t uuid; + } data; + + } jp2_box_t; +diff -Naur jasper-1.900.1/src/libjasper/jp2/jp2_enc.c jasper-1.900.1.uuid/src/libjasper/jp2/jp2_enc.c +--- jasper-1.900.1/src/libjasper/jp2/jp2_enc.c 2007-01-19 15:43:05.000000000 -0600 ++++ jasper-1.900.1.uuid/src/libjasper/jp2/jp2_enc.c 2007-03-06 07:49:58.000000000 -0600 +@@ -5,6 +5,11 @@ + * All rights reserved. + */ + ++/* ++ * Modified by Andrey Kiselev to properly handle UUID ++ * box. ++ */ ++ + /* __START_OF_JASPER_LICENSE__ + * + * JasPer License Version 2.0 +@@ -86,7 +91,7 @@ + * Functions. + \******************************************************************************/ + +-int jp2_encode(jas_image_t *image, jas_stream_t *out, char *optstr) ++int jp2_write_header(jas_image_t *image, jas_stream_t *out) + { + jp2_box_t *box; + jp2_ftyp_t *ftyp; +@@ -97,8 +102,6 @@ + long len; + uint_fast16_t cmptno; + jp2_colr_t *colr; +- char buf[4096]; +- uint_fast32_t overhead; + jp2_cdefchan_t *cdefchanent; + jp2_cdef_t *cdef; + int i; +@@ -326,6 +329,26 @@ + jas_stream_close(tmpstream); + tmpstream = 0; + ++ return 0; ++ abort(); ++ ++error: ++ ++ if (box) { ++ jp2_box_destroy(box); ++ } ++ if (tmpstream) { ++ jas_stream_close(tmpstream); ++ } ++ return -1; ++} ++ ++int jp2_write_codestream(jas_image_t *image, jas_stream_t *out, char *optstr) ++{ ++ jp2_box_t *box; ++ char buf[4096]; ++ uint_fast32_t overhead; ++ + /* + * Output the contiguous code stream box. + */ +@@ -358,12 +381,34 @@ + if (box) { + jp2_box_destroy(box); + } +- if (tmpstream) { +- jas_stream_close(tmpstream); +- } + return -1; + } + ++int jp2_encode(jas_image_t *image, jas_stream_t *out, char *optstr) ++{ ++ if (jp2_write_header(image, out) < 0) ++ return -1; ++ if (jp2_write_codestream(image, out, optstr) < 0) ++ return -1; ++ ++ return 0; ++} ++ ++int jp2_encode_uuid(jas_image_t *image, jas_stream_t *out, ++ char *optstr, jp2_box_t *uuid) ++{ ++ if (jp2_write_header(image, out) < 0) ++ return -1; ++ if (uuid) { ++ if (jp2_box_put(uuid, out)) ++ return -1; ++ } ++ if (jp2_write_codestream(image, out, optstr) < 0) ++ return -1; ++ ++ return 0; ++} ++ + static uint_fast32_t jp2_gettypeasoc(int colorspace, int ctype) + { + int type; -- cgit v1.2.3-70-g09d2 From 5490190b716d310dcb8e088efb513d5a96fefcad Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sat, 26 May 2018 10:37:48 -0500 Subject: Add JasPer 2.0.14 (#8207) * Add JasPer 2.0.14 * Remove no longer necessary patch * Explicitly disable generation of documentation * Re-add support for JasPer 1.900.1, add GDAL patch * Remove GDAL patch --- var/spack/repos/builtin/packages/jasper/package.py | 91 ++++++++++++++++++---- 1 file changed, 77 insertions(+), 14 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/jasper/package.py b/var/spack/repos/builtin/packages/jasper/package.py index 2ae1234903..3e4bbeb8a5 100644 --- a/var/spack/repos/builtin/packages/jasper/package.py +++ b/var/spack/repos/builtin/packages/jasper/package.py @@ -25,34 +25,97 @@ from spack import * -class Jasper(AutotoolsPackage): +class Jasper(Package): """Library for manipulating JPEG-2000 images""" homepage = "https://www.ece.uvic.ca/~frodo/jasper/" - url = "https://www.ece.uvic.ca/~frodo/jasper/software/jasper-1.900.1.zip" + url = "https://www.ece.uvic.ca/~frodo/jasper/software/jasper-2.0.14.tar.gz" + list_url = homepage - version('1.900.1', 'a342b2b4495b3e1394e161eb5d85d754') + version('2.0.14', '23561b51da8eb5d0dc85b91eff3d9a7f', + url="https://www.ece.uvic.ca/~frodo/jasper/software/jasper-2.0.14.tar.gz") + version('1.900.1', 'a342b2b4495b3e1394e161eb5d85d754', + url="https://www.ece.uvic.ca/~frodo/jasper/software/jasper-1.900.1.zip") - variant('shared', default=True, - description='Builds shared versions of the libraries') - variant('debug', default=False, - description='Builds debug versions of the libraries') + variant('jpeg', default=True, description='Enable the use of the JPEG library') + variant('opengl', default=False, description='Enable the use of the OpenGL and GLUT libraries') + variant('shared', default=True, description='Enable the building of shared libraries') + variant('build_type', default='Release', description='CMake build type', values=('Debug', 'Release')) - depends_on('jpeg') + depends_on('cmake@2.8.11:', type='build', when='@2:') + depends_on('jpeg', when='+jpeg') + depends_on('gl', when='+opengl') - # Fixes a bug (still in upstream as of v.1.900.1) where an assertion fails - # when certain JPEG-2000 files with an alpha channel are processed - # see: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=469786 - patch('fix_alpha_channel_assert_fail.patch') + # Fixes a bug where an assertion fails when certain JPEG-2000 + # files with an alpha channel are processed. + # See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=469786 + patch('fix_alpha_channel_assert_fail.patch', when='@1.900.1') + + def cmake_args(self): + spec = self.spec + args = std_cmake_args + args.append('-DJAS_ENABLE_DOC=false') + + if '+jpeg' in spec: + args.append('-DJAS_ENABLE_LIBJPEG=true') + else: + args.append('-DJAS_ENABLE_LIBJPEG=false') + + if '+opengl' in spec: + args.append('-DJAS_ENABLE_OPENGL=true') + else: + args.append('-DJAS_ENABLE_OPENGL=false') + + if '+shared' in spec: + args.append('-DJAS_ENABLE_SHARED=true') + else: + args.append('-DJAS_ENABLE_SHARED=false') + + return args def configure_args(self): spec = self.spec - args = ['--mandir={0}'.format(spec.prefix.man)] + args = [ + '--prefix={0}'.format(self.prefix) + ] + + if '+jpeg' in spec: + args.append('--enable-libjpeg') + else: + args.append('--disable-libjpeg') + + if '+opengl' in spec: + args.append('--enable-opengl') + else: + args.append('--disable-opengl') if '+shared' in spec: args.append('--enable-shared') + else: + args.append('--disable-shared') - if '+debug' not in spec: + if 'build_type=Debug' in spec: + args.append('--enable-debug') + else: args.append('--disable-debug') return args + + @when('@2:') + def install(self, spec, prefix): + with working_dir('spack-build', create=True): + cmake('..', *self.cmake_args()) + make() + if self.run_tests: + make('test') + make('install') + + @when('@:1') + def install(self, spec, prefix): + configure(*self.configure_args()) + make() + if self.run_tests: + make('check') + make('install') + if self.run_tests: + make('installcheck') -- cgit v1.2.3-70-g09d2 From bdb5d17eb88a92caada596b88625958b29130a12 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Mon, 28 May 2018 15:01:29 +0200 Subject: yambo: added versions 4.2.2 (#8298) --- var/spack/repos/builtin/packages/yambo/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/yambo/package.py b/var/spack/repos/builtin/packages/yambo/package.py index 7f2eca243c..7605af81d3 100644 --- a/var/spack/repos/builtin/packages/yambo/package.py +++ b/var/spack/repos/builtin/packages/yambo/package.py @@ -39,6 +39,7 @@ class Yambo(AutotoolsPackage): homepage = "http://www.yambo-code.org/index.php" url = "https://github.com/yambo-code/yambo/archive/4.1.3.tar.gz" + version('4.2.2', '97f3513bd726141be5e18072118b6fb5') version('4.2.1', '99027014192c0f0f4b5d9b48414ad85d') version('4.2.0', '0cbb4d7c9790596d163ebe872d95bd30') -- cgit v1.2.3-70-g09d2 From dedfd4e89d45573e20de55f71a4a484b5aa4e4e0 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Mon, 28 May 2018 15:01:51 +0200 Subject: plumed: added versions 2.4.1 and 2.3.5 (#8297) --- var/spack/repos/builtin/packages/plumed/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/plumed/package.py b/var/spack/repos/builtin/packages/plumed/package.py index f68ec49812..96579c5e55 100644 --- a/var/spack/repos/builtin/packages/plumed/package.py +++ b/var/spack/repos/builtin/packages/plumed/package.py @@ -43,6 +43,8 @@ class Plumed(AutotoolsPackage): homepage = 'http://www.plumed.org/' url = 'https://github.com/plumed/plumed2/archive/v2.2.3.tar.gz' + version('2.4.1', '6558e1fd02fc46e847ab6a3fb5ed5411') + version('2.3.5', '3cc5f025cb6f5d963f3c778f15c77d44') version('2.3.3', '9f5729e406e79a06a16976fcb020e024') version('2.3.0', 'a9b5728f115dca8f0519111f1f5a6fa5') version('2.2.4', 'afb00da25a3fbd47acf377e53342059d') -- cgit v1.2.3-70-g09d2 From 7b6e3595a596bd63ab8586a27041eabe0169f1d2 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Mon, 28 May 2018 15:11:22 +0200 Subject: nwchem: added version 6.8 (#8295) It seems that the new versions on github don't require the patching that was needed in previous versions. --- var/spack/repos/builtin/packages/nwchem/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nwchem/package.py b/var/spack/repos/builtin/packages/nwchem/package.py index f0e132b741..c3b2ce6a5b 100644 --- a/var/spack/repos/builtin/packages/nwchem/package.py +++ b/var/spack/repos/builtin/packages/nwchem/package.py @@ -33,6 +33,8 @@ class Nwchem(Package): homepage = "http://www.nwchem-sw.org" url = "http://www.nwchem-sw.org/images/Nwchem-6.6.revision27746-src.2015-10-20.tar.gz" + version('6.8', '50b18116319f4c15d1cb7eaa1b433006', + url='https://github.com/nwchemgit/nwchem/archive/v6.8-release.tar.gz') version('6.6', 'c581001c004ea5e5dfacb783385825e3', url='http://www.nwchem-sw.org/images/Nwchem-6.6.revision27746-src.2015-10-20.tar.gz') -- cgit v1.2.3-70-g09d2 From 2be65a86189d63f8742f3065a385a904c429e45b Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Mon, 28 May 2018 15:11:43 +0200 Subject: abinit: added version 8.8.2 (#8294) --- var/spack/repos/builtin/packages/abinit/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/abinit/package.py b/var/spack/repos/builtin/packages/abinit/package.py index 5fe87fc9b1..b93fe175f1 100644 --- a/var/spack/repos/builtin/packages/abinit/package.py +++ b/var/spack/repos/builtin/packages/abinit/package.py @@ -49,6 +49,7 @@ class Abinit(AutotoolsPackage): homepage = 'http://www.abinit.org' url = 'https://www.abinit.org/sites/default/files/packages/abinit-8.6.3.tar.gz' + version('8.8.2', '72d7046c7ff31b9f17afe050ecdfb3a5') version('8.6.3', '6c34d2cec0cf0008dd25b8ec1b6d3ee8') version('8.2.2', '5f25250e06fdc0815c224ffd29858860') # Versions before 8.0.8b are not supported. -- cgit v1.2.3-70-g09d2 From 627df0bcc105cea503a44cc1d304394c78bdfbb8 Mon Sep 17 00:00:00 2001 From: Jimmy Tang Date: Mon, 28 May 2018 19:45:56 +0100 Subject: Add far variant to openfst package (#8299) * Add far variant * Append instead of extend --- var/spack/repos/builtin/packages/openfst/package.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openfst/package.py b/var/spack/repos/builtin/packages/openfst/package.py index 13f08820c6..e98fa4f785 100644 --- a/var/spack/repos/builtin/packages/openfst/package.py +++ b/var/spack/repos/builtin/packages/openfst/package.py @@ -50,7 +50,18 @@ class Openfst(AutotoolsPackage): conflicts('%intel@16:') conflicts('%gcc@6:') + variant('far', default=False, description="Enable FAR support") + # Patch openfst-1.4.1 for kaldi@c024e8 # See https://github.com/kaldi-asr/kaldi/blob/c024e8aa0a727bf76c91a318f76a1f8b0b59249e/tools/Makefile#L82-L88 patch('openfst-1.4.1.patch', when='@1.4.1-patch') patch('openfst_gcc41up.patch', when='@1.4.1-patch') + + def configure_args(self): + args = [] + spec = self.spec + if '+far' in spec: + args.append('--enable-far') + else: + args.append('--disable-far') + return args -- cgit v1.2.3-70-g09d2 From 80564fae5df952eb8544272e178d283bac0c0f57 Mon Sep 17 00:00:00 2001 From: Sajid Ali <30510036+s-sajid-ali@users.noreply.github.com> Date: Mon, 28 May 2018 20:15:18 -0500 Subject: py-pillow : update version and fix jpeg dependency (#8300) * modified: package.py * as requested. --- .../repos/builtin/packages/py-pillow/package.py | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pillow/package.py b/var/spack/repos/builtin/packages/py-pillow/package.py index 9e16e89233..0cb85ac4d0 100644 --- a/var/spack/repos/builtin/packages/py-pillow/package.py +++ b/var/spack/repos/builtin/packages/py-pillow/package.py @@ -33,17 +33,10 @@ class PyPillow(PythonPackage): capabilities.""" homepage = "https://python-pillow.org/" - url = "https://pypi.io/packages/source/P/Pillow/Pillow-3.0.0.tar.gz" + url = "https://pypi.io/packages/source/P/Pillow/Pillow-5.1.0.tar.gz" - # TODO: This version should be deleted once the next release comes out. - # TODO: It fixes a bug that prevented us from linking to Tk/Tcl. - # TODO: Tk/Tcl support is necessary for tkinter bitmap and photo images. - # TODO: If you require this support, run the following command: - # TODO: `spack install py-pillow@3.3.0.dev0 ^python+tk` - version('3.3.0.dev0', git='https://github.com/python-pillow/Pillow.git', - commit='30eced62868141a6c859a4370efd40b9434a7c3f') - - version('3.2.0', '7cfd093c11205d9e2ebe3c51dfcad510', preferred=True) + version('5.1.0', '04d2b1d1ce8b9f6831e33fb85b34316d') + version('3.2.0', '7cfd093c11205d9e2ebe3c51dfcad510') version('3.0.0', 'fc8ac44e93da09678eac7e30c9b7377d') provides('pil') @@ -54,8 +47,7 @@ class PyPillow(PythonPackage): variant('tiff', default=False, description='Access to TIFF files') variant('freetype', default=False, description='Font related services') variant('lcms', default=False, description='Color management') - variant('jpeg2000', default=False, - description='Provide JPEG 2000 functionality') + variant('jpeg2000', default=False, description='Provide JPEG 2000 functionality') # Spack does not (yet) support these modes of building # variant('webp', default=False, description='Provide the WebP format') @@ -94,8 +86,8 @@ class PyPillow(PythonPackage): if '+jpeg' in spec: setup.filter('JPEG_ROOT = None', - 'JPEG_ROOT = ("{0}", "{1}")'.format( - spec['jpeg'].prefix.lib, + 'JPEG_ROOT=("{0}","{1}")'.format( + spec['jpeg'].libs.directories[0], spec['jpeg'].prefix.include)) if '+zlib' in spec: setup.filter('ZLIB_ROOT = None', -- cgit v1.2.3-70-g09d2 From ff4f92fec74982a663ce82ce36ffc486fa98a025 Mon Sep 17 00:00:00 2001 From: nvarini Date: Tue, 29 May 2018 17:27:05 +0200 Subject: Quantum espresso (#8183) Changed the name from espresso to more appropriate quantum-espresso. Added github mirror. --- .../builtin/packages/espresso/dspev_drv_elpa.patch | 42 ----- .../repos/builtin/packages/espresso/package.py | 164 ------------------- .../repos/builtin/packages/qmcpack/package.py | 4 +- .../packages/quantum-espresso/dspev_drv_elpa.patch | 42 +++++ .../builtin/packages/quantum-espresso/package.py | 175 +++++++++++++++++++++ 5 files changed, 219 insertions(+), 208 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/espresso/dspev_drv_elpa.patch delete mode 100644 var/spack/repos/builtin/packages/espresso/package.py create mode 100644 var/spack/repos/builtin/packages/quantum-espresso/dspev_drv_elpa.patch create mode 100644 var/spack/repos/builtin/packages/quantum-espresso/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/espresso/dspev_drv_elpa.patch b/var/spack/repos/builtin/packages/espresso/dspev_drv_elpa.patch deleted file mode 100644 index 153bcf2ef5..0000000000 --- a/var/spack/repos/builtin/packages/espresso/dspev_drv_elpa.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -ruN LAXlib-orig/dspev_drv.f90 LAXlib/dspev_drv.f90 ---- a/LAXlib/dspev_drv.f90 2017-06-12 15:00:46.157372185 +0200 -+++ b/LAXlib/dspev_drv.f90 2017-06-12 15:01:19.937371580 +0200 -@@ -708,11 +708,11 @@ - - #if defined(__ELPA_2016) - ! -> ELPA 2016.11.001_pre -- ierr = elpa_get_communicators(ortho_comm, my_prow, my_pcol,mpi_comm_rows, mpi_comm_cols) -- success = solve_evp_real_1stage(n, n, s, lds, w, vv, lds,SIZE(s,2),nb ,mpi_comm_rows, mpi_comm_cols, ortho_comm) -+ !ierr = elpa_get_communicators(ortho_comm, my_prow, my_pcol,mpi_comm_rows, mpi_comm_cols) -+ !success = solve_evp_real_1stage(n, n, s, lds, w, vv, lds,SIZE(s,2),nb ,mpi_comm_rows, mpi_comm_cols, ortho_comm) - ! -> ELPA 2016.05.003 -- !ierr = get_elpa_row_col_comms(ortho_comm, my_prow, my_pcol,mpi_comm_rows, mpi_comm_cols) -- !success = solve_evp_real_1stage(n, n, s, lds, w, vv, lds,SIZE(s,2),nb ,mpi_comm_rows, mpi_comm_cols) -+ ierr = get_elpa_row_col_comms(ortho_comm, my_prow, my_pcol,mpi_comm_rows, mpi_comm_cols) -+ success = solve_evp_real_1stage(n, n, s, lds, w, vv, lds,SIZE(s,2),nb ,mpi_comm_rows, mpi_comm_cols) - #elif defined(__ELPA_2015) - ierr = get_elpa_row_col_comms(ortho_comm, my_prow, my_pcol,mpi_comm_rows, mpi_comm_cols) - ierr = solve_evp_real(n, n, s, lds, w, vv, lds,SIZE(s,2),nb ,mpi_comm_rows, mpi_comm_cols) -diff -ruN LAXlib-orig/zhpev_drv.f90 LAXlib/zhpev_drv.f90 ---- a/LAXlib/zhpev_drv.f90 2017-06-12 15:00:46.157372185 +0200 -+++ b/LAXlib/zhpev_drv.f90 2017-06-12 15:02:09.309370696 +0200 -@@ -1519,13 +1519,13 @@ - - #if defined(__ELPA_2016) - ! -> ELPA 2016.11.001_pre -- ierr = elpa_get_communicators(ortho_comm, my_prow, my_pcol,mpi_comm_rows, mpi_comm_cols) -- success = solve_evp_complex_1stage_double(n, n, h, size(h,1), w, v, size(h,1), size(h,2), nb, & -- mpi_comm_rows, mpi_comm_cols, ortho_comm) -+ !ierr = elpa_get_communicators(ortho_comm, my_prow, my_pcol,mpi_comm_rows, mpi_comm_cols) -+ !success = solve_evp_complex_1stage_double(n, n, h, size(h,1), w, v, size(h,1), size(h,2), nb, & -+ ! mpi_comm_rows, mpi_comm_cols, ortho_comm) - ! -> ELPA 2016.05.003 -- !ierr = get_elpa_row_col_comms(ortho_comm, my_prow, my_pcol,mpi_comm_rows, mpi_comm_cols) -- !success = solve_evp_complex(n, n, h, size(h,1), w, v, size(h,1), size(h,2), nb, & -- ! mpi_comm_rows, mpi_comm_cols) -+ ierr = get_elpa_row_col_comms(ortho_comm, my_prow, my_pcol,mpi_comm_rows, mpi_comm_cols) -+ success = solve_evp_complex(n, n, h, size(h,1), w, v, size(h,1), size(h,2), nb, & -+ mpi_comm_rows, mpi_comm_cols) - #elif defined(__ELPA_2015) - ierr = get_elpa_row_col_comms(ortho_comm, my_prow, my_pcol,mpi_comm_rows, mpi_comm_cols) - ierr = solve_evp_complex(n, n, h, size(h,1), w, v, size(h,1), size(h,2), nb, & diff --git a/var/spack/repos/builtin/packages/espresso/package.py b/var/spack/repos/builtin/packages/espresso/package.py deleted file mode 100644 index 63d88ff78f..0000000000 --- a/var/spack/repos/builtin/packages/espresso/package.py +++ /dev/null @@ -1,164 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -import glob -import os.path - -from spack import * - - -class Espresso(Package): - """Quantum-ESPRESSO is an integrated suite of Open-Source computer codes - for electronic-structure calculations and materials modeling at the - nanoscale. It is based on density-functional theory, plane waves, and - pseudopotentials. - """ - - homepage = 'http://quantum-espresso.org' - url = 'http://www.qe-forge.org/gf/download/frsrelease/204/912/espresso-5.3.0.tar.gz' - - version( - '6.1.0', - 'db398edcad76e085f8c8a3f6ecb7aaab', - url='http://www.qe-forge.org/gf/download/frsrelease/240/1075/qe-6.1.tar.gz' - ) - - version( - '5.4.0', - '8bb78181b39bd084ae5cb7a512c1cfe7', - url='http://www.qe-forge.org/gf/download/frsrelease/211/968/espresso-5.4.0.tar.gz' - ) - version('5.3.0', '6848fcfaeb118587d6be36bd10b7f2c3') - - variant('mpi', default=True, description='Builds with mpi support') - variant('openmp', default=False, description='Enables openMP support') - variant('scalapack', default=True, description='Enables scalapack support') - variant('elpa', default=True, description='Uses elpa as an eigenvalue solver') - - # Support for HDF5 has been added starting in version 6.1.0 and is - # still experimental, therefore we default to False for the variant - variant('hdf5', default=False, description='Builds with HDF5 support') - - depends_on('blas') - depends_on('lapack') - depends_on('mpi', when='+mpi') - depends_on('scalapack', when='+scalapack+mpi') - - depends_on('fftw+mpi', when='+mpi') - depends_on('fftw~mpi', when='~mpi') - depends_on('elpa+openmp', when='+elpa+openmp') - depends_on('elpa~openmp', when='+elpa~openmp') - depends_on('hdf5', when='+hdf5') - - patch('dspev_drv_elpa.patch', when='@6.1+elpa ^elpa@2016.05.004') - patch('dspev_drv_elpa.patch', when='@6.1+elpa ^elpa@2016.05.003') - - # We can't ask for scalapack or elpa if we don't want MPI - conflicts( - '+scalapack', - when='~mpi', - msg='scalapack is a parallel library and needs MPI support' - ) - - conflicts( - '+elpa', - when='~mpi', - msg='elpa is a parallel library and needs MPI support' - ) - - # Elpa is formally supported by @:5.4.0, but QE configure searches - # for it in the wrong folders (or tries to download it within - # the build directory). Instead of patching Elpa to provide the - # folder QE expects as a link, we issue a conflict here. - conflicts('+elpa', when='@:5.4.0') - conflicts('+hdf5', when='@:5.4.0') - - # Spurious problems running in parallel the Makefile - # generated by the configure - parallel = False - - def install(self, spec, prefix): - - prefix_path = prefix.bin if '@:5.4.0' in spec else prefix - options = ['-prefix={0}'.format(prefix_path)] - - if '+mpi' in spec: - options.append('--enable-parallel=yes') - else: - options.append('--enable-parallel=no') - - if '+openmp' in spec: - options.append('--enable-openmp') - - if '+scalapack' in spec: - scalapack_option = 'intel' if '^intel-mkl' in spec else 'yes' - options.append('--with-scalapack={0}'.format(scalapack_option)) - - if '+elpa' in spec: - - # Spec for elpa - elpa = spec['elpa'] - - # Find where the Fortran module resides - elpa_module = find(elpa.prefix, 'elpa.mod') - - # Compute the include directory from there: versions - # of espresso prior to 6.1 requires -I in front of the directory - elpa_include = '' if '@6.1:' in spec else '-I' - elpa_include += os.path.dirname(elpa_module[0]) - - options.extend([ - '--with-elpa-include={0}'.format(elpa_include), - '--with-elpa-lib={0}'.format(elpa.libs[0]) - ]) - - if '+hdf5' in spec: - options.append('--with-hdf5={0}'.format(spec['hdf5'].prefix)) - - # Add a list of directories to search - search_list = [] - for dependency_spec in spec.dependencies(): - search_list.extend([ - dependency_spec.prefix.lib, - dependency_spec.prefix.lib64 - ]) - - search_list = " ".join(search_list) - - options.extend([ - 'LIBDIRS={0}'.format(search_list), - 'F90={0}'.format(env['SPACK_FC']), - 'CC={0}'.format(env['SPACK_CC']) - ]) - - configure(*options) - - make('all') - - if 'platform=darwin' in spec: - mkdirp(prefix.bin) - for filename in glob.glob("bin/*.x"): - install(filename, prefix.bin) - else: - make('install') diff --git a/var/spack/repos/builtin/packages/qmcpack/package.py b/var/spack/repos/builtin/packages/qmcpack/package.py index 4a638f854a..0a77491736 100644 --- a/var/spack/repos/builtin/packages/qmcpack/package.py +++ b/var/spack/repos/builtin/packages/qmcpack/package.py @@ -107,11 +107,11 @@ class Qmcpack(CMakePackage): # Quantum Espresso 5.3.0 (see QMCPACK manual) patch_url = 'https://raw.githubusercontent.com/QMCPACK/qmcpack/develop/external_codes/quantum_espresso/add_pw2qmcpack_to_espresso-5.3.0.diff' patch_checksum = '0d8d7ba805313ddd4c02ee32c96d2f12e7091e9e82e22671d3ad5a24247860c4' - depends_on('espresso@5.3.0~elpa', + depends_on('quantum-espresso@5.3.0~elpa', patches=patch(patch_url, sha256=patch_checksum, when='+qe'), when='+qe+mpi') - depends_on('espresso@5.3.0~elpa~scalapack~mpi', + depends_on('quantum-espresso@5.3.0~elpa~scalapack~mpi', patches=patch(patch_url, sha256=patch_checksum, when='+qe'), when='+qe~mpi') diff --git a/var/spack/repos/builtin/packages/quantum-espresso/dspev_drv_elpa.patch b/var/spack/repos/builtin/packages/quantum-espresso/dspev_drv_elpa.patch new file mode 100644 index 0000000000..153bcf2ef5 --- /dev/null +++ b/var/spack/repos/builtin/packages/quantum-espresso/dspev_drv_elpa.patch @@ -0,0 +1,42 @@ +diff -ruN LAXlib-orig/dspev_drv.f90 LAXlib/dspev_drv.f90 +--- a/LAXlib/dspev_drv.f90 2017-06-12 15:00:46.157372185 +0200 ++++ b/LAXlib/dspev_drv.f90 2017-06-12 15:01:19.937371580 +0200 +@@ -708,11 +708,11 @@ + + #if defined(__ELPA_2016) + ! -> ELPA 2016.11.001_pre +- ierr = elpa_get_communicators(ortho_comm, my_prow, my_pcol,mpi_comm_rows, mpi_comm_cols) +- success = solve_evp_real_1stage(n, n, s, lds, w, vv, lds,SIZE(s,2),nb ,mpi_comm_rows, mpi_comm_cols, ortho_comm) ++ !ierr = elpa_get_communicators(ortho_comm, my_prow, my_pcol,mpi_comm_rows, mpi_comm_cols) ++ !success = solve_evp_real_1stage(n, n, s, lds, w, vv, lds,SIZE(s,2),nb ,mpi_comm_rows, mpi_comm_cols, ortho_comm) + ! -> ELPA 2016.05.003 +- !ierr = get_elpa_row_col_comms(ortho_comm, my_prow, my_pcol,mpi_comm_rows, mpi_comm_cols) +- !success = solve_evp_real_1stage(n, n, s, lds, w, vv, lds,SIZE(s,2),nb ,mpi_comm_rows, mpi_comm_cols) ++ ierr = get_elpa_row_col_comms(ortho_comm, my_prow, my_pcol,mpi_comm_rows, mpi_comm_cols) ++ success = solve_evp_real_1stage(n, n, s, lds, w, vv, lds,SIZE(s,2),nb ,mpi_comm_rows, mpi_comm_cols) + #elif defined(__ELPA_2015) + ierr = get_elpa_row_col_comms(ortho_comm, my_prow, my_pcol,mpi_comm_rows, mpi_comm_cols) + ierr = solve_evp_real(n, n, s, lds, w, vv, lds,SIZE(s,2),nb ,mpi_comm_rows, mpi_comm_cols) +diff -ruN LAXlib-orig/zhpev_drv.f90 LAXlib/zhpev_drv.f90 +--- a/LAXlib/zhpev_drv.f90 2017-06-12 15:00:46.157372185 +0200 ++++ b/LAXlib/zhpev_drv.f90 2017-06-12 15:02:09.309370696 +0200 +@@ -1519,13 +1519,13 @@ + + #if defined(__ELPA_2016) + ! -> ELPA 2016.11.001_pre +- ierr = elpa_get_communicators(ortho_comm, my_prow, my_pcol,mpi_comm_rows, mpi_comm_cols) +- success = solve_evp_complex_1stage_double(n, n, h, size(h,1), w, v, size(h,1), size(h,2), nb, & +- mpi_comm_rows, mpi_comm_cols, ortho_comm) ++ !ierr = elpa_get_communicators(ortho_comm, my_prow, my_pcol,mpi_comm_rows, mpi_comm_cols) ++ !success = solve_evp_complex_1stage_double(n, n, h, size(h,1), w, v, size(h,1), size(h,2), nb, & ++ ! mpi_comm_rows, mpi_comm_cols, ortho_comm) + ! -> ELPA 2016.05.003 +- !ierr = get_elpa_row_col_comms(ortho_comm, my_prow, my_pcol,mpi_comm_rows, mpi_comm_cols) +- !success = solve_evp_complex(n, n, h, size(h,1), w, v, size(h,1), size(h,2), nb, & +- ! mpi_comm_rows, mpi_comm_cols) ++ ierr = get_elpa_row_col_comms(ortho_comm, my_prow, my_pcol,mpi_comm_rows, mpi_comm_cols) ++ success = solve_evp_complex(n, n, h, size(h,1), w, v, size(h,1), size(h,2), nb, & ++ mpi_comm_rows, mpi_comm_cols) + #elif defined(__ELPA_2015) + ierr = get_elpa_row_col_comms(ortho_comm, my_prow, my_pcol,mpi_comm_rows, mpi_comm_cols) + ierr = solve_evp_complex(n, n, h, size(h,1), w, v, size(h,1), size(h,2), nb, & diff --git a/var/spack/repos/builtin/packages/quantum-espresso/package.py b/var/spack/repos/builtin/packages/quantum-espresso/package.py new file mode 100644 index 0000000000..96bdda65e2 --- /dev/null +++ b/var/spack/repos/builtin/packages/quantum-espresso/package.py @@ -0,0 +1,175 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +import glob +import os.path + +from spack import * + + +class QuantumEspresso(Package): + """Quantum-ESPRESSO is an integrated suite of Open-Source computer codes + for electronic-structure calculations and materials modeling at the + nanoscale. It is based on density-functional theory, plane waves, and + pseudopotentials. + """ + + homepage = 'http://quantum-espresso.org' + url = 'https://github.com/QEF/q-e/archive/qe-5.3.tar.gz' + + version( + '6.2.0', + '972176a58d16ae8cf0c9a308479e2b97', + url='https://github.com/QEF/q-e/archive/qe-6.2.0.tar.gz' + ) + + version( + '6.1.0', + '3fe861dcb5f6ec3d15f802319d5d801b', + url='https://github.com/QEF/q-e/archive/qe-6.1.0.tar.gz' + ) + + version( + '5.4.0', + '085f7e4de0952e266957bbc79563c54e', + url='https://github.com/QEF/q-e/archive/qe-5.4.tar.gz' + ) + + version( + '5.3.0', + 'be3f8778e302cffb89258a5f936a7592', + url='https://github.com/QEF/q-e/archive/qe-5.3.tar.gz' + ) + + variant('mpi', default=True, description='Builds with mpi support') + variant('openmp', default=False, description='Enables openMP support') + variant('scalapack', default=True, description='Enables scalapack support') + variant('elpa', default=True, description='Uses elpa as an eigenvalue solver') + + # Support for HDF5 has been added starting in version 6.1.0 and is + # still experimental, therefore we default to False for the variant + variant('hdf5', default=False, description='Builds with HDF5 support') + + depends_on('blas') + depends_on('lapack') + depends_on('mpi', when='+mpi') + depends_on('scalapack', when='+scalapack+mpi') + + depends_on('fftw+mpi', when='+mpi') + depends_on('fftw~mpi', when='~mpi') + depends_on('elpa+openmp', when='+elpa+openmp') + depends_on('elpa~openmp', when='+elpa~openmp') + depends_on('hdf5', when='+hdf5') + + patch('dspev_drv_elpa.patch', when='@6.1+elpa ^elpa@2016.05.004') + patch('dspev_drv_elpa.patch', when='@6.1+elpa ^elpa@2016.05.003') + + # We can't ask for scalapack or elpa if we don't want MPI + conflicts( + '+scalapack', + when='~mpi', + msg='scalapack is a parallel library and needs MPI support' + ) + + conflicts( + '+elpa', + when='~mpi', + msg='elpa is a parallel library and needs MPI support' + ) + + # Elpa is formally supported by @:5.4.0, but QE configure searches + # for it in the wrong folders (or tries to download it within + # the build directory). Instead of patching Elpa to provide the + # folder QE expects as a link, we issue a conflict here. + conflicts('+elpa', when='@:5.4.0') + conflicts('+hdf5', when='@:5.4.0') + + # Spurious problems running in parallel the Makefile + # generated by the configure + parallel = False + + def install(self, spec, prefix): + + prefix_path = prefix.bin if '@:5.4.0' in spec else prefix + options = ['-prefix={0}'.format(prefix_path)] + + if '+mpi' in spec: + options.append('--enable-parallel=yes') + else: + options.append('--enable-parallel=no') + + if '+openmp' in spec: + options.append('--enable-openmp') + + if '+scalapack' in spec: + scalapack_option = 'intel' if '^intel-mkl' in spec else 'yes' + options.append('--with-scalapack={0}'.format(scalapack_option)) + + if '+elpa' in spec: + + # Spec for elpa + elpa = spec['elpa'] + + # Find where the Fortran module resides + elpa_module = find(elpa.prefix, 'elpa.mod') + + # Compute the include directory from there: versions + # of espresso prior to 6.1 requires -I in front of the directory + elpa_include = '' if '@6.1:' in spec else '-I' + elpa_include += os.path.dirname(elpa_module[0]) + + options.extend([ + '--with-elpa-include={0}'.format(elpa_include), + '--with-elpa-lib={0}'.format(elpa.libs[0]) + ]) + + if '+hdf5' in spec: + options.append('--with-hdf5={0}'.format(spec['hdf5'].prefix)) + + # Add a list of directories to search + search_list = [] + for dependency_spec in spec.dependencies(): + search_list.extend([ + dependency_spec.prefix.lib, + dependency_spec.prefix.lib64 + ]) + + search_list = " ".join(search_list) + + options.extend([ + 'LIBDIRS={0}'.format(search_list), + 'F90={0}'.format(env['SPACK_FC']), + 'CC={0}'.format(env['SPACK_CC']) + ]) + + configure(*options) + + make('all') + + if 'platform=darwin' in spec: + mkdirp(prefix.bin) + for filename in glob.glob("bin/*.x"): + install(filename, prefix.bin) + else: + make('install') -- cgit v1.2.3-70-g09d2 From 79d529e9abf4f95ce4601ff008117c8711a72c6f Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Tue, 29 May 2018 17:28:17 +0200 Subject: nasm: Fix compilation with GCC 8 (#8307) --- var/spack/repos/builtin/packages/nasm/package.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nasm/package.py b/var/spack/repos/builtin/packages/nasm/package.py index b4a8ad5d05..a8ac7bf940 100644 --- a/var/spack/repos/builtin/packages/nasm/package.py +++ b/var/spack/repos/builtin/packages/nasm/package.py @@ -36,3 +36,7 @@ class Nasm(AutotoolsPackage): version('2.13.03', 'd5ca2ad7121ccbae69dd606b1038532c') version('2.11.06', '2b958e9f5d200641e6fc9564977aecc5') + + # Fix compilation with GCC 8 + # https://bugzilla.nasm.us/show_bug.cgi?id=3392461 + patch('https://src.fedoraproject.org/rpms/nasm/raw/0cc3eb244bd971df81a7f02bc12c5ec259e1a5d6/f/0001-Remove-invalid-pure_func-qualifiers.patch', level=1, sha256='ac9f315d204afa6b99ceefa1fe46d4eed2b8a23c7315d32d33c0f378d930e950', when='@2.13.03 %gcc@8:') -- cgit v1.2.3-70-g09d2 From 8af37d5d645913d086ec151835fb02274291bcb5 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Tue, 29 May 2018 17:28:32 +0200 Subject: python: Update to 2.7.15 (#8306) 2.7.14 does not compile with GCC 8, see https://bugs.python.org/issue33374. --- var/spack/repos/builtin/packages/python/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 34e1e0ea6d..0c913422ef 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -60,7 +60,8 @@ class Python(AutotoolsPackage): version('3.3.6', 'cdb3cd08f96f074b3f3994ccb51063e9') version('3.2.6', '23815d82ae706e9b781ca65865353d39') version('3.1.5', '02196d3fc7bc76bdda68aa36b0dd16ab') - version('2.7.14', 'cee2e4b33ad3750da77b2e85f2f8b724', preferred=True) + version('2.7.15', '045fb3440219a1f6923fefdabde63342', preferred=True) + version('2.7.14', 'cee2e4b33ad3750da77b2e85f2f8b724') version('2.7.13', '17add4bf0ad0ec2f08e0cae6d205c700') version('2.7.12', '88d61f82e3616a4be952828b3694109d') version('2.7.11', '6b6076ec9e93f05dd63e47eb9c15728b') -- cgit v1.2.3-70-g09d2 From 064ae1e6e080f450c58bacfa2fe4dbbfe34cdcff Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Tue, 29 May 2018 17:28:58 +0200 Subject: perl: Fix build on Fedora 28 (#8305) --- var/spack/repos/builtin/packages/perl/package.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl/package.py b/var/spack/repos/builtin/packages/perl/package.py index ebfa514ce2..2cacb5a03c 100644 --- a/var/spack/repos/builtin/packages/perl/package.py +++ b/var/spack/repos/builtin/packages/perl/package.py @@ -76,6 +76,10 @@ class Perl(Package): # Perl doesn't use Autotools, it should subclass Package # https://rt.perl.org/Public/Bug/Display.html?id=126468 patch('protect-quotes-in-ccflags.patch', when='@5.22.0') + # Fix build on Fedora 28 + # https://bugzilla.redhat.com/show_bug.cgi?id=1536752 + patch('https://src.fedoraproject.org/rpms/perl/raw/004cea3a67df42e92ffdf4e9ac36d47a3c6a05a4/f/perl-5.26.1-guard_old_libcrypt_fix.patch', level=1, sha256='0eac10ed90aeb0459ad8851f88081d439a4e41978e586ec743069e8b059370ac') + # Installing cpanm alongside the core makes it safe and simple for # people/projects to install their own sets of perl modules. Not # having it in core increases the "energy of activation" for doing -- cgit v1.2.3-70-g09d2 From 7559a808bcbd6ab7985679be4d53a7faa0ada28e Mon Sep 17 00:00:00 2001 From: David Beckingsale Date: Tue, 29 May 2018 12:41:09 -0700 Subject: Add umpire package (#8229) * Add umpire package * Style fixes * Add package URL --- var/spack/repos/builtin/packages/umpire/package.py | 61 ++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 var/spack/repos/builtin/packages/umpire/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/umpire/package.py b/var/spack/repos/builtin/packages/umpire/package.py new file mode 100644 index 0000000000..9285e3b932 --- /dev/null +++ b/var/spack/repos/builtin/packages/umpire/package.py @@ -0,0 +1,61 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class Umpire(CMakePackage): + """An application-focused API for memory management on NUMA & GPU + architectures""" + url = 'https://github.com/LLNL/Umpire/releases/download/v0.1.4/umpire-0.1.4.tar.gz' + homepage = 'https://github.com/LLNL/Umpire' + + version('master', git='https://github.com/LLNL/Umpire.git', branch='master', submodules='True') + version('develop', git='https://github.com/LLNL/Umpire.git', branch='develop', submodules='True') + version('0.1.4', git='https://github.com/LLNL/Umpire.git', tag='v0.1.4', submodules='True') + version('0.1.3', git='https://github.com/LLNL/Umpire.git', tag='v0.1.3', submodules='True') + + variant('cuda', default=False, description='Build with CUDA support') + variant('fortran', default=False, description='Build C/Fortran API') + + depends_on('cuda', when='+cuda') + depends_on('cmake@3.3:', type='build') + + def cmake_args(self): + spec = self.spec + + options = [] + + if '+cuda' in spec: + options.extend([ + '-DENABLE_CUDA=On', + '-DCUDA_TOOLKIT_ROOT_DIR=%s' % (spec['cuda'].prefix)]) + else: + options.append('-DENABLE_CUDA=Off') + + if '+fortran' in spec: + options.append('-DENABLE_FORTRAN=On') + + return options -- cgit v1.2.3-70-g09d2 From 39415f57da9eb4982c82f4e9d42ebdbcb06958d6 Mon Sep 17 00:00:00 2001 From: jthies Date: Tue, 29 May 2018 12:46:12 -0700 Subject: new version: Phist 1.6.0 (#8312) * gmp: add oldish version 5.1.3 with checksum * new version phist 1.6.0 --- var/spack/repos/builtin/packages/phist/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/phist/package.py b/var/spack/repos/builtin/packages/phist/package.py index 04660b943b..7ffd34099b 100644 --- a/var/spack/repos/builtin/packages/phist/package.py +++ b/var/spack/repos/builtin/packages/phist/package.py @@ -44,6 +44,7 @@ class Phist(CMakePackage): git='https://bitbucket.org/essex/phist/phist.git', branch='devel') version('master', git='https://bitbucket.org/essex/phist/phist.git', branch='master') + version('1.6.0', '751f855230d6227b972b5ab7bce2c65f') version('1.4.3', 'af3300378d4282366d148e38c3a3199a') variant(name='kernel_lib', default='builtin', -- cgit v1.2.3-70-g09d2 From 8eb0f50219a942298070034a8638d01a0a3c25a9 Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Tue, 29 May 2018 12:46:42 -0700 Subject: Add info for bedops@v2.4.35 (#8310) --- var/spack/repos/builtin/packages/bedops/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bedops/package.py b/var/spack/repos/builtin/packages/bedops/package.py index 6757d082d8..15c3f53bcc 100644 --- a/var/spack/repos/builtin/packages/bedops/package.py +++ b/var/spack/repos/builtin/packages/bedops/package.py @@ -34,6 +34,7 @@ class Bedops(MakefilePackage): homepage = "https://bedops.readthedocs.io" url = "https://github.com/bedops/bedops/archive/v2.4.30.tar.gz" + version('2.4.35', 'b425b3e05fd4cd1024ef4dd8bf04b4e5') version('2.4.34', 'fc467d96134a0efe8b134e638af87a1a') version('2.4.30', '4e5d9f7b7e5432b28aef8d17a22cffab') -- cgit v1.2.3-70-g09d2 From 97206cb60a1780f1746d73fc2ff5ae8ca64a5aae Mon Sep 17 00:00:00 2001 From: "Daryl W. Grunau" Date: Wed, 30 May 2018 09:35:39 -0600 Subject: paraview: set PARAVIEW_VTK_DIR in spack_env and run_env (#8308) --- var/spack/repos/builtin/packages/paraview/package.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index 907d98eada..0bd2d85b11 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -96,6 +96,15 @@ class Paraview(CMakePackage): else: return self._urlfmt.format(version.up_to(2), version, '') + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): + if os.path.isdir(self.prefix.lib64): + lib_dir = self.prefix.lib64 + else: + lib_dir = self.prefix.lib + paraview_version = 'paraview-%s' % self.spec.version.up_to(2) + spack_env.set('PARAVIEW_VTK_DIR', + join_path(lib_dir, 'cmake', paraview_version)) + def setup_environment(self, spack_env, run_env): if os.path.isdir(self.prefix.lib64): lib_dir = self.prefix.lib64 @@ -106,6 +115,8 @@ class Paraview(CMakePackage): paraview_version)) run_env.prepend_path('LD_LIBRARY_PATH', join_path(lib_dir, paraview_version)) + run_env.set('PARAVIEW_VTK_DIR', + join_path(lib_dir, 'cmake', paraview_version)) if '+python' in self.spec: run_env.prepend_path('PYTHONPATH', join_path(lib_dir, paraview_version)) -- cgit v1.2.3-70-g09d2 From be8077367ddfc6018e2162285497a582156685ec Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Wed, 30 May 2018 08:36:20 -0700 Subject: Update package: add info for emacs@26.1 (#8302) * Update package: add info for emacs@26.1 In addition to the digest, it needs gnutls (perhaps there's a way to turn it off, but it seems like a Good Thing to encourage, so...). * Clean up tls variant handling - Don't to specify the dependency for @26.1:, just need to fix what's already there. - Don't assume that configure will DTRT w.r.t. gnutls when it's discovered in the environmnet, use explicit configure switches. - Clean up some unnecessary dependencies when +tls. Why would you need libxpm when building +tls? Will ask the original author about this. * Use append when adding configure switches * Add dependency on pcre When one builds +X, Spack's pcre is pulled into the build via the X dependencies. When one builds without it, the build discovers and links against the system library. We might as well just depend on it and have a consistent outcome. --- var/spack/repos/builtin/packages/emacs/package.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/emacs/package.py b/var/spack/repos/builtin/packages/emacs/package.py index 77a976b52d..9fa1c30fd8 100644 --- a/var/spack/repos/builtin/packages/emacs/package.py +++ b/var/spack/repos/builtin/packages/emacs/package.py @@ -33,6 +33,7 @@ class Emacs(AutotoolsPackage): homepage = "https://www.gnu.org/software/emacs" url = "http://ftp.gnu.org/gnu/emacs/emacs-24.5.tar.gz" + version('26.1', '544d2ab5eb142e9ca69adb023d17bf4b') version('25.3', '74ddd373dc52ac05ca7a8c63b1ddbf58') version('25.2', '0a36d1cdbba6024d4dbbac027f87995f') version('25.1', '95c12e6a9afdf0dcbdd7d2efa26ca42c') @@ -50,6 +51,7 @@ class Emacs(AutotoolsPackage): depends_on('pkgconfig', type='build') depends_on('ncurses') + depends_on('pcre') depends_on('zlib') depends_on('libtiff', when='+X') depends_on('libpng', when='+X') @@ -59,8 +61,6 @@ class Emacs(AutotoolsPackage): depends_on('libxaw', when='+X toolkit=athena') depends_on('gtkplus', when='+X toolkit=gtk') depends_on('gnutls', when='+tls') - depends_on('libxpm ^gettext+libunistring', when='+tls') - depends_on('ncurses+termlib', when='+tls') def configure_args(self): spec = self.spec @@ -79,4 +79,9 @@ class Emacs(AutotoolsPackage): if sys.platform == 'darwin': args.append('--without-ns') + if '+tls' in spec: + args.append('--with-gnutls') + else: + args.append('--without-gnutls') + return args -- cgit v1.2.3-70-g09d2 From 5c56f2467bdf2d6be9f2e9a891ff8fe1a20d8b1c Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 30 May 2018 12:30:50 -0500 Subject: fastqc: Add version 0.11.7 (#8319) --- var/spack/repos/builtin/packages/fastqc/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fastqc/package.py b/var/spack/repos/builtin/packages/fastqc/package.py index e9a53bd8f9..1b0eb876ae 100644 --- a/var/spack/repos/builtin/packages/fastqc/package.py +++ b/var/spack/repos/builtin/packages/fastqc/package.py @@ -33,6 +33,7 @@ class Fastqc(Package): homepage = "http://www.bioinformatics.babraham.ac.uk/projects/fastqc/" url = "http://www.bioinformatics.babraham.ac.uk/projects/fastqc/fastqc_v0.11.5.zip" + version('0.11.7', '8fead05fa62c5e723f0d2157a9b5fcd4') version('0.11.5', '3524f101c0ab0bae77c7595983170a76') version('0.11.4', '104ff2e0e9aebf5bee1f6b068a059b0d') -- cgit v1.2.3-70-g09d2 From 55e42dca2c7627e00abfaec60ece96861ce77d4c Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 30 May 2018 12:31:05 -0500 Subject: trimgalore: Use perl from env (#8318) --- var/spack/repos/builtin/packages/trimgalore/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trimgalore/package.py b/var/spack/repos/builtin/packages/trimgalore/package.py index fe51368934..6374c9c6e4 100644 --- a/var/spack/repos/builtin/packages/trimgalore/package.py +++ b/var/spack/repos/builtin/packages/trimgalore/package.py @@ -41,5 +41,7 @@ class Trimgalore(Package): depends_on('fastqc') def install(self, spec, prefix): + filter_file(r'#!/usr/bin/perl', '#!/usr/bin/env perl', 'trim_galore') + mkdirp(prefix.bin) install('trim_galore', prefix.bin) -- cgit v1.2.3-70-g09d2 From 4e15d6f41b63a21c827f71867db29acd7ccb9201 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Thu, 31 May 2018 13:54:39 +0200 Subject: latte: specify blas and lapack explicitly (#8327) --- var/spack/repos/builtin/packages/latte/package.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/latte/package.py b/var/spack/repos/builtin/packages/latte/package.py index 606bd99dda..80f999f763 100644 --- a/var/spack/repos/builtin/packages/latte/package.py +++ b/var/spack/repos/builtin/packages/latte/package.py @@ -61,4 +61,9 @@ class Latte(CMakePackage): if '+progress' in self.spec: options.append('-DPROGRESS=yes') + blas_list = ';'.join(self.spec['blas'].libs) + lapack_list = ';'.join(self.spec['lapack'].libs) + options.append('-DBLAS_LIBRARIES={0}'.format(blas_list)) + options.append('-DLAPACK_LIBRARIES={0}'.format(lapack_list)) + return options -- cgit v1.2.3-70-g09d2 From 59633d5c958883ebf1a738ad1b8cd36480043dbf Mon Sep 17 00:00:00 2001 From: Sinan Date: Thu, 31 May 2018 13:24:38 -0700 Subject: fix missing -lrt for Centos6, issue: #7552 (#7597) * fix missing -lrt for Centos6, issue: #7552 * fix missing -lrt for Centos6, issue: #7552 * fix using make() as opposed to patching * remove patch, as the fix is provided withing package.py instead * make flake8 happy --- var/spack/repos/builtin/packages/lz4/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lz4/package.py b/var/spack/repos/builtin/packages/lz4/package.py index 973250a2f1..ec5dded43f 100644 --- a/var/spack/repos/builtin/packages/lz4/package.py +++ b/var/spack/repos/builtin/packages/lz4/package.py @@ -50,7 +50,10 @@ class Lz4(Package): return "{0}/r{1}.tar.gz".format(url, version.joined) def install(self, spec, prefix): - make() + if sys.platform != "darwin": + make('LIBS=-lrt') # fixes make error on CentOS6 + else: + make() if self.run_tests: make('test') # requires valgrind to be installed make('install', 'PREFIX={0}'.format(prefix)) -- cgit v1.2.3-70-g09d2 From 610835e64654b38fd6872177882eaa18eb1d704e Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Thu, 31 May 2018 18:24:33 -0700 Subject: Add missing expand=False for v2.18.3 (#8342) Installing the current version of Picard fails with: ``` ==> Error: Unable to parse extension from https://github.com/broadinstitute/picard/releases/download/2.18.3/picard.jar. If this URL is for a tarball but does not include the file extension in the name, you can explicitly declare it with the following syntax: version('1.2.3', 'hash', extension='tar.gz') If this URL is for a download like a .jar or .whl that does not need to be expanded, or an uncompressed installation script, you can tell Spack not to expand it with the following syntax: version('1.2.3', 'hash', expand=False) ``` Fix it, but adding `expand=False`, like the other versions. --- var/spack/repos/builtin/packages/picard/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/picard/package.py b/var/spack/repos/builtin/packages/picard/package.py index e4dc41a4ea..cca0ae2f7b 100644 --- a/var/spack/repos/builtin/packages/picard/package.py +++ b/var/spack/repos/builtin/packages/picard/package.py @@ -41,7 +41,7 @@ class Picard(Package): # They started distributing a single jar file at v2.6.0, prior to # that it was a .zip file with multiple .jar and .so files - version('2.18.3', '181b1b0731fd35f0d8bd44677d8787e9') + version('2.18.3', '181b1b0731fd35f0d8bd44677d8787e9', expand=False) version('2.18.0', '20045ff141e4a67512365f0b6bbd8229', expand=False) version('2.17.0', '72cc527f1e4ca6a799ae0117af60b54e', expand=False) version('2.16.0', 'fed8928b03bb36e355656f349e579083', expand=False) -- cgit v1.2.3-70-g09d2 From cff6255e56c13d087c896d571d8241db8170d118 Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Thu, 31 May 2018 18:28:08 -0700 Subject: Use GitHub URL for pigz, supports > 1 release (#8339) The URL that we were using for pigz only provides the current version. When the author released v2.4 the package became uninstallable (unless you have the tarball cached). It turns out that their are tarballs of the tagged source tree available on GitHub and they're sufficient to build things (no additional bits needed). This commit switches the URL to the GitHub archive URL. Sadly, this changes the v2.3.4 digest, but that version was no longer available/install-able anyway, so "net-net we're still in positive territory". --- var/spack/repos/builtin/packages/pigz/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pigz/package.py b/var/spack/repos/builtin/packages/pigz/package.py index dc38cd444c..993ae37dd2 100644 --- a/var/spack/repos/builtin/packages/pigz/package.py +++ b/var/spack/repos/builtin/packages/pigz/package.py @@ -30,9 +30,10 @@ class Pigz(MakefilePackage): multi-core machines.""" homepage = "http://zlib.net/pigz/" - url = "http://zlib.net/pigz/pigz-2.3.4.tar.gz" + url = "https://github.com/madler/pigz/archive/v2.3.4.tar.gz" - version('2.3.4', '08e6b2e682bbf65ccf12c8966d633fc6') + version('2.4', '3c8a601db141d3013ef9fe5f2daaf73f') + version('2.3.4', 'c109057050b15edf3eb9bb4d0805235e') depends_on('zlib') -- cgit v1.2.3-70-g09d2 From ed64b8dace511d002c748ae17408fe40dff0ae9f Mon Sep 17 00:00:00 2001 From: Nate Roberts Date: Thu, 31 May 2018 19:29:44 -0600 Subject: Added dependency for hdf5 version number (known incompatibility with 1.10). (#8337) --- var/spack/repos/builtin/packages/camellia/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/camellia/package.py b/var/spack/repos/builtin/packages/camellia/package.py index 6bdf9a61ad..147c2181e7 100644 --- a/var/spack/repos/builtin/packages/camellia/package.py +++ b/var/spack/repos/builtin/packages/camellia/package.py @@ -40,6 +40,7 @@ class Camellia(CMakePackage): depends_on('trilinos+amesos+amesos2+belos+epetra+epetraext+exodus+ifpack+ifpack2+intrepid+intrepid2+kokkos+ml+muelu+sacado+shards+teuchos+tpetra+zoltan+mumps+superlu-dist+hdf5+zlib+pnetcdf@master,12.12.1:') depends_on('moab@:4', when='+moab') + depends_on('hdf5@:1.8') depends_on('mpi') def cmake_args(self): -- cgit v1.2.3-70-g09d2 From 16fb10bc7e6e77935b745a3e39091271c3594781 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Fri, 1 Jun 2018 10:30:47 +0200 Subject: subread: use compiler wrappers when compiling (#8328) --- var/spack/repos/builtin/packages/subread/package.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/subread/package.py b/var/spack/repos/builtin/packages/subread/package.py index 1fdf52d4da..1bc36ddb13 100644 --- a/var/spack/repos/builtin/packages/subread/package.py +++ b/var/spack/repos/builtin/packages/subread/package.py @@ -43,6 +43,11 @@ class Subread(MakefilePackage): plat = sys.platform with working_dir('src'): if plat.startswith('linux'): + filter_file( + 'CC_EXEC = gcc', + 'CC_EXEC = {0}'.format(spack_cc), + 'Makefile.Linux' + ) make('-f', 'Makefile.Linux') elif plat.startswith('darwin'): make('-f', 'Makefile.MacOS') -- cgit v1.2.3-70-g09d2 From 287a43ce354e12f4bad0c772311aa4b109e6a0e5 Mon Sep 17 00:00:00 2001 From: Mayeul d'Avezac Date: Fri, 1 Jun 2018 15:30:07 +0100 Subject: Adding nektar++ package (#8167) * Adding nektar++ package * - -> ~ and add explicit conflict with metis * Add messages explaing nektar's conflicts --- var/spack/repos/builtin/packages/nektar/package.py | 75 ++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 var/spack/repos/builtin/packages/nektar/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nektar/package.py b/var/spack/repos/builtin/packages/nektar/package.py new file mode 100644 index 0000000000..1c09397883 --- /dev/null +++ b/var/spack/repos/builtin/packages/nektar/package.py @@ -0,0 +1,75 @@ +############################################################################# +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Nektar(CMakePackage): + """Nektar++: Spectral/hp Element Framework""" + + homepage = "https://www.nektar.info/" + url = "https://gitlab.nektar.info/nektar/nektar/-/archive/v4.4.1/nektar-v4.4.1.tar.bz2" + + version('4.4.1', '1be7d061c3cafd9a0f1eb8d281d99b89') + + variant('mpi', default=True, description='Builds with mpi support') + variant('fftw', default=True, description='Builds with fftw support') + variant('arpack', default=True, description='Builds with arpack support') + variant('hdf5', default=True, description='Builds with hdf5 support') + variant('scotch', default=False, + description='Builds with scotch partitioning support') + + depends_on('cmake@2.8.8:', type='build', when="~hdf5") + depends_on('cmake@3.2:', type='build', when="+hdf5") + + depends_on('blas') + depends_on('lapack') + depends_on('boost@1.56.0: +iostreams') + depends_on('tinyxml', when='platform=darwin') + + depends_on('mpi', when='+mpi') + depends_on('fftw@3.0: +mpi', when="+mpi+fftw") + depends_on('fftw@3.0: ~mpi', when="~mpi+fftw") + depends_on('arpack-ng +mpi', when="+arpack+mpi") + depends_on('arpack-ng ~mpi', when="+arpack~mpi") + depends_on('hdf5 +mpi +hl', when="+mpi+hdf5") + depends_on('scotch ~mpi ~metis', when="~mpi+scotch") + depends_on('scotch +mpi ~metis', when="+mpi+scotch") + + conflicts("+hdf5", when="~mpi", + msg="Nektar's hdf5 output is for parallel builds only") + + def cmake_args(self): + args = [] + + def hasfeature(feature): + return 'ON' if feature in self.spec else 'OFF' + + args.append('-DNEKTAR_USE_MPI=%s' % hasfeature('+mpi')) + args.append('-DNEKTAR_USE_FFTW=%s' % hasfeature('+fftw')) + args.append('-DNEKTAR_USE_ARPACK=%s' % hasfeature('+arpack')) + args.append('-DNEKTAR_USE_HDF5=%s' % hasfeature('+hdf5')) + args.append('-DNEKTAR_USE_SCOTCH=%s' % hasfeature('+scotch')) + args.append('-DNEKTAR_USE_PETSC=OFF') + return args -- cgit v1.2.3-70-g09d2 From bda05830da3581b246cdcb64fa006d71a8ea01e7 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Fri, 1 Jun 2018 17:47:13 +0200 Subject: gmake: fix build with glibc 2.27 (#8344) Also add an nls variant for gettext support. --- var/spack/repos/builtin/packages/gmake/package.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gmake/package.py b/var/spack/repos/builtin/packages/gmake/package.py index d7a944e3b6..a47d3a0fdc 100644 --- a/var/spack/repos/builtin/packages/gmake/package.py +++ b/var/spack/repos/builtin/packages/gmake/package.py @@ -36,11 +36,16 @@ class Gmake(AutotoolsPackage): version('4.0', 'b5e558f981326d9ca1bfdb841640721a') variant('guile', default=False, description='Support GNU Guile for embedded scripting') + variant('nls', default=True, description='Enable Native Language Support') + depends_on('gettext', when='+nls') depends_on('guile', when='+guile') build_directory = 'spack-build' + patch('https://src.fedoraproject.org/rpms/make/raw/519a7c5bcbead22e6ea2d2c2341d981ef9e25c0d/f/make-4.2.1-glob-fix-2.patch', level=1, sha256='fe5b60d091c33f169740df8cb718bf4259f84528b42435194ffe0dd5b79cd125', when='@4.2.1') + patch('https://src.fedoraproject.org/rpms/make/raw/519a7c5bcbead22e6ea2d2c2341d981ef9e25c0d/f/make-4.2.1-glob-fix-3.patch', level=1, sha256='ca60bd9c1a1b35bc0dc58b6a4a19d5c2651f7a94a4b22b2c5ea001a1ca7a8a7f', when='@:4.2.1') + def configure_args(self): args = [] @@ -49,6 +54,11 @@ class Gmake(AutotoolsPackage): else: args.append('--without-guile') + if '+nls' in self.spec: + args.append('--enable-nls') + else: + args.append('--disable-nls') + return args @run_after('install') -- cgit v1.2.3-70-g09d2 From 8d40f12853cd0911ee2df8f4475ca54ea782b0b1 Mon Sep 17 00:00:00 2001 From: "Daryl W. Grunau" Date: Fri, 1 Jun 2018 09:49:26 -0600 Subject: make provision to install version 6.4.0beta.2 (#8338) * make provision to install version 6.4.0beta.2 * drop flang.patch for the newer version per junghans --- var/spack/repos/builtin/packages/eospac/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/eospac/package.py b/var/spack/repos/builtin/packages/eospac/package.py index 222a7ee4db..7b76f425d2 100644 --- a/var/spack/repos/builtin/packages/eospac/package.py +++ b/var/spack/repos/builtin/packages/eospac/package.py @@ -34,11 +34,12 @@ class Eospac(Package): homepage = "https://laws.lanl.gov/projects/data/eos.html" list_url = "https://laws.lanl.gov/projects/data/eos/eospacReleases.php" + version('6.4.0beta.2_69196eadbc77506561eef711f19d2f03b4ab0ffa', '9b6e48090647221d5ffe7ec5f9ea4c71') version('6.4.0beta.1_r20171213193219', 'e4e4beabf946f0b8953532832002afc2') version('6.3.1_r20161202150449', '549fda008c4169a69b02ec2a9de1e434', preferred=True) # This patch allows the use of spack's compile wrapper 'flang' - patch('flang.patch', when='%clang') + patch('flang.patch', when='@:6.4.0beta.2%clang') def url_for_version(self, version): return "https://laws.lanl.gov/projects/data/eos/get_file.php?package=eospac&filename=eospac_v{0}.tgz".format(version) -- cgit v1.2.3-70-g09d2 From 4395d217528e36bb56a97abd64effb25b422989e Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Fri, 1 Jun 2018 11:13:33 -0700 Subject: added py-cffi 1.11.5 (#8349) --- var/spack/repos/builtin/packages/py-cffi/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-cffi/package.py b/var/spack/repos/builtin/packages/py-cffi/package.py index 41c1129c69..d3e6eecd00 100644 --- a/var/spack/repos/builtin/packages/py-cffi/package.py +++ b/var/spack/repos/builtin/packages/py-cffi/package.py @@ -33,6 +33,7 @@ class PyCffi(PythonPackage): import_modules = ['cffi'] + version('1.11.5', 'ac8492f4ad952360737413e82d661908') version('1.10.0', '2b5fa41182ed0edaf929a789e602a070') version('1.1.2', 'ca6e6c45b45caa87aee9adc7c796eaea') -- cgit v1.2.3-70-g09d2 From 9a486b970980fe960b0158cdccb8d84b2facb3c8 Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Fri, 1 Jun 2018 13:06:27 -0700 Subject: added avro and avro_json_serializer python packages (#8351) --- .../packages/py-avro-json-serializer/package.py | 38 ++++++++++++++++++++++ .../repos/builtin/packages/py-avro/package.py | 36 ++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-avro-json-serializer/package.py create mode 100644 var/spack/repos/builtin/packages/py-avro/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-avro-json-serializer/package.py b/var/spack/repos/builtin/packages/py-avro-json-serializer/package.py new file mode 100644 index 0000000000..dd26863719 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-avro-json-serializer/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyAvroJsonSerializer(PythonPackage): + """Serializes data into a JSON format using AVRO schema.""" + + homepage = "https://github.com/linkedin/python-avro-json-serializer" + url = "https://github.com/linkedin/python-avro-json-serializer/archive/0.4.tar.gz" + + version('0.4', 'ee32f415e03820653cf8477bf5bfc779') + + depends_on('py-setuptools', type='build') + depends_on('py-simplejson', type=('build', 'run')) + depends_on('py-avro', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-avro/package.py b/var/spack/repos/builtin/packages/py-avro/package.py new file mode 100644 index 0000000000..82cbfa213c --- /dev/null +++ b/var/spack/repos/builtin/packages/py-avro/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyAvro(PythonPackage): + """Avro is a serialization and RPC framework.""" + + homepage = "http://avro.apache.org/docs/current/" + url = "https://pypi.io/packages/source/a/avro/avro-1.8.2.tar.gz" + + version('1.8.2', '44ec007d432a2f3c35f87eee01f1e9ec') + + depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From b3064938848e154f83cc5152db51767fa3e6d032 Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Fri, 1 Jun 2018 13:06:45 -0700 Subject: Fix digest for abyss@1.5.2 (#8341) * Fix digest for abyss@1.5.2 The digest value for v1.5.2 appears to have changed. This value works for me, today. The existing value v2.0.2 works as is. * Use "download" URL for ABYSS Following the suggestion of the project team, switch to using the release tarballs from the "download" URL instead of the automagically generated ones at the "archive" URL. Converstation here: https://github.com/bcgsc/abyss/issues/232 --- var/spack/repos/builtin/packages/abyss/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/abyss/package.py b/var/spack/repos/builtin/packages/abyss/package.py index bf171debce..cbf15ef039 100644 --- a/var/spack/repos/builtin/packages/abyss/package.py +++ b/var/spack/repos/builtin/packages/abyss/package.py @@ -31,9 +31,9 @@ class Abyss(AutotoolsPackage): is useful for assembling genomes up to 100 Mbases in size.""" homepage = "http://www.bcgsc.ca/platform/bioinfo/software/abyss" - url = "https://github.com/bcgsc/abyss/archive/2.0.2.tar.gz" + url = "https://github.com/bcgsc/abyss/releases/download/1.5.2/abyss-1.5.2.tar.gz" - version('2.0.2', 'bb3f8cebf121312bf81789d963b4ecc5') + version('2.0.2', '1623f55ad7f4586e80f6e74b1f27c798') version('1.5.2', '10d6d72d1a915e618d41a5cbbcf2364c') depends_on('autoconf', type='build') -- cgit v1.2.3-70-g09d2 From fed9cf07778c7b25246b766c67e78708f8f6a6c8 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Sat, 2 Jun 2018 18:24:37 -0500 Subject: cmake: update version (#8357) --- var/spack/repos/builtin/packages/cmake/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index 7875e6b18f..79b7b21970 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -33,6 +33,7 @@ class Cmake(Package): list_url = 'https://cmake.org/files/' list_depth = 1 + version('3.11.3', '3f923154ed47128f13b08eacd207d9ee') version('3.11.2', 'd2d554c05fc07cfae7846d2aa205f12a') version('3.11.1', '12a3177477e4e2c7bc514193d421dafe') version('3.11.0', 'f3ebc79b5dec85b49abe75958ffa1a03') -- cgit v1.2.3-70-g09d2 From bfd9ebaa92b141f82931d78ee72f2371d8f501e0 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Sat, 2 Jun 2018 19:27:46 -0600 Subject: legion: version bump (#8352) --- var/spack/repos/builtin/packages/legion/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/legion/package.py b/var/spack/repos/builtin/packages/legion/package.py index 0ec388994f..fb497216d4 100644 --- a/var/spack/repos/builtin/packages/legion/package.py +++ b/var/spack/repos/builtin/packages/legion/package.py @@ -44,6 +44,8 @@ class Legion(CMakePackage): url = "https://github.com/StanfordLegion/legion/tarball/legion-17.02.0" version('develop', git='https://github.com/StanfordLegion/legion', branch='master') + version('18.05.0', 'ab5ac8cd4aa4c91e6187bf1333a031bf') + version('18.02.0', '14937b386100347b051a5fc514636353') version('17.10.0', 'ebfc974dc82a9d7f3ba53242ecae62e1') version('17.08.0', 'acc1ea8c564c4a382a015e0c9cf94574') version('17.02.0', '31ac3004e2fb0996764362d2b6f6844a') -- cgit v1.2.3-70-g09d2 From ff56d739a03886ee3d49df2ed8b9f1c605bba61e Mon Sep 17 00:00:00 2001 From: healther Date: Sun, 3 Jun 2018 03:28:54 +0200 Subject: add 2.17.1 for git (#8316) --- var/spack/repos/builtin/packages/git/package.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index be4bc12e66..e8c3400c94 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -43,6 +43,11 @@ class Git(AutotoolsPackage): # https://www.kernel.org/pub/software/scm/git/git-manpages-{version}.tar.xz releases = [ + { + 'version': '2.17.1', + 'md5': 'e04bfbbe5f17a4faa9507c75b8505c13', + 'md5_manpages': 'f1d5dfc1459c9f2885f790c5af7473d1' + }, { 'version': '2.17.0', 'md5': '8e0f5253eef3abeb76bd9c55386d3bee', @@ -146,7 +151,7 @@ class Git(AutotoolsPackage): ] for release in releases: - version(release['version'], release['md5']) + version(release['version'], md5=release['md5']) resource( name='git-manpages', url="https://www.kernel.org/pub/software/scm/git/git-manpages-{0}.tar.xz".format( -- cgit v1.2.3-70-g09d2 From 20a89ca326712058f3f22621eed725c0f510bee3 Mon Sep 17 00:00:00 2001 From: Mario Melara Date: Sun, 3 Jun 2018 20:20:57 -0700 Subject: Add branch with bugfix (#8355) --- var/spack/repos/builtin/packages/meraculous/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/meraculous/package.py b/var/spack/repos/builtin/packages/meraculous/package.py index a2d6d6fb99..798de5761c 100644 --- a/var/spack/repos/builtin/packages/meraculous/package.py +++ b/var/spack/repos/builtin/packages/meraculous/package.py @@ -32,6 +32,9 @@ class Meraculous(CMakePackage): homepage = "http://jgi.doe.gov/data-and-tools/meraculous/" url = "https://downloads.sourceforge.net/project/meraculous20/Meraculous-v2.2.4.tar.gz" + version('2.2.5.1', + git="https://bitbucket.org/berkeleylab/genomics-meraculous2.git", + branch="release-2.2.5.1") version('2.2.4', '349feb6cb178643a46e4b092c87bad3a') depends_on('perl', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From add7f2b09ac01022976eaabdad117336affb7a52 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Mon, 4 Jun 2018 16:50:02 +0200 Subject: pybind11: test functionality (#8304) * pybind11: test support Add a test functionality to pybind11. * CMake: test also on "make check" Some projects use non-CTest manual targets for tests. --- lib/spack/spack/build_systems/cmake.py | 2 ++ var/spack/repos/builtin/packages/py-pybind11/package.py | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/lib/spack/spack/build_systems/cmake.py b/lib/spack/spack/build_systems/cmake.py index c60f649fa5..1592ae4be5 100644 --- a/lib/spack/spack/build_systems/cmake.py +++ b/lib/spack/spack/build_systems/cmake.py @@ -256,8 +256,10 @@ class CMakePackage(PackageBase): with working_dir(self.build_directory): if self.generator == 'Unix Makefiles': self._if_make_target_execute('test') + self._if_make_target_execute('check') elif self.generator == 'Ninja': self._if_ninja_target_execute('test') + self._if_ninja_target_execute('check') # Check that self.prefix is there after installation run_after('install')(PackageBase.sanity_check_prefix) diff --git a/var/spack/repos/builtin/packages/py-pybind11/package.py b/var/spack/repos/builtin/packages/py-pybind11/package.py index c995660d71..0c05694f50 100644 --- a/var/spack/repos/builtin/packages/py-pybind11/package.py +++ b/var/spack/repos/builtin/packages/py-pybind11/package.py @@ -46,7 +46,7 @@ class PyPybind11(CMakePackage): version('2.1.1', '5518988698df937ccee53fb6ba91d12a') version('2.1.0', '3cf07043d677d200720c928569635e12') - depends_on('py-pytest', type=('build')) + depends_on('py-pytest', type='test') extends('python') @@ -59,4 +59,8 @@ class PyPybind11(CMakePackage): args = [] args.append('-DPYTHON_EXECUTABLE:FILEPATH=%s' % self.spec['python'].command.path) + args += [ + '-DPYBIND11_TEST:BOOL={0}'.format( + 'ON' if self.run_tests else 'OFF') + ] return args -- cgit v1.2.3-70-g09d2 From 3144eb40399f681c12861818617ecbf8799cfcc8 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Mon, 4 Jun 2018 13:19:27 -0500 Subject: New package: clapack (#7992) * clapack: new package * clapack: updated edit phase and fixed flake9 errors * clapack: added description for variant * clapack: updated * removed .package.py.swo --- .../repos/builtin/packages/clapack/package.py | 63 ++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 var/spack/repos/builtin/packages/clapack/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/clapack/package.py b/var/spack/repos/builtin/packages/clapack/package.py new file mode 100644 index 0000000000..73c4414d31 --- /dev/null +++ b/var/spack/repos/builtin/packages/clapack/package.py @@ -0,0 +1,63 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +from distutils.dir_util import copy_tree + + +class Clapack(MakefilePackage): + """CLAPACK is a f2c'ed version of LAPACK. + + The CLAPACK library was built using a Fortran to C conversion utility + called f2c. The entire Fortran 77 LAPACK library is run through f2c to + obtain C code, and then modified to improve readability. CLAPACK's goal + is to provide LAPACK for someone who does not have access to a Fortran + compiler.""" + + homepage = "http://www.netlib.org/clapack/" + url = "http://www.netlib.org/clapack/clapack.tgz" + + version('3.2.1', '040da31f3a7d4fbc9ac376c748d18d1f') + + variant('external-blas', default=True, + description='Build with external BLAS (ATLAS here).') + + depends_on('atlas', when='+external-blas') + + def edit(self, spec, prefix): + install('make.inc.example', 'make.inc') + if '+external-blas' in spec: + make_inc = FileFilter('make.inc') + make_inc.filter(r'^BLASLIB.*', + 'BLASLIB = ../../libcblaswr.a -lcblas -latlas') + makefile.filter(r'^lib.*', + 'lib: variants lapacklib tmglib') + + def build(self, spec, prefix): + make('f2clib') + make('cblaswrap' if '+external-blas' in spec else 'blaslib') + make('lib') + + def install(self, spec, prefix): + copy_tree('.', prefix) -- cgit v1.2.3-70-g09d2 From fcfcd7689a40a387b2e92bbc99571c6a524e53b1 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Mon, 4 Jun 2018 13:22:47 -0500 Subject: New package: phast (#7993) * adding partially completed recipe for phast. will need clapack as dependency * try to install phast * seems to still need CLAPCK * using CLAPACK instead * phast: updated * fixed flake8 error * phast cannot build with clapack built with external blas? * phast: depend on clapack built without external blas * fixed flake8 errors * phast: updated build_directory --- var/spack/repos/builtin/packages/phast/package.py | 58 +++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 var/spack/repos/builtin/packages/phast/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/phast/package.py b/var/spack/repos/builtin/packages/phast/package.py new file mode 100644 index 0000000000..2973c8720c --- /dev/null +++ b/var/spack/repos/builtin/packages/phast/package.py @@ -0,0 +1,58 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Phast(MakefilePackage): + """PHAST is a freely available software package for comparative and + evolutionary genomics.""" + + homepage = "http://compgen.cshl.edu/phast/index.php" + url = "https://github.com/CshlSiepelLab/phast/archive/v1.4.tar.gz" + + version('1.4', '2bc0412ba58ea1f08ba5e12fad43b4c7') + + # phast cannot build with clapack using external blas + depends_on('clapack~external-blas') + + build_directory = 'src' + + @property + def build_targets(self): + targets = ['CLAPACKPATH={0}'.format(self.spec['clapack'].prefix)] + return targets + + def edit(self, spec, prefix): + with working_dir(self.build_directory): + filter_file(r'\$\{PWD\}', + '$(dir $(realpath $(firstword $(MAKEFILE_LIST))))', + 'make-include.mk') + filter_file(r'\$\{PWD\}', + '$(dir $(realpath $(firstword $(MAKEFILE_LIST))))', + 'Makefile') + + def install(self, spec, prefix): + install_tree('bin', prefix.bin) + install_tree('lib', prefix.lib) -- cgit v1.2.3-70-g09d2 From 4ea16fe3e4545a926617d702f6db538d394bdc89 Mon Sep 17 00:00:00 2001 From: "Daryl W. Grunau" Date: Mon, 4 Jun 2018 14:04:12 -0600 Subject: clean up version names (#8368) --- var/spack/repos/builtin/packages/eospac/package.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/eospac/package.py b/var/spack/repos/builtin/packages/eospac/package.py index 7b76f425d2..0ed4487b0d 100644 --- a/var/spack/repos/builtin/packages/eospac/package.py +++ b/var/spack/repos/builtin/packages/eospac/package.py @@ -34,16 +34,16 @@ class Eospac(Package): homepage = "https://laws.lanl.gov/projects/data/eos.html" list_url = "https://laws.lanl.gov/projects/data/eos/eospacReleases.php" - version('6.4.0beta.2_69196eadbc77506561eef711f19d2f03b4ab0ffa', '9b6e48090647221d5ffe7ec5f9ea4c71') - version('6.4.0beta.1_r20171213193219', 'e4e4beabf946f0b8953532832002afc2') - version('6.3.1_r20161202150449', '549fda008c4169a69b02ec2a9de1e434', preferred=True) + version('6.4.0beta.2', '9b6e48090647221d5ffe7ec5f9ea4c71', + url="https://laws.lanl.gov/projects/data/eos/get_file.php?package=eospac&filename=eospac_v6.4.0beta.2_69196eadbc77506561eef711f19d2f03b4ab0ffa.tgz") + version('6.4.0beta.1', 'e4e4beabf946f0b8953532832002afc2', + url="https://laws.lanl.gov/projects/data/eos/get_file.php?package=eospac&filename=eospac_v6.4.0beta.1_r20171213193219.tgz") + version('6.3.1', '549fda008c4169a69b02ec2a9de1e434', preferred=True, + url="https://laws.lanl.gov/projects/data/eos/get_file.php?package=eospac&filename=eospac_v6.3.1_r20161202150449.tgz") # This patch allows the use of spack's compile wrapper 'flang' patch('flang.patch', when='@:6.4.0beta.2%clang') - def url_for_version(self, version): - return "https://laws.lanl.gov/projects/data/eos/get_file.php?package=eospac&filename=eospac_v{0}.tgz".format(version) - def install(self, spec, prefix): with working_dir('Source'): make('install', -- cgit v1.2.3-70-g09d2 From a226559347957d54b67ed49e4a937f205ab3efec Mon Sep 17 00:00:00 2001 From: Daniel Topa Date: Mon, 4 Jun 2018 14:04:45 -0600 Subject: added line 43 (#8369) version('1.4.1.2', '38c7d33210155e5796b16d536d1b5cfe') Signed-off-by: Daniel Topa --- var/spack/repos/builtin/packages/libhio/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libhio/package.py b/var/spack/repos/builtin/packages/libhio/package.py index 50e6d9b775..ff5f28202e 100644 --- a/var/spack/repos/builtin/packages/libhio/package.py +++ b/var/spack/repos/builtin/packages/libhio/package.py @@ -40,6 +40,7 @@ class Libhio(AutotoolsPackage): # We don't include older versions since they are missing features # needed by current and future consumers of libhio # + version('1.4.1.2', '38c7d33210155e5796b16d536d1b5cfe') version('1.4.1.0', '6ef566fd8cf31fdcd05fab01dd3fae44') # -- cgit v1.2.3-70-g09d2 From e7f82163bfe5fac9f6032db57eaaf1b10b644b17 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Tue, 5 Jun 2018 20:35:43 +0200 Subject: py-virtualenv: added version 16.0.0 (#8380) --- var/spack/repos/builtin/packages/py-virtualenv/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-virtualenv/package.py b/var/spack/repos/builtin/packages/py-virtualenv/package.py index bc9057307d..be8906340c 100644 --- a/var/spack/repos/builtin/packages/py-virtualenv/package.py +++ b/var/spack/repos/builtin/packages/py-virtualenv/package.py @@ -31,6 +31,7 @@ class PyVirtualenv(PythonPackage): homepage = "https://virtualenv.pypa.io/" url = "https://pypi.io/packages/source/v/virtualenv/virtualenv-15.1.0.tar.gz" + version('16.0.0', '4feb74ee26255dd7e62e36ce96bcc4c6') version('15.1.0', '44e19f4134906fe2d75124427dc9b716') version('15.0.1', '28d76a0d9cbd5dc42046dd14e76a6ecc') version('13.0.1', '1ffc011bde6667f0e37ecd976f4934db') -- cgit v1.2.3-70-g09d2 From 88e18a3db77f9e1a1d4849b916dc84a67c489156 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Tue, 5 Jun 2018 20:36:09 +0200 Subject: Added py-pip 10.0.1 and py-setuptools 39.2.0 (#8377) --- var/spack/repos/builtin/packages/py-pip/package.py | 1 + var/spack/repos/builtin/packages/py-setuptools/package.py | 1 + 2 files changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pip/package.py b/var/spack/repos/builtin/packages/py-pip/package.py index 3c3548d8ac..1f41badf75 100644 --- a/var/spack/repos/builtin/packages/py-pip/package.py +++ b/var/spack/repos/builtin/packages/py-pip/package.py @@ -31,6 +31,7 @@ class PyPip(PythonPackage): homepage = "https://pypi.python.org/pypi/pip" url = "https://pypi.io/packages/source/p/pip/pip-9.0.1.tar.gz" + version('10.0.1', '83a177756e2c801d0b3a6f7b0d4f3f7e') version('9.0.1', '35f01da33009719497f01a4ba69d63c9') depends_on('python@2.6:2.8,3.3:') diff --git a/var/spack/repos/builtin/packages/py-setuptools/package.py b/var/spack/repos/builtin/packages/py-setuptools/package.py index de9e3ef073..23bbc1cd5c 100644 --- a/var/spack/repos/builtin/packages/py-setuptools/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools/package.py @@ -34,6 +34,7 @@ class PySetuptools(PythonPackage): import_modules = ['pkg_resources', 'setuptools', 'setuptools.command'] + version('39.2.0', 'dd4e3fa83a21bf7bf9c51026dc8a4e59') version('39.0.1', '75310b72ca0ab4e673bf7679f69d7a62') version('35.0.2', 'c368b4970d3ad3eab5afe4ef4dbe2437') version('34.4.1', '5f9b07aeaafd29eac2548fc0b89a4934') -- cgit v1.2.3-70-g09d2 From ee735e58a8daf03dff4bba9456d830c785be915c Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Tue, 5 Jun 2018 20:36:29 +0200 Subject: py-cython: added version 0.28.3 (#8379) --- var/spack/repos/builtin/packages/py-cython/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-cython/package.py b/var/spack/repos/builtin/packages/py-cython/package.py index 57cdf1cae9..bc14fbf179 100644 --- a/var/spack/repos/builtin/packages/py-cython/package.py +++ b/var/spack/repos/builtin/packages/py-cython/package.py @@ -30,6 +30,7 @@ class PyCython(PythonPackage): homepage = "https://pypi.python.org/pypi/cython" url = "https://pypi.io/packages/source/c/cython/Cython-0.25.2.tar.gz" + version('0.28.3', '586f0eb70ba1fcc34334e9e10c5e68c0') version('0.28.1', 'c549effadb52d90bdcb1affc1e5dbb97') version('0.25.2', '642c81285e1bb833b14ab3f439964086') version('0.23.5', '66b62989a67c55af016c916da36e7514') -- cgit v1.2.3-70-g09d2 From e107a50d0a705d15969ecfe44f5bb850f9b08802 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Tue, 5 Jun 2018 20:42:18 +0200 Subject: py-sympy: added version 1.1.1 (#8381) --- var/spack/repos/builtin/packages/py-sympy/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-sympy/package.py b/var/spack/repos/builtin/packages/py-sympy/package.py index b921431099..1d16331284 100644 --- a/var/spack/repos/builtin/packages/py-sympy/package.py +++ b/var/spack/repos/builtin/packages/py-sympy/package.py @@ -30,7 +30,8 @@ class PySympy(PythonPackage): homepage = "https://pypi.python.org/pypi/sympy" url = "https://pypi.io/packages/source/s/sympy/sympy-0.7.6.tar.gz" - version('0.7.6', '3d04753974306d8a13830008e17babca') + version('1.1.1', 'c410a9c2346878716d16ec873d72e72a') version('1.0', '43e797de799f00f9e8fd2307dba9fab1') + version('0.7.6', '3d04753974306d8a13830008e17babca') depends_on('py-mpmath', when='@1.0:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 38ccc07a483f7c9a7206f3733d0c6a626b01bea5 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Wed, 6 Jun 2018 13:58:20 +0200 Subject: py-theano: added version 1.0.2 (#8400) --- var/spack/repos/builtin/packages/py-theano/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-theano/package.py b/var/spack/repos/builtin/packages/py-theano/package.py index 3648ce687f..b973065a21 100644 --- a/var/spack/repos/builtin/packages/py-theano/package.py +++ b/var/spack/repos/builtin/packages/py-theano/package.py @@ -32,6 +32,7 @@ class PyTheano(PythonPackage): homepage = "http://deeplearning.net/software/theano/" url = "https://pypi.io/packages/source/T/Theano/Theano-0.8.2.tar.gz" + version('1.0.2', 'fcae24dfa76babe15f5f3c556d67c9f2') version('1.0.1', 'a38b36c0fdc3126c574163db0a253e69') version('0.8.2', 'f2d0dfe7df141115201077cd933b2c52') version('master', git='https://github.com/Theano/Theano.git', branch='master') -- cgit v1.2.3-70-g09d2 From 891a15f4090e1989d43455a1fb1f3a505d139e9b Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Wed, 6 Jun 2018 14:41:48 +0200 Subject: py-scikit-learn: added version 0.19.1 and updated dependencies (#8399) py-numpy: added version 1.14.3 py-scipy: added version 1.1.0 --- var/spack/repos/builtin/packages/py-numpy/package.py | 1 + var/spack/repos/builtin/packages/py-scikit-learn/package.py | 1 + var/spack/repos/builtin/packages/py-scipy/package.py | 1 + 3 files changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-numpy/package.py b/var/spack/repos/builtin/packages/py-numpy/package.py index 42cc6be231..b4c738fa68 100644 --- a/var/spack/repos/builtin/packages/py-numpy/package.py +++ b/var/spack/repos/builtin/packages/py-numpy/package.py @@ -48,6 +48,7 @@ class PyNumpy(PythonPackage): # FIXME: numpy._build_utils and numpy.core.code_generators failed to import # FIXME: Is this expected? + version('1.14.3', '97416212c0a172db4bc6b905e9c4634b') version('1.14.2', '080f01a19707cf467393e426382c7619') version('1.14.1', 'b8324ef90ac9064cd0eac46b8b388674') version('1.14.0', 'c12d4bf380ac925fcdc8a59ada6c3298') diff --git a/var/spack/repos/builtin/packages/py-scikit-learn/package.py b/var/spack/repos/builtin/packages/py-scikit-learn/package.py index 9df4f1ae5d..652aeed709 100644 --- a/var/spack/repos/builtin/packages/py-scikit-learn/package.py +++ b/var/spack/repos/builtin/packages/py-scikit-learn/package.py @@ -31,6 +31,7 @@ class PyScikitLearn(PythonPackage): homepage = "https://pypi.python.org/pypi/scikit-learn" url = "https://pypi.io/packages/source/s/scikit-learn/scikit-learn-0.18.1.tar.gz" + version('0.19.1', 'b67143988c108862735a96cf2b1e827a') version('0.18.1', '6b0ff1eaa5010043895dd63d1e3c60c9') version('0.15.2', 'd9822ad0238e17b382a3c756ea94fe0d') version('0.16.1', '363ddda501e3b6b61726aa40b8dbdb7e') diff --git a/var/spack/repos/builtin/packages/py-scipy/package.py b/var/spack/repos/builtin/packages/py-scipy/package.py index b26ac618e7..cdcd886ecc 100644 --- a/var/spack/repos/builtin/packages/py-scipy/package.py +++ b/var/spack/repos/builtin/packages/py-scipy/package.py @@ -49,6 +49,7 @@ class PyScipy(PythonPackage): 'scipy.special._precompute' ] + version('1.1.0', 'aa6bcc85276b6f25e17bcfc4dede8718') version('1.0.0', '53fa34bd3733a9a4216842b6000f7316') # See https://github.com/spack/spack/issues/2737 version('0.19.1', '6b4d91b62f1926282b127194a06b72b3', -- cgit v1.2.3-70-g09d2 From 6cc4ad4caa03ce826d295a4cd2b2fde12484515b Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Wed, 6 Jun 2018 14:59:53 +0200 Subject: py-mpmath: added version 1.0.0 (#8382) * py-mpmath: added version 1.0.0 * Fixed checksum for version 0.19 --- var/spack/repos/builtin/packages/py-mpmath/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-mpmath/package.py b/var/spack/repos/builtin/packages/py-mpmath/package.py index a011891c87..1076c63d63 100644 --- a/var/spack/repos/builtin/packages/py-mpmath/package.py +++ b/var/spack/repos/builtin/packages/py-mpmath/package.py @@ -28,6 +28,7 @@ from spack import * class PyMpmath(PythonPackage): """A Python library for arbitrary-precision floating-point arithmetic.""" homepage = "http://mpmath.org" - url = "https://pypi.io/packages/source/m/mpmath/mpmath-all-0.19.tar.gz" + url = "https://pypi.io/packages/source/m/mpmath/mpmath-1.0.0.tar.gz" - version('0.19', 'd1b7e19dd6830d0d7b5e1bc93d46c02c') + version('1.0.0', '998f10cb231af62743212ca80693f1b5') + version('0.19', 'af5cc956b2673b33a25c3e57299bae7b') -- cgit v1.2.3-70-g09d2 From b0b3b258c0f237d369d6882f1d0362cc3f7c534b Mon Sep 17 00:00:00 2001 From: Sheng Di Date: Wed, 6 Jun 2018 07:02:03 -0600 Subject: add 1.4.13.4 for SZ (#8375) * add 1.4.13.4 for SZ * undo spack link (change llnl/spack to spack/spack) and change .zip to .tar.gz * revise package.py for SZ 1.4.13.4 based on Adam's comments. --- var/spack/repos/builtin/packages/sz/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sz/package.py b/var/spack/repos/builtin/packages/sz/package.py index c84c753788..3569d4632d 100644 --- a/var/spack/repos/builtin/packages/sz/package.py +++ b/var/spack/repos/builtin/packages/sz/package.py @@ -30,10 +30,11 @@ class Sz(AutotoolsPackage): """Error-bounded Lossy Compressor for HPC Data.""" homepage = "https://collab.cels.anl.gov/display/ESR/SZ" - url = "https://github.com/disheng222/SZ/archive/v1.4.11.0.tar.gz" + url = "https://github.com/disheng222/SZ/archive/v1.4.13.4.tar.gz" version('develop', git='https://github.com/disheng222/SZ.git', branch='master') + version('1.4.13.4', '1c47170a9eebeadbf0f7e9b675d68d76') version('1.4.12.3', '5f51be8530cdfa5280febb410ac6dd94') version('1.4.11.0', '10dee28b3503821579ce35a50e352cc6') version('1.4.10.0', '82e23dc5a51bcce1f70ba7e3b68a5965') -- cgit v1.2.3-70-g09d2 From 7c1231e7f8543807d9c53d5314edfda686f8d8ca Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Wed, 6 Jun 2018 08:03:23 -0500 Subject: r-splitstackshape: Create new package. (#8370) * r-splitstackshape: Create new package. * r-splitstackshape: Add version constraints. * add list_url and change dependency type. --- .../builtin/packages/r-splitstackshape/package.py | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-splitstackshape/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-splitstackshape/package.py b/var/spack/repos/builtin/packages/r-splitstackshape/package.py new file mode 100644 index 0000000000..cc69acf81d --- /dev/null +++ b/var/spack/repos/builtin/packages/r-splitstackshape/package.py @@ -0,0 +1,47 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RSplitstackshape(RPackage): + """Stack and Reshape Datasets After Splitting Concatenated Values. + + Online data collection tools like Google Forms often export + multiple-response questions with data concatenated in cells. The + concat.split (cSplit) family of functions splits such data into + separate cells. The package also includes functions to stack groups + of columns and to reshape wide data, even when the data are + "unbalanced" something which reshape (from base R) does not handle, + and which melt and dcast from reshape2 do not easily handle. + """ + + homepage = "http://github.com/mrdwab/splitstackshape" + url = "https://cran.r-project.org/src/contrib/splitstackshape_1.4.4.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/splitstackshape" + + version('1.4.4', '54d2554fe92dfc4670a000b45baacc28') + + depends_on('r-data-table@1.9.4:', type=('build', 'run')) + depends_on('r@2.10:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From c86628880f2c19d43942721b654126b0c8bde085 Mon Sep 17 00:00:00 2001 From: Andrey Prokopenko Date: Wed, 6 Jun 2018 09:04:33 -0400 Subject: Trilinos update (#8363) * trilinos: add more package conflicts This was done by putting in required lib dependencies from each package's `cmake/Dependencies.cmake`. * trilinos: added few more trilinos packages * trilinos: hiccup fix --- .../repos/builtin/packages/trilinos/package.py | 80 ++++++++++++++++++++-- 1 file changed, 75 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 21cae3a7a9..83032de1d2 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -147,22 +147,36 @@ class Trilinos(CMakePackage): description='Enable Intrepid') variant('intrepid2', default=False, description='Enable Intrepid2') + variant('isorropia', default=False, + description='Compile with Isorropia') variant('kokkos', default=True, description='Compile with Kokkos') variant('ml', default=True, description='Compile with ML') + variant('minitensor', default=False, + description='Compile with MiniTensor') variant('muelu', default=True, description='Compile with Muelu') variant('nox', default=False, - description='Enable NOX') + description='Compile with NOX') + variant('piro', default=False, + description='Compile with Piro') + variant('phalanx', default=False, + description='Compile with Phalanx') variant('rol', default=False, - description='Enable ROL') + description='Compile with ROL') + variant('rythmos', default=False, + description='Compile with Rythmos') variant('sacado', default=True, description='Compile with Sacado') variant('stk', default=False, description='Compile with STK') variant('shards', default=False, - description='Enable Shards') + description='Compile with Shards') + variant('teko', default=False, + description='Compile with Teko') + variant('tempus', default=False, + description='Compile with Tempus') variant('teuchos', default=True, description='Compile with Teuchos') variant('tpetra', default=True, @@ -189,11 +203,53 @@ class Trilinos(CMakePackage): placement='packages/ForTrilinos', when='+fortrilinos') - conflicts('+tpetra', when='~kokkos') - conflicts('+intrepid2', when='~kokkos') + conflicts('+amesos2', when='~teuchos') conflicts('+amesos2', when='~tpetra') + conflicts('+amesos', when='~epetra') + conflicts('+amesos', when='~teuchos') + conflicts('+anasazi', when='~teuchos') + conflicts('+belos', when='~teuchos') + conflicts('+epetraext', when='~epetra') + conflicts('+epetraext', when='~teuchos') + conflicts('+ifpack2', when='~belos') + conflicts('+ifpack2', when='~teuchos') conflicts('+ifpack2', when='~tpetra') + conflicts('+ifpack', when='~epetra') + conflicts('+ifpack', when='~teuchos') + conflicts('+intrepid2', when='~kokkos') + conflicts('+intrepid2', when='~shards') + conflicts('+intrepid2', when='~teuchos') + conflicts('+intrepid', when='~sacado') + conflicts('+intrepid', when='~shards') + conflicts('+intrepid', when='~teuchos') + conflicts('+isorropia', when='~epetra') + conflicts('+isorropia', when='~epetraext') + conflicts('+isorropia', when='~teuchos') + conflicts('+isorropia', when='~zoltan') + conflicts('+muelu', when='~teuchos') + conflicts('+muelu', when='~xpetra') + conflicts('+nox', when='~teuchos') + conflicts('+phalanx', when='~kokkos') + conflicts('+phalanx', when='~sacado') + conflicts('+phalanx', when='~teuchos') + conflicts('+piro', when='~teuchos') + conflicts('+rol', when='~teuchos') + conflicts('+rythmos', when='~teuchos') + conflicts('+teko', when='~amesos') + conflicts('+teko', when='~anasazi') + conflicts('+teko', when='~aztec') + conflicts('+teko', when='~ifpack') + conflicts('+teko', when='~ml') + conflicts('+teko', when='~teuchos') + conflicts('+teko', when='~tpetra') + conflicts('+tempus', when='~nox') + conflicts('+tempus', when='~teuchos') + conflicts('+tpetra', when='~kokkos') + conflicts('+tpetra', when='~teuchos') + conflicts('+zoltan2', when='~teuchos') conflicts('+zoltan2', when='~tpetra') + conflicts('+zoltan2', when='~xpetra') + conflicts('+zoltan2', when='~zoltan') conflicts('+dtk', when='~tpetra') conflicts('+fortrilinos', when='~fortran') @@ -322,22 +378,36 @@ class Trilinos(CMakePackage): 'ON' if '+intrepid' in spec else 'OFF'), '-DTrilinos_ENABLE_Intrepid2=%s' % ( 'ON' if '+intrepid2' in spec else 'OFF'), + '-DTrilinos_ENABLE_Isorropia=%s' % ( + 'ON' if '+isorropia' in spec else 'OFF'), '-DTrilinos_ENABLE_Kokkos:BOOL=%s' % ( 'ON' if '+kokkos' in spec else 'OFF'), + '-DTrilinos_ENABLE_MiniTensor=%s' % ( + 'ON' if '+minitensor' in spec else 'OFF'), '-DTrilinos_ENABLE_ML:BOOL=%s' % ( 'ON' if '+ml' in spec else 'OFF'), '-DTrilinos_ENABLE_MueLu:BOOL=%s' % ( 'ON' if '+muelu' in spec else 'OFF'), '-DTrilinos_ENABLE_NOX:BOOL=%s' % ( 'ON' if '+nox' in spec else 'OFF'), + '-DTrilinos_ENABLE_Piro:BOOL=%s' % ( + 'ON' if '+piro' in spec else 'OFF'), + '-DTrilinos_ENABLE_Phalanx=%s' % ( + 'ON' if '+phalanx' in spec else 'OFF'), '-DTrilinos_ENABLE_PyTrilinos:BOOL=%s' % ( 'ON' if '+python' in spec else 'OFF'), '-DTrilinos_ENABLE_ROL:BOOL=%s' % ( 'ON' if '+rol' in spec else 'OFF'), + '-DTrilinos_ENABLE_Rythmos=%s' % ( + 'ON' if '+rythmos' in spec else 'OFF'), '-DTrilinos_ENABLE_Sacado:BOOL=%s' % ( 'ON' if '+sacado' in spec else 'OFF'), '-DTrilinos_ENABLE_Shards=%s' % ( 'ON' if '+shards' in spec else 'OFF'), + '-DTrilinos_ENABLE_Teko=%s' % ( + 'ON' if '+teko' in spec else 'OFF'), + '-DTrilinos_ENABLE_Tempus=%s' % ( + 'ON' if '+tempus' in spec else 'OFF'), '-DTrilinos_ENABLE_Teuchos:BOOL=%s' % ( 'ON' if '+teuchos' in spec else 'OFF'), '-DTrilinos_ENABLE_Tpetra:BOOL=%s' % ( -- cgit v1.2.3-70-g09d2 From 6449f5bde73a58fe15b42eb30311e5042abba570 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 6 Jun 2018 17:12:47 +0200 Subject: ISAAC Server 1.3.3 (#8403) Forgot to bump this package with the library release. --- var/spack/repos/builtin/packages/isaac-server/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/isaac-server/package.py b/var/spack/repos/builtin/packages/isaac-server/package.py index f54f4dd989..4b534ae152 100644 --- a/var/spack/repos/builtin/packages/isaac-server/package.py +++ b/var/spack/repos/builtin/packages/isaac-server/package.py @@ -36,6 +36,7 @@ class IsaacServer(CMakePackage): git='https://github.com/ComputationalRadiationPhysics/isaac.git') version('master', branch='master', git='https://github.com/ComputationalRadiationPhysics/isaac.git') + version('1.3.3', '7aeebaf0c5a77e2cb9bea066750e369b') version('1.3.2', 'c557daa74de52fd79e734c9758fca38b') version('1.3.1', '7fe075f9af68d05355eaba0e224f20ca') version('1.3.0', 'c8a794da9bb998ef0e75449bfece1a12') -- cgit v1.2.3-70-g09d2 From e6d2cd6ff0dfc3583a4b8f223f899bd4e5a350a4 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 6 Jun 2018 17:33:31 +0200 Subject: numpy: nosetest (#8404) the type 'test' exists now :-) --- var/spack/repos/builtin/packages/py-numpy/package.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-numpy/package.py b/var/spack/repos/builtin/packages/py-numpy/package.py index b4c738fa68..54af4da6ae 100644 --- a/var/spack/repos/builtin/packages/py-numpy/package.py +++ b/var/spack/repos/builtin/packages/py-numpy/package.py @@ -72,9 +72,7 @@ class PyNumpy(PythonPackage): depends_on('blas', when='+blas') depends_on('lapack', when='+lapack') - # Tests require: - # TODO: Add a 'test' deptype - # depends_on('py-nose@1.0.0:', type='test') + depends_on('py-nose@1.0.0:', type='test') def setup_dependent_package(self, module, dependent_spec): python_version = self.spec['python'].version.up_to(2) -- cgit v1.2.3-70-g09d2 From 1a27f911d35a9f0cb90cf9a36eafffbc2c195d1d Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 6 Jun 2018 18:58:15 +0200 Subject: Fix ADIOS 1.13.1: Maxium SZ (#8408) Fix the maximum accepted SZ version for the latest ADIOS release. --- var/spack/repos/builtin/packages/adios/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/adios/package.py b/var/spack/repos/builtin/packages/adios/package.py index 2536ee8130..3fabaff020 100644 --- a/var/spack/repos/builtin/packages/adios/package.py +++ b/var/spack/repos/builtin/packages/adios/package.py @@ -98,8 +98,8 @@ class Adios(AutotoolsPackage): depends_on('bzip2', when='+bzip2') depends_on('szip', when='+szip') depends_on('sz@:1.4.10', when='@:1.12.0 +sz') - depends_on('sz@1.4.11.0:', when='@1.13.0 +sz') - depends_on('sz@1.4.12.3:', when='@1.13.1: +sz') + depends_on('sz@1.4.11.0:1.4.11.99', when='@1.13.0 +sz') + depends_on('sz@1.4.12.3:1.4.12.99', when='@1.13.1: +sz') depends_on('zfp@:0.5.0', when='+zfp') depends_on('lz4', when='+lz4') depends_on('c-blosc@1.12.0:', when='+blosc') -- cgit v1.2.3-70-g09d2 From 34149e9a2b7718d2e8e5d66db33d88b7f9bd9d61 Mon Sep 17 00:00:00 2001 From: Javier Cervantes Date: Wed, 6 Jun 2018 19:07:16 +0200 Subject: Add new package: prng (#8396) * Add new package: prng * Add missing dependencies and use force_autoreconf option * Add dependency types --- var/spack/repos/builtin/packages/prng/package.py | 45 +++++++ .../prng/prng-3.0.2-fix-c99-inline-semantics.patch | 146 +++++++++++++++++++++ .../builtin/packages/prng/prng-3.0.2-shared.patch | 52 ++++++++ 3 files changed, 243 insertions(+) create mode 100644 var/spack/repos/builtin/packages/prng/package.py create mode 100644 var/spack/repos/builtin/packages/prng/prng-3.0.2-fix-c99-inline-semantics.patch create mode 100644 var/spack/repos/builtin/packages/prng/prng-3.0.2-shared.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/prng/package.py b/var/spack/repos/builtin/packages/prng/package.py new file mode 100644 index 0000000000..2b1cde5ce2 --- /dev/null +++ b/var/spack/repos/builtin/packages/prng/package.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Prng(AutotoolsPackage): + """Pseudo-Random Number Generator library.""" + + homepage = "http://statmath.wu.ac.at/prng/" + url = "http://statmath.wu.ac.at/prng/prng-3.0.2.tar.gz" + + version('3.0.2', '80cb0870f2d18618bd2772f9e1dc1a70') + + depends_on('automake', type='build') + depends_on('autoconf', type='build') + depends_on('libtool', type='build') + depends_on('m4', type='build') + + patch('prng-3.0.2-shared.patch', when="@3.0.2") + patch('prng-3.0.2-fix-c99-inline-semantics.patch', when="@3.0.2") + + # Force the autoreconf step + force_autoreconf = True diff --git a/var/spack/repos/builtin/packages/prng/prng-3.0.2-fix-c99-inline-semantics.patch b/var/spack/repos/builtin/packages/prng/prng-3.0.2-fix-c99-inline-semantics.patch new file mode 100644 index 0000000000..c84a288d47 --- /dev/null +++ b/var/spack/repos/builtin/packages/prng/prng-3.0.2-fix-c99-inline-semantics.patch @@ -0,0 +1,146 @@ +Use portable 'static inline' semantics that work in GNU89 and C99 +See also: http://www.greenend.org.uk/rjk/tech/inline.html + +--- a/src/dicg.c ++++ b/src/dicg.c +@@ -441,7 +441,7 @@ + * Algorithm by Karin Schaber and Otmar Lendl. + * + */ +-inline prng_num prng_dicg_multiply(int k,prng_num c, prng_num d) ++prng_num prng_dicg_multiply(int k,prng_num c, prng_num d) + { + int i; + struct mtable *t; +--- a/src/external.c ++++ b/src/external.c +@@ -139,7 +139,7 @@ + * gen: Pointer to a struct prng. + * + */ +-inline prng_num prng_tt800_get_next_int(struct prng *gen) ++prng_num prng_tt800_get_next_int(struct prng *gen) + { + unsigned int y; + struct tt800_state *g; +--- a/src/icg.c ++++ b/src/icg.c +@@ -110,7 +110,7 @@ + * gen: Pointer to a struct prng. + * + */ +-inline prng_num prng_icg_get_next_int(struct prng *gen) ++prng_num prng_icg_get_next_int(struct prng *gen) + { + s_prng_num inv, current, prod; + +--- a/src/lcg.c ++++ b/src/lcg.c +@@ -111,7 +111,7 @@ + * gen: Pointer to a struct prng. + * + */ +-inline prng_num prng_lcg_get_next_int(struct prng *gen) ++prng_num prng_lcg_get_next_int(struct prng *gen) + { + s_prng_num ax, current; + +--- a/src/meicg.c ++++ b/src/meicg.c +@@ -106,7 +106,7 @@ + * gen: Pointer to a struct prng. + * + */ +-inline prng_num prng_meicg_get_next_int(struct prng *gen) ++prng_num prng_meicg_get_next_int(struct prng *gen) + { + s_prng_num an, sum, inv, n; + +--- a/src/mt19937.c ++++ b/src/mt19937.c +@@ -172,7 +172,7 @@ + * gen: Pointer to a struct prng. + * + */ +-inline prng_num prng_mt19937_get_next_int(struct prng *gen) ++prng_num prng_mt19937_get_next_int(struct prng *gen) + { + #define MT gen->data.mt19937_data.mt + #define MTI gen->data.mt19937_data.mti +--- a/src/prng.h ++++ b/src/prng.h +@@ -406,7 +406,7 @@ + /* INLINE fnk def. for mult_mod, I don't know if this works for non-GCC */ + + #ifdef __GNUC__ +-extern __inline__ prng_num mult_mod(prng_num s,struct mult_mod_struct *mm) ++static inline prng_num mult_mod(prng_num s,struct mult_mod_struct *mm) + { + s_prng_num s_tmp; + +--- a/src/qcg.c ++++ b/src/qcg.c +@@ -107,7 +107,7 @@ + * gen: Pointer to a struct prng. + * + */ +-inline prng_num prng_qcg_get_next_int(struct prng *gen) ++prng_num prng_qcg_get_next_int(struct prng *gen) + { + s_prng_num current, sum, square, q_term, l_term; + +--- a/src/support.c ++++ b/src/support.c +@@ -449,52 +449,6 @@ + } + } + +-#ifndef __cplusplus +-/* +- * Modular Multiplication. Uses the precalculated values from mult_mod_setup. +- * +- * +- * Input: +- * s An prng_num. +- * mm pointer to a struct mult_mod_struct initialized +- * by mult_mod_setup. +- * +- * Output: +- * (mm->a*s) mod mm->p +- * +- */ +-prng_num mult_mod(prng_num s,struct mult_mod_struct *mm) +-{ +-s_prng_num s_tmp; +- +-switch(mm->algorithm) +- { +- case PRNG_MM_ZERO: return(0); +- break; +- case PRNG_MM_ONE: return(s); +- break; +- case PRNG_MM_SIMPLE: return((s * mm->a) % mm->p ); +- break; +- case PRNG_MM_SCHRAGE: +- s_tmp = mm->a * ( s % mm->q ) - +- mm->r * ( s / mm->q ); +- if (s_tmp < 0) s_tmp += mm->p; +- return(s_tmp); +- break; +- case PRNG_MM_DECOMP: return(mult_mod_generic(s,mm->a,mm->p)); +- break; +-#ifdef HAVE_LONGLONG +- case PRNG_MM_LL: return(mult_mod_ll(s,mm->a,mm->p)); +- break; +-#endif +- case PRNG_MM_POW2: return((s*mm->a) & mm->mask); +- break; +- } +-/* not reached */ +-return(0); +-} +-#endif +- + + /* + * Modular Multiplication: Decomposition method (from L'Ecuyer & Cote) diff --git a/var/spack/repos/builtin/packages/prng/prng-3.0.2-shared.patch b/var/spack/repos/builtin/packages/prng/prng-3.0.2-shared.patch new file mode 100644 index 0000000000..cee8de060f --- /dev/null +++ b/var/spack/repos/builtin/packages/prng/prng-3.0.2-shared.patch @@ -0,0 +1,52 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -23,6 +23,7 @@ + AC_PROG_RANLIB + AC_PROG_INSTALL + AC_PROG_LN_S ++AC_PROG_LIBTOOL + + dnl Checks for typedefs, structures, and compiler characteristics. + AC_C_CONST +@@ -39,10 +40,7 @@ + dnl Checks for library functions. + AC_CHECK_FUNCS(strtoul) + +-dnl Set flags for compiler +-if test X"$GCC" = Xyes ; then +- AC_SUBST(AM_CFLAGS,"-Wall -fomit-frame-pointer") +-fi ++AC_CHECK_LIB([m], [pow]) + + AC_CONFIG_FILES([\ + Makefile \ +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -1,11 +1,11 @@ + ## Process this file with automake to produce Makefile.in + # $Id$ + +-LDADD = $(top_builddir)/src/libprng.a -lm ++LDADD = $(top_builddir)/src/libprng.la -lm + + INCLUDES = -I$(top_srcdir)/src + +-noinst_PROGRAMS = pairs tuples ++check_PROGRAMS = pairs tuples + + # clean backup files + CLEANFILES = *~ +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -3,9 +3,9 @@ + + INCLUDES = + +-lib_LIBRARIES = libprng.a ++lib_LTLIBRARIES = libprng.la + +-libprng_a_SOURCES = \ ++libprng_la_SOURCES = \ + prng.c \ + dicg.c \ + eicg.c \ -- cgit v1.2.3-70-g09d2 From d1d731bf837c66863e80cda73c0e3a811fd1f191 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 6 Jun 2018 19:10:34 +0200 Subject: xsimd: test type (#8405) Add the new type 'test` to the `googletest` dependency of xsimd. --- var/spack/repos/builtin/packages/xsimd/package.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/xsimd/package.py b/var/spack/repos/builtin/packages/xsimd/package.py index 6240c38a05..e08eab8606 100644 --- a/var/spack/repos/builtin/packages/xsimd/package.py +++ b/var/spack/repos/builtin/packages/xsimd/package.py @@ -37,10 +37,18 @@ class Xsimd(CMakePackage): version('4.0.0', '4186ec94985daa3fc284d9d0d4aa03e8') version('3.1.0', '29c1c525116cbda28f610e2bf24a827e') - depends_on('googletest', type='build') + depends_on('googletest', type='test') # C++14 support conflicts('%gcc@:4.8') conflicts('%clang@:3.6') # untested: conflicts('%intel@:15') # untested: conflicts('%pgi@:14') + + def cmake_args(self): + args = [ + '-DBUILD_TESTS:BOOL={0}'.format( + 'ON' if self.run_tests else 'OFF') + ] + + return args -- cgit v1.2.3-70-g09d2 From 8b261506cb71fda70187677a285e434f84f55840 Mon Sep 17 00:00:00 2001 From: Javier Cervantes Date: Wed, 6 Jun 2018 19:10:56 +0200 Subject: Add new package: rngstreams (#8395) * Add new package: rngstreams * Remove unnecessary list_url --- .../repos/builtin/packages/rngstreams/package.py | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 var/spack/repos/builtin/packages/rngstreams/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/rngstreams/package.py b/var/spack/repos/builtin/packages/rngstreams/package.py new file mode 100644 index 0000000000..b6a60acae0 --- /dev/null +++ b/var/spack/repos/builtin/packages/rngstreams/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Rngstreams(AutotoolsPackage): + """Multiple independent streams of pseudo-random numbers.""" + + homepage = "http://statmath.wu.ac.at/software/RngStreams" + url = "http://statmath.wu.ac.at/software/RngStreams/rngstreams-1.0.1.tar.gz" + + version('1.0.1', '6d9d842247cd1d4e9e60440406858a69') -- cgit v1.2.3-70-g09d2 From 0495b5474b4595849fea92e518a2971941c2cd20 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 6 Jun 2018 22:38:36 +0200 Subject: ADIOS: Serial API with Parallel Lib (#8409) Provides a patch for the fix in https://github.com/ornladios/ADIOS/pull/182 Installed ADIOS MPI-enabled libraries are with that able to also perform serial I/O without the need to start the whole app via `mpiexec`. --- var/spack/repos/builtin/packages/adios/nompi.patch | 16 ++++++++++++++++ var/spack/repos/builtin/packages/adios/package.py | 3 +++ 2 files changed, 19 insertions(+) create mode 100644 var/spack/repos/builtin/packages/adios/nompi.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/adios/nompi.patch b/var/spack/repos/builtin/packages/adios/nompi.patch new file mode 100644 index 0000000000..2d00b29924 --- /dev/null +++ b/var/spack/repos/builtin/packages/adios/nompi.patch @@ -0,0 +1,16 @@ +diff --git a/src/core/adios_internals_mxml.c b/src/core/adios_internals_mxml.c +index 513fd45c..b9296050 100644 +--- a/src/core/adios_internals_mxml.c ++++ b/src/core/adios_internals_mxml.c +@@ -2173,8 +2173,9 @@ int adios_parse_config (const char * config, MPI_Comm comm) + char * buffer = NULL; + //#if HAVE_MPI + int buffer_size = 0; +- int rank; +- MPI_Comm_rank (comm, &rank); ++ int rank = 0; ++ if (comm != MPI_COMM_NULL) ++ MPI_Comm_rank (comm, &rank); + init_comm = comm; + if (rank == 0) + { diff --git a/var/spack/repos/builtin/packages/adios/package.py b/var/spack/repos/builtin/packages/adios/package.py index 3fabaff020..2ebd1c31e1 100644 --- a/var/spack/repos/builtin/packages/adios/package.py +++ b/var/spack/repos/builtin/packages/adios/package.py @@ -121,6 +121,9 @@ class Adios(AutotoolsPackage): # https://github.com/ornladios/ADIOS/commit/3b21a8a41509 # https://github.com/spack/spack/issues/1683 patch('adios_1100.patch', when='@:1.10.0^hdf5@1.10:') + # Fix ADIOS <=1.13.1 serial compile against parallel library + # https://github.com/ornladios/ADIOS/pull/182 + patch('nompi.patch', when='@1.10.0:1.13.1') def validate(self, spec): """Checks if incompatible variants have been activated at the same time -- cgit v1.2.3-70-g09d2 From 5c3adff49b3bb65296e84aeffbfb86eb9ff6dc1d Mon Sep 17 00:00:00 2001 From: ynanyam <31993194+ynanyam@users.noreply.github.com> Date: Wed, 6 Jun 2018 16:18:03 -0500 Subject: libjpeg-turbo: updated checksums and added autoreconf for older versions (#8411) --- var/spack/repos/builtin/packages/libjpeg-turbo/package.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libjpeg-turbo/package.py b/var/spack/repos/builtin/packages/libjpeg-turbo/package.py index 543e87d81a..a8dfb64d47 100644 --- a/var/spack/repos/builtin/packages/libjpeg-turbo/package.py +++ b/var/spack/repos/builtin/packages/libjpeg-turbo/package.py @@ -35,9 +35,9 @@ class LibjpegTurbo(Package): url = "https://github.com/libjpeg-turbo/libjpeg-turbo/archive/1.5.90.tar.gz" version('1.5.90', '85f7f9c377b70cbf48e61726097d4efa') - version('1.5.3', '7c82f0f6a3130ec06b8a4d0b321cbca3') - version('1.5.0', '3fc5d9b6a8bce96161659ae7a9939257') - version('1.3.1', '2c3a68129dac443a72815ff5bb374b05') + version('1.5.3', '5b7549d440b86c98a517355c102d155e') + version('1.5.0', 'eff98ac84de05eafc65ae96caa6e23e9') + version('1.3.1', '5e4bc19c3cb602bcab1296b9bee5124c') provides('jpeg') @@ -47,14 +47,18 @@ class LibjpegTurbo(Package): # TODO: Implement the selection between two supported assemblers. # depends_on("yasm", type='build') depends_on("nasm", type='build') + depends_on('autoconf', type='build', when="@1.3.1:1.5.3") + depends_on('automake', type='build', when="@1.3.1:1.5.3") + depends_on('libtool', type='build', when="@1.3.1:1.5.3") depends_on('cmake', type='build', when="@1.5.90:") @property def libs(self): return find_libraries("libjpeg*", root=self.prefix, recursive=True) - @when('@:1.5.3') + @when('@1.3.1:1.5.3') def install(self, spec, prefix): + autoreconf('-ifv') configure('--prefix=%s' % prefix) make() make('install') -- cgit v1.2.3-70-g09d2 From 2c13e9c0e5a085563b51e904fcb2ee25004f8057 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Wed, 6 Jun 2018 17:44:32 -0500 Subject: r-mitml: new package and its dependencies r-jomo and r-pan (#8412) --- var/spack/repos/builtin/packages/r-jomo/package.py | 44 ++++++++++++++++++++++ .../repos/builtin/packages/r-mitml/package.py | 41 ++++++++++++++++++++ var/spack/repos/builtin/packages/r-pan/package.py | 35 +++++++++++++++++ 3 files changed, 120 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-jomo/package.py create mode 100644 var/spack/repos/builtin/packages/r-mitml/package.py create mode 100644 var/spack/repos/builtin/packages/r-pan/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-jomo/package.py b/var/spack/repos/builtin/packages/r-jomo/package.py new file mode 100644 index 0000000000..f63a88be6b --- /dev/null +++ b/var/spack/repos/builtin/packages/r-jomo/package.py @@ -0,0 +1,44 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RJomo(RPackage): + """Similarly to Schafer's package 'pan', 'jomo' is a package for multilevel + joint modelling multiple imputation (Carpenter and Kenward, 2013) + . Novel aspects of 'jomo' are the possibility of + handling binary and categorical data through latent normal variables, the + option to use cluster-specific covariance matrices and to impute compatibly + with the substantive model. + """ + + homepage = "https://cran.r-project.org/package=jomo" + url = "https://cran.r-project.org/src/contrib/jomo_2.6-2.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/jomo" + + version('2.6-2', 'eff4a6c1a971708959d65b3224c98a25') + + depends_on('r-lme4', type=('build', 'run')) + depends_on('r-survival', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-mitml/package.py b/var/spack/repos/builtin/packages/r-mitml/package.py new file mode 100644 index 0000000000..08d506e8ce --- /dev/null +++ b/var/spack/repos/builtin/packages/r-mitml/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RMitml(RPackage): + """Provides tools for multiple imputation of missing data in multilevel + modeling. Includes a user-friendly interface to the packages 'pan' and + 'jomo', and several functions for visualization, data management and the + analysis of multiply imputed data sets.""" + + homepage = "https://cran.r-project.org/package=mitml" + url = "https://cran.r-project.org/src/contrib/mitml_0.3-5.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/mitml" + version('0.3-5', '6f8659c33696915bf510241287b2a34d') + + depends_on('r-pan', type=('build', 'run')) + depends_on('r-jomo', type=('build', 'run')) + depends_on('r-haven', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-pan/package.py b/var/spack/repos/builtin/packages/r-pan/package.py new file mode 100644 index 0000000000..00db43e28d --- /dev/null +++ b/var/spack/repos/builtin/packages/r-pan/package.py @@ -0,0 +1,35 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RPan(RPackage): + """Multiple imputation for multivariate panel or clustered data.""" + + homepage = "https://cran.r-project.org/package=pan" + url = "https://cran.r-project.org/src/contrib/pan_1.4.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/pan" + + version('1.4', 'cdead963110561fc42dc544a60ac44ed') -- cgit v1.2.3-70-g09d2 From 8e161f1034ca44a601bb0759a0291d5bcab48798 Mon Sep 17 00:00:00 2001 From: Sheng Di Date: Wed, 6 Jun 2018 16:44:47 -0600 Subject: remove pwrType from the interface SZ_compress_args() (#8414) --- var/spack/repos/builtin/packages/sz/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sz/package.py b/var/spack/repos/builtin/packages/sz/package.py index 3569d4632d..149a29e14f 100644 --- a/var/spack/repos/builtin/packages/sz/package.py +++ b/var/spack/repos/builtin/packages/sz/package.py @@ -30,10 +30,11 @@ class Sz(AutotoolsPackage): """Error-bounded Lossy Compressor for HPC Data.""" homepage = "https://collab.cels.anl.gov/display/ESR/SZ" - url = "https://github.com/disheng222/SZ/archive/v1.4.13.4.tar.gz" + url = "https://github.com/disheng222/SZ/archive/v1.4.13.5.tar.gz" version('develop', git='https://github.com/disheng222/SZ.git', branch='master') + version('1.4.13.5', 'a2f6147c3c74d74c938dd17d914a4cb8') version('1.4.13.4', '1c47170a9eebeadbf0f7e9b675d68d76') version('1.4.12.3', '5f51be8530cdfa5280febb410ac6dd94') version('1.4.11.0', '10dee28b3503821579ce35a50e352cc6') -- cgit v1.2.3-70-g09d2 From 728351faaef3b3db29d9bdfde55d2ee07a683c3b Mon Sep 17 00:00:00 2001 From: Javier Cervantes Date: Thu, 7 Jun 2018 01:54:07 +0200 Subject: Add new package: davix (#8376) * Add new package: davix * Add list_url * Remove extra spaces, add list_depth and specify dependency type --- .../builtin/packages/davix/davix-0.6.7-uuid.patch | 66 ++++++++++++++++++++++ var/spack/repos/builtin/packages/davix/package.py | 43 ++++++++++++++ 2 files changed, 109 insertions(+) create mode 100644 var/spack/repos/builtin/packages/davix/davix-0.6.7-uuid.patch create mode 100644 var/spack/repos/builtin/packages/davix/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/davix/davix-0.6.7-uuid.patch b/var/spack/repos/builtin/packages/davix/davix-0.6.7-uuid.patch new file mode 100644 index 0000000000..97d56315ca --- /dev/null +++ b/var/spack/repos/builtin/packages/davix/davix-0.6.7-uuid.patch @@ -0,0 +1,66 @@ +--- + cmake/modules/Finduuid.cmake | 48 +++++++++++++++++------------------- + 1 file changed, 22 insertions(+), 26 deletions(-) + +diff --git a/cmake/modules/Finduuid.cmake b/cmake/modules/Finduuid.cmake +index 2f97a1f..e2c7d13 100644 +--- a/cmake/modules/Finduuid.cmake ++++ b/cmake/modules/Finduuid.cmake +@@ -1,32 +1,28 @@ +-# Try to find uuid +-# Once done, this will define +-# +-# UUID_FOUND - system has uuid +-# UUID_INCLUDE_DIRS - uuid include directories +-# UUID_LIBRARIES - libraries needed to use uuid +- ++include(CheckCXXSymbolExists) ++include(CheckLibraryExists) + include(FindPackageHandleStandardArgs) + +-if(UUID_INCLUDE_DIRS AND UUID_LIBRARIES) +- set(UUID_FIND_QUIETLY TRUE) +-else() +- find_path( +- UUID_INCLUDE_DIR +- NAMES uuid.h +- HINTS ${UUID_ROOT_DIR} +- PATH_SUFFIXES include uuid) +- +- find_library( +- UUID_LIBRARY +- NAMES uuid +- HINTS ${UUID_ROOT_DIR} +- PATH_SUFFIXES ${LIBRARY_PATH_PREFIX}) ++if(NOT UUID_INCLUDE_DIR) ++ find_path(UUID_INCLUDE_DIR uuid/uuid.h) ++endif() + ++if(EXISTS UUID_INCLUDE_DIR) + set(UUID_INCLUDE_DIRS ${UUID_INCLUDE_DIR}) +- set(UUID_LIBRARIES ${UUID_LIBRARY}) +- +- find_package_handle_standard_args( +- uuid DEFAULT_MSG UUID_LIBRARY UUID_INCLUDE_DIR) ++ set(CMAKE_REQUIRED_INCLUDES ${UUID_INCLUDE_DIRS}) ++ check_cxx_symbol_exists("uuid_generate_random" "uuid/uuid.h" _uuid_header_only) ++endif() + +- mark_as_advanced(UUID_INCLUDE_DIR UUID_LIBRARY) ++if(NOT _uuid_header_only AND NOT UUID_LIBRARY) ++ check_library_exists("uuid" "uuid_generate_random" "" _have_libuuid) ++ if(_have_libuuid) ++ set(UUID_LIBRARY "uuid") ++ set(UUID_LIBRARIES ${UUID_LIBRARY}) ++ endif() + endif() ++ ++unset(CMAKE_REQUIRED_INCLUDES) ++unset(_uuid_header_only) ++unset(_have_libuuid) ++ ++find_package_handle_standard_args(uuid DEFAULT_MSG UUID_INCLUDE_DIR) ++mark_as_advanced(UUID_INCLUDE_DIR UUID_LIBRARY) +-- +2.17.0 + diff --git a/var/spack/repos/builtin/packages/davix/package.py b/var/spack/repos/builtin/packages/davix/package.py new file mode 100644 index 0000000000..c9bcde74ce --- /dev/null +++ b/var/spack/repos/builtin/packages/davix/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Davix(CMakePackage): + """High-performance file management over WebDAV/HTTP.""" + + homepage = "https://dmc.web.cern.ch/projects/davix" + url = "http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/0.6.7/davix-0.6.7.tar.gz" + list_url = "http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/" + list_depth = 1 + + version('0.6.7', 'f811647d924a6dc5852c92110359ed91') + + depends_on('pkgconfig', type='build') + depends_on('libxml2') + depends_on('libuuid') + depends_on('openssl') + + patch('davix-0.6.7-uuid.patch', when="@0.6.7") -- cgit v1.2.3-70-g09d2 From 7e649c1205f2ad22ebf8292e8c8ac83a214c425a Mon Sep 17 00:00:00 2001 From: healther Date: Thu, 7 Jun 2018 15:10:39 +0200 Subject: add package py-cartopy and dependencies (#8406) * add package py-cartopy Change-Id: Ifbe541e852921c384a381594a2c1110814556311 * fix comments and flake8 Change-Id: I8d5e994580e8252e00654e68ad79d74e06089939 * remove pip dependency... not sure why added in the first place Change-Id: Ie2a788887dac30778cc43931a0732980a347514d * move build, link, run to default dependencies Change-Id: I1ec0cb7dc4a697c4ca9e68a0cc0d8694cc21c100 --- .../repos/builtin/packages/py-cartopy/package.py | 63 ++++++++++++++++++++++ .../repos/builtin/packages/py-owslib/package.py | 42 +++++++++++++++ .../repos/builtin/packages/py-pyepsg/package.py | 37 +++++++++++++ .../repos/builtin/packages/py-pyshp/package.py | 37 +++++++++++++ .../repos/builtin/packages/py-shapely/package.py | 45 ++++++++++++++++ 5 files changed, 224 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-cartopy/package.py create mode 100644 var/spack/repos/builtin/packages/py-owslib/package.py create mode 100644 var/spack/repos/builtin/packages/py-pyepsg/package.py create mode 100644 var/spack/repos/builtin/packages/py-pyshp/package.py create mode 100644 var/spack/repos/builtin/packages/py-shapely/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-cartopy/package.py b/var/spack/repos/builtin/packages/py-cartopy/package.py new file mode 100644 index 0000000000..7e5da81848 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-cartopy/package.py @@ -0,0 +1,63 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyCartopy(PythonPackage): + """Cartopy - a cartographic python library with matplotlib support.""" + + homepage = "http://scitools.org.uk/cartopy/" + url = "https://github.com/SciTools/cartopy/archive/v0.16.0.tar.gz" + + version('0.16.0', 'f9e2e528d7758da7c64f824548a53f32') + + depends_on('py-setuptools@0.7.2:', type='build') + depends_on('py-cython@0.15.1:', type='build') + depends_on('py-numpy@1.10.0:', type=('build', 'run')) + depends_on('py-shapely@1.5.6:', type=('build', 'run')) + depends_on('py-pyshp@1.1.4:', type=('build', 'run')) + depends_on('py-six@1.3.0:', type=('build', 'run')) + depends_on('geos@3.3.3:') + depends_on('proj@4.9.0:') + + # optional dependecies + depends_on('py-matplotlib@1.5.1:', type=('build', 'run')) + depends_on('gdal@1.10.0:+python', type=('build', 'run')) + depends_on('py-pillow@1.7.8:', type=('build', 'run')) + depends_on('py-pyepsg@0.2.0:', type=('build', 'run')) + depends_on('py-scipy@0.10:', type=('build', 'run')) + depends_on('py-owslib@0.8.11:', type=('build', 'run')) + + # testing dependencies + depends_on('py-mock@1.0.1', type='test') + depends_on('py-pytest@3.0.0:', type='test') + + phases = ['build_ext', 'install'] + + def build_ext_args(self, spec, prefix): + args = ['-I{0}'.format(spec['proj'].prefix.include), + '-L{0}'.format(spec['proj'].prefix.lib) + ] + return args diff --git a/var/spack/repos/builtin/packages/py-owslib/package.py b/var/spack/repos/builtin/packages/py-owslib/package.py new file mode 100644 index 0000000000..d4e70e1444 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-owslib/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyOwslib(PythonPackage): + """OWSLib is a Python package for client programming with Open Geospatial + Consortium (OGC) web service (hence OWS) interface standards, and their + related content models.""" + + homepage = "http://http://geopython.github.io/OWSLib/#installation" + url = "https://pypi.io/packages/source/O/OWSLib/OWSLib-0.16.0.tar.gz" + + version('0.16.0', '7ff9c9edde95eadeb27ea8d8fbd1a2cf') + + depends_on('py-setuptools', type='build') + depends_on('py-dateutil@1.5:', type=('build', 'run')) + depends_on('py-pytz', type=('build', 'run')) + depends_on('py-requests@1.0:', type=('build', 'run')) + depends_on('py-proj', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pyepsg/package.py b/var/spack/repos/builtin/packages/py-pyepsg/package.py new file mode 100644 index 0000000000..b91f1671ce --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pyepsg/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPyepsg(PythonPackage): + """Provides simple access to http://epsg.io/.""" + + homepage = "https://pyepsg.readthedocs.io/en/latest/" + url = "https://pypi.io/packages/source/p/pyepsg/pyepsg-0.3.2.tar.gz" + + version('0.3.2', 'b0644187068a9b58378a5c58ad55b991') + + depends_on('py-setuptools', type='build') + depends_on('py-requests', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pyshp/package.py b/var/spack/repos/builtin/packages/py-pyshp/package.py new file mode 100644 index 0000000000..7c4b7b5ada --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pyshp/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPyshp(PythonPackage): + """The Python Shapefile Library (pyshp) reads and writes ESRI Shapefiles in + pure Python.""" + + homepage = "https://github.com/GeospatialPython/pyshp" + url = "https://pypi.io/packages/source/p/pyshp/pyshp-1.2.12.tar.gz" + + version('1.2.12', '63d33d151ac308f1db71ea0f22c30d8b') + + depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-shapely/package.py b/var/spack/repos/builtin/packages/py-shapely/package.py new file mode 100644 index 0000000000..0f14934738 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-shapely/package.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyShapely(PythonPackage): + """Manipulation and analysis of geometric objects in the Cartesian plane. + """ + + homepage = "https://github.com/Toblerity/Shapely" + url = "https://pypi.io/packages/source/S/Shapely/Shapely-1.6.4.tar.gz" + + version('1.6.4', '7581ef2d0fb346f9ed157f3efc75f6a4') + + depends_on('python@2.6.0:2.8,3.4.0:', type=('build', 'run')) + depends_on('py-setuptools', type='build') + depends_on('py-cython@0.19:', type='build') + depends_on('py-numpy@1.4.1:', type=('build', 'run')) + depends_on('geos@3.3:') + + def setup_environment(self, spack_env, run_env): + spack_env.set('GEOS_CONFIG', self.spec['geos'].prefix) + spack_env.prepend_path('LD_LIBRARY_PATH', self.spec['geos'].prefix.lib) -- cgit v1.2.3-70-g09d2 From 93791beb2385e8b8d1ccac9ba5c05250001c67dd Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Thu, 7 Jun 2018 15:12:18 +0200 Subject: openPMD-api: Update Dependencies (#8330) We need a newer version of HDF5 and dropped the boost dependency. Modernize the test variant to the spack test functionality. --- var/spack/repos/builtin/packages/openpmd-api/package.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openpmd-api/package.py b/var/spack/repos/builtin/packages/openpmd-api/package.py index e9aae9308f..533f08c74b 100644 --- a/var/spack/repos/builtin/packages/openpmd-api/package.py +++ b/var/spack/repos/builtin/packages/openpmd-api/package.py @@ -47,17 +47,14 @@ class OpenpmdApi(CMakePackage): # description='Enable JSON support') variant('python', default=True, description='Enable Python bindings') - variant('test', default=True, - description='Build the tests') depends_on('cmake@3.10.0:', type='build') - depends_on('boost@1.62.0:') depends_on('mpark-variant@1.3.0:') - depends_on('catch@2.2.1: ~single_header', when='+test', type='build') + depends_on('catch@2.2.1: ~single_header', type='test') depends_on('mpi@2.3:', when='+mpi') # might become MPI 3.0+ - depends_on('hdf5@1.8.6:', when='+hdf5') - depends_on('hdf5@1.8.6: ~mpi', when='~mpi +hdf5') - depends_on('hdf5@1.8.6: +mpi', when='+mpi +hdf5') + depends_on('hdf5@1.8.13:', when='+hdf5') + depends_on('hdf5@1.8.13: ~mpi', when='~mpi +hdf5') + depends_on('hdf5@1.8.13: +mpi', when='+mpi +hdf5') depends_on('adios@1.10.0:', when='+adios1') depends_on('adios@1.10.0: ~mpi', when='~mpi +adios1') depends_on('adios@1.10.0: +mpi', when='+mpi +adios1') @@ -87,7 +84,7 @@ class OpenpmdApi(CMakePackage): '-DopenPMD_USE_PYTHON:BOOL={0}'.format( 'ON' if '+python' in spec else 'OFF'), '-DBUILD_TESTING:BOOL={0}'.format( - 'ON' if '+test' in spec else 'OFF') + 'ON' if self.run_tests else 'OFF') ] if spec.satisfies('+python'): @@ -96,7 +93,7 @@ class OpenpmdApi(CMakePackage): # switch internally shipped third-party libraries for spack args.append('-DopenPMD_USE_INTERNAL_VARIANT:BOOL=OFF') - if spec.satisfies('+test'): + if self.run_tests: args.append('-DopenPMD_USE_INTERNAL_CATCH:BOOL=OFF') return args -- cgit v1.2.3-70-g09d2 From f3cb8ee6cf4f104a7e7e47bab03765c173429154 Mon Sep 17 00:00:00 2001 From: Javier Cervantes Date: Thu, 7 Jun 2018 15:48:27 +0200 Subject: Add new package: ftgl (#8416) * Add new package: ftgl * Check version using decorator --- var/spack/repos/builtin/packages/ftgl/package.py | 57 ++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 var/spack/repos/builtin/packages/ftgl/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ftgl/package.py b/var/spack/repos/builtin/packages/ftgl/package.py new file mode 100644 index 0000000000..95e968e371 --- /dev/null +++ b/var/spack/repos/builtin/packages/ftgl/package.py @@ -0,0 +1,57 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import sys +import os + + +class Ftgl(AutotoolsPackage): + """Library to use arbitrary fonts in OpenGL applications.""" + + homepage = "http://ftgl.sourceforge.net/docs/html/" + url = "https://sourceforge.net/projects/ftgl/files/FTGL%20Source/2.1.2/ftgl-2.1.2.tar.gz/download" + list_url = "https://sourceforge.net/projects/ftgl/files/FTGL%20Source/" + list_depth = 1 + + version('2.1.2', 'f81c0a7128192ba11e036186f9a968f2') + + # Ftgl does not come with a configure script + depends_on('autoconf', type='build') + depends_on('automake', type='build') + depends_on('libtool', type='build') + depends_on('m4', type='build') + + depends_on('pkgconfig', type='build') + depends_on('gl') + depends_on('glu') + depends_on('freetype@2.0.9:') + + @property + @when('@2.1.2') + def configure_directory(self): + subdir = 'unix' + if sys.platform == 'darwin': + subdir = 'mac' + return os.path.join(self.stage.source_path, subdir) -- cgit v1.2.3-70-g09d2 From f1ba43d4a4d12f0d187e799862bbd11ce62528fe Mon Sep 17 00:00:00 2001 From: Sajid Ali <30510036+s-sajid-ali@users.noreply.github.com> Date: Thu, 7 Jun 2018 10:26:48 -0500 Subject: modified: var/spack/repos/builtin/packages/py-psutil/package.py (#8420) --- var/spack/repos/builtin/packages/py-psutil/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-psutil/package.py b/var/spack/repos/builtin/packages/py-psutil/package.py index 5b91d4f75a..d6cc11ae4b 100644 --- a/var/spack/repos/builtin/packages/py-psutil/package.py +++ b/var/spack/repos/builtin/packages/py-psutil/package.py @@ -31,8 +31,9 @@ class PyPsutil(PythonPackage): in Python.""" homepage = "https://pypi.python.org/pypi/psutil" - url = "https://pypi.io/packages/source/p/psutil/psutil-5.0.1.tar.gz" + url = "https://pypi.io/packages/source/p/psutil/psutil-5.4.5.tar.gz" + version('5.4.5', '7d3d7954782bba4a400e106e66f10656') version('5.0.1', '153dc8be94badc4072016ceeac7808dc') depends_on('python@2.6:') -- cgit v1.2.3-70-g09d2 From b5a48f44bca6fb061e34250a63cce56b77d861f4 Mon Sep 17 00:00:00 2001 From: healther Date: Thu, 7 Jun 2018 17:33:59 +0200 Subject: add commented test dependencies (#8407) * add commented test dependencies Change-Id: I38ffd3caa77a59f2a0a7ae92a9c8e8215cf5b4d6 * readd make('test') to openssl Change-Id: Ia3733a3848a2a26729b4050c7d4439ea9de17b1a --- var/spack/repos/builtin/packages/esmf/package.py | 2 +- var/spack/repos/builtin/packages/flann/package.py | 7 +++---- var/spack/repos/builtin/packages/jsoncpp/package.py | 3 +-- var/spack/repos/builtin/packages/libpipeline/package.py | 4 +--- var/spack/repos/builtin/packages/lz4/package.py | 2 +- var/spack/repos/builtin/packages/openssl/package.py | 10 +++------- var/spack/repos/builtin/packages/py-brian2/package.py | 4 +--- var/spack/repos/builtin/packages/py-elephant/package.py | 2 +- var/spack/repos/builtin/packages/py-fiscalyear/package.py | 5 ++--- var/spack/repos/builtin/packages/py-flake8/package.py | 3 +-- var/spack/repos/builtin/packages/py-mako/package.py | 4 ++-- var/spack/repos/builtin/packages/py-matplotlib/package.py | 5 ++--- var/spack/repos/builtin/packages/py-mccabe/package.py | 4 +--- var/spack/repos/builtin/packages/py-patsy/package.py | 3 +-- var/spack/repos/builtin/packages/py-pkgconfig/package.py | 3 +-- var/spack/repos/builtin/packages/py-psyclone/package.py | 6 ++---- var/spack/repos/builtin/packages/py-py2cairo/package.py | 3 +-- var/spack/repos/builtin/packages/py-pynn/package.py | 3 +-- var/spack/repos/builtin/packages/py-qtconsole/package.py | 3 +-- var/spack/repos/builtin/packages/py-requests/package.py | 9 ++++----- var/spack/repos/builtin/packages/py-sphinx/package.py | 9 ++++----- .../builtin/packages/py-sphinxcontrib-websupport/package.py | 5 ++--- var/spack/repos/builtin/packages/py-theano/package.py | 5 ++--- var/spack/repos/builtin/packages/rr/package.py | 2 +- var/spack/repos/builtin/packages/wget/package.py | 3 +-- 25 files changed, 41 insertions(+), 68 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/esmf/package.py b/var/spack/repos/builtin/packages/esmf/package.py index cd631f20b6..99c7bce2c6 100644 --- a/var/spack/repos/builtin/packages/esmf/package.py +++ b/var/spack/repos/builtin/packages/esmf/package.py @@ -59,7 +59,7 @@ class Esmf(MakefilePackage): depends_on('xerces-c@3.1.0:', when='+xerces') # Testing dependencies - # depends_on('perl', type='test') # TODO: Add a test deptype + depends_on('perl', type='test') # Make esmf build with newer gcc versions # https://sourceforge.net/p/esmf/esmf/ci/3706bf758012daebadef83d6575c477aeff9c89b/ diff --git a/var/spack/repos/builtin/packages/flann/package.py b/var/spack/repos/builtin/packages/flann/package.py index 9053ae8610..4e817b109b 100644 --- a/var/spack/repos/builtin/packages/flann/package.py +++ b/var/spack/repos/builtin/packages/flann/package.py @@ -92,6 +92,9 @@ class Flann(CMakePackage): # Example uses hdf5. depends_on("hdf5", when="+examples") + depends_on('hdf5', type='test') + depends_on('gtest', type='test') + def patch(self): # Fix up the python setup.py call inside the install(CODE filter_file("setup.py install", @@ -109,10 +112,6 @@ class Flann(CMakePackage): "# install( FILES", "src/python/CMakeLists.txt", string=True) - # TODO: revisit after https://github.com/spack/spack/issues/1279 - # depends_on('hdf5', type='test') - # depends_on('gtest', type='test') - def cmake_args(self): spec = self.spec args = [] diff --git a/var/spack/repos/builtin/packages/jsoncpp/package.py b/var/spack/repos/builtin/packages/jsoncpp/package.py index fe82bca877..3f0fccf47e 100644 --- a/var/spack/repos/builtin/packages/jsoncpp/package.py +++ b/var/spack/repos/builtin/packages/jsoncpp/package.py @@ -42,8 +42,7 @@ class Jsoncpp(CMakePackage): 'MinSizeRel', 'Coverage')) depends_on('cmake@3.1:', type='build') - # TODO: Add a 'test' deptype - # depends_on('python', type='test') + depends_on('python', type='test') def cmake_args(self): return ['-DBUILD_SHARED_LIBS=ON'] diff --git a/var/spack/repos/builtin/packages/libpipeline/package.py b/var/spack/repos/builtin/packages/libpipeline/package.py index a384e2a292..5128162998 100644 --- a/var/spack/repos/builtin/packages/libpipeline/package.py +++ b/var/spack/repos/builtin/packages/libpipeline/package.py @@ -35,6 +35,4 @@ class Libpipeline(AutotoolsPackage): version('1.4.2', '30cec7bcd6fee723adea6a54389f3da2') depends_on('pkgconfig', type='build') - # TODO: Add a 'test' deptype - # See https://github.com/spack/spack/issues/1279 - # depends_on('check', type='test') + depends_on('check', type='test') diff --git a/var/spack/repos/builtin/packages/lz4/package.py b/var/spack/repos/builtin/packages/lz4/package.py index ec5dded43f..d5e915a05b 100644 --- a/var/spack/repos/builtin/packages/lz4/package.py +++ b/var/spack/repos/builtin/packages/lz4/package.py @@ -39,7 +39,7 @@ class Lz4(Package): version('1.7.5', 'c9610c5ce97eb431dddddf0073d919b9') version('1.3.1', '42b09fab42331da9d3fb33bd5c560de9') - # depends_on('valgrind', type='test') + depends_on('valgrind', type='test') def url_for_version(self, version): url = "https://github.com/lz4/lz4/archive" diff --git a/var/spack/repos/builtin/packages/openssl/package.py b/var/spack/repos/builtin/packages/openssl/package.py index f4e78c5759..1f2245f02c 100644 --- a/var/spack/repos/builtin/packages/openssl/package.py +++ b/var/spack/repos/builtin/packages/openssl/package.py @@ -67,10 +67,7 @@ class Openssl(Package): depends_on('zlib') - # TODO: 'make test' requires Perl module Test::More version 0.96 - # TODO: uncomment when test dependency types are supported. - # TODO: This is commented in the meantime to avoid dependnecy bloat. - # depends_on('perl@5.14.0:', type='build', when='+tests') + depends_on('perl@5.14.0:', type='test') parallel = False @@ -111,9 +108,8 @@ class Openssl(Package): filter_file(r'-arch x86_64', '', 'Makefile') make() - # TODO: add this back when we have a 'test' dependency type. See above. - # if self.run_tests: - # make('test') # 'VERBOSE=1' + if self.run_tests: + make('test') # 'VERBOSE=1' make('install') @run_after('install') diff --git a/var/spack/repos/builtin/packages/py-brian2/package.py b/var/spack/repos/builtin/packages/py-brian2/package.py index ef9842516a..2f6bafa0e1 100644 --- a/var/spack/repos/builtin/packages/py-brian2/package.py +++ b/var/spack/repos/builtin/packages/py-brian2/package.py @@ -44,7 +44,5 @@ class PyBrian2(PythonPackage): depends_on('py-pyparsing', type=('build', 'run')) depends_on('py-jinja2@2.7:', type=('build', 'run')) depends_on('py-cpuinfo@0.1.6:', type=('build', 'run')) - - # TODO: Add a 'test' deptype - # depends_on('py-nosetests@1.0:', type='test') depends_on('py-sphinx@1.4.2:', type=('build', 'run'), when='+docs') + depends_on('py-nosetests@1.0:', type='test') \ No newline at end of file diff --git a/var/spack/repos/builtin/packages/py-elephant/package.py b/var/spack/repos/builtin/packages/py-elephant/package.py index 520bb35284..80612ba4ff 100644 --- a/var/spack/repos/builtin/packages/py-elephant/package.py +++ b/var/spack/repos/builtin/packages/py-elephant/package.py @@ -46,4 +46,4 @@ class PyElephant(PythonPackage): depends_on('py-pandas@0.14.1:', type=('build', 'run'), when='+pandas') depends_on('py-numpydoc@0.5:', type=('build', 'run'), when='+docs') depends_on('py-sphinx@1.2.2:', type=('build', 'run'), when='+docs') - # depends_on('py-nose@1.3.3:', type=('build', 'run')) # tests + depends_on('py-nose@1.3.3:', type='test') diff --git a/var/spack/repos/builtin/packages/py-fiscalyear/package.py b/var/spack/repos/builtin/packages/py-fiscalyear/package.py index e1be120d3c..133677264a 100644 --- a/var/spack/repos/builtin/packages/py-fiscalyear/package.py +++ b/var/spack/repos/builtin/packages/py-fiscalyear/package.py @@ -43,6 +43,5 @@ class PyFiscalyear(PythonPackage): depends_on('python@2.5:') depends_on('py-setuptools', type='build') - # TODO: Add a 'test' deptype - # depends_on('py-pytest', type='test') - # depends_on('py-pytest-runner', type='test') + depends_on('py-pytest', type='test') + depends_on('py-pytest-runner', type='test') diff --git a/var/spack/repos/builtin/packages/py-flake8/package.py b/var/spack/repos/builtin/packages/py-flake8/package.py index f2282845a1..81a5838956 100644 --- a/var/spack/repos/builtin/packages/py-flake8/package.py +++ b/var/spack/repos/builtin/packages/py-flake8/package.py @@ -71,8 +71,7 @@ class PyFlake8(PythonPackage): depends_on('py-configparser', type=('build', 'run')) depends_on('py-enum34', type=('build', 'run')) - # TODO: Add test dependencies - # depends_on('py-nose', type='test') + depends_on('py-nose', type='test') def patch(self): """Filter pytest-runner requirement out of setup.py.""" diff --git a/var/spack/repos/builtin/packages/py-mako/package.py b/var/spack/repos/builtin/packages/py-mako/package.py index 01e83a77fe..7e7b5d07d8 100644 --- a/var/spack/repos/builtin/packages/py-mako/package.py +++ b/var/spack/repos/builtin/packages/py-mako/package.py @@ -36,6 +36,6 @@ class PyMako(PythonPackage): version('1.0.1', '9f0aafd177b039ef67b90ea350497a54') depends_on('py-setuptools', type='build') - # depends_on('py-mock', type='test') # TODO: Add test deptype - # depends_on('py-pytest', type='test') # TODO: Add test deptype + depends_on('py-mock', type='test') + depends_on('py-pytest', type='test') depends_on('py-markupsafe@0.9.2:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-matplotlib/package.py b/var/spack/repos/builtin/packages/py-matplotlib/package.py index 914a3dfce6..a1947b18dd 100644 --- a/var/spack/repos/builtin/packages/py-matplotlib/package.py +++ b/var/spack/repos/builtin/packages/py-matplotlib/package.py @@ -95,9 +95,8 @@ class PyMatplotlib(PythonPackage): depends_on('texlive', when='+latex', type='run') # Testing dependencies - # TODO: Add a 'test' deptype - # depends_on('py-nose', type='test') - # depends_on('py-mock', type='test') + depends_on('py-nose', type='test') + depends_on('py-mock', type='test') # Required libraries that ship with matplotlib # depends_on('agg@2.4:') diff --git a/var/spack/repos/builtin/packages/py-mccabe/package.py b/var/spack/repos/builtin/packages/py-mccabe/package.py index 63c0a828d7..487320a755 100644 --- a/var/spack/repos/builtin/packages/py-mccabe/package.py +++ b/var/spack/repos/builtin/packages/py-mccabe/package.py @@ -47,9 +47,7 @@ class PyMccabe(PythonPackage): depends_on('python@2.7:2.8,3.3:') depends_on('py-setuptools', type='build') - - # TODO: Add test dependencies - # depends_on('py-pytest', type='test') + depends_on('py-pytest', type='test') def patch(self): """Filter pytest-runner requirement out of setup.py.""" diff --git a/var/spack/repos/builtin/packages/py-patsy/package.py b/var/spack/repos/builtin/packages/py-patsy/package.py index 48fbe1f7af..c760fdb40b 100644 --- a/var/spack/repos/builtin/packages/py-patsy/package.py +++ b/var/spack/repos/builtin/packages/py-patsy/package.py @@ -41,5 +41,4 @@ class PyPatsy(PythonPackage): depends_on('py-scipy', type=('build', 'run'), when="+splines") depends_on('py-six', type=('build', 'run')) - # TODO: Add a 'test' deptype - # depends_on('py-nose', type='test') + depends_on('py-nose', type='test') diff --git a/var/spack/repos/builtin/packages/py-pkgconfig/package.py b/var/spack/repos/builtin/packages/py-pkgconfig/package.py index b7d424a161..2b1d6f8b4d 100644 --- a/var/spack/repos/builtin/packages/py-pkgconfig/package.py +++ b/var/spack/repos/builtin/packages/py-pkgconfig/package.py @@ -38,5 +38,4 @@ class PyPkgconfig(PythonPackage): depends_on('pkgconfig', type=('build', 'run')) - # TODO: Add a 'test' deptype - # depends_on('py-nose@1.0:', type='test') + depends_on('py-nose@1.0:', type='test') diff --git a/var/spack/repos/builtin/packages/py-psyclone/package.py b/var/spack/repos/builtin/packages/py-psyclone/package.py index a8ec68202b..094d3c205f 100644 --- a/var/spack/repos/builtin/packages/py-psyclone/package.py +++ b/var/spack/repos/builtin/packages/py-psyclone/package.py @@ -39,8 +39,6 @@ class PyPsyclone(PythonPackage): version('develop', git=giturl, branch='master') depends_on('py-setuptools', type='build') - - depends_on('python', type=('build', 'run')) depends_on('py-pyparsing', type=('build', 'run')) # Test cases fail without compatible versions of py-fparser: @@ -48,8 +46,8 @@ class PyPsyclone(PythonPackage): depends_on('py-fparser', type=('build', 'run'), when='@1.5.2:') # Dependencies only required for tests: - depends_on('py-numpy', type='test') - depends_on('py-nose', type='test') + depends_on('py-numpy', type='test') + depends_on('py-nose', type='test') depends_on('py-pytest', type='test') @run_after('install') diff --git a/var/spack/repos/builtin/packages/py-py2cairo/package.py b/var/spack/repos/builtin/packages/py-py2cairo/package.py index 1ddbcc440a..a990bbaeb5 100644 --- a/var/spack/repos/builtin/packages/py-py2cairo/package.py +++ b/var/spack/repos/builtin/packages/py-py2cairo/package.py @@ -40,8 +40,7 @@ class PyPy2cairo(WafPackage): depends_on('pixman') depends_on('pkgconfig', type='build') - # TODO: Add a 'test' deptype - # depends_on('py-pytest', type='test') + depends_on('py-pytest', type='test') def installtest(self): with working_dir('test'): diff --git a/var/spack/repos/builtin/packages/py-pynn/package.py b/var/spack/repos/builtin/packages/py-pynn/package.py index 5eb900ab6e..0bc23e1cee 100644 --- a/var/spack/repos/builtin/packages/py-pynn/package.py +++ b/var/spack/repos/builtin/packages/py-pynn/package.py @@ -50,5 +50,4 @@ class PyPynn(PythonPackage): depends_on('py-neo@0.3:0.4.1', type=('build', 'run'), when="@:0.8.3") depends_on('py-neo@0.5.0:', type=('build', 'run'), when="@0.9.0:") - # TODO: Add a 'test' deptype - # depends_on('py-mock@1.0:', type='test') + depends_on('py-mock@1.0:', type='test') diff --git a/var/spack/repos/builtin/packages/py-qtconsole/package.py b/var/spack/repos/builtin/packages/py-qtconsole/package.py index e136cd6834..f4b818be17 100644 --- a/var/spack/repos/builtin/packages/py-qtconsole/package.py +++ b/var/spack/repos/builtin/packages/py-qtconsole/package.py @@ -42,5 +42,4 @@ class PyQtconsole(PythonPackage): depends_on('py-traitlets', type=('build', 'run')) depends_on('py-sphinx@1.3:', type=('build', 'run'), when='+docs') - # TODO: Add a 'test' deptype - # depends_on('py-mock', type='test', when='^python@2.7:2.8') + depends_on('py-mock', type='test', when='^python@2.7:2.8') diff --git a/var/spack/repos/builtin/packages/py-requests/package.py b/var/spack/repos/builtin/packages/py-requests/package.py index 814778823f..db710fcb0e 100644 --- a/var/spack/repos/builtin/packages/py-requests/package.py +++ b/var/spack/repos/builtin/packages/py-requests/package.py @@ -49,8 +49,7 @@ class PyRequests(PythonPackage): depends_on('py-setuptools', type='build') - # TODO: Add a 'test' deptype - # depends_on('py-pytest@2.8.0:', type='test') - # depends_on('py-pytest-cov', type='test') - # depends_on('py-pytest-httpbin@0.0.7', type='test') - # depends_on('py-pytest-mock', type='test') + depends_on('py-pytest@2.8.0:', type='test') + depends_on('py-pytest-cov', type='test') + depends_on('py-pytest-httpbin@0.0.7', type='test') + depends_on('py-pytest-mock', type='test') diff --git a/var/spack/repos/builtin/packages/py-sphinx/package.py b/var/spack/repos/builtin/packages/py-sphinx/package.py index e4be436a7f..e63605efc6 100644 --- a/var/spack/repos/builtin/packages/py-sphinx/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx/package.py @@ -84,8 +84,7 @@ class PySphinx(PythonPackage): # type=('build', 'run')) depends_on('py-typing', when='@1.6:', type=('build', 'run')) - # TODO: Add a 'test' deptype - # depends_on('py-pytest', type='test') - # depends_on('py-mock', type='test') - # depends_on('py-simplejson', type='test') - # depends_on('py-html5lib', type='test') + depends_on('py-pytest', type='test') + depends_on('py-mock', type='test') + depends_on('py-simplejson', type='test') + depends_on('py-html5lib', type='test') diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-websupport/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-websupport/package.py index 49c1b26143..0c98d435c7 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-websupport/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-websupport/package.py @@ -42,6 +42,5 @@ class PySphinxcontribWebsupport(PythonPackage): depends_on('py-setuptools', type='build') - # TODO: Add a 'test' deptype - # depends_on('py-pytest', type='test') - # depends_on('py-mock', type='test') + depends_on('py-pytest', type='test') + depends_on('py-mock', type='test') diff --git a/var/spack/repos/builtin/packages/py-theano/package.py b/var/spack/repos/builtin/packages/py-theano/package.py index b973065a21..a8b32f5781 100644 --- a/var/spack/repos/builtin/packages/py-theano/package.py +++ b/var/spack/repos/builtin/packages/py-theano/package.py @@ -54,6 +54,5 @@ class PyTheano(PythonPackage): depends_on('py-pygpu', when='+gpu', type=('build', 'run')) depends_on('libgpuarray', when='+gpu') - # TODO: Add a 'test' deptype - # depends_on('py-nose@1.3.0:', type='test') - # depends_on('py-nose-parameterized@0.5.0:', type='test') + depends_on('py-nose@1.3.0:', type='test') + depends_on('py-nose-parameterized@0.5.0:', type='test') diff --git a/var/spack/repos/builtin/packages/rr/package.py b/var/spack/repos/builtin/packages/rr/package.py index 1f74a35e78..baf79aca6b 100644 --- a/var/spack/repos/builtin/packages/rr/package.py +++ b/var/spack/repos/builtin/packages/rr/package.py @@ -40,7 +40,7 @@ class Rr(CMakePackage): # depends_on('capnproto', when='@4.6:') # not yet in spack # depends_on('libcapnp') # needed for future releases depends_on('pkgconfig', type='build') - depends_on('py-pexpect', type='build') # actually tests + depends_on('py-pexpect', type='test') # rr needs architecture Nehalem and beyond, how can spack # test this? diff --git a/var/spack/repos/builtin/packages/wget/package.py b/var/spack/repos/builtin/packages/wget/package.py index 0c7301011c..d3ebfbd0fb 100644 --- a/var/spack/repos/builtin/packages/wget/package.py +++ b/var/spack/repos/builtin/packages/wget/package.py @@ -62,8 +62,7 @@ class Wget(AutotoolsPackage): depends_on('perl@5.12.0:', type='build') depends_on('pkgconfig', type='build') - # TODO: Add a 'test' deptype - # depends_on('valgrind', type='test') + depends_on('valgrind', type='test') build_directory = 'spack-build' -- cgit v1.2.3-70-g09d2 From a6e0837b3173354af6785adb2fd7afa89f16e485 Mon Sep 17 00:00:00 2001 From: "Daryl W. Grunau" Date: Thu, 7 Jun 2018 09:34:37 -0600 Subject: googletest: add a shared variant for all supported versions (#8373) * add a shared variant for all supported versions * address comment from @citibeth about MacOS lib installs * address additional comments from @citibeth about MacOS lib installs * set +shared variant to be default behavior --- var/spack/repos/builtin/packages/googletest/package.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/googletest/package.py b/var/spack/repos/builtin/packages/googletest/package.py index 4651ea7c3e..67edb2dc2e 100644 --- a/var/spack/repos/builtin/packages/googletest/package.py +++ b/var/spack/repos/builtin/packages/googletest/package.py @@ -39,6 +39,8 @@ class Googletest(CMakePackage): variant('pthreads', default=True, description='Build multithreaded version with pthreads') + variant('shared', default=True, + description='Build shared libraries (DLLs)') def cmake_args(self): spec = self.spec @@ -55,6 +57,8 @@ class Googletest(CMakePackage): options.append('-Dgtest_disable_pthreads={0}'.format( 'ON' if '+pthreads' in spec else 'OFF')) + options.append('-DBUILD_SHARED_LIBS={0}'.format( + 'ON' if '+shared' in spec else 'OFF')) return options @when('@:1.7.0') @@ -67,5 +71,9 @@ class Googletest(CMakePackage): prefix.include) mkdirp(prefix.lib) - install('libgtest.a', prefix.lib) - install('libgtest_main.a', prefix.lib) + if '+shared' in spec: + install('libgtest.{0}'.format(dso_suffix), prefix.lib) + install('libgtest_main.{0}'.format(dso_suffix), prefix.lib) + else: + install('libgtest.a', prefix.lib) + install('libgtest_main.a', prefix.lib) -- cgit v1.2.3-70-g09d2 From af881b8c2edf8896cb563648b2164410b331ccbc Mon Sep 17 00:00:00 2001 From: healther Date: Thu, 7 Jun 2018 17:50:05 +0200 Subject: fix qt@5.8: build on systems without wayland (#8417) * fix qt@5.8: build on systems without wayland Change-Id: I56b83208edd46f50e003d82c071e296e905bfb15 * add links Change-Id: Ia16fc20632690340f33df77fbdcb1a166d49cedc * move 5.8 comparison into 5.7 configure block Change-Id: I7dc606beeb5b5bf4e8263bc50d28de6591633c99 --- var/spack/repos/builtin/packages/qt/package.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index a9ce442966..6bcc16a6bf 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -378,6 +378,12 @@ class Qt(Package): '-skip', 'webglplugin', ]) + if self.version > Version('5.8'): + # relies on a system installed wayland, i.e. no spack package yet + # https://wayland.freedesktop.org/ubuntu16.04.html + # https://wiki.qt.io/QtWayland + config_args.extend(['-skip', 'wayland']) + configure('-no-eglfs', '-no-directfb', '-{0}gtk'.format('' if '+gtk' in self.spec else 'no-'), -- cgit v1.2.3-70-g09d2 From 1d3ad6ea7e3f62b371418e91f0afc59b7b73b456 Mon Sep 17 00:00:00 2001 From: healther Date: Thu, 7 Jun 2018 18:34:29 +0200 Subject: add sqlitebrowser (#8418) * add sqlitebrowser Change-Id: I20cac709509e82d348cebc11b0d584b53b2ad3d4 * add message and clean up unnecessary code Change-Id: Ib9d2229ee25d751274680d06824891ee78fa5970 * and make flake8 happy Change-Id: I814eb89eefe1767af4d8043b08b61991750516df * make gcc-independence great again Change-Id: I75f7271757782a6735eb7f03c0551d190722974d * remove explicit import of dso_suffix Change-Id: I626c6391b22524895199db5508606c4cf22bf9b5 --- var/spack/repos/builtin/packages/sqlite/package.py | 22 +++++++++++ .../builtin/packages/sqlitebrowser/package.py | 46 ++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 var/spack/repos/builtin/packages/sqlitebrowser/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sqlite/package.py b/var/spack/repos/builtin/packages/sqlite/package.py index f70bbfe3bd..fea27c8661 100644 --- a/var/spack/repos/builtin/packages/sqlite/package.py +++ b/var/spack/repos/builtin/packages/sqlite/package.py @@ -63,6 +63,19 @@ class Sqlite(AutotoolsPackage): # compiler is used. patch('remove_overflow_builtins.patch', when='@3.17.0:3.20%intel') + variant('functions', default=False, + description='Provide mathematical and string extension functions ' + 'for SQL queries using the loadable extensions ' + 'mechanism.') + + resource(name='extension-functions', + url='https://sqlite.org/contrib/download/extension-functions.c/download/extension-functions.c?get=25', + md5='3a32bfeace0d718505af571861724a43', + expand=False, + placement={'extension-functions.c?get=25': + 'extension-functions.c'}, + when='+functions') + def get_arch(self): arch = architecture.Arch() arch.platform = architecture.platform() @@ -75,3 +88,12 @@ class Sqlite(AutotoolsPackage): args.append('--build=powerpc64le-redhat-linux-gnu') return args + + @run_after('install') + def build_libsqlitefunctions(self): + if '+functions' in self.spec: + libraryname = 'libsqlitefunctions.' + dso_suffix + cc = Executable(spack_cc) + cc(self.compiler.pic_flag, '-lm', '-shared', + 'extension-functions.c', '-o', libraryname) + install(libraryname, self.prefix.lib) diff --git a/var/spack/repos/builtin/packages/sqlitebrowser/package.py b/var/spack/repos/builtin/packages/sqlitebrowser/package.py new file mode 100644 index 0000000000..71278d84b9 --- /dev/null +++ b/var/spack/repos/builtin/packages/sqlitebrowser/package.py @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Sqlitebrowser(CMakePackage): + """DB Browser for SQLite (DB4S) is a high quality, visual, + open source tool to create, design, and edit database files + compatible with SQLite.""" + + homepage = "https://sqlitebrowser.org" + url = "https://github.com/sqlitebrowser/sqlitebrowser/archive/v3.10.1.tar.gz" + + version('3.10.1', '66cbe41f9da5be80067942ed3816576c') + + msg = 'sqlitebrowser requires C++11 support' + conflicts('%gcc@:4.8.0', msg=msg) + conflicts('%clang@:3.2', msg=msg) + conflicts('%intel@:12', msg=msg) + conflicts('%xl@:13.0', msg=msg) + conflicts('%xl_r@:13.0', msg=msg) + + depends_on('sqlite@3:+functions') + depends_on('qt@5.5:') -- cgit v1.2.3-70-g09d2 From 1a8bb78824686a6d15b32c5d6689ae864204d20b Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Thu, 7 Jun 2018 14:07:39 -0500 Subject: Fermi Science Tools: New package (#8126) * fermisciencetools: new package * fermisciencetools: new package * added comments about the error in building the source distribution; fixed flake8 errors --- .../builtin/packages/fermisciencetools/package.py | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 var/spack/repos/builtin/packages/fermisciencetools/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fermisciencetools/package.py b/var/spack/repos/builtin/packages/fermisciencetools/package.py new file mode 100644 index 0000000000..bdac786766 --- /dev/null +++ b/var/spack/repos/builtin/packages/fermisciencetools/package.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +from distutils.dir_util import copy_tree + + +class Fermisciencetools(Package): + """The Fermi Science Tools consists of the basic tools necessary to + analyze Fermi data. + + This is the binary version for Linux x86_64 with libc-2.17.""" + + homepage = "https://fermi.gsfc.nasa.gov/ssc/data/analysis/software/" + url = "https://fermi.gsfc.nasa.gov/ssc/data/analysis/software/v11r5p3/ScienceTools-v11r5p3-fssc-20180124-x86_64-unknown-linux-gnu-libc2.17.tar.gz" + + # Now we are using the binary distribution. The source distribution is also + # available, but there might be some logical errors in the configure codes, + # which leads to failing in building it from source. Hopefully someone else + # can figure it out and we can use the source distribution instead. + version('11r5p3', 'cf050ddddfe9251b6ebe8d3fd7de3c3f') + + def install(self, spec, prefix): + copy_tree('x86_64-unknown-linux-gnu-libc2.17', prefix) -- cgit v1.2.3-70-g09d2 From c8a3a650fa736cb27fe2e63f493f7d23e742b16c Mon Sep 17 00:00:00 2001 From: Corey McNeish <35310375+mcneish1@users.noreply.github.com> Date: Thu, 7 Jun 2018 16:08:23 -0700 Subject: Fix hydrogen@develop build (#8262) * Delete support for old versions of Elemental in Hydrogen * Fix cmake_args versions in lbann * Remove unused import (again) * Revert elemental to pre-llnl fork * Strip tailing whitespace from libgfortran.so * Fix flake8 * Remove debug print * * Add back elemental@develop * Prohibit installation of hydrogen previous to 0.99 * Fix flake8 * Change cmake_args error to a conflicts for old versions of Hydrogen * Use ~ not - --- .../repos/builtin/packages/elemental/package.py | 66 +++------------------- .../repos/builtin/packages/hydrogen/package.py | 14 ++--- var/spack/repos/builtin/packages/lbann/package.py | 2 +- 3 files changed, 13 insertions(+), 69 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/elemental/package.py b/var/spack/repos/builtin/packages/elemental/package.py index 2b72a500ca..b82d57b147 100644 --- a/var/spack/repos/builtin/packages/elemental/package.py +++ b/var/spack/repos/builtin/packages/elemental/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## import os -import sys from spack import * from spack.spec import UnsupportedCompilerError @@ -33,9 +32,7 @@ class Elemental(CMakePackage): and optimization library.""" homepage = "http://libelemental.org" - url = "https://github.com/elemental/Elemental/archive/v0.87.6.tar.gz" - - version('hydrogen-develop', git='https://github.com/LLNL/Elemental.git', branch='hydrogen') + url = "https://github.com/elemental/Elemental/archive/v0.87.7.tar.gz" version('develop', git='https://github.com/elemental/Elemental.git', branch='master') version('0.87.7', '6c1e7442021c59a36049e37ea69b8075') @@ -88,7 +85,7 @@ class Elemental(CMakePackage): depends_on('veclibfort', when='blas=accelerate') - depends_on('essl -cuda', when='blas=essl -openmp_blas ~int64_blas') + depends_on('essl ~cuda', when='blas=essl ~openmp_blas ~int64_blas') depends_on('essl threads=openmp', when='blas=essl +openmp_blas ~int64_blas') # Note that this forces us to use OpenBLAS until #1712 is fixed @@ -116,7 +113,6 @@ class Elemental(CMakePackage): 'libEl', root=self.prefix, shared=shared, recursive=True ) - @when('@0.87.6:') def cmake_args(self): spec = self.spec @@ -146,20 +142,20 @@ class Elemental(CMakePackage): ifort = env['SPACK_F77'] intel_bin = os.path.dirname(ifort) intel_root = os.path.dirname(intel_bin) - libfortran = LibraryList('{0}/lib/intel64/libifcoremt.{1}' - .format(intel_root, dso_suffix)) + libfortran = find_libraries('libifcoremt', + root=intel_root, recursive=True) elif self.spec.satisfies('%gcc'): # see /debian/rules as an example: mpif77 = Executable(spec['mpi'].mpif77) libfortran = LibraryList(mpif77('--print-file-name', 'libgfortran.%s' % dso_suffix, - output=str)) + output=str).strip()) elif self.spec.satisfies('%xl') or self.spec.satisfies('%xl_r'): xl_fort = env['SPACK_F77'] xl_bin = os.path.dirname(xl_fort) xl_root = os.path.dirname(xl_bin) - libfortran = LibraryList('{0}/lib/libxlf90_r.{1}.1' - .format(xl_root, dso_suffix)) + libfortran = find_libraries('libxlf90_r', + root=xl_root, recursive=True) else: libfortran = None @@ -191,51 +187,3 @@ class Elemental(CMakePackage): '-DPYTHON_SITE_PACKAGES:STRING={0}'.format(site_packages_dir)]) return args - - @when('@:0.87.6') - def cmake_args(self): - spec = self.spec - - if '@:0.87.7' in spec and '%intel@:17.0.2' in spec: - raise UnsupportedCompilerError( - "Elemental {0} has a known bug with compiler: {1} {2}".format( - spec.version, spec.compiler.name, spec.compiler.version)) - - args = [ - '-DCMAKE_INSTALL_MESSAGE:STRING=LAZY', - '-DCMAKE_C_COMPILER=%s' % spec['mpi'].mpicc, - '-DCMAKE_CXX_COMPILER=%s' % spec['mpi'].mpicxx, - '-DCMAKE_Fortran_COMPILER=%s' % spec['mpi'].mpifc, - '-DBUILD_SHARED_LIBS:BOOL=%s' % ('+shared' in spec), - '-DHydrogen_ENABLE_OPENMP:BOOL=%s' % ('+hybrid' in spec), - '-DHydrogen_ENABLE_QUADMATH:BOOL=%s' % ('+quad' in spec), - '-DHydrogen_USE_64BIT_INTS:BOOL=%s' % ('+int64' in spec), - '-DHydrogen_USE_64BIT_BLAS_INTS:BOOL=%s' % ('+int64_blas' in spec), - '-DHydrogen_ENABLE_MPC:BOOL=%s' % ('+mpfr' in spec), - '-DHydrogen_GENERAL_LAPACK_FALLBACK=ON', - ] - - # Add support for OS X to find OpenMP - if (self.spec.satisfies('%clang')): - if (sys.platform == 'darwin'): - clang = self.compiler.cc - clang_bin = os.path.dirname(clang) - clang_root = os.path.dirname(clang_bin) - args.extend([ - '-DOpenMP_DIR={0}'.format(clang_root)]) - - if 'blas=openblas' in spec: - args.extend([ - '-DHydrogen_USE_OpenBLAS:BOOL=%s' % ('blas=openblas' in spec), - '-DOpenBLAS_DIR:STRING={0}'.format( - spec['elemental'].prefix)]) - elif 'blas=mkl' in spec: - args.extend([ - '-DHydrogen_USE_MKL:BOOL=%s' % ('blas=mkl' in spec)]) - elif 'blas=accelerate' in spec: - args.extend(['-DHydrogen_USE_ACCELERATE:BOOL=TRUE']) - elif 'blas=essl' in spec: - args.extend([ - '-DHydrogen_USE_ESSL:BOOL=%s' % ('blas=essl' in spec)]) - - return args diff --git a/var/spack/repos/builtin/packages/hydrogen/package.py b/var/spack/repos/builtin/packages/hydrogen/package.py index 449e29a999..47787505aa 100644 --- a/var/spack/repos/builtin/packages/hydrogen/package.py +++ b/var/spack/repos/builtin/packages/hydrogen/package.py @@ -25,7 +25,6 @@ import os import sys from spack import * -from spack.spec import UnsupportedCompilerError class Hydrogen(CMakePackage): @@ -60,9 +59,9 @@ class Hydrogen(CMakePackage): variant('mpfr', default=False, description='Support GNU MPFR\'s' 'arbitrary-precision floating-point arithmetic') - variant('cuda', default=False, + variant('cuda', default=False, description='Builds with support for GPUs via CUDA and cuDNN') - variant('test', default=False, + variant('test', default=False, description='Builds test suite') # Note that #1712 forces us to enumerate the different blas variants @@ -100,6 +99,9 @@ class Hydrogen(CMakePackage): depends_on('cudnn', when='+cuda') depends_on('cub', when='+cuda') + conflicts('@0:0.98', msg="Hydrogen did not exist before v0.99. " + + "Did you mean to use Elemental instead?") + @property def libs(self): shared = True if '+shared' in self.spec else False @@ -107,15 +109,9 @@ class Hydrogen(CMakePackage): 'libEl', root=self.prefix, shared=shared, recursive=True ) - @when('@:0.84' or '@0.99:') def cmake_args(self): spec = self.spec - if '@:0.87.7' in spec and '%intel@:17.0.2' in spec: - raise UnsupportedCompilerError( - "Elemental {0} has a known bug with compiler: {1} {2}".format( - spec.version, spec.compiler.name, spec.compiler.version)) - args = [ '-DCMAKE_INSTALL_MESSAGE:STRING=LAZY', '-DCMAKE_C_COMPILER=%s' % spec['mpi'].mpicc, diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index 55a966e9a9..643bcecfee 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -106,7 +106,7 @@ class Lbann(CMakePackage): # Get any recent versions or non-numeric version # Note that develop > numeric and non-develop < numeric - @when('@:0.90' or '@0.94:') + @when('@:0.90,0.94:') def cmake_args(self): spec = self.spec args = self.common_config_args -- cgit v1.2.3-70-g09d2 From 21ff3c9ac1130e498cc38c7a485e572f7a837264 Mon Sep 17 00:00:00 2001 From: Miles Perry <37849532+Miles-Perry@users.noreply.github.com> Date: Thu, 7 Jun 2018 22:44:30 -0500 Subject: pbbam: new package (#8365) * pbbam: new package * pbbam: updated version * pbbam: added option tests handling * pbbam: flake8 edits --- var/spack/repos/builtin/packages/pbbam/package.py | 62 +++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 var/spack/repos/builtin/packages/pbbam/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pbbam/package.py b/var/spack/repos/builtin/packages/pbbam/package.py new file mode 100644 index 0000000000..f9b1ccc727 --- /dev/null +++ b/var/spack/repos/builtin/packages/pbbam/package.py @@ -0,0 +1,62 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Pbbam(CMakePackage): + """The pbbam software package provides components to create, query, + & edit PacBio BAM files and associated indices. + These components include a core C++ library, + bindings for additional languages, and command-line utilities.""" + + homepage = "https://github.com/PacificBiosciences/pbbam" + url = "https://github.com/PacificBiosciences/pbbam/archive/0.18.0.tar.gz" + + version('0.18.0', 'abbb687b1e7ea08916c26da828e11384') + + depends_on('zlib') + depends_on('boost@1.55.0:') + depends_on('htslib@1.3.1:') + depends_on('doxygen+graphviz') + + conflicts('%gcc@:5.2.0') + + def cmake_args(self): + options = [] + if self.run_tests: + options.append('-DPacBioBAM_build_tests:BOOL=ON') + else: + options.append('-DPacBioBAM_build_tests:BOOL=OFF') + + return options + + def install(self, spec, prefix): + install_tree('spack-build/bin', prefix.bin) + install_tree('spack-build/lib', prefix.lib) + install_tree('include/pbbam', prefix.include.pbbam) + + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): + spack_env.set('PacBioBAM_LIBRARIES', self.prefix.lib) + spack_env.set('PacBioBAM_INCLUDE_DIRS', self.prefix.include) -- cgit v1.2.3-70-g09d2 From 25024b68d071fa0837b3fdc056493eff6903ea8a Mon Sep 17 00:00:00 2001 From: Chris Green Date: Thu, 7 Jun 2018 23:16:31 -0500 Subject: Update intel-tbb to 2018.3 and improve version URLs, dependencies and patching. (#7932) * Update to 2018.3 and improve version URLs, dependencies and patching. Improve to version -> URL translation to be algorithmic rather than manual. Make binutils build dependency explicit where appropriate because we're sensitive to the assembler used. Build's use of '-mrtm' is only patched away if it needs to be because the assembler is too old. Incorporate @adamjstewart request to convert GCC version check to a conflict. * Allow specification of C++ standard. * Improve TBB patch per PR comments. * Restrict RTM patch application to older OS only. * New version 2018_U4. --- .../repos/builtin/packages/intel-tbb/package.py | 87 ++++++++++++++++------ .../packages/intel-tbb/tbb_cmakeConfig.patch | 11 +++ .../packages/intel-tbb/tbb_gcc_rtm_key.patch | 34 +++------ 3 files changed, 85 insertions(+), 47 deletions(-) create mode 100644 var/spack/repos/builtin/packages/intel-tbb/tbb_cmakeConfig.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/intel-tbb/package.py b/var/spack/repos/builtin/packages/intel-tbb/package.py index c6b5fe5eed..ab486bf896 100644 --- a/var/spack/repos/builtin/packages/intel-tbb/package.py +++ b/var/spack/repos/builtin/packages/intel-tbb/package.py @@ -24,6 +24,8 @@ ############################################################################## from spack import * import glob +import inspect +import platform class IntelTbb(Package): @@ -34,33 +36,60 @@ class IntelTbb(Package): """ homepage = "http://www.threadingbuildingblocks.org/" - # Only version-specific URL's work for TBB - version('2018.2', '0b8dfe30917a54e40828eeb0ed7562ae', - url='https://github.com/01org/tbb/archive/2018_U2.tar.gz') - version('2018.1', 'b2f2fa09adf44a22f4024049907f774b', - url='https://github.com/01org/tbb/archive/2018_U1.tar.gz') - version('2018.0', 'e54de69981905ad69eb9cf0226b9bf5f9a4ba065', - url='https://github.com/01org/tbb/archive/2018.tar.gz') - version('2017.8', '488f049fd107d8b1f6ba59cf4aad881172525106', - url='https://github.com/01org/tbb/archive/2017_U8.tar.gz') - version('2017.6', 'c0a722fd1ae66b40aeab25da6049086ef5f02f17', - url='https://github.com/01org/tbb/archive/2017_U6.tar.gz') - version('2017.5', '26f720729d322913912e99d1e4a36bd10625d3ca', - url='https://github.com/01org/tbb/archive/2017_U5.tar.gz') - version('2017.3', '2c451a5bcf6fc31487b98b4b29651c369874277c', - url='https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb2017_20161128oss_src.tgz') - version('4.4.4', 'd4cee5e4ca75cab5181834877738619c56afeb71', - url='https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb44_20160413oss_src.tgz') - version('4.4.3', '80707e277f69d9b20eeebdd7a5f5331137868ce1', - url='https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb44_20160128oss_src_0.tgz') + # See url_for_version() below. + version('2018.4', '5e2e6ba0e25624a94331c945856551c2') + version('2018.3', 'cd2e136598ffa5c136f077ee85a35b4c') + version('2018.2', '0b8dfe30917a54e40828eeb0ed7562ae') + version('2018.1', 'b2f2fa09adf44a22f4024049907f774b') + version('2018', '7fb30d5ea2545f26ce02757d9ab05e6c') + version('2017.8', '7240f57f1aeea0e266a5e17ae68fdc16') + version('2017.7', '364f2a4b80e978f38a69cbf7c466b898') + version('2017.6', 'ec21254af4fc2a29574c272f501a3138') + version('2017.5', '85b41c64102c052e24d8a39f6193e599') + version('2017.4', '71526b2fef098515e212302d1455de7d') + version('2017.3', 'd7622eeaafeff8d271c7aa684bd82ddb') + version('2017.2', '9605cbea96998a10a186fc72c35cbd76') + version('2017.1', '6c0fe8aa7bc911a85e8e522e620511b3') + version('2017', '9e7f9ea684ecf84ac74dcd3c6012cfa6') + version('4.4.6', '20e15206f70c2651bfc964e451a443a0') + version('4.4.5', '531a67cd98f9b4ec8ece95c5f8193a83') + version('4.4.4', '61531b2e8684e06a621dcdca1a7a420e') + version('4.4.3', '8e3e39e1fdfb3f7c3a5ac8ec1afe186e') + version('4.4.2', 'e92b110e8eb238741b00e3789b39969e') + version('4.4.1', 'a02c9958f02c1b5f3626874219979ae8') + version('4.4', '1d512085221996eae6cec04e1a4cd3dd') provides('tbb') + conflicts('%gcc@6.1:', when='@:4.4.3', + msg='4.4.4 or later required for GCC >= 6.1.') + variant('shared', default=True, description='Builds a shared version of TBB libraries') - # include patch for gcc rtm options - patch("tbb_gcc_rtm_key.patch", level=0) + variant('cxxstd', + default='default', + values=('default', '98', '11', '14', '17'), + multi=False, + description='Use the specified C++ standard when building.') + + # Build and install CMake config files if we're new enough. + depends_on('cmake@3.0.0:', type='build', when='@2017.0:') + + # Deactivate use of RTM with GCC when on an OS with an elderly assembler. + patch("tbb_gcc_rtm_key.patch", level=0, when='%gcc@4.8.0: os=rhel6') + patch("tbb_gcc_rtm_key.patch", level=0, when='%gcc@4.8.0: os=scientific6') + patch("tbb_gcc_rtm_key.patch", level=0, when='%gcc@4.8.0: os=centos6') + + # Patch cmakeConfig.cmake.in to find the libraries where we install them. + patch("tbb_cmakeConfig.patch", level=0, when='@2017.0:') + + def url_for_version(self, version): + url = 'https://github.com/01org/tbb/archive/{0}.tar.gz' + if (version[0] >= 2017) and len(version) > 1: + return url.format('{0}_U{1}'.format(version[0], version[1])) + else: + return url.format(version) def coerce_to_spack(self, tbb_build_subdir): for compiler in ["icc", "gcc", "clang"]: @@ -80,9 +109,6 @@ class IntelTbb(Package): of.write(l) def install(self, spec, prefix): - if spec.satisfies('%gcc@6.1:') and spec.satisfies('@:4.4.3'): - raise InstallError('Only TBB 4.4.4 and above build with GCC 6.1!') - # We need to follow TBB's compiler selection logic to get the proper # build + link flags but we still need to use spack's compiler wrappers # to accomplish this, we do two things: @@ -113,6 +139,10 @@ class IntelTbb(Package): if '+shared' not in self.spec: make_opts.append("extra_inc=big_iron.inc") + if spec.variants['cxxstd'].value != 'default': + make_opts.append('stdver=c++{0}'. + format(spec.variants['cxxstd'].value)) + # # tbb does not have a configure script or make install target # we simply call make, and try to put the pieces together @@ -137,3 +167,12 @@ class IntelTbb(Package): fs = glob.glob(join_path("build", "*debug", lib_name + "_debug.*")) for f in fs: install(f, prefix.lib) + + if self.spec.satisfies('@2017.0:'): + # Generate and install the CMake Config file. + cmake_args = ('-DTBB_ROOT={0}'.format(prefix), + '-DTBB_OS={0}'.format(platform.system()), + '-P', + 'tbb_config_generator.cmake') + with working_dir(join_path(self.stage.source_path, 'cmake')): + inspect.getmodule(self).cmake(*cmake_args) diff --git a/var/spack/repos/builtin/packages/intel-tbb/tbb_cmakeConfig.patch b/var/spack/repos/builtin/packages/intel-tbb/tbb_cmakeConfig.patch new file mode 100644 index 0000000000..a7a7ec24a2 --- /dev/null +++ b/var/spack/repos/builtin/packages/intel-tbb/tbb_cmakeConfig.patch @@ -0,0 +1,11 @@ +--- cmake/templates/TBBConfig.cmake.in~ 2018-03-30 10:55:05.000000000 -0500 ++++ cmake/templates/TBBConfig.cmake.in 2018-05-25 10:25:52.498708945 -0500 +@@ -52,7 +52,7 @@ + + @TBB_CHOOSE_COMPILER_SUBDIR@ + +-get_filename_component(_tbb_lib_path "${_tbb_root}/@TBB_SHARED_LIB_DIR@/${_tbb_arch_subdir}/${_tbb_compiler_subdir}" ABSOLUTE) ++get_filename_component(_tbb_lib_path "${_tbb_root}/@TBB_SHARED_LIB_DIR@" ABSOLUTE) + + foreach (_tbb_component ${TBB_FIND_COMPONENTS}) + set(_tbb_release_lib "${_tbb_lib_path}/@TBB_LIB_PREFIX@${_tbb_component}.@TBB_LIB_EXT@") diff --git a/var/spack/repos/builtin/packages/intel-tbb/tbb_gcc_rtm_key.patch b/var/spack/repos/builtin/packages/intel-tbb/tbb_gcc_rtm_key.patch index f1a42fb52f..29f040d4a8 100644 --- a/var/spack/repos/builtin/packages/intel-tbb/tbb_gcc_rtm_key.patch +++ b/var/spack/repos/builtin/packages/intel-tbb/tbb_gcc_rtm_key.patch @@ -1,23 +1,11 @@ -*** build/linux.gcc.inc.orig 2017-01-10 16:54:01.000000000 -0800 ---- build/linux.gcc.inc 2017-01-10 16:54:04.000000000 -0800 -*************** -*** 49,57 **** - endif - - # gcc 4.8 and later support RTM intrinsics, but require command line switch to enable them -! ifneq (,$(shell gcc -dumpversion | egrep "^(4\.[8-9]|[5-9])")) -! RTM_KEY = -mrtm -! endif - - ifeq ($(cfg), release) - CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD ---- 49,57 ---- - endif - - # gcc 4.8 and later support RTM intrinsics, but require command line switch to enable them -! #ifneq (,$(shell gcc -dumpversion | egrep "^(4\.[8-9]|[5-9])")) -! # RTM_KEY = -mrtm -! #endif - - ifeq ($(cfg), release) - CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD \ No newline at end of file +--- build/linux.gcc.inc~ 2016-09-15 07:00:44.000000000 -0500 ++++ build/linux.gcc.inc 2018-06-07 17:32:53.181194974 -0500 +@@ -46,7 +46,7 @@ + + # gcc 4.8 and later support RTM intrinsics, but require command line switch to enable them + ifneq (,$(shell gcc -dumpversion | egrep "^(4\.[8-9]|[5-9])")) +- RTM_KEY = -mrtm ++ RTM_KEY = # -mrtm + endif + + ifeq ($(cfg), release) -- cgit v1.2.3-70-g09d2 From 7f6f83d173088b95b19d35196a61d01a37953a3c Mon Sep 17 00:00:00 2001 From: sknigh Date: Thu, 7 Jun 2018 21:17:07 -0700 Subject: Added elastic search (#8424) --- .../builtin/packages/elasticsearch/package.py | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 var/spack/repos/builtin/packages/elasticsearch/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/elasticsearch/package.py b/var/spack/repos/builtin/packages/elasticsearch/package.py new file mode 100644 index 0000000000..97c4f4ff9d --- /dev/null +++ b/var/spack/repos/builtin/packages/elasticsearch/package.py @@ -0,0 +1,50 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Elasticsearch(Package): + """Elasticsearch is a search engine based on Lucene. It provides a + distributed, multitenant-capable full-text search engine with an HTTP web + interface and schema-free JSON documents. + """ + + homepage = "https://www.elastic.co/" + url = "https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.2.4.tar.gz" + + version('6.2.4', '692d01956fe7aee2d08ac0fbf7b7a19e') + + depends_on('jdk', type='run') + + def install(self, spec, prefix): + dirs = [ + 'bin', + 'config', + 'lib', + 'modules', + 'plugins'] + + for d in dirs: + install_tree(d, join_path(prefix, d)) -- cgit v1.2.3-70-g09d2 From 7488ed4ff5641ea2eeb7fd1e6b3e95d9a5ced8e4 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Fri, 8 Jun 2018 14:35:43 +0200 Subject: go: Update to 1.10.3 (#8426) --- var/spack/repos/builtin/packages/go/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/go/package.py b/var/spack/repos/builtin/packages/go/package.py index b75dcbf46b..e7c96af8af 100644 --- a/var/spack/repos/builtin/packages/go/package.py +++ b/var/spack/repos/builtin/packages/go/package.py @@ -56,6 +56,7 @@ class Go(Package): extendable = True + version('1.10.3', '567b1cc66c9704d1c019c50bef946272e911ec6baf244310f87f4e678be155f2') version('1.10.2', '6264609c6b9cd8ed8e02ca84605d727ce1898d74efa79841660b2e3e985a98bd') version('1.10.1', '589449ff6c3ccbff1d391d4e7ab5bb5d5643a5a41a04c99315e55c16bbf73ddc') version('1.9.5', 'f1c2bb7f32bbd8fa7a19cc1608e0d06582df32ff5f0340967d83fb0017c49fbc') -- cgit v1.2.3-70-g09d2 From 9b2953939b4e1a09c1d8f07046e8bf97f3bf3584 Mon Sep 17 00:00:00 2001 From: Ricardo Silva Date: Fri, 8 Jun 2018 15:35:28 +0200 Subject: GDL and missing dependencies (#8283) * GDL and missing dependencies Signed-off-by: Ricardo Silva * GDL and GraphicsMagick improvements * GDL: sort variants and dependencies, add descriptions * GDL: add wx variant * GDL: make variants explicit (in cmake args) * GraphicsMagick: sort dependencies * GraphicsMagick: cleanup boilerplate comments Signed-off-by: Ricardo Silva * Improvements/Fixes for gdl, plplot and graphicsmagick * gdl: * variants: * openmp * be explicit about enabling/disabling x11 * dependencies: * logic for plplot with/without wx * some previously missing (where being picked up from the system) * graphicsmagick: previously missing dependencies (where being picked up from the system) * plplot: more versions + variants + dependencies Signed-off-by: Ricardo Silva * GDL: hdf4/5 variants * also sorted explicit enabling/disabling of cmake flags for readability Signed-off-by: Ricardo Silva * plplot: fix variant descriptions Signed-off-by: Ricardo Silva * Add tcl variant, use find_libraries for portability Signed-off-by: Ricardo Silva * plplot: flake8 Signed-off-by: Ricardo Silva --- var/spack/repos/builtin/packages/gdl/package.py | 129 +++++++++++++++++++++ .../builtin/packages/graphicsmagick/package.py | 60 ++++++++++ var/spack/repos/builtin/packages/plplot/package.py | 123 ++++++++++++++++++++ var/spack/repos/builtin/packages/pslib/package.py | 37 ++++++ 4 files changed, 349 insertions(+) create mode 100644 var/spack/repos/builtin/packages/gdl/package.py create mode 100644 var/spack/repos/builtin/packages/graphicsmagick/package.py create mode 100644 var/spack/repos/builtin/packages/plplot/package.py create mode 100644 var/spack/repos/builtin/packages/pslib/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gdl/package.py b/var/spack/repos/builtin/packages/gdl/package.py new file mode 100644 index 0000000000..3de689948e --- /dev/null +++ b/var/spack/repos/builtin/packages/gdl/package.py @@ -0,0 +1,129 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Gdl(CMakePackage): + """A free and open-source IDL/PV-WAVE compiler. + + GNU Data Language (GDL) is a free/libre/open source incremental compiler + compatible with IDL and to some extent with PV-WAVE. + """ + + homepage = "https://github.com/gnudatalanguage/gdl" + url = "https://github.com/gnudatalanguage/gdl/archive/v0.9.8.tar.gz" + + version('0.9.8', '447b0362e1df5ea8af814a969e89d3ec') + + variant( + 'graphicsmagick', + default=False, + description='Enable GraphicsMagick' + ) + variant('hdf4', default=False, description='Enable HDF4') + variant('hdf5', default=True, description='Enable HDF5') + variant('openmp', default=True, description='Enable OpenMP') + variant('proj', default=True, description='Enable LIBPROJ4') + variant('python', default=False, description='Enable Python') + variant('wx', default=False, description='Enable WxWidgets') + variant('x11', default=False, description='Enable X11') + + extends('python', when='+python') + + depends_on('graphicsmagick', when='+graphicsmagick') + depends_on('hdf', when='+hdf4') + depends_on('hdf5', when='+hdf5') + depends_on('libx11', when='+x11') + depends_on('plplot+wx', when='+wx@:5.11') + depends_on('plplot+wx+wxold', when='+wx@5.12:') + depends_on('plplot~wx', when='~wx') + depends_on('proj', when='+proj') + depends_on('py-numpy', type=('build', 'run'), when='+python') + depends_on('python@2.7:2.8', type=('build', 'run'), when='+python') + depends_on('wx', when='+wx') + + depends_on('eigen') + depends_on('fftw') + depends_on('gsl') + depends_on('jpeg') + depends_on('libice') + depends_on('libsm') + depends_on('libxinerama') + depends_on('libxxf86vm') + depends_on('netcdf') + depends_on('pslib') + depends_on('readline') + + def cmake_args(self): + args = [] + + # GraphicsMagick covers the same features as ImageMagick and + # only version 6 of ImageMagick is supported (version 7 is packaged) + args += ['-DMAGICK=OFF'] + + if '+graphicsmagick' in self.spec: + args += ['-DGRAPHICSMAGICK=ON'] + else: + args += ['-DGRAPHICSMAGICK=OFF'] + + if '+hdf4' in self.spec: + args += ['-DHDF=ON'] + else: + args += ['-DHDF=OFF'] + + if '+hdf5' in self.spec: + args += ['-DHDF5=ON'] + else: + args += ['-DHDF5=OFF'] + + if '+openmp' in self.spec: + args += ['-DOPENMP=ON'] + else: + args += ['-DOPENMP=OFF'] + + if '+proj' in self.spec: + args += [ + '-DLIBPROJ4=ON', + '-DLIBPROJ4DIR={0}'.format(self.spec['proj'].prefix) + ] + else: + args += ['-DLIBPROJ4=OFF'] + + if '+python' in self.spec: + args += ['-DPYTHON=ON'] + else: + args += ['-DPYTHON=OFF'] + + if '+wx' in self.spec: + args += ['-DWXWIDGETS=ON'] + else: + args += ['-DWXWIDGETS=OFF'] + + if '+x11' in self.spec: + args += ['-DX11=ON'] + else: + args += ['-DX11=OFF'] + + return args diff --git a/var/spack/repos/builtin/packages/graphicsmagick/package.py b/var/spack/repos/builtin/packages/graphicsmagick/package.py new file mode 100644 index 0000000000..5240153df4 --- /dev/null +++ b/var/spack/repos/builtin/packages/graphicsmagick/package.py @@ -0,0 +1,60 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Graphicsmagick(AutotoolsPackage): + """GraphicsMagick is the swiss army knife of image processing. + + Provides a robust and efficient collection of tools and libraries which + support reading, writing, and manipulating an image in over 88 major + formats including important formats like DPX, GIF, JPEG, JPEG-2000, PNG, + PDF, PNM, and TIFF. + """ + + homepage = "http://www.graphicsmagick.org/" + url = "https://sourceforge.net/projects/graphicsmagick/files/graphicsmagick/1.3.29/GraphicsMagick-1.3.29.tar.xz/download" + + version('1.3.29', 'ddde0dd239592db50c5378472355c03c') + + depends_on('bzip2') + depends_on('ghostscript') + depends_on('ghostscript-fonts') + depends_on('graphviz') + depends_on('jasper') + depends_on('jpeg') + depends_on('lcms') + depends_on('libice') + depends_on('libpng') + depends_on('libsm') + depends_on('libtiff') + depends_on('libtool') + depends_on('libxml2') + depends_on('xz') + depends_on('zlib') + + def configure_args(self): + args = ['--enable-shared'] + return args diff --git a/var/spack/repos/builtin/packages/plplot/package.py b/var/spack/repos/builtin/packages/plplot/package.py new file mode 100644 index 0000000000..e6aabc1ce5 --- /dev/null +++ b/var/spack/repos/builtin/packages/plplot/package.py @@ -0,0 +1,123 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Plplot(CMakePackage): + """PLplot is a cross-platform package for creating scientific plots.""" + + homepage = "http://plplot.sourceforge.net/" + url = "https://sourceforge.net/projects/plplot/files/plplot/5.13.0%20Source/plplot-5.13.0.tar.gz/download" + + version('5.13.0', 'bfefeae7fb9a23377c6dc37b44a7da8a') + version('5.12.0', '998a05be218e5de8f2faf988b8dbdc51') + version('5.11.0', '632c9e13b09f4e2b2517b3567bc3cece') + + variant('java', default=False, description='Enable Java binding') + variant('lua', default=False, description='Enable Lua binding') + variant('pango', default=False, description='Enable Pango') + variant('python', default=False, description='Enable Python binding') + variant('qt', default=False, description='Enable QT binding') + variant('tcl', default=True, description='Enable TCL binding') + variant('wx', default=False, description='Enable WxWidgets') + variant('wxold', default=False, description='Use WxWidgets old interface') + + conflicts('~wx', when='+wxold') + conflicts('+wxold', when='@:5.11') + + depends_on('java', when='+java') + depends_on('lua', when='+lua') + depends_on('pango', when='+pango') + depends_on('py-numpy', type=('build', 'run'), when='+python') + depends_on('python@2.7:2.8', type=('build', 'run'), when='+python') + depends_on('qt', when='+qt') + depends_on('tcl', when='+tcl') + depends_on('wx', when='+wx') + + depends_on('freetype') + depends_on('gtkplus') + depends_on('libx11') + depends_on('qhull') + depends_on('swig') + + def cmake_args(self): + args = [] + # needs 'tk with wish' + args += ['-DENABLE_tk=OFF'] + + if '+java' in self.spec: + args += ['-DENABLE_java=ON'] + else: + args += ['-DENABLE_java=OFF'] + + if '+lua' in self.spec: + args += ['-DENABLE_lua=ON'] + else: + args += ['-DENABLE_lua=OFF'] + + if '+python' in self.spec: + args += ['-DENABLE_python=ON'] + else: + args += ['-DENABLE_python=OFF'] + + if '+qt' in self.spec: + args += ['-DENABLE_qt=ON'] + else: + args += ['-DENABLE_qt=OFF'] + + if '+tcl' in self.spec: + args += ['-DENABLE_tcl=ON'] + # could also be addressed by creating the links within tcl + # as is done for the tclsh executable + args += [ + '-DTCL_INCLUDE_PATH={0}/include'.format( + self.spec['tcl'].prefix.include + ), + '-DTCL_LIBRARY={0}'.format( + LibraryList(find_libraries( + 'libtcl*', + self.spec['tcl'].prefix.lib, + shared=True, + )), + ), + '-DTCL_STUB_LIBRARY={0}'.format( + LibraryList(find_libraries( + 'libtclstub*', + self.spec['tcl'].prefix.lib, + shared=False, + )), + ) + ] + else: + args += ['-DENABLE_tcl=OFF'] + + if '+wx' in self.spec: + args += ['-DENABLE_wxwidgets=ON'] + if '+wxold' in self.spec: + args += ['-DOLD_WXWIDGETS=ON'] + else: + args += ['-DENABLE_wxwidgets=OFF'] + + return args diff --git a/var/spack/repos/builtin/packages/pslib/package.py b/var/spack/repos/builtin/packages/pslib/package.py new file mode 100644 index 0000000000..bb49f9cddf --- /dev/null +++ b/var/spack/repos/builtin/packages/pslib/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Pslib(AutotoolsPackage): + """C-library to create PostScript files on the fly.""" + + homepage = "http://pslib.sourceforge.net/" + url = "https://kent.dl.sourceforge.net/project/pslib/pslib/0.4.5/pslib-0.4.5.tar.gz" + + version('0.4.5', '03f39393628a6d758799b9f845047e27') + + depends_on('jpeg') + depends_on('libpng') -- cgit v1.2.3-70-g09d2 From cd860d755427aa088995fb26b39111d9ca69dd1f Mon Sep 17 00:00:00 2001 From: Oliver Pola <5pola@informatik.uni-hamburg.de> Date: Fri, 8 Jun 2018 15:39:03 +0200 Subject: new version scotch@6.0.5a (#8254) * new version scotch@6.0.5a * patch metis headers on scotch@6.0.4 according to https://gforge.inria.fr/tracker/?func=detail&atid=1082&aid=19521&group_id=248 --- .../packages/scotch/metis-headers-6.0.4.patch | 634 +++++++++++++++++++++ var/spack/repos/builtin/packages/scotch/package.py | 2 + 2 files changed, 636 insertions(+) create mode 100644 var/spack/repos/builtin/packages/scotch/metis-headers-6.0.4.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/scotch/metis-headers-6.0.4.patch b/var/spack/repos/builtin/packages/scotch/metis-headers-6.0.4.patch new file mode 100644 index 0000000000..9c902a62b8 --- /dev/null +++ b/var/spack/repos/builtin/packages/scotch/metis-headers-6.0.4.patch @@ -0,0 +1,634 @@ +--- A/src/libscotch/Makefile 2014-09-23 21:28:28.000000000 +0200 ++++ B/src/libscotch/Makefile 2015-07-24 12:51:31.357132922 +0200 +@@ -60,7 +60,7 @@ scotch : + libscotcherrexit$(LIB) + + ptscotch : scotch +- $(MAKE) CFLAGS="$(CFLAGS) -DSCOTCH_PTSCOTCH" CC="$(CCP)" \ ++ $(MAKE) CFLAGS="$(CFLAGS) -DSCOTCH_PTSCOTCH" CC="$(CCP)" CCD="$(CCP)" \ + ptscotch.h \ + ptscotchf.h \ + libptscotch$(LIB) \ +--- A/src/libscotchmetis/Makefile 2011-09-06 18:46:48.000000000 +0200 ++++ B/src/libscotchmetis/Makefile 2015-08-25 13:37:31.424467916 +0200 +@@ -54,10 +54,12 @@ include ../Makefile.inc + + scotch : + $(MAKE) CC="$(CCS)" SCOTCHLIB=ptscotch \ ++ metis.h \ + libscotchmetis$(LIB) + + ptscotch : + $(MAKE) CFLAGS="$(CFLAGS) -DSCOTCH_PTSCOTCH" CC="$(CCP)" SCOTCHLIB=ptscotch \ ++ parmetis.h \ + libptscotchparmetis$(LIB) + + install : scotch +@@ -69,7 +71,7 @@ ptinstall : ptscotch + -$(CP) libptscotchparmetis$(LIB) $(libdir) + + clean : +- -$(RM) *~ *$(OBJ) lib*$(LIB) ++ -$(RM) *~ *$(OBJ) lib*$(LIB) metis.h parmetis.h + + realclean : clean + +@@ -138,3 +140,10 @@ libscotchmetis$(LIB) : metis_graph_orde + metis_graph_part_f$(OBJ) + $(AR) $(ARFLAGS) $(@) $(^) + -$(RANLIB) $(@) ++metis.h : metis_skeleton.h \ ++ ../libscotch/dummysizes ++ ../libscotch/dummysizes metis_skeleton.h metis.h ++ ++parmetis.h : parmetis_skeleton.h \ ++ ../libscotch/dummysizes ++ ../libscotch/dummysizes parmetis_skeleton.h parmetis.h +--- A/src/libscotchmetis/metis.h 2012-09-13 17:43:52.000000000 +0200 ++++ B/src/libscotchmetis/metis.h 1970-01-01 01:00:00.000000000 +0100 +@@ -1,97 +0,0 @@ +-/********************************************************* +-** ** +-** WARNING: THIS IS NOT THE ORIGINAL INCLUDE FILE OF ** +-** THE MeTiS SOFTWARE PACKAGE. ** +-** This file is a compatibility include file provided ** +-** as part of the Scotch software distribution. ** +-** Preferably use the original MeTiS include file to ** +-** keep definitions of routines not overloaded by ** +-** the libScotchMeTiS library. ** +-** ** +-*********************************************************/ +-/* Copyright 2007,2010,2012 IPB, Universite de Bordeaux, INRIA & CNRS +-** +-** This file is part of the Scotch software package for static mapping, +-** graph partitioning and sparse matrix ordering. +-** +-** This software is governed by the CeCILL-C license under French law +-** and abiding by the rules of distribution of free software. You can +-** use, modify and/or redistribute the software under the terms of the +-** CeCILL-C license as circulated by CEA, CNRS and INRIA at the following +-** URL: "http://www.cecill.info". +-** +-** As a counterpart to the access to the source code and rights to copy, +-** modify and redistribute granted by the license, users are provided +-** only with a limited warranty and the software's author, the holder of +-** the economic rights, and the successive licensors have only limited +-** liability. +-** +-** In this respect, the user's attention is drawn to the risks associated +-** with loading, using, modifying and/or developing or reproducing the +-** software by the user in light of its specific status of free software, +-** that may mean that it is complicated to manipulate, and that also +-** therefore means that it is reserved for developers and experienced +-** professionals having in-depth computer knowledge. Users are therefore +-** encouraged to load and test the software's suitability as regards +-** their requirements in conditions enabling the security of their +-** systems and/or data to be ensured and, more generally, to use and +-** operate it in the same conditions as regards security. +-** +-** The fact that you are presently reading this means that you have had +-** knowledge of the CeCILL-C license and that you accept its terms. +-*/ +-/************************************************************/ +-/** **/ +-/** NAME : metis.h **/ +-/** **/ +-/** AUTHOR : Francois PELLEGRINI **/ +-/** **/ +-/** FUNCTION : Compatibility declaration file for the **/ +-/** MeTiS interface routines provided by **/ +-/** the Scotch project. **/ +-/** **/ +-/** DATES : # Version 5.0 : from : 08 sep 2006 **/ +-/** to 07 jun 2007 **/ +-/** # Version 5.1 : from : 30 jun 2010 **/ +-/** to 30 jun 2010 **/ +-/** # Version 6.0 : from : 13 sep 2012 **/ +-/** to 13 sep 2012 **/ +-/** **/ +-/************************************************************/ +- +-/* +-** The defines. +-*/ +- +-#ifdef SCOTCH_METIS_PREFIX +-#define SCOTCH_METIS_PREFIXL scotch_ +-#define SCOTCH_METIS_PREFIXU SCOTCH_ +-#endif /* SCOTCH_METIS_PREFIX */ +- +-#ifndef SCOTCH_METIS_PREFIXL +-#define SCOTCH_METIS_PREFIXL +-#endif /* SCOTCH_METIS_PREFIXL */ +- +-#ifndef SCOTCH_METIS_PREFIXU +-#define SCOTCH_METIS_PREFIXU +-#endif /* SCOTCH_METIS_PREFIXU */ +- +-#ifndef METISNAMEL +-#define METISNAMEL(s) METISNAME2(METISNAME3(SCOTCH_METIS_PREFIXL),s) +-#define METISNAMEU(s) METISNAME2(METISNAME3(SCOTCH_METIS_PREFIXU),s) +-#define METISNAME2(p,s) METISNAME4(p,s) +-#define METISNAME3(s) s +-#define METISNAME4(p,s) p##s +-#endif /* METISNAMEL */ +- +-/* +-** The function prototypes. +-*/ +- +-void METISNAMEU(METIS_EdgeND) (const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const); +-void METISNAMEU(METIS_NodeND) (const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const); +-void METISNAMEU(METIS_NodeWND) (const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const); +- +-void METISNAMEU(METIS_PartGraphKway) (const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const); +-void METISNAMEU(METIS_PartGraphRecursive) (const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const); +-void METISNAMEU(METIS_PartGraphVKway) (const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const); +--- A/src/libscotchmetis/metis_skeleton.h 1970-01-01 01:00:00.000000000 +0100 ++++ B/src/libscotchmetis/metis_skeleton.h 2015-08-25 13:27:07.224497875 +0200 +@@ -0,0 +1,103 @@ ++/********************************************************* ++** ** ++** WARNING: THIS IS NOT THE ORIGINAL INCLUDE FILE OF ** ++** THE MeTiS SOFTWARE PACKAGE. ** ++** This file is a compatibility include file provided ** ++** as part of the Scotch software distribution. ** ++** Preferably use the original MeTiS include file to ** ++** keep definitions of routines not overloaded by ** ++** the libScotchMeTiS library. ** ++** ** ++*********************************************************/ ++/* Copyright 2007,2010,2012 IPB, Universite de Bordeaux, INRIA & CNRS ++** ++** This file is part of the Scotch software package for static mapping, ++** graph partitioning and sparse matrix ordering. ++** ++** This software is governed by the CeCILL-C license under French law ++** and abiding by the rules of distribution of free software. You can ++** use, modify and/or redistribute the software under the terms of the ++** CeCILL-C license as circulated by CEA, CNRS and INRIA at the following ++** URL: "http://www.cecill.info". ++** ++** As a counterpart to the access to the source code and rights to copy, ++** modify and redistribute granted by the license, users are provided ++** only with a limited warranty and the software's author, the holder of ++** the economic rights, and the successive licensors have only limited ++** liability. ++** ++** In this respect, the user's attention is drawn to the risks associated ++** with loading, using, modifying and/or developing or reproducing the ++** software by the user in light of its specific status of free software, ++** that may mean that it is complicated to manipulate, and that also ++** therefore means that it is reserved for developers and experienced ++** professionals having in-depth computer knowledge. Users are therefore ++** encouraged to load and test the software's suitability as regards ++** their requirements in conditions enabling the security of their ++** systems and/or data to be ensured and, more generally, to use and ++** operate it in the same conditions as regards security. ++** ++** The fact that you are presently reading this means that you have had ++** knowledge of the CeCILL-C license and that you accept its terms. ++*/ ++/************************************************************/ ++/** **/ ++/** NAME : metis.h **/ ++/** **/ ++/** AUTHOR : Francois PELLEGRINI **/ ++/** **/ ++/** FUNCTION : Compatibility declaration file for the **/ ++/** MeTiS interface routines provided by **/ ++/** the Scotch project. **/ ++/** **/ ++/** DATES : # Version 5.0 : from : 08 sep 2006 **/ ++/** to 07 jun 2007 **/ ++/** # Version 5.1 : from : 30 jun 2010 **/ ++/** to 30 jun 2010 **/ ++/** # Version 6.0 : from : 13 sep 2012 **/ ++/** to 13 sep 2012 **/ ++/** **/ ++/************************************************************/ ++ ++#include ++ ++/* ++** The defines. ++*/ ++ ++#ifdef SCOTCH_METIS_PREFIX ++#define SCOTCH_METIS_PREFIXL scotch_ ++#define SCOTCH_METIS_PREFIXU SCOTCH_ ++#endif /* SCOTCH_METIS_PREFIX */ ++ ++#ifndef SCOTCH_METIS_PREFIXL ++#define SCOTCH_METIS_PREFIXL ++#endif /* SCOTCH_METIS_PREFIXL */ ++ ++#ifndef SCOTCH_METIS_PREFIXU ++#define SCOTCH_METIS_PREFIXU ++#endif /* SCOTCH_METIS_PREFIXU */ ++ ++#ifndef METISNAMEL ++#define METISNAMEL(s) METISNAME2(METISNAME3(SCOTCH_METIS_PREFIXL),s) ++#define METISNAMEU(s) METISNAME2(METISNAME3(SCOTCH_METIS_PREFIXU),s) ++#define METISNAME2(p,s) METISNAME4(p,s) ++#define METISNAME3(s) s ++#define METISNAME4(p,s) p##s ++#endif /* METISNAMEL */ ++ ++/*+ Integer type. +*/ ++ ++typedef DUMMYINT SCOTCH_Num; ++ ++/* ++** The function prototypes. ++*/ ++ ++void METISNAMEU(METIS_EdgeND) (const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const); ++void METISNAMEU(METIS_NodeND) (const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const); ++void METISNAMEU(METIS_NodeWND) (const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const); ++ ++void METISNAMEU(METIS_PartGraphKway) (const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const); ++void METISNAMEU(METIS_PartGraphRecursive) (const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const); ++void METISNAMEU(METIS_PartGraphVKway) (const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const); +--- A/src/libscotchmetis/parmetis.h 2012-09-13 17:41:21.000000000 +0200 ++++ B/src/libscotchmetis/parmetis.h 1970-01-01 01:00:00.000000000 +0100 +@@ -1,100 +0,0 @@ +-/********************************************************* +-** ** +-** WARNING: THIS IS NOT THE ORIGINAL INCLUDE FILE OF ** +-** THE ParMeTiS SOFTWARE PACKAGE. ** +-** This file is a compatibility include file provided ** +-** as part of the Scotch software distribution. ** +-** Preferably use the original ParMeTiS include file ** +-** to keep definitions of routines not overloaded by ** +-** the libPTScotchMeTiS library. ** +-** ** +-*********************************************************/ +-/* Copyright 2007,2008,2010,2012 IPB, Universite de Bordeaux, INRIA & CNRS +-** +-** This file is part of the Scotch software package for static mapping, +-** graph partitioning and sparse matrix ordering. +-** +-** This software is governed by the CeCILL-C license under French law +-** and abiding by the rules of distribution of free software. You can +-** use, modify and/or redistribute the software under the terms of the +-** CeCILL-C license as circulated by CEA, CNRS and INRIA at the following +-** URL: "http://www.cecill.info". +-** +-** As a counterpart to the access to the source code and rights to copy, +-** modify and redistribute granted by the license, users are provided +-** only with a limited warranty and the software's author, the holder of +-** the economic rights, and the successive licensors have only limited +-** liability. +-** +-** In this respect, the user's attention is drawn to the risks associated +-** with loading, using, modifying and/or developing or reproducing the +-** software by the user in light of its specific status of free software, +-** that may mean that it is complicated to manipulate, and that also +-** therefore means that it is reserved for developers and experienced +-** professionals having in-depth computer knowledge. Users are therefore +-** encouraged to load and test the software's suitability as regards +-** their requirements in conditions enabling the security of their +-** systems and/or data to be ensured and, more generally, to use and +-** operate it in the same conditions as regards security. +-** +-** The fact that you are presently reading this means that you have had +-** knowledge of the CeCILL-C license and that you accept its terms. +-*/ +-/************************************************************/ +-/** **/ +-/** NAME : parmetis.h **/ +-/** **/ +-/** AUTHOR : Francois PELLEGRINI **/ +-/** **/ +-/** FUNCTION : Compatibility declaration file for the **/ +-/** MeTiS interface routines provided by **/ +-/** the Scotch project. **/ +-/** **/ +-/** DATES : # Version 5.0 : from : 17 oct 2007 **/ +-/** to 18 oct 2007 **/ +-/** # Version 5.1 : from : 19 jun 2008 **/ +-/** to 30 jun 2010 **/ +-/** # Version 6.0 : from : 13 sep 2012 **/ +-/** to 13 sep 2012 **/ +-/** **/ +-/************************************************************/ +- +-/* +-** The defines and includes. +-*/ +- +-#ifndef __parmetis_h__ +-#define __parmetis_h__ +- +-#include /* Since ParMeTiS does it, do it too */ +- +-#endif /* __parmetis_h__ */ +- +-#ifdef SCOTCH_METIS_PREFIX +-#define SCOTCH_METIS_PREFIXL scotch_ +-#define SCOTCH_METIS_PREFIXU SCOTCH_ +-#endif /* SCOTCH_METIS_PREFIX */ +- +-#ifndef SCOTCH_METIS_PREFIXL +-#define SCOTCH_METIS_PREFIXL +-#endif /* SCOTCH_METIS_PREFIXL */ +- +-#ifndef SCOTCH_METIS_PREFIXU +-#define SCOTCH_METIS_PREFIXU +-#endif /* SCOTCH_METIS_PREFIXU */ +- +-#ifndef METISNAMEL +-#define METISNAMEL(s) METISNAME2(METISNAME3(SCOTCH_METIS_PREFIXL),s) +-#define METISNAMEU(s) METISNAME2(METISNAME3(SCOTCH_METIS_PREFIXU),s) +-#define METISNAME2(p,s) METISNAME4(p,s) +-#define METISNAME3(s) s +-#define METISNAME4(p,s) p##s +-#endif /* METISNAMEL */ +- +-/* +-** The function prototypes. +-*/ +- +-void METISNAMEU(ParMETIS_V3_NodeND) (const SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const, MPI_Comm * const); +-void METISNAMEU(ParMETIS_V3_PartGeomKway) (const SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const float * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const float * const, const float * const, const SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const, MPI_Comm * const); +-void METISNAMEU(ParMETIS_V3_PartKway) (const SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const float * const, const float * const, const SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const, MPI_Comm * const); +--- A/src/libscotchmetis/parmetis_skeleton.h 1970-01-01 01:00:00.000000000 +0100 ++++ B/src/libscotchmetis/parmetis_skeleton.h 2015-08-25 13:42:17.972454163 +0200 +@@ -0,0 +1,105 @@ ++/********************************************************* ++** ** ++** WARNING: THIS IS NOT THE ORIGINAL INCLUDE FILE OF ** ++** THE ParMeTiS SOFTWARE PACKAGE. ** ++** This file is a compatibility include file provided ** ++** as part of the Scotch software distribution. ** ++** Preferably use the original ParMeTiS include file ** ++** to keep definitions of routines not overloaded by ** ++** the libPTScotchMeTiS library. ** ++** ** ++*********************************************************/ ++/* Copyright 2007,2008,2010,2012 IPB, Universite de Bordeaux, INRIA & CNRS ++** ++** This file is part of the Scotch software package for static mapping, ++** graph partitioning and sparse matrix ordering. ++** ++** This software is governed by the CeCILL-C license under French law ++** and abiding by the rules of distribution of free software. You can ++** use, modify and/or redistribute the software under the terms of the ++** CeCILL-C license as circulated by CEA, CNRS and INRIA at the following ++** URL: "http://www.cecill.info". ++** ++** As a counterpart to the access to the source code and rights to copy, ++** modify and redistribute granted by the license, users are provided ++** only with a limited warranty and the software's author, the holder of ++** the economic rights, and the successive licensors have only limited ++** liability. ++** ++** In this respect, the user's attention is drawn to the risks associated ++** with loading, using, modifying and/or developing or reproducing the ++** software by the user in light of its specific status of free software, ++** that may mean that it is complicated to manipulate, and that also ++** therefore means that it is reserved for developers and experienced ++** professionals having in-depth computer knowledge. Users are therefore ++** encouraged to load and test the software's suitability as regards ++** their requirements in conditions enabling the security of their ++** systems and/or data to be ensured and, more generally, to use and ++** operate it in the same conditions as regards security. ++** ++** The fact that you are presently reading this means that you have had ++** knowledge of the CeCILL-C license and that you accept its terms. ++*/ ++/************************************************************/ ++/** **/ ++/** NAME : parmetis.h **/ ++/** **/ ++/** AUTHOR : Francois PELLEGRINI **/ ++/** **/ ++/** FUNCTION : Compatibility declaration file for the **/ ++/** MeTiS interface routines provided by **/ ++/** the Scotch project. **/ ++/** **/ ++/** DATES : # Version 5.0 : from : 17 oct 2007 **/ ++/** to 18 oct 2007 **/ ++/** # Version 5.1 : from : 19 jun 2008 **/ ++/** to 30 jun 2010 **/ ++/** # Version 6.0 : from : 13 sep 2012 **/ ++/** to 13 sep 2012 **/ ++/** **/ ++/************************************************************/ ++ ++/* ++** The defines and includes. ++*/ ++ ++#ifndef __parmetis_h__ ++#define __parmetis_h__ ++ ++#include ++#include /* Since ParMeTiS does it, do it too */ ++ ++#endif /* __parmetis_h__ */ ++ ++#ifdef SCOTCH_METIS_PREFIX ++#define SCOTCH_METIS_PREFIXL scotch_ ++#define SCOTCH_METIS_PREFIXU SCOTCH_ ++#endif /* SCOTCH_METIS_PREFIX */ ++ ++#ifndef SCOTCH_METIS_PREFIXL ++#define SCOTCH_METIS_PREFIXL ++#endif /* SCOTCH_METIS_PREFIXL */ ++ ++#ifndef SCOTCH_METIS_PREFIXU ++#define SCOTCH_METIS_PREFIXU ++#endif /* SCOTCH_METIS_PREFIXU */ ++ ++#ifndef METISNAMEL ++#define METISNAMEL(s) METISNAME2(METISNAME3(SCOTCH_METIS_PREFIXL),s) ++#define METISNAMEU(s) METISNAME2(METISNAME3(SCOTCH_METIS_PREFIXU),s) ++#define METISNAME2(p,s) METISNAME4(p,s) ++#define METISNAME3(s) s ++#define METISNAME4(p,s) p##s ++#endif /* METISNAMEL */ ++ ++/*+ Integer type. +*/ ++ ++typedef DUMMYINT SCOTCH_Num; ++ ++/* ++** The function prototypes. ++*/ ++ ++void METISNAMEU(ParMETIS_V3_NodeND) (const SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const, MPI_Comm * const); ++void METISNAMEU(ParMETIS_V3_PartGeomKway) (const SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const float * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const float * const, const float * const, const SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const, MPI_Comm * const); ++void METISNAMEU(ParMETIS_V3_PartKway) (const SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const SCOTCH_Num * const, const float * const, const float * const, const SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const, MPI_Comm * const); +--- A/src/Makefile 2014-10-02 17:31:36.000000000 +0200 ++++ B/src/Makefile 2015-08-25 13:00:50.288573562 +0200 +@@ -115,6 +115,7 @@ install : required $(bindir) $(includ + -$(CP) -f ../bin/[agm]*$(EXE) $(bindir) + -$(CP) -f ../bin/d[agm]*$(EXE) $(bindir) + -$(CP) -f ../include/*scotch*.h $(includedir) ++ -$(CP) -f ../include/*metis*.h $(includedir) + -$(CP) -f ../lib/*scotch*$(LIB) $(libdir) + -$(CP) -Rf ../man/* $(mandir) + +--- A/src/Makefile~ 1970-01-01 01:00:00.000000000 +0100 ++++ B/src/Makefile~ 2014-10-02 17:31:36.000000000 +0200 +@@ -0,0 +1,134 @@ ++## Copyright 2004,2007,2008,2010-2012,2014 IPB, Universite de Bordeaux, INRIA & CNRS ++## ++## This file is part of the Scotch software package for static mapping, ++## graph partitioning and sparse matrix ordering. ++## ++## This software is governed by the CeCILL-C license under French law ++## and abiding by the rules of distribution of free software. You can ++## use, modify and/or redistribute the software under the terms of the ++## CeCILL-C license as circulated by CEA, CNRS and INRIA at the following ++## URL: "http://www.cecill.info". ++## ++## As a counterpart to the access to the source code and rights to copy, ++## modify and redistribute granted by the license, users are provided ++## only with a limited warranty and the software's author, the holder of ++## the economic rights, and the successive licensors have only limited ++## liability. ++## ++## In this respect, the user's attention is drawn to the risks associated ++## with loading, using, modifying and/or developing or reproducing the ++## software by the user in light of its specific status of free software, ++## that may mean that it is complicated to manipulate, and that also ++## therefore means that it is reserved for developers and experienced ++## professionals having in-depth computer knowledge. Users are therefore ++## encouraged to load and test the software's suitability as regards ++## their requirements in conditions enabling the security of their ++## systems and/or data to be ensured and, more generally, to use and ++## operate it in the same conditions as regards security. ++## ++## The fact that you are presently reading this means that you have had ++## knowledge of the CeCILL-C license and that you accept its terms. ++## ++ ++VERSION = 6 ++RELEASE = 0 ++PATCHLEVEL = 4 ++ ++.PHONY : clean default install ptscotch realclean required scotch ++ ++default : scotch ++ ++required : Makefile.inc ../bin ../include ../lib ++ ++Makefile.inc : ++ @echo "#####################################################################" ++ @echo "BEFORE COMPILING Scotch OR PT-Scotch, YOU SHOULD HAVE AN APPROPRIATE" ++ @echo "Makefile.inc FILE IN THIS DIRECTORY. PLEASE LOOK INTO DIRECTORY" ++ @echo " ./Make.inc FOR AN EXISTING Makefile.inc FILE THAT FITS YOUR NEED, OR" ++ @echo "USE THEM AS MODELS IN CASE YOU NEED TO BUILD A NEW ONE FOR YOUR" ++ @echo "PARTICULAR PLATFORM." ++ @echo "#####################################################################" ++ @echo "Then, type \"make scotch\" (default) for the sequential library" ++ @echo "and software, or \"make ptscotch\" for the parallel library and" ++ @echo "software." ++ @exit 1 ++ ++include Makefile.inc ++ ++prefix ?= /usr/local ++bindir ?= $(prefix)/bin ++includedir ?= $(prefix)/include ++libdir ?= $(prefix)/lib ++datarootdir ?= $(prefix)/share ++mandir ?= $(datarootdir)/man ++ ++../bin : ++ -$(MKDIR) ../bin ++ ++../include : ++ -$(MKDIR) ../include ++ ++../lib : ++ -$(MKDIR) ../lib ++ ++$(bindir) : ++ -$(MKDIR) $(bindir) ++ ++$(datarootdir) : ++ -$(MKDIR) $(datarootdir) ++ ++$(includedir) : ++ -$(MKDIR) $(includedir) ++ ++$(libdir) : ++ -$(MKDIR) $(libdir) ++ ++$(mandir) : $(datarootdir) ++ -$(MKDIR) $(mandir) ++ ++$(mandir)/man1 : $(mandir) ++ -$(MKDIR) $(mandir)/man1 ++ ++scotch : required ++ (cd libscotch ; $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) scotch && $(MAKE) install) ++ (cd scotch ; $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) scotch && $(MAKE) install) ++ (cd libscotchmetis ; $(MAKE) scotch && $(MAKE) install) ++ ++ptscotch : required ++ (cd libscotch ; $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) ptscotch && $(MAKE) ptinstall) ++ (cd scotch ; $(MAKE) VERSION=$(VERSION) RELEASE=$(RELEASE) PATCHLEVEL=$(PATCHLEVEL) ptscotch && $(MAKE) ptinstall) ++ (cd libscotchmetis ; $(MAKE) ptscotch && $(MAKE) ptinstall) ++ ++check : scotch ++ (cd check ; $(MAKE) check) ++ ++ptcheck : ptscotch ++ (cd check ; $(MAKE) ptcheck) ++ ++esmumps : scotch ++ (cd esmumps ; $(MAKE) scotch && $(MAKE) install) ++ ++ptesmumps : ptscotch ++ (cd esmumps ; $(MAKE) ptscotch && $(MAKE) ptinstall) ++ ++install : required $(bindir) $(includedir) $(libdir) $(mandir)/man1 ++ -$(CP) -f ../bin/[agm]*$(EXE) $(bindir) ++ -$(CP) -f ../bin/d[agm]*$(EXE) $(bindir) ++ -$(CP) -f ../include/*scotch*.h $(includedir) ++ -$(CP) -f ../lib/*scotch*$(LIB) $(libdir) ++ -$(CP) -Rf ../man/* $(mandir) ++ ++clean : required ++ (cd libscotch ; $(MAKE) clean) ++ (cd scotch ; $(MAKE) clean) ++ (cd libscotchmetis ; $(MAKE) clean) ++ (cd check ; $(MAKE) clean) ++ (cd esmumps ; $(MAKE) clean) ++ ++realclean : required ++ (cd libscotch ; $(MAKE) realclean) ++ (cd scotch ; $(MAKE) realclean) ++ (cd libscotchmetis ; $(MAKE) realclean) ++ (cd check ; $(MAKE) realclean) ++ (cd esmumps ; $(MAKE) realclean) ++ -$(RM) ../bin/* ../include/* ../lib/* +--- A/src/Make.inc/Makefile.inc.x86-64_pc_linux2~ 1970-01-01 01:00:00.000000000 +0100 ++++ B/src/Make.inc/Makefile.inc.x86-64_pc_linux2~ 2015-08-25 13:09:33.984548426 +0200 +@@ -0,0 +1,21 @@ ++EXE = ++LIB = .a ++OBJ = .o ++ ++MAKE = make ++AR = ar ++ARFLAGS = -ruv ++CAT = cat ++CCS = gcc ++CCP = mpicc ++CCD = gcc ++CFLAGS = -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict -DIDXSIZE64 -DINT=int64_t ++CLIBFLAGS = ++LDFLAGS = -lz -lm -lrt -pthread ++CP = cp ++LEX = flex -Pscotchyy -olex.yy.c ++LN = ln ++MKDIR = mkdir ++MV = mv ++RANLIB = ranlib ++YACC = bison -pscotchyy -y -b y diff --git a/var/spack/repos/builtin/packages/scotch/package.py b/var/spack/repos/builtin/packages/scotch/package.py index 0d8eaf1964..2e550bf2a7 100644 --- a/var/spack/repos/builtin/packages/scotch/package.py +++ b/var/spack/repos/builtin/packages/scotch/package.py @@ -33,6 +33,7 @@ class Scotch(Package): url = "http://gforge.inria.fr/frs/download.php/latestfile/298/scotch_6.0.4.tar.gz" list_url = "http://gforge.inria.fr/frs/?group_id=248" + version('6.0.5a', '8430dff7175a1dfd5a3258e75260cf71') version('6.0.4', 'd58b825eb95e1db77efe8c6ff42d329f') version('6.0.3', '10b0cc0f184de2de99859eafaca83cfc') version('6.0.0', 'c50d6187462ba801f9a82133ee666e8e') @@ -60,6 +61,7 @@ class Scotch(Package): # Version-specific patches patch('nonthreaded-6.0.4.patch', when='@6.0.4') patch('esmumps-ldflags-6.0.4.patch', when='@6.0.4') + patch('metis-headers-6.0.4.patch', when='@6.0.4') # NOTE: In cross-compiling environment parallel build # produces weird linker errors. -- cgit v1.2.3-70-g09d2 From 4a53942ee1d1797c32c5039ae7a4bd878f37189c Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Fri, 8 Jun 2018 14:10:40 -0400 Subject: tcl package: Install sources (#8153) The tcl package references the original sources upon install, and the tk build requires the tcl sources. This updates the tcl package to install its sources following the example of #4102, and also updates the tclConfig.sh file to properly reference the installed sources (rather than the staging directory created by Spack). --- var/spack/repos/builtin/packages/tcl/package.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/tcl/package.py b/var/spack/repos/builtin/packages/tcl/package.py index 6c4278d514..e899ab55b4 100644 --- a/var/spack/repos/builtin/packages/tcl/package.py +++ b/var/spack/repos/builtin/packages/tcl/package.py @@ -61,9 +61,30 @@ class Tcl(AutotoolsPackage): with working_dir(self.build_directory): make('install') + # http://wiki.tcl.tk/17463 + if self.spec.satisfies('@8.6:'): + make('install-headers') + # Some applications like Expect require private Tcl headers. make('install-private-headers') + # Copy source to install tree + # A user-provided install option might re-do this + # https://github.com/spack/spack/pull/4102/files + installed_src = join_path( + self.spec.prefix, 'share', self.name, 'src') + stage_src = os.path.realpath(self.stage.source_path) + install_tree(stage_src, installed_src) + + # Replace stage dir -> installed src dir in tclConfig + filter_file( + stage_src, installed_src, + join_path(self.spec.prefix, 'lib', 'tclConfig.sh')) + + # Don't install binaries in src/ tree + with working_dir(join_path(installed_src, self.configure_directory)): + make('clean') + @run_after('install') def symlink_tclsh(self): with working_dir(self.prefix.bin): -- cgit v1.2.3-70-g09d2 From ceb2790f30c5ad5a9d90121057bb93f45448778e Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Fri, 8 Jun 2018 14:48:54 -0500 Subject: r-mice: new package (#8423) * r-mice: new package * flake8 fixed --- var/spack/repos/builtin/packages/r-mice/package.py | 57 ++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-mice/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-mice/package.py b/var/spack/repos/builtin/packages/r-mice/package.py new file mode 100644 index 0000000000..43bf35dbdd --- /dev/null +++ b/var/spack/repos/builtin/packages/r-mice/package.py @@ -0,0 +1,57 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RMice(RPackage): + """Multiple imputation using Fully Conditional Specification (FCS) + implemented by the MICE algorithm as described in Van Buuren and + Groothuis-Oudshoorn (2011) . + + Each variable has its own imputation model. Built-in imputation models are + provided for continuous data (predictive mean matching, normal), binary + data (logistic regression), unordered categorical data (polytomous logistic + regression) and ordered categorical data (proportional odds). MICE can + also impute continuous two-level data (normal model, pan, second-level + variables). Passive imputation can be used to maintain consistency between + variables. Various diagnostic plots are available to inspect the quality + of the imputations.""" + + homepage = "https://cran.r-project.org/package=mice" + url = "https://cran.r-project.org/src/contrib/mice_3.0.0.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/mice" + + version('3.0.0', 'fb54a29679536c474c756cca4538d7e3') + + depends_on('r-broom', type=('build', 'run')) + depends_on('r-dplyr', type=('build', 'run')) + depends_on('r-mass', type=('build', 'run')) + depends_on('r-mitml', type=('build', 'run')) + depends_on('r-nnet', type=('build', 'run')) + depends_on('r-rcpp', type=('build', 'run')) + depends_on('r-rlang', type=('build', 'run')) + depends_on('r-rpart', type=('build', 'run')) + depends_on('r-survival', type=('build', 'run')) + depends_on('r-lattice', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 15c98fa57c0022df3c3788f19b3febd484d8ccd7 Mon Sep 17 00:00:00 2001 From: Chris Green Date: Fri, 8 Jun 2018 15:49:31 -0500 Subject: compiler flags: add cxx98 standard support (#7601) The following improvements are made to cxx standard support (e.g. compiler.cxxNN_flag functions) in compilers: * Add cxx98_flag property * Add support for throwing an exception when a flag is not supported (previously if a flag was not supported the application was terminated with tty.die) * The name of the flag associated with e.g. c++14 standard support changes for different compiler versions (e.g. c++1y vs c++14). This makes a few corrections on what flag to return for which version. * Added tests to confirm that versions report expected flags for various c++ standards (or raise an exception for versions that don't provide a given cxx standard) Note that if a given cxx standard is the default, the associated flag property will return ""; cxx98 is assumed to be the default standard so this is the behavior for the associated property in the base compiler class. Package changes: * Improvements to the boost spec to take advantage of the improved standard flag facility. * Update the clingo spec to catch the new exception rather than look for an empty flag to indicate non-support (which is not part of the compiler flag API) --- lib/spack/docs/packaging_guide.rst | 4 +- lib/spack/spack/compiler.py | 48 ++++-- lib/spack/spack/compilers/clang.py | 43 ++++-- lib/spack/spack/compilers/gcc.py | 35 ++++- lib/spack/spack/compilers/intel.py | 16 +- lib/spack/spack/compilers/xl.py | 10 +- lib/spack/spack/compilers/xl_r.py | 10 +- lib/spack/spack/test/compilers.py | 169 ++++++++++++++++++++- var/spack/repos/builtin/packages/boost/package.py | 41 ++++- var/spack/repos/builtin/packages/clingo/package.py | 4 +- 10 files changed, 328 insertions(+), 52 deletions(-) (limited to 'var') diff --git a/lib/spack/docs/packaging_guide.rst b/lib/spack/docs/packaging_guide.rst index ca21092f26..34be562c29 100644 --- a/lib/spack/docs/packaging_guide.rst +++ b/lib/spack/docs/packaging_guide.rst @@ -2654,8 +2654,8 @@ In rare circumstances such as compiling and running small unit tests, a package developer may need to know what are the appropriate compiler flags to enable features like ``OpenMP``, ``c++11``, ``c++14`` and alike. To that end the compiler classes in ``spack`` implement the -following **properties**: ``openmp_flag``, ``cxx11_flag``, -``cxx14_flag``, which can be accessed in a package by +following **properties**: ``openmp_flag``, ``cxx98_flag``, ``cxx11_flag``, +``cxx14_flag``, and ``cxx17_flag``, which can be accessed in a package by ``self.compiler.cxx11_flag`` and alike. Note that the implementation is such that if a given compiler version does not support this feature, an error will be produced. Therefore package developers can also use these diff --git a/lib/spack/spack/compiler.py b/lib/spack/spack/compiler.py index 6d9742150e..b219eee09d 100644 --- a/lib/spack/spack/compiler.py +++ b/lib/spack/spack/compiler.py @@ -178,40 +178,40 @@ class Compiler(object): @property def openmp_flag(self): # If it is not overridden, assume it is not supported and warn the user - tty.die( - "The compiler you have chosen does not currently support OpenMP.", - "If you think it should, please edit the compiler subclass and", - "submit a pull request or issue.") + raise UnsupportedCompilerFlag(self, "OpenMP", "openmp_flag") + + # This property should be overridden in the compiler subclass if + # C++98 is not the default standard for that compiler + @property + def cxx98_flag(self): + return "" # This property should be overridden in the compiler subclass if # C++11 is supported by that compiler @property def cxx11_flag(self): # If it is not overridden, assume it is not supported and warn the user - tty.die( - "The compiler you have chosen does not currently support C++11.", - "If you think it should, please edit the compiler subclass and", - "submit a pull request or issue.") + raise UnsupportedCompilerFlag(self, + "the C++11 standard", + "cxx11_flag") # This property should be overridden in the compiler subclass if # C++14 is supported by that compiler @property def cxx14_flag(self): # If it is not overridden, assume it is not supported and warn the user - tty.die( - "The compiler you have chosen does not currently support C++14.", - "If you think it should, please edit the compiler subclass and", - "submit a pull request or issue.") + raise UnsupportedCompilerFlag(self, + "the C++14 standard", + "cxx14_flag") # This property should be overridden in the compiler subclass if # C++17 is supported by that compiler @property def cxx17_flag(self): # If it is not overridden, assume it is not supported and warn the user - tty.die( - "The compiler you have chosen does not currently support C++17.", - "If you think it should, please edit the compiler subclass and", - "submit a pull request or issue.") + raise UnsupportedCompilerFlag(self, + "the C++17 standard", + "cxx17_flag") # # Compiler classes have methods for querying the version of @@ -339,3 +339,19 @@ class InvalidCompilerError(spack.error.SpackError): def __init__(self): super(InvalidCompilerError, self).__init__( "Compiler has no executables.") + + +class UnsupportedCompilerFlag(spack.error.SpackError): + + def __init__(self, compiler, feature, flag_name, ver_string=None): + super(UnsupportedCompilerFlag, self).__init__( + "{0} ({1}) does not support {2} (as compiler.{3})." + .format(compiler.name, + ver_string if ver_string else compiler.version, + feature, + flag_name), + "If you think it should, please edit the compiler.{0} subclass to" + .format(compiler.name) + + " implement the {0} property and submit a pull request or issue." + .format(flag_name) + ) diff --git a/lib/spack/spack/compilers/clang.py b/lib/spack/spack/compilers/clang.py index ce54e49c79..2aa958ab91 100644 --- a/lib/spack/spack/compilers/clang.py +++ b/lib/spack/spack/compilers/clang.py @@ -30,7 +30,7 @@ from shutil import copytree, ignore_patterns import llnl.util.tty as tty import spack.paths -from spack.compiler import Compiler, _version_cache +from spack.compiler import Compiler, _version_cache, UnsupportedCompilerFlag from spack.util.executable import Executable from spack.version import ver @@ -69,7 +69,10 @@ class Clang(Compiler): @property def openmp_flag(self): if self.is_apple: - tty.die("Clang from Apple does not support Openmp yet.") + raise UnsupportedCompilerFlag(self, + "OpenMP", + "openmp_flag", + "Xcode {0}".format(self.version)) else: return "-fopenmp" @@ -77,14 +80,20 @@ class Clang(Compiler): def cxx11_flag(self): if self.is_apple: # Adapted from CMake's AppleClang-CXX rules - # Spack's AppleClang detection only valid form Xcode >= 4.6 + # Spack's AppleClang detection only valid from Xcode >= 4.6 if self.version < ver('4.0.0'): - tty.die("Only Apple LLVM 4.0 and above support c++11") + raise UnsupportedCompilerFlag(self, + "the C++11 standard", + "cxx11_flag", + "Xcode < 4.0.0") else: return "-std=c++11" else: if self.version < ver('3.3'): - tty.die("Only Clang 3.3 and above support c++11.") + raise UnsupportedCompilerFlag(self, + "the C++11 standard", + "cxx11_flag", + "< 3.3") else: return "-std=c++11" @@ -93,14 +102,20 @@ class Clang(Compiler): if self.is_apple: # Adapted from CMake's rules for AppleClang if self.version < ver('5.1.0'): - tty.die("Only Apple LLVM 5.1 and above support c++14.") + raise UnsupportedCompilerFlag(self, + "the C++14 standard", + "cxx14_flag", + "Xcode < 5.1.0") elif self.version < ver('6.1.0'): return "-std=c++1y" else: return "-std=c++14" else: if self.version < ver('3.4'): - tty.die("Only Clang 3.4 and above support c++14.") + raise UnsupportedCompilerFlag(self, + "the C++14 standard", + "cxx14_flag", + "< 3.5") elif self.version < ver('3.5'): return "-std=c++1y" else: @@ -111,14 +126,22 @@ class Clang(Compiler): if self.is_apple: # Adapted from CMake's rules for AppleClang if self.version < ver('6.1.0'): - tty.die("Only Apple LLVM 6.1 and above support c++17.") + raise UnsupportedCompilerFlag(self, + "the C++17 standard", + "cxx17_flag", + "Xcode < 6.1.0") else: return "-std=c++1z" else: if self.version < ver('3.5'): - tty.die("Only Clang 3.5 and above support c++17.") - else: + raise UnsupportedCompilerFlag(self, + "the C++17 standard", + "cxx17_flag", + "< 5.0") + elif self.version < ver('5.0'): return "-std=c++1z" + else: + return "-std=c++17" @property def pic_flag(self): diff --git a/lib/spack/spack/compilers/gcc.py b/lib/spack/spack/compilers/gcc.py index e52dd5c047..489e87e544 100644 --- a/lib/spack/spack/compilers/gcc.py +++ b/lib/spack/spack/compilers/gcc.py @@ -22,10 +22,9 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## -import llnl.util.tty as tty - import spack.compilers.clang -from spack.compiler import Compiler, get_compiler_version +from spack.compiler import \ + Compiler, get_compiler_version, UnsupportedCompilerFlag from spack.version import ver @@ -60,10 +59,20 @@ class Gcc(Compiler): def openmp_flag(self): return "-fopenmp" + @property + def cxx98_flag(self): + if self.version < ver('6.0'): + return "" + else: + return "-std=c++98" + @property def cxx11_flag(self): if self.version < ver('4.3'): - tty.die("Only gcc 4.3 and above support c++11.") + raise UnsupportedCompilerFlag(self, + "the C++11 standard", + "cxx11_flag", + " < 4.3") elif self.version < ver('4.7'): return "-std=c++0x" else: @@ -72,18 +81,28 @@ class Gcc(Compiler): @property def cxx14_flag(self): if self.version < ver('4.8'): - tty.die("Only gcc 4.8 and above support c++14.") + raise UnsupportedCompilerFlag(self, + "the C++14 standard", + "cxx14_flag", + "< 4.8") elif self.version < ver('4.9'): return "-std=c++1y" - else: + elif self.version < ver('6.0'): return "-std=c++14" + else: + return "" @property def cxx17_flag(self): if self.version < ver('5.0'): - tty.die("Only gcc 5.0 and above support c++17.") - else: + raise UnsupportedCompilerFlag(self, + "the C++17 standard", + "cxx17_flag", + "< 5.0") + elif self.version < ver('6.0'): return "-std=c++1z" + else: + return "-std=c++17" @property def pic_flag(self): diff --git a/lib/spack/spack/compilers/intel.py b/lib/spack/spack/compilers/intel.py index 0c5ba3ab40..962120362e 100644 --- a/lib/spack/spack/compilers/intel.py +++ b/lib/spack/spack/compilers/intel.py @@ -22,9 +22,8 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## -import llnl.util.tty as tty - -from spack.compiler import Compiler, get_compiler_version +from spack.compiler import \ + Compiler, get_compiler_version, UnsupportedCompilerFlag from spack.version import ver @@ -60,7 +59,11 @@ class Intel(Compiler): @property def cxx11_flag(self): if self.version < ver('11.1'): - tty.die("Only intel 11.1 and above support c++11.") + raise UnsupportedCompilerFlag(self, + "the C++11 standard", + "cxx11_flag", + "< 11.1") + elif self.version < ver('13'): return "-std=c++0x" else: @@ -70,7 +73,10 @@ class Intel(Compiler): def cxx14_flag(self): # Adapted from CMake's Intel-CXX rules. if self.version < ver('15'): - tty.die("Only intel 15.0 and above support c++14.") + raise UnsupportedCompilerFlag(self, + "the C++14 standard", + "cxx14_flag", + "< 15") elif self.version < ver('15.0.2'): return "-std=c++1y" else: diff --git a/lib/spack/spack/compilers/xl.py b/lib/spack/spack/compilers/xl.py index 7b5bd3994b..4448efbb98 100644 --- a/lib/spack/spack/compilers/xl.py +++ b/lib/spack/spack/compilers/xl.py @@ -22,9 +22,8 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## -import llnl.util.tty as tty - -from spack.compiler import Compiler, get_compiler_version +from spack.compiler import \ + Compiler, get_compiler_version, UnsupportedCompilerFlag from spack.version import ver @@ -54,7 +53,10 @@ class Xl(Compiler): @property def cxx11_flag(self): if self.version < ver('13.1'): - tty.die("Only xlC 13.1 and above have some c++11 support.") + raise UnsupportedCompilerFlag(self, + "the C++11 standard", + "cxx11_flag", + "< 13.1") else: return "-qlanglvl=extended0x" diff --git a/lib/spack/spack/compilers/xl_r.py b/lib/spack/spack/compilers/xl_r.py index 774db363af..9aa12a03ce 100644 --- a/lib/spack/spack/compilers/xl_r.py +++ b/lib/spack/spack/compilers/xl_r.py @@ -23,9 +23,8 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## -import llnl.util.tty as tty - -from spack.compiler import Compiler, get_compiler_version +from spack.compiler import \ + Compiler, get_compiler_version, UnsupportedCompilerFlag from spack.version import ver @@ -55,7 +54,10 @@ class XlR(Compiler): @property def cxx11_flag(self): if self.version < ver('13.1'): - tty.die("Only xlC 13.1 and above have some c++11 support.") + raise UnsupportedCompilerFlag(self, + "the C++11 standard", + "cxx11_flag", + "< 13.1") else: return "-qlanglvl=extended0x" diff --git a/lib/spack/spack/test/compilers.py b/lib/spack/spack/test/compilers.py index 2c9d68f674..4e14641b63 100644 --- a/lib/spack/spack/test/compilers.py +++ b/lib/spack/spack/test/compilers.py @@ -22,11 +22,12 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## +from copy import copy from six import iteritems import spack.spec import spack.compilers as compilers -from spack.compiler import _get_versioned_tuple +from spack.compiler import _get_versioned_tuple, Compiler def test_get_compiler_duplicates(config): @@ -79,3 +80,169 @@ def test_compiler_flags_from_config_are_grouped(): compiler = compilers.compiler_from_config_entry(compiler_entry) assert any(x == '-foo-flag foo-val' for x in compiler.flags['cflags']) + + +# Test behavior of flags and UnsupportedCompilerFlag. + +# Utility function to test most flags. +default_compiler_entry = { + 'spec': 'clang@2.0.0-apple', + 'operating_system': 'foo-os', + 'paths': { + 'cc': 'cc-path', + 'cxx': 'cxx-path', + 'fc': None, + 'f77': None + }, + 'flags': {}, + 'modules': None +} + + +# Fake up a mock compiler where everything is defaulted. +class MockCompiler(Compiler): + def __init__(self): + super(MockCompiler, self).__init__( + "badcompiler@1.0.0", + default_compiler_entry['operating_system'], + None, + [default_compiler_entry['paths']['cc'], + default_compiler_entry['paths']['cxx'], + default_compiler_entry['paths']['fc'], + default_compiler_entry['paths']['f77']]) + + @property + def name(self): + return "mockcompiler" + + @property + def version(self): + return "1.0.0" + + +# Get the desired flag from the specified compiler spec. +def flag_value(flag, spec): + compiler = None + if spec is None: + compiler = MockCompiler() + else: + compiler_entry = copy(default_compiler_entry) + compiler_entry['spec'] = spec + # Disable faulty id()-based cache (issue #7647). + compilers._compiler_cache = {} + compiler = compilers.compiler_from_config_entry(compiler_entry) + + return getattr(compiler, flag) + + +# Utility function to verify that the expected exception is thrown for +# an unsupported flag. +def unsupported_flag_test(flag, spec=None): + caught_exception = None + try: + flag_value(flag, spec) + except spack.compiler.UnsupportedCompilerFlag: + caught_exception = True + + assert(caught_exception and "Expected exception not thrown.") + + +# Verify the expected flag value for the give compiler spec. +def supported_flag_test(flag, flag_value_ref, spec=None): + assert(flag_value(flag, spec) == flag_value_ref) + + +# Tests for UnsupportedCompilerFlag exceptions from default +# implementations of flags. +def test_default_flags(): + unsupported_flag_test("openmp_flag") + unsupported_flag_test("cxx11_flag") + unsupported_flag_test("cxx14_flag") + unsupported_flag_test("cxx17_flag") + supported_flag_test("cxx98_flag", "") + + +# Verify behavior of particular compiler definitions. +def test_clang_flags(): + # Common + supported_flag_test("pic_flag", "-fPIC", "gcc@4.0") + + # Apple Clang. + unsupported_flag_test("openmp_flag", "clang@2.0.0-apple") + unsupported_flag_test("cxx11_flag", "clang@2.0.0-apple") + supported_flag_test("cxx11_flag", "-std=c++11", "clang@4.0.0-apple") + unsupported_flag_test("cxx14_flag", "clang@5.0.0-apple") + supported_flag_test("cxx14_flag", "-std=c++1y", "clang@5.1.0-apple") + supported_flag_test("cxx14_flag", "-std=c++14", "clang@6.1.0-apple") + unsupported_flag_test("cxx17_flag", "clang@6.0.0-apple") + supported_flag_test("cxx17_flag", "-std=c++1z", "clang@6.1.0-apple") + + # non-Apple Clang. + supported_flag_test("openmp_flag", "-fopenmp", "clang@3.3") + unsupported_flag_test("cxx11_flag", "clang@3.2") + supported_flag_test("cxx11_flag", "-std=c++11", "clang@3.3") + unsupported_flag_test("cxx14_flag", "clang@3.3") + supported_flag_test("cxx14_flag", "-std=c++1y", "clang@3.4") + supported_flag_test("cxx14_flag", "-std=c++14", "clang@3.5") + unsupported_flag_test("cxx17_flag", "clang@3.4") + supported_flag_test("cxx17_flag", "-std=c++1z", "clang@3.5") + supported_flag_test("cxx17_flag", "-std=c++17", "clang@5.0") + + +def test_cce_flags(): + supported_flag_test("openmp_flag", "-h omp", "cce@1.0") + supported_flag_test("cxx11_flag", "-h std=c++11", "cce@1.0") + supported_flag_test("pic_flag", "-h PIC", "cce@1.0") + + +def test_gcc_flags(): + supported_flag_test("openmp_flag", "-fopenmp", "gcc@4.1") + supported_flag_test("cxx98_flag", "", "gcc@5.2") + supported_flag_test("cxx98_flag", "-std=c++98", "gcc@6.0") + unsupported_flag_test("cxx11_flag", "gcc@4.2") + supported_flag_test("cxx11_flag", "-std=c++0x", "gcc@4.3") + supported_flag_test("cxx11_flag", "-std=c++11", "gcc@4.7") + unsupported_flag_test("cxx14_flag", "gcc@4.7") + supported_flag_test("cxx14_flag", "-std=c++1y", "gcc@4.8") + supported_flag_test("cxx14_flag", "-std=c++14", "gcc@4.9") + supported_flag_test("cxx14_flag", "", "gcc@6.0") + unsupported_flag_test("cxx17_flag", "gcc@4.9") + supported_flag_test("pic_flag", "-fPIC", "gcc@4.0") + + +def test_intel_flags(): + supported_flag_test("openmp_flag", "-openmp", "intel@15.0") + supported_flag_test("openmp_flag", "-qopenmp", "intel@16.0") + unsupported_flag_test("cxx11_flag", "intel@11.0") + supported_flag_test("cxx11_flag", "-std=c++0x", "intel@12.0") + supported_flag_test("cxx11_flag", "-std=c++11", "intel@13") + unsupported_flag_test("cxx14_flag", "intel@14.0") + supported_flag_test("cxx14_flag", "-std=c++1y", "intel@15.0") + supported_flag_test("cxx14_flag", "-std=c++14", "intel@15.0.2") + supported_flag_test("pic_flag", "-fPIC", "intel@1.0") + + +def test_nag_flags(): + supported_flag_test("openmp_flag", "-openmp", "nag@1.0") + supported_flag_test("cxx11_flag", "-std=c++11", "nag@1.0") + supported_flag_test("pic_flag", "-PIC", "nag@1.0") + + +def test_pgi_flags(): + supported_flag_test("openmp_flag", "-mp", "pgi@1.0") + supported_flag_test("cxx11_flag", "-std=c++11", "pgi@1.0") + supported_flag_test("pic_flag", "-fpic", "pgi@1.0") + + +def test_xl_flags(): + supported_flag_test("openmp_flag", "-qsmp=omp", "xl@1.0") + unsupported_flag_test("cxx11_flag", "xl@13.0") + supported_flag_test("cxx11_flag", "-qlanglvl=extended0x", "xl@13.1") + supported_flag_test("pic_flag", "-qpic", "xl@1.0") + + +def test_xl_r_flags(): + supported_flag_test("openmp_flag", "-qsmp=omp", "xl_r@1.0") + unsupported_flag_test("cxx11_flag", "xl_r@13.0") + supported_flag_test("cxx11_flag", "-qlanglvl=extended0x", "xl_r@13.1") + supported_flag_test("pic_flag", "-qpic", "xl_r@1.0") diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index 5666df8baa..db72c06212 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -126,6 +126,11 @@ class Boost(Package): variant(lib, default=(lib not in default_noinstall_libs), description="Compile with {0} library".format(lib)) + variant('cxxstd', + default='default', + values=('default', '98', '11', '14', '17'), + multi=False, + description='Use the specified C++ standard when building.') variant('debug', default=False, description='Switch to the debug version of Boost') variant('shared', default=True, @@ -250,6 +255,26 @@ class Boost(Package): if '+python' in spec: f.write(self.bjam_python_line(spec)) + def cxxstd_to_flag(self, std): + flag = '' + if self.spec.variants['cxxstd'].value == '98': + flag = self.compiler.cxx98_flag + elif self.spec.variants['cxxstd'].value == '11': + flag = self.compiler.cxx11_flag + elif self.spec.variants['cxxstd'].value == '14': + flag = self.compiler.cxx14_flag + elif self.spec.variants['cxxstd'].value == '17': + flag = self.compiler.cxx17_flag + elif self.spec.variants['cxxstd'].value == 'default': + # Let the compiler do what it usually does. + pass + else: + # The user has selected a (new?) legal value that we've + # forgotten to deal with here. + tty.die("INTERNAL ERROR: cannot accommodate unexpected variant ", + "cxxstd={0}".format(spec.variants['cxxstd'].value)) + return flag + def determine_b2_options(self, spec, options): if '+debug' in spec: options.append('variant=debug') @@ -299,6 +324,17 @@ class Boost(Package): 'toolset=%s' % self.determine_toolset(spec) ]) + # Other C++ flags. + cxxflags = [] + + # Deal with C++ standard. + if spec.satisfies('@1.66:'): + options.append('cxxstd={0}'.format(spec.variants['cxxstd'].value)) + else: # Add to cxxflags for older Boost. + flag = self.cxxstd_to_flag(spec.variants['cxxstd'].value) + if flag: + cxxflags.append(flag) + # clang is not officially supported for pre-compiled headers # and at least in clang 3.9 still fails to build # http://www.boost.org/build/doc/html/bbv2/reference/precompiled_headers.html @@ -306,10 +342,13 @@ class Boost(Package): if spec.satisfies('%clang'): options.extend(['pch=off']) if '+clanglibcpp' in spec: + cxxflags.append('-stdlib=libc++') options.extend(['toolset=clang', - 'cxxflags="-stdlib=libc++"', 'linkflags="-stdlib=libc++"']) + if cxxflags: + options.append('cxxflags="{0}"'.format(' '.join(cxxflags))) + return threadingOpts def add_buildopt_symlinks(self, prefix): diff --git a/var/spack/repos/builtin/packages/clingo/package.py b/var/spack/repos/builtin/packages/clingo/package.py index cf45630e12..c014e14cf2 100644 --- a/var/spack/repos/builtin/packages/clingo/package.py +++ b/var/spack/repos/builtin/packages/clingo/package.py @@ -44,7 +44,9 @@ class Clingo(CMakePackage): depends_on('python') def cmake_args(self): - if not self.compiler.cxx14_flag: + try: + self.compiler.cxx14_flag + except UnsupportedCompilerFlag: InstallError('clingo requires a C++14-compliant C++ compiler') args = ['-DCLINGO_BUILD_WITH_PYTHON=ON', -- cgit v1.2.3-70-g09d2 From 689e0cb24b8681c709aa3122e2b99020edcbc4d9 Mon Sep 17 00:00:00 2001 From: "Kelly (KT) Thompson" Date: Sat, 9 Jun 2018 15:16:36 -0600 Subject: Git's gitk needs TK's wish to be found in PATH (#8360) * Git's gitk needs TK's wish to be found in PATH * Add a _runtime_ dependency on `tk` * Add an environment rule to add the path to TK's `wish` program to $PATH for the generated `git` modulefile. * Make TclTk run environment an optional variant for git. * Cleanup based on PR recommendations. --- var/spack/repos/builtin/packages/git/package.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index e8c3400c94..97986b9777 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -160,6 +160,9 @@ class Git(AutotoolsPackage): placement='git-manpages', when='@{0}'.format(release['version'])) + variant('tcltk', default=False, + description='Gitk: provide Tcl/Tk in the run environment') + depends_on('curl') depends_on('expat') depends_on('gettext') @@ -174,6 +177,7 @@ class Git(AutotoolsPackage): depends_on('automake', type='build') depends_on('libtool', type='build') depends_on('m4', type='build') + depends_on('tk', type=('build', 'link'), when='+tcltk') # See the comment in setup_environment re EXTLIBS. def patch(self): @@ -202,7 +206,7 @@ class Git(AutotoolsPackage): def configure_args(self): spec = self.spec - return [ + configure_args = [ '--with-curl={0}'.format(spec['curl'].prefix), '--with-expat={0}'.format(spec['expat'].prefix), '--with-iconv={0}'.format(spec['libiconv'].prefix), @@ -212,6 +216,14 @@ class Git(AutotoolsPackage): '--with-zlib={0}'.format(spec['zlib'].prefix), ] + if '+tcltk' in self.spec: + configure_args.append('--with-tcltk={0}'.format( + self.spec['tk'].prefix.bin.wish)) + else: + configure_args.append('--without-tcltk') + + return configure_args + @run_after('configure') def filter_rt(self): if sys.platform == 'darwin': -- cgit v1.2.3-70-g09d2 From 8a97aa4c5196370a72d8649566d811d265ccd459 Mon Sep 17 00:00:00 2001 From: toffer93 Date: Sat, 9 Jun 2018 23:22:25 +0200 Subject: py-projectq: Added new package and fixed its dependency py-pybind11 (#8378) * py-pybind11: Additionally install python extensions e.g. run python setup * py-projectq: Added new package for quantum computing * py-projectq: corrected typos * edited flake8 incompatibilities * additional flake8 faults * changes according to suggestions * flake8 errors fixed * typo and missing environment variable set * py-pybind11:added setup_environemt * py-projectq:changed version according to request * flake8 correction * py-pybind11:changed to setup_py and removed noop * py-projectq:removed dependency and changed type of py-pytest dependency * py-pybind11: flake8 error corrected * py-projectq: Small error correction --- .../repos/builtin/packages/py-projectq/package.py | 60 ++++++++++++++++++++++ .../repos/builtin/packages/py-pybind11/package.py | 9 ++++ 2 files changed, 69 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-projectq/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-projectq/package.py b/var/spack/repos/builtin/packages/py-projectq/package.py new file mode 100644 index 0000000000..e6d300dc63 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-projectq/package.py @@ -0,0 +1,60 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyProjectq(PythonPackage): + """ + ProjectQ is an open-source software framework for quantum computing started + at ETH Zurich. It allows users to implement their quantum programs in + Python using a powerful and intuitive syntax. ProjectQ can then translate + these programs to any type of back-end, be it a simulator run on a + classical computer of an actual quantum chip. + """ + + # URL and HOMEPAGE + homepage = "https://projectq.ch" + url = "https://github.com/ProjectQ-Framework/ProjectQ/archive/v0.3.6.tar.gz" + + # Provided python modules + import_modules = ['projectq', 'projectq.backends', 'projectq.cengines', + 'projectq.libs', 'projectq.meta', 'projectq.ops', + 'projectq.setups', 'projectq.types'] + + # Versions + version('develop', branch='develop', + git='https://github.com/projectq-framework/projectq.git') + version('0.3.6', commit='fa484fe037a3a1772127bbd00fe4628ddba34611', + git='https://github.com/projectq-framework/projectq.git') + + # Dependencies + depends_on('py-setuptools', type=('build')) + depends_on('py-numpy', type=('build', 'run')) + depends_on('py-scipy', type=('build', 'run')) + depends_on('py-future', type=('build', 'run')) + depends_on('py-pytest@3.1.0:', type=('test')) + depends_on('py-requests', type=('build', 'run')) + # conflict with pybind11@2.2.0 -> see requirements.txt + depends_on('py-pybind11@1.7:2.1,2.2.1:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pybind11/package.py b/var/spack/repos/builtin/packages/py-pybind11/package.py index 0c05694f50..69183be75c 100644 --- a/var/spack/repos/builtin/packages/py-pybind11/package.py +++ b/var/spack/repos/builtin/packages/py-pybind11/package.py @@ -47,6 +47,7 @@ class PyPybind11(CMakePackage): version('2.1.0', '3cf07043d677d200720c928569635e12') depends_on('py-pytest', type='test') + depends_on('py-setuptools', type='build') extends('python') @@ -64,3 +65,11 @@ class PyPybind11(CMakePackage): 'ON' if self.run_tests else 'OFF') ] return args + + def setup_environment(self, spack_env, run_env): + spack_env.set('PYBIND11_USE_CMAKE', 1) + + def install(self, spec, prefix): + super(PyPybind11, self).install(spec, prefix) + setup_py('install', '--single-version-externally-managed', '--root=/', + '--prefix={0}'.format(prefix)) -- cgit v1.2.3-70-g09d2 From 80c1984e680a9f1f9fbb95748578d5b14fbfbe97 Mon Sep 17 00:00:00 2001 From: 健美猞猁 Date: Mon, 11 Jun 2018 04:15:43 +0800 Subject: Bump miniconda to 4.5.4. (#8435) --- var/spack/repos/builtin/packages/miniconda2/package.py | 1 + var/spack/repos/builtin/packages/miniconda3/package.py | 1 + 2 files changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/miniconda2/package.py b/var/spack/repos/builtin/packages/miniconda2/package.py index 681be764e3..a111b1c150 100644 --- a/var/spack/repos/builtin/packages/miniconda2/package.py +++ b/var/spack/repos/builtin/packages/miniconda2/package.py @@ -33,6 +33,7 @@ class Miniconda2(Package): homepage = "https://conda.io/miniconda.html" url = "https://repo.continuum.io/miniconda/Miniconda2-4.3.11-Linux-x86_64.sh" + version('4.5.4', '8a1c02f6941d8778f8afad7328265cf5', expand=False) version('4.3.30', 'bd1655b4b313f7b2a1f2e15b7b925d03', expand=False) version('4.3.14', '8cb075cf5462480980ef2373ad9fad38', expand=False) version('4.3.11', 'd573980fe3b5cdf80485add2466463f5', expand=False) diff --git a/var/spack/repos/builtin/packages/miniconda3/package.py b/var/spack/repos/builtin/packages/miniconda3/package.py index fd8c1dbaa1..24f610889b 100644 --- a/var/spack/repos/builtin/packages/miniconda3/package.py +++ b/var/spack/repos/builtin/packages/miniconda3/package.py @@ -33,6 +33,7 @@ class Miniconda3(Package): homepage = "https://conda.io/miniconda.html" url = "https://repo.continuum.io/miniconda/Miniconda3-4.3.11-Linux-x86_64.sh" + version('4.5.4', 'a946ea1d0c4a642ddf0c3a26a18bb16d', expand=False) version('4.3.30', '0b80a152332a4ce5250f3c09589c7a81', expand=False) version('4.3.14', 'fc6fc37479e3e3fcf3f9ba52cae98991', expand=False) version('4.3.11', '1924c8d9ec0abf09005aa03425e9ab1a', expand=False) -- cgit v1.2.3-70-g09d2 From 35a83540f0ee476febedf2529adf60a18396d783 Mon Sep 17 00:00:00 2001 From: 健美猞猁 Date: Mon, 11 Jun 2018 04:16:16 +0800 Subject: A new package: axel. (#8434) * A new package: axel. * Remove duplicate pkgconf. --- var/spack/repos/builtin/packages/axel/package.py | 42 ++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 var/spack/repos/builtin/packages/axel/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/axel/package.py b/var/spack/repos/builtin/packages/axel/package.py new file mode 100644 index 0000000000..e40c1e4535 --- /dev/null +++ b/var/spack/repos/builtin/packages/axel/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Axel(AutotoolsPackage): + """Axel is a light command line download accelerator for Linux and Unix""" + + homepage = "https://github.com/axel-download-accelerator/axel" + url = "https://github.com/axel-download-accelerator/axel/archive/v2.16.1.tar.gz" + + version('2.16.1', '3aaa7052458c66c1547bf1133609d0f2') + + depends_on('m4', type='build') + depends_on('autoconf', type='build') + depends_on('automake', type='build') + depends_on('libtool', type='build') + depends_on('pkgconf', type='build') + depends_on('gettext') + depends_on('openssl') -- cgit v1.2.3-70-g09d2 From 69ec8deec8176645f3a5ac1b437f4dc47340e0e9 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Sun, 10 Jun 2018 22:16:42 +0200 Subject: arpack-ng: add 3.6.0 (#8433) --- var/spack/repos/builtin/packages/arpack-ng/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/arpack-ng/package.py b/var/spack/repos/builtin/packages/arpack-ng/package.py index d4e62714a1..1d99f62157 100644 --- a/var/spack/repos/builtin/packages/arpack-ng/package.py +++ b/var/spack/repos/builtin/packages/arpack-ng/package.py @@ -56,6 +56,7 @@ class ArpackNg(Package): homepage = 'https://github.com/opencollab/arpack-ng' url = 'https://github.com/opencollab/arpack-ng/archive/3.3.0.tar.gz' + version('3.6.0', 'f2607c1d5f80e922d55751fbed86a8ec') version('3.5.0', '9762c9ae6d739a9e040f8201b1578874') version('3.4.0', 'ae9ca13f2143a7ea280cb0e2fd4bfae4') version('3.3.0', 'ed3648a23f0a868a43ef44c97a21bad5') -- cgit v1.2.3-70-g09d2 From 4ec3cb1ddb08e14ba3c2ba169b4c5c47c779740a Mon Sep 17 00:00:00 2001 From: Javier Cervantes Date: Mon, 11 Jun 2018 15:41:32 +0200 Subject: Add new package: unuran (#8397) * Add new package: unuran * Remove list_url and prng variant due to compilation problems * Make shared library option more explicit --- var/spack/repos/builtin/packages/unuran/package.py | 60 ++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 var/spack/repos/builtin/packages/unuran/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/unuran/package.py b/var/spack/repos/builtin/packages/unuran/package.py new file mode 100644 index 0000000000..f3f60644c6 --- /dev/null +++ b/var/spack/repos/builtin/packages/unuran/package.py @@ -0,0 +1,60 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Unuran(AutotoolsPackage): + """Universal Non-Uniform Random number generator.""" + + homepage = "http://statmath.wu.ac.at/unuran" + url = "http://statmath.wu.ac.at/unuran/unuran-1.8.1.tar.gz" + + version('1.8.1', 'a5885baab53a2608c1d85517bf5d06a5') + + variant('shared', default=True, + description="Enable the build of shared libraries") + variant('rngstreams', default=True, + description="Use RNGSTREAM library for uniform random generation") + variant('gsl', default=False, + description="Use random number generators from GNU Scientific Library") + + depends_on('gsl', when="+gsl") + depends_on('rngstreams', when="+rngstreams") + + def configure_args(self): + + spec = self.spec + + args = [ + '--%s-shared' % ('enable' if '+shared' in spec else 'disable'), + '--with-urgn-default=%s' % ( + 'rngstream' if '+rngstreams' in spec else 'builtin'), + '--%s-urng-gsl' % ( + 'with' if '+gsl' in spec else 'without'), + '--%s-urng-rngstreams' % ( + 'with' if '+rngstreams' in spec else 'without') + ] + + return args -- cgit v1.2.3-70-g09d2 From d943754e923a2c63017fa42519cabcef7dfca4aa Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Mon, 11 Jun 2018 17:31:27 +0200 Subject: boost: fix cxxstd=default (#8438) --- var/spack/repos/builtin/packages/boost/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index db72c06212..cc774b927b 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -329,7 +329,9 @@ class Boost(Package): # Deal with C++ standard. if spec.satisfies('@1.66:'): - options.append('cxxstd={0}'.format(spec.variants['cxxstd'].value)) + if spec.variants['cxxstd'].value != 'default': + options.append('cxxstd={0}'.format( + spec.variants['cxxstd'].value)) else: # Add to cxxflags for older Boost. flag = self.cxxstd_to_flag(spec.variants['cxxstd'].value) if flag: -- cgit v1.2.3-70-g09d2 From 004e9b8948c44417997f0f0af94884436dcf5a4e Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Mon, 11 Jun 2018 18:42:13 +0200 Subject: Fixed compilation of quantum-espresso (#8439) The patch to select ELPA API needs to be applied to version 6.2.0 too. The link line of hdf5 is computed incorrectly from the configuration part of the build-system. To fix this the relevant file (make.inc) is patched. --- .../builtin/packages/quantum-espresso/package.py | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/quantum-espresso/package.py b/var/spack/repos/builtin/packages/quantum-espresso/package.py index 96bdda65e2..a90eaf4b9d 100644 --- a/var/spack/repos/builtin/packages/quantum-espresso/package.py +++ b/var/spack/repos/builtin/packages/quantum-espresso/package.py @@ -82,8 +82,8 @@ class QuantumEspresso(Package): depends_on('elpa~openmp', when='+elpa~openmp') depends_on('hdf5', when='+hdf5') - patch('dspev_drv_elpa.patch', when='@6.1+elpa ^elpa@2016.05.004') - patch('dspev_drv_elpa.patch', when='@6.1+elpa ^elpa@2016.05.003') + patch('dspev_drv_elpa.patch', when='@6.1.0:+elpa ^elpa@2016.05.004') + patch('dspev_drv_elpa.patch', when='@6.1.0:+elpa ^elpa@2016.05.003') # We can't ask for scalapack or elpa if we don't want MPI conflicts( @@ -165,6 +165,24 @@ class QuantumEspresso(Package): configure(*options) + # Apparently the build system of QE is so broken that: + # + # 1. The variable reported on stdout as HDF5_LIBS is actually + # called HDF5_LIB (singular) + # 2. The link flags omit a few `-L` from the line, and this + # causes the linker to break + # + # Below we try to match the entire HDF5_LIB line and substitute + # with the list of libraries that needs to be linked. + if '+hdf5' in spec: + make_inc = join_path(self.stage.source_path, 'make.inc') + hdf5_libs = ' '.join(spec['hdf5:hl,fortran'].libs) + filter_file( + 'HDF5_LIB([\s]*)=([\s\w\-\/.,]*)', + 'HDF5_LIB = {0}'.format(hdf5_libs), + make_inc + ) + make('all') if 'platform=darwin' in spec: -- cgit v1.2.3-70-g09d2 From 8e7d98c5fafcbf1fdff81e5acc70f2a32b4f3bfb Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Tue, 12 Jun 2018 18:51:10 +0530 Subject: superlu_dist: fix 'spack install superlu-dist@develop' (#8442) Latest superlu_dist sources now use INCLUDEDIR. This change should not affect older superlu_dist version builds --- var/spack/repos/builtin/packages/superlu-dist/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/superlu-dist/package.py b/var/spack/repos/builtin/packages/superlu-dist/package.py index 2506391509..98bd776a92 100644 --- a/var/spack/repos/builtin/packages/superlu-dist/package.py +++ b/var/spack/repos/builtin/packages/superlu-dist/package.py @@ -86,6 +86,7 @@ class SuperluDist(Package): 'FORTRAN = {0}'.format(self.spec['mpi'].mpif77), 'F90FLAGS = -O2', 'LOADER = {0}'.format(self.spec['mpi'].mpif77), + 'INCLUDEDIR = $(SuperLUroot)/include', 'LOADOPTS =', 'CDEFS = %s' % ("-DNoChange" if '%xl' in spec or '%xl_r' in spec -- cgit v1.2.3-70-g09d2 From 583af6ef4fbeabebcaac1899bd902075bc46fb12 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Tue, 12 Jun 2018 18:11:32 +0200 Subject: Package: ISAAC 1.4.0 (#8447) --- var/spack/repos/builtin/packages/isaac-server/package.py | 3 ++- var/spack/repos/builtin/packages/isaac/package.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/isaac-server/package.py b/var/spack/repos/builtin/packages/isaac-server/package.py index 4b534ae152..11325a24e2 100644 --- a/var/spack/repos/builtin/packages/isaac-server/package.py +++ b/var/spack/repos/builtin/packages/isaac-server/package.py @@ -36,6 +36,7 @@ class IsaacServer(CMakePackage): git='https://github.com/ComputationalRadiationPhysics/isaac.git') version('master', branch='master', git='https://github.com/ComputationalRadiationPhysics/isaac.git') + version('1.4.0', '3ad05c8fad4673366077204c5d39285f') version('1.3.3', '7aeebaf0c5a77e2cb9bea066750e369b') version('1.3.2', 'c557daa74de52fd79e734c9758fca38b') version('1.3.1', '7fe075f9af68d05355eaba0e224f20ca') @@ -51,7 +52,7 @@ class IsaacServer(CMakePackage): depends_on('libwebsockets@2.1.1:', type='link') # depends_on('gstreamer@1.0', when='+gstreamer') - # Until the pull request is merged: https://github.com/ComputationalRadiationPhysics/isaac/pull/70 + # https://github.com/ComputationalRadiationPhysics/isaac/pull/70 patch('jpeg.patch', when='@:1.3.1') root_cmakelists_dir = 'server' diff --git a/var/spack/repos/builtin/packages/isaac/package.py b/var/spack/repos/builtin/packages/isaac/package.py index 5be55e69fe..4783ffecbf 100644 --- a/var/spack/repos/builtin/packages/isaac/package.py +++ b/var/spack/repos/builtin/packages/isaac/package.py @@ -36,6 +36,7 @@ class Isaac(CMakePackage): git='https://github.com/ComputationalRadiationPhysics/isaac.git') version('master', branch='master', git='https://github.com/ComputationalRadiationPhysics/isaac.git') + version('1.4.0', '3ad05c8fad4673366077204c5d39285f') version('1.3.3', '7aeebaf0c5a77e2cb9bea066750e369b') version('1.3.2', 'c557daa74de52fd79e734c9758fca38b') version('1.3.1', '7fe075f9af68d05355eaba0e224f20ca') @@ -52,7 +53,7 @@ class Isaac(CMakePackage): depends_on('boost@1.56.0:', type='link') depends_on('boost@1.65.1:', type='link', when='^cuda@9:') depends_on('cuda@7.0:', type='link', when='+cuda') - # depends_on('alpaka', when='+alpaka') + # depends_on('alpaka@0.3', when='+alpaka') depends_on('icet', type='link') depends_on('mpi', type='link') -- cgit v1.2.3-70-g09d2 From 3cbae250f029c85c774d193e5cd273c37b74c9af Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Tue, 12 Jun 2018 14:25:20 -0400 Subject: new package: pdftk (#8166) --- .../builtin/packages/eclipse-gcj-parser/package.py | 69 ++++++++++++++ var/spack/repos/builtin/packages/pdftk/package.py | 102 +++++++++++++++++++++ 2 files changed, 171 insertions(+) create mode 100644 var/spack/repos/builtin/packages/eclipse-gcj-parser/package.py create mode 100644 var/spack/repos/builtin/packages/pdftk/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/eclipse-gcj-parser/package.py b/var/spack/repos/builtin/packages/eclipse-gcj-parser/package.py new file mode 100644 index 0000000000..e265cff96c --- /dev/null +++ b/var/spack/repos/builtin/packages/eclipse-gcj-parser/package.py @@ -0,0 +1,69 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import os + + +class EclipseGcjParser(Package): + """GCJ requires the Eclipse Java parser, but does not ship with it. + This builds that parser into an executable binary, thereby + making GCJ work.""" + + homepage = "https://github.com/spack/spack/issues/8165" + url = "ftp://sourceware.org/pub/java/ecj-4.8.jar" + # Official download found at (see ecj-4.8M4.jar and ecjsrc-4.8M4.jar) + # http://download.eclipse.org/eclipse/downloads/drops4/S-4.8M4-201712062000/ + + maintainers = ['citibeth'] + + version('4.8', 'd7cd6a27c8801e66cbaa964a039ecfdb', expand=False) + + phases = ('build', 'install') + + @property + def gcj(self): + """Obtain Executable for the gcj included with this GCC, + even in the face of GCC binaries with version numbers + included in their names.""" + + dir, gcc = os.path.split(str(self.compiler.cc)) + if 'gcc' not in gcc: + raise ValueError( + 'Package {0} requires GCC to build'.format(self.name)) + + return Executable(join_path(dir, gcc.replace('gcc', 'gcj'))) + + def build(self, spec, prefix): + self.gcj( + '-o', 'ecj1', + '--main=org.eclipse.jdt.internal.compiler.batch.GCCMain', + 'ecj-4.8.jar') + + def install(self, spec, prefix): + mkdirp(spec.prefix.bin) + install('ecj1', spec.prefix.bin) + + def setup_environment(self, spack_env, run_env): + run_env.prepend_path('PATH', self.prefix.bin) diff --git a/var/spack/repos/builtin/packages/pdftk/package.py b/var/spack/repos/builtin/packages/pdftk/package.py new file mode 100644 index 0000000000..cbce63f039 --- /dev/null +++ b/var/spack/repos/builtin/packages/pdftk/package.py @@ -0,0 +1,102 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import os + + +class Pdftk(MakefilePackage): + """PDFtk Server is a command-line tool for working with PDFs. It is + commonly used for client-side scripting or server-side processing + of PDFs.""" + + homepage = "https://www.pdflabs.com/tools/pdftk-server" + url = "https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-2.02-src.zip" + # Alternative download locations: + # https://sources.debian.org/src/pdftk/ + # http://archive.ubuntu.com/ubuntu/pool/universe/p/pdftk/pdftk_2.02.orig.tar.gz + + maintainers = ['citibeth'] + + version('2.02', '6534365fd6727724f288a556ede33faa') + + depends_on('eclipse-gcj-parser', type='build') + + # Only takes effect in phases not overridden here + build_directory = 'pdftk' + + # https://www.pdflabs.com/docs/install-pdftk-on-redhat-or-centos/ + def edit(self, spec, prefix): + + # ------ Fix install directory in main Makefile + makefile = FileFilter(join_path('pdftk', 'Makefile.Base')) + makefile.filter('/usr/local/bin', spec.prefix.bin) + + # ------ Create new config file + compiler = self.compiler + gcc_base = os.path.split(os.path.split(compiler.cxx)[0])[0] + gcc_version = compiler.version + + cppflags = ( + '-DPATH_DELIM=0x2f', + '-DASK_ABOUT_WARNINGS=false', + '-DUNBLOCK_SIGNALS', + '-fdollars-in-identifiers') + cxxflags = ('-Wall', '-Wextra', '-Weffc++', '-O2') + gcjflags = ('-Wall', '-Wextra', '-O2') + vars = [ + ('VERSUFF', '-%s' % gcc_version), + ('CXX', compiler.cxx), + ('GCJ', spec['eclipse-gcj-parser'].package.gcj), + ('GCJH', join_path(gcc_base, 'bin', 'gcjh')), + ('GJAR', join_path(gcc_base, 'bin', 'gjar')), + ('LIBGCJ', join_path( + gcc_base, 'share', 'java', + 'libgcj-{0}.jar'.format(gcc_version))), + ('AR', 'ar'), + ('RM', 'rm'), + ('ARFLAGS', 'rs'), + ('RMFLAGS', '-vf'), + ('CPPFLAGS', ' '.join(cppflags)), + ('CXXFLAGS', ' '.join(cxxflags)), + ('GCJFLAGS', ' '.join(gcjflags)), + ('GCJHFLAGS', '-force'), + ('LDLIBS', '-lgcj') + ] + with open(join_path('pdftk', 'Makefile.Spack'), 'w') as mk: + for var, val in vars: + mk.write("export {0}={1}\n".format(var, str(val))) + mk.write('include Makefile.Base\n') + + def build(self, spec, prefix): + compiler = self.compiler + gcc_base = os.path.split(os.path.split(compiler.cxx)[0])[0] + env['PATH'] = join_path(gcc_base, 'bin') + ':' + env['PATH'] + with working_dir(self.build_directory): + make('-f', 'Makefile.Spack', parallel=False) + + def install(self, spec, prefix): + mkdirp(self.spec.prefix.bin) + with working_dir(self.build_directory): + make('-f', 'Makefile.Spack', 'install', parallel=False) -- cgit v1.2.3-70-g09d2 From 683addc26d23841c0fd345073a98e27722228eb8 Mon Sep 17 00:00:00 2001 From: Veselin Dobrev Date: Wed, 13 Jun 2018 06:42:45 -0700 Subject: [GLVis] Add new version: 3.4 (#8454) * [glvis] Add new version, 3.4; update all checksums to be SHA-256. * [GLVis] Use the new bit.ly short link for v3.4. --- var/spack/repos/builtin/packages/glvis/package.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/glvis/package.py b/var/spack/repos/builtin/packages/glvis/package.py index 42844a739c..c97cf5704c 100644 --- a/var/spack/repos/builtin/packages/glvis/package.py +++ b/var/spack/repos/builtin/packages/glvis/package.py @@ -28,8 +28,10 @@ from spack import * class Glvis(MakefilePackage): """GLVis: an OpenGL tool for visualization of FEM meshes and functions""" - homepage = "http://glvis.org/" - url = "https://github.com/GLvis/glvis/archive/v3.3.tar.gz" + homepage = "http://glvis.org" + url = "https://github.com/GLVis/glvis" + + maintainers = ['goxberry', 'v-dobrev', 'tzanio'] # glvis (like mfem) is downloaded from a URL shortener at request # of upstream author Tzanio Kolev . See here: @@ -52,18 +54,23 @@ class Glvis(MakefilePackage): version('develop', git='https://github.com/glvis/glvis', branch='master') + version('3.4', + '289fbd2e09d4456e5fee6162bdc3e0b4c8c8d54625f3547ad2a69fef319279e7', + url='https://bit.ly/glvis-3-4', + extension='.tar.gz') + version('3.3', - '1201a76d1b0c38240186c06f6478de77', + 'e24d7c5cb53f208b691c872fe82ea898242cfdc0fd68dd0579c739e070dcd800', url='http://goo.gl/C0Oadw', extension='.tar.gz') version('3.2', - '4575a03a50d4730c07b5d4018e936707', + 'c82cb110396e63b6436a770c55eb6d578441eaeaf3f9cc20436c242392e44e80', url='http://goo.gl/hzupg1', extension='.tar.gz') version('3.1', - '3ce8a53209c6593e066e568dbbf2bbf6', + '793e984ddfbf825dcd13dfe1ca00eccd686cd40ad30c8789ba80ee175a1b488c', url='http://goo.gl/gQZuu9', extension='tar.gz') @@ -75,6 +82,7 @@ class Glvis(MakefilePackage): description='Use antialiased fonts via freetype & fontconfig') depends_on('mfem@develop', when='@develop') + depends_on('mfem@3.4', when='@3.4') depends_on('mfem@3.3', when='@3.3') depends_on('mfem@3.2', when='@3.2') depends_on('mfem@3.1', when='@3.1') -- cgit v1.2.3-70-g09d2 From 1d14ec7436d655063f253410ce62d8382de70f2b Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Wed, 13 Jun 2018 19:13:09 +0530 Subject: petsc: 'master' is a branch - not a tag - so fix it accordingly. (#8457) --- var/spack/repos/builtin/packages/petsc/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index a54661643b..08d16f5e1e 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -39,7 +39,7 @@ class Petsc(Package): maintainers = ['balay', 'barrysmith', 'jedbrown'] - version('develop', git='https://bitbucket.org/petsc/petsc.git', tag='master') + version('develop', git='https://bitbucket.org/petsc/petsc.git', branch='master') version('xsdk-0.2.0', git='https://bitbucket.org/petsc/petsc.git', tag='xsdk-0.2.0') version('3.9.0', '34b8a81814ca050a96d58e53a2f0ac7a') -- cgit v1.2.3-70-g09d2 From b27da52e4b44ceef4b87c6b54e3bf38cb0439a98 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Wed, 13 Jun 2018 09:44:10 -0400 Subject: new package: dealii-parameter-gui (#8456) --- .../packages/dealii-parameter-gui/package.py | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 var/spack/repos/builtin/packages/dealii-parameter-gui/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dealii-parameter-gui/package.py b/var/spack/repos/builtin/packages/dealii-parameter-gui/package.py new file mode 100644 index 0000000000..ac7492ea91 --- /dev/null +++ b/var/spack/repos/builtin/packages/dealii-parameter-gui/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class DealiiParameterGui(CMakePackage): + """A qt based graphical user interface for editing deal.II .prm parameter + files.""" + + homepage = "https://github.com/dealii/parameter_gui" + url = "https://github.com/dealii/parameter_gui" + + version('develop', git='https://github.com/dealii/parameter_gui.git', branch='master') + + depends_on('qt') + + def setup_environment(self, spack_env, run_env): + run_env.set('PARAMETER_GUI_DIR', self.prefix) -- cgit v1.2.3-70-g09d2 From c12855dce553fdce18de7cd6668a613fc91279f0 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Wed, 13 Jun 2018 19:24:53 +0530 Subject: trilinos: use 'branch' option to specify branches such as develop/master [they are not tags] (#8448) Fixes the following problem: ==> Installing trilinos ==> Warning: Suspicious requests to set or unset 'LD_LIBRARY_PATH' found ==> Warning: env.unset('LD_LIBRARY_PATH') at /home/balay/spack.new/lib/spack/spack/build_environment.py:269 ==> Warning: ---> env.set('%s' % key, value) at /home/balay/spack.new/lib/spack/spack/build_environment.py:292 ==> Trying to clone git repository: https://github.com/trilinos/Trilinos.git at tag develop Fetching tags only, you probably meant: git fetch --tags error: pathspec 'develop' did not match any file(s) known to git. ==> Fetching from [git] https://github.com/trilinos/Trilinos.git failed. ==> Error: FetchError: All fetchers failed for trilinos-develop-tgkpnctp6nn4imoizxlw4ymqyztcie4n --- var/spack/repos/builtin/packages/trilinos/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 83032de1d2..9a2be4036b 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -53,9 +53,9 @@ class Trilinos(CMakePackage): version('xsdk-0.2.0', git='https://github.com/trilinos/Trilinos.git', tag='xsdk-0.2.0') version('develop', - git='https://github.com/trilinos/Trilinos.git', tag='develop') + git='https://github.com/trilinos/Trilinos.git', branch='develop') version('master', - git='https://github.com/trilinos/Trilinos.git', tag='master') + git='https://github.com/trilinos/Trilinos.git', branch='master') version('12.12.1', 'ecd4606fa332212433c98bf950a69cc7') version('12.10.1', '667333dbd7c0f031d47d7c5511fd0810') version('12.8.1', '9f37f683ee2b427b5540db8a20ed6b15') -- cgit v1.2.3-70-g09d2 From fa00a04e912a903e5a6934c8f11246d99d30fe98 Mon Sep 17 00:00:00 2001 From: Miles Perry <37849532+Miles-Perry@users.noreply.github.com> Date: Wed, 13 Jun 2018 08:55:31 -0500 Subject: blasr-libcpp: new package (#8366) * blasr-libcpp: new package * blasr-libcpp: added version #, and moved make into build phase. * blasr-libcpp: added prefix.include to PBBAM_INC, added version URL * blasr-libcpp: indented comments, made list of configure_args, and added prefix.include * blasr-libcpp: added setup_dependent_environment from blasr * blasr-libcpp: fixed syntax for configure_args * blasr-libcpp: fixed configure_args syntax * blasr-libcpp: fixed syntax * blasr-libcpp: syntaxtest * blasr-libcpp: fixed def build error * blasr-libcpp: edited dependent environment to move after install phase * blasr-libcpp: rearranged build and install * blasr-libcpp: added configure_args * blasr-libcpp: fixed syntax error * blasr-libcpp: removed .spec from INC and LIB alignment, pbdata, hdf * blasr-libcpp: seperated configure args * blasr-libcpp: edited configure and setup_dependent steps * blasr-libcpp: added CPATH arg * blasr-libcpp: C_INCLUDE_PATH * blasr-libcpp: fixed install issues resulting from PacBio change --- .../repos/builtin/packages/blasr-libcpp/package.py | 73 ++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 var/spack/repos/builtin/packages/blasr-libcpp/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/blasr-libcpp/package.py b/var/spack/repos/builtin/packages/blasr-libcpp/package.py new file mode 100644 index 0000000000..c597fae507 --- /dev/null +++ b/var/spack/repos/builtin/packages/blasr-libcpp/package.py @@ -0,0 +1,73 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import os + + +class BlasrLibcpp(Package): + """Blasr_libcpp is a library used by blasr + and other executables such as samtoh5, + loadPulses for analyzing PacBio sequences.""" + + homepage = "https://github.com/PacificBiosciences/blasr_libcpp" + url = "https://github.com/PacificBiosciences/blasr_libcpp/archive/5.3.1.tar.gz" + + version('5.3.1', 'ca770042cbca508d5ff12dff0d645045') + + depends_on('pbbam') + depends_on('hdf5+cxx@1.8.12:1.8.99') + # maximum version is 1.8.20 currently. There doesn't appear to be a + # major version 1.9 and the 1.10.1 version doesn't build correctly. + # https://github.com/PacificBiosciences/blasr/issues/355 + + depends_on('python', type='build') + + phases = ['configure', 'build', 'install'] + + def configure(self, spec, prefix): + configure_args = [ + 'PBBAM_INC={0}'.format(self.spec['pbbam'].prefix.include), + 'PBBAM_LIB={0}'.format(self.spec['pbbam'].prefix.lib), + 'HDF5_INC={0}'.format(self.spec['hdf5'].prefix.include), + 'HDF5_LIB={0}'.format(self.spec['hdf5'].prefix.lib) + ] + python('configure.py', *configure_args) + + def build(self, spec, prefix): + os.environ['CPLUS_INCLUDE_PATH'] = self.stage.source_path + make() + + def install(self, spec, prefix): + install_tree('alignment', prefix.alignment) + install_tree('hdf', prefix.hdf) + install_tree('pbdata', prefix.pbdata) + + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): + spack_env.prepend_path('LD_LIBRARY_PATH', + self.spec.prefix.hdf) + spack_env.prepend_path('LD_LIBRARY_PATH', + self.spec.prefix.alignment) + spack_env.prepend_path('LD_LIBRARY_PATH', + self.spec.prefix.pbdata) -- cgit v1.2.3-70-g09d2 From 470d4ddd9619e099d25b2357e970d0accb828f4b Mon Sep 17 00:00:00 2001 From: Simone Bnà Date: Wed, 13 Jun 2018 15:56:52 +0200 Subject: openfoam-com: added submodule flag to git fetch (#8446) --- var/spack/repos/builtin/packages/openfoam-com/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openfoam-com/package.py b/var/spack/repos/builtin/packages/openfoam-com/package.py index ec070f5103..a8d7598e0e 100644 --- a/var/spack/repos/builtin/packages/openfoam-com/package.py +++ b/var/spack/repos/builtin/packages/openfoam-com/package.py @@ -284,7 +284,7 @@ class OpenfoamCom(Package): version('1712', '6ad92df051f4d52c7d0ec34f4b8eb3bc') version('1706', '630d30770f7b54d6809efbf94b7d7c8f') version('1612', 'ca02c491369150ab127cbb88ec60fbdf') - version('develop', branch='develop', git=gitrepo) # Needs credentials + version('develop', branch='develop', git=gitrepo, submodules='True') # Needs credentials variant('float32', default=False, description='Use single-precision') -- cgit v1.2.3-70-g09d2 From 04dce191551b6f40866317daa8b1987e8e259d88 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Wed, 13 Jun 2018 15:57:52 +0200 Subject: gplates: new package (#8336) This also adds an older 1.x version to gdal that is required by gplates. --- var/spack/repos/builtin/packages/gdal/package.py | 124 ++++++++++++--------- .../repos/builtin/packages/gplates/package.py | 77 +++++++++++++ var/spack/repos/builtin/packages/json-c/package.py | 2 +- 3 files changed, 148 insertions(+), 55 deletions(-) create mode 100644 var/spack/repos/builtin/packages/gplates/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gdal/package.py b/var/spack/repos/builtin/packages/gdal/package.py index d303d26f3b..124c472f9e 100644 --- a/var/spack/repos/builtin/packages/gdal/package.py +++ b/var/spack/repos/builtin/packages/gdal/package.py @@ -41,9 +41,10 @@ class Gdal(AutotoolsPackage): list_url = "http://download.osgeo.org/gdal/" list_depth = 1 - version('2.3.0', '2fe9d64fcd9dc37645940df020d3e200') - version('2.1.2', 'ae85b78888514c75e813d658cac9478e') - version('2.0.2', '940208e737c87d31a90eaae43d0efd65') + version('2.3.0', '2fe9d64fcd9dc37645940df020d3e200') + version('2.1.2', 'ae85b78888514c75e813d658cac9478e') + version('2.0.2', '940208e737c87d31a90eaae43d0efd65') + version('1.11.5', '5fcee5622430fbeb25556a4d07c06dd7') variant('libtool', default=True, description='Use libtool to build the library') variant('libz', default=True, description='Include libz support') @@ -92,14 +93,15 @@ class Gdal(AutotoolsPackage): # Required dependencies depends_on('libtiff@3.6.0:') # 3.9.0+ needed to pass testsuite depends_on('libgeotiff@1.2.1:') - depends_on('json-c') + depends_on('json-c', when='@2.3:') + depends_on('json-c@0.12.1', when='@:2.2.99') # Optional dependencies depends_on('libtool', type='build', when='+libtool') depends_on('zlib', when='+libz') depends_on('libiconv', when='+libiconv') depends_on('xz', when='+liblzma') - depends_on('zstd', when='+zstd') + depends_on('zstd', when='+zstd @2.3:') depends_on('postgresql', when='+pg') depends_on('cfitsio', when='+cfitsio') depends_on('libpng', when='+png') @@ -108,7 +110,7 @@ class Gdal(AutotoolsPackage): depends_on('fyba', when='+sosi') depends_on('hdf', when='+hdf4') depends_on('hdf5', when='+hdf5') - depends_on('kealib', when='+kea') + depends_on('kealib', when='+kea @2:') depends_on('netcdf', when='+netcdf') depends_on('jasper@1.900.1', patches=patch('uuid.patch'), when='+jasper') depends_on('openjpeg', when='+openjpeg') @@ -120,16 +122,16 @@ class Gdal(AutotoolsPackage): depends_on('sqlite@3:', when='+sqlite3') depends_on('pcre', when='+pcre') depends_on('geos', when='+geos') - depends_on('qhull', when='+qhull') + depends_on('qhull', when='+qhull @2.1:') depends_on('opencl', when='+opencl') depends_on('poppler', when='+poppler') - depends_on('proj', when='+proj') + depends_on('proj', when='+proj @2.3:') depends_on('perl', type=('build', 'run'), when='+perl') depends_on('python', type=('build', 'run'), when='+python') depends_on('java', type=('build', 'run'), when='+java') depends_on('armadillo', when='+armadillo') - depends_on('cryptopp', when='+cryptopp') - depends_on('openssl', when='+crypto') + depends_on('cryptopp', when='+cryptopp @2.1:') + depends_on('openssl', when='+crypto @2.3:') # https://trac.osgeo.org/gdal/wiki/SWIG depends_on('swig', type='build', when='+python') @@ -155,6 +157,45 @@ class Gdal(AutotoolsPackage): '--with-libjson-c={0}'.format(spec['json-c'].prefix), ] + if spec.satisfies('@2.3:'): + if '+zstd' in spec: + args.append('--with-zstd={0}'.format(spec['zstd'].prefix)) + else: + args.append('--with-zstd=no') + + if '+proj' in spec: + args.append('--with-proj={0}'.format(spec['proj'].prefix)) + if spec.satisfies('^proj@5.0:5.999'): + args.append('--with-proj5-api=yes') + else: + args.append('--with-proj5-api=no') + else: + args.append('--with-proj=no') + + if '+crypto' in spec: + args.append('--with-crypto={0}'.format(spec['openssl'].prefix)) + else: + args.append('--with-crypto=no') + + if spec.satisfies('@2.1:'): + if '+qhull' in spec: + args.append('--with-qhull=yes') + else: + args.append('--with-qhull=no') + + if '+cryptopp' in spec: + args.append('--with-cryptopp={0}'.format( + spec['cryptopp'].prefix)) + else: + args.append('--with-cryptopp=no') + + if spec.satisfies('@2:'): + if '+kea' in spec: + args.append('--with-kea={0}'.format( + join_path(spec['kealib'].prefix.bin, 'kea-config'))) + else: + args.append('--with-kea=no') + # Optional dependencies if '+libtool' in spec: args.append('--with-libtool=yes') @@ -177,11 +218,6 @@ class Gdal(AutotoolsPackage): else: args.append('--with-liblzma=no') - if '+zstd' in spec: - args.append('--with-zstd={0}'.format(spec['zstd'].prefix)) - else: - args.append('--with-zstd=no') - if '+pg' in spec: args.append('--with-pg={0}'.format( spec['postgresql'].prefix.bin.pg_config)) @@ -225,12 +261,6 @@ class Gdal(AutotoolsPackage): else: args.append('--with-hdf5=no') - if '+kea' in spec: - args.append('--with-kea={0}'.format( - join_path(spec['kealib'].prefix.bin, 'kea-config'))) - else: - args.append('--with-kea=no') - # https://trac.osgeo.org/gdal/wiki/NetCDF if '+netcdf' in spec: args.append('--with-netcdf={0}'.format(spec['netcdf'].prefix)) @@ -293,11 +323,6 @@ class Gdal(AutotoolsPackage): else: args.append('--with-geos=no') - if '+qhull' in spec: - args.append('--with-qhull=yes') - else: - args.append('--with-qhull=no') - if '+opencl' in spec: args.append('--with-opencl={0}'.format(spec['opencl'].prefix)) else: @@ -308,15 +333,6 @@ class Gdal(AutotoolsPackage): else: args.append('--with-poppler=no') - if '+proj' in spec: - args.append('--with-proj={0}'.format(spec['proj'].prefix)) - if spec.satisfies('^proj@5.0:5.999'): - args.append('--with-proj5-api=yes') - else: - args.append('--with-proj5-api=no') - else: - args.append('--with-proj=no') - if '+perl' in spec: args.append('--with-perl=yes') else: @@ -339,16 +355,6 @@ class Gdal(AutotoolsPackage): else: args.append('--with-armadillo=no') - if '+cryptopp' in spec: - args.append('--with-cryptopp={0}'.format(spec['cryptopp'].prefix)) - else: - args.append('--with-cryptopp=no') - - if '+crypto' in spec: - args.append('--with-crypto={0}'.format(spec['openssl'].prefix)) - else: - args.append('--with-crypto=no') - # TODO: add packages for these dependencies args.extend([ # https://trac.osgeo.org/gdal/wiki/GRASS @@ -360,7 +366,6 @@ class Gdal(AutotoolsPackage): '--with-pcidsk=no', '--with-ogdi=no', '--with-fme=no', - '--with-mongocxx=no', # https://trac.osgeo.org/gdal/wiki/FileGDB '--with-fgdb=no', # https://trac.osgeo.org/gdal/wiki/ECW @@ -371,14 +376,12 @@ class Gdal(AutotoolsPackage): '--with-mrsid=no', '--with-jp2mrsid=no', '--with-mrsid_lidar=no', - '--with-jp2lura=no', # https://trac.osgeo.org/gdal/wiki/MSG '--with-msg=no', '--with-bsb=no', # https://trac.osgeo.org/gdal/wiki/Oracle '--with-oci=no', '--with-grib=no', - '--with-gnm=no', '--with-mysql=no', # https://trac.osgeo.org/gdal/wiki/Ingres '--with-ingres=no', @@ -386,27 +389,40 @@ class Gdal(AutotoolsPackage): '--with-libkml=no', '--with-dods-root=no', '--with-spatialite=no', - '--with-rasterlite2=no', - # https://trac.osgeo.org/gdal/wiki/DxfDwg - '--with-teigha=no', '--with-idb=no', # https://trac.osgeo.org/gdal/wiki/ArcSDE '--with-sde=no', # https://trac.osgeo.org/gdal/wiki/Epsilon '--with-epsilon=no', '--with-webp=no', - '--with-sfcgal=no', '--with-freexl=no', '--with-pam=no', '--with-podofo=no', - '--with-pdfium=no', '--with-php=no', # https://trac.osgeo.org/gdal/wiki/mdbtools '--with-mdb=no', '--with-rasdaman=no', - '--with-mrf=no', ]) + # TODO: add packages for these dependencies (only for 2.3 and newer) + if spec.satisfies('@2.3:'): + args.extend([ + '--with-jp2lura=no', + '--with-rasterlite2=no', + # https://trac.osgeo.org/gdal/wiki/DxfDwg + '--with-teigha=no', + '--with-sfcgal=no', + '--with-mrf=no', + ]) + + # TODO: add packages for these dependencies (only for 2.1 and newer) + if spec.satisfies('@2.1:'): + args.extend([ + '--with-mongocxx=no', + '--with-gnm=no', + '--with-pdfium=no', + ]) + return args @run_after('install') diff --git a/var/spack/repos/builtin/packages/gplates/package.py b/var/spack/repos/builtin/packages/gplates/package.py new file mode 100644 index 0000000000..a0a1036153 --- /dev/null +++ b/var/spack/repos/builtin/packages/gplates/package.py @@ -0,0 +1,77 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Gplates(CMakePackage): + """GPlates is desktop software for the interactive visualisation of + plate-tectonics. GPlates offers a novel combination of interactive + plate-tectonic reconstructions, geographic information system (GIS) + functionality and raster data visualisation. GPlates enables both the + visualisation and the manipulation of plate-tectonic reconstructions + and associated data through geological time.""" + + homepage = 'https://www.gplates.org' + url = 'https://sourceforge.net/projects/gplates/files/gplates/2.0/gplates-2.0.0-unixsrc.tar.bz2/download' + + version('2.0.0', '9e95874b35a01f4c9bff5845a1621ad5') + + depends_on('cmake@2.6.2:', type='build') + # Qt 5 does not support (at least) the Q_WS_* constants. + depends_on('qt+opengl@4.4.0:4.99') + depends_on('qwt@6.0.1:') + depends_on('mesa-glu') + depends_on('glew') + # GDAL's OGRSFDriverRegistrar is not compatible anymore starting with 2.0. + depends_on('gdal@1.3.2:1.99') + depends_on('cgal@3.5:') + depends_on('proj@4.6.0:') + # Boost's Python library has a different name starting with 1.67. + # There were changes to Boost's optional in 1.61 that make the build fail. + depends_on('boost+python@1.34:1.60') + depends_on('python@2:2.99') + + # Officially, GPlates only supports GCC 4. Moreover, it requires + # QtXmlPatterns, which Qt 4 only builds with GCC 4. + conflicts('%gcc@5:') + + # When built in parallel, headers are not generated before they are used + # (specifically, ViewportWindowUi.h). + parallel = False + + def url_for_version(self, version): + url = 'https://sourceforge.net/projects/gplates/files/gplates/{0}/gplates-{1}-unixsrc.tar.bz2/download' + return url.format(version.up_to(2), version) + + def patch(self): + # GPlates overrides FindPythonLibs and finds the static library, which + # can not be used easily. Fall back to CMake's version, which finds + # the shared library instead. + force_remove('cmake/modules/FindPythonLibs.cmake') + + # GPlates only installs its binary for the Release configuration. + filter_file('CONFIGURATIONS release', + 'CONFIGURATIONS Debug Release RelWithDebInfo MinSizeRel', + 'src/CMakeLists.txt') diff --git a/var/spack/repos/builtin/packages/json-c/package.py b/var/spack/repos/builtin/packages/json-c/package.py index 0579e1fe9a..ad9b6b6f19 100644 --- a/var/spack/repos/builtin/packages/json-c/package.py +++ b/var/spack/repos/builtin/packages/json-c/package.py @@ -38,7 +38,7 @@ class JsonC(AutotoolsPackage): parallel = False - @when('@0.12.1 %gcc@7') + @when('@0.12.1 %gcc@7:') def patch(self): filter_file('-Wextra', '-Wextra -Wno-error=implicit-fallthrough', -- cgit v1.2.3-70-g09d2 From 6d4909d69b38bddf9c742ba2d16fea03c58adce3 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 13 Jun 2018 21:40:51 +0200 Subject: Add: MPILander (#8464) MPILander - There can only be one (MPI process)! The final MPI implementation. --- .../repos/builtin/packages/mpilander/package.py | 64 ++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 var/spack/repos/builtin/packages/mpilander/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mpilander/package.py b/var/spack/repos/builtin/packages/mpilander/package.py new file mode 100644 index 0000000000..9be27b90a9 --- /dev/null +++ b/var/spack/repos/builtin/packages/mpilander/package.py @@ -0,0 +1,64 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Mpilander(CMakePackage): + """There can only be one (MPI process)!""" + + homepage = "https://github.com/MPILander/MPILander" + url = "https://github.com/MPILander/MPILander/archive/0.1.0.tar.gz" + maintainers = ['ax3l'] + + version('develop', branch='master', + git='https://github.com/MPILander/MPILander.git') + + # variant('cuda', default=False, description='Enable CUDA support') + # variant( + # 'schedulers', + # description='List of supported schedulers', + # values=('alps', 'lsf', 'tm', 'slurm', 'sge', 'loadleveler'), + # multi=True + # ) + + depends_on('cmake@3.9.2:', type='build') + + provides('mpi@:3.1') + + # compiler support + conflicts('%gcc@:4.7') + conflicts('%clang@:3.8') + conflicts('%intel@:16') + + def cmake_args(self): + args = [ + # tests and examples + '-DBUILD_TESTING:BOOL={0}'.format( + 'ON' if self.run_tests else 'OFF'), + '-DBUILD_EXAMPLES:BOOL={0}'.format( + 'ON' if self.run_tests else 'OFF'), + ] + + return args -- cgit v1.2.3-70-g09d2 From 664f03e32957041b28fc9b60e5cbb4729adc5cfc Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 13 Jun 2018 21:42:13 +0200 Subject: ADIOS: Revert Patch (#8463) That patch is only a partial solution and does not solve the issue. Revert is, unnecessary. --- var/spack/repos/builtin/packages/adios/nompi.patch | 16 ---------------- var/spack/repos/builtin/packages/adios/package.py | 3 --- 2 files changed, 19 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/adios/nompi.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/adios/nompi.patch b/var/spack/repos/builtin/packages/adios/nompi.patch deleted file mode 100644 index 2d00b29924..0000000000 --- a/var/spack/repos/builtin/packages/adios/nompi.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/core/adios_internals_mxml.c b/src/core/adios_internals_mxml.c -index 513fd45c..b9296050 100644 ---- a/src/core/adios_internals_mxml.c -+++ b/src/core/adios_internals_mxml.c -@@ -2173,8 +2173,9 @@ int adios_parse_config (const char * config, MPI_Comm comm) - char * buffer = NULL; - //#if HAVE_MPI - int buffer_size = 0; -- int rank; -- MPI_Comm_rank (comm, &rank); -+ int rank = 0; -+ if (comm != MPI_COMM_NULL) -+ MPI_Comm_rank (comm, &rank); - init_comm = comm; - if (rank == 0) - { diff --git a/var/spack/repos/builtin/packages/adios/package.py b/var/spack/repos/builtin/packages/adios/package.py index 2ebd1c31e1..3fabaff020 100644 --- a/var/spack/repos/builtin/packages/adios/package.py +++ b/var/spack/repos/builtin/packages/adios/package.py @@ -121,9 +121,6 @@ class Adios(AutotoolsPackage): # https://github.com/ornladios/ADIOS/commit/3b21a8a41509 # https://github.com/spack/spack/issues/1683 patch('adios_1100.patch', when='@:1.10.0^hdf5@1.10:') - # Fix ADIOS <=1.13.1 serial compile against parallel library - # https://github.com/ornladios/ADIOS/pull/182 - patch('nompi.patch', when='@1.10.0:1.13.1') def validate(self, spec): """Checks if incompatible variants have been activated at the same time -- cgit v1.2.3-70-g09d2 From 758b813c3673ee74f0b23edb2a568d686107d507 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Wed, 13 Jun 2018 15:42:29 -0400 Subject: new package: ASPECT (#8459) * add ASPECT package * add maintainer * simplify --- var/spack/repos/builtin/packages/aspect/package.py | 56 ++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 var/spack/repos/builtin/packages/aspect/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/aspect/package.py b/var/spack/repos/builtin/packages/aspect/package.py new file mode 100644 index 0000000000..c55494f521 --- /dev/null +++ b/var/spack/repos/builtin/packages/aspect/package.py @@ -0,0 +1,56 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Aspect(CMakePackage): + """Parallel, extendible finite element code to simulate convection in the + Earth's mantle and elsewhere.""" + + homepage = "https://aspect.geodynamics.org" + url = "https://github.com/geodynamics/aspect/releases/download/v2.0.0/aspect-2.0.0.tar.gz" + + maintainers = ['tjhei'] + + version('2.0.0', 'dfecc571fb221f28a0800034cd29c95c') + version('develop', git='https://github.com/geodynamics/aspect.git', branch='master') + + variant('build_type', default='Release', + description='The build type to build', + values=('Debug', 'Release')) + variant('gui', default=False, description='Enable the deal.II parameter GUI') + variant('fpe', default=False, description='Enable floating point exception checks') + + depends_on('dealii+p4est+trilinos+mpi') + depends_on('dealii-parameter-gui', when='+gui') + + def cmake_args(self): + return [ + '-DASPECT_USE_FP_EXCEPTIONS=%s' % + ('ON' if '+fpe' in self.spec else 'OFF') + ] + + def setup_environment(self, spack_env, run_env): + run_env.set('Aspect_DIR', self.prefix) -- cgit v1.2.3-70-g09d2 From 674feb45f1f9437991d3dae7e4a34949feaecb11 Mon Sep 17 00:00:00 2001 From: Jim Galarowicz Date: Wed, 13 Jun 2018 15:35:32 -0500 Subject: Add the ability to build the dyninst master branch under the develop version name. (#8455) * Add the ability to build the dyninst master branch under the develop version name. Fix elfutils and libdwarf to work with the various dyninst versions and vice-versa. * Add reviewer suggested change to dyninst package file. Remove colon in spec.satisfies clause. * Add reviewer suggested change to dyninst package file. Remove duplicate lines. * Add reviewer suggested change to dyninst package file. Encompass all versions under 10.0 with respect to using libdwarf in the build. --- .../repos/builtin/packages/dyninst/package.py | 31 +++++++++++++++++----- .../repos/builtin/packages/elfutils/package.py | 2 +- .../repos/builtin/packages/libdwarf/package.py | 9 ++++++- 3 files changed, 34 insertions(+), 8 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dyninst/package.py b/var/spack/repos/builtin/packages/dyninst/package.py index 879bbf616a..df7c0a3f7f 100644 --- a/var/spack/repos/builtin/packages/dyninst/package.py +++ b/var/spack/repos/builtin/packages/dyninst/package.py @@ -33,6 +33,7 @@ class Dyninst(Package): url = "https://github.com/dyninst/dyninst/archive/v9.2.0.tar.gz" list_url = "http://www.dyninst.org/downloads/dyninst-8.x" + version('develop', git="https://github.com/dyninst/dyninst.git", branch='master') version('9.3.2', git="https://github.com/dyninst/dyninst.git", tag='v9.3.2') version('9.3.0', git="https://github.com/dyninst/dyninst.git", tag='v9.3.0') version('9.2.0', git="https://github.com/dyninst/dyninst.git", tag='v9.2.0') @@ -44,9 +45,19 @@ class Dyninst(Package): variant('stat_dysect', default=False, description="patch for STAT's DySectAPI") + # Dyninst depends on libelf and libdwarf prior to @9.3.0 + # Dyninst depends on elfutils and libdwarf from @9.3.0 to but + # not including @develop + # Dyninst depends on elfutils and elfutils libdw from @develop forward + # elf@0 is an abstaction for libelf + # elf@1 is an abstaction for elfutils depends_on("elf@0", type='link', when='@:9.2.99') + # The sorting algorithm puts numbered releases as newer than alphabetic + # releases, but spack has special logic in place to ensure that + # develop is considered newer than all other releases. + # So, develop is included in the elf@1 line below. depends_on("elf@1", type='link', when='@9.3.0:') - depends_on("libdwarf") + depends_on("libdwarf", when='@:9') depends_on("boost@1.42:") depends_on('cmake', type='build') @@ -62,7 +73,8 @@ class Dyninst(Package): return libelf = spec['elf'].prefix - libdwarf = spec['libdwarf'].prefix + if spec.satisfies('@:9'): + libdwarf = spec['libdwarf'].prefix with working_dir('spack-build', create=True): args = ['..', @@ -72,10 +84,17 @@ class Dyninst(Package): '-DLIBELF_INCLUDE_DIR=%s' % join_path( libelf.include, 'libelf'), '-DLIBELF_LIBRARIES=%s' % join_path( - libelf.lib, 'libelf.so'), - '-DLIBDWARF_INCLUDE_DIR=%s' % libdwarf.include, - '-DLIBDWARF_LIBRARIES=%s' % join_path( - libdwarf.lib, 'libdwarf.so')] + libelf.lib, "libelf." + dso_suffix)] + if spec.satisfies('@:9'): + args.append('-DLIBDWARF_INCLUDE_DIR=%s' % libdwarf.include) + args.append('-DLIBDWARF_LIBRARIES=%s' % join_path( + libdwarf.lib, "libdwarf." + dso_suffix)) + # For @develop + use elfutils libdw, libelf is an abstraction + # we are really using elfutils here + if spec.satisfies('@develop'): + args.append('-DLIBDWARF_INCLUDE_DIR=%s' % libelf.include) + args.append('-DLIBDWARF_LIBRARIES=%s' % join_path( + libelf.lib, "libdw." + dso_suffix)) if spec.satisfies('arch=linux-redhat7-ppc64le'): args.append('-Darch_ppc64_little_endian=1') args += std_cmake_args diff --git a/var/spack/repos/builtin/packages/elfutils/package.py b/var/spack/repos/builtin/packages/elfutils/package.py index 1f269c883d..faf972151e 100644 --- a/var/spack/repos/builtin/packages/elfutils/package.py +++ b/var/spack/repos/builtin/packages/elfutils/package.py @@ -41,7 +41,7 @@ class Elfutils(AutotoolsPackage): version('0.170', '03599aee98c9b726c7a732a2dd0245d5') version('0.168', '52adfa40758d0d39e5d5c57689bf38d6') - version('0.163', '77ce87f259987d2e54e4d87b86cbee41', preferred=True) + version('0.163', '77ce87f259987d2e54e4d87b86cbee41') depends_on('flex', type='build') depends_on('bison', type='build') diff --git a/var/spack/repos/builtin/packages/libdwarf/package.py b/var/spack/repos/builtin/packages/libdwarf/package.py index 80681d08d1..75288d66b1 100644 --- a/var/spack/repos/builtin/packages/libdwarf/package.py +++ b/var/spack/repos/builtin/packages/libdwarf/package.py @@ -24,6 +24,7 @@ ############################################################################## from spack import * import sys +import os # Only build certain parts of dwarf because the other ones break. dwarf_dirs = ['libdwarf', 'dwarfdump2'] @@ -45,10 +46,12 @@ class Libdwarf(Package): url = "http://www.prevanders.net/libdwarf-20160507.tar.gz" list_url = homepage + version('20180129', 'c5e90fad4640f0d713ae8b986031f959') version('20160507', 'ae32d6f9ece5daf05e2d4b14822ea811') version('20130729', '4cc5e48693f7b93b7aa0261e63c0e21d') version('20130207', '64b42692e947d5180e162e46c689dfbf') version('20130126', 'ded74a5e90edb5a12aac3c29d260c5db') + depends_on("elfutils@0.163", when='@20160507', type='link') depends_on("elf", type='link') depends_on('zlib', type='link') @@ -91,8 +94,12 @@ class Libdwarf(Package): make() libdwarf_name = 'libdwarf.{0}'.format(dso_suffix) + libdwarf1_name = 'libdwarf.{0}'.format(dso_suffix) + ".1" install('libdwarf.a', prefix.lib) - install('libdwarf.so', join_path(prefix.lib, libdwarf_name)) + install('libdwarf.so', join_path(prefix.lib, libdwarf1_name)) + if spec.satisfies('@20160507:'): + with working_dir(prefix.lib): + os.symlink(libdwarf1_name, libdwarf_name) install('libdwarf.h', prefix.include) install('dwarf.h', prefix.include) -- cgit v1.2.3-70-g09d2 From a0c2a25a72136f705e411a86b7f4bdfec5126505 Mon Sep 17 00:00:00 2001 From: Veselin Dobrev Date: Wed, 13 Jun 2018 13:42:21 -0700 Subject: [mfem] new version: 3.4 (#8453) * Add new version (3.4.0) with new variant (pumi). * Fix an issue: skip the tests in examples/pumi as they require files that are not included in the mfem distribution/repository. * Use patches to fix the testing issues with PUMI and PETSc v3.9. * Use the new bit.ly short link for v3.4. --- .../packages/mfem/mfem-3.3-3.4-petsc-3.9.patch | 71 ++++++++++++++++++++++ .../repos/builtin/packages/mfem/mfem-3.4.patch | 36 +++++++++++ var/spack/repos/builtin/packages/mfem/package.py | 39 +++++++++--- .../repos/builtin/packages/mfem/test_builds.sh | 5 +- 4 files changed, 142 insertions(+), 9 deletions(-) create mode 100644 var/spack/repos/builtin/packages/mfem/mfem-3.3-3.4-petsc-3.9.patch create mode 100644 var/spack/repos/builtin/packages/mfem/mfem-3.4.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mfem/mfem-3.3-3.4-petsc-3.9.patch b/var/spack/repos/builtin/packages/mfem/mfem-3.3-3.4-petsc-3.9.patch new file mode 100644 index 0000000000..dcf4870a25 --- /dev/null +++ b/var/spack/repos/builtin/packages/mfem/mfem-3.3-3.4-petsc-3.9.patch @@ -0,0 +1,71 @@ +diff --git a/examples/petsc/rc_ex3p b/examples/petsc/rc_ex3p +index 2cbe07ef2..c585d9b52 100644 +--- a/examples/petsc/rc_ex3p ++++ b/examples/petsc/rc_ex3p +@@ -6,4 +6,4 @@ + # it needs PETSc configured with MUMPS + + -solver_pc_type cholesky +--solver_pc_factor_mat_solver_package mumps ++-solver_pc_factor_mat_solver_type mumps +diff --git a/examples/petsc/rc_ex3p_bddc b/examples/petsc/rc_ex3p_bddc +index ea887bb29..2e1eba0d5 100644 +--- a/examples/petsc/rc_ex3p_bddc ++++ b/examples/petsc/rc_ex3p_bddc +@@ -16,7 +16,7 @@ + #-pc_bddc_adaptive_threshold 10 + + # Customization of the local solvers +-#-pc_bddc_neumann_pc_factor_mat_solver_package mumps +-#-pc_bddc_dirichlet_pc_factor_mat_solver_package mumps ++#-pc_bddc_neumann_pc_factor_mat_solver_type mumps ++#-pc_bddc_dirichlet_pc_factor_mat_solver_type mumps + #-pc_bddc_coarse_pc_type cholesky +-#-pc_bddc_coarse_pc_factor_mat_solver_package mumps ++#-pc_bddc_coarse_pc_factor_mat_solver_type mumps +diff --git a/examples/petsc/rc_ex4p b/examples/petsc/rc_ex4p +index f734f35fe..64fbe9427 100644 +--- a/examples/petsc/rc_ex4p ++++ b/examples/petsc/rc_ex4p +@@ -2,4 +2,4 @@ + # it needs PETSc configured with MUMPS + + -solver_pc_type cholesky +--solver_pc_factor_mat_solver_package mumps ++-solver_pc_factor_mat_solver_type mumps +diff --git a/examples/petsc/rc_ex4p_bddc b/examples/petsc/rc_ex4p_bddc +index 9507ad431..e8ef99db7 100644 +--- a/examples/petsc/rc_ex4p_bddc ++++ b/examples/petsc/rc_ex4p_bddc +@@ -13,7 +13,7 @@ + #-pc_bddc_adaptive_threshold 10 + + # Customization of the local solvers +-#-pc_bddc_neumann_pc_factor_mat_solver_package mumps +-#-pc_bddc_dirichlet_pc_factor_mat_solver_package mumps ++#-pc_bddc_neumann_pc_factor_mat_solver_type mumps ++#-pc_bddc_dirichlet_pc_factor_mat_solver_type mumps + #-pc_bddc_coarse_pc_type cholesky +-#-pc_bddc_coarse_pc_factor_mat_solver_package mumps ++#-pc_bddc_coarse_pc_factor_mat_solver_type mumps +diff --git a/examples/petsc/rc_ex5p_bddc b/examples/petsc/rc_ex5p_bddc +index b243c53c8..a4bc899c3 100644 +--- a/examples/petsc/rc_ex5p_bddc ++++ b/examples/petsc/rc_ex5p_bddc +@@ -28,13 +28,13 @@ + # local solvers (needs PETSc compiled with support for SuiteSparse) + # default solvers will fail + -prec_pc_bddc_neumann_pc_type lu +--prec_pc_bddc_neumann_pc_factor_mat_solver_package umfpack ++-prec_pc_bddc_neumann_pc_factor_mat_solver_type umfpack + -prec_pc_bddc_dirichlet_pc_type lu +--prec_pc_bddc_dirichlet_pc_factor_mat_solver_package umfpack ++-prec_pc_bddc_dirichlet_pc_factor_mat_solver_type umfpack + + # coarse solver (needs PETSc compiled with support for MUMPS) + # default solver may fail +--prec_pc_bddc_coarse_pc_factor_mat_solver_package mumps ++-prec_pc_bddc_coarse_pc_factor_mat_solver_type mumps + -prec_pc_bddc_coarse_pc_type cholesky + + # deluxe scaling (needs PETSc compiled with support for MUMPS) diff --git a/var/spack/repos/builtin/packages/mfem/mfem-3.4.patch b/var/spack/repos/builtin/packages/mfem/mfem-3.4.patch new file mode 100644 index 0000000000..465e0525ea --- /dev/null +++ b/var/spack/repos/builtin/packages/mfem/mfem-3.4.patch @@ -0,0 +1,36 @@ +diff --git a/config/test.mk b/config/test.mk +index 4821b084d..62479fc63 100644 +--- a/config/test.mk ++++ b/config/test.mk +@@ -14,11 +14,13 @@ + # Colors used below: + # green '\033[0;32m' + # red '\033[0;31m' ++# yellow '\033[0;33m' + # no color '\033[0m' + COLOR_PRINT = if [ -t 1 ]; then \ + printf $(1)$(2)'\033[0m'$(3); else printf $(2)$(3); fi + PRINT_OK = $(call COLOR_PRINT,'\033[0;32m',OK," ($$1 $$2)\n") + PRINT_FAILED = $(call COLOR_PRINT,'\033[0;31m',FAILED," ($$1 $$2)\n") ++PRINT_SKIP = $(call COLOR_PRINT,'\033[0;33m',SKIP,"\n") + + # Timing support + define TIMECMD_detect +diff --git a/examples/pumi/makefile b/examples/pumi/makefile +index 2f98eeca7..5ff652aca 100644 +--- a/examples/pumi/makefile ++++ b/examples/pumi/makefile +@@ -51,6 +51,13 @@ endif + MFEM_TESTS = EXAMPLES + include $(MFEM_TEST_MK) + ++ifneq (,$(filter test%,$(MAKECMDGOALS))) ++ ifeq (,$(wildcard ../../data/pumi)) ++ $(info PUMI data directory not found. The PUMI tests will be SKIPPED.) ++ mfem-test = printf " $(3) [$(2) $(1) ... ]: "; $(PRINT_SKIP) ++ endif ++endif ++ + # Testing: Parallel vs. serial runs + RUN_MPI_NP = $(MFEM_MPIEXEC) $(MFEM_MPIEXEC_NP) + RUN_MPI = $(RUN_MPI_NP) $(MFEM_MPI_NP) diff --git a/var/spack/repos/builtin/packages/mfem/package.py b/var/spack/repos/builtin/packages/mfem/package.py index 4ad659d16b..c32e1f622a 100644 --- a/var/spack/repos/builtin/packages/mfem/package.py +++ b/var/spack/repos/builtin/packages/mfem/package.py @@ -65,11 +65,15 @@ class Mfem(Package): version('develop', git='https://github.com/mfem/mfem', branch='master') - version('3.3.2', - '01a762a5d0a2bc59ce4e2f59009045a4', - url='https://goo.gl/Kd7Jk8', extension='.tar.gz', + version('3.4.0', + '4e73e4fe0482636de3c5dc983cd395839a83cb16f6f509bd88b053e8b3858e05', + url='https://bit.ly/mfem-3-4', extension='.tar.gz', preferred=True) + version('3.3.2', + 'b70fa3c5080b9ec514fc05f4a04ff74322b99ac4ecd6d99c229f0ed5188fc0ce', + url='https://goo.gl/Kd7Jk8', extension='.tar.gz') + version('laghos-v1.0', git='https://github.com/mfem/mfem', tag='laghos-v1.0') @@ -117,6 +121,8 @@ class Mfem(Package): description='Enable PETSc solvers, preconditioners, etc.') variant('sundials', default=False, description='Enable Sundials time integrators') + variant('pumi', default=False, + description='Enable functionality based on PUMI') variant('mpfr', default=False, description='Enable precise, 1D quadrature rules') variant('lapack', default=False, @@ -152,6 +158,7 @@ class Mfem(Package): conflicts('+mpfr', when='@:3.2') conflicts('+petsc', when='@:3.2') conflicts('+sundials', when='@:3.2') + conflicts('+pumi', when='@:3.3.2') conflicts('timer=mac', when='@:3.3.0') conflicts('timer=mpi', when='@:3.3.0') conflicts('~metis+mpi', when='@:3.3.0') @@ -160,8 +167,11 @@ class Mfem(Package): conflicts('+superlu-dist', when='~mpi') conflicts('+petsc', when='~mpi') + conflicts('+pumi', when='~mpi') conflicts('timer=mpi', when='~mpi') + conflicts('+pumi', when='+shared') + depends_on('mpi', when='+mpi') depends_on('hypre@2.10.0:2.13.999', when='@:3.3.999+mpi') depends_on('hypre', when='@3.4:+mpi') @@ -174,6 +184,7 @@ class Mfem(Package): depends_on('sundials@2.7.0+mpi+hypre', when='@:3.3.0+sundials+mpi') depends_on('sundials@2.7.0:', when='@3.3.2:+sundials~mpi') depends_on('sundials@2.7.0:+mpi+hypre', when='@3.3.2:+sundials+mpi') + depends_on('pumi', when='+pumi') depends_on('suite-sparse', when='+suite-sparse') depends_on('superlu-dist', when='+superlu-dist') # The PETSc tests in MFEM will fail if PETSc is not configured with @@ -192,6 +203,9 @@ class Mfem(Package): depends_on('conduit+mpi', when='+conduit+mpi') patch('mfem_ppc_build.patch', when='@3.2:3.3.0 arch=ppc64le') + patch('mfem-3.4.patch', when='@3.4.0') + patch('mfem-3.3-3.4-petsc-3.9.patch', + when='@3.3.0:3.4.0,develop +petsc ^petsc@3.9.0:') phases = ['configure', 'build', 'install'] @@ -226,6 +240,15 @@ class Mfem(Package): flags += ['-l%s' % lib for lib in pkg_libs_list] return ' '.join(flags) + def find_optional_library(name, prefix): + for shared in [True, False]: + for path in ['lib64', 'lib']: + lib = find_libraries(name, join_path(prefix, path), + shared=shared, recursive=False) + if lib: + return lib + return LibraryList([]) + metis5_str = 'NO' if ('+metis' in spec) and spec['metis'].satisfies('@5:'): metis5_str = 'YES' @@ -248,6 +271,7 @@ class Mfem(Package): 'MFEM_USE_SUITESPARSE=%s' % yes_no('+suite-sparse'), 'MFEM_USE_SUNDIALS=%s' % yes_no('+sundials'), 'MFEM_USE_PETSC=%s' % yes_no('+petsc'), + 'MFEM_USE_PUMI=%s' % yes_no('+pumi'), 'MFEM_USE_NETCDF=%s' % yes_no('+netcdf'), 'MFEM_USE_MPFR=%s' % yes_no('+mpfr'), 'MFEM_USE_GNUTLS=%s' % yes_no('+gnutls'), @@ -318,6 +342,9 @@ class Mfem(Package): 'PETSC_LIB=%s' % ld_flags_from_LibraryList(spec['petsc'].libs)] + if '+pumi' in spec: + options += ['PUMI_DIR=%s' % spec['pumi'].prefix] + if '+netcdf' in spec: options += [ 'NETCDF_OPT=-I%s' % spec['netcdf'].prefix.include, @@ -349,11 +376,7 @@ class Mfem(Package): libunwind = spec['libunwind'] headers = find_headers('libunwind', libunwind.prefix.include) headers.add_macro('-g') - libs = find_libraries('libunwind', libunwind.prefix.lib, - shared=True, recursive=True) - if not libs: - libs = find_libraries('libunwind', libunwind.prefix.lib, - shared=False, recursive=True) + libs = find_optional_library('libunwind', libunwind.prefix) # When mfem uses libunwind, it also needs 'libdl'. libs += LibraryList(find_system_libraries('libdl')) options += [ diff --git a/var/spack/repos/builtin/packages/mfem/test_builds.sh b/var/spack/repos/builtin/packages/mfem/test_builds.sh index 5b8dd7ba0f..b7d3d881b3 100755 --- a/var/spack/repos/builtin/packages/mfem/test_builds.sh +++ b/var/spack/repos/builtin/packages/mfem/test_builds.sh @@ -5,7 +5,7 @@ builds=( 'mfem' 'mfem~mpi~metis~gzstream' 'mfem+mpi+superlu-dist+suite-sparse+petsc \ - +sundials+mpfr+netcdf+gzstream+gnutls+libunwind \ + +sundials+pumi+mpfr+netcdf+gzstream+gnutls+libunwind \ ^hypre~internal-superlu ^petsc~boost+suite-sparse+mumps' 'mfem~mpi+suite-sparse+sundials+mpfr+netcdf \ +gzstream+gnutls+libunwind' @@ -14,6 +14,7 @@ builds=( 'mfem@develop+shared~static~mpi~metis~gzstream' # TODO: Replace '^conduit~python~hdf5' with '^conduit~python' when conduit # is fixed to accept '^hdf5+mpi'. + # NOTE: Skip PUMI since it conflicts with '+shared'. 'mfem@develop+shared~static+mpi \ +superlu-dist+suite-sparse+petsc+sundials+mpfr+netcdf+gzstream \ +gnutls+libunwind+conduit ^hypre~internal-superlu \ @@ -32,6 +33,7 @@ builds2=( 'mfem+suite-sparse' 'mfem+sundials~mpi' 'mfem+sundials' + 'mfem+pumi' 'mfem+netcdf~mpi' 'mfem+netcdf' 'mfem+mpfr' @@ -43,6 +45,7 @@ builds2=( 'mfem@develop+suite-sparse' 'mfem@develop+sundials~mpi' 'mfem@develop+sundials' + 'mfem@develop+pumi' 'mfem@develop+netcdf~mpi' 'mfem@develop+netcdf' 'mfem@develop+mpfr' -- cgit v1.2.3-70-g09d2 From 2829ebd4852d3798403447fc6bb766185e0b0e5d Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Thu, 14 Jun 2018 02:15:34 +0530 Subject: xsdk: update xsdk@develop dependency on mfem@develop (#8462) --- var/spack/repos/builtin/packages/xsdk/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py index dc96b61723..b3660a6493 100644 --- a/var/spack/repos/builtin/packages/xsdk/package.py +++ b/var/spack/repos/builtin/packages/xsdk/package.py @@ -51,7 +51,7 @@ class Xsdk(Package): depends_on('hypre@develop~internal-superlu', when='@develop') depends_on('mfem@3.3.2+mpi+hypre+superlu-dist+petsc+sundials+examples+miniapps', when='@0.3.0') - depends_on('mfem@3.3.2+mpi+hypre+superlu-dist+petsc+sundials+examples+miniapps', when='@develop') + depends_on('mfem@develop+mpi+hypre+superlu-dist+petsc+sundials+examples+miniapps', when='@develop') depends_on('superlu-dist@5.2.2', when='@0.3.0') depends_on('superlu-dist@xsdk-0.2.0', when='@xsdk-0.2.0') -- cgit v1.2.3-70-g09d2 From eac8cf83bd0b4891c9bcb7d07b0ae48d6dc203e6 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Thu, 14 Jun 2018 02:16:38 +0530 Subject: xsdk: fix 'ChecksumError: md5 checksum failed' (#8440) [error came up with the prior url pointing to a 'master' branch. so fixing with a switch to a fixed tarball] --- var/spack/repos/builtin/packages/xsdk/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py index b3660a6493..cb8178ce74 100644 --- a/var/spack/repos/builtin/packages/xsdk/package.py +++ b/var/spack/repos/builtin/packages/xsdk/package.py @@ -37,7 +37,7 @@ class Xsdk(Package): # Dummy url since Spack complains if I don't list something, will be # removed when metapackage is available - url = 'https://bitbucket.org/saws/saws/get/master.tar.gz' + url = 'http://ftp.mcs.anl.gov/pub/petsc/externalpackages/xsdk.tar.gz' version('develop', 'a52dc710c744afa0b71429b8ec9425bc') version('0.3.0', 'a52dc710c744afa0b71429b8ec9425bc', preferred=True) -- cgit v1.2.3-70-g09d2 From ee4050c58f7c76cf789a03d62a6ee613f8b1a34a Mon Sep 17 00:00:00 2001 From: Serban Maerean Date: Wed, 13 Jun 2018 18:53:14 -0400 Subject: boost package: patch dirent for pgi and boost 1.67 (#8313) --- .../repos/builtin/packages/boost/boost_1.67.0_pgi.patch | 13 +++++++++++++ var/spack/repos/builtin/packages/boost/package.py | 1 + 2 files changed, 14 insertions(+) create mode 100644 var/spack/repos/builtin/packages/boost/boost_1.67.0_pgi.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/boost/boost_1.67.0_pgi.patch b/var/spack/repos/builtin/packages/boost/boost_1.67.0_pgi.patch new file mode 100644 index 0000000000..b2c7acaf6b --- /dev/null +++ b/var/spack/repos/builtin/packages/boost/boost_1.67.0_pgi.patch @@ -0,0 +1,13 @@ +--- a/libs/filesystem/src/operations.cpp ++++ b/libs/filesystem/src/operations.cpp +@@ -2056,10 +2056,6 @@ + return ok; + } + +-#if defined(__PGI) && defined(__USE_FILE_OFFSET64) +-#define dirent dirent64 +-#endif +- + error_code dir_itr_first(void *& handle, void *& buffer, + const char* dir, string& target, + fs::file_status &, fs::file_status &) diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index cc774b927b..5b8b621ba5 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -177,6 +177,7 @@ class Boost(Package): patch('call_once_variadic.patch', when='@1.54.0:1.55.9999%gcc@5.0:5.9') # Patch fix for PGI compiler + patch('boost_1.67.0_pgi.patch', when='@1.67.0%pgi') patch('boost_1.63.0_pgi.patch', when='@1.63.0%pgi') patch('boost_1.63.0_pgi_17.4_workaround.patch', when='@1.63.0%pgi@17.4') -- cgit v1.2.3-70-g09d2 From a878e76f936551e371e587cab5f6210518f2715d Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Thu, 14 Jun 2018 20:41:35 +0200 Subject: superlu-dist: add 5.3.0 and 5.4.0 (#8481) --- var/spack/repos/builtin/packages/superlu-dist/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/superlu-dist/package.py b/var/spack/repos/builtin/packages/superlu-dist/package.py index 98bd776a92..396f2f091d 100644 --- a/var/spack/repos/builtin/packages/superlu-dist/package.py +++ b/var/spack/repos/builtin/packages/superlu-dist/package.py @@ -35,6 +35,8 @@ class SuperluDist(Package): version('develop', git='https://github.com/xiaoyeli/superlu_dist', tag='master') version('xsdk-0.2.0', git='https://github.com/xiaoyeli/superlu_dist', tag='xsdk-0.2.0') + version('5.4.0', 'e64645c5be352ae2c88327af2cac66e1') + version('5.3.0', '35d5aa8e0a246efaf327988b20106714') version('5.2.2', 'a685ef7fb7859b24c8c9d5d5f121a8a5') version('5.2.1', 'af857778ffeb04aea02aa4843e6e8e1d') version('5.1.3', '3a9e88a8469aa7f319f0364364b8da35') -- cgit v1.2.3-70-g09d2 From df657275e4efff2ca92a80987ca9a7e578bbdfc1 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Thu, 14 Jun 2018 20:41:52 +0200 Subject: slepc: add 3.9.1 (#8480) --- var/spack/repos/builtin/packages/slepc/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/slepc/package.py b/var/spack/repos/builtin/packages/slepc/package.py index 0fb73ddca6..cdd69f48cb 100644 --- a/var/spack/repos/builtin/packages/slepc/package.py +++ b/var/spack/repos/builtin/packages/slepc/package.py @@ -34,6 +34,7 @@ class Slepc(Package): homepage = "http://www.grycap.upv.es/slepc" url = "http://slepc.upv.es/download/distrib/slepc-3.6.2.tar.gz" + version('3.9.1', 'e174ea7c127d9161eef976b0288f0c56d443a58d6ab2dc8af1e8bd66f156ce17') version('3.9.0', '1f3930db56b4065aaf214ea758ddff1a70bf19d45544cbdfd19d2787db4bfe0b') version('3.8.2', '1e7d20d20eb26da307d36017461fe4a55f40e947e232739179dbe6412e22ed13') version('3.8.0', 'c58ccc4e852d1da01112466c48efa41f0839649f3a265925788237d76cd3d963') -- cgit v1.2.3-70-g09d2 From 484e54d78e59231acfe35e737936462c49bb15ff Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Thu, 14 Jun 2018 20:42:12 +0200 Subject: petsc: add 3.9.1 and 3.9.2 (#8479) --- var/spack/repos/builtin/packages/petsc/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index 08d16f5e1e..80dbdbfc84 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -42,6 +42,8 @@ class Petsc(Package): version('develop', git='https://bitbucket.org/petsc/petsc.git', branch='master') version('xsdk-0.2.0', git='https://bitbucket.org/petsc/petsc.git', tag='xsdk-0.2.0') + version('3.9.2', '8bedc0cd8c8603d54bfd99a6e8f77b3d') + version('3.9.1', 'd3a229a188dbeef9b3f29b9a63622fad') version('3.9.0', '34b8a81814ca050a96d58e53a2f0ac7a') version('3.8.4', 'd7767fe2919536aa393eb22841899306') version('3.8.3', '322cbcf2a0f7b7bad562643b05d66f11') -- cgit v1.2.3-70-g09d2 From b5fcd62891b4e4c54e805704fd6b2c9c9a707c95 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Thu, 14 Jun 2018 20:43:05 +0200 Subject: openblas: add 0.3.0 (#8478) --- var/spack/repos/builtin/packages/openblas/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openblas/package.py b/var/spack/repos/builtin/packages/openblas/package.py index bb61bafb40..434a6171df 100644 --- a/var/spack/repos/builtin/packages/openblas/package.py +++ b/var/spack/repos/builtin/packages/openblas/package.py @@ -34,6 +34,7 @@ class Openblas(MakefilePackage): homepage = 'http://www.openblas.net' url = 'http://github.com/xianyi/OpenBLAS/archive/v0.2.19.tar.gz' + version('0.3.0', '42cde2c1059a8a12227f1e6551c8dbd2') version('0.2.20', '48637eb29f5b492b91459175dcc574b1') version('0.2.19', '28c998054fd377279741c6f0b9ea7941') version('0.2.18', '805e7f660877d588ea7e3792cda2ee65') -- cgit v1.2.3-70-g09d2 From 34c08ed362452b5753782b6ebfef12195122b3dd Mon Sep 17 00:00:00 2001 From: Praveen C Date: Fri, 15 Jun 2018 00:13:43 +0530 Subject: netgen should depend on zlib (#8473) --- var/spack/repos/builtin/packages/netgen/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/netgen/package.py b/var/spack/repos/builtin/packages/netgen/package.py index 6273d5ae18..a5595c4c69 100644 --- a/var/spack/repos/builtin/packages/netgen/package.py +++ b/var/spack/repos/builtin/packages/netgen/package.py @@ -43,6 +43,7 @@ class Netgen(AutotoolsPackage): variant("gui", default=False, description='enable gui') variant("metis", default=False, description='use metis for partitioning') + depends_on('zlib') depends_on('mpi', when='+mpi') depends_on('oce+X11', when='+oce') depends_on('metis', when='+metis') -- cgit v1.2.3-70-g09d2 From 53517c60b624793e0019c41e6592fe15d4f912d4 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Thu, 14 Jun 2018 20:44:14 +0200 Subject: oce: add 0.18.3 (#8477) --- var/spack/repos/builtin/packages/oce/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/oce/package.py b/var/spack/repos/builtin/packages/oce/package.py index c7ca09f06f..45758d6924 100644 --- a/var/spack/repos/builtin/packages/oce/package.py +++ b/var/spack/repos/builtin/packages/oce/package.py @@ -35,6 +35,7 @@ class Oce(Package): homepage = "https://github.com/tpaviot/oce" url = "https://github.com/tpaviot/oce/archive/OCE-0.18.tar.gz" + version('0.18.3', '1686393c8493bbbb2f3f242330b33cba') version('0.18.2', '6dfd68e459e2c62387579888a867281f') version('0.18.1', '2a7597f4243ee1f03245aeeb02d00956') version('0.18', '226e45e77c16a4a6e127c71fefcd171410703960ae75c7ecc7eb68895446a993') @@ -62,7 +63,7 @@ class Oce(Package): # OCE depends on xlocale.h from glibc-headers but it was removed in 2.26, # see https://github.com/tpaviot/oce/issues/675 - patch('xlocale.patch', level=0, when='@0.18.1:') + patch('xlocale.patch', level=0, when='@0.18.1:0.18.2') # fix build with Xcode 8 "previous definition of CLOCK_REALTIME" # reported 27 Sep 2016 https://github.com/tpaviot/oce/issues/643 -- cgit v1.2.3-70-g09d2 From 75c0007cf80a2858ee20cd6c47d16ea58fb9efb1 Mon Sep 17 00:00:00 2001 From: Matthias Wolf Date: Thu, 14 Jun 2018 20:44:40 +0200 Subject: neovim: add info for v0.3.0 (#8472) --- var/spack/repos/builtin/packages/neovim/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/neovim/package.py b/var/spack/repos/builtin/packages/neovim/package.py index f7919cd70b..ad685a79f6 100644 --- a/var/spack/repos/builtin/packages/neovim/package.py +++ b/var/spack/repos/builtin/packages/neovim/package.py @@ -32,6 +32,7 @@ class Neovim(CMakePackage): homepage = "http://neovim.io" url = "https://github.com/neovim/neovim/archive/v0.2.0.tar.gz" + version('0.3.0', 'e5fdb2025757c337c17449c296eddf5b') version('0.2.2', '44b69f8ace88b646ec890670f1e462c4') version('0.2.1', 'f4271f22d2a46fa18dace42849c56a98') version('0.2.0', '9af7f61f9f0b1a2891147a479d185aa2') -- cgit v1.2.3-70-g09d2 From 98d8bdebbe9eebe6541fc9ff8e44a4486479b585 Mon Sep 17 00:00:00 2001 From: 健美猞猁 Date: Fri, 15 Jun 2018 02:45:12 +0800 Subject: A new package: megahit. (#8471) --- .../repos/builtin/packages/megahit/package.py | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 var/spack/repos/builtin/packages/megahit/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/megahit/package.py b/var/spack/repos/builtin/packages/megahit/package.py new file mode 100644 index 0000000000..3ffcdfb86e --- /dev/null +++ b/var/spack/repos/builtin/packages/megahit/package.py @@ -0,0 +1,44 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Megahit(MakefilePackage): + """MEGAHIT: An ultra-fast single-node solution for + large and complex metagenomics assembly via succinct de Bruijn graph""" + + homepage = "https://github.com/voutcn/megahit" + url = "https://github.com/voutcn/megahit/archive/v1.1.3.tar.gz" + + version('1.1.3', '2962a781a22c0884fa97b95f740ed2fe') + + depends_on('zlib') + + def install(self, spec, prefix): + mkdirp(prefix.bin) + install('megahit', prefix.bin) + install('megahit_asm_core', prefix.bin) + install('megahit_sdbg_build', prefix.bin) + install('megahit_toolkit', prefix.bin) -- cgit v1.2.3-70-g09d2 From a67b2e2942bf8cbd3322cc699dd3da131b6ee30a Mon Sep 17 00:00:00 2001 From: Dan FitzGerald <38731008+djfitzgerald@users.noreply.github.com> Date: Thu, 14 Jun 2018 23:45:21 -0400 Subject: Use the name of the Fortran compiler to determine what name mangling (#8393) setting to use, instead of the spack compiler. %clang can use multiple Fortran compilers with different options, so we need to know what compiler is used in order to provide the correct options. --- var/spack/repos/builtin/packages/suite-sparse/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/suite-sparse/package.py b/var/spack/repos/builtin/packages/suite-sparse/package.py index 6b22e76f0e..be52030057 100644 --- a/var/spack/repos/builtin/packages/suite-sparse/package.py +++ b/var/spack/repos/builtin/packages/suite-sparse/package.py @@ -120,7 +120,7 @@ class SuiteSparse(Package): elif '%pgi' in spec: make_args += ['CFLAGS+=--exceptions'] - if '%xl' in spec or '%xl_r' in spec: + if spack_f77.endswith('xlf') or spack_f77.endswith('xlf_r'): make_args += ['CFLAGS+=-DBLAS_NO_UNDERSCORE'] # Intel TBB in SuiteSparseQR -- cgit v1.2.3-70-g09d2 From 64d20a3955df8cd692b52579a91de416e2649c4b Mon Sep 17 00:00:00 2001 From: Dan FitzGerald <38731008+djfitzgerald@users.noreply.github.com> Date: Thu, 14 Jun 2018 23:46:09 -0400 Subject: Use no mangling for all spack compiler definitions that use the XL (#8392) Fortran compiler. Clang can build with IBM XL Fortran compiler as well, so the name mangling shoud be avoided for that case as well. --- var/spack/repos/builtin/packages/superlu-dist/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/superlu-dist/package.py b/var/spack/repos/builtin/packages/superlu-dist/package.py index 396f2f091d..51c156047f 100644 --- a/var/spack/repos/builtin/packages/superlu-dist/package.py +++ b/var/spack/repos/builtin/packages/superlu-dist/package.py @@ -91,7 +91,8 @@ class SuperluDist(Package): 'INCLUDEDIR = $(SuperLUroot)/include', 'LOADOPTS =', 'CDEFS = %s' % ("-DNoChange" - if '%xl' in spec or '%xl_r' in spec + if spack_f77.endswith('xlf') or + spack_f77.endswith('xlf_r') else "-DAdd_") ]) -- cgit v1.2.3-70-g09d2 From 54aab585c49297b1be5072deea16f5ed2876ba09 Mon Sep 17 00:00:00 2001 From: Dan FitzGerald <38731008+djfitzgerald@users.noreply.github.com> Date: Thu, 14 Jun 2018 23:48:43 -0400 Subject: Patch trilinos for xlf when using clang (#8391) * Add patching for xlf when %clang. Changes are effective only when Fortran compiler is 'XL'. * Use the right version for trilinos when patching for seacas. --- var/spack/repos/builtin/packages/trilinos/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 9a2be4036b..ac98561c04 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -311,6 +311,8 @@ class Trilinos(CMakePackage): patch('xlf_seacas.patch', when='@12.10.1:%xl_r') patch('xlf_tpetra.patch', when='@12.12.1:%xl') patch('xlf_tpetra.patch', when='@12.12.1:%xl_r') + patch('xlf_seacas.patch', when='@12.12.1:%clang') + patch('xlf_tpetra.patch', when='@12.12.1:%clang') def url_for_version(self, version): url = "https://github.com/trilinos/Trilinos/archive/trilinos-release-{0}.tar.gz" -- cgit v1.2.3-70-g09d2 From 5f852634cdaa790bc01010c7a209f77c5f89f1f5 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Fri, 15 Jun 2018 00:54:52 -0700 Subject: openssl: add new version 1.0.2o (#8486) --- var/spack/repos/builtin/packages/openssl/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openssl/package.py b/var/spack/repos/builtin/packages/openssl/package.py index 1f2245f02c..63fbfed533 100644 --- a/var/spack/repos/builtin/packages/openssl/package.py +++ b/var/spack/repos/builtin/packages/openssl/package.py @@ -48,7 +48,8 @@ class Openssl(Package): version('1.1.0c', '601e8191f72b18192a937ecf1a800f3f') # Note: Version 1.0.2 is the "long-term support" version that will # remain supported until 2019. - version('1.0.2n', '13bdc1b1d1ff39b6fd42a255e74676a4', preferred=True) + version('1.0.2o', '44279b8557c3247cbe324e2322ecd114', preferred=True) + version('1.0.2n', '13bdc1b1d1ff39b6fd42a255e74676a4') version('1.0.2m', '10e9e37f492094b9ef296f68f24a7666') version('1.0.2k', 'f965fc0bf01bf882b31314b61391ae65') version('1.0.2j', '96322138f0b69e61b7212bc53d5e912b') -- cgit v1.2.3-70-g09d2 From a3c989ef3a146b771500254b2bf05e61f168f27a Mon Sep 17 00:00:00 2001 From: Veselin Dobrev Date: Fri, 15 Jun 2018 02:34:04 -0700 Subject: [mfem] Add BLAS+LAPACK to the required dependencies of SuperLU_DIST. (#8485) --- var/spack/repos/builtin/packages/mfem/package.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mfem/package.py b/var/spack/repos/builtin/packages/mfem/package.py index c32e1f622a..f1979cdde1 100644 --- a/var/spack/repos/builtin/packages/mfem/package.py +++ b/var/spack/repos/builtin/packages/mfem/package.py @@ -313,13 +313,15 @@ class Mfem(Package): 'LAPACK_LIB=%s' % ld_flags_from_LibraryList(lapack_blas)] if '+superlu-dist' in spec: + lapack_blas = spec['lapack'].libs + spec['blas'].libs options += [ 'SUPERLU_OPT=-I%s -I%s' % (spec['superlu-dist'].prefix.include, spec['parmetis'].prefix.include), - 'SUPERLU_LIB=-L%s -L%s -lsuperlu_dist -lparmetis' % + 'SUPERLU_LIB=-L%s -L%s -lsuperlu_dist -lparmetis %s' % (spec['superlu-dist'].prefix.lib, - spec['parmetis'].prefix.lib)] + spec['parmetis'].prefix.lib, + ld_flags_from_LibraryList(lapack_blas))] if '+suite-sparse' in spec: ss_spec = 'suite-sparse:' + self.suitesparse_components -- cgit v1.2.3-70-g09d2 From a85981b2504c5c7dd63cb2e1fe153b3ab743f43b Mon Sep 17 00:00:00 2001 From: Matthias Maiterth Date: Fri, 15 Jun 2018 15:17:17 +0200 Subject: Package/geopm: Update to version 0.5.0 (#8487) --- var/spack/repos/builtin/packages/geopm/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/geopm/package.py b/var/spack/repos/builtin/packages/geopm/package.py index 6895291c16..b413ae4205 100644 --- a/var/spack/repos/builtin/packages/geopm/package.py +++ b/var/spack/repos/builtin/packages/geopm/package.py @@ -40,6 +40,7 @@ class Geopm(AutotoolsPackage): url = "https://github.com/geopm/geopm/releases/download/v0.4.0/geopm-0.4.0.tar.gz" # Add additional proper versions and checksums here. "spack checksum geopm" + version('0.5.0', '61b454bc74d4606fe84818aef16c1be4') version('0.4.0', 'd4cc8fffe521296dab379857d7e2064d') version('0.3.0', '568fd37234396fff134f8d57b60f2b83') version('master', git='https://github.com/geopm/geopm.git', branch='master') -- cgit v1.2.3-70-g09d2 From a3a9b2ab2b505f1cd17a2a02934dbfd54b3144aa Mon Sep 17 00:00:00 2001 From: Pramod Kumbhar Date: Fri, 15 Jun 2018 17:14:00 +0200 Subject: Add newer likwid versions 4.3.1 and 4.3.2 (#8488) --- var/spack/repos/builtin/packages/likwid/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/likwid/package.py b/var/spack/repos/builtin/packages/likwid/package.py index bcd15ed049..e5e04e252a 100644 --- a/var/spack/repos/builtin/packages/likwid/package.py +++ b/var/spack/repos/builtin/packages/likwid/package.py @@ -37,6 +37,8 @@ class Likwid(Package): maintainers = ['davydden'] + version('4.3.2', '2cf00e220dfe22c8d9b6e44f7534e11d') + version('4.3.1', 'ff28250f622185688bf5e2e0975368ea') version('4.3.0', '7f8f6981d7d341fce2621554323f8c8b') version('4.2.1', 'c408ddcf0317cdd894af4c580cd74294') version('4.2.0', 'e41ff334b8f032a323d941ce32907a75') -- cgit v1.2.3-70-g09d2 From cea5d04a1e03c8ecdbbe76d85c8e9fb716257dfb Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Fri, 15 Jun 2018 10:14:50 -0500 Subject: Fix GDAL Python bindings and add import tests (#8482) --- var/spack/repos/builtin/packages/gdal/package.py | 27 ++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gdal/package.py b/var/spack/repos/builtin/packages/gdal/package.py index 124c472f9e..996564f337 100644 --- a/var/spack/repos/builtin/packages/gdal/package.py +++ b/var/spack/repos/builtin/packages/gdal/package.py @@ -41,6 +41,11 @@ class Gdal(AutotoolsPackage): list_url = "http://download.osgeo.org/gdal/" list_depth = 1 + import_modules = [ + 'osgeo', 'osgeo.gdal', 'osgeo.ogr', 'osgeo.osr', + 'osgeo.gdal_array', 'osgeo.gdalconst' + ] + version('2.3.0', '2fe9d64fcd9dc37645940df020d3e200') version('2.1.2', 'ae85b78888514c75e813d658cac9478e') version('2.0.2', '940208e737c87d31a90eaae43d0efd65') @@ -128,15 +133,14 @@ class Gdal(AutotoolsPackage): depends_on('proj', when='+proj @2.3:') depends_on('perl', type=('build', 'run'), when='+perl') depends_on('python', type=('build', 'run'), when='+python') + # swig/python/setup.py + depends_on('py-setuptools', type='build', when='+python') + depends_on('py-numpy@1.0.0:', type=('build', 'run'), when='+python') depends_on('java', type=('build', 'run'), when='+java') depends_on('armadillo', when='+armadillo') depends_on('cryptopp', when='+cryptopp @2.1:') depends_on('openssl', when='+crypto @2.3:') - # https://trac.osgeo.org/gdal/wiki/SWIG - depends_on('swig', type='build', when='+python') - depends_on('swig', type='build', when='+perl') - # https://trac.osgeo.org/gdal/wiki/SupportedCompilers msg = 'GDAL requires C++11 support' conflicts('%gcc@:4.8.0', msg=msg) @@ -145,6 +149,13 @@ class Gdal(AutotoolsPackage): conflicts('%xl@:13.0', msg=msg) conflicts('%xl_r@:13.0', msg=msg) + def setup_environment(self, spack_env, run_env): + # Needed to install Python bindings to GDAL installation + # prefix instead of Python installation prefix. + # See swig/python/GNUmakefile for more details. + spack_env.set('PREFIX', self.prefix) + spack_env.set('DESTDIR', '/') + # https://trac.osgeo.org/gdal/wiki/BuildHints def configure_args(self): spec = self.spec @@ -425,6 +436,14 @@ class Gdal(AutotoolsPackage): return args + @run_after('install') + @on_package_attributes(run_tests=True) + def import_module_test(self): + if '+python' in self.spec: + with working_dir('..'): + for module in self.import_modules: + python('-c', 'import {0}'.format(module)) + @run_after('install') def darwin_fix(self): # The shared library is not installed correctly on Darwin; fix this -- cgit v1.2.3-70-g09d2 From 4e4457f82054183d6a375bd638f01f6487fb4433 Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Fri, 15 Jun 2018 23:53:59 -0600 Subject: SAMRAI: new versions, handle deprecation of boost in latest version. (#8494) --- var/spack/repos/builtin/packages/samrai/package.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/samrai/package.py b/var/spack/repos/builtin/packages/samrai/package.py index 4e63c6f810..9caf76c888 100644 --- a/var/spack/repos/builtin/packages/samrai/package.py +++ b/var/spack/repos/builtin/packages/samrai/package.py @@ -37,7 +37,12 @@ class Samrai(AutotoolsPackage): url = "https://computation.llnl.gov/projects/samrai/download/SAMRAI-v3.11.2.tar.gz" list_url = homepage + version('3.12.0', '07364f6e209284e45ac0e9caf1d610f6') + version('3.11.5', '4359a03145c03501b230777f92b62104') + version('3.11.4', '473d6796772f5926b1c0d1cf8f3f8c99') + # Version 3.11.3 permissions don't allow downloading version('3.11.2', 'd5f59f8efd755b23b797e46349428206') + version('3.11.1', '19a2398a7448ec0f0f0c5e8fc6f80478') version('3.10.0', 'ff5f5b8b4a35b52a1b7e37a74166c65a') version('3.9.1', '232d04d0c995f5abf20d94350befd0b2') version('3.8.0', 'c18fcffa706346bfa5828b36787ce5fe') @@ -59,9 +64,14 @@ class Samrai(AutotoolsPackage): depends_on('mpi') depends_on('zlib') depends_on('hdf5+mpi') - depends_on('boost') depends_on('m4', type='build') + # At some point later versions of boost were not able to be found + # by SAMRAI during configure, so we're using boost <= 1.60.0 for + # < 3.12.0 versions. I don't know what version of boost that + # happened at though without trying each version of boost. + depends_on('boost@:1.60.0', when='@0:3.11.99') + # don't build tools with gcc patch('no-tool-build.patch', when='%gcc') @@ -74,13 +84,17 @@ class Samrai(AutotoolsPackage): '--with-F77=%s' % self.spec['mpi'].mpifc, '--with-M4=%s' % self.spec['m4'].prefix, '--with-hdf5=%s' % self.spec['hdf5'].prefix, - '--with-boost=%s' % self.spec['boost'].prefix, '--with-zlib=%s' % self.spec['zlib'].prefix, '--without-blas', '--without-lapack', '--with-hypre=no', '--with-petsc=no']) + if self.spec.satisfies('@0:3.11.99'): + options.extend([ + '--with-boost=%s' % self.spec['boost'].prefix + ]) + if '+debug' in self.spec: options.extend([ '--disable-opt', -- cgit v1.2.3-70-g09d2 From fe0fd6ef34bab96b3075b5b7118492f3df8f9fa9 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Sat, 16 Jun 2018 18:48:01 +0530 Subject: superlu_dist: 'master' is branch - not tag (#8495) ==> Trying to clone git repository: https://github.com/xiaoyeli/superlu_dist at tag master Fetching tags only, you probably meant: git fetch --tags --- var/spack/repos/builtin/packages/superlu-dist/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/superlu-dist/package.py b/var/spack/repos/builtin/packages/superlu-dist/package.py index 51c156047f..ecd404a350 100644 --- a/var/spack/repos/builtin/packages/superlu-dist/package.py +++ b/var/spack/repos/builtin/packages/superlu-dist/package.py @@ -33,7 +33,7 @@ class SuperluDist(Package): homepage = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/" url = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_dist_4.1.tar.gz" - version('develop', git='https://github.com/xiaoyeli/superlu_dist', tag='master') + version('develop', git='https://github.com/xiaoyeli/superlu_dist', branch='master') version('xsdk-0.2.0', git='https://github.com/xiaoyeli/superlu_dist', tag='xsdk-0.2.0') version('5.4.0', 'e64645c5be352ae2c88327af2cac66e1') version('5.3.0', '35d5aa8e0a246efaf327988b20106714') -- cgit v1.2.3-70-g09d2 From 129e03a2e0c29298e9b077d33d4c6f732de7498c Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Sat, 16 Jun 2018 13:11:07 -0600 Subject: Trilinos needs parallel-netcdf as an explicit dependency to avoid concretization errors when netcdf is an external. (#8493) --- var/spack/repos/builtin/packages/trilinos/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index ac98561c04..bf12f293a8 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -280,6 +280,7 @@ class Trilinos(CMakePackage): depends_on('mpi') depends_on('netcdf+mpi', when="~pnetcdf") depends_on('netcdf+mpi+parallel-netcdf', when="+pnetcdf@master,12.12.1:") + depends_on('parallel-netcdf', when="+pnetcdf@master,12.12.1:") depends_on('parmetis', when='+metis') depends_on('cgns', when='+cgns') # Trilinos' Tribits config system is limited which makes it very tricky to -- cgit v1.2.3-70-g09d2 From ec66e0fb7eccc2f67cda5a2ef9785b2e495ccd28 Mon Sep 17 00:00:00 2001 From: Jim Galarowicz Date: Sun, 17 Jun 2018 09:49:27 -0500 Subject: Add changes to the Krell packages with version updates and ranges for the latest release. (#8468) * Add changes to the Krell packages with version updates and ranges for the latest release. * Add reviewer requested changes. Remove preferred clauses and update the qt version for the cbtf-argonavis-gui@develop * Trigger integration/test restart --- .../builtin/packages/cbtf-argonavis-gui/package.py | 28 ++++++-------- .../builtin/packages/cbtf-argonavis/package.py | 23 ++++++----- .../repos/builtin/packages/cbtf-krell/package.py | 36 +++++++++-------- .../repos/builtin/packages/cbtf-lanl/package.py | 21 +++++----- var/spack/repos/builtin/packages/cbtf/package.py | 14 +++---- .../packages/openspeedshop-utils/package.py | 44 ++++++++++----------- .../builtin/packages/openspeedshop/package.py | 45 ++++++++++------------ 7 files changed, 99 insertions(+), 112 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py index 4f2d7645e8..6e9a2beea1 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py @@ -56,45 +56,39 @@ class CbtfArgonavisGui(QMakePackage): version('develop', branch='master', git='https://github.com/OpenSpeedShop/cbtf-argonavis-gui.git') - depends_on("cmake@3.0.2:", when='@develop', type='build') - depends_on("cmake@3.11.1", when='@1.3.0.0:', type='build') + depends_on("cmake@3.0.2:", type='build') - # To specify ^elfutils@0.170 on the command line spack - # apparently needs/wants this dependency explicity here - # even though it is referenced downstream - depends_on("elf", type="link") - - depends_on('qt@4.8.6:', when='@develop') - depends_on('qt@5.10.0', when='@1.3.0.0:') + depends_on('qt@5.10.0:', when='@develop') + depends_on('qt@5.10.0', when='@1.3.0.0:9999') depends_on("boost@1.50.0:", when='@develop') - depends_on("boost@1.66.0", when='@1.3.0.0:') + depends_on("boost@1.66.0", when='@1.3.0.0:9999') # For MRNet depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop') - depends_on("mrnet@5.0.1-3+lwthreads", when='@1.3.0.0:') + depends_on("mrnet@5.0.1-3+lwthreads", when='@1.3.0.0:9999') # Dependencies for the openspeedshop cbtf packages. depends_on("cbtf@develop", when='@develop') - depends_on("cbtf@1.9.1.0:", when='@1.3.0.0:') + depends_on("cbtf@1.9.1.0:9999", when='@1.3.0.0:9999') depends_on("cbtf-krell@develop", when='@develop') - depends_on("cbtf-krell@1.9.1.0:", when='@1.3.0.0:') + depends_on("cbtf-krell@1.9.1.0:9999", when='@1.3.0.0:9999') depends_on("cbtf-argonavis@develop", when='@develop') - depends_on("cbtf-argonavis@1.9.1.0:", when='@1.3.0.0:') + depends_on("cbtf-argonavis@1.9.1.0:9999", when='@1.3.0.0:9999') depends_on("cuda") depends_on("openspeedshop-utils+cuda@develop", when='@develop') - depends_on("openspeedshop-utils@2.3.1.3:+cuda", when='@1.3.0.0:') + depends_on("openspeedshop-utils@2.3.1.3:+cuda", when='@1.3.0.0:9999') # For Xerces-C depends_on("xerces-c@3.1.1:", when='@develop') - depends_on("xerces-c@3.1.4", when='@1.3.0.0:') + depends_on("xerces-c@3.1.4", when='@1.3.0.0:9999') depends_on("graphviz@2.40.1:", when='@develop') - depends_on("graphviz@2.40.1", when='@1.3.0.0:') + depends_on("graphviz@2.40.1", when='@1.3.0.0:9999') depends_on("qtgraph") diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py index 62b42dc6da..9fe4752e41 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py @@ -70,8 +70,7 @@ class CbtfArgonavis(CMakePackage): variant('build_type', default='None', values=('None'), description='CMake build type') - depends_on("cmake@3.11.1", when='@1.9.1.0:', type='build') - depends_on("cmake@3.0.2:", when='@develop', type='build') + depends_on("cmake@3.0.2:", type='build') # To specify ^elfutils@0.170 on the command line spack # apparently needs/wants this dependency explicity here @@ -80,42 +79,42 @@ class CbtfArgonavis(CMakePackage): # For boost depends_on("boost@1.50.0:", when='@develop') - depends_on("boost@1.66.0", when='@1.9.1.0:') + depends_on("boost@1.66.0", when='@1.9.1.0:9999') # For MRNet depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti') depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop~cti') - depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0:+cti') - depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0:~cti') + depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0:9999+cti') + depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0:9999~cti') # For CBTF depends_on("cbtf@develop", when='@develop') - depends_on("cbtf@1.9.1.0:", when='@1.9.1.0:') + depends_on("cbtf@1.9.1.0:9999", when='@1.9.1.0:9999') # For CBTF with cti depends_on("cbtf@develop+cti", when='@develop+cti') - depends_on("cbtf@1.9.1.0:+cti", when='@1.9.1.0:+cti') + depends_on("cbtf@1.9.1.0:9999+cti", when='@1.9.1.0:9999+cti') # For CBTF with runtime depends_on("cbtf@develop+runtime", when='@develop+runtime') - depends_on("cbtf@1.9.1.0:+runtime", when='@1.9.1.0:+runtime') + depends_on("cbtf@1.9.1.0:9999+runtime", when='@1.9.1.0:9999+runtime') # For libmonitor depends_on("libmonitor+krellpatch") # For PAPI depends_on("papi", when='@develop') - depends_on("papi@5.5.1", when='@1.9.1.0:') + depends_on("papi@5.5.1", when='@1.9.1.0:9999') # For CBTF-KRELL depends_on("cbtf-krell@develop", when='@develop') - depends_on("cbtf-krell@1.9.1.0:", when='@1.9.1.0:') + depends_on("cbtf-krell@1.9.1.0:9999", when='@1.9.1.0:9999') depends_on('cbtf-krell@develop+cti', when='@develop+cti') - depends_on('cbtf-krell@1.9.1.0:+cti', when='@1.9.1.0:+cti') + depends_on('cbtf-krell@1.9.1.0:9999+cti', when='@1.9.1.0:9999+cti') depends_on('cbtf-krell@develop+runtime', when='@develop+runtime') - depends_on('cbtf-krell@1.9.1.0:+runtime', when='@1.9.1.0:+runtime') + depends_on('cbtf-krell@1.9.1.0:9999+runtime', when='@1.9.1.0:9999+runtime') # For CUDA depends_on("cuda") diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py index e7da53d7ba..ef7ff4467a 100644 --- a/var/spack/repos/builtin/packages/cbtf-krell/package.py +++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py @@ -55,13 +55,13 @@ class CbtfKrell(CMakePackage): homepage = "http://sourceforge.net/p/cbtf/wiki/Home/" url = "https://github.com/OpenSpeedShop/cbtf-krell.git" - version('1.9.1.1', branch='1.9.1.1', + version('develop', branch='master', git='https://github.com/OpenSpeedShop/cbtf-krell.git') - version('1.9.1.0', branch='1.9.1.0', + version('1.9.1.1', branch='1.9.1.1', git='https://github.com/OpenSpeedShop/cbtf-krell.git') - version('develop', branch='master', + version('1.9.1.0', branch='1.9.1.0', git='https://github.com/OpenSpeedShop/cbtf-krell.git') # MPI variants @@ -88,52 +88,51 @@ class CbtfKrell(CMakePackage): to point to target build.") # Dependencies for cbtf-krell - depends_on("cmake@3.11.1", when='@1.9.1.0:', type='build') - depends_on("cmake@3.0.2:", when='@develop', type='build') + depends_on("cmake@3.0.2:", type='build') # For binutils depends_on("binutils", when='@develop') - depends_on("binutils@2.29.1", when='@1.9.1.0:') + depends_on("binutils@2.29.1", when='@1.9.1.0:9999') # For boost depends_on("boost@1.50.0:", when='@develop') - depends_on("boost@1.66.0", when='@1.9.1.0:') + depends_on("boost@1.66.0", when='@1.9.1.0:9999') # For Dyninst - depends_on("dyninst@9.3.2:", when='@develop') - depends_on("dyninst@9.3.2", when='@1.9.1.0:') + depends_on("dyninst@develop", when='@develop') + depends_on("dyninst@9.3.2", when='@1.9.1.0:9999') # For MRNet depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti') depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop') - depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0:+cti') - depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0:') + depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0:9999+cti') + depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0:9999') # For Xerces-C depends_on("xerces-c@3.1.1:", when='@develop') - depends_on("xerces-c@3.1.4", when='@1.9.1.0:') + depends_on("xerces-c@3.1.4", when='@1.9.1.0:9999') # For CBTF depends_on("cbtf@develop", when='@develop') - depends_on("cbtf@1.9.1.0:", when='@1.9.1.0:') + depends_on("cbtf@1.9.1.0:9999", when='@1.9.1.0:9999') # For CBTF with cti depends_on("cbtf@develop+cti", when='@develop+cti') - depends_on("cbtf@1.9.1.0:+cti", when='@1.9.1.0:+cti') + depends_on("cbtf@1.9.1.0:9999+cti", when='@1.9.1.0:9999+cti') # For CBTF with runtime depends_on("cbtf@develop+runtime", when='@develop+runtime') - depends_on("cbtf@1.9.1.0:+runtime", when='@1.9.1.0:+runtime') + depends_on("cbtf@1.9.1.0:9999+runtime", when='@1.9.1.0:9999+runtime') # for services and collectors depends_on("libmonitor+krellpatch") depends_on("libunwind", when='@develop') - depends_on("libunwind@1.1", when='@1.9.1.0:') + depends_on("libunwind@1.1", when='@1.9.1.0:9999') depends_on("papi", when='@develop') - depends_on("papi@5.5.1", when='@1.9.1.0:') + depends_on("papi@5.5.1", when='@1.9.1.0:9999') depends_on("llvm-openmp-ompt@tr6_forwards+standalone") @@ -145,6 +144,8 @@ class CbtfKrell(CMakePackage): depends_on("mvapich", when='+mvapich') depends_on("mpt", when='+mpt') + depends_on("gotcha") + parallel = False build_directory = 'build_cbtf_krell' @@ -251,6 +252,7 @@ class CbtfKrell(CMakePackage): '-DMRNET_DIR=%s' % spec['mrnet'].prefix, '-DDYNINST_DIR=%s' % spec['dyninst'].prefix, '-DLIBIOMP_DIR=%s' % spec['llvm-openmp-ompt'].prefix, + '-DGOTCHA_DIR=%s' % spec['gotcha'].prefix, '-DXERCESC_DIR=%s' % spec['xerces-c'].prefix] if self.spec.satisfies('+runtime'): diff --git a/var/spack/repos/builtin/packages/cbtf-lanl/package.py b/var/spack/repos/builtin/packages/cbtf-lanl/package.py index e39a7cec5a..e52652e862 100644 --- a/var/spack/repos/builtin/packages/cbtf-lanl/package.py +++ b/var/spack/repos/builtin/packages/cbtf-lanl/package.py @@ -67,40 +67,39 @@ class CbtfLanl(CMakePackage): variant('cti', default=False, description="Build MRNet with the CTI startup option") - depends_on("cmake@3.0.2:", when='@develop', type='build') - depends_on("cmake@3.11.1", when='@1.9.1.0:', type='build') + depends_on("cmake@3.0.2:", type='build') # For MRNet depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti') depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop') - depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0:+cti') - depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0:') + depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0:9999+cti') + depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0:9999') # For Xerces-C depends_on("xerces-c@3.1.1:", when='@develop') - depends_on("xerces-c@3.1.4", when='@1.9.1.0:') + depends_on("xerces-c@3.1.4", when='@1.9.1.0:9999') # For CBTF depends_on("cbtf@develop", when='@develop') - depends_on("cbtf@1.9.1.0:", when='@1.9.1.0:') + depends_on("cbtf@1.9.1.0:9999", when='@1.9.1.0:9999') # For CBTF with cti depends_on("cbtf@develop+cti", when='@develop+cti') - depends_on("cbtf@1.9.1.0:+cti", when='@1.9.1.0:+cti') + depends_on("cbtf@1.9.1.0:9999+cti", when='@1.9.1.0:9999+cti') # For CBTF with runtime depends_on("cbtf@develop+runtime", when='@develop+runtime') - depends_on("cbtf@1.9.1.0:+runtime", when='@1.9.1.0:+runtime') + depends_on("cbtf@1.9.1.0:9999+runtime", when='@1.9.1.0:9999+runtime') # For CBTF-KRELL depends_on("cbtf-krell@develop", when='@develop') - depends_on("cbtf-krell@1.9.1.0:", when='@1.9.1.0:') + depends_on("cbtf-krell@1.9.1.0:9999", when='@1.9.1.0:9999') depends_on('cbtf-krell@develop+cti', when='@develop+cti') - depends_on('cbtf-krell@1.9.1.0:+cti', when='@1.9.1.0:+cti') + depends_on('cbtf-krell@1.9.1.0:9999+cti', when='@1.9.1.0:9999+cti') depends_on('cbtf-krell@develop+runtime', when='@develop+runtime') - depends_on('cbtf-krell@1.9.1.0:+runtime', when='@1.9.1.0:+runtime') + depends_on('cbtf-krell@1.9.1.0:9999+runtime', when='@1.9.1.0:9999+runtime') parallel = False diff --git a/var/spack/repos/builtin/packages/cbtf/package.py b/var/spack/repos/builtin/packages/cbtf/package.py index 2845efd446..7a1ac536f5 100644 --- a/var/spack/repos/builtin/packages/cbtf/package.py +++ b/var/spack/repos/builtin/packages/cbtf/package.py @@ -72,25 +72,23 @@ class Cbtf(CMakePackage): variant('build_type', default='None', values=('None'), description='CMake build type') - depends_on("cmake@3.11.1", when='@1.9.1.0:', type='build') - depends_on("cmake@3.0.2:", when='@develop', type='build') + depends_on("cmake@3.0.2:", type='build') - depends_on("boost@1.66.0", when='@1.9.1.0:') + depends_on("boost@1.66.0", when='@1.9.1.0:9999') depends_on("boost@1.50.0:", when='@develop') # For MRNet depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti') depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop') - depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0:+cti') - depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0:') + depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0:9999+cti') + depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0:9999') # For Xerces-C depends_on("xerces-c@3.1.1:", when='@develop') - depends_on("xerces-c@3.1.4", when='@1.9.1.0:') + depends_on("xerces-c@3.1.4:", when='@1.9.1.0:9999') # For XML2 - depends_on("libxml2", when='@develop') - depends_on("libxml2@2.9.4", when='@1.9.1.0:') + depends_on("libxml2") parallel = False diff --git a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py index ab5bf2a791..bea2e36401 100644 --- a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py @@ -114,18 +114,17 @@ class OpenspeedshopUtils(CMakePackage): description="Build mpi collector for mpich\ MPI when variant is enabled.") - depends_on("cmake@3.11.1", when='@2.3.1.3:', type='build') - depends_on("cmake@3.0.2:", when='@develop', type='build') + depends_on("cmake@3.0.2:", type='build') # Dependencies for openspeedshop that are common to all # the variants of the OpenSpeedShop build depends_on("libtool", type='build') depends_on("bison", type='build') - depends_on("flex", type='build') + depends_on("flex@2.6.1", type='build') # For binutils depends_on("binutils", when='@develop', type='build') - depends_on("binutils@2.29.1", when='@2.3.1.3:', type='build') + depends_on("binutils@2.29.1", when='@2.3.1.3:9999', type='build') depends_on("elf", type="link") depends_on("libdwarf") @@ -134,57 +133,56 @@ class OpenspeedshopUtils(CMakePackage): # For boost depends_on("boost@1.50.0:", when='@develop') - depends_on("boost@1.66.0", when='@2.3.1.3:') + depends_on("boost@1.66.0", when='@2.3.1.3:9999') - depends_on("dyninst@9.3.2:", when='@develop') - depends_on("dyninst@9.3.2", when='@2.3.1.3:') + depends_on("dyninst@develop", when='@develop') + depends_on("dyninst@9.3.2", when='@2.3.1.3:9999') depends_on("python", when='@develop') - depends_on("python@2.7.14", when='@2.3.1.3:') + depends_on("python@2.7.14:2.7.15", when='@2.3.1.3:9999') - depends_on("libxml2", when='@develop') - depends_on("libxml2@2.9.4", when='@2.3.1.3:') + depends_on("libxml2") # Dependencies for the openspeedshop cbtf packages. depends_on("cbtf@develop", when='@develop') - depends_on("cbtf@1.9.1.0:", when='@2.3.1.3:') + depends_on("cbtf@1.9.1.0:9999", when='@2.3.1.3:9999') depends_on("cbtf-krell@develop", when='@develop') - depends_on("cbtf-krell@1.9.1.0:", when='@2.3.1.3:') + depends_on("cbtf-krell@1.9.1.0:9999", when='@2.3.1.3:9999') depends_on('cbtf-krell@develop+crayfe', when='@develop+crayfe') - depends_on('cbtf-krell@1.9.1.0:+crayfe', when='@2.3.1.3:+crayfe') + depends_on('cbtf-krell@1.9.1.0:9999+crayfe', when='@2.3.1.3:9999+crayfe') depends_on('cbtf-krell@develop+cti', when='@develop+cti') - depends_on('cbtf-krell@1.9.1.0:+cti', when='@2.3.1.3:+cti') + depends_on('cbtf-krell@1.9.1.0:9999+cti', when='@2.3.1.3:9999+cti') depends_on('cbtf-krell@develop+mpich', when='@develop+mpich') - depends_on('cbtf-krell@1.9.1.0:+mpich', when='@2.3.1.3:+mpich') + depends_on('cbtf-krell@1.9.1.0:9999+mpich', when='@2.3.1.3:9999+mpich') depends_on('cbtf-krell@develop+mpich2', when='@develop+mpich2') - depends_on('cbtf-krell@1.9.1.0:+mpich2', when='@2.3.1.3:+mpich2') + depends_on('cbtf-krell@1.9.1.0:9999+mpich2', when='@2.3.1.3:9999+mpich2') depends_on('cbtf-krell@develop+mpt', when='@develop+mpt') - depends_on('cbtf-krell@1.9.1.0:+mpt', when='@2.3.1.3:+mpt') + depends_on('cbtf-krell@1.9.1.0:9999+mpt', when='@2.3.1.3:9999+mpt') depends_on('cbtf-krell@develop+mvapich', when='@develop+mvapich') - depends_on('cbtf-krell@1.9.1.0:+mvapich', when='@2.3.1.3:+mvapich') + depends_on('cbtf-krell@1.9.1.0:9999+mvapich', when='@2.3.1.3:9999+mvapich') depends_on('cbtf-krell@develop+mvapich2', when='@develop+mvapich2') - depends_on('cbtf-krell@1.9.1.0:+mvapich2', when='@2.3.1.3:+mvapich2') + depends_on('cbtf-krell@1.9.1.0:9999+mvapich2', when='@2.3.1.3:9999+mvapich2') depends_on('cbtf-krell@develop+openmpi', when='@develop+openmpi') - depends_on('cbtf-krell@1.9.1.0:+openmpi', when='@2.3.1.3:+openmpi') + depends_on('cbtf-krell@1.9.1.0:9999+openmpi', when='@2.3.1.3:9999+openmpi') depends_on("cbtf-argonavis@develop", when='@develop+cuda') - depends_on("cbtf-argonavis@1.9.1.0:", when='@2.3.1.3:+cuda') + depends_on("cbtf-argonavis@1.9.1.0:9999", when='@2.3.1.3:9999+cuda') # For MRNet depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti') depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop') - depends_on("mrnet@5.0.1-3:+cti", when='@2.3.1.3:+cti') - depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.3.1.3:') + depends_on("mrnet@5.0.1-3:+cti", when='@2.3.1.3:9999+cti') + depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.3.1.3:9999') parallel = False diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py index 28938399a4..ad5b762b68 100644 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop/package.py @@ -112,18 +112,17 @@ class Openspeedshop(CMakePackage): description="Build mpi collector for mpich\ MPI when variant is enabled.") - depends_on("cmake@3.11.1", when='@2.3.1.3:', type='build') - depends_on("cmake@3.0.2:", when='@develop', type='build') + depends_on("cmake@3.0.2:", type='build') # Dependencies for openspeedshop that are common to all # the variants of the OpenSpeedShop build depends_on("libtool", type='build') depends_on("bison", type='build') - depends_on("flex", type='build') + depends_on("flex@2.6.1", type='build') # For binutils depends_on("binutils", when='@develop', type='build') - depends_on("binutils@2.29.1", when='@2.3.1.3:', type='build') + depends_on("binutils@2.29.1", when='@2.3.1.3:9999', type='build') depends_on("elf", type="link") depends_on("libdwarf") @@ -132,59 +131,58 @@ class Openspeedshop(CMakePackage): # For boost depends_on("boost@1.50.0:", when='@develop') - depends_on("boost@1.66.0", when='@2.3.1.3:') + depends_on("boost@1.66.0", when='@2.3.1.3:9999') - depends_on("dyninst@9.3.2:", when='@develop') - depends_on("dyninst@9.3.2", when='@2.3.1.3:') + depends_on("dyninst@develop", when='@develop') + depends_on("dyninst@9.3.2", when='@2.3.1.3:9999') depends_on("python", when='@develop') - depends_on("python@2.7.14", when='@2.3.1.3:') + depends_on("python@2.7.14:2.7.15", when='@2.3.1.3:9999') - depends_on("libxml2", when='@develop') - depends_on("libxml2@2.9.4", when='@2.3.1.3:') + depends_on("libxml2") depends_on("qt@3.3.8b+krellpatch", when='gui=qt3') # Dependencies for the openspeedshop cbtf packages. depends_on("cbtf@develop", when='@develop') - depends_on("cbtf@1.9.1.0:", when='@2.3.1.3:') + depends_on("cbtf@1.9.1.0:9999", when='@2.3.1.3:9999') depends_on("cbtf-krell@develop", when='@develop') - depends_on("cbtf-krell@1.9.1.0:", when='@2.3.1.3:') + depends_on("cbtf-krell@1.9.1.0:9999", when='@2.3.1.3:9999') depends_on('cbtf-krell@develop+crayfe', when='@develop+crayfe') - depends_on('cbtf-krell@1.9.1.0:+crayfe', when='@2.3.1.3:+crayfe') + depends_on('cbtf-krell@1.9.1.0:9999+crayfe', when='@2.3.1.3:9999+crayfe') depends_on('cbtf-krell@develop+cti', when='@develop+cti') - depends_on('cbtf-krell@1.9.1.0:+cti', when='@2.3.1.3:+cti') + depends_on('cbtf-krell@1.9.1.0:9999+cti', when='@2.3.1.3:9999+cti') depends_on('cbtf-krell@develop+mpich', when='@develop+mpich') - depends_on('cbtf-krell@1.9.1.0:+mpich', when='@2.3.1.3:+mpich') + depends_on('cbtf-krell@1.9.1.0:9999+mpich', when='@2.3.1.3:9999+mpich') depends_on('cbtf-krell@develop+mpich2', when='@develop+mpich2') - depends_on('cbtf-krell@1.9.1.0:+mpich2', when='@2.3.1.3:+mpich2') + depends_on('cbtf-krell@1.9.1.0:9999+mpich2', when='@2.3.1.3:9999+mpich2') depends_on('cbtf-krell@develop+mpt', when='@develop+mpt') - depends_on('cbtf-krell@1.9.1.0:+mpt', when='@2.3.1.3:+mpt') + depends_on('cbtf-krell@1.9.1.0:9999+mpt', when='@2.3.1.3:9999+mpt') depends_on('cbtf-krell@develop+mvapich', when='@develop+mvapich') - depends_on('cbtf-krell@1.9.1.0:+mvapich', when='@2.3.1.3:+mvapich') + depends_on('cbtf-krell@1.9.1.0:9999+mvapich', when='@2.3.1.3:9999+mvapich') depends_on('cbtf-krell@develop+mvapich2', when='@develop+mvapich2') - depends_on('cbtf-krell@1.9.1.0:+mvapich2', when='@2.3.1.3:+mvapich2') + depends_on('cbtf-krell@1.9.1.0:9999+mvapich2', when='@2.3.1.3:9999+mvapich2') depends_on('cbtf-krell@develop+openmpi', when='@develop+openmpi') - depends_on('cbtf-krell@1.9.1.0:+openmpi', when='@2.3.1.3:+openmpi') + depends_on('cbtf-krell@1.9.1.0:9999+openmpi', when='@2.3.1.3:9999+openmpi') depends_on("cbtf-argonavis@develop", when='@develop+cuda') - depends_on("cbtf-argonavis@1.9.1.0:", when='@2.3.1.3:+cuda') + depends_on("cbtf-argonavis@1.9.1.0:9999", when='@2.3.1.3:9999+cuda') # For MRNet depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti') depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop') - depends_on("mrnet@5.0.1-3:+cti", when='@2.3.1.3:+cti') - depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.3.1.3:') + depends_on("mrnet@5.0.1-3:+cti", when='@2.3.1.3:9999+cti') + depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.3.1.3:9999') parallel = False @@ -229,7 +227,6 @@ class Openspeedshop(CMakePackage): if spec.satisfies('+runtime'): # Appends base options to cmake_args self.set_defaultbase_cmakeOptions(spec, cmake_args) - cmake_args.extend( ['-DCMAKE_CXX_FLAGS=%s' % compile_flags, '-DCMAKE_C_FLAGS=%s' % compile_flags, -- cgit v1.2.3-70-g09d2 From 98f11b9defd876e36b692f3780471a23521d43d2 Mon Sep 17 00:00:00 2001 From: Pramod Kumbhar Date: Mon, 18 Jun 2018 00:21:00 +0200 Subject: Add new versions for TAU and PDT package (#8497) --- var/spack/repos/builtin/packages/pdt/package.py | 3 +++ var/spack/repos/builtin/packages/tau/package.py | 3 +++ 2 files changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pdt/package.py b/var/spack/repos/builtin/packages/pdt/package.py index 64dfbda8c7..660e3e2ee2 100644 --- a/var/spack/repos/builtin/packages/pdt/package.py +++ b/var/spack/repos/builtin/packages/pdt/package.py @@ -38,6 +38,9 @@ class Pdt(AutotoolsPackage): homepage = "https://www.cs.uoregon.edu/research/pdt/home.php" url = "http://www.cs.uoregon.edu/research/paracomp/pdtoolkit/Download/pdtoolkit-3.22.1.tar.gz" + version('3.25', '2cad41fcabf4c79cab8780d3b87f7bb4') + version('3.24', 'b8fa5189e5602276ce225ba497b617e4') + version('3.23', 'd61e7a631a27b00e58def52950230a2c') version('3.22.1', 'b56b9b3e621161c7fd9e4908b944840d') version('3.22', '982d667617802962a1f7fe6c4c31184f') version('3.21', '3092ca0d8833b69992c17e63ae66c263') diff --git a/var/spack/repos/builtin/packages/tau/package.py b/var/spack/repos/builtin/packages/tau/package.py index 84b69dfca5..11ba76e751 100644 --- a/var/spack/repos/builtin/packages/tau/package.py +++ b/var/spack/repos/builtin/packages/tau/package.py @@ -37,6 +37,9 @@ class Tau(Package): homepage = "http://www.cs.uoregon.edu/research/tau" url = "https://www.cs.uoregon.edu/research/tau/tau_releases/tau-2.25.tar.gz" + version('2.27.1', '4f98ff67ae5ab1ff2712f694bdec1fa9') + version('2.27', '76602d35fc96f546b5b9dcaf09158651') + version('2.26.3', '4ec14e85b8f3560b58628512c7b49e17') version('2.25', '46cd48fa3f3c4ce0197017b3158a2b43') version('2.24.1', '6635ece6d1f08215b02f5d0b3c1e971b') version('2.24', '57ce33539c187f2e5ec68f0367c76db4') -- cgit v1.2.3-70-g09d2 From 46bf21f05e09b4ba255667e4efa24c1463174f39 Mon Sep 17 00:00:00 2001 From: Samuel Fux Date: Mon, 18 Jun 2018 16:53:48 +0200 Subject: Adding patch to Opencv (3.3.0-3.4.1) for fixing conflict between CUDA and OpenCV dnn header file (#8502) * Adding patch for OpenCV to fix a conflict between an OpenCV and a CUDA header file * Added patch command to package.py file for OpenCV SPACK package. * Adding version range for patch. * shortening comment lines, since testsuite failed --- .../repos/builtin/packages/opencv/dnn_cuda.patch | 44 ++++++++++++++++++++++ var/spack/repos/builtin/packages/opencv/package.py | 5 +++ 2 files changed, 49 insertions(+) create mode 100644 var/spack/repos/builtin/packages/opencv/dnn_cuda.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/opencv/dnn_cuda.patch b/var/spack/repos/builtin/packages/opencv/dnn_cuda.patch new file mode 100644 index 0000000000..66ab59ba26 --- /dev/null +++ b/var/spack/repos/builtin/packages/opencv/dnn_cuda.patch @@ -0,0 +1,44 @@ +--- opencv-3.4.1/modules/dnn/src/layers/mvn_layer.cpp.orig 2018-06-14 10:46:28.025703093 +0200 ++++ opencv-3.4.1/modules/dnn/src/layers/mvn_layer.cpp 2018-06-14 10:40:56.266069123 +0200 +@@ -43,7 +43,7 @@ + #include "../precomp.hpp" + #include "layers_common.hpp" + #include +-#include "math_functions.hpp" ++#include "../ocl4dnn/include/math_functions.hpp" + #include "opencl_kernels_dnn.hpp" + + namespace cv +--- opencv-3.4.1/modules/dnn/src/ocl4dnn/src/math_functions.cpp.orig 2018-06-14 10:45:23.565162940 +0200 ++++ opencv-3.4.1/modules/dnn/src/ocl4dnn/src/math_functions.cpp 2018-06-14 10:44:48.513412965 +0200 +@@ -42,7 +42,7 @@ + + #include "../../precomp.hpp" + #include "common.hpp" +-#include "math_functions.hpp" ++#include "../include/math_functions.hpp" + #include + #include "opencl_kernels_dnn.hpp" + +--- opencv-3.4.1/modules/dnn/src/ocl4dnn/src/ocl4dnn_conv_spatial.cpp.orig 2018-06-14 10:42:11.319534007 +0200 ++++ opencv-3.4.1/modules/dnn/src/ocl4dnn/src/ocl4dnn_conv_spatial.cpp 2018-06-14 10:42:52.988236879 +0200 +@@ -52,7 +52,7 @@ + #include "common.hpp" + #include "ocl4dnn.hpp" + #include "opencl_kernels_dnn.hpp" +-#include "math_functions.hpp" ++#include "../include/math_functions.hpp" + #include "default_kernel_config.hpp" + + #if defined WIN32 || defined _WIN32 +--- opencv-3.4.1/modules/dnn/src/ocl4dnn/src/ocl4dnn_inner_product.cpp.orig 2018-06-14 10:45:41.245036822 +0200 ++++ opencv-3.4.1/modules/dnn/src/ocl4dnn/src/ocl4dnn_inner_product.cpp 2018-06-14 10:45:55.543934818 +0200 +@@ -43,7 +43,7 @@ + #include "../../precomp.hpp" + #include "common.hpp" + #include "ocl4dnn.hpp" +-#include "math_functions.hpp" ++#include "../include/math_functions.hpp" + + #ifdef HAVE_OPENCL + namespace cv { namespace dnn { namespace ocl4dnn { diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index 0417ae1b4c..a8c4b819bd 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -105,6 +105,11 @@ class Opencv(CMakePackage): variant('vtk', default=True, description='Activates support for VTK') variant('zlib', default=True, description='Build zlib from source') + # Patch to fix conflict between CUDA and OpenCV (reproduced with 3.3.0 + # and 3.4.1) header file that have the same name.Problem is fixed in + # the current development branch of OpenCV. See #8461 for more information. + patch('dnn_cuda.patch', when='@3.3.0:3.4.1+cuda+dnn') + depends_on('eigen~mpfr', when='+eigen', type='build') depends_on('zlib', when='+zlib') -- cgit v1.2.3-70-g09d2 From ef002a25fa4ae0eb351151a5d42db8a529fdaf9e Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Mon, 18 Jun 2018 11:04:11 -0600 Subject: Updates to Nalu package(s) (#8492) * Updating Nalu now that it can build with shared libraries and adding the new Nalu-Wind wind energy focused application. * Explicitly turn off TPLs for Nalu when not enabled. --- .../repos/builtin/packages/nalu-wind/package.py | 91 ++++++++++++++++++++++ var/spack/repos/builtin/packages/nalu/package.py | 21 ++--- 2 files changed, 103 insertions(+), 9 deletions(-) create mode 100644 var/spack/repos/builtin/packages/nalu-wind/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nalu-wind/package.py b/var/spack/repos/builtin/packages/nalu-wind/package.py new file mode 100644 index 0000000000..87b235bc0b --- /dev/null +++ b/var/spack/repos/builtin/packages/nalu-wind/package.py @@ -0,0 +1,91 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class NaluWind(CMakePackage): + """Nalu-Wind: Wind energy focused variant of Nalu.""" + + homepage = "https://github.com/exawind/nalu-wind" + url = "https://github.com/exawind/nalu-wind.git" + + maintainers = ['jrood-nrel'] + + variant('openfast', default=False, + description='Compile with OpenFAST support') + variant('tioga', default=False, + description='Compile with Tioga support') + variant('hypre', default=False, + description='Compile with Hypre support') + + version('master', + git='https://github.com/exawind/nalu-wind.git', branch='master') + + depends_on('mpi') + depends_on('yaml-cpp@0.5.3:') + depends_on('trilinos+exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist+superlu+hdf5+zlib+pnetcdf+shards~hypre@master,develop') + depends_on('openfast+cxx', when='+openfast') + depends_on('tioga', when='+tioga') + depends_on('hypre+mpi+int64', when='+hypre') + + def cmake_args(self): + spec = self.spec + options = [] + + options.extend([ + '-DTrilinos_DIR:PATH=%s' % spec['trilinos'].prefix, + '-DYAML_DIR:PATH=%s' % spec['yaml-cpp'].prefix, + '-DCMAKE_C_COMPILER=%s' % spec['mpi'].mpicc, + '-DCMAKE_CXX_COMPILER=%s' % spec['mpi'].mpicxx, + '-DCMAKE_Fortran_COMPILER=%s' % spec['mpi'].mpifc, + '-DMPI_C_COMPILER=%s' % spec['mpi'].mpicc, + '-DMPI_CXX_COMPILER=%s' % spec['mpi'].mpicxx, + '-DMPI_Fortran_COMPILER=%s' % spec['mpi'].mpifc + ]) + + if '+openfast' in spec: + options.extend([ + '-DENABLE_OPENFAST:BOOL=ON', + '-DOpenFAST_DIR:PATH=%s' % spec['openfast'].prefix + ]) + else: + options.append('-DENABLE_OPENFAST:BOOL=OFF') + + if '+tioga' in spec: + options.extend([ + '-DENABLE_TIOGA:BOOL=ON', + '-DTIOGA_DIR:PATH=%s' % spec['tioga'].prefix + ]) + else: + options.append('-DENABLE_TIOGA:BOOL=OFF') + + if '+hypre' in spec: + options.extend([ + '-DENABLE_HYPRE:BOOL=ON', + '-DHYPRE_DIR:PATH=%s' % spec['hypre'].prefix + ]) + else: + options.append('-DENABLE_HYPRE:BOOL=OFF') + + return options diff --git a/var/spack/repos/builtin/packages/nalu/package.py b/var/spack/repos/builtin/packages/nalu/package.py index 8f32117b7e..e1b87a161d 100644 --- a/var/spack/repos/builtin/packages/nalu/package.py +++ b/var/spack/repos/builtin/packages/nalu/package.py @@ -27,16 +27,13 @@ from spack import * class Nalu(CMakePackage): """Nalu: a generalized unstructured massively parallel low Mach flow code - designed to support a variety of energy applications of interest (most - notably Wind ECP) built on the Sierra Toolkit and Trilinos solver - Tpetra/Epetra stack + designed to support a variety of energy applications of interest + built on the Sierra Toolkit and Trilinos solver Tpetra/Epetra stack """ homepage = "https://github.com/NaluCFD/Nalu" url = "https://github.com/NaluCFD/Nalu.git" - maintainers = ['jrood-nrel'] - variant('openfast', default=False, description='Compile with OpenFAST support') variant('tioga', default=False, @@ -47,12 +44,12 @@ class Nalu(CMakePackage): version('master', git='https://github.com/NaluCFD/Nalu.git', branch='master') - # Currently Nalu only builds with certain libraries statically - depends_on('yaml-cpp+pic~shared@develop') - depends_on('trilinos~shared+exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist+superlu+hdf5+zlib+pnetcdf+shards@master,12.12.1:') + depends_on('mpi') + depends_on('yaml-cpp@0.5.3:') + depends_on('trilinos+exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist+superlu+hdf5+zlib+pnetcdf+shards~hypre@master,develop') depends_on('openfast+cxx', when='+openfast') depends_on('tioga', when='+tioga') - depends_on('hypre+mpi+int64~shared', when='+hypre') + depends_on('hypre+mpi+int64', when='+hypre') def cmake_args(self): spec = self.spec @@ -68,17 +65,23 @@ class Nalu(CMakePackage): '-DENABLE_OPENFAST:BOOL=ON', '-DOpenFAST_DIR:PATH=%s' % spec['openfast'].prefix ]) + else: + options.append('-DENABLE_OPENFAST:BOOL=OFF') if '+tioga' in spec: options.extend([ '-DENABLE_TIOGA:BOOL=ON', '-DTIOGA_DIR:PATH=%s' % spec['tioga'].prefix ]) + else: + options.append('-DENABLE_TIOGA:BOOL=OFF') if '+hypre' in spec: options.extend([ '-DENABLE_HYPRE:BOOL=ON', '-DHYPRE_DIR:PATH=%s' % spec['hypre'].prefix ]) + else: + options.append('-DENABLE_HYPRE:BOOL=OFF') return options -- cgit v1.2.3-70-g09d2 From d98d45ec500c2850a507ddd248abff62a9253add Mon Sep 17 00:00:00 2001 From: Glen Hansen Date: Mon, 18 Jun 2018 12:50:26 -0600 Subject: Albany: Add Albany package. (#8332) * Add package.py to support the Albany GitHub project builds. --- var/spack/repos/builtin/packages/albany/package.py | 121 +++++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 var/spack/repos/builtin/packages/albany/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/albany/package.py b/var/spack/repos/builtin/packages/albany/package.py new file mode 100644 index 0000000000..40b7a286aa --- /dev/null +++ b/var/spack/repos/builtin/packages/albany/package.py @@ -0,0 +1,121 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Albany(CMakePackage): + """Albany is an implicit, unstructured grid, finite element code for the + solution and analysis of multiphysics problems. The Albany repository + on the GitHub site contains hundreds of regression tests and examples + that demonstrate the code's capabilities on a wide variety of problems + including fluid mechanics, solid mechanics (elasticity and plasticity), + ice-sheet flow, quantum device modeling, and many other applications.""" + + homepage = "http://gahansen.github.io/Albany" + url = "https://github.com/gahansen/Albany/tarball/master" + + maintainers = ['gahansen'] + + version('develop', git='https://github.com/gahansen/Albany.git', branch='master') + + variant('lcm', default=True, + description='Enable LCM') + variant('aeras', default=False, + description='Enable AERAS') + variant('qcad', default=False, + description='Enable QCAD') + variant('hydride', default=False, + description='Enable HYDRIDE') + variant('lcm_spec', default=False, + description='Enable LCM_SPECULATIVE') + variant('lame', default=False, + description='Enable LAME') + variant('debug', default=False, + description='Enable DEBUGGING') + variant('fpe', default=False, + description='Enable CHECK_FPE') + variant('scorec', default=False, + description='Enable SCOREC') + variant('felix', default=False, + description='Enable FELIX') + variant('mor', default=False, + description='Enable MOR') + variant('confgui', default=False, + description='Enable Albany configuration (CI) GUI') + variant('ascr', default=False, + description='Enable ALBANY_ASCR') + variant('perf', default=False, + description='Enable PERFORMANCE_TESTS') + variant('64bit', default=True, + description='Enable 64BIT') + + # Add dependencies + depends_on('mpi') + depends_on('trilinos~superlu-dist+isorropia+tempus+rythmos+teko+intrepid+intrepid2+minitensor+phalanx+pnetcdf+nox+piro+rol+shards+stk+superlu@master,develop') + + def cmake_args(self): + spec = self.spec + trilinos_dir = spec['trilinos'].prefix + options = [] + + options.extend([ + '-DALBANY_TRILINOS_DIR:FILEPATH={0}'.format(trilinos_dir), + '-DINSTALL_ALBANY:BOOL=ON' + ]) + + options.extend([ + '-DENABLE_LCM:BOOL=%s' % ( + 'ON' if '+lcm' in spec else 'OFF'), + '-DENABLE_AERAS:BOOL=%s' % ( + 'ON' if '+aeras' in spec else 'OFF'), + '-DENABLE_QCAD:BOOL=%s' % ( + 'ON' if '+qcad' in spec else 'OFF'), + '-DENABLE_HYDRIDE:BOOL=%s' % ( + 'ON' if '+hydride' in spec else 'OFF'), + '-DENABLE_LCM_SPECULATIVE:BOOL=%s' % ( + 'ON' if '+lcm_spec' in spec else 'OFF'), + '-DENABLE_LAME:BOOL=%s' % ( + 'ON' if '+lame' in spec else 'OFF'), + '-DENABLE_DEBUGGING:BOOL=%s' % ( + 'ON' if '+debug' in spec else 'OFF'), + '-DENABLE_CHECK_FPE:BOOL=%s' % ( + 'ON' if '+fpe' in spec else 'OFF'), + '-DENABLE_SCOREC:BOOL=%s' % ( + 'ON' if '+scorec' in spec else 'OFF'), + '-DENABLE_FELIX:BOOL=%s' % ( + 'ON' if '+felix' in spec else 'OFF'), + '-DENABLE_MOR:BOOL=%s' % ( + 'ON' if '+mor' in spec else 'OFF'), + '-DENABLE_ALBANY_CI:BOOL=%s' % ( + 'ON' if '+ci' in spec else 'OFF'), + '-DENABLE_ASCR:BOOL=%s' % ( + 'ON' if '+ascr' in spec else 'OFF'), + '-DENABLE_PERFORMANCE_TESTS:BOOL=%s' % ( + 'ON' if '+perf' in spec else 'OFF'), + '-DENABLE_64BIT_INT:BOOL=%s' % ( + 'ON' if '+64bit' in spec else 'OFF') + ]) + + return options -- cgit v1.2.3-70-g09d2 From ec1b2d0a3a0ffed93825e90f927db542149d3bda Mon Sep 17 00:00:00 2001 From: twang15 Date: Mon, 18 Jun 2018 11:52:24 -0700 Subject: samrai: update package for 3.12.0 and fix compilation bugs for earlier versions (#8501) * SAMRAI: remove dependency on boost for samrai 3.12.0 or later versions, but keep the older versions ccontinuing working with boost 1.64.0 or earlier. Also, the older versions cannot compile with boost 1.65.0 or above. (#8491) * SAMRAI: fix typos of comments and remove obsolete code. --- var/spack/repos/builtin/packages/samrai/package.py | 26 +++++++++++++--------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/samrai/package.py b/var/spack/repos/builtin/packages/samrai/package.py index 9caf76c888..f1c8f78332 100644 --- a/var/spack/repos/builtin/packages/samrai/package.py +++ b/var/spack/repos/builtin/packages/samrai/package.py @@ -66,11 +66,10 @@ class Samrai(AutotoolsPackage): depends_on('hdf5+mpi') depends_on('m4', type='build') - # At some point later versions of boost were not able to be found - # by SAMRAI during configure, so we're using boost <= 1.60.0 for - # < 3.12.0 versions. I don't know what version of boost that - # happened at though without trying each version of boost. - depends_on('boost@:1.60.0', when='@0:3.11.99') + # Starting with 3.12.0, samrai no longer depends on boost. + # version 3.11.5 or earlier can only work with boost version + # 1.64.0 or earlier. + depends_on('boost@:1.64.0', when='@0:3.11.99', type='build') # don't build tools with gcc patch('no-tool-build.patch', when='%gcc') @@ -90,11 +89,6 @@ class Samrai(AutotoolsPackage): '--with-hypre=no', '--with-petsc=no']) - if self.spec.satisfies('@0:3.11.99'): - options.extend([ - '--with-boost=%s' % self.spec['boost'].prefix - ]) - if '+debug' in self.spec: options.extend([ '--disable-opt', @@ -104,4 +98,16 @@ class Samrai(AutotoolsPackage): '--enable-opt', '--disable-debug']) + if self.version >= Version('3.12.0'): + # only version 3.12.0 and above, samrai does not use + # boost, but needs c++11. Without c++11 flags, samrai + # cannot build with either gcc or intel compilers. + if 'CXXFLAGS' in env and env['CXXFLAGS']: + env['CXXFLAGS'] += ' ' + self.compiler.cxx11_flag + else: + env['CXXFLAGS'] = self.compiler.cxx11_flag + else: + # boost 1.64.0 or earlier works with samrai 2.4.4~3.11.5 + options.append('--with-boost=%s' % self.spec['boost'].prefix) + return options -- cgit v1.2.3-70-g09d2 From 3e2636e10fbf340713f1e332d23772e1ec1b743d Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Mon, 18 Jun 2018 15:34:39 -0600 Subject: Percept requires googletest to be a static library. (#8506) --- var/spack/repos/builtin/packages/percept/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/percept/package.py b/var/spack/repos/builtin/packages/percept/package.py index 0607434993..db1ac11452 100644 --- a/var/spack/repos/builtin/packages/percept/package.py +++ b/var/spack/repos/builtin/packages/percept/package.py @@ -38,7 +38,7 @@ class Percept(CMakePackage): version('develop', git='https://github.com/PerceptTools/percept.git', branch='master') - depends_on('googletest') + depends_on('googletest~shared') depends_on('opennurbs@percept') depends_on('boost+graph+mpi') depends_on('yaml-cpp+pic~shared@0.5.3:') -- cgit v1.2.3-70-g09d2 From 818e7481a67d34ac1ca8821ff0e31336dada3570 Mon Sep 17 00:00:00 2001 From: Douglas Duckworth Date: Tue, 19 Jun 2018 12:16:41 -0400 Subject: added albacore version 2.3.1 (#8513) --- var/spack/repos/builtin/packages/ont-albacore/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ont-albacore/package.py b/var/spack/repos/builtin/packages/ont-albacore/package.py index dadfa58921..a29deb96c3 100644 --- a/var/spack/repos/builtin/packages/ont-albacore/package.py +++ b/var/spack/repos/builtin/packages/ont-albacore/package.py @@ -33,8 +33,9 @@ class OntAlbacore(Package): kits and Flow Cells.""" homepage = "https://nanoporetech.com" - url = "https://mirror.oxfordnanoportal.com/software/analysis/ont_albacore-1.2.4-cp35-cp35m-manylinux1_x86_64.whl" + url = "https://mirror.oxfordnanoportal.com/software/analysis/ont_albacore-2.3.1-cp35-cp35m-manylinux1_x86_64.whl" + version('2.3.1', '0e85ad176e691252344c4c4b673c4b68', expand=False) version('2.1.2', '1e60cfb95628829f2a61a85247f1b6af', expand=False) version('1.2.4', '559640bec4693af12e4d923e8d77adf6', expand=False) version('1.1.0', 'fab4502ea1bad99d813aa2629e03e83d', expand=False) -- cgit v1.2.3-70-g09d2 From 5c731f54b8886e84012b8fc90484b882c1cd30b4 Mon Sep 17 00:00:00 2001 From: Chuck Atkins Date: Wed, 20 Jun 2018 10:33:17 -0400 Subject: Bump ZeroMQ from v4.2.2 to v4.2.5 (#8514) This addresses some build issues with GCC 8 and the addition of the -Werror=stringop-truncation warning. --- var/spack/repos/builtin/packages/zeromq/package.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/zeromq/package.py b/var/spack/repos/builtin/packages/zeromq/package.py index 291d153265..c9645145f6 100644 --- a/var/spack/repos/builtin/packages/zeromq/package.py +++ b/var/spack/repos/builtin/packages/zeromq/package.py @@ -32,8 +32,9 @@ class Zeromq(AutotoolsPackage): version('develop', branch='master', git='https://github.com/zeromq/libzmq.git') - version('4.2.2', '52499909b29604c1e47a86f1cb6a9115', - url='https://github.com/zeromq/libzmq/releases/download/v4.2.2/zeromq-4.2.2.tar.gz') + version('4.2.5', 'a1c95b34384257e986842f4d006957b8', + url='https://github.com/zeromq/libzmq/releases/download/v4.2.5/zeromq-4.2.5.tar.gz') + version('4.2.2', '52499909b29604c1e47a86f1cb6a9115') version('4.1.4', 'a611ecc93fffeb6d058c0e6edf4ad4fb') version('4.1.2', '159c0c56a895472f02668e692d122685') version('4.1.1', '0a4b44aa085644f25c177f79dc13f253') @@ -49,6 +50,8 @@ class Zeromq(AutotoolsPackage): depends_on('libtool', type='build', when='@develop') depends_on('pkgconfig', type='build') + conflicts('%gcc@8:', when='@:4.2.2') + @when('@develop') def autoreconf(self, spec, prefix): bash = which('bash') -- cgit v1.2.3-70-g09d2 From f9683419f9cf7ce74dda5cc04c8a7c04851f256b Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 20 Jun 2018 11:17:14 -0500 Subject: mitofates: needs perl at runtime (#8526) --- var/spack/repos/builtin/packages/mitofates/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mitofates/package.py b/var/spack/repos/builtin/packages/mitofates/package.py index 57d763b340..8b968af5b5 100644 --- a/var/spack/repos/builtin/packages/mitofates/package.py +++ b/var/spack/repos/builtin/packages/mitofates/package.py @@ -35,6 +35,7 @@ class Mitofates(Package): version('1.2', 'aaac42a8e8c7318a4abde9df3a4b72d1') depends_on('libsvm') + depends_on('perl', type='run') def install(self, spec, prefix): install_tree('bin', prefix.bin) -- cgit v1.2.3-70-g09d2 From e6834301b9b11fc0fb3e82b6ea448a753981340f Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Wed, 20 Jun 2018 18:20:04 +0200 Subject: glib: Update to 2.56.1 (#8523) --- var/spack/repos/builtin/packages/glib/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/glib/package.py b/var/spack/repos/builtin/packages/glib/package.py index e16b9ffee1..6a004d8e64 100644 --- a/var/spack/repos/builtin/packages/glib/package.py +++ b/var/spack/repos/builtin/packages/glib/package.py @@ -41,6 +41,7 @@ class Glib(AutotoolsPackage): homepage = "https://developer.gnome.org/glib/" url = "https://ftp.gnome.org/pub/gnome/sources/glib/2.53/glib-2.53.1.tar.xz" + version('2.56.1', '40ef3f44f2c651c7a31aedee44259809b6f03d3d20be44545cd7d177221c0b8d') version('2.56.0', 'f2b59392f2fb514bbe7791dda0c36da5') version('2.55.1', '9cbb6b3c7e75ba75575588497c7707b6') version('2.53.1', '3362ef4da713f834ea26904caf3a75f5') -- cgit v1.2.3-70-g09d2 From 5b309ea6ac4a65ecf8db3ac70399a828f2c6d5ab Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 20 Jun 2018 18:24:41 +0200 Subject: openPMD-api: update dependencies (#8528) update the dependencies of openPMD-api --- var/spack/repos/builtin/packages/openpmd-api/package.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openpmd-api/package.py b/var/spack/repos/builtin/packages/openpmd-api/package.py index 533f08c74b..d2d032a3e7 100644 --- a/var/spack/repos/builtin/packages/openpmd-api/package.py +++ b/var/spack/repos/builtin/packages/openpmd-api/package.py @@ -62,7 +62,8 @@ class OpenpmdApi(CMakePackage): depends_on('adios2@2.1.0: ~mpi', when='~mpi +adios2') depends_on('adios2@2.1.0: +mpi', when='+mpi +adios2') # ideally we want 2.3.0+ for full C++11 CT function signature support - depends_on('py-pybind11@2.2.1:', when='+python') + depends_on('py-pybind11@2.2.3:', when='+python') + depends_on('py-numpy', when='+python', type=['test', 'run']) extends('python', when='+python') @@ -83,11 +84,15 @@ class OpenpmdApi(CMakePackage): # 'ON' if '+json' in spec else 'OFF'), '-DopenPMD_USE_PYTHON:BOOL={0}'.format( 'ON' if '+python' in spec else 'OFF'), + # tests and examples '-DBUILD_TESTING:BOOL={0}'.format( - 'ON' if self.run_tests else 'OFF') + 'ON' if self.run_tests else 'OFF'), + '-DBUILD_EXAMPLES:BOOL={0}'.format( + 'ON' if self.run_tests else 'OFF'), ] if spec.satisfies('+python'): + args.append('-DopenPMD_USE_INTERNAL_PYBIND11:BOOL=OFF') args.append('-DPYTHON_EXECUTABLE:FILEPATH={0}'.format( self.spec['python'].command.path)) -- cgit v1.2.3-70-g09d2 From b477868a5fd4f7d928cf61448492dfde0fa2cbfc Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 20 Jun 2018 13:51:33 -0500 Subject: Add kealib 1.4.8 (#8522) --- var/spack/repos/builtin/packages/kealib/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/kealib/package.py b/var/spack/repos/builtin/packages/kealib/package.py index f42ac16b99..2bc9ac25fd 100644 --- a/var/spack/repos/builtin/packages/kealib/package.py +++ b/var/spack/repos/builtin/packages/kealib/package.py @@ -45,6 +45,7 @@ class Kealib(CMakePackage): url = "https://bitbucket.org/chchrsc/kealib/get/kealib-1.4.7.tar.gz" version('develop', hg='https://bitbucket.org/chchrsc/kealib') + version('1.4.8', '1af2514c908f9168ff6665cc012815ad') version('1.4.7', '6139e31e50f552247ddf98f489948893') depends_on('cmake@2.8.10:', type='build') -- cgit v1.2.3-70-g09d2 From 508bbf407b199afb5e946ab27fd0b1746747e5fc Mon Sep 17 00:00:00 2001 From: Chris Green Date: Wed, 20 Jun 2018 13:51:53 -0500 Subject: New package xxhash. (#8530) * New package xxhash. * Change requested by @adamjstewart. --- var/spack/repos/builtin/packages/xxhash/package.py | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 var/spack/repos/builtin/packages/xxhash/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/xxhash/package.py b/var/spack/repos/builtin/packages/xxhash/package.py new file mode 100644 index 0000000000..1185203c47 --- /dev/null +++ b/var/spack/repos/builtin/packages/xxhash/package.py @@ -0,0 +1,49 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Xxhash(MakefilePackage): + """xxHash is an Extremely fast Hash algorithm, running at RAM speed + limits. It successfully completes the SMHasher test suite which + evaluates collision, dispersion and randomness qualities of hash + functions. Code is highly portable, and hashes are identical on all + platforms (little / big endian). + """ + + homepage = "https://github.com/Cyan4973/xxHash" + url = "https://github.com/Cyan4973/xxHash/archive/v0.6.5.tar.gz" + + version('0.6.5', '6af3a964f3c2accebce66e54b44b6446') + version('0.6.4', '3c071c95e31bd601cca149cc354e6f19') + version('0.6.3', 'f2ec1497317c0eb89addd7f333c83228') + version('0.6.2', 'b2d12d99094b824e0a5f3ab63abc6c58') + version('0.6.1', 'f4ced3767aad8384b1ecb73bd5f992ca') + version('0.6.0', 'e0fd163b07ab0038f389a180dc263cf2') + version('0.5.1', '9417fd8a4d88204b680e21a60f0ccada') + version('0.5.0', '42e9a31a2cfc2f626fde17e84a0b6bb7') + + def install(self, spec, prefix): + make('prefix={0}'.format(prefix), 'install') -- cgit v1.2.3-70-g09d2 From 5be89bfb7f48103b14620477b8b96d4c271f135f Mon Sep 17 00:00:00 2001 From: Peter Doak Date: Wed, 20 Jun 2018 17:04:22 -0400 Subject: poppler needs it test repo URL updated (#8519) --- var/spack/repos/builtin/packages/poppler/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/poppler/package.py b/var/spack/repos/builtin/packages/poppler/package.py index 3feb832778..3d168c1cdc 100644 --- a/var/spack/repos/builtin/packages/poppler/package.py +++ b/var/spack/repos/builtin/packages/poppler/package.py @@ -70,7 +70,7 @@ class Poppler(CMakePackage): # Only needed to run `make test` resource( name='test', - git='git://git.freedesktop.org/git/poppler/test', + git='https://anongit.freedesktop.org/git/poppler/test', placement='testdata' ) -- cgit v1.2.3-70-g09d2 From e378d4ee342e2547da9f5902bd4a8cd8a4f02000 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Thu, 21 Jun 2018 18:24:05 +0200 Subject: dealii: add msg= to conflicts statements (#8509) --- var/spack/repos/builtin/packages/dealii/package.py | 45 ++++++++++++++-------- 1 file changed, 30 insertions(+), 15 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 2c1daab97c..8b56b9de8c 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -155,21 +155,36 @@ class Dealii(CMakePackage, CudaPackage): depends_on('trilinos@master+amesos+aztec+epetra+ifpack+ml+muelu+rol+sacado+teuchos~hypre~amesos2~ifpack2~intrepid2~kokkos~tpetra~zoltan2', when='+trilinos+mpi+int64+cuda') # check that the combination of variants makes sense - conflicts('^openblas+ilp64', when='@:8.5.1') - conflicts('^intel-mkl+ilp64', when='@:8.5.1') - conflicts('^intel-parallel-studio+mkl+ilp64', when='@:8.5.1') - conflicts('+assimp', when='@:8.5.1') - conflicts('+gmsh', when='@:8.5.1') - conflicts('+nanoflann', when='@:8.5.1') - conflicts('+scalapack', when='@:8.5.1') - conflicts('+sundials', when='@:8.5.1') - conflicts('+adol-c', when='@:8.5.1') - conflicts('+slepc', when='~petsc') - conflicts('+gsl', when='@:8.4.2') - conflicts('+python', when='@:8.4.2') - for p in ['+arpack', '+hdf5', '+netcdf', '+p4est', '+petsc', '+scalapack', - '+slepc', '+trilinos']: - conflicts(p, when='~mpi') + # 64-bit BLAS: + for p in ['openblas', 'intel-mkl', 'intel-parallel-studio+mkl']: + conflicts('^{0}+ilp64'.format(p), when='@:8.5.1', + msg='64bit BLAS is only supported from 9.0.0') + + # interfaces added in 9.0.0: + for p in ['assimp', 'gmsh', 'nanoflann', 'scalapack', 'sundials', + 'adol-c']: + conflicts('+{0}'.format(p), when='@:8.5.1', + msg='The interface to {0} is supported from version 9.0.0 ' + 'onwards. Please explicitly disable this variant ' + 'via ~{0}'.format(p)) + + conflicts('+slepc', when='~petsc', + msg='It is not possible to enable slepc interfaces ' + 'without petsc.') + + # interfaces added in 8.5.0: + for p in ['gsl', 'python']: + conflicts('+{0}'.format(p), when='@:8.4.2', + msg='The interface to {0} is supported from version 8.5.0 ' + 'onwards. Please explicitly disable this variant ' + 'via ~{0}'.format(p)) + + # MPI requirements: + for p in ['arpack', 'hdf5', 'netcdf', 'p4est', 'petsc', 'scalapack', + 'slepc', 'trilinos']: + conflicts('+{0}'.format(p), when='~mpi', + msg='To enable {0} it is necessary to build deal.II with ' + 'MPI support enabled.'.format(p)) def cmake_args(self): spec = self.spec -- cgit v1.2.3-70-g09d2 From 70a0ea910ffd56c409e643fb6d1c5ffb51a3e127 Mon Sep 17 00:00:00 2001 From: Daniel Topa Date: Thu, 21 Jun 2018 11:55:17 -0600 Subject: openmpi: add latest release 3.0.2 (#8452) * Add latest release 3.0.2 https://www.open-mpi.org/software/ompi/v3.0/:x Signed-off-by: Daniel Topa * Add in library version in comment --- var/spack/repos/builtin/packages/openmpi/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 2e97975304..abe1a715f0 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -86,6 +86,7 @@ class Openmpi(AutotoolsPackage): version('3.1.0', '0895e268ca27735d7654bf64cee6c256') # libmpi.so.40.10.0 # Still supported + version('3.0.2', '098fa89646f5b4438d9d8534bc960cd6') # libmpi.so.40.00.2 version('3.0.1', '565f5060e080b0871a64b295c3d4426a') # libmpi.so.40.00.1 version('3.0.0', '757d51719efec08f9f1a7f32d58b3305') # libmpi.so.40.00.0 version('2.1.3', '46079b6f898a412240a0bf523e6cd24b') # libmpi.so.20.10.2 -- cgit v1.2.3-70-g09d2 From a14b1cac9ef820593100865baeaeb11d37de3480 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Thu, 21 Jun 2018 15:34:33 -0500 Subject: cmake: update package (#8539) --- var/spack/repos/builtin/packages/cmake/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index 79b7b21970..010e60e734 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -33,6 +33,7 @@ class Cmake(Package): list_url = 'https://cmake.org/files/' list_depth = 1 + version('3.11.4', '72e168b3bad2f9c34dcebbad7af56ff0') version('3.11.3', '3f923154ed47128f13b08eacd207d9ee') version('3.11.2', 'd2d554c05fc07cfae7846d2aa205f12a') version('3.11.1', '12a3177477e4e2c7bc514193d421dafe') -- cgit v1.2.3-70-g09d2 From 645c640f38ae67008eb18c79301e19ddfd39c041 Mon Sep 17 00:00:00 2001 From: Cyrus Harrison Date: Thu, 21 Jun 2018 14:35:07 -0700 Subject: use new valgrind repo (#8538) --- var/spack/repos/builtin/packages/valgrind/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/valgrind/package.py b/var/spack/repos/builtin/packages/valgrind/package.py index df701e3907..20c8431788 100644 --- a/var/spack/repos/builtin/packages/valgrind/package.py +++ b/var/spack/repos/builtin/packages/valgrind/package.py @@ -45,7 +45,7 @@ class Valgrind(AutotoolsPackage): version('3.11.0', '4ea62074da73ae82e0162d6550d3f129') version('3.10.1', '60ddae962bc79e7c95cfc4667245707f') version('3.10.0', '7c311a72a20388aceced1aa5573ce970') - version('develop', svn='svn://svn.valgrind.org/valgrind/trunk') + version('develop', git='git://sourceware.org/git/valgrind.git') variant('mpi', default=True, description='Activates MPI support for valgrind') -- cgit v1.2.3-70-g09d2 From 9f22bb61acc750ccf11a17979eb98851aed285ce Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Thu, 21 Jun 2018 15:37:10 -0600 Subject: Correcting position independent code setting for boxlib and amrex. (#8537) --- var/spack/repos/builtin/packages/amrex/package.py | 2 +- var/spack/repos/builtin/packages/boxlib/package.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/amrex/package.py b/var/spack/repos/builtin/packages/amrex/package.py index 7521e8411f..d19f429421 100644 --- a/var/spack/repos/builtin/packages/amrex/package.py +++ b/var/spack/repos/builtin/packages/amrex/package.py @@ -61,7 +61,7 @@ class Amrex(CMakePackage): spec = self.spec cmake_args = [ - '-DENABLE_POSITION_INDEPENDENT_CODE=ON', + '-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON', '-DBL_SPACEDIM:INT=%d' % int(spec.variants['dims'].value), '-DBL_PRECISION:STRING=%s' % spec.variants['prec'].value, '-DENABLE_FMG=%s' % ('+fortran' in spec), diff --git a/var/spack/repos/builtin/packages/boxlib/package.py b/var/spack/repos/builtin/packages/boxlib/package.py index 3dff87517f..9546d28f53 100644 --- a/var/spack/repos/builtin/packages/boxlib/package.py +++ b/var/spack/repos/builtin/packages/boxlib/package.py @@ -49,7 +49,7 @@ class Boxlib(CMakePackage): options.extend([ '-DBL_SPACEDIM=%d' % int(spec.variants['dims'].value), - '-DENABLE_POSITION_INDEPENDENT_CODE=ON', + '-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON', '-DENABLE_FBASELIB=ON', '-DCMAKE_C_COMPILER=%s' % spec['mpi'].mpicc, '-DCMAKE_CXX_COMPILER=%s' % spec['mpi'].mpicxx, -- cgit v1.2.3-70-g09d2 From 8f2918813dd65858ccf6f60290828d07455607e6 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Fri, 15 Jun 2018 10:46:35 -0700 Subject: Add tags for ECP applications that are in Spack. - All now have both 'ecp' and 'ecp-apps' tags. - ECP ST projects will eventually also have ecp and ecp-software tags. --- var/spack/repos/builtin/packages/chombo/package.py | 2 ++ var/spack/repos/builtin/packages/lammps/package.py | 2 ++ var/spack/repos/builtin/packages/latte/package.py | 2 ++ var/spack/repos/builtin/packages/nalu/package.py | 2 ++ var/spack/repos/builtin/packages/nek5000/package.py | 2 +- var/spack/repos/builtin/packages/nwchem/package.py | 2 ++ var/spack/repos/builtin/packages/openmc/package.py | 2 ++ var/spack/repos/builtin/packages/parsplice/package.py | 2 ++ var/spack/repos/builtin/packages/qmcpack/package.py | 2 ++ 9 files changed, 17 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/chombo/package.py b/var/spack/repos/builtin/packages/chombo/package.py index 64280d545b..8baa39cc73 100644 --- a/var/spack/repos/builtin/packages/chombo/package.py +++ b/var/spack/repos/builtin/packages/chombo/package.py @@ -36,6 +36,8 @@ class Chombo(MakefilePackage): homepage = "https://commons.lbl.gov/display/chombo" url = "http://bitbucket.org/drhansj/chombo-xsdk.git" + tags = ['ecp', 'ecp-apps'] + # Use whatever path Brian V. and Terry L. agreed upon, but preserve version version('3.2', git='http://bitbucket.org/drhansj/chombo-xsdk.git', commit='71d856c') version('develop', git='http://bitbucket.org/drhansj/chombo-xsdk.git', tag='master') diff --git a/var/spack/repos/builtin/packages/lammps/package.py b/var/spack/repos/builtin/packages/lammps/package.py index 688b629393..f9c4351c8f 100644 --- a/var/spack/repos/builtin/packages/lammps/package.py +++ b/var/spack/repos/builtin/packages/lammps/package.py @@ -36,6 +36,8 @@ class Lammps(CMakePackage): homepage = "http://lammps.sandia.gov/" url = "https://github.com/lammps/lammps/archive/patch_1Sep2017.tar.gz" + tags = ['ecp', 'ecp-apps'] + version('20180316', '25bad35679583e0dd8cb8753665bb84b') version('20180222', '4d0513e3183bd57721814d217fdaf957') version('20170922', '4306071f919ec7e759bda195c26cfd9a') diff --git a/var/spack/repos/builtin/packages/latte/package.py b/var/spack/repos/builtin/packages/latte/package.py index 80f999f763..5a8d021cff 100644 --- a/var/spack/repos/builtin/packages/latte/package.py +++ b/var/spack/repos/builtin/packages/latte/package.py @@ -32,6 +32,8 @@ class Latte(CMakePackage): homepage = "https://github.com/lanl/latte" url = "https://github.com/lanl/latte/tarball/v1.0" + tags = ['ecp', 'ecp-apps'] + version('1.1.1', 'ab11867ba6235189681cf6e50a50cc50') version('1.0.1', 'd0b99edbcf7a19abe0a68a192d6f6234') version('develop', git='https://github.com/lanl/latte', branch='master') diff --git a/var/spack/repos/builtin/packages/nalu/package.py b/var/spack/repos/builtin/packages/nalu/package.py index e1b87a161d..44efe0121e 100644 --- a/var/spack/repos/builtin/packages/nalu/package.py +++ b/var/spack/repos/builtin/packages/nalu/package.py @@ -34,6 +34,8 @@ class Nalu(CMakePackage): homepage = "https://github.com/NaluCFD/Nalu" url = "https://github.com/NaluCFD/Nalu.git" + tags = ['ecp', 'ecp-apps'] + variant('openfast', default=False, description='Compile with OpenFAST support') variant('tioga', default=False, diff --git a/var/spack/repos/builtin/packages/nek5000/package.py b/var/spack/repos/builtin/packages/nek5000/package.py index b18d220bb1..a988867cda 100644 --- a/var/spack/repos/builtin/packages/nek5000/package.py +++ b/var/spack/repos/builtin/packages/nek5000/package.py @@ -45,7 +45,7 @@ class Nek5000(Package): url = "https://github.com/Nek5000/Nek5000" tags = ['cfd', 'flow', 'hpc', 'solver', 'navier-stokes', - 'spectral-elements', 'fluid'] + 'spectral-elements', 'fluid', 'ecp', 'ecp-apps'] version('17.0', '6a13bfad2ce023897010dd88f54a0a87', url="https://github.com/Nek5000/Nek5000/releases/download/" diff --git a/var/spack/repos/builtin/packages/nwchem/package.py b/var/spack/repos/builtin/packages/nwchem/package.py index c3b2ce6a5b..84a5981b5d 100644 --- a/var/spack/repos/builtin/packages/nwchem/package.py +++ b/var/spack/repos/builtin/packages/nwchem/package.py @@ -33,6 +33,8 @@ class Nwchem(Package): homepage = "http://www.nwchem-sw.org" url = "http://www.nwchem-sw.org/images/Nwchem-6.6.revision27746-src.2015-10-20.tar.gz" + tags = ['ecp', 'ecp-apps'] + version('6.8', '50b18116319f4c15d1cb7eaa1b433006', url='https://github.com/nwchemgit/nwchem/archive/v6.8-release.tar.gz') version('6.6', 'c581001c004ea5e5dfacb783385825e3', diff --git a/var/spack/repos/builtin/packages/openmc/package.py b/var/spack/repos/builtin/packages/openmc/package.py index d83aaf0732..97c819c433 100644 --- a/var/spack/repos/builtin/packages/openmc/package.py +++ b/var/spack/repos/builtin/packages/openmc/package.py @@ -36,6 +36,8 @@ class Openmc(MakefilePackage): homepage = "https://github.com/ANL-CESAR/" url = "https://github.com/ANL-CESAR/openmc.git" + tags = ['ecp', 'ecp-apps'] + version('develop', git='https://github.com/ANL-CESAR/openmc.git') build_directory = 'src' diff --git a/var/spack/repos/builtin/packages/parsplice/package.py b/var/spack/repos/builtin/packages/parsplice/package.py index 10b81171de..66fe7c6ebb 100644 --- a/var/spack/repos/builtin/packages/parsplice/package.py +++ b/var/spack/repos/builtin/packages/parsplice/package.py @@ -32,6 +32,8 @@ class Parsplice(CMakePackage): homepage = "https://gitlab.com/exaalt/parsplice" url = "https://gitlab.com/api/v4/projects/exaalt%2Fparsplice/repository/archive.tar.gz?sha=v1.1" + tags = ['ecp', 'ecp-apps'] + version('1.1', '3a72340d49d731a076e8942f2ae2f4e9') version('develop', git='https://gitlab.com/exaalt/parsplice', branch='master') diff --git a/var/spack/repos/builtin/packages/qmcpack/package.py b/var/spack/repos/builtin/packages/qmcpack/package.py index 0a77491736..8003a3c0d1 100644 --- a/var/spack/repos/builtin/packages/qmcpack/package.py +++ b/var/spack/repos/builtin/packages/qmcpack/package.py @@ -34,6 +34,8 @@ class Qmcpack(CMakePackage): homepage = "http://www.qmcpack.org/" url = "https://github.com/QMCPACK/qmcpack.git" + tags = ['ecp', 'ecp-apps'] + # This download method is untrusted, and is not recommended by the # Spack manual. However, it is easier to maintain because github hashes # can occasionally change. -- cgit v1.2.3-70-g09d2 From 3c627ea65550f2555329851361540fe4e7cb103a Mon Sep 17 00:00:00 2001 From: Mike Pozulp Date: Thu, 21 Jun 2018 18:25:26 -0700 Subject: new packages: workrave and its dependencies (#7753) --- .../repos/builtin/packages/cairomm/package.py | 38 ++++++++ .../builtin/packages/glibmm/guint16_cast.patch | 36 +++++++ var/spack/repos/builtin/packages/glibmm/package.py | 47 +++++++++ var/spack/repos/builtin/packages/gtkmm/package.py | 53 +++++++++++ .../repos/builtin/packages/libsigcpp/package.py | 42 +++++++++ .../repos/builtin/packages/pangomm/package.py | 45 +++++++++ .../repos/builtin/packages/py-cheetah/package.py | 34 +++++++ .../packages/workrave/add_time_header.patch | 12 +++ .../packages/workrave/dont_get_widget.patch | 22 +++++ .../builtin/packages/workrave/no_gettext.patch | 29 ++++++ .../repos/builtin/packages/workrave/package.py | 105 +++++++++++++++++++++ 11 files changed, 463 insertions(+) create mode 100644 var/spack/repos/builtin/packages/cairomm/package.py create mode 100644 var/spack/repos/builtin/packages/glibmm/guint16_cast.patch create mode 100644 var/spack/repos/builtin/packages/glibmm/package.py create mode 100644 var/spack/repos/builtin/packages/gtkmm/package.py create mode 100644 var/spack/repos/builtin/packages/libsigcpp/package.py create mode 100644 var/spack/repos/builtin/packages/pangomm/package.py create mode 100644 var/spack/repos/builtin/packages/py-cheetah/package.py create mode 100644 var/spack/repos/builtin/packages/workrave/add_time_header.patch create mode 100644 var/spack/repos/builtin/packages/workrave/dont_get_widget.patch create mode 100644 var/spack/repos/builtin/packages/workrave/no_gettext.patch create mode 100644 var/spack/repos/builtin/packages/workrave/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cairomm/package.py b/var/spack/repos/builtin/packages/cairomm/package.py new file mode 100644 index 0000000000..37408d50c5 --- /dev/null +++ b/var/spack/repos/builtin/packages/cairomm/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Cairomm(AutotoolsPackage): + """Cairomm is a C++ wrapper for the cairo graphics library.""" + + homepage = "https://www.cairographics.org/cairomm/" + url = "https://cairographics.org/releases/cairomm-1.6.4.tar.gz" + + version('1.6.4', '63561c62536173a98f03005dfe55c90e') + version('1.6.2', 'eac5d159e4cba98e32ea174483dee24e') + + depends_on('cairo') + depends_on('libsigcpp') diff --git a/var/spack/repos/builtin/packages/glibmm/guint16_cast.patch b/var/spack/repos/builtin/packages/glibmm/guint16_cast.patch new file mode 100644 index 0000000000..325eb4d21f --- /dev/null +++ b/var/spack/repos/builtin/packages/glibmm/guint16_cast.patch @@ -0,0 +1,36 @@ +diff --git a/glib/glibmm/class.cc b/glib/glibmm/class.cc +index dc1c4a8..fc640ae 100644 +--- a/glib/glibmm/class.cc ++++ b/glib/glibmm/class.cc +@@ -37,13 +37,13 @@ void Class::register_derived_type(GType base_type) + + const GTypeInfo derived_info = + { +- base_query.class_size, ++ (guint16) base_query.class_size, + 0, // base_init + 0, // base_finalize + class_init_func_, + 0, // class_finalize + 0, // class_data +- base_query.instance_size, ++ (guint16) base_query.instance_size, + 0, // n_preallocs + 0, // instance_init + 0, // value_table +@@ -75,13 +75,13 @@ GType Class::clone_custom_type(const char* custom_type_name) const + + const GTypeInfo derived_info = + { +- base_query.class_size, ++ (guint16) base_query.class_size, + 0, // base_init + 0, // base_finalize + &Class::custom_class_init_function, + 0, // class_finalize + this, // class_data +- base_query.instance_size, ++ (guint16) base_query.instance_size, + 0, // n_preallocs + 0, // instance_init + 0, // value_table diff --git a/var/spack/repos/builtin/packages/glibmm/package.py b/var/spack/repos/builtin/packages/glibmm/package.py new file mode 100644 index 0000000000..810a8674b1 --- /dev/null +++ b/var/spack/repos/builtin/packages/glibmm/package.py @@ -0,0 +1,47 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Glibmm(AutotoolsPackage): + """Glibmm is a C++ wrapper for the glib library.""" + + homepage = "https://developer.gnome.org/glib/" + url = "https://ftp.gnome.org/pub/GNOME/sources/glibmm/2.19/glibmm-2.19.3.tar.gz" + + version('2.19.3', 'b50180bb93f501172a2ac4c54e83e88a') + version('2.16.0', '24390d2da1734205f1e572f24d4942f0') + version('2.4.8', 'fa8b2889cd845752446c6ce15a94bb32') + + depends_on('libsigcpp') + depends_on('glib') + + patch('guint16_cast.patch', when='@2.19.3') + + def url_for_version(self, version): + """Handle glibmm's version-based custom URLs.""" + url = "https://ftp.acc.umu.se/pub/GNOME/sources/glibmm" + ext = '.tar.gz' if version < Version('2.28.2') else '.tar.xz' + return url + "/%s/glibmm-%s%s" % (version.up_to(2), version, ext) diff --git a/var/spack/repos/builtin/packages/gtkmm/package.py b/var/spack/repos/builtin/packages/gtkmm/package.py new file mode 100644 index 0000000000..6d06bd14a1 --- /dev/null +++ b/var/spack/repos/builtin/packages/gtkmm/package.py @@ -0,0 +1,53 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Gtkmm(AutotoolsPackage): + """Gtkmm is the official C++ interface for the popular GUI library GTK+.""" + + homepage = "https://www.gtkmm.org/en/" + url = "https://ftp.acc.umu.se/pub/GNOME/sources/gtkmm/2.16/gtkmm-2.16.0.tar.gz" + + version('2.19.7', '2afc018e5b15cde293cd2d21db9b6a55') + version('2.19.6', 'fb140e82e583620defe0d70bfe7eefd7') + version('2.19.4', '60006a23306487938dfe0e4b17e3fa46') + version('2.19.2', 'dc208575a24e8d5265af2fd59c08f3d8') + version('2.17.11', '2326ff83439aac83721ed4694acf14e5') + version('2.17.1', '19358644e5e620ad738658be2cb6d739') + version('2.16.0', 'de178c2a6f23eda0b6a8bfb0219e2e1c') + version('2.4.11', 'a339958bc4ab7f74201b312bd3562d46') + + depends_on('glibmm') + depends_on('atk') + depends_on('gtkplus') + depends_on('pangomm') + depends_on('cairomm') + + def url_for_version(self, version): + """Handle glib's version-based custom URLs.""" + url = "https://ftp.acc.umu.se/pub/GNOME/sources/gtkmm" + ext = '.tar.gz' if version < Version('3.1.0') else '.tar.xz' + return url + "/%s/gtkmm-%s%s" % (version.up_to(2), version, ext) diff --git a/var/spack/repos/builtin/packages/libsigcpp/package.py b/var/spack/repos/builtin/packages/libsigcpp/package.py new file mode 100644 index 0000000000..2197f3f991 --- /dev/null +++ b/var/spack/repos/builtin/packages/libsigcpp/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Libsigcpp(AutotoolsPackage): + """Libsigc++ is a C++ library for typesafe callbacks""" + + homepage = "http://www.example.com" + url = "https://ftp.acc.umu.se/pub/GNOME/sources/libsigc++/2.0/libsigc++-2.0.3.tar.gz" + + version('2.9.3', '0e5630fd0557ee80b5e5cbbcebaa2594') + version('2.1.1', '5ae4d6da9a408c90e86c776673c38972') + version('2.0.3', '57c6887dd46ce0bd312a4823589db5d8') + + def url_for_version(self, version): + """Handle version-based custom URLs.""" + url = "https://ftp.acc.umu.se/pub/GNOME/sources/libsigc++" + ext = '.tar.gz' if version < Version('2.2.10') else '.tar.xz' + return url + "/%s/libsigc++-%s%s" % (version.up_to(2), version, ext) diff --git a/var/spack/repos/builtin/packages/pangomm/package.py b/var/spack/repos/builtin/packages/pangomm/package.py new file mode 100644 index 0000000000..bb287596da --- /dev/null +++ b/var/spack/repos/builtin/packages/pangomm/package.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Pangomm(AutotoolsPackage): + """Pangomm is a C++ interface to Pango.""" + + homepage = "http://www.pango.org/" + url = "https://ftp.gnome.org/pub/GNOME/sources/pangomm/2.14/pangomm-2.14.1.tar.gz" + + version('2.14.1', '607a404291d9eeb895f1df3d08f531d7') + version('2.14.0', '897d8c56cec4a9c297a426eb0fc2af91') + + depends_on('pango') + depends_on('glibmm') + depends_on('cairomm') + + def url_for_version(self, version): + """Handle version-based custom URLs.""" + url = "https://ftp.acc.umu.se/pub/GNOME/sources/pangomm" + ext = '.tar.gz' if version < Version('2.28.3') else '.tar.xz' + return url + "/%s/pangomm-%s%s" % (version.up_to(2), version, ext) diff --git a/var/spack/repos/builtin/packages/py-cheetah/package.py b/var/spack/repos/builtin/packages/py-cheetah/package.py new file mode 100644 index 0000000000..b27d848630 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-cheetah/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyCheetah(PythonPackage): + """Cheetah is a template engine and code generation tool.""" + + homepage = "https://pypi.python.org/pypi/Cheetah/2.4.4" + url = "https://pypi.io/packages/source/C/Cheetah/Cheetah-2.3.0.tar.gz" + + version('2.3.0', 'e28ffef7f5c1660d66196639f162d9ce') diff --git a/var/spack/repos/builtin/packages/workrave/add_time_header.patch b/var/spack/repos/builtin/packages/workrave/add_time_header.patch new file mode 100644 index 0000000000..535b7356fe --- /dev/null +++ b/var/spack/repos/builtin/packages/workrave/add_time_header.patch @@ -0,0 +1,12 @@ +diff --git a/backend/src/TimePred.hh b/backend/src/TimePred.hh +index 187f0fc..99bf48c 100644 +--- a/backend/src/TimePred.hh ++++ b/backend/src/TimePred.hh +@@ -26,6 +26,7 @@ + #else + # if HAVE_SYS_TIME_H + # include ++# include + # else + # include + # endif diff --git a/var/spack/repos/builtin/packages/workrave/dont_get_widget.patch b/var/spack/repos/builtin/packages/workrave/dont_get_widget.patch new file mode 100644 index 0000000000..de8076748c --- /dev/null +++ b/var/spack/repos/builtin/packages/workrave/dont_get_widget.patch @@ -0,0 +1,22 @@ +diff --git a/frontend/plugin/statistics/gtkmm/src/StatisticsDialog.cc b/frontend/plugin/statistics/gtkmm/src/StatisticsDialog.cc +index ee7d56f..608fddb 100644 +--- a/frontend/plugin/statistics/gtkmm/src/StatisticsDialog.cc ++++ b/frontend/plugin/statistics/gtkmm/src/StatisticsDialog.cc +@@ -604,7 +604,7 @@ StatisticsDialog::on_history_delete_all() + ); + Gtk::MessageDialog mb_ask( *this, msg, true, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_YES_NO, false ); + mb_ask.set_title( _("Warning") ); +- mb_ask.get_widget_for_response( Gtk::RESPONSE_NO )->grab_default(); ++ //mb_ask.get_widget_for_response( Gtk::RESPONSE_NO )->grab_default(); + if( mb_ask.run() == Gtk::RESPONSE_YES ) + { + mb_ask.hide(); +@@ -630,7 +630,7 @@ StatisticsDialog::on_history_delete_all() + ); + Gtk::MessageDialog mb_error( *this, msg, true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_YES_NO, false ); + mb_error.set_title( _("Error") ); +- mb_error.get_widget_for_response( Gtk::RESPONSE_NO )->grab_default(); ++ //mb_error.get_widget_for_response( Gtk::RESPONSE_NO )->grab_default(); + if( mb_error.run() != Gtk::RESPONSE_YES ) + break; + } diff --git a/var/spack/repos/builtin/packages/workrave/no_gettext.patch b/var/spack/repos/builtin/packages/workrave/no_gettext.patch new file mode 100644 index 0000000000..ab440c0e11 --- /dev/null +++ b/var/spack/repos/builtin/packages/workrave/no_gettext.patch @@ -0,0 +1,29 @@ +diff --git a/configure.ac b/configure.ac +index a8a437f..6128cd2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -949,8 +949,8 @@ dnl + dnl Internationalization + dnl + +-AM_GNU_GETTEXT_VERSION([0.17]) +-AM_GNU_GETTEXT([external]) ++dnl AM_GNU_GETTEXT_VERSION([0.17]) ++dnl AM_GNU_GETTEXT([external]) + + dnl Hack because windows gettext package is SEVERELY broken... + if test "x$platform_os_win32" = "xyes" +@@ -963,9 +963,10 @@ then + BUILD_INCLUDED_LIBINTL=no + fi + +-GETTEXT_PACKAGE=workrave +-AC_SUBST(GETTEXT_PACKAGE) +-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define to the gettext domain name.]) ++dnl GETTEXT_PACKAGE=workrave ++dnl AC_SUBST(GETTEXT_PACKAGE) ++dnl AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define to the gettext domain name.]) ++AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) + IT_PROG_INTLTOOL([0.40.0]) + + diff --git a/var/spack/repos/builtin/packages/workrave/package.py b/var/spack/repos/builtin/packages/workrave/package.py new file mode 100644 index 0000000000..76434acad3 --- /dev/null +++ b/var/spack/repos/builtin/packages/workrave/package.py @@ -0,0 +1,105 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +from shutil import copyfile + + +class Workrave(AutotoolsPackage): + """Workrave is a program that assists in the recovery and prevention of + Repetitive Strain Injury (RSI). The program frequently alerts you to + take micro-pauses, rest breaks and restricts you to your daily limit. + The program runs on GNU/Linux and Microsoft Windows. + """ + + homepage = "http://www.workrave.org/" + url = "https://github.com/rcaelers/workrave/archive/v1_10_20.tar.gz" + + version('1_10_20', '095567c10311bd2c1a52f98035cc8590') + version('1_10_19', 'a87ed53d5b321133e8b6b98fd715507b') + version('1_10_18', 'd36c2aba0485116b831d5b36a862f343') + version('1_10_17', 'ba829bb2c0ec999b3194b4d845549c39') + version('1_10_16', 'b9bf77bfe0c909fff56759e7dda40f9d') + version('1_10_15', '4a70c2e325503249d1a40fcc236d6802') + version('1_10_14', '67108d993719d9438a1b69f0cb8fc9b8') + version('1_10_13', 'd5e7110dfb0b0a31c909405913ac2a75') + version('1_10_12', '0bfbaa1dc35901ffa8f1a3676421a992') + version('1_10_10', 'cf827672c8a1ece074f8ddfcf73d0fe2') + + depends_on('autoconf', type='build') + depends_on('automake', type='build') + depends_on('libtool', type='build') + depends_on('m4', type='build') + + depends_on('libx11') + depends_on('py-cheetah') + depends_on('glib') + depends_on('glibmm') + depends_on('gtkplus') + depends_on('gtkmm@2.17.1') + depends_on('libsigcpp') + + # adds #include to a workrave test + patch('add_time_header.patch') + + # removes call to missing gtkmm api function + patch('dont_get_widget.patch') + + # removes gettext which canot be use with intltool + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=724555 + # https://bugzilla.gnome.org/show_bug.cgi?id=708673#c4 + patch('no_gettext.patch') + + # add a couple m4 macros used during autoreconf + # https://github.com/rcaelers/workrave/issues/95 + m4files = ['ax_cxx_compile_stdcxx_11', 'ax_cxx_compile_stdcxx'] + resource(name=m4files[0], + url='http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=blob_plain;f=m4/ax_cxx_compile_stdcxx_11.m4', + sha256='d75fc9fe4502eea02e8c5bfb61b88a04cd08aa6d5bd757fe66e9a9a1e4781b46', + expand=False, + destination='', + placement=m4files[0]) + resource(name=m4files[1], + url='http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=blob_plain;f=m4/ax_cxx_compile_stdcxx.m4', + sha256='0c08d2f64147f65eb7e255019102c1042ab695c60fd49add19793951a1279a1a', + expand=False, + destination='', + placement=m4files[1]) + + def setup_environment(self, build_env, run_env): + # unset PYTHONHOME to let system python script with explict + # system python sbangs like glib-mkenums work, see #6968 + # Without this, we will get + # ImportError: No module named site + # during build phase when make runs glib-mkenums + build_env.unset('PYTHONHOME') + + @run_before('autoreconf') + def extra_m4(self): + # move m4 macros, which we added with the resource() directive, + # to the m4 directory, where aclocal will pick them up + for fname in self.m4files: + src = '%s/%s/%s.m4' % (self.stage.source_path, fname, fname) + dest = '%s/m4/%s.m4' % (self.stage.source_path, fname) + copyfile(src, dest) -- cgit v1.2.3-70-g09d2 From 8e3d49cf357b2e4f497789ecd7940a89ed88a11e Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Fri, 22 Jun 2018 14:52:40 +0200 Subject: elpa: add 2018.05.001.rc1 and 2017.11.001 (#8512) * elpa: add 2018.05.001.rc1 and 2017.11.001 * elpa: shift preferred --- var/spack/repos/builtin/packages/elpa/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/elpa/package.py b/var/spack/repos/builtin/packages/elpa/package.py index 7349fa2ec9..1795f51e7e 100644 --- a/var/spack/repos/builtin/packages/elpa/package.py +++ b/var/spack/repos/builtin/packages/elpa/package.py @@ -31,10 +31,12 @@ class Elpa(AutotoolsPackage): homepage = 'http://elpa.mpcdf.mpg.de/' url = 'http://elpa.mpcdf.mpg.de/elpa-2015.11.001.tar.gz' + version('2018.05.001.rc1', 'ccd77bd8036988ee624f43c04992bcdd') + version('2017.11.001', '4a437be40cc966efb07aaab84c20cd6e', preferred=True) version('2017.05.003', '7c8e5e58cafab212badaf4216695700f') version('2017.05.002', 'd0abc1ac1f493f93bf5e30ec8ab155dc') version('2016.11.001.pre', '5656fd066cf0dcd071dbcaf20a639b37') - version('2016.05.004', 'c0dd3a53055536fc3a2a221e78d8b376', preferred=True) + version('2016.05.004', 'c0dd3a53055536fc3a2a221e78d8b376') version('2016.05.003', '88a9f3f3bfb63e16509dd1be089dcf2c') version('2015.11.001', 'de0f35b7ee7c971fd0dca35c900b87e6') -- cgit v1.2.3-70-g09d2 From d5e8cabe7565fc92f1b64375958146ef57fbd18c Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Fri, 22 Jun 2018 15:03:47 +0200 Subject: Fixed linking of R with MKL + configure issue in a dep (pixman) (#8449) --- var/spack/repos/builtin/packages/pixman/package.py | 19 +++++++++++++++++++ var/spack/repos/builtin/packages/r/package.py | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pixman/package.py b/var/spack/repos/builtin/packages/pixman/package.py index 7107148688..7714120049 100644 --- a/var/spack/repos/builtin/packages/pixman/package.py +++ b/var/spack/repos/builtin/packages/pixman/package.py @@ -47,6 +47,25 @@ class Pixman(AutotoolsPackage): # Patch is obtained from above link. patch('clang.patch', when='%clang@9.1.0-apple:') + @run_before('build') + def patch_config_h_for_intel(self): + config_h = join_path(self.stage.source_path, 'config.h') + + # Intel disguises itself as GNU, but doesn't implement + # the same builtin functions. This causes in this case + # a positive detection of GCC vector extensions, which + # is bound to fail at compile time because Intel has no + # __builtin_shuffle. See also: + # + # https://software.intel.com/en-us/forums/intel-c-compiler/topic/758013 + # + if '%intel' in self.spec: + filter_file( + '#define HAVE_GCC_VECTOR_EXTENSIONS /\*\*/', + '/* #undef HAVE_GCC_VECTOR_EXTENSIONS */', + config_h + ) + def configure_args(self): args = [ '--enable-libpng', diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py index 46c56787aa..b1c9f49eb8 100644 --- a/var/spack/repos/builtin/packages/r/package.py +++ b/var/spack/repos/builtin/packages/r/package.py @@ -119,7 +119,7 @@ class R(AutotoolsPackage): if '+external-lapack' in spec: config_args.extend([ - '--with-blas', + '--with-blas={0}'.format(spec['blas'].libs), '--with-lapack' ]) -- cgit v1.2.3-70-g09d2 From 3e7f5250c0b39d963521269a0d0d68f5d4892be9 Mon Sep 17 00:00:00 2001 From: Paul Chelarescu Date: Fri, 22 Jun 2018 18:27:25 +0200 Subject: Added minuit package (#8536) * Added minuit package * Removed default method and template * Different URLs for old versions * Patches for versions down to 1.5.0 * Reverted ROOT package changes * Removed print statement * Added checksums for older versions * Consistent version names --- .../builtin/packages/minuit/LASymMatrix.h.patch | 117 +++++++++++++++++++++ var/spack/repos/builtin/packages/minuit/package.py | 66 ++++++++++++ .../builtin/packages/minuit/sprintf.cxx.patch | 10 ++ .../repos/builtin/packages/minuit/sprintf.patch | 10 ++ 4 files changed, 203 insertions(+) create mode 100644 var/spack/repos/builtin/packages/minuit/LASymMatrix.h.patch create mode 100644 var/spack/repos/builtin/packages/minuit/package.py create mode 100644 var/spack/repos/builtin/packages/minuit/sprintf.cxx.patch create mode 100644 var/spack/repos/builtin/packages/minuit/sprintf.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/minuit/LASymMatrix.h.patch b/var/spack/repos/builtin/packages/minuit/LASymMatrix.h.patch new file mode 100644 index 0000000000..645d2ccd35 --- /dev/null +++ b/var/spack/repos/builtin/packages/minuit/LASymMatrix.h.patch @@ -0,0 +1,117 @@ +commit 62772d5fb0c6c7661c7acaa73d21de4205579d73 +Author: Paul Chelarescu +Date: Fri Jun 22 15:34:20 2018 +0200 + + Patched LASymMatrix.h + +diff --git a/Minuit/LASymMatrix.h b/Minuit/LASymMatrix.h +index 755eb11..976c0de 100644 +--- a/Minuit/LASymMatrix.h ++++ b/Minuit/LASymMatrix.h +@@ -16,6 +16,7 @@ + // #include + + #include "Minuit/StackAllocator.h" ++#include + //extern StackAllocator StackAllocatorHolder::get(); + + int mndaxpy(unsigned int, double, const double*, int, double*, int); +@@ -37,7 +38,7 @@ public: + + LASymMatrix(unsigned int n) : theSize(n*(n+1)/2), theNRow(n), theData((double*)StackAllocatorHolder::get().allocate(sizeof(double)*n*(n+1)/2)) { + // assert(theSize>0); +- memset(theData, 0, theSize*sizeof(double)); ++ std::memset(theData, 0, theSize*sizeof(double)); + // std::cout<<"LASymMatrix(unsigned int n), n= "<& v)"< + LASymMatrix(const ABObj, T>, T>& inv) : theSize(inv.obj().obj().obj().size()), theNRow(inv.obj().obj().obj().nrow()), theData((double*)StackAllocatorHolder::get().allocate(sizeof(double)*inv.obj().obj().obj().size())) { +- memcpy(theData, inv.obj().obj().obj().data(), theSize*sizeof(double)); ++ std::memcpy(theData, inv.obj().obj().obj().data(), theSize*sizeof(double)); + mndscal(theSize, double(inv.obj().obj().f()), theData, 1); + invert(*this); + mndscal(theSize, double(inv.f()), theData, 1); +@@ -236,7 +237,7 @@ public: + assert(theSize == v.obj().size()); + } + //std::cout<<"theData= "< LASymMatrix& operator=(const ABObj, T>& something)"< Version('5.0.0'): + url = "http://www.cern.ch/mathlibs/sw/{0}/Minuit2/Minuit2-{1}.tar.gz" + return url.format(version.underscored, version) + else: + url = "http://seal.web.cern.ch/seal/minuit/releases/Minuit-{0}.tar.gz" + return url.format(version.underscored) + + patch('sprintf.cxx.patch', when='@5.08.00:5.18.00') + patch('sprintf.patch', when='@:1.7.9') + patch('LASymMatrix.h.patch', when='@:1.7.6') diff --git a/var/spack/repos/builtin/packages/minuit/sprintf.cxx.patch b/var/spack/repos/builtin/packages/minuit/sprintf.cxx.patch new file mode 100644 index 0000000000..f6bf81cbc3 --- /dev/null +++ b/var/spack/repos/builtin/packages/minuit/sprintf.cxx.patch @@ -0,0 +1,10 @@ +--- a/src/MnUserTransformation.cxx 2008-01-17 15:05:38.000000000 +0100 ++++ b/src/MnUserTransformation.cxx 2018-06-22 13:44:02.629389848 +0200 +@@ -11,6 +11,7 @@ + #include "Minuit2/MnUserCovariance.h" + + #include ++#include + + namespace ROOT { + diff --git a/var/spack/repos/builtin/packages/minuit/sprintf.patch b/var/spack/repos/builtin/packages/minuit/sprintf.patch new file mode 100644 index 0000000000..be49ed772a --- /dev/null +++ b/var/spack/repos/builtin/packages/minuit/sprintf.patch @@ -0,0 +1,10 @@ +--- a/src/MnUserTransformation.cpp 2018-06-22 11:35:34.476798087 +0200 ++++ b/src/MnUserTransformation.cpp 2018-06-22 11:08:01.729725829 +0200 +@@ -2,6 +2,7 @@ + #include "Minuit/MnUserCovariance.h" + + #include ++#include + + class MnParStr { + -- cgit v1.2.3-70-g09d2 From ae8645e27d86666815c48397007df5376c7d929b Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Fri, 22 Jun 2018 15:03:41 -0700 Subject: added ReMPI version 1.1.0 (#8548) --- var/spack/repos/builtin/packages/rempi/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/rempi/package.py b/var/spack/repos/builtin/packages/rempi/package.py index 3958671539..26304c1f03 100644 --- a/var/spack/repos/builtin/packages/rempi/package.py +++ b/var/spack/repos/builtin/packages/rempi/package.py @@ -30,6 +30,7 @@ class Rempi(AutotoolsPackage): homepage = "https://github.com/PRUNERS/ReMPI" url = "https://github.com/PRUNERS/ReMPI/releases/download/v1.0.0/ReMPI-1.0.0.tar.gz" + version("1.1.0", "05b872a6f3e2f49a2fc6112a844c7f43") version("1.0.0", "32c780a6a74627b5796bea161d4c4733") depends_on("mpi") -- cgit v1.2.3-70-g09d2 From 259b1834f1c693e7c7a3bfea97e29cd1071fcec0 Mon Sep 17 00:00:00 2001 From: Nick Forrington Date: Fri, 22 Jun 2018 18:19:03 -0400 Subject: silo: Make silo use AutotoolsPackage (#8551) To benefit from updates to config.guess for newer architectures. More info: https://github.com/spack/spack/issues/2063 --- var/spack/repos/builtin/packages/silo/package.py | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/silo/package.py b/var/spack/repos/builtin/packages/silo/package.py index e9261822f0..d236a661f2 100644 --- a/var/spack/repos/builtin/packages/silo/package.py +++ b/var/spack/repos/builtin/packages/silo/package.py @@ -25,7 +25,7 @@ from spack import * -class Silo(Package): +class Silo(AutotoolsPackage): """Silo is a library for reading and writing a wide variety of scientific data to binary, disk files.""" @@ -58,8 +58,14 @@ class Silo(Package): flags.append('-ldl') return (flags, None, None) - def install(self, spec, prefix): + def configure_args(self): + spec = self.spec config_args = [ + '--with-hdf5=%s,%s' % (spec['hdf5'].prefix.include, + spec['hdf5'].prefix.lib), + '--with-zlib=%s,%s' % (spec['zlib'].prefix.include, + spec['zlib'].prefix.lib), + '--enable-install-lite-headers', '--enable-fortran' if '+fortran' in spec else '--disable-fortran', '--enable-silex' if '+silex' in spec else '--disable-silex', '--enable-shared' if '+shared' in spec else '--disable-shared', @@ -79,14 +85,4 @@ class Silo(Package): config_args.append('CXX=%s' % spec['mpi'].mpicxx) config_args.append('FC=%s' % spec['mpi'].mpifc) - configure( - '--prefix=%s' % prefix, - '--with-hdf5=%s,%s' % (spec['hdf5'].prefix.include, - spec['hdf5'].prefix.lib), - '--with-zlib=%s,%s' % (spec['zlib'].prefix.include, - spec['zlib'].prefix.lib), - '--enable-install-lite-headers', - *config_args) - - make() - make('install') + return config_args -- cgit v1.2.3-70-g09d2 From 8b0d29bec4dfed2030dd6c808876663d238b3cb3 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Fri, 22 Jun 2018 17:48:32 -0500 Subject: New package ncbi-magicblast (#8517) * ncbi-magicblast: new package * updated package.py * updated ncbi-magicblast --- .../builtin/packages/ncbi-magicblast/package.py | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 var/spack/repos/builtin/packages/ncbi-magicblast/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ncbi-magicblast/package.py b/var/spack/repos/builtin/packages/ncbi-magicblast/package.py new file mode 100644 index 0000000000..328d53fb44 --- /dev/null +++ b/var/spack/repos/builtin/packages/ncbi-magicblast/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class NcbiMagicblast(AutotoolsPackage): + """Magic-BLAST is a tool for mapping large next-generation RNA or DNA + sequencing runs against a whole genome or transcriptome. """ + + homepage = "https://ncbi.github.io/magicblast/" + url = "ftp://ftp.ncbi.nlm.nih.gov/blast/executables/magicblast/1.3.0/ncbi-magicblast-1.3.0-src.tar.gz" + + version('1.3.0', '2615b919c1fe1bf7dc3d816392ab4420') + + depends_on('lmdb') + configure_directory = 'c++' + + def configure_args(self): + return ['--without-internal'] -- cgit v1.2.3-70-g09d2 From e18359bd824a67f573be0a51139d22538b2dd35d Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Fri, 22 Jun 2018 17:02:27 -0600 Subject: Updating py-pillow with change in checksum for version 5.1.0. (#8547) --- var/spack/repos/builtin/packages/py-pillow/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pillow/package.py b/var/spack/repos/builtin/packages/py-pillow/package.py index 0cb85ac4d0..71c8989918 100644 --- a/var/spack/repos/builtin/packages/py-pillow/package.py +++ b/var/spack/repos/builtin/packages/py-pillow/package.py @@ -35,7 +35,7 @@ class PyPillow(PythonPackage): homepage = "https://python-pillow.org/" url = "https://pypi.io/packages/source/P/Pillow/Pillow-5.1.0.tar.gz" - version('5.1.0', '04d2b1d1ce8b9f6831e33fb85b34316d') + version('5.1.0', '308f9c13b376abce96ab6ebd6c889cc4') version('3.2.0', '7cfd093c11205d9e2ebe3c51dfcad510') version('3.0.0', 'fc8ac44e93da09678eac7e30c9b7377d') -- cgit v1.2.3-70-g09d2 From bef60f6d7e990a66a45611e6c15a9163070323bd Mon Sep 17 00:00:00 2001 From: Tom Merrick Date: Fri, 22 Jun 2018 18:03:05 -0500 Subject: Package/grass (#8505) * Add the grass74 GIS system. * Correct flake8 errors * Made requested changes * added correct types to python --- var/spack/repos/builtin/packages/grass/package.py | 202 ++++++++++++++++++++++ 1 file changed, 202 insertions(+) create mode 100644 var/spack/repos/builtin/packages/grass/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/grass/package.py b/var/spack/repos/builtin/packages/grass/package.py new file mode 100644 index 0000000000..7b5f78749b --- /dev/null +++ b/var/spack/repos/builtin/packages/grass/package.py @@ -0,0 +1,202 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Grass(AutotoolsPackage): + """GRASS GIS (Geographic Resources Analysis Support System), is a free + and open source Geographic Information System (GIS) software suite + used for geospatial data management and analysis, image processing, + graphics and maps production, spatial modeling, and visualization.""" + + homepage = "http://grass.osgeo.org" + url = "https://grass.osgeo.org/grass74/source/grass-7.4.1.tar.gz" + + version('7.4.1', 'bf7add62cbeb05a3ed5ad832344ba524') + + variant('cxx', default=True, description='Add c++ functionality') + variant('tiff', default=True, description='Add TIFF functionality') + variant('png', default=True, description='Add PNG functionality') + variant('postgres', default=False, description='Add PostgreSQL functionality') + variant('mysql', default=False, description='Add MySQL functionality') + variant('sqlite', default=True, description='Add SQLite functionality') + variant('opengl', default=True, description='Add OpenGL functionality') + variant('fftw', default=True, description='Add FFTW functionality') + variant('blas', default=False, description='Add BLAS functionality') + variant('lapack', default=False, description='Add LAPACK functionality') + variant('cairo', default=True, description='Add Cairo functionality') + variant('freetype', default=True, description='Add FreeType functionality') + variant('readline', default=False, description='Add Readline functionality') + variant('regex', default=True, description='Add regex functionality') + variant('pthread', default=False, description='Add POSIX threads functionality') + variant('openmp', default=False, description='Add OpenMP functionality') + variant('opencl', default=False, description='Add OpenCL functionality') + variant('bzlib', default=False, description='Add BZIP2 functionality') + variant('netcdf', default=False, description='Enable NetCDF support') + variant('geos', default=False, description='Geometry Engine for v.buffer') + + # required components + depends_on('gmake@3.8.1:', type='build') + depends_on('zlib') + depends_on('flex', type='build') + depends_on('bison', type='build') + depends_on('proj') + depends_on('gdal') + depends_on('python@2.7:2.9', type=('build', 'run')) + depends_on('libx11') + + # optional pieces + depends_on('libtiff', when='+tiff') + depends_on('libpng', when='+png') + depends_on('postgresql', when='+postgres') + depends_on('mariadb', when='+mysql') + depends_on('sqlite', when='+sqlite') + depends_on('gl', when='+opengl') + depends_on('fftw', when='+fftw') + depends_on('blas', when='+blas') + depends_on('lapack', when='+lapack') + depends_on('cairo', when='+cairo') + depends_on('freetype', when='+freetype') + depends_on('readline', when='+readline') + depends_on('opencl', when='+opencl') + depends_on('bzip2', when='+bzlib') + depends_on('netcdf', when='+netcdf') + depends_on('geos', when='+geos') + + def configure_args(self): + spec = self.spec + + args = [ + '--without-odbc', + '--without-nls', + '--without-opendwg', + '--with-x', + '--with-gdal={0}/bin/gdal-config'.format( + spec['gdal'].prefix), + ] + + if '+cxx' in spec: + args.append('--with-cxx') + else: + args.append('--without-cxx') + + if '+tiff' in spec: + args.append('--with-tiff') + else: + args.append('--without-tiff') + + if '+png' in spec: + args.append('--with-png') + else: + args.append('--without-png') + + if '+postgres' in spec: + args.append('--with-postgres') + else: + args.append('--without-postgres') + + if '+mysql' in spec: + args.append('--with-mysql') + else: + args.append('--without-mysql') + + if '+sqlite' in spec: + args.append('--with-sqlite') + else: + args.append('--without-sqlite') + + if '+opengl' in spec: + args.append('--with-opengl') + else: + args.append('--without-opengl') + + if '+fftw' in spec: + args.append('--with-fftw') + else: + args.append('--without-fftw') + + if '+blas' in spec: + args.append('--with-blas') + else: + args.append('--without-blas') + + if '+lapack' in spec: + args.append('--with-lapack') + else: + args.append('--without-lapack') + + if '+cairo' in spec: + args.append('--with-cairo') + else: + args.append('--without-cairo') + + if '+freetype' in spec: + args.append('--with-freetype') + else: + args.append('--without-freetype') + + if '+readline' in spec: + args.append('--with-readline') + else: + args.append('--without-readline') + + if '+regex' in spec: + args.append('--with-regex') + else: + args.append('--without-regex') + + if '+pthread' in spec: + args.append('--with-pthread') + else: + args.append('--without-pthread') + + if '+openmp' in spec: + args.append('--with-openmp') + else: + args.append('--without-openmp') + + if '+opencl' in spec: + args.append('--with-opencl') + else: + args.append('--without-opencl') + + if '+bzlib' in spec: + args.append('--with-bzlib') + else: + args.append('--without-bzlib') + + if '+netcdf' in spec: + args.append('--with-netcdf={0}/bin/nc-config'.format( + spec['netcdf'].prefix)) + else: + args.append('--without-netcdf') + + if '+geos' in spec: + args.append('--with-geos={0}/bin/geos-config'.format( + spec['geos'].prefix)) + else: + args.append('--without-geos') + + return args -- cgit v1.2.3-70-g09d2 From e1661ff662944965efa54713c5db592290b32eba Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Sat, 23 Jun 2018 17:55:33 +0530 Subject: omega-h: fix -std=c++11 build error (#8543) cd /tmp/balay/spack-stage/spack-stage-joxtpr/omega_h-9.13.4/spack-build/src && /home/balay/spack/opt/spack/linux-ubuntu16.04-x86_64/gcc-5.4.0/openmpi-3.1.0-7ws4tgx4z3o ru5g5skjrxs5sobpeiyef/bin/mpic++ -Domega_h_EXPORTS -I/home/balay/spack/var/spack/stage/omega-h-9.13.4-th4b67fz5es6cbgcar742jxamjt3tqjb/omega_h-9.13.4/src -I/tmp/bala y/spack-stage/spack-stage-joxtpr/omega_h-9.13.4/spack-build/src -I/home/balay/spack/var/spack/stage/omega-h-9.13.4-th4b67fz5es6cbgcar742jxamjt3tqjb/omega_h-9.13.4/tpl -I/home/balay/spack/opt/spack/linux-ubuntu16.04-x86_64/gcc-5.4.0/zlib-1.2.11-5nus6knzumx4ik2yl44jxtgtsl7d54xb/include -O2 -g -DNDEBUG -fPIC -o CMakeFiles/omega_h.di r/Omega_h_map.cpp.o -c /home/balay/spack/var/spack/stage/omega-h-9.13.4-th4b67fz5es6cbgcar742jxamjt3tqjb/omega_h-9.13.4/src/Omega_h_map.cpp In file included from /usr/include/c++/5/chrono:35:0, from /home/balay/spack/var/spack/stage/omega-h-9.13.4-th4b67fz5es6cbgcar742jxamjt3tqjb/omega_h-9.13.4/src/Omega_h_timer.hpp:4, from /home/balay/spack/var/spack/stage/omega-h-9.13.4-th4b67fz5es6cbgcar742jxamjt3tqjb/omega_h-9.13.4/src/Omega_h_timer.cpp:1: /usr/include/c++/5/bits/c++0x_warning.h:32:2: error: #error This file requires compiler and library support for the ISO C++ 2011 standard. This support must be enabled with the -std=c++11 or -std=gnu++11 compiler options. #error This file requires compiler and library support \ ^ --- var/spack/repos/builtin/packages/omega-h/package.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/omega-h/package.py b/var/spack/repos/builtin/packages/omega-h/package.py index 89d9223750..5eb7f47546 100644 --- a/var/spack/repos/builtin/packages/omega-h/package.py +++ b/var/spack/repos/builtin/packages/omega-h/package.py @@ -65,3 +65,9 @@ class OmegaH(CMakePackage): else: args.append('-DTPL_ENABLE_ZLIB:BOOL=OFF') return args + + def flag_handler(self, name, flags): + flags = list(flags) + if name == 'cxxflags': + flags.append(self.compiler.cxx11_flag) + return (None, None, flags) -- cgit v1.2.3-70-g09d2 From a72f240f9509d287988ae494c308e9fa9f5ef439 Mon Sep 17 00:00:00 2001 From: Geoff Womeldorff Date: Sat, 23 Jun 2018 11:12:12 -0600 Subject: kokkos: add support for version 2.7.00 of kokkos (#8521) --- var/spack/repos/builtin/packages/kokkos/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/kokkos/package.py b/var/spack/repos/builtin/packages/kokkos/package.py index 51d90ffc06..ef1651ff4f 100644 --- a/var/spack/repos/builtin/packages/kokkos/package.py +++ b/var/spack/repos/builtin/packages/kokkos/package.py @@ -32,6 +32,7 @@ class Kokkos(Package): homepage = "https://github.com/kokkos/kokkos" url = "https://github.com/kokkos/kokkos/archive/2.03.00.tar.gz" + version('2.7.00', 'b357f9374c1008754babb4495f95e392') version('2.5.00', '2db83c56587cb83b772d0c81a3228a21') version('2.04.11', 'd4849cee6eb9001d61c30f1d9fe74336') version('2.04.04', '2c6d1c2569b91c9fcd4117296438e65c') @@ -81,7 +82,7 @@ class Kokkos(Package): # https://github.com/kokkos/kokkos/issues/1296 conflicts('+cuda', when='@2.5.00:develop', msg='Kokkos build system has issue when CUDA enabled' - ' in version 2.5.00, and develop until ' + ' in version 2.5.00, 2.7.00, and develop until ' 'issue #1296 is resolved.') # Specify that v1.x is required as v2.x has API changes -- cgit v1.2.3-70-g09d2 From 486400548358d3539d0b47f67f639e8be6283c6d Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Sat, 23 Jun 2018 17:40:42 -0700 Subject: Fix gcc@5.5.0 on OS X 10.13.5 (#8540) * Fix gcc@5.5.0 on OS X 10.13.5 gcc@5.5.0 failed to build on my OS X 10.13.5 box. I found/modified a patch in the MacPorts world that traced back to Homebrewy, https://trac.macports.org/ticket/56502#no1 The issue has also been reported to gcc, https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83531 I eventually discovered a nearly identical version of the patch at Homebrew. https://github.com/Homebrew/formula-patches/blob/master/gcc%405/10.13_headers.patch gcc builds with this and I can compile many things, but e.g. curl and cmake both fail. As @davydden and others observed in #1847, it seems to be an apple thing. * Fix mistaken change to patch when clause (added :) I mistakenly deleted a colon from the 'darwin/gcc-7.1.0-headerpad.patch'. --- .../packages/gcc/darwin/headers-10.13-fix.patch | 127 +++++++++++++++++++++ var/spack/repos/builtin/packages/gcc/package.py | 6 +- 2 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 var/spack/repos/builtin/packages/gcc/darwin/headers-10.13-fix.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gcc/darwin/headers-10.13-fix.patch b/var/spack/repos/builtin/packages/gcc/darwin/headers-10.13-fix.patch new file mode 100644 index 0000000000..3dbfde0255 --- /dev/null +++ b/var/spack/repos/builtin/packages/gcc/darwin/headers-10.13-fix.patch @@ -0,0 +1,127 @@ +diff -pur fixincludes/fixincl.x gcc-5.5.0/fixincludes/fixincl.x +--- a/fixincludes/fixincl.x 2017-01-30 17:08:42.000000000 +0100 ++++ b/fixincludes/fixincl.x 2017-12-21 14:34:35.000000000 +0100 +@@ -1,12 +1,12 @@ + /* -*- buffer-read-only: t -*- vi: set ro: +- * ++ * + * DO NOT EDIT THIS FILE (fixincl.x) +- * +- * It has been AutoGen-ed January 5, 2017 at 06:05:06 PM by AutoGen 5.16.2 ++ * ++ * It has been AutoGen-ed December 21, 2017 at 02:34:35 PM by AutoGen 5.18.7 + * From the definitions inclhack.def + * and the template file fixincl + */ +-/* DO NOT SVN-MERGE THIS FILE, EITHER Thu Jan 5 18:05:06 CET 2017 ++/* DO NOT SVN-MERGE THIS FILE, EITHER Thu Dec 21 14:34:35 CET 2017 + * + * You must regenerate it. Use the ./genfixes script. + * +@@ -15,7 +15,7 @@ + * certain ANSI-incompatible system header files which are fixed to work + * correctly with ANSI C and placed in a directory that GNU C will search. + * +- * This file contains 240 fixup descriptions. ++ * This file contains 241 fixup descriptions. + * + * See README for more information. + * +@@ -2579,6 +2579,43 @@ extern \"C\" {\n\ + + /* * * * * * * * * * * * * * * * * * * * * * * * * * + * ++ * Description of Darwin_Osavailability fix ++ */ ++tSCC zDarwin_OsavailabilityName[] = ++ "darwin_osavailability"; ++ ++/* ++ * File name selection pattern ++ */ ++tSCC zDarwin_OsavailabilityList[] = ++ "os/availability.h\0"; ++/* ++ * Machine/OS name selection pattern ++ */ ++tSCC* apzDarwin_OsavailabilityMachs[] = { ++ "*-*-darwin*", ++ (const char*)NULL }; ++ ++/* ++ * content selection pattern - do fix if pattern found ++ */ ++tSCC zDarwin_OsavailabilitySelect0[] = ++ "#define[ \t]+__(API_[A-Z_]*)\\(\\.\\.\\.\\)"; ++ ++#define DARWIN_OSAVAILABILITY_TEST_CT 1 ++static tTestDesc aDarwin_OsavailabilityTests[] = { ++ { TT_EGREP, zDarwin_OsavailabilitySelect0, (regex_t*)NULL }, }; ++ ++/* ++ * Fix Command Arguments for Darwin_Osavailability ++ */ ++static const char* apzDarwin_OsavailabilityPatch[] = { ++ "format", ++ "#define %1(...)", ++ (char*)NULL }; ++ ++/* * * * * * * * * * * * * * * * * * * * * * * * * * ++ * + * Description of Darwin_9_Long_Double_Funcs_2 fix + */ + tSCC zDarwin_9_Long_Double_Funcs_2Name[] = +@@ -9818,9 +9855,9 @@ static const char* apzX11_SprintfPatch[] + * + * List of all fixes + */ +-#define REGEX_COUNT 276 ++#define REGEX_COUNT 277 + #define MACH_LIST_SIZE_LIMIT 187 +-#define FIX_COUNT 240 ++#define FIX_COUNT 241 + + /* + * Enumerate the fixes +@@ -9885,6 +9922,7 @@ typedef enum { + CTRL_QUOTES_DEF_FIXIDX, + CTRL_QUOTES_USE_FIXIDX, + CXX_UNREADY_FIXIDX, ++ DARWIN_OSAVAILABILITY_FIXIDX, + DARWIN_9_LONG_DOUBLE_FUNCS_2_FIXIDX, + DARWIN_EXTERNC_FIXIDX, + DARWIN_GCC4_BREAKAGE_FIXIDX, +@@ -10364,6 +10402,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { + CXX_UNREADY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aCxx_UnreadyTests, apzCxx_UnreadyPatch, 0 }, + ++ { zDarwin_OsavailabilityName, zDarwin_OsavailabilityList, ++ apzDarwin_OsavailabilityMachs, ++ DARWIN_OSAVAILABILITY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, ++ aDarwin_OsavailabilityTests, apzDarwin_OsavailabilityPatch, 0 }, ++ + { zDarwin_9_Long_Double_Funcs_2Name, zDarwin_9_Long_Double_Funcs_2List, + apzDarwin_9_Long_Double_Funcs_2Machs, + DARWIN_9_LONG_DOUBLE_FUNCS_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, +diff -pur fixincludes/inclhack.def gcc-5.5.0/fixincludes/inclhack.def +--- a/fixincludes/inclhack.def 2017-01-30 17:08:42.000000000 +0100 ++++ b/fixincludes/inclhack.def 2017-12-21 14:34:28.000000000 +0100 +@@ -1337,6 +1337,18 @@ fix = { + test_text = "extern void* malloc( size_t );"; + }; + ++fix = { ++ hackname = darwin_osavailability; ++ mach = "*-*-darwin*"; ++ files = os/availability.h; ++ select = "#define[ \t]+__(API_[A-Z_]*)\\(\\.\\.\\.\\)"; ++ c_fix = format; ++ c_fix_arg = "#define %1(...)"; ++ ++ test_text = "#define __API_AVAILABLE(...)\n" ++ "#define API_AVAILABLE(...)\n"; ++}; ++ + /* + * For the AAB_darwin7_9_long_double_funcs fix to be useful, + * you have to not use "" includes. diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py index acc7eb36fb..d4180d1c50 100644 --- a/var/spack/repos/builtin/packages/gcc/package.py +++ b/var/spack/repos/builtin/packages/gcc/package.py @@ -158,7 +158,11 @@ class Gcc(AutotoolsPackage): # Fix parallel build on APFS filesystem # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81797 if macOS_version() >= Version('10.13'): - patch('darwin/apfs.patch', when='@6.1:6.4,7.1:7.3') + patch('darwin/apfs.patch', when='@5.5.0,6.1:6.4,7.1:7.3') + # from homebrew via macports + # https://trac.macports.org/ticket/56502#no1 + # see also: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83531 + patch('darwin/headers-10.13-fix.patch', when='@5.5.0') patch('darwin/gcc-7.1.0-headerpad.patch', when='@5:') patch('darwin/gcc-6.1.0-jit.patch', when='@5:7') patch('darwin/gcc-4.9.patch1', when='@4.9.0:4.9.3') -- cgit v1.2.3-70-g09d2 From 1e92721ab53eb2476f672c1515b68b3fc6229415 Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Sat, 23 Jun 2018 18:34:04 -0700 Subject: Fix m4 on OS X highsierra (#8559) m4 exited immediately (causing the nettle build to fail). ``` (alice)[11:09:46]spack>>/Users/hartzell/tmp/spack-mac/spack/opt/spack/darwin-highsierra-x86_64/clang-9.1.0-apple/m4-1.4.18-caxsf7l5yd7qbq2bown6bzi5el3ltfwf/bin/m4 Abort trap: 6 (alice)[11:10:18]spack>>fg ``` Tracked down a fix via the Homebrew recipe. I'll send a note to the `bug-m4@gnu.org` list to ensure that upstream knows about it. --- var/spack/repos/builtin/packages/m4/package.py | 3 +++ var/spack/repos/builtin/packages/m4/secure_snprintf.patch | 15 +++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 var/spack/repos/builtin/packages/m4/secure_snprintf.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/m4/package.py b/var/spack/repos/builtin/packages/m4/package.py index 219cde979e..35adc3c0af 100644 --- a/var/spack/repos/builtin/packages/m4/package.py +++ b/var/spack/repos/builtin/packages/m4/package.py @@ -36,6 +36,9 @@ class M4(AutotoolsPackage): patch('gnulib-pgi.patch', when='@1.4.18') patch('pgi.patch', when='@1.4.17') + # from: https://github.com/Homebrew/homebrew-core/blob/master/Formula/m4.rb + # Patch credit to Jeremy Huddleston Sequoia + patch('secure_snprintf.patch', when='platform_os = highsierra') variant('sigsegv', default=True, description="Build the libsigsegv dependency") diff --git a/var/spack/repos/builtin/packages/m4/secure_snprintf.patch b/var/spack/repos/builtin/packages/m4/secure_snprintf.patch new file mode 100644 index 0000000000..da3ae5ba0d --- /dev/null +++ b/var/spack/repos/builtin/packages/m4/secure_snprintf.patch @@ -0,0 +1,15 @@ +With format string strictness, High Sierra also enforces that %n isn't used +in dynamic format strings, but we should just disable its use on darwin in +general. + +--- a/lib/vasnprintf.c.orig 2017-06-22 15:19:15.000000000 -0700 ++++ b/lib/vasnprintf.c 2017-06-22 15:20:20.000000000 -0700 +@@ -4869,7 +4869,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * + #endif + *fbp = dp->conversion; + #if USE_SNPRINTF +-# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) ++# if !defined(__APPLE__) && !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) + fbp[1] = '%'; + fbp[2] = 'n'; + fbp[3] = '\0'; -- cgit v1.2.3-70-g09d2 From f6140375e9433cd4a5bf53d8efec6ac5eee658f3 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Sun, 24 Jun 2018 18:38:44 +0530 Subject: xsdk: update xsdk@develop to use plasma@develop (#8555) plasma@develop has another flag 'DHAVE_MKL' that needs to be disabled [for non-mkl build] add dependency on gcc-6.0 add in new dependency on readline plasma: requires both LIBS in make.inc and command line? If cmd line is missing -some internal values from plasma makefile gets used - causing link errors [on Mac] tools/lua-5.3.4/src/Makefile: $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -lreadline" if make.inc is missing - I get: /usr/bin/ld: cannot find -lmkl_intel_lp64 /usr/bin/ld: cannot find -lmkl_sequential /usr/bin/ld: cannot find -lmkl_core collect2: error: ld returned 1 exit status Also add a new dependency -ldl --- var/spack/repos/builtin/packages/plasma/package.py | 20 ++++++++++++++------ var/spack/repos/builtin/packages/xsdk/package.py | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/plasma/package.py b/var/spack/repos/builtin/packages/plasma/package.py index 4565350303..29afcef8ac 100644 --- a/var/spack/repos/builtin/packages/plasma/package.py +++ b/var/spack/repos/builtin/packages/plasma/package.py @@ -31,6 +31,7 @@ class Plasma(MakefilePackage): depends_on("blas") depends_on("lapack") + depends_on("readline", when='@17.2:') conflicts("atlas") # does not have LAPACKE interface @@ -44,7 +45,9 @@ class Plasma(MakefilePackage): conflicts("veclibfort") # only GCC 4.9+ and higher have sufficient support for OpenMP 4+ tasks+deps - conflicts("%gcc@:4.8.99") + conflicts("%gcc@:4.8.99", when='@:17.1') + # only GCC 6.0+ and higher have for OpenMP 4+ Clause "priority" + conflicts("%gcc@:5.99", when='@17.2:') conflicts("%cce") conflicts("%clang") @@ -77,6 +80,7 @@ class Plasma(MakefilePackage): if "^mkl" not in spec: make_inc.filter("-DPLASMA_WITH_MKL", "") # not using MKL + make_inc.filter("-DHAVE_MKL", "") # not using MKL header_flags = "" # accumulate CPP flags for headers: and @@ -94,8 +98,11 @@ class Plasma(MakefilePackage): # make sure CC variable comes from build environment make_inc.filter("CC *[?]*= * .*cc", "") - make_inc.filter("LIBS *[?]*= * .*", "LIBS = " + - self.getblaslapacklibs().ld_flags) + libs = self.getblaslapacklibs().ld_flags + if 'readline' in self.spec: + libs += ' ' + self.spec['readline'].libs.ld_flags + libs += ' ' + find_system_libraries(['libdl']).ld_flags + make_inc.filter("LIBS *[?]*= * .*", "LIBS = " + libs) @property def build_targets(self): @@ -107,7 +114,8 @@ class Plasma(MakefilePackage): if "^mkl" in self.spec: targets.append("MKLROOT = {0}".format(env["MKLROOT"])) - targets.append("LIBS = {0}".format( - self.getblaslapacklibs().ld_flags)) - + targets.append("LIBS = {0} {1} {2}".format( + self.getblaslapacklibs().ld_flags, + self.spec['readline'].libs.ld_flags, + find_system_libraries(['libdl']).ld_flags)) return targets diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py index cb8178ce74..7414c12c49 100644 --- a/var/spack/repos/builtin/packages/xsdk/package.py +++ b/var/spack/repos/builtin/packages/xsdk/package.py @@ -82,7 +82,7 @@ class Xsdk(Package): depends_on('sundials@3.1.0~int64+hypre', when='@0.3.0') depends_on('sundials@3.1.0~int64+hypre', when='@develop') - depends_on('plasma@17.1', when='@develop %gcc@4.9:') + depends_on('plasma@17.2:', when='@develop %gcc@6.0:') depends_on('magma@2.2.0', when='@0.3.0 +cuda') depends_on('magma@2.2.0', when='@develop +cuda') -- cgit v1.2.3-70-g09d2 From df45b6f56db3dde44b80ee433bfdb1de7e921b31 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Sun, 24 Jun 2018 21:22:14 +0530 Subject: Balay/petsc remove boost dependency (#8508) * petsc: remove dependency on boost - its required only as a dependency on trilinos Also set COPTFLAGS='' etc - this way CFLAGS is the primary way optimization flags are set by spack * petsc: update pkgs with petsc~boost dependency * fix flake8 * boost is optional for trilinos - so adjust petsc dependency on boost [via trilinos] accordingly * do not add boost dependency on petsc [due to trilinos requirement]. Trilinos adds this dependency anyway. --- var/spack/repos/builtin/packages/ceed/package.py | 4 ++-- var/spack/repos/builtin/packages/mfem/test_builds.sh | 8 ++++---- var/spack/repos/builtin/packages/petsc/package.py | 11 +++++++---- var/spack/repos/builtin/packages/xsdk/package.py | 6 +++--- 4 files changed, 16 insertions(+), 13 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ceed/package.py b/var/spack/repos/builtin/packages/ceed/package.py index f6569a324c..a5e2c73da3 100644 --- a/var/spack/repos/builtin/packages/ceed/package.py +++ b/var/spack/repos/builtin/packages/ceed/package.py @@ -73,10 +73,10 @@ class Ceed(Package): depends_on('nekcem@0b8bedd', when='@1.0.0+nek') # PETSc, HPGMG - # For a +quickbuild we disable boost, hdf5, and superlu-dist in PETSc. + # For a +quickbuild we disable hdf5, and superlu-dist in PETSc. # Ideally, these can be turned into recommendations to Spack for # concretizing the PETSc spec, if Spack ever supports recommendations. - depends_on('petsc@3.8.3~boost~hdf5~superlu-dist', + depends_on('petsc@3.8.3~hdf5~superlu-dist', when='@1.0.0+petsc+quickbuild') depends_on('petsc@3.8.3+mpi+double~int64', when='@1.0.0+petsc~mfem') # The mfem petsc examples need the petsc variants +hypre, +suite-sparse, diff --git a/var/spack/repos/builtin/packages/mfem/test_builds.sh b/var/spack/repos/builtin/packages/mfem/test_builds.sh index b7d3d881b3..125fa0055c 100755 --- a/var/spack/repos/builtin/packages/mfem/test_builds.sh +++ b/var/spack/repos/builtin/packages/mfem/test_builds.sh @@ -6,7 +6,7 @@ builds=( 'mfem~mpi~metis~gzstream' 'mfem+mpi+superlu-dist+suite-sparse+petsc \ +sundials+pumi+mpfr+netcdf+gzstream+gnutls+libunwind \ - ^hypre~internal-superlu ^petsc~boost+suite-sparse+mumps' + ^hypre~internal-superlu ^petsc+suite-sparse+mumps' 'mfem~mpi+suite-sparse+sundials+mpfr+netcdf \ +gzstream+gnutls+libunwind' # develop version: @@ -18,7 +18,7 @@ builds=( 'mfem@develop+shared~static+mpi \ +superlu-dist+suite-sparse+petsc+sundials+mpfr+netcdf+gzstream \ +gnutls+libunwind+conduit ^hypre~internal-superlu \ - ^petsc~boost+suite-sparse+mumps ^conduit~python~hdf5' + ^petsc+suite-sparse+mumps ^conduit~python~hdf5' # TODO: The options '^netcdf~mpi ^hdf5@1.8.19~mpi' are added just to make # conduit happy. 'mfem@develop+shared~static~mpi \ @@ -38,7 +38,7 @@ builds2=( 'mfem+netcdf' 'mfem+mpfr' 'mfem+gnutls' - 'mfem+petsc+mpi ^hypre~internal-superlu ^petsc~boost+suite-sparse+mumps' + 'mfem+petsc+mpi ^hypre~internal-superlu ^petsc+suite-sparse+mumps' # develop version 'mfem@develop+superlu-dist' 'mfem@develop+suite-sparse~mpi' @@ -53,7 +53,7 @@ builds2=( 'mfem@develop+conduit~mpi ^conduit~python' 'mfem@develop+conduit ^conduit~python' 'mfem@develop+petsc+mpi ^hypre~internal-superlu \ - ^petsc~boost+suite-sparse+mumps' + ^petsc+suite-sparse+mumps' ) trap 'printf "\nScript interrupted.\n"; exit 33' INT diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index 80dbdbfc84..552baa4ad6 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -74,7 +74,6 @@ class Petsc(Package): description='Activates support for metis and parmetis') variant('hdf5', default=True, description='Activates support for HDF5 (only parallel)') - variant('boost', default=True, description='Activates support for Boost') variant('hypre', default=True, description='Activates support for Hypre (only parallel)') # Mumps is disabled by default, because it depends on Scalapack @@ -121,7 +120,6 @@ class Petsc(Package): depends_on('python@2.6:2.8', type='build') # Other dependencies - depends_on('boost', when='@:3.5+boost') depends_on('metis@5:~int64+real64', when='@:3.7.99+metis~int64+double') depends_on('metis@5:~int64', when='@:3.7.99+metis~int64~double') depends_on('metis@5:+int64+real64', when='@:3.7.99+metis+int64+double') @@ -197,7 +195,10 @@ class Petsc(Package): '--with-x=0', '--download-c2html=0', '--download-sowing=0', - '--download-hwloc=0'] + '--download-hwloc=0', + 'COPTFLAGS=', + 'FOPTFLAGS=', + 'CXXOPTFLAGS='] options.extend(self.mpi_dependent_options()) options.extend([ '--with-precision=%s' % ( @@ -217,6 +218,8 @@ class Petsc(Package): if 'trilinos' in spec: options.append('--with-cxx-dialect=C++11') + if spec.satisfies('^trilinos+boost'): + options.append('--with-boost=1') if self.spec.satisfies('clanguage=C++'): options.append('--with-clanguage=C++') @@ -236,7 +239,7 @@ class Petsc(Package): ]) # Activates library support if needed - for library in ('metis', 'boost', 'hdf5', 'hypre', 'parmetis', + for library in ('metis', 'hdf5', 'hypre', 'parmetis', 'mumps', 'trilinos'): options.append( '--with-{library}={value}'.format( diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py index 7414c12c49..9b20a7e374 100644 --- a/var/spack/repos/builtin/packages/xsdk/package.py +++ b/var/spack/repos/builtin/packages/xsdk/package.py @@ -64,11 +64,11 @@ class Xsdk(Package): depends_on('trilinos@12.12.1+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse~tpetra+nox~ifpack2~zoltan2~amesos2~exodus', when='@develop') - depends_on('petsc@3.8.2+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps~boost+double~int64', + depends_on('petsc@3.8.2+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps+double~int64', when='@0.3.0') - depends_on('petsc@xsdk-0.2.0+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps~boost+double~int64', + depends_on('petsc@xsdk-0.2.0+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps+double~int64', when='@xsdk-0.2.0') - depends_on('petsc@develop+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps~boost+double~int64', + depends_on('petsc@develop+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps+double~int64', when='@develop') depends_on('pflotran@xsdk-0.3.0', when='@0.3.0') -- cgit v1.2.3-70-g09d2 From 6517dabbce06a7a62154e00ecea427116d9ef801 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Mon, 25 Jun 2018 03:32:39 +0530 Subject: sowing: update to version used by current petsc -i.e 1.1.25-p1 (#8561) --- var/spack/repos/builtin/packages/sowing/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sowing/package.py b/var/spack/repos/builtin/packages/sowing/package.py index 6420c389cc..3c310a30ee 100644 --- a/var/spack/repos/builtin/packages/sowing/package.py +++ b/var/spack/repos/builtin/packages/sowing/package.py @@ -34,6 +34,7 @@ class Sowing(AutotoolsPackage): homepage = "http://www.mcs.anl.gov/petsc/index.html" url = "http://ftp.mcs.anl.gov/pub/petsc/externalpackages/sowing-1.1.23-p1.tar.gz" + version('1.1.25-p1', 'fc5e5664b80e606ad71ba9b85f4c86b9') version('1.1.23-p1', '65aaf3ae2a4c0f30d532fec291702e16') def build(self, spec, prefix): -- cgit v1.2.3-70-g09d2 From d04e9fd2726a6617ab76bcdbdf52330a1849a630 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Sun, 24 Jun 2018 15:46:38 -0700 Subject: coreutils: add version 8.29 --- var/spack/repos/builtin/packages/coreutils/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/coreutils/package.py b/var/spack/repos/builtin/packages/coreutils/package.py index 39d540ce8e..eca635a712 100644 --- a/var/spack/repos/builtin/packages/coreutils/package.py +++ b/var/spack/repos/builtin/packages/coreutils/package.py @@ -34,6 +34,7 @@ class Coreutils(AutotoolsPackage): homepage = "http://www.gnu.org/software/coreutils/" url = "http://ftp.gnu.org/gnu/coreutils/coreutils-8.26.tar.xz" + version('8.29', '960cfe75a42c9907c71439f8eb436303') version('8.26', 'd5aa2072f662d4118b9f4c63b94601a6') version('8.23', 'abed135279f87ad6762ce57ff6d89c41') -- cgit v1.2.3-70-g09d2 From 808a53c0df5e434f012a6bf9a3e9e28d051c74c9 Mon Sep 17 00:00:00 2001 From: 健美猞猁 Date: Tue, 26 Jun 2018 01:02:04 +0800 Subject: A new perl package: perl-io-compress. (#8566) * A new package: perl-compress-raw-zlib. * A new package: perl-compress-raw-bzip2. * A new perl package: perl-io-compress. * flake8. * Add zlib and bzip2 dependency. --- .../packages/perl-compress-raw-bzip2/package.py | 37 +++++++++++++++++++++ .../packages/perl-compress-raw-zlib/package.py | 37 +++++++++++++++++++++ .../builtin/packages/perl-io-compress/package.py | 38 ++++++++++++++++++++++ 3 files changed, 112 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-compress-raw-bzip2/package.py create mode 100644 var/spack/repos/builtin/packages/perl-compress-raw-zlib/package.py create mode 100644 var/spack/repos/builtin/packages/perl-io-compress/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-compress-raw-bzip2/package.py b/var/spack/repos/builtin/packages/perl-compress-raw-bzip2/package.py new file mode 100644 index 0000000000..1d836ce93f --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-compress-raw-bzip2/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlCompressRawBzip2(PerlPackage): + """A low-Level Interface to bzip2 compression library.""" + + homepage = "http://search.cpan.org/~pmqs/Compress-Raw-Bzip2-2.081/lib/Compress/Raw/Bzip2.pm" + url = "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.081.tar.gz" + + version('2.081', '25fa9c9cc4fd3250b65b91694f9eac2e') + + depends_on('bzip2') + depends_on('perl-extutils-makemaker', type='build') diff --git a/var/spack/repos/builtin/packages/perl-compress-raw-zlib/package.py b/var/spack/repos/builtin/packages/perl-compress-raw-zlib/package.py new file mode 100644 index 0000000000..35784f7c3d --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-compress-raw-zlib/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlCompressRawZlib(PerlPackage): + "A low-Level Interface to zlib compression library" + + homepage = "http://search.cpan.org/~pmqs/Compress-Raw-Zlib-2.081/lib/Compress/Raw/Zlib.pm" + url = "https://cpan.metacpan.org/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.081.tar.gz" + + version('2.081', 'a22d23bb4f8ce92a41ace1dff29f2bd1') + + depends_on('zlib') + depends_on('perl-extutils-makemaker', type='build') diff --git a/var/spack/repos/builtin/packages/perl-io-compress/package.py b/var/spack/repos/builtin/packages/perl-io-compress/package.py new file mode 100644 index 0000000000..5ae1dacd3a --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-io-compress/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlIoCompress(PerlPackage): + """A perl library for uncompressing gzip, zip, bzip2 + or lzop file/buffer.""" + + homepage = "http://search.cpan.org/~pmqs/IO-Compress-2.070/lib/IO/Uncompress/AnyUncompress.pm" + url = "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/IO-Compress-2.070.tar.gz" + + version('2.081', '379932c1b9428b873ed7ad3c1db15872') + + depends_on('perl-compress-raw-zlib', type='run') + depends_on('perl-compress-raw-bzip2', type='run') -- cgit v1.2.3-70-g09d2 From 9a0af8a5ce7d5add2739443673e6a48667b30e8e Mon Sep 17 00:00:00 2001 From: 健美猞猁 Date: Tue, 26 Jun 2018 01:04:00 +0800 Subject: HiC-pro depends on python+ucs4. (#8564) --- var/spack/repos/builtin/packages/hic-pro/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hic-pro/package.py b/var/spack/repos/builtin/packages/hic-pro/package.py index d79b19e16b..e96243912d 100644 --- a/var/spack/repos/builtin/packages/hic-pro/package.py +++ b/var/spack/repos/builtin/packages/hic-pro/package.py @@ -37,7 +37,7 @@ class HicPro(MakefilePackage): depends_on('bowtie2') depends_on('samtools') - depends_on('python@2.7:2.8') + depends_on('python+ucs4@2.7:2.8') depends_on('r') depends_on('py-numpy', type=('build', 'run')) depends_on('py-scipy', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 729bed3fd3e7bd3ecabda3ab25525019f3f83661 Mon Sep 17 00:00:00 2001 From: Sajid Ali <30510036+s-sajid-ali@users.noreply.github.com> Date: Tue, 26 Jun 2018 12:55:10 -0500 Subject: Add py-imageio for python3 (#8553) * new file: var/spack/repos/builtin/packages/py-imageio/package.py * modified: var/spack/repos/builtin/packages/py-imageio/package.py * Update package.py --- .../repos/builtin/packages/py-imageio/package.py | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-imageio/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-imageio/package.py b/var/spack/repos/builtin/packages/py-imageio/package.py new file mode 100644 index 0000000000..55122f1d34 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-imageio/package.py @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyImageio(PythonPackage): + """ Imageio is a Python library that provides an easy interface + to read and write a wide range of image data, including animated + images, video, volumetric data, and scientific formats. It is + cross-platform, runs on Python 2.7 and 3.4+, and is easy to install.""" + + homepage = "http://imageio.github.io/" + url = "https://pypi.io/packages/source/i/imageio/imageio-2.3.0.tar.gz" + + version('2.3.0', '4722c4e1c366748abcb18729881cffb8') + + # TODO: Add variants for plugins, and optional dependencies + + # Fix for python 2 if needed. + depends_on('py-numpy', type=('build', 'run')) + depends_on('py-pillow', type=('build', 'run')) + depends_on('python@2.7:2.8,3.4:', type=('build', 'run')) + depends_on('py-setuptools', type='build') + depends_on('ffmpeg', type='run') -- cgit v1.2.3-70-g09d2 From 1276ce0585187d56d3f4fe3da9ca0753d04441fa Mon Sep 17 00:00:00 2001 From: Andreas Baumbach Date: Wed, 27 Jun 2018 00:51:45 +0200 Subject: Add version 3.904 of verilator (#8577) * Add specific version to package verilator Change-Id: If7645410ec192f92a5eed83ee9b317b569576b4a * fix dependency types Change-Id: Ib36c72257c1fa6678c8553225ca21a010d7ae6d1 --- var/spack/repos/builtin/packages/verilator/package.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/verilator/package.py b/var/spack/repos/builtin/packages/verilator/package.py index 5810f5f412..4c4db03195 100644 --- a/var/spack/repos/builtin/packages/verilator/package.py +++ b/var/spack/repos/builtin/packages/verilator/package.py @@ -55,10 +55,11 @@ class Verilator(AutotoolsPackage): url = "https://www.veripool.org/ftp/verilator-3.920.tgz" version('3.920', '71de7b9ddb27a72e96ed2a04e5ccf933') + version('3.904', '7d4dc8e61d5e0e564c3016a06f0b9d07') - depends_on('bison') - depends_on('flex') - depends_on('perl') + depends_on('bison', type='build') + depends_on('flex', type='build') + depends_on('perl', type=('build', 'run')) def setup_environment(self, spack_env, run_env): run_env.prepend_path('VERILATOR_ROOT', self.prefix) -- cgit v1.2.3-70-g09d2 From 3560f6dbe9823c4b36783dfb8244d01672074760 Mon Sep 17 00:00:00 2001 From: scheibelp Date: Tue, 26 Jun 2018 16:14:05 -0700 Subject: views: packages can customize how they're added to views (#7152) Functional updates: - `python` now creates a copy of the `python` binaries when it is added to a view - Python extensions (packages which subclass `PythonPackage`) rewrite their shebang lines to refer to python in the view - Python packages in the same namespace will not generate conflicts if both have `...lib/site-packages/namespace-example/__init__.py` - These `__init__` files will also remain when removing any package in the namespace until the last package in the namespace is removed Generally (Updated 2/16): - Any package can define `add_files_to_view` to customize how it is added to a view (and at the moment custom definitions are included for `python` and `PythonPackage`) - Likewise any package can define `remove_files_from_view` to customize which files are removed (e.g. you don't always want to remove the namespace `__init__`) - Any package can define `view_file_conflicts` to customize what it considers a merge conflict - Global activations are handled like views (where the view root is the spec prefix of the extendee) - Benefit: filesystem-management aspects of activating extensions are now placed in views (e.g. now one can hardlink a global activation) - Benefit: overriding `Package.activate` is more straightforward (see `Python.activate`) - Complication: extension packages which have special-purpose logic *only* when activated outside of the extendee prefix must check for this in their `add_files_to_view` method (see `PythonPackage`) - `LinkTree` is refactored to have separate methods for copying a directory structure and for copying files (since it was found that generally packages may want to alter how files are copied but still wanted to copy directories in the same way) TODOs (updated 2/20): - [x] additional testing (there is some unit testing added at this point but more would be useful) - [x] refactor or reorganize `LinkTree` methods: currently there is a separate set of methods for replicating just the directory structure without the files, and a set for replicating everything - [x] Right now external views (i.e. those not used for global activations) call `view.add_extension`, but global activations do not to avoid some extra work that goes into maintaining external views. I'm not sure if addressing that needs to be done here but I'd like to clarify it in the comments (UPDATE: for now I have added a TODO and in my opinion this can be merged now and the refactor handled later) - [x] Several method descriptions (e.g. for `Package.activate`) are out of date and reference a distinction between global activations and views, they need to be updated - [x] Update aspell package activations --- lib/spack/docs/basic_usage.rst | 39 ++-- lib/spack/docs/packaging_guide.rst | 34 +++- lib/spack/docs/workflows.rst | 50 ++--- lib/spack/llnl/util/filesystem.py | 23 +++ lib/spack/llnl/util/link_tree.py | 143 +++++++++----- lib/spack/spack/binary_distribution.py | 4 +- lib/spack/spack/build_systems/aspell_dict.py | 12 ++ lib/spack/spack/build_systems/python.py | 70 ++++++- lib/spack/spack/cmd/activate.py | 19 +- lib/spack/spack/cmd/deactivate.py | 33 ++-- lib/spack/spack/cmd/extensions.py | 14 +- lib/spack/spack/database.py | 4 +- lib/spack/spack/directory_layout.py | 48 ++--- lib/spack/spack/filesystem_view.py | 103 ++++++---- lib/spack/spack/hooks/extensions.py | 7 +- lib/spack/spack/package.py | 164 ++++++++-------- lib/spack/spack/relocate.py | 11 -- lib/spack/spack/store.py | 3 - lib/spack/spack/test/cmd/activate.py | 61 ++++++ lib/spack/spack/test/test_activations.py | 211 ++++++++++++++++++--- lib/spack/spack/test/views.py | 48 +++++ var/spack/repos/builtin/packages/aspell/package.py | 47 ----- var/spack/repos/builtin/packages/perl/package.py | 17 +- .../package.py | 2 + .../py-backports-ssl-match-hostname/package.py | 2 + var/spack/repos/builtin/packages/python/package.py | 50 +++-- 26 files changed, 838 insertions(+), 381 deletions(-) create mode 100644 lib/spack/spack/test/cmd/activate.py create mode 100644 lib/spack/spack/test/views.py (limited to 'var') diff --git a/lib/spack/docs/basic_usage.rst b/lib/spack/docs/basic_usage.rst index 1a7576c74e..ae180c0659 100644 --- a/lib/spack/docs/basic_usage.rst +++ b/lib/spack/docs/basic_usage.rst @@ -950,11 +950,11 @@ directly when you run ``python``: ImportError: No module named numpy >>> -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Extensions & Environment Modules -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^ +Using Extensions +^^^^^^^^^^^^^^^^ -There are two ways to get ``numpy`` working in Python. The first is +There are three ways to get ``numpy`` working in Python. The first is to use :ref:`shell-support`. You can simply ``use`` or ``load`` the module for the extension, and it will be added to the ``PYTHONPATH`` in your current shell. @@ -976,15 +976,26 @@ or, for dotkit: Now ``import numpy`` will succeed for as long as you keep your current session open. -^^^^^^^^^^^^^^^^^^^^^ -Activating Extensions -^^^^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Activating Extensions in a View +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -It is often desirable to have certain packages *always* available as -part of a Python installation. Spack offers a more permanent solution -for this case. Instead of requiring users to load particular -environment modules, you can *activate* the package within the Python -installation: +The second way to use extensions is to create a view, which merges the +python installation along with the extensions into a single prefix. +See :ref:`filesystem-views` for a more in-depth description of views and +:ref:`cmd-spack-view` for usage of the ``spack view`` command. + +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Activating Extensions Globally +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +As an alternative to creating a merged prefix with Python and its extensions, +and prior to support for views, Spack has provided a means to install the +extension into the Spack installation prefix for the extendee. This has +typically been useful since extendable packages typically search their own +installation path for addons by default. + +Global activations are performed with the ``spack activate`` command: .. _cmd-spack-activate: @@ -1044,11 +1055,11 @@ the ``py-numpy`` into the prefix of the ``python`` package. To the python interpreter, it looks like ``numpy`` is installed in the ``site-packages`` directory. -The only limitation of activation is that you can only have a *single* +The only limitation of global activation is that you can only have a *single* version of an extension activated at a time. This is because multiple versions of the same extension would conflict if symbolically linked into the same prefix. Users who want a different version of a package -can still get it by using environment modules, but they will have to +can still get it by using environment modules or views, but they will have to explicitly load their preferred version. ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/lib/spack/docs/packaging_guide.rst b/lib/spack/docs/packaging_guide.rst index 34be562c29..706144403d 100644 --- a/lib/spack/docs/packaging_guide.rst +++ b/lib/spack/docs/packaging_guide.rst @@ -1854,18 +1854,38 @@ from being linked in at activation time. ``depends_on('python')`` and ``extends(python)`` in the same package. ``extends`` implies ``depends_on``. +----- +Views +----- + +As covered in :ref:`filesystem-views`, the ``spack view`` command can be +used to symlink a number of packages into a merged prefix. The methods of +``PackageViewMixin`` can be overridden to customize how packages are added +to views. Generally this can be used to create copies of specific files rather +than symlinking them when symlinking does not work. For example, ``Python`` +overrides ``add_files_to_view`` in order to create a copy of the ``python`` +binary since the real path of the Python executable is used to detect +extensions; as a consequence python extension packages (those inheriting from +``PythonPackage``) likewise override ``add_files_to_view`` in order to rewrite +shebang lines which point to the Python interpreter. + ^^^^^^^^^^^^^^^^^^^^^^^^^ Activation & deactivation ^^^^^^^^^^^^^^^^^^^^^^^^^ +Adding an extension to a view is referred to as an activation. If the view is +maintained in the Spack installation prefix of the extendee this is called a +global activation. Activations may involve updating some centralized state +that is maintained by the extendee package, so there can be additional work +for adding extensions compared with non-extension packages. + Spack's ``Package`` class has default ``activate`` and ``deactivate`` implementations that handle symbolically linking extensions' prefixes -into the directory of the parent package. However, extendable -packages can override these methods to add custom activate/deactivate -logic of their own. For example, the ``activate`` and ``deactivate`` -methods in the Python class use the symbolic linking, but they also -handle details surrounding Python's ``.pth`` files, and other aspects -of Python packaging. +into a specified view. Extendable packages can override these methods +to add custom activate/deactivate logic of their own. For example, +the ``activate`` and ``deactivate`` methods in the Python class handle +symbolic linking of extensions, but they also handle details surrounding +Python's ``.pth`` files, and other aspects of Python packaging. Spack's extensions mechanism is designed to be extensible, so that other packages (like Ruby, R, Perl, etc.) can provide their own @@ -1880,7 +1900,7 @@ Let's look at Python's activate function: This function is called on the *extendee* (Python). It first calls ``activate`` in the superclass, which handles symlinking the -extension package's prefix into this package's prefix. It then does +extension package's prefix into the specified view. It then does some special handling of the ``easy-install.pth`` file, part of Python's setuptools. diff --git a/lib/spack/docs/workflows.rst b/lib/spack/docs/workflows.rst index 78fc6e52a9..b7d5a0ce43 100644 --- a/lib/spack/docs/workflows.rst +++ b/lib/spack/docs/workflows.rst @@ -402,31 +402,6 @@ Numpy, core Python, BLAS/LAPACK and anything else needed: spack module loads --dependencies py-scipy -^^^^^^^^^^^^^^^^^^ -Extension Packages -^^^^^^^^^^^^^^^^^^ - -:ref:`packaging_extensions` may be used as an alternative to loading -Python (and similar systems) packages directly. If extensions are -activated, then ``spack load python`` will also load all the -extensions activated for the given ``python``. This reduces the need -for users to load a large number of modules. - -However, Spack extensions have two potential drawbacks: - -#. Activated packages that involve compiled C extensions may still - need their dependencies to be loaded manually. For example, - ``spack load openblas`` might be required to make ``py-numpy`` - work. - -#. Extensions "break" a core feature of Spack, which is that multiple - versions of a package can co-exist side-by-side. For example, - suppose you wish to run a Python package in two different - environments but the same basic Python --- one with - ``py-numpy@1.7`` and one with ``py-numpy@1.8``. Spack extensions - will not support this potential debugging use case. - - ^^^^^^^^^^^^^^ Dummy Packages ^^^^^^^^^^^^^^ @@ -447,6 +422,8 @@ it. A disadvantage is the set of packages will be consistent; this means you cannot load up two applications this way if they are not consistent with each other. +.. _filesystem-views: + ^^^^^^^^^^^^^^^^ Filesystem Views ^^^^^^^^^^^^^^^^ @@ -587,6 +564,29 @@ symlinks. At any time one can delete ``/path/to/MYVIEW`` or use ``spack view`` to manage it surgically. None of this will affect the real Spack install area. +^^^^^^^^^^^^^^^^^^ +Global Activations +^^^^^^^^^^^^^^^^^^ + +:ref:`cmd-spack-activate` may be used as an alternative to loading +Python (and similar systems) packages directly or creating a view. +If extensions are globally activated, then ``spack load python`` will +also load all the extensions activated for the given ``python``. +This reduces the need for users to load a large number of modules. + +However, Spack global activations have two potential drawbacks: + +#. Activated packages that involve compiled C extensions may still + need their dependencies to be loaded manually. For example, + ``spack load openblas`` might be required to make ``py-numpy`` + work. + +#. Global activations "break" a core feature of Spack, which is that + multiple versions of a package can co-exist side-by-side. For example, + suppose you wish to run a Python package in two different + environments but the same basic Python --- one with + ``py-numpy@1.7`` and one with ``py-numpy@1.8``. Spack extensions + will not support this potential debugging use case. ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Discussion: Running Binaries diff --git a/lib/spack/llnl/util/filesystem.py b/lib/spack/llnl/util/filesystem.py index b2591c2cf6..f43745a551 100644 --- a/lib/spack/llnl/util/filesystem.py +++ b/lib/spack/llnl/util/filesystem.py @@ -79,6 +79,18 @@ __all__ = [ ] +def path_contains_subdirectory(path, root): + norm_root = os.path.abspath(root).rstrip(os.path.sep) + os.path.sep + norm_path = os.path.abspath(path).rstrip(os.path.sep) + os.path.sep + return norm_path.startswith(norm_root) + + +def same_path(path1, path2): + norm1 = os.path.abspath(path1).rstrip(os.path.sep) + norm2 = os.path.abspath(path2).rstrip(os.path.sep) + return norm1 == norm2 + + def filter_file(regex, repl, *filenames, **kwargs): r"""Like sed, but uses python regular expressions. @@ -281,6 +293,17 @@ def is_exe(path): return os.path.isfile(path) and os.access(path, os.X_OK) +def get_filetype(path_name): + """ + Return the output of file path_name as a string to identify file type. + """ + file = Executable('file') + file.add_default_env('LC_ALL', 'C') + output = file('-b', '-h', '%s' % path_name, + output=str, error=str) + return output.strip() + + def mkdirp(*paths): """Creates a directory, as well as parent directories if needed.""" for path in paths: diff --git a/lib/spack/llnl/util/link_tree.py b/lib/spack/llnl/util/link_tree.py index b90661ccce..6deadf8109 100644 --- a/lib/spack/llnl/util/link_tree.py +++ b/lib/spack/llnl/util/link_tree.py @@ -29,6 +29,7 @@ import shutil import filecmp from llnl.util.filesystem import traverse_tree, mkdirp, touch +import llnl.util.tty as tty __all__ = ['LinkTree'] @@ -44,37 +45,49 @@ class LinkTree(object): Trees comprise symlinks only to files; directries are never symlinked to, to prevent the source directory from ever being modified. - """ - def __init__(self, source_root): if not os.path.exists(source_root): raise IOError("No such file or directory: '%s'", source_root) self._root = source_root - def find_conflict(self, dest_root, **kwargs): + def find_conflict(self, dest_root, ignore=None, + ignore_file_conflicts=False): """Returns the first file in dest that conflicts with src""" - kwargs['follow_nonexisting'] = False + ignore = ignore or (lambda x: False) + conflicts = self.find_dir_conflicts(dest_root, ignore) + + if not ignore_file_conflicts: + conflicts.extend( + dst for src, dst + in self.get_file_map(dest_root, ignore).items() + if os.path.exists(dst)) + + if conflicts: + return conflicts[0] + + def find_dir_conflicts(self, dest_root, ignore): + conflicts = [] + kwargs = {'follow_nonexisting': False, 'ignore': ignore} for src, dest in traverse_tree(self._root, dest_root, **kwargs): if os.path.isdir(src): if os.path.exists(dest) and not os.path.isdir(dest): - return dest - elif os.path.exists(dest): - return dest - return None - - def merge(self, dest_root, link=os.symlink, **kwargs): - """Link all files in src into dest, creating directories - if necessary. - If ignore_conflicts is True, do not break when the target exists but - rather return a list of files that could not be linked. - Note that files blocking directories will still cause an error. - """ - kwargs['order'] = 'pre' - ignore_conflicts = kwargs.get("ignore_conflicts", False) - existing = [] + conflicts.append("File blocks directory: %s" % dest) + elif os.path.exists(dest) and os.path.isdir(dest): + conflicts.append("Directory blocks directory: %s" % dest) + return conflicts + + def get_file_map(self, dest_root, ignore): + merge_map = {} + kwargs = {'follow_nonexisting': True, 'ignore': ignore} for src, dest in traverse_tree(self._root, dest_root, **kwargs): + if not os.path.isdir(src): + merge_map[src] = dest + return merge_map + + def merge_directories(self, dest_root, ignore): + for src, dest in traverse_tree(self._root, dest_root, ignore=ignore): if os.path.isdir(src): if not os.path.exists(dest): mkdirp(dest) @@ -88,31 +101,13 @@ class LinkTree(object): marker = os.path.join(dest, empty_file_name) touch(marker) - else: - if os.path.exists(dest): - if ignore_conflicts: - existing.append(src) - else: - raise AssertionError("File already exists: %s" % dest) - else: - link(src, dest) - if ignore_conflicts: - return existing - - def unmerge(self, dest_root, **kwargs): - """Unlink all files in dest that exist in src. - - Unlinks directories in dest if they are empty. - - """ - kwargs['order'] = 'post' - for src, dest in traverse_tree(self._root, dest_root, **kwargs): + def unmerge_directories(self, dest_root, ignore): + for src, dest in traverse_tree( + self._root, dest_root, ignore=ignore, order='post'): if os.path.isdir(src): - # Skip non-existing links. if not os.path.exists(dest): continue - - if not os.path.isdir(dest): + elif not os.path.isdir(dest): raise ValueError("File blocks directory: %s" % dest) # remove directory if it is empty. @@ -124,11 +119,61 @@ class LinkTree(object): if os.path.exists(marker): os.remove(marker) - elif os.path.exists(dest): - if not os.path.islink(dest): - raise ValueError("%s is not a link tree!" % dest) - # remove if dest is a hardlink/symlink to src; this will only - # be false if two packages are merged into a prefix and have a - # conflicting file - if filecmp.cmp(src, dest, shallow=True): - os.remove(dest) + def merge(self, dest_root, **kwargs): + """Link all files in src into dest, creating directories + if necessary. + If ignore_conflicts is True, do not break when the target exists but + rather return a list of files that could not be linked. + Note that files blocking directories will still cause an error. + """ + ignore_conflicts = kwargs.get("ignore_conflicts", False) + + ignore = kwargs.get('ignore', lambda x: False) + conflict = self.find_conflict( + dest_root, ignore=ignore, ignore_file_conflicts=ignore_conflicts) + if conflict: + raise MergeConflictError(conflict) + + self.merge_directories(dest_root, ignore) + existing = [] + merge_file = kwargs.get('merge_file', merge_link) + for src, dst in self.get_file_map(dest_root, ignore).items(): + if os.path.exists(dst): + existing.append(dst) + else: + merge_file(src, dst) + + for c in existing: + tty.warn("Could not merge: %s" % c) + + def unmerge(self, dest_root, **kwargs): + """Unlink all files in dest that exist in src. + + Unlinks directories in dest if they are empty. + """ + remove_file = kwargs.get('remove_file', remove_link) + ignore = kwargs.get('ignore', lambda x: False) + for src, dst in self.get_file_map(dest_root, ignore).items(): + remove_file(src, dst) + self.unmerge_directories(dest_root, ignore) + + +def merge_link(src, dest): + os.symlink(src, dest) + + +def remove_link(src, dest): + if not os.path.islink(dest): + raise ValueError("%s is not a link tree!" % dest) + # remove if dest is a hardlink/symlink to src; this will only + # be false if two packages are merged into a prefix and have a + # conflicting file + if filecmp.cmp(src, dest, shallow=True): + os.remove(dest) + + +class MergeConflictError(Exception): + + def __init__(self, path): + super(MergeConflictError, self).__init__( + "Package merge blocked by file: %s" % path) diff --git a/lib/spack/spack/binary_distribution.py b/lib/spack/spack/binary_distribution.py index 1ae068e897..b96237ed99 100644 --- a/lib/spack/spack/binary_distribution.py +++ b/lib/spack/spack/binary_distribution.py @@ -34,7 +34,7 @@ from contextlib import closing import yaml import llnl.util.tty as tty -from llnl.util.filesystem import mkdirp, install_tree +from llnl.util.filesystem import mkdirp, install_tree, get_filetype import spack.cmd import spack.fetch_strategy as fs @@ -148,7 +148,7 @@ def write_buildinfo_file(prefix, workdir, rel=False): # of files potentially needing relocation if relocate.strings_contains_installroot( path_name, spack.store.layout.root): - filetype = relocate.get_filetype(path_name) + filetype = get_filetype(path_name) if relocate.needs_binary_relocation(filetype, os_id): rel_path_name = os.path.relpath(path_name, prefix) binary_to_relocate.append(rel_path_name) diff --git a/lib/spack/spack/build_systems/aspell_dict.py b/lib/spack/spack/build_systems/aspell_dict.py index c9369ca9a8..99039fcf28 100644 --- a/lib/spack/spack/build_systems/aspell_dict.py +++ b/lib/spack/spack/build_systems/aspell_dict.py @@ -27,6 +27,7 @@ from llnl.util.filesystem import filter_file from spack.build_systems.autotools import AutotoolsPackage from spack.directives import extends +from spack.package import ExtensionError from spack.util.executable import which @@ -42,6 +43,17 @@ class AspellDictPackage(AutotoolsPackage): extends('aspell') + def view_destination(self, view): + aspell_spec = self.spec['aspell'] + if view.root != aspell_spec.prefix: + raise ExtensionError( + 'aspell does not support non-global extensions') + aspell = aspell_spec.command + return aspell('dump', 'config', 'dict-dir', output=str).strip() + + def view_source(self): + return self.prefix.lib + def patch(self): filter_file(r'^dictdir=.*$', 'dictdir=/lib', 'configure') filter_file(r'^datadir=.*$', 'datadir=/lib', 'configure') diff --git a/lib/spack/spack/build_systems/python.py b/lib/spack/spack/build_systems/python.py index 98fdab3be5..7933253eed 100644 --- a/lib/spack/spack/build_systems/python.py +++ b/lib/spack/spack/build_systems/python.py @@ -25,11 +25,14 @@ import inspect import os +import shutil from spack.directives import depends_on, extends from spack.package import PackageBase, run_after -from llnl.util.filesystem import working_dir +from llnl.util.filesystem import (working_dir, get_filetype, filter_file, + path_contains_subdirectory, same_path) +from llnl.util.lang import match_predicate class PythonPackage(PackageBase): @@ -116,6 +119,8 @@ class PythonPackage(PackageBase): depends_on('python', type=('build', 'run')) + py_namespace = None + def setup_file(self): """Returns the name of the setup file to use.""" return 'setup.py' @@ -403,3 +408,66 @@ class PythonPackage(PackageBase): # Check that self.prefix is there after installation run_after('install')(PackageBase.sanity_check_prefix) + + def view_file_conflicts(self, view, merge_map): + """Report all file conflicts, excepting special cases for python. + Specifically, this does not report errors for duplicate + __init__.py files for packages in the same namespace. + """ + conflicts = list(dst for src, dst in merge_map.items() + if os.path.exists(dst)) + + if conflicts and self.py_namespace: + ext_map = view.extensions_layout.extension_map(self.extendee_spec) + namespaces = set( + x.package.py_namespace for x in ext_map.values()) + namespace_re = ( + r'site-packages/{0}/__init__.py'.format(self.py_namespace)) + find_namespace = match_predicate(namespace_re) + if self.py_namespace in namespaces: + conflicts = list( + x for x in conflicts if not find_namespace(x)) + + return conflicts + + def add_files_to_view(self, view, merge_map): + bin_dir = self.spec.prefix.bin + python_prefix = self.extendee_spec.prefix + global_view = same_path(python_prefix, view.root) + for src, dst in merge_map.items(): + if os.path.exists(dst): + continue + elif global_view or not path_contains_subdirectory(src, bin_dir): + view.link(src, dst) + elif not os.path.islink(src): + shutil.copy2(src, dst) + if 'script' in get_filetype(src): + filter_file( + python_prefix, os.path.abspath(view.root), dst) + else: + orig_link_target = os.path.realpath(src) + new_link_target = os.path.abspath(merge_map[orig_link_target]) + view.link(new_link_target, dst) + + def remove_files_from_view(self, view, merge_map): + ignore_namespace = False + if self.py_namespace: + ext_map = view.extensions_layout.extension_map(self.extendee_spec) + remaining_namespaces = set( + spec.package.py_namespace for name, spec in ext_map.items() + if name != self.name) + if self.py_namespace in remaining_namespaces: + namespace_init = match_predicate( + r'site-packages/{0}/__init__.py'.format(self.py_namespace)) + ignore_namespace = True + + bin_dir = self.spec.prefix.bin + global_view = self.extendee_spec.prefix == view.root + for src, dst in merge_map.items(): + if ignore_namespace and namespace_init(dst): + continue + + if global_view or not path_contains_subdirectory(src, bin_dir): + view.remove_file(src, dst) + else: + os.remove(dst) diff --git a/lib/spack/spack/cmd/activate.py b/lib/spack/spack/cmd/activate.py index b0e4be91f1..73c4c63bce 100644 --- a/lib/spack/spack/cmd/activate.py +++ b/lib/spack/spack/cmd/activate.py @@ -27,7 +27,7 @@ import argparse import llnl.util.tty as tty import spack.cmd -from spack.directory_layout import YamlViewExtensionsLayout +from spack.filesystem_view import YamlFilesystemView description = "activate a package extension" section = "extensions" @@ -55,14 +55,17 @@ def activate(parser, args): if not spec.package.is_extension: tty.die("%s is not an extension." % spec.name) - layout = spack.store.extensions - if args.view is not None: - layout = YamlViewExtensionsLayout( - args.view, spack.store.layout) + if args.view: + target = args.view + else: + target = spec.package.extendee_spec.prefix - if spec.package.is_activated(extensions_layout=layout): + view = YamlFilesystemView(target, spack.store.layout) + + if spec.package.is_activated(view): tty.msg("Package %s is already activated." % specs[0].short_spec) return - spec.package.do_activate(extensions_layout=layout, - with_dependencies=not args.force) + # TODO: refactor FilesystemView.add_extension and use that here (so there + # aren't two ways of activating extensions) + spec.package.do_activate(view, with_dependencies=not args.force) diff --git a/lib/spack/spack/cmd/deactivate.py b/lib/spack/spack/cmd/deactivate.py index 30eb271412..fdf64ee0b7 100644 --- a/lib/spack/spack/cmd/deactivate.py +++ b/lib/spack/spack/cmd/deactivate.py @@ -27,7 +27,7 @@ import llnl.util.tty as tty import spack.cmd import spack.store -from spack.directory_layout import YamlViewExtensionsLayout +from spack.filesystem_view import YamlFilesystemView from spack.graph import topological_sort description = "deactivate a package extension" @@ -59,25 +59,29 @@ def deactivate(parser, args): spec = spack.cmd.disambiguate_spec(specs[0]) pkg = spec.package - layout = spack.store.extensions - if args.view is not None: - layout = YamlViewExtensionsLayout( - args.view, spack.store.layout) + if args.view: + target = args.view + elif pkg.is_extension: + target = pkg.extendee_spec.prefix + elif pkg.extendable: + target = spec.prefix + + view = YamlFilesystemView(target, spack.store.layout) if args.all: if pkg.extendable: tty.msg("Deactivating all extensions of %s" % pkg.spec.short_spec) ext_pkgs = spack.store.db.activated_extensions_for( - spec, extensions_layout=layout) + spec, view.extensions_layout) for ext_pkg in ext_pkgs: ext_pkg.spec.normalize() - if ext_pkg.is_activated(): - ext_pkg.do_deactivate(force=True, extensions_layout=layout) + if ext_pkg.is_activated(view): + ext_pkg.do_deactivate(view, force=True) elif pkg.is_extension: if not args.force and \ - not spec.package.is_activated(extensions_layout=layout): + not spec.package.is_activated(view): tty.die("%s is not activated." % pkg.spec.short_spec) tty.msg("Deactivating %s and all dependencies." % @@ -90,11 +94,8 @@ def deactivate(parser, args): espec = index[name] epkg = espec.package if epkg.extends(pkg.extendee_spec): - if epkg.is_activated(extensions_layout=layout) or \ - args.force: - - epkg.do_deactivate( - force=args.force, extensions_layout=layout) + if epkg.is_activated(view) or args.force: + epkg.do_deactivate(view, force=args.force) else: tty.die( @@ -107,7 +108,7 @@ def deactivate(parser, args): "Did you mean 'spack deactivate --all'?") if not args.force and \ - not spec.package.is_activated(extensions_layout=layout): + not spec.package.is_activated(view): tty.die("Package %s is not activated." % specs[0].short_spec) - spec.package.do_deactivate(force=args.force, extensions_layout=layout) + spec.package.do_deactivate(view, force=args.force) diff --git a/lib/spack/spack/cmd/extensions.py b/lib/spack/spack/cmd/extensions.py index a428e85035..9e17dbb81a 100644 --- a/lib/spack/spack/cmd/extensions.py +++ b/lib/spack/spack/cmd/extensions.py @@ -31,7 +31,7 @@ import spack.cmd import spack.cmd.find import spack.repo import spack.store -from spack.directory_layout import YamlViewExtensionsLayout +from spack.filesystem_view import YamlFilesystemView description = "list extensions for package" section = "extensions" @@ -113,10 +113,12 @@ def extensions(parser, args): tty.msg("%d extensions:" % len(extensions)) colify(ext.name for ext in extensions) - layout = spack.store.extensions - if args.view is not None: - layout = YamlViewExtensionsLayout( - args.view, spack.store.layout) + if args.view: + target = args.view + else: + target = spec.prefix + + view = YamlFilesystemView(target, spack.store.layout) if show_installed: # @@ -137,7 +139,7 @@ def extensions(parser, args): # # List specs of activated extensions. # - activated = layout.extension_map(spec) + activated = view.extensions_layout.extension_map(spec) if show_all: print if not activated: diff --git a/lib/spack/spack/database.py b/lib/spack/spack/database.py index 4bc6891ec8..4d82643b38 100644 --- a/lib/spack/spack/database.py +++ b/lib/spack/spack/database.py @@ -58,6 +58,7 @@ import spack.repo import spack.spec import spack.util.spack_yaml as syaml import spack.util.spack_json as sjson +from spack.filesystem_view import YamlFilesystemView from spack.util.crypto import bit_length from spack.directory_layout import DirectoryLayoutError from spack.error import SpackError @@ -823,7 +824,8 @@ class Database(object): the given spec """ if extensions_layout is None: - extensions_layout = spack.store.extensions + view = YamlFilesystemView(extendee_spec.prefix, spack.store.layout) + extensions_layout = view.extensions_layout for spec in self.query(): try: extensions_layout.check_activated(extendee_spec, spec) diff --git a/lib/spack/spack/directory_layout.py b/lib/spack/spack/directory_layout.py index b392af01eb..6b4e9c7336 100644 --- a/lib/spack/spack/directory_layout.py +++ b/lib/spack/spack/directory_layout.py @@ -128,7 +128,6 @@ class ExtensionsLayout(object): """ def __init__(self, root, **kwargs): self.root = root - self.link = kwargs.get("link", os.symlink) def add_extension(self, spec, ext_spec): """Add to the list of currently installed extensions.""" @@ -313,14 +312,14 @@ class YamlDirectoryLayout(DirectoryLayout): return by_hash -class YamlExtensionsLayout(ExtensionsLayout): - """Implements globally activated extensions within a YamlDirectoryLayout. +class YamlViewExtensionsLayout(ExtensionsLayout): + """Maintain extensions within a view. """ def __init__(self, root, layout): """layout is the corresponding YamlDirectoryLayout object for which we implement extensions. """ - super(YamlExtensionsLayout, self).__init__(root) + super(YamlViewExtensionsLayout, self).__init__(root) self.layout = layout self.extension_file_name = 'extensions.yaml' @@ -354,19 +353,29 @@ class YamlExtensionsLayout(ExtensionsLayout): raise NoSuchExtensionError(spec, ext_spec) def extension_file_path(self, spec): - """Gets full path to an installed package's extension file""" + """Gets full path to an installed package's extension file, which + keeps track of all the extensions for that package which have been + added to this view. + """ _check_concrete(spec) - return os.path.join(self.layout.metadata_path(spec), - self.extension_file_name) + normalize_path = lambda p: ( + os.path.abspath(p).rstrip(os.path.sep)) + if normalize_path(spec.prefix) == normalize_path(self.root): + # For backwards compatibility, when the root is the extended + # package's installation directory, do not include the spec name + # as a subdirectory. + components = [self.root, self.layout.metadata_dir, + self.extension_file_name] + else: + components = [self.root, self.layout.metadata_dir, spec.name, + self.extension_file_name] + return os.path.join(*components) def extension_map(self, spec): """Defensive copying version of _extension_map() for external API.""" _check_concrete(spec) return self._extension_map(spec).copy() - def extendee_target_directory(self, extendee): - return extendee.prefix - def remove_extension(self, spec, ext_spec): _check_concrete(spec) _check_concrete(ext_spec) @@ -419,6 +428,8 @@ class YamlExtensionsLayout(ExtensionsLayout): # Create a temp file in the same directory as the actual file. dirname, basename = os.path.split(path) + mkdirp(dirname) + tmp = tempfile.NamedTemporaryFile( prefix=basename, dir=dirname, delete=False) @@ -436,23 +447,6 @@ class YamlExtensionsLayout(ExtensionsLayout): os.rename(tmp.name, path) -class YamlViewExtensionsLayout(YamlExtensionsLayout): - """Governs the directory layout present when creating filesystem views in a - certain root folder. - - Meant to replace YamlDirectoryLayout when working with filesystem views. - """ - - def extension_file_path(self, spec): - """Gets the full path to an installed package's extension file.""" - _check_concrete(spec) - return os.path.join(self.root, self.layout.metadata_dir, spec.name, - self.extension_file_name) - - def extendee_target_directory(self, extendee): - return self.root - - class DirectoryLayoutError(SpackError): """Superclass for directory layout errors.""" diff --git a/lib/spack/spack/filesystem_view.py b/lib/spack/spack/filesystem_view.py index ead18c5836..0f8c8c4282 100644 --- a/lib/spack/spack/filesystem_view.py +++ b/lib/spack/spack/filesystem_view.py @@ -22,14 +22,16 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## +import filecmp import functools as ft import os import re import shutil import sys -from llnl.util.link_tree import LinkTree +from llnl.util.link_tree import LinkTree, MergeConflictError from llnl.util import tty +from llnl.util.lang import match_predicate import spack.spec import spack.store @@ -223,20 +225,9 @@ class YamlFilesystemView(FilesystemView): % colorize_spec(spec)) return True - try: - if not spec.package.is_activated(self.extensions_layout): - spec.package.do_activate( - ignore_conflicts=self.ignore_conflicts, - with_dependencies=False, # already taken care of - # in add_specs() - verbose=self.verbose, - extensions_layout=self.extensions_layout) - - except ExtensionAlreadyInstalledError: - # As we use sets in add_specs(), the order in which packages get - # activated is essentially random. So this spec might have already - # been activated as dependency of another package -> fail silently - pass + if not spec.package.is_activated(self): + spec.package.do_activate( + self, verbose=self.verbose, with_dependencies=False) # make sure the meta folder is linked as well (this is not done by the # extension-activation mechnism) @@ -274,29 +265,66 @@ class YamlFilesystemView(FilesystemView): long=False) return False - tree = LinkTree(spec.prefix) - - if not self.ignore_conflicts: - conflict = tree.find_conflict(self.root) - if conflict is not None: - tty.error(self._croot + - "Cannot link package %s, file already exists: %s" - % (spec.name, conflict)) - return False + self.merge(spec) - conflicts = tree.merge(self.root, link=self.link, - ignore=ignore_metadata_dir, - ignore_conflicts=self.ignore_conflicts) self.link_meta_folder(spec) - if self.ignore_conflicts: - for c in conflicts: - tty.warn(self._croot + "Could not link: %s" % c) - if self.verbose: tty.info(self._croot + 'Linked package: %s' % colorize_spec(spec)) return True + def merge(self, spec, ignore=None): + pkg = spec.package + view_source = pkg.view_source() + view_dst = pkg.view_destination(self) + + tree = LinkTree(view_source) + + ignore = ignore or (lambda f: False) + ignore_file = match_predicate( + self.layout.hidden_file_paths, ignore) + + # check for dir conflicts + conflicts = tree.find_dir_conflicts(view_dst, ignore_file) + + merge_map = tree.get_file_map(view_dst, ignore_file) + if not self.ignore_conflicts: + conflicts.extend(pkg.view_file_conflicts(self, merge_map)) + + if conflicts: + raise MergeConflictError(conflicts[0]) + + # merge directories with the tree + tree.merge_directories(view_dst, ignore_file) + + pkg.add_files_to_view(self, merge_map) + + def unmerge(self, spec, ignore=None): + pkg = spec.package + view_source = pkg.view_source() + view_dst = pkg.view_destination(self) + + tree = LinkTree(view_source) + + ignore = ignore or (lambda f: False) + ignore_file = match_predicate( + self.layout.hidden_file_paths, ignore) + + merge_map = tree.get_file_map(view_dst, ignore_file) + pkg.remove_files_from_view(self, merge_map) + + # now unmerge the directory tree + tree.unmerge_directories(view_dst, ignore_file) + + def remove_file(self, src, dest): + if not os.path.islink(dest): + raise ValueError("%s is not a link tree!" % dest) + # remove if dest is a hardlink/symlink to src; this will only + # be false if two packages are merged into a prefix and have a + # conflicting file + if filecmp.cmp(src, dest, shallow=True): + os.remove(dest) + def check_added(self, spec): assert spec.concrete return spec == self.get_spec(spec) @@ -364,11 +392,11 @@ class YamlFilesystemView(FilesystemView): # The spec might have been deactivated as depdency of another package # already - if spec.package.is_activated(self.extensions_layout): + if spec.package.is_activated(self): spec.package.do_deactivate( + self, verbose=self.verbose, - remove_dependents=with_dependents, - extensions_layout=self.extensions_layout) + remove_dependents=with_dependents) self.unlink_meta_folder(spec) def remove_standalone(self, spec): @@ -380,8 +408,7 @@ class YamlFilesystemView(FilesystemView): 'Skipping package not linked in view: %s' % spec.name) return - tree = LinkTree(spec.prefix) - tree.unmerge(self.root, ignore=ignore_metadata_dir) + self.unmerge(spec) self.unlink_meta_folder(spec) if self.verbose: @@ -545,7 +572,3 @@ def get_dependencies(specs): retval = set() set(map(retval.update, (set(s.traverse()) for s in specs))) return retval - - -def ignore_metadata_dir(f): - return f in spack.store.layout.hidden_file_paths diff --git a/lib/spack/spack/hooks/extensions.py b/lib/spack/spack/hooks/extensions.py index 94fe9f3cf4..109a23ab1b 100644 --- a/lib/spack/spack/hooks/extensions.py +++ b/lib/spack/spack/hooks/extensions.py @@ -22,6 +22,8 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## +import spack +from spack.filesystem_view import YamlFilesystemView def pre_uninstall(spec): @@ -29,6 +31,9 @@ def pre_uninstall(spec): assert spec.concrete if pkg.is_extension: - if pkg.is_activated(): + target = pkg.extendee_spec.prefix + view = YamlFilesystemView(target, spack.store.layout) + + if pkg.is_activated(view): # deactivate globally pkg.do_deactivate(force=True) diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py index 73a872545c..dab963740f 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -75,6 +75,7 @@ from llnl.util.lang import memoized from llnl.util.link_tree import LinkTree from llnl.util.tty.log import log_output from llnl.util.tty.color import colorize +from spack.filesystem_view import YamlFilesystemView from spack.util.executable import which from spack.stage import Stage, ResourceStage, StageComposite from spack.util.environment import dump_environment @@ -260,7 +261,54 @@ def on_package_attributes(**attr_dict): return _execute_under_condition -class PackageBase(with_metaclass(PackageMeta, object)): +class PackageViewMixin(object): + """This collects all functionality related to adding installed Spack + package to views. Packages can customize how they are added to views by + overriding these functions. + """ + def view_source(self): + """The source root directory that will be added to the view: files are + added such that their path relative to the view destination matches + their path relative to the view source. + """ + return self.spec.prefix + + def view_destination(self, view): + """The target root directory: each file is added relative to this + directory. + """ + return view.root + + def view_file_conflicts(self, view, merge_map): + """Report any files which prevent adding this package to the view. The + default implementation looks for any files which already exist. + Alternative implementations may allow some of the files to exist in + the view (in this case they would be omitted from the results). + """ + return set(dst for dst in merge_map.values() if os.path.exists(dst)) + + def add_files_to_view(self, view, merge_map): + """Given a map of package files to destination paths in the view, add + the files to the view. By default this adds all files. Alternative + implementations may skip some files, for example if other packages + linked into the view already include the file. + """ + for src, dst in merge_map.items(): + if not os.path.exists(dst): + view.link(src, dst) + + def remove_files_from_view(self, view, merge_map): + """Given a map of package files to files currently linked in the view, + remove the files from the view. The default implementation removes all + files. Alternative implementations may not remove all files. For + example if two packages include the same file, it should only be + removed when both packages are removed. + """ + for src, dst in merge_map.items(): + view.remove_file(src, dst) + + +class PackageBase(with_metaclass(PackageMeta, PackageViewMixin, object)): """This is the superclass for all spack packages. ***The Package class*** @@ -942,13 +990,12 @@ class PackageBase(with_metaclass(PackageMeta, object)): s = self.extendee_spec return s and spec.satisfies(s) - def is_activated(self, extensions_layout=None): + def is_activated(self, view): """Return True if package is activated.""" if not self.is_extension: raise ValueError( - "is_extension called on package that is not an extension.") - if extensions_layout is None: - extensions_layout = spack.store.extensions + "is_activated called on package that is not an extension.") + extensions_layout = view.extensions_layout exts = extensions_layout.extension_map(self.extendee_spec) return (self.name in exts) and (exts[self.name] == self.spec) @@ -1979,8 +2026,7 @@ class PackageBase(with_metaclass(PackageMeta, object)): raise ActivationError("%s does not extend %s!" % (self.name, self.extendee.name)) - def do_activate(self, with_dependencies=True, ignore_conflicts=False, - verbose=True, extensions_layout=None): + def do_activate(self, view=None, with_dependencies=True, verbose=True): """Called on an extension to invoke the extendee's activate method. Commands should call this routine, and should not call @@ -1991,9 +2037,11 @@ class PackageBase(with_metaclass(PackageMeta, object)): (self.spec.cshort_spec, self.extendee_spec.cshort_spec)) self._sanity_check_extension() + if not view: + view = YamlFilesystemView( + self.extendee_spec.prefix, spack.store.layout) - if extensions_layout is None: - extensions_layout = spack.store.extensions + extensions_layout = view.extensions_layout extensions_layout.check_extension_conflict( self.extendee_spec, self.spec) @@ -2001,17 +2049,13 @@ class PackageBase(with_metaclass(PackageMeta, object)): # Activate any package dependencies that are also extensions. if with_dependencies: for spec in self.dependency_activations(): - if not spec.package.is_activated( - extensions_layout=extensions_layout): + if not spec.package.is_activated(view): spec.package.do_activate( - with_dependencies=with_dependencies, - ignore_conflicts=ignore_conflicts, - verbose=verbose, - extensions_layout=extensions_layout) + view, with_dependencies=with_dependencies, + verbose=verbose) self.extendee_spec.package.activate( - self, extensions_layout=extensions_layout, - ignore_conflicts=ignore_conflicts, **self.extendee_args) + self, view, **self.extendee_args) extensions_layout.add_extension(self.extendee_spec, self.spec) @@ -2025,41 +2069,22 @@ class PackageBase(with_metaclass(PackageMeta, object)): return (spec for spec in self.spec.traverse(root=False, deptype='run') if spec.package.extends(self.extendee_spec)) - def activate(self, extension, ignore_conflicts=False, **kwargs): - """Make extension package usable by linking all its files to a target - provided by the directory layout (depending if the user wants to - activate globally or in a specified file system view). - - Package authors can override this method to support other - extension mechanisms. Spack internals (commands, hooks, etc.) - should call do_activate() method so that proper checks are - always executed. - + def activate(self, extension, view, **kwargs): """ - extensions_layout = kwargs.get("extensions_layout", - spack.store.extensions) - target = extensions_layout.extendee_target_directory(self) - - def ignore(filename): - return (filename in spack.store.layout.hidden_file_paths or - kwargs.get('ignore', lambda f: False)(filename)) - - tree = LinkTree(extension.prefix) + Add the extension to the specified view. - conflict = tree.find_conflict(target, ignore=ignore) - if not conflict: - pass - elif ignore_conflicts: - tty.warn("While activating %s, found conflict %s" % - (self.spec.cshort_spec, conflict)) - else: - raise ExtensionConflictError(conflict) + Package authors can override this function to maintain some + centralized state related to the set of activated extensions + for a package. - tree.merge(target, ignore=ignore, link=extensions_layout.link, - ignore_conflicts=ignore_conflicts) + Spack internals (commands, hooks, etc.) should call + do_activate() method so that proper checks are always executed. + """ + view.merge(extension.spec, ignore=kwargs.get('ignore', None)) - def do_deactivate(self, **kwargs): - """Called on the extension to invoke extendee's deactivate() method. + def do_deactivate(self, view=None, **kwargs): + """Remove this extension package from the specified view. Called + on the extension to invoke extendee's deactivate() method. `remove_dependents=True` deactivates extensions depending on this package instead of raising an error. @@ -2068,8 +2093,11 @@ class PackageBase(with_metaclass(PackageMeta, object)): force = kwargs.get('force', False) verbose = kwargs.get("verbose", True) remove_dependents = kwargs.get("remove_dependents", False) - extensions_layout = kwargs.get("extensions_layout", - spack.store.extensions) + + if not view: + view = YamlFilesystemView( + self.extendee_spec.prefix, spack.store.layout) + extensions_layout = view.extensions_layout # Allow a force deactivate to happen. This can unlink # spurious files if something was corrupted. @@ -2094,13 +2122,11 @@ class PackageBase(with_metaclass(PackageMeta, object)): aspec.cshort_spec)) self.extendee_spec.package.deactivate( - self, - extensions_layout=extensions_layout, - **self.extendee_args) + self, view, **self.extendee_args) # redundant activation check -- makes SURE the spec is not # still activated even if something was wrong above. - if self.is_activated(extensions_layout): + if self.is_activated(view): extensions_layout.remove_extension( self.extendee_spec, self.spec) @@ -2110,26 +2136,23 @@ class PackageBase(with_metaclass(PackageMeta, object)): (self.spec.short_spec, self.extendee_spec.cformat("$_$@$+$%@"))) - def deactivate(self, extension, **kwargs): - """Unlinks all files from extension out of this package's install dir - or the corresponding filesystem view. + def deactivate(self, extension, view, **kwargs): + """ + Remove all extension files from the specified view. Package authors can override this method to support other extension mechanisms. Spack internals (commands, hooks, etc.) should call do_deactivate() method so that proper checks are always executed. - """ - extensions_layout = kwargs.get("extensions_layout", - spack.store.extensions) - target = extensions_layout.extendee_target_directory(self) + view.unmerge(extension.spec, ignore=kwargs.get('ignore', None)) - def ignore(filename): - return (filename in spack.store.layout.hidden_file_paths or - kwargs.get('ignore', lambda f: False)(filename)) - - tree = LinkTree(extension.prefix) - tree.unmerge(target, ignore=ignore) + def view(self): + """Create a view with the prefix of this package as the root. + Extensions added to this view will modify the installation prefix of + this package. + """ + return YamlFilesystemView(self.prefix, spack.store.layout) def do_restage(self): """Reverts expanded/checked out source to a pristine state.""" @@ -2409,13 +2432,6 @@ class ExtensionError(PackageError): pass -class ExtensionConflictError(ExtensionError): - - def __init__(self, path): - super(ExtensionConflictError, self).__init__( - "Extension blocked by file: %s" % path) - - class ActivationError(ExtensionError): def __init__(self, msg, long_msg=None): diff --git a/lib/spack/spack/relocate.py b/lib/spack/spack/relocate.py index 9800718dff..6996cc1d5c 100644 --- a/lib/spack/spack/relocate.py +++ b/lib/spack/spack/relocate.py @@ -256,17 +256,6 @@ def modify_macho_object(cur_path, rpaths, deps, idpath, return -def get_filetype(path_name): - """ - Return the output of file path_name as a string to identify file type. - """ - file = Executable('file') - file.add_default_env('LC_ALL', 'C') - output = file('-b', '-h', '%s' % path_name, - output=str, error=str) - return output.strip() - - def strings_contains_installroot(path_name, root_dir): """ Check if the file contain the install root string. diff --git a/lib/spack/spack/store.py b/lib/spack/spack/store.py index f5111e7f46..189bef4bd9 100644 --- a/lib/spack/spack/store.py +++ b/lib/spack/spack/store.py @@ -80,8 +80,6 @@ class Store(object): self.db = spack.database.Database(root) self.layout = spack.directory_layout.YamlDirectoryLayout( root, hash_len=hash_length, path_scheme=path_scheme) - self.extensions = spack.directory_layout.YamlExtensionsLayout( - root, self.layout) def reindex(self): """Convenience function to reindex the store DB with its own layout.""" @@ -105,4 +103,3 @@ store = llnl.util.lang.Singleton(_store) root = llnl.util.lang.LazyReference(lambda: store.root) db = llnl.util.lang.LazyReference(lambda: store.db) layout = llnl.util.lang.LazyReference(lambda: store.layout) -extensions = llnl.util.lang.LazyReference(lambda: store.extensions) diff --git a/lib/spack/spack/test/cmd/activate.py b/lib/spack/spack/test/cmd/activate.py new file mode 100644 index 0000000000..59a25ff51d --- /dev/null +++ b/lib/spack/spack/test/cmd/activate.py @@ -0,0 +1,61 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack.main import SpackCommand + +activate = SpackCommand('activate') +deactivate = SpackCommand('deactivate') +install = SpackCommand('install') +extensions = SpackCommand('extensions') + + +def test_activate( + mock_packages, mock_archive, mock_fetch, config, + install_mockery): + install('extension1') + activate('extension1') + output = extensions('--show', 'activated', 'extendee') + assert 'extension1' in output + + +def test_deactivate( + mock_packages, mock_archive, mock_fetch, config, + install_mockery): + install('extension1') + activate('extension1') + deactivate('extension1') + output = extensions('--show', 'activated', 'extendee') + assert 'extension1' not in output + + +def test_deactivate_all( + mock_packages, mock_archive, mock_fetch, config, + install_mockery): + install('extension1') + install('extension2') + activate('extension1') + activate('extension2') + deactivate('--all', 'extendee') + output = extensions('--show', 'activated', 'extendee') + assert 'extension1' not in output diff --git a/lib/spack/spack/test/test_activations.py b/lib/spack/spack/test/test_activations.py index da20a46bdc..04f5580cd9 100644 --- a/lib/spack/spack/test/test_activations.py +++ b/lib/spack/spack/test/test_activations.py @@ -24,16 +24,25 @@ ############################################################################## import os import pytest +import sys import spack.spec +import spack.package +from llnl.util.link_tree import MergeConflictError +from spack.build_systems.python import PythonPackage from spack.directory_layout import YamlDirectoryLayout from spack.filesystem_view import YamlFilesystemView +from spack.util.prefix import Prefix +"""This includes tests for customized activation logic for specific packages + (e.g. python and perl). +""" -class FakeExtensionPackage(object): + +class FakeExtensionPackage(spack.package.PackageViewMixin): def __init__(self, name, prefix): self.name = name - self.prefix = prefix + self.prefix = Prefix(prefix) self.spec = FakeSpec(self) @@ -42,10 +51,43 @@ class FakeSpec(object): self.name = package.name self.prefix = package.prefix self.hash = self.name + self.package = package + self.concrete = True def dag_hash(self): return self.hash + def __lt__(self, other): + return self.name < other.name + + +class FakePythonExtensionPackage(FakeExtensionPackage): + def __init__(self, name, prefix, py_namespace, python_spec): + self.py_namespace = py_namespace + self.extendee_spec = python_spec + super(FakePythonExtensionPackage, self).__init__(name, prefix) + + def add_files_to_view(self, view, merge_map): + if sys.version_info >= (3, 0): + add_fn = PythonPackage.add_files_to_view + else: + add_fn = PythonPackage.add_files_to_view.im_func + return add_fn(self, view, merge_map) + + def view_file_conflicts(self, view, merge_map): + if sys.version_info >= (3, 0): + conflicts_fn = PythonPackage.view_file_conflicts + else: + conflicts_fn = PythonPackage.view_file_conflicts.im_func + return conflicts_fn(self, view, merge_map) + + def remove_files_from_view(self, view, merge_map): + if sys.version_info >= (3, 0): + remove_fn = PythonPackage.remove_files_from_view + else: + remove_fn = PythonPackage.remove_files_from_view.im_func + return remove_fn(self, view, merge_map) + def create_dir_structure(tmpdir, dir_structure): for fname, children in dir_structure.items(): @@ -102,25 +144,49 @@ path/to/setuptools.egg""") return str(python_prefix), str(ext_prefix) -def test_python_activation(tmpdir): - # Note the lib directory is based partly on the python version - python_spec = spack.spec.Spec('python@2.7.12') - python_spec._concrete = True +@pytest.fixture() +def namespace_extensions(tmpdir): + ext1_dirs = { + 'bin/': { + 'py-ext-tool1': None + }, + 'lib/': { + 'python2.7/': { + 'site-packages/': { + 'examplenamespace/': { + '__init__.py': None, + 'ext1_sample.py': None + } + } + } + } + } - python_name = 'python' - tmpdir.ensure(python_name, dir=True) + ext2_dirs = { + 'bin/': { + 'py-ext-tool2': None + }, + 'lib/': { + 'python2.7/': { + 'site-packages/': { + 'examplenamespace/': { + '__init__.py': None, + 'ext2_sample.py': None + } + } + } + } + } - python_prefix = str(tmpdir.join(python_name)) - # Set the prefix on the package's spec reference because that is a copy of - # the original spec - python_spec.package.spec.prefix = python_prefix + ext1_name = 'py-extension1' + ext1_prefix = tmpdir.join(ext1_name) + create_dir_structure(ext1_prefix, ext1_dirs) - ext_name = 'py-extension' - tmpdir.ensure(ext_name, dir=True) - ext_pkg = FakeExtensionPackage(ext_name, str(tmpdir.join(ext_name))) + ext2_name = 'py-extension2' + ext2_prefix = tmpdir.join(ext2_name) + create_dir_structure(ext2_prefix, ext2_dirs) - python_pkg = python_spec.package - python_pkg.activate(ext_pkg) + return str(ext1_prefix), str(ext2_prefix), 'examplenamespace' def test_python_activation_with_files(tmpdir, python_and_extension_dirs): @@ -133,7 +199,7 @@ def test_python_activation_with_files(tmpdir, python_and_extension_dirs): ext_pkg = FakeExtensionPackage('py-extension', ext_prefix) python_pkg = python_spec.package - python_pkg.activate(ext_pkg) + python_pkg.activate(ext_pkg, python_pkg.view()) assert os.path.exists(os.path.join(python_prefix, 'bin/py-ext-tool')) @@ -159,13 +225,114 @@ def test_python_activation_view(tmpdir, python_and_extension_dirs): view = YamlFilesystemView(view_dir, layout) python_pkg = python_spec.package - python_pkg.activate(ext_pkg, extensions_layout=view.extensions_layout) + python_pkg.activate(ext_pkg, view) assert not os.path.exists(os.path.join(python_prefix, 'bin/py-ext-tool')) assert os.path.exists(os.path.join(view_dir, 'bin/py-ext-tool')) +def test_python_ignore_namespace_init_conflict(tmpdir, namespace_extensions): + """Test the view update logic in PythonPackage ignores conflicting + instances of __init__ for packages which are in the same namespace. + """ + ext1_prefix, ext2_prefix, py_namespace = namespace_extensions + + python_spec = spack.spec.Spec('python@2.7.12') + python_spec._concrete = True + + ext1_pkg = FakePythonExtensionPackage( + 'py-extension1', ext1_prefix, py_namespace, python_spec) + ext2_pkg = FakePythonExtensionPackage( + 'py-extension2', ext2_prefix, py_namespace, python_spec) + + view_dir = str(tmpdir.join('view')) + layout = YamlDirectoryLayout(view_dir) + view = YamlFilesystemView(view_dir, layout) + + python_pkg = python_spec.package + python_pkg.activate(ext1_pkg, view) + # Normally handled by Package.do_activate, but here we activate directly + view.extensions_layout.add_extension(python_spec, ext1_pkg.spec) + python_pkg.activate(ext2_pkg, view) + + f1 = 'lib/python2.7/site-packages/examplenamespace/ext1_sample.py' + f2 = 'lib/python2.7/site-packages/examplenamespace/ext2_sample.py' + init_file = 'lib/python2.7/site-packages/examplenamespace/__init__.py' + + assert os.path.exists(os.path.join(view_dir, f1)) + assert os.path.exists(os.path.join(view_dir, f2)) + assert os.path.exists(os.path.join(view_dir, init_file)) + + +def test_python_keep_namespace_init(tmpdir, namespace_extensions): + """Test the view update logic in PythonPackage keeps the namespace + __init__ file as long as one package in the namespace still + exists. + """ + ext1_prefix, ext2_prefix, py_namespace = namespace_extensions + + python_spec = spack.spec.Spec('python@2.7.12') + python_spec._concrete = True + + ext1_pkg = FakePythonExtensionPackage( + 'py-extension1', ext1_prefix, py_namespace, python_spec) + ext2_pkg = FakePythonExtensionPackage( + 'py-extension2', ext2_prefix, py_namespace, python_spec) + + view_dir = str(tmpdir.join('view')) + layout = YamlDirectoryLayout(view_dir) + view = YamlFilesystemView(view_dir, layout) + + python_pkg = python_spec.package + python_pkg.activate(ext1_pkg, view) + # Normally handled by Package.do_activate, but here we activate directly + view.extensions_layout.add_extension(python_spec, ext1_pkg.spec) + python_pkg.activate(ext2_pkg, view) + view.extensions_layout.add_extension(python_spec, ext2_pkg.spec) + + f1 = 'lib/python2.7/site-packages/examplenamespace/ext1_sample.py' + init_file = 'lib/python2.7/site-packages/examplenamespace/__init__.py' + + python_pkg.deactivate(ext1_pkg, view) + view.extensions_layout.remove_extension(python_spec, ext1_pkg.spec) + + assert not os.path.exists(os.path.join(view_dir, f1)) + assert os.path.exists(os.path.join(view_dir, init_file)) + + python_pkg.deactivate(ext2_pkg, view) + view.extensions_layout.remove_extension(python_spec, ext2_pkg.spec) + + assert not os.path.exists(os.path.join(view_dir, init_file)) + + +def test_python_namespace_conflict(tmpdir, namespace_extensions): + """Test the view update logic in PythonPackage reports an error when two + python extensions with different namespaces have a conflicting __init__ + file. + """ + ext1_prefix, ext2_prefix, py_namespace = namespace_extensions + other_namespace = py_namespace + 'other' + + python_spec = spack.spec.Spec('python@2.7.12') + python_spec._concrete = True + + ext1_pkg = FakePythonExtensionPackage( + 'py-extension1', ext1_prefix, py_namespace, python_spec) + ext2_pkg = FakePythonExtensionPackage( + 'py-extension2', ext2_prefix, other_namespace, python_spec) + + view_dir = str(tmpdir.join('view')) + layout = YamlDirectoryLayout(view_dir) + view = YamlFilesystemView(view_dir, layout) + + python_pkg = python_spec.package + python_pkg.activate(ext1_pkg, view) + view.extensions_layout.add_extension(python_spec, ext1_pkg.spec) + with pytest.raises(MergeConflictError): + python_pkg.activate(ext2_pkg, view) + + @pytest.fixture() def perl_and_extension_dirs(tmpdir): perl_dirs = { @@ -230,7 +397,7 @@ def test_perl_activation(tmpdir): ext_pkg = FakeExtensionPackage(ext_name, str(tmpdir.join(ext_name))) perl_pkg = perl_spec.package - perl_pkg.activate(ext_pkg) + perl_pkg.activate(ext_pkg, perl_pkg.view()) def test_perl_activation_with_files(tmpdir, perl_and_extension_dirs): @@ -243,7 +410,7 @@ def test_perl_activation_with_files(tmpdir, perl_and_extension_dirs): ext_pkg = FakeExtensionPackage('perl-extension', ext_prefix) perl_pkg = perl_spec.package - perl_pkg.activate(ext_pkg) + perl_pkg.activate(ext_pkg, perl_pkg.view()) assert os.path.exists(os.path.join(perl_prefix, 'bin/perl-ext-tool')) @@ -262,7 +429,7 @@ def test_perl_activation_view(tmpdir, perl_and_extension_dirs): view = YamlFilesystemView(view_dir, layout) perl_pkg = perl_spec.package - perl_pkg.activate(ext_pkg, extensions_layout=view.extensions_layout) + perl_pkg.activate(ext_pkg, view) assert not os.path.exists(os.path.join(perl_prefix, 'bin/perl-ext-tool')) diff --git a/lib/spack/spack/test/views.py b/lib/spack/spack/test/views.py new file mode 100644 index 0000000000..0981d05015 --- /dev/null +++ b/lib/spack/spack/test/views.py @@ -0,0 +1,48 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +import os + +from spack.spec import Spec + + +def test_global_activation(install_mockery, mock_fetch): + """This test ensures that views which are maintained inside of an extendee + package's prefix are maintained as expected and are compatible with + global activations prior to #7152. + """ + spec = Spec('extension1').concretized() + pkg = spec.package + pkg.do_install() + pkg.do_activate() + + extendee_spec = spec['extendee'] + extendee_pkg = spec['extendee'].package + view = extendee_pkg.view() + assert pkg.is_activated(view) + + expected_path = os.path.join( + extendee_spec.prefix, '.spack', 'extensions.yaml') + assert (view.extensions_layout.extension_file_path(extendee_spec) == + expected_path) diff --git a/var/spack/repos/builtin/packages/aspell/package.py b/var/spack/repos/builtin/packages/aspell/package.py index 66eeb9e7cb..30cd8b9a23 100644 --- a/var/spack/repos/builtin/packages/aspell/package.py +++ b/var/spack/repos/builtin/packages/aspell/package.py @@ -23,9 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from llnl.util.link_tree import LinkTree -import spack.store -from spack.package import ExtensionError, ExtensionConflictError # See also: AspellDictPackage @@ -41,47 +38,3 @@ class Aspell(AutotoolsPackage): version('0.60.6.1', 'e66a9c9af6a60dc46134fdacf6ce97d7') patch('darwin.patch', when='platform=darwin') - - # The dictionaries install all their bits into their prefix.lib dir, - # we want to link them into aspell's dict-dir. - # These are identical to what's in spack/package.py except - # for using: - # - extension.prefix.lib instead of extension.prefix in LinkTree() - # - dest_dir instead of self.prefix in tree.(find_conflict|merge)() - def activate(self, extension, **kwargs): - extensions_layout = kwargs.get("extensions_layout", - spack.store.extensions) - if extensions_layout is not spack.store.extensions: - raise ExtensionError( - 'aspell does not support non-global extensions') - - aspell = which(self.prefix.bin.aspell) - dest_dir = aspell('dump', 'config', 'dict-dir', output=str).strip() - tree = LinkTree(extension.prefix.lib) - - def ignore(filename): - return (filename in spack.store.layout.hidden_file_paths or - kwargs.get('ignore', lambda f: False)(filename)) - - conflict = tree.find_conflict(dest_dir, ignore=ignore) - if conflict: - raise ExtensionConflictError(conflict) - - tree.merge(dest_dir, ignore=ignore) - - def deactivate(self, extension, **kwargs): - extensions_layout = kwargs.get("extensions_layout", - spack.store.extensions) - if extensions_layout is not spack.store.extensions: - raise ExtensionError( - 'aspell does not support non-global extensions') - - aspell = which(self.prefix.bin.aspell) - dest_dir = aspell('dump', 'config', 'dict-dir', output=str).strip() - - def ignore(filename): - return (filename in spack.store.layout.hidden_file_paths or - kwargs.get('ignore', lambda f: False)(filename)) - - tree = LinkTree(extension.prefix.lib) - tree.unmerge(dest_dir, ignore=ignore) diff --git a/var/spack/repos/builtin/packages/perl/package.py b/var/spack/repos/builtin/packages/perl/package.py index 2cacb5a03c..3e40c68349 100644 --- a/var/spack/repos/builtin/packages/perl/package.py +++ b/var/spack/repos/builtin/packages/perl/package.py @@ -35,7 +35,6 @@ from contextlib import contextmanager from llnl.util.lang import match_predicate -import spack.store from spack import * @@ -267,27 +266,23 @@ class Perl(Package): # Perl doesn't use Autotools, it should subclass Package return match_predicate(ignore_arg, patterns) - def activate(self, ext_pkg, **args): + def activate(self, ext_pkg, view, **args): ignore = self.perl_ignore(ext_pkg, args) args.update(ignore=ignore) - super(Perl, self).activate(ext_pkg, **args) - - extensions_layout = args.get("extensions_layout", - spack.store.extensions) + super(Perl, self).activate(ext_pkg, view, **args) + extensions_layout = view.extensions_layout exts = extensions_layout.extension_map(self.spec) exts[ext_pkg.name] = ext_pkg.spec - def deactivate(self, ext_pkg, **args): + def deactivate(self, ext_pkg, view, **args): ignore = self.perl_ignore(ext_pkg, args) args.update(ignore=ignore) - super(Perl, self).deactivate(ext_pkg, **args) - - extensions_layout = args.get("extensions_layout", - spack.store.extensions) + super(Perl, self).deactivate(ext_pkg, view, **args) + extensions_layout = view.extensions_layout exts = extensions_layout.extension_map(self.spec) # Make deactivate idempotent if ext_pkg.name in exts: diff --git a/var/spack/repos/builtin/packages/py-backports-shutil-get-terminal-size/package.py b/var/spack/repos/builtin/packages/py-backports-shutil-get-terminal-size/package.py index e30ef3770b..350eb793e6 100644 --- a/var/spack/repos/builtin/packages/py-backports-shutil-get-terminal-size/package.py +++ b/var/spack/repos/builtin/packages/py-backports-shutil-get-terminal-size/package.py @@ -32,6 +32,8 @@ class PyBackportsShutilGetTerminalSize(PythonPackage): homepage = "https://pypi.python.org/pypi/backports.shutil_get_terminal_size" url = "https://pypi.io/packages/source/b/backports.shutil_get_terminal_size/backports.shutil_get_terminal_size-1.0.0.tar.gz" + py_namespace = 'backports' + version('1.0.0', '03267762480bd86b50580dc19dff3c66') # newer setuptools version mess with "namespace" packages in an diff --git a/var/spack/repos/builtin/packages/py-backports-ssl-match-hostname/package.py b/var/spack/repos/builtin/packages/py-backports-ssl-match-hostname/package.py index 08ee1abbbb..df7c2dc84b 100644 --- a/var/spack/repos/builtin/packages/py-backports-ssl-match-hostname/package.py +++ b/var/spack/repos/builtin/packages/py-backports-ssl-match-hostname/package.py @@ -31,4 +31,6 @@ class PyBackportsSslMatchHostname(PythonPackage): homepage = "https://pypi.python.org/pypi/backports.ssl_match_hostname" url = "https://pypi.io/packages/source/b/backports.ssl_match_hostname/backports.ssl_match_hostname-3.5.0.1.tar.gz" + py_namespace = 'backports' + version('3.5.0.1', 'c03fc5e2c7b3da46b81acf5cbacfe1e6') diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 0c913422ef..7ce53903fb 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -27,10 +27,12 @@ import os import platform import re import sys +import shutil import llnl.util.tty as tty from llnl.util.lang import match_predicate -from llnl.util.filesystem import force_remove +from llnl.util.filesystem import (force_remove, get_filetype, + path_contains_subdirectory) import spack.store import spack.util.spack_json as sjson @@ -676,33 +678,49 @@ class Python(AutotoolsPackage): "sys.path[p:p]=new; " "sys.__egginsert = p+len(new)\n") - def activate(self, ext_pkg, **args): + def activate(self, ext_pkg, view, **args): ignore = self.python_ignore(ext_pkg, args) args.update(ignore=ignore) - extensions_layout = args.get("extensions_layout", - spack.store.extensions) - - super(Python, self).activate(ext_pkg, **args) + super(Python, self).activate(ext_pkg, view, **args) + extensions_layout = view.extensions_layout exts = extensions_layout.extension_map(self.spec) exts[ext_pkg.name] = ext_pkg.spec - self.write_easy_install_pth( - exts, - prefix=extensions_layout.extendee_target_directory(self)) + self.write_easy_install_pth(exts, prefix=view.root) - def deactivate(self, ext_pkg, **args): + def deactivate(self, ext_pkg, view, **args): args.update(ignore=self.python_ignore(ext_pkg, args)) - super(Python, self).deactivate(ext_pkg, **args) - extensions_layout = args.get("extensions_layout", - spack.store.extensions) + super(Python, self).deactivate(ext_pkg, view, **args) + extensions_layout = view.extensions_layout exts = extensions_layout.extension_map(self.spec) # Make deactivate idempotent if ext_pkg.name in exts: del exts[ext_pkg.name] - self.write_easy_install_pth( - exts, - prefix=extensions_layout.extendee_target_directory(self)) + self.write_easy_install_pth(exts, prefix=view.root) + + def add_files_to_view(self, view, merge_map): + bin_dir = self.spec.prefix.bin + for src, dst in merge_map.items(): + if not path_contains_subdirectory(src, bin_dir): + view.link(src, dst) + elif not os.path.islink(src): + shutil.copy2(src, dst) + if 'script' in get_filetype(src): + filter_file( + self.spec.prefix, os.path.abspath(view.root), dst) + else: + orig_link_target = os.path.realpath(src) + new_link_target = os.path.abspath(merge_map[orig_link_target]) + view.link(new_link_target, dst) + + def remove_files_from_view(self, view, merge_map): + bin_dir = self.spec.prefix.bin + for src, dst in merge_map.items(): + if not path_contains_subdirectory(src, bin_dir): + view.remove_file(src, dst) + else: + os.remove(dst) -- cgit v1.2.3-70-g09d2 From cdf98235997be6ff8b06280c04eda9661631ac38 Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Wed, 27 Jun 2018 02:29:22 -0400 Subject: zoltan: depends on metis.h and libmetis (#8583) the parmetis build system does not install metis.h and libmetis --- var/spack/repos/builtin/packages/zoltan/package.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/zoltan/package.py b/var/spack/repos/builtin/packages/zoltan/package.py index 13c0f4838a..f141c4720d 100644 --- a/var/spack/repos/builtin/packages/zoltan/package.py +++ b/var/spack/repos/builtin/packages/zoltan/package.py @@ -58,6 +58,7 @@ class Zoltan(Package): depends_on('mpi', when='+mpi') depends_on('parmetis@4:', when='+parmetis') + depends_on('metis', when='+parmetis') conflicts('+parmetis', when='~mpi') @@ -91,6 +92,10 @@ class Zoltan(Package): .format(spec['parmetis'].prefix.lib)) config_args.append('--with-parmetis-incdir={0}' .format(spec['parmetis'].prefix.include)) + config_args.append('--with-incdirs=-I{0}' + .format(spec['metis'].prefix.include)) + config_args.append('--with-ldflags=-L{0}' + .format(spec['metis'].prefix.lib)) if '+mpi' in spec: config_args.append('CC={0}'.format(spec['mpi'].mpicc)) -- cgit v1.2.3-70-g09d2 From da011bc7fb9278306ecd44e8cf97bff37f8b0bb7 Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Wed, 27 Jun 2018 11:03:46 -0400 Subject: pumi: add fortran variant (#8584) --- var/spack/repos/builtin/packages/pumi/package.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pumi/package.py b/var/spack/repos/builtin/packages/pumi/package.py index 3866501409..a6ec15af2b 100644 --- a/var/spack/repos/builtin/packages/pumi/package.py +++ b/var/spack/repos/builtin/packages/pumi/package.py @@ -44,6 +44,7 @@ class Pumi(CMakePackage): branch='master') variant('zoltan', default=False, description='Enable Zoltan Features') + variant('fortran', default=False, description='Enable FORTRAN interface') depends_on('mpi') depends_on('cmake@3:', type='build') @@ -57,6 +58,9 @@ class Pumi(CMakePackage): '-DENABLE_ZOLTAN=%s' % ('ON' if '+zoltan' in spec else 'OFF'), '-DCMAKE_C_COMPILER=%s' % spec['mpi'].mpicc, '-DCMAKE_CXX_COMPILER=%s' % spec['mpi'].mpicxx, + '-DCMAKE_Fortran_COMPILER=%s' % spec['mpi'].mpifc, + '-DPUMI_FORTRAN_INTERFACE=%s' % + ('ON' if '+fortran' in spec else 'OFF') ] return args -- cgit v1.2.3-70-g09d2 From b495c43783ba7e0d475224c70ce0f8bf7eb733b8 Mon Sep 17 00:00:00 2001 From: Andreas Baumbach Date: Wed, 27 Jun 2018 17:05:00 +0200 Subject: Add package tcl-itcl (#8578) * Add package tcl-itcl Change-Id: I0eeaefe0554d0b62614f56204d635e3d8d216e4a * fix naming Change-Id: Id8adc7299f41b217b48999304a74827525533598 * and fix name of file accordingly Change-Id: I0f32f8b66f2695fd99eee4a326353cd5af4aa334 --- .../repos/builtin/packages/tcl-itcl/package.py | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 var/spack/repos/builtin/packages/tcl-itcl/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/tcl-itcl/package.py b/var/spack/repos/builtin/packages/tcl-itcl/package.py new file mode 100644 index 0000000000..56762ea01e --- /dev/null +++ b/var/spack/repos/builtin/packages/tcl-itcl/package.py @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class TclItcl(AutotoolsPackage): + """[incr Tcl] is the most widely used O-O system for Tcl. The name is a + play on C++, and [incr Tcl] provides a similar object model, including + multiple inheritence and public and private classes and variables.""" + + homepage = "https://sourceforge.net/projects/incrtcl/" + url = "https://sourceforge.net/projects/incrtcl/files/%5Bincr%20Tcl_Tk%5D-4-source/itcl%204.0.4/itcl4.0.4.tar.gz" + + version('4.0.4', 'c9c52afdd9435490e2db17c3c6c95ab4') + + extends('tcl') + + def configure_args(self): + args = [ + '--enable-shared', + '--enable-threads', + '--with-tcl=' + self.spec['tcl'].tcl_lib_dir, + ] + return args -- cgit v1.2.3-70-g09d2 From 8966a4987d8d87d150dfac15f385690476c47569 Mon Sep 17 00:00:00 2001 From: Andreas Baumbach Date: Wed, 27 Jun 2018 19:43:24 +0200 Subject: Provide new version of sbt (simple build tool) (#8576) --- var/spack/repos/builtin/packages/sbt/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sbt/package.py b/var/spack/repos/builtin/packages/sbt/package.py index 1e46b8104d..17aa4800eb 100644 --- a/var/spack/repos/builtin/packages/sbt/package.py +++ b/var/spack/repos/builtin/packages/sbt/package.py @@ -30,10 +30,13 @@ class Sbt(Package): """Scala Build Tool""" homepage = 'http://www.scala-sbt.org' - url = 'https://github.com/sbt/sbt/releases/download/v1.1.4/sbt-1.1.4.tgz' + url = "https://github.com/sbt/sbt/releases/download/v1.1.4/sbt-1.1.4.tgz" + version('1.1.5', 'b771480feb07f98fa8cd6d787c8d4485') version('1.1.4', 'c71e5fa846164d14d4cd450520d66c6a') version('0.13.17', 'c52c6152cc7aadfd1f0736a1a5d0a5b8') + version('0.13.12', 'cec3071d46ef13334c8097cc3467ff28', + url="https://dl.bintray.com/sbt/native-packages/sbt/0.13.12/sbt-0.13.12.tgz") depends_on('java') -- cgit v1.2.3-70-g09d2 From e3f208e4cbf443976e6557cb2e1adfba2e15c814 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 27 Jun 2018 21:57:55 +0200 Subject: New version mesa-18.1.2 (#8589) - compiles with newer LLVM. The older mesa-17 versions balk at the changes in the llvm::FastMath class, where a member function has been removed. --- var/spack/repos/builtin/packages/mesa/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py index 4c02066ceb..1fcd8214af 100644 --- a/var/spack/repos/builtin/packages/mesa/package.py +++ b/var/spack/repos/builtin/packages/mesa/package.py @@ -36,6 +36,7 @@ class Mesa(AutotoolsPackage): _oldurlfmt = "https://mesa.freedesktop.org/archive/older-versions/{0}.x/{1}/mesa-{1}.tar.xz" list_depth = 2 + version('18.1.2', 'a2d4f031eb6bd6111d44d84004476918') version('17.2.3', 'a7dca71afbc7294cb7d505067fd44ef6') version('17.2.2', '1a157b5baefb5adf9f4fbb8a6632d74c') version('17.1.5', '6cf936fbcaadd98924298a7009e8265d') -- cgit v1.2.3-70-g09d2 From 51bd319fcf71f3182fd5fe4775a86bc5d0011a88 Mon Sep 17 00:00:00 2001 From: David Böhme Date: Wed, 27 Jun 2018 15:21:23 -0700 Subject: Add Caliper 1.7.0 and Gotcha 1.0.2 (#8572) * Update Gotcha and Caliper versions * caliper: Use spack-built gotcha * caliper: Enable sampling support on Linux * More robust check for Linux --- var/spack/repos/builtin/packages/caliper/package.py | 12 +++++++++++- var/spack/repos/builtin/packages/gotcha/package.py | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/caliper/package.py b/var/spack/repos/builtin/packages/caliper/package.py index 07528a2ca8..6c9a5a4064 100644 --- a/var/spack/repos/builtin/packages/caliper/package.py +++ b/var/spack/repos/builtin/packages/caliper/package.py @@ -39,8 +39,12 @@ class Caliper(CMakePackage): url = "" version('master', git='https://github.com/LLNL/Caliper.git') + version('1.7.0', git='https://github.com/LLNL/Caliper.git', tag='v1.7.0') + # version 1.6.0 is broken b/c it downloads the wrong gotcha version version('1.6.0', git='https://github.com/LLNL/Caliper.git', tag='v1.6.0') + is_linux = sys.platform.startswith('linux') + variant('mpi', default=True, description='Enable MPI wrappers') variant('dyninst', default=False, @@ -51,14 +55,17 @@ class Caliper(CMakePackage): # pthread_self() signature is incompatible with PAPI_thread_init() on Mac variant('papi', default=sys.platform != 'darwin', description='Enable PAPI service') - variant('libpfm', default=sys.platform == 'linux2', + variant('libpfm', default=is_linux, description='Enable libpfm (perf_events) service') # gotcha doesn't work on Mac variant('gotcha', default=sys.platform != 'darwin', description='Enable GOTCHA support') + variant('sampler', default=is_linux, + description='Enable sampling support on Linux') variant('sosflow', default=False, description='Enable SOSflow support') + depends_on('gotcha@1.0:', when='+gotcha') depends_on('dyninst', when='+dyninst') depends_on('papi', when='+papi') depends_on('libpfm4', when='+libpfm') @@ -81,10 +88,13 @@ class Caliper(CMakePackage): '-DWITH_PAPI=%s' % ('On' if '+papi' in spec else 'Off'), '-DWITH_LIBPFM=%s' % ('On' if '+libpfm' in spec else 'Off'), '-DWITH_SOSFLOW=%s' % ('On' if '+sosflow' in spec else 'Off'), + '-DWITH_SAMPLER=%s' % ('On' if '+sampler' in spec else 'Off'), '-DWITH_MPI=%s' % ('On' if '+mpi' in spec else 'Off'), '-DWITH_MPIT=%s' % ('On' if spec.satisfies('^mpi@3:') else 'Off') ] + if '+gotcha' in spec: + args.append('-DUSE_EXTERNAL_GOTCHA=True') if '+papi' in spec: args.append('-DPAPI_PREFIX=%s' % spec['papi'].prefix) if '+libpfm' in spec: diff --git a/var/spack/repos/builtin/packages/gotcha/package.py b/var/spack/repos/builtin/packages/gotcha/package.py index 7842b9bec0..acfff70415 100644 --- a/var/spack/repos/builtin/packages/gotcha/package.py +++ b/var/spack/repos/builtin/packages/gotcha/package.py @@ -38,6 +38,7 @@ class Gotcha(CMakePackage): branch="develop") version('master', git='https://github.com/LLNL/gotcha.git', branch="master") + version('1.0.2', git='https://github.com/LLNL/gotcha.git', tag="1.0.2") version('0.0.2', git='https://github.com/LLNL/gotcha.git', tag="0.0.2") def configure_args(self): -- cgit v1.2.3-70-g09d2 From 795e701ae332b3740604325338c93bfb21f4f39b Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 28 Jun 2018 10:51:30 -0500 Subject: Add kealib 1.4.9 (#8597) --- var/spack/repos/builtin/packages/kealib/package.py | 29 ++++++++++++++++------ 1 file changed, 22 insertions(+), 7 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/kealib/package.py b/var/spack/repos/builtin/packages/kealib/package.py index 2bc9ac25fd..fae9202c7b 100644 --- a/var/spack/repos/builtin/packages/kealib/package.py +++ b/var/spack/repos/builtin/packages/kealib/package.py @@ -42,21 +42,36 @@ class Kealib(CMakePackage): Development work on this project has been funded by Landcare Research. """ homepage = "http://www.kealib.org/" - url = "https://bitbucket.org/chchrsc/kealib/get/kealib-1.4.7.tar.gz" + url = "https://bitbucket.org/chchrsc/kealib/get/kealib-1.4.9.tar.gz" version('develop', hg='https://bitbucket.org/chchrsc/kealib') + version('1.4.9', 'a095d0b9d6de1d609ffaf242e00cc2b6') version('1.4.8', '1af2514c908f9168ff6665cc012815ad') version('1.4.7', '6139e31e50f552247ddf98f489948893') depends_on('cmake@2.8.10:', type='build') depends_on('hdf5+cxx+hl') - root_cmakelists_dir = 'trunk' - patch('cmake.patch', when='@1.4.7') + @property + def root_cmakelists_dir(self): + if self.version >= Version('1.4.9'): + return '.' + else: + return 'trunk' + def cmake_args(self): - return [ - '-DHDF5_INCLUDE_DIR=%s' % self.spec['hdf5'].headers.directories[0], - '-DHDF5_LIB_PATH=%s' % self.spec['hdf5'].libs.directories[0], - ] + spec = self.spec + + if self.version >= Version('1.4.9'): + return [ + '-DHDF5_ROOT={0}'.format(spec['hdf5'].prefix) + ] + else: + return [ + '-DHDF5_INCLUDE_DIR={0}'.format( + spec['hdf5'].headers.directories[0]), + '-DHDF5_LIB_PATH={0}'.format( + spec['hdf5'].libs.directories[0]) + ] -- cgit v1.2.3-70-g09d2 From 8b3bcd189dba46064b3b09799d7b3ae39bdcacd6 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 28 Jun 2018 11:28:22 -0500 Subject: Add CFITSIO 3.450 (#8602) --- var/spack/repos/builtin/packages/cfitsio/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cfitsio/package.py b/var/spack/repos/builtin/packages/cfitsio/package.py index 65bce7407a..6bc3a58afd 100644 --- a/var/spack/repos/builtin/packages/cfitsio/package.py +++ b/var/spack/repos/builtin/packages/cfitsio/package.py @@ -31,8 +31,9 @@ class Cfitsio(AutotoolsPackage): """ homepage = 'http://heasarc.gsfc.nasa.gov/fitsio/' - url = 'http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio3420.tar.gz' + url = 'http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio3450.tar.gz' + version('3.450', 'f470849bb43561d9a9b1925eeb7f7f0d') version('3.420', '26e5c0dfb85b8d00f536e706305caa13') version('3.410', '8a4a66fcdd816aae41768baa0b025552') version('3.370', 'abebd2d02ba5b0503c633581e3bfa116') -- cgit v1.2.3-70-g09d2 From e792c148bc9617d926dc3bf008a3d94cfc0b4abe Mon Sep 17 00:00:00 2001 From: Ian Lee Date: Thu, 28 Jun 2018 13:32:43 -0700 Subject: Added nmap version 7.70 (#8606) --- var/spack/repos/builtin/packages/nmap/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nmap/package.py b/var/spack/repos/builtin/packages/nmap/package.py index 1cb3589140..7c0f0dc12b 100644 --- a/var/spack/repos/builtin/packages/nmap/package.py +++ b/var/spack/repos/builtin/packages/nmap/package.py @@ -31,7 +31,8 @@ class Nmap(AutotoolsPackage): It also provides ncat an updated nc""" homepage = "https://nmap.org" - url = "https://nmap.org/dist/nmap-7.31.tar.bz2" + url = "https://nmap.org/dist/nmap-7.70.tar.bz2" + version('7.70', '84eb6fbe788e0d4918c2b1e39421bf79') version('7.31', 'f2f6660142a777862342a58cc54258ea') version('7.30', '8d86797d5c9e56de571f9630c0e6b5f8') -- cgit v1.2.3-70-g09d2 From 13ee2c04e1089576e6f0da79083fdb73aeba6651 Mon Sep 17 00:00:00 2001 From: 健美猞猁 Date: Fri, 29 Jun 2018 04:40:00 +0800 Subject: r-aer: a new package. (#8567) * r-aer: a new package. * Flake8. * Add list_url and dependency versions. --- var/spack/repos/builtin/packages/r-aer/package.py | 46 +++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-aer/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-aer/package.py b/var/spack/repos/builtin/packages/r-aer/package.py new file mode 100644 index 0000000000..58dcc60eab --- /dev/null +++ b/var/spack/repos/builtin/packages/r-aer/package.py @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RAer(RPackage): + """Functions, data sets, examples, demos, and vignettes + for the book Christian Kleiber and Achim Zeileis (2008), + Applied Econometrics with R, Springer-Verlag, New York. + ISBN 978-0-387-77316-2.""" + + homepage = "https://cran.r-project.org/web/packages/AER/index.html" + url = "https://cran.r-project.org/src/contrib/AER_1.2-5.tar.gz" + list_url = "https://cran.rstudio.com/src/contrib/Archive/AER" + + version('1.2-5', '419df9dc8ee6e5edd79678fee06719ae') + + depends_on('r@2.13.0:', type=('build', 'run')) + depends_on('r-car@2.10-19:', type=('build', 'run')) + depends_on('r-lmtest', type=('build', 'run')) + depends_on('r-sandwich', type=('build', 'run')) + depends_on('r-survival@2.37-5:', type=('build', 'run')) + depends_on('r-zoo', type=('build', 'run')) + depends_on('r-formula', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From b1d7fd886a8e2a141e04bce3a2e14a42b0cb4310 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Fri, 29 Jun 2018 08:19:24 -0600 Subject: latte: version bump (#8611) --- var/spack/repos/builtin/packages/bml/package.py | 1 + var/spack/repos/builtin/packages/latte/package.py | 2 ++ var/spack/repos/builtin/packages/qmd-progress/package.py | 5 +++-- 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bml/package.py b/var/spack/repos/builtin/packages/bml/package.py index 6db847376d..093cfab3c4 100644 --- a/var/spack/repos/builtin/packages/bml/package.py +++ b/var/spack/repos/builtin/packages/bml/package.py @@ -33,6 +33,7 @@ class Bml(CMakePackage): homepage = "http://lanl.github.io/bml/" url = "https://github.com/lanl/bml/tarball/v1.2.2" + version('1.3.0', '2bf8546b27a89666dab3e8f4873cd117') version('1.2.3', '8133137fb56a27fade44d1588449c2ac') version('1.2.2', 'c86959cb0188e9d0a9a2cbad03b2782d') version('1.1.0', '271adecee08aee678be9eeceee06b6fb') diff --git a/var/spack/repos/builtin/packages/latte/package.py b/var/spack/repos/builtin/packages/latte/package.py index 5a8d021cff..8b1d60c024 100644 --- a/var/spack/repos/builtin/packages/latte/package.py +++ b/var/spack/repos/builtin/packages/latte/package.py @@ -34,6 +34,8 @@ class Latte(CMakePackage): tags = ['ecp', 'ecp-apps'] + version('1.2.1', '56db44afaba2a89e6ca62ac565c3c012') + version('1.2.0', 'b9bf8f84a0e0cf7b0e278a1bc7751b3d') version('1.1.1', 'ab11867ba6235189681cf6e50a50cc50') version('1.0.1', 'd0b99edbcf7a19abe0a68a192d6f6234') version('develop', git='https://github.com/lanl/latte', branch='master') diff --git a/var/spack/repos/builtin/packages/qmd-progress/package.py b/var/spack/repos/builtin/packages/qmd-progress/package.py index a880609e76..3d2df5a31d 100644 --- a/var/spack/repos/builtin/packages/qmd-progress/package.py +++ b/var/spack/repos/builtin/packages/qmd-progress/package.py @@ -32,10 +32,11 @@ class QmdProgress(CMakePackage): commonly used in quantum chemistry packages.""" homepage = "https://github.com/lanl/qmd-progress" - url = "https://github.com/lanl/qmd-progress" + url = "https://github.com/lanl/qmd-progress/tarball/v1.1.0" + version('1.1.0', 'dda155134f0925629bf116e562c0a4bd') + version('1.0.0', 'c950bead2719a47a78864e3376ba143e') version('develop', git='https://github.com/lanl/qmd-progress', branch='master') - version('1.0.0', git='https://github.com/lanl/qmd-progress', tag='v1.0.0') variant('graphlib', default=False, description='Build with Metis Suppport') variant('mpi', default=True, description='Build with MPI Support') -- cgit v1.2.3-70-g09d2 From ec46c7c4a6d9e8660abe06bcff6e9fc3c624f1af Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Fri, 29 Jun 2018 13:41:52 -0600 Subject: numactl: fix build with glibc-2.26 (#8615) --- .../numactl/numactl-2.0.11-sysmacros.patch | 41 ++++++++++++++++++++++ .../repos/builtin/packages/numactl/package.py | 2 ++ 2 files changed, 43 insertions(+) create mode 100644 var/spack/repos/builtin/packages/numactl/numactl-2.0.11-sysmacros.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/numactl/numactl-2.0.11-sysmacros.patch b/var/spack/repos/builtin/packages/numactl/numactl-2.0.11-sysmacros.patch new file mode 100644 index 0000000000..3f95367573 --- /dev/null +++ b/var/spack/repos/builtin/packages/numactl/numactl-2.0.11-sysmacros.patch @@ -0,0 +1,41 @@ +https://bugs.gentoo.org/580098 + +From c1644f92e340d797e490c41a9ef9961125d202b9 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Mon, 18 Apr 2016 18:49:51 -0400 +Subject: [PATCH] include sys/sysmacros.h for major/minor + +These functions are not part of any official spec, and glibc has always +kept them in sys/sysmacros.h. As glibc moves to conform to POSIX, and +more alternative C libraries come up, we need to include this header +explicitly to get the prototypes. Otherwise we fail to build like: + +affinity.c: In function 'affinity_file': +affinity.c:177:7: warning: implicit declaration of function 'major' [-Wimplicit-function-declaration] + if (major(d) != maj || minor(d) != min) + ^ +affinity.c:177:26: warning: implicit declaration of function 'minor' [-Wimplicit-function-declaration] + if (major(d) != maj || minor(d) != min) + ^ +./.libs/libnuma.so: undefined reference to 'minor' +./.libs/libnuma.so: undefined reference to 'major' +collect2: error: ld returned 1 exit status +--- + affinity.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/affinity.c b/affinity.c +index 9fbd6af..984291c 100644 +--- a/affinity.c ++++ b/affinity.c +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.7.4 + diff --git a/var/spack/repos/builtin/packages/numactl/package.py b/var/spack/repos/builtin/packages/numactl/package.py index fa962cc021..18123ec27e 100644 --- a/var/spack/repos/builtin/packages/numactl/package.py +++ b/var/spack/repos/builtin/packages/numactl/package.py @@ -33,6 +33,8 @@ class Numactl(AutotoolsPackage): version('2.0.11', 'b56d2367217cde390b4d8087e00773b8') + patch('numactl-2.0.11-sysmacros.patch', when="@2.0.11") + depends_on('autoconf', type='build') depends_on('automake', type='build') depends_on('libtool', type='build') -- cgit v1.2.3-70-g09d2 From 02b8502212eb3a895fc948b2467913810107b8bb Mon Sep 17 00:00:00 2001 From: Stephen Hudson Date: Fri, 29 Jun 2018 14:51:30 -0500 Subject: Update py-libensemble package (#8617) --- var/spack/repos/builtin/packages/py-libensemble/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-libensemble/package.py b/var/spack/repos/builtin/packages/py-libensemble/package.py index d31793d9ed..7324f137c3 100644 --- a/var/spack/repos/builtin/packages/py-libensemble/package.py +++ b/var/spack/repos/builtin/packages/py-libensemble/package.py @@ -30,9 +30,10 @@ class PyLibensemble(PythonPackage): """Library for managing ensemble-like collections of computations.""" homepage = "https://libensemble.readthedocs.io" - url = "https://pypi.io/packages/source/l/libensemble/libensemble-0.1.0.tar.gz" + url = "https://pypi.io/packages/source/l/libensemble/libensemble-0.2.0.tar.gz" version('develop', git='https://github.com/Libensemble/libensemble.git', branch='master') + version('0.2.0', 'ee96047594a3f5a1533f24d3b1f365f9') version('0.1.0', '0c3d45dd139429de1a5273e5bd8e46ec') depends_on('python@2.7:2.8,3.3:') -- cgit v1.2.3-70-g09d2 From a0c13229e8028cccb572a77bb06f1039020c2710 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Fri, 29 Jun 2018 16:25:39 -0500 Subject: Add Python 3.7.0 (#8619) --- var/spack/repos/builtin/packages/python/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 7ce53903fb..94e6b61bd4 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -49,6 +49,7 @@ class Python(AutotoolsPackage): list_url = "https://www.python.org/downloads/" list_depth = 1 + version('3.7.0', '41b6595deb4147a1ed517a7d9a580271') version('3.6.5', 'ab25d24b1f8cc4990ade979f6dc37883') version('3.6.4', '9de6494314ea199e3633211696735f65') version('3.6.3', 'e9180c69ed9a878a4a8a3ab221e32fa9') -- cgit v1.2.3-70-g09d2 From bd3f981fbbbcedf330eb836a57b7b4c2f4755558 Mon Sep 17 00:00:00 2001 From: 健美猞猁 Date: Mon, 2 Jul 2018 20:54:41 +0800 Subject: A new package: xhmm. (#8620) * A new package: xhmm. * Flake8. * Support general BLAS. --- var/spack/repos/builtin/packages/xhmm/package.py | 51 ++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 var/spack/repos/builtin/packages/xhmm/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/xhmm/package.py b/var/spack/repos/builtin/packages/xhmm/package.py new file mode 100644 index 0000000000..e85102daeb --- /dev/null +++ b/var/spack/repos/builtin/packages/xhmm/package.py @@ -0,0 +1,51 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Xhmm(MakefilePackage): + """The XHMM C++ software suite was written to + call copy number variation (CNV) from next-generation + sequencing projects, where exome capture was used + (or targeted sequencing, more generally).""" + + homepage = "http://atgu.mgh.harvard.edu/xhmm/index.shtml" + url = "https://bitbucket.org/statgen/xhmm.git" + + version('20160104', git='https://bitbucket.org/statgen/xhmm.git', + commit='cc14e528d90932f059ac4fe94e869e81221fd732') + + depends_on('lapack') + + def edit(self, spec, prefix): + filter_file('GCC', 'CC', 'sources/hmm++/config_rules.Makefile') + filter_file('GCC =gcc', '', 'sources/hmm++/config_defs.Makefile') + + def build(self, spec, prefix): + make('LAPACK_LIBS=%s' % ''.join(spec['lapack'].libs.names)) + + def install(self, spec, prefix): + mkdir(prefix.bin) + install('xhmm', prefix.bin) -- cgit v1.2.3-70-g09d2 From a4ca2bb889fb65f9fdd2cbeca7d64fe8d5b27577 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 2 Jul 2018 17:02:48 +0200 Subject: ENH: Building OpenFOAM sub-packages (issue #8579) (#8592) * ENH: Building OpenFOAM sub-packages (issue #8579) * Some support for packages building with OpenFOAM - Adjust the wrappers calling the OpenFOAM Allwmake script. Have them look for a Allwmake-spack file first, which is assumed to contain special adjustments for compiling with spack. This file could be delivered as part of a tarball (which is unlikely) or generated on the fly by the spack sub-package as part of its patch or configure stage. CONFIG: change the default paraview variant for openfoam to be False - the different combinations of paraview backends, off-screen etc make it difficult to suggest that building with paraview as a standard dependency makes much sense. Additionally, building paraview with qt can become quite an issue. So it makes much more sense to only enable that upon request. ENH: add a +vtk variant. - for VTK with off-screen rendering to be used by the runTimePostProcessing function object, which is a fairly simple framework for generating images of some OpenFOAM derived objects (eg, sampling planes). SPACK spec problem: - reflect the flex restriction impose by the scotch dependency within the openfoam spec as well, as partial workaround for buggy or annoying spec resolution. OTHER: - updated the backstop foamEtcFile file to include args handling as per the OpenFOAM-v1806 updates. * new version: OpenFOAM-v1806 - https://www.openfoam.com/releases/openfoam-v1806/ --- .../packages/openfoam-com/common/spack-Allwmake | 10 +- .../openfoam-com/common/spack-derived-Allwmake | 12 +- .../repos/builtin/packages/openfoam-com/package.py | 19 ++- .../packages/openfoam-org/assets/bin/foamEtcFile | 170 +++++++++++++++------ 4 files changed, 156 insertions(+), 55 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openfoam-com/common/spack-Allwmake b/var/spack/repos/builtin/packages/openfoam-com/common/spack-Allwmake index cff22daf10..6c53c2fd70 100755 --- a/var/spack/repos/builtin/packages/openfoam-com/common/spack-Allwmake +++ b/var/spack/repos/builtin/packages/openfoam-com/common/spack-Allwmake @@ -5,7 +5,15 @@ export FOAM_INST_DIR=$(cd .. && pwd -L) mkdir -p $FOAM_APPBIN $FOAM_LIBBIN 2>/dev/null # Allow interrupt echo "Build openfoam with SPACK ($@)" echo WM_PROJECT_DIR = $WM_PROJECT_DIR -./Allwmake $@ # Pass arguments + +# Prefer spack-specific Allwmake if it exists +if [ -f Allwmake-spack ] +then + ./Allwmake-spack $@ # Pass arguments +else + ./Allwmake $@ # Pass arguments +fi + # Link non-dummy MPI_FOAM type to parent-dir, where rpath can find it if [ "${FOAM_MPI:=dummy}" != dummy -a -d "$FOAM_LIBBIN/$FOAM_MPI" ] diff --git a/var/spack/repos/builtin/packages/openfoam-com/common/spack-derived-Allwmake b/var/spack/repos/builtin/packages/openfoam-com/common/spack-derived-Allwmake index 407ad734e8..02741f1d13 100755 --- a/var/spack/repos/builtin/packages/openfoam-com/common/spack-derived-Allwmake +++ b/var/spack/repos/builtin/packages/openfoam-com/common/spack-derived-Allwmake @@ -1,6 +1,7 @@ #!/bin/bash # The openfoam providers must export 'FOAM_PROJECT_DIR' -# The package is expected to supply an appropriate Allwmake file. +# The derived package is expected to supply an appropriate +# or file. [ -d "$FOAM_PROJECT_DIR" -a -f "$FOAM_PROJECT_DIR/etc/bashrc" ] || { echo "Error: no PROJECT=$FOAM_PROJECT_DIR" 1>&2 @@ -22,5 +23,12 @@ echo " $WM_COMPILER $WM_COMPILER_TYPE compiler" echo " $WM_OPTIONS - with $WM_MPLIB $FOAM_MPI" echo -./Allwmake $@ # Pass arguments +# Prefer spack-specific Allwmake if it exists +if [ -f Allwmake-spack ] +then + ./Allwmake-spack $@ # Pass arguments +else + ./Allwmake $@ # Pass arguments +fi + # ----------------------------------------------------------------------------- diff --git a/var/spack/repos/builtin/packages/openfoam-com/package.py b/var/spack/repos/builtin/packages/openfoam-com/package.py index a8d7598e0e..1a05a40380 100644 --- a/var/spack/repos/builtin/packages/openfoam-com/package.py +++ b/var/spack/repos/builtin/packages/openfoam-com/package.py @@ -281,6 +281,7 @@ class OpenfoamCom(Package): list_url = "https://sourceforge.net/projects/openfoamplus/files/" list_depth = 2 + version('1806', 'bb244a3bde7048a03edfccffc46c763f') version('1712', '6ad92df051f4d52c7d0ec34f4b8eb3bc') version('1706', '630d30770f7b54d6809efbf94b7d7c8f') version('1612', 'ca02c491369150ab127cbb88ec60fbdf') @@ -303,8 +304,10 @@ class OpenfoamCom(Package): # TODO?# variant('scalasca', default=False, # TODO?# description='With scalasca profiling') variant('mgridgen', default=False, description='With mgridgen support') - variant('paraview', default=True, + variant('paraview', default=False, description='Build paraview plugins and runtime post-processing') + variant('vtk', default=False, + description='With VTK runTimePostProcessing') variant('source', default=True, description='Install library/application sources and tutorials') @@ -319,7 +322,9 @@ class OpenfoamCom(Package): depends_on('fftw') depends_on('boost') depends_on('cgal') - depends_on('flex', type='build') + # The flex restriction is ONLY to deal with a spec resolution clash + # introduced by the restriction within scotch! + depends_on('flex@:2.6.1,2.6.4:', type='build') depends_on('cmake', type='build') # Require scotch with ptscotch - corresponds to standard OpenFOAM setup @@ -331,6 +336,8 @@ class OpenfoamCom(Package): # mgridgen is statically linked depends_on('parmgridgen', when='+mgridgen', type='build') depends_on('zoltan', when='+zoltan') + depends_on('vtk', when='+vtk') + # TODO?# depends_on('scalasca', when='+scalasca') # For OpenFOAM plugins and run-time post-processing this should just be @@ -568,6 +575,7 @@ class OpenfoamCom(Package): 'ensight': {}, # Disable settings 'paraview': [], 'gperftools': [], # Currently unused + 'vtk': [], } if '+scotch' in spec: @@ -596,6 +604,13 @@ class OpenfoamCom(Package): ('PATH', foamAddPath('${ParaView_DIR}/bin')), ] + if '+vtk' in spec: + self.etc_config['vtk'] = [ + ('VTK_DIR', spec['vtk'].prefix), + ('LD_LIBRARY_PATH', + foamAddLib(pkglib(spec['vtk'], '${VTK_DIR}'))), + ] + # Optional if '+mgridgen' in spec: self.etc_config['mgridgen'] = { diff --git a/var/spack/repos/builtin/packages/openfoam-org/assets/bin/foamEtcFile b/var/spack/repos/builtin/packages/openfoam-org/assets/bin/foamEtcFile index e61279b591..195b91bdbe 100755 --- a/var/spack/repos/builtin/packages/openfoam-org/assets/bin/foamEtcFile +++ b/var/spack/repos/builtin/packages/openfoam-org/assets/bin/foamEtcFile @@ -4,7 +4,7 @@ # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | # \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation -# \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd. +# \\/ M anipulation | Copyright (C) 2017-2018 OpenCFD Ltd. #------------------------------------------------------------------------------- # License # This file is part of OpenFOAM, licensed under GNU General Public License @@ -46,7 +46,7 @@ printHelp() { cat<&2 # done - -# Save the essential bits of information -# silently remove leading ~OpenFOAM/ (used in Foam::findEtcFile) -nArgs=$# -fileName="${1#~OpenFOAM/}" - # Define the various places to be searched: unset dirList case "$optMode" in (*u*) # (U)ser @@ -309,27 +335,61 @@ case "$optMode" in (*o*) # (O)ther == shipped esac set -- $dirList +[ "$#" -ge 1 ] || die "No directories to scan. Programming error?" +exitCode=2 # Fallback is a FileNotFound error + + +# +# Preliminaries +# + +# Special handling of config.sh/ , config.csh/ directories +if [ -n "$optConfig" -a -n "$shellOutput" -a -n "$fileName" ] +then + case "$shellOutput" in + csh*) + optConfig="config.csh/" + ;; + sh*) + optConfig="config.sh/" + ;; + *) + unset optConfig + ;; + esac + + if [ -n "$optConfig" ] + then + case "$fileName" in + /* | config.csh* | config.sh*) + # Does not need or cannot add a prefix + unset optConfig + ;; + *) + fileName="$optConfig$fileName" + ;; + esac + fi +fi + # # The main routine # -exitCode=0 if [ -n "$optList" ] then # List directories, or potential file locations [ "$nArgs" -le 1 ] || \ - die "-list expects 0 or 1 filename, but $nArgs provided" + die "-list options expect 0 or 1 filename, but $nArgs provided" - # A silly combination, but -quiet does have precedence + # A silly combination, but -quiet has absolute precedence [ -n "$optQuiet" ] && exit 0 # Test for directory or file too? if [ "$optList" = "test" ] then - exitCode=2 # Fallback to a general error (file not found) - if [ "$nArgs" -eq 1 ] then for dir @@ -352,6 +412,7 @@ then done fi else + exitCode=0 # OK, already verified that $# != 0 for dir do echo "$dir${fileName:+/}$fileName" @@ -362,35 +423,44 @@ else [ "$nArgs" -eq 1 ] || die "One filename expected - $nArgs provided" - exitCode=2 # Fallback to a general error (file not found) + # Output for sourcing files ("source" for csh, "." for POSIX shell) + # Only allow sourcing a single file (disallow combination with -all) + case "$shellOutput" in + csh*) + shellOutput="source " # eg, "source FILE" + ;; + sh*) + shellOutput=". " # eg, ". FILE" + ;; + esac + + # Anti-pattern: -all disables shell commands + if [ -n "$optAll" ] + then + unset shellOutput verboseOutput + fi for dir do - if [ -f "$dir/$fileName" ] + resolved="$dir/$fileName" + if [ -f "$resolved" ] then - exitCode=0 - [ -n "$optQuiet" ] && break - - case "$optShell" in - (*verbose) - echo "Using: $dir/$fileName" 1>&2 - ;; - esac - - case "$optShell" in - csh*) - echo "source $dir/$fileName" - break - ;; - sh*) - echo ". $dir/$fileName" + exitCode=0 # OK + if [ -n "$optQuiet" ] + then break - ;; - *) - echo "$dir/$fileName" - [ -n "$optAll" ] || break - ;; - esac + elif [ -n "$verboseOutput" ] + then + echo "$verboseOutput$resolved" 1>&2 + fi + + if [ -n "$shellOutput" ] + then + echo "$shellOutput$resolved $evalArgs" + else + echo "$resolved" + fi + [ -n "$optAll" ] || break fi done -- cgit v1.2.3-70-g09d2 From f98657491de90a194fc4707d34e09abff2e6d580 Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Mon, 2 Jul 2018 10:42:09 -0600 Subject: Add Amrvis package (#8590) * First draft of amrvis package file. * More additions to amrvis. * Formatting. * Forcing compiler environment variables to point to spack mpi compilers when using mpi. * Disabling intel compiler for amrvis. * Comments. * Refining amrvis package file. * Moving library and include locations variables to be inserted at the first lines of the makefile. * Globbing amrvis binary instead of constructing its name. * Making env variable setting consistent and fixing globbing of executable. * Using iglob instead of glob. * Turning MPI on by default for Amrvis. --- var/spack/repos/builtin/packages/amrvis/package.py | 188 +++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 var/spack/repos/builtin/packages/amrvis/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/amrvis/package.py b/var/spack/repos/builtin/packages/amrvis/package.py new file mode 100644 index 0000000000..b765c58a4b --- /dev/null +++ b/var/spack/repos/builtin/packages/amrvis/package.py @@ -0,0 +1,188 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. # +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import glob + + +class Amrvis(MakefilePackage): + """Amrvis is a visualization package specifically designed to + read and display output and profiling data from codes built + on the AMReX framework. + """ + + homepage = "https://github.com/AMReX-Codes/Amrvis" + url = "https://github.com/AMReX-Codes/Amrvis.git" + + version('master', + git='https://github.com/AMReX-Codes/Amrvis.git', tag='master') + + variant( + 'dims', + default='3', + values=('1', '2', '3'), + multi=False, + description='Number of spatial dimensions' + ) + variant( + 'prec', + default='DOUBLE', + values=('FLOAT', 'DOUBLE'), + multi=False, + description='Floating point precision' + ) + variant('mpi', default=True, description='Enable MPI parallel support') + variant('debug', default=False, description='Enable debugging features') + + depends_on('gmake', type='build') + depends_on('mpi', when='+mpi') + depends_on('libsm') + depends_on('libice') + depends_on('libxpm') + depends_on('libx11') + depends_on('libxt') + depends_on('libxext') + depends_on('motif') + + # Only doing gcc and clang at the moment. + # Intel currently fails searching for mpiicc, mpiicpc, etc. + for comp in ['%intel', '%cce', '%nag', '%pgi', '%xl', '%xl_r']: + conflicts( + comp, + msg='Amrvis currently only builds with gcc and clang' + ) + + # Need to clone AMReX into Amrvis because Amrvis uses AMReX's source + resource(name='amrex', + git='https://github.com/AMReX-Codes/amrex.git', + tag='master', + placement='amrex') + + def edit(self, spec, prefix): + # Set all available makefile options to values we want + makefile = FileFilter('GNUmakefile') + makefile.filter( + r'^AMREX_HOME\s*=.*', + 'AMREX_HOME = {0}'.format('./amrex') + ) + makefile.filter( + r'^PRECISION\s*=.*', + 'PRECISION = {0}'.format(spec.variants['prec'].value) + ) + makefile.filter( + r'^DIM\s*=.*', + 'DIM = {0}'.format(spec.variants['dims'].value) + ) + makefile.filter( + r'^PROFILE\s*=.*', + 'PROFILE = FALSE' + ) + makefile.filter( + r'^TRACE_PROFILE\s*=.*', + 'TRACE_PROFILE = FALSE' + ) + makefile.filter( + r'^COMM_PROFILE\s*=.*', + 'COMM_PROFILE = FALSE' + ) + makefile.filter( + r'^COMP\s*=.*', + 'COMP = {0}'.format(self.compiler.name) + ) + makefile.filter( + r'^DEBUG\s*=.*', + 'DEBUG = {0}'.format(spec.variants['debug'].value).upper() + ) + makefile.filter( + r'^USE_ARRAYVIEW\s*=.*', + 'USE_ARRAY_VIEW = FALSE' + ) + makefile.filter( + r'^USE_MPI\s*=.*', + 'USE_MPI = {0}'.format(spec.variants['mpi'].value).upper() + ) + makefile.filter( + r'^USE_CXX11\s*=.*', + 'USE_CXX11 = TRUE' + ) + makefile.filter( + r'^USE_VOLRENDER\s*=.*', + 'USE_VOLRENDER = FALSE' + ) + makefile.filter( + r'^USE_PARALLELVOLRENDER\s*=.*', + 'USE_PARALLELVOLRENDER = FALSE' + ) + makefile.filter( + r'^USE_PROFPARSER\s*=.*', + 'USE_PROFPARSER = FALSE' + ) + + # A bit risky here deleting all /usr and /opt X + # library default search paths in makefile + makefile.filter( + r'^.*\b(usr|opt)\b.*$', + '# Spack removed INCLUDE_LOCATIONS and LIBRARY_LOCATIONS' + ) + + # Read GNUmakefile into array + with open('GNUmakefile', 'r') as file: + contents = file.readlines() + + # Edit GNUmakefile includes and libraries to point to Spack + # dependencies. + # The safest bet is to put the LIBRARY_LOCATIONS and + # INCLUDE_LOCATIONS at the beginning of the makefile. + line_offset = 0 + count = 0 + for lib in ['libsm', 'libice', 'libxpm', 'libx11', + 'libxt', 'libxext', 'motif']: + contents.insert( + line_offset + count, + 'LIBRARY_LOCATIONS += {0}\n'.format(spec[lib].prefix.lib) + ) + contents.insert( + line_offset + count + 1, + 'INCLUDE_LOCATIONS += {0}\n'.format(spec[lib].prefix.include) + ) + count += 1 + + # Write GNUmakefile + with open('GNUmakefile', 'w') as file: + file.writelines(contents) + + def setup_environment(self, spack_env, run_env): + # Help force Amrvis to not pick up random system compilers + if '+mpi' in self.spec: + spack_env.set('MPI_HOME', self.spec['mpi'].prefix) + spack_env.set('CC', spec['mpi'].mpicc) + spack_env.set('CXX', spec['mpi'].mpicxx) + spack_env.set('F77', spec['mpi'].mpif77) + spack_env.set('FC', spec['mpi'].mpifc) + + def install(self, spec, prefix): + # Install exe manually + mkdirp(prefix.bin) + exes = glob.iglob('*.ex') + for exe in exes: + install(exe, prefix.bin) -- cgit v1.2.3-70-g09d2 From 2601fd66f6a3251ac0066b437c84077606e9beb8 Mon Sep 17 00:00:00 2001 From: 健美猞猁 Date: Tue, 3 Jul 2018 01:46:46 +0800 Subject: Bump gradle to 4.8.1. (#8625) --- var/spack/repos/builtin/packages/gradle/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gradle/package.py b/var/spack/repos/builtin/packages/gradle/package.py index 483ebb95aa..055aac845f 100644 --- a/var/spack/repos/builtin/packages/gradle/package.py +++ b/var/spack/repos/builtin/packages/gradle/package.py @@ -37,6 +37,7 @@ class Gradle(Package): homepage = "https://gradle.org" url = "https://services.gradle.org/distributions/gradle-3.4-all.zip" + version('4.8.1', 'bf87b4c64bb6a43861f1964fb8a7f3bc') version('3.4', '5ae23dbd730dea22eb79cd97a072f06a') version('3.3', '355f61e9c5d092d49577765ab3712dc0') version('3.2.1', 'd44dba900ff364103e1f45c0f4b27bbe') -- cgit v1.2.3-70-g09d2 From 6f7e012cab40caf2c89006da10790c4c9bf6ee19 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Mon, 2 Jul 2018 15:17:39 -0500 Subject: byobu: update package (#8628) --- var/spack/repos/builtin/packages/byobu/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/byobu/package.py b/var/spack/repos/builtin/packages/byobu/package.py index a32886ca7d..30f2c37ce8 100644 --- a/var/spack/repos/builtin/packages/byobu/package.py +++ b/var/spack/repos/builtin/packages/byobu/package.py @@ -32,6 +32,7 @@ class Byobu(AutotoolsPackage): homepage = "http://www.byobu.co" url = "https://launchpad.net/byobu/trunk/5.123/+download/byobu_5.123.orig.tar.gz" + version('5.125', 'f90f15771325e8be9360f301b52182d2') version('5.123', '961e0072c01c78c9ce4c20d1aa1b0dc4') depends_on('tmux', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From b0f8b7130f49f17f269824b585f7c913c5df6a0f Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Mon, 2 Jul 2018 15:48:13 -0500 Subject: petsc: add in latest release 3.9.3. (#8627) xl related fixes are 3.9.3 so remove xlc-test-3.9.0.diff --- var/spack/repos/builtin/packages/petsc/package.py | 3 +- .../builtin/packages/petsc/xlc-test-3.9.0.diff | 60 ---------------------- 2 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/petsc/xlc-test-3.9.0.diff (limited to 'var') diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index 552baa4ad6..52d7314e91 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -42,6 +42,7 @@ class Petsc(Package): version('develop', git='https://bitbucket.org/petsc/petsc.git', branch='master') version('xsdk-0.2.0', git='https://bitbucket.org/petsc/petsc.git', tag='xsdk-0.2.0') + version('3.9.3', '7b71d705f66f9961cb0e2da3f9da79a1') version('3.9.2', '8bedc0cd8c8603d54bfd99a6e8f77b3d') version('3.9.1', 'd3a229a188dbeef9b3f29b9a63622fad') version('3.9.0', '34b8a81814ca050a96d58e53a2f0ac7a') @@ -103,8 +104,6 @@ class Petsc(Package): patch('macos-clang-8.1.0.diff', when='@3.7.5%clang@8.1.0:') patch('pkg-config-3.7.6-3.8.4.diff', when='@3.7.6:3.8.4') - patch('xlc-test-3.9.0.diff', when='@3.9: %xl') - patch('xlc-test-3.9.0.diff', when='@3.9: %xl_r') # Virtual dependencies # Git repository needs sowing to build Fortran interface diff --git a/var/spack/repos/builtin/packages/petsc/xlc-test-3.9.0.diff b/var/spack/repos/builtin/packages/petsc/xlc-test-3.9.0.diff deleted file mode 100644 index ce41cfaed5..0000000000 --- a/var/spack/repos/builtin/packages/petsc/xlc-test-3.9.0.diff +++ /dev/null @@ -1,60 +0,0 @@ ---- a/gmakefile.test -+++ b/gmakefile.test -@@ -123,15 +123,16 @@ - ifeq ($(FC_MODULE_OUTPUT_FLAG),) - $(call quiet,FCMOD) $(MODDIR) && $(FC) -c $(FC_FLAGS) $(FFLAGS) $(FCPPFLAGS) $(FC_DEPFLAGS) -I$(dir $<) $(abspath $<) -o $(abspath $@) - else -- $(PETSC_COMPILE.F) -I$(dir $<) $(abspath $<) -o $@ $(FC_MODULE_OUTPUT_FLAG)$(MODDIR) -+ $(PETSC_COMPILE.F) -I$(dir $<) -I$(MODDIR) $(abspath $<) -o $@ $(FC_MODULE_OUTPUT_FLAG)$(MODDIR) - endif - -@$(GFORTRAN_DEP_CLEANUP) - -+XLF2003FLAGS = "-qxlf2003=polymorphic:bozlitargs:stopexcept:volatile:autorealloc" - $(TESTDIR)/%.o : $(EXAMPLESDIR)/%.F90 | $$(@D)/.DIR - ifeq ($(FC_MODULE_OUTPUT_FLAG),) - $(call quiet,FCMOD) $(MODDIR) && $(FC) -c $(FC_FLAGS) $(FFLAGS) $(FCPPFLAGS) $(FC_DEPFLAGS) -I$(dir $<) $(abspath $<) -o $(abspath $@) - else -- $(PETSC_COMPILE.F) -I$(dir $<) $(abspath $<) -o $@ $(FC_MODULE_OUTPUT_FLAG)$(MODDIR) -+ $(PETSC_COMPILE.F) ${XLF2003FLAGS} -I$(dir $<) -I$(MODDIR) $(abspath $<) -o $@ $(FC_MODULE_OUTPUT_FLAG)$(MODDIR) - endif - -@$(GFORTRAN_DEP_CLEANUP) - ---- a/src/ksp/ksp/examples/tutorials/ex6f.F90 -+++ b/src/ksp/ksp/examples/tutorials/ex6f.F90 -@@ -173,7 +173,7 @@ - call PetscOptionsHasName(PETSC_NULL_OPTIONS,PETSC_NULL_CHARACTER,'-mat_view',pflag,ierr) - if (pflag) then - if (rank .eq. 0) write(6,100) -- call flush(6) -+ call flush_(6) - endif - call MatConvert(A,MATSAME,MAT_INITIAL_MATRIX,A2,ierr) - ! All other times: Set previous solution as initial guess for next solve. -@@ -190,7 +190,7 @@ - call MatAssemblyBegin(A,MAT_FINAL_ASSEMBLY,ierr) - if (pflag) then - if (rank .eq. 0) write(6,110) -- call flush(6) -+ call flush_(6) - endif - call MatAssemblyEnd(A,MAT_FINAL_ASSEMBLY,ierr) - ---- a/src/vec/vec/examples/tutorials/ex21.c -+++ b/src/vec/vec/examples/tutorials/ex21.c -@@ -8,13 +8,13 @@ - #define f90array1daccessmystruct_ F90ARRAY1DACCESSMYSTRUCT - #define f90array1ddestroymystruct_ F90ARRAY1DDESTROYMYSTRUCT - #define f90array1dgetaddrmystruct_ F90ARRAY1DGETADDRMYSTRUCT --#elif !defined(PETSC_HAVE_FORTRAN_UNDERSCORE) -+#elif defined(PETSC_HAVE_FORTRAN_NOUNDERSCORE) - #define vecgetarraymystruct_ vecgetarraymystruct - #define vecrestorearraymystruct_ vecrestorearraymystruct - #define f90array1dcreatemystruct_ f90array1dcreatemystruct - #define f90array1daccessmystruct_ f90array1daccessmystruct - #define f90array1ddestroymystruct_ f90array1ddestroymystruct --#define f90array1dgetaddrmystruc_ f90array1dgetaddrmystruct -+#define f90array1dgetaddrmystruct_ f90array1dgetaddrmystruct - #endif - - PETSC_EXTERN void PETSC_STDCALL f90array1dcreatemystruct_(void *,PetscInt *,PetscInt *,F90Array1d * PETSC_F90_2PTR_PROTO_NOVAR); - -- cgit v1.2.3-70-g09d2 From c987987ca4a64d40a371f28b9f34f456a6ee958a Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Mon, 2 Jul 2018 16:03:22 -0500 Subject: screen: update package (#8630) --- var/spack/repos/builtin/packages/screen/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/screen/package.py b/var/spack/repos/builtin/packages/screen/package.py index 7d70f276f0..40bcf4b5b4 100644 --- a/var/spack/repos/builtin/packages/screen/package.py +++ b/var/spack/repos/builtin/packages/screen/package.py @@ -33,6 +33,7 @@ class Screen(AutotoolsPackage): homepage = "https://www.gnu.org/software/screen/" url = "http://ftp.gnu.org/gnu/screen/screen-4.3.1.tar.gz" + version('4.6.2', 'a0f529d3333b128dfaa324d978ba73a8') version('4.3.1', '5bb3b0ff2674e29378c31ad3411170ad') version('4.3.0', 'f76d28eadc4caaf6cdff00685ae6ad46') version('4.2.1', '419a0594e2b25039239af8b90eda7d92') -- cgit v1.2.3-70-g09d2 From 30a6a1750755b03a0e1abcaf7b11770bd9b53a24 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Mon, 2 Jul 2018 21:33:44 -0500 Subject: Pxz: new package (#8631) --- var/spack/repos/builtin/packages/pxz/package.py | 43 +++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 var/spack/repos/builtin/packages/pxz/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pxz/package.py b/var/spack/repos/builtin/packages/pxz/package.py new file mode 100644 index 0000000000..1c7084e392 --- /dev/null +++ b/var/spack/repos/builtin/packages/pxz/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Pxz(MakefilePackage): + """Pxz is a parallel LZMA compressor using liblzma.""" + + homepage = "https://jnovy.fedorapeople.org/pxz/pxz.html" + url = "http://jnovy.fedorapeople.org/pxz/pxz-4.999.9beta.20091201git.tar.xz" + + version('develop', git='https://github.com/jnovy/pxz') + version('4.999.9beta.20091201git', '4ae3926185978f5c95c9414dc4634451') + + depends_on('lzma') + + conflicts('platform=darwin', msg='Pxz runs only on Linux.') + + def install(self, spec, prefix): + make('install', "DESTDIR=%s" % prefix, + "BINDIR=/bin", "MANDIR=/share/man") -- cgit v1.2.3-70-g09d2 From 6c24f686ce90206e75a300a5b95fc0c1006840ff Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 2 Jul 2018 22:47:56 -0500 Subject: Fix base class for py-pyserial (#8633) --- var/spack/repos/builtin/packages/py-pyserial/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pyserial/package.py b/var/spack/repos/builtin/packages/py-pyserial/package.py index 0bbf9826f8..289e87712b 100644 --- a/var/spack/repos/builtin/packages/py-pyserial/package.py +++ b/var/spack/repos/builtin/packages/py-pyserial/package.py @@ -25,7 +25,7 @@ from spack import * -class PyPyserial(Package): +class PyPyserial(PythonPackage): """Python Serial Port Extension""" homepage = "https://github.com/pyserial/pyserial" -- cgit v1.2.3-70-g09d2 From 52a997208c5bd39b5cb406a5bc0eb866fbceb01b Mon Sep 17 00:00:00 2001 From: 健美猞猁 Date: Tue, 3 Jul 2018 23:03:49 +0800 Subject: Bump sbt to 1.1.6. (#8634) --- var/spack/repos/builtin/packages/sbt/package.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sbt/package.py b/var/spack/repos/builtin/packages/sbt/package.py index 17aa4800eb..d5eecc145c 100644 --- a/var/spack/repos/builtin/packages/sbt/package.py +++ b/var/spack/repos/builtin/packages/sbt/package.py @@ -32,11 +32,10 @@ class Sbt(Package): homepage = 'http://www.scala-sbt.org' url = "https://github.com/sbt/sbt/releases/download/v1.1.4/sbt-1.1.4.tgz" + version('1.1.6', 'd307b131ed041c783ac5ed7bbb4768dc') version('1.1.5', 'b771480feb07f98fa8cd6d787c8d4485') version('1.1.4', 'c71e5fa846164d14d4cd450520d66c6a') version('0.13.17', 'c52c6152cc7aadfd1f0736a1a5d0a5b8') - version('0.13.12', 'cec3071d46ef13334c8097cc3467ff28', - url="https://dl.bintray.com/sbt/native-packages/sbt/0.13.12/sbt-0.13.12.tgz") depends_on('java') -- cgit v1.2.3-70-g09d2 From 9a60698ef8296665045b50275ec1a4891d695e80 Mon Sep 17 00:00:00 2001 From: 健美猞猁 Date: Tue, 3 Jul 2018 23:08:22 +0800 Subject: Add new versions for log4cplus. (#8621) * Add new versions for log4cplus. * Update log4cplus versions. * Add urls. * Add url_for_version. * Remove url_for_version. --- var/spack/repos/builtin/packages/log4cplus/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/log4cplus/package.py b/var/spack/repos/builtin/packages/log4cplus/package.py index 435c070f30..d401d8eee0 100644 --- a/var/spack/repos/builtin/packages/log4cplus/package.py +++ b/var/spack/repos/builtin/packages/log4cplus/package.py @@ -31,6 +31,8 @@ class Log4cplus(CMakePackage): granular control over log management and configuration.""" homepage = "https://sourceforge.net/projects/log4cplus/" - url = "https://nchc.dl.sourceforge.net/project/log4cplus/log4cplus-stable/1.2.0/log4cplus-1.2.0.tar.gz" + url = "https://download.sourceforge.net/project/log4cplus/log4cplus-stable/2.0.1/log4cplus-2.0.1.tar.bz2" + version('2.0.1', 'ec01c03241ebd31127a44d1880830d8f') + version('1.2.1', 'e4e6c38b065b70b5d6efc238a5106bc9') version('1.2.0', 'e250f0f431c0723f8b625323e7b6465d') -- cgit v1.2.3-70-g09d2 From aab5488154c819c8db841f08a5e7906c5ccb359d Mon Sep 17 00:00:00 2001 From: becker33 Date: Tue, 3 Jul 2018 14:25:12 -0700 Subject: disable openblas intel openmp patch for versions > 0.2.20, fixed upstream (#8638) --- var/spack/repos/builtin/packages/openblas/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openblas/package.py b/var/spack/repos/builtin/packages/openblas/package.py index 434a6171df..d70e86dd3b 100644 --- a/var/spack/repos/builtin/packages/openblas/package.py +++ b/var/spack/repos/builtin/packages/openblas/package.py @@ -78,7 +78,7 @@ class Openblas(MakefilePackage): # https://github.com/xianyi/OpenBLAS/pull/915 # UPD: the patch has been merged starting version 0.2.20 patch('openblas_icc.patch', when='@:0.2.19%intel') - patch('openblas_icc_openmp.patch', when='%intel@16.0:') + patch('openblas_icc_openmp.patch', when='@:0.2.20%intel@16.0:') patch('openblas_icc_fortran.patch', when='%intel@16.0:') patch('openblas_icc_fortran2.patch', when='%intel@18.0:') -- cgit v1.2.3-70-g09d2 From 81668c524bcea8cb60a6a8efd16b576c757f1dbf Mon Sep 17 00:00:00 2001 From: Matthias Wolf Date: Wed, 4 Jul 2018 14:24:39 +0200 Subject: Parquet: new packages (#8601) * parquet: new package Includes the following dependencies: * arrow * flatbuffers Changes for compilation: * snappy * thrift * zstd * parquet: improve recipes (including dependencies) * arrow: remove unused import in recipe * parquet: fix line length for flake8/py27 * parquet, arrow: fix py26 format strings * Address review comments. * arrow: simplify recipe --- var/spack/repos/builtin/packages/arrow/package.py | 74 ++++++++++++++++++++++ .../repos/builtin/packages/flatbuffers/package.py | 36 +++++++++++ .../repos/builtin/packages/parquet/package.py | 52 +++++++++++++++ var/spack/repos/builtin/packages/snappy/package.py | 7 ++ var/spack/repos/builtin/packages/thrift/package.py | 9 +++ var/spack/repos/builtin/packages/zstd/package.py | 6 ++ 6 files changed, 184 insertions(+) create mode 100644 var/spack/repos/builtin/packages/arrow/package.py create mode 100644 var/spack/repos/builtin/packages/flatbuffers/package.py create mode 100644 var/spack/repos/builtin/packages/parquet/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/arrow/package.py b/var/spack/repos/builtin/packages/arrow/package.py new file mode 100644 index 0000000000..9fcc344a32 --- /dev/null +++ b/var/spack/repos/builtin/packages/arrow/package.py @@ -0,0 +1,74 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Arrow(CMakePackage): + """A cross-language development platform for in-memory data. + + This package contains the C++ bindings. + """ + + homepage = "http://arrow.apache.org" + url = "https://github.com/apache/arrow/archive/apache-arrow-0.9.0.tar.gz" + + version('0.9.0', 'ebbd36c362b9e1d398ca612f6d2531ec') + version('0.8.0', '56436f6f61ccc68686b7e0ea30bf4d09') + + depends_on('boost@1.60:') + depends_on('cmake@3.2.0:', type='build') + depends_on('flatbuffers@1.8.0 build_type=Release') # only Release contains flatc + depends_on('rapidjson') + depends_on('snappy~shared') + depends_on('zlib+pic') + depends_on('zstd+pic') + + variant('build_type', default='Release', + description='CMake build type', + values=('Debug', 'FastDebug', 'Release')) + + root_cmakelists_dir = 'cpp' + + def patch(self): + """Prevent `-isystem /usr/include` from appearing, since this confuses gcc. + """ + filter_file(r'(include_directories\()SYSTEM ', + r'\1', + 'cpp/cmake_modules/ThirdpartyToolchain.cmake') + + def cmake_args(self): + args = [ + "-DARROW_USE_SSE=ON", + "-DARROW_BUILD_SHARED=ON", + "-DARROW_BUILD_STATIC=OFF", + "-DARROW_BUILD_TESTS=OFF", + "-DARROW_WITH_BROTLI=OFF", + "-DARROW_WITH_LZ4=OFF", + ] + for dep in ('flatbuffers', 'rapidjson', 'snappy', 'zlib', 'zstd'): + args.append("-D{0}_HOME={1}".format(dep.upper(), + self.spec[dep].prefix)) + args.append("-DZLIB_LIBRARIES={0}".format(self.spec['zlib'].libs)) + return args diff --git a/var/spack/repos/builtin/packages/flatbuffers/package.py b/var/spack/repos/builtin/packages/flatbuffers/package.py new file mode 100644 index 0000000000..0f8eecbf60 --- /dev/null +++ b/var/spack/repos/builtin/packages/flatbuffers/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Flatbuffers(CMakePackage): + """Memory Efficient Serialization Library + """ + + homepage = "http://google.github.io/flatbuffers/" + url = "https://github.com/google/flatbuffers/archive/v1.9.0.tar.gz" + + version('1.9.0', '8be7513bf960034f6873326d09521a4b') + version('1.8.0', '276cab8303c4189cbe3b8a70e0515d65') diff --git a/var/spack/repos/builtin/packages/parquet/package.py b/var/spack/repos/builtin/packages/parquet/package.py new file mode 100644 index 0000000000..91e74a97a4 --- /dev/null +++ b/var/spack/repos/builtin/packages/parquet/package.py @@ -0,0 +1,52 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Parquet(CMakePackage): + """C++ bindings for the Apache Parquet columnar data format. + """ + + homepage = "https://github.com/apache/parquet-cpp" + url = "https://github.com/apache/parquet-cpp/archive/apache-parquet-cpp-1.4.0.tar.gz" + + version('1.4.0', '3a3659e65052ef5a76fb88e4922283b9') + + depends_on('arrow') + depends_on('boost') + depends_on('cmake@3.2.0:', type='build') + depends_on('pkgconfig', type='build') + depends_on('thrift+pic') + + variant('build_type', default='Release', + description='CMake build type', + values=('Debug', 'FastDebug', 'Release')) + + def cmake_args(self): + args = ['-DPARQUET_USE_SSE=OFF', '-DPARQUET_BUILD_TESTS=OFF'] + for dep in ('arrow', 'thrift'): + args.append("-D{0}_HOME={1}".format(dep.upper(), + self.spec[dep].prefix)) + return args diff --git a/var/spack/repos/builtin/packages/snappy/package.py b/var/spack/repos/builtin/packages/snappy/package.py index 89ea5b0055..cdcd192056 100644 --- a/var/spack/repos/builtin/packages/snappy/package.py +++ b/var/spack/repos/builtin/packages/snappy/package.py @@ -34,6 +34,7 @@ class Snappy(CMakePackage): version('1.1.7', 'ee9086291c9ae8deb4dac5e0b85bf54a') variant('shared', default=True, description='Build shared libraries') + variant('pic', default=True, description='Build position independent code') def cmake_args(self): spec = self.spec @@ -47,6 +48,12 @@ class Snappy(CMakePackage): return args + def flag_handler(self, name, flags): + flags = list(flags) + if '+pic' in self.spec and name in ('cflags', 'cxxflags'): + flags.append(self.compiler.pic_flag) + return (None, None, flags) + @run_after('install') def install_pkgconfig(self): mkdirp(self.prefix.lib.pkgconfig) diff --git a/var/spack/repos/builtin/packages/thrift/package.py b/var/spack/repos/builtin/packages/thrift/package.py index 48841db49a..262aa9b106 100644 --- a/var/spack/repos/builtin/packages/thrift/package.py +++ b/var/spack/repos/builtin/packages/thrift/package.py @@ -38,6 +38,7 @@ class Thrift(Package): homepage = "http://thrift.apache.org" url = "http://apache.mirrors.ionfish.org/thrift/0.9.2/thrift-0.9.2.tar.gz" + version('0.11.0', '0be59730ebce071eceaf6bfdb8d3a20e') version('0.10.0', '795c5dd192e310ffff38cfd9430d6b29') version('0.9.3', '88d667a8ae870d5adeca8cb7d6795442') version('0.9.2', '89f63cc4d0100912f4a1f8a9dee63678') @@ -45,6 +46,8 @@ class Thrift(Package): # Currently only support for c-family and python variant('c', default=True, description="Build support for C-family languages") + variant('pic', default=True, + description='Build position independent code') variant('python', default=True, description="Build support for python") @@ -63,6 +66,11 @@ class Thrift(Package): depends_on('zlib', when='+c') depends_on('libevent', when='+c') + def setup_environment(self, spack_env, run_env): + if '+pic' in self.spec: + spack_env.append_flags('CFLAGS', self.compiler.pic_flag) + spack_env.append_flags('CXXFLAGS', self.compiler.pic_flag) + def install(self, spec, prefix): env['PY_PREFIX'] = prefix env['JAVA_HOME'] = spec['java'].prefix @@ -73,6 +81,7 @@ class Thrift(Package): options.append('--with-boost=%s' % spec['boost'].prefix) options.append('--enable-tests=no') + options.append('--with-nodejs=no') options.append('--with-c=%s' % ('yes' if '+c' in spec else 'no')) options.append('--with-python=%s' % ('yes' if '+python' in spec else 'no')) diff --git a/var/spack/repos/builtin/packages/zstd/package.py b/var/spack/repos/builtin/packages/zstd/package.py index 82fe0a0e4a..dea374f931 100644 --- a/var/spack/repos/builtin/packages/zstd/package.py +++ b/var/spack/repos/builtin/packages/zstd/package.py @@ -36,5 +36,11 @@ class Zstd(MakefilePackage): version('1.3.0', '888660a850e33c2dcc7c4f9d0b04d347') version('1.1.2', '4c57a080d194bdaac83f2d3251fc7ffc') + variant('pic', default=True, description='Build position independent code') + + def setup_environment(self, spack_env, run_env): + if '+pic' in self.spec: + spack_env.append_flags('CFLAGS', self.compiler.pic_flag) + def install(self, spec, prefix): make('install', 'PREFIX={0}'.format(prefix)) -- cgit v1.2.3-70-g09d2 From 8a1bbc5d84c92cc204fcf24d8674007965f84a60 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Wed, 4 Jul 2018 14:39:07 +0200 Subject: gcc: Fix build of older versions with recent versions of glibc (#8510) --- var/spack/repos/builtin/packages/gcc/package.py | 10 ++ var/spack/repos/builtin/packages/gcc/signal.patch | 28 +++ .../repos/builtin/packages/gcc/stack_t-4.9.patch | 80 +++++++++ var/spack/repos/builtin/packages/gcc/stack_t.patch | 88 ++++++++++ .../builtin/packages/gcc/ucontext_t-java.patch | 60 +++++++ .../repos/builtin/packages/gcc/ucontext_t.patch | 189 +++++++++++++++++++++ 6 files changed, 455 insertions(+) create mode 100644 var/spack/repos/builtin/packages/gcc/signal.patch create mode 100644 var/spack/repos/builtin/packages/gcc/stack_t-4.9.patch create mode 100644 var/spack/repos/builtin/packages/gcc/stack_t.patch create mode 100644 var/spack/repos/builtin/packages/gcc/ucontext_t-java.patch create mode 100644 var/spack/repos/builtin/packages/gcc/ucontext_t.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py index d4180d1c50..fb176edcff 100644 --- a/var/spack/repos/builtin/packages/gcc/package.py +++ b/var/spack/repos/builtin/packages/gcc/package.py @@ -171,6 +171,16 @@ class Gcc(AutotoolsPackage): patch('piclibs.patch', when='+piclibs') patch('gcc-backport.patch', when='@4.7:4.9.2,5:5.3') + # Older versions do not compile with newer versions of glibc + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81712 + patch('ucontext_t.patch', when='@4.9,5.1:5.4,6.1:6.4,7.1') + patch('ucontext_t-java.patch', when='@4.9,5.1:5.4,6.1:6.4 languages=java') + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81066 + patch('stack_t-4.9.patch', when='@4.9') + patch('stack_t.patch', when='@5.1:5.4,6.1:6.4,7.1') + # https://bugs.busybox.net/show_bug.cgi?id=10061 + patch('signal.patch', when='@4.9,5.1:5.4') + build_directory = 'spack-build' def url_for_version(self, version): diff --git a/var/spack/repos/builtin/packages/gcc/signal.patch b/var/spack/repos/builtin/packages/gcc/signal.patch new file mode 100644 index 0000000000..21bf9e030f --- /dev/null +++ b/var/spack/repos/builtin/packages/gcc/signal.patch @@ -0,0 +1,28 @@ +From 6c709b6262e8b6441b1e94526d6d65d4ce7a7dec Mon Sep 17 00:00:00 2001 +From: doko +Date: Thu, 7 Sep 2017 07:18:57 +0000 +Subject: [PATCH] 2017-09-07 Matthias Klose + + * asan/asan_linux.cc: Include + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@251830 138bc75d-0d04-0410-961f-82ee72b054a4 +--- + libsanitizer/asan/asan_linux.cc | 1 + + 2 files changed, 5 insertions(+) + +diff --git a/libsanitizer/asan/asan_linux.cc b/libsanitizer/asan/asan_linux.cc +index c504168..59087b9 100644 +--- a/libsanitizer/asan/asan_linux.cc ++++ b/libsanitizer/asan/asan_linux.cc +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.9.3 + diff --git a/var/spack/repos/builtin/packages/gcc/stack_t-4.9.patch b/var/spack/repos/builtin/packages/gcc/stack_t-4.9.patch new file mode 100644 index 0000000000..b894557c8c --- /dev/null +++ b/var/spack/repos/builtin/packages/gcc/stack_t-4.9.patch @@ -0,0 +1,80 @@ +From 833e00c01e96f61e24cd7ec97b93fad212dc914b Mon Sep 17 00:00:00 2001 +From: doko +Date: Thu, 7 Sep 2017 07:17:17 +0000 +Subject: [PATCH] 2017-09-07 Matthias Klose + + Backported from mainline + 2017-07-14 Jakub Jelinek + + PR sanitizer/81066 + * sanitizer_common/sanitizer_linux.h: Cherry-pick upstream r307969. + * sanitizer_common/sanitizer_linux.cc: Likewise. + * sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc: Likewise. + * tsan/tsan_platform_linux.cc: Likewise. + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@251829 138bc75d-0d04-0410-961f-82ee72b054a4 +--- + libsanitizer/sanitizer_common/sanitizer_linux.cc | 3 +-- + libsanitizer/sanitizer_common/sanitizer_linux.h | 4 +--- + .../sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc | 2 +- + libsanitizer/tsan/tsan_platform_linux.cc | 2 +- + 5 files changed, 15 insertions(+), 7 deletions(-) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc +index 9feb307..821b26d 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_linux.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc +@@ -514,8 +514,7 @@ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5) { + } + #endif + +-uptr internal_sigaltstack(const struct sigaltstack *ss, +- struct sigaltstack *oss) { ++uptr internal_sigaltstack(const void *ss, void *oss) { + return internal_syscall(__NR_sigaltstack, (uptr)ss, (uptr)oss); + } + +diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.h b/libsanitizer/sanitizer_common/sanitizer_linux.h +index 086834c..3a6f4cd 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_linux.h ++++ b/libsanitizer/sanitizer_common/sanitizer_linux.h +@@ -27,8 +26,7 @@ struct linux_dirent; + // Syscall wrappers. + uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count); + uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5); +-uptr internal_sigaltstack(const struct sigaltstack* ss, +- struct sigaltstack* oss); ++uptr internal_sigaltstack(const void* ss, void* oss); + uptr internal_sigaction(int signum, const __sanitizer_kernel_sigaction_t *act, + __sanitizer_kernel_sigaction_t *oldact); + uptr internal_sigprocmask(int how, __sanitizer_kernel_sigset_t *set, +diff --git a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc +index 5881202..c54894d 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc +@@ -234,7 +234,7 @@ static int TracerThread(void* argument) { + + // Alternate stack for signal handling. + InternalScopedBuffer handler_stack_memory(kHandlerStackSize); +- struct sigaltstack handler_stack; ++ stack_t handler_stack; + internal_memset(&handler_stack, 0, sizeof(handler_stack)); + handler_stack.ss_sp = handler_stack_memory.data(); + handler_stack.ss_size = kHandlerStackSize; +diff --git a/libsanitizer/tsan/tsan_platform_linux.cc b/libsanitizer/tsan/tsan_platform_linux.cc +index 3259131..b8e9078 100644 +--- a/libsanitizer/tsan/tsan_platform_linux.cc ++++ b/libsanitizer/tsan/tsan_platform_linux.cc +@@ -377,7 +377,7 @@ bool IsGlobalVar(uptr addr) { + int ExtractResolvFDs(void *state, int *fds, int nfd) { + #if SANITIZER_LINUX + int cnt = 0; +- __res_state *statp = (__res_state*)state; ++ struct __res_state *statp = (struct __res_state*)state; + for (int i = 0; i < MAXNS && cnt < nfd; i++) { + if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1) + fds[cnt++] = statp->_u._ext.nssocks[i]; +-- +2.9.3 + diff --git a/var/spack/repos/builtin/packages/gcc/stack_t.patch b/var/spack/repos/builtin/packages/gcc/stack_t.patch new file mode 100644 index 0000000000..48a5a47ade --- /dev/null +++ b/var/spack/repos/builtin/packages/gcc/stack_t.patch @@ -0,0 +1,88 @@ +From 833e00c01e96f61e24cd7ec97b93fad212dc914b Mon Sep 17 00:00:00 2001 +From: doko +Date: Thu, 7 Sep 2017 07:17:17 +0000 +Subject: [PATCH] 2017-09-07 Matthias Klose + + Backported from mainline + 2017-07-14 Jakub Jelinek + + PR sanitizer/81066 + * sanitizer_common/sanitizer_linux.h: Cherry-pick upstream r307969. + * sanitizer_common/sanitizer_linux.cc: Likewise. + * sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc: Likewise. + * tsan/tsan_platform_linux.cc: Likewise. + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@251829 138bc75d-0d04-0410-961f-82ee72b054a4 +--- + libsanitizer/sanitizer_common/sanitizer_linux.cc | 3 +-- + libsanitizer/sanitizer_common/sanitizer_linux.h | 4 +--- + .../sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc | 2 +- + libsanitizer/tsan/tsan_platform_linux.cc | 2 +- + 5 files changed, 15 insertions(+), 7 deletions(-) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc +index 9feb307..821b26d 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_linux.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc +@@ -514,8 +514,7 @@ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5) { + } + #endif + +-uptr internal_sigaltstack(const struct sigaltstack *ss, +- struct sigaltstack *oss) { ++uptr internal_sigaltstack(const void *ss, void *oss) { + return internal_syscall(SYSCALL(sigaltstack), (uptr)ss, (uptr)oss); + } + +diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.h b/libsanitizer/sanitizer_common/sanitizer_linux.h +index 086834c..3a6f4cd 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_linux.h ++++ b/libsanitizer/sanitizer_common/sanitizer_linux.h +@@ -18,7 +18,6 @@ + #include "sanitizer_platform_limits_posix.h" + + struct link_map; // Opaque type returned by dlopen(). +-struct sigaltstack; + + namespace __sanitizer { + // Dirent structure for getdents(). Note that this structure is different from +@@ -27,8 +26,7 @@ struct linux_dirent; + + // Syscall wrappers. + uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count); +-uptr internal_sigaltstack(const struct sigaltstack* ss, +- struct sigaltstack* oss); ++uptr internal_sigaltstack(const void* ss, void* oss); + uptr internal_sigprocmask(int how, __sanitizer_sigset_t *set, + __sanitizer_sigset_t *oldset); + void internal_sigfillset(__sanitizer_sigset_t *set); +diff --git a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc +index 5881202..c54894d 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc +@@ -234,7 +234,7 @@ static int TracerThread(void* argument) { + + // Alternate stack for signal handling. + InternalScopedBuffer handler_stack_memory(kHandlerStackSize); +- struct sigaltstack handler_stack; ++ stack_t handler_stack; + internal_memset(&handler_stack, 0, sizeof(handler_stack)); + handler_stack.ss_sp = handler_stack_memory.data(); + handler_stack.ss_size = kHandlerStackSize; +diff --git a/libsanitizer/tsan/tsan_platform_linux.cc b/libsanitizer/tsan/tsan_platform_linux.cc +index 3259131..b8e9078 100644 +--- a/libsanitizer/tsan/tsan_platform_linux.cc ++++ b/libsanitizer/tsan/tsan_platform_linux.cc +@@ -377,7 +377,7 @@ bool IsGlobalVar(uptr addr) { + int ExtractResolvFDs(void *state, int *fds, int nfd) { + #if SANITIZER_LINUX + int cnt = 0; +- __res_state *statp = (__res_state*)state; ++ struct __res_state *statp = (struct __res_state*)state; + for (int i = 0; i < MAXNS && cnt < nfd; i++) { + if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1) + fds[cnt++] = statp->_u._ext.nssocks[i]; +-- +2.9.3 + diff --git a/var/spack/repos/builtin/packages/gcc/ucontext_t-java.patch b/var/spack/repos/builtin/packages/gcc/ucontext_t-java.patch new file mode 100644 index 0000000000..a43e0b5aa2 --- /dev/null +++ b/var/spack/repos/builtin/packages/gcc/ucontext_t-java.patch @@ -0,0 +1,60 @@ +From 9b9287cde20ea57578cf07efb2a96ed4cc0da36f Mon Sep 17 00:00:00 2001 +From: doko +Date: Thu, 7 Sep 2017 07:22:07 +0000 +Subject: [PATCH] 2017-09-07 Matthias Klose + + * include/x86_64-signal.h (HANDLE_DIVIDE_OVERFLOW): Replace + 'struct ucontext' with ucontext_t. + * include/i386-signal.h (HANDLE_DIVIDE_OVERFLOW): Likewise. + * include/s390-signal.h (HANDLE_DIVIDE_OVERFLOW): Likewise. + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@251832 138bc75d-0d04-0410-961f-82ee72b054a4 +--- + libjava/include/i386-signal.h | 2 +- + libjava/include/s390-signal.h | 2 +- + libjava/include/x86_64-signal.h | 2 +- + 4 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/libjava/include/i386-signal.h b/libjava/include/i386-signal.h +index c2409b0..ef77e7e 100644 +--- a/libjava/include/i386-signal.h ++++ b/libjava/include/i386-signal.h +@@ -29,7 +29,7 @@ static void _Jv_##_name (int, siginfo_t *, \ + #define HANDLE_DIVIDE_OVERFLOW \ + do \ + { \ +- struct ucontext *_uc = (struct ucontext *)_p; \ ++ ucontext_t *_uc = (ucontext_t *)_p; \ + gregset_t &_gregs = _uc->uc_mcontext.gregs; \ + unsigned char *_eip = (unsigned char *)_gregs[REG_EIP]; \ + \ +diff --git a/libjava/include/s390-signal.h b/libjava/include/s390-signal.h +index 4ca4c10..9261b52 100644 +--- a/libjava/include/s390-signal.h ++++ b/libjava/include/s390-signal.h +@@ -51,7 +51,7 @@ do \ + struct \ + { \ + unsigned long int uc_flags; \ +- struct ucontext *uc_link; \ ++ ucontext_t *uc_link; \ + stack_t uc_stack; \ + mcontext_t uc_mcontext; \ + unsigned long sigmask[2]; \ +diff --git a/libjava/include/x86_64-signal.h b/libjava/include/x86_64-signal.h +index 12383b5..e36c5a3 100644 +--- a/libjava/include/x86_64-signal.h ++++ b/libjava/include/x86_64-signal.h +@@ -28,7 +28,7 @@ static void _Jv_##_name (int, siginfo_t *, \ + #define HANDLE_DIVIDE_OVERFLOW \ + do \ + { \ +- struct ucontext *_uc = (struct ucontext *)_p; \ ++ ucontext_t *_uc = (ucontext_t *)_p; \ + gregset_t &_gregs = _uc->uc_mcontext.gregs; \ + unsigned char *_rip = (unsigned char *)_gregs[REG_RIP]; \ + \ +-- +2.9.3 + diff --git a/var/spack/repos/builtin/packages/gcc/ucontext_t.patch b/var/spack/repos/builtin/packages/gcc/ucontext_t.patch new file mode 100644 index 0000000000..a4f04b4715 --- /dev/null +++ b/var/spack/repos/builtin/packages/gcc/ucontext_t.patch @@ -0,0 +1,189 @@ +From ecf0d1a107133c715763940c2b197aa814710e1b Mon Sep 17 00:00:00 2001 +From: jsm28 +Date: Tue, 4 Jul 2017 10:25:10 +0000 +Subject: [PATCH] Use ucontext_t not struct ucontext in linux-unwind.h files. + +Current glibc no longer gives the ucontext_t type the tag struct +ucontext, to conform with POSIX namespace rules. This requires +various linux-unwind.h files in libgcc, that were previously using +struct ucontext, to be fixed to use ucontext_t instead. This is +similar to the removal of the struct siginfo tag from siginfo_t some +years ago. + +This patch changes those files to use ucontext_t instead. As the +standard name that should be unconditionally safe, so this is not +restricted to architectures supported by glibc, or conditioned on the +glibc version. + +Tested compilation together with current glibc with glibc's +build-many-glibcs.py. + + * config/aarch64/linux-unwind.h (aarch64_fallback_frame_state), + config/alpha/linux-unwind.h (alpha_fallback_frame_state), + config/bfin/linux-unwind.h (bfin_fallback_frame_state), + config/i386/linux-unwind.h (x86_64_fallback_frame_state, + x86_fallback_frame_state), config/m68k/linux-unwind.h (struct + uw_ucontext), config/nios2/linux-unwind.h (struct nios2_ucontext), + config/pa/linux-unwind.h (pa32_fallback_frame_state), + config/sh/linux-unwind.h (sh_fallback_frame_state), + config/tilepro/linux-unwind.h (tile_fallback_frame_state), + config/xtensa/linux-unwind.h (xtensa_fallback_frame_state): Use + ucontext_t instead of struct ucontext. + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@249958 138bc75d-0d04-0410-961f-82ee72b054a4 +--- + libgcc/config/aarch64/linux-unwind.h | 2 +- + libgcc/config/alpha/linux-unwind.h | 2 +- + libgcc/config/bfin/linux-unwind.h | 2 +- + libgcc/config/i386/linux-unwind.h | 4 ++-- + libgcc/config/m68k/linux-unwind.h | 2 +- + libgcc/config/nios2/linux-unwind.h | 2 +- + libgcc/config/pa/linux-unwind.h | 2 +- + libgcc/config/sh/linux-unwind.h | 2 +- + libgcc/config/tilepro/linux-unwind.h | 2 +- + libgcc/config/xtensa/linux-unwind.h | 2 +- + 11 files changed, 25 insertions(+), 11 deletions(-) + +diff --git a/libgcc/config/aarch64/linux-unwind.h b/libgcc/config/aarch64/linux-unwind.h +index 86d17b1..909f68f 100644 +--- a/libgcc/config/aarch64/linux-unwind.h ++++ b/libgcc/config/aarch64/linux-unwind.h +@@ -52,7 +52,7 @@ aarch64_fallback_frame_state (struct _Unwind_Context *context, + struct rt_sigframe + { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + }; + + struct rt_sigframe *rt_; +diff --git a/libgcc/config/alpha/linux-unwind.h b/libgcc/config/alpha/linux-unwind.h +index d65474f..9a226b1 100644 +--- a/libgcc/config/alpha/linux-unwind.h ++++ b/libgcc/config/alpha/linux-unwind.h +@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context, + { + struct rt_sigframe { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_ = context->cfa; + sc = &rt_->uc.uc_mcontext; + } +diff --git a/libgcc/config/bfin/linux-unwind.h b/libgcc/config/bfin/linux-unwind.h +index 0c270e4..7fa95d2 100644 +--- a/libgcc/config/bfin/linux-unwind.h ++++ b/libgcc/config/bfin/linux-unwind.h +@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context, + void *puc; + char retcode[8]; + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_ = context->cfa; + + /* The void * cast is necessary to avoid an aliasing warning. +diff --git a/libgcc/config/i386/linux-unwind.h b/libgcc/config/i386/linux-unwind.h +index e54bf73..d35fc45 100644 +--- a/libgcc/config/i386/linux-unwind.h ++++ b/libgcc/config/i386/linux-unwind.h +@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context, + if (*(unsigned char *)(pc+0) == 0x48 + && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL) + { +- struct ucontext *uc_ = context->cfa; ++ ucontext_t *uc_ = context->cfa; + /* The void * cast is necessary to avoid an aliasing warning. + The aliasing warning is correct, but should not be a problem + because it does not alias anything. */ +@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind_Context *context, + siginfo_t *pinfo; + void *puc; + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_ = context->cfa; + /* The void * cast is necessary to avoid an aliasing warning. + The aliasing warning is correct, but should not be a problem +diff --git a/libgcc/config/m68k/linux-unwind.h b/libgcc/config/m68k/linux-unwind.h +index fb79a4d..b2f5ea4 100644 +--- a/libgcc/config/m68k/linux-unwind.h ++++ b/libgcc/config/m68k/linux-unwind.h +@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + /* is unfortunately broken right now. */ + struct uw_ucontext { + unsigned long uc_flags; +- struct ucontext *uc_link; ++ ucontext_t *uc_link; + stack_t uc_stack; + mcontext_t uc_mcontext; + unsigned long uc_filler[80]; +diff --git a/libgcc/config/nios2/linux-unwind.h b/libgcc/config/nios2/linux-unwind.h +index dff1c20..1d88afe 100644 +--- a/libgcc/config/nios2/linux-unwind.h ++++ b/libgcc/config/nios2/linux-unwind.h +@@ -38,7 +38,7 @@ struct nios2_mcontext { + + struct nios2_ucontext { + unsigned long uc_flags; +- struct ucontext *uc_link; ++ ucontext_t *uc_link; + stack_t uc_stack; + struct nios2_mcontext uc_mcontext; + sigset_t uc_sigmask; /* mask last for extensibility */ +diff --git a/libgcc/config/pa/linux-unwind.h b/libgcc/config/pa/linux-unwind.h +index 0149468..9157535 100644 +--- a/libgcc/config/pa/linux-unwind.h ++++ b/libgcc/config/pa/linux-unwind.h +@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context, + struct sigcontext *sc; + struct rt_sigframe { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *frame; + + /* rt_sigreturn trampoline: +diff --git a/libgcc/config/sh/linux-unwind.h b/libgcc/config/sh/linux-unwind.h +index e63091f..67033f0 100644 +--- a/libgcc/config/sh/linux-unwind.h ++++ b/libgcc/config/sh/linux-unwind.h +@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context, + { + struct rt_sigframe { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_ = context->cfa; + /* The void * cast is necessary to avoid an aliasing warning. + The aliasing warning is correct, but should not be a problem +diff --git a/libgcc/config/tilepro/linux-unwind.h b/libgcc/config/tilepro/linux-unwind.h +index fd83ba7..e3c9ef0 100644 +--- a/libgcc/config/tilepro/linux-unwind.h ++++ b/libgcc/config/tilepro/linux-unwind.h +@@ -61,7 +61,7 @@ tile_fallback_frame_state (struct _Unwind_Context *context, + struct rt_sigframe { + unsigned char save_area[C_ABI_SAVE_AREA_SIZE]; + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_; + + /* Return if this is not a signal handler. */ +diff --git a/libgcc/config/xtensa/linux-unwind.h b/libgcc/config/xtensa/linux-unwind.h +index 9a67b5d..98b7ea6 100644 +--- a/libgcc/config/xtensa/linux-unwind.h ++++ b/libgcc/config/xtensa/linux-unwind.h +@@ -67,7 +67,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context, + + struct rt_sigframe { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + } *rt_; + + /* movi a2, __NR_rt_sigreturn; syscall */ +-- +2.9.3 + -- cgit v1.2.3-70-g09d2 From f8f3fe5b8f16e59b4d7356df36783250d44282f2 Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Thu, 5 Jul 2018 19:33:32 -0700 Subject: added rpy2 2.9.4 and added py-jinja2 dependency (#8645) --- var/spack/repos/builtin/packages/py-rpy2/package.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-rpy2/package.py b/var/spack/repos/builtin/packages/py-rpy2/package.py index ad7a9ecf01..79deaed32f 100644 --- a/var/spack/repos/builtin/packages/py-rpy2/package.py +++ b/var/spack/repos/builtin/packages/py-rpy2/package.py @@ -35,14 +35,25 @@ class PyRpy2(PythonPackage): homepage = "https://pypi.python.org/pypi/rpy2" url = "https://pypi.io/packages/source/r/rpy2/rpy2-2.5.4.tar.gz" - version('2.5.4', '115a20ac30883f096da2bdfcab55196d') + version('2.9.4', '7df2562cdf43a0ccdd1e44ee1c16614f') + version('2.8.6', '85046aa58ba586622f67271fbca05933') version('2.5.6', 'a36e758b633ce6aec6a5f450bfee980f') + version('2.5.4', '115a20ac30883f096da2bdfcab55196d') # FIXME: Missing dependencies: # ld: cannot find -licuuc # ld: cannot find -licui18 - depends_on('py-six', type=('build', 'run')) + # All versions depends_on('py-setuptools', type='build') + depends_on('r', type=('build', 'run')) + + # @2.9.0: + depends_on('r@3.3:', when='@2.9.0:', type=('build', 'run')) + depends_on('python@3:', when='@2.9.0:', type=('build', 'run')) + depends_on('py-jinja2', when='@2.9.0:', type=('build', 'run')) + depends_on('py-six', when='@2.9.0:', type=('build', 'run')) - depends_on('r') + # @:2.8.6 + depends_on('r@2.8:', when='@:2.8.6', type=('build', 'run')) + depends_on('py-singledispatch', when='^python@:2', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 1fa22125437c4102b87b77661672690a18120026 Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Thu, 5 Jul 2018 21:34:38 -0500 Subject: ncbitoolkit: Create new package. (#8591) * ncbitoolkit: Create new package. * Fix Flake8 Error. * Add version constraints and change format. * Fix version constraints. --- .../repos/builtin/packages/ncbi-toolkit/package.py | 65 ++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 var/spack/repos/builtin/packages/ncbi-toolkit/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ncbi-toolkit/package.py b/var/spack/repos/builtin/packages/ncbi-toolkit/package.py new file mode 100644 index 0000000000..876b9ac80d --- /dev/null +++ b/var/spack/repos/builtin/packages/ncbi-toolkit/package.py @@ -0,0 +1,65 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class NcbiToolkit(AutotoolsPackage): + """NCBI C++ Toolkit""" + + homepage = "https://www.ncbi.nlm.nih.gov/IEB/ToolBox/CPP_DOC/" + url = "ftp://ftp.ncbi.nih.gov/toolbox/ncbi_tools++/CURRENT/ncbi_cxx--21_0_0.tar.gz" + + version('21_0_0', '14e021e08b1a78ac9cde98d0cab92098') + + depends_on('boost@1.35.0:') + depends_on('bzip2') + depends_on('libjpeg') + depends_on('libpng') + depends_on('libtiff') + depends_on('libxml2') + depends_on('libxslt@1.1.14:') + depends_on('lzo') + depends_on('pcre') + depends_on('giflib') + depends_on('sqlite@3.6.6:') + depends_on('zlib') + depends_on('samtools') + depends_on('bamtools') + + def configure_args(self): + return ['--without-sybase', '--without-fastcgi'] + + def patch(self): + with working_dir(join_path('src', 'util', 'image')): + filter_file(r'jpeg_start_compress(&cinfo, true)', + 'jpeg_start_compress(&cinfo, TRUE)', + 'image_io_jpeg.cpp', string=True) + + def build(self, spec, prefix): + CompilerVersion = self.compiler.version.joined + + with working_dir(join_path( + 'GCC{0}-DebugMT64'.format(CompilerVersion), 'build')): + make('all_r') -- cgit v1.2.3-70-g09d2 From 7fa3e7a9aa5a150f39c4a71be18139c484fb3a9c Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 5 Jul 2018 21:36:29 -0500 Subject: Add missing dependencies and variants to wcslib (#8603) * Add missing dependencies and variants to wcslib * Add flex version requirement --- var/spack/repos/builtin/packages/wcslib/package.py | 36 ++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/wcslib/package.py b/var/spack/repos/builtin/packages/wcslib/package.py index 1ec63b2275..95196736cf 100644 --- a/var/spack/repos/builtin/packages/wcslib/package.py +++ b/var/spack/repos/builtin/packages/wcslib/package.py @@ -29,7 +29,39 @@ class Wcslib(AutotoolsPackage): """WCSLIB a C implementation of the coordinate transformations defined in the FITS WCS papers.""" - homepage = "http://www.atnf.csiro.au/people/mcalabre/WCS/" - url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib.tar.bz2" + homepage = "http://www.atnf.csiro.au/people/mcalabre/WCS/wcslib/" + url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib-5.18.tar.bz2" version('5.18', '67a78354be74eca4f17d3e0853d5685f') + + variant('cfitsio', default=False, description='Include CFITSIO support') + variant('x', default=False, description='Use the X Window System') + + depends_on('gmake', type='build') + depends_on('flex@2.5.9:', type='build') + depends_on('cfitsio', when='+cfitsio') + depends_on('libx11', when='+x') + + def configure_args(self): + spec = self.spec + + # TODO: Add PGPLOT package + args = ['--without-pgplot'] + + if '+cfitsio' in spec: + args.extend([ + '--with-cfitsio', + '--with-cfitsiolib={0}'.format( + spec['cfitsio'].libs.directories[0]), + '--with-cfitsioinc={0}'.format( + spec['cfitsio'].headers.directories[0]), + ]) + else: + args.append('--without-cfitsio') + + if '+x' in spec: + args.append('--with-x') + else: + args.append('--without-x') + + return args -- cgit v1.2.3-70-g09d2 From 4b15391dab2dcf960d11720243c9d2bf3a3ca0c5 Mon Sep 17 00:00:00 2001 From: twang15 Date: Thu, 5 Jul 2018 19:54:05 -0700 Subject: cleverleaf: Intel compiler fails compilation without c++11 flag (#8550) (#8598) --- var/spack/repos/builtin/packages/cleverleaf/package.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cleverleaf/package.py b/var/spack/repos/builtin/packages/cleverleaf/package.py index 2421133a00..f2488de89c 100644 --- a/var/spack/repos/builtin/packages/cleverleaf/package.py +++ b/var/spack/repos/builtin/packages/cleverleaf/package.py @@ -44,3 +44,9 @@ class Cleverleaf(CMakePackage): depends_on('hdf5+mpi') depends_on('boost') depends_on('cmake@3.1:', type='build') + + def flag_handler(self, name, flags): + if self.spec.satisfies('%intel') and name in ['cppflags', 'cxxflags']: + flags.append(self.compiler.cxx11_flag) + + return (None, None, flags) -- cgit v1.2.3-70-g09d2 From c31ac174c6faaa6d83fe82516cd8ed10f33b82da Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Fri, 6 Jul 2018 07:15:47 -0500 Subject: Glog: make is a function (#8648) --- var/spack/repos/builtin/packages/glog/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/glog/package.py b/var/spack/repos/builtin/packages/glog/package.py index ee55f1fb60..3f65de6727 100644 --- a/var/spack/repos/builtin/packages/glog/package.py +++ b/var/spack/repos/builtin/packages/glog/package.py @@ -40,7 +40,7 @@ class Glog(Package): def install(self, spec, prefix): configure('--prefix=%s' % prefix) - make + make() make('install') @when('@0.3.5:') @@ -50,5 +50,5 @@ class Glog(Package): with working_dir('spack-build', create=True): cmake('..', *cmake_args) - make + make() make('install') -- cgit v1.2.3-70-g09d2 From 7098937c03a8e614561581be339bfa270b413f7b Mon Sep 17 00:00:00 2001 From: Andreas Baumbach Date: Fri, 6 Jul 2018 14:16:54 +0200 Subject: switch git to kernel.org source and sha256 (#8580) * switch git to kernel.org source and sha256 Change-Id: I5fe15689adb1163e9ed2b7127b52c95bd0d48564 * fix forgotton md5s Change-Id: Ib01f21e20678d9aac3344b6ee311134a90b87bdd * remove old url Change-Id: I717a084a0357a84b83bc6c8542749aac7e04f68b --- var/spack/repos/builtin/packages/git/package.py | 97 +++++++++++++------------ 1 file changed, 49 insertions(+), 48 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index 97986b9777..29e0266355 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -34,129 +34,130 @@ class Git(AutotoolsPackage): """ homepage = "http://git-scm.com" - url = "https://github.com/git/git/archive/v2.12.0.tar.gz" + url = "https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.12.0.tar.gz" # In order to add new versions here, add a new list entry with: # * version: {version} - # * md5: the md5sum of the v{version}.tar.gz - # * md5_manpages: the md5sum of the corresponding manpage from + # * sha256: the sha256sum of the git-{version}.tar.gz + # * sha256_manpages: the sha256sum of the corresponding manpage from # https://www.kernel.org/pub/software/scm/git/git-manpages-{version}.tar.xz + # You can find the source here: https://mirrors.edge.kernel.org/pub/software/scm/git/sha256sums.asc releases = [ { 'version': '2.17.1', - 'md5': 'e04bfbbe5f17a4faa9507c75b8505c13', - 'md5_manpages': 'f1d5dfc1459c9f2885f790c5af7473d1' + 'sha256': '7a0cff35dbb14b77dca6924c33ac9fe510b9de35d5267172490af548ec5ee1b8', + 'sha256_manpages': '41b58c68e90e4c95265c75955ddd5b68f6491f4d57b2f17c6d68e60bbb07ba6a' }, { 'version': '2.17.0', - 'md5': '8e0f5253eef3abeb76bd9c55386d3bee', - 'md5_manpages': '1ce1ae78a559032810af8b455535935f' + 'sha256': 'ec6452f0c8d5c1f3bcceabd7070b8a8a5eea11d4e2a04955c139b5065fd7d09a', + 'sha256_manpages': '9732053c1a618d2576c1751d0249e43702f632a571f84511331882beb360677d' }, { 'version': '2.15.1', - 'md5': 'da59fc6baa55ab44684011e369af397d', - 'md5_manpages': '2cb428071c08c7df513cfc103610536e', + 'sha256': '85fca8781a83c96ba6db384cc1aa6a5ee1e344746bafac1cbe1f0fe6d1109c84', + 'sha256_manpages': '472454c494c9a7f50ad38060c3eec372f617de654b20f3eb3be59fc17a683fa1', }, { 'version': '2.14.1', - 'md5': 'e965a37b3d277f2e7e78f5b04de28e2a', - 'md5_manpages': 'da2e75ea3972b9e93fb47023e3bf1401', + 'sha256': '01925349b9683940e53a621ee48dd9d9ac3f9e59c079806b58321c2cf85a4464', + 'sha256_manpages': '8c5810ce65d44cd333327d3a115c5b462712a2f81225d142e07bd889ad8dc0e0', }, { 'version': '2.13.0', - 'md5': 'd0f14da0ef1d22f1ce7f7876fadcb39f', - 'md5_manpages': 'fda8d6d5314eb5a47e315405830f9970', + 'sha256': '9f2fa8040ebafc0c2caae4a9e2cb385c6f16c0525bcb0fbd84938bc796372e80', + 'sha256_manpages': 'e764721796cad175a4cf9a4afe7fb4c4fc57582f6f9a6e214239498e0835355b', }, { 'version': '2.12.2', - 'md5': 'f1a50c09ce8b5dd197f3c6c6d5ea8e75', - 'md5_manpages': '9358777e9a67e57427b03884c82311bd', + 'sha256': 'd9c6d787a24670d7e5100db2367c250ad9756ef8084fb153a46b82f1d186f8d8', + 'sha256_manpages': '6e7ed503f1190734e57c9427df356b42020f125fa36ab0478777960a682adf50', }, { 'version': '2.12.1', - 'md5': 'a05c614c80ecd41e50699f1562e1130c', - 'md5_manpages': '8dfba0c9f51c6c23fb135d136c061c78', + 'sha256': '65d62d10caf317fc1daf2ca9975bdb09dbff874c92d24f9529d29a7784486b43', + 'sha256_manpages': '35e46b8acd529ea671d94035232b1795919be8f3c3a363ea9698f1fd08d7d061', }, { 'version': '2.12.0', - 'md5': '11a440ce0ed02098adf554c797facfd3', - 'md5_manpages': '4d11e05068231e37d7e42935e9cc43a1', + 'sha256': '882f298daf582a07c597737eb4bbafb82c6208fe0e73c047defc12169c221a92', + 'sha256_manpages': '1f7733a44c59f9ae8dd321d68a033499a76c82046025cc2a6792299178138d65', }, { 'version': '2.11.1', - 'md5': '2cf960f19e56f27248816809ae896794', - 'md5_manpages': 'ade1e458a34a89d03dda9a6de85976bd', + 'sha256': 'a1cdd7c820f92c44abb5003b36dc8cb7201ba38e8744802399f59c97285ca043', + 'sha256_manpages': 'ee567e7b0f95333816793714bb31c54e288cf8041f77a0092b85e62c9c2974f9', }, { 'version': '2.11.0', - 'md5': 'c63fb83b86431af96f8e9722ebb3ca01', - 'md5_manpages': '72718851626e5b2267877cc2194a1ac9', + 'sha256': 'd3be9961c799562565f158ce5b836e2b90f38502d3992a115dfb653d7825fd7e', + 'sha256_manpages': '437a0128acd707edce24e1a310ab2f09f9a09ee42de58a8e7641362012dcfe22', }, { 'version': '2.9.3', - 'md5': 'b0edfc0f3cb046aec7ed68a4b7282a75', - 'md5_manpages': '337165a3b2bbe4814c73075cb6854ca2', + 'sha256': 'a252b6636b12d5ba57732c8469701544c26c2b1689933bd1b425e603cbb247c0', + 'sha256_manpages': '8ea1a55b048fafbf0c0c6fcbca4b5b0f5e9917893221fc7345c09051d65832ce', }, { 'version': '2.9.2', - 'md5': '3ff8a9b30fd5c99a02e6d6585ab543fc', - 'md5_manpages': 'c4f415b4fc94cf75a1deb651ba769594', + 'sha256': '3cb09a3917c2d8150fc1708f3019cf99a8f0feee6cd61bba3797e3b2a85be9dc', + 'sha256_manpages': 'ac5c600153d1e4a1c6494e250cd27ca288e7667ad8d4ea2f2386f60ba1b78eec', }, { 'version': '2.9.1', - 'md5': 'a5d806743a992300b45f734d1667ddd2', - 'md5_manpages': '2aa797ff70c704a563c910e04c0f620a', + 'sha256': 'c2230873bf77f93736473e6a06501bf93eed807d011107de6983dc015424b097', + 'sha256_manpages': '324f5f173f2bd50b0102b66e474b81146ccc078d621efeb86d7f75e3c1de33e6', }, { 'version': '2.9.0', - 'md5': 'bf33a13c2adc05bc9d654c415332bc65', - 'md5_manpages': 'c840c968062251b768ba9852fd29054c', + 'sha256': 'bff7560f5602fcd8e37669e0f65ef08c6edc996e4f324e4ed6bb8a84765e30bd', + 'sha256_manpages': '35ba69a8560529aa837e395a6d6c8d42f4d29b40a3c1cc6e3dc69bb1faadb332', }, { 'version': '2.8.4', - 'md5': '86afb10254c3803894c9863fb5896bb6', - 'md5_manpages': '8340e772d60ccd04a5da88fa9c976dad', + 'sha256': '626e319f8a24fc0866167ea5f6bf3e2f38f69d6cb2e59e150f13709ca3ebf301', + 'sha256_manpages': '953a8eadaf4ae96dbad2c3ec12384c677416843917ef83d94b98367ffd55afc0', }, { 'version': '2.8.3', - 'md5': '0e19f31f96f9364fd247b8dc737dacfd', - 'md5_manpages': '553827e1b6c422ecc485499c1a1ae28d', + 'sha256': '2dad50c758339d6f5235309db620e51249e0000ff34aa2f2acbcb84c2123ed09', + 'sha256_manpages': '2dad50c758339d6f5235309db620e51249e0000ff34aa2f2acbcb84c2123ed09', }, { 'version': '2.8.2', - 'md5': '3d55550880af98f6e35c7f1d7c5aecfe', - 'md5_manpages': '33330463af27eb1238cbc2b4ca100b3a', + 'sha256': 'a029c37ee2e0bb1efea5c4af827ff5afdb3356ec42fc19c1d40216d99e97e148', + 'sha256_manpages': '82d322211aade626d1eb3bcf3b76730bfdd2fcc9c189950fb0a8bdd69c383e2f', }, { 'version': '2.8.1', - 'md5': '1308448d95afa41a4135903f22262fc8', - 'md5_manpages': '87bc202c6f6ae32c1c46c2dda3134ed1', + 'sha256': 'cfc66324179b9ed62ee02833f29d39935f4ab66874125a3ab9d5bb9055c0cb67', + 'sha256_manpages': 'df46de0c172049f935cc3736361b263c5ff289b77077c73053e63ae83fcf43f4', }, { 'version': '2.8.0', - 'md5': 'eca687e46e9750121638f258cff8317b', - 'md5_manpages': 'd67a7db0f363e8c3b2960cd84ad0373f', + 'sha256': '2c6eee5506237e0886df9973fd7938a1b2611ec93d07f64ed3447493ebac90d1', + 'sha256_manpages': '2c48902a69df3bec3b8b8f0350a65fd1b662d2f436f0e64d475ecd1c780767b6', }, { 'version': '2.7.3', - 'md5': 'fa1c008b56618c355a32ba4a678305f6', - 'md5_manpages': '97a525cca7fe38ff6bd7aaa4f0438896', + 'sha256': '30d067499b61caddedaf1a407b4947244f14d10842d100f7c7c6ea1c288280cd', + 'sha256_manpages': '84b487c9071857ab0f15f11c4a102a583d59b524831cda0dc0954bd3ab73920b', }, { 'version': '2.7.1', - 'md5': 'bf0706b433a8dedd27a63a72f9a66060', - 'md5_manpages': '19881ca231f73dec91fb456d74943950', + 'sha256': 'b4ab42798b7fb038eaefabb0c32ce9dbde2919103e5e2a35adc35dd46258a66f', + 'sha256_manpages': '0313cf4d283336088883d8416692fb6c547512233e11dbf06e5b925b7e762d61', }, ] for release in releases: - version(release['version'], md5=release['md5']) + version(release['version'], sha256=release['sha256']) resource( name='git-manpages', - url="https://www.kernel.org/pub/software/scm/git/git-manpages-{0}.tar.xz".format( + url="https://www.kernel.org/pub/software/scm/git/git-manpages-{0}.tar.gz".format( release['version']), - md5=release['md5_manpages'], + sha256=release['sha256_manpages'], placement='git-manpages', when='@{0}'.format(release['version'])) -- cgit v1.2.3-70-g09d2 From f946a83c8cb929dd0021d8a5a2a0a1d99ba2e47d Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 6 Jul 2018 14:19:30 +0200 Subject: precice: new package (issue #8643) (#8644) preCICE (Precise Code Interaction Coupling Environment) is a coupling library for partitioned multi-physics simulations. Partitioned means that preCICE couples existing programs (solvers) capable of simulating a subpart of the complete physics involved in a simulation. of-precice: new package preCICE adapter for OpenFOAM --- .../repos/builtin/packages/of-precice/package.py | 104 +++++++++++++++++++++ .../repos/builtin/packages/precice/package.py | 77 +++++++++++++++ 2 files changed, 181 insertions(+) create mode 100644 var/spack/repos/builtin/packages/of-precice/package.py create mode 100644 var/spack/repos/builtin/packages/precice/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/of-precice/package.py b/var/spack/repos/builtin/packages/of-precice/package.py new file mode 100644 index 0000000000..2b3f64aaea --- /dev/null +++ b/var/spack/repos/builtin/packages/of-precice/package.py @@ -0,0 +1,104 @@ +############################################################################## +# Copyright (c) 2018 Mark Olesen, OpenCFD Ltd. +# +# This file was authored by Mark Olesen +# and is released as part of spack under the LGPL license. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for the LLNL notice and LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +import os + +import llnl.util.tty as tty + +from spack import * +from spack.pkg.builtin.openfoam_com import add_extra_files + + +class OfPrecice(Package): + """preCICE adapter for OpenFOAM""" + + homepage = 'https://www.precice.org' + gitrepo = 'https://github.com/precice/openfoam-adapter.git' + + # Currently develop only + version('develop', branch='master', git=gitrepo) + + depends_on('openfoam+source') + depends_on('precice') + depends_on('yaml-cpp') + + # General patches + common = ['change-userdir.sh', 'spack-derived-Allwmake'] + assets = [] + + build_script = './spack-derived-Allwmake' + build_userdir = 'spack-userdir' # Build user APPBIN, LIBBIN into here + + phases = ['configure', 'build', 'install'] + + # + # - End of definitions / setup - + # + + def patch(self): + """Copy additional files or other patching.""" + add_extra_files(self, self.common, self.assets) + # Emit openfoam version immediately, if we resolved the wrong version + # it takes a very long time to rebuild! + tty.info('Build for ' + self.spec['openfoam'].format('$_$@$%@+$+')) + + def configure(self, spec, prefix): + """Generate spack-config.sh file.""" + # Local tweaks + # This is ugly, but otherwise it only looks for src/precice, + # not the installed include files + config = join_path(self.stage.source_path, 'spack-config.sh') + with open(config, 'w') as out: + out.write( + """# Local tweaks for building +CPLUS_INCLUDE_PATH="{precice_dir}/include/precice${{CPLUS_INCLUDE_PATH:+:}}$CPLUS_INCLUDE_PATH" ## noqa: E501 +export CPLUS_INCLUDE_PATH +# Local build (for user appbin, libbin) +. ./change-userdir.sh $PWD/{user_dir} +# +""" + .format( + precice_dir=spec['precice'].prefix, + user_dir=self.build_userdir)) + + def build(self, spec, prefix): + """Build with Allwmake script, wrapped to source environment first.""" + args = [] + if self.parallel: # Parallel build? - pass via environment + os.environ['WM_NCOMPPROCS'] = str(make_jobs) + builder = Executable(self.build_script) + builder(*args) + + def install(self, spec, prefix): + """Install under the prefix directory""" + + for f in ['README.md', 'LICENSE']: + if os.path.isfile(f): + install(f, join_path(self.prefix, f)) + + install_tree('tutorials', join_path(self.prefix, 'tutorials')) + + # Place directly under 'lib' (no bin) + install_tree( + join_path(self.build_userdir, 'lib'), + join_path(self.prefix, 'lib')) diff --git a/var/spack/repos/builtin/packages/precice/package.py b/var/spack/repos/builtin/packages/precice/package.py new file mode 100644 index 0000000000..69e7d16592 --- /dev/null +++ b/var/spack/repos/builtin/packages/precice/package.py @@ -0,0 +1,77 @@ +############################################################################## +# Copyright (c) 2018 Mark Olesen, OpenCFD Ltd. +# +# This file was authored by Mark Olesen +# and is released as part of spack under the LGPL license. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for the LLNL notice and LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Precice(CMakePackage): + """preCICE (Precise Code Interaction Coupling Environment) is a + coupling library for partitioned multi-physics simulations. + Partitioned means that preCICE couples existing programs (solvers) + capable of simulating a subpart of the complete physics involved in + a simulation.""" + + homepage = 'https://www.precice.org' + gitrepo = 'https://github.com/precice/precice.git' + + # Skip version 1.1.1 entirely, the cmake was lacking install. + version('develop', branch='develop', git=gitrepo) + + variant('mpi', default=True, description='Enable MPI support') + variant('petsc', default=False, description='Enable PETSc support') + variant('python', default=False, description='Enable Python support') + variant('shared', default=True, description='Build shared libraries') + + # Not yet +# variant( +# 'float', default=False, +# description='Use single precision for field data exchange') +# variant( +# 'int64', +# default=False, description='Use 64-bit integers for indices') + + depends_on('cmake@3.5:', type='build') + depends_on('boost@1.60.0:') + depends_on('eigen@3.2:') + # Implicit via eigen, don't over-constrain: depends_on('libxml2') + depends_on('mpi', when='+mpi') + depends_on('petsc', when='+petsc') + depends_on('python@2.7', when='+python', type=('build', 'run')) + + def cmake_args(self): + """Populate cmake arguments for precice.""" + spec = self.spec + + def variant_bool(feature, on='ON', off='OFF'): + """Ternary for spec variant to ON/OFF string""" + if feature in spec: + return on + return off + + cmake_args = [ + '-DMPI:BOOL=%s' % variant_bool('+mpi'), + '-DPETSC:BOOL=%s' % variant_bool('+petsc'), + '-DPYTHON:BOOL=%s' % variant_bool('+python'), + '-DBUILD_SHARED_LIBS:BOOL=%s' % variant_bool('+shared'), + ] + return cmake_args -- cgit v1.2.3-70-g09d2 From cf140b5f4c0ffd1d000fa66de739193051c12f34 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Fri, 6 Jul 2018 07:22:38 -0500 Subject: Add url_for_version and list_url to Ruby package (#8216) --- var/spack/repos/builtin/packages/ruby/package.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ruby/package.py b/var/spack/repos/builtin/packages/ruby/package.py index c79defced1..77e7d80abf 100644 --- a/var/spack/repos/builtin/packages/ruby/package.py +++ b/var/spack/repos/builtin/packages/ruby/package.py @@ -31,6 +31,8 @@ class Ruby(AutotoolsPackage): homepage = "https://www.ruby-lang.org/" url = "http://cache.ruby-lang.org/pub/ruby/2.2/ruby-2.2.0.tar.gz" + list_url = "http://cache.ruby-lang.org/pub/ruby/" + list_depth = 1 version('2.2.0', 'cd03b28fd0b555970f5c4fd481700852') @@ -63,6 +65,10 @@ class Ruby(AutotoolsPackage): expand=False ) + def url_for_version(self, version): + url = "http://cache.ruby-lang.org/pub/ruby/{0}/ruby-{1}.tar.gz" + return url.format(version.up_to(2), version) + def configure_args(self): args = [] if '+openssl' in self.spec: -- cgit v1.2.3-70-g09d2 From 48c0ce2b045d3199eb82bfdae05bf91bfb19e79c Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Fri, 6 Jul 2018 12:57:33 -0700 Subject: Update nettle package with info for v3.4 (#8653) --- var/spack/repos/builtin/packages/nettle/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nettle/package.py b/var/spack/repos/builtin/packages/nettle/package.py index 30a0e5530b..60a76789ac 100644 --- a/var/spack/repos/builtin/packages/nettle/package.py +++ b/var/spack/repos/builtin/packages/nettle/package.py @@ -32,6 +32,7 @@ class Nettle(AutotoolsPackage): homepage = "https://www.lysator.liu.se/~nisse/nettle/" url = "http://ftp.gnu.org/gnu/nettle/nettle-3.3.tar.gz" + version('3.4', 'dc0f13028264992f58e67b4e8915f53d') version('3.3', '10f969f78a463704ae73529978148dbe') version('3.2', 'afb15b4764ebf1b4e6d06c62bd4d29e4') version('2.7.1', '003d5147911317931dd453520eb234a5') -- cgit v1.2.3-70-g09d2 From 71076bc9c5364532395518781f08094d2acbb80d Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Fri, 6 Jul 2018 12:57:45 -0700 Subject: Fix digests for git@2.17.0 and git@2.17.1 (#8652) The entries for git@2.17.1 and git@2.17.0 were swapped. This fixes them. --- var/spack/repos/builtin/packages/git/package.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index 29e0266355..35fdc9e1c7 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -46,13 +46,13 @@ class Git(AutotoolsPackage): releases = [ { 'version': '2.17.1', - 'sha256': '7a0cff35dbb14b77dca6924c33ac9fe510b9de35d5267172490af548ec5ee1b8', - 'sha256_manpages': '41b58c68e90e4c95265c75955ddd5b68f6491f4d57b2f17c6d68e60bbb07ba6a' + 'sha256': 'ec6452f0c8d5c1f3bcceabd7070b8a8a5eea11d4e2a04955c139b5065fd7d09a', + 'sha256_manpages': '9732053c1a618d2576c1751d0249e43702f632a571f84511331882beb360677d' }, { 'version': '2.17.0', - 'sha256': 'ec6452f0c8d5c1f3bcceabd7070b8a8a5eea11d4e2a04955c139b5065fd7d09a', - 'sha256_manpages': '9732053c1a618d2576c1751d0249e43702f632a571f84511331882beb360677d' + 'sha256': '7a0cff35dbb14b77dca6924c33ac9fe510b9de35d5267172490af548ec5ee1b8', + 'sha256_manpages': '41b58c68e90e4c95265c75955ddd5b68f6491f4d57b2f17c6d68e60bbb07ba6a' }, { 'version': '2.15.1', -- cgit v1.2.3-70-g09d2 From 64d5847f058dec81a288482665a1d8208f0f4e17 Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Fri, 6 Jul 2018 17:59:17 -0700 Subject: Fix security issue in singularity + misc cleanups (#8657) - Versions before 2.5.2 suffer from a serious security problem (https://nvd.nist.gov/vuln/detail/CVE-2018-12021). Deleted all versions prior to v2.5.2. - Update homepage (looks like singularity's going Freemium). - Use release tarball instead of automagically generated archive tarball (digest values are more stable). - No longer need autotools for released versions, just @devel. - Install needs to be single-threaded, otherwise when installed as root the various 'chmod' operations race against the copies. --- .../repos/builtin/packages/singularity/package.py | 24 ++++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/singularity/package.py b/var/spack/repos/builtin/packages/singularity/package.py index 87cf8a4649..5951973916 100644 --- a/var/spack/repos/builtin/packages/singularity/package.py +++ b/var/spack/repos/builtin/packages/singularity/package.py @@ -29,15 +29,21 @@ class Singularity(AutotoolsPackage): """Singularity is a container platform focused on supporting 'Mobility of Compute'""" - homepage = "http://singularity.lbl.gov/" - url = "https://github.com/singularityware/singularity/archive/2.4.tar.gz" + homepage = "https://www.sylabs.io/singularity/" + url = "https://github.com/singularityware/singularity/releases/download/2.5.2/singularity-2.5.2.tar.gz" - version('2.4.5', '9afa903ee019448104b4f40be77a46e7') - version('2.4', 'd357ce68ef2f8149edd84155731531465dbe74148c37719f87f168fc39384377') - version('2.3.1', '292ff7fe3db09c854b8accf42f763f62') + # Versions before 2.5.2 suffer from a serious security problem. + # https://nvd.nist.gov/vuln/detail/CVE-2018-12021 + version('2.5.2', '2edc1a8ac9a4d7d26fba6244f1c5fd95') version('develop', git='https://github.com/singularityware/singularity.git', branch='master') - depends_on('m4', type='build') - depends_on('autoconf', type='build') - depends_on('automake', type='build') - depends_on('libtool', type='build') + depends_on('libarchive', when='@2.5.2:') + # these are only needed if we're grabbing the unreleased tree + depends_on('m4', type='build', when='@develop') + depends_on('autoconf', type='build', when='@develop') + depends_on('automake', type='build', when='@develop') + depends_on('libtool', type='build', when='@develop') + + # When installing as root, the copy has to run before chmod runs + def install(self, spec, prefix): + make('install', parallel=False) -- cgit v1.2.3-70-g09d2 From 891aa6ad7ae243154da9af2fbcd88f175d4dc047 Mon Sep 17 00:00:00 2001 From: estebanpauli <40901502+estebanpauli@users.noreply.github.com> Date: Fri, 6 Jul 2018 17:59:34 -0700 Subject: Added support for uncrustify 0.67. (#8655) * Added support for uncrustify 0.67. Since the build system changed for uncrustify at version 0.64, I had to change the package from an AutotoolsPackage to a plain Package and use @when annotations to build the packages differently. * Removed blank line at end of file * Added support for python2.6 in uncrustify configuration. --- var/spack/repos/builtin/packages/uncrustify/package.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/uncrustify/package.py b/var/spack/repos/builtin/packages/uncrustify/package.py index 4ef0049c73..a30a7b0ae3 100644 --- a/var/spack/repos/builtin/packages/uncrustify/package.py +++ b/var/spack/repos/builtin/packages/uncrustify/package.py @@ -25,10 +25,26 @@ from spack import * -class Uncrustify(AutotoolsPackage): +class Uncrustify(Package): """Source Code Beautifier for C, C++, C#, ObjectiveC, Java, and others.""" homepage = "http://uncrustify.sourceforge.net/" url = "http://downloads.sourceforge.net/project/uncrustify/uncrustify/uncrustify-0.61/uncrustify-0.61.tar.gz" + version('0.67', '0c9a08366e5c97cd02ae766064e957de41827611') version('0.61', 'b6140106e74c64e831d0b1c4b6cf7727') + + depends_on('cmake', type='build', when='@0.64:') + + @when('@0.64:') + def install(self, spec, prefix): + with working_dir('spack-build', create=True): + cmake('..', *std_cmake_args) + make() + make('install') + + @when('@:0.62') + def install(self, spec, prefix): + configure('--prefix={0}'.format(self.prefix)) + make() + make('install') -- cgit v1.2.3-70-g09d2 From c907937ff48d2c5f004061a0caf4fe61452ca8c6 Mon Sep 17 00:00:00 2001 From: "Elsa Gonsiorowski, PhD" Date: Sat, 7 Jul 2018 16:56:56 +0200 Subject: ECP VELOC (#8581) * kvtree package file * MPI is default on * proper mpi compiler * rankstr package * better rankstr description * typo * redset package * shuffile package * er package * axl package * proper pythor * mpi is default on * alpha releases and master versions * veloc package with boost headers dep * cmake version * added C++11 requirement * flake8 * flake8 * ecp tag * axl: better async api option handling * veloc package description * prettier args list * C++11 flag handler * v1.0 of veloc --- var/spack/repos/builtin/packages/axl/package.py | 74 ++++++++++++++++++++++ var/spack/repos/builtin/packages/er/package.py | 52 +++++++++++++++ var/spack/repos/builtin/packages/kvtree/package.py | 52 +++++++++++++++ .../repos/builtin/packages/rankstr/package.py | 46 ++++++++++++++ var/spack/repos/builtin/packages/redset/package.py | 50 +++++++++++++++ .../repos/builtin/packages/shuffile/package.py | 48 ++++++++++++++ var/spack/repos/builtin/packages/veloc/package.py | 66 +++++++++++++++++++ 7 files changed, 388 insertions(+) create mode 100644 var/spack/repos/builtin/packages/axl/package.py create mode 100644 var/spack/repos/builtin/packages/er/package.py create mode 100644 var/spack/repos/builtin/packages/kvtree/package.py create mode 100644 var/spack/repos/builtin/packages/rankstr/package.py create mode 100644 var/spack/repos/builtin/packages/redset/package.py create mode 100644 var/spack/repos/builtin/packages/shuffile/package.py create mode 100644 var/spack/repos/builtin/packages/veloc/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/axl/package.py b/var/spack/repos/builtin/packages/axl/package.py new file mode 100644 index 0000000000..a9198a2ff6 --- /dev/null +++ b/var/spack/repos/builtin/packages/axl/package.py @@ -0,0 +1,74 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +from spack.error import SpackError + + +def async_api_validator(values): + if 'none' in values and len(values) != 1: + raise SpackError("The value 'none' is not usable" + " with other async_api values.") + if 'ibm_bbapi' in values and 'cray_dw' in values: + raise SpackError("The 'ibm_bbapi' and 'cray_dw' asynchronous" + " APIs are incompatible.") + + +class Axl(CMakePackage): + """Asynchronous transfer library""" + + homepage = "https://github.com/ECP-VeloC/AXL" + url = "https://github.com/ECP-VeloC/AXL/archive/v0.1.0.zip" + tags = ['ecp'] + + version('0.1.0', '1ff16c046c3a080c252e0bf4251b83bc') + version('master', git='https://github.com/ecp-veloc/axl.git', + branch='master') + + variant('async_api', default='daemon', + description="Set of async transfer APIs to enable", + values=['cray_dw', 'ibm_bbapi', 'daemon', 'none'], multi=True, + validator=async_api_validator) + + # not-yet implemented functionality + conflicts('async_api=cray_dw', when='@0.1.0') + conflicts('async_api=ibm_bbapi', when='@0.1.0') + + depends_on('kvtree') + + def cmake_args(self): + args = [] + if self.spec.satisfies('platform=cray'): + args.append("-DAXL_LINK_STATIC=ON") + args.append("-DWITH_KVTREE_PREFIX=%s" % self.spec['kvtree'].prefix) + + apis = self.spec.variants['async_api'].value.split(',') + if 'daemon' in apis: + args.append('-DAXL_ASYNC_DAEMON=ON') + apis.remove('daemon') + + for api in apis: + args.append('-DAXL_ASYNC_API={0}'.format(api)) + + return args diff --git a/var/spack/repos/builtin/packages/er/package.py b/var/spack/repos/builtin/packages/er/package.py new file mode 100644 index 0000000000..7ff1416eef --- /dev/null +++ b/var/spack/repos/builtin/packages/er/package.py @@ -0,0 +1,52 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Er(CMakePackage): + """Encoding and redundancy on a file set""" + + homepage = "https://github.com/ECP-VeloC/er" + url = "https://github.com/ECP-VeloC/er/archive/v0.0.1.zip" + tags = ['ecp'] + + version('0.0.2', '24ad8f87bce2b6d900f1fb67452c3672') + version('master', git='https://github.com/ecp-veloc/er.git', + branch='master') + + depends_on('mpi') + depends_on('kvtree') + depends_on('redset') + depends_on('shuffile') + + def cmake_args(self): + args = [] + args.append("-DMPI_C_COMPILER=%s" % self.spec['mpi'].mpicc) + if self.spec.satisfies('platform=cray'): + args.append("-DER_LINK_STATIC=ON") + args.append("-DWITH_KVTREE_PREFIX=%s" % self.spec['kvtree'].prefix) + args.append("-DWITH_REDSET_PREFIX=%s" % self.spec['redset'].prefix) + args.append("-DWITH_SHUFFILE_PREFIX=%s" % self.spec['shuffile'].prefix) + return args diff --git a/var/spack/repos/builtin/packages/kvtree/package.py b/var/spack/repos/builtin/packages/kvtree/package.py new file mode 100644 index 0000000000..3a8fb66811 --- /dev/null +++ b/var/spack/repos/builtin/packages/kvtree/package.py @@ -0,0 +1,52 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Kvtree(CMakePackage): + """KVTree provides a fully extensible C datastructure modeled after perl + hashes.""" + + homepage = "https://github.com/ECP-VeloC/KVTree" + url = "https://github.com/ECP-VeloC/KVTree/archive/v1.0.0.zip" + tags = ['ecp'] + + version('1.0.1', 'f007b4b930d12fc0eb784b4dc3af823e') + version('master', git='https://github.com/ecp-veloc/kvtree.git', + branch='master') + + variant('mpi', default=True, description="Build with MPI message packing") + depends_on('mpi', when='+mpi') + + def cmake_args(self): + args = [] + if self.spec.satisfies('+mpi'): + args.append("-DMPI=ON") + args.append("-DMPI_C_COMPILER=%s" % self.spec['mpi'].mpicc) + else: + args.append("-DMPI=OFF") + if self.spec.satisfies('platform=cray'): + args.append("-DKVTREE_LINK_STATIC=ON") + return args diff --git a/var/spack/repos/builtin/packages/rankstr/package.py b/var/spack/repos/builtin/packages/rankstr/package.py new file mode 100644 index 0000000000..88963be60b --- /dev/null +++ b/var/spack/repos/builtin/packages/rankstr/package.py @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Rankstr(CMakePackage): + """Assign one-to-one mapping of MPI ranks to strings""" + + homepage = "https://github.com/ECP-VeloC/rankstr" + url = "https://github.com/ECP-VeloC/rankstr/archive/v0.0.1.zip" + tags = ['ecp'] + + version('0.0.1', 'abe06fa6a78cfe20ec0c78717ac2f2ed') + version('master', git='https://github.com/ecp-veloc/rankstr.git', + branch='master') + + depends_on('mpi') + + def cmake_args(self): + args = [] + args.append("-DMPI_C_COMPILER=%s" % self.spec['mpi'].mpicc) + if self.spec.satisfies('platform=cray'): + args.append("-DRANKSTR_LINK_STATIC=ON") + return args diff --git a/var/spack/repos/builtin/packages/redset/package.py b/var/spack/repos/builtin/packages/redset/package.py new file mode 100644 index 0000000000..8f2ac8af04 --- /dev/null +++ b/var/spack/repos/builtin/packages/redset/package.py @@ -0,0 +1,50 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Redset(CMakePackage): + """Create MPI communicators for disparate redundancy sets""" + + homepage = "https://github.com/ECP-VeloC/redset" + url = "https://github.com/ECP-VeloC/redset/archive/v0.0.1.zip" + tags = ['ecp'] + + version('0.0.2', '370d4dd477ebcfdd28dcc6375c22f731') + version('master', git='https://github.com/ecp-veloc/redset.git', + branch='master') + + depends_on('mpi') + depends_on('rankstr') + depends_on('kvtree+mpi') + + def cmake_args(self): + args = [] + args.append("-DMPI_C_COMPILER=%s" % self.spec['mpi'].mpicc) + if self.spec.satisfies('platform=cray'): + args.append("-DREDSET_LINK_STATIC=ON") + args.append("-DWITH_KVTREE_PREFIX=%s" % self.spec['kvtree'].prefix) + args.append("-DWITH_RANKSTR_PREFIX=%s" % self.spec['rankstr'].prefix) + return args diff --git a/var/spack/repos/builtin/packages/shuffile/package.py b/var/spack/repos/builtin/packages/shuffile/package.py new file mode 100644 index 0000000000..096d968b1f --- /dev/null +++ b/var/spack/repos/builtin/packages/shuffile/package.py @@ -0,0 +1,48 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Shuffile(CMakePackage): + """Shuffle files between MPI ranks""" + + homepage = "https://github.com/ECP-VeloC/shuffile" + url = "https://github.com/ECP-VeloC/shuffile/archive/v0.0.1.zip" + tags = ['ecp'] + + version('0.0.2', 'eca45150d83e21ac51049133a2308d34') + version('master', git='https://github.com/ecp-veloc/shuffile.git', + branch='master') + + depends_on('mpi') + depends_on('kvtree') + + def cmake_args(self): + args = [] + args.append("-DMPI_C_COMPILER=%s" % self.spec['mpi'].mpicc) + if self.spec.satisfies('platform=cray'): + args.append("-DSHUFFILE_LINK_STATIC=ON") + args.append("-DWITH_KVTREE_PREFIX=%s" % self.spec['kvtree'].prefix) + return args diff --git a/var/spack/repos/builtin/packages/veloc/package.py b/var/spack/repos/builtin/packages/veloc/package.py new file mode 100644 index 0000000000..0d098e7e85 --- /dev/null +++ b/var/spack/repos/builtin/packages/veloc/package.py @@ -0,0 +1,66 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Veloc(CMakePackage): + """Very-Low Overhead Checkpointing System. VELOC is a multi-level + checkpoint-restart runtime for HPC supercomputing infrastructures""" + + homepage = "https://github.com/ECP-VeloC/VELOC" + url = "https://github.com/ECP-VeloC/VELOC/archive/veloc-1.0rc1.zip" + tags = ['ecp'] + + version('1.0', '98fe2d9abd2a1b53d7a52267dab91fae') + version('1.0rc1', 'c6db0de56b5b865183b1fa719ac74c1d') + version('master', git='https://github.com/ecp-veloc/veloc.git', + branch='master') + + depends_on('boost~atomic~chrono~clanglibcpp~date_time~debug~exception' + '~filesystem~graph~icu~iostreams~locale~log~math~mpi' + '~multithreaded~numpy~program_options~python~random~regex' + '~serialization~shared~signals~singlethreaded~system' + '~taggedlayout~test~thread~timer~versionedlayout~wave') + depends_on('libpthread-stubs') + depends_on('mpi') + depends_on('er') + depends_on('axl') + depends_on('cmake@3.9:', type='build') + + # requires C++11 + def flag_handler(self, name, flags): + flags = list(flags) + if name == 'cxxflags': + flags.append(self.compiler.cxx11_flag) + return (None, None, flags) + + def cmake_args(self): + args = [ + "-DWITH_AXL_PREFIX=%s" % self.spec['axl'].prefix, + "-DWITH_ER_PREFIX=%s" % self.spec['er'].prefix, + "-DBOOST_ROOT=%s" % self.spec['boost'].prefix + ] + + return args -- cgit v1.2.3-70-g09d2 From 53c0c5701c364ebdd10f56d7063a693d2059ff15 Mon Sep 17 00:00:00 2001 From: Miles Perry <37849532+Miles-Perry@users.noreply.github.com> Date: Sat, 7 Jul 2018 10:05:57 -0500 Subject: blasr: new package (#8367) * blasr: new package * blasr: changed version release, created list with 9 things, seperated make into build phase. * blasr: fixed build phase by adding : * blasr: fixed syntax for configure_args * blasr: flake8 edits * blasr-libcpp: fixed configure_args syntax * blasr: fixed install issues resulting from PacBio changes * blasr: removed accidental blasr-libcpp upload * blasr: removed accidental blasr-libcpp upload * blasr: removed blasr-libcpp * blasr: edited out comment --- var/spack/repos/builtin/packages/blasr/package.py | 96 +++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 var/spack/repos/builtin/packages/blasr/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/blasr/package.py b/var/spack/repos/builtin/packages/blasr/package.py new file mode 100644 index 0000000000..b7f100b642 --- /dev/null +++ b/var/spack/repos/builtin/packages/blasr/package.py @@ -0,0 +1,96 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +## +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import os + + +class Blasr(Package): + """The PacBio long read aligner.""" + + homepage = "https://github.com/PacificBiosciences/blasr/wiki" + url = "https://github.com/PacificBiosciences/blasr/archive/5.3.1.tar.gz" + + version('5.3.1', '53c93f499aa4bc10781c87bafc33df2a') + + depends_on('ncurses') + depends_on('hdf5+cxx@1.8.12:1.8.99') + depends_on('htslib') + depends_on('zlib') + depends_on('boost') + depends_on('pbbam') + depends_on('blasr-libcpp') + depends_on('python', type='build') + + phases = ['configure', 'build', 'install'] + + def setup_environment(self, spack_env, run_env): + run_env.prepend_path('PATH', self.spec.prefix.utils) + spack_env.prepend_path('CPATH', self.spec['blasr-libcpp'].prefix) + spack_env.prepend_path('CPATH', self.spec[ + 'blasr-libcpp'].prefix.pbdata) + spack_env.prepend_path('CPATH', self.spec[ + 'blasr-libcpp'].prefix.alignment) + spack_env.prepend_path('CPATH', self.spec['blasr-libcpp'].prefix.hdf) + + # hdf has +mpi by default, so handle that possibility + if ('+mpi' in self.spec['hdf5']): + spack_env.set('CC', self.spec['mpi'].mpicc) + spack_env.set('CXX', self.spec['mpi'].mpicxx) + + def configure(self, spec, prefix): + configure_args = [ + 'LIBPBDATA_INC={0}'.format( + self.spec['blasr-libcpp'].prefix), + 'LIBPBDATA_LIB={0}'.format( + self.spec['blasr-libcpp'].prefix.pbdata), + 'LIBBLASR_LIB={0}'.format( + self.spec['blasr-libcpp'].prefix.alignment), + 'LIBBLASR_INC={0}'.format( + self.spec['blasr-libcpp'].prefix), + 'LIBPBIHDF_INC={0}'.format(self.spec['blasr-libcpp'].prefix), + 'LIBPBIHDF_LIB={0}'.format(self.spec['blasr-libcpp'].prefix.hdf), + 'HDF5_INC={0}'.format(self.spec['hdf5'].prefix.include), + 'HDF5_LIB={0}'.format(self.spec['hdf5'].prefix.lib), + '--shared' + ] + python('configure.py', *configure_args) + + def build(self, spec, prefix): + os.environ['CPLUS_INCLUDE_PATH'] = join_path( + self.stage.source_path, 'include') + make() + + def install(self, spec, prefix): + mkdir(prefix.utils) + mkdir(prefix.bin) + install('blasr', prefix.bin.blasr) + install('utils/loadPulses', prefix.utils) + install('utils/pls2fasta', prefix.utils) + install('utils/samFilter', prefix.utils) + install('utils/samtoh5', prefix.utils) + install('utils/samtom4', prefix.utils) + install('utils/sawriter', prefix.utils) + install('utils/sdpMatcher', prefix.utils) + install('utils/toAfg', prefix.utils) -- cgit v1.2.3-70-g09d2 From de4b6e6100a4101a0bce2734755b8ece2c79f165 Mon Sep 17 00:00:00 2001 From: Andrey Prokopenko Date: Sun, 8 Jul 2018 16:45:21 -0400 Subject: trilinos: update dtk dependencies (#8660) --- var/spack/repos/builtin/packages/trilinos/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index bf12f293a8..b9b0970cda 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -251,6 +251,9 @@ class Trilinos(CMakePackage): conflicts('+zoltan2', when='~xpetra') conflicts('+zoltan2', when='~zoltan') + conflicts('+dtk', when='~intrepid2') + conflicts('+dtk', when='~kokkos') + conflicts('+dtk', when='~teuchos') conflicts('+dtk', when='~tpetra') conflicts('+fortrilinos', when='~fortran') conflicts('+fortrilinos', when='@:99') -- cgit v1.2.3-70-g09d2 From 25c9a5216f2b0b6452f8bbc2e501dcf1a6428305 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Mon, 9 Jul 2018 13:21:38 -0500 Subject: express: bamtools lib handling (#8552) * express: bamtools lib handling * express: use libs property * express: remove old comment --- var/spack/repos/builtin/packages/express/package.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/express/package.py b/var/spack/repos/builtin/packages/express/package.py index cfc83ec44c..6d792f5479 100644 --- a/var/spack/repos/builtin/packages/express/package.py +++ b/var/spack/repos/builtin/packages/express/package.py @@ -52,11 +52,8 @@ class Express(CMakePackage): edit.filter('#include Date: Mon, 9 Jul 2018 20:21:55 +0200 Subject: Make 'netlib-lapack' a CMakePackage. (#8661) * Make 'netlib-lapack' a CMakePackage. * Add a comment. * Some refactoring. --- .../builtin/packages/netlib-lapack/package.py | 118 ++++++++++++--------- 1 file changed, 70 insertions(+), 48 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/netlib-lapack/package.py b/var/spack/repos/builtin/packages/netlib-lapack/package.py index c99b3fc91a..28e6b6374f 100644 --- a/var/spack/repos/builtin/packages/netlib-lapack/package.py +++ b/var/spack/repos/builtin/packages/netlib-lapack/package.py @@ -25,7 +25,7 @@ from spack import * -class NetlibLapack(Package): +class NetlibLapack(CMakePackage): """LAPACK version 3.X is a comprehensive FORTRAN library that does linear algebra operations including matrix inversions, least squared solutions to linear sets of equations, eigenvector analysis, singular @@ -48,8 +48,6 @@ class NetlibLapack(Package): version('3.4.0', '02d5706ec03ba885fc246e5fa10d8c70') version('3.3.1', 'd0d533ec9a5b74933c2a1e84eedc58b4') - variant('debug', default=False, - description='Activates the Debug build type') variant('shared', default=True, description="Build shared library version") variant('external-blas', default=False, description='Build lapack with an external blas') @@ -66,9 +64,21 @@ class NetlibLapack(Package): provides('blas', when='~external-blas') provides('lapack') - depends_on('cmake', type='build') depends_on('blas', when='+external-blas') depends_on('netlib-xblas+fortran+plain_blas', when='+xblas') + depends_on('python@2.7:', type='test') + + # We need to run every phase twice in order to get static and shared + # versions of the libraries. When ~shared, we run the default + # implementations of the CMakePackage's phases and get only one building + # directory 'spack-build-static' with -DBUILD_SHARED_LIBS:BOOL=OFF (see + # implementations of self.build_directory and self.cmake_args() below). + # When +shared, we run the overridden methods for the phases, each + # running the default implementation twice with different values for + # self._building_shared. As a result, we get two building directories: + # 'spack-build-static' with -DBUILD_SHARED_LIBS:BOOL=OFF and + # 'spack-build-shared' with -DBUILD_SHARED_LIBS:BOOL=ON. + _building_shared = False def patch(self): # Fix cblas CMakeLists.txt -- has wrong case for subdirectory name. @@ -131,61 +141,73 @@ class NetlibLapack(Package): lapacke_h = join_path(include_dir, 'lapacke.h') return HeaderList([cblas_h, lapacke_h]) - def install_one(self, spec, prefix, shared): - cmake_args = [ - '-DBUILD_SHARED_LIBS:BOOL=%s' % ('ON' if shared else 'OFF'), - '-DCMAKE_BUILD_TYPE:STRING=%s' % ( - 'Debug' if '+debug' in spec else 'Release'), - '-DLAPACKE:BOOL=%s' % ( - 'ON' if '+lapacke' in spec else 'OFF'), - '-DLAPACKE_WITH_TMG:BOOL=%s' % ( - 'ON' if '+lapacke' in spec else 'OFF')] - if spec.satisfies('@3.6.0:'): - cmake_args.extend(['-DCBLAS=ON']) # always build CBLAS - - if self.compiler.name == 'intel': + @property + def build_directory(self): + return join_path(self.stage.source_path, + 'spack-build-shared' if self._building_shared + else 'spack-build-static') + + def cmake_args(self): + args = ['-DBUILD_SHARED_LIBS:BOOL=' + + ('ON' if self._building_shared else 'OFF')] + + if self.spec.satisfies('+lapacke'): + args.extend(['-DLAPACKE:BOOL=ON', '-DLAPACKE_WITH_TMG:BOOL=ON']) + else: + args.extend(['-DLAPACKE:BOOL=OFF', '-DLAPACKE_WITH_TMG:BOOL=OFF']) + + if self.spec.satisfies('@3.6.0:'): + args.append('-DCBLAS=ON') # always build CBLAS + + if self.spec.satisfies('%intel'): # Intel compiler finds serious syntax issues when trying to # build CBLAS and LapackE - cmake_args.extend(['-DCBLAS=OFF']) - cmake_args.extend(['-DLAPACKE:BOOL=OFF']) + args.extend(['-DCBLAS=OFF', '-DLAPACKE:BOOL=OFF']) - if self.compiler.name == 'xl' or self.compiler.name == 'xl_r': + if self.spec.satisfies('%xl') or self.spec.satisfies('%xl_r'): # use F77 compiler if IBM XL - cmake_args.extend([ - '-DCMAKE_Fortran_COMPILER=%s' % self.compiler.f77, - '-DCMAKE_Fortran_FLAGS=%s' % ( - ' '.join(self.spec.compiler_flags['fflags'])), - ]) + args.extend(['-DCMAKE_Fortran_COMPILER=' + self.compiler.f77, + '-DCMAKE_Fortran_FLAGS=' + + (' '.join(self.spec.compiler_flags['fflags']))]) # deprecated routines are commonly needed by, for example, suitesparse # Note that OpenBLAS spack is built with deprecated routines - cmake_args.extend(['-DBUILD_DEPRECATED:BOOL=ON']) + args.append('-DBUILD_DEPRECATED:BOOL=ON') + + if self.spec.satisfies('+external-blas'): + args.extend(['-DUSE_OPTIMIZED_BLAS:BOOL=ON', + '-DBLAS_LIBRARIES:PATH=' + + self.spec['blas'].libs.joined(';')]) + + if self.spec.satisfies('+xblas'): + args.extend(['-DXBLAS_INCLUDE_DIR=' + + self.spec['netlib-xblas'].prefix.include, + '-DXBLAS_LIBRARY=' + + self.spec['netlib-xblas'].libs.joined(';')]) - if '+external-blas' in spec: - cmake_args.extend([ - '-DUSE_OPTIMIZED_BLAS:BOOL=ON', - '-DBLAS_LIBRARIES:PATH=%s' % spec['blas'].libs.joined(';') - ]) + args.append('-DBUILD_TESTING:BOOL=' + + ('ON' if self.run_tests else 'OFF')) - if spec.satisfies('+xblas'): - xblas_include_dir = spec['netlib-xblas'].prefix.include - xblas_library = spec['netlib-xblas'].libs.joined(';') - cmake_args.extend([ - '-DXBLAS_INCLUDE_DIR={0}'.format(xblas_include_dir), - '-DXBLAS_LIBRARY={0}'.format(xblas_library)]) + return args - cmake_args.extend(std_cmake_args) + # Build, install, and check both static and shared versions of the + # libraries when +shared + @when('+shared') + def cmake(self, spec, prefix): + for self._building_shared in (False, True): + super(NetlibLapack, self).cmake(spec, prefix) - build_dir = 'spack-build' + ('-shared' if shared else '-static') - with working_dir(build_dir, create=True): - cmake('..', *cmake_args) - make() - make("install") + @when('+shared') + def build(self, spec, prefix): + for self._building_shared in (False, True): + super(NetlibLapack, self).build(spec, prefix) + @when('+shared') def install(self, spec, prefix): - # Always build static libraries. - self.install_one(spec, prefix, False) + for self._building_shared in (False, True): + super(NetlibLapack, self).install(spec, prefix) - # Build shared libraries if requested. - if '+shared' in spec: - self.install_one(spec, prefix, True) + @when('+shared') + def check(self): + for self._building_shared in (False, True): + super(NetlibLapack, self).check() -- cgit v1.2.3-70-g09d2 From 4ed7931200c5726532f05bf275a6aba27aa2063d Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Mon, 9 Jul 2018 16:16:09 -0500 Subject: libnova: new package (#8666) * libnova: new package * libnova: flake8 --- .../repos/builtin/packages/libnova/package.py | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 var/spack/repos/builtin/packages/libnova/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libnova/package.py b/var/spack/repos/builtin/packages/libnova/package.py new file mode 100644 index 0000000000..6a5c88aa85 --- /dev/null +++ b/var/spack/repos/builtin/packages/libnova/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Libnova(AutotoolsPackage): + """"libnova is a general purpose, double precision, Celestial Mechanics, + Astrometry and Astrodynamics library.""" + + homepage = "http://libnova.sourceforge.net" + url = "https://sourceforge.net/projects/libnova/files/libnova/v%200.15.0/libnova-0.15.0.tar.gz/download" + + version('0.15.0', '756fdb55745cb78511f83a62c25f3be4') + + depends_on('m4') + depends_on('autoconf') + depends_on('automake') + depends_on('libtool') + + force_autoreconf = True -- cgit v1.2.3-70-g09d2 From bc5168e4b121df1802741b275984cea1aa5c3c41 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Mon, 9 Jul 2018 16:16:27 -0500 Subject: charm: add possibility to run tests (#8665) --- var/spack/repos/builtin/packages/charm/package.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/charm/package.py b/var/spack/repos/builtin/packages/charm/package.py index 4ca93142b4..d123d2881a 100644 --- a/var/spack/repos/builtin/packages/charm/package.py +++ b/var/spack/repos/builtin/packages/charm/package.py @@ -235,3 +235,9 @@ class Charm(Package): except (IOError, OSError): pass shutil.rmtree(join_path(prefix, "tmp")) + + @run_after('install') + @on_package_attributes(run_tests=True) + def check_build(self): + make('-C', join_path(self.stage.path, 'charm/tests'), + 'test', parallel=False) -- cgit v1.2.3-70-g09d2 From 00c3331de92ca33e0783b0b80786832de0ecdc66 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Tue, 10 Jul 2018 14:58:44 +0200 Subject: libxshmfence: Update to 1.3 (#8667) libxshmfence@1.2 does not compile with recent versions of glibc. --- var/spack/repos/builtin/packages/libxshmfence/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libxshmfence/package.py b/var/spack/repos/builtin/packages/libxshmfence/package.py index 031dd62e6c..b5ce7cfffd 100644 --- a/var/spack/repos/builtin/packages/libxshmfence/package.py +++ b/var/spack/repos/builtin/packages/libxshmfence/package.py @@ -33,9 +33,10 @@ class Libxshmfence(AutotoolsPackage): using file descriptor passing.""" homepage = "https://cgit.freedesktop.org/xorg/lib/libxshmfence/" - url = "http://xorg.freedesktop.org/archive/individual/lib/libxshmfence-1.2.tar.gz" + url = "https://www.x.org/archive/individual/lib/libxshmfence-1.3.tar.bz2" - version('1.2', 'f0b30c0fc568b22ec524859ee28556f1') + version('1.3', '42dda8016943dc12aff2c03a036e0937') + version('1.2', '66662e76899112c0f99e22f2fc775a7e') depends_on('xproto', type='build') depends_on('pkgconfig', type='build') -- cgit v1.2.3-70-g09d2 From 3c4ef576d9e2143fb74777e5efcb6b3b869a7caa Mon Sep 17 00:00:00 2001 From: Kshitij Mehta Date: Tue, 10 Jul 2018 13:50:10 -0400 Subject: Gtkorvo updates (#8663) * gtkorvo-atl: Updated to version 2.2 * gtkorvo-dill: Updated to version 2.4 * gtkorvo-enet: Updated to version 1.3.14 * libevpath: Updated to version 4.4.0 * libffs: Updated to version 1.5 * gtkorvo-atl: Bugfix: Fixed cmake args * gtkorvo-enet: Switched order of versions to have the latest version on the top * gtkorvo-atl: Cleaned up cmake_args. Added conditional self.run_tests * gtkorvo-dill: Cleaned up cmake_args. Added conditional self.run_tests * libffs: Correction in dependency versions. Cleaned up cmake_args. Added conditional self.run_tests * libevpath: Correction in dependency versions. Cleaned up cmake_args. Added conditional self.run_tests * gtkorvo-atl: Removed unused option from cmake args --- .../repos/builtin/packages/gtkorvo-atl/package.py | 13 ++++++++++++- .../repos/builtin/packages/gtkorvo-dill/package.py | 13 ++++++++++++- .../repos/builtin/packages/gtkorvo-enet/package.py | 1 + .../repos/builtin/packages/libevpath/package.py | 19 +++++++++++++++++-- var/spack/repos/builtin/packages/libffs/package.py | 20 +++++++++++++++----- 5 files changed, 57 insertions(+), 9 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gtkorvo-atl/package.py b/var/spack/repos/builtin/packages/gtkorvo-atl/package.py index 71ae342886..e3d1c568b8 100644 --- a/var/spack/repos/builtin/packages/gtkorvo-atl/package.py +++ b/var/spack/repos/builtin/packages/gtkorvo-atl/package.py @@ -35,10 +35,21 @@ class GtkorvoAtl(CMakePackage): version('develop', git='https://github.com/GTkorvo/atl.git', branch='master') + version('2.2', 'f0e3581e4b4c6943bf4b203685630564') version('2.1', 'b2324ff041bccba127330a0e1b241978') depends_on('gtkorvo-cercs-env') def cmake_args(self): - args = ["-DENABLE_TESTING=0", "-DENABLE_BUILD_STATIC=STATIC"] + args = [] + if self.spec.satisfies('@2.2:'): + args.append("-DBUILD_SHARED_LIBS=OFF") + else: + args.append("-DENABLE_BUILD_STATIC=STATIC") + + if self.run_tests: + args.append('-DENABLE_TESTING=1') + else: + args.append('-DENABLE_TESTING=0') + return args diff --git a/var/spack/repos/builtin/packages/gtkorvo-dill/package.py b/var/spack/repos/builtin/packages/gtkorvo-dill/package.py index 00b444e32b..b863be21f4 100644 --- a/var/spack/repos/builtin/packages/gtkorvo-dill/package.py +++ b/var/spack/repos/builtin/packages/gtkorvo-dill/package.py @@ -36,8 +36,19 @@ class GtkorvoDill(CMakePackage): version('develop', git='https://github.com/GTkorvo/dill.git', branch='master') + version('2.4', '6836673b24f395eaae044b8bb976511d') version('2.1', '14c835e79b66c9acd2beee01d56e6200') def cmake_args(self): - args = ["-DENABLE_TESTING=0", "-DBUILD_SHARED_STATIC=STATIC"] + args = [] + if self.spec.satisfies('@2.4:'): + args.append("-DBUILD_SHARED_LIBS=OFF") + else: + args.append("-DENABLE_BUILD_STATIC=STATIC") + + if self.run_tests: + args.append('-DENABLE_TESTING=1') + else: + args.append('-DENABLE_TESTING=0') + return args diff --git a/var/spack/repos/builtin/packages/gtkorvo-enet/package.py b/var/spack/repos/builtin/packages/gtkorvo-enet/package.py index eece0ad91a..bf9a7c6c50 100644 --- a/var/spack/repos/builtin/packages/gtkorvo-enet/package.py +++ b/var/spack/repos/builtin/packages/gtkorvo-enet/package.py @@ -35,4 +35,5 @@ class GtkorvoEnet(AutotoolsPackage): homepage = "http://www.github.com/GTkorvo/enet" url = "https://github.com/GTkorvo/enet/archive/v1.3.13.tar.gz" + version('1.3.14', '05272cac1a8cb0500995eeca310e7fac') version('1.3.13', '3490f924a4d421e4832e45850e6ec142') diff --git a/var/spack/repos/builtin/packages/libevpath/package.py b/var/spack/repos/builtin/packages/libevpath/package.py index 0275b8a07e..e7598160e9 100644 --- a/var/spack/repos/builtin/packages/libevpath/package.py +++ b/var/spack/repos/builtin/packages/libevpath/package.py @@ -37,13 +37,28 @@ class Libevpath(CMakePackage): version('develop', git='https://github.com/GTkorvo/evpath.git', branch='master') + version('4.4.0', 'd8630eb358ec90ae2d188e0e6c74022a') + version('4.2.4', '757ce010a6b7564dc62d3c79edd861d5') version('4.2.1', 'f928dc0dee41668afc91634c7051ce1a') version('4.1.2', '1a187f55431c991ae7040e3ff041d75c') version('4.1.1', '65a8db820f396ff2926e3d31908d123d') + variant('enet_transport', default=False, description='Build an ENET transport for EVpath') + + depends_on('gtkorvo-enet', when='@4.4.0: +enet_transport') + depends_on('gtkorvo-enet@1.3.13', when='@:4.2.4 +enet_transport') depends_on('libffs') def cmake_args(self): - args = ["-DENABLE_TESTING=0", "-DTARGET_CNL=1", - "-DBUILD_SHARED_STATIC=STATIC"] + args = ["-DTARGET_CNL=1"] + if self.spec.satisfies('@4.4.0:'): + args.append("-DBUILD_SHARED_LIBS=OFF") + else: + args.append("-DENABLE_BUILD_STATIC=STATIC") + + if self.run_tests: + args.append('-DENABLE_TESTING=1') + else: + args.append('-DENABLE_TESTING=0') + return args diff --git a/var/spack/repos/builtin/packages/libffs/package.py b/var/spack/repos/builtin/packages/libffs/package.py index 340e748bb6..3ebd03c600 100644 --- a/var/spack/repos/builtin/packages/libffs/package.py +++ b/var/spack/repos/builtin/packages/libffs/package.py @@ -38,16 +38,26 @@ class Libffs(CMakePackage): version('develop', git='https://github.com/GTkorvo/ffs.git', branch='master') + version('1.5', 'c41c5f5f448b627740deecd695b7bbf8') version('1.1.1', 'aa1c8ad5cf35e8cf76735e3a60891509') version('1.1', '561c6b3abc53e12b3c01192e8ef2ffbc') - depends_on('flex') - depends_on('bison') + depends_on('flex', type='build', when='@:1.4') + depends_on('bison', type='build', when='@:1.4') + depends_on('gtkorvo-cercs-env', type='build', when='@:1.4') depends_on('gtkorvo-atl') depends_on('gtkorvo-dill') - depends_on('gtkorvo-cercs-env') def cmake_args(self): - args = ["-DENABLE_TESTING=0", "-DTARGET_CNL=1", - "-DBUILD_SHARED_STATIC=STATIC"] + args = ["-DTARGET_CNL=1"] + if self.spec.satisfies('@1.5:'): + args.append("-DBUILD_SHARED_LIBS=OFF") + else: + args.append("-DENABLE_BUILD_STATIC=STATIC") + + if self.run_tests: + args.append('-DENABLE_TESTING=0') + else: + args.append('-DENABLE_TESTING=0') + return args -- cgit v1.2.3-70-g09d2 From a1bfa8eca04a5c111f6fa9fac4041fec91ca421a Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Tue, 10 Jul 2018 18:32:50 -0600 Subject: Adding psm as a dependency of mvapich2. (#8674) --- var/spack/repos/builtin/packages/mvapich2/package.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mvapich2/package.py b/var/spack/repos/builtin/packages/mvapich2/package.py index ffa2f6ea02..030e03b7f1 100644 --- a/var/spack/repos/builtin/packages/mvapich2/package.py +++ b/var/spack/repos/builtin/packages/mvapich2/package.py @@ -119,6 +119,7 @@ class Mvapich2(AutotoolsPackage): depends_on('bison', type='build') depends_on('libpciaccess', when=(sys.platform != 'darwin')) depends_on('cuda', when='+cuda') + depends_on('psm', when='fabrics=psm') filter_compiler_wrappers( 'mpicc', 'mpicxx', 'mpif77', 'mpif90', 'mpifort', relative_root='bin' @@ -163,7 +164,10 @@ class Mvapich2(AutotoolsPackage): opts = [] # From here on I can suppose that only one variant has been selected if 'fabrics=psm' in self.spec: - opts = ["--with-device=ch3:psm"] + opts = [ + "--with-device=ch3:psm", + "--with-psm={0}".format(self.spec['psm'].prefix) + ] elif 'fabrics=sock' in self.spec: opts = ["--with-device=ch3:sock"] elif 'fabrics=nemesistcpib' in self.spec: -- cgit v1.2.3-70-g09d2 From 391d89a8534afd3fdd06b385542a02d1feae6ee1 Mon Sep 17 00:00:00 2001 From: 健美猞猁 Date: Wed, 11 Jul 2018 21:05:39 +0800 Subject: Bump gromacs versions. (#8676) --- var/spack/repos/builtin/packages/gromacs/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gromacs/package.py b/var/spack/repos/builtin/packages/gromacs/package.py index 6416ce4dce..1add3141f1 100644 --- a/var/spack/repos/builtin/packages/gromacs/package.py +++ b/var/spack/repos/builtin/packages/gromacs/package.py @@ -41,8 +41,10 @@ class Gromacs(CMakePackage): homepage = 'http://www.gromacs.org' url = 'http://ftp.gromacs.org/gromacs/gromacs-5.1.2.tar.gz' + version('2018.2', '7087462bb08393aec4ce3192fa4cd8df') version('2018.1', '7ee393fa3c6b7ae351d47eae2adf980e') version('2018', '6467ffb1575b8271548a13abfba6374c') + version('2016.5', 'f41807e5b2911ccb547a3fd11f105d47') version('2016.4', '19c8b5c85f3ec62df79d2249a3c272f8') version('2016.3', 'e9e3a41bd123b52fbcc6b32d09f8202b') version('5.1.4', 'ba2e34d59b3982603b4935d650c08040') -- cgit v1.2.3-70-g09d2 From 6479ec6defcf9bfc206da93615817307331608c1 Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Wed, 11 Jul 2018 15:52:21 +0200 Subject: Patch for 'netlib-lapack'. (#8677) --- .../builtin/packages/netlib-lapack/package.py | 5 +++++ .../netlib-lapack/undefined_declarations.patch | 26 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 var/spack/repos/builtin/packages/netlib-lapack/undefined_declarations.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/netlib-lapack/package.py b/var/spack/repos/builtin/packages/netlib-lapack/package.py index 28e6b6374f..7293b6c0f4 100644 --- a/var/spack/repos/builtin/packages/netlib-lapack/package.py +++ b/var/spack/repos/builtin/packages/netlib-lapack/package.py @@ -60,6 +60,11 @@ class NetlibLapack(CMakePackage): patch('ibm-xl.patch', when='@3.7: %xl') patch('ibm-xl.patch', when='@3.7: %xl_r') + # https://github.com/Reference-LAPACK/lapack/issues/228 + # TODO: update 'when' once the version of lapack + # containing the fix is released and added to Spack. + patch('undefined_declarations.patch', when='@3.8.0:') + # virtual dependency provides('blas', when='~external-blas') provides('lapack') diff --git a/var/spack/repos/builtin/packages/netlib-lapack/undefined_declarations.patch b/var/spack/repos/builtin/packages/netlib-lapack/undefined_declarations.patch new file mode 100644 index 0000000000..9dac2562f7 --- /dev/null +++ b/var/spack/repos/builtin/packages/netlib-lapack/undefined_declarations.patch @@ -0,0 +1,26 @@ +diff --git a/SRC/dsytrf_aa_2stage.f b/SRC/dsytrf_aa_2stage.f +index 2991305..f5f06cc 100644 +--- a/SRC/dsytrf_aa_2stage.f ++++ b/SRC/dsytrf_aa_2stage.f +@@ -191,7 +191,7 @@ + EXTERNAL LSAME, ILAENV + * .. + * .. External Subroutines .. +- EXTERNAL XERBLA, DCOPY, DLACGV, DLACPY, ++ EXTERNAL XERBLA, DCOPY, DLACPY, + $ DLASET, DGBTRF, DGEMM, DGETRF, + $ DSYGST, DSWAP, DTRSM + * .. +diff --git a/SRC/ssytrf_aa_2stage.f b/SRC/ssytrf_aa_2stage.f +index be6809d..a929749 100644 +--- a/SRC/ssytrf_aa_2stage.f ++++ b/SRC/ssytrf_aa_2stage.f +@@ -191,7 +191,7 @@ + EXTERNAL LSAME, ILAENV + * .. + * .. External Subroutines .. +- EXTERNAL XERBLA, SCOPY, SLACGV, SLACPY, ++ EXTERNAL XERBLA, SCOPY, SLACPY, + $ SLASET, SGBTRF, SGEMM, SGETRF, + $ SSYGST, SSWAP, STRSM + * .. -- cgit v1.2.3-70-g09d2 From f036f17f61386f2ee9d46705e15d70e9315e4f1e Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 11 Jul 2018 10:26:38 -0500 Subject: Retire the py-dev package (#8679) --- .../builtin/packages/py-dev/__init__.py.patch | 10 ------ var/spack/repos/builtin/packages/py-dev/package.py | 38 ---------------------- 2 files changed, 48 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/py-dev/__init__.py.patch delete mode 100644 var/spack/repos/builtin/packages/py-dev/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-dev/__init__.py.patch b/var/spack/repos/builtin/packages/py-dev/__init__.py.patch deleted file mode 100644 index 1c783b82c8..0000000000 --- a/var/spack/repos/builtin/packages/py-dev/__init__.py.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/dev/__init__.py 2017-03-24 13:46:56.211385166 +0000 -+++ b/dev/__init__.py 2017-03-24 13:47:01.535332256 +0000 -@@ -1,6 +1,6 @@ - """ - --🚧 About -+About - -------- - - dev is a collection of Python developer tools presented as a diff --git a/var/spack/repos/builtin/packages/py-dev/package.py b/var/spack/repos/builtin/packages/py-dev/package.py deleted file mode 100644 index 49c89444eb..0000000000 --- a/var/spack/repos/builtin/packages/py-dev/package.py +++ /dev/null @@ -1,38 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -from spack import * - - -class PyDev(PythonPackage): - """libraries and tools for Python development""" - - homepage = "https://pypi.python.org/pypi/dev" - url = "https://pypi.io/packages/source/d/dev/dev-0.4.0.tar.gz" - - version('0.4.0', '00449cf0b347c32da9c840adcb4cf24b') - - patch('__init__.py.patch') - - depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From a985dc859c59cf23c7709847ed34937b0be6aa7a Mon Sep 17 00:00:00 2001 From: 健美猞猁 Date: Wed, 11 Jul 2018 23:33:44 +0800 Subject: New packages: libbeato bwtool. (#8681) --- var/spack/repos/builtin/packages/bwtool/package.py | 36 ++++++++++++++++++++++ .../repos/builtin/packages/libbeato/package.py | 36 ++++++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 var/spack/repos/builtin/packages/bwtool/package.py create mode 100644 var/spack/repos/builtin/packages/libbeato/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bwtool/package.py b/var/spack/repos/builtin/packages/bwtool/package.py new file mode 100644 index 0000000000..2cb2c2277b --- /dev/null +++ b/var/spack/repos/builtin/packages/bwtool/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Bwtool(AutotoolsPackage): + """bwtool is a command-line utility for bigWig files.""" + + homepage = "https://github.com/CRG-Barcelona/bwtool" + url = "https://github.com/CRG-Barcelona/bwtool/archive/1.0.tar.gz" + + version('1.0', 'cdd7a34ae457b587edfe7dc8a0bdbedd') + + depends_on('libbeato') diff --git a/var/spack/repos/builtin/packages/libbeato/package.py b/var/spack/repos/builtin/packages/libbeato/package.py new file mode 100644 index 0000000000..b553794c50 --- /dev/null +++ b/var/spack/repos/builtin/packages/libbeato/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Libbeato(AutotoolsPackage): + """libbeato is a C library containing routines for various uses in Genomics, + and includes a copy of the freeware portion of the C library + from UCSC's Genome Browser Group.""" + + homepage = "https://github.com/CRG-Barcelona/libbeato" + url = "https://github.com/CRG-Barcelona/libbeato/archive/master.tar.gz" + + version('master', 'ee6f0f0f3f09c4f601fcfed3b13e7395') -- cgit v1.2.3-70-g09d2 From 5780eadf646e23ae41df7e564f8920ae8dc9756e Mon Sep 17 00:00:00 2001 From: Jimmy Tang Date: Wed, 11 Jul 2018 18:38:06 +0100 Subject: Update kaldi (#8682) * Update kaldi always use the --fst-version otherwise it does the wrong thing with selecting the fst version. also enable speex by default * Give version a more meaningful name * Update older version with a date string instead --- var/spack/repos/builtin/packages/kaldi/package.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/kaldi/package.py b/var/spack/repos/builtin/packages/kaldi/package.py index 229b6a1939..376aebaa94 100644 --- a/var/spack/repos/builtin/packages/kaldi/package.py +++ b/var/spack/repos/builtin/packages/kaldi/package.py @@ -38,7 +38,9 @@ class Kaldi(Package): # Does not use Autotools url = "https://github.com/kaldi-asr/kaldi/archive/master.zip" version('master', git='https://github.com/kaldi-asr/kaldi.git') - version('c024e8', git='https://github.com/kaldi-asr/kaldi.git', + version('2018-07-11', git='https://github.com/kaldi-asr/kaldi.git', + commit='6f2140b032b0108bc313eefdca65151289642773') + version('2015-10-07', git='https://github.com/kaldi-asr/kaldi.git', commit='c024e8aa0a727bf76c91a318f76a1f8b0b59249e') variant('shared', default=True, @@ -53,18 +55,16 @@ class Kaldi(Package): # Does not use Autotools depends_on('sph2pipe', type='run') depends_on('sctk', type='run') depends_on('speex', type='run') - depends_on('openfst@1.4.1-patch', when='@c024e8') + depends_on('openfst@1.4.1-patch', when='@2015-10-07') + depends_on('openfst@1.6.0:', when='@2018-07-11') depends_on('openfst') - patch('openfst-1.4.1.patch', when='@c024e8') + patch('openfst-1.4.1.patch', when='@2015-10-07') def install(self, spec, prefix): configure_args = ['--fst-root=' + spec['openfst'].prefix] - - if spec.satisfies('c024e8'): - configure_args.append('--speex-root=' + spec['speex'].prefix) - configure_args.append('--fst-version=' + - str(spec['openfst'].version)) + configure_args.append('--fst-version=' + str(spec['openfst'].version)) + configure_args.append('--speex-root=' + spec['speex'].prefix) if '~shared' in spec: configure_args.append('--static') -- cgit v1.2.3-70-g09d2 From d27133b3cd43ea3b28746607df6a6319bf2e1f83 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 11 Jul 2018 12:40:39 -0500 Subject: perl-math-cephes: new package (#8671) --- .../builtin/packages/perl-math-cephes/package.py | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-math-cephes/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-math-cephes/package.py b/var/spack/repos/builtin/packages/perl-math-cephes/package.py new file mode 100644 index 0000000000..d4baa23e3f --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-math-cephes/package.py @@ -0,0 +1,35 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlMathCephes(PerlPackage): + """This module provides an interface to over 150 functions of the + cephes math library of Stephen Moshier.""" + + homepage = "http://search.cpan.org/~shlomif/Math-Cephes/lib/Math/Cephes.pod" + url = "http://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF/Math-Cephes-0.5305.tar.gz" + + version('0.5305', '30922dd213783aaaf91a47626f6a1853') -- cgit v1.2.3-70-g09d2 From 6a3f36c4e30e9187c318f5d47545eb88011a266e Mon Sep 17 00:00:00 2001 From: Jannek Squar Date: Wed, 11 Jul 2018 19:41:48 +0200 Subject: Adjusted sublime-text package (#8685) --- var/spack/repos/builtin/packages/sublime-text/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sublime-text/package.py b/var/spack/repos/builtin/packages/sublime-text/package.py index cba3b7508e..dad8ca0db4 100644 --- a/var/spack/repos/builtin/packages/sublime-text/package.py +++ b/var/spack/repos/builtin/packages/sublime-text/package.py @@ -31,8 +31,9 @@ class SublimeText(Package): prose.""" homepage = "http://www.sublimetext.com/" - url = "https://download.sublimetext.com/sublime_text_3_build_3126_x64.tar.bz2" + url = "https://download.sublimetext.com/sublime_text_3_build_3176_x64.tar.bz2" + version('3_build_3176', '7d4c8c5167224888d901e8cbafb6ec7f') version('3_build_3126', 'acc34252b0ea7dff1f581c5db1564dcb') version('2.0.2', '699cd26d7fe0bada29eb1b2cd7b50e4b') @@ -52,7 +53,7 @@ class SublimeText(Package): if version[0] == 2: return "https://download.sublimetext.com/Sublime%20Text%20{0}%20x64.tar.bz2".format(version) else: - return "https://download.sublimetext.com/sublime_text_3_build_{0}_x64.tar.bz2".format(version) + return "https://download.sublimetext.com/sublime_text_{0}_x64.tar.bz2".format(version) def install(self, spec, prefix): # Sublime text comes as a pre-compiled binary. -- cgit v1.2.3-70-g09d2 From be9dfc2d73de65b247ef71bbe6ae0a789f482207 Mon Sep 17 00:00:00 2001 From: Howard Pritchard Date: Wed, 11 Jul 2018 12:42:00 -0500 Subject: openmpi: add 3.1.1 (#8684) Signed-off-by: Howard Pritchard --- var/spack/repos/builtin/packages/openmpi/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index abe1a715f0..68f017c551 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -83,6 +83,7 @@ class Openmpi(AutotoolsPackage): list_url = "http://www.open-mpi.org/software/ompi/" # Current + version('3.1.1', '493f1db2f75afaab1c8ecba78d2f5aab') # libmpi.so.40.10.1 version('3.1.0', '0895e268ca27735d7654bf64cee6c256') # libmpi.so.40.10.0 # Still supported -- cgit v1.2.3-70-g09d2 From aa9bb06b892ab9c8ffac9cbd85c2b5d52c7bdb97 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 11 Jul 2018 14:53:35 -0500 Subject: py-cutadapt: needs py-setuptools at runtime (#8689) --- var/spack/repos/builtin/packages/py-cutadapt/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-cutadapt/package.py b/var/spack/repos/builtin/packages/py-cutadapt/package.py index cb61110d5e..7f6aedda2f 100644 --- a/var/spack/repos/builtin/packages/py-cutadapt/package.py +++ b/var/spack/repos/builtin/packages/py-cutadapt/package.py @@ -36,5 +36,5 @@ class PyCutadapt(PythonPackage): version('1.13', '2d2d14e0c20ad53d7d84b57bc3e63b4c') depends_on('python@2.6:', type=('build', 'run')) - depends_on('py-setuptools', type=('build')) + depends_on('py-setuptools', type=('build', 'run')) depends_on('py-xopen@0.1.1:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From e3a556cd2a93ec3c45c3627cb16cfcebcfd6b930 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Wed, 11 Jul 2018 22:12:19 +0200 Subject: Don't propagate version-specific URL overrides to newer versions (#8565) When a user specifies a URL for a specific version of a package, Spack originally would use that URL for all newer versions of the package. This behavior has proven to be generally more harmful than useful, so this PR removes the feature such that a version-specific URL override affects only that version. --- lib/spack/spack/package.py | 21 ++----------- lib/spack/spack/test/packages.py | 15 ++++++++++ .../builtin.mock/packages/url_override/package.py | 34 ++++++++++++++++++++++ 3 files changed, 52 insertions(+), 18 deletions(-) create mode 100644 var/spack/repos/builtin.mock/packages/url_override/package.py (limited to 'var') diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py index dab963740f..f0aa67fc8f 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -766,22 +766,6 @@ class PackageBase(with_metaclass(PackageMeta, PackageViewMixin, object)): version_urls[v] = args['url'] return version_urls - def nearest_url(self, version): - """Finds the URL for the next lowest version with a URL. - If there is no lower version with a URL, uses the - package url property. If that isn't there, uses a - *higher* URL, and if that isn't there raises an error. - """ - version_urls = self.version_urls() - url = getattr(self.__class__, 'url', None) - - for v in version_urls: - if v > version and url: - break - if version_urls[v]: - url = version_urls[v] - return url - # TODO: move this out of here and into some URL extrapolation module? def url_for_version(self, version): """Returns a URL from which the specified version of this package @@ -804,9 +788,10 @@ class PackageBase(with_metaclass(PackageMeta, PackageViewMixin, object)): if version in version_urls: return version_urls[version] - # If we have no idea, try to substitute the version. + # If we have no idea, substitute the version into the default URL. + default_url = getattr(self.__class__, 'url', None) return spack.url.substitute_version( - self.nearest_url(version), self.url_version(version)) + default_url, self.url_version(version)) def _make_resource_stage(self, root_stage, fetcher, resource): resource_stage_folder = self._resource_stage(resource) diff --git a/lib/spack/spack/test/packages.py b/lib/spack/spack/test/packages.py index 9fae9decfb..8f9838ce78 100644 --- a/lib/spack/spack/test/packages.py +++ b/lib/spack/spack/test/packages.py @@ -165,3 +165,18 @@ class TestPackage(object): import spack.pkg.builtin.mock # noqa import spack.pkg.builtin.mock as m # noqa from spack.pkg.builtin import mock # noqa + + @pytest.mark.regression('2737') + def test_urls_for_versions(self): + # Checks that a version directive without a 'url' argument + # specified uses the default url + for spec_str in ('url_override@0.9.0', 'url_override@1.0.0'): + s = Spec(spec_str).concretized() + url = s.package.url_for_version('0.9.0') + assert url == 'http://www.anothersite.org/uo-0.9.0.tgz' + + url = s.package.url_for_version('1.0.0') + assert url == 'http://www.doesnotexist.org/url_override-1.0.0.tar.gz' + + url = s.package.url_for_version('0.8.1') + assert url == 'http://www.doesnotexist.org/url_override-0.8.1.tar.gz' diff --git a/var/spack/repos/builtin.mock/packages/url_override/package.py b/var/spack/repos/builtin.mock/packages/url_override/package.py new file mode 100644 index 0000000000..6173ea94eb --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/url_override/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class UrlOverride(Package): + homepage = 'http://www.doesnotexist.org' + url = 'http://www.doesnotexist.org/url_override-1.0.0.tar.gz' + + version('1.0.0', 'cxyzab') + version('0.9.0', 'bcxyza', url='http://www.anothersite.org/uo-0.9.0.tgz') + version('0.8.1', 'cxyzab') -- cgit v1.2.3-70-g09d2 From 10e628a5a0f1a73ac0b7c599835effa389c873cf Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Wed, 11 Jul 2018 22:21:55 +0200 Subject: py-ply: added version 3.11 (#8383) --- var/spack/repos/builtin/packages/py-ply/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-ply/package.py b/var/spack/repos/builtin/packages/py-ply/package.py index f3845c4625..6486dc7af4 100644 --- a/var/spack/repos/builtin/packages/py-ply/package.py +++ b/var/spack/repos/builtin/packages/py-ply/package.py @@ -28,6 +28,7 @@ from spack import * class PyPly(PythonPackage): """PLY is nothing more than a straightforward lex/yacc implementation.""" homepage = "http://www.dabeaz.com/ply" - url = "http://www.dabeaz.com/ply/ply-3.8.tar.gz" + url = "https://github.com/dabeaz/ply/archive/3.11.tar.gz" - version('3.8', '94726411496c52c87c2b9429b12d5c50') + version('3.11', '6465f602e656455affcd7c5734c638f8') + version('3.8', '94726411496c52c87c2b9429b12d5c50', url='http://www.dabeaz.com/ply/ply-3.8.tar.gz') -- cgit v1.2.3-70-g09d2 From feb4701ae3f63922a08cb019d2b1fb9b80170f3d Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 11 Jul 2018 17:07:02 -0500 Subject: mothur: new version (#8692) --- var/spack/repos/builtin/packages/mothur/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mothur/package.py b/var/spack/repos/builtin/packages/mothur/package.py index 4c32475552..8fd771c0d1 100644 --- a/var/spack/repos/builtin/packages/mothur/package.py +++ b/var/spack/repos/builtin/packages/mothur/package.py @@ -33,6 +33,7 @@ class Mothur(MakefilePackage): homepage = "https://github.com/mothur/mothur" url = "https://github.com/mothur/mothur/archive/v1.39.5.tar.gz" + version('1.40.5', 'd57847849fdb961c3f66c9b9fdf3057b') version('1.39.5', '1f826ea4420e6822fc0db002c5940b92') variant('mpi', default=True, description='Enable MPI parallel support') -- cgit v1.2.3-70-g09d2 From f29c1d90962d42c7579b5835a8957ca03c7966ae Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 11 Jul 2018 17:07:20 -0500 Subject: beast1: new version (#8691) --- var/spack/repos/builtin/packages/beast1/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/beast1/package.py b/var/spack/repos/builtin/packages/beast1/package.py index 3d5797ad0c..f80731f016 100644 --- a/var/spack/repos/builtin/packages/beast1/package.py +++ b/var/spack/repos/builtin/packages/beast1/package.py @@ -32,6 +32,8 @@ class Beast1(Package): homepage = "http://beast.community/" url = "https://github.com/beast-dev/beast-mcmc/releases/download/v1.8.4/BEASTv1.8.4.tgz" + version('1.10.0', 'bcf2f2c074319360ec8a2ebad57d2e57', + url='https://github.com/beast-dev/beast-mcmc/releases/download/v1.10.0/BEAST_v1.10.0.tgz') version('1.8.4', 'cb8752340c1f77a22d39ca4fe09687b0') depends_on('java', type='run') -- cgit v1.2.3-70-g09d2 From 2561d1d6565fed0754518d66d877404f7f4d2da0 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 11 Jul 2018 17:38:58 -0500 Subject: transdecoder: needs perl-uri-escape (#8690) --- var/spack/repos/builtin/packages/transdecoder/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/transdecoder/package.py b/var/spack/repos/builtin/packages/transdecoder/package.py index cbee3b5ca4..8bf3c0f04f 100644 --- a/var/spack/repos/builtin/packages/transdecoder/package.py +++ b/var/spack/repos/builtin/packages/transdecoder/package.py @@ -37,6 +37,7 @@ class Transdecoder(MakefilePackage): version('3.0.1', 'f62b86a15fcb78b1dada9f80cc25f300') depends_on('perl', type=('build', 'run')) + depends_on('perl-uri-escape', type='run') def install(self, spec, prefix): mkdirp(prefix.bin) -- cgit v1.2.3-70-g09d2 From ecff47538e7064c7c5529abf0213a1c9378c6010 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 12 Jul 2018 00:28:11 -0500 Subject: Remove unnecessary version-specific URL overrides (#8693) --- var/spack/repos/builtin/packages/bwa/package.py | 12 ++++-------- var/spack/repos/builtin/packages/jellyfish/package.py | 3 +-- .../packages/py-backports-functools-lru-cache/package.py | 7 +++---- var/spack/repos/builtin/packages/py-scipy/package.py | 4 +--- var/spack/repos/builtin/packages/star/package.py | 3 +-- 5 files changed, 10 insertions(+), 19 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bwa/package.py b/var/spack/repos/builtin/packages/bwa/package.py index ffbab1fedf..f070d12611 100644 --- a/var/spack/repos/builtin/packages/bwa/package.py +++ b/var/spack/repos/builtin/packages/bwa/package.py @@ -31,14 +31,10 @@ class Bwa(Package): homepage = "http://github.com/lh3/bwa" url = "https://github.com/lh3/bwa/releases/download/v0.7.15/bwa-0.7.15.tar.bz2" - version('0.7.17', '82cba7ef695538e6a38b9d4156837381', - url="https://github.com/lh3/bwa/releases/download/v0.7.17/bwa-0.7.17.tar.bz2") - version('0.7.16a', 'c5115c9a5ea0406848500e4b23a7708c', - url="https://github.com/lh3/bwa/releases/download/v0.7.16/bwa-0.7.16a.tar.bz2") - version('0.7.15', 'fcf470a46a1dbe2f96a1c5b87c530554', - url="https://github.com/lh3/bwa/releases/download/v0.7.15/bwa-0.7.15.tar.bz2") - version('0.7.13', 'f094f609438511766c434178a3635ab4', - url="https://github.com/lh3/bwa/releases/download/v0.7.13/bwa-0.7.13.tar.bz2") + version('0.7.17', '82cba7ef695538e6a38b9d4156837381') + version('0.7.16a', 'c5115c9a5ea0406848500e4b23a7708c') + version('0.7.15', 'fcf470a46a1dbe2f96a1c5b87c530554') + version('0.7.13', 'f094f609438511766c434178a3635ab4') version('0.7.12', 'e24a587baaad411d5da89516ad7a261a', url='https://github.com/lh3/bwa/archive/0.7.12.tar.gz') diff --git a/var/spack/repos/builtin/packages/jellyfish/package.py b/var/spack/repos/builtin/packages/jellyfish/package.py index 41f5830c50..e3c31566c1 100644 --- a/var/spack/repos/builtin/packages/jellyfish/package.py +++ b/var/spack/repos/builtin/packages/jellyfish/package.py @@ -33,8 +33,7 @@ class Jellyfish(AutotoolsPackage): url = "https://github.com/gmarcais/Jellyfish/releases/download/v2.2.7/jellyfish-2.2.7.tar.gz" list_url = "http://www.cbcb.umd.edu/software/jellyfish/" - version('2.2.7', 'f741192d9061f28e34cb67c86a1027ab', - url='https://github.com/gmarcais/Jellyfish/releases/download/v2.2.7/jellyfish-2.2.7.tar.gz') + version('2.2.7', 'f741192d9061f28e34cb67c86a1027ab') version('1.1.11', 'dc994ea8b0896156500ea8c648f24846', url='http://www.cbcb.umd.edu/software/jellyfish/jellyfish-1.1.11.tar.gz') diff --git a/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py b/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py index a57434f65a..8fd37a7400 100644 --- a/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py +++ b/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py @@ -31,12 +31,11 @@ class PyBackportsFunctoolsLruCache(PythonPackage): homepage = "https://github.com/jaraco/backports.functools_lru_cache" url = "https://pypi.io/packages/source/b/backports.functools_lru_cache/backports.functools_lru_cache-1.4.tar.gz" - version('1.5', '20f53f54cd3f04b3346ce75a54959754', - url="https://pypi.io/packages/source/b/backports.functools_lru_cache/backports.functools_lru_cache-1.5.tar.gz") - version('1.4', 'b954e7d5e2ca0f0f66ad2ed12ba800e5', - url="https://pypi.io/packages/source/b/backports.functools_lru_cache/backports.functools_lru_cache-1.4.tar.gz") + version('1.5', '20f53f54cd3f04b3346ce75a54959754') + version('1.4', 'b954e7d5e2ca0f0f66ad2ed12ba800e5') version('1.0.1', 'c789ef439d189330b99872746a6d9e85', url="https://pypi.io/packages/source/b/backports.functools_lru_cache/backports.functools_lru_cache-1.0.1.zip") + depends_on('py-setuptools', type='build') depends_on('py-setuptools-scm@1.15.0:', type='build') depends_on('python@2.6.0:3.3.99', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-scipy/package.py b/var/spack/repos/builtin/packages/py-scipy/package.py index cdcd886ecc..7aba6223ef 100644 --- a/var/spack/repos/builtin/packages/py-scipy/package.py +++ b/var/spack/repos/builtin/packages/py-scipy/package.py @@ -51,9 +51,7 @@ class PyScipy(PythonPackage): version('1.1.0', 'aa6bcc85276b6f25e17bcfc4dede8718') version('1.0.0', '53fa34bd3733a9a4216842b6000f7316') - # See https://github.com/spack/spack/issues/2737 - version('0.19.1', '6b4d91b62f1926282b127194a06b72b3', - url="https://pypi.io/packages/source/s/scipy/scipy-0.19.1.tar.gz") + version('0.19.1', '6b4d91b62f1926282b127194a06b72b3') version('0.19.0', '91b8396231eec780222a57703d3ec550', url="https://pypi.io/packages/source/s/scipy/scipy-0.19.0.zip") version('0.18.1', '5fb5fb7ccb113ab3a039702b6c2f3327') diff --git a/var/spack/repos/builtin/packages/star/package.py b/var/spack/repos/builtin/packages/star/package.py index 896b775d9a..76d4604eaa 100644 --- a/var/spack/repos/builtin/packages/star/package.py +++ b/var/spack/repos/builtin/packages/star/package.py @@ -31,8 +31,7 @@ class Star(Package): homepage = "https://github.com/alexdobin/STAR" url = "https://github.com/alexdobin/STAR/archive/2.5.3a.tar.gz" - version('2.5.3a', 'baf8d1b62a50482cfa13acb7652dc391', - url='https://github.com/alexdobin/STAR/archive/2.5.3a.tar.gz') + version('2.5.3a', 'baf8d1b62a50482cfa13acb7652dc391') version('2.4.2a', '8b9345f2685a5ec30731e0868e86d506', url='https://github.com/alexdobin/STAR/archive/STAR_2.4.2a.tar.gz') -- cgit v1.2.3-70-g09d2 From 1846bc5ed6384b55d10fc2085d47e4a519565476 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Thu, 12 Jul 2018 03:23:22 -0500 Subject: mitofates: more deps and a patch to make it functional (#8686) * mitofates: more deps and a patch to make it functional --- .../mitofates/DirichletRegulator_fast.patch | 13 +++++++++++ .../repos/builtin/packages/mitofates/package.py | 26 ++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/mitofates/DirichletRegulator_fast.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mitofates/DirichletRegulator_fast.patch b/var/spack/repos/builtin/packages/mitofates/DirichletRegulator_fast.patch new file mode 100644 index 0000000000..85e836878e --- /dev/null +++ b/var/spack/repos/builtin/packages/mitofates/DirichletRegulator_fast.patch @@ -0,0 +1,13 @@ +--- a/bin/modules/DirichletRegulator_fast.pm 2014-10-23 01:59:55.000000000 -0500 ++++ b/bin/modules/DirichletRegulator_fast.pm 2018-07-11 11:19:07.814358134 -0500 +@@ -10,9 +10,7 @@ + use strict; + use warnings; + use FindBin qw($Bin); +-use Inline (Config => +- DIRECTORY => "$Bin/modules/_Inline/", +- ); ++use Inline; + use Inline 'C'; + + # Sub-routin: DirichletParser diff --git a/var/spack/repos/builtin/packages/mitofates/package.py b/var/spack/repos/builtin/packages/mitofates/package.py index 8b968af5b5..4dff8ff5c0 100644 --- a/var/spack/repos/builtin/packages/mitofates/package.py +++ b/var/spack/repos/builtin/packages/mitofates/package.py @@ -23,6 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * +import glob class Mitofates(Package): @@ -36,7 +37,32 @@ class Mitofates(Package): depends_on('libsvm') depends_on('perl', type='run') + depends_on('perl-inline-c', type='run') + depends_on('perl-perl6-slurp', type='run') + depends_on('perl-math-cephes', type='run') + + # The DirichletRegulator_fast.pm sets the perl Inline directory + # to be inside the deployed source (which won't be writable by + # the end user of site wide deployed software. + # Removing that config entry will cause the inline module to auto + # create a directory in the user's homedir instead + patch('DirichletRegulator_fast.patch') + + def patch(self): + perlscripts = FileFilter('MitoFates.pl') + perlscripts.filter('#!/usr/bin/perl', '#!/usr/bin/env perl') + + # other perl module files probably should get this filter too + with working_dir(join_path(self.stage.source_path, 'bin/modules')): + perlmodules = glob.glob('*.pm') + filter_file('#!/usr/bin/perl', '#!/usr/bin/env perl', *perlmodules) def install(self, spec, prefix): install_tree('bin', prefix.bin) install('MitoFates.pl', prefix) + chmod = which('chmod') + chmod('+x', join_path(prefix, 'MitoFates.pl')) + + def setup_environment(self, spack_env, run_env): + # We want the main MitoFates.pl script in the path + run_env.prepend_path('PATH', self.prefix) -- cgit v1.2.3-70-g09d2 From d8921ac323a9d1456d8b601d4c6ead0abde35426 Mon Sep 17 00:00:00 2001 From: Nicolas Richart Date: Thu, 12 Jul 2018 14:30:59 +0200 Subject: First try on pytorch (#8649) * initial version of the package pyTorch (#171) * adding version 0.4 * flake8 correction * reordering version, removing run dependecies * Changing depends_on type to default --- .../repos/builtin/packages/py-pytorch/package.py | 93 ++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-pytorch/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pytorch/package.py b/var/spack/repos/builtin/packages/py-pytorch/package.py new file mode 100644 index 0000000000..b8c648d6fe --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pytorch/package.py @@ -0,0 +1,93 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPytorch(PythonPackage): + """Tensors and Dynamic neural networks in Python + with strong GPU acceleration.""" + + homepage = "http://pytorch.org/" + url = "https://github.com/pytorch/pytorch/archive/v0.3.1.tar.gz" + + version('0.4.0', git='https://github.com/pytorch/pytorch.git', + tag='v0.4.0', submodules=True) + version('0.3.1', git='https://github.com/pytorch/pytorch.git', + tag='v0.3.1', submodules=True) + + variant('cuda', default='False', description='Add GPU support') + variant('cudnn', default='False', description='Add cuDNN support') + variant('nccl', default='False', description='Add NCCL support') + variant('mkldnn', default='False', description='Add Intel MKL DNN support') + variant('magma', default='False', description='Add MAGMA support') + + conflicts('+cudnn', when='~cuda') + conflicts('+nccl', when='~cuda') + conflicts('+magma', when='~cuda') + conflicts('+mkldnn', when='@:0.3.2') + + depends_on('py-setuptools', type='build') + depends_on('py-cffi', type='build') + depends_on('py-numpy', type=('run', 'build')) + depends_on('blas') + depends_on('lapack') + depends_on('py-pyyaml', type=('run', 'build')) + depends_on('py-typing', when='@0.3.2:', type=('run', 'build')) + depends_on('intel-mkl', when='+mkl') + depends_on('cuda', when='+cuda', type=('build', 'link', 'run')) + depends_on('cudnn', when='+cuda+cudnn') + depends_on('nccl', when='+cuda+nccl') + depends_on('magma+shared', when='+cuda+magma') + + def setup_environment(self, build_env, run_env): + build_env.set('MAX_JOBS', make_jobs) + + if '+cuda' in self.spec: + build_env.set('CUDA_HOME', self.spec['cuda'].prefix) + else: + build_env.set('NO_CUDA', 'TRUE') + + if '+cudnn' in self.spec: + build_env.set('CUDNN_LIB_DIR', + self.spec['cudnn'].prefix.lib) + build_env.set('CUDNN_INCLUDE_DIR', + self.spec['cudnn'].prefix.include) + else: + build_env.set('NO_CUDNN', 'TRUE') + + if '+nccl' in self.spec: + build_env.set('NCCL_ROOT_DIR', self.spec['nccl'].prefix) + else: + build_env.set('NO_SYSTEM_NCCL', 'TRUE') + + if '+mkldnn' in self.spec: + build_env.set('MKLDNN_HOME', self.spec['intel-mkl'].prefix) + else: + build_env.set('NO_MKLDNN', 'TRUE') + + build_env.set('NO_NNPACK', 'TRUE') + + build_env.set('PYTORCH_BUILD_VERSION', str(self.version)) + build_env.set('PYTORCH_BUILD_NUMBER', 0) -- cgit v1.2.3-70-g09d2 From 2a27a37597f32dd2cb871cef80aefd4352a66660 Mon Sep 17 00:00:00 2001 From: Tim Law Date: Thu, 12 Jul 2018 13:37:42 +0100 Subject: Add Git development versions for Typhon and BookLeaf_Cpp. (#8694) --- var/spack/repos/builtin/packages/bookleaf-cpp/package.py | 3 +++ var/spack/repos/builtin/packages/typhon/package.py | 3 +++ 2 files changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bookleaf-cpp/package.py b/var/spack/repos/builtin/packages/bookleaf-cpp/package.py index df0a26bab6..8fe1e13dfc 100644 --- a/var/spack/repos/builtin/packages/bookleaf-cpp/package.py +++ b/var/spack/repos/builtin/packages/bookleaf-cpp/package.py @@ -33,6 +33,9 @@ class BookleafCpp(CMakePackage): homepage = "https://github.com/UK-MAC/BookLeaf_Cpp" url = "https://github.com/UK-MAC/BookLeaf_Cpp/archive/v2.0.tar.gz" + version('develop', git='https://github.com/UK-MAC/BookLeaf_Cpp', + branch='develop') + version('2.0.1', '34a5a9e7b2b5ffc98562656a4406ba5b') version('2.0', '69819ebcbae5eaa63d1a4de2c77cac85') diff --git a/var/spack/repos/builtin/packages/typhon/package.py b/var/spack/repos/builtin/packages/typhon/package.py index 21fa80adb5..e08f2f1eb7 100644 --- a/var/spack/repos/builtin/packages/typhon/package.py +++ b/var/spack/repos/builtin/packages/typhon/package.py @@ -34,6 +34,9 @@ class Typhon(CMakePackage): homepage = "https://github.com/UK-MAC/Typhon" url = "https://github.com/UK-MAC/Typhon/archive/v3.0.tar.gz" + version('develop', git='https://github.com/UK-MAC/Typhon', + branch='develop') + version('3.0.1', '89045decfba5fd468ef05ad4c924df8c') version('3.0', 'ec67cd1aa585ce2410d4fa50514a916f') -- cgit v1.2.3-70-g09d2 From d569a9c1245b9acae17851bd1241f7fef99f9af2 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Thu, 12 Jul 2018 18:37:50 -0600 Subject: flang: add support for llvm-6 (#8073) * flang: add support for llvm-6 * flang: review changes * pgmath: make flake8 happy --- var/spack/repos/builtin/packages/flang/package.py | 36 ++++++++++++++++----- var/spack/repos/builtin/packages/pgmath/package.py | 37 ++++++++++++++++++++++ 2 files changed, 65 insertions(+), 8 deletions(-) create mode 100644 var/spack/repos/builtin/packages/pgmath/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/flang/package.py b/var/spack/repos/builtin/packages/flang/package.py index d716ecaa06..73a016ad7f 100644 --- a/var/spack/repos/builtin/packages/flang/package.py +++ b/var/spack/repos/builtin/packages/flang/package.py @@ -36,16 +36,23 @@ class Flang(CMakePackage): version('20180319', 'e659bad83b791f90af2c5cd672864669') depends_on( - "llvm+clang@4.0.1,5.0.0", + "llvm+clang@4.0.1,5.0.0,6.0.0", patches=[ patch('https://github.com/llvm-mirror/clang/pull/33.diff', sha256='e46d7ab305e5e95c51f4656d9b52058143cd85d859b312b3c80e93a02d54b4a5', when='@4.0.1', level=1, working_dir='tools/clang'), patch('https://github.com/llvm-mirror/clang/pull/35.diff', sha256='7f39555783993f78b75c380ca5ef167c1d8b88cc75c6542f6c94e0b6acfb7c5d', - when='@5.0.0', level=1, working_dir='tools/clang') + when='@5.0.0', level=1, working_dir='tools/clang'), + patch('https://github.com/llvm-mirror/llvm/pull/56.diff', + sha256='2ee155aa1017766cdae3a860050d82ed48961a2f88bcef760d4922ff25ce381e', + when='@6.0.0', level=1), + patch('https://github.com/llvm-mirror/clang/pull/40.diff', + sha256='5021f2ea54e957eb1c712f9e9a87b3dc33616ebd2e84735b6735f788fd2c45e9', + when='@6.0.0', level=1, working_dir='tools/clang') ] ) + depends_on("pgmath@develop", when="@develop") def cmake_args(self): options = [ @@ -72,17 +79,30 @@ class Flang(CMakePackage): flang = os.path.join(self.spec.prefix.bin, 'flang') with open(flang, 'w') as out: out.write('#!/bin/bash\n') - out.write( - '{0} -I{1} -L{2} {3}{4} -B{5} "$@"\n'.format( - os.path.join(self.spec['llvm'].prefix.bin, 'flang'), - self.prefix.include, self.prefix.lib, - self.compiler.fc_rpath_arg, self.prefix.lib, - self.spec.prefix.bin)) + if '@develop' in self.spec: + out.write( + '{0} -I{1} -L{2} -L{3} {4}{5} {6}{7} -B{8} "$@"\n'.format( + self.spec['llvm'].prefix.bin.flang, + self.prefix.include, self.prefix.lib, + self.spec['pgmath'].prefix.lib, + self.compiler.fc_rpath_arg, self.prefix.lib, + self.compiler.fc_rpath_arg, + self.spec['pgmath'].prefix.lib, + self.spec.prefix.bin)) + else: + out.write( + '{0} -I{1} -L{2} {3}{4} -B{5} "$@"\n'.format( + self.spec['llvm'].prefix.bin.flang, + self.prefix.include, self.prefix.lib, + self.compiler.fc_rpath_arg, self.prefix.lib, + self.spec.prefix.bin)) out.close() chmod = which('chmod') chmod('+x', flang) def setup_environment(self, spack_env, run_env): + # to find llvm's libc++.so + spack_env.set('LD_LIBRARY_PATH', self.spec['llvm'].prefix.lib) run_env.set('FC', join_path(self.spec.prefix.bin, 'flang')) run_env.set('F77', join_path(self.spec.prefix.bin, 'flang')) run_env.set('F90', join_path(self.spec.prefix.bin, 'flang')) diff --git a/var/spack/repos/builtin/packages/pgmath/package.py b/var/spack/repos/builtin/packages/pgmath/package.py new file mode 100644 index 0000000000..64742813db --- /dev/null +++ b/var/spack/repos/builtin/packages/pgmath/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2018, Los Alamos National Security, LLC +# Produced at the Los Alamos National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class Pgmath(CMakePackage): + """Flang's math library""" + homepage = "https://github.com/flang-compiler/flang" + url = "https://github.com/flang-compiler/flang/archive/pgmath_20180319.tar.gz" + + version('develop', git='https://github.com/flang-compiler/flang', branch='master') + + conflicts("%gcc@:7.1.9999") + root_cmakelists_dir = 'runtime/libpgmath' -- cgit v1.2.3-70-g09d2 From 4c5e4cb960a266482dac21eaeb0b568359c58b39 Mon Sep 17 00:00:00 2001 From: Sajid Ali <30510036+s-sajid-ali@users.noreply.github.com> Date: Fri, 13 Jul 2018 10:59:02 -0500 Subject: Add py-backcall (#8701) * new file: var/spack/repos/builtin/packages/py-backcall/package.py * Update package.py * Update package.py * Update package.py * Update package.py --- .../repos/builtin/packages/py-backcall/package.py | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-backcall/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-backcall/package.py b/var/spack/repos/builtin/packages/py-backcall/package.py new file mode 100644 index 0000000000..f72a95a36c --- /dev/null +++ b/var/spack/repos/builtin/packages/py-backcall/package.py @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyBackcall(PythonPackage): + """Specifications for callback functions passed in to an API""" + + homepage = "https://github.com/takluyver/backcall" + url = "https://pypi.io/packages/source/b/backcall/backcall-0.1.0.tar.gz" + + version('0.1.0', '87ce0c7839808e6a3427d57df6a792e7') -- cgit v1.2.3-70-g09d2 From aec91d1cca84af5680c3fb4b572be46bd7c09204 Mon Sep 17 00:00:00 2001 From: Sajid Ali <30510036+s-sajid-ali@users.noreply.github.com> Date: Fri, 13 Jul 2018 15:50:21 -0500 Subject: update version for numexpr (#8702) * modified: package.py * deleted: var/spack/repos/builtin/packages/py-numexpr/numexpr-2.6.5.tar.gz --- var/spack/repos/builtin/packages/py-numexpr/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-numexpr/package.py b/var/spack/repos/builtin/packages/py-numexpr/package.py index 7bce85851b..29416d8cb1 100644 --- a/var/spack/repos/builtin/packages/py-numexpr/package.py +++ b/var/spack/repos/builtin/packages/py-numexpr/package.py @@ -28,8 +28,9 @@ from spack import * class PyNumexpr(PythonPackage): """Fast numerical expression evaluator for NumPy""" homepage = "https://pypi.python.org/pypi/numexpr" - url = "https://pypi.io/packages/source/n/numexpr/numexpr-2.6.1.tar.gz" + url = "https://pypi.io/packages/source/n/numexpr/numexpr-2.6.5.tar.gz" + version('2.6.5', 'c9b5859c11bd6da092f6c8a84a472e77') version('2.6.1', '6365245705b446426df9543ad218dd8e') version('2.5', '84f66cced45ba3e30dcf77a937763aaa') version('2.4.6', '17ac6fafc9ea1ce3eb970b9abccb4fbd') -- cgit v1.2.3-70-g09d2 From 2cf9c7955c6739cafb57f5b8749f12e44f912d6e Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Fri, 13 Jul 2018 15:51:04 -0500 Subject: Scotch: fix compilation of 6.0.5a (#8704) Prevent this error: metis_graph_part.c:301:7: error: non-void function 'METIS_PartGraphVKway' should return a value [-Wreturn-type] --- .../builtin/packages/scotch/libscotchmetis-return-6.0.5a.patch | 10 ++++++++++ var/spack/repos/builtin/packages/scotch/package.py | 2 ++ 2 files changed, 12 insertions(+) create mode 100644 var/spack/repos/builtin/packages/scotch/libscotchmetis-return-6.0.5a.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/scotch/libscotchmetis-return-6.0.5a.patch b/var/spack/repos/builtin/packages/scotch/libscotchmetis-return-6.0.5a.patch new file mode 100644 index 0000000000..7e124c6aac --- /dev/null +++ b/var/spack/repos/builtin/packages/scotch/libscotchmetis-return-6.0.5a.patch @@ -0,0 +1,10 @@ +--- a/src/libscotchmetis/metis_graph_part.c 2018-07-13 14:25:50.000000000 -0500 ++++ b/src/libscotchmetis/metis_graph_part.c 2018-07-13 14:21:08.000000000 -0500 +@@ -298,7 +298,7 @@ + + edgenbr = xadj[vertnbr] - baseval; + if ((edlotax = memAlloc (edgenbr * sizeof (SCOTCH_Num))) == NULL) +- return; ++ return (METIS_ERROR); + edlotax -= baseval; /* Base access to edlotax */ + vsiztax = vsize2 - baseval; diff --git a/var/spack/repos/builtin/packages/scotch/package.py b/var/spack/repos/builtin/packages/scotch/package.py index 2e550bf2a7..5ff5491bba 100644 --- a/var/spack/repos/builtin/packages/scotch/package.py +++ b/var/spack/repos/builtin/packages/scotch/package.py @@ -63,6 +63,8 @@ class Scotch(Package): patch('esmumps-ldflags-6.0.4.patch', when='@6.0.4') patch('metis-headers-6.0.4.patch', when='@6.0.4') + patch('libscotchmetis-return-6.0.5a.patch', when='@6.0.5a') + # NOTE: In cross-compiling environment parallel build # produces weird linker errors. parallel = False -- cgit v1.2.3-70-g09d2 From 44c999e2e166b80b891eb75645d0cfa4c42272f2 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Fri, 13 Jul 2018 20:31:25 -0500 Subject: mothur: mpi not used (#8706) --- var/spack/repos/builtin/packages/mothur/package.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mothur/package.py b/var/spack/repos/builtin/packages/mothur/package.py index 8fd771c0d1..f3873b05f8 100644 --- a/var/spack/repos/builtin/packages/mothur/package.py +++ b/var/spack/repos/builtin/packages/mothur/package.py @@ -36,9 +36,6 @@ class Mothur(MakefilePackage): version('1.40.5', 'd57847849fdb961c3f66c9b9fdf3057b') version('1.39.5', '1f826ea4420e6822fc0db002c5940b92') - variant('mpi', default=True, description='Enable MPI parallel support') - - depends_on('mpi', when='+mpi') depends_on('boost') depends_on('readline') -- cgit v1.2.3-70-g09d2 From 4c5cbfeb29f9a8c414cc8a5bd7dfbe745c52f69b Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Fri, 13 Jul 2018 20:31:39 -0500 Subject: py-fn: new package (#8705) --- var/spack/repos/builtin/packages/py-fn/package.py | 37 +++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-fn/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-fn/package.py b/var/spack/repos/builtin/packages/py-fn/package.py new file mode 100644 index 0000000000..3076acc064 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-fn/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyFn(PythonPackage): + """Functional programming in Python: implementation of missing features + to enjoy FP.""" + + homepage = "https://github.com/fnpy/fn.py" + url = "https://github.com/fnpy/fn.py/archive/v0.5.2.tar.gz" + + version('0.5.2', '48c168fe335e31fc6152ea0944741be2') + + depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From e367d1fb3ae494a2cbd9d88c236ad08afa1ba23d Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Fri, 13 Jul 2018 19:32:02 -0600 Subject: Unset F90 and F90FLAGS in mvapich2 (#8698) * Unset F90 in mvapich2 when using intel compilers. * Fixing typo. * Unset F90 and F90FLAGS for mvapich2 at all times. * Adding comment. --- var/spack/repos/builtin/packages/mvapich2/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mvapich2/package.py b/var/spack/repos/builtin/packages/mvapich2/package.py index 030e03b7f1..c3e9f1c2f4 100644 --- a/var/spack/repos/builtin/packages/mvapich2/package.py +++ b/var/spack/repos/builtin/packages/mvapich2/package.py @@ -199,6 +199,9 @@ class Mvapich2(AutotoolsPackage): def setup_environment(self, spack_env, run_env): spec = self.spec + # mvapich2 configure fails when F90 and F90FLAGS are set + spack_env.unset('F90') + spack_env.unset('F90FLAGS') if 'process_managers=slurm' in spec: run_env.set('SLURM_MPI_TYPE', 'pmi2') -- cgit v1.2.3-70-g09d2 From da5663a52a02f154e761d955f36a95d6267fc1a4 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Sat, 14 Jul 2018 13:51:58 -0500 Subject: Py-opentuner: new package (#8707) --- .../repos/builtin/packages/py-opentuner/package.py | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-opentuner/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-opentuner/package.py b/var/spack/repos/builtin/packages/py-opentuner/package.py new file mode 100644 index 0000000000..9fcc51a402 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-opentuner/package.py @@ -0,0 +1,44 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyOpentuner(PythonPackage): + """An extensible framework for program autotuning.""" + + homepage = "http://opentuner.org/" + url = "https://github.com/jansel/opentuner" + + version('0.8.0', git='https://github.com/jansel/opentuner', commit='4cb9135') + + # No support for Python 3 yet + depends_on('python@2.7:2.8', type=('build', 'run')) + + depends_on('py-argparse@1.2.1:', type=('build', 'run')) + depends_on('py-fn@0.2.12:', type=('build', 'run')) + depends_on('py-numpy@1.8.0:', type=('build', 'run')) + depends_on('py-pysqlite@2.6.3:', type=('build', 'run')) + depends_on('py-setuptools', type='build') + depends_on('py-sqlalchemy@0.8.2:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 5192a3d6d6566c7edde246020ca7ebd48697d957 Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Sat, 14 Jul 2018 17:19:26 -0600 Subject: Fixing error in amrvis package. (#8710) --- var/spack/repos/builtin/packages/amrvis/package.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/amrvis/package.py b/var/spack/repos/builtin/packages/amrvis/package.py index b765c58a4b..049b70d03d 100644 --- a/var/spack/repos/builtin/packages/amrvis/package.py +++ b/var/spack/repos/builtin/packages/amrvis/package.py @@ -175,10 +175,10 @@ class Amrvis(MakefilePackage): # Help force Amrvis to not pick up random system compilers if '+mpi' in self.spec: spack_env.set('MPI_HOME', self.spec['mpi'].prefix) - spack_env.set('CC', spec['mpi'].mpicc) - spack_env.set('CXX', spec['mpi'].mpicxx) - spack_env.set('F77', spec['mpi'].mpif77) - spack_env.set('FC', spec['mpi'].mpifc) + spack_env.set('CC', self.spec['mpi'].mpicc) + spack_env.set('CXX', self.spec['mpi'].mpicxx) + spack_env.set('F77', self.spec['mpi'].mpif77) + spack_env.set('FC', self.spec['mpi'].mpifc) def install(self, spec, prefix): # Install exe manually -- cgit v1.2.3-70-g09d2 From 4df673e401eeb12ae6602d1039eb96f9fcbf6ee3 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Sun, 15 Jul 2018 10:33:57 -0500 Subject: charm: provide MPI (#8647) * Charm: provide MPI * add mpicc wrappers * clarify MPI comment --- var/spack/repos/builtin/packages/charm/package.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/charm/package.py b/var/spack/repos/builtin/packages/charm/package.py index d123d2881a..c808335990 100644 --- a/var/spack/repos/builtin/packages/charm/package.py +++ b/var/spack/repos/builtin/packages/charm/package.py @@ -92,6 +92,25 @@ class Charm(Package): variant("production", default=True, description="Build charm++ with all optimizations") variant("tracing", default=False, description="Enable tracing modules") + # FIXME: backend=mpi also provides mpi, but spack does not support + # depends_on("mpi") and provides("mpi") in the same package currently. + for b in ['multicore', 'netlrts', 'verbs', 'gni', 'ofi', 'pami', + 'pamilrts']: + provides('mpi@2', when='@6.7.1: build-target=AMPI backend={0}'.format(b)) + provides('mpi@2', when='@6.7.1: build-target=LIBS backend={0}'.format(b)) + + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): + spack_env.set('MPICC', join_path(self.prefix.bin, 'ampicc')) + spack_env.set('MPICXX', join_path(self.prefix.bin, 'ampicxx')) + spack_env.set('MPIF77', join_path(self.prefix.bin, 'ampif77')) + spack_env.set('MPIF90', join_path(self.prefix.bin, 'ampif90')) + + def setup_dependent_package(self, module, dependent_spec): + self.spec.mpicc = join_path(self.prefix.bin, 'ampicc') + self.spec.mpicxx = join_path(self.prefix.bin, 'ampicxx') + self.spec.mpifc = join_path(self.prefix.bin, 'ampif90') + self.spec.mpif77 = join_path(self.prefix.bin, 'ampif77') + depends_on("mpi", when="backend=mpi") depends_on("papi", when="+papi") depends_on("cuda", when="+cuda") -- cgit v1.2.3-70-g09d2 From 067c8466bd8338ed71384237a46dd581409eee07 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Sun, 15 Jul 2018 15:54:13 -0500 Subject: yasm: add develop version (#8712) --- var/spack/repos/builtin/packages/yasm/package.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/yasm/package.py b/var/spack/repos/builtin/packages/yasm/package.py index 25d8b1cad5..7483312ac2 100644 --- a/var/spack/repos/builtin/packages/yasm/package.py +++ b/var/spack/repos/builtin/packages/yasm/package.py @@ -33,4 +33,10 @@ class Yasm(AutotoolsPackage): homepage = "http://yasm.tortall.net" url = "http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz" + version('develop', git='https://github.com/yasm/yasm/') version('1.3.0', 'fc9e586751ff789b34b1f21d572d96af') + + depends_on('autoconf', when='@develop') + depends_on('automake', when='@develop') + depends_on('libtool', when='@develop') + depends_on('m4', when='@develop') -- cgit v1.2.3-70-g09d2 From b25187bfa6c622cd6154d7bcfcb4bc3b856e240e Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Sun, 15 Jul 2018 15:54:28 -0500 Subject: Scotch: update package (#8711) --- var/spack/repos/builtin/packages/scotch/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/scotch/package.py b/var/spack/repos/builtin/packages/scotch/package.py index 5ff5491bba..c2ceb679ef 100644 --- a/var/spack/repos/builtin/packages/scotch/package.py +++ b/var/spack/repos/builtin/packages/scotch/package.py @@ -33,6 +33,7 @@ class Scotch(Package): url = "http://gforge.inria.fr/frs/download.php/latestfile/298/scotch_6.0.4.tar.gz" list_url = "http://gforge.inria.fr/frs/?group_id=248" + version('6.0.6', 'ef676a3118b5590c416176e402fac248') version('6.0.5a', '8430dff7175a1dfd5a3258e75260cf71') version('6.0.4', 'd58b825eb95e1db77efe8c6ff42d329f') version('6.0.3', '10b0cc0f184de2de99859eafaca83cfc') -- cgit v1.2.3-70-g09d2 From badf913fc44780b73f7709a5a11d99bb00f899e2 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Sun, 15 Jul 2018 16:41:25 -0500 Subject: Charm: more info about build targets (#8713) * Charm: more info about build targets * fix whitespace --- var/spack/repos/builtin/packages/charm/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/charm/package.py b/var/spack/repos/builtin/packages/charm/package.py index c808335990..6bbbf06327 100644 --- a/var/spack/repos/builtin/packages/charm/package.py +++ b/var/spack/repos/builtin/packages/charm/package.py @@ -63,6 +63,7 @@ class Charm(Package): variant( "build-target", default="LIBS", + # AMPI also builds charm++, LIBS also builds AMPI and charm++ values=("charm++", "AMPI", "LIBS"), description="Specify the target to build" ) -- cgit v1.2.3-70-g09d2 From dfc1f70aa48c195072022441a5824ac7f0c3dff5 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Sun, 15 Jul 2018 16:41:36 -0500 Subject: Charm: set default backend to netlrts (#8714) This allows building MPI applications on top of charm/AMPI without to specify another backend. --- var/spack/repos/builtin/packages/charm/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/charm/package.py b/var/spack/repos/builtin/packages/charm/package.py index 6bbbf06327..b232e97442 100644 --- a/var/spack/repos/builtin/packages/charm/package.py +++ b/var/spack/repos/builtin/packages/charm/package.py @@ -71,7 +71,7 @@ class Charm(Package): # Communication mechanisms (choose exactly one) variant( "backend", - default="mpi", + default="netlrts", values=("mpi", "multicore", "netlrts", "verbs", "gni", "ofi", "pami", "pamilrts"), description="Set the backend to use" -- cgit v1.2.3-70-g09d2 From d006139e3cb7fc1fe42792a4961494db31ded7c9 Mon Sep 17 00:00:00 2001 From: 健美猞猁 Date: Tue, 17 Jul 2018 02:53:23 +0800 Subject: aspera-cli: a new package. (#8715) * aspera-cli: a new package. * flak8. --- .../repos/builtin/packages/aspera-cli/package.py | 53 ++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 var/spack/repos/builtin/packages/aspera-cli/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/aspera-cli/package.py b/var/spack/repos/builtin/packages/aspera-cli/package.py new file mode 100644 index 0000000000..530234f239 --- /dev/null +++ b/var/spack/repos/builtin/packages/aspera-cli/package.py @@ -0,0 +1,53 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +from glob import glob + + +class AsperaCli(Package): + """The Aspera CLI client for the Fast and Secure Protocol (FASP).""" + + homepage = "https://asperasoft.com" + url = "https://download.asperasoft.com/download/sw/cli/3.7.7/aspera-cli-3.7.7.608.927cce8-linux-64-release.sh" + + version('3.7.7', 'e92140d809e7e65112a5d1cd49c442cf', + url='https://download.asperasoft.com/download/sw/cli/3.7.7/aspera-cli-3.7.7.608.927cce8-linux-64-release.sh', + expand=False) + + def setup_environment(self, spack_env, run_env): + run_env.prepend_path('PATH', self.prefix.cli.bin) + + def install(self, spec, prefix): + runfile = glob(join_path(self.stage.path, 'aspera-cli*.sh'))[0] + # Update destination path + filter_file('INSTALL_DIR=~/.aspera', + 'INSTALL_DIR=%s' % prefix, + runfile, + string=True) + # Install + chmod = which('chmod') + chmod('+x', runfile) + runfile = which(runfile) + runfile() -- cgit v1.2.3-70-g09d2 From b12d5aecaa2b7ef2a3f63c62bb5765b0ecee2bd9 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Mon, 16 Jul 2018 22:23:09 -0500 Subject: r: add memory profiling variant (#8717) * r: add memory profiling variant * r: change memory_profiling to underscores --- var/spack/repos/builtin/packages/r/package.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py index b1c9f49eb8..a9b99053ca 100644 --- a/var/spack/repos/builtin/packages/r/package.py +++ b/var/spack/repos/builtin/packages/r/package.py @@ -62,6 +62,8 @@ class R(AutotoolsPackage): description='Links to externally installed BLAS/LAPACK') variant('X', default=False, description='Enable X11 support (call configure --with-x)') + variant('memory_profiling', default=False, + description='Enable memory profiling') # Virtual dependencies depends_on('blas', when='+external-lapack') @@ -128,6 +130,9 @@ class R(AutotoolsPackage): else: config_args.append('--without-x') + if '+memory_profiling' in spec: + config_args.append('--enable-memory-profiling') + return config_args @run_after('install') -- cgit v1.2.3-70-g09d2 From 0a80d94a467b34921e1418db4569aad63d85c482 Mon Sep 17 00:00:00 2001 From: James Dickson Date: Tue, 17 Jul 2018 14:24:16 +0100 Subject: Add fix for bug causing MACSio build failure when hdf5 or typhonio enabled (#8722) * Add fix for bug causing build failure when hdf5 enabled * Added correct hdf5 dependency to typhonio --- var/spack/repos/builtin/packages/macsio/package.py | 2 +- var/spack/repos/builtin/packages/typhonio/package.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/macsio/package.py b/var/spack/repos/builtin/packages/macsio/package.py index 8fda9c4040..01422268a1 100644 --- a/var/spack/repos/builtin/packages/macsio/package.py +++ b/var/spack/repos/builtin/packages/macsio/package.py @@ -52,7 +52,7 @@ class Macsio(CMakePackage): depends_on('json-cwx') depends_on('mpi', when="+mpi") depends_on('silo', when="+silo") - depends_on('hdf5', when="+hdf5") + depends_on('hdf5+hl', when="+hdf5") # depends_on('hdf5+szip', when="+szip") depends_on('exodusii', when="+exodus") # pdb is packaged with silo diff --git a/var/spack/repos/builtin/packages/typhonio/package.py b/var/spack/repos/builtin/packages/typhonio/package.py index 7a31e6db01..f5f4461841 100644 --- a/var/spack/repos/builtin/packages/typhonio/package.py +++ b/var/spack/repos/builtin/packages/typhonio/package.py @@ -43,7 +43,7 @@ class Typhonio(CMakePackage): variant('doc', default=False, description='Build user guide and doxygen documentation') depends_on('mpi') - depends_on('hdf5') + depends_on('hdf5+hl') def cmake_args(self): spec = self.spec -- cgit v1.2.3-70-g09d2 From 9f0f18dad6593ff13292981be218e4d34ef2eb4a Mon Sep 17 00:00:00 2001 From: Lukasz Date: Tue, 17 Jul 2018 14:24:52 +0100 Subject: fix link to blas libs (#8721) --- var/spack/repos/builtin/packages/moab/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/moab/package.py b/var/spack/repos/builtin/packages/moab/package.py index 9f366ee915..89dc41d36c 100644 --- a/var/spack/repos/builtin/packages/moab/package.py +++ b/var/spack/repos/builtin/packages/moab/package.py @@ -124,6 +124,8 @@ class Moab(AutotoolsPackage): # else: # options.append('--without-mpi') + options.append('--with-blas=%s' % spec['blas'].libs) + if '+hdf5' in spec: options.append('--with-hdf5=%s' % spec['hdf5'].prefix) else: -- cgit v1.2.3-70-g09d2 From ab60e2258fb2932dda492a2b23c6241aefa0d021 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Tue, 17 Jul 2018 10:11:19 -0600 Subject: fftw: version bump (#8723) * fftw: version bump * fftw: add gcc-8 conflict for v3.3.7 --- var/spack/repos/builtin/packages/fftw/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fftw/package.py b/var/spack/repos/builtin/packages/fftw/package.py index 39b24ee69e..8c1d2ed1fb 100644 --- a/var/spack/repos/builtin/packages/fftw/package.py +++ b/var/spack/repos/builtin/packages/fftw/package.py @@ -39,6 +39,7 @@ class Fftw(AutotoolsPackage): url = "http://www.fftw.org/fftw-3.3.4.tar.gz" list_url = "http://www.fftw.org/download.html" + version('3.3.8', '8aac833c943d8e90d51b697b27d4384d') version('3.3.7', '0d5915d7d39b3253c1cc05030d79ac47') version('3.3.6-pl2', '927e481edbb32575397eb3d62535a856') version('3.3.5', '6cc08a3b9c7ee06fdd5b9eb02e06f569') @@ -87,6 +88,8 @@ class Fftw(AutotoolsPackage): depends_on('automake', type='build', when='+pfft_patches') depends_on('autoconf', type='build', when='+pfft_patches') depends_on('libtool', type='build', when='+pfft_patches') + # https://github.com/FFTW/fftw3/commit/902d0982522cdf6f0acd60f01f59203824e8e6f3 + conflicts('%gcc@8:8.9999', when="@3.3.7") @property def libs(self): -- cgit v1.2.3-70-g09d2 From 25062d0bd4c280ee5ec416bcb75686f50113c2a7 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Tue, 17 Jul 2018 11:13:04 -0600 Subject: lammps: added v20180629 (#8695) --- var/spack/repos/builtin/packages/lammps/package.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lammps/package.py b/var/spack/repos/builtin/packages/lammps/package.py index f9c4351c8f..459166c36e 100644 --- a/var/spack/repos/builtin/packages/lammps/package.py +++ b/var/spack/repos/builtin/packages/lammps/package.py @@ -38,6 +38,7 @@ class Lammps(CMakePackage): tags = ['ecp', 'ecp-apps'] + version('20180629', '6d5941863ee25ad2227ff3b7577d5e7c') version('20180316', '25bad35679583e0dd8cb8753665bb84b') version('20180222', '4d0513e3183bd57721814d217fdaf957') version('20170922', '4306071f919ec7e759bda195c26cfd9a') @@ -73,7 +74,8 @@ class Lammps(CMakePackage): depends_on('blas', when='+user-atc') depends_on('lapack', when='+user-atc') depends_on('latte@1.0.1', when='@:20180222+latte') - depends_on('latte@1.1.1:', when='@20180316:+latte') + depends_on('latte@1.1.1:', when='@20180316:20180628+latte') + depends_on('latte@1.2.1:', when='@20180629:+latte') depends_on('blas', when='+latte') depends_on('lapack', when='+latte') depends_on('python', when='+python') @@ -81,7 +83,7 @@ class Lammps(CMakePackage): depends_on('mpi', when='+user-h5md') depends_on('hdf5', when='+user-h5md') - conflicts('+body', when='+poems') + conflicts('+body', when='+poems@:20180628') conflicts('+latte', when='@:20170921') conflicts('+python', when='~lib') conflicts('+qeq', when='~manybody') @@ -98,15 +100,25 @@ class Lammps(CMakePackage): def cmake_args(self): spec = self.spec + mpi_prefix = 'ENABLE' + pkg_prefix = 'ENABLE' + if spec.satisfies('@20180629:'): + mpi_prefix = 'BUILD' + pkg_prefix = 'PKG' + args = [ '-DBUILD_SHARED_LIBS={0}'.format( 'ON' if '+lib' in spec else 'OFF'), - '-DENABLE_MPI={0}'.format( + '-D{0}_MPI={1}'.format( + mpi_prefix, 'ON' if '+mpi' in spec else 'OFF') ] + if spec.satisfies('@20180629:+lib'): + args.append('-DBUILD_LIB=ON') + for pkg in self.supported_packages: - opt = '-DENABLE_{0}'.format(pkg.upper()) + opt = '-D{0}_{1}'.format(pkg_prefix, pkg.upper()) if '+{0}'.format(pkg) in spec: args.append('{0}=ON'.format(opt)) else: -- cgit v1.2.3-70-g09d2 From 373b3d2444b2a2058e904071042e08d2dfecfc5b Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Tue, 17 Jul 2018 20:43:30 +0200 Subject: Packages must be added to DB to be considered installed (#8038) Fixes #8036 Before this PR Package.installed was returning True if the spec prefix existed, without checking the DB. This is wrong for external packages, whose prefix exists before being registered into the DB. Now the property checks for both the prefix and a DB entry. --- lib/spack/spack/package.py | 35 ++++++++++++++++++---- lib/spack/spack/test/data/packages.yaml | 1 + lib/spack/spack/test/database.py | 33 ++++++++++++++++++++ .../builtin.mock/packages/externaltool/package.py | 1 + 4 files changed, 64 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py index f0aa67fc8f..c79237dbef 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -995,7 +995,23 @@ class PackageBase(with_metaclass(PackageMeta, PackageViewMixin, object)): @property def installed(self): - return os.path.isdir(self.prefix) + """Installation status of a package. + + Returns: + True if the package has been installed, False otherwise. + """ + has_prefix = os.path.isdir(self.prefix) + try: + # If the spec is in the DB, check the installed + # attribute of the record + rec = spack.store.db.get_record(self.spec) + db_says_installed = rec.installed + except KeyError: + # If the spec is not in the DB, the method + # above raises a Key error + db_says_installed = False + + return has_prefix and db_says_installed @property def prefix(self): @@ -1650,11 +1666,18 @@ class PackageBase(with_metaclass(PackageMeta, PackageViewMixin, object)): def check_for_unfinished_installation( self, keep_prefix=False, restage=False): """Check for leftover files from partially-completed prior install to - prepare for a new install attempt. Options control whether these - files are reused (vs. destroyed). This function considers a package - fully-installed if there is a DB entry for it (in that way, it is - more strict than Package.installed). The return value is used to - indicate when the prefix exists but the install is not complete. + prepare for a new install attempt. + + Options control whether these files are reused (vs. destroyed). + + Args: + keep_prefix (bool): True if the installation prefix needs to be + kept, False otherwise + restage (bool): False if the stage has to be kept, True otherwise + + Returns: + True if the prefix exists but the install is not complete, False + otherwise. """ if self.spec.external: raise ExternalPackageError("Attempted to repair external spec %s" % diff --git a/lib/spack/spack/test/data/packages.yaml b/lib/spack/spack/test/data/packages.yaml index 923d63173a..c7256ddb33 100644 --- a/lib/spack/spack/test/data/packages.yaml +++ b/lib/spack/spack/test/data/packages.yaml @@ -3,6 +3,7 @@ packages: buildable: False paths: externaltool@1.0%gcc@4.5.0: /path/to/external_tool + externaltool@0.9%gcc@4.5.0: /usr externalvirtual: buildable: False paths: diff --git a/lib/spack/spack/test/database.py b/lib/spack/spack/test/database.py index 2e61853349..4c5db3089b 100644 --- a/lib/spack/spack/test/database.py +++ b/lib/spack/spack/test/database.py @@ -27,6 +27,7 @@ These tests check the database is functioning properly, both in memory and in its file """ import datetime +import functools import multiprocessing import os import pytest @@ -42,6 +43,23 @@ from spack.util.executable import Executable pytestmark = pytest.mark.db +@pytest.fixture() +def usr_folder_exists(monkeypatch): + """The ``/usr`` folder is assumed to be existing in some tests. This + fixture makes it such that its existence is mocked, so we have no + requirements on the system running tests. + """ + isdir = os.path.isdir + + @functools.wraps(os.path.isdir) + def mock_isdir(path): + if path == '/usr': + return True + return isdir(path) + + monkeypatch.setattr(os.path, 'isdir', mock_isdir) + + def _print_ref_counts(): """Print out all ref counts for the graph used here, for debugging""" recs = [] @@ -436,3 +454,18 @@ def test_external_entries_in_db(database): assert rec.spec.external_path == '/path/to/external_tool' assert rec.spec.external_module is None assert rec.explicit is True + + +@pytest.mark.regression('8036') +def test_regression_issue_8036(mutable_database, usr_folder_exists): + # The test ensures that the external package prefix is treated as + # existing. Even when the package prefix exists, the package should + # not be considered installed until it is added to the database with + # do_install. + s = spack.spec.Spec('externaltool@0.9') + s.concretize() + assert not s.package.installed + + # Now install the external package and check again the `installed` property + s.package.do_install(fake=True) + assert s.package.installed diff --git a/var/spack/repos/builtin.mock/packages/externaltool/package.py b/var/spack/repos/builtin.mock/packages/externaltool/package.py index c8867f3ef5..9f0e3f6f73 100644 --- a/var/spack/repos/builtin.mock/packages/externaltool/package.py +++ b/var/spack/repos/builtin.mock/packages/externaltool/package.py @@ -30,6 +30,7 @@ class Externaltool(Package): url = "http://somewhere.com/tool-1.0.tar.gz" version('1.0', '1234567890abcdef1234567890abcdef') + version('0.9', '1234567890abcdef1234567890abcdef') depends_on('externalprereq') -- cgit v1.2.3-70-g09d2 From 956faa50cca8a62ffda400c8171cebf0ab42e646 Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Tue, 17 Jul 2018 13:45:39 -0600 Subject: Confine the xlf_seacas.patch for trilinos to version 12.12.1 (#8725) * The xlf_seacas.patch fails on the latest trilinos develop branch so confine it up to version 12.12.1. * Fixing likely mistak in seacas patch version range. --- var/spack/repos/builtin/packages/trilinos/package.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index b9b0970cda..7854226079 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -311,11 +311,11 @@ class Trilinos(CMakePackage): depends_on('swig', when='+python') patch('umfpack_from_suitesparse.patch', when='@11.14.1:12.8.1') - patch('xlf_seacas.patch', when='@12.10.1:%xl') - patch('xlf_seacas.patch', when='@12.10.1:%xl_r') + patch('xlf_seacas.patch', when='@12.10.1:12.12.1 %xl') + patch('xlf_seacas.patch', when='@12.10.1:12.12.1 %xl_r') + patch('xlf_seacas.patch', when='@12.10.1:12.12.1 %clang') patch('xlf_tpetra.patch', when='@12.12.1:%xl') patch('xlf_tpetra.patch', when='@12.12.1:%xl_r') - patch('xlf_seacas.patch', when='@12.12.1:%clang') patch('xlf_tpetra.patch', when='@12.12.1:%clang') def url_for_version(self, version): -- cgit v1.2.3-70-g09d2 From 2ce6299c2b9c7ca19b2c4841776d03db6e5eefb1 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Tue, 17 Jul 2018 16:07:38 -0500 Subject: py-pyqi: new package (#8726) * py-pyqi: new package * py-pyqi: cleanup --- .../repos/builtin/packages/py-pyqi/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-pyqi/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pyqi/package.py b/var/spack/repos/builtin/packages/py-pyqi/package.py new file mode 100644 index 0000000000..43b4c791d3 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pyqi/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPyqi(PythonPackage): + """pyqi (canonically pronounced pie chee) is a Python framework designed + to support wrapping general commands in multiple types of interfaces, + including at the command line, HTML, and API levels.""" + + homepage = "https://pyqi.readthedocs.io" + url = "https://pypi.io/packages/source/p/pyqi/pyqi-0.3.2.tar.gz" + + version('0.3.2', '9507c06eeb22a816d963c860ad8e92ae') + + depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From 111512ce7b6ceacdfd2b066b332743ec72ead989 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Tue, 17 Jul 2018 17:56:04 -0500 Subject: Cmake: add version 3.12.0 (#8731) --- var/spack/repos/builtin/packages/cmake/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index 010e60e734..09352b7ae2 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -33,6 +33,7 @@ class Cmake(Package): list_url = 'https://cmake.org/files/' list_depth = 1 + version('3.12.0', 'ab4aa7df9301c94cdd6f8ee4fe66458b') version('3.11.4', '72e168b3bad2f9c34dcebbad7af56ff0') version('3.11.3', '3f923154ed47128f13b08eacd207d9ee') version('3.11.2', 'd2d554c05fc07cfae7846d2aa205f12a') -- cgit v1.2.3-70-g09d2 From 290125f893ddd4edc78b6205a30b35418717f97e Mon Sep 17 00:00:00 2001 From: Cyrus Harrison Date: Wed, 18 Jul 2018 12:54:12 -0700 Subject: openmpi: add c++ exceptions cfg option variant (#8743) * openmpi: add c++ exceptions cfg option variant * address review comments --- var/spack/repos/builtin/packages/openmpi/package.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 68f017c551..e276528f21 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -207,6 +207,7 @@ class Openmpi(AutotoolsPackage): description='Enable MPI_THREAD_MULTIPLE support') variant('cuda', default=False, description='Enable CUDA support') variant('pmi', default=False, description='Enable PMI support') + variant('cxx_exceptions', default=True, description='Enable C++ Exception support') # Adding support to build a debug version of OpenMPI that activates # Memchecker, as described here: # @@ -434,6 +435,10 @@ class Openmpi(AutotoolsPackage): else: config_args.append('--without-cuda') + if '+cxx_exceptions' in spec: + config_args.append('--enable-cxx-exceptions') + else: + config_args.append('--disable-cxx-exceptions') return config_args @run_after('install') -- cgit v1.2.3-70-g09d2 From ab262ca9168a9da1f311776fca54115ec872e989 Mon Sep 17 00:00:00 2001 From: Neil Flood Date: Thu, 19 Jul 2018 12:42:04 +1000 Subject: py-pkgconfig: Made nose dependency type=build,test instead of just type=test, to prevent setuptools from silently installing its own copy of nose (#8749) --- var/spack/repos/builtin/packages/py-pkgconfig/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pkgconfig/package.py b/var/spack/repos/builtin/packages/py-pkgconfig/package.py index 2b1d6f8b4d..6250006f6a 100644 --- a/var/spack/repos/builtin/packages/py-pkgconfig/package.py +++ b/var/spack/repos/builtin/packages/py-pkgconfig/package.py @@ -38,4 +38,4 @@ class PyPkgconfig(PythonPackage): depends_on('pkgconfig', type=('build', 'run')) - depends_on('py-nose@1.0:', type='test') + depends_on('py-nose@1.0:', type=('build', 'test')) -- cgit v1.2.3-70-g09d2 From 186d3669c6c2e3201cded06a74e712281e111a4d Mon Sep 17 00:00:00 2001 From: Neil Flood Date: Thu, 19 Jul 2018 12:42:57 +1000 Subject: py-snuggs: Added depends_on py-parsing. The build uses setuptools, which would otherwise silently try to install pyparsing itself, presumably into the python home dir (obviously not ideal). (#8748) --- var/spack/repos/builtin/packages/py-snuggs/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-snuggs/package.py b/var/spack/repos/builtin/packages/py-snuggs/package.py index 69711908c8..975fdfbe03 100644 --- a/var/spack/repos/builtin/packages/py-snuggs/package.py +++ b/var/spack/repos/builtin/packages/py-snuggs/package.py @@ -35,3 +35,4 @@ class PySnuggs(PythonPackage): depends_on('py-numpy', type=('build', 'run')) depends_on('py-click', type=('build', 'run')) + depends_on('py-pyparsing', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 23d911d1a0e2a91e7a3c8c5098ae20cda56608b6 Mon Sep 17 00:00:00 2001 From: Neil Flood Date: Thu, 19 Jul 2018 13:52:44 +1000 Subject: py-pytest: Added dependency on py-setuptools-scm, as well as py-setup… (#8750) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * py-pytest: Added dependency on py-setuptools-scm, as well as py-setuptools, to prevent the build from silently installing its own copy of setuptools-scm * py-pytest: Dependency on setuptools-scm only needs to be 'build' --- var/spack/repos/builtin/packages/py-pytest/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pytest/package.py b/var/spack/repos/builtin/packages/py-pytest/package.py index d41a19c432..5f0a0bc8fc 100644 --- a/var/spack/repos/builtin/packages/py-pytest/package.py +++ b/var/spack/repos/builtin/packages/py-pytest/package.py @@ -45,6 +45,7 @@ class PyPytest(PythonPackage): # Most Python packages only require setuptools as a build dependency. # However, pytest requires setuptools during runtime as well. depends_on('py-setuptools', type=('build', 'run')) + depends_on('py-setuptools-scm', type='build') depends_on('py-py@1.5.0:', type=('build', 'run')) depends_on('py-six@1.10.0:', type=('build', 'run')) depends_on('py-attrs@17.4.0:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 264761ccb85099a0a21ea32171bfe87181937dfa Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Wed, 27 Jun 2018 13:44:22 -0700 Subject: add py-pep8-naming package --- lib/spack/docs/contribution_guide.rst | 15 +++++--- .../builtin/packages/py-flake8-polyfill/package.py | 45 ++++++++++++++++++++++ .../builtin/packages/py-pep8-naming/package.py | 37 ++++++++++++++++++ 3 files changed, 92 insertions(+), 5 deletions(-) create mode 100644 var/spack/repos/builtin/packages/py-flake8-polyfill/package.py create mode 100644 var/spack/repos/builtin/packages/py-pep8-naming/package.py (limited to 'var') diff --git a/lib/spack/docs/contribution_guide.rst b/lib/spack/docs/contribution_guide.rst index d988b3df50..8123dbd164 100644 --- a/lib/spack/docs/contribution_guide.rst +++ b/lib/spack/docs/contribution_guide.rst @@ -189,11 +189,16 @@ to update them. .. warning:: - Flake8 requires setuptools in order to run. If you installed ``py-flake8`` - with Spack, make sure to add ``py-setuptools`` to your ``PYTHONPATH``. - The easiest way to do this is to run ``spack activate py-flake8`` so that - all of the dependencies are symlinked to a central location. If you see an - error message like: + Flake8 and ``pep8-naming`` require a number of dependencies in order + to run. If you installed ``py-flake8`` and ``py-pep8-naming``, the + easiest way to ensure the right packages are on your ``PYTHONPATH`` is + to run:: + + spack activate py-flake8 + spack activate pep8-naming + + so that all of the dependencies are symlinked to a central + location. If you see an error message like: .. code-block:: console diff --git a/var/spack/repos/builtin/packages/py-flake8-polyfill/package.py b/var/spack/repos/builtin/packages/py-flake8-polyfill/package.py new file mode 100644 index 0000000000..e1ca84bd7d --- /dev/null +++ b/var/spack/repos/builtin/packages/py-flake8-polyfill/package.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyFlake8Polyfill(PythonPackage): + """flake8-polyfill is a package that provides some compatibility helpers + for Flake8 plugins that intend to support Flake8 2.x and 3.x + simultaneously. + """ + homepage = "https://pypi.org/project/flake8-polyfill/" + url = "https://files.pythonhosted.org/packages/e6/67/1c26634a770db5c442e361311bee73cb3a177adb2eb3f7af8953cfd9f553/flake8-polyfill-1.0.2.tar.gz" + + version('1.0.2', 'e44b087597f6da52ec6393a709e7108b2905317d0c0b744cdca6208e670d8eda') + + extends('python', ignore='bin/(flake8|pyflakes|pycodestyle)') + depends_on('py-flake8', type='run') + + def build_args(self, spec, prefix): + # FIXME: Add arguments other than --prefix + # FIXME: If not needed delete this function + args = [] + return args diff --git a/var/spack/repos/builtin/packages/py-pep8-naming/package.py b/var/spack/repos/builtin/packages/py-pep8-naming/package.py new file mode 100644 index 0000000000..6f6e16f909 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pep8-naming/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPep8Naming(PythonPackage): + """Check PEP-8 naming conventions, plugin for flake8.""" + + homepage = "https://pypi.org/project/pep8-naming/" + url = "https://files.pythonhosted.org/packages/3e/4a/125425d6b1e017f48dfc9c961f4bb9510168db7a090618906c750184ed03/pep8-naming-0.7.0.tar.gz" + + extends('python', ignore='bin/(flake8|pyflakes|pycodestyle)') + version('0.7.0', '624258e0dd06ef32a9daf3c36cc925ff7314da7233209c5b01f7e5cdd3c34826') + + depends_on('py-flake8-polyfill', type='run') -- cgit v1.2.3-70-g09d2 From 20e4038a726e7b938a6bc5ab196156e0bf0becab Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Wed, 27 Jun 2018 09:31:21 -0700 Subject: style: make core comply with pep8-naming --- .flake8 | 5 ++++- lib/spack/llnl/util/lang.py | 4 ++-- lib/spack/llnl/util/multiproc.py | 6 +++--- lib/spack/llnl/util/tty/__init__.py | 6 +++--- lib/spack/spack/architecture.py | 5 ++--- lib/spack/spack/binary_distribution.py | 6 +++--- lib/spack/spack/cmd/create.py | 4 ++-- lib/spack/spack/compilers/nag.py | 2 +- lib/spack/spack/compilers/xl_r.py | 2 +- lib/spack/spack/config.py | 4 ++-- lib/spack/spack/directives.py | 6 +++--- lib/spack/spack/fetch_strategy.py | 8 ++++---- lib/spack/spack/mirror.py | 10 +++++----- lib/spack/spack/operating_systems/mac_os.py | 2 +- lib/spack/spack/package.py | 23 +++++++++++----------- lib/spack/spack/platforms/bgq.py | 2 +- lib/spack/spack/platforms/darwin.py | 2 +- lib/spack/spack/platforms/linux.py | 2 +- lib/spack/spack/platforms/test.py | 10 ++++++---- lib/spack/spack/stage.py | 4 ++-- lib/spack/spack/tengine.py | 12 +++++------ lib/spack/spack/test/conftest.py | 9 +++------ lib/spack/spack/test/flag_handlers.py | 6 +++--- lib/spack/spack/test/llnl/util/file_list.py | 8 ++++---- lib/spack/spack/test/module_parsing.py | 6 +++--- lib/spack/spack/test/modules/lmod.py | 4 ++-- lib/spack/spack/test/repo.py | 4 ++-- lib/spack/spack/test/test_activations.py | 8 ++++---- lib/spack/spack/util/file_cache.py | 4 ++-- lib/spack/spack/util/module_cmd.py | 6 +++--- lib/spack/spack/util/package_hash.py | 12 +++++------ var/spack/repos/builtin/packages/bison/package.py | 4 ++-- var/spack/repos/builtin/packages/gcc/package.py | 4 ++-- var/spack/repos/builtin/packages/oce/package.py | 6 +++--- .../repos/builtin/packages/trilinos/package.py | 4 ++-- 35 files changed, 106 insertions(+), 104 deletions(-) (limited to 'var') diff --git a/.flake8 b/.flake8 index 49199b35c8..9e7956c919 100644 --- a/.flake8 +++ b/.flake8 @@ -16,6 +16,9 @@ # These are required to get the package.py files to test clean: # - F999: syntax error in doctest # +# Exempt to allow decorator classes to be lowercase, but follow otherwise: +# - N801: CapWords for class names. +# [flake8] -ignore = E129,E221,E241,E272,E731,F999 +ignore = E129,E221,E241,E272,E731,F999,N801 max-line-length = 79 diff --git a/lib/spack/llnl/util/lang.py b/lib/spack/llnl/util/lang.py index edba6e38e1..4d238217a1 100644 --- a/lib/spack/llnl/util/lang.py +++ b/lib/spack/llnl/util/lang.py @@ -282,8 +282,8 @@ class HashableMap(collections.MutableMapping): def copy(self): """Type-agnostic clone method. Preserves subclass type.""" # Construct a new dict of my type - T = type(self) - clone = T() + self_type = type(self) + clone = self_type() # Copy everything from this dict into it. for key in self: diff --git a/lib/spack/llnl/util/multiproc.py b/lib/spack/llnl/util/multiproc.py index 2bf5d1a200..26902d02ee 100644 --- a/lib/spack/llnl/util/multiproc.py +++ b/lib/spack/llnl/util/multiproc.py @@ -39,10 +39,10 @@ def spawn(f): return fun -def parmap(f, X): - pipe = [Pipe() for x in X] +def parmap(f, elements): + pipe = [Pipe() for x in elements] proc = [Process(target=spawn(f), args=(c, x)) - for x, (p, c) in zip(X, pipe)] + for x, (p, c) in zip(elements, pipe)] [p.start() for p in proc] [p.join() for p in proc] return [p.recv() for (p, c) in pipe] diff --git a/lib/spack/llnl/util/tty/__init__.py b/lib/spack/llnl/util/tty/__init__.py index d8e5f35379..5bf4e0f8ba 100644 --- a/lib/spack/llnl/util/tty/__init__.py +++ b/lib/spack/llnl/util/tty/__init__.py @@ -246,18 +246,18 @@ def hline(label=None, **kwargs): def terminal_size(): """Gets the dimensions of the console: (rows, cols).""" - def ioctl_GWINSZ(fd): + def ioctl_gwinsz(fd): try: rc = struct.unpack('hh', fcntl.ioctl( fd, termios.TIOCGWINSZ, '1234')) except BaseException: return return rc - rc = ioctl_GWINSZ(0) or ioctl_GWINSZ(1) or ioctl_GWINSZ(2) + rc = ioctl_gwinsz(0) or ioctl_gwinsz(1) or ioctl_gwinsz(2) if not rc: try: fd = os.open(os.ctermid(), os.O_RDONLY) - rc = ioctl_GWINSZ(fd) + rc = ioctl_gwinsz(fd) os.close(fd) except BaseException: pass diff --git a/lib/spack/spack/architecture.py b/lib/spack/spack/architecture.py index 4ef61d569f..ca0a647121 100644 --- a/lib/spack/spack/architecture.py +++ b/lib/spack/spack/architecture.py @@ -193,14 +193,13 @@ class Platform(object): return self.operating_sys.get(name, None) @classmethod - def setup_platform_environment(self, pkg, env): + def setup_platform_environment(cls, pkg, env): """ Subclass can override this method if it requires any platform-specific build environment modifications. """ - pass @classmethod - def detect(self): + def detect(cls): """ Subclass is responsible for implementing this method. Returns True if the Platform class detects that it is the current platform diff --git a/lib/spack/spack/binary_distribution.py b/lib/spack/spack/binary_distribution.py index b96237ed99..c743be7261 100644 --- a/lib/spack/spack/binary_distribution.py +++ b/lib/spack/spack/binary_distribution.py @@ -203,13 +203,13 @@ def tarball_path_name(spec, ext): def checksum_tarball(file): # calculate sha256 hash of tar file - BLOCKSIZE = 65536 + block_size = 65536 hasher = hashlib.sha256() with open(file, 'rb') as tfile: - buf = tfile.read(BLOCKSIZE) + buf = tfile.read(block_size) while len(buf) > 0: hasher.update(buf) - buf = tfile.read(BLOCKSIZE) + buf = tfile.read(block_size) return hasher.hexdigest() diff --git a/lib/spack/spack/cmd/create.py b/lib/spack/spack/cmd/create.py index 650eb81189..eae6e6da3a 100644 --- a/lib/spack/spack/cmd/create.py +++ b/lib/spack/spack/cmd/create.py @@ -676,8 +676,8 @@ def create(parser, args): build_system = get_build_system(args, guesser) # Create the package template object - PackageClass = templates[build_system] - package = PackageClass(name, url, versions) + package_class = templates[build_system] + package = package_class(name, url, versions) tty.msg("Created template for {0} package".format(package.name)) # Create a directory for the new package diff --git a/lib/spack/spack/compilers/nag.py b/lib/spack/spack/compilers/nag.py index dbe7ae55cf..a279384a74 100644 --- a/lib/spack/spack/compilers/nag.py +++ b/lib/spack/spack/compilers/nag.py @@ -72,7 +72,7 @@ class Nag(Compiler): return '-Wl,-Wl,,-rpath,,' @classmethod - def default_version(self, comp): + def default_version(cls, comp): """The ``-V`` option works for nag compilers. Output looks like this:: diff --git a/lib/spack/spack/compilers/xl_r.py b/lib/spack/spack/compilers/xl_r.py index 9aa12a03ce..d926c1d782 100644 --- a/lib/spack/spack/compilers/xl_r.py +++ b/lib/spack/spack/compilers/xl_r.py @@ -74,7 +74,7 @@ class XlR(Compiler): return "-qzerosize" @classmethod - def default_version(self, comp): + def default_version(cls, comp): """The '-qversion' is the standard option fo XL compilers. Output looks like this:: diff --git a/lib/spack/spack/config.py b/lib/spack/spack/config.py index ec37c0a972..2e67f0e1da 100644 --- a/lib/spack/spack/config.py +++ b/lib/spack/spack/config.py @@ -542,9 +542,9 @@ def _validate_section(data, schema): """ import jsonschema if not hasattr(_validate_section, 'validator'): - DefaultSettingValidator = _extend_with_default( + default_setting_validator = _extend_with_default( jsonschema.Draft4Validator) - _validate_section.validator = DefaultSettingValidator + _validate_section.validator = default_setting_validator try: _validate_section.validator(schema).validate(data) diff --git a/lib/spack/spack/directives.py b/lib/spack/spack/directives.py index 68678d904d..56490f8452 100644 --- a/lib/spack/spack/directives.py +++ b/lib/spack/spack/directives.py @@ -80,7 +80,7 @@ class DirectiveMeta(type): _directive_names = set() _directives_to_be_executed = [] - def __new__(mcs, name, bases, attr_dict): + def __new__(cls, name, bases, attr_dict): # Initialize the attribute containing the list of directives # to be executed. Here we go reversed because we want to execute # commands: @@ -109,8 +109,8 @@ class DirectiveMeta(type): DirectiveMeta._directives_to_be_executed) DirectiveMeta._directives_to_be_executed = [] - return super(DirectiveMeta, mcs).__new__( - mcs, name, bases, attr_dict) + return super(DirectiveMeta, cls).__new__( + cls, name, bases, attr_dict) def __init__(cls, name, bases, attr_dict): # The class is being created: if it is a package we must ensure diff --git a/lib/spack/spack/fetch_strategy.py b/lib/spack/spack/fetch_strategy.py index d1c6f607b3..3a08deb754 100644 --- a/lib/spack/spack/fetch_strategy.py +++ b/lib/spack/spack/fetch_strategy.py @@ -1026,7 +1026,7 @@ class FsCache(object): def __init__(self, root): self.root = os.path.abspath(root) - def store(self, fetcher, relativeDst): + def store(self, fetcher, relative_dest): # skip fetchers that aren't cachable if not fetcher.cachable: return @@ -1035,12 +1035,12 @@ class FsCache(object): if isinstance(fetcher, CacheURLFetchStrategy): return - dst = os.path.join(self.root, relativeDst) + dst = os.path.join(self.root, relative_dest) mkdirp(os.path.dirname(dst)) fetcher.archive(dst) - def fetcher(self, targetPath, digest, **kwargs): - path = os.path.join(self.root, targetPath) + def fetcher(self, target_path, digest, **kwargs): + path = os.path.join(self.root, target_path) return CacheURLFetchStrategy(path, digest, **kwargs) def destroy(self): diff --git a/lib/spack/spack/mirror.py b/lib/spack/spack/mirror.py index 14e4b482ef..c04a769ba4 100644 --- a/lib/spack/spack/mirror.py +++ b/lib/spack/spack/mirror.py @@ -44,7 +44,7 @@ from spack.version import VersionList from spack.util.compression import allowed_archive -def mirror_archive_filename(spec, fetcher, resourceId=None): +def mirror_archive_filename(spec, fetcher, resource_id=None): """Get the name of the spec's archive in the mirror.""" if not spec.version.concrete: raise ValueError("mirror.path requires spec with concrete version.") @@ -87,18 +87,18 @@ Spack not to expand it with the following syntax: # Otherwise we'll make a .tar.gz ourselves ext = 'tar.gz' - if resourceId: - filename = "%s-%s" % (resourceId, spec.version) + ".%s" % ext + if resource_id: + filename = "%s-%s" % (resource_id, spec.version) + ".%s" % ext else: filename = "%s-%s" % (spec.package.name, spec.version) + ".%s" % ext return filename -def mirror_archive_path(spec, fetcher, resourceId=None): +def mirror_archive_path(spec, fetcher, resource_id=None): """Get the relative path to the spec's archive within a mirror.""" return os.path.join( - spec.name, mirror_archive_filename(spec, fetcher, resourceId)) + spec.name, mirror_archive_filename(spec, fetcher, resource_id)) def get_matching_versions(specs, **kwargs): diff --git a/lib/spack/spack/operating_systems/mac_os.py b/lib/spack/spack/operating_systems/mac_os.py index 8f283e2fe1..39e3afbda3 100644 --- a/lib/spack/spack/operating_systems/mac_os.py +++ b/lib/spack/spack/operating_systems/mac_os.py @@ -29,7 +29,7 @@ from spack.version import Version # FIXME: store versions inside OperatingSystem as a Version instead of string -def macOS_version(): +def macos_version(): """temporary workaround to return a macOS version as a Version object """ return Version('.'.join(py_platform.mac_ver()[0].split('.')[:2])) diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py index b203551b07..75aed2e899 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -163,7 +163,7 @@ class PackageMeta( _InstallPhase_run_before = {} _InstallPhase_run_after = {} - def __new__(mcs, name, bases, attr_dict): + def __new__(cls, name, bases, attr_dict): if 'phases' in attr_dict: # Turn the strings in 'phases' into InstallPhase instances @@ -176,7 +176,7 @@ class PackageMeta( def _flush_callbacks(check_name): # Name of the attribute I am going to check it exists attr_name = PackageMeta.phase_fmt.format(check_name) - checks = getattr(mcs, attr_name) + checks = getattr(cls, attr_name) if checks: for phase_name, funcs in checks.items(): try: @@ -202,12 +202,12 @@ class PackageMeta( PackageMeta.phase_fmt.format(phase_name)] getattr(phase, check_name).extend(funcs) # Clear the attribute for the next class - setattr(mcs, attr_name, {}) + setattr(cls, attr_name, {}) _flush_callbacks('run_before') _flush_callbacks('run_after') - return super(PackageMeta, mcs).__new__(mcs, name, bases, attr_dict) + return super(PackageMeta, cls).__new__(cls, name, bases, attr_dict) @staticmethod def register_callback(check_type, *phases): @@ -1229,7 +1229,7 @@ class PackageBase(with_metaclass(PackageMeta, PackageViewMixin, object)): " if the associated spec is not concrete") raise spack.error.SpackError(err_msg) - hashContent = list() + hash_content = list() source_id = fs.for_package_version(self, self.version).source_id() if not source_id: # TODO? in cases where a digest or source_id isn't available, @@ -1238,14 +1238,15 @@ class PackageBase(with_metaclass(PackageMeta, PackageViewMixin, object)): # referenced by branch name rather than tag or commit ID. message = 'Missing a source id for {s.name}@{s.version}' tty.warn(message.format(s=self)) - hashContent.append(''.encode('utf-8')) + hash_content.append(''.encode('utf-8')) else: - hashContent.append(source_id.encode('utf-8')) - hashContent.extend(':'.join((p.sha256, str(p.level))).encode('utf-8') - for p in self.spec.patches) - hashContent.append(package_hash(self.spec, content)) + hash_content.append(source_id.encode('utf-8')) + hash_content.extend(':'.join((p.sha256, str(p.level))).encode('utf-8') + for p in self.spec.patches) + hash_content.append(package_hash(self.spec, content)) return base64.b32encode( - hashlib.sha256(bytes().join(sorted(hashContent))).digest()).lower() + hashlib.sha256(bytes().join( + sorted(hash_content))).digest()).lower() @property def namespace(self): diff --git a/lib/spack/spack/platforms/bgq.py b/lib/spack/spack/platforms/bgq.py index 1c46542018..18004d8880 100644 --- a/lib/spack/spack/platforms/bgq.py +++ b/lib/spack/spack/platforms/bgq.py @@ -53,5 +53,5 @@ class Bgq(Platform): self.add_operating_system(str(back_distro), back_distro) @classmethod - def detect(self): + def detect(cls): return os.path.exists('/bgsys') diff --git a/lib/spack/spack/platforms/darwin.py b/lib/spack/spack/platforms/darwin.py index 3d9e4df9c5..fba3de7fe9 100644 --- a/lib/spack/spack/platforms/darwin.py +++ b/lib/spack/spack/platforms/darwin.py @@ -45,5 +45,5 @@ class Darwin(Platform): self.add_operating_system(str(mac_os), mac_os) @classmethod - def detect(self): + def detect(cls): return 'darwin' in platform.system().lower() diff --git a/lib/spack/spack/platforms/linux.py b/lib/spack/spack/platforms/linux.py index cf263bb457..0cf906e355 100644 --- a/lib/spack/spack/platforms/linux.py +++ b/lib/spack/spack/platforms/linux.py @@ -49,5 +49,5 @@ class Linux(Platform): self.add_operating_system(str(linux_dist), linux_dist) @classmethod - def detect(self): + def detect(cls): return 'linux' in platform.system().lower() diff --git a/lib/spack/spack/platforms/test.py b/lib/spack/spack/platforms/test.py index a1ad34b46f..fa1c86effa 100644 --- a/lib/spack/spack/platforms/test.py +++ b/lib/spack/spack/platforms/test.py @@ -23,7 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack.architecture import Platform, Target -from spack.architecture import OperatingSystem as OS +from spack.architecture import OperatingSystem class Test(Platform): @@ -41,9 +41,11 @@ class Test(Platform): self.add_target(self.default, Target(self.default)) self.add_target(self.front_end, Target(self.front_end)) - self.add_operating_system(self.default_os, OS('debian', 6)) - self.add_operating_system(self.front_os, OS('redhat', 6)) + self.add_operating_system( + self.default_os, OperatingSystem('debian', 6)) + self.add_operating_system( + self.front_os, OperatingSystem('redhat', 6)) @classmethod - def detect(self): + def detect(cls): return True diff --git a/lib/spack/spack/stage.py b/lib/spack/spack/stage.py index 0111ccd840..82363f31ee 100644 --- a/lib/spack/spack/stage.py +++ b/lib/spack/spack/stage.py @@ -432,9 +432,9 @@ class Stage(object): tty.debug(e) continue else: - errMessage = "All fetchers failed for %s" % self.name + err_msg = "All fetchers failed for %s" % self.name self.fetcher = self.default_fetcher - raise fs.FetchError(errMessage, None) + raise fs.FetchError(err_msg, None) def check(self): """Check the downloaded archive against a checksum digest. diff --git a/lib/spack/spack/tengine.py b/lib/spack/spack/tengine.py index 731ce78782..c3ce16ac04 100644 --- a/lib/spack/spack/tengine.py +++ b/lib/spack/spack/tengine.py @@ -43,10 +43,10 @@ class ContextMeta(type): #: by the class that is being defined _new_context_properties = [] - def __new__(mcs, name, bases, attr_dict): + def __new__(cls, name, bases, attr_dict): # Merge all the context properties that are coming from base classes # into a list without duplicates. - context_properties = list(mcs._new_context_properties) + context_properties = list(cls._new_context_properties) for x in bases: try: context_properties.extend(x.context_properties) @@ -55,20 +55,20 @@ class ContextMeta(type): context_properties = list(llnl.util.lang.dedupe(context_properties)) # Flush the list - mcs._new_context_properties = [] + cls._new_context_properties = [] # Attach the list to the class being created attr_dict['context_properties'] = context_properties - return super(ContextMeta, mcs).__new__(mcs, name, bases, attr_dict) + return super(ContextMeta, cls).__new__(cls, name, bases, attr_dict) @classmethod - def context_property(mcs, func): + def context_property(cls, func): """Decorator that adds a function name to the list of new context properties, and then returns a property. """ name = func.__name__ - mcs._new_context_properties.append(name) + cls._new_context_properties.append(name) return property(func) diff --git a/lib/spack/spack/test/conftest.py b/lib/spack/spack/test/conftest.py index 6649fa6a5e..4f4e01930a 100644 --- a/lib/spack/spack/test/conftest.py +++ b/lib/spack/spack/test/conftest.py @@ -44,7 +44,7 @@ import spack.platforms.test import spack.repo import spack.stage import spack.util.executable -import spack.util.pattern +from spack.util.pattern import Bunch from spack.dependency import Dependency from spack.package import PackageBase from spack.fetch_strategy import FetchStrategyComposite, URLFetchStrategy @@ -165,10 +165,10 @@ def mock_fetch_cache(monkeypatch): and raises on fetch. """ class MockCache(object): - def store(self, copyCmd, relativeDst): + def store(self, copy_cmd, relative_dest): pass - def fetcher(self, targetPath, digest, **kwargs): + def fetcher(self, target_path, digest, **kwargs): return MockCacheFetcher() class MockCacheFetcher(object): @@ -508,7 +508,6 @@ def mock_git_repository(tmpdir_factory): r1 = rev_hash(branch) r1_file = branch_file - Bunch = spack.util.pattern.Bunch checks = { 'master': Bunch( revision='master', file=r0_file, args={'git': str(repodir)} @@ -561,7 +560,6 @@ def mock_hg_repository(tmpdir_factory): hg('commit', '-m' 'revision 1', '-u', 'test') r1 = get_rev() - Bunch = spack.util.pattern.Bunch checks = { 'default': Bunch( revision=r1, file=r1_file, args={'hg': str(repodir)} @@ -618,7 +616,6 @@ def mock_svn_repository(tmpdir_factory): r0 = '1' r1 = '2' - Bunch = spack.util.pattern.Bunch checks = { 'default': Bunch( revision=r1, file=r1_file, args={'svn': url}), diff --git a/lib/spack/spack/test/flag_handlers.py b/lib/spack/spack/test/flag_handlers.py index cd6955646d..a81e00ca89 100644 --- a/lib/spack/spack/test/flag_handlers.py +++ b/lib/spack/spack/test/flag_handlers.py @@ -37,7 +37,7 @@ def temp_env(): os.environ = old_env -def add_O3_to_build_system_cflags(pkg, name, flags): +def add_o3_to_build_system_cflags(pkg, name, flags): build_system_flags = [] if name == 'cflags': build_system_flags.append('-O3') @@ -137,7 +137,7 @@ class TestFlagHandlers(object): s = spack.spec.Spec('libelf cppflags=-g') s.concretize() pkg = spack.repo.get(s) - pkg.flag_handler = add_O3_to_build_system_cflags + pkg.flag_handler = add_o3_to_build_system_cflags spack.build_environment.setup_package(pkg, False) assert '-g' in os.environ['SPACK_CPPFLAGS'] @@ -149,7 +149,7 @@ class TestFlagHandlers(object): s = spack.spec.Spec('callpath cppflags=-g') s.concretize() pkg = spack.repo.get(s) - pkg.flag_handler = add_O3_to_build_system_cflags + pkg.flag_handler = add_o3_to_build_system_cflags spack.build_environment.setup_package(pkg, False) assert '-g' in os.environ['SPACK_CPPFLAGS'] diff --git a/lib/spack/spack/test/llnl/util/file_list.py b/lib/spack/spack/test/llnl/util/file_list.py index 5671661435..6499befd3c 100644 --- a/lib/spack/spack/test/llnl/util/file_list.py +++ b/lib/spack/spack/test/llnl/util/file_list.py @@ -263,7 +263,7 @@ def test_searching_order(search_fn, search_list, root, kwargs): # Now reverse the result and start discarding things # as soon as you have matches. In the end the list should # be emptied. - L = list(reversed(result)) + rlist = list(reversed(result)) # At this point make sure the search list is a sequence if isinstance(search_list, six.string_types): @@ -272,14 +272,14 @@ def test_searching_order(search_fn, search_list, root, kwargs): # Discard entries in the order they appear in search list for x in search_list: try: - while fnmatch.fnmatch(L[-1], x) or x in L[-1]: - L.pop() + while fnmatch.fnmatch(rlist[-1], x) or x in rlist[-1]: + rlist.pop() except IndexError: # List is empty pass # List should be empty here - assert len(L) == 0 + assert len(rlist) == 0 @pytest.mark.parametrize('root,search_list,kwargs,expected', [ diff --git a/lib/spack/spack/test/module_parsing.py b/lib/spack/spack/test/module_parsing.py index 978de51559..59ea6402d1 100644 --- a/lib/spack/spack/test/module_parsing.py +++ b/lib/spack/spack/test/module_parsing.py @@ -42,13 +42,13 @@ MODULE_NOT_DEFINED = b'not found' in typeset @pytest.fixture def save_env(): - old_PATH = os.environ.get('PATH', None) + old_path = os.environ.get('PATH', None) old_bash_func = os.environ.get('BASH_FUNC_module()', None) yield - if old_PATH: - os.environ['PATH'] = old_PATH + if old_path: + os.environ['PATH'] = old_path if old_bash_func: os.environ['BASH_FUNC_module()'] = old_bash_func diff --git a/lib/spack/spack/test/modules/lmod.py b/lib/spack/spack/test/modules/lmod.py index 7371a9a0d7..82a31b03a3 100644 --- a/lib/spack/spack/test/modules/lmod.py +++ b/lib/spack/spack/test/modules/lmod.py @@ -171,11 +171,11 @@ class TestLmod(object): path = module.layout.filename mpi_spec = spec['mpi'] - mpiElement = "{0}/{1}-{2}/".format( + mpi_element = "{0}/{1}-{2}/".format( mpi_spec.name, mpi_spec.version, mpi_spec.dag_hash(length=7) ) - assert mpiElement in path + assert mpi_element in path mpileaks_spec = spec mpileaks_element = "{0}/{1}.lua".format( diff --git a/lib/spack/spack/test/repo.py b/lib/spack/spack/test/repo.py index 1bac0bb32a..789f0c2dec 100644 --- a/lib/spack/spack/test/repo.py +++ b/lib/spack/spack/test/repo.py @@ -42,8 +42,8 @@ def extra_repo(tmpdir_factory): repo_dir = tmpdir_factory.mktemp(repo_namespace) repo_dir.ensure('packages', dir=True) - with open(str(repo_dir.join('repo.yaml')), 'w') as F: - F.write(""" + with open(str(repo_dir.join('repo.yaml')), 'w') as f: + f.write(""" repo: namespace: extra_test_repo """) diff --git a/lib/spack/spack/test/test_activations.py b/lib/spack/spack/test/test_activations.py index 04f5580cd9..d9b69446a9 100644 --- a/lib/spack/spack/test/test_activations.py +++ b/lib/spack/spack/test/test_activations.py @@ -137,8 +137,8 @@ def python_and_extension_dirs(tmpdir): create_dir_structure(ext_prefix, ext_dirs) easy_install_location = 'lib/python2.7/site-packages/easy-install.pth' - with open(str(ext_prefix.join(easy_install_location)), 'w') as F: - F.write("""path/to/ext1.egg + with open(str(ext_prefix.join(easy_install_location)), 'w') as f: + f.write("""path/to/ext1.egg path/to/setuptools.egg""") return str(python_prefix), str(ext_prefix) @@ -204,8 +204,8 @@ def test_python_activation_with_files(tmpdir, python_and_extension_dirs): assert os.path.exists(os.path.join(python_prefix, 'bin/py-ext-tool')) easy_install_location = 'lib/python2.7/site-packages/easy-install.pth' - with open(os.path.join(python_prefix, easy_install_location), 'r') as F: - easy_install_contents = F.read() + with open(os.path.join(python_prefix, easy_install_location), 'r') as f: + easy_install_contents = f.read() assert 'ext1.egg' in easy_install_contents assert 'setuptools.egg' not in easy_install_contents diff --git a/lib/spack/spack/util/file_cache.py b/lib/spack/spack/util/file_cache.py index 56217e3a7c..6dce9b9bdc 100644 --- a/lib/spack/spack/util/file_cache.py +++ b/lib/spack/spack/util/file_cache.py @@ -130,7 +130,7 @@ class FileCache(object): """ class WriteContextManager(object): - def __enter__(cm): + def __enter__(cm): # noqa cm.orig_filename = self.cache_path(key) cm.orig_file = None if os.path.exists(cm.orig_filename): @@ -141,7 +141,7 @@ class FileCache(object): return cm.orig_file, cm.tmp_file - def __exit__(cm, type, value, traceback): + def __exit__(cm, type, value, traceback): # noqa if cm.orig_file: cm.orig_file.close() cm.tmp_file.close() diff --git a/lib/spack/spack/util/module_cmd.py b/lib/spack/spack/util/module_cmd.py index 66a553f60c..d8a9ce27d6 100644 --- a/lib/spack/spack/util/module_cmd.py +++ b/lib/spack/spack/util/module_cmd.py @@ -194,9 +194,9 @@ def get_path_from_module(mod): # If it lists a -L instruction, use that for line in text: - L = line.find('-L/') - if L >= 0: - return line[L + 2:line.find('/lib')] + lib_paths = line.find('-L/') + if lib_paths >= 0: + return line[lib_paths + 2:line.find('/lib')] # If it sets the PATH, use it for line in text: diff --git a/lib/spack/spack/util/package_hash.py b/lib/spack/spack/util/package_hash.py index 21514745e3..904234baf3 100644 --- a/lib/spack/spack/util/package_hash.py +++ b/lib/spack/spack/util/package_hash.py @@ -44,13 +44,13 @@ class RemoveDocstrings(ast.NodeTransformer): self.generic_visit(node) return node - def visit_FunctionDef(self, node): + def visit_FunctionDef(self, node): # noqa return self.remove_docstring(node) - def visit_ClassDef(self, node): + def visit_ClassDef(self, node): # noqa return self.remove_docstring(node) - def visit_Module(self, node): + def visit_Module(self, node): # noqa return self.remove_docstring(node) @@ -69,7 +69,7 @@ class RemoveDirectives(ast.NodeTransformer): node.targets and isinstance(node.targets[0], ast.Name) and node.targets[0].id in spack.package.Package.metadata_attrs) - def visit_ClassDef(self, node): + def visit_ClassDef(self, node): # noqa if node.name == spack.util.naming.mod_to_class(self.spec.name): node.body = [ c for c in node.body @@ -83,7 +83,7 @@ class TagMultiMethods(ast.NodeVisitor): self.spec = spec self.methods = {} - def visit_FunctionDef(self, node): + def visit_FunctionDef(self, node): # noqa nodes = self.methods.setdefault(node.name, []) if node.decorator_list: dec = node.decorator_list[0] @@ -112,7 +112,7 @@ class ResolveMultiMethods(ast.NodeTransformer): result = n return result - def visit_FunctionDef(self, node): + def visit_FunctionDef(self, node): # noqa if self.resolve(node) is node: node.decorator_list = [] return node diff --git a/var/spack/repos/builtin/packages/bison/package.py b/var/spack/repos/builtin/packages/bison/package.py index ac920b96aa..8a2d4a111b 100644 --- a/var/spack/repos/builtin/packages/bison/package.py +++ b/var/spack/repos/builtin/packages/bison/package.py @@ -23,7 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from spack.operating_systems.mac_os import macOS_version +from spack.operating_systems.mac_os import macos_version import sys @@ -42,7 +42,7 @@ class Bison(AutotoolsPackage): patch('pgi.patch', when='@3.0.4') - if sys.platform == 'darwin' and macOS_version() >= Version('10.13'): + if sys.platform == 'darwin' and macos_version() >= Version('10.13'): patch('secure_snprintf.patch', level=0, when='@3.0.4') build_directory = 'spack-build' diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py index fb176edcff..13f7e1abf8 100644 --- a/var/spack/repos/builtin/packages/gcc/package.py +++ b/var/spack/repos/builtin/packages/gcc/package.py @@ -23,7 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from spack.operating_systems.mac_os import macOS_version +from spack.operating_systems.mac_os import macos_version from llnl.util import tty import glob @@ -157,7 +157,7 @@ class Gcc(AutotoolsPackage): if sys.platform == 'darwin': # Fix parallel build on APFS filesystem # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81797 - if macOS_version() >= Version('10.13'): + if macos_version() >= Version('10.13'): patch('darwin/apfs.patch', when='@5.5.0,6.1:6.4,7.1:7.3') # from homebrew via macports # https://trac.macports.org/ticket/56502#no1 diff --git a/var/spack/repos/builtin/packages/oce/package.py b/var/spack/repos/builtin/packages/oce/package.py index 45758d6924..6b7b3349bd 100644 --- a/var/spack/repos/builtin/packages/oce/package.py +++ b/var/spack/repos/builtin/packages/oce/package.py @@ -23,7 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from spack.operating_systems.mac_os import macOS_version +from spack.operating_systems.mac_os import macos_version import platform @@ -68,7 +68,7 @@ class Oce(Package): # fix build with Xcode 8 "previous definition of CLOCK_REALTIME" # reported 27 Sep 2016 https://github.com/tpaviot/oce/issues/643 if (platform.system() == "Darwin") and ( - macOS_version() == Version('10.12')): + macos_version() == Version('10.12')): patch('sierra.patch', when='@0.17.2:0.18.0') def install(self, spec, prefix): @@ -99,7 +99,7 @@ class Oce(Package): ]) if platform.system() == 'Darwin' and ( - macOS_version() >= Version('10.12')): + macos_version() >= Version('10.12')): # use @rpath on Sierra due to limit of dynamic loader options.append('-DCMAKE_MACOSX_RPATH=ON') else: diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 7854226079..9cce2f028e 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -25,7 +25,7 @@ import os import sys from spack import * -from spack.operating_systems.mac_os import macOS_version +from spack.operating_systems.mac_os import macos_version # Trilinos is complicated to build, as an inspiration a couple of links to # other repositories which build it: @@ -703,7 +703,7 @@ class Trilinos(CMakePackage): '-DTrilinos_ENABLE_FEI=OFF' ]) - if sys.platform == 'darwin' and macOS_version() >= Version('10.12'): + if sys.platform == 'darwin' and macos_version() >= Version('10.12'): # use @rpath on Sierra due to limit of dynamic loader options.append('-DCMAKE_MACOSX_RPATH=ON') else: -- cgit v1.2.3-70-g09d2 From d0a808944ef121b7f23d4e78e1c661ff8b107274 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Wed, 27 Jun 2018 10:27:03 -0700 Subject: style: bring packages in compliance with pep8-naming --- var/spack/repos/builtin/packages/boost/package.py | 54 +++++++------- .../repos/builtin/packages/cbtf-krell/package.py | 86 +++++++++++----------- .../repos/builtin/packages/dataspaces/package.py | 2 +- var/spack/repos/builtin/packages/dislin/package.py | 4 +- var/spack/repos/builtin/packages/exasp2/package.py | 4 +- var/spack/repos/builtin/packages/gslib/package.py | 36 ++++----- var/spack/repos/builtin/packages/lbann/package.py | 10 +-- var/spack/repos/builtin/packages/matlab/package.py | 10 +-- var/spack/repos/builtin/packages/metis/package.py | 6 +- var/spack/repos/builtin/packages/mfem/package.py | 20 ++--- .../repos/builtin/packages/ncbi-toolkit/package.py | 4 +- .../repos/builtin/packages/nek5000/package.py | 59 +++++++-------- .../repos/builtin/packages/nekbone/package.py | 12 +-- var/spack/repos/builtin/packages/nekcem/package.py | 41 ++++++----- var/spack/repos/builtin/packages/netcdf/package.py | 40 +++++----- var/spack/repos/builtin/packages/nwchem/package.py | 6 +- .../repos/builtin/packages/openfoam-com/package.py | 24 +++--- .../packages/openspeedshop-utils/package.py | 80 ++++++++++---------- .../builtin/packages/openspeedshop/package.py | 80 ++++++++++---------- .../builtin/packages/planck-likelihood/package.py | 4 +- .../repos/builtin/packages/platypus/package.py | 4 +- var/spack/repos/builtin/packages/r-rmpi/package.py | 6 +- var/spack/repos/builtin/packages/r/package.py | 8 +- .../repos/builtin/packages/tcptrace/package.py | 4 +- var/spack/repos/builtin/packages/tcsh/package.py | 2 +- .../repos/builtin/packages/verilator/package.py | 2 +- var/spack/repos/builtin/packages/vtk/package.py | 26 +++---- 27 files changed, 315 insertions(+), 319 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index 5b8b621ba5..8ec6b24593 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -217,10 +217,10 @@ class Boost(Package): spec['python'].libs[0] ) - def determine_bootstrap_options(self, spec, withLibs, options): - boostToolsetId = self.determine_toolset(spec) - options.append('--with-toolset=%s' % boostToolsetId) - options.append("--with-libraries=%s" % ','.join(withLibs)) + def determine_bootstrap_options(self, spec, with_libs, options): + boost_toolset_id = self.determine_toolset(spec) + options.append('--with-toolset=%s' % boost_toolset_id) + options.append("--with-libraries=%s" % ','.join(with_libs)) if '+python' in spec: options.append('--with-python=%s' % spec['python'].command.path) @@ -234,7 +234,7 @@ class Boost(Package): # error: duplicate initialization of intel-linux with the following parameters: # noqa # error: version = # error: previous initialization at ./user-config.jam:1 - f.write("using {0} : : {1} ;\n".format(boostToolsetId, + f.write("using {0} : : {1} ;\n".format(boost_toolset_id, spack_cxx)) if '+mpi' in spec: @@ -292,16 +292,16 @@ class Boost(Package): '-s', 'ZLIB_INCLUDE=%s' % spec['zlib'].prefix.include, '-s', 'ZLIB_LIBPATH=%s' % spec['zlib'].prefix.lib]) - linkTypes = ['static'] + link_types = ['static'] if '+shared' in spec: - linkTypes.append('shared') + link_types.append('shared') - threadingOpts = [] + threading_opts = [] if '+multithreaded' in spec: - threadingOpts.append('multi') + threading_opts.append('multi') if '+singlethreaded' in spec: - threadingOpts.append('single') - if not threadingOpts: + threading_opts.append('single') + if not threading_opts: raise RuntimeError("At least one of {singlethreaded, " + "multithreaded} must be enabled") @@ -310,13 +310,13 @@ class Boost(Package): elif '+versionedlayout' in spec: layout = 'versioned' else: - if len(threadingOpts) > 1: + if len(threading_opts) > 1: raise RuntimeError("Cannot build both single and " + "multi-threaded targets with system layout") layout = 'system' options.extend([ - 'link=%s' % ','.join(linkTypes), + 'link=%s' % ','.join(link_types), '--layout=%s' % layout ]) @@ -352,7 +352,7 @@ class Boost(Package): if cxxflags: options.append('cxxflags="{0}"'.format(' '.join(cxxflags))) - return threadingOpts + return threading_opts def add_buildopt_symlinks(self, prefix): with working_dir(prefix.lib): @@ -371,11 +371,11 @@ class Boost(Package): force_symlink('/usr/bin/libtool', join_path(newdir, 'libtool')) env['PATH'] = newdir + ':' + env['PATH'] - withLibs = list() + with_libs = list() for lib in Boost.all_libs: if "+{0}".format(lib) in spec: - withLibs.append(lib) - if not withLibs: + with_libs.append(lib) + if not with_libs: # if no libraries are specified for compilation, then you dont have # to configure/build anything, just copy over to the prefix # directory. @@ -387,19 +387,19 @@ class Boost(Package): # Remove libraries that the release version does not support if not spec.satisfies('@1.54.0:'): - withLibs.remove('log') + with_libs.remove('log') if not spec.satisfies('@1.53.0:'): - withLibs.remove('atomic') + with_libs.remove('atomic') if not spec.satisfies('@1.48.0:'): - withLibs.remove('locale') + with_libs.remove('locale') if not spec.satisfies('@1.47.0:'): - withLibs.remove('chrono') + with_libs.remove('chrono') if not spec.satisfies('@1.43.0:'): - withLibs.remove('random') + with_libs.remove('random') if not spec.satisfies('@1.39.0:'): - withLibs.remove('exception') + with_libs.remove('exception') if '+graph' in spec and '+mpi' in spec: - withLibs.append('graph_parallel') + with_libs.append('graph_parallel') # to make Boost find the user-config.jam env['BOOST_BUILD_PATH'] = self.stage.source_path @@ -407,7 +407,7 @@ class Boost(Package): bootstrap = Executable('./bootstrap.sh') bootstrap_options = ['--prefix=%s' % prefix] - self.determine_bootstrap_options(spec, withLibs, bootstrap_options) + self.determine_bootstrap_options(spec, with_libs, bootstrap_options) bootstrap(*bootstrap_options) @@ -426,13 +426,13 @@ class Boost(Package): self.stage.source_path, 'user-config.jam') ] - threadingOpts = self.determine_b2_options(spec, b2_options) + threading_opts = self.determine_b2_options(spec, b2_options) b2('--clean') # In theory it could be done on one call but it fails on # Boost.MPI if the threading options are not separated. - for threadingOpt in threadingOpts: + for threadingOpt in threading_opts: b2('install', 'threading=%s' % threadingOpt, *b2_options) if '+multithreaded' in spec and '~taggedlayout' in spec: diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py index ef7ff4467a..bdf17ddd4b 100644 --- a/var/spack/repos/builtin/packages/cbtf-krell/package.py +++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py @@ -150,46 +150,46 @@ class CbtfKrell(CMakePackage): build_directory = 'build_cbtf_krell' - def set_RTOnly_cmakeOptions(self, spec, cmakeOptions): - # Appends to cmakeOptions the options that will enable the appropriate + def set_rt_only_cmake_options(self, spec, cmake_options): + # Appends to cmake_options the options that will enable the appropriate # MPI implementations - RTOnlyOptions = [] - RTOnlyOptions.append('-DRUNTIME_ONLY=true') - cmakeOptions.extend(RTOnlyOptions) + rt_only_options = [] + rt_only_options.append('-DRUNTIME_ONLY=true') + cmake_options.extend(rt_only_options) - def set_mpi_cmakeOptions(self, spec, cmakeOptions): - # Appends to cmakeOptions the options that will enable the appropriate + def set_mpi_cmake_options(self, spec, cmake_options): + # Appends to cmake_options the options that will enable the appropriate # MPI implementations - MPIOptions = [] + mpi_options = [] # openmpi if spec.satisfies('+openmpi'): - MPIOptions.append('-DOPENMPI_DIR=%s' % spec['openmpi'].prefix) + mpi_options.append('-DOPENMPI_DIR=%s' % spec['openmpi'].prefix) # mpich if spec.satisfies('+mpich'): - MPIOptions.append('-DMPICH_DIR=%s' % spec['mpich'].prefix) + mpi_options.append('-DMPICH_DIR=%s' % spec['mpich'].prefix) # mpich2 if spec.satisfies('+mpich2'): - MPIOptions.append('-DMPICH2_DIR=%s' % spec['mpich2'].prefix) + mpi_options.append('-DMPICH2_DIR=%s' % spec['mpich2'].prefix) # mvapich if spec.satisfies('+mvapich'): - MPIOptions.append('-DMVAPICH_DIR=%s' % spec['mvapich'].prefix) + mpi_options.append('-DMVAPICH_DIR=%s' % spec['mvapich'].prefix) # mvapich2 if spec.satisfies('+mvapich2'): - MPIOptions.append('-DMVAPICH2_DIR=%s' % spec['mvapich2'].prefix) + mpi_options.append('-DMVAPICH2_DIR=%s' % spec['mvapich2'].prefix) # mpt if spec.satisfies('+mpt'): - MPIOptions.append('-DMPT_DIR=%s' % spec['mpt'].prefix) + mpi_options.append('-DMPT_DIR=%s' % spec['mpt'].prefix) - cmakeOptions.extend(MPIOptions) + cmake_options.extend(mpi_options) - def set_CrayLoginNode_cmakeOptions(self, spec, cmakeOptions): - # Appends to cmakeOptions the options that will enable + def set_cray_login_node_cmake_options(self, spec, cmake_options): + # Appends to cmake_options the options that will enable # the appropriate Cray login node libraries - CrayLoginNodeOptions = [] + cray_login_node_options = [] rt_platform = "cray" # How do we get the compute node (CNL) cbtf package # install directory path. spec['cbtf'].prefix is the @@ -207,31 +207,31 @@ class CbtfKrell(CMakePackage): be_dyn = spack.store.db.query_one('dyninst arch=cray-CNL-haswell') be_mrnet = spack.store.db.query_one('mrnet arch=cray-CNL-haswell') - CrayLoginNodeOptions.append('-DCN_RUNTIME_PLATFORM=%s' - % rt_platform) + cray_login_node_options.append( + '-DCN_RUNTIME_PLATFORM=%s' % rt_platform) # Use install directories as CMAKE args for the building # of login cbtf-krell - CrayLoginNodeOptions.append('-DCBTF_CN_RUNTIME_DIR=%s' - % be_cbtf.prefix) - CrayLoginNodeOptions.append('-DCBTF_KRELL_CN_RUNTIME_DIR=%s' - % be_cbtfk.prefix) - CrayLoginNodeOptions.append('-DPAPI_CN_RUNTIME_DIR=%s' - % be_papi.prefix) - CrayLoginNodeOptions.append('-DBOOST_CN_RUNTIME_DIR=%s' - % be_boost.prefix) - CrayLoginNodeOptions.append('-DLIBMONITOR_CN_RUNTIME_DIR=%s' - % be_mont.prefix) - CrayLoginNodeOptions.append('-DLIBUNWIND_CN_RUNTIME_DIR=%s' - % be_unw.prefix) - CrayLoginNodeOptions.append('-DXERCESC_CN_RUNTIME_DIR=%s' - % be_xer.prefix) - CrayLoginNodeOptions.append('-DDYNINST_CN_RUNTIME_DIR=%s' - % be_dyn.prefix) - CrayLoginNodeOptions.append('-DMRNET_CN_RUNTIME_DIR=%s' - % be_mrnet.prefix) - - cmakeOptions.extend(CrayLoginNodeOptions) + cray_login_node_options.append( + '-DCBTF_CN_RUNTIME_DIR=%s' % be_cbtf.prefix) + cray_login_node_options.append( + '-DCBTF_KRELL_CN_RUNTIME_DIR=%s' % be_cbtfk.prefix) + cray_login_node_options.append( + '-DPAPI_CN_RUNTIME_DIR=%s' % be_papi.prefix) + cray_login_node_options.append( + '-DBOOST_CN_RUNTIME_DIR=%s' % be_boost.prefix) + cray_login_node_options.append( + '-DLIBMONITOR_CN_RUNTIME_DIR=%s' % be_mont.prefix) + cray_login_node_options.append( + '-DLIBUNWIND_CN_RUNTIME_DIR=%s' % be_unw.prefix) + cray_login_node_options.append( + '-DXERCESC_CN_RUNTIME_DIR=%s' % be_xer.prefix) + cray_login_node_options.append( + '-DDYNINST_CN_RUNTIME_DIR=%s' % be_dyn.prefix) + cray_login_node_options.append( + '-DMRNET_CN_RUNTIME_DIR=%s' % be_mrnet.prefix) + + cmake_options.extend(cray_login_node_options) def cmake_args(self): spec = self.spec @@ -256,14 +256,14 @@ class CbtfKrell(CMakePackage): '-DXERCESC_DIR=%s' % spec['xerces-c'].prefix] if self.spec.satisfies('+runtime'): - self.set_RTOnly_cmakeOptions(spec, cmake_args) + self.set_rt_only_cmake_options(spec, cmake_args) # Add any MPI implementations coming from variant settings - self.set_mpi_cmakeOptions(spec, cmake_args) + self.set_mpi_cmake_options(spec, cmake_args) if self.spec.satisfies('+crayfe'): # We need to build target/compute node components/libraries first # then pass those libraries to the cbtf-krell login node build - self.set_CrayLoginNode_cmakeOptions(spec, cmake_args) + self.set_cray_login_node_cmake_options(spec, cmake_args) return cmake_args diff --git a/var/spack/repos/builtin/packages/dataspaces/package.py b/var/spack/repos/builtin/packages/dataspaces/package.py index 387f72b0ae..d5fb3819fc 100644 --- a/var/spack/repos/builtin/packages/dataspaces/package.py +++ b/var/spack/repos/builtin/packages/dataspaces/package.py @@ -70,7 +70,7 @@ class Dataspaces(AutotoolsPackage): depends_on('libtool', type='build') depends_on('mpi', when='+mpi') - def autoreconf(spec, prefix, self): + def autoreconf(self, spec, prefix): bash = which('bash') bash('./autogen.sh') diff --git a/var/spack/repos/builtin/packages/dislin/package.py b/var/spack/repos/builtin/packages/dislin/package.py index f662f0b4fc..f7b2cfa024 100644 --- a/var/spack/repos/builtin/packages/dislin/package.py +++ b/var/spack/repos/builtin/packages/dislin/package.py @@ -70,7 +70,7 @@ class Dislin(Package): run_env.prepend_path('LD_LIBRARY_PATH', self.prefix) def install(self, spec, prefix): - INSTALL = Executable('./INSTALL') - INSTALL() + install = Executable('./INSTALL') + install() with working_dir('examples'): install('dislin_d.h', prefix) diff --git a/var/spack/repos/builtin/packages/exasp2/package.py b/var/spack/repos/builtin/packages/exasp2/package.py index 7c7b414e8b..5c759df4bc 100644 --- a/var/spack/repos/builtin/packages/exasp2/package.py +++ b/var/spack/repos/builtin/packages/exasp2/package.py @@ -81,8 +81,8 @@ class Exasp2(MakefilePackage): math_includes += " -I" + spec['blas'].prefix.include targets.append('SPACKBLASINCLUDES=' + math_includes) # And BML - bmlLibDirs = spec['bml'].libs.directories[0] - targets.append('BML_PATH=' + bmlLibDirs) + bml_lib_dirs = spec['bml'].libs.directories[0] + targets.append('BML_PATH=' + bml_lib_dirs) targets.append('--file=Makefile.vanilla') return targets diff --git a/var/spack/repos/builtin/packages/gslib/package.py b/var/spack/repos/builtin/packages/gslib/package.py index 055aa50120..b90a50977c 100644 --- a/var/spack/repos/builtin/packages/gslib/package.py +++ b/var/spack/repos/builtin/packages/gslib/package.py @@ -46,44 +46,44 @@ class Gslib(Package): conflicts('~mpi', when='+mpiio') def install(self, spec, prefix): - srcDir = 'src' - libDir = 'lib' + src_dir = 'src' + lib_dir = 'lib' libname = 'libgs.a' if self.version == Version('1.0.1'): - makeFile = 'Makefile' + makefile = 'Makefile' else: - makeFile = 'src/Makefile' + makefile = 'src/Makefile' - CC = self.compiler.cc + cc = self.compiler.cc if '+mpiio' not in spec: - filter_file(r'MPIIO.*?=.*1', 'MPIIO = 0', makeFile) + filter_file(r'MPIIO.*?=.*1', 'MPIIO = 0', makefile) if '+mpi' in spec: - CC = spec['mpi'].mpicc + cc = spec['mpi'].mpicc else: - filter_file(r'MPI.*?=.*1', 'MPI = 0', makeFile) - filter_file(r'MPIIO.*?=.*1', 'MPIIO = 0', makeFile) + filter_file(r'MPI.*?=.*1', 'MPI = 0', makefile) + filter_file(r'MPIIO.*?=.*1', 'MPIIO = 0', makefile) - makeCmd = "CC=" + CC + make_cmd = "CC=" + cc if '+blas' in spec: - filter_file(r'BLAS.*?=.*0', 'BLAS = 1', makeFile) + filter_file(r'BLAS.*?=.*0', 'BLAS = 1', makefile) blas = spec['blas'].libs - ldFlags = blas.ld_flags - filter_file(r'\$\(LDFLAGS\)', ldFlags, makeFile) + ld_flags = blas.ld_flags + filter_file(r'\$\(LDFLAGS\)', ld_flags, makefile) if self.version == Version('1.0.1'): - make(makeCmd) + make(make_cmd) make('install') - install_tree(libDir, prefix.lib) + install_tree(lib_dir, prefix.lib) elif self.version == Version('1.0.0'): - with working_dir(srcDir): - make(makeCmd) + with working_dir(src_dir): + make(make_cmd) mkdir(prefix.lib) install(libname, prefix.lib) # Should only install the headers (this will be fixed in gslib on # future releases). - install_tree(srcDir, prefix.include) + install_tree(src_dir, prefix.include) diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index 643bcecfee..8b0faccabe 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -58,9 +58,9 @@ class Lbann(CMakePackage): when=('build_type=Debug' '@0.95:')) depends_on('hydrogen +openmp_blas +shared +int64 build_type=Debug', when=('build_type=Debug' '@:0.90')) - depends_on('hydrogen +openmp_blas +shared +int64 +cuda', + depends_on('hydrogen +openmp_blas +shared +int64 +cuda', when=('+gpu' '@0.95:')) - depends_on('hydrogen +openmp_blas +shared +int64 +cuda', + depends_on('hydrogen +openmp_blas +shared +int64 +cuda', when=('+gpu' '@:0.90')) depends_on('hydrogen +openmp_blas +shared +int64 +cuda build_type=Debug', when=('build_type=Debug' '@0.95:' '+gpu')) @@ -94,12 +94,12 @@ class Lbann(CMakePackage): def common_config_args(self): spec = self.spec # Environment variables - CPPFLAGS = [] - CPPFLAGS.append('-DLBANN_SET_EL_RNG -ldl') + cppflags = [] + cppflags.append('-DLBANN_SET_EL_RNG -ldl') return [ '-DCMAKE_INSTALL_MESSAGE=LAZY', - '-DCMAKE_CXX_FLAGS=%s' % ' '.join(CPPFLAGS), + '-DCMAKE_CXX_FLAGS=%s' % ' '.join(cppflags), '-DLBANN_VERSION=spack', '-DCNPY_DIR={0}'.format(spec['cnpy'].prefix), ] diff --git a/var/spack/repos/builtin/packages/matlab/package.py b/var/spack/repos/builtin/packages/matlab/package.py index 56de703712..5d7715c673 100644 --- a/var/spack/repos/builtin/packages/matlab/package.py +++ b/var/spack/repos/builtin/packages/matlab/package.py @@ -80,15 +80,15 @@ class Matlab(Package): } # Store values requested by the installer in a file - with open('spack_installer_input.txt', 'w') as inputFile: + with open('spack_installer_input.txt', 'w') as input_file: for key in config: - inputFile.write('{0}={1}\n'.format(key, config[key])) + input_file.write('{0}={1}\n'.format(key, config[key])) def install(self, spec, prefix): self.configure(spec, prefix) # Run silent installation script # Full path required - inputFile = join_path(self.stage.source_path, - 'spack_installer_input.txt') - subprocess.call(['./install', '-inputFile', inputFile]) + input_file = join_path( + self.stage.source_path, 'spack_installer_input.txt') + subprocess.call(['./install', '-inputFile', input_file]) diff --git a/var/spack/repos/builtin/packages/metis/package.py b/var/spack/repos/builtin/packages/metis/package.py index 56de392b69..65a32662bc 100644 --- a/var/spack/repos/builtin/packages/metis/package.py +++ b/var/spack/repos/builtin/packages/metis/package.py @@ -221,11 +221,11 @@ class Metis(Package): make('install') # install GKlib headers, which will be needed for ParMETIS - GKlib_dist = join_path(prefix.include, 'GKlib') - mkdirp(GKlib_dist) + gklib_dist = join_path(prefix.include, 'GKlib') + mkdirp(gklib_dist) hfiles = glob.glob(join_path(source_directory, 'GKlib', '*.h')) for hfile in hfiles: - install(hfile, GKlib_dist) + install(hfile, gklib_dist) if self.run_tests: # FIXME: On some systems, the installed binaries for METIS cannot diff --git a/var/spack/repos/builtin/packages/mfem/package.py b/var/spack/repos/builtin/packages/mfem/package.py index f1979cdde1..d5cbf4f077 100644 --- a/var/spack/repos/builtin/packages/mfem/package.py +++ b/var/spack/repos/builtin/packages/mfem/package.py @@ -229,7 +229,7 @@ class Mfem(Package): # from within MFEM. # Similar to spec[pkg].libs.ld_flags but prepends rpath flags too. - def ld_flags_from_LibraryList(libs_list): + def ld_flags_from_library_list(libs_list): flags = ['-Wl,-rpath,%s' % dir for dir in libs_list.directories] flags += [libs_list.ld_flags] return ' '.join(flags) @@ -298,7 +298,7 @@ class Mfem(Package): hypre['blas'].libs options += [ 'HYPRE_OPT=-I%s' % hypre.prefix.include, - 'HYPRE_LIB=%s' % ld_flags_from_LibraryList(all_hypre_libs)] + 'HYPRE_LIB=%s' % ld_flags_from_library_list(all_hypre_libs)] if '+metis' in spec: options += [ @@ -310,7 +310,7 @@ class Mfem(Package): lapack_blas = spec['lapack'].libs + spec['blas'].libs options += [ # LAPACK_OPT is not used - 'LAPACK_LIB=%s' % ld_flags_from_LibraryList(lapack_blas)] + 'LAPACK_LIB=%s' % ld_flags_from_library_list(lapack_blas)] if '+superlu-dist' in spec: lapack_blas = spec['lapack'].libs + spec['blas'].libs @@ -321,28 +321,28 @@ class Mfem(Package): 'SUPERLU_LIB=-L%s -L%s -lsuperlu_dist -lparmetis %s' % (spec['superlu-dist'].prefix.lib, spec['parmetis'].prefix.lib, - ld_flags_from_LibraryList(lapack_blas))] + ld_flags_from_library_list(lapack_blas))] if '+suite-sparse' in spec: ss_spec = 'suite-sparse:' + self.suitesparse_components options += [ 'SUITESPARSE_OPT=-I%s' % spec[ss_spec].prefix.include, 'SUITESPARSE_LIB=%s' % - ld_flags_from_LibraryList(spec[ss_spec].libs)] + ld_flags_from_library_list(spec[ss_spec].libs)] if '+sundials' in spec: sun_spec = 'sundials:' + self.sundials_components options += [ 'SUNDIALS_OPT=%s' % spec[sun_spec].headers.cpp_flags, 'SUNDIALS_LIB=%s' % - ld_flags_from_LibraryList(spec[sun_spec].libs)] + ld_flags_from_library_list(spec[sun_spec].libs)] if '+petsc' in spec: # options += ['PETSC_DIR=%s' % spec['petsc'].prefix] options += [ 'PETSC_OPT=%s' % spec['petsc'].headers.cpp_flags, 'PETSC_LIB=%s' % - ld_flags_from_LibraryList(spec['petsc'].libs)] + ld_flags_from_library_list(spec['petsc'].libs)] if '+pumi' in spec: options += ['PUMI_DIR=%s' % spec['pumi'].prefix] @@ -360,7 +360,7 @@ class Mfem(Package): options += [ 'ZLIB_OPT=-I%s' % spec['zlib'].prefix.include, 'ZLIB_LIB=%s' % - ld_flags_from_LibraryList(spec['zlib'].libs)] + ld_flags_from_library_list(spec['zlib'].libs)] if '+mpfr' in spec: options += [ @@ -383,7 +383,7 @@ class Mfem(Package): libs += LibraryList(find_system_libraries('libdl')) options += [ 'LIBUNWIND_OPT=%s' % headers.cpp_flags, - 'LIBUNWIND_LIB=%s' % ld_flags_from_LibraryList(libs)] + 'LIBUNWIND_LIB=%s' % ld_flags_from_library_list(libs)] if '+openmp' in spec: options += ['OPENMP_OPT=%s' % self.compiler.openmp_flag] @@ -408,7 +408,7 @@ class Mfem(Package): libs += hdf5.libs options += [ 'CONDUIT_OPT=%s' % headers.cpp_flags, - 'CONDUIT_LIB=%s' % ld_flags_from_LibraryList(libs)] + 'CONDUIT_LIB=%s' % ld_flags_from_library_list(libs)] make('config', *options, parallel=False) make('info', parallel=False) diff --git a/var/spack/repos/builtin/packages/ncbi-toolkit/package.py b/var/spack/repos/builtin/packages/ncbi-toolkit/package.py index 876b9ac80d..b6bdefdbf8 100644 --- a/var/spack/repos/builtin/packages/ncbi-toolkit/package.py +++ b/var/spack/repos/builtin/packages/ncbi-toolkit/package.py @@ -58,8 +58,8 @@ class NcbiToolkit(AutotoolsPackage): 'image_io_jpeg.cpp', string=True) def build(self, spec, prefix): - CompilerVersion = self.compiler.version.joined + compiler_version = self.compiler.version.joined with working_dir(join_path( - 'GCC{0}-DebugMT64'.format(CompilerVersion), 'build')): + 'GCC{0}-DebugMT64'.format(compiler_version), 'build')): make('all_r') diff --git a/var/spack/repos/builtin/packages/nek5000/package.py b/var/spack/repos/builtin/packages/nek5000/package.py index a988867cda..291cc348e0 100644 --- a/var/spack/repos/builtin/packages/nek5000/package.py +++ b/var/spack/repos/builtin/packages/nek5000/package.py @@ -97,25 +97,20 @@ class Nek5000(Package): @run_after('install') def test_install(self): - currentDir = os.getcwd() - eddyDir = 'short_tests/eddy' - os.chdir(eddyDir) - - os.system(join_path(self.prefix.bin, 'makenek') + ' eddy_uv') - if not os.path.isfile(join_path(os.getcwd(), 'nek5000')): - msg = 'Cannot build example: short_tests/eddy.' - raise RuntimeError(msg) - - os.chdir(currentDir) + with working_dir('short_tests/eddy'): + os.system(join_path(self.prefix.bin, 'makenek') + ' eddy_uv') + if not os.path.isfile(join_path(os.getcwd(), 'nek5000')): + msg = 'Cannot build example: short_tests/eddy.' + raise RuntimeError(msg) def install(self, spec, prefix): - toolsDir = 'tools' - binDir = 'bin' + tools_dir = 'tools' + bin_dir = 'bin' # Do not use the Spack compiler wrappers. # Use directly the compilers: - FC = self.compiler.f77 - CC = self.compiler.cc + fc = self.compiler.f77 + cc = self.compiler.cc fflags = spec.compiler_flags['fflags'] cflags = spec.compiler_flags['cflags'] @@ -149,10 +144,10 @@ class Nek5000(Package): # Build the tools, maketools copy them to Nek5000/bin by default. # We will then install Nek5000/bin under prefix after that. - with working_dir(toolsDir): + with working_dir(tools_dir): # Update the maketools script to use correct compilers - filter_file(r'^#FC\s*=.*', 'FC="{0}"'.format(FC), 'maketools') - filter_file(r'^#CC\s*=.*', 'CC="{0}"'.format(CC), 'maketools') + filter_file(r'^#FC\s*=.*', 'FC="{0}"'.format(fc), 'maketools') + filter_file(r'^#CC\s*=.*', 'CC="{0}"'.format(cc), 'maketools') if fflags: filter_file(r'^#FFLAGS=.*', 'FFLAGS="{0}"'.format(fflags), 'maketools') @@ -194,31 +189,31 @@ class Nek5000(Package): maxnel = self.spec.variants['MAXNEL'].value filter_file(r'^#MAXNEL\s*=.*', 'MAXNEL=' + maxnel, 'maketools') - makeTools = Executable('./maketools') + maketools = Executable('./maketools') # Build the tools if '+genbox' in spec: - makeTools('genbox') + maketools('genbox') # "ERROR: int_tp does not exist!" # if '+int_tp' in spec: - # makeTools('int_tp') + # maketools('int_tp') if '+n2to3' in spec: - makeTools('n2to3') + maketools('n2to3') if '+postnek' in spec: - makeTools('postnek') + maketools('postnek') if '+reatore2' in spec: - makeTools('reatore2') + maketools('reatore2') if '+genmap' in spec: - makeTools('genmap') + maketools('genmap') if '+nekmerge' in spec: - makeTools('nekmerge') + maketools('nekmerge') if '+prenek' in spec: - makeTools('prenek') + maketools('prenek') - with working_dir(binDir): + with working_dir(bin_dir): if '+mpi' in spec: - FC = spec['mpi'].mpif77 - CC = spec['mpi'].mpicc + fc = spec['mpi'].mpif77 + cc = spec['mpi'].mpicc else: filter_file(r'^#MPI=0', 'MPI=0', 'makenek') @@ -232,8 +227,8 @@ class Nek5000(Package): # Update the makenek to use correct compilers and # Nek5000 source. - filter_file(r'^#FC\s*=.*', 'FC="{0}"'.format(FC), 'makenek') - filter_file(r'^#CC\s*=.*', 'CC="{0}"'.format(CC), 'makenek') + filter_file(r'^#FC\s*=.*', 'FC="{0}"'.format(fc), 'makenek') + filter_file(r'^#CC\s*=.*', 'CC="{0}"'.format(cc), 'makenek') filter_file(r'^#SOURCE_ROOT\s*=\"\$H.*', 'SOURCE_ROOT=\"' + prefix.bin.Nek5000 + '\"', 'makenek') if fflags: @@ -254,7 +249,7 @@ class Nek5000(Package): '$(FC) -c -qextname $(L0)', 'makefile.template') # Install Nek5000/bin in prefix/bin - install_tree(binDir, prefix.bin) + install_tree(bin_dir, prefix.bin) # Copy Nek5000 source to prefix/bin install_tree('../Nek5000', prefix.bin.Nek5000) diff --git a/var/spack/repos/builtin/packages/nekbone/package.py b/var/spack/repos/builtin/packages/nekbone/package.py index b2c38a509b..8c2da87c6c 100644 --- a/var/spack/repos/builtin/packages/nekbone/package.py +++ b/var/spack/repos/builtin/packages/nekbone/package.py @@ -54,11 +54,11 @@ class Nekbone(Package): def install(self, spec, prefix): mkdir(prefix.bin) - FC = self.compiler.fc - CC = self.compiler.cc + fc = self.compiler.fc + cc = self.compiler.cc if '+mpi' in spec: - FC = spec['mpi'].mpif77 - CC = spec['mpi'].mpicc + fc = spec['mpi'].mpif77 + cc = spec['mpi'].mpicc # Install Nekbone in prefix.bin install_tree("../Nekbone", prefix.bin.Nekbone) @@ -73,8 +73,8 @@ class Nekbone(Package): with working_dir(prefix.bin): filter_file(r'^SOURCE_ROOT\s*=.*', 'SOURCE_ROOT=\"' + prefix.bin.Nekbone + '/src\"', 'makenek') - filter_file(r'^CC\s*=.*', 'CC=\"' + CC + '\"', 'makenek') - filter_file(r'^F77\s*=.*', 'F77=\"' + FC + '\"', 'makenek') + filter_file(r'^CC\s*=.*', 'CC=\"' + cc + '\"', 'makenek') + filter_file(r'^F77\s*=.*', 'F77=\"' + fc + '\"', 'makenek') if '+mpi' not in spec: filter_file(r'^#IFMPI=\"false\"', 'IFMPI=\"false\"', 'makenek') diff --git a/var/spack/repos/builtin/packages/nekcem/package.py b/var/spack/repos/builtin/packages/nekcem/package.py index c4e236bf38..aa460d7445 100644 --- a/var/spack/repos/builtin/packages/nekcem/package.py +++ b/var/spack/repos/builtin/packages/nekcem/package.py @@ -56,32 +56,32 @@ class Nekcem(Package): @run_after('install') def test_install(self): - NekCEM_test = join_path(self.prefix.bin, 'NekCEM', 'tests', '2dboxpec') - with working_dir(NekCEM_test): + nekcem_test = join_path(self.prefix.bin, 'NekCEM', 'tests', '2dboxpec') + with working_dir(nekcem_test): makenek = Executable(join_path(self.prefix.bin, 'makenek')) - makenek(os.path.basename(NekCEM_test)) + makenek(os.path.basename(nekcem_test)) if not os.path.isfile('nekcem'): - msg = 'Cannot build example: %s' % NekCEM_test + msg = 'Cannot build example: %s' % nekcem_test raise RuntimeError(msg) def install(self, spec, prefix): - binDir = 'bin' + bin_dir = 'bin' nek = 'nek' - cNek = 'configurenek' - mNek = 'makenek' + configurenek = 'configurenek' + makenek = 'makenek' - FC = self.compiler.f77 - CC = self.compiler.cc + fc = self.compiler.f77 + cc = self.compiler.cc fflags = spec.compiler_flags['fflags'] cflags = spec.compiler_flags['cflags'] ldflags = spec.compiler_flags['ldflags'] if '+mpi' in spec: - FC = spec['mpi'].mpif77 - CC = spec['mpi'].mpicc + fc = spec['mpi'].mpif77 + cc = spec['mpi'].mpicc - with working_dir(binDir): + with working_dir(bin_dir): fflags = ['-O3'] + fflags cflags = ['-O3'] + cflags fflags += ['-I.'] @@ -104,14 +104,14 @@ class Nekcem(Package): if '+mpi' in spec: fflags += ['-DMPI', '-DMPIIO'] cflags += ['-DMPI', '-DMPIIO'] - blasLapack = spec['lapack'].libs + spec['blas'].libs + blas_lapack = spec['lapack'].libs + spec['blas'].libs pthread_lib = find_system_libraries('libpthread') - ldflags += (blasLapack + pthread_lib).ld_flags.split() + ldflags += (blas_lapack + pthread_lib).ld_flags.split() all_arch = { 'spack-arch': { - 'FC': FC, 'FFLAGS': fflags, - 'CC': CC, 'CFLAGS': cflags, - 'LD': FC, 'LDFLAGS': ldflags + 'FC': fc, 'FFLAGS': fflags, + 'CC': cc, 'CFLAGS': cflags, + 'LD': fc, 'LDFLAGS': ldflags } } os.rename('arch.json', 'arch.json.orig') @@ -125,6 +125,7 @@ class Nekcem(Package): install_tree('../NekCEM', prefix.bin.NekCEM) # Create symlinks to makenek, nek and configurenek scripts with working_dir(prefix.bin): - os.symlink(os.path.join('NekCEM', binDir, mNek), mNek) - os.symlink(os.path.join('NekCEM', binDir, cNek), cNek) - os.symlink(os.path.join('NekCEM', binDir, nek), nek) + os.symlink(os.path.join('NekCEM', bin_dir, makenek), makenek) + os.symlink( + os.path.join('NekCEM', bin_dir, configurenek), configurenek) + os.symlink(os.path.join('NekCEM', bin_dir, nek), nek) diff --git a/var/spack/repos/builtin/packages/netcdf/package.py b/var/spack/repos/builtin/packages/netcdf/package.py index 43e910893f..8c1748e5d6 100644 --- a/var/spack/repos/builtin/packages/netcdf/package.py +++ b/var/spack/repos/builtin/packages/netcdf/package.py @@ -153,10 +153,10 @@ class Netcdf(AutotoolsPackage): r'\1{0}\2'.format(max_vars)) def configure_args(self): - CFLAGS = [] - CPPFLAGS = [] - LDFLAGS = [] - LIBS = [] + cflags = [] + cppflags = [] + ldflags = [] + libs = [] config_args = ['--enable-v2', '--enable-utilities', @@ -177,7 +177,7 @@ class Netcdf(AutotoolsPackage): if '~shared' in self.spec: # We don't have shared libraries but we still want it to be # possible to use this library in shared builds - CFLAGS.append(self.compiler.pic_flag) + cflags.append(self.compiler.pic_flag) config_args += self.enable_or_disable('dap') # config_args += self.enable_or_disable('cdmremote') @@ -189,10 +189,10 @@ class Netcdf(AutotoolsPackage): # undefined reference to `SSL_CTX_use_certificate_chain_file curl = self.spec['curl'] curl_libs = curl.libs - LIBS.append(curl_libs.link_flags) - LDFLAGS.append(curl_libs.search_flags) + libs.append(curl_libs.link_flags) + ldflags.append(curl_libs.search_flags) # TODO: figure out how to get correct flags via headers.cpp_flags - CPPFLAGS.append('-I' + curl.prefix.include) + cppflags.append('-I' + curl.prefix.include) if self.spec.satisfies('@4.4:'): if '+mpi' in self.spec: @@ -204,16 +204,16 @@ class Netcdf(AutotoolsPackage): # are removed. Variables CPPFLAGS, LDFLAGS, and LD_LIBRARY_PATH must be # used instead. hdf5_hl = self.spec['hdf5:hl'] - CPPFLAGS.append(hdf5_hl.headers.cpp_flags) - LDFLAGS.append(hdf5_hl.libs.search_flags) + cppflags.append(hdf5_hl.headers.cpp_flags) + ldflags.append(hdf5_hl.libs.search_flags) if '+parallel-netcdf' in self.spec: config_args.append('--enable-pnetcdf') pnetcdf = self.spec['parallel-netcdf'] - CPPFLAGS.append(pnetcdf.headers.cpp_flags) + cppflags.append(pnetcdf.headers.cpp_flags) # TODO: change to pnetcdf.libs.search_flags once 'parallel-netcdf' # package gets custom implementation of 'libs' - LDFLAGS.append('-L' + pnetcdf.prefix.lib) + ldflags.append('-L' + pnetcdf.prefix.lib) else: config_args.append('--disable-pnetcdf') @@ -223,26 +223,26 @@ class Netcdf(AutotoolsPackage): config_args += self.enable_or_disable('hdf4') if '+hdf4' in self.spec: hdf4 = self.spec['hdf'] - CPPFLAGS.append(hdf4.headers.cpp_flags) + cppflags.append(hdf4.headers.cpp_flags) # TODO: change to hdf4.libs.search_flags once 'hdf' # package gets custom implementation of 'libs' property. - LDFLAGS.append('-L' + hdf4.prefix.lib) + ldflags.append('-L' + hdf4.prefix.lib) # TODO: change to self.spec['jpeg'].libs.link_flags once the # implementations of 'jpeg' virtual package get 'jpeg_libs' # property. - LIBS.append('-ljpeg') + libs.append('-ljpeg') if '+szip' in hdf4: # This should also come from hdf4.libs - LIBS.append('-lsz') + libs.append('-lsz') # Fortran support # In version 4.2+, NetCDF-C and NetCDF-Fortran have split. # Use the netcdf-fortran package to install Fortran support. - config_args.append('CFLAGS=' + ' '.join(CFLAGS)) - config_args.append('CPPFLAGS=' + ' '.join(CPPFLAGS)) - config_args.append('LDFLAGS=' + ' '.join(LDFLAGS)) - config_args.append('LIBS=' + ' '.join(LIBS)) + config_args.append('CFLAGS=' + ' '.join(cflags)) + config_args.append('CPPFLAGS=' + ' '.join(cppflags)) + config_args.append('LDFLAGS=' + ' '.join(ldflags)) + config_args.append('LIBS=' + ' '.join(libs)) return config_args diff --git a/var/spack/repos/builtin/packages/nwchem/package.py b/var/spack/repos/builtin/packages/nwchem/package.py index 84a5981b5d..e151b53441 100644 --- a/var/spack/repos/builtin/packages/nwchem/package.py +++ b/var/spack/repos/builtin/packages/nwchem/package.py @@ -107,9 +107,9 @@ class Nwchem(Package): # TODO: query if blas/lapack/scalapack uses 64bit Ints # A flag to distinguish between 32bit and 64bit integers in linear # algebra (Blas, Lapack, Scalapack) - use32bitLinAlg = True + use_32_bit_lin_alg = True - if use32bitLinAlg: + if use_32_bit_lin_alg: args.extend([ 'USE_64TO32=y', 'BLAS_SIZE=4', @@ -135,7 +135,7 @@ class Nwchem(Package): with working_dir('src'): make('nwchem_config', *args) - if use32bitLinAlg: + if use_32_bit_lin_alg: make('64_to_32', *args) make(*args) diff --git a/var/spack/repos/builtin/packages/openfoam-com/package.py b/var/spack/repos/builtin/packages/openfoam-com/package.py index 1a05a40380..26c763d7e3 100644 --- a/var/spack/repos/builtin/packages/openfoam-com/package.py +++ b/var/spack/repos/builtin/packages/openfoam-com/package.py @@ -74,8 +74,8 @@ __all__ = [ 'write_environ', 'rewrite_environ_files', 'mplib_content', - 'foamAddPath', - 'foamAddLib', + 'foam_add_path', + 'foam_add_lib', 'OpenfoamArch', ] @@ -204,12 +204,12 @@ def rewrite_environ_files(environ, **kwargs): filter_file(regex, replace, rcfile, backup=False) -def foamAddPath(*args): +def foam_add_path(*args): """A string with args prepended to 'PATH'""" return '"' + ':'.join(args) + ':${PATH}"' -def foamAddLib(*args): +def foam_add_lib(*args): """A string with args prepended to 'LD_LIBRARY_PATH'""" return '"' + ':'.join(args) + ':${LD_LIBRARY_PATH}"' @@ -553,21 +553,21 @@ class OpenfoamCom(Package): ('BOOST_ARCH_PATH', spec['boost'].prefix), ('CGAL_ARCH_PATH', spec['cgal'].prefix), ('LD_LIBRARY_PATH', - foamAddLib( + foam_add_lib( pkglib(spec['boost'], '${BOOST_ARCH_PATH}'), pkglib(spec['cgal'], '${CGAL_ARCH_PATH}'))), ], 'FFTW': [ ('FFTW_ARCH_PATH', spec['fftw'].prefix), # Absolute ('LD_LIBRARY_PATH', - foamAddLib( + foam_add_lib( pkglib(spec['fftw'], '${BOOST_ARCH_PATH}'))), ], # User-defined MPI 'mpi-user': [ ('MPI_ARCH_PATH', spec['mpi'].prefix), # Absolute - ('LD_LIBRARY_PATH', foamAddLib(user_mpi['libdir'])), - ('PATH', foamAddPath(user_mpi['bindir'])), + ('LD_LIBRARY_PATH', foam_add_lib(user_mpi['libdir'])), + ('PATH', foam_add_path(user_mpi['bindir'])), ], 'scotch': {}, 'kahip': {}, @@ -596,12 +596,12 @@ class OpenfoamCom(Package): } if '+paraview' in spec: - pvMajor = 'paraview-{0}'.format(spec['paraview'].version.up_to(2)) + pvmajor = 'paraview-{0}'.format(spec['paraview'].version.up_to(2)) self.etc_config['paraview'] = [ ('ParaView_DIR', spec['paraview'].prefix), - ('ParaView_INCLUDE_DIR', '${ParaView_DIR}/include/' + pvMajor), - ('PV_PLUGIN_PATH', '$FOAM_LIBBIN/' + pvMajor), - ('PATH', foamAddPath('${ParaView_DIR}/bin')), + ('ParaView_INCLUDE_DIR', '${ParaView_DIR}/include/' + pvmajor), + ('PV_PLUGIN_PATH', '$FOAM_LIBBIN/' + pvmajor), + ('PATH', foam_add_path('${ParaView_DIR}/bin')), ] if '+vtk' in spec: diff --git a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py index bea2e36401..feea4121bf 100644 --- a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py @@ -188,11 +188,11 @@ class OpenspeedshopUtils(CMakePackage): build_directory = 'build_openspeedshop' - def set_CrayLoginNode_cmakeOptions(self, spec, cmakeOptions): - # Appends to cmakeOptions the options that will enable the appropriate + def set_cray_login_node_cmake_options(self, spec, cmake_options): + # Appends to cmake_options the options that will enable the appropriate # Cray login node libraries - CrayLoginNodeOptions = [] + cray_login_node_options = [] rt_platform = "cray" # How do we get the compute node (CNL) cbtf package install @@ -205,12 +205,12 @@ class OpenspeedshopUtils(CMakePackage): # Equivalent to install-tool cmake arg: # '-DCBTF_KRELL_CN_RUNTIME_DIR=%s' # % /cbtf_v2.3.1.release/compute) - CrayLoginNodeOptions.append('-DCBTF_KRELL_CN_RUNTIME_DIR=%s' - % be_ck.prefix) - CrayLoginNodeOptions.append('-DRUNTIME_PLATFORM=%s' - % rt_platform) + cray_login_node_options.append('-DCBTF_KRELL_CN_RUNTIME_DIR=%s' + % be_ck.prefix) + cray_login_node_options.append('-DRUNTIME_PLATFORM=%s' + % rt_platform) - cmakeOptions.extend(CrayLoginNodeOptions) + cmake_options.extend(cray_login_node_options) def cmake_args(self): # Appends base options to cmake_args @@ -224,7 +224,7 @@ class OpenspeedshopUtils(CMakePackage): instrumentor_setting = "cbtf" if spec.satisfies('+runtime'): - self.set_defaultbase_cmakeOptions(spec, cmake_args) + self.set_defaultbase_cmake_options(spec, cmake_args) cmake_args.extend( ['-DCMAKE_CXX_FLAGS=%s' % compile_flags, @@ -237,7 +237,7 @@ class OpenspeedshopUtils(CMakePackage): else: # Appends base options to cmake_args - self.set_defaultbase_cmakeOptions(spec, cmake_args) + self.set_defaultbase_cmake_options(spec, cmake_args) cmake_args.extend( ['-DCMAKE_CXX_FLAGS=%s' % compile_flags, '-DCMAKE_C_FLAGS=%s' % compile_flags, @@ -252,63 +252,63 @@ class OpenspeedshopUtils(CMakePackage): # components/libraries first then pass # those libraries to the openspeedshop # login node build - self.set_CrayLoginNode_cmakeOptions(spec, cmake_args) + self.set_cray_login_node_cmake_options(spec, cmake_args) cmake_args.extend(['-DBUILD_QT3_GUI=FALSE']) return cmake_args - def set_defaultbase_cmakeOptions(self, spec, cmakeOptions): - # Appends to cmakeOptions the options that will enable + def set_defaultbase_cmake_options(self, spec, cmake_options): + # Appends to cmake_options the options that will enable # the appropriate base level options to the openspeedshop # cmake build. python_exe = spec['python'].command.path python_library = spec['python'].libs[0] python_include = spec['python'].headers.directories[0] - BaseOptions = [] - - BaseOptions.append('-DBINUTILS_DIR=%s' % spec['binutils'].prefix) - BaseOptions.append('-DLIBELF_DIR=%s' % spec['elf'].prefix) - BaseOptions.append('-DLIBDWARF_DIR=%s' % spec['libdwarf'].prefix) - BaseOptions.append('-DPYTHON_EXECUTABLE=%s' % python_exe) - BaseOptions.append('-DPYTHON_INCLUDE_DIR=%s' % python_include) - BaseOptions.append('-DPYTHON_LIBRARY=%s' % python_library) - BaseOptions.append('-DBoost_NO_SYSTEM_PATHS=TRUE') - BaseOptions.append('-DBoost_NO_BOOST_CMAKE=TRUE') - BaseOptions.append('-DBOOST_ROOT=%s' % spec['boost'].prefix) - BaseOptions.append('-DBoost_DIR=%s' % spec['boost'].prefix) - BaseOptions.append('-DBOOST_LIBRARYDIR=%s' % spec['boost'].prefix.lib) - BaseOptions.append('-DDYNINST_DIR=%s' % spec['dyninst'].prefix) - - cmakeOptions.extend(BaseOptions) - - def set_mpi_cmakeOptions(self, spec, cmakeOptions): - # Appends to cmakeOptions the options that will enable + base_options = [] + + base_options.append('-DBINUTILS_DIR=%s' % spec['binutils'].prefix) + base_options.append('-DLIBELF_DIR=%s' % spec['elf'].prefix) + base_options.append('-DLIBDWARF_DIR=%s' % spec['libdwarf'].prefix) + base_options.append('-DPYTHON_EXECUTABLE=%s' % python_exe) + base_options.append('-DPYTHON_INCLUDE_DIR=%s' % python_include) + base_options.append('-DPYTHON_LIBRARY=%s' % python_library) + base_options.append('-DBoost_NO_SYSTEM_PATHS=TRUE') + base_options.append('-DBoost_NO_BOOST_CMAKE=TRUE') + base_options.append('-DBOOST_ROOT=%s' % spec['boost'].prefix) + base_options.append('-DBoost_DIR=%s' % spec['boost'].prefix) + base_options.append('-DBOOST_LIBRARYDIR=%s' % spec['boost'].prefix.lib) + base_options.append('-DDYNINST_DIR=%s' % spec['dyninst'].prefix) + + cmake_options.extend(base_options) + + def set_mpi_cmake_options(self, spec, cmake_options): + # Appends to cmake_options the options that will enable # the appropriate MPI implementations - MPIOptions = [] + mpi_options = [] # openmpi if spec.satisfies('+openmpi'): - MPIOptions.append('-DOPENMPI_DIR=%s' % spec['openmpi'].prefix) + mpi_options.append('-DOPENMPI_DIR=%s' % spec['openmpi'].prefix) # mpich if spec.satisfies('+mpich'): - MPIOptions.append('-DMPICH_DIR=%s' % spec['mpich'].prefix) + mpi_options.append('-DMPICH_DIR=%s' % spec['mpich'].prefix) # mpich2 if spec.satisfies('+mpich2'): - MPIOptions.append('-DMPICH2_DIR=%s' % spec['mpich2'].prefix) + mpi_options.append('-DMPICH2_DIR=%s' % spec['mpich2'].prefix) # mvapich if spec.satisfies('+mvapich'): - MPIOptions.append('-DMVAPICH_DIR=%s' % spec['mvapich'].prefix) + mpi_options.append('-DMVAPICH_DIR=%s' % spec['mvapich'].prefix) # mvapich2 if spec.satisfies('+mvapich2'): - MPIOptions.append('-DMVAPICH2_DIR=%s' % spec['mvapich2'].prefix) + mpi_options.append('-DMVAPICH2_DIR=%s' % spec['mvapich2'].prefix) # mpt if spec.satisfies('+mpt'): - MPIOptions.append('-DMPT_DIR=%s' % spec['mpt'].prefix) + mpi_options.append('-DMPT_DIR=%s' % spec['mpt'].prefix) - cmakeOptions.extend(MPIOptions) + cmake_options.extend(mpi_options) def setup_environment(self, spack_env, run_env): """Set up the compile and runtime environments for a package.""" diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py index ad5b762b68..16eb54eb90 100644 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop/package.py @@ -188,11 +188,11 @@ class Openspeedshop(CMakePackage): build_directory = 'build_openspeedshop' - def set_CrayLoginNode_cmakeOptions(self, spec, cmakeOptions): - # Appends to cmakeOptions the options that will enable the appropriate + def set_cray_login_node_cmake_options(self, spec, cmake_options): + # Appends to cmake_options the options that will enable the appropriate # Cray login node libraries - CrayLoginNodeOptions = [] + cray_login_node_options = [] rt_platform = "cray" # How do we get the compute node (CNL) cbtf package install @@ -206,12 +206,12 @@ class Openspeedshop(CMakePackage): # Equivalent to install-tool cmake arg: # '-DCBTF_KRELL_CN_RUNTIME_DIR=%s' # % /cbtf_v2.3.1.release/compute) - CrayLoginNodeOptions.append('-DCBTF_KRELL_CN_RUNTIME_DIR=%s' - % be_ck.prefix) - CrayLoginNodeOptions.append('-DRUNTIME_PLATFORM=%s' - % rt_platform) + cray_login_node_options.append('-DCBTF_KRELL_CN_RUNTIME_DIR=%s' + % be_ck.prefix) + cray_login_node_options.append('-DRUNTIME_PLATFORM=%s' + % rt_platform) - cmakeOptions.extend(CrayLoginNodeOptions) + cmake_options.extend(cray_login_node_options) def cmake_args(self): @@ -226,7 +226,7 @@ class Openspeedshop(CMakePackage): if spec.satisfies('+runtime'): # Appends base options to cmake_args - self.set_defaultbase_cmakeOptions(spec, cmake_args) + self.set_defaultbase_cmake_options(spec, cmake_args) cmake_args.extend( ['-DCMAKE_CXX_FLAGS=%s' % compile_flags, '-DCMAKE_C_FLAGS=%s' % compile_flags, @@ -238,7 +238,7 @@ class Openspeedshop(CMakePackage): else: # Appends base options to cmake_args - self.set_defaultbase_cmakeOptions(spec, cmake_args) + self.set_defaultbase_cmake_options(spec, cmake_args) guitype = self.spec.variants['gui'].value cmake_args.extend( ['-DCMAKE_CXX_FLAGS=%s' % compile_flags, @@ -265,61 +265,61 @@ class Openspeedshop(CMakePackage): # components/libraries first then pass # those libraries to the openspeedshop # login node build - self.set_CrayLoginNode_cmakeOptions(spec, cmake_args) + self.set_cray_login_node_cmake_options(spec, cmake_args) return cmake_args - def set_defaultbase_cmakeOptions(self, spec, cmakeOptions): - # Appends to cmakeOptions the options that will enable + def set_defaultbase_cmake_options(self, spec, cmake_options): + # Appends to cmake_options the options that will enable # the appropriate base level options to the openspeedshop # cmake build. python_exe = spec['python'].command.path python_library = spec['python'].libs[0] python_include = spec['python'].headers.directories[0] - BaseOptions = [] - - BaseOptions.append('-DBINUTILS_DIR=%s' % spec['binutils'].prefix) - BaseOptions.append('-DLIBELF_DIR=%s' % spec['elf'].prefix) - BaseOptions.append('-DLIBDWARF_DIR=%s' % spec['libdwarf'].prefix) - BaseOptions.append('-DPYTHON_EXECUTABLE=%s' % python_exe) - BaseOptions.append('-DPYTHON_INCLUDE_DIR=%s' % python_include) - BaseOptions.append('-DPYTHON_LIBRARY=%s' % python_library) - BaseOptions.append('-DBoost_NO_SYSTEM_PATHS=TRUE') - BaseOptions.append('-DBoost_NO_BOOST_CMAKE=TRUE') - BaseOptions.append('-DBOOST_ROOT=%s' % spec['boost'].prefix) - BaseOptions.append('-DBoost_DIR=%s' % spec['boost'].prefix) - BaseOptions.append('-DBOOST_LIBRARYDIR=%s' % spec['boost'].prefix.lib) - BaseOptions.append('-DDYNINST_DIR=%s' % spec['dyninst'].prefix) - - cmakeOptions.extend(BaseOptions) - - def set_mpi_cmakeOptions(self, spec, cmakeOptions): - # Appends to cmakeOptions the options that will enable + base_options = [] + + base_options.append('-DBINUTILS_DIR=%s' % spec['binutils'].prefix) + base_options.append('-DLIBELF_DIR=%s' % spec['elf'].prefix) + base_options.append('-DLIBDWARF_DIR=%s' % spec['libdwarf'].prefix) + base_options.append('-DPYTHON_EXECUTABLE=%s' % python_exe) + base_options.append('-DPYTHON_INCLUDE_DIR=%s' % python_include) + base_options.append('-DPYTHON_LIBRARY=%s' % python_library) + base_options.append('-DBoost_NO_SYSTEM_PATHS=TRUE') + base_options.append('-DBoost_NO_BOOST_CMAKE=TRUE') + base_options.append('-DBOOST_ROOT=%s' % spec['boost'].prefix) + base_options.append('-DBoost_DIR=%s' % spec['boost'].prefix) + base_options.append('-DBOOST_LIBRARYDIR=%s' % spec['boost'].prefix.lib) + base_options.append('-DDYNINST_DIR=%s' % spec['dyninst'].prefix) + + cmake_options.extend(base_options) + + def set_mpi_cmake_options(self, spec, cmake_options): + # Appends to cmake_options the options that will enable # the appropriate MPI implementations - MPIOptions = [] + mpi_options = [] # openmpi if spec.satisfies('+openmpi'): - MPIOptions.append('-DOPENMPI_DIR=%s' % spec['openmpi'].prefix) + mpi_options.append('-DOPENMPI_DIR=%s' % spec['openmpi'].prefix) # mpich if spec.satisfies('+mpich'): - MPIOptions.append('-DMPICH_DIR=%s' % spec['mpich'].prefix) + mpi_options.append('-DMPICH_DIR=%s' % spec['mpich'].prefix) # mpich2 if spec.satisfies('+mpich2'): - MPIOptions.append('-DMPICH2_DIR=%s' % spec['mpich2'].prefix) + mpi_options.append('-DMPICH2_DIR=%s' % spec['mpich2'].prefix) # mvapich if spec.satisfies('+mvapich'): - MPIOptions.append('-DMVAPICH_DIR=%s' % spec['mvapich'].prefix) + mpi_options.append('-DMVAPICH_DIR=%s' % spec['mvapich'].prefix) # mvapich2 if spec.satisfies('+mvapich2'): - MPIOptions.append('-DMVAPICH2_DIR=%s' % spec['mvapich2'].prefix) + mpi_options.append('-DMVAPICH2_DIR=%s' % spec['mvapich2'].prefix) # mpt if spec.satisfies('+mpt'): - MPIOptions.append('-DMPT_DIR=%s' % spec['mpt'].prefix) + mpi_options.append('-DMPT_DIR=%s' % spec['mpt'].prefix) - cmakeOptions.extend(MPIOptions) + cmake_options.extend(mpi_options) def setup_environment(self, spack_env, run_env): """Set up the compile and runtime environments for a package.""" diff --git a/var/spack/repos/builtin/packages/planck-likelihood/package.py b/var/spack/repos/builtin/packages/planck-likelihood/package.py index bbd28dc008..1a17bf917a 100644 --- a/var/spack/repos/builtin/packages/planck-likelihood/package.py +++ b/var/spack/repos/builtin/packages/planck-likelihood/package.py @@ -141,8 +141,8 @@ class PlanckLikelihood(Package): @on_package_attributes(run_tests=True) def check_install(self): prefix = self.prefix - clik_example_C = Executable(join_path(prefix.bin, 'clik_example_C')) + clik_example_c = Executable(join_path(prefix.bin, 'clik_example_C')) with working_dir('spack-check', create=True): - clik_example_C(join_path(prefix, 'share', 'clik', + clik_example_c(join_path(prefix, 'share', 'clik', 'plc_2.0', 'hi_l', 'plik', 'plik_dx11dr2_HM_v18_TT.clik')) diff --git a/var/spack/repos/builtin/packages/platypus/package.py b/var/spack/repos/builtin/packages/platypus/package.py index 26a20d9576..c0812851c0 100644 --- a/var/spack/repos/builtin/packages/platypus/package.py +++ b/var/spack/repos/builtin/packages/platypus/package.py @@ -38,6 +38,6 @@ class Platypus(Package): depends_on('htslib') def install(self, spec, prefix): - buildPlatypus = Executable('./buildPlatypus.sh') - buildPlatypus() + build_platypus = Executable('./buildPlatypus.sh') + build_platypus() install_tree('.', prefix.bin) diff --git a/var/spack/repos/builtin/packages/r-rmpi/package.py b/var/spack/repos/builtin/packages/r-rmpi/package.py index 498419b899..3e2f499516 100644 --- a/var/spack/repos/builtin/packages/r-rmpi/package.py +++ b/var/spack/repos/builtin/packages/r-rmpi/package.py @@ -51,13 +51,13 @@ class RRmpi(RPackage): # The type of MPI. Supported values are: # OPENMPI, LAM, MPICH, MPICH2, or CRAY if mpi_name == 'openmpi': - Rmpi_type = 'OPENMPI' + rmpi_type = 'OPENMPI' elif mpi_name == 'mpich': - Rmpi_type = 'MPICH2' + rmpi_type = 'MPICH2' else: raise InstallError('Unsupported MPI type') return [ - '--with-Rmpi-type={0}'.format(Rmpi_type), + '--with-Rmpi-type={0}'.format(rmpi_type), '--with-mpi={0}'.format(spec['mpi'].prefix), ] diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py index a9b99053ca..78aee97001 100644 --- a/var/spack/repos/builtin/packages/r/package.py +++ b/var/spack/repos/builtin/packages/r/package.py @@ -107,16 +107,16 @@ class R(AutotoolsPackage): spec = self.spec prefix = self.prefix - tclConfig_path = join_path(spec['tcl'].prefix.lib, 'tclConfig.sh') - tkConfig_path = join_path(spec['tk'].prefix.lib, 'tkConfig.sh') + tcl_config_path = join_path(spec['tcl'].prefix.lib, 'tclConfig.sh') + tk_config_path = join_path(spec['tk'].prefix.lib, 'tkConfig.sh') config_args = [ '--libdir={0}'.format(join_path(prefix, 'rlib')), '--enable-R-shlib', '--enable-BLAS-shlib', '--enable-R-framework=no', - '--with-tcl-config={0}'.format(tclConfig_path), - '--with-tk-config={0}'.format(tkConfig_path), + '--with-tcl-config={0}'.format(tcl_config_path), + '--with-tk-config={0}'.format(tk_config_path), ] if '+external-lapack' in spec: diff --git a/var/spack/repos/builtin/packages/tcptrace/package.py b/var/spack/repos/builtin/packages/tcptrace/package.py index f5381de833..dea8b81680 100644 --- a/var/spack/repos/builtin/packages/tcptrace/package.py +++ b/var/spack/repos/builtin/packages/tcptrace/package.py @@ -48,8 +48,8 @@ class Tcptrace(AutotoolsPackage): @run_after('configure') def patch_makefile(self): # see https://github.com/blitz/tcptrace/blob/master/README.linux - Makefile = FileFilter('Makefile') - Makefile.filter( + makefile = FileFilter('Makefile') + makefile.filter( "PCAP_LDLIBS = -lpcap", "DEFINES += -D_BSD_SOURCE\nPCAP_LDLIBS = -lpcap") diff --git a/var/spack/repos/builtin/packages/tcsh/package.py b/var/spack/repos/builtin/packages/tcsh/package.py index e41fd84bcc..c5b681c9bb 100644 --- a/var/spack/repos/builtin/packages/tcsh/package.py +++ b/var/spack/repos/builtin/packages/tcsh/package.py @@ -38,7 +38,7 @@ class Tcsh(AutotoolsPackage): version('6.20.00', '59d40ef40a68e790d95e182069431834') - def fedora_patch(commit, file, **kwargs): + def fedora_patch(commit, file, **kwargs): # noqa prefix = 'https://src.fedoraproject.org/rpms/tcsh/raw/{0}/f/'.format(commit) patch('{0}{1}'.format(prefix, file), **kwargs) diff --git a/var/spack/repos/builtin/packages/verilator/package.py b/var/spack/repos/builtin/packages/verilator/package.py index 4c4db03195..3b6b08da1e 100644 --- a/var/spack/repos/builtin/packages/verilator/package.py +++ b/var/spack/repos/builtin/packages/verilator/package.py @@ -74,7 +74,7 @@ class Verilator(AutotoolsPackage): # we need to fix the CXX and LINK paths, as they point to the spack # wrapper scripts which aren't usable without spack @run_after('install') - def patch_CXX(self): + def patch_cxx(self): filter_file(r'^CXX\s*=.*', 'CXX = {0}'.format(self.compiler.cxx), join_path(self.prefix.include, 'verilated.mk')) filter_file(r'^LINK\s*=.*', 'LINK = {0}'.format(self.compiler.cxx), diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py index a355626bfb..e413b4c4e6 100644 --- a/var/spack/repos/builtin/packages/vtk/package.py +++ b/var/spack/repos/builtin/packages/vtk/package.py @@ -154,31 +154,31 @@ class Vtk(CMakePackage): if '+osmesa' in spec: prefix = spec['mesa'].prefix - osmesaIncludeDir = prefix.include - osmesaLibrary = os.path.join(prefix.lib, 'libOSMesa.so') + osmesa_include_dir = prefix.include + osmesa_library = os.path.join(prefix.lib, 'libOSMesa.so') - useParam = 'VTK_USE_X' + use_param = 'VTK_USE_X' if 'darwin' in spec.architecture: - useParam = 'VTK_USE_COCOA' + use_param = 'VTK_USE_COCOA' cmake_args.extend([ - '-D{0}:BOOL=OFF'.format(useParam), + '-D{0}:BOOL=OFF'.format(use_param), '-DVTK_OPENGL_HAS_OSMESA:BOOL=ON', - '-DOSMESA_INCLUDE_DIR:PATH={0}'.format(osmesaIncludeDir), - '-DOSMESA_LIBRARY:FILEPATH={0}'.format(osmesaLibrary), + '-DOSMESA_INCLUDE_DIR:PATH={0}'.format(osmesa_include_dir), + '-DOSMESA_LIBRARY:FILEPATH={0}'.format(osmesa_library), ]) else: prefix = spec['opengl'].prefix - openglIncludeDir = prefix.include - openglLibrary = os.path.join(prefix.lib, 'libGL.so') + opengl_include_dir = prefix.include + opengl_library = os.path.join(prefix.lib, 'libGL.so') if 'darwin' in spec.architecture: - openglIncludeDir = prefix - openglLibrary = prefix + opengl_include_dir = prefix + opengl_library = prefix cmake_args.extend([ - '-DOPENGL_INCLUDE_DIR:PATH={0}'.format(openglIncludeDir), - '-DOPENGL_gl_LIBRARY:FILEPATH={0}'.format(openglLibrary) + '-DOPENGL_INCLUDE_DIR:PATH={0}'.format(opengl_include_dir), + '-DOPENGL_gl_LIBRARY:FILEPATH={0}'.format(opengl_library) ]) if spec.satisfies('@:6.1.0'): -- cgit v1.2.3-70-g09d2 From f227cf05456e108afe0adab35d395ed1de1999f5 Mon Sep 17 00:00:00 2001 From: Hadrien G Date: Thu, 19 Jul 2018 17:57:53 +0300 Subject: New package: Verrou, a floating point error checker (#8738) * New package: Verrou, a floating point error checker * Clean up usage of patch * Account for future patches in version ranges * Manual call to autogen is not needed anymore, but extra dependencies are needed * Use trick from automake to evade shebang length limit * Use a glob instead of an explicit file list * Turns out conflict() does not do what I want... * Suggestions from @citibeth reviews - Use 'develop' convention for the master branch - Prefer tarballs over git repositories - Increase robustness against default configuration * Drop a couple of older releases with a different patching procedure * Playing coding style golf * Various bug squashing - Missed master -> develop substitution - Turns out manually calling autogen.sh is needed after all - Missed + in spec * More style golfing to fit in 80 columns * Remove unnecessary mention of the develop branch --- var/spack/repos/builtin/packages/verrou/package.py | 107 +++++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 var/spack/repos/builtin/packages/verrou/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/verrou/package.py b/var/spack/repos/builtin/packages/verrou/package.py new file mode 100644 index 0000000000..0562c600be --- /dev/null +++ b/var/spack/repos/builtin/packages/verrou/package.py @@ -0,0 +1,107 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import glob +import os +import sys + + +class Verrou(AutotoolsPackage): + """A floating-point error checker. + + Verrou helps you look for floating-point round-off errors in programs. It + implements a stochastic floating-point arithmetic based on random rounding: + all floating-point operations are perturbed by randomly switching rounding + modes. This can be seen as an asynchronous variant of the CESTAC method, or + a subset of Monte Carlo Arithmetic, performing only output randomization + through random rounding. + """ + + homepage = "https://github.com/edf-hpc/verrou" + url = "https://github.com/edf-hpc/verrou/archive/v2.0.0.tar.gz" + + version('develop', + git='https://github.com/edf-hpc/verrou.git', + branch='master') + + version('2.0.0', '388d493df3f253c9b049ce0ceae55fd6') + version('1.1.0', '9752d776fb534890e5e29f9721ee6125') + + resource(name='valgrind-3.13.0', + url='https://sourceware.org/pub/valgrind/valgrind-3.13.0.tar.bz2', + sha256='d76680ef03f00cd5e970bbdcd4e57fb1f6df7d2e2c071635ef2be74790190c3b', + when='@1.1.0:') + + variant('fma', default=True, + description='Activates fused multiply-add support for Verrou') + + depends_on('autoconf', type='build') + depends_on('automake', type='build') + depends_on('libtool', type='build') + depends_on('m4', type='build') + + def patch(self): + # We start with the verrou source tree and a "valgrind-x.y.z" subdir. + # But we actually need a valgrind source tree with a "verrou" subdir. + # First, let's locate the valgrind sources... + valgrind_dirs = glob.glob('valgrind-*') + assert len(valgrind_dirs) == 1 + valgrind_dir = valgrind_dirs[0] + + # ...then we can flip the directory organization around + verrou_files = os.listdir('.') + verrou_files.remove(valgrind_dir) + os.mkdir('verrou') + for name in verrou_files: + os.rename(name, os.path.join('verrou', name)) + for name in os.listdir(valgrind_dir): + os.rename(os.path.join(valgrind_dir, name), name) + os.rmdir(valgrind_dir) + + # Once this is done, we can patch valgrind + which('patch')('-p0', '--input=verrou/valgrind.diff') + + # Autogenerated perl path may be too long, need to fix this here + # because these files are used during the build. + for link_tool_in in glob.glob('coregrind/link_tool_exe_*.in'): + filter_file('^#! @PERL@', + '#! /usr/bin/env perl', + link_tool_in) + + def autoreconf(self, spec, prefix): + # Needed because we patched valgrind + which("bash")("autogen.sh") + + def configure_args(self): + spec = self.spec + options = [ + '--enable-only64bit', + '--{0}able-verrou-fma'.format('en' if '+fma' in spec else 'dis') + ] + + if sys.platform == 'darwin': + options.append('--build=amd64-darwin') + + return options -- cgit v1.2.3-70-g09d2 From e0d05d23a18b5848603c603c5aed2c6a3535ff58 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Thu, 19 Jul 2018 12:06:16 -0400 Subject: votca*: update dependencies (#8757) --- .../repos/builtin/packages/ceres-solver/package.py | 53 ++++++++++++++++++++++ .../repos/builtin/packages/votca-ctp/package.py | 3 +- .../repos/builtin/packages/votca-tools/package.py | 5 +- .../repos/builtin/packages/votca-xtp/package.py | 4 +- 4 files changed, 61 insertions(+), 4 deletions(-) create mode 100644 var/spack/repos/builtin/packages/ceres-solver/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ceres-solver/package.py b/var/spack/repos/builtin/packages/ceres-solver/package.py new file mode 100644 index 0000000000..c3fbda2f3c --- /dev/null +++ b/var/spack/repos/builtin/packages/ceres-solver/package.py @@ -0,0 +1,53 @@ +############################################################################## +# Copyright (c) 2018, The VOTCA Development Team (http://www.votca.org) +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class CeresSolver(CMakePackage): + """Ceres Solver is an open source C++ library for modeling and solving + large, complicated optimization problems. It can be used to solve + Non-linear Least Squares problems with bounds constraints and general + unconstrained optimization problems. It is a mature, feature rich, and + performant library that has been used in production at Google since 2010. + """ + + homepage = "http://ceres-solver.org" + url = "http://ceres-solver.org/ceres-solver-1.12.0.tar.gz" + + version('1.12.0', '278a7b366881cc45e258da71464114d9') + + depends_on('eigen@3:') + depends_on('lapack') + depends_on('glog') + + def cmake_args(self): + args = [ + '-DSUITESPARSE=OFF', + '-DCXSPARSE=OFF', + '-DEIGENSPARSE=ON', + '-DLAPACK=ON', + '-DBUILD_SHARED_LIBS=ON', + '-DSCHUR_SPECIALIZATIONS=OFF' + ] + return args diff --git a/var/spack/repos/builtin/packages/votca-ctp/package.py b/var/spack/repos/builtin/packages/votca-ctp/package.py index 0d56af5319..202c7c7bbf 100644 --- a/var/spack/repos/builtin/packages/votca-ctp/package.py +++ b/var/spack/repos/builtin/packages/votca-ctp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017, The VOTCA Development Team (http://www.votca.org) +# Copyright (c) 2017-2018, The VOTCA Development Team (http://www.votca.org) # # This file is part of Spack. # Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. @@ -42,3 +42,4 @@ class VotcaCtp(CMakePackage): depends_on("cmake@2.8:", type='build') depends_on("votca-tools@develop", when='@develop') depends_on("votca-csg@develop", when='@develop') + depends_on("gsl") diff --git a/var/spack/repos/builtin/packages/votca-tools/package.py b/var/spack/repos/builtin/packages/votca-tools/package.py index 9eb7fd147a..8b1d37138e 100644 --- a/var/spack/repos/builtin/packages/votca-tools/package.py +++ b/var/spack/repos/builtin/packages/votca-tools/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017, The VOTCA Development Team (http://www.votca.org) +# Copyright (c) 2017-2018, The VOTCA Development Team (http://www.votca.org) # # This file is part of Spack. # Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. @@ -43,6 +43,7 @@ class VotcaTools(CMakePackage): depends_on("cmake@2.8:", type='build') depends_on("expat") depends_on("fftw") - depends_on("gsl") + depends_on("gsl", when="@:1.4.9999") + depends_on("eigen@3.3:", when="@1.5:") depends_on("boost") depends_on("sqlite") diff --git a/var/spack/repos/builtin/packages/votca-xtp/package.py b/var/spack/repos/builtin/packages/votca-xtp/package.py index 8723001a2e..ce06ba19a3 100644 --- a/var/spack/repos/builtin/packages/votca-xtp/package.py +++ b/var/spack/repos/builtin/packages/votca-xtp/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017, The VOTCA Development Team (http://www.votca.org) +# Copyright (c) 2017-2018, The VOTCA Development Team (http://www.votca.org) # # This file is part of Spack. # Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. @@ -45,3 +45,5 @@ class VotcaXtp(CMakePackage): depends_on("votca-csg@develop", when='@develop') depends_on("votca-csg@1.4:1.4.999", when='@1.4:1.4.999') depends_on("votca-ctp@develop", when='@develop') + depends_on("libxc", when='@1.5:') + depends_on("ceres-solver", when='@1.5:') -- cgit v1.2.3-70-g09d2 From b0a0649d2c03adf003add6a8c655eb2041712596 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Thu, 19 Jul 2018 12:03:40 -0500 Subject: nwchem: add link type to python dep (#8759) --- var/spack/repos/builtin/packages/nwchem/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nwchem/package.py b/var/spack/repos/builtin/packages/nwchem/package.py index e151b53441..d8fd12b72d 100644 --- a/var/spack/repos/builtin/packages/nwchem/package.py +++ b/var/spack/repos/builtin/packages/nwchem/package.py @@ -45,7 +45,7 @@ class Nwchem(Package): depends_on('mpi') depends_on('scalapack') - depends_on('python@2.7:2.8', type=('build', 'run')) + depends_on('python@2.7:2.8', type=('build', 'link', 'run')) # first hash is sha256 of the patch (required for URL patches), # second is sha256 for the archive. -- cgit v1.2.3-70-g09d2 From 9a9998dd2d4c690718b6348a7a1685f78ea56153 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Thu, 19 Jul 2018 12:49:05 -0500 Subject: pycparser: add version 2.18 (#8760) --- var/spack/repos/builtin/packages/py-pycparser/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pycparser/package.py b/var/spack/repos/builtin/packages/py-pycparser/package.py index 7f9c38307d..ca4aa82788 100644 --- a/var/spack/repos/builtin/packages/py-pycparser/package.py +++ b/var/spack/repos/builtin/packages/py-pycparser/package.py @@ -32,6 +32,7 @@ class PyPycparser(PythonPackage): import_modules = ['pycparser', 'pycparser.ply'] + version('2.18', '72370da54358202a60130e223d488136') version('2.17', 'ca98dcb50bc1276f230118f6af5a40c7') version('2.13', 'e4fe1a2d341b22e25da0d22f034ef32f') -- cgit v1.2.3-70-g09d2 From 76b54a214e7582c2f7c875de3a7e4d58619e6ac7 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Thu, 19 Jul 2018 14:00:19 -0500 Subject: Py-lark-parser: new package (#8761) --- .../builtin/packages/py-lark-parser/package.py | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-lark-parser/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-lark-parser/package.py b/var/spack/repos/builtin/packages/py-lark-parser/package.py new file mode 100644 index 0000000000..da31bb7b77 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-lark-parser/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyLarkParser(PythonPackage): + """Lark is a modern general-purpose parsing library for Python.""" + + homepage = "https://github.com/lark-parser/lark/" + url = "https://pypi.io/packages/source/l/lark-parser/lark-parser-0.6.2.tar.gz" + + version('0.6.2', '675058937a7f41e661bcf2b3bfdb7ceb') + + depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From 3299d41ef9e344f2538da6d575bb83a57c69f6d8 Mon Sep 17 00:00:00 2001 From: sknigh Date: Thu, 19 Jul 2018 14:02:55 -0700 Subject: Packaged iperf3 (#8762) --- var/spack/repos/builtin/packages/iperf3/package.py | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 var/spack/repos/builtin/packages/iperf3/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/iperf3/package.py b/var/spack/repos/builtin/packages/iperf3/package.py new file mode 100644 index 0000000000..d2715c05f3 --- /dev/null +++ b/var/spack/repos/builtin/packages/iperf3/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Iperf3(AutotoolsPackage): + """The iperf series of tools perform active measurements to determine the + maximum achievable bandwidth on IP networks. iperf2 is a separately + maintained project.""" + + homepage = "https://software.es.net/iperf/" + url = "https://github.com/esnet/iperf/archive/3.6.tar.gz" + + version('3.6', '5082ffc4141abc1bac7cbd59337ff409') -- cgit v1.2.3-70-g09d2 From 2a12c3bf071307961b950269a2e97b2f9a824ec4 Mon Sep 17 00:00:00 2001 From: sknigh Date: Thu, 19 Jul 2018 15:55:06 -0700 Subject: Packaged iperf2 (#8765) --- var/spack/repos/builtin/packages/iperf2/package.py | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 var/spack/repos/builtin/packages/iperf2/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/iperf2/package.py b/var/spack/repos/builtin/packages/iperf2/package.py new file mode 100644 index 0000000000..a4bd33765d --- /dev/null +++ b/var/spack/repos/builtin/packages/iperf2/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Iperf2(AutotoolsPackage): + """This code is a continuation based from the no longer maintained iperf + 2.0.5 code base. Iperf 2.0.5 is still widely deployed and used by many for + testing networks and for qualifying networking products.""" + + homepage = "https://sourceforge.net/projects/iperf2" + url = "https://downloads.sourceforge.net/project/iperf2/iperf-2.0.12.tar.gz" + + version('2.0.12', 'e501e26b9289097086ce0c44a42b10bc') -- cgit v1.2.3-70-g09d2 From 9653dc2aac471d2d984b0b21d68d0684661d3ad6 Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Thu, 19 Jul 2018 17:58:36 -0500 Subject: r-qorts: Create new package. (#8744) * r-qorts: Create new package. * Change dependency to java, change package name. * Remove some join_path. --- var/spack/repos/builtin/packages/qorts/QoRTs.sh | 3 + var/spack/repos/builtin/packages/qorts/package.py | 71 +++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 var/spack/repos/builtin/packages/qorts/QoRTs.sh create mode 100644 var/spack/repos/builtin/packages/qorts/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/qorts/QoRTs.sh b/var/spack/repos/builtin/packages/qorts/QoRTs.sh new file mode 100644 index 0000000000..d847e76e05 --- /dev/null +++ b/var/spack/repos/builtin/packages/qorts/QoRTs.sh @@ -0,0 +1,3 @@ +#!/bin/sh +# convenience wrapper for the QoRTs jar file +java -jar QoRTs.jar "$@" diff --git a/var/spack/repos/builtin/packages/qorts/package.py b/var/spack/repos/builtin/packages/qorts/package.py new file mode 100644 index 0000000000..bb71f15b8f --- /dev/null +++ b/var/spack/repos/builtin/packages/qorts/package.py @@ -0,0 +1,71 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import os.path +from shutil import copyfile + + +class Qorts(RPackage): + """The QoRTs software package is a fast, efficient, and portable + multifunction toolkit designed to assist in the analysis, quality + control, and data management of RNA-Seq and DNA-Seq datasets. Its + primary function is to aid in the detection and identification of + errors, biases, and artifacts produced by high-throughput sequencing + technology.""" + + homepage = "https://github.com/hartleys/QoRTs" + url = "https://github.com/hartleys/QoRTs/releases/download/v1.2.42/QoRTs_1.2.42.tar.gz" + + version('1.2.42', '7d46162327b0da70bfe483fe2f2b7829') + + depends_on('java', type='run') + + resource( + name='QoRTs.jar', + url='https://github.com/hartleys/QoRTs/releases/download/v1.2.42/QoRTs.jar', + md5='918df4291538218c12caa3ab98c535e9', + placement='jarfile', + expand=False + ) + + @run_after('install') + def install_jar(self): + install_tree(join_path(self.stage.source_path, 'jarfile'), + self.prefix.bin) + + # Set up a helper script to call java on the jar file, + # explicitly codes the path for java and the jar file. + script_sh = join_path(os.path.dirname(__file__), "QoRTs.sh") + script = self.prefix.bin.QoRTs + copyfile(script_sh, script) + set_executable(script) + + # Munge the helper script to explicitly point to java and the + # jar file. + java = self.spec['java'].prefix.bin.java + kwargs = {'backup': False} + filter_file('^java', java, script, **kwargs) + filter_file('QoRTs.jar', join_path(self.prefix.bin, 'QoRTs.jar'), + script, **kwargs) -- cgit v1.2.3-70-g09d2 From 1a136d6db2d12be8788c34993c5e6f4edeb00bb3 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 19 Jul 2018 21:21:06 -0500 Subject: Add kealib 1.4.10 (#8769) --- var/spack/repos/builtin/packages/kealib/package.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/kealib/package.py b/var/spack/repos/builtin/packages/kealib/package.py index fae9202c7b..95d5846d61 100644 --- a/var/spack/repos/builtin/packages/kealib/package.py +++ b/var/spack/repos/builtin/packages/kealib/package.py @@ -42,12 +42,13 @@ class Kealib(CMakePackage): Development work on this project has been funded by Landcare Research. """ homepage = "http://www.kealib.org/" - url = "https://bitbucket.org/chchrsc/kealib/get/kealib-1.4.9.tar.gz" + url = "https://bitbucket.org/chchrsc/kealib/get/kealib-1.4.10.tar.gz" version('develop', hg='https://bitbucket.org/chchrsc/kealib') - version('1.4.9', 'a095d0b9d6de1d609ffaf242e00cc2b6') - version('1.4.8', '1af2514c908f9168ff6665cc012815ad') - version('1.4.7', '6139e31e50f552247ddf98f489948893') + version('1.4.10', '5684aeb2085a67a4270c73e79d4ab768') + version('1.4.9', 'a095d0b9d6de1d609ffaf242e00cc2b6') + version('1.4.8', '1af2514c908f9168ff6665cc012815ad') + version('1.4.7', '6139e31e50f552247ddf98f489948893') depends_on('cmake@2.8.10:', type='build') depends_on('hdf5+cxx+hl') -- cgit v1.2.3-70-g09d2 From 0e4909cad8dbc243f1dc3f3c2926f282e8d9f15f Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Sat, 21 Jul 2018 17:45:01 -0400 Subject: votca: add more deps (#8771) * votca: add more deps * Update package.py --- var/spack/repos/builtin/packages/votca-csg/package.py | 1 + var/spack/repos/builtin/packages/votca-tools/package.py | 6 ++++++ 2 files changed, 7 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/votca-csg/package.py b/var/spack/repos/builtin/packages/votca-csg/package.py index 5c827ad36d..50dd0ed40e 100644 --- a/var/spack/repos/builtin/packages/votca-csg/package.py +++ b/var/spack/repos/builtin/packages/votca-csg/package.py @@ -44,3 +44,4 @@ class VotcaCsg(CMakePackage): depends_on("votca-tools@1.4:1.4.999", when='@1.4:1.4.999') depends_on("votca-tools@develop", when='@develop') depends_on("gromacs~mpi@5.1:") + depends_on("hdf5~mpi") diff --git a/var/spack/repos/builtin/packages/votca-tools/package.py b/var/spack/repos/builtin/packages/votca-tools/package.py index 8b1d37138e..579df3c8c2 100644 --- a/var/spack/repos/builtin/packages/votca-tools/package.py +++ b/var/spack/repos/builtin/packages/votca-tools/package.py @@ -47,3 +47,9 @@ class VotcaTools(CMakePackage): depends_on("eigen@3.3:", when="@1.5:") depends_on("boost") depends_on("sqlite") + + def cmake_args(self): + args = [ + '-DWITH_RC_FILES=OFF' + ] + return args -- cgit v1.2.3-70-g09d2 From a18a6420748da96aafdd00b8ce1a9d80995a10a4 Mon Sep 17 00:00:00 2001 From: Lukasz Date: Sun, 22 Jul 2018 21:26:30 +0100 Subject: add MoFEM packages (#8700) * add mofem-cephas package * add mofem fracture module * add user modules build and fracture modyle * add minimal surface module * add slepc variant * bump mofem core lib version * bump mofem core lib version * bump version * fix bug * set upper bound to petsc version and other chanes * fix indentation * add minimal med file installation * chcekc with flake8 and installation with spack packages * add variants to med package * upper bound to adol-c and remove obsolete internal package install * fix basic module install * module install from external source in extended prefix * remove obsolte code and reverse to variant doxygen * fix git adress * improve packaging for mofem users modules * fix flake8 * move dependencies after variants * move root_cmakelists_dir right before cmake_args * remove unused variants * use append for single element * replace root_cmakelists_dir * use install_tree instead copy tree * simplify code * remove phase and mkdirp * add run tests * instal ext modules to ext_users_modules directory * move version below url * simplify directory name * use underscore in variant name * remove unused variable * fix link to blas libs * add missing boost dependence * fix problem with copying module source code * change variant name form doxygen to docs * add expanded description * make installation consistent with spack * fix flake8 * make extensions installed * code comments and minor corrections * make slepc variant false by default --- var/spack/repos/builtin/packages/adol-c/package.py | 1 + var/spack/repos/builtin/packages/med/package.py | 71 ++++++++++++++ .../repos/builtin/packages/mofem-cephas/package.py | 100 +++++++++++++++++++ .../packages/mofem-fracture-module/package.py | 107 +++++++++++++++++++++ .../mofem-minimal-surface-equation/package.py | 95 ++++++++++++++++++ .../packages/mofem-users-modules/package.py | 82 ++++++++++++++++ 6 files changed, 456 insertions(+) create mode 100644 var/spack/repos/builtin/packages/med/package.py create mode 100644 var/spack/repos/builtin/packages/mofem-cephas/package.py create mode 100644 var/spack/repos/builtin/packages/mofem-fracture-module/package.py create mode 100644 var/spack/repos/builtin/packages/mofem-minimal-surface-equation/package.py create mode 100644 var/spack/repos/builtin/packages/mofem-users-modules/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/adol-c/package.py b/var/spack/repos/builtin/packages/adol-c/package.py index 2947556f80..b6f00b7eeb 100644 --- a/var/spack/repos/builtin/packages/adol-c/package.py +++ b/var/spack/repos/builtin/packages/adol-c/package.py @@ -37,6 +37,7 @@ class AdolC(AutotoolsPackage): version('2.6.3', 'f78f67f70d5874830a1ad1c0f54e54f7') version('2.6.2', '0f9547584c99c0673e4f81cf64e8d865') version('2.6.1', '1032b28427d6e399af4610e78c0f087b') + version('2.5.2', '96f81b80e93cca57398066ea4afe28f0') variant('advanced_branching', default=False, description='Enable advanced branching to reduce retaping') diff --git a/var/spack/repos/builtin/packages/med/package.py b/var/spack/repos/builtin/packages/med/package.py new file mode 100644 index 0000000000..353ed091aa --- /dev/null +++ b/var/spack/repos/builtin/packages/med/package.py @@ -0,0 +1,71 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class Med(CMakePackage): + """The MED file format is a specialization of the HDF5 standard.""" + + homepage = "http://docs.salome-platform.org/latest/dev/MEDCoupling/med-file.html" + url = "http://files.salome-platform.org/Salome/other/med-3.2.0.tar.gz" + + maintainers = ['likask'] + + version('3.2.0', 'eb61df92f0624feb6328f517cd756a23') + + variant('api23', default=True, description='Enable API2.3') + + depends_on('mpi') + depends_on('hdf5@:1.8.19+mpi') + + # FIXME This is minimal installation. + + def cmake_args(self): + spec = self.spec + + options = [] + + if '+api23' in spec: + options.extend([ + '-DCMAKE_CXX_FLAGS:STRING=-DMED_API_23=1', + '-DCMAKE_C_FLAGS:STRING=-DMED_API_23=1', + '-DMED_API_23=1']) + + options.extend([ + '-DMEDFILE_USE_MPI=YES' + '-DMEDFILE_BUILD_TESTS={0}'.format( + 'ON' if self.run_tests else 'OFF'), + '-DMEDFILE_BUILD_PYTHON=OFF', + '-DMEDFILE_INSTALL_DOC=OFF', + '-DMEDFILE_BUILD_SHARED_LIBS=OFF', + '-DMEDFILE_BUILD_STATIC_LIBS=ON', + '-DCMAKE_Fortran_COMPILER=']) + + options.extend([ + '-DHDF5_ROOT_DIR=%s' % spec['hdf5'].prefix, + '-DMPI_ROOT_DIR=%s' % spec['mpi'].prefix]) + + return options diff --git a/var/spack/repos/builtin/packages/mofem-cephas/package.py b/var/spack/repos/builtin/packages/mofem-cephas/package.py new file mode 100644 index 0000000000..f98f0a6379 --- /dev/null +++ b/var/spack/repos/builtin/packages/mofem-cephas/package.py @@ -0,0 +1,100 @@ +############################################################################## +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class MofemCephas(CMakePackage): + """mofem-cephas core library""" + + homepage = "http://mofem.eng.gla.ac.uk" + url = "https://bitbucket.org/likask/mofem-cephas.git" + + maintainers = ['likask'] + + version('0.8.7', git='https://bitbucket.org/likask/mofem-cephas.git', + tag='v0.8.7', submodules=True) + version('develop', + git='https://bitbucket.org/likask/mofem-cephas.git', + branch='develop', submodules=True) + + # This option can be only used for development of core lib + variant('copy_user_modules', default=True, + description='Copy user modules directory instead linking to source') + variant('adol-c', default=True, description='Compile with Adol-C') + variant('tetgen', default=True, description='Compile with Tetgen') + variant('med', default=True, description='Compile with Med') + variant('slepc', default=False, description='Compile with Slepc') + + depends_on("mpi") + depends_on("boost") + depends_on("parmetis") + # Fixed version of hdf5, to remove some problems with dependent + # packages, f.e. MED format + depends_on("hdf5@:1.8.19+hl+mpi") + depends_on("petsc@:3.9.2+mumps+mpi") + depends_on('slepc', when='+slepc') + depends_on("moab") + # Upper bound set to ADOL-C until issues with memory leaks + # for versions 2.6: fully resolved + depends_on("adol-c@2.5.2~examples", when="+adol-c") + depends_on("tetgen", when="+tetgen") + depends_on("med", when='+med') + + extendable = True + + root_cmakelists_dir = 'mofem' + + def cmake_args(self): + spec = self.spec + options = [] + + # obligatory options + options.extend([ + '-DWITH_SPACK=YES', + '-DPETSC_DIR=%s' % spec['petsc'].prefix, + '-DPETSC_ARCH=', + '-DMOAB_DIR=%s' % spec['moab'].prefix, + '-DBOOST_DIR=%s' % spec['boost'].prefix]) + + # build tests + options.append('-DMOFEM_BUILD_TETS={0}'.format( + 'ON' if self.run_tests else 'OFF')) + + # variant packages + if '+adol-c' in spec: + options.append('-DADOL-C_DIR=%s' % spec['adol-c'].prefix) + + if '+tetgen' in spec: + options.append('-DTETGEN_DIR=%s' % spec['tetgen'].prefix) + + if '+med' in spec: + options.append('-DMED_DIR=%s' % spec['med'].prefix) + + if '+slepc' in spec: + options.append('-DSLEPC_DIR=%s' % spec['slepc'].prefix) + + # copy users modules, i.e. stand alone vs linked users modules + options.append( + '-DSTAND_ALLONE_USERS_MODULES=%s' % + ('YES' if '+copy_user_modules' in spec else 'NO')) + return options diff --git a/var/spack/repos/builtin/packages/mofem-fracture-module/package.py b/var/spack/repos/builtin/packages/mofem-fracture-module/package.py new file mode 100644 index 0000000000..0369aba7d2 --- /dev/null +++ b/var/spack/repos/builtin/packages/mofem-fracture-module/package.py @@ -0,0 +1,107 @@ +############################################################################## +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class MofemFractureModule(CMakePackage): + """mofem fracture module""" + + homepage = "http://mofem.eng.gla.ac.uk" + url = "https://bitbucket.org/likask/mofem_um_fracture_mechanics" + + maintainers = ['likask'] + + version('0.9.42', + git='https://bitbucket.org/likask/mofem_um_fracture_mechanics', + tag='v0.9.42') + version('develop', + git='https://bitbucket.org/likask/mofem_um_fracture_mechanics', + branch='develop') + + variant('copy_user_modules', default=True, + description='Copy user modules directory instead linking') + + extends('mofem-cephas') + depends_on("mofem-users-modules", type=('build', 'link', 'run')) + + # The CMakeLists.txt installed with mofem-cephas package set cmake + # environment to install extension from extension repository. It searches + # for modules in user provides paths, for example in Spack source path.Also + # it finds all cmake exported targets installed in lib directory, which are + # built with dependent extensions, f.e.mofem - users - modules or others if + # needed. + @property + def root_cmakelists_dir(self): + """The relative path to the directory containing CMakeLists.txt + + This path is relative to the root of the extracted tarball, + not to the ``build_directory``. Defaults to the current directory. + + :return: directory containing CMakeLists.txt + """ + spec = self.spec + return spec['mofem-cephas'].prefix.users_modules + + def cmake_args(self): + spec = self.spec + source = self.stage.source_path + + options = [] + + # obligatory options + options.extend([ + '-DWITH_SPACK=YES', + '-DEXTERNAL_MODULES_BUILD=YES', + '-DUM_INSTALL_BREFIX=%s' % spec['mofem-users-modules'].prefix, + '-DEXTERNAL_MODULE_SOURCE_DIRS=%s' % source, + '-DSTAND_ALLONE_USERS_MODULES=%s' % + ('YES' if '+copy_user_modules' in spec else 'NO')]) + + # Set module version + if self.spec.version == Version('develop'): + options.extend([ + '-DFM_VERSION_MAJOR=%s' % 0, + '-DFM_VERSION_MINOR=%s' % 0, + '-DFM_VERSION_BUILD=%s' % 0]) + else: + options.extend([ + '-DFM_VERSION_MAJOR=%s' % self.spec.version[0], + '-DFM_VERSION_MINOR=%s' % self.spec.version[1], + '-DFM_VERSION_BUILD=%s' % self.spec.version[2]]) + + # build tests + options.append('-DMOFEM_UM_BUILD_TETS={0}'.format( + 'ON' if self.run_tests else 'OFF')) + + return options + + # This function is not needed to run code installed by extension, nor in + # the install process. However for users like to have access to source code + # to play and make with it. Having source code at hand one can compile in + # own build directory it in mofem-cephas view when the extension is + # activated. + @run_after('install') + def copy_source_code(self): + source = self.stage.source_path + prefix = self.prefix + install_tree(source, prefix.ext_users_modules.fracture_mechanics) diff --git a/var/spack/repos/builtin/packages/mofem-minimal-surface-equation/package.py b/var/spack/repos/builtin/packages/mofem-minimal-surface-equation/package.py new file mode 100644 index 0000000000..761fbc178a --- /dev/null +++ b/var/spack/repos/builtin/packages/mofem-minimal-surface-equation/package.py @@ -0,0 +1,95 @@ +############################################################################## +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class MofemMinimalSurfaceEquation(CMakePackage): + """mofem minimal surface equation""" + + homepage = "http://mofem.eng.gla.ac.uk" + url = "https://bitbucket.org/likask/mofem_um_minimal_surface_equation" + + maintainers = ['likask'] + + version('0.3.9', + git='https://bitbucket.org/likask/mofem_um_minimal_surface_equation', + tag='v0.3.9') + version('develop', + git='https://bitbucket.org/likask/mofem_um_minimal_surface_equation', + branch='develop') + + variant('copy_user_modules', default=True, + description='Copy user modules directory instead linking') + + extends('mofem-cephas') + depends_on("mofem-users-modules", type=('build', 'link', 'run')) + + # The CMakeLists.txt installed with mofem - cephas package set cmake + # environment to install extension from extension repository.It searches + # for modules in user provides paths, for example in Spack source path.Also + # it finds all cmake exported targets installed in lib directory, which are + # built with dependent extensions, f.e.mofem - users - modules or others if + # needed. + @property + def root_cmakelists_dir(self): + """The relative path to the directory containing CMakeLists.txt + + This path is relative to the root of the extracted tarball, + not to the ``build_directory``. Defaults to the current directory. + + :return: directory containing CMakeLists.txt + """ + spec = self.spec + return spec['mofem-cephas'].prefix.users_modules + + def cmake_args(self): + spec = self.spec + source = self.stage.source_path + + options = [] + + # obligatory options + options.extend([ + '-DWITH_SPACK=YES', + '-DEXTERNAL_MODULES_BUILD=YES', + '-DUM_INSTALL_BREFIX=%s' % spec['mofem-users-modules'].prefix, + '-DEXTERNAL_MODULE_SOURCE_DIRS=%s' % source, + '-DSTAND_ALLONE_USERS_MODULES=%s' % + ('YES' if '+copy_user_modules' in spec else 'NO')]) + + # build tests + options.append('-DMOFEM_UM_BUILD_TETS={0}'.format( + 'ON' if self.run_tests else 'OFF')) + + return options + + # This function is not needed to run code installed by extension, nor in + # the install process. However for users like to have access to source code + # to play and make with it. Having source code at hand one can compile in + # own build directory it in mofem-cephas view when the extension is + # activated. + @run_after('install') + def copy_source_code(self): + source = self.stage.source_path + prefix = self.prefix + install_tree(source, prefix.ext_users_modules.minimal_surface_equation) diff --git a/var/spack/repos/builtin/packages/mofem-users-modules/package.py b/var/spack/repos/builtin/packages/mofem-users-modules/package.py new file mode 100644 index 0000000000..acab4417d8 --- /dev/null +++ b/var/spack/repos/builtin/packages/mofem-users-modules/package.py @@ -0,0 +1,82 @@ +############################################################################## +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class MofemUsersModules(CMakePackage): + """MofemUsersModules creates installation environment for user-provided + modules and extends of mofem-cephas package. The CMakeList.txt file for + user modules is located in mofem-cephas/user_modules prefix. + MofemUsersModules itself does not contain any code (is a dummy with a + single dummy version). It provide sources location of users modules, i.e. + mofem-fracture-module. Those are kept as a stand-alone package (instead + of resources) as they have different versions and developers. One can + install the extension, f.e. spack installs extension spack install + mofem-fracture-module. Next, create a symlink to run the code, f.e. spack + view symlink um_view mofem-cephas, and activate the extension, i.e. spack + activate um_view mofem-minimal-surface-equation. Basic mofem + functionality is available when with spack install mofem-users-modules, + it provides simple examples for calculating elasticity problems, + magnetostatics, saturated and unsaturated flow and a couple more. For + more information how to work with Spack and MoFEM see + http://mofem.eng.gla.ac.uk/mofem/html/install_spack.html""" + + homepage = "http://mofem.eng.gla.ac.uk" + url = "https://bitbucket.org/likask/mofem-joseph/downloads/users_modules_dummy" + version('1.0', '5a8b22c9cdcad7bbad92b1590d55edb1', expand=False) + + maintainers = ['likask'] + + variant('copy_user_modules', default=True, + description='Copy user modules directory instead linking') + + extends('mofem-cephas') + + @property + def root_cmakelists_dir(self): + """The relative path to the directory containing CMakeLists.txt + + This path is relative to the root of the extracted tarball, + not to the ``build_directory``. Defaults to the current directory. + + :return: directory containing CMakeLists.txt + """ + spec = self.spec + return spec['mofem-cephas'].prefix.users_modules + + def cmake_args(self): + spec = self.spec + + options = [] + + # obligatory options + options.extend([ + '-DWITH_SPACK=YES', + '-DSTAND_ALLONE_USERS_MODULES=%s' % + ('YES' if '+copy_user_modules' in spec else 'NO')]) + + # build tests + options.append('-DMOFEM_UM_BUILD_TETS={0}'.format( + 'ON' if self.run_tests else 'OFF')) + + return options -- cgit v1.2.3-70-g09d2 From dcaa6759574ab511cc42cc99ea6ee62195225c53 Mon Sep 17 00:00:00 2001 From: Lukasz Date: Sun, 22 Jul 2018 22:32:47 +0100 Subject: add necessary dependence on lapacak, and fix ld_flags for blas (#8776) --- var/spack/repos/builtin/packages/moab/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/moab/package.py b/var/spack/repos/builtin/packages/moab/package.py index 89dc41d36c..ae1ef0c35a 100644 --- a/var/spack/repos/builtin/packages/moab/package.py +++ b/var/spack/repos/builtin/packages/moab/package.py @@ -80,6 +80,7 @@ class Moab(AutotoolsPackage): # depends_on('vtk', when='+vtk') depends_on('blas') + depends_on('lapack') depends_on('mpi', when='+mpi') depends_on('hdf5', when='+hdf5') depends_on('hdf5+mpi', when='+hdf5+mpi') @@ -124,7 +125,8 @@ class Moab(AutotoolsPackage): # else: # options.append('--without-mpi') - options.append('--with-blas=%s' % spec['blas'].libs) + options.append('--with-blas=%s' % spec['blas'].libs.ld_flags) + options.append('--with-lapack=%s' % spec['lapack'].libs.ld_flags) if '+hdf5' in spec: options.append('--with-hdf5=%s' % spec['hdf5'].prefix) -- cgit v1.2.3-70-g09d2 From 777a0fe5df4682a7f04b0c63e5cb7697ed4055f8 Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Sun, 22 Jul 2018 15:51:59 -0600 Subject: Make read only source file writeable in perl before patch to avoid failures on lustre filesystem. (#8764) --- var/spack/repos/builtin/packages/perl/package.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl/package.py b/var/spack/repos/builtin/packages/perl/package.py index 3e40c68349..ef69a88ad3 100644 --- a/var/spack/repos/builtin/packages/perl/package.py +++ b/var/spack/repos/builtin/packages/perl/package.py @@ -102,6 +102,18 @@ class Perl(Package): # Perl doesn't use Autotools, it should subclass Package phases = ['configure', 'build', 'install'] + # On a lustre filesystem, patch may fail when files + # aren't writeable so make pp.c user writeable + # before patching. This should probably walk the + # source and make everything writeable in the future. + def do_stage(self, mirror_only=False): + # Do Spack's regular stage + super(Perl, self).do_stage(mirror_only) + # Add write permissions on file to be patched + filename = join_path(self.stage.source_path, 'pp.c') + perm = os.stat(filename).st_mode + os.chmod(filename, perm | 0o200) + def configure_args(self): spec = self.spec prefix = self.prefix -- cgit v1.2.3-70-g09d2 From 2386ce4995d88266919d1f402f0e7d52df8f0215 Mon Sep 17 00:00:00 2001 From: "Nasr S. Hassanein" Date: Mon, 23 Jul 2018 00:54:06 +0300 Subject: Ncl update (#8747) * fix ncl url and hash * adding ncl version 6.5.0 * remove 6.5.0 * using github archive url --- var/spack/repos/builtin/packages/ncl/package.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ncl/package.py b/var/spack/repos/builtin/packages/ncl/package.py index 518bbf488e..573acb664c 100644 --- a/var/spack/repos/builtin/packages/ncl/package.py +++ b/var/spack/repos/builtin/packages/ncl/package.py @@ -37,15 +37,15 @@ class Ncl(Package): homepage = "https://www.ncl.ucar.edu" - version('6.4.0', 'a981848ddcaf1c263279648265f24766', - url='https://www.earthsystemgrid.org/download/fileDownload.html?logicalFileId=86b9bec2-fa01-11e6-a976-00c0f03d5b7c', - extension='tar.gz') + url = "https://github.com/NCAR/ncl/archive/6.4.0.tar.gz" - patch('spack_ncl.patch') + version('6.4.0', 'd891452cda7bb25afad9b6c876c73986') + + patch('spack_ncl.patch', when="@6.4.0") # Make ncl compile with hdf5 1.10 - patch('hdf5.patch') + patch('hdf5.patch', when="@6.4.0") # ymake-filter's buffer may overflow - patch('ymake-filter.patch') + patch('ymake-filter.patch', when="@6.4.0") # This installation script is implemented according to this manual: # http://www.ncl.ucar.edu/Download/build_from_src.shtml -- cgit v1.2.3-70-g09d2 From eecef8d4a7d4b35f5eb591da8c94cc85fa0d4dd4 Mon Sep 17 00:00:00 2001 From: g-mathias <40861554+g-mathias@users.noreply.github.com> Date: Mon, 23 Jul 2018 00:07:44 +0200 Subject: fix to build libmatheval with guile@2.0: (#8680) * fix to build libmatheval with guile@2.0: * fixed formatting issues * fixed formatting issues2 * fixed check for autoreconf and renaming of configure.in * fixed force_autoreconf * now patching configure, which is hopefully more robust * minimal patches for guile 2.0 and 2.2 (disabeling unit testing for libmatheval) * minimal patches for guile 2.0 and 2.2 (disabeling unit testing for libmatheval) --- .../builtin/packages/libmatheval/guile-2.0.patch | 197 +++++++++++++++++++++ .../builtin/packages/libmatheval/guile-2.2.patch | 20 +++ .../repos/builtin/packages/libmatheval/package.py | 7 + 3 files changed, 224 insertions(+) create mode 100644 var/spack/repos/builtin/packages/libmatheval/guile-2.0.patch create mode 100644 var/spack/repos/builtin/packages/libmatheval/guile-2.2.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libmatheval/guile-2.0.patch b/var/spack/repos/builtin/packages/libmatheval/guile-2.0.patch new file mode 100644 index 0000000000..18bacb44ca --- /dev/null +++ b/var/spack/repos/builtin/packages/libmatheval/guile-2.0.patch @@ -0,0 +1,197 @@ +--- libmatheval-1.1.11-v/configure 2018-07-13 11:16:19.115719477 +0200 ++++ libmatheval-1.1.11/configure 2018-07-13 11:33:07.914093005 +0200 +@@ -640,6 +640,7 @@ + GUILE_CFLAGS + GUILE_TOOLS + GUILE_CONFIG ++GUILE_EFFECTIVE_VERSION + GUILE + AUTOM4TE + YFLAGS +@@ -4831,21 +4832,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + # Check whether --with-gnu-ld was given. + if test "${with_gnu_ld+set}" = set; then : + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes +@@ -12267,8 +12253,9 @@ + break + fi + done ++# start patch + +- ++CPPFLAGS="$GUILE_CFLAGS -DSCM_ENABLE_DEPRECATED=0 $CPPFLAGS" + ac_fn_c_check_type "$LINENO" "scm_t_bits" "ac_cv_type_scm_t_bits" "#include + " + if test "x$ac_cv_type_scm_t_bits" = xyes; then : +@@ -12276,14 +12263,15 @@ + $as_echo "#define HAVE_SCM_T_BITS 1" >>confdefs.h + + fi +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for scm_c_define_gsubr in -lguile" >&5 +-$as_echo_n "checking for scm_c_define_gsubr in -lguile... " >&6; } +-if ${ac_cv_lib_guile_scm_c_define_gsubr+:} false; then : ++GUILE_EFFECTIVE_VERSION=2.0 ++as_ac_Lib=`$as_echo "ac_cv_lib_guile-$GUILE_EFFECTIVE_VERSION''_scm_c_define_gsubr" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for scm_c_define_gsubr in -lguile-$GUILE_EFFECTIVE_VERSION" >&5 ++$as_echo_n "checking for scm_c_define_gsubr in -lguile-$GUILE_EFFECTIVE_VERSION... " >&6; } ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lguile $GUILE_LDFLAGS $LIBS" ++LIBS="-lguile-$GUILE_EFFECTIVE_VERSION $GUILE_LDFLAGS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -12303,29 +12291,31 @@ + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_guile_scm_c_define_gsubr=yes ++ eval "$as_ac_Lib=yes" + else +- ac_cv_lib_guile_scm_c_define_gsubr=no ++ eval "$as_ac_Lib=no" + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_guile_scm_c_define_gsubr" >&5 +-$as_echo "$ac_cv_lib_guile_scm_c_define_gsubr" >&6; } +-if test "x$ac_cv_lib_guile_scm_c_define_gsubr" = xyes; then : ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + $as_echo "#define HAVE_SCM_C_DEFINE_GSUBR 1" >>confdefs.h + + fi + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for scm_make_gsubr in -lguile" >&5 +-$as_echo_n "checking for scm_make_gsubr in -lguile... " >&6; } +-if ${ac_cv_lib_guile_scm_make_gsubr+:} false; then : ++as_ac_Lib=`$as_echo "ac_cv_lib_guile-$GUILE_EFFECTIVE_VERSION''_scm_make_gsubr" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for scm_make_gsubr in -lguile-$GUILE_EFFECTIVE_VERSION" >&5 ++$as_echo_n "checking for scm_make_gsubr in -lguile-$GUILE_EFFECTIVE_VERSION... " >&6; } ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lguile $GUILE_LDFLAGS $LIBS" ++LIBS="-lguile-$GUILE_EFFECTIVE_VERSION $GUILE_LDFLAGS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -12345,29 +12335,31 @@ + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_guile_scm_make_gsubr=yes ++ eval "$as_ac_Lib=yes" + else +- ac_cv_lib_guile_scm_make_gsubr=no ++ eval "$as_ac_Lib=no" + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_guile_scm_make_gsubr" >&5 +-$as_echo "$ac_cv_lib_guile_scm_make_gsubr" >&6; } +-if test "x$ac_cv_lib_guile_scm_make_gsubr" = xyes; then : ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + $as_echo "#define HAVE_SCM_MAKE_GSUBR 1" >>confdefs.h + + fi + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for scm_num2dbl in -lguile" >&5 +-$as_echo_n "checking for scm_num2dbl in -lguile... " >&6; } +-if ${ac_cv_lib_guile_scm_num2dbl+:} false; then : ++as_ac_Lib=`$as_echo "ac_cv_lib_guile-$GUILE_EFFECTIVE_VERSION''_scm_num2dbl" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for scm_num2dbl in -lguile-$GUILE_EFFECTIVE_VERSION" >&5 ++$as_echo_n "checking for scm_num2dbl in -lguile-$GUILE_EFFECTIVE_VERSION... " >&6; } ++if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lguile $GUILE_LDFLAGS $LIBS" ++LIBS="-lguile-$GUILE_EFFECTIVE_VERSION $GUILE_LDFLAGS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -12387,22 +12379,25 @@ + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_guile_scm_num2dbl=yes ++ eval "$as_ac_Lib=yes" + else +- ac_cv_lib_guile_scm_num2dbl=no ++ eval "$as_ac_Lib=no" + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_guile_scm_num2dbl" >&5 +-$as_echo "$ac_cv_lib_guile_scm_num2dbl" >&6; } +-if test "x$ac_cv_lib_guile_scm_num2dbl" = xyes; then : ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + $as_echo "#define HAVE_SCM_NUM2DBL 1" >>confdefs.h + + fi + ++# end patch ++# end patch + + ac_config_files="$ac_config_files Makefile doc/Makefile lib/Makefile" + +--- libmatheval-1.1.11-v/tests/matheval.c.bak 2018-07-13 12:43:21.718862366 +0200 ++++ libmatheval-1.1.11/tests/matheval.c 2018-07-13 12:46:34.162597100 +0200 +@@ -51,7 +51,7 @@ + + /* Guile interface for libmatheval library. Procedures below are simple + * wrappers for corresponding libmatheval procedures. */ +-static scm_sizet evaluator_destroy_scm(SCM evaluator_smob); ++static size_t evaluator_destroy_scm(SCM evaluator_smob); + static SCM evaluator_create_scm(SCM string); + static SCM evaluator_evaluate_scm(SCM evaluator_smob, SCM count, + SCM names, SCM values); +@@ -122,7 +122,7 @@ + } + + /* Wrapper for evaluator_destroy() procedure from libmatheval library. */ +-static scm_sizet ++static size_t + evaluator_destroy_scm(SCM evaluator_smob) + { + SCM_ASSERT((SCM_NIMP(evaluator_smob) diff --git a/var/spack/repos/builtin/packages/libmatheval/guile-2.2.patch b/var/spack/repos/builtin/packages/libmatheval/guile-2.2.patch new file mode 100644 index 0000000000..394f9ebdef --- /dev/null +++ b/var/spack/repos/builtin/packages/libmatheval/guile-2.2.patch @@ -0,0 +1,20 @@ +--- libmatheval-1.1.11/Makefile.in.orig 2018-07-13 17:42:03.426339145 +0200 ++++ libmatheval-1.1.11/Makefile.in 2018-07-13 17:42:24.190310979 +0200 +@@ -316,7 +316,7 @@ + MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in \ + config.log config.status stamp-h.in $(AUX_DIST) + +-SUBDIRS = doc lib tests ++SUBDIRS = doc lib + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libmatheval.pc + all: config.h +@@ -863,7 +863,7 @@ + .PHONY: beauty dist-hook + + beauty: +- -for dir in lib tests; do cd $$dir; $(MAKE) $@; cd ..; done ++ -for dir in lib ; do cd $$dir; $(MAKE) $@; cd ..; done + + dist-hook: + for file in $(AUX_DIST); do \ diff --git a/var/spack/repos/builtin/packages/libmatheval/package.py b/var/spack/repos/builtin/packages/libmatheval/package.py index 3b9acc92a8..223f6b4a8e 100644 --- a/var/spack/repos/builtin/packages/libmatheval/package.py +++ b/var/spack/repos/builtin/packages/libmatheval/package.py @@ -40,3 +40,10 @@ class Libmatheval(AutotoolsPackage): # Only needed for unit tests, but configure crashes without it depends_on('guile', type='build') + + # guile 2.0 provides a deprecated interface for the unit test using guile + patch('guile-2.0.patch', when='^guile@2.0') + + # guile 2.2 does not support deprecated functions any longer + # the patch skips the unit tests + patch('guile-2.2.patch', when='^guile@2.2:') -- cgit v1.2.3-70-g09d2 From 8a35687d31b0c62675e0ed40cf121a4ee44b6adf Mon Sep 17 00:00:00 2001 From: Roberto Villegas-Díaz Date: Sun, 22 Jul 2018 17:11:37 -0500 Subject: Augustus updated to version 3.3.1 (#8588) * Augustus updated to version 3.3.1 * Augustus - Version-specific URLs replaced by list_url * Augustus - Adding tool versions back --- var/spack/repos/builtin/packages/augustus/package.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/augustus/package.py b/var/spack/repos/builtin/packages/augustus/package.py index ef6e3d042a..6343832462 100644 --- a/var/spack/repos/builtin/packages/augustus/package.py +++ b/var/spack/repos/builtin/packages/augustus/package.py @@ -30,12 +30,12 @@ class Augustus(MakefilePackage): genomic sequences""" homepage = "http://bioinf.uni-greifswald.de/augustus/" - url = "http://bioinf.uni-greifswald.de/augustus/binaries/augustus-3.3.tar.gz" + url = "http://bioinf.uni-greifswald.de/augustus/binaries/augustus-3.3.1.tar.gz" + list_url = "http://bioinf.uni-greifswald.de/augustus/binaries/old" - version('3.3', '93691d9aafc7d3d0e1adf31ec308507f', - url='http://bioinf.uni-greifswald.de/augustus/binaries/augustus-3.3.tar.gz') - version('3.2.3', 'b8c47ea8d0c45aa7bb9a82626c8ff830', - url='http://bioinf.uni-greifswald.de/augustus/binaries/old/augustus-3.2.3.tar.gz') + version('3.3.1', '8363ece221c799eb169f47e545efb951') + version('3.3', '93691d9aafc7d3d0e1adf31ec308507f') + version('3.2.3', 'b8c47ea8d0c45aa7bb9a82626c8ff830') depends_on('bamtools') depends_on('gsl') -- cgit v1.2.3-70-g09d2 From 8b890db50ffc15f46583d134af942e6479c87cec Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Sun, 22 Jul 2018 17:16:43 -0500 Subject: libbeagle: add java dependency so jni hooks get built (#8524) * libbeagle: add java dependency so jni hooks get built * libbeagle: set BEAST_LIB instead of LD_LIBRARY_PATH * libbeagle: use BEAST_LIB --- var/spack/repos/builtin/packages/libbeagle/package.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libbeagle/package.py b/var/spack/repos/builtin/packages/libbeagle/package.py index 4809bf2423..1678e01939 100644 --- a/var/spack/repos/builtin/packages/libbeagle/package.py +++ b/var/spack/repos/builtin/packages/libbeagle/package.py @@ -41,7 +41,12 @@ class Libbeagle(AutotoolsPackage): depends_on('subversion', type='build') depends_on('pkgconfig', type='build') + depends_on('java', type='build') def url_for_version(self, version): url = "https://github.com/beagle-dev/beagle-lib/archive/beagle_release_{0}.tar.gz" return url.format(version.underscored) + + def setup_environment(self, spack_env, run_env): + prefix = self.prefix + run_env.prepend_path('BEAST_LIB', prefix.lib) -- cgit v1.2.3-70-g09d2 From 5acdc2e3353467a1151c84982ce4a34f3eb5802b Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Sun, 22 Jul 2018 17:17:03 -0500 Subject: beast1: add libbeagle support (#8525) --- var/spack/repos/builtin/packages/beast1/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/beast1/package.py b/var/spack/repos/builtin/packages/beast1/package.py index f80731f016..2d559f5ae0 100644 --- a/var/spack/repos/builtin/packages/beast1/package.py +++ b/var/spack/repos/builtin/packages/beast1/package.py @@ -36,7 +36,10 @@ class Beast1(Package): url='https://github.com/beast-dev/beast-mcmc/releases/download/v1.10.0/BEAST_v1.10.0.tgz') version('1.8.4', 'cb8752340c1f77a22d39ca4fe09687b0') + variant('beagle', default=True, description='Build with libbeagle support') + depends_on('java', type='run') + depends_on('libbeagle', type=('build', 'link', 'run'), when="+beagle") def setup_environment(self, spack_env, run_env): run_env.set('BEAST1', self.prefix) -- cgit v1.2.3-70-g09d2 From 0cef7b435596f8d283143f5466fddc25adbe292d Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Sun, 22 Jul 2018 17:17:44 -0500 Subject: Trinity plugins (#8516) * trinity: fix plugin installation * trinity: flake8 * trinity: more specific types for dependencies --- var/spack/repos/builtin/packages/trinity/package.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trinity/package.py b/var/spack/repos/builtin/packages/trinity/package.py index a4fc604a17..eab36f9ae4 100644 --- a/var/spack/repos/builtin/packages/trinity/package.py +++ b/var/spack/repos/builtin/packages/trinity/package.py @@ -44,14 +44,18 @@ class Trinity(MakefilePackage): version('2.6.6', 'b7472e98ab36655a6d9296d965471a56') - depends_on("java@8:") + depends_on("java@8:", type=("build", "run")) depends_on("bowtie2") depends_on("jellyfish") depends_on("salmon") - depends_on("perl+threads") + depends_on("perl+threads", type=("build", "run")) + depends_on("autoconf", type="build") + depends_on("automake", type="build") + depends_on("libtool", type="build") def build(self, spec, prefix): - make + make() + make("trinity_essentials") make("plugins") def install(self, spec, prefix): @@ -73,3 +77,4 @@ class Trinity(MakefilePackage): def setup_environment(self, spack_env, run_env): run_env.set('TRINITY_HOME', self.prefix.bin) + spack_env.append_flags('CXXFLAGS', self.compiler.openmp_flag) -- cgit v1.2.3-70-g09d2 From bd3ffc7b76f4eda034765d1eadf507614f0ec098 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Sun, 22 Jul 2018 17:54:15 -0700 Subject: core: use sha256 instead of md5 for `spack checksum` and `spack create` - This changes `get_checksums_for_versions` to generate code that uses an explicit `sha256` argument instead if the bare `md5` hash we used to generate. - also use a generic digest parameter for the `version` directive, rather than a specific `md5` parameter. --- lib/spack/spack/directives.py | 15 ++--- lib/spack/spack/fetch_strategy.py | 41 ++++++++----- lib/spack/spack/patch.py | 2 +- lib/spack/spack/test/url_fetch.py | 69 ++++++++++++++++++---- lib/spack/spack/util/web.py | 4 +- .../builtin.mock/packages/url-list-test/package.py | 14 ++--- 6 files changed, 102 insertions(+), 43 deletions(-) (limited to 'var') diff --git a/lib/spack/spack/directives.py b/lib/spack/spack/directives.py index 56490f8452..5137320e98 100644 --- a/lib/spack/spack/directives.py +++ b/lib/spack/spack/directives.py @@ -240,16 +240,17 @@ directive = DirectiveMeta.directive @directive('versions') def version(ver, checksum=None, **kwargs): - """Adds a version and metadata describing how to fetch it. - Metadata is just stored as a dict in the package's versions - dictionary. Package must turn it into a valid fetch strategy - later. + """Adds a version and metadata describing how to fetch its source code. + + Metadata is stored as a dict of ``kwargs`` in the package class's + ``versions`` dictionary. + + The ``dict`` of arguments is turned into a valid fetch strategy + later. See ``spack.fetch_strategy.for_package_version()``. """ def _execute_version(pkg): - # TODO: checksum vs md5 distinction is confusing -- fix this. - # special case checksum for backward compatibility if checksum: - kwargs['md5'] = checksum + kwargs['checksum'] = checksum # Store kwargs for the package to later with a fetch_strategy. pkg.versions[Version(ver)] = kwargs diff --git a/lib/spack/spack/fetch_strategy.py b/lib/spack/spack/fetch_strategy.py index 3a08deb754..8aa38a4c01 100644 --- a/lib/spack/spack/fetch_strategy.py +++ b/lib/spack/spack/fetch_strategy.py @@ -181,19 +181,18 @@ class URLFetchStrategy(FetchStrategy): enabled = True required_attributes = ['url'] - def __init__(self, url=None, digest=None, **kwargs): + def __init__(self, url=None, checksum=None, **kwargs): super(URLFetchStrategy, self).__init__() - # If URL or digest are provided in the kwargs, then prefer - # those values. - self.url = kwargs.get('url', None) - if not self.url: - self.url = url + # Prefer values in kwargs to the positionals. + self.url = kwargs.get('url', url) - self.digest = next((kwargs[h] for h in crypto.hashes if h in kwargs), - None) - if not self.digest: - self.digest = digest + # digest can be set as the first argument, or from an explicit + # kwarg by the hash name. + self.digest = kwargs.get('checksum', checksum) + for h in crypto.hashes: + if h in kwargs: + self.digest = kwargs[h] self.expand_archive = kwargs.get('expand', True) self.extra_curl_options = kwargs.get('curl_options', []) @@ -1009,15 +1008,25 @@ def from_list_url(pkg): try: versions = pkg.fetch_remote_versions() try: + # get a URL, and a checksum if we have it url_from_list = versions[pkg.version] - digest = None - if pkg.version in pkg.versions: - digest = pkg.versions[pkg.version].get('md5', None) - return URLFetchStrategy(url=url_from_list, digest=digest) + checksum = None + + # try to find a known checksum for version, from the package + version = pkg.version + if version in pkg.versions: + args = pkg.versions[version] + checksum = next( + (v for k, v in args.items() if k in crypto.hashes), + args.get('checksum')) + + # construct a fetcher + return URLFetchStrategy(url_from_list, checksum) except KeyError: - tty.msg("Can not find version %s in url_list" % - pkg.version) + tty.msg("Cannot find version %s in url_list" % pkg.version) + except BaseException: + # TODO: Don't catch BaseException here! Be more specific. tty.msg("Could not determine url from list_url.") diff --git a/lib/spack/spack/patch.py b/lib/spack/spack/patch.py index ffa94d964f..f1b6b1a88c 100644 --- a/lib/spack/spack/patch.py +++ b/lib/spack/spack/patch.py @@ -153,7 +153,7 @@ class UrlPatch(Patch): if self.archive_sha256: fetch_digest = self.archive_sha256 - fetcher = fs.URLFetchStrategy(self.url, digest=fetch_digest) + fetcher = fs.URLFetchStrategy(self.url, fetch_digest) mirror = os.path.join( os.path.dirname(stage.mirror_path), os.path.basename(self.url)) diff --git a/lib/spack/spack/test/url_fetch.py b/lib/spack/spack/test/url_fetch.py index 780b4bdf58..2e6e1912bf 100644 --- a/lib/spack/spack/test/url_fetch.py +++ b/lib/spack/spack/test/url_fetch.py @@ -83,16 +83,65 @@ def test_fetch( def test_from_list_url(mock_packages, config): pkg = spack.repo.get('url-list-test') - for ver_str in ['0.0.0', '1.0.0', '2.0.0', - '3.0', '4.5', '2.0.0b2', - '3.0a1', '4.5-rc5']: - spec = Spec('url-list-test@%s' % ver_str) - spec.concretize() - pkg.spec = spec - fetch_strategy = from_list_url(pkg) - assert isinstance(fetch_strategy, URLFetchStrategy) - assert (os.path.basename(fetch_strategy.url) == - ('foo-' + ver_str + '.tar.gz')) + + # These URLs are all in the url-list-test package and should have + # checksums taken from the package. + spec = Spec('url-list-test @0.0.0').concretized() + pkg = spack.repo.get(spec) + fetch_strategy = from_list_url(pkg) + assert isinstance(fetch_strategy, URLFetchStrategy) + assert os.path.basename(fetch_strategy.url) == 'foo-0.0.0.tar.gz' + assert fetch_strategy.digest == 'abc000' + + spec = Spec('url-list-test @1.0.0').concretized() + pkg = spack.repo.get(spec) + fetch_strategy = from_list_url(pkg) + assert isinstance(fetch_strategy, URLFetchStrategy) + assert os.path.basename(fetch_strategy.url) == 'foo-1.0.0.tar.gz' + assert fetch_strategy.digest == 'abc100' + + spec = Spec('url-list-test @3.0').concretized() + pkg = spack.repo.get(spec) + fetch_strategy = from_list_url(pkg) + assert isinstance(fetch_strategy, URLFetchStrategy) + assert os.path.basename(fetch_strategy.url) == 'foo-3.0.tar.gz' + assert fetch_strategy.digest == 'abc30' + + spec = Spec('url-list-test @4.5').concretized() + pkg = spack.repo.get(spec) + fetch_strategy = from_list_url(pkg) + assert isinstance(fetch_strategy, URLFetchStrategy) + assert os.path.basename(fetch_strategy.url) == 'foo-4.5.tar.gz' + assert fetch_strategy.digest == 'abc45' + + spec = Spec('url-list-test @2.0.0b2').concretized() + pkg = spack.repo.get(spec) + fetch_strategy = from_list_url(pkg) + assert isinstance(fetch_strategy, URLFetchStrategy) + assert os.path.basename(fetch_strategy.url) == 'foo-2.0.0b2.tar.gz' + assert fetch_strategy.digest == 'abc200b2' + + spec = Spec('url-list-test @3.0a1').concretized() + pkg = spack.repo.get(spec) + fetch_strategy = from_list_url(pkg) + assert isinstance(fetch_strategy, URLFetchStrategy) + assert os.path.basename(fetch_strategy.url) == 'foo-3.0a1.tar.gz' + assert fetch_strategy.digest == 'abc30a1' + + spec = Spec('url-list-test @4.5-rc5').concretized() + pkg = spack.repo.get(spec) + fetch_strategy = from_list_url(pkg) + assert isinstance(fetch_strategy, URLFetchStrategy) + assert os.path.basename(fetch_strategy.url) == 'foo-4.5-rc5.tar.gz' + assert fetch_strategy.digest == 'abc45rc5' + + # this one is not in the url-list-test package. + spec = Spec('url-list-test @2.0.0').concretized() + pkg = spack.repo.get(spec) + fetch_strategy = from_list_url(pkg) + assert isinstance(fetch_strategy, URLFetchStrategy) + assert os.path.basename(fetch_strategy.url) == 'foo-2.0.0.tar.gz' + assert fetch_strategy.digest is None def test_hash_detection(checksum_type): diff --git a/lib/spack/spack/util/web.py b/lib/spack/spack/util/web.py index b9f94fcc35..9777859fa8 100644 --- a/lib/spack/spack/util/web.py +++ b/lib/spack/spack/util/web.py @@ -404,7 +404,7 @@ def get_checksums_for_versions( # Checksum the archive and add it to the list version_hashes.append((version, spack.util.crypto.checksum( - hashlib.md5, stage.archive_file))) + hashlib.sha256, stage.archive_file))) i += 1 except spack.stage.FailedDownloadError: tty.msg("Failed to fetch {0}".format(url)) @@ -420,7 +420,7 @@ def get_checksums_for_versions( # Generate the version directives to put in a package.py version_lines = "\n".join([ - " version('{0}', {1}'{2}')".format( + " version('{0}', {1}sha256='{2}')".format( v, ' ' * (max_len - len(str(v))), h) for v, h in version_hashes ]) diff --git a/var/spack/repos/builtin.mock/packages/url-list-test/package.py b/var/spack/repos/builtin.mock/packages/url-list-test/package.py index fff04d7a9e..2adb06272a 100644 --- a/var/spack/repos/builtin.mock/packages/url-list-test/package.py +++ b/var/spack/repos/builtin.mock/packages/url-list-test/package.py @@ -37,13 +37,13 @@ class UrlListTest(Package): list_url = 'file://' + web_data_path + '/index.html' list_depth = 3 - version('0.0.0') - version('1.0.0') - version('3.0') - version('4.5') - version('2.0.0b2') - version('3.0a1') - version('4.5-rc5') + version('0.0.0', 'abc000') + version('1.0.0', 'abc100') + version('3.0', 'abc30') + version('4.5', 'abc45') + version('2.0.0b2', 'abc200b2') + version('3.0a1', 'abc30a1') + version('4.5-rc5', 'abc45rc5') def install(self, spec, prefix): pass -- cgit v1.2.3-70-g09d2 From e2e8108dc4ca8210f1526ce68db59d633d53f66e Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Sun, 22 Jul 2018 23:36:05 -0700 Subject: packages: do not use generic checksum= in version() directives - This is very old usage -- preparing to deprecate this in favor of being explicit about checksums. --- var/spack/repos/builtin/packages/bohrium/package.py | 2 +- var/spack/repos/builtin/packages/zsh/package.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bohrium/package.py b/var/spack/repos/builtin/packages/bohrium/package.py index 445802118f..56f9acabb8 100644 --- a/var/spack/repos/builtin/packages/bohrium/package.py +++ b/var/spack/repos/builtin/packages/bohrium/package.py @@ -41,7 +41,7 @@ class Bohrium(CMakePackage, CudaPackage): # version("develop", git="https://github.com/bh107/bohrium.git", branch="master") - version('0.9.0', checksum="6f6379f1555de5a6a19138beac891a470df7df1fc9594e2b9404cf01b6e17d93") + version('0.9.0', sha256="6f6379f1555de5a6a19138beac891a470df7df1fc9594e2b9404cf01b6e17d93") # # Variants diff --git a/var/spack/repos/builtin/packages/zsh/package.py b/var/spack/repos/builtin/packages/zsh/package.py index 3fd012c7ec..6b0041573c 100644 --- a/var/spack/repos/builtin/packages/zsh/package.py +++ b/var/spack/repos/builtin/packages/zsh/package.py @@ -34,9 +34,9 @@ class Zsh(AutotoolsPackage): homepage = "http://www.zsh.org" url = "http://downloads.sourceforge.net/project/zsh/zsh/5.4.2/zsh-5.4.2.tar.gz" - version('5.4.2', checksum='dfe156fd69b0d8d1745ecf6d6e02e047') - version('5.3.1', checksum='d583fbca0c2410bf9542ce8a651c26ca') - version('5.1.1', checksum='8ba28a9ef82e40c3a271602f18343b2f') + version('5.4.2', sha256='957bcdb2c57f64c02f673693ea5a7518ef24b6557aeb3a4ce222cefa6d74acc9') + version('5.3.1', sha256='3d94a590ff3c562ecf387da78ac356d6bea79b050a9ef81e3ecb9f8ee513040e') + version('5.1.1', sha256='94ed5b412023761bc8d2f03c173f13d625e06e5d6f0dff2c7a6e140c3fa55087') # Testing for terminal related things causes failures in e.g. Jenkins. # See e.g. https://www.zsh.org/mla/users/2003/msg00845.html, -- cgit v1.2.3-70-g09d2 From b0499cf45e85eea054bf79d1d185a619a52e553e Mon Sep 17 00:00:00 2001 From: sknigh Date: Wed, 25 Jul 2018 21:54:09 -0700 Subject: Added latest version of charliecloud (#8792) --- var/spack/repos/builtin/packages/charliecloud/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/charliecloud/package.py b/var/spack/repos/builtin/packages/charliecloud/package.py index 70d538af28..032684fbb0 100644 --- a/var/spack/repos/builtin/packages/charliecloud/package.py +++ b/var/spack/repos/builtin/packages/charliecloud/package.py @@ -31,6 +31,7 @@ class Charliecloud(MakefilePackage): homepage = "https://hpc.github.io/charliecloud" url = "https://github.com/hpc/charliecloud/archive/v0.2.4.tar.gz" + version('0.9.0', sha256='7e74cb16e31fd9d502198f7509bab14d1049ec68ba90b15e277e76f805db9458') version('0.2.4', 'b112de661c2c360174b42c99022c1967') @property -- cgit v1.2.3-70-g09d2 From f59666587bf0eb853fc1b47576a71d3f4c20ec3c Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Wed, 25 Jul 2018 15:31:35 -0500 Subject: hypre: 'master' is branch - not a tag --- var/spack/repos/builtin/packages/hypre/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hypre/package.py b/var/spack/repos/builtin/packages/hypre/package.py index 4f60b84427..a6020464f6 100644 --- a/var/spack/repos/builtin/packages/hypre/package.py +++ b/var/spack/repos/builtin/packages/hypre/package.py @@ -42,7 +42,7 @@ class Hypre(Package): version('2.11.1', '3f02ef8fd679239a6723f60b7f796519') version('2.10.1', 'dc048c4cabb3cd549af72591474ad674') version('2.10.0b', '768be38793a35bb5d055905b271f5b8e') - version('develop', git='https://github.com/LLNL/hypre', tag='master') + version('develop', git='https://github.com/LLNL/hypre', branch='master') version('xsdk-0.2.0', git='https://github.com/LLNL/hypre', tag='xsdk-0.2.0') # hypre does not know how to build shared libraries on Darwin -- cgit v1.2.3-70-g09d2 From 498d8cf04b6c932d8c224c7b3b9f696fd7dd3e27 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Wed, 18 Jul 2018 20:10:46 -0700 Subject: core: fixes and tests for handling of fetcher attributes in packages - Packages can remove the top-level `url` attribute and still work - These are now legal: - Packages with *only* version-specific URLs (even with gaps) - Packages with a top-level git/hg/svn attribute and `version` directives for that. - If a package has both a top-level hg/git/svn attribute AND a top-level url attribute, the url attribute takes precedence. --- lib/spack/spack/fetch_strategy.py | 24 ++++- lib/spack/spack/package.py | 76 +++++++++----- lib/spack/spack/test/packages.py | 114 ++++++++++++++++++--- .../packages/git-and-url-top-level/package.py | 38 +++++++ .../builtin.mock/packages/git-top-level/package.py | 36 +++++++ .../builtin.mock/packages/hg-top-level/package.py | 36 +++++++ .../builtin.mock/packages/svn-top-level/package.py | 35 +++++++ .../url-only-override-with-gaps/package.py | 37 +++++++ .../packages/url-only-override/package.py | 33 ++++++ 9 files changed, 389 insertions(+), 40 deletions(-) create mode 100644 var/spack/repos/builtin.mock/packages/git-and-url-top-level/package.py create mode 100644 var/spack/repos/builtin.mock/packages/git-top-level/package.py create mode 100644 var/spack/repos/builtin.mock/packages/hg-top-level/package.py create mode 100644 var/spack/repos/builtin.mock/packages/svn-top-level/package.py create mode 100644 var/spack/repos/builtin.mock/packages/url-only-override-with-gaps/package.py create mode 100644 var/spack/repos/builtin.mock/packages/url-only-override/package.py (limited to 'var') diff --git a/lib/spack/spack/fetch_strategy.py b/lib/spack/spack/fetch_strategy.py index 8aa38a4c01..a497342379 100644 --- a/lib/spack/spack/fetch_strategy.py +++ b/lib/spack/spack/fetch_strategy.py @@ -971,9 +971,18 @@ def args_are_for(args, fetcher): def for_package_version(pkg, version): """Determine a fetch strategy based on the arguments supplied to version() in the package description.""" - # If it's not a known version, extrapolate one. + if not isinstance(version, Version): + version = Version(version) + + # If it's not a known version, extrapolate one by URL. if version not in pkg.versions: - url = pkg.url_for_version(version) + try: + url = pkg.url_for_version(version) + except spack.package.NoURLError: + msg = ("Can't extrapolate a URL for version %s " + "because package %s defines no URLs") + raise ExtrapolationError(msg % (version, pkg.name)) + if not url: raise InvalidArgsError(pkg, version) return URLFetchStrategy(url) @@ -987,10 +996,11 @@ def for_package_version(pkg, version): return fetcher(**args) # If nothing matched for a *specific* version, test all strategies - # against + # against attributes in the version directives and on the package for fetcher in all_strategies: - attrs = dict((attr, getattr(pkg, attr, None)) - for attr in fetcher.required_attributes) + attrs = dict((attr, getattr(pkg, attr)) + for attr in fetcher.required_attributes + if hasattr(pkg, attr)) if 'url' in attrs: attrs['url'] = pkg.url_for_version(version) attrs.update(args) @@ -1080,6 +1090,10 @@ class NoDigestError(FetchError): """Raised after attempt to checksum when URL has no digest.""" +class ExtrapolationError(FetchError): + """Raised when we can't extrapolate a version for a package.""" + + class InvalidArgsError(FetchError): def __init__(self, pkg, version): msg = ("Could not construct a fetch strategy for package %s at " diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py index 8d6b2b99f5..22d986a6d5 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -45,6 +45,7 @@ import time from six import StringIO from six import string_types from six import with_metaclass +from ordereddict_backport import OrderedDict import llnl.util.tty as tty @@ -487,13 +488,6 @@ class PackageBase(with_metaclass(PackageMeta, PackageViewMixin, object)): except ValueError as e: raise ValueError("In package %s: %s" % (self.name, e.message)) - # stage used to build this package. - self._stage = None - - # Init fetch strategy and url to None - self._fetcher = None - self.url = getattr(self.__class__, 'url', None) - # Set a default list URL (place to find available versions) if not hasattr(self, 'list_url'): self.list_url = None @@ -501,15 +495,17 @@ class PackageBase(with_metaclass(PackageMeta, PackageViewMixin, object)): if not hasattr(self, 'list_depth'): self.list_depth = 0 - # Set up some internal variables for timing. + # init internal variables + self._stage = None + self._fetcher = None + + # Set up timing variables self._fetch_time = 0.0 self._total_time = 0.0 if self.is_extension: spack.repo.get(self.extendee_spec)._check_extendable() - self.extra_args = {} - super(PackageBase, self).__init__() def possible_dependencies( @@ -577,17 +573,46 @@ class PackageBase(with_metaclass(PackageMeta, PackageViewMixin, object)): @memoized def version_urls(self): - """Return a list of URLs for different versions of this - package, sorted by version. A version's URL only appears - in this list if it has an explicitly defined URL.""" - version_urls = {} - for v in sorted(self.versions): - args = self.versions[v] + """OrderedDict of explicitly defined URLs for versions of this package. + + Return: + An OrderedDict (version -> URL) different versions of this + package, sorted by version. + + A version's URL only appears in the result if it has an an + explicitly defined ``url`` argument. So, this list may be empty + if a package only defines ``url`` at the top level. + """ + version_urls = OrderedDict() + for v, args in sorted(self.versions.items()): if 'url' in args: version_urls[v] = args['url'] return version_urls - # TODO: move this out of here and into some URL extrapolation module? + def nearest_url(self, version): + """Finds the URL with the "closest" version to ``version``. + + This uses the following precedence order: + + 1. Find the next lowest or equal version with a URL. + 2. If no lower URL, return the next *higher* URL. + 3. If no higher URL, return None. + + """ + version_urls = self.version_urls() + + if version in version_urls: + return version_urls[version] + + last_url = None + for v, u in self.version_urls().items(): + if v > version: + if last_url: + return last_url + last_url = u + + return last_url + def url_for_version(self, version): """Returns a URL from which the specified version of this package may be downloaded. @@ -600,17 +625,22 @@ class PackageBase(with_metaclass(PackageMeta, PackageViewMixin, object)): if not isinstance(version, Version): version = Version(version) - cls = self.__class__ - if not (hasattr(cls, 'url') or self.version_urls()): - raise NoURLError(cls) - # If we have a specific URL for this version, don't extrapolate. version_urls = self.version_urls() if version in version_urls: return version_urls[version] - # If we have no idea, substitute the version into the default URL. - default_url = getattr(self.__class__, 'url', None) + # If no specific URL, use the default, class-level URL + default_url = getattr(self, 'url', None) + + # if no exact match AND no class-level default, use the nearest URL + if not default_url: + default_url = self.nearest_url(version) + + # if there are NO URLs to go by, then we can't do anything + if not default_url: + raise NoURLError(self.__class__) + return spack.url.substitute_version( default_url, self.url_version(version)) diff --git a/lib/spack/spack/test/packages.py b/lib/spack/spack/test/packages.py index 8f9838ce78..da46283593 100644 --- a/lib/spack/spack/test/packages.py +++ b/lib/spack/spack/test/packages.py @@ -26,6 +26,7 @@ import os.path import pytest import spack.repo +import spack.fetch_strategy from spack.paths import mock_packages_path from spack.util.naming import mod_to_class from spack.spec import Spec @@ -166,17 +167,106 @@ class TestPackage(object): import spack.pkg.builtin.mock as m # noqa from spack.pkg.builtin import mock # noqa - @pytest.mark.regression('2737') - def test_urls_for_versions(self): - # Checks that a version directive without a 'url' argument - # specified uses the default url - for spec_str in ('url_override@0.9.0', 'url_override@1.0.0'): - s = Spec(spec_str).concretized() - url = s.package.url_for_version('0.9.0') - assert url == 'http://www.anothersite.org/uo-0.9.0.tgz' - url = s.package.url_for_version('1.0.0') - assert url == 'http://www.doesnotexist.org/url_override-1.0.0.tar.gz' +@pytest.mark.regression('2737') +def test_urls_for_versions(mock_packages, config): + """Version directive without a 'url' argument should use default url.""" + for spec_str in ('url_override@0.9.0', 'url_override@1.0.0'): + s = Spec(spec_str).concretized() + url = s.package.url_for_version('0.9.0') + assert url == 'http://www.anothersite.org/uo-0.9.0.tgz' - url = s.package.url_for_version('0.8.1') - assert url == 'http://www.doesnotexist.org/url_override-0.8.1.tar.gz' + url = s.package.url_for_version('1.0.0') + assert url == 'http://www.doesnotexist.org/url_override-1.0.0.tar.gz' + + url = s.package.url_for_version('0.8.1') + assert url == 'http://www.doesnotexist.org/url_override-0.8.1.tar.gz' + + +def test_url_for_version_with_no_urls(): + pkg = spack.repo.get('git-test') + with pytest.raises(spack.package.NoURLError): + pkg.url_for_version('1.0') + + with pytest.raises(spack.package.NoURLError): + pkg.url_for_version('1.1') + + +def test_url_for_version_with_only_overrides(mock_packages, config): + spec = Spec('url-only-override') + spec.concretize() + + pkg = spack.repo.get(spec) + + # these exist and should just take the URL provided in the package + assert pkg.url_for_version('1.0.0') == 'http://a.example.com/url_override-1.0.0.tar.gz' + assert pkg.url_for_version('0.9.0') == 'http://b.example.com/url_override-0.9.0.tar.gz' + assert pkg.url_for_version('0.8.1') == 'http://c.example.com/url_override-0.8.1.tar.gz' + + # these don't exist but should still work, even if there are only overrides + assert pkg.url_for_version('1.0.5') == 'http://a.example.com/url_override-1.0.5.tar.gz' + assert pkg.url_for_version('0.9.5') == 'http://b.example.com/url_override-0.9.5.tar.gz' + assert pkg.url_for_version('0.8.5') == 'http://c.example.com/url_override-0.8.5.tar.gz' + assert pkg.url_for_version('0.7.0') == 'http://c.example.com/url_override-0.7.0.tar.gz' + + +def test_url_for_version_with_only_overrides_with_gaps(mock_packages, config): + spec = Spec('url-only-override-with-gaps') + spec.concretize() + + pkg = spack.repo.get(spec) + + # same as for url-only-override -- these are specific + assert pkg.url_for_version('1.0.0') == 'http://a.example.com/url_override-1.0.0.tar.gz' + assert pkg.url_for_version('0.9.0') == 'http://b.example.com/url_override-0.9.0.tar.gz' + assert pkg.url_for_version('0.8.1') == 'http://c.example.com/url_override-0.8.1.tar.gz' + + # these don't have specific URLs, but should still work by extrapolation + assert pkg.url_for_version('1.0.5') == 'http://a.example.com/url_override-1.0.5.tar.gz' + assert pkg.url_for_version('0.9.5') == 'http://b.example.com/url_override-0.9.5.tar.gz' + assert pkg.url_for_version('0.8.5') == 'http://c.example.com/url_override-0.8.5.tar.gz' + assert pkg.url_for_version('0.7.0') == 'http://c.example.com/url_override-0.7.0.tar.gz' + + +def test_git_top_level(mock_packages, config): + """Ensure that top-level git attribute can be used as a default.""" + pkg = spack.repo.get('git-top-level') + + fetcher = spack.fetch_strategy.for_package_version(pkg, '1.0') + assert isinstance(fetcher, spack.fetch_strategy.GitFetchStrategy) + assert fetcher.url == 'https://example.com/some/git/repo' + + +def test_svn_top_level(mock_packages, config): + """Ensure that top-level svn attribute can be used as a default.""" + pkg = spack.repo.get('svn-top-level') + + fetcher = spack.fetch_strategy.for_package_version(pkg, '1.0') + assert isinstance(fetcher, spack.fetch_strategy.SvnFetchStrategy) + assert fetcher.url == 'https://example.com/some/svn/repo' + + +def test_hg_top_level(mock_packages, config): + """Ensure that top-level hg attribute can be used as a default.""" + pkg = spack.repo.get('hg-top-level') + + fetcher = spack.fetch_strategy.for_package_version(pkg, '1.0') + assert isinstance(fetcher, spack.fetch_strategy.HgFetchStrategy) + assert fetcher.url == 'https://example.com/some/hg/repo' + + +def test_no_extrapolate_without_url(mock_packages, config): + """Verify that we can't extrapolate versions for non-URL packages.""" + pkg = spack.repo.get('git-top-level') + + with pytest.raises(spack.fetch_strategy.ExtrapolationError): + spack.fetch_strategy.for_package_version(pkg, '1.1') + + +def test_git_and_url_top_level(mock_packages, config): + """Verify that URL takes precedence over other top-level attributes.""" + pkg = spack.repo.get('git-and-url-top-level') + + fetcher = spack.fetch_strategy.for_package_version(pkg, '2.0') + assert isinstance(fetcher, spack.fetch_strategy.URLFetchStrategy) + assert fetcher.url == 'https://example.com/some/tarball-2.0.tar.gz' diff --git a/var/spack/repos/builtin.mock/packages/git-and-url-top-level/package.py b/var/spack/repos/builtin.mock/packages/git-and-url-top-level/package.py new file mode 100644 index 0000000000..d34c9d9b06 --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/git-and-url-top-level/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class GitAndUrlTopLevel(Package): + """Mock package that uses git for fetching.""" + homepage = "http://www.git-fetch-example.com" + + git = 'https://example.com/some/git/repo' + url = 'https://example.com/some/tarball-1.0.tar.gz' + + version('2.0') + + def install(self, spec, prefix): + pass diff --git a/var/spack/repos/builtin.mock/packages/git-top-level/package.py b/var/spack/repos/builtin.mock/packages/git-top-level/package.py new file mode 100644 index 0000000000..5c0be81101 --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/git-top-level/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class GitTopLevel(Package): + """Mock package that uses git for fetching.""" + homepage = "http://www.git-fetch-example.com" + + git = 'https://example.com/some/git/repo' + version('1.0') + + def install(self, spec, prefix): + pass diff --git a/var/spack/repos/builtin.mock/packages/hg-top-level/package.py b/var/spack/repos/builtin.mock/packages/hg-top-level/package.py new file mode 100644 index 0000000000..94a06cd38e --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/hg-top-level/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class HgTopLevel(Package): + """Test package that does fetching with mercurial.""" + homepage = "http://www.hg-fetch-example.com" + + hg = 'https://example.com/some/hg/repo' + version('1.0') + + def install(self, spec, prefix): + pass diff --git a/var/spack/repos/builtin.mock/packages/svn-top-level/package.py b/var/spack/repos/builtin.mock/packages/svn-top-level/package.py new file mode 100644 index 0000000000..3198b16435 --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/svn-top-level/package.py @@ -0,0 +1,35 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class SvnTopLevel(Package): + """Mock package that uses svn for fetching.""" + + svn = 'https://example.com/some/svn/repo' + version('1.0') + + def install(self, spec, prefix): + pass diff --git a/var/spack/repos/builtin.mock/packages/url-only-override-with-gaps/package.py b/var/spack/repos/builtin.mock/packages/url-only-override-with-gaps/package.py new file mode 100644 index 0000000000..8bcbb386bd --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/url-only-override-with-gaps/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class UrlOnlyOverrideWithGaps(Package): + homepage = 'http://www.example.com' + + version('1.0.5', 'abcdef0') + version('1.0.0', 'bcdef0a', url='http://a.example.com/url_override-1.0.0.tar.gz') + version('0.9.5', 'cdef0ab') + version('0.9.0', 'def0abc', url='http://b.example.com/url_override-0.9.0.tar.gz') + version('0.8.5', 'ef0abcd') + version('0.8.1', 'f0abcde', url='http://c.example.com/url_override-0.8.1.tar.gz') + version('0.7.0', '0abcdef') diff --git a/var/spack/repos/builtin.mock/packages/url-only-override/package.py b/var/spack/repos/builtin.mock/packages/url-only-override/package.py new file mode 100644 index 0000000000..76999fb21e --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/url-only-override/package.py @@ -0,0 +1,33 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class UrlOnlyOverride(Package): + homepage = 'http://www.example.com' + + version('1.0.0', 'cxyzab', url='http://a.example.com/url_override-1.0.0.tar.gz') + version('0.9.0', 'bcxyza', url='http://b.example.com/url_override-0.9.0.tar.gz') + version('0.8.1', 'cxyzab', url='http://c.example.com/url_override-0.8.1.tar.gz') -- cgit v1.2.3-70-g09d2 From 773cfe088fab98f7ca4451bb5cfcacbab48529a5 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Sun, 22 Jul 2018 13:49:01 -0700 Subject: core: differentiate package-level fetch URLs by args to `version()` - packagers can specify two top-level fetch URLs if one is `url` - e.g., `url` and `git` or `url` and `svn` - allow only one VCS fetcher so we can differentiate between URL and VCS. - also clean up fetcher logic and class structure --- lib/spack/spack/fetch_strategy.py | 192 ++++++++++++--------- lib/spack/spack/test/packages.py | 78 ++++++++- .../packages/git-and-url-top-level/package.py | 38 ---- .../packages/git-svn-top-level/package.py | 39 +++++ .../packages/git-url-svn-top-level/package.py | 40 +++++ .../packages/git-url-top-level/package.py | 53 ++++++ 6 files changed, 318 insertions(+), 122 deletions(-) delete mode 100644 var/spack/repos/builtin.mock/packages/git-and-url-top-level/package.py create mode 100644 var/spack/repos/builtin.mock/packages/git-svn-top-level/package.py create mode 100644 var/spack/repos/builtin.mock/packages/git-url-svn-top-level/package.py create mode 100644 var/spack/repos/builtin.mock/packages/git-url-top-level/package.py (limited to 'var') diff --git a/lib/spack/spack/fetch_strategy.py b/lib/spack/spack/fetch_strategy.py index 6a3ea6bfbc..3245f56482 100644 --- a/lib/spack/spack/fetch_strategy.py +++ b/lib/spack/spack/fetch_strategy.py @@ -56,7 +56,7 @@ import spack.error import spack.util.crypto as crypto import spack.util.pattern as pattern from spack.util.executable import which -from spack.util.string import comma_or, comma_and, quote +from spack.util.string import comma_and, quote from spack.version import Version, ver from spack.util.compression import decompressor_for, extension @@ -89,7 +89,15 @@ class FSMeta(type): class FetchStrategy(with_metaclass(FSMeta, object)): """Superclass of all fetch strategies.""" enabled = False # Non-abstract subclasses should be enabled. - required_attributes = None # Attributes required in version() args. + + #: The URL attribute must be specified either at the package class + #: level, or as a keyword argument to ``version()``. It is used to + #: distinguish fetchers for different versions in the package DSL. + url_attr = None + + #: Optional attributes can be used to distinguish fetchers when : + #: classes have multiple ``url_attrs`` at the top-level. + optional_attrs = [] # optional attributes in version() args. def __init__(self): # The stage is initialized late, so that fetch strategies can be @@ -156,7 +164,7 @@ class FetchStrategy(with_metaclass(FSMeta, object)): # arguments in packages. @classmethod def matches(cls, args): - return any(k in args for k in cls.required_attributes) + return cls.url_attr in args @pattern.composite(interface=FetchStrategy) @@ -179,7 +187,11 @@ class URLFetchStrategy(FetchStrategy): checks the archive against a checksum,and decompresses the archive. """ enabled = True - required_attributes = ['url'] + url_attr = 'url' + + # these are checksum types. The generic 'checksum' is deprecated for + # specific hash names, but we need it for backward compatibility + optional_attrs = list(crypto.hashes.keys()) + ['checksum'] def __init__(self, url=None, checksum=None, **kwargs): super(URLFetchStrategy, self).__init__() @@ -190,7 +202,7 @@ class URLFetchStrategy(FetchStrategy): # digest can be set as the first argument, or from an explicit # kwarg by the hash name. self.digest = kwargs.get('checksum', checksum) - for h in crypto.hashes: + for h in self.optional_attrs: if h in kwargs: self.digest = kwargs[h] @@ -419,9 +431,6 @@ class URLFetchStrategy(FetchStrategy): class CacheURLFetchStrategy(URLFetchStrategy): """The resource associated with a cache URL may be out of date.""" - def __init__(self, *args, **kwargs): - super(CacheURLFetchStrategy, self).__init__(*args, **kwargs) - @_needs_stage def fetch(self): path = re.sub('^file://', '', self.url) @@ -452,35 +461,38 @@ class CacheURLFetchStrategy(URLFetchStrategy): class VCSFetchStrategy(FetchStrategy): + """Superclass for version control system fetch strategies. + + Like all fetchers, VCS fetchers are identified by the attributes + passed to the ``version`` directive. The optional_attrs for a VCS + fetch strategy represent types of revisions, e.g. tags, branches, + commits, etc. + + The required attributes (git, svn, etc.) are used to specify the URL + and to distinguish a VCS fetch strategy from a URL fetch strategy. - def __init__(self, name, *rev_types, **kwargs): + """ + + def __init__(self, **kwargs): super(VCSFetchStrategy, self).__init__() - self.name = name # Set a URL based on the type of fetch strategy. - self.url = kwargs.get(name, None) + self.url = kwargs.get(self.url_attr, None) if not self.url: raise ValueError( - "%s requires %s argument." % (self.__class__, name)) - - # Ensure that there's only one of the rev_types - if sum(k in kwargs for k in rev_types) > 1: - raise ValueError( - "Supply only one of %s to fetch with %s" % ( - comma_or(rev_types), name - )) + "%s requires %s argument." % (self.__class__, self.url_attr)) - # Set attributes for each rev type. - for rt in rev_types: - setattr(self, rt, kwargs.get(rt, None)) + for attr in self.optional_attrs: + setattr(self, attr, kwargs.get(attr, None)) @_needs_stage def check(self): - tty.msg("No checksum needed when fetching with %s" % self.name) + tty.msg("No checksum needed when fetching with %s" % self.url_attr) @_needs_stage def expand(self): - tty.debug("Source fetched with %s is already expanded." % self.name) + tty.debug( + "Source fetched with %s is already expanded." % self.url_attr) @_needs_stage def archive(self, destination, **kwargs): @@ -517,15 +529,15 @@ class GoFetchStrategy(VCSFetchStrategy): Go get does not natively support versions, they can be faked with git """ enabled = True - required_attributes = ('go', ) + url_attr = 'go' def __init__(self, **kwargs): # Discards the keywords in kwargs that may conflict with the next # call to __init__ forwarded_args = copy.copy(kwargs) forwarded_args.pop('name', None) + super(GoFetchStrategy, self).__init__(**forwarded_args) - super(GoFetchStrategy, self).__init__('go', **forwarded_args) self._go = None @property @@ -583,16 +595,16 @@ class GitFetchStrategy(VCSFetchStrategy): * ``commit``: Particular commit hash in the repo """ enabled = True - required_attributes = ('git', ) + url_attr = 'git' + optional_attrs = ['tag', 'branch', 'commit'] def __init__(self, **kwargs): # Discards the keywords in kwargs that may conflict with the next call # to __init__ forwarded_args = copy.copy(kwargs) forwarded_args.pop('name', None) + super(GitFetchStrategy, self).__init__(**forwarded_args) - super(GitFetchStrategy, self).__init__( - 'git', 'tag', 'branch', 'commit', **forwarded_args) self._git = None self.submodules = kwargs.get('submodules', False) @@ -745,16 +757,16 @@ class SvnFetchStrategy(VCSFetchStrategy): revision='1641') """ enabled = True - required_attributes = ['svn'] + url_attr = 'svn' + optional_attrs = ['revision'] def __init__(self, **kwargs): # Discards the keywords in kwargs that may conflict with the next call # to __init__ forwarded_args = copy.copy(kwargs) forwarded_args.pop('name', None) + super(SvnFetchStrategy, self).__init__(**forwarded_args) - super(SvnFetchStrategy, self).__init__( - 'svn', 'revision', **forwarded_args) self._svn = None if self.revision is not None: self.revision = str(self.revision) @@ -845,16 +857,16 @@ class HgFetchStrategy(VCSFetchStrategy): * ``revision``: Particular revision, branch, or tag. """ enabled = True - required_attributes = ['hg'] + url_attr = 'hg' + optional_attrs = ['revision'] def __init__(self, **kwargs): # Discards the keywords in kwargs that may conflict with the next call # to __init__ forwarded_args = copy.copy(kwargs) forwarded_args.pop('name', None) + super(HgFetchStrategy, self).__init__(**forwarded_args) - super(HgFetchStrategy, self).__init__( - 'hg', 'revision', **forwarded_args) self._hg = None @property @@ -957,74 +969,88 @@ def from_kwargs(**kwargs): for fetcher in all_strategies: if fetcher.matches(kwargs): return fetcher(**kwargs) - # Raise an error in case we can't instantiate any known strategy - message = "Cannot instantiate any FetchStrategy" - long_message = message + " from the given arguments : {arguments}".format( - arguments=kwargs) - raise FetchError(message, long_message) + raise InvalidArgsError(**kwargs) -def args_are_for(args, fetcher): - fetcher.matches(args) +def check_pkg_attributes(pkg): + """Find ambiguous top-level fetch attributes in a package. -def check_attributes(pkg): - """Find ambiguous top-level fetch attributes in a package.""" - # a single package cannot have required attributes from multiple - # fetch strategies *unless* they are the same attribute. - conflicts = set( - sum([[a for a in s.required_attributes if hasattr(pkg, a)] - for s in all_strategies], - [])) + Currently this only ensures that two or more VCS fetch strategies are + not specified at once. + """ + # a single package cannot have URL attributes for multiple VCS fetch + # strategies *unless* they are the same attribute. + conflicts = set([s.url_attr for s in all_strategies + if hasattr(pkg, s.url_attr)]) + + # URL isn't a VCS fetch method. We can use it with a VCS method. + conflicts -= set(['url']) if len(conflicts) > 1: raise FetcherConflict( - 'Package %s cannot specify %s together. Must pick only one.' + 'Package %s cannot specify %s together. Pick at most one.' % (pkg.name, comma_and(quote(conflicts)))) +def _extrapolate(pkg, version): + """Create a fetcher from an extrapolated URL for this version.""" + try: + return URLFetchStrategy(pkg.url_for_version(version)) + except spack.package.NoURLError: + msg = ("Can't extrapolate a URL for version %s " + "because package %s defines no URLs") + raise ExtrapolationError(msg % (version, pkg.name)) + + +def _from_merged_attrs(fetcher, pkg, version): + """Create a fetcher from merged package and version attributes.""" + if fetcher.url_attr == 'url': + url = pkg.url_for_version(version) + else: + url = getattr(pkg, fetcher.url_attr) + + attrs = {fetcher.url_attr: url} + attrs.update(pkg.versions[version]) + return fetcher(**attrs) + + def for_package_version(pkg, version): """Determine a fetch strategy based on the arguments supplied to version() in the package description.""" - check_attributes(pkg) + check_pkg_attributes(pkg) if not isinstance(version, Version): version = Version(version) - # If it's not a known version, extrapolate one by URL. + # If it's not a known version, try to extrapolate one by URL if version not in pkg.versions: - try: - url = pkg.url_for_version(version) - except spack.package.NoURLError: - msg = ("Can't extrapolate a URL for version %s " - "because package %s defines no URLs") - raise ExtrapolationError(msg % (version, pkg.name)) - - if not url: - raise InvalidArgsError(pkg, version) - return URLFetchStrategy(url) + return _extrapolate(pkg, version) # Grab a dict of args out of the package version dict args = pkg.versions[version] - # Test all strategies against per-version arguments. + # If the version specifies a `url_attr` directly, use that. for fetcher in all_strategies: - if fetcher.matches(args): + if fetcher.url_attr in args: return fetcher(**args) - # If nothing matched for a *specific* version, test all strategies - # against attributes in the version directives and on the package + # if a version's optional attributes imply a particular fetch + # strategy, and we have the `url_attr`, then use that strategy. + for fetcher in all_strategies: + if hasattr(pkg, fetcher.url_attr) or fetcher.url_attr == 'url': + optionals = fetcher.optional_attrs + if optionals and any(a in args for a in optionals): + return _from_merged_attrs(fetcher, pkg, version) + + # if the optional attributes tell us nothing, then use any `url_attr` + # on the package. This prefers URL vs. VCS, b/c URLFetchStrategy is + # defined first in this file. for fetcher in all_strategies: - attrs = dict((attr, getattr(pkg, attr)) - for attr in fetcher.required_attributes - if hasattr(pkg, attr)) - if 'url' in attrs: - attrs['url'] = pkg.url_for_version(version) - attrs.update(args) - if fetcher.matches(attrs): - return fetcher(**attrs) + if hasattr(pkg, fetcher.url_attr): + return _from_merged_attrs(fetcher, pkg, version) - raise InvalidArgsError(pkg, version) + raise InvalidArgsError(pkg, version, **args) def from_list_url(pkg): @@ -1116,11 +1142,15 @@ class FetcherConflict(FetchError): class InvalidArgsError(FetchError): - def __init__(self, pkg, version): - msg = ("Could not construct a fetch strategy for package %s at " - "version %s") - msg %= (pkg.name, version) - super(InvalidArgsError, self).__init__(msg) + """Raised when a version can't be deduced from a set of arguments.""" + def __init__(self, pkg=None, version=None, **args): + msg = "Could not guess a fetch strategy" + if pkg: + msg += ' for {pkg}'.format(pkg=pkg) + if version: + msg += '@{version}'.format(version=version) + long_msg = 'with arguments: {args}'.format(args=args) + super(InvalidArgsError, self).__init__(msg, long_msg) class ChecksumError(FetchError): diff --git a/lib/spack/spack/test/packages.py b/lib/spack/spack/test/packages.py index 2769ceb70d..d50de07a57 100644 --- a/lib/spack/spack/test/packages.py +++ b/lib/spack/spack/test/packages.py @@ -263,9 +263,81 @@ def test_no_extrapolate_without_url(mock_packages, config): spack.fetch_strategy.for_package_version(pkg, '1.1') -def test_git_and_url_top_level(mock_packages, config): - """Verify conflict when url and git are specified together.""" +def test_two_vcs_fetchers_top_level(mock_packages, config): + """Verify conflict when two VCS strategies are specified together.""" - pkg = spack.repo.get('git-and-url-top-level') + pkg = spack.repo.get('git-url-svn-top-level') with pytest.raises(spack.fetch_strategy.FetcherConflict): spack.fetch_strategy.for_package_version(pkg, '1.0') + + pkg = spack.repo.get('git-svn-top-level') + with pytest.raises(spack.fetch_strategy.FetcherConflict): + spack.fetch_strategy.for_package_version(pkg, '1.0') + + +def test_git_url_top_level(mock_packages, config): + """Test fetch strategy inference when url is specified with a VCS.""" + + pkg = spack.repo.get('git-url-top-level') + + fetcher = spack.fetch_strategy.for_package_version(pkg, '2.0') + assert isinstance(fetcher, spack.fetch_strategy.URLFetchStrategy) + assert fetcher.url == 'https://example.com/some/tarball-2.0.tar.gz' + assert fetcher.digest == 'abc20' + + fetcher = spack.fetch_strategy.for_package_version(pkg, '2.1') + assert isinstance(fetcher, spack.fetch_strategy.URLFetchStrategy) + assert fetcher.url == 'https://example.com/some/tarball-2.1.tar.gz' + assert fetcher.digest == 'abc21' + + fetcher = spack.fetch_strategy.for_package_version(pkg, '2.2') + assert isinstance(fetcher, spack.fetch_strategy.URLFetchStrategy) + assert fetcher.url == 'https://www.example.com/foo2.2.tar.gz' + assert fetcher.digest == 'abc22' + + fetcher = spack.fetch_strategy.for_package_version(pkg, '2.3') + assert isinstance(fetcher, spack.fetch_strategy.URLFetchStrategy) + assert fetcher.url == 'https://www.example.com/foo2.3.tar.gz' + assert fetcher.digest == 'abc23' + + fetcher = spack.fetch_strategy.for_package_version(pkg, '3.0') + assert isinstance(fetcher, spack.fetch_strategy.GitFetchStrategy) + assert fetcher.url == 'https://example.com/some/git/repo' + assert fetcher.tag == 'v3.0' + assert fetcher.commit is None + assert fetcher.branch is None + + fetcher = spack.fetch_strategy.for_package_version(pkg, '3.1') + assert isinstance(fetcher, spack.fetch_strategy.GitFetchStrategy) + assert fetcher.url == 'https://example.com/some/git/repo' + assert fetcher.tag == 'v3.1' + assert fetcher.commit == 'abc31' + assert fetcher.branch is None + + fetcher = spack.fetch_strategy.for_package_version(pkg, '3.2') + assert isinstance(fetcher, spack.fetch_strategy.GitFetchStrategy) + assert fetcher.url == 'https://example.com/some/git/repo' + assert fetcher.tag is None + assert fetcher.commit is None + assert fetcher.branch == 'releases/v3.2' + + fetcher = spack.fetch_strategy.for_package_version(pkg, '3.3') + assert isinstance(fetcher, spack.fetch_strategy.GitFetchStrategy) + assert fetcher.url == 'https://example.com/some/git/repo' + assert fetcher.tag is None + assert fetcher.commit == 'abc33' + assert fetcher.branch == 'releases/v3.3' + + fetcher = spack.fetch_strategy.for_package_version(pkg, '3.4') + assert isinstance(fetcher, spack.fetch_strategy.GitFetchStrategy) + assert fetcher.url == 'https://example.com/some/git/repo' + assert fetcher.tag is None + assert fetcher.commit == 'abc34' + assert fetcher.branch is None + + fetcher = spack.fetch_strategy.for_package_version(pkg, 'develop') + assert isinstance(fetcher, spack.fetch_strategy.GitFetchStrategy) + assert fetcher.url == 'https://example.com/some/git/repo' + assert fetcher.tag is None + assert fetcher.commit is None + assert fetcher.branch == 'develop' diff --git a/var/spack/repos/builtin.mock/packages/git-and-url-top-level/package.py b/var/spack/repos/builtin.mock/packages/git-and-url-top-level/package.py deleted file mode 100644 index d34c9d9b06..0000000000 --- a/var/spack/repos/builtin.mock/packages/git-and-url-top-level/package.py +++ /dev/null @@ -1,38 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -from spack import * - - -class GitAndUrlTopLevel(Package): - """Mock package that uses git for fetching.""" - homepage = "http://www.git-fetch-example.com" - - git = 'https://example.com/some/git/repo' - url = 'https://example.com/some/tarball-1.0.tar.gz' - - version('2.0') - - def install(self, spec, prefix): - pass diff --git a/var/spack/repos/builtin.mock/packages/git-svn-top-level/package.py b/var/spack/repos/builtin.mock/packages/git-svn-top-level/package.py new file mode 100644 index 0000000000..0bff4402e2 --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/git-svn-top-level/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class GitSvnTopLevel(Package): + """Mock package that uses git for fetching.""" + homepage = "http://www.git-fetch-example.com" + + # can't have two VCS fetchers. + git = 'https://example.com/some/git/repo' + svn = 'https://example.com/some/svn/repo' + + version('2.0') + + def install(self, spec, prefix): + pass diff --git a/var/spack/repos/builtin.mock/packages/git-url-svn-top-level/package.py b/var/spack/repos/builtin.mock/packages/git-url-svn-top-level/package.py new file mode 100644 index 0000000000..d4897b228f --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/git-url-svn-top-level/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class GitUrlSvnTopLevel(Package): + """Mock package that uses git for fetching.""" + homepage = "http://www.git-fetch-example.com" + + # can't have two VCS fetchers. + url = 'https://example.com/some/tarball-1.0.tar.gz' + git = 'https://example.com/some/git/repo' + svn = 'https://example.com/some/svn/repo' + + version('2.0') + + def install(self, spec, prefix): + pass diff --git a/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py b/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py new file mode 100644 index 0000000000..e4931ef416 --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py @@ -0,0 +1,53 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class GitUrlTopLevel(Package): + """Mock package that top-level git and url attributes. + + This demonstrates how Spack infers fetch mechanisms from parameters + to the ``version`` directive. + + """ + homepage = "http://www.git-fetch-example.com" + + git = 'https://example.com/some/git/repo' + url = 'https://example.com/some/tarball-1.0.tar.gz' + + version('develop', branch='develop') + version('3.4', commit='abc34') + version('3.3', branch='releases/v3.3', commit='abc33') + version('3.2', branch='releases/v3.2') + version('3.1', tag='v3.1', commit='abc31') + version('3.0', tag='v3.0') + + version('2.3', 'abc23', url='https://www.example.com/foo2.3.tar.gz') + version('2.2', sha256='abc22', url='https://www.example.com/foo2.2.tar.gz') + version('2.1', sha256='abc21') + version('2.0', 'abc20') + + def install(self, spec, prefix): + pass -- cgit v1.2.3-70-g09d2 From 020c34e13665c508d5afe13da52042d791d22367 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Sun, 22 Jul 2018 16:15:37 -0700 Subject: tests: add checks and tests for consistent version() arguments - Previously, Spack didn't check the arguments you put in version() directives. - So, you could do something like this, where there are arguments for a URL fetcher AND for a git fetcher: version('1.0', md5='abc123', git='https://foo.bar', commit='feda2343') - Now, we check the arguments before constructing a fetcher, to ensure that each package has *only* arguments for a single type of fetcher. - Also added `test_package_version_consistency()` to the `package_sanity` test, so that all builtin packages are required to have valid `version()` directives. --- lib/spack/spack/fetch_strategy.py | 24 ++++++++++++++++ lib/spack/spack/test/package_sanity.py | 10 +++++++ lib/spack/spack/test/packages.py | 28 ++++++++++++++++-- .../packages/git-url-top-level/package.py | 8 ++++++ .../builtin.mock/packages/svn-test/package.py | 2 +- .../repos/builtin/packages/damselfly/package.py | 5 ++-- .../repos/builtin/packages/nekbone/package.py | 4 +-- var/spack/repos/builtin/packages/py-yt/package.py | 33 +++++++++------------- .../builtin/packages/r-affycompatible/package.py | 4 +-- .../repos/builtin/packages/ruby-narray/package.py | 5 ++-- 10 files changed, 91 insertions(+), 32 deletions(-) (limited to 'var') diff --git a/lib/spack/spack/fetch_strategy.py b/lib/spack/spack/fetch_strategy.py index 3245f56482..38b837b659 100644 --- a/lib/spack/spack/fetch_strategy.py +++ b/lib/spack/spack/fetch_strategy.py @@ -993,6 +993,27 @@ def check_pkg_attributes(pkg): % (pkg.name, comma_and(quote(conflicts)))) +def _check_version_attributes(fetcher, pkg, version): + """Ensure that the fetcher for a version is not ambiguous. + + This assumes that we have already determined the fetcher for the + specific version using ``for_package_version()`` + """ + all_optionals = set(a for s in all_strategies for a in s.optional_attrs) + + args = pkg.versions[version] + extra = set(args) - set(fetcher.optional_attrs) - set([fetcher.url_attr]) + extra.intersection_update(all_optionals) + + if extra: + legal_attrs = [fetcher.url_attr] + list(fetcher.optional_attrs) + raise FetcherConflict( + "%s version '%s' has extra arguments: %s" + % (pkg.name, version, comma_and(quote(extra))), + "Valid arguments for a %s fetcher are: \n %s" + % (fetcher.url_attr, comma_and(quote(legal_attrs)))) + + def _extrapolate(pkg, version): """Create a fetcher from an extrapolated URL for this version.""" try: @@ -1033,6 +1054,7 @@ def for_package_version(pkg, version): # If the version specifies a `url_attr` directly, use that. for fetcher in all_strategies: if fetcher.url_attr in args: + _check_version_attributes(fetcher, pkg, version) return fetcher(**args) # if a version's optional attributes imply a particular fetch @@ -1041,6 +1063,7 @@ def for_package_version(pkg, version): if hasattr(pkg, fetcher.url_attr) or fetcher.url_attr == 'url': optionals = fetcher.optional_attrs if optionals and any(a in args for a in optionals): + _check_version_attributes(fetcher, pkg, version) return _from_merged_attrs(fetcher, pkg, version) # if the optional attributes tell us nothing, then use any `url_attr` @@ -1048,6 +1071,7 @@ def for_package_version(pkg, version): # defined first in this file. for fetcher in all_strategies: if hasattr(pkg, fetcher.url_attr): + _check_version_attributes(fetcher, pkg, version) return _from_merged_attrs(fetcher, pkg, version) raise InvalidArgsError(pkg, version, **args) diff --git a/lib/spack/spack/test/package_sanity.py b/lib/spack/spack/test/package_sanity.py index 0c26fd7d95..74890664a6 100644 --- a/lib/spack/spack/test/package_sanity.py +++ b/lib/spack/spack/test/package_sanity.py @@ -29,6 +29,7 @@ import pytest import spack.paths import spack.repo +import spack.fetch_strategy def check_repo(): @@ -68,3 +69,12 @@ def test_all_virtual_packages_have_default_providers(): for provider in providers: assert provider in default_providers + + +def test_package_version_consistency(): + """Make sure all versions on builtin packages can produce a fetcher.""" + for name in spack.repo.all_package_names(): + pkg = spack.repo.get(name) + spack.fetch_strategy.check_pkg_attributes(pkg) + for version in pkg.versions: + assert spack.fetch_strategy.for_package_version(pkg, version) diff --git a/lib/spack/spack/test/packages.py b/lib/spack/spack/test/packages.py index d50de07a57..464e37a8d2 100644 --- a/lib/spack/spack/test/packages.py +++ b/lib/spack/spack/test/packages.py @@ -275,8 +275,8 @@ def test_two_vcs_fetchers_top_level(mock_packages, config): spack.fetch_strategy.for_package_version(pkg, '1.0') -def test_git_url_top_level(mock_packages, config): - """Test fetch strategy inference when url is specified with a VCS.""" +def test_git_url_top_level_url_versions(mock_packages, config): + """Test URL fetch strategy inference when url is specified with git.""" pkg = spack.repo.get('git-url-top-level') @@ -300,6 +300,12 @@ def test_git_url_top_level(mock_packages, config): assert fetcher.url == 'https://www.example.com/foo2.3.tar.gz' assert fetcher.digest == 'abc23' + +def test_git_url_top_level_git_versions(mock_packages, config): + """Test git fetch strategy inference when url is specified with git.""" + + pkg = spack.repo.get('git-url-top-level') + fetcher = spack.fetch_strategy.for_package_version(pkg, '3.0') assert isinstance(fetcher, spack.fetch_strategy.GitFetchStrategy) assert fetcher.url == 'https://example.com/some/git/repo' @@ -341,3 +347,21 @@ def test_git_url_top_level(mock_packages, config): assert fetcher.tag is None assert fetcher.commit is None assert fetcher.branch == 'develop' + + +def test_git_url_top_level_conflicts(mock_packages, config): + """Test git fetch strategy inference when url is specified with git.""" + + pkg = spack.repo.get('git-url-top-level') + + with pytest.raises(spack.fetch_strategy.FetcherConflict): + spack.fetch_strategy.for_package_version(pkg, '1.0') + + with pytest.raises(spack.fetch_strategy.FetcherConflict): + spack.fetch_strategy.for_package_version(pkg, '1.1') + + with pytest.raises(spack.fetch_strategy.FetcherConflict): + spack.fetch_strategy.for_package_version(pkg, '1.2') + + with pytest.raises(spack.fetch_strategy.FetcherConflict): + spack.fetch_strategy.for_package_version(pkg, '1.3') diff --git a/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py b/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py index e4931ef416..f3fe17bd0f 100644 --- a/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py +++ b/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py @@ -37,6 +37,7 @@ class GitUrlTopLevel(Package): git = 'https://example.com/some/git/repo' url = 'https://example.com/some/tarball-1.0.tar.gz' + # These resolve to git fetchers version('develop', branch='develop') version('3.4', commit='abc34') version('3.3', branch='releases/v3.3', commit='abc33') @@ -44,10 +45,17 @@ class GitUrlTopLevel(Package): version('3.1', tag='v3.1', commit='abc31') version('3.0', tag='v3.0') + # These resolve to URL fetchers version('2.3', 'abc23', url='https://www.example.com/foo2.3.tar.gz') version('2.2', sha256='abc22', url='https://www.example.com/foo2.2.tar.gz') version('2.1', sha256='abc21') version('2.0', 'abc20') + # These result in a FetcherConflict b/c we can't tell what to use + version('1.3', sha256='abc13', commit='abc13') + version('1.2', sha512='abc12', branch='releases/v1.2') + version('1.1', md5='abc11', tag='v1.1') + version('1.0', 'abc11', tag='abc123') + def install(self, spec, prefix): pass diff --git a/var/spack/repos/builtin.mock/packages/svn-test/package.py b/var/spack/repos/builtin.mock/packages/svn-test/package.py index f31bd269ea..ca60fbe6b1 100644 --- a/var/spack/repos/builtin.mock/packages/svn-test/package.py +++ b/var/spack/repos/builtin.mock/packages/svn-test/package.py @@ -29,7 +29,7 @@ class SvnTest(Package): """Mock package that uses svn for fetching.""" url = "http://www.example.com/svn-test-1.0.tar.gz" - version('svn', 'to-be-filled-in-by-test') + version('svn', svn='to-be-filled-in-by-test') def install(self, spec, prefix): pass diff --git a/var/spack/repos/builtin/packages/damselfly/package.py b/var/spack/repos/builtin/packages/damselfly/package.py index d2d219a930..f8c96be243 100644 --- a/var/spack/repos/builtin/packages/damselfly/package.py +++ b/var/spack/repos/builtin/packages/damselfly/package.py @@ -28,9 +28,8 @@ from spack import * class Damselfly(CMakePackage): """Damselfly is a model-based parallel network simulator.""" homepage = "https://github.com/llnl/damselfly" - url = "https://github.com/llnl/damselfly" + url = "https://github.com/LLNL/damselfly/archive/v1.0.tar.gz" - version('1.0', '05cf7e2d8ece4408c0f2abb7ab63fd74c0d62895', - git='https://github.com/llnl/damselfly.git', tag='v1.0') + version('1.0', sha256='560e1b800c9036766396a1033c00914bd8d181b911e87140c3ac8879baf6545a') depends_on('cmake@2.6:', type='build') diff --git a/var/spack/repos/builtin/packages/nekbone/package.py b/var/spack/repos/builtin/packages/nekbone/package.py index 8c2da87c6c..aae60ef797 100644 --- a/var/spack/repos/builtin/packages/nekbone/package.py +++ b/var/spack/repos/builtin/packages/nekbone/package.py @@ -32,11 +32,11 @@ class Nekbone(Package): the spectral element method.""" homepage = "https://github.com/Nek5000/Nekbone" - url = "https://github.com/Nek5000/Nekbone/tarball/v17.0" + url = "https://github.com/Nek5000/Nekbone/archive/v17.0.tar.gz" tags = ['proxy-app', 'ecp-proxy-app'] - version('17.0', 'cc339684547614a0725959e41839fec1', git='https://github.com/Nek5000/Nekbone.git') + version('17.0', sha256='ae361cc61368a924398a28a296f675b7f0c4a9516788a7f8fa3c09d787cdf69b') version('develop', git='https://github.com/Nek5000/Nekbone.git') # Variants diff --git a/var/spack/repos/builtin/packages/py-yt/package.py b/var/spack/repos/builtin/packages/py-yt/package.py index 5f059c04b5..5c95ec621a 100644 --- a/var/spack/repos/builtin/packages/py-yt/package.py +++ b/var/spack/repos/builtin/packages/py-yt/package.py @@ -35,26 +35,21 @@ class PyYt(PythonPackage): interdisciplinary community. """ homepage = "http://yt-project.org" - url = "https://github.com/yt-project/yt.git" + url = "https://github.com/yt-project/yt/archive/yt-3.4.0.tar.gz" + git = "https://github.com/yt-project/yt.git" - version("3.4.0", "413b835f1b0e2a0bd26f1044ff7dbc94", - url="https://github.com/yt-project/yt/archive/yt-3.4.0.tar.gz") - version("3.3.5", "2ad314ff3d3261e41825d15db027b0e7", - url="https://bitbucket.org/yt_analysis/yt/get/yt-3.3.5.tar.gz") - version("3.3.4", "3a84e56dfd82f9dd923f3fb8490e679c", - url="https://bitbucket.org/yt_analysis/yt/get/yt-3.3.4.tar.gz") - version("3.3.1", hg="https://bitbucket.org/yt_analysis/yt", - tag="yt-3.3.1", commit="9bc3d0e9b750c923d44d73c447df64fc431f5838") - version("3.2.3", hg="https://bitbucket.org/yt_analysis/yt", - tag="yt-3.2.3", commit="83d2c1e9313e7d83eb5b96888451ff2646fd8ff3") - version("3.1.0", hg="https://bitbucket.org/yt_analysis/yt", - tag="yt-3.1.0", commit="fd7cdc4836188a3badf81adb477bcc1b9632e485") - version("3.0.2", hg="https://bitbucket.org/yt_analysis/yt", - tag="yt-3.0.2", commit="511887af4c995a78fe606e58ce8162c88380ecdc") - version("2.6.3", hg="https://bitbucket.org/yt_analysis/yt", - tag="yt-2.6.3", commit="816186f16396a16853810ac9ebcde5057d8d5b1a") - version("develop", git="https://github.com/yt-project/yt.git", - branch="master") + version("develop", branch="master") + + version('3.4.1', sha256='b9a73ade3726a8163fc992999c8c1010ca89473131901fe4d48b820ab2ced486') + version('3.4.0', sha256='2120793a76864cf3165b2b7290ef719e358fa57501ee8721941e7cfc434cfb2b') + version('3.3.5', sha256='2ebe4bbefd9f5367563ce4d7eb87d3f6ef0de1f97ed1c03106d9541e71b7e1ca') + version('3.3.4', sha256='2842bab891cfbf3269a3c4bd8f22fef23c9a15a790ba48c6490730cb51ce9b0e') + version('3.3.3', sha256='7b9244089e92b1d32cef791cd72760bb8c80b391eaec29672a5377c33f932d88') + version('3.3.2', sha256='d323419ad3919e86d2af1738c846021fd7f5b5dc5c06059cdf3a2bc63226466a') + version('3.3.1', sha256='7ac68d5e05e2b57fb3635f1027f3201094f3547d584e72ab55fedbfd3bc09a36') + version('3.3.0', sha256='e6be799c0d9a83a06649f0d77a61ad9c23b94b34f94e16724e2b18f5c7513c33') + version('3.2.3', sha256='96476d17e9ce35f0d4380b2ddb398fe729e39f1f3894602ff07e49844541e5ca') + version('3.2.2', sha256='498ed77b3dae8c54929602d4931f3c3e0a3420a9b500cbd870f50b1e0efea8c3') variant("astropy", default=True, description="enable astropy support") variant("h5py", default=True, description="enable h5py support") diff --git a/var/spack/repos/builtin/packages/r-affycompatible/package.py b/var/spack/repos/builtin/packages/r-affycompatible/package.py index f0eea26606..3747cb7649 100644 --- a/var/spack/repos/builtin/packages/r-affycompatible/package.py +++ b/var/spack/repos/builtin/packages/r-affycompatible/package.py @@ -34,9 +34,9 @@ class RAffycompatible(RPackage): (AGCC)-compatible sample annotation files.""" homepage = "https://www.bioconductor.org/packages/AffyCompatible/" - url = "https://git.bioconductor.org/packages/AffyCompatible" + git = "https://git.bioconductor.org/packages/AffyCompatible" - version('1.36.0', 'https://git.bioconductor.org/packages/AffyCompatible', commit='dbbfd43a54ae1de6173336683a9461084ebf38c3') + version('1.36.0', commit='dbbfd43a54ae1de6173336683a9461084ebf38c3') depends_on('r@3.4.0:3.4.9', when=('@1.36.0')) depends_on('r-xml', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/ruby-narray/package.py b/var/spack/repos/builtin/packages/ruby-narray/package.py index 4102009dc9..97d30d96d4 100644 --- a/var/spack/repos/builtin/packages/ruby-narray/package.py +++ b/var/spack/repos/builtin/packages/ruby-narray/package.py @@ -31,10 +31,9 @@ class RubyNarray(Package): similar to numpy.ndaray.""" homepage = "https://rubygems.org/gems/narray" - url = "https://github.com/ruby-numo/narray" + git = "https://github.com/ruby-numo/narray" - version('0.9.0.9', '9cadbbccf1e01b6d1bc143c19d598cad1c420869', - git='https://github.com/ruby-numo/narray.git') + version('0.9.0.9', commit='9cadbbccf1e01b6d1bc143c19d598cad1c420869') extends('ruby') -- cgit v1.2.3-70-g09d2 From 4c6aca533ab0596a677d041b1766e88f045d42f4 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 23 Jul 2018 00:00:15 -0700 Subject: Add top-level attributes for hg, svn, and git A-L packages --- var/spack/repos/builtin/packages/accfft/package.py | 4 +-- var/spack/repos/builtin/packages/adios/package.py | 9 ++++--- var/spack/repos/builtin/packages/adios2/package.py | 6 ++--- var/spack/repos/builtin/packages/adol-c/package.py | 5 ++-- var/spack/repos/builtin/packages/albany/package.py | 4 +-- .../repos/builtin/packages/alquimia/package.py | 7 ++--- var/spack/repos/builtin/packages/amg/package.py | 4 +-- var/spack/repos/builtin/packages/amp/package.py | 9 +++---- var/spack/repos/builtin/packages/amrex/package.py | 8 +++--- var/spack/repos/builtin/packages/amrvis/package.py | 5 ++-- .../repos/builtin/packages/arpack-ng/package.py | 5 ++-- var/spack/repos/builtin/packages/ascent/package.py | 7 ++--- var/spack/repos/builtin/packages/aspa/package.py | 10 ++++--- var/spack/repos/builtin/packages/aspect/package.py | 3 ++- var/spack/repos/builtin/packages/axl/package.py | 7 ++--- .../builtin/packages/bash-completion/package.py | 6 +++-- var/spack/repos/builtin/packages/bbcp/package.py | 5 ++-- .../repos/builtin/packages/benchmark/package.py | 6 ++--- .../repos/builtin/packages/biopieces/package.py | 4 +-- var/spack/repos/builtin/packages/bml/package.py | 3 ++- .../repos/builtin/packages/bohrium/package.py | 9 ++++--- .../repos/builtin/packages/bookleaf-cpp/package.py | 11 +++----- var/spack/repos/builtin/packages/boost/package.py | 31 +++++++++------------- .../repos/builtin/packages/branson/package.py | 3 ++- .../repos/builtin/packages/breakdancer/package.py | 5 ++-- .../repos/builtin/packages/brigand/package.py | 8 +++--- var/spack/repos/builtin/packages/busco/package.py | 4 +-- .../repos/builtin/packages/caliper/package.py | 12 ++++----- .../repos/builtin/packages/camellia/package.py | 5 ++-- var/spack/repos/builtin/packages/cares/package.py | 5 ++-- .../builtin/packages/cbtf-argonavis-gui/package.py | 9 +++---- .../builtin/packages/cbtf-argonavis/package.py | 14 +++------- .../repos/builtin/packages/cbtf-krell/package.py | 14 +++------- .../repos/builtin/packages/cbtf-lanl/package.py | 14 ++++------ var/spack/repos/builtin/packages/cbtf/package.py | 14 +++------- .../repos/builtin/packages/cdbfasta/package.py | 4 +-- var/spack/repos/builtin/packages/charm/package.py | 4 +-- var/spack/repos/builtin/packages/chombo/package.py | 7 +++-- .../repos/builtin/packages/cityhash/package.py | 8 +++--- var/spack/repos/builtin/packages/clamr/package.py | 4 +-- .../repos/builtin/packages/cleverleaf/package.py | 6 ++--- var/spack/repos/builtin/packages/cnmem/package.py | 4 ++- var/spack/repos/builtin/packages/cnpy/package.py | 4 +-- var/spack/repos/builtin/packages/cntk/package.py | 3 ++- .../repos/builtin/packages/cntk1bitsgd/package.py | 6 ++--- .../builtin/packages/codar-cheetah/package.py | 6 ++--- var/spack/repos/builtin/packages/coevp/package.py | 4 +-- var/spack/repos/builtin/packages/cohmm/package.py | 5 ++-- var/spack/repos/builtin/packages/comd/package.py | 3 ++- .../repos/builtin/packages/conduit/package.py | 9 +++---- var/spack/repos/builtin/packages/cosp2/package.py | 5 ++-- var/spack/repos/builtin/packages/cppad/package.py | 3 ++- var/spack/repos/builtin/packages/cppzmq/package.py | 5 ++-- .../repos/builtin/packages/cpu-features/package.py | 5 ++-- .../repos/builtin/packages/cpuinfo/package.py | 4 +-- .../repos/builtin/packages/cuda-memtest/package.py | 6 ++--- .../repos/builtin/packages/dataspaces/package.py | 4 +-- .../packages/dealii-parameter-gui/package.py | 4 +-- var/spack/repos/builtin/packages/dealii/package.py | 6 +++-- var/spack/repos/builtin/packages/delly2/package.py | 5 ++-- var/spack/repos/builtin/packages/dlpack/package.py | 3 ++- .../repos/builtin/packages/dmlc-core/package.py | 7 +++-- .../repos/builtin/packages/dyninst/package.py | 19 +++++++------ var/spack/repos/builtin/packages/ebms/package.py | 4 +-- .../repos/builtin/packages/elemental/package.py | 3 ++- var/spack/repos/builtin/packages/er/package.py | 7 ++--- .../builtin/packages/everytrace-example/package.py | 6 ++--- .../repos/builtin/packages/everytrace/package.py | 6 ++--- .../repos/builtin/packages/examinimd/package.py | 3 ++- var/spack/repos/builtin/packages/exampm/package.py | 5 ++-- var/spack/repos/builtin/packages/exasp2/package.py | 4 +-- .../repos/builtin/packages/exodusii/package.py | 5 ++-- .../repos/builtin/packages/express/package.py | 5 ++-- var/spack/repos/builtin/packages/falcon/package.py | 6 ++--- .../repos/builtin/packages/farmhash/package.py | 8 +++--- .../repos/builtin/packages/fast-gbs/package.py | 4 +-- .../builtin/packages/fastqvalidator/package.py | 5 ++-- .../repos/builtin/packages/fermikit/package.py | 4 ++- var/spack/repos/builtin/packages/flang/package.py | 4 ++- .../repos/builtin/packages/flecsale/package.py | 5 ++-- var/spack/repos/builtin/packages/flecsi/package.py | 4 +-- var/spack/repos/builtin/packages/flint/package.py | 3 ++- var/spack/repos/builtin/packages/flux/package.py | 4 +-- var/spack/repos/builtin/packages/fp16/package.py | 4 +-- .../repos/builtin/packages/freebayes/package.py | 4 +-- var/spack/repos/builtin/packages/funhpc/package.py | 7 ++--- var/spack/repos/builtin/packages/gccxml/package.py | 8 +++--- .../repos/builtin/packages/gemmlowp/package.py | 5 ++-- var/spack/repos/builtin/packages/geopm/package.py | 5 ++-- var/spack/repos/builtin/packages/ghost/package.py | 5 ++-- .../repos/builtin/packages/git-lfs/package.py | 12 ++++----- var/spack/repos/builtin/packages/gloo/package.py | 4 +-- var/spack/repos/builtin/packages/glvis/package.py | 4 +-- var/spack/repos/builtin/packages/gotcha/package.py | 14 +++++----- .../repos/builtin/packages/graphmap/package.py | 4 +-- .../repos/builtin/packages/graphviz/package.py | 5 ++-- .../repos/builtin/packages/gromacs/package.py | 11 ++++---- var/spack/repos/builtin/packages/gslib/package.py | 8 +++--- .../repos/builtin/packages/gtkorvo-atl/package.py | 6 ++--- .../builtin/packages/gtkorvo-cercs-env/package.py | 9 +++---- .../repos/builtin/packages/gtkorvo-dill/package.py | 6 ++--- .../repos/builtin/packages/h5z-zfp/package.py | 8 +++--- .../repos/builtin/packages/hacckernels/package.py | 5 ++-- .../repos/builtin/packages/hapcut2/package.py | 6 ++--- var/spack/repos/builtin/packages/hapdip/package.py | 3 ++- .../repos/builtin/packages/hdf5-blosc/package.py | 5 ++-- .../repos/builtin/packages/highwayhash/package.py | 4 +-- var/spack/repos/builtin/packages/hiop/package.py | 5 ++-- .../repos/builtin/packages/hoomd-blue/package.py | 8 ++---- .../packages/hpctoolkit-externals/package.py | 6 ++--- .../repos/builtin/packages/hpctoolkit/package.py | 6 ++--- var/spack/repos/builtin/packages/hpgmg/package.py | 6 +++-- var/spack/repos/builtin/packages/hub/package.py | 6 +++-- .../repos/builtin/packages/hydrogen/package.py | 3 ++- var/spack/repos/builtin/packages/hypre/package.py | 21 ++++++++++----- var/spack/repos/builtin/packages/icet/package.py | 4 +-- .../repos/builtin/packages/intel-xed/package.py | 6 ++--- .../repos/builtin/packages/isaac-server/package.py | 8 +++--- var/spack/repos/builtin/packages/isaac/package.py | 8 +++--- var/spack/repos/builtin/packages/julia/package.py | 15 +++++------ var/spack/repos/builtin/packages/kahip/package.py | 3 ++- var/spack/repos/builtin/packages/kaldi/package.py | 10 +++---- var/spack/repos/builtin/packages/kealib/package.py | 3 ++- .../repos/builtin/packages/kentutils/package.py | 4 +-- var/spack/repos/builtin/packages/kokkos/package.py | 4 +-- var/spack/repos/builtin/packages/krims/package.py | 7 ++--- .../repos/builtin/packages/kvasir-mpl/package.py | 4 +-- var/spack/repos/builtin/packages/kvtree/package.py | 7 ++--- var/spack/repos/builtin/packages/laghos/package.py | 4 +-- var/spack/repos/builtin/packages/lammps/package.py | 3 ++- var/spack/repos/builtin/packages/latte/package.py | 3 ++- .../repos/builtin/packages/lazyten/package.py | 7 ++--- var/spack/repos/builtin/packages/lbann/package.py | 3 ++- var/spack/repos/builtin/packages/legion/package.py | 3 ++- .../repos/builtin/packages/libceed/package.py | 12 ++++----- var/spack/repos/builtin/packages/libev/package.py | 3 ++- .../repos/builtin/packages/libevpath/package.py | 6 ++--- var/spack/repos/builtin/packages/libffs/package.py | 10 +++---- .../repos/builtin/packages/libharu/package.py | 4 +-- .../repos/builtin/packages/libmonitor/package.py | 7 +++-- var/spack/repos/builtin/packages/libquo/package.py | 5 ++-- var/spack/repos/builtin/packages/librom/package.py | 5 ++-- var/spack/repos/builtin/packages/libshm/package.py | 4 +-- .../repos/builtin/packages/libsplash/package.py | 7 +++-- .../repos/builtin/packages/libxsmm/package.py | 4 +-- .../repos/builtin/packages/linkphase3/package.py | 5 ++-- .../builtin/packages/llvm-openmp-ompt/package.py | 13 +++------ var/spack/repos/builtin/packages/lrzip/package.py | 5 ++-- var/spack/repos/builtin/packages/lwm2/package.py | 3 ++- var/spack/repos/builtin/packages/opencv/package.py | 5 ++-- var/spack/repos/builtin/packages/plasma/package.py | 4 +-- var/spack/repos/builtin/packages/xios/package.py | 3 +-- 152 files changed, 461 insertions(+), 486 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/accfft/package.py b/var/spack/repos/builtin/packages/accfft/package.py index 5ed7b7c61e..29dd02bb6c 100644 --- a/var/spack/repos/builtin/packages/accfft/package.py +++ b/var/spack/repos/builtin/packages/accfft/package.py @@ -31,9 +31,9 @@ class Accfft(CMakePackage, CudaPackage): """ homepage = "http://accfft.org" - url = "https://github.com/amirgholami/accfft.git" + git = "https://github.com/amirgholami/accfft.git" - version('develop', git='https://github.com/amirgholami/accfft.git', branch='master') + version('develop', branch='master') variant('pnetcdf', default=True, description='Add support for parallel NetCDF') variant('shared', default=True, description='Enables the build of shared libraries') diff --git a/var/spack/repos/builtin/packages/adios/package.py b/var/spack/repos/builtin/packages/adios/package.py index 3fabaff020..69d4ca0671 100644 --- a/var/spack/repos/builtin/packages/adios/package.py +++ b/var/spack/repos/builtin/packages/adios/package.py @@ -33,18 +33,19 @@ class Adios(AutotoolsPackage): """ homepage = "http://www.olcf.ornl.gov/center-projects/adios/" - url = "https://github.com/ornladios/ADIOS/archive/v1.12.0.tar.gz" + url = "https://github.com/ornladios/ADIOS/archive/v1.12.0.tar.gz" + git = "https://github.com/ornladios/ADIOS.git" + maintainers = ['ax3l'] - version('develop', git='https://github.com/ornladios/ADIOS.git', - branch='master') + version('develop', branch='master') version('1.13.1', '958aed11240d7f5a065ab5ee271ecb44') version('1.13.0', '68af36b821debbdf4748b20320a990ce') version('1.12.0', '84a1c71b6698009224f6f748c5257fc9') version('1.11.1', '5639bfc235e50bf17ba9dafb14ea4185') version('1.11.0', '5eead5b2ccf962f5e6d5f254d29d5238') version('1.10.0', 'eff450a4c0130479417cfd63186957f3') - version('1.9.0', '310ff02388bbaa2b1c1710ee970b5678') + version('1.9.0', '310ff02388bbaa2b1c1710ee970b5678') variant('shared', default=True, description='Builds a shared version of the library') diff --git a/var/spack/repos/builtin/packages/adios2/package.py b/var/spack/repos/builtin/packages/adios2/package.py index 2ba986af86..bda425443a 100644 --- a/var/spack/repos/builtin/packages/adios2/package.py +++ b/var/spack/repos/builtin/packages/adios2/package.py @@ -30,11 +30,11 @@ class Adios2(CMakePackage): homepage = "https://www.olcf.ornl.gov/center-projects/adios/" url = "https://github.com/ornladios/ADIOS2/archive/v2.0.0.tar.gz" - maintainers = ['ax3l'] + git = "https://github.com/ornladios/ADIOS2.git" - version('develop', branch='master', - git='https://github.com/ornladios/ADIOS2.git') + maintainers = ['ax3l'] + version('develop', branch='master') version('2.1.0', '431fa5b015349f1838b96b8f5a1cc8f8') version('2.0.0', 'da39655b51745d2c5f3f1e46c5abc4d7') diff --git a/var/spack/repos/builtin/packages/adol-c/package.py b/var/spack/repos/builtin/packages/adol-c/package.py index b6f00b7eeb..5597c1ec7e 100644 --- a/var/spack/repos/builtin/packages/adol-c/package.py +++ b/var/spack/repos/builtin/packages/adol-c/package.py @@ -29,11 +29,12 @@ class AdolC(AutotoolsPackage): """A package for the automatic differentiation of first and higher derivatives of vector functions in C and C++ programs by operator overloading.""" + homepage = "https://projects.coin-or.org/ADOL-C" url = "http://www.coin-or.org/download/source/ADOL-C/ADOL-C-2.6.1.tgz" + git = "https://gitlab.com/adol-c/adol-c.git" - version('develop', git='https://gitlab.com/adol-c/adol-c.git', - branch='master') + version('develop', branch='master') version('2.6.3', 'f78f67f70d5874830a1ad1c0f54e54f7') version('2.6.2', '0f9547584c99c0673e4f81cf64e8d865') version('2.6.1', '1032b28427d6e399af4610e78c0f087b') diff --git a/var/spack/repos/builtin/packages/albany/package.py b/var/spack/repos/builtin/packages/albany/package.py index 40b7a286aa..eccbe67ce1 100644 --- a/var/spack/repos/builtin/packages/albany/package.py +++ b/var/spack/repos/builtin/packages/albany/package.py @@ -34,11 +34,11 @@ class Albany(CMakePackage): ice-sheet flow, quantum device modeling, and many other applications.""" homepage = "http://gahansen.github.io/Albany" - url = "https://github.com/gahansen/Albany/tarball/master" + git = "https://github.com/gahansen/Albany.git" maintainers = ['gahansen'] - version('develop', git='https://github.com/gahansen/Albany.git', branch='master') + version('develop', branch='master') variant('lcm', default=True, description='Enable LCM') diff --git a/var/spack/repos/builtin/packages/alquimia/package.py b/var/spack/repos/builtin/packages/alquimia/package.py index e579e8bbfe..467f5740be 100644 --- a/var/spack/repos/builtin/packages/alquimia/package.py +++ b/var/spack/repos/builtin/packages/alquimia/package.py @@ -30,10 +30,11 @@ class Alquimia(CMakePackage): of mature geochemistry codes such as CrunchFlow and PFLOTRAN""" homepage = "https://github.com/LBL-EESA/alquimia-dev" + git = "https://github.com/LBL-EESA/alquimia-dev.git" - version('xsdk-0.3.0', git='https://github.com/LBL-EESA/alquimia-dev.git', tag='xsdk-0.3.0') - version('xsdk-0.2.0', git='https://github.com/LBL-EESA/alquimia-dev.git', tag='xsdk-0.2.0') - version('develop', git='https://github.com/LBL-EESA/alquimia-dev.git') + version('develop') + version('xsdk-0.3.0', tag='xsdk-0.3.0') + version('xsdk-0.2.0', tag='xsdk-0.2.0') variant('shared', default=True, description='Enables the build of shared libraries') diff --git a/var/spack/repos/builtin/packages/amg/package.py b/var/spack/repos/builtin/packages/amg/package.py index f8a7c2745d..f2745ed26d 100644 --- a/var/spack/repos/builtin/packages/amg/package.py +++ b/var/spack/repos/builtin/packages/amg/package.py @@ -35,8 +35,8 @@ class Amg(MakefilePackage): homepage = "https://codesign.llnl.gov/amg2013.php" git = "https://github.com/LLNL/AMG" - version('1.0', git=git, tag='1.0') - version('develop', git=git, branch='master') + version('develop', branch='master') + version('1.0', tag='1.0') variant('openmp', default=True, description='Build with OpenMP support') variant('optflags', default=False, description='Additional optimizations') diff --git a/var/spack/repos/builtin/packages/amp/package.py b/var/spack/repos/builtin/packages/amp/package.py index 0e232e6a50..e80b924b11 100644 --- a/var/spack/repos/builtin/packages/amp/package.py +++ b/var/spack/repos/builtin/packages/amp/package.py @@ -41,14 +41,11 @@ class Amp(CMakePackage): to allow application domain scientists, computer scientists and mathematicians to simulate, collaborate, and conduct research on various aspects of massively parallel simulation algorithms.""" - homepage = "https://bitbucket.org/AdvancedMultiPhysics/amp" - - # ###################### Versions ########################## - version("develop", hg="https://bitbucket.org/AdvancedMultiPhysics/amp") - # ###################### Variants ########################## + homepage = "https://bitbucket.org/AdvancedMultiPhysics/amp" + hg = homepage - # ###################### Dependencies ########################## + version('develop') # Everything should be compiled position independent (-fpic) depends_on('blas') diff --git a/var/spack/repos/builtin/packages/amrex/package.py b/var/spack/repos/builtin/packages/amrex/package.py index d19f429421..4810af5e25 100644 --- a/var/spack/repos/builtin/packages/amrex/package.py +++ b/var/spack/repos/builtin/packages/amrex/package.py @@ -31,11 +31,11 @@ class Amrex(CMakePackage): """ homepage = "https://ccse.lbl.gov/AMReX/index.html" - url = "https://github.com/AMReX-Codes/amrex.git" + git = "https://github.com/AMReX-Codes/amrex.git" - version('17.06', git='https://github.com/AMReX-Codes/amrex.git', commit='836d3c7') - version('master', git='https://github.com/AMReX-Codes/amrex.git', tag='master') - version('develop', git='https://github.com/AMReX-Codes/amrex.git', tag='development') + version('develop', tag='development') + version('master', tag='master') + version('17.06', commit='836d3c7') variant('dims', default='3', diff --git a/var/spack/repos/builtin/packages/amrvis/package.py b/var/spack/repos/builtin/packages/amrvis/package.py index 049b70d03d..ca72e9e8eb 100644 --- a/var/spack/repos/builtin/packages/amrvis/package.py +++ b/var/spack/repos/builtin/packages/amrvis/package.py @@ -32,10 +32,9 @@ class Amrvis(MakefilePackage): """ homepage = "https://github.com/AMReX-Codes/Amrvis" - url = "https://github.com/AMReX-Codes/Amrvis.git" + git = "https://github.com/AMReX-Codes/Amrvis.git" - version('master', - git='https://github.com/AMReX-Codes/Amrvis.git', tag='master') + version('master', tag='master') variant( 'dims', diff --git a/var/spack/repos/builtin/packages/arpack-ng/package.py b/var/spack/repos/builtin/packages/arpack-ng/package.py index 1d99f62157..76a1929b2d 100644 --- a/var/spack/repos/builtin/packages/arpack-ng/package.py +++ b/var/spack/repos/builtin/packages/arpack-ng/package.py @@ -54,13 +54,14 @@ class ArpackNg(Package): """ homepage = 'https://github.com/opencollab/arpack-ng' - url = 'https://github.com/opencollab/arpack-ng/archive/3.3.0.tar.gz' + url = 'https://github.com/opencollab/arpack-ng/archive/3.3.0.tar.gz' + git = 'https://github.com/opencollab/arpack-ng.git' + version('develop', branch='master') version('3.6.0', 'f2607c1d5f80e922d55751fbed86a8ec') version('3.5.0', '9762c9ae6d739a9e040f8201b1578874') version('3.4.0', 'ae9ca13f2143a7ea280cb0e2fd4bfae4') version('3.3.0', 'ed3648a23f0a868a43ef44c97a21bad5') - version('develop', git='https://github.com/opencollab/arpack-ng.git', branch='master') variant('shared', default=True, description='Enables the build of shared libraries') diff --git a/var/spack/repos/builtin/packages/ascent/package.py b/var/spack/repos/builtin/packages/ascent/package.py index 22a3da578b..018221fe6c 100644 --- a/var/spack/repos/builtin/packages/ascent/package.py +++ b/var/spack/repos/builtin/packages/ascent/package.py @@ -47,14 +47,11 @@ class Ascent(Package): simulations.""" homepage = "https://github.com/Alpine-DAV/ascent" - url = "https://github.com/Alpine-DAV/ascent" + git = "https://github.com/Alpine-DAV/ascent.git" maintainers = ['cyrush'] - version('develop', - git='https://github.com/Alpine-DAV/ascent.git', - branch='develop', - submodules=True) + version('develop', branch='develop', submodules=True) ########################################################################### # package variants diff --git a/var/spack/repos/builtin/packages/aspa/package.py b/var/spack/repos/builtin/packages/aspa/package.py index 69ec2c0d1f..e58c8ade24 100644 --- a/var/spack/repos/builtin/packages/aspa/package.py +++ b/var/spack/repos/builtin/packages/aspa/package.py @@ -32,12 +32,14 @@ class Aspa(MakefilePackage): demands upon the exascale ecosystem that need to be identified and quantified. """ - tags = ['proxy-app'] + homepage = "http://www.exmatex.org/aspa.html" - url = "https://github.com/exmatex/ASPA/archive/master.tar.gz" + git = "https://github.com/exmatex/ASPA.git" + + tags = ['proxy-app'] + + version('master', branch='master') - version('master', git='https://github.com/exmatex/ASPA.git', - description='master') variant('mpi', default=True, description='Build with MPI Support') depends_on('lapack') diff --git a/var/spack/repos/builtin/packages/aspect/package.py b/var/spack/repos/builtin/packages/aspect/package.py index c55494f521..f19f6b470b 100644 --- a/var/spack/repos/builtin/packages/aspect/package.py +++ b/var/spack/repos/builtin/packages/aspect/package.py @@ -31,11 +31,12 @@ class Aspect(CMakePackage): homepage = "https://aspect.geodynamics.org" url = "https://github.com/geodynamics/aspect/releases/download/v2.0.0/aspect-2.0.0.tar.gz" + git = "https://github.com/geodynamics/aspect.git" maintainers = ['tjhei'] + version('develop', branch='master') version('2.0.0', 'dfecc571fb221f28a0800034cd29c95c') - version('develop', git='https://github.com/geodynamics/aspect.git', branch='master') variant('build_type', default='Release', description='The build type to build', diff --git a/var/spack/repos/builtin/packages/axl/package.py b/var/spack/repos/builtin/packages/axl/package.py index a9198a2ff6..21ba3f797e 100644 --- a/var/spack/repos/builtin/packages/axl/package.py +++ b/var/spack/repos/builtin/packages/axl/package.py @@ -40,11 +40,12 @@ class Axl(CMakePackage): homepage = "https://github.com/ECP-VeloC/AXL" url = "https://github.com/ECP-VeloC/AXL/archive/v0.1.0.zip" - tags = ['ecp'] + git = "https://github.com/ecp-veloc/axl.git" + tags = ['ecp'] + + version('master', branch='master') version('0.1.0', '1ff16c046c3a080c252e0bf4251b83bc') - version('master', git='https://github.com/ecp-veloc/axl.git', - branch='master') variant('async_api', default='daemon', description="Set of async transfer APIs to enable", diff --git a/var/spack/repos/builtin/packages/bash-completion/package.py b/var/spack/repos/builtin/packages/bash-completion/package.py index ff860baf77..71de10bc22 100644 --- a/var/spack/repos/builtin/packages/bash-completion/package.py +++ b/var/spack/repos/builtin/packages/bash-completion/package.py @@ -27,12 +27,14 @@ from spack import * class BashCompletion(AutotoolsPackage): """Programmable completion functions for bash.""" + homepage = "https://github.com/scop/bash-completion" - url = "https://github.com/scop/bash-completion/archive/2.3.tar.gz" + url = "https://github.com/scop/bash-completion/archive/2.3.tar.gz" + git = "https://github.com/scop/bash-completion.git" + version('develop', git=git) version('2.7', 'f72c9e2e877d188c3159956a3496a450e7279b76') version('2.3', '67e50f5f3c804350b43f2b664c33dde811d24292') - version('develop', git='https://github.com/scop/bash-completion.git') # Build dependencies depends_on('automake', type='build') diff --git a/var/spack/repos/builtin/packages/bbcp/package.py b/var/spack/repos/builtin/packages/bbcp/package.py index 7c05e7d4b9..7144e468d2 100644 --- a/var/spack/repos/builtin/packages/bbcp/package.py +++ b/var/spack/repos/builtin/packages/bbcp/package.py @@ -27,10 +27,11 @@ from spack import * class Bbcp(Package): """Securely and quickly copy data from source to target""" + homepage = "http://www.slac.stanford.edu/~abh/bbcp/" + git = "http://www.slac.stanford.edu/~abh/bbcp/bbcp.git" - version('git', git='http://www.slac.stanford.edu/~abh/bbcp/bbcp.git', - branch="master") + version('git', branch='master') depends_on('zlib') depends_on('openssl') diff --git a/var/spack/repos/builtin/packages/benchmark/package.py b/var/spack/repos/builtin/packages/benchmark/package.py index 98a309aeb3..24546d01d3 100644 --- a/var/spack/repos/builtin/packages/benchmark/package.py +++ b/var/spack/repos/builtin/packages/benchmark/package.py @@ -30,12 +30,12 @@ class Benchmark(CMakePackage): homepage = "https://github.com/google/benchmark" url = "https://github.com/google/benchmark/archive/v1.1.0.tar.gz" - - version('develop', branch='master', - git='https://github.com/google/benchmark.git') + git = "https://github.com/google/benchmark.git" # first properly installed CMake config packages in # 1.2.0 release: https://github.com/google/benchmark/issues/363 + + version('develop', branch='master') version('1.4.0', 'ccfaf2cd93ae20191b94f730b945423e') version('1.3.0', '19ce86516ab82d6ad3b17173cf307aac') version('1.2.0', '48d0b090cd7a84af2c4a28c8dc963c74') diff --git a/var/spack/repos/builtin/packages/biopieces/package.py b/var/spack/repos/builtin/packages/biopieces/package.py index b8337713f0..30435af0e3 100644 --- a/var/spack/repos/builtin/packages/biopieces/package.py +++ b/var/spack/repos/builtin/packages/biopieces/package.py @@ -32,10 +32,10 @@ class Biopieces(Package): simple and complex tasks.""" homepage = "http://maasha.github.io/biopieces/" - url = "https://github.com/maasha/biopieces/archive/2.0.tar.gz" + git = "https://github.com/maasha/biopieces.git" version('2016-04-12', commit='982f80f7c55e2cae67737d80fe35a4e784762856', - git='https://github.com/maasha/biopieces.git', submodules=True) + submodules=True) depends_on('perl', type=('build', 'run')) depends_on('perl-module-build', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/bml/package.py b/var/spack/repos/builtin/packages/bml/package.py index 093cfab3c4..fe9b04d26b 100644 --- a/var/spack/repos/builtin/packages/bml/package.py +++ b/var/spack/repos/builtin/packages/bml/package.py @@ -32,12 +32,13 @@ class Bml(CMakePackage): homepage = "http://lanl.github.io/bml/" url = "https://github.com/lanl/bml/tarball/v1.2.2" + git = "https://github.com/lanl/bml.git" + version('develop', branch='master') version('1.3.0', '2bf8546b27a89666dab3e8f4873cd117') version('1.2.3', '8133137fb56a27fade44d1588449c2ac') version('1.2.2', 'c86959cb0188e9d0a9a2cbad03b2782d') version('1.1.0', '271adecee08aee678be9eeceee06b6fb') - version('develop', git='https://github.com/lanl/bml', branch='master') variant('shared', default=True, description='Build shared libs') variant('mpi', default=True, description='Build with MPI Support') diff --git a/var/spack/repos/builtin/packages/bohrium/package.py b/var/spack/repos/builtin/packages/bohrium/package.py index 56f9acabb8..1a2a39a8e1 100644 --- a/var/spack/repos/builtin/packages/bohrium/package.py +++ b/var/spack/repos/builtin/packages/bohrium/package.py @@ -32,15 +32,16 @@ import os class Bohrium(CMakePackage, CudaPackage): """Library for automatic acceleration of array operations""" - homepage = "http://bh107.org" - url = "https://github.com/bh107/bohrium/archive/v0.8.9.tar.gz" + homepage = "http://bh107.org" + url = "https://github.com/bh107/bohrium/archive/v0.8.9.tar.gz" + git = "https://github.com/bh107/bohrium.git" + maintainers = ['mfherbst'] # # Versions # - version("develop", git="https://github.com/bh107/bohrium.git", - branch="master") + version("develop", branch="master") version('0.9.0', sha256="6f6379f1555de5a6a19138beac891a470df7df1fc9594e2b9404cf01b6e17d93") # diff --git a/var/spack/repos/builtin/packages/bookleaf-cpp/package.py b/var/spack/repos/builtin/packages/bookleaf-cpp/package.py index 8fe1e13dfc..eb2b0c100b 100644 --- a/var/spack/repos/builtin/packages/bookleaf-cpp/package.py +++ b/var/spack/repos/builtin/packages/bookleaf-cpp/package.py @@ -26,18 +26,15 @@ from spack import * class BookleafCpp(CMakePackage): - """ - BookLeaf is a 2D unstructured hydrodynamics mini-app. - """ + """BookLeaf is a 2D unstructured hydrodynamics mini-app.""" homepage = "https://github.com/UK-MAC/BookLeaf_Cpp" url = "https://github.com/UK-MAC/BookLeaf_Cpp/archive/v2.0.tar.gz" + git = "https://github.com/UK-MAC/BookLeaf_Cpp.git" - version('develop', git='https://github.com/UK-MAC/BookLeaf_Cpp', - branch='develop') - + version('develop', branch='develop') version('2.0.1', '34a5a9e7b2b5ffc98562656a4406ba5b') - version('2.0', '69819ebcbae5eaa63d1a4de2c77cac85') + version('2.0', '69819ebcbae5eaa63d1a4de2c77cac85') variant('typhon', default=True, description='Use Typhon') variant('parmetis', default=False, description='Use ParMETIS') diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index 8ec6b24593..6fac5541c7 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -38,30 +38,21 @@ class Boost(Package): """ homepage = "http://www.boost.org" url = "http://downloads.sourceforge.net/project/boost/boost/1.55.0/boost_1_55_0.tar.bz2" + git = "https://github.com/boostorg/boost.git" list_url = "http://sourceforge.net/projects/boost/files/boost/" list_depth = 1 - version('develop', - git='https://github.com/boostorg/boost.git', - branch='develop', - submodules=True) - - version('1.67.0', '694ae3f4f899d1a80eb7a3b31b33be73c423c1ae', - url='https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.tar.bz2') - version('1.66.0', 'b6b284acde2ad7ed49b44e856955d7b1ea4e9459', - url='https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2') - version('1.65.1', '41d7542ce40e171f3f7982aff008ff0d', - url='https://dl.bintray.com/boostorg/release/1.65.1/source/boost_1_65_1.tar.bz2') - version('1.65.0', '5512d3809801b0a1b9dd58447b70915d', - url='https://dl.bintray.com/boostorg/release/1.65.0/source/boost_1_65_0.tar.bz2') + version('develop', branch='develop', submodules=True) + version('1.67.0', '694ae3f4f899d1a80eb7a3b31b33be73c423c1ae') + version('1.66.0', 'b6b284acde2ad7ed49b44e856955d7b1ea4e9459') + version('1.65.1', '41d7542ce40e171f3f7982aff008ff0d') + version('1.65.0', '5512d3809801b0a1b9dd58447b70915d') # NOTE: 1.64.0 seems fine for *most* applications, but if you need # +python and +mpi, there seem to be errors with out-of-date # API calls from mpi/python. # See: https://github.com/spack/spack/issues/3963 - version('1.64.0', '93eecce2abed9d2442c9676914709349', - url='https://dl.bintray.com/boostorg/release/1.64.0/source/boost_1_64_0.tar.bz2') - version('1.63.0', '1c837ecd990bb022d07e7aab32b09847', - url='https://dl.bintray.com/boostorg/release/1.63.0/source/boost_1_63_0.tar.bz2') + version('1.64.0', '93eecce2abed9d2442c9676914709349') + version('1.63.0', '1c837ecd990bb022d07e7aab32b09847') version('1.62.0', '5fb94629535c19e48703bdb2b2e9490f') version('1.61.0', '6095876341956f65f9d35939ccea1a9f') version('1.60.0', '65a840e1a0b13a558ff19eeb2c4f0cbe') @@ -182,7 +173,11 @@ class Boost(Package): patch('boost_1.63.0_pgi_17.4_workaround.patch', when='@1.63.0%pgi@17.4') def url_for_version(self, version): - url = "http://downloads.sourceforge.net/project/boost/boost/{0}/boost_{1}.tar.bz2" + if version >= Version('1.63.0'): + url = "https://dl.bintray.com/boostorg/release/{0}/source/boost_{1}.tar.bz2" + else: + url = "http://downloads.sourceforge.net/project/boost/boost/{0}/boost_{1}.tar.bz2" + return url.format(version.dotted, version.underscored) def determine_toolset(self, spec): diff --git a/var/spack/repos/builtin/packages/branson/package.py b/var/spack/repos/builtin/packages/branson/package.py index 8546fe396f..999a08d891 100644 --- a/var/spack/repos/builtin/packages/branson/package.py +++ b/var/spack/repos/builtin/packages/branson/package.py @@ -32,10 +32,11 @@ class Branson(CMakePackage): homepage = "https://github.com/lanl/branson" url = "https://github.com/lanl/branson/archive/1.01.zip" + git = "https://github.com/lanl/branson" tags = ['proxy-app'] - version('develop', git='https://github.com/lanl/branson', branch='develop') + version('develop', branch='develop') version('1.01', 'cf7095a887a8dd7d417267615bd0452a') depends_on('mpi@2:') diff --git a/var/spack/repos/builtin/packages/breakdancer/package.py b/var/spack/repos/builtin/packages/breakdancer/package.py index 2396bf5354..570fd76230 100644 --- a/var/spack/repos/builtin/packages/breakdancer/package.py +++ b/var/spack/repos/builtin/packages/breakdancer/package.py @@ -37,10 +37,9 @@ class Breakdancer(CMakePackage): 100bp) using normally mapped read pairs..""" homepage = "http://gmt.genome.wustl.edu/packages/breakdancer" - url = "https://github.com/genome/breakdancer.git" + git = "https://github.com/genome/breakdancer.git" - version('master', git='https://github.com/genome/breakdancer.git', - submodules='true') + version('master', submodules='true') depends_on('zlib') diff --git a/var/spack/repos/builtin/packages/brigand/package.py b/var/spack/repos/builtin/packages/brigand/package.py index 2431de57e1..dddff731c0 100644 --- a/var/spack/repos/builtin/packages/brigand/package.py +++ b/var/spack/repos/builtin/packages/brigand/package.py @@ -27,15 +27,13 @@ from spack import * class Brigand(Package): - """ - Brigand Meta-programming library - """ + """Brigand Meta-programming library""" homepage = "https://github.com/edouarda/brigand" url = "https://github.com/edouarda/brigand/archive/1.0.0.tar.gz" + git = "https://github.com/edouarda/brigand.git" - version('master', git='https://github.com/edouarda/brigand.git', - branch='master') + version('master', branch='master') version('1.3.0', '0bea9713b3b712229aed289e218d577b') version('1.2.0', '32c0f73e7e666d33ff123334f5c9c92f') version('1.1.0', '073b7c8e2cbda3a81bbeb1ea5b9ca0eb') diff --git a/var/spack/repos/builtin/packages/busco/package.py b/var/spack/repos/builtin/packages/busco/package.py index 48c4c50719..a6b97da35d 100644 --- a/var/spack/repos/builtin/packages/busco/package.py +++ b/var/spack/repos/builtin/packages/busco/package.py @@ -31,14 +31,14 @@ class Busco(PythonPackage): homepage = "http://busco.ezlab.org/" url = "https://gitlab.com/api/v4/projects/ezlab%2Fbusco/repository/archive.tar.gz?sha=2.0.1" + git = "https://gitlab.com/ezlab/busco.git" # TODO: check the installation procedure for version 3.0.2 # and uncomment the following line # version('3.0.2', '31d80042bb7e96422843fa43d0acbd21') # There is no tag for version 3.0.1 - version('3.0.1', git='https://gitlab.com/ezlab/busco.git', - commit='078252e00399550d7b0e8941cd4d986c8e868a83') + version('3.0.1', commit='078252e00399550d7b0e8941cd4d986c8e868a83') version('2.0.1', '4dbcc8a0c18fa8f8312c103eb2fbb4e2') depends_on('python', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/caliper/package.py b/var/spack/repos/builtin/packages/caliper/package.py index 6c9a5a4064..b2ba46253f 100644 --- a/var/spack/repos/builtin/packages/caliper/package.py +++ b/var/spack/repos/builtin/packages/caliper/package.py @@ -36,18 +36,18 @@ class Caliper(CMakePackage): """ homepage = "https://github.com/LLNL/Caliper" - url = "" + git = "https://github.com/LLNL/Caliper.git" - version('master', git='https://github.com/LLNL/Caliper.git') - version('1.7.0', git='https://github.com/LLNL/Caliper.git', tag='v1.7.0') + version('master') + version('1.7.0', tag='v1.7.0') # version 1.6.0 is broken b/c it downloads the wrong gotcha version - version('1.6.0', git='https://github.com/LLNL/Caliper.git', tag='v1.6.0') + version('1.6.0', tag='v1.6.0') is_linux = sys.platform.startswith('linux') - variant('mpi', default=True, + variant('mpi', default=True, description='Enable MPI wrappers') - variant('dyninst', default=False, + variant('dyninst', default=False, description='Enable symbol translation support with dyninst') # libunwind has some issues on Mac variant('callpath', default=sys.platform != 'darwin', diff --git a/var/spack/repos/builtin/packages/camellia/package.py b/var/spack/repos/builtin/packages/camellia/package.py index 147c2181e7..715c19f041 100644 --- a/var/spack/repos/builtin/packages/camellia/package.py +++ b/var/spack/repos/builtin/packages/camellia/package.py @@ -31,10 +31,11 @@ class Camellia(CMakePackage): """ homepage = "https://bitbucket.org/nateroberts/Camellia" - url = "https://bitbucket.org/nateroberts/camellia.git" + git = "https://bitbucket.org/nateroberts/camellia.git" maintainers = ['CamelliaDPG'] - version('master', git='https://bitbucket.org/nateroberts/camellia.git', branch='master') + + version('master', branch='master') variant('moab', default=True, description='Compile with MOAB to include support for reading standard mesh formats') diff --git a/var/spack/repos/builtin/packages/cares/package.py b/var/spack/repos/builtin/packages/cares/package.py index 23d2eacaab..894f646c00 100644 --- a/var/spack/repos/builtin/packages/cares/package.py +++ b/var/spack/repos/builtin/packages/cares/package.py @@ -30,10 +30,9 @@ class Cares(CMakePackage): homepage = "https://c-ares.haxx.se" url = "https://github.com/c-ares/c-ares/archive/cares-1_13_0.tar.gz" + git = "https://github.com/c-ares/c-ares.git" - version('develop', branch='master', - git='https://github.com/c-ares/c-ares.git') - + version('develop', branch='master') version('1.13.0', 'cdb21052a7eb85261da22f83c0654cfd') def url_for_version(self, version): diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py index 6e9a2beea1..668cd5c8d5 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py @@ -48,13 +48,10 @@ class CbtfArgonavisGui(QMakePackage): performance information by loading in the Sqlite database files. """ homepage = "http://sourceforge.net/p/cbtf/wiki/Home/" - url = "https://github.com/OpenSpeedShop/cbtf-argonavis-gui.git" + git = "https://github.com/OpenSpeedShop/cbtf-argonavis-gui.git" - version('1.3.0.0', branch='1.3.0.0', - git='https://github.com/OpenSpeedShop/cbtf-argonavis-gui.git') - - version('develop', branch='master', - git='https://github.com/OpenSpeedShop/cbtf-argonavis-gui.git') + version('develop', branch='master') + version('1.3.0.0', branch='1.3.0.0') depends_on("cmake@3.0.2:", type='build') diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py index 9fe4752e41..0ec1114211 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py @@ -46,19 +46,13 @@ from spack import * class CbtfArgonavis(CMakePackage): """CBTF Argo Navis project contains the CUDA collector and supporting libraries that was done as a result of a DOE SBIR grant. - """ homepage = "http://sourceforge.net/p/cbtf/wiki/Home/" - url = "https://github.com/OpenSpeedShop/cbtf-argonavis.git" - - version('1.9.1.1', branch='1.9.1.1', - git='https://github.com/OpenSpeedShop/cbtf-argonavis.git') - - version('1.9.1.0', branch='1.9.1.0', - git='https://github.com/OpenSpeedShop/cbtf-argonavis.git') + git = "https://github.com/OpenSpeedShop/cbtf-argonavis.git" - version('develop', branch='master', - git='https://github.com/OpenSpeedShop/cbtf-argonavis.git') + version('develop', branch='master') + version('1.9.1.1', branch='1.9.1.1') + version('1.9.1.0', branch='1.9.1.0') variant('cti', default=False, description="Build MRNet with the CTI startup option") diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py index bdf17ddd4b..6ca54a8433 100644 --- a/var/spack/repos/builtin/packages/cbtf-krell/package.py +++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py @@ -50,19 +50,13 @@ class CbtfKrell(CMakePackage): CBTF project. These contributions include many performance data collectors and support libraries as well as some example tools that drive the data collection at HPC levels of scale. - """ homepage = "http://sourceforge.net/p/cbtf/wiki/Home/" - url = "https://github.com/OpenSpeedShop/cbtf-krell.git" - - version('develop', branch='master', - git='https://github.com/OpenSpeedShop/cbtf-krell.git') - - version('1.9.1.1', branch='1.9.1.1', - git='https://github.com/OpenSpeedShop/cbtf-krell.git') + git = "https://github.com/OpenSpeedShop/cbtf-krell.git" - version('1.9.1.0', branch='1.9.1.0', - git='https://github.com/OpenSpeedShop/cbtf-krell.git') + version('develop', branch='master') + version('1.9.1.1', branch='1.9.1.1') + version('1.9.1.0', branch='1.9.1.0') # MPI variants variant('openmpi', default=False, diff --git a/var/spack/repos/builtin/packages/cbtf-lanl/package.py b/var/spack/repos/builtin/packages/cbtf-lanl/package.py index e52652e862..b61723575b 100644 --- a/var/spack/repos/builtin/packages/cbtf-lanl/package.py +++ b/var/spack/repos/builtin/packages/cbtf-lanl/package.py @@ -46,17 +46,13 @@ from spack import * class CbtfLanl(CMakePackage): """CBTF LANL project contains a memory tool and data center type system command monitoring tool.""" - homepage = "http://sourceforge.net/p/cbtf/wiki/Home/" - url = "https://github.com/OpenSpeedShop/cbtf-lanl.git" - - version('1.9.1.1', branch='1.9.1.1', - git='https://github.com/OpenSpeedShop/cbtf-lanl.git') - version('1.9.1.0', branch='1.9.1.0', - git='https://github.com/OpenSpeedShop/cbtf-lanl.git') + homepage = "http://sourceforge.net/p/cbtf/wiki/Home/" + git = "https://github.com/OpenSpeedShop/cbtf-lanl.git" - version('develop', branch='master', - git='https://github.com/OpenSpeedShop/cbtf-lanl.git') + version('develop', branch='master') + version('1.9.1.1', branch='1.9.1.1') + version('1.9.1.0', branch='1.9.1.0') variant('build_type', default='None', values=('None'), description='CMake build type') diff --git a/var/spack/repos/builtin/packages/cbtf/package.py b/var/spack/repos/builtin/packages/cbtf/package.py index 7a1ac536f5..e50b205180 100644 --- a/var/spack/repos/builtin/packages/cbtf/package.py +++ b/var/spack/repos/builtin/packages/cbtf/package.py @@ -51,17 +51,11 @@ class Cbtf(CMakePackage): """ homepage = "http://sourceforge.net/p/cbtf/wiki/Home" - url = "https://github.com/OpenSpeedShop/cbtf.git" + git = "https://github.com/OpenSpeedShop/cbtf.git" - # Use when the git repository is available - version('1.9.1.1', branch='1.9.1.1', - git='https://github.com/OpenSpeedShop/cbtf.git') - - version('1.9.1.0', branch='1.9.1.0', - git='https://github.com/OpenSpeedShop/cbtf.git') - - version('develop', branch='master', - git='https://github.com/OpenSpeedShop/cbtf.git') + version('develop', branch='master') + version('1.9.1.1', branch='1.9.1.1') + version('1.9.1.0', branch='1.9.1.0') variant('cti', default=False, description="Build MRNet with the CTI startup option") diff --git a/var/spack/repos/builtin/packages/cdbfasta/package.py b/var/spack/repos/builtin/packages/cdbfasta/package.py index 5eda8af773..c1e2b519cb 100644 --- a/var/spack/repos/builtin/packages/cdbfasta/package.py +++ b/var/spack/repos/builtin/packages/cdbfasta/package.py @@ -29,9 +29,9 @@ class Cdbfasta(MakefilePackage): """Fast indexing and retrieval of fasta records from flat file databases""" homepage = "https://github.com/gpertea/cdbfasta" - url = "https://github.com/gpertea/cdbfasta" + git = "https://github.com/gpertea/cdbfasta.git" - version('2017-03-16', git='https://github.com/gpertea/cdbfasta.git', commit='b3e481fe02dfbc767a3842bcb1b687c60376a5e8') + version('2017-03-16', commit='b3e481fe02dfbc767a3842bcb1b687c60376a5e8') depends_on('zlib') diff --git a/var/spack/repos/builtin/packages/charm/package.py b/var/spack/repos/builtin/packages/charm/package.py index b232e97442..fcd81db8de 100644 --- a/var/spack/repos/builtin/packages/charm/package.py +++ b/var/spack/repos/builtin/packages/charm/package.py @@ -38,9 +38,9 @@ class Charm(Package): homepage = "http://charmplusplus.org" url = "http://charm.cs.illinois.edu/distrib/charm-6.8.2.tar.gz" + git = "https://github.com/UIUC-PPL/charm" - version("develop", git="https://github.com/UIUC-PPL/charm") - + version("develop", git=git) version("6.8.2", "a887a34b638a5b2f7fcf7ff3c262496d") version("6.8.1", "3e95ffa760909154ef16b643c9bb8193") version("6.8.0", "54df066a5aefb0bbc1a263c2383c2bba") diff --git a/var/spack/repos/builtin/packages/chombo/package.py b/var/spack/repos/builtin/packages/chombo/package.py index 8baa39cc73..74717b88d4 100644 --- a/var/spack/repos/builtin/packages/chombo/package.py +++ b/var/spack/repos/builtin/packages/chombo/package.py @@ -34,14 +34,13 @@ class Chombo(MakefilePackage): logically rectangular (i.e. Cartesian) grids.""" homepage = "https://commons.lbl.gov/display/chombo" - url = "http://bitbucket.org/drhansj/chombo-xsdk.git" + git = "http://bitbucket.org/drhansj/chombo-xsdk.git" tags = ['ecp', 'ecp-apps'] # Use whatever path Brian V. and Terry L. agreed upon, but preserve version - version('3.2', git='http://bitbucket.org/drhansj/chombo-xsdk.git', commit='71d856c') - version('develop', git='http://bitbucket.org/drhansj/chombo-xsdk.git', tag='master') -# version('3.2', svn='https://anag-repo.lbl.gov/svn/Chombo/release/3.2') + version('3.2', commit='71d856c') + version('develop', tag='master') variant('mpi', default=True, description='Enable MPI parallel support') variant('hdf5', default=True, description='Enable HDF5 support') diff --git a/var/spack/repos/builtin/packages/cityhash/package.py b/var/spack/repos/builtin/packages/cityhash/package.py index 70856c6c8b..02200ace49 100644 --- a/var/spack/repos/builtin/packages/cityhash/package.py +++ b/var/spack/repos/builtin/packages/cityhash/package.py @@ -29,12 +29,10 @@ class Cityhash(AutotoolsPackage): """CityHash, a family of hash functions for strings.""" homepage = "https://github.com/google/cityhash" - url = "https://github.com/google/cityhash" + git = "https://github.com/google/cityhash.git" - version('2013-07-31', git='https://github.com/google/cityhash.git', - commit='8af9b8c2b889d80c22d6bc26ba0df1afb79a30db') - version('master', branch='master', - git='https://github.com/google/cityhash.git') + version('master', branch='master') + version('2013-07-31', commit='8af9b8c2b889d80c22d6bc26ba0df1afb79a30db') def configure_args(self): return ['--enable-sse4.2'] diff --git a/var/spack/repos/builtin/packages/clamr/package.py b/var/spack/repos/builtin/packages/clamr/package.py index ec31849a54..e6165b63de 100644 --- a/var/spack/repos/builtin/packages/clamr/package.py +++ b/var/spack/repos/builtin/packages/clamr/package.py @@ -32,10 +32,10 @@ class Clamr(CMakePackage): """ homepage = "https://github.com/lanl/CLAMR" - url = "https://github.com/lanl/CLAMR.git" + git = "https://github.com/lanl/CLAMR.git" tags = ['proxy-app'] - version('master', git='https://github.com/lanl/CLAMR.git') + version('master') variant( 'graphics', default='opengl', diff --git a/var/spack/repos/builtin/packages/cleverleaf/package.py b/var/spack/repos/builtin/packages/cleverleaf/package.py index f2488de89c..ec5e5ecdaa 100644 --- a/var/spack/repos/builtin/packages/cleverleaf/package.py +++ b/var/spack/repos/builtin/packages/cleverleaf/package.py @@ -31,14 +31,12 @@ class Cleverleaf(CMakePackage): Livermore National Laboratory. The primary goal of CleverLeaf is to evaluate the application of AMR to the Lagrangian-Eulerian hydrodynamics scheme used by CloverLeaf. - """ homepage = "http://uk-mac.github.io/CleverLeaf/" - url = "https://github.com/UK-MAC/CleverLeaf/tarball/master" + git = "https://github.com/UK-MAC/CleverLeaf_ref.git" - version('develop', git='https://github.com/UK-MAC/CleverLeaf_ref.git', - branch='develop') + version('develop', branch='develop') depends_on('samrai@3.8.0:') depends_on('hdf5+mpi') diff --git a/var/spack/repos/builtin/packages/cnmem/package.py b/var/spack/repos/builtin/packages/cnmem/package.py index 573b72f1ad..555db814f0 100644 --- a/var/spack/repos/builtin/packages/cnmem/package.py +++ b/var/spack/repos/builtin/packages/cnmem/package.py @@ -27,8 +27,10 @@ from spack import * class Cnmem(CMakePackage): """CNMem mempool for CUDA devices""" + homepage = "https://github.com/NVIDIA/cnmem" + git = "https://github.com/NVIDIA/cnmem.git" - version('git', git='https://github.com/NVIDIA/cnmem.git', branch="master") + version('git', branch='master') depends_on('cmake@2.8.8:', type='build') diff --git a/var/spack/repos/builtin/packages/cnpy/package.py b/var/spack/repos/builtin/packages/cnpy/package.py index 0112281c5a..52c7e16abe 100644 --- a/var/spack/repos/builtin/packages/cnpy/package.py +++ b/var/spack/repos/builtin/packages/cnpy/package.py @@ -31,9 +31,9 @@ class Cnpy(CMakePackage): """cnpy: library to read/write .npy and .npz files in C/C++.""" homepage = "https://github.com/rogersce/cnpy" - url = "https://github.com/rogersce/cnpy" + git = "https://github.com/rogersce/cnpy.git" - version('master', git='https://github.com/rogersce/cnpy.git', branch="master") + version('master', branch='master') def cmake_args(self): args = [] diff --git a/var/spack/repos/builtin/packages/cntk/package.py b/var/spack/repos/builtin/packages/cntk/package.py index 52d4e8f896..b78e1ed8b3 100644 --- a/var/spack/repos/builtin/packages/cntk/package.py +++ b/var/spack/repos/builtin/packages/cntk/package.py @@ -32,8 +32,9 @@ class Cntk(Package): homepage = "https://www.microsoft.com/en-us/research/product/cognitive-toolkit" url = "https://github.com/Microsoft/CNTK/archive/v2.0.tar.gz" + git = "https://github.com/Microsoft/CNTK.git" - version('master', git='https://github.com/Microsoft/CNTK.git', branch='master') + version('master', branch='master') version('2.0', '8038780f1169ceea578e5ef4d69e4c6f') variant('opencv', default=False, description="Enable OpenCV support.") diff --git a/var/spack/repos/builtin/packages/cntk1bitsgd/package.py b/var/spack/repos/builtin/packages/cntk1bitsgd/package.py index 71d65aba17..6969424e8c 100644 --- a/var/spack/repos/builtin/packages/cntk1bitsgd/package.py +++ b/var/spack/repos/builtin/packages/cntk1bitsgd/package.py @@ -32,10 +32,10 @@ class Cntk1bitsgd(Package): the Computational Network Toolkit (CNTK).""" homepage = "https://github.com/CNTK-components/CNTK1bitSGD" + git = "https://github.com/CNTK-components/CNTK1bitSGD.git" - version('master', git='https://github.com/CNTK-components/CNTK1bitSGD.git') - version('c8b77d', git='https://github.com/CNTK-components/CNTK1bitSGD.git', - commit='c8b77d6e325a4786547b27624890276c1483aed1') + version('master') + version('c8b77d', commit='c8b77d6e325a4786547b27624890276c1483aed1') def install(self, spec, prefix): mkdirp(prefix.include) diff --git a/var/spack/repos/builtin/packages/codar-cheetah/package.py b/var/spack/repos/builtin/packages/codar-cheetah/package.py index 956643add4..c2754f5f8a 100644 --- a/var/spack/repos/builtin/packages/codar-cheetah/package.py +++ b/var/spack/repos/builtin/packages/codar-cheetah/package.py @@ -32,11 +32,11 @@ class CodarCheetah(Package): """ homepage = "https://github.com/CODARcode/cheetah" - url = "https://github.com/CODARcode/cheetah/archive/v0.1.tar.gz" + url = "https://github.com/CODARcode/cheetah/archive/v0.1.tar.gz" + git = "https://github.com/CODARcode/cheetah.git" + version('develop', branch='master') version('0.1', '6918021f74fa7a2f1de26c0bb31a63ef') - version('develop', git='https://github.com/CODARcode/cheetah.git', - branch='master') depends_on('python@3:', type=('build', 'run')) depends_on('savanna') diff --git a/var/spack/repos/builtin/packages/coevp/package.py b/var/spack/repos/builtin/packages/coevp/package.py index 655f91062e..a6a8214fb5 100644 --- a/var/spack/repos/builtin/packages/coevp/package.py +++ b/var/spack/repos/builtin/packages/coevp/package.py @@ -39,9 +39,9 @@ class Coevp(MakefilePackage): proxy application provides the adaptive sampling support.""" homepage = 'https://github.com/exmatex/CoEVP' + git = 'https://github.com/exmatex/CoEVP.git' - version('develop', git='https://github.com/exmatex/CoEVP.git', - branch='master') + version('develop', branch='master') variant('mpi', default=True, description='Build with MPI Support') variant('silo', default=False, description='Build with silo Support') diff --git a/var/spack/repos/builtin/packages/cohmm/package.py b/var/spack/repos/builtin/packages/cohmm/package.py index 606ac973c6..c098dae60d 100644 --- a/var/spack/repos/builtin/packages/cohmm/package.py +++ b/var/spack/repos/builtin/packages/cohmm/package.py @@ -35,10 +35,9 @@ class Cohmm(MakefilePackage): tags = ['proxy-app'] homepage = "http://www.exmatex.org/cohmm.html" - url = "https://github.com/exmatex/CoHMM/archive/sad.tar.gz" + git = "https://github.com/exmatex/CoHMM.git" - version('develop', git='https://github.com/exmatex/CoHMM.git', - branch='sad') + version('develop', branch='sad') variant('openmp', default=True, description='Build with OpenMP Support') variant('gnuplot', default=False, description='Enable gnu plot Support') diff --git a/var/spack/repos/builtin/packages/comd/package.py b/var/spack/repos/builtin/packages/comd/package.py index 6fee9ac97f..2aed00a924 100644 --- a/var/spack/repos/builtin/packages/comd/package.py +++ b/var/spack/repos/builtin/packages/comd/package.py @@ -41,9 +41,10 @@ class Comd(MakefilePackage): homepage = "http://www.exmatex.org/comd.html" url = "https://github.com/ECP-copa/CoMD/archive/v1.1.tar.gz" + git = "https://github.com/ECP-copa/CoMD.git" + version('develop', branch='master') version('1.1', '5051310a8d2c93cccba63de40bcfaa78') - version('develop', git='https://github.com/ECP-copa/CoMD', branch='master') variant('mpi', default=True, description='Build with MPI support') variant('openmp', default=False, description='Build with OpenMP support') diff --git a/var/spack/repos/builtin/packages/conduit/package.py b/var/spack/repos/builtin/packages/conduit/package.py index d37300cd07..fac04a1751 100644 --- a/var/spack/repos/builtin/packages/conduit/package.py +++ b/var/spack/repos/builtin/packages/conduit/package.py @@ -46,8 +46,10 @@ class Conduit(Package): coupling between packages in-core, serialization, and I/O tasks.""" homepage = "http://software.llnl.gov/conduit" - url = "https://github.com/LLNL/conduit/releases/download/v0.3.0/conduit-v0.3.0-src-with-blt.tar.gz" + url = "https://github.com/LLNL/conduit/releases/download/v0.3.0/conduit-v0.3.0-src-with-blt.tar.gz" + git = "https://github.com/LLNL/conduit.git" + version('master', branch='master', submodules=True) version('0.3.1', 'b98d1476199a46bde197220cd9cde042') version('0.3.0', '6396f1d1ca16594d7c66d4535d4f898e') # note: checksums on github automatic release source tars changed ~9/17 @@ -56,11 +58,6 @@ class Conduit(Package): maintainers = ['cyrush'] - version('master', - git='https://github.com/LLNL/conduit.git', - branch="master", - submodules=True) - ########################################################################### # package variants ########################################################################### diff --git a/var/spack/repos/builtin/packages/cosp2/package.py b/var/spack/repos/builtin/packages/cosp2/package.py index 042f961ecd..001206132a 100644 --- a/var/spack/repos/builtin/packages/cosp2/package.py +++ b/var/spack/repos/builtin/packages/cosp2/package.py @@ -37,10 +37,9 @@ class Cosp2(MakefilePackage): tags = ['proxy-app'] homepage = "http://www.exmatex.org/cosp2.html" - url = "https://github.com/exmatex/CoSP2/archive/master.tar.gz" + git = "https://github.com/exmatex/CoSP2.git" - version('master', git='https://github.com/exmatex/CoSP2.git', - description='master') + version('master', branch='master') variant('double', default=True, description='Build with double precision.') diff --git a/var/spack/repos/builtin/packages/cppad/package.py b/var/spack/repos/builtin/packages/cppad/package.py index 98a6d0a9f6..40ed6a0de4 100644 --- a/var/spack/repos/builtin/packages/cppad/package.py +++ b/var/spack/repos/builtin/packages/cppad/package.py @@ -30,9 +30,10 @@ class Cppad(CMakePackage): homepage = "https://www.coin-or.org/CppAD/" url = "http://www.coin-or.org/download/source/CppAD/cppad-20170114.gpl.tgz" + git = "https://github.com/coin-or/CppAD.git" + version('develop', git=git) version('20170114', '565a534dc813fa1289764222cd8c11ea') - version('develop', git='https://github.com/coin-or/CppAD.git') def cmake_args(self): # This package does not obey CMAKE_INSTALL_PREFIX diff --git a/var/spack/repos/builtin/packages/cppzmq/package.py b/var/spack/repos/builtin/packages/cppzmq/package.py index 98f7c2d0d2..ec6da2769f 100644 --- a/var/spack/repos/builtin/packages/cppzmq/package.py +++ b/var/spack/repos/builtin/packages/cppzmq/package.py @@ -30,10 +30,9 @@ class Cppzmq(CMakePackage): homepage = "http://www.zeromq.org" url = "https://github.com/zeromq/cppzmq/archive/v4.2.2.tar.gz" + git = "https://github.com/zeromq/cppzmq.git" - version('develop', branch='master', - git='https://github.com/zeromq/cppzmq.git') - + version('develop', branch='master') version('4.2.2', 'bd809b47296e77fe9f192bd9dafd5cc3') depends_on('cmake@3.0.0:', type='build') diff --git a/var/spack/repos/builtin/packages/cpu-features/package.py b/var/spack/repos/builtin/packages/cpu-features/package.py index 157288a25c..8cc013acd8 100644 --- a/var/spack/repos/builtin/packages/cpu-features/package.py +++ b/var/spack/repos/builtin/packages/cpu-features/package.py @@ -29,10 +29,9 @@ class CpuFeatures(CMakePackage): """A cross platform C99 library to get cpu features at runtime.""" homepage = "https://github.com/google/cpu_features" - url = "https://github.com/google/cpu_features/archive/v0.1.0.tar.gz" + git = "https://github.com/google/cpu_features.git" - version('develop', branch='master', - git='https://github.com/google/cpu_features.git') + version('develop', branch='master') depends_on('cmake@3.0.0:', type='build') diff --git a/var/spack/repos/builtin/packages/cpuinfo/package.py b/var/spack/repos/builtin/packages/cpuinfo/package.py index fbc375f607..02c0587d84 100644 --- a/var/spack/repos/builtin/packages/cpuinfo/package.py +++ b/var/spack/repos/builtin/packages/cpuinfo/package.py @@ -30,6 +30,6 @@ class Cpuinfo(CMakePackage): for performance optimization information about host CPU.""" homepage = "https://github.com/Maratyszcza/cpuinfo/" - url = "https://github.com/Maratyszcza/cpuinfo.git" + git = "https://github.com/Maratyszcza/cpuinfo.git" - version('master', git='https://github.com/Maratyszcza/cpuinfo.git') + version('master') diff --git a/var/spack/repos/builtin/packages/cuda-memtest/package.py b/var/spack/repos/builtin/packages/cuda-memtest/package.py index 38b23793e3..cdafb9296d 100644 --- a/var/spack/repos/builtin/packages/cuda-memtest/package.py +++ b/var/spack/repos/builtin/packages/cuda-memtest/package.py @@ -35,11 +35,11 @@ class CudaMemtest(CMakePackage): """ homepage = "https://github.com/ComputationalRadiationPhysics/cuda_memtest" - url = "https://github.com/ComputationalRadiationPhysics/cuda_memtest.git" + git = "https://github.com/ComputationalRadiationPhysics/cuda_memtest.git" + maintainers = ['ax3l'] - version('master', branch='dev', - git='https://github.com/ComputationalRadiationPhysics/cuda_memtest.git') + version('master', branch='dev') depends_on('cmake@2.8.5:', type='build') # depends_on('nvml', when='+nvml') diff --git a/var/spack/repos/builtin/packages/dataspaces/package.py b/var/spack/repos/builtin/packages/dataspaces/package.py index d5fb3819fc..396ba83b0d 100644 --- a/var/spack/repos/builtin/packages/dataspaces/package.py +++ b/var/spack/repos/builtin/packages/dataspaces/package.py @@ -41,9 +41,9 @@ class Dataspaces(AutotoolsPackage): homepage = "http://www.dataspaces.org" url = "http://personal.cac.rutgers.edu/TASSL/projects/data/downloads/dataspaces-1.6.2.tar.gz" + git = "https://github.com/melrom/dataspaces.git" - version('develop', git='https://github.com/melrom/dataspaces.git', - branch='master') + version('develop', branch='master') version('1.6.2', '73caa4920b6f2c0c6d6cb87640ff04be') variant('dimes', diff --git a/var/spack/repos/builtin/packages/dealii-parameter-gui/package.py b/var/spack/repos/builtin/packages/dealii-parameter-gui/package.py index ac7492ea91..24e3a8a37d 100644 --- a/var/spack/repos/builtin/packages/dealii-parameter-gui/package.py +++ b/var/spack/repos/builtin/packages/dealii-parameter-gui/package.py @@ -30,9 +30,9 @@ class DealiiParameterGui(CMakePackage): files.""" homepage = "https://github.com/dealii/parameter_gui" - url = "https://github.com/dealii/parameter_gui" + git = "https://github.com/dealii/parameter_gui.git" - version('develop', git='https://github.com/dealii/parameter_gui.git', branch='master') + version('develop', branch='master') depends_on('qt') diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 8b56b9de8c..f1b4e848ca 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -28,8 +28,10 @@ from spack import * class Dealii(CMakePackage, CudaPackage): """C++ software library providing well-documented tools to build finite element codes for a broad variety of PDEs.""" + homepage = "https://www.dealii.org" - url = "https://github.com/dealii/dealii/releases/download/v8.4.1/dealii-8.4.1.tar.gz" + url = "https://github.com/dealii/dealii/releases/download/v8.4.1/dealii-8.4.1.tar.gz" + git = "https://github.com/dealii/dealii.git" maintainers = ['davydden', 'jppelteret'] @@ -37,6 +39,7 @@ class Dealii(CMakePackage, CudaPackage): # only add for immediate deps. transitive_rpaths = False + version('develop', branch='master') version('9.0.0', 'a4d45a67b2b028ecf81a6cb621cfaf84') version('8.5.1', '39b9ebd6ab083d63cfc9044319aaa2ee') version('8.5.0', 'ef999cc310b007559a6343bf5b1759bc') @@ -46,7 +49,6 @@ class Dealii(CMakePackage, CudaPackage): version('8.3.0', 'fc6cdcb16309ef4bea338a4f014de6fa') version('8.2.1', '71c728dbec14f371297cd405776ccf08') version('8.1.0', 'aa8fadc2ce5eb674f44f997461bf668d') - version('develop', git='https://github.com/dealii/dealii.git', branch='master') variant('mpi', default=True, description='Compile with MPI') variant('assimp', default=True, diff --git a/var/spack/repos/builtin/packages/delly2/package.py b/var/spack/repos/builtin/packages/delly2/package.py index ae3311d8e9..e219955144 100644 --- a/var/spack/repos/builtin/packages/delly2/package.py +++ b/var/spack/repos/builtin/packages/delly2/package.py @@ -32,10 +32,9 @@ class Delly2(MakefilePackage): short-read massively parallel sequencing data..""" homepage = "https://github.com/dellytools/delly" - url = "https://github.com/dellytools/delly" + git = "https://github.com/dellytools/delly.git" - version('2017-08-03', commit='e32a9cd55c7e3df5a6ae4a91f31a0deb354529fc', - git='https://github.com/dellytools/delly.git') + version('2017-08-03', commit='e32a9cd55c7e3df5a6ae4a91f31a0deb354529fc') depends_on('htslib') depends_on('boost') diff --git a/var/spack/repos/builtin/packages/dlpack/package.py b/var/spack/repos/builtin/packages/dlpack/package.py index 9edf7a49a9..5121b6ed84 100644 --- a/var/spack/repos/builtin/packages/dlpack/package.py +++ b/var/spack/repos/builtin/packages/dlpack/package.py @@ -30,8 +30,9 @@ class Dlpack(Package): in deep learning systems.""" homepage = "https://github.com/sjtuhpcc/dlpack" + git = "https://github.com/dmlc/dlpack.git" - version('master', git='https://github.com/dmlc/dlpack.git', branch='master') + version('master', branch='master') def install(self, spec, prefix): install_tree('include', prefix.include) diff --git a/var/spack/repos/builtin/packages/dmlc-core/package.py b/var/spack/repos/builtin/packages/dmlc-core/package.py index eb1b1ee09a..da63a3404c 100644 --- a/var/spack/repos/builtin/packages/dmlc-core/package.py +++ b/var/spack/repos/builtin/packages/dmlc-core/package.py @@ -31,11 +31,10 @@ class DmlcCore(CMakePackage): distributed machine learning libraries.""" homepage = "https://github.com/dmlc/dmlc-core" - url = "https://github.com/dmlc/dmlc-core.git" + git = "https://github.com/dmlc/dmlc-core.git" - version('master', git='https://github.com/dmlc/dmlc-core.git') - version('20170508', git='https://github.com/dmlc/dmlc-core.git', - commit='a6c5701219e635fea808d264aefc5b03c3aec314') + version('master') + version('20170508', commit='a6c5701219e635fea808d264aefc5b03c3aec314') variant('openmp', default=False, description='Enable OpenMP support') diff --git a/var/spack/repos/builtin/packages/dyninst/package.py b/var/spack/repos/builtin/packages/dyninst/package.py index df7c0a3f7f..e2aa774126 100644 --- a/var/spack/repos/builtin/packages/dyninst/package.py +++ b/var/spack/repos/builtin/packages/dyninst/package.py @@ -30,17 +30,16 @@ class Dyninst(Package): are executing without recompiling, re-linking, or re-executing.""" homepage = "https://paradyn.org" - url = "https://github.com/dyninst/dyninst/archive/v9.2.0.tar.gz" - list_url = "http://www.dyninst.org/downloads/dyninst-8.x" + git = "https://github.com/dyninst/dyninst.git" - version('develop', git="https://github.com/dyninst/dyninst.git", branch='master') - version('9.3.2', git="https://github.com/dyninst/dyninst.git", tag='v9.3.2') - version('9.3.0', git="https://github.com/dyninst/dyninst.git", tag='v9.3.0') - version('9.2.0', git="https://github.com/dyninst/dyninst.git", tag='v9.2.0') - version('9.1.0', git="https://github.com/dyninst/dyninst.git", tag='v9.1.0') - version('8.2.1', git="https://github.com/dyninst/dyninst.git", tag='v8.2.1') - version('8.1.2', git="https://github.com/dyninst/dyninst.git", tag='v8.1.2') - version('8.1.1', git="https://github.com/dyninst/dyninst.git", tag='v8.1.1') + version('develop', branch='master') + version('9.3.2', tag='v9.3.2') + version('9.3.0', tag='v9.3.0') + version('9.2.0', tag='v9.2.0') + version('9.1.0', tag='v9.1.0') + version('8.2.1', tag='v8.2.1') + version('8.1.2', tag='v8.1.2') + version('8.1.1', tag='v8.1.1') variant('stat_dysect', default=False, description="patch for STAT's DySectAPI") diff --git a/var/spack/repos/builtin/packages/ebms/package.py b/var/spack/repos/builtin/packages/ebms/package.py index c6ac087ed2..8a700abb0d 100644 --- a/var/spack/repos/builtin/packages/ebms/package.py +++ b/var/spack/repos/builtin/packages/ebms/package.py @@ -37,9 +37,9 @@ class Ebms(MakefilePackage): """ homepage = "https://github.com/ANL-CESAR/EBMS" - url = "https://github.com/ANL-CESAR/EBMS/archive/master.tar.gz" + git = "https://github.com/ANL-CESAR/EBMS.git" - version('develop', git='https://github.com/ANL-CESAR/EBMS.git') + version('develop') variant('mpi', default=True, description='Build with MPI support') diff --git a/var/spack/repos/builtin/packages/elemental/package.py b/var/spack/repos/builtin/packages/elemental/package.py index b82d57b147..a1ac76b889 100644 --- a/var/spack/repos/builtin/packages/elemental/package.py +++ b/var/spack/repos/builtin/packages/elemental/package.py @@ -33,8 +33,9 @@ class Elemental(CMakePackage): homepage = "http://libelemental.org" url = "https://github.com/elemental/Elemental/archive/v0.87.7.tar.gz" + git = "https://github.com/elemental/Elemental.git" - version('develop', git='https://github.com/elemental/Elemental.git', branch='master') + version('develop', branch='master') version('0.87.7', '6c1e7442021c59a36049e37ea69b8075') version('0.87.6', '9fd29783d45b0a0e27c0df85f548abe9') diff --git a/var/spack/repos/builtin/packages/er/package.py b/var/spack/repos/builtin/packages/er/package.py index 7ff1416eef..90f7805da5 100644 --- a/var/spack/repos/builtin/packages/er/package.py +++ b/var/spack/repos/builtin/packages/er/package.py @@ -30,11 +30,12 @@ class Er(CMakePackage): homepage = "https://github.com/ECP-VeloC/er" url = "https://github.com/ECP-VeloC/er/archive/v0.0.1.zip" - tags = ['ecp'] + git = "https://github.com/ecp-veloc/er.git" + tags = ['ecp'] + + version('master', branch='master') version('0.0.2', '24ad8f87bce2b6d900f1fb67452c3672') - version('master', git='https://github.com/ecp-veloc/er.git', - branch='master') depends_on('mpi') depends_on('kvtree') diff --git a/var/spack/repos/builtin/packages/everytrace-example/package.py b/var/spack/repos/builtin/packages/everytrace-example/package.py index 1d764e2733..f3f95d850b 100644 --- a/var/spack/repos/builtin/packages/everytrace-example/package.py +++ b/var/spack/repos/builtin/packages/everytrace-example/package.py @@ -29,9 +29,9 @@ class EverytraceExample(CMakePackage): """Get stack trace EVERY time a program exits.""" homepage = "https://github.com/citibeth/everytrace-example" - version('develop', - git='https://github.com/citibeth/everytrace-example.git', - branch='develop') + git = "https://github.com/citibeth/everytrace-example.git" + + version('develop', branch='develop') depends_on('everytrace+mpi+fortran') diff --git a/var/spack/repos/builtin/packages/everytrace/package.py b/var/spack/repos/builtin/packages/everytrace/package.py index e0cb9630ff..0ce78ac2d4 100644 --- a/var/spack/repos/builtin/packages/everytrace/package.py +++ b/var/spack/repos/builtin/packages/everytrace/package.py @@ -29,13 +29,13 @@ class Everytrace(CMakePackage): """Get stack trace EVERY time a program exits.""" homepage = "https://github.com/citibeth/everytrace" - url = "https://github.com/citibeth/everytrace/archive/0.2.2.tar.gz" + url = "https://github.com/citibeth/everytrace/archive/0.2.2.tar.gz" + git = "https://github.com/citibeth/everytrace.git" maintainers = ['citibeth'] + version('develop', branch='develop') version('0.2.2', 'dd60b8bf68cbf3dc2be305a040f2fe3e') - version('develop', - git='https://github.com/citibeth/everytrace.git', branch='develop') variant('mpi', default=True, description='Enables MPI parallelism') variant('fortran', default=True, diff --git a/var/spack/repos/builtin/packages/examinimd/package.py b/var/spack/repos/builtin/packages/examinimd/package.py index f2932eda7f..f4a493342b 100644 --- a/var/spack/repos/builtin/packages/examinimd/package.py +++ b/var/spack/repos/builtin/packages/examinimd/package.py @@ -41,9 +41,10 @@ class Examinimd(MakefilePackage): homepage = "https://github.com/ECP-copa/ExaMiniMD" url = "https://github.com/ECP-copa/ExaMiniMD/archive/1.0.zip" + git = "https://github.com/ECP-copa/ExaMiniMD.git" + version('develop', branch='master') version('1.0', '5db7679a4b9296c0cc3b2ff3a7e8f38f') - version('develop', git='https://github.com/ECP-copa/ExaMiniMD', branch='master') variant('mpi', default=True, description='Build with MPI support') variant('openmp', default=False, description='Build with OpenMP support') diff --git a/var/spack/repos/builtin/packages/exampm/package.py b/var/spack/repos/builtin/packages/exampm/package.py index eba2fbc442..eb808203a2 100644 --- a/var/spack/repos/builtin/packages/exampm/package.py +++ b/var/spack/repos/builtin/packages/exampm/package.py @@ -29,9 +29,8 @@ class Exampm(CMakePackage): """Exascale Material Point Method (MPM) Mini-App""" homepage = "https://github.com/ECP-copa/ExaMPM" - url = "https://github.com/ECP-copa/ExaMPM" + git = "https://github.com/ECP-copa/ExaMPM.git" - version('develop', git='https://github.com/ECP-copa/ExaMPM', - branch='master') + version('develop', branch='master') tags = ['proxy-app'] diff --git a/var/spack/repos/builtin/packages/exasp2/package.py b/var/spack/repos/builtin/packages/exasp2/package.py index 5c759df4bc..f796827317 100644 --- a/var/spack/repos/builtin/packages/exasp2/package.py +++ b/var/spack/repos/builtin/packages/exasp2/package.py @@ -44,10 +44,10 @@ class Exasp2(MakefilePackage): homepage = "https://github.com/ECP-copa/ExaSP2" url = "https://github.com/ECP-copa/ExaSP2/tarball/v1.0" + git = "https://github.com/ECP-copa/ExaSP2.git" + version('develop', branch='master') version('1.0', 'dba545995acc73f2bd1101bcb377bff5') - version('develop', git='https://github.com/ECP-copa/ExaSP2', - branch='master') variant('mpi', default=True, description='Build With MPI Support') diff --git a/var/spack/repos/builtin/packages/exodusii/package.py b/var/spack/repos/builtin/packages/exodusii/package.py index 3a17a52dde..4b504c3153 100644 --- a/var/spack/repos/builtin/packages/exodusii/package.py +++ b/var/spack/repos/builtin/packages/exodusii/package.py @@ -35,13 +35,12 @@ class Exodusii(CMakePackage): data transfer between codes. An Exodus II data file is a random access, machine independent, binary file that is written and read via C, C++, or Fortran API routines. - """ homepage = "https://github.com/gsjaardema/seacas" - url = "https://github.com/gsjaardema/seacas/archive/master.zip" + git = "https://github.com/gsjaardema/seacas.git" - version('2016-08-09', git='https://github.com/gsjaardema/seacas.git', commit='2ffeb1b') + version('2016-08-09', commit='2ffeb1b') variant('mpi', default=True, description='Enables MPI parallelism.') diff --git a/var/spack/repos/builtin/packages/express/package.py b/var/spack/repos/builtin/packages/express/package.py index 6d792f5479..f4ca8e9641 100644 --- a/var/spack/repos/builtin/packages/express/package.py +++ b/var/spack/repos/builtin/packages/express/package.py @@ -32,10 +32,9 @@ class Express(CMakePackage): target sequences from sampled subsequences.""" homepage = "http://bio.math.berkeley.edu/eXpress/" - url = "https://github.com/adarob/eXpress" + git = "https://github.com/adarob/eXpress.git" - version('2015-11-29', commit='f845cab2c7f2d9247b35143e4aa05869cfb10e79', - git='https://github.com/adarob/eXpress.git') + version('2015-11-29', commit='f845cab2c7f2d9247b35143e4aa05869cfb10e79') depends_on('boost') depends_on('bamtools') diff --git a/var/spack/repos/builtin/packages/falcon/package.py b/var/spack/repos/builtin/packages/falcon/package.py index ec6cd1814d..f0a565cf35 100644 --- a/var/spack/repos/builtin/packages/falcon/package.py +++ b/var/spack/repos/builtin/packages/falcon/package.py @@ -36,11 +36,9 @@ class Falcon(PythonPackage): front-end written in Python for convenience.""" homepage = "https://github.com/PacificBiosciences/FALCON" - url = "https://github.com/PacificBiosciences/FALCON.git" + git = "https://github.com/PacificBiosciences/FALCON.git" - version('2017-05-30', - git='https://github.com/PacificBiosciences/FALCON.git', - commit='86cec6157291679095ea6080b0cde6561eccc041') + version('2017-05-30', commit='86cec6157291679095ea6080b0cde6561eccc041') depends_on('py-setuptools', type='run') depends_on('py-pypeflow', type='run') diff --git a/var/spack/repos/builtin/packages/farmhash/package.py b/var/spack/repos/builtin/packages/farmhash/package.py index b95c920f7b..23c9af82a4 100644 --- a/var/spack/repos/builtin/packages/farmhash/package.py +++ b/var/spack/repos/builtin/packages/farmhash/package.py @@ -28,14 +28,12 @@ from shutil import copyfile class Farmhash(CMakePackage): - """ - FarmHash provides hash functions for strings and other data. - """ + """FarmHash provides hash functions for strings and other data.""" homepage = "https://github.com/google/farmhash" + git = "https://github.com/google/farmhash.git" - version('92e897', git='https://github.com/google/farmhash.git', - commit='92e897b282426729f4724d91a637596c7e2fe28f') + version('92e897', commit='92e897b282426729f4724d91a637596c7e2fe28f') def patch(self): copyfile(join_path(os.path.dirname(__file__), "CMakeLists.txt"), diff --git a/var/spack/repos/builtin/packages/fast-gbs/package.py b/var/spack/repos/builtin/packages/fast-gbs/package.py index 0805539630..feddf105d9 100644 --- a/var/spack/repos/builtin/packages/fast-gbs/package.py +++ b/var/spack/repos/builtin/packages/fast-gbs/package.py @@ -31,9 +31,9 @@ class FastGbs(Package): genotyping-by-sequencing (GBS) libraries.""" homepage = "https://bitbucket.org/jerlar73/fast-gbs" - url = "https://bitbucket.org/jerlar73/fast-gbs" + git = "https://bitbucket.org/jerlar73/fast-gbs.git" - version('2017-01-25', git='https://bitbucket.org/jerlar73/fast-gbs.git', commit='3b3cbffa84d269419692067c6a3de08b3b88849c') + version('2017-01-25', commit='3b3cbffa84d269419692067c6a3de08b3b88849c') depends_on('parallel', type='run') depends_on('python@2.7:', type='run') diff --git a/var/spack/repos/builtin/packages/fastqvalidator/package.py b/var/spack/repos/builtin/packages/fastqvalidator/package.py index bf2ab45b11..fca9a5bd95 100644 --- a/var/spack/repos/builtin/packages/fastqvalidator/package.py +++ b/var/spack/repos/builtin/packages/fastqvalidator/package.py @@ -29,10 +29,9 @@ class Fastqvalidator(MakefilePackage): """The fastQValidator validates the format of fastq files.""" homepage = "http://genome.sph.umich.edu/wiki/FastQValidator" - url = "https://github.com/statgen/fastQValidator/archive/v0.1.1a.tar.gz" + git = "https://github.com/statgen/fastQValidator.git" - version('2017-01-10', commit='6d619a34749e9d33c34ef0d3e0e87324ca77f320', - git='https://github.com/statgen/fastQValidator.git') + version('2017-01-10', commit='6d619a34749e9d33c34ef0d3e0e87324ca77f320') resource( name='libStatGen', diff --git a/var/spack/repos/builtin/packages/fermikit/package.py b/var/spack/repos/builtin/packages/fermikit/package.py index 3ad9f6689d..061e39b247 100644 --- a/var/spack/repos/builtin/packages/fermikit/package.py +++ b/var/spack/repos/builtin/packages/fermikit/package.py @@ -30,8 +30,10 @@ class Fermikit(MakefilePackage): reads""" homepage = "https://github.com/lh3/fermikit" + git = "https://github.com/lh3/fermikit.git" - version('2017-11-7', git='https://github.com/lh3/fermikit.git', commit='bf9c7112221577ba110665bddca8f1987250bdc7', submodules=True) + version('2017-11-7', commit='bf9c7112221577ba110665bddca8f1987250bdc7', + submodules=True) depends_on('zlib') diff --git a/var/spack/repos/builtin/packages/flang/package.py b/var/spack/repos/builtin/packages/flang/package.py index 73a016ad7f..c96a9c0176 100644 --- a/var/spack/repos/builtin/packages/flang/package.py +++ b/var/spack/repos/builtin/packages/flang/package.py @@ -29,10 +29,12 @@ import os class Flang(CMakePackage): """Flang is a Fortran compiler targeting LLVM.""" + homepage = "https://github.com/flang-compiler/flang" url = "https://github.com/flang-compiler/flang/archive/flang_20180319.tar.gz" + git = "https://github.com/flang-compiler/flang.git" - version('develop', git='https://github.com/flang-compiler/flang', branch='master') + version('develop', branch='master') version('20180319', 'e659bad83b791f90af2c5cd672864669') depends_on( diff --git a/var/spack/repos/builtin/packages/flecsale/package.py b/var/spack/repos/builtin/packages/flecsale/package.py index 1160ea642e..78bd88e96d 100644 --- a/var/spack/repos/builtin/packages/flecsale/package.py +++ b/var/spack/repos/builtin/packages/flecsale/package.py @@ -28,10 +28,11 @@ from spack import * class Flecsale(CMakePackage): """Flecsale is an ALE code based on FleCSI""" + homepage = "https://github.com/laristra/flecsale" - url = "https://github.com/laristra/flecsale/tarball/v1.0" + git = "https://github.com/laristra/flecsale.git" - version('develop', git='https://github.com/laristra/flecsale', branch='master', submodules=True) + version('develop', branch='master', submodules=True) variant('mpi', default=True, description='Build on top of mpi conduit for mpi inoperability') diff --git a/var/spack/repos/builtin/packages/flecsi/package.py b/var/spack/repos/builtin/packages/flecsi/package.py index 049b28d15d..aefa2c2d0d 100644 --- a/var/spack/repos/builtin/packages/flecsi/package.py +++ b/var/spack/repos/builtin/packages/flecsi/package.py @@ -37,9 +37,9 @@ class Flecsi(CMakePackage): interfaces,and dependency closures. """ homepage = "http://flecsi.lanl.gov/" - url = "https://github.com/laristra/flecsi/tarball/v1.0" + git = "https://github.com/laristra/flecsi.git" - version('develop', git='https://github.com/laristra/flecsi', branch='master', submodules=True) + version('develop', branch='master', submodules=True) variant('mpi', default=True, description='Build on top of mpi conduit for mpi inoperability') diff --git a/var/spack/repos/builtin/packages/flint/package.py b/var/spack/repos/builtin/packages/flint/package.py index f7e7055a4a..134dffa587 100644 --- a/var/spack/repos/builtin/packages/flint/package.py +++ b/var/spack/repos/builtin/packages/flint/package.py @@ -30,10 +30,11 @@ class Flint(Package): homepage = "http://www.flintlib.org" url = "http://mirrors.mit.edu/sage/spkg/upstream/flint/flint-2.5.2.tar.gz" + git = "https://github.com/wbhart/flint2.git" + version('develop', git=git) version('2.5.2', 'cda885309362150196aed66a5e0f0383') version('2.4.5', '6504b9deabeafb9313e57153a1730b33') - version('develop', git='https://github.com/wbhart/flint2.git') # Overlap in functionality between gmp and mpir # All other dependencies must also be built with diff --git a/var/spack/repos/builtin/packages/flux/package.py b/var/spack/repos/builtin/packages/flux/package.py index 2e8ab8c889..ddad8365e4 100644 --- a/var/spack/repos/builtin/packages/flux/package.py +++ b/var/spack/repos/builtin/packages/flux/package.py @@ -31,10 +31,10 @@ class Flux(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" + version('master', branch='master') version('0.8.0', md5='9ee12974a8b2ab9a30533f69826f3bec') - version('master', branch='master', - git='https://github.com/flux-framework/flux-core') variant('doc', default=False, description='Build flux manpages') diff --git a/var/spack/repos/builtin/packages/fp16/package.py b/var/spack/repos/builtin/packages/fp16/package.py index c1f0dbf625..7cdc8293a4 100644 --- a/var/spack/repos/builtin/packages/fp16/package.py +++ b/var/spack/repos/builtin/packages/fp16/package.py @@ -30,9 +30,9 @@ class Fp16(Package): conversion to/from half-precision floating point formats""" homepage = "https://github.com/Maratyszcza/FP16/" - url = "https://github.com/Maratyszcza/FP16.git" + git = "https://github.com/Maratyszcza/FP16.git" - version('master', git='https://github.com/Maratyszcza/FP16.git') + version('master') def install(self, spec, prefix): install_tree('include', prefix.include) diff --git a/var/spack/repos/builtin/packages/freebayes/package.py b/var/spack/repos/builtin/packages/freebayes/package.py index f8e20550e5..4d1ab6f773 100644 --- a/var/spack/repos/builtin/packages/freebayes/package.py +++ b/var/spack/repos/builtin/packages/freebayes/package.py @@ -30,9 +30,9 @@ class Freebayes(MakefilePackage): genotyping.""" homepage = "https://github.com/ekg/freebayes" + git = "https://github.com/ekg/freebayes.git" - version('1.1.0', git='https://github.com/ekg/freebayes.git', - commit='39e5e4bcb801556141f2da36aba1df5c5c60701f', + version('1.1.0', commit='39e5e4bcb801556141f2da36aba1df5c5c60701f', submodules=True) depends_on('cmake', type='build') diff --git a/var/spack/repos/builtin/packages/funhpc/package.py b/var/spack/repos/builtin/packages/funhpc/package.py index 0cb1b1bf73..c31f10dc30 100644 --- a/var/spack/repos/builtin/packages/funhpc/package.py +++ b/var/spack/repos/builtin/packages/funhpc/package.py @@ -28,9 +28,12 @@ from spack import * class Funhpc(CMakePackage): """FunHPC: Functional HPC Programming""" + homepage = "https://github.com/eschnett/FunHPC.cxx" - url = "https://github.com/eschnett/FunHPC.cxx/archive/version/0.1.0.tar.gz" + url = "https://github.com/eschnett/FunHPC.cxx/archive/version/0.1.0.tar.gz" + git = "https://github.com/eschnett/FunHPC.cxx.git" + version('develop', branch='master') version('1.3.0', '71a1e57c4d882cdf001f29122edf7fc6') version('1.2.0', 'ba2bbeea3091e999b6b85eaeb1b67a83') version('1.1.1', '7b9ef638b02fffe35b75517e8eeff580') @@ -38,8 +41,6 @@ class Funhpc(CMakePackage): version('1.0.0', 'f34e71ccd5548b42672e692c913ba5ee') version('0.1.1', 'f0248710f2de88ed2a595ad40d99997c') version('0.1.0', '00f7dabc08ed1ab77858785ce0809f50') - version('develop', - git='https://github.com/eschnett/FunHPC.cxx', branch='master') variant('pic', default=True, description="Produce position-independent code") diff --git a/var/spack/repos/builtin/packages/gccxml/package.py b/var/spack/repos/builtin/packages/gccxml/package.py index fc54b3a91f..995a63bd0c 100644 --- a/var/spack/repos/builtin/packages/gccxml/package.py +++ b/var/spack/repos/builtin/packages/gccxml/package.py @@ -27,11 +27,11 @@ class Gccxml(CMakePackage): the GCC C++ compiler.""" homepage = "http://gccxml.github.io" - url = "https://github.com/gccxml/gccxml/archive/v0.6.x.tar.gz" + git = "https://github.com/gccxml/gccxml.git" - version('develop', git='https://github.com/gccxml/gccxml.git', branch='master') - version('latest', git='https://github.com/gccxml/gccxml.git', - commit='3afa8ba5be6866e603dcabe80aff79856b558e24', preferred=True) + version('develop', branch='master') + version('latest', commit='3afa8ba5be6866e603dcabe80aff79856b558e24', + preferred=True) patch('darwin-gcc.patch', when='%gcc platform=darwin') # taken from https://github.com/gccxml/gccxml/issues/11#issuecomment-140334118 diff --git a/var/spack/repos/builtin/packages/gemmlowp/package.py b/var/spack/repos/builtin/packages/gemmlowp/package.py index 7f3847f7c7..9ff88511e6 100644 --- a/var/spack/repos/builtin/packages/gemmlowp/package.py +++ b/var/spack/repos/builtin/packages/gemmlowp/package.py @@ -29,8 +29,9 @@ class Gemmlowp(Package): """Google low-precision matrix multiplication library""" homepage = "https://github.com/google/gemmlowp" - version('a6f29d9ac', git='https://github.com/google/gemmlowp.git', - commit='a6f29d8ac48d63293f845f2253eccbf86bc28321') + git = "https://github.com/google/gemmlowp.git" + + version('a6f29d9ac', commit='a6f29d8ac48d63293f845f2253eccbf86bc28321') def install(self, spec, prefix): header_directories = ('eight_bit_int_gemm', 'fixedpoint', diff --git a/var/spack/repos/builtin/packages/geopm/package.py b/var/spack/repos/builtin/packages/geopm/package.py index b413ae4205..634b0e79a8 100644 --- a/var/spack/repos/builtin/packages/geopm/package.py +++ b/var/spack/repos/builtin/packages/geopm/package.py @@ -38,13 +38,14 @@ class Geopm(AutotoolsPackage): homepage = "https://geopm.github.io" url = "https://github.com/geopm/geopm/releases/download/v0.4.0/geopm-0.4.0.tar.gz" + git = "https://github.com/geopm/geopm.git" # Add additional proper versions and checksums here. "spack checksum geopm" + version('develop', branch='dev') + version('master', branch='master') version('0.5.0', '61b454bc74d4606fe84818aef16c1be4') version('0.4.0', 'd4cc8fffe521296dab379857d7e2064d') version('0.3.0', '568fd37234396fff134f8d57b60f2b83') - version('master', git='https://github.com/geopm/geopm.git', branch='master') - version('develop', git='https://github.com/geopm/geopm.git', branch='dev') # Variants reflecting most ./configure --help options variant('debug', default=False, description='Enable debug.') diff --git a/var/spack/repos/builtin/packages/ghost/package.py b/var/spack/repos/builtin/packages/ghost/package.py index 7a89adca66..deadd8338b 100644 --- a/var/spack/repos/builtin/packages/ghost/package.py +++ b/var/spack/repos/builtin/packages/ghost/package.py @@ -35,10 +35,9 @@ class Ghost(CMakePackage, CudaPackage): """ homepage = "https://www.bitbucket.org/essex/ghost/" - url = "https://bitbucket.org/essex/ghost/" + git = "https://bitbucket.org/essex/ghost/ghost.git" - version('develop', - git='https://bitbucket.org/essex/ghost/ghost.git', branch='devel') + version('develop', branch='devel') variant('shared', default=True, description='Enables the build of shared libraries') diff --git a/var/spack/repos/builtin/packages/git-lfs/package.py b/var/spack/repos/builtin/packages/git-lfs/package.py index 3250fcd53d..99b02c99f3 100644 --- a/var/spack/repos/builtin/packages/git-lfs/package.py +++ b/var/spack/repos/builtin/packages/git-lfs/package.py @@ -33,13 +33,13 @@ class GitLfs(Package): Git LFS server.""" homepage = "https://git-lfs.github.com" - git_url = "https://github.com/github/git-lfs.git" + git = "https://github.com/github/git-lfs.git" - version('2.3.0', git=git_url, tag='v2.3.0') - version('2.2.1', git=git_url, tag='v2.2.1') - version('2.0.2', git=git_url, tag='v2.0.2') - version('1.4.1', git=git_url, tag='v1.4.1') - version('1.3.1', git=git_url, tag='v1.3.1') + version('2.3.0', tag='v2.3.0') + version('2.2.1', tag='v2.2.1') + version('2.0.2', tag='v2.0.2') + version('1.4.1', tag='v1.4.1') + version('1.3.1', tag='v1.3.1') # TODO: Add tests by following the instructions at this location: # https://github.com/github/git-lfs/blob/master/CONTRIBUTING.md#building diff --git a/var/spack/repos/builtin/packages/gloo/package.py b/var/spack/repos/builtin/packages/gloo/package.py index 5fe40d7a22..66961d5656 100644 --- a/var/spack/repos/builtin/packages/gloo/package.py +++ b/var/spack/repos/builtin/packages/gloo/package.py @@ -29,6 +29,6 @@ class Gloo(CMakePackage): """Gloo is a collective communications library.""" homepage = "https://github.com/facebookincubator/gloo" - url = "https://github.com/facebookincubator/gloo.git" + git = "https://github.com/facebookincubator/gloo.git" - version('master', git='https://github.com/facebookincubator/gloo.git') + version('master') diff --git a/var/spack/repos/builtin/packages/glvis/package.py b/var/spack/repos/builtin/packages/glvis/package.py index c97cf5704c..a79ca2dd1a 100644 --- a/var/spack/repos/builtin/packages/glvis/package.py +++ b/var/spack/repos/builtin/packages/glvis/package.py @@ -29,7 +29,7 @@ class Glvis(MakefilePackage): """GLVis: an OpenGL tool for visualization of FEM meshes and functions""" homepage = "http://glvis.org" - url = "https://github.com/GLVis/glvis" + git = "https://github.com/glvis/glvis.git" maintainers = ['goxberry', 'v-dobrev', 'tzanio'] @@ -52,7 +52,7 @@ class Glvis(MakefilePackage): # If this quick verification procedure fails, additional discussion # will be required to verify the new version. - version('develop', git='https://github.com/glvis/glvis', branch='master') + version('develop', branch='master') version('3.4', '289fbd2e09d4456e5fee6162bdc3e0b4c8c8d54625f3547ad2a69fef319279e7', diff --git a/var/spack/repos/builtin/packages/gotcha/package.py b/var/spack/repos/builtin/packages/gotcha/package.py index acfff70415..419d276653 100644 --- a/var/spack/repos/builtin/packages/gotcha/package.py +++ b/var/spack/repos/builtin/packages/gotcha/package.py @@ -30,16 +30,14 @@ class Gotcha(CMakePackage): enables tools to intercept calls into shared libraries""" homepage = "http://github.com/LLNL/gotcha" - url = "http://github.com/LLNL/gotcha" + git = "https://github.com/LLNL/gotcha.git" - variant('test', default=False, description='Build tests for Gotcha') + version('develop', branch='develop') + version('master', branch='master') + version('1.0.2', tag='1.0.2') + version('0.0.2', tag='0.0.2') - version('develop', git='https://github.com/LLNL/gotcha.git', - branch="develop") - version('master', git='https://github.com/LLNL/gotcha.git', - branch="master") - version('1.0.2', git='https://github.com/LLNL/gotcha.git', tag="1.0.2") - version('0.0.2', git='https://github.com/LLNL/gotcha.git', tag="0.0.2") + variant('test', default=False, description='Build tests for Gotcha') def configure_args(self): spec = self.spec diff --git a/var/spack/repos/builtin/packages/graphmap/package.py b/var/spack/repos/builtin/packages/graphmap/package.py index bc35f1b247..21a461e663 100644 --- a/var/spack/repos/builtin/packages/graphmap/package.py +++ b/var/spack/repos/builtin/packages/graphmap/package.py @@ -29,9 +29,9 @@ class Graphmap(MakefilePackage): """A highly sensitive and accurate mapper for long, error-prone reads""" homepage = "https://github.com/isovic/graphmap" - url = "https://github.com/isovic/graphmap/archive/v0.3.0.tar.gz" + git = "https://github.com/isovic/graphmap.git" - version('0.3.0', git='https://github.com/isovic/graphmap.git', commit='eb8c75d68b03be95464318afa69b645a59f8f6b7') + version('0.3.0', commit='eb8c75d68b03be95464318afa69b645a59f8f6b7') def edit(self, spec, prefix): mkdirp(prefix.bin) diff --git a/var/spack/repos/builtin/packages/graphviz/package.py b/var/spack/repos/builtin/packages/graphviz/package.py index 905c0c8892..a06e5e3458 100644 --- a/var/spack/repos/builtin/packages/graphviz/package.py +++ b/var/spack/repos/builtin/packages/graphviz/package.py @@ -29,11 +29,12 @@ import sys class Graphviz(AutotoolsPackage): """Graph Visualization Software""" + homepage = 'http://www.graphviz.org' + git = 'https://gitlab.com/graphviz/graphviz.git' # This commit hash is tag='stable_release_2.40.1' - version('2.40.1', git='https://gitlab.com/graphviz/graphviz.git', - commit='67cd2e5121379a38e0801cc05cce5033f8a2a609') + version('2.40.1', commit='67cd2e5121379a38e0801cc05cce5033f8a2a609') # We try to leave language bindings enabled if they don't cause # build issues or add dependencies. diff --git a/var/spack/repos/builtin/packages/gromacs/package.py b/var/spack/repos/builtin/packages/gromacs/package.py index 1add3141f1..aa663890e8 100644 --- a/var/spack/repos/builtin/packages/gromacs/package.py +++ b/var/spack/repos/builtin/packages/gromacs/package.py @@ -39,17 +39,18 @@ class Gromacs(CMakePackage): """ homepage = 'http://www.gromacs.org' - url = 'http://ftp.gromacs.org/gromacs/gromacs-5.1.2.tar.gz' + url = 'http://ftp.gromacs.org/gromacs/gromacs-5.1.2.tar.gz' + git = 'https://github.com/gromacs/gromacs.git' + version('develop', branch='master') version('2018.2', '7087462bb08393aec4ce3192fa4cd8df') version('2018.1', '7ee393fa3c6b7ae351d47eae2adf980e') - version('2018', '6467ffb1575b8271548a13abfba6374c') + version('2018', '6467ffb1575b8271548a13abfba6374c') version('2016.5', 'f41807e5b2911ccb547a3fd11f105d47') version('2016.4', '19c8b5c85f3ec62df79d2249a3c272f8') version('2016.3', 'e9e3a41bd123b52fbcc6b32d09f8202b') - version('5.1.4', 'ba2e34d59b3982603b4935d650c08040') - version('5.1.2', '614d0be372f1a6f1f36382b7a6fcab98') - version('develop', git='https://github.com/gromacs/gromacs', branch='master') + version('5.1.4', 'ba2e34d59b3982603b4935d650c08040') + version('5.1.2', '614d0be372f1a6f1f36382b7a6fcab98') variant('mpi', default=True, description='Activate MPI support') variant('shared', default=True, diff --git a/var/spack/repos/builtin/packages/gslib/package.py b/var/spack/repos/builtin/packages/gslib/package.py index b90a50977c..aca4d55256 100644 --- a/var/spack/repos/builtin/packages/gslib/package.py +++ b/var/spack/repos/builtin/packages/gslib/package.py @@ -29,11 +29,11 @@ class Gslib(Package): """Highly scalable Gather-scatter code with AMG and XXT solvers""" homepage = "https://github.com/gslib/gslib" - url = "https://github.com/gslib/gslib" + git = "https://github.com/gslib/gslib.git" - version('1.0.2', git='https://github.com/gslib/gslib.git', tag='v1.0.2') - version('1.0.1', git='https://github.com/gslib/gslib.git', tag='v1.0.1') - version('1.0.0', git='https://github.com/gslib/gslib.git', tag='v1.0.0') + version('1.0.2', tag='v1.0.2') + version('1.0.1', tag='v1.0.1') + version('1.0.0', tag='v1.0.0') variant('mpi', default=True, description='Build with MPI') variant('mpiio', default=True, description='Build with MPI I/O') diff --git a/var/spack/repos/builtin/packages/gtkorvo-atl/package.py b/var/spack/repos/builtin/packages/gtkorvo-atl/package.py index e3d1c568b8..7dcac0ccf9 100644 --- a/var/spack/repos/builtin/packages/gtkorvo-atl/package.py +++ b/var/spack/repos/builtin/packages/gtkorvo-atl/package.py @@ -31,10 +31,10 @@ class GtkorvoAtl(CMakePackage): """ homepage = "https://github.com/GTkorvo/atl" - url = "https://github.com/GTkorvo/atl/archive/v2.1.tar.gz" + url = "https://github.com/GTkorvo/atl/archive/v2.1.tar.gz" + git = "https://github.com/GTkorvo/atl.git" - version('develop', git='https://github.com/GTkorvo/atl.git', - branch='master') + version('develop', branch='master') version('2.2', 'f0e3581e4b4c6943bf4b203685630564') version('2.1', 'b2324ff041bccba127330a0e1b241978') diff --git a/var/spack/repos/builtin/packages/gtkorvo-cercs-env/package.py b/var/spack/repos/builtin/packages/gtkorvo-cercs-env/package.py index 40f55d3425..e6a741bb4f 100644 --- a/var/spack/repos/builtin/packages/gtkorvo-cercs-env/package.py +++ b/var/spack/repos/builtin/packages/gtkorvo-cercs-env/package.py @@ -26,14 +26,13 @@ from spack import * class GtkorvoCercsEnv(CMakePackage): - """A utility library used by some GTkorvo packages. - """ + """A utility library used by some GTkorvo packages.""" homepage = "https://github.com/GTkorvo/cercs_env" - url = "https://github.com/GTkorvo/cercs_env/archive/v1.0.tar.gz" + url = "https://github.com/GTkorvo/cercs_env/archive/v1.0.tar.gz" + git = "https://github.com/GTkorvo/cercs_env.git" - version('develop', git='https://github.com/GTkorvo/cercs_env.git', - branch='master') + version('develop', branch='master') version('1.0', '08f0532d0c2f7bc9b53dfa7a1c40ea4d') def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/gtkorvo-dill/package.py b/var/spack/repos/builtin/packages/gtkorvo-dill/package.py index b863be21f4..a39c88ba25 100644 --- a/var/spack/repos/builtin/packages/gtkorvo-dill/package.py +++ b/var/spack/repos/builtin/packages/gtkorvo-dill/package.py @@ -32,10 +32,10 @@ class GtkorvoDill(CMakePackage): """ homepage = "https://github.com/GTkorvo/dill" - url = "https://github.com/GTkorvo/dill/archive/v2.1.tar.gz" + url = "https://github.com/GTkorvo/dill/archive/v2.1.tar.gz" + git = "https://github.com/GTkorvo/dill.git" - version('develop', git='https://github.com/GTkorvo/dill.git', - branch='master') + version('develop', branch='master') version('2.4', '6836673b24f395eaae044b8bb976511d') version('2.1', '14c835e79b66c9acd2beee01d56e6200') diff --git a/var/spack/repos/builtin/packages/h5z-zfp/package.py b/var/spack/repos/builtin/packages/h5z-zfp/package.py index d4cae6fe88..07c200e523 100644 --- a/var/spack/repos/builtin/packages/h5z-zfp/package.py +++ b/var/spack/repos/builtin/packages/h5z-zfp/package.py @@ -30,11 +30,11 @@ class H5zZfp(MakefilePackage): HDF5 library using ZFP compression.""" homepage = "http://h5z-zfp.readthedocs.io/en/latest" - url = "https://github.com/LLNL/H5Z-ZFP" + git = "https://github.com/LLNL/H5Z-ZFP.git" - version('develop', git='https://github.com/LLNL/H5Z-ZFP.git', tag='master') - version('0.7.0', git='https://github.com/LLNL/H5Z-ZFP.git', commit='58ac811') - version('0.8.0', git='https://github.com/LLNL/H5Z-ZFP.git', commit='af165c4') + version('develop', tag='master') + version('0.8.0', commit='af165c4') + version('0.7.0', commit='58ac811') variant('fortran', default=True, description='Enable Fortran support') diff --git a/var/spack/repos/builtin/packages/hacckernels/package.py b/var/spack/repos/builtin/packages/hacckernels/package.py index e3a5c3cc12..a8d60c4e37 100644 --- a/var/spack/repos/builtin/packages/hacckernels/package.py +++ b/var/spack/repos/builtin/packages/hacckernels/package.py @@ -33,12 +33,11 @@ class Hacckernels(CMakePackage): cores and beyond.""" homepage = "https://xgitlab.cels.anl.gov/hacc/HACCKernels" - url = "https://xgitlab.cels.anl.gov/api/v4/projects/hacc%2FHACCKernels/repository/archive.tar.gz" + git = "https://xgitlab.cels.anl.gov/hacc/HACCKernels.git" tags = ['proxy-app'] - version('develop', git='https://xgitlab.cels.anl.gov/hacc/HACCKernels.git', - branch='master') + version('develop', branch='master') def install(self, spec, prefix): mkdirp(prefix.bin) diff --git a/var/spack/repos/builtin/packages/hapcut2/package.py b/var/spack/repos/builtin/packages/hapcut2/package.py index 033a552145..35580bfe15 100644 --- a/var/spack/repos/builtin/packages/hapcut2/package.py +++ b/var/spack/repos/builtin/packages/hapcut2/package.py @@ -31,10 +31,10 @@ class Hapcut2(MakefilePackage): and accuracy.""" homepage = "https://github.com/vibansal/HapCUT2" - url = "https://github.com/vibansal/HapCUT2" + git = "https://github.com/vibansal/HapCUT2.git" - version('2017-07-10', git='https://github.com/vibansal/HapCUT2.git', - commit='2966b94c2c2f97813b757d4999b7a6471df1160e', submodules=True) + version('2017-07-10', commit='2966b94c2c2f97813b757d4999b7a6471df1160e', + submodules=True) def install(self, spec, prefix): mkdirp(prefix.bin) diff --git a/var/spack/repos/builtin/packages/hapdip/package.py b/var/spack/repos/builtin/packages/hapdip/package.py index 066282c461..15a5615822 100644 --- a/var/spack/repos/builtin/packages/hapdip/package.py +++ b/var/spack/repos/builtin/packages/hapdip/package.py @@ -30,8 +30,9 @@ class Hapdip(Package): WGS Illumina data.""" homepage = "https://github.com/lh3/hapdip" + git = "https://github.com/lh3/hapdip.git" - version('2018.02.20', git='https://github.com/lh3/hapdip.git', commit='7c12f684471999a543fdacce972c9c86349758a3') + version('2018.02.20', commit='7c12f684471999a543fdacce972c9c86349758a3') depends_on('k8', type='run') diff --git a/var/spack/repos/builtin/packages/hdf5-blosc/package.py b/var/spack/repos/builtin/packages/hdf5-blosc/package.py index 168bcb07ac..b0ff9536c7 100644 --- a/var/spack/repos/builtin/packages/hdf5-blosc/package.py +++ b/var/spack/repos/builtin/packages/hdf5-blosc/package.py @@ -48,10 +48,9 @@ def _install_shlib(name, src, dst): class Hdf5Blosc(Package): """Blosc filter for HDF5""" homepage = "https://github.com/Blosc/hdf5-blosc" - url = "https://github.com/Blosc/hdf5-blosc" + git = "https://github.com/Blosc/hdf5-blosc.git" - version('master', git='https://github.com/Blosc/hdf5-blosc', - branch='master') + version('master', branch='master') depends_on("c-blosc") depends_on("hdf5") diff --git a/var/spack/repos/builtin/packages/highwayhash/package.py b/var/spack/repos/builtin/packages/highwayhash/package.py index 71b2472db7..7ab78df158 100644 --- a/var/spack/repos/builtin/packages/highwayhash/package.py +++ b/var/spack/repos/builtin/packages/highwayhash/package.py @@ -34,9 +34,9 @@ class Highwayhash(MakefilePackage): """ homepage = "https://github.com/google/highwayhash" + git = "https://github.com/google/highwayhash.git" - version('dfcb97', git='https://github.com/google/highwayhash.git', - commit='dfcb97ca4fe9277bf9dc1802dd979b071896453b') + version('dfcb97', commit='dfcb97ca4fe9277bf9dc1802dd979b071896453b') build_targets = ['all', 'libhighwayhash.a'] diff --git a/var/spack/repos/builtin/packages/hiop/package.py b/var/spack/repos/builtin/packages/hiop/package.py index 5393f19464..2720973271 100644 --- a/var/spack/repos/builtin/packages/hiop/package.py +++ b/var/spack/repos/builtin/packages/hiop/package.py @@ -33,10 +33,9 @@ class Hiop(CMakePackage): specialized linear algebra kernels.""" homepage = "https://github.com/LLNL/hiop" - url = "https://github.com/LLNL/hiop" + git = "https://github.com/LLNL/hiop.git" - version('0.1', git='https://github.com/LLNL/hiop', - tag='v0.1') + version('0.1', tag='v0.1') variant('mpi', default=True, description='Enable/Disable MPI') diff --git a/var/spack/repos/builtin/packages/hoomd-blue/package.py b/var/spack/repos/builtin/packages/hoomd-blue/package.py index 3aed18ce27..5b74cf82f3 100644 --- a/var/spack/repos/builtin/packages/hoomd-blue/package.py +++ b/var/spack/repos/builtin/packages/hoomd-blue/package.py @@ -39,10 +39,6 @@ class HoomdBlue(CMakePackage): homepage = "http://glotzerlab.engin.umich.edu/hoomd-blue/" git = "https://bitbucket.org/glotzer/hoomd-blue" - # TODO: There is a bug in Spack that requires a url to be defined - # even if it isn't used. This URL can hopefully be removed someday. - url = "https://bitbucket.org/glotzer/hoomd-blue/get/v2.1.6.tar.bz2" - version('develop', git=git, submodules=True) # Bitbucket has tarballs for each release, but they cannot be built. @@ -50,8 +46,8 @@ class HoomdBlue(CMakePackage): # with a .git directory, causing the build to fail. As a workaround, # clone a specific tag from Bitbucket instead of using the tarballs. # https://bitbucket.org/glotzer/hoomd-blue/issues/238 - version('2.2.2', git=git, tag='v2.2.2', submodules=True) - version('2.1.6', git=git, tag='v2.1.6', submodules=True) + version('2.2.2', tag='v2.2.2', submodules=True) + version('2.1.6', tag='v2.1.6', submodules=True) variant('mpi', default=True, description='Compile with MPI enabled') variant('cuda', default=True, description='Compile with CUDA Toolkit') diff --git a/var/spack/repos/builtin/packages/hpctoolkit-externals/package.py b/var/spack/repos/builtin/packages/hpctoolkit-externals/package.py index dcd9d93172..78f33e161d 100644 --- a/var/spack/repos/builtin/packages/hpctoolkit-externals/package.py +++ b/var/spack/repos/builtin/packages/hpctoolkit-externals/package.py @@ -30,10 +30,10 @@ class HpctoolkitExternals(Package): HpctoolkitExternals package provides all these prerequisites.""" homepage = "http://hpctoolkit.org" - url = "https://github.com/HPCToolkit/hpctoolkit-externals" + git = "https://github.com/HPCToolkit/hpctoolkit-externals" - version('2017.06', git=url, tag='release-2017.06') - version('master', git=url) + version('master') + version('2017.06', tag='release-2017.06') parallel = False diff --git a/var/spack/repos/builtin/packages/hpctoolkit/package.py b/var/spack/repos/builtin/packages/hpctoolkit/package.py index 8b66e168ea..9dfa96d7d8 100644 --- a/var/spack/repos/builtin/packages/hpctoolkit/package.py +++ b/var/spack/repos/builtin/packages/hpctoolkit/package.py @@ -34,10 +34,10 @@ class Hpctoolkit(Package): and attributes them to the full calling context in which they occur.""" homepage = "http://hpctoolkit.org" - url = "https://github.com/HPCToolkit/hpctoolkit" + git = "https://github.com/HPCToolkit/hpctoolkit" - version('2017.06', git=url, tag='release-2017.06') - version('master', git=url) + version('master') + version('2017.06', tag='release-2017.06') variant('mpi', default=True, description='Enable MPI supoort') variant('papi', default=True, description='Enable PAPI counter support') diff --git a/var/spack/repos/builtin/packages/hpgmg/package.py b/var/spack/repos/builtin/packages/hpgmg/package.py index 2a43115799..5f6a6e37dd 100644 --- a/var/spack/repos/builtin/packages/hpgmg/package.py +++ b/var/spack/repos/builtin/packages/hpgmg/package.py @@ -37,9 +37,11 @@ class Hpgmg(Package): homepage = "https://bitbucket.org/hpgmg/hpgmg" url = "https://hpgmg.org/static/hpgmg-0.tar.gz" - tags = ['proxy-app'] + git = "https://bitbucket.org/hpgmg/hpgmg.git" - version('develop', git='https://bitbucket.org/hpgmg/hpgmg.git', branch='master') + tags = ['proxy-app'] + + version('develop', branch='master') version('a0a5510df23b', 'b9c50f25e541428d4735fb07344d1d0ed9fc821bdde918d8e0defa78c0d9b4f9') version('0.3', '12a65da216fec91daea78594ae4b5a069c8f1a700f1ba21eed9f45a79a68c793') diff --git a/var/spack/repos/builtin/packages/hub/package.py b/var/spack/repos/builtin/packages/hub/package.py index c398e19279..d14d6b87fd 100644 --- a/var/spack/repos/builtin/packages/hub/package.py +++ b/var/spack/repos/builtin/packages/hub/package.py @@ -28,10 +28,12 @@ import os class Hub(Package): """The github git wrapper""" + homepage = "https://github.com/github/hub" - url = "https://github.com/github/hub/archive/v2.2.3.tar.gz" + url = "https://github.com/github/hub/archive/v2.2.3.tar.gz" + git = "https://github.com/github/hub" - version('head', git='https://github.com/github/hub') + version('head', git=git) version('2.2.3', '6675992ddd16d186eac7ba4484d57f5b') version('2.2.2', '7edc8f5b5d3c7c392ee191dd999596fc') version('2.2.1', '889a31ee9d10ae9cb333480d8dbe881f') diff --git a/var/spack/repos/builtin/packages/hydrogen/package.py b/var/spack/repos/builtin/packages/hydrogen/package.py index 47787505aa..cb804e4275 100644 --- a/var/spack/repos/builtin/packages/hydrogen/package.py +++ b/var/spack/repos/builtin/packages/hydrogen/package.py @@ -33,8 +33,9 @@ class Hydrogen(CMakePackage): homepage = "http://libelemental.org" url = "https://github.com/LLNL/Elemental/archive/0.99.tar.gz" + git = "https://github.com/LLNL/Elemental.git" - version('develop', git='https://github.com/LLNL/Elemental.git', branch='hydrogen') + version('develop', branch='hydrogen') version('0.99', 'b678433ab1d498da47acf3dc5e056c23') variant('shared', default=True, diff --git a/var/spack/repos/builtin/packages/hypre/package.py b/var/spack/repos/builtin/packages/hypre/package.py index a6020464f6..a20e925208 100644 --- a/var/spack/repos/builtin/packages/hypre/package.py +++ b/var/spack/repos/builtin/packages/hypre/package.py @@ -33,17 +33,18 @@ class Hypre(Package): unstructured grid problems.""" homepage = "http://computation.llnl.gov/project/linear_solvers/software.php" - url = "http://computation.llnl.gov/project/linear_solvers/download/hypre-2.10.0b.tar.gz" + url = "https://github.com/LLNL/hypre/archive/v2.14.0.tar.gz" + git = "https://github.com/LLNL/hypre.git" - version('2.14.0', 'ecde5cc807ec45bfb647e9f28d2eaea1', url='https://github.com/LLNL/hypre/archive/v2.14.0.tar.gz') - version('2.13.0', '4b688a5c15b6b5e3de5e045ae081b89b', url='https://github.com/LLNL/hypre/archive/v2.13.0.tar.gz') - version('2.12.1', 'c6fcb6d7e57cec1c7ce4a44da885068c', url='https://github.com/LLNL/hypre/archive/v2.12.1.tar.gz') + version('develop', branch='master') + version('2.14.0', 'ecde5cc807ec45bfb647e9f28d2eaea1') + version('2.13.0', '4b688a5c15b6b5e3de5e045ae081b89b') + version('2.12.1', 'c6fcb6d7e57cec1c7ce4a44da885068c') version('2.11.2', 'd507943a1a3ce5681c3308e2f3a6dd34') version('2.11.1', '3f02ef8fd679239a6723f60b7f796519') version('2.10.1', 'dc048c4cabb3cd549af72591474ad674') version('2.10.0b', '768be38793a35bb5d055905b271f5b8e') - version('develop', git='https://github.com/LLNL/hypre', branch='master') - version('xsdk-0.2.0', git='https://github.com/LLNL/hypre', tag='xsdk-0.2.0') + version('xsdk-0.2.0', tag='xsdk-0.2.0') # hypre does not know how to build shared libraries on Darwin variant('shared', default=(sys.platform != 'darwin'), @@ -62,6 +63,14 @@ class Hypre(Package): depends_on("blas") depends_on("lapack") + def url_for_version(self, version): + if version >= Version('2.12.0'): + url = 'https://github.com/LLNL/hypre/archive/v{0}.tar.gz' + else: + url = 'http://computation.llnl.gov/project/linear_solvers/download/hypre-{0}.tar.gz' + + return url.format(version) + def install(self, spec, prefix): # Note: --with-(lapack|blas)_libs= needs space separated list of names lapack = spec['lapack'].libs diff --git a/var/spack/repos/builtin/packages/icet/package.py b/var/spack/repos/builtin/packages/icet/package.py index 1a2181c24f..87e831ea2e 100644 --- a/var/spack/repos/builtin/packages/icet/package.py +++ b/var/spack/repos/builtin/packages/icet/package.py @@ -31,9 +31,9 @@ class Icet(CMakePackage): homepage = "http://icet.sandia.gov" url = "https://gitlab.kitware.com/api/v4/projects/icet%2Ficet/repository/archive.tar.bz2?sha=IceT-2.1.1" + git = "https://gitlab.kitware.com/icet/icet.git" - version('develop', branch='master', - git='https://gitlab.kitware.com/icet/icet.git') + version('develop', branch='master') version('2.1.1', '4f971c51105a64937460d482adca2a6c') depends_on('mpi') diff --git a/var/spack/repos/builtin/packages/intel-xed/package.py b/var/spack/repos/builtin/packages/intel-xed/package.py index 25f8057679..5905868ae3 100644 --- a/var/spack/repos/builtin/packages/intel-xed/package.py +++ b/var/spack/repos/builtin/packages/intel-xed/package.py @@ -33,11 +33,9 @@ class IntelXed(Package): a lightweight library for decoding the length of an instruction.""" homepage = "https://intelxed.github.io/" - url = "https://github.com/intelxed/xed" + git = "https://github.com/intelxed/xed.git" - version('2018.02.14', - git='https://github.com/intelxed/xed', - commit='44d06033b69aef2c20ab01bfb518c52cd71bb537') + version('2018.02.14', commit='44d06033b69aef2c20ab01bfb518c52cd71bb537') resource(name='mbuild', git='https://github.com/intelxed/mbuild', diff --git a/var/spack/repos/builtin/packages/isaac-server/package.py b/var/spack/repos/builtin/packages/isaac-server/package.py index 11325a24e2..59e8b8734a 100644 --- a/var/spack/repos/builtin/packages/isaac-server/package.py +++ b/var/spack/repos/builtin/packages/isaac-server/package.py @@ -30,12 +30,12 @@ class IsaacServer(CMakePackage): homepage = "http://computationalradiationphysics.github.io/isaac/" url = "https://github.com/ComputationalRadiationPhysics/isaac/archive/v1.3.0.tar.gz" + git = "https://github.com/ComputationalRadiationPhysics/isaac.git" + maintainers = ['ax3l'] - version('develop', branch='dev', - git='https://github.com/ComputationalRadiationPhysics/isaac.git') - version('master', branch='master', - git='https://github.com/ComputationalRadiationPhysics/isaac.git') + version('develop', branch='dev') + version('master', branch='master') version('1.4.0', '3ad05c8fad4673366077204c5d39285f') version('1.3.3', '7aeebaf0c5a77e2cb9bea066750e369b') version('1.3.2', 'c557daa74de52fd79e734c9758fca38b') diff --git a/var/spack/repos/builtin/packages/isaac/package.py b/var/spack/repos/builtin/packages/isaac/package.py index 4783ffecbf..4c853e67cf 100644 --- a/var/spack/repos/builtin/packages/isaac/package.py +++ b/var/spack/repos/builtin/packages/isaac/package.py @@ -30,12 +30,12 @@ class Isaac(CMakePackage): homepage = "http://computationalradiationphysics.github.io/isaac/" url = "https://github.com/ComputationalRadiationPhysics/isaac/archive/v1.3.0.tar.gz" + git = "https://github.com/ComputationalRadiationPhysics/isaac.git" + maintainers = ['ax3l'] - version('develop', branch='dev', - git='https://github.com/ComputationalRadiationPhysics/isaac.git') - version('master', branch='master', - git='https://github.com/ComputationalRadiationPhysics/isaac.git') + version('develop', branch='dev') + version('master', branch='master') version('1.4.0', '3ad05c8fad4673366077204c5d39285f') version('1.3.3', '7aeebaf0c5a77e2cb9bea066750e369b') version('1.3.2', 'c557daa74de52fd79e734c9758fca38b') diff --git a/var/spack/repos/builtin/packages/julia/package.py b/var/spack/repos/builtin/packages/julia/package.py index 5cc134de61..0d4f5e883c 100644 --- a/var/spack/repos/builtin/packages/julia/package.py +++ b/var/spack/repos/builtin/packages/julia/package.py @@ -30,19 +30,18 @@ import sys class Julia(Package): """The Julia Language: A fresh approach to technical computing""" + homepage = "http://julialang.org" url = "https://github.com/JuliaLang/julia/releases/download/v0.4.3/julia-0.4.3-full.tar.gz" + git = "https://github.com/JuliaLang/julia.git" - version('master', - git='https://github.com/JuliaLang/julia.git', branch='master') - version('release-0.5', - git='https://github.com/JuliaLang/julia.git', branch='release-0.5') - version('0.6.2', '255d80bc8d56d5f059fe18f0798e32f6') - version('0.5.2', '8c3fff150a6f96cf0536fb3b4eaa5cbb') + version('master', branch='master') + version('0.6.2', '255d80bc8d56d5f059fe18f0798e32f6') + version('release-0.5', branch='release-0.5') + version('0.5.2', '8c3fff150a6f96cf0536fb3b4eaa5cbb') version('0.5.1', 'bce119b98f274e0f07ce01498c463ad5') version('0.5.0', 'b61385671ba74767ab452363c43131fb') - version('release-0.4', - git='https://github.com/JuliaLang/julia.git', branch='release-0.4') + version('release-0.4', branch='release-0.4') version('0.4.7', '75a7a7dd882b7840829d8f165e9b9078') version('0.4.6', 'd88db18c579049c23ab8ef427ccedf5d') version('0.4.5', '69141ff5aa6cee7c0ec8c85a34aa49a6') diff --git a/var/spack/repos/builtin/packages/kahip/package.py b/var/spack/repos/builtin/packages/kahip/package.py index 30565a5180..a7d8d836dd 100644 --- a/var/spack/repos/builtin/packages/kahip/package.py +++ b/var/spack/repos/builtin/packages/kahip/package.py @@ -44,8 +44,9 @@ class Kahip(SConsPackage): homepage = 'http://algo2.iti.kit.edu/documents/kahip/index.html' url = 'http://algo2.iti.kit.edu/schulz/software_releases/KaHIP_2.00.tar.gz' + git = 'https://github.com/schulzchristian/KaHIP.git' - version('develop', git='https://github.com/schulzchristian/KaHIP.git') + version('develop', git=git) version('2.00', '0a66b0a604ad72cfb7e3dce00e2c9fdfac82b855') depends_on('argtable') diff --git a/var/spack/repos/builtin/packages/kaldi/package.py b/var/spack/repos/builtin/packages/kaldi/package.py index 376aebaa94..69981c85ca 100644 --- a/var/spack/repos/builtin/packages/kaldi/package.py +++ b/var/spack/repos/builtin/packages/kaldi/package.py @@ -35,13 +35,11 @@ class Kaldi(Package): # Does not use Autotools Kaldi is intended for use by speech recognition researchers.""" homepage = "https://github.com/kaldi-asr/kaldi" - url = "https://github.com/kaldi-asr/kaldi/archive/master.zip" + git = "https://github.com/kaldi-asr/kaldi.git" - version('master', git='https://github.com/kaldi-asr/kaldi.git') - version('2018-07-11', git='https://github.com/kaldi-asr/kaldi.git', - commit='6f2140b032b0108bc313eefdca65151289642773') - version('2015-10-07', git='https://github.com/kaldi-asr/kaldi.git', - commit='c024e8aa0a727bf76c91a318f76a1f8b0b59249e') + version('master') + version('2018-07-11', commit='6f2140b032b0108bc313eefdca65151289642773') + version('2015-10-07', commit='c024e8aa0a727bf76c91a318f76a1f8b0b59249e') variant('shared', default=True, description='build shared libraries') diff --git a/var/spack/repos/builtin/packages/kealib/package.py b/var/spack/repos/builtin/packages/kealib/package.py index 95d5846d61..79a61c2e62 100644 --- a/var/spack/repos/builtin/packages/kealib/package.py +++ b/var/spack/repos/builtin/packages/kealib/package.py @@ -43,8 +43,9 @@ class Kealib(CMakePackage): """ homepage = "http://www.kealib.org/" url = "https://bitbucket.org/chchrsc/kealib/get/kealib-1.4.10.tar.gz" + hg = "https://bitbucket.org/chchrsc/kealib" - version('develop', hg='https://bitbucket.org/chchrsc/kealib') + version('develop', hg=hg) version('1.4.10', '5684aeb2085a67a4270c73e79d4ab768') version('1.4.9', 'a095d0b9d6de1d609ffaf242e00cc2b6') version('1.4.8', '1af2514c908f9168ff6665cc012815ad') diff --git a/var/spack/repos/builtin/packages/kentutils/package.py b/var/spack/repos/builtin/packages/kentutils/package.py index 9e807df0e1..c66925a088 100644 --- a/var/spack/repos/builtin/packages/kentutils/package.py +++ b/var/spack/repos/builtin/packages/kentutils/package.py @@ -29,9 +29,9 @@ class Kentutils(MakefilePackage): """Jim Kent command line bioinformatic utilities""" homepage = "https://github.com/ENCODE-DCC/kentUtils" - url = "https://github.com/ENCODE-DCC/kentUtils" + git = "https://github.com/ENCODE-DCC/kentUtils.git" - version('302.1', git='https://github.com/ENCODE-DCC/kentUtils.git', commit='d8376c5d52a161f2267346ed3dc94b5dce74c2f9') + version('302.1', commit='d8376c5d52a161f2267346ed3dc94b5dce74c2f9') depends_on('libpng') depends_on('openssl') diff --git a/var/spack/repos/builtin/packages/kokkos/package.py b/var/spack/repos/builtin/packages/kokkos/package.py index ef1651ff4f..98304b4cda 100644 --- a/var/spack/repos/builtin/packages/kokkos/package.py +++ b/var/spack/repos/builtin/packages/kokkos/package.py @@ -31,7 +31,9 @@ class Kokkos(Package): homepage = "https://github.com/kokkos/kokkos" url = "https://github.com/kokkos/kokkos/archive/2.03.00.tar.gz" + git = "https://github.com/kokkos/kokkos.git" + version('develop', branch='develop') version('2.7.00', 'b357f9374c1008754babb4495f95e392') version('2.5.00', '2db83c56587cb83b772d0c81a3228a21') version('2.04.11', 'd4849cee6eb9001d61c30f1d9fe74336') @@ -42,8 +44,6 @@ class Kokkos(Package): version('2.03.00', 'f205d659d4304747759fabfba32d43c3') version('2.02.15', 'de41e38f452a50bb03363c519fe20769') version('2.02.07', 'd5baeea70109249f7dca763074ffb202') - version('develop', git='https://github.com/kokkos/kokkos', - branch='develop') variant('qthreads', default=False, description="enable Qthreads backend") variant('cuda', default=False, description="enable Cuda backend") diff --git a/var/spack/repos/builtin/packages/krims/package.py b/var/spack/repos/builtin/packages/krims/package.py index 3fa405b669..1c6258f0f0 100644 --- a/var/spack/repos/builtin/packages/krims/package.py +++ b/var/spack/repos/builtin/packages/krims/package.py @@ -29,15 +29,16 @@ class Krims(CMakePackage): """The bucket of Krimskrams every C or C++ project needs""" homepage = "http://lazyten.org/krims" - url = "https://github.com/lazyten/krims/archive/v0.2.1.tar.gz" + url = "https://github.com/lazyten/krims/archive/v0.2.1.tar.gz" + git = "https://github.com/lazyten/krims.git" + maintainers = ['mfherbst'] # # Versions # + version("develop", branch="master") version("0.2.1", "bf219656fd81c342a4782bad7d7beed0") - version("develop", git="https://github.com/lazyten/krims.git", - branch="master") # # Variants diff --git a/var/spack/repos/builtin/packages/kvasir-mpl/package.py b/var/spack/repos/builtin/packages/kvasir-mpl/package.py index 35470eee1a..2a67665fd8 100644 --- a/var/spack/repos/builtin/packages/kvasir-mpl/package.py +++ b/var/spack/repos/builtin/packages/kvasir-mpl/package.py @@ -30,9 +30,9 @@ class KvasirMpl(Package): """Kvasir metaprogramming library""" homepage = "https://github.com/kvasir-io/mpl" + git = "https://github.com/kvasir-io/mpl.git" - version('develop', git='https://github.com/kvasir-io/mpl.git', - branch='development') + version('develop', branch='development') def install(self, spec, prefix): install_tree('src', prefix.include) diff --git a/var/spack/repos/builtin/packages/kvtree/package.py b/var/spack/repos/builtin/packages/kvtree/package.py index 3a8fb66811..aeff98804d 100644 --- a/var/spack/repos/builtin/packages/kvtree/package.py +++ b/var/spack/repos/builtin/packages/kvtree/package.py @@ -31,11 +31,12 @@ class Kvtree(CMakePackage): homepage = "https://github.com/ECP-VeloC/KVTree" url = "https://github.com/ECP-VeloC/KVTree/archive/v1.0.0.zip" - tags = ['ecp'] + git = "https://github.com/ecp-veloc/kvtree.git" + tags = ['ecp'] + + version('master', branch='master') version('1.0.1', 'f007b4b930d12fc0eb784b4dc3af823e') - version('master', git='https://github.com/ecp-veloc/kvtree.git', - branch='master') variant('mpi', default=True, description="Build with MPI message packing") depends_on('mpi', when='+mpi') diff --git a/var/spack/repos/builtin/packages/laghos/package.py b/var/spack/repos/builtin/packages/laghos/package.py index e828904bdd..11abe46fdf 100644 --- a/var/spack/repos/builtin/packages/laghos/package.py +++ b/var/spack/repos/builtin/packages/laghos/package.py @@ -34,11 +34,11 @@ class Laghos(MakefilePackage): tags = ['proxy-app', 'ecp-proxy-app'] homepage = "https://codesign.llnl.gov/laghos.php" - git = "https://github.com/CEED/Laghos" url = "https://github.com/CEED/Laghos/archive/v1.0.tar.gz" + git = "https://github.com/CEED/Laghos.git" + version('develop', branch='master') version('1.0', '4c091e115883c79bed81c557ef16baff') - version('develop', git=git, branch='master') variant('metis', default=True, description='Enable/disable METIS support') diff --git a/var/spack/repos/builtin/packages/lammps/package.py b/var/spack/repos/builtin/packages/lammps/package.py index 459166c36e..238e56500a 100644 --- a/var/spack/repos/builtin/packages/lammps/package.py +++ b/var/spack/repos/builtin/packages/lammps/package.py @@ -35,15 +35,16 @@ class Lammps(CMakePackage): """ homepage = "http://lammps.sandia.gov/" url = "https://github.com/lammps/lammps/archive/patch_1Sep2017.tar.gz" + git = "https://github.com/lammps/lammps" tags = ['ecp', 'ecp-apps'] + version('develop', branch='master') version('20180629', '6d5941863ee25ad2227ff3b7577d5e7c') version('20180316', '25bad35679583e0dd8cb8753665bb84b') version('20180222', '4d0513e3183bd57721814d217fdaf957') version('20170922', '4306071f919ec7e759bda195c26cfd9a') version('20170901', '767e7f07289663f033474dfe974974e7') - version('develop', git='https://github.com/lammps/lammps', branch='master') def url_for_version(self, version): vdate = dt.datetime.strptime(str(version), "%Y%m%d") diff --git a/var/spack/repos/builtin/packages/latte/package.py b/var/spack/repos/builtin/packages/latte/package.py index 8b1d60c024..ce4246123f 100644 --- a/var/spack/repos/builtin/packages/latte/package.py +++ b/var/spack/repos/builtin/packages/latte/package.py @@ -31,14 +31,15 @@ class Latte(CMakePackage): homepage = "https://github.com/lanl/latte" url = "https://github.com/lanl/latte/tarball/v1.0" + git = "https://github.com/lanl/latte.git" tags = ['ecp', 'ecp-apps'] + version('develop', branch='master') version('1.2.1', '56db44afaba2a89e6ca62ac565c3c012') version('1.2.0', 'b9bf8f84a0e0cf7b0e278a1bc7751b3d') version('1.1.1', 'ab11867ba6235189681cf6e50a50cc50') version('1.0.1', 'd0b99edbcf7a19abe0a68a192d6f6234') - version('develop', git='https://github.com/lanl/latte', branch='master') variant('mpi', default=True, description='Build with mpi') diff --git a/var/spack/repos/builtin/packages/lazyten/package.py b/var/spack/repos/builtin/packages/lazyten/package.py index 3b5a2829d1..d564732848 100644 --- a/var/spack/repos/builtin/packages/lazyten/package.py +++ b/var/spack/repos/builtin/packages/lazyten/package.py @@ -30,15 +30,16 @@ class Lazyten(CMakePackage): """Lightweight linear algebra library based on lazy matrices""" homepage = "http://lazyten.org" - url = "https://github.com/lazyten/lazyten/archive/v0.4.1.tar.gz" + url = "https://github.com/lazyten/lazyten/archive/v0.4.1.tar.gz" + git = "https://github.com/lazyten/lazyten.git" + maintainers = ['mfherbst'] # # Versions # + version("develop", branch="master") version('0.4.1', 'd06f7996144e1bf1b0aee82c2af36e83') - version("develop", git="https://github.com/lazyten/lazyten.git", - branch="master") # # Variants diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index 8b0faccabe..ff8d8a3047 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -34,8 +34,9 @@ class Lbann(CMakePackage): homepage = "http://software.llnl.gov/lbann/" url = "https://github.com/LLNL/lbann/archive/v0.91.tar.gz" + git = "https://github.com/LLNL/lbann.git" - version('develop', git='https://github.com/LLNL/lbann.git', branch="develop") + version('develop', branch='develop') version('0.93', '1913a25a53d4025fa04c16f14afdaa55') version('0.92', 'c0eb1595a7c74640e96f280beb497564') version('0.91', '83b0ec9cd0b7625d41dfb06d2abd4134') diff --git a/var/spack/repos/builtin/packages/legion/package.py b/var/spack/repos/builtin/packages/legion/package.py index fb497216d4..82235a8f86 100644 --- a/var/spack/repos/builtin/packages/legion/package.py +++ b/var/spack/repos/builtin/packages/legion/package.py @@ -42,8 +42,9 @@ class Legion(CMakePackage): """ homepage = "http://legion.stanford.edu/" url = "https://github.com/StanfordLegion/legion/tarball/legion-17.02.0" + git = "https://github.com/StanfordLegion/legion.git" - version('develop', git='https://github.com/StanfordLegion/legion', branch='master') + version('develop', branch='master') version('18.05.0', 'ab5ac8cd4aa4c91e6187bf1333a031bf') version('18.02.0', '14937b386100347b051a5fc514636353') version('17.10.0', 'ebfc974dc82a9d7f3ba53242ecae62e1') diff --git a/var/spack/repos/builtin/packages/libceed/package.py b/var/spack/repos/builtin/packages/libceed/package.py index e3967b4a0f..c2a3e3676d 100644 --- a/var/spack/repos/builtin/packages/libceed/package.py +++ b/var/spack/repos/builtin/packages/libceed/package.py @@ -26,16 +26,14 @@ from spack import * class Libceed(Package): - """The CEED API Library: Code for Efficient Extensible Discretizations - """ + """The CEED API Library: Code for Efficient Extensible Discretizations.""" homepage = "https://github.com/CEED/libCEED" - url = 'https://github.com/CEED/libCEED' + git = "https://github.com/CEED/libCEED.git" - version('develop', git='https://github.com/CEED/libCEED.git', - branch='master') - version('0.2', git='https://github.com/CEED/libCEED.git', tag='v0.2') - version('0.1', git='https://github.com/CEED/libCEED.git', tag='v0.1') + version('develop', branch='master') + version('0.2', tag='v0.2') + version('0.1', tag='v0.1') variant('occa', default=True, description='Enable OCCA backends') variant('cuda', default=False, description='Enable CUDA support') diff --git a/var/spack/repos/builtin/packages/libev/package.py b/var/spack/repos/builtin/packages/libev/package.py index 09fe1d1a35..19fd42f700 100644 --- a/var/spack/repos/builtin/packages/libev/package.py +++ b/var/spack/repos/builtin/packages/libev/package.py @@ -31,9 +31,10 @@ class Libev(AutotoolsPackage): homepage = "http://software.schmorp.de/pkg/libev.html" url = "http://dist.schmorp.de/libev/libev-4.24.tar.gz" + git = "https://github.com/enki/libev.git" list_url = "http://dist.schmorp.de/libev/Attic/" - version('develop', git='https://github.com/enki/libev') + version('develop', git=git) version('4.24', '94459a5a22db041dec6f98424d6efe54') depends_on('autoconf', type='build', when='@develop') diff --git a/var/spack/repos/builtin/packages/libevpath/package.py b/var/spack/repos/builtin/packages/libevpath/package.py index e7598160e9..b8ae807afa 100644 --- a/var/spack/repos/builtin/packages/libevpath/package.py +++ b/var/spack/repos/builtin/packages/libevpath/package.py @@ -33,10 +33,10 @@ class Libevpath(CMakePackage): """ homepage = "https://github.com/GTkorvo/evpath" - url = "https://github.com/GTkorvo/evpath/archive/v4.1.1.tar.gz" + url = "https://github.com/GTkorvo/evpath/archive/v4.1.1.tar.gz" + git = "https://github.com/GTkorvo/evpath.git" - version('develop', git='https://github.com/GTkorvo/evpath.git', - branch='master') + version('develop', branch='master') version('4.4.0', 'd8630eb358ec90ae2d188e0e6c74022a') version('4.2.4', '757ce010a6b7564dc62d3c79edd861d5') version('4.2.1', 'f928dc0dee41668afc91634c7051ce1a') diff --git a/var/spack/repos/builtin/packages/libffs/package.py b/var/spack/repos/builtin/packages/libffs/package.py index 3ebd03c600..68638251d6 100644 --- a/var/spack/repos/builtin/packages/libffs/package.py +++ b/var/spack/repos/builtin/packages/libffs/package.py @@ -34,13 +34,13 @@ class Libffs(CMakePackage): """ homepage = "http://www.cc.gatech.edu/systems/projects/FFS" - url = "https://github.com/GTkorvo/ffs/archive/v1.1.tar.gz" + url = "https://github.com/GTkorvo/ffs/archive/v1.1.tar.gz" + git = "https://github.com/GTkorvo/ffs.git" - version('develop', git='https://github.com/GTkorvo/ffs.git', - branch='master') - version('1.5', 'c41c5f5f448b627740deecd695b7bbf8') + version('develop', branch='master') + version('1.5', 'c41c5f5f448b627740deecd695b7bbf8') version('1.1.1', 'aa1c8ad5cf35e8cf76735e3a60891509') - version('1.1', '561c6b3abc53e12b3c01192e8ef2ffbc') + version('1.1', '561c6b3abc53e12b3c01192e8ef2ffbc') depends_on('flex', type='build', when='@:1.4') depends_on('bison', type='build', when='@:1.4') diff --git a/var/spack/repos/builtin/packages/libharu/package.py b/var/spack/repos/builtin/packages/libharu/package.py index 4411a4f58c..4c5aeada97 100644 --- a/var/spack/repos/builtin/packages/libharu/package.py +++ b/var/spack/repos/builtin/packages/libharu/package.py @@ -34,11 +34,11 @@ class Libharu(AutotoolsPackage): homepage = "http://libharu.org" url = "https://github.com/libharu/libharu/archive/RELEASE_2_3_0.tar.gz" + git = "https://github.com/libharu/libharu.git" + version('master', branch='master') version('2.3.0', '4f916aa49c3069b3a10850013c507460') version('2.2.0', 'b65a6fc33a0bdad89bec6b7def101f01') - version('master', branch='master', - git='https://github.com/libharu/libharu.git') depends_on('libtool', type=('build')) depends_on('autoconf', type=('build')) diff --git a/var/spack/repos/builtin/packages/libmonitor/package.py b/var/spack/repos/builtin/packages/libmonitor/package.py index f909e8b516..168389d450 100644 --- a/var/spack/repos/builtin/packages/libmonitor/package.py +++ b/var/spack/repos/builtin/packages/libmonitor/package.py @@ -27,9 +27,12 @@ from spack import * class Libmonitor(AutotoolsPackage): """Libmonitor is a library for process and thread control.""" + homepage = "https://github.com/HPCToolkit/libmonitor" - version('20130218', git='https://github.com/HPCToolkit/libmonitor.git', - commit='4f2311e') + git = "https://github.com/HPCToolkit/libmonitor.git" + + version('20130218', commit='4f2311e') + variant('krellpatch', default=False, description="build with openspeedshop based patch.") diff --git a/var/spack/repos/builtin/packages/libquo/package.py b/var/spack/repos/builtin/packages/libquo/package.py index 74957725d8..fa454bfcdc 100644 --- a/var/spack/repos/builtin/packages/libquo/package.py +++ b/var/spack/repos/builtin/packages/libquo/package.py @@ -33,9 +33,10 @@ class Libquo(AutotoolsPackage): homepage = "https://github.com/lanl/libquo" url = "https://github.com/lanl/libquo/archive/v1.2.9.tar.gz" + git = "https://github.com/lanl/libquo.git" - version('develop', git='https://github.com/lanl/libquo', branch='master') - version('1.3', '3ff74162837425a15ecf695ca0201e4a') + version('develop', branch='master') + version('1.3', '3ff74162837425a15ecf695ca0201e4a') version('1.2.9', 'ca82ab33f13e2b89983f81e7c02e98c2') depends_on('mpi') diff --git a/var/spack/repos/builtin/packages/librom/package.py b/var/spack/repos/builtin/packages/librom/package.py index c52c06370a..9994184557 100644 --- a/var/spack/repos/builtin/packages/librom/package.py +++ b/var/spack/repos/builtin/packages/librom/package.py @@ -30,10 +30,9 @@ class Librom(AutotoolsPackage): """libROM: library for computing large-scale reduced order models""" homepage = "https://github.com/LLNL/libROM" - url = "https://github.com/LLNL/libROM" + git = "https://github.com/LLNL/libROM.git" - version('develop', git='https://github.com/LLNL/libROM', - branch='master') + version('develop', branch='master') depends_on('lapack') depends_on('mpi') diff --git a/var/spack/repos/builtin/packages/libshm/package.py b/var/spack/repos/builtin/packages/libshm/package.py index 99b415b313..7ac2fcea03 100644 --- a/var/spack/repos/builtin/packages/libshm/package.py +++ b/var/spack/repos/builtin/packages/libshm/package.py @@ -30,9 +30,9 @@ class Libshm(Package): making an easy C++11 access to a shared memory.""" homepage = "https://github.com/afeldman/libshm" - url = "https://github.com/afeldman/libshm.git" + git = "https://github.com/afeldman/libshm.git" - version('master', git='https://github.com/afeldman/libshm.git') + version('master') def install(self, spec, prefix): install_tree('include', prefix.include) diff --git a/var/spack/repos/builtin/packages/libsplash/package.py b/var/spack/repos/builtin/packages/libsplash/package.py index 5cca529a76..672a0268d2 100644 --- a/var/spack/repos/builtin/packages/libsplash/package.py +++ b/var/spack/repos/builtin/packages/libsplash/package.py @@ -36,12 +36,11 @@ class Libsplash(CMakePackage): homepage = "https://github.com/ComputationalRadiationPhysics/libSplash" url = "https://github.com/ComputationalRadiationPhysics/libSplash/archive/v1.4.0.tar.gz" + git = "https://github.com/ComputationalRadiationPhysics/libSplash.git" maintainers = ['ax3l'] - version('develop', branch='dev', - git='https://github.com/ComputationalRadiationPhysics/libSplash.git') - version('master', branch='master', - git='https://github.com/ComputationalRadiationPhysics/libSplash.git') + version('develop', branch='dev') + version('master', branch='master') version('1.7.0', '22dea94734fe4f4c5f4e875ce70900d3') version('1.6.0', 'c05bce95abfe1ae4cd9d9817acf58d94') version('1.5.0', 'c1efec4c20334242c8a3b6bfdc0207e3') diff --git a/var/spack/repos/builtin/packages/libxsmm/package.py b/var/spack/repos/builtin/packages/libxsmm/package.py index e97f328d18..e88ce2c8ad 100644 --- a/var/spack/repos/builtin/packages/libxsmm/package.py +++ b/var/spack/repos/builtin/packages/libxsmm/package.py @@ -33,9 +33,9 @@ class Libxsmm(MakefilePackage): homepage = 'https://github.com/hfp/libxsmm' url = 'https://github.com/hfp/libxsmm/archive/1.9.tar.gz' + git = 'https://github.com/hfp/libxsmm.git' - version('develop', git='https://github.com/hfp/libxsmm.git') - + version('develop', git=git) version('1.9', 'a001a491d9b98239bc2bfd906bd09d90') version('1.8.3', '3415928340929c3a29773934de05c978') version('1.8.2', '8f11ece699244c28dcb6742969a2ccd4') diff --git a/var/spack/repos/builtin/packages/linkphase3/package.py b/var/spack/repos/builtin/packages/linkphase3/package.py index 3c574a5811..25bc77dec3 100644 --- a/var/spack/repos/builtin/packages/linkphase3/package.py +++ b/var/spack/repos/builtin/packages/linkphase3/package.py @@ -29,10 +29,9 @@ class Linkphase3(Package): """Haplotype reconstruction in pedigreed populations.""" homepage = "https://github.com/tdruet/LINKPHASE3" - url = "https://github.com/tdruet/LINKPHASE3" + git = "https://github.com/tdruet/LINKPHASE3.git" - version('2017-06-14', commit='559913593fc818bb1adb29796a548cf5bf323827', - git='https://github.com/tdruet/LINKPHASE3.git') + version('2017-06-14', commit='559913593fc818bb1adb29796a548cf5bf323827') def install(self, spec, prefix): fortran = Executable(self.compiler.fc) diff --git a/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py b/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py index 310df251aa..1b29312f7e 100644 --- a/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py +++ b/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py @@ -32,19 +32,14 @@ class LlvmOpenmpOmpt(CMakePackage): changes for OMPT, the OpenMP Tools interface""" homepage = "https://github.com/OpenMPToolsInterface/LLVM-openmp" + git = "https://github.com/OpenMPToolsInterface/LLVM-openmp.git" # tr6_forwards branch - version('tr6_forwards', branch='tr6_forwards', - git='https://github.com/OpenMPToolsInterface/LLVM-openmp.git') - - version('3.9.2b2', - git='https://github.com/OpenMPToolsInterface/LLVM-openmp.git', - commit='5cdca5dd3c0c336d42a335ca7cff622e270c9d47') + version('tr6_forwards', branch='tr6_forwards') + version('3.9.2b2', commit='5cdca5dd3c0c336d42a335ca7cff622e270c9d47') # align-to-tr-rebased branch - version('3.9.2b', - git='https://github.com/OpenMPToolsInterface/LLVM-openmp.git', - commit='982a08bcf3df9fb5afc04ac3bada47f19cc4e3d3') + version('3.9.2b', commit='982a08bcf3df9fb5afc04ac3bada47f19cc4e3d3') # variant for building llvm-openmp-ompt as a stand alone library variant('standalone', default=False, diff --git a/var/spack/repos/builtin/packages/lrzip/package.py b/var/spack/repos/builtin/packages/lrzip/package.py index aa26cb6ab6..268f0ed817 100644 --- a/var/spack/repos/builtin/packages/lrzip/package.py +++ b/var/spack/repos/builtin/packages/lrzip/package.py @@ -34,9 +34,10 @@ class Lrzip(Package): but not both.""" homepage = 'http://lrzip.kolivas.org' - url = 'https://github.com/ckolivas/lrzip/archive/v0.630.tar.gz' + url = 'https://github.com/ckolivas/lrzip/archive/v0.630.tar.gz' + git = 'https://github.com/ckolivas/lrzip.git' - version('master', git='https://github.com/ckolivas/lrzip.git') + version('master', git=git) version('0.630', '3ca7f1d1365aa105089d1fbfc6b0924a') version('0.621', '1f07227b39ae81a98934411e8611e341') version('0.616', 'd40bdb046d0807ef602e36b1e9782cc0') diff --git a/var/spack/repos/builtin/packages/lwm2/package.py b/var/spack/repos/builtin/packages/lwm2/package.py index 7893864d29..2190529f8c 100644 --- a/var/spack/repos/builtin/packages/lwm2/package.py +++ b/var/spack/repos/builtin/packages/lwm2/package.py @@ -31,8 +31,9 @@ class Lwm2(AutotoolsPackage): measurements from a program. """ homepage = "https://jay.grs.rwth-aachen.de/redmine/projects/lwm2" + hg = "https://jay.grs.rwth-aachen.de/hg/lwm2" - version('torus', hg='https://jay.grs.rwth-aachen.de/hg/lwm2', revision='torus') + version('torus', revision='torus') depends_on("papi") depends_on("mpi") diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index a8c4b819bd..f4b5a6012e 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -40,9 +40,10 @@ class Opencv(CMakePackage): """ homepage = 'http://opencv.org/' - url = 'https://github.com/Itseez/opencv/archive/3.1.0.tar.gz' + url = 'https://github.com/Itseez/opencv/archive/3.1.0.tar.gz' + git = 'https://github.com/opencv/opencv.git' - version('master', git="https://github.com/opencv/opencv.git", branch="master") + version('master', branch='master') version('3.4.1', 'a0b7a47899e67b3490ea31edc4f6e8e6') version('3.4.0', '170732dc760e5f7ddeccbe53ba5d16a6') version('3.3.1', 'b1ed9aea030bb5bd9df28524d97de84c') diff --git a/var/spack/repos/builtin/packages/plasma/package.py b/var/spack/repos/builtin/packages/plasma/package.py index 29afcef8ac..907857aace 100644 --- a/var/spack/repos/builtin/packages/plasma/package.py +++ b/var/spack/repos/builtin/packages/plasma/package.py @@ -22,11 +22,11 @@ class Plasma(MakefilePackage): homepage = "https://bitbucket.org/icl/plasma/" url = "https://bitbucket.org/icl/plasma/downloads/plasma-17.1.tar.gz" + hg = "https://luszczek@bitbucket.org/icl/plasma" + version("develop", hg=hg) version("17.1", "64b410b76023a41b3f07a5f0dca554e1") - version("develop", hg="https://luszczek@bitbucket.org/icl/plasma") - variant('shared', default=True, description="Build shared library (disables static library)") depends_on("blas") diff --git a/var/spack/repos/builtin/packages/xios/package.py b/var/spack/repos/builtin/packages/xios/package.py index 599b9a907e..665aee5e99 100644 --- a/var/spack/repos/builtin/packages/xios/package.py +++ b/var/spack/repos/builtin/packages/xios/package.py @@ -31,9 +31,8 @@ class Xios(Package): """XML-IO-SERVER library for IO management of climate models.""" homepage = "https://forge.ipsl.jussieu.fr/ioserver/wiki" - url = "https://forge.ipsl.jussieu.fr/ioserver" - version('1.0', revision=910, + version('1.0', revision=910, svn='http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS/branchs/xios-1.0') version('develop', svn='http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS/trunk') -- cgit v1.2.3-70-g09d2 From 908d2dcd4d3e5aac2e5cc7f357015982247141ab Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 23 Jul 2018 20:55:17 -0500 Subject: Add top-level attributes for git M-P packages --- var/spack/repos/builtin/packages/macsio/package.py | 10 +++++----- var/spack/repos/builtin/packages/mad-numdiff/package.py | 3 ++- var/spack/repos/builtin/packages/mallocmc/package.py | 8 ++++---- var/spack/repos/builtin/packages/masa/package.py | 7 +++---- var/spack/repos/builtin/packages/mdtest/package.py | 3 ++- var/spack/repos/builtin/packages/mefit/package.py | 4 ++-- var/spack/repos/builtin/packages/meraculous/package.py | 5 ++--- var/spack/repos/builtin/packages/mfem/package.py | 5 ++--- var/spack/repos/builtin/packages/mindthegap/package.py | 7 ++----- var/spack/repos/builtin/packages/miniaero/package.py | 5 ++--- var/spack/repos/builtin/packages/miniasm/package.py | 3 ++- var/spack/repos/builtin/packages/mitos/package.py | 5 ++--- var/spack/repos/builtin/packages/mlhka/package.py | 5 ++--- var/spack/repos/builtin/packages/mofem-cephas/package.py | 9 +++------ .../builtin/packages/mofem-fracture-module/package.py | 10 +++------- .../packages/mofem-minimal-surface-equation/package.py | 10 +++------- var/spack/repos/builtin/packages/mpich/package.py | 5 +++-- var/spack/repos/builtin/packages/mpifileutils/package.py | 3 ++- var/spack/repos/builtin/packages/mpilander/package.py | 6 +++--- var/spack/repos/builtin/packages/mpir/package.py | 3 ++- .../repos/builtin/packages/mpix-launch-swift/package.py | 5 ++--- var/spack/repos/builtin/packages/mrbayes/package.py | 5 ++--- var/spack/repos/builtin/packages/mrnet/package.py | 7 ++++--- var/spack/repos/builtin/packages/mrtrix3/package.py | 5 ++--- var/spack/repos/builtin/packages/mshadow/package.py | 7 +++---- var/spack/repos/builtin/packages/multiverso/package.py | 7 +++---- var/spack/repos/builtin/packages/nalu-wind/package.py | 7 +++---- var/spack/repos/builtin/packages/nalu/package.py | 7 +++---- var/spack/repos/builtin/packages/nek5000/package.py | 10 ++++------ var/spack/repos/builtin/packages/nekbone/package.py | 5 +++-- var/spack/repos/builtin/packages/nekcem/package.py | 7 +++---- var/spack/repos/builtin/packages/neuron/package.py | 4 ++-- var/spack/repos/builtin/packages/nlopt/package.py | 3 ++- var/spack/repos/builtin/packages/nnvm/package.py | 7 +++---- var/spack/repos/builtin/packages/nut/package.py | 13 +++++-------- var/spack/repos/builtin/packages/occa/package.py | 11 +++++------ var/spack/repos/builtin/packages/of-adios-write/package.py | 8 ++++---- var/spack/repos/builtin/packages/of-precice/package.py | 4 ++-- var/spack/repos/builtin/packages/openblas/package.py | 7 ++++--- var/spack/repos/builtin/packages/openfast/package.py | 10 +++------- var/spack/repos/builtin/packages/openfoam-com/package.py | 4 ++-- var/spack/repos/builtin/packages/openfoam-org/package.py | 3 ++- var/spack/repos/builtin/packages/openmc/package.py | 4 ++-- var/spack/repos/builtin/packages/opennurbs/package.py | 6 ++---- var/spack/repos/builtin/packages/openpmd-api/package.py | 6 +++--- .../repos/builtin/packages/openspeedshop-utils/package.py | 14 ++++---------- var/spack/repos/builtin/packages/openspeedshop/package.py | 14 ++++---------- .../repos/builtin/packages/pacbio-daligner/package.py | 6 ++---- .../repos/builtin/packages/pacbio-damasker/package.py | 6 ++---- var/spack/repos/builtin/packages/pacbio-dazz-db/package.py | 6 ++---- .../repos/builtin/packages/pacbio-dextractor/package.py | 6 ++---- var/spack/repos/builtin/packages/papyrus/package.py | 4 ++-- var/spack/repos/builtin/packages/paradiseo/package.py | 8 ++++---- var/spack/repos/builtin/packages/parsimonator/package.py | 4 ++-- var/spack/repos/builtin/packages/parsplice/package.py | 3 ++- var/spack/repos/builtin/packages/pbmpi/package.py | 4 ++-- var/spack/repos/builtin/packages/pegtl/package.py | 3 ++- var/spack/repos/builtin/packages/percept/package.py | 5 ++--- .../repos/builtin/packages/perl-star-fusion/package.py | 4 ++-- var/spack/repos/builtin/packages/petsc/package.py | 7 ++++--- var/spack/repos/builtin/packages/pflotran/package.py | 9 +++++---- var/spack/repos/builtin/packages/pgmath/package.py | 6 ++++-- var/spack/repos/builtin/packages/phasta/package.py | 8 +++----- var/spack/repos/builtin/packages/phist/package.py | 9 ++++----- var/spack/repos/builtin/packages/pidx/package.py | 4 ++-- var/spack/repos/builtin/packages/piranha/package.py | 3 ++- var/spack/repos/builtin/packages/pism/package.py | 13 ++++--------- var/spack/repos/builtin/packages/pngwriter/package.py | 8 ++++---- var/spack/repos/builtin/packages/pocl/package.py | 7 +++---- var/spack/repos/builtin/packages/portage/package.py | 8 ++++---- var/spack/repos/builtin/packages/precice/package.py | 4 ++-- var/spack/repos/builtin/packages/ps-lite/package.py | 7 +++---- var/spack/repos/builtin/packages/psm/package.py | 3 ++- var/spack/repos/builtin/packages/psmc/package.py | 3 ++- var/spack/repos/builtin/packages/pumi/package.py | 8 +++----- var/spack/repos/builtin/packages/pxz/package.py | 3 ++- var/spack/repos/builtin/packages/py-adios/package.py | 5 +++-- var/spack/repos/builtin/packages/py-dryscrape/package.py | 4 ++-- var/spack/repos/builtin/packages/py-edffile/package.py | 5 ++--- var/spack/repos/builtin/packages/py-espresso/package.py | 9 ++++----- var/spack/repos/builtin/packages/py-espressopp/package.py | 7 ++++--- var/spack/repos/builtin/packages/py-fiscalyear/package.py | 5 +++-- var/spack/repos/builtin/packages/py-fparser/package.py | 4 ++-- var/spack/repos/builtin/packages/py-libensemble/package.py | 3 ++- .../repos/builtin/packages/py-mg-rast-tools/package.py | 3 ++- var/spack/repos/builtin/packages/py-mpi4py/package.py | 4 ++-- var/spack/repos/builtin/packages/py-opentuner/package.py | 4 ++-- var/spack/repos/builtin/packages/py-proj/package.py | 5 +++-- var/spack/repos/builtin/packages/py-projectq/package.py | 10 ++++------ var/spack/repos/builtin/packages/py-psyclone/package.py | 7 +++---- var/spack/repos/builtin/packages/py-pybind11/package.py | 6 +++--- var/spack/repos/builtin/packages/py-pynn/package.py | 4 ++-- var/spack/repos/builtin/packages/py-pypeflow/package.py | 6 ++---- var/spack/repos/builtin/packages/py-pytorch/package.py | 8 +++----- var/spack/repos/builtin/packages/py-spefile/package.py | 5 ++--- var/spack/repos/builtin/packages/py-symengine/package.py | 5 +++-- var/spack/repos/builtin/packages/py-theano/package.py | 5 +++-- .../repos/builtin/packages/py-webkit-server/package.py | 3 ++- var/spack/repos/builtin/packages/py-xattr/package.py | 4 ++-- var/spack/repos/builtin/packages/py-yt/package.py | 4 ++-- var/spack/repos/builtin/packages/qmcpack/package.py | 14 +++++++------- var/spack/repos/builtin/packages/qmd-progress/package.py | 3 ++- var/spack/repos/builtin/packages/qtgraph/package.py | 9 +++------ var/spack/repos/builtin/packages/quinoa/package.py | 4 ++-- 104 files changed, 287 insertions(+), 343 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/macsio/package.py b/var/spack/repos/builtin/packages/macsio/package.py index 01422268a1..1acb384f7c 100644 --- a/var/spack/repos/builtin/packages/macsio/package.py +++ b/var/spack/repos/builtin/packages/macsio/package.py @@ -26,16 +26,16 @@ from spack import * class Macsio(CMakePackage): - """A Multi-purpose, Application-Centric, Scalable I/O Proxy Application - """ + """A Multi-purpose, Application-Centric, Scalable I/O Proxy Application.""" + tags = ['proxy-app', 'ecp-proxy-app'] homepage = "http://llnl.github.io/MACSio" - url = "https://github.com/LLNL/MACSio/archive/1.0.tar.gz" + url = "https://github.com/LLNL/MACSio/archive/1.0.tar.gz" + git = "https://github.com/LLNL/MACSio.git" + version('develop', branch='master') version('1.0', '90e8e00ea84af2a47bee387ad331dbde') - version('develop', git='https://github.com/LLNL/MACSio.git', - branch='master') variant('mpi', default=True, description="Build MPI plugin") variant('silo', default=True, description="Build with SILO plugin") diff --git a/var/spack/repos/builtin/packages/mad-numdiff/package.py b/var/spack/repos/builtin/packages/mad-numdiff/package.py index 8d687e2258..b4a0235f55 100644 --- a/var/spack/repos/builtin/packages/mad-numdiff/package.py +++ b/var/spack/repos/builtin/packages/mad-numdiff/package.py @@ -31,6 +31,7 @@ class MadNumdiff(CMakePackage): homepage = "https://github.com/quinoacomputing/ndiff" url = "https://github.com/quinoacomputing/ndiff/tarball/20150724" + git = "https://github.com/quinoacomputing/ndiff" - version('develop', git='https://github.com/quinoacomputing/ndiff', branch='master') + version('develop', branch='master') version('20150724', '7723c0f2499aea8fd960377c5bed28d8') diff --git a/var/spack/repos/builtin/packages/mallocmc/package.py b/var/spack/repos/builtin/packages/mallocmc/package.py index ce8dc2b98e..5ecde73967 100644 --- a/var/spack/repos/builtin/packages/mallocmc/package.py +++ b/var/spack/repos/builtin/packages/mallocmc/package.py @@ -39,12 +39,12 @@ class Mallocmc(CMakePackage): homepage = "https://github.com/ComputationalRadiationPhysics/mallocMC" url = "https://github.com/ComputationalRadiationPhysics/mallocMC/archive/2.2.0crp.tar.gz" + git = "https://github.com/ComputationalRadiationPhysics/mallocMC.git" + maintainers = ['ax3l'] - version('develop', branch='dev', - git='https://github.com/ComputationalRadiationPhysics/mallocMC.git') - version('master', branch='master', - git='https://github.com/ComputationalRadiationPhysics/mallocMC.git') + version('develop', branch='dev') + version('master', branch='master') version('2.2.0crp', '3e5c5fc963d1a9abc829ff701504e54c') version('2.1.0crp', 'd2bd2644012b64a246048575e9a9051c') version('2.0.1crp', '1f674d5d1ae05446d9a4e4b65465dca0') diff --git a/var/spack/repos/builtin/packages/masa/package.py b/var/spack/repos/builtin/packages/masa/package.py index 90df859473..622626d519 100644 --- a/var/spack/repos/builtin/packages/masa/package.py +++ b/var/spack/repos/builtin/packages/masa/package.py @@ -31,12 +31,11 @@ class Masa(AutotoolsPackage): provides a suite of manufactured solutions for the software verification of partial differential equation solvers in multiple dimensions.""" + homepage = "https://github.com/manufactured-solutions/MASA" - url = "https://github.com/manufactured-solutions/MASA.git" + git = "https://github.com/manufactured-solutions/MASA.git" - version('master', - git='https://github.com/manufactured-solutions/MASA.git', - tag='master') + version('master', tag='master') variant('fortran', default=True, description='Compile with Fortran interfaces') diff --git a/var/spack/repos/builtin/packages/mdtest/package.py b/var/spack/repos/builtin/packages/mdtest/package.py index 2a40e7e638..25068478e5 100644 --- a/var/spack/repos/builtin/packages/mdtest/package.py +++ b/var/spack/repos/builtin/packages/mdtest/package.py @@ -31,8 +31,9 @@ class Mdtest(Package): and directories and then reports the performance.""" homepage = "https://github.com/LLNL/mdtest" + git = "https://github.com/LLNL/mdtest.git" - version('1.9.3', git='https://github.com/LLNL/mdtest.git', commit='49f3f0') + version('1.9.3', commit='49f3f0') depends_on('mpi') diff --git a/var/spack/repos/builtin/packages/mefit/package.py b/var/spack/repos/builtin/packages/mefit/package.py index e82615b732..cbd05eb656 100644 --- a/var/spack/repos/builtin/packages/mefit/package.py +++ b/var/spack/repos/builtin/packages/mefit/package.py @@ -31,9 +31,9 @@ class Mefit(Package): merge statistics, and filter reads for quality.""" homepage = "https://github.com/nisheth/MeFiT" - url = "https://github.com/nisheth/MeFiT.git" + git = "https://github.com/nisheth/MeFiT.git" - version('1.0', git='https://github.com/nisheth/MeFiT.git', commit='0733326d8917570bbf70ff5c0f710bf66c13db09') + version('1.0', commit='0733326d8917570bbf70ff5c0f710bf66c13db09') depends_on('py-numpy') depends_on('py-htseq') diff --git a/var/spack/repos/builtin/packages/meraculous/package.py b/var/spack/repos/builtin/packages/meraculous/package.py index 798de5761c..0fe382d9eb 100644 --- a/var/spack/repos/builtin/packages/meraculous/package.py +++ b/var/spack/repos/builtin/packages/meraculous/package.py @@ -31,10 +31,9 @@ class Meraculous(CMakePackage): homepage = "http://jgi.doe.gov/data-and-tools/meraculous/" url = "https://downloads.sourceforge.net/project/meraculous20/Meraculous-v2.2.4.tar.gz" + git = "https://bitbucket.org/berkeleylab/genomics-meraculous2.git" - version('2.2.5.1', - git="https://bitbucket.org/berkeleylab/genomics-meraculous2.git", - branch="release-2.2.5.1") + version('2.2.5.1', branch='release-2.2.5.1') version('2.2.4', '349feb6cb178643a46e4b092c87bad3a') depends_on('perl', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/mfem/package.py b/var/spack/repos/builtin/packages/mfem/package.py index d5cbf4f077..832ad61191 100644 --- a/var/spack/repos/builtin/packages/mfem/package.py +++ b/var/spack/repos/builtin/packages/mfem/package.py @@ -33,7 +33,7 @@ class Mfem(Package): tags = ['FEM', 'finite elements', 'high-order', 'AMR', 'HPC'] homepage = 'http://www.mfem.org' - url = 'https://github.com/mfem/mfem' + git = 'https://github.com/mfem/mfem.git' maintainers = ['goxberry', 'tzanio', 'markcmiller86', 'acfisher', 'v-dobrev'] @@ -62,8 +62,7 @@ class Mfem(Package): # 'develop' is a special version that is always larger (or newer) than any # other version. - version('develop', - git='https://github.com/mfem/mfem', branch='master') + version('develop', branch='master') version('3.4.0', '4e73e4fe0482636de3c5dc983cd395839a83cb16f6f509bd88b053e8b3858e05', diff --git a/var/spack/repos/builtin/packages/mindthegap/package.py b/var/spack/repos/builtin/packages/mindthegap/package.py index a9b9fbdf7a..9bc8e5a1a7 100644 --- a/var/spack/repos/builtin/packages/mindthegap/package.py +++ b/var/spack/repos/builtin/packages/mindthegap/package.py @@ -31,11 +31,8 @@ class Mindthegap(CMakePackage): respect to a reference genome.""" homepage = "https://gatb.inria.fr/software/mind-the-gap/" - url = "https://github.com/GATB/MindTheGap.git" + git = "https://github.com/GATB/MindTheGap.git" - version('2.0.2', - tags='v2.0.2', - git='https://github.com/GATB/MindTheGap.git', - submodules=True) + version('2.0.2', tags='v2.0.2', submodules=True) depends_on('zlib') diff --git a/var/spack/repos/builtin/packages/miniaero/package.py b/var/spack/repos/builtin/packages/miniaero/package.py index bd1422ecf3..cc7ec4e4b2 100644 --- a/var/spack/repos/builtin/packages/miniaero/package.py +++ b/var/spack/repos/builtin/packages/miniaero/package.py @@ -32,12 +32,11 @@ class Miniaero(MakefilePackage): """ homepage = "http://mantevo.org" - url = "https://github.com/Mantevo/miniAero.git" + git = "https://github.com/Mantevo/miniAero.git" tags = ['proxy-app'] - version('2016-11-11', git='https://github.com/Mantevo/miniAero.git', - commit='f46d135479a5be19ec5d146ccaf0e581aeff4596') + version('2016-11-11', commit='f46d135479a5be19ec5d146ccaf0e581aeff4596') depends_on('kokkos') diff --git a/var/spack/repos/builtin/packages/miniasm/package.py b/var/spack/repos/builtin/packages/miniasm/package.py index 0de8451fe2..5f6444f741 100644 --- a/var/spack/repos/builtin/packages/miniasm/package.py +++ b/var/spack/repos/builtin/packages/miniasm/package.py @@ -30,8 +30,9 @@ class Miniasm(MakefilePackage): reads.""" homepage = "http://www.example.co://github.com/lh3/miniasm" + git = "https://github.com/lh3/miniasm.git" - version('2018-3-30', git='https://github.com/lh3/miniasm.git', commit='55cf0189e2f7d5bda5868396cebe066eec0a9547') + version('2018-3-30', commit='55cf0189e2f7d5bda5868396cebe066eec0a9547') depends_on('zlib') diff --git a/var/spack/repos/builtin/packages/mitos/package.py b/var/spack/repos/builtin/packages/mitos/package.py index 40f4fe7014..4c998f5541 100644 --- a/var/spack/repos/builtin/packages/mitos/package.py +++ b/var/spack/repos/builtin/packages/mitos/package.py @@ -31,10 +31,9 @@ class Mitos(CMakePackage): homepage = "https://github.com/llnl/Mitos" url = "https://github.com/LLNL/Mitos/archive/v0.9.1.tar.gz" + git = "https://github.com/llnl/Mitos.git" - version('0.9.2', - git='https://github.com/llnl/Mitos.git', - commit='8cb143a2e8c00353ff531a781a9ca0992b0aaa3d') + version('0.9.2', commit='8cb143a2e8c00353ff531a781a9ca0992b0aaa3d') version('0.9.1', 'c6cb57f3cae54f5157affd97ef7ef79e') depends_on('dyninst@8.2.1:') diff --git a/var/spack/repos/builtin/packages/mlhka/package.py b/var/spack/repos/builtin/packages/mlhka/package.py index dd2e044a23..9d76b3df79 100644 --- a/var/spack/repos/builtin/packages/mlhka/package.py +++ b/var/spack/repos/builtin/packages/mlhka/package.py @@ -30,10 +30,9 @@ class Mlhka(Package): and divergence data.""" homepage = "https://wright.eeb.utoronto.ca" - url = "https://github.com/rossibarra/MLHKA" + git = "https://github.com/rossibarra/MLHKA.git" - version('2.1', git='https://github.com/rossibarra/MLHKA.git', - commit='e735ddd39073af58da21b00b27dea203736e5467') + version('2.1', commit='e735ddd39073af58da21b00b27dea203736e5467') def install(self, spec, prefix): cxx = which('c++') diff --git a/var/spack/repos/builtin/packages/mofem-cephas/package.py b/var/spack/repos/builtin/packages/mofem-cephas/package.py index f98f0a6379..01b2d36fb9 100644 --- a/var/spack/repos/builtin/packages/mofem-cephas/package.py +++ b/var/spack/repos/builtin/packages/mofem-cephas/package.py @@ -27,15 +27,12 @@ class MofemCephas(CMakePackage): """mofem-cephas core library""" homepage = "http://mofem.eng.gla.ac.uk" - url = "https://bitbucket.org/likask/mofem-cephas.git" + git = "https://bitbucket.org/likask/mofem-cephas.git" maintainers = ['likask'] - version('0.8.7', git='https://bitbucket.org/likask/mofem-cephas.git', - tag='v0.8.7', submodules=True) - version('develop', - git='https://bitbucket.org/likask/mofem-cephas.git', - branch='develop', submodules=True) + version('develop', branch='develop', submodules=True) + version('0.8.7', tag='v0.8.7', submodules=True) # This option can be only used for development of core lib variant('copy_user_modules', default=True, diff --git a/var/spack/repos/builtin/packages/mofem-fracture-module/package.py b/var/spack/repos/builtin/packages/mofem-fracture-module/package.py index 0369aba7d2..fde8de5b94 100644 --- a/var/spack/repos/builtin/packages/mofem-fracture-module/package.py +++ b/var/spack/repos/builtin/packages/mofem-fracture-module/package.py @@ -27,16 +27,12 @@ class MofemFractureModule(CMakePackage): """mofem fracture module""" homepage = "http://mofem.eng.gla.ac.uk" - url = "https://bitbucket.org/likask/mofem_um_fracture_mechanics" + git = "https://bitbucket.org/likask/mofem_um_fracture_mechanics.git" maintainers = ['likask'] - version('0.9.42', - git='https://bitbucket.org/likask/mofem_um_fracture_mechanics', - tag='v0.9.42') - version('develop', - git='https://bitbucket.org/likask/mofem_um_fracture_mechanics', - branch='develop') + version('develop', branch='develop') + version('0.9.42', tag='v0.9.42') variant('copy_user_modules', default=True, description='Copy user modules directory instead linking') diff --git a/var/spack/repos/builtin/packages/mofem-minimal-surface-equation/package.py b/var/spack/repos/builtin/packages/mofem-minimal-surface-equation/package.py index 761fbc178a..7a7457d61c 100644 --- a/var/spack/repos/builtin/packages/mofem-minimal-surface-equation/package.py +++ b/var/spack/repos/builtin/packages/mofem-minimal-surface-equation/package.py @@ -27,16 +27,12 @@ class MofemMinimalSurfaceEquation(CMakePackage): """mofem minimal surface equation""" homepage = "http://mofem.eng.gla.ac.uk" - url = "https://bitbucket.org/likask/mofem_um_minimal_surface_equation" + git = "https://bitbucket.org/likask/mofem_um_minimal_surface_equation.git" maintainers = ['likask'] - version('0.3.9', - git='https://bitbucket.org/likask/mofem_um_minimal_surface_equation', - tag='v0.3.9') - version('develop', - git='https://bitbucket.org/likask/mofem_um_minimal_surface_equation', - branch='develop') + version('develop', branch='develop') + version('0.3.9', tag='v0.3.9') variant('copy_user_modules', default=True, description='Copy user modules directory instead linking') diff --git a/var/spack/repos/builtin/packages/mpich/package.py b/var/spack/repos/builtin/packages/mpich/package.py index 9398df42bb..62fb44de29 100644 --- a/var/spack/repos/builtin/packages/mpich/package.py +++ b/var/spack/repos/builtin/packages/mpich/package.py @@ -31,10 +31,12 @@ class Mpich(AutotoolsPackage): the Message Passing Interface (MPI) standard.""" homepage = "http://www.mpich.org" - url = "http://www.mpich.org/static/downloads/3.0.4/mpich-3.0.4.tar.gz" + url = "http://www.mpich.org/static/downloads/3.0.4/mpich-3.0.4.tar.gz" + git = "https://github.com/pmodels/mpich.git" list_url = "http://www.mpich.org/static/downloads/" list_depth = 1 + version('develop', submodules=True) version('3.2.1', 'e175452f4d61646a52c73031683fc375') version('3.2', 'f414cfa77099cd1fa1a5ae4e22db508a') version('3.1.4', '2ab544607986486562e076b83937bba2') @@ -43,7 +45,6 @@ class Mpich(AutotoolsPackage): version('3.1.1', '40dc408b1e03cc36d80209baaa2d32b7') version('3.1', '5643dd176499bfb7d25079aaff25f2ec') version('3.0.4', '9c5d5d4fe1e17dd12153f40bc5b6dbc0') - version('develop', git='git://github.com/pmodels/mpich', submodules=True) variant('hydra', default=True, description='Build the hydra process manager') variant('pmi', default=True, description='Build with PMI support') diff --git a/var/spack/repos/builtin/packages/mpifileutils/package.py b/var/spack/repos/builtin/packages/mpifileutils/package.py index b59e34768e..32ec11a0ed 100644 --- a/var/spack/repos/builtin/packages/mpifileutils/package.py +++ b/var/spack/repos/builtin/packages/mpifileutils/package.py @@ -37,8 +37,9 @@ class Mpifileutils(AutotoolsPackage): homepage = "https://github.com/hpc/mpifileutils" url = "https://github.com/hpc/mpifileutils/releases/download/v0.6/mpifileutils-0.6.tar.gz" + git = "https://github.com/hpc/mpifileutils.git" - version('develop', git='https://github.com/hpc/mpifileutils.git') + version('develop', git=git) version('0.7', 'c081f7f72c4521dddccdcf9e087c5a2b') version('0.6', '620bcc4966907481f1b1a965b28fc9bf') diff --git a/var/spack/repos/builtin/packages/mpilander/package.py b/var/spack/repos/builtin/packages/mpilander/package.py index 9be27b90a9..b0dbee3ea9 100644 --- a/var/spack/repos/builtin/packages/mpilander/package.py +++ b/var/spack/repos/builtin/packages/mpilander/package.py @@ -29,11 +29,11 @@ class Mpilander(CMakePackage): """There can only be one (MPI process)!""" homepage = "https://github.com/MPILander/MPILander" - url = "https://github.com/MPILander/MPILander/archive/0.1.0.tar.gz" + git = "https://github.com/MPILander/MPILander.git" + maintainers = ['ax3l'] - version('develop', branch='master', - git='https://github.com/MPILander/MPILander.git') + version('develop', branch='master') # variant('cuda', default=False, description='Enable CUDA support') # variant( diff --git a/var/spack/repos/builtin/packages/mpir/package.py b/var/spack/repos/builtin/packages/mpir/package.py index a196919546..4f26bfe45b 100644 --- a/var/spack/repos/builtin/packages/mpir/package.py +++ b/var/spack/repos/builtin/packages/mpir/package.py @@ -30,10 +30,11 @@ class Mpir(Package): homepage = "https://github.com/wbhart/mpir" url = "https://github.com/wbhart/mpir/archive/mpir-2.7.0.tar.gz" + git = "https://github.com/wbhart/mpir.git" + version('develop', git=git) version('2.7.0', '985b5d57bd0e74c74125ee885b9c8f71') version('2.6.0', 'ec17d6a7e026114ceb734b2466aa0a91') - version('develop', git='https://github.com/wbhart/mpir.git') # This setting allows mpir to act as a drop-in replacement for gmp variant('gmp_compat', default=False, diff --git a/var/spack/repos/builtin/packages/mpix-launch-swift/package.py b/var/spack/repos/builtin/packages/mpix-launch-swift/package.py index d5d8190621..f72b0fff4f 100644 --- a/var/spack/repos/builtin/packages/mpix-launch-swift/package.py +++ b/var/spack/repos/builtin/packages/mpix-launch-swift/package.py @@ -32,10 +32,9 @@ class MpixLaunchSwift(Package): """ homepage = "https://bitbucket.org/kshitijvmehta/mpix_launch_swift" - url = "https://kshitijvmehta@bitbucket.org/kshitijvmehta/mpix_launch_swift.git" + git = "https://kshitijvmehta@bitbucket.org/kshitijvmehta/mpix_launch_swift.git" - version('develop', git='https://kshitijvmehta@bitbucket.org/kshitijvmehta/mpix_launch_swift.git', - branch='envs') + version('develop', branch='envs') depends_on('stc') depends_on('tcl') diff --git a/var/spack/repos/builtin/packages/mrbayes/package.py b/var/spack/repos/builtin/packages/mrbayes/package.py index fcc29329bd..69fb15de5d 100644 --- a/var/spack/repos/builtin/packages/mrbayes/package.py +++ b/var/spack/repos/builtin/packages/mrbayes/package.py @@ -32,10 +32,9 @@ class Mrbayes(AutotoolsPackage): of model parameters.""" homepage = "http://mrbayes.sourceforge.net" - url = "https://github.com/NBISweden/MrBayes" + git = "https://github.com/NBISweden/MrBayes.git" - version('2017-11-22', commit='8a9adb11bcc538cb95d91d57568dff383f924503', - git='https://github.com/NBISweden/MrBayes.git') + version('2017-11-22', commit='8a9adb11bcc538cb95d91d57568dff383f924503') variant('mpi', default=True, description='Enable MPI parallel support') variant('beagle', default=True, description='Enable BEAGLE library for speed benefits') diff --git a/var/spack/repos/builtin/packages/mrnet/package.py b/var/spack/repos/builtin/packages/mrnet/package.py index 996ce273d0..dc7ca9acf9 100644 --- a/var/spack/repos/builtin/packages/mrnet/package.py +++ b/var/spack/repos/builtin/packages/mrnet/package.py @@ -27,13 +27,14 @@ from spack import * class Mrnet(AutotoolsPackage): """The MRNet Multi-Cast Reduction Network.""" + homepage = "http://paradyn.org/mrnet" url = "http://ftp.cs.wisc.edu/pub/paradyn/mrnet/mrnet_5.0.1.tar.gz" + git = "https://github.com/dyninst/mrnet.git" list_url = "http://ftp.cs.wisc.edu/paradyn/mrnet" - version('5.0.1-3', git='https://github.com/dyninst/mrnet.git') - version('5.0.1-2', git='https://github.com/dyninst/mrnet.git', - commit='20b1eacfc6d680d9f6472146d2dfaa0f900cc2e9') + version('5.0.1-3', git=git) + version('5.0.1-2', commit='20b1eacfc6d680d9f6472146d2dfaa0f900cc2e9') version('5.0.1', '17f65738cf1b9f9b95647ff85f69ecdd') version('4.1.0', '5a248298b395b329e2371bf25366115c') version('4.0.0', 'd00301c078cba57ef68613be32ceea2f') diff --git a/var/spack/repos/builtin/packages/mrtrix3/package.py b/var/spack/repos/builtin/packages/mrtrix3/package.py index 1d9d089333..a61a19cc4c 100644 --- a/var/spack/repos/builtin/packages/mrtrix3/package.py +++ b/var/spack/repos/builtin/packages/mrtrix3/package.py @@ -33,10 +33,9 @@ class Mrtrix3(Package): density.""" homepage = "http://www.mrtrix.org/" - url = "https://github.com/MRtrix3/mrtrix3" + git = "https://github.com/MRtrix3/mrtrix3.git" - version('2017-09-25', commit='72aca89e3d38c9d9e0c47104d0fb5bd2cbdb536d', - git='https://github.com/MRtrix3/mrtrix3.git') + version('2017-09-25', commit='72aca89e3d38c9d9e0c47104d0fb5bd2cbdb536d') depends_on('python@2.7:', type=('build', 'run')) depends_on('py-numpy', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/mshadow/package.py b/var/spack/repos/builtin/packages/mshadow/package.py index 83b9eee2d4..a8bc977303 100644 --- a/var/spack/repos/builtin/packages/mshadow/package.py +++ b/var/spack/repos/builtin/packages/mshadow/package.py @@ -30,11 +30,10 @@ class Mshadow(Package): in C++/CUDA.""" homepage = "https://github.com/dmlc/mshadow" - url = "https://github.com/dmlc/mshadow/archive/v1.1.tar.gz" + git = "https://github.com/dmlc/mshadow.git" - version('master', git='https://github.com/dmlc/mshadow.git', branch='master') - version('20170721', git='https://github.com/dmlc/mshadow.git', - commit='20b54f068c1035f0319fa5e5bbfb129c450a5256') + version('master', branch='master') + version('20170721', commit='20b54f068c1035f0319fa5e5bbfb129c450a5256') def install(self, spec, prefix): install_tree('mshadow', prefix.include.mshadow) diff --git a/var/spack/repos/builtin/packages/multiverso/package.py b/var/spack/repos/builtin/packages/multiverso/package.py index 2d7e48cf47..ed803a4be8 100644 --- a/var/spack/repos/builtin/packages/multiverso/package.py +++ b/var/spack/repos/builtin/packages/multiverso/package.py @@ -31,11 +31,10 @@ class Multiverso(CMakePackage): homepage = "https://github.com/Microsoft/Multiverso" url = "https://github.com/Microsoft/Multiverso/archive/v0.2.tar.gz" + git = "https://github.com/Microsoft/Multiverso.git" - version('master', git='https://github.com/Microsoft/Multiverso.git', - branch='master') - version('143187', git='https://github.com/Microsoft/Multiverso.git', - commit='143187575d1cfa410100037b8aea2e767e0af637') + version('master', branch='master') + version('143187', commit='143187575d1cfa410100037b8aea2e767e0af637') version('0.2', '483ca7524fea14a311389e421f2bc098') depends_on('mpi') diff --git a/var/spack/repos/builtin/packages/nalu-wind/package.py b/var/spack/repos/builtin/packages/nalu-wind/package.py index 87b235bc0b..8ea04adf92 100644 --- a/var/spack/repos/builtin/packages/nalu-wind/package.py +++ b/var/spack/repos/builtin/packages/nalu-wind/package.py @@ -28,10 +28,12 @@ class NaluWind(CMakePackage): """Nalu-Wind: Wind energy focused variant of Nalu.""" homepage = "https://github.com/exawind/nalu-wind" - url = "https://github.com/exawind/nalu-wind.git" + git = "https://github.com/exawind/nalu-wind.git" maintainers = ['jrood-nrel'] + version('master', branch='master') + variant('openfast', default=False, description='Compile with OpenFAST support') variant('tioga', default=False, @@ -39,9 +41,6 @@ class NaluWind(CMakePackage): variant('hypre', default=False, description='Compile with Hypre support') - version('master', - git='https://github.com/exawind/nalu-wind.git', branch='master') - depends_on('mpi') depends_on('yaml-cpp@0.5.3:') depends_on('trilinos+exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist+superlu+hdf5+zlib+pnetcdf+shards~hypre@master,develop') diff --git a/var/spack/repos/builtin/packages/nalu/package.py b/var/spack/repos/builtin/packages/nalu/package.py index 44efe0121e..89084f51d3 100644 --- a/var/spack/repos/builtin/packages/nalu/package.py +++ b/var/spack/repos/builtin/packages/nalu/package.py @@ -32,10 +32,12 @@ class Nalu(CMakePackage): """ homepage = "https://github.com/NaluCFD/Nalu" - url = "https://github.com/NaluCFD/Nalu.git" + git = "https://github.com/NaluCFD/Nalu.git" tags = ['ecp', 'ecp-apps'] + version('master', branch='master') + variant('openfast', default=False, description='Compile with OpenFAST support') variant('tioga', default=False, @@ -43,9 +45,6 @@ class Nalu(CMakePackage): variant('hypre', default=False, description='Compile with Hypre support') - version('master', - git='https://github.com/NaluCFD/Nalu.git', branch='master') - depends_on('mpi') depends_on('yaml-cpp@0.5.3:') depends_on('trilinos+exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist+superlu+hdf5+zlib+pnetcdf+shards~hypre@master,develop') diff --git a/var/spack/repos/builtin/packages/nek5000/package.py b/var/spack/repos/builtin/packages/nek5000/package.py index 291cc348e0..34ee6cdb63 100644 --- a/var/spack/repos/builtin/packages/nek5000/package.py +++ b/var/spack/repos/builtin/packages/nek5000/package.py @@ -42,16 +42,14 @@ class Nek5000(Package): dynamics""" homepage = "https://nek5000.mcs.anl.gov/" - url = "https://github.com/Nek5000/Nek5000" + url = "https://github.com/Nek5000/Nek5000/releases/download/v17.0/Nek5000-v17.0.tar.gz" + git = "https://github.com/Nek5000/Nek5000.git" tags = ['cfd', 'flow', 'hpc', 'solver', 'navier-stokes', 'spectral-elements', 'fluid', 'ecp', 'ecp-apps'] - version('17.0', '6a13bfad2ce023897010dd88f54a0a87', - url="https://github.com/Nek5000/Nek5000/releases/download/" - "v17.0/Nek5000-v17.0.tar.gz") - version('develop', git='https://github.com/Nek5000/Nek5000.git', - branch='master') + version('develop', branch='master') + version('17.0', '6a13bfad2ce023897010dd88f54a0a87') # MPI, Profiling and Visit variants variant('mpi', default=True, description='Build with MPI.') diff --git a/var/spack/repos/builtin/packages/nekbone/package.py b/var/spack/repos/builtin/packages/nekbone/package.py index aae60ef797..f610c9e416 100644 --- a/var/spack/repos/builtin/packages/nekbone/package.py +++ b/var/spack/repos/builtin/packages/nekbone/package.py @@ -32,12 +32,13 @@ class Nekbone(Package): the spectral element method.""" homepage = "https://github.com/Nek5000/Nekbone" - url = "https://github.com/Nek5000/Nekbone/archive/v17.0.tar.gz" + url = "https://github.com/Nek5000/Nekbone/archive/v17.0.tar.gz" + git = "https://github.com/Nek5000/Nekbone.git" tags = ['proxy-app', 'ecp-proxy-app'] + version('develop', git=git) version('17.0', sha256='ae361cc61368a924398a28a296f675b7f0c4a9516788a7f8fa3c09d787cdf69b') - version('develop', git='https://github.com/Nek5000/Nekbone.git') # Variants variant('mpi', default=True, description='Build with MPI') diff --git a/var/spack/repos/builtin/packages/nekcem/package.py b/var/spack/repos/builtin/packages/nekcem/package.py index aa460d7445..6aedcdf9fd 100644 --- a/var/spack/repos/builtin/packages/nekcem/package.py +++ b/var/spack/repos/builtin/packages/nekcem/package.py @@ -33,15 +33,14 @@ class Nekcem(Package): # Links to homepage and git homepage = "https://nekcem.mcs.anl.gov" - url = "https://github.com/NekCEM/NekCEM/archive/development.zip" + git = "https://github.com/NekCEM/NekCEM.git" # Variants variant('mpi', default=True, description='Build with MPI') # We only have a development version - version('develop', git='https://github.com/NekCEM/NekCEM.git') - version('0b8bedd', git='https://github.com/NekCEM/NekCEM.git', - commit='0b8beddfdcca646bfcc866dfda1c5f893338399b') + version('develop') + version('0b8bedd', commit='0b8beddfdcca646bfcc866dfda1c5f893338399b') # dependencies depends_on('mpi', when='+mpi') diff --git a/var/spack/repos/builtin/packages/neuron/package.py b/var/spack/repos/builtin/packages/neuron/package.py index df1b45d2ed..b84ec2db34 100644 --- a/var/spack/repos/builtin/packages/neuron/package.py +++ b/var/spack/repos/builtin/packages/neuron/package.py @@ -38,13 +38,13 @@ class Neuron(Package): homepage = "https://www.neuron.yale.edu/" url = "http://www.neuron.yale.edu/ftp/neuron/versions/v7.5/nrn-7.5.tar.gz" - github = "https://github.com/nrnhines/nrn" + git = "https://github.com/nrnhines/nrn.git" + version('develop', git=git) version('7.5', 'fb72c841374dfacbb6c2168ff57bfae9') version('7.4', '2c0bbee8a9e55d60fa26336f4ab7acbf') version('7.3', '993e539cb8bf102ca52e9fefd644ab61') version('7.2', '5486709b6366add932e3a6d141c4f7ad') - version('develop', git=github) variant('mpi', default=True, description='Enable MPI parallelism') variant('python', default=True, description='Enable python') diff --git a/var/spack/repos/builtin/packages/nlopt/package.py b/var/spack/repos/builtin/packages/nlopt/package.py index 9ff1f0ee38..1b5a904132 100644 --- a/var/spack/repos/builtin/packages/nlopt/package.py +++ b/var/spack/repos/builtin/packages/nlopt/package.py @@ -33,8 +33,9 @@ class Nlopt(CMakePackage): homepage = "https://nlopt.readthedocs.io" url = "https://github.com/stevengj/nlopt/releases/download/nlopt-2.4.2/nlopt-2.4.2.tar.gz" + git = "https://github.com/stevengj/nlopt.git" - version('develop', git='https://github.com/stevengj/nlopt.git', branch='master') + version('develop', branch='master') version('2.4.2', 'd0b8f139a4acf29b76dbae69ade8ac54') variant('shared', default=True, description='Enables the build of shared libraries') diff --git a/var/spack/repos/builtin/packages/nnvm/package.py b/var/spack/repos/builtin/packages/nnvm/package.py index c3caf69cf1..b520b014e8 100644 --- a/var/spack/repos/builtin/packages/nnvm/package.py +++ b/var/spack/repos/builtin/packages/nnvm/package.py @@ -30,11 +30,10 @@ class Nnvm(CMakePackage): part to help build deep learning libraries.""" homepage = "https://github.com/dmlc/nnvm" - url = "https://github.com/dmlc/nnvm.git" + git = "https://github.com/dmlc/nnvm.git" - version('master', git='https://github.com/dmlc/nnvm.git', branch='master') - version('20170418', git='https://github.com/dmlc/nnvm.git', - commit='b279286304ac954098d94a2695bca599e832effb') + version('master', branch='master') + version('20170418', commit='b279286304ac954098d94a2695bca599e832effb') variant('shared', default=True, description='Build a shared NNVM lib.') diff --git a/var/spack/repos/builtin/packages/nut/package.py b/var/spack/repos/builtin/packages/nut/package.py index a5f0c427d6..c53cb188ab 100644 --- a/var/spack/repos/builtin/packages/nut/package.py +++ b/var/spack/repos/builtin/packages/nut/package.py @@ -32,15 +32,12 @@ class Nut(CMakePackage): and performance issues.""" homepage = "https://github.com/lanl/NuT" - url = "https://github.com/lanl/NuT.git" - tags = ['proxy-app'] + git = "https://github.com/lanl/NuT.git" - version( - 'serial', git='https://github.com/lanl/NuT.git', - branch='master') - version( - 'openmp', git='https://github.com/lanl/NuT.git', - branch='openmp') + tags = ['proxy-app'] + + version('serial', branch='master') + version('openmp', branch='openmp') depends_on('cmake@3.0:') depends_on('random123') diff --git a/var/spack/repos/builtin/packages/occa/package.py b/var/spack/repos/builtin/packages/occa/package.py index df00f80e6f..a27d3c6b34 100644 --- a/var/spack/repos/builtin/packages/occa/package.py +++ b/var/spack/repos/builtin/packages/occa/package.py @@ -38,13 +38,12 @@ class Occa(Package): """ homepage = "http://libocca.org" - url = 'https://github.com/libocca/occa' - git_url = 'https://github.com/libocca/occa.git' + git = 'https://github.com/libocca/occa.git' - version('develop', git='https://github.com/libocca/occa.git') - version('v1.0.0-alpha.5', git=git_url, tag='v1.0.0-alpha.5') - version('v0.2.0', git=git_url, tag='v0.2.0') - version('v0.1.0', git=git_url, tag='v0.1.0') + version('develop') + version('v1.0.0-alpha.5', tag='v1.0.0-alpha.5') + version('v0.2.0', tag='v0.2.0') + version('v0.1.0', tag='v0.1.0') variant('cuda', default=True, diff --git a/var/spack/repos/builtin/packages/of-adios-write/package.py b/var/spack/repos/builtin/packages/of-adios-write/package.py index 0c56f0286c..ba2be2f601 100644 --- a/var/spack/repos/builtin/packages/of-adios-write/package.py +++ b/var/spack/repos/builtin/packages/of-adios-write/package.py @@ -56,11 +56,11 @@ class OfAdiosWrite(Package): # Currently only via git, but with some branches corresponding to main # OpenFOAM releases. homepage = "https://develop.openfoam.com/Community/feature-adiosWrite/" - gitrepo = "https://develop.openfoam.com/Community/feature-adiosWrite.git" + git = "https://develop.openfoam.com/Community/feature-adiosWrite.git" - version('develop', branch='develop', git=gitrepo) - version('1706', branch='v1706', git=gitrepo) - version('1612', branch='v1612', git=gitrepo) + version('develop', branch='develop') + version('1706', branch='v1706') + version('1612', branch='v1612') variant('source', default=True, description='Install library source') diff --git a/var/spack/repos/builtin/packages/of-precice/package.py b/var/spack/repos/builtin/packages/of-precice/package.py index 2b3f64aaea..88180f6c57 100644 --- a/var/spack/repos/builtin/packages/of-precice/package.py +++ b/var/spack/repos/builtin/packages/of-precice/package.py @@ -33,10 +33,10 @@ class OfPrecice(Package): """preCICE adapter for OpenFOAM""" homepage = 'https://www.precice.org' - gitrepo = 'https://github.com/precice/openfoam-adapter.git' + git = 'https://github.com/precice/openfoam-adapter.git' # Currently develop only - version('develop', branch='master', git=gitrepo) + version('develop', branch='master') depends_on('openfoam+source') depends_on('precice') diff --git a/var/spack/repos/builtin/packages/openblas/package.py b/var/spack/repos/builtin/packages/openblas/package.py index d70e86dd3b..ed5301cb03 100644 --- a/var/spack/repos/builtin/packages/openblas/package.py +++ b/var/spack/repos/builtin/packages/openblas/package.py @@ -31,9 +31,12 @@ import spack.architecture class Openblas(MakefilePackage): """OpenBLAS: An optimized BLAS library""" + homepage = 'http://www.openblas.net' - url = 'http://github.com/xianyi/OpenBLAS/archive/v0.2.19.tar.gz' + url = 'http://github.com/xianyi/OpenBLAS/archive/v0.2.19.tar.gz' + git = 'https://github.com/xianyi/OpenBLAS.git' + version('develop', branch='develop') version('0.3.0', '42cde2c1059a8a12227f1e6551c8dbd2') version('0.2.20', '48637eb29f5b492b91459175dcc574b1') version('0.2.19', '28c998054fd377279741c6f0b9ea7941') @@ -41,8 +44,6 @@ class Openblas(MakefilePackage): version('0.2.17', '664a12807f2a2a7cda4781e3ab2ae0e1') version('0.2.16', 'fef46ab92463bdbb1479dcec594ef6dc') version('0.2.15', 'b1190f3d3471685f17cfd1ec1d252ac9') - version('develop', git='https://github.com/xianyi/OpenBLAS.git', - branch='develop') variant( 'shared', diff --git a/var/spack/repos/builtin/packages/openfast/package.py b/var/spack/repos/builtin/packages/openfast/package.py index ecc92d7848..6ade9fcba5 100644 --- a/var/spack/repos/builtin/packages/openfast/package.py +++ b/var/spack/repos/builtin/packages/openfast/package.py @@ -29,16 +29,12 @@ class Openfast(CMakePackage): """Wind turbine simulation package from NREL""" homepage = "http://openfast.readthedocs.io/en/latest/" - url = "https://github.com/OpenFAST/openfast.git" + git = "https://github.com/OpenFAST/openfast.git" maintainers = ['jrood-nrel'] - version('develop', - git='https://github.com/OpenFAST/openfast.git', - branch='dev') - version('master', - git='https://github.com/OpenFAST/openfast.git', - branch='master') + version('develop', branch='dev') + version('master', branch='master') variant('shared', default=False, description="Build shared libraries") diff --git a/var/spack/repos/builtin/packages/openfoam-com/package.py b/var/spack/repos/builtin/packages/openfoam-com/package.py index 26c763d7e3..b86398d230 100644 --- a/var/spack/repos/builtin/packages/openfoam-com/package.py +++ b/var/spack/repos/builtin/packages/openfoam-com/package.py @@ -276,16 +276,16 @@ class OpenfoamCom(Package): maintainers = ['olesenm'] homepage = "http://www.openfoam.com/" - gitrepo = "https://develop.openfoam.com/Development/OpenFOAM-plus.git" url = "https://sourceforge.net/projects/openfoamplus/files/v1706/OpenFOAM-v1706.tgz" + git = "https://develop.openfoam.com/Development/OpenFOAM-plus.git" list_url = "https://sourceforge.net/projects/openfoamplus/files/" list_depth = 2 + version('develop', branch='develop', submodules='True') # Needs credentials version('1806', 'bb244a3bde7048a03edfccffc46c763f') version('1712', '6ad92df051f4d52c7d0ec34f4b8eb3bc') version('1706', '630d30770f7b54d6809efbf94b7d7c8f') version('1612', 'ca02c491369150ab127cbb88ec60fbdf') - version('develop', branch='develop', git=gitrepo, submodules='True') # Needs credentials variant('float32', default=False, description='Use single-precision') diff --git a/var/spack/repos/builtin/packages/openfoam-org/package.py b/var/spack/repos/builtin/packages/openfoam-org/package.py index 17ea54e0c2..74c7cac236 100644 --- a/var/spack/repos/builtin/packages/openfoam-org/package.py +++ b/var/spack/repos/builtin/packages/openfoam-org/package.py @@ -80,14 +80,15 @@ class OpenfoamOrg(Package): homepage = "http://www.openfoam.org/" baseurl = "https://github.com/OpenFOAM" url = "https://github.com/OpenFOAM/OpenFOAM-4.x/archive/version-4.1.tar.gz" + git = "https://github.com/OpenFOAM/OpenFOAM-dev.git" + version('develop', git=git) version('5.0', 'cd8c5bdd3ff39c34f61747c8e55f59d1', url=baseurl + '/OpenFOAM-5.x/archive/version-5.0.tar.gz') version('4.1', 'afd7d8e66e7db0ffaf519b14f1a8e1d4', url=baseurl + '/OpenFOAM-4.x/archive/version-4.1.tar.gz') version('2.4.0', 'ad7d8b7b0753655b2b6fd9e92eefa92a', url=baseurl + '/OpenFOAM-2.4.x/archive/version-2.4.0.tar.gz') - version('develop', git='https://github.com/OpenFOAM/OpenFOAM-dev.git') variant('int64', default=False, description='Compile with 64-bit label') diff --git a/var/spack/repos/builtin/packages/openmc/package.py b/var/spack/repos/builtin/packages/openmc/package.py index 97c819c433..9667c80cdd 100644 --- a/var/spack/repos/builtin/packages/openmc/package.py +++ b/var/spack/repos/builtin/packages/openmc/package.py @@ -34,11 +34,11 @@ class Openmc(MakefilePackage): Group at MIT.""" homepage = "https://github.com/ANL-CESAR/" - url = "https://github.com/ANL-CESAR/openmc.git" + git = "https://github.com/ANL-CESAR/openmc.git" tags = ['ecp', 'ecp-apps'] - version('develop', git='https://github.com/ANL-CESAR/openmc.git') + version('develop') build_directory = 'src' diff --git a/var/spack/repos/builtin/packages/opennurbs/package.py b/var/spack/repos/builtin/packages/opennurbs/package.py index 43135b7a31..6603f46af3 100644 --- a/var/spack/repos/builtin/packages/opennurbs/package.py +++ b/var/spack/repos/builtin/packages/opennurbs/package.py @@ -32,13 +32,11 @@ class Opennurbs(Package): """ homepage = "https://github.com/OpenNURBS/OpenNURBS" - url = "https://github.com/OpenNURBS/OpenNURBS.git" + git = "https://github.com/OpenNURBS/OpenNURBS.git" maintainers = ['jrood-nrel'] - version('develop', - git='https://github.com/OpenNURBS/OpenNURBS.git', - branch='develop') + version('develop', branch='develop') version('percept', '59163fd085a24c7a4c2170c70bb60fea', url='https://github.com/PerceptTools/percept/raw/master/build-cmake/opennurbs-percept.tar.gz') diff --git a/var/spack/repos/builtin/packages/openpmd-api/package.py b/var/spack/repos/builtin/packages/openpmd-api/package.py index d2d032a3e7..420465d1d1 100644 --- a/var/spack/repos/builtin/packages/openpmd-api/package.py +++ b/var/spack/repos/builtin/packages/openpmd-api/package.py @@ -29,11 +29,11 @@ class OpenpmdApi(CMakePackage): """API for easy reading and writing of openPMD files""" homepage = "http://www.openPMD.org" - url = "https://github.com/openPMD/openPMD-api/archive/1.0.0.tar.gz" + git = "https://github.com/openPMD/openPMD-api.git" + maintainers = ['ax3l'] - version('develop', branch='dev', - git='https://github.com/openPMD/openPMD-api.git') + version('develop', branch='dev') variant('mpi', default=True, description='Enable parallel I/O') diff --git a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py index feea4121bf..ef1be9dbfd 100644 --- a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py @@ -69,17 +69,11 @@ class OpenspeedshopUtils(CMakePackage): """ homepage = "http://www.openspeedshop.org" - url = "https://github.com/OpenSpeedShop/openspeedshop.git" + git = "https://github.com/OpenSpeedShop/openspeedshop.git" - # Use when the git repository is available - version('2.3.1.4', branch='2.3.1.4', - git='https://github.com/OpenSpeedShop/openspeedshop.git') - - version('2.3.1.3', branch='2.3.1.3', - git='https://github.com/OpenSpeedShop/openspeedshop.git') - - version('develop', branch='master', - git='https://github.com/OpenSpeedShop/openspeedshop.git') + version('develop', branch='master') + version('2.3.1.4', branch='2.3.1.4') + version('2.3.1.3', branch='2.3.1.3') variant('runtime', default=False, description="build only the runtime libraries and collectors.") diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py index 16eb54eb90..462b1abe4f 100644 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop/package.py @@ -63,17 +63,11 @@ class Openspeedshop(CMakePackage): """ homepage = "http://www.openspeedshop.org" - url = "https://github.com/OpenSpeedShop/openspeedshop.git" + git = "https://github.com/OpenSpeedShop/openspeedshop.git" - # Use when the git repository is available - version('2.3.1.4', branch='2.3.1.4', - git='https://github.com/OpenSpeedShop/openspeedshop.git') - - version('2.3.1.3', branch='2.3.1.3', - git='https://github.com/OpenSpeedShop/openspeedshop.git') - - version('develop', branch='master', - git='https://github.com/OpenSpeedShop/openspeedshop.git') + version('develop', branch='master') + version('2.3.1.4', branch='2.3.1.4') + version('2.3.1.3', branch='2.3.1.3') variant('runtime', default=False, description="build only the runtime libraries and collectors.") diff --git a/var/spack/repos/builtin/packages/pacbio-daligner/package.py b/var/spack/repos/builtin/packages/pacbio-daligner/package.py index 2d4866f65e..10b7297810 100644 --- a/var/spack/repos/builtin/packages/pacbio-daligner/package.py +++ b/var/spack/repos/builtin/packages/pacbio-daligner/package.py @@ -30,11 +30,9 @@ class PacbioDaligner(MakefilePackage): required for some pacbio utilities.""" homepage = "https://github.com/PacificBiosciences/DALIGNER" - url = "https://github.com/PacificBiosciences/DALIGNER" + git = "https://github.com/PacificBiosciences/DALIGNER.git" - version('2017-08-05', - git='https://github.com/PacificBiosciences/DALIGNER.git', - commit='0fe5240d2cc6b55bf9e04465b700b76110749c9d') + version('2017-08-05', commit='0fe5240d2cc6b55bf9e04465b700b76110749c9d') depends_on('gmake', type='build') depends_on('pacbio-dazz-db') diff --git a/var/spack/repos/builtin/packages/pacbio-damasker/package.py b/var/spack/repos/builtin/packages/pacbio-damasker/package.py index 674a6d35e0..326a543a5f 100644 --- a/var/spack/repos/builtin/packages/pacbio-damasker/package.py +++ b/var/spack/repos/builtin/packages/pacbio-damasker/package.py @@ -30,11 +30,9 @@ class PacbioDamasker(MakefilePackage): required for some pacbio utilities.""" homepage = "https://github.com/PacificBiosciences/DAMASKER" - url = "https://github.com/PacificBiosciences/DAMASKER" + git = "https://github.com/PacificBiosciences/DAMASKER.git" - version('2017-02-11', - git='https://github.com/PacificBiosciences/DAMASKER.git', - commit='144244b77d52cb785cb1b3b8ae3ab6f3f0c63264') + version('2017-02-11', commit='144244b77d52cb785cb1b3b8ae3ab6f3f0c63264') depends_on('gmake', type='build') diff --git a/var/spack/repos/builtin/packages/pacbio-dazz-db/package.py b/var/spack/repos/builtin/packages/pacbio-dazz-db/package.py index 328e307b63..5f8eb9f3a6 100644 --- a/var/spack/repos/builtin/packages/pacbio-dazz-db/package.py +++ b/var/spack/repos/builtin/packages/pacbio-dazz-db/package.py @@ -31,11 +31,9 @@ class PacbioDazzDb(MakefilePackage): required for some pacbio utilities.""" homepage = "https://github.com/PacificBiosciences/DAZZ_DB" - url = "https://github.com/PacificBiosciences/DAZZ_DB" + git = "https://github.com/PacificBiosciences/DAZZ_DB.git" - version('2017-04-10', - git='https://github.com/PacificBiosciences/DAZZ_DB.git', - commit='f29d27d51f460563481cd227d17f4bdc5e288365') + version('2017-04-10', commit='f29d27d51f460563481cd227d17f4bdc5e288365') depends_on('gmake', type='build') diff --git a/var/spack/repos/builtin/packages/pacbio-dextractor/package.py b/var/spack/repos/builtin/packages/pacbio-dextractor/package.py index a567c22e9a..a1c70fea09 100644 --- a/var/spack/repos/builtin/packages/pacbio-dextractor/package.py +++ b/var/spack/repos/builtin/packages/pacbio-dextractor/package.py @@ -30,11 +30,9 @@ class PacbioDextractor(MakefilePackage): fork required by some pacbio utilities.""" homepage = "https://github.com/PacificBiosciences/DEXTRACTOR" - url = "https://github.com/PacificBiosciences/DEXTRACTOR" + git = "https://github.com/PacificBiosciences/DEXTRACTOR.git" - version('2016-08-09', - git='https://github.com/PacificBiosciences/DEXTRACTOR.git', - commit='89726800346d0bed15d98dcc577f4c7733aab4b1') + version('2016-08-09', commit='89726800346d0bed15d98dcc577f4c7733aab4b1') depends_on('hdf5') depends_on('gmake', type='build') diff --git a/var/spack/repos/builtin/packages/papyrus/package.py b/var/spack/repos/builtin/packages/papyrus/package.py index bfe3807fab..a8bab0ed46 100644 --- a/var/spack/repos/builtin/packages/papyrus/package.py +++ b/var/spack/repos/builtin/packages/papyrus/package.py @@ -30,9 +30,9 @@ class Papyrus(CMakePackage): homepage = "https://code.ornl.gov/eck/papyrus" url = "https://code.ornl.gov/eck/papyrus/repository/archive.tar.bz2?ref=v1.0.0" + git = "https://code.ornl.gov/eck/papyrus.git" - version('develop', branch='master', - git='https://code.ornl.gov/eck/papyrus.git') + version('develop', branch='master') version('1.0.0', 'fe0fca073c3604110f0507f375d71e64') depends_on('mpi') diff --git a/var/spack/repos/builtin/packages/paradiseo/package.py b/var/spack/repos/builtin/packages/paradiseo/package.py index 4fd587bdc8..a571533e34 100644 --- a/var/spack/repos/builtin/packages/paradiseo/package.py +++ b/var/spack/repos/builtin/packages/paradiseo/package.py @@ -28,19 +28,19 @@ from spack import * class Paradiseo(CMakePackage): """A C++ white-box object-oriented framework dedicated to the reusable design of metaheuristics.""" + homepage = "http://paradiseo.gforge.inria.fr/" + git = "https://gforge.inria.fr/git/paradiseo/paradiseo.git" # Installing from the development version is a better option at this # point than using the very old supplied packages - version('head', git='https://gforge.inria.fr/git/paradiseo/paradiseo.git') + version('head') # This is a version that the package formula author has tested # successfully. However, the clone is very large (~1Gb git # history). The history in the head version has been trimmed # significantly. - version( - 'dev-safe', git='https://gforge.inria.fr/git/paradiseo/paradiseo.git', - commit='dbb8fbe9a786efd4d1c26408ac1883442e7643a6') + version('dev-safe', commit='dbb8fbe9a786efd4d1c26408ac1883442e7643a6') variant('mpi', default=True, description='Compile with parallel and distributed ' diff --git a/var/spack/repos/builtin/packages/parsimonator/package.py b/var/spack/repos/builtin/packages/parsimonator/package.py index af2dda7a0a..b0a2e63a91 100644 --- a/var/spack/repos/builtin/packages/parsimonator/package.py +++ b/var/spack/repos/builtin/packages/parsimonator/package.py @@ -30,9 +30,9 @@ class Parsimonator(MakefilePackage): starting trees under parsimony for RAxML""" homepage = "http://www.exelixis-lab.org/" - url = "https://github.com/stamatak/Parsimonator-1.0.2" + git = "https://github.com/stamatak/Parsimonator-1.0.2.git" - version('1.0.2', git='https://github.com/stamatak/Parsimonator-1.0.2.git', commit='78368c6ab1e9adc7e9c6ec9256dd7ff2a5bb1b0a') + version('1.0.2', commit='78368c6ab1e9adc7e9c6ec9256dd7ff2a5bb1b0a') variant('sse', default=True, description='Enable SSE in order to substantially speed up execution') variant('avx', default=False, description='Enable AVX in order to substantially speed up execution') diff --git a/var/spack/repos/builtin/packages/parsplice/package.py b/var/spack/repos/builtin/packages/parsplice/package.py index 66fe7c6ebb..0b89600541 100644 --- a/var/spack/repos/builtin/packages/parsplice/package.py +++ b/var/spack/repos/builtin/packages/parsplice/package.py @@ -31,11 +31,12 @@ class Parsplice(CMakePackage): homepage = "https://gitlab.com/exaalt/parsplice" url = "https://gitlab.com/api/v4/projects/exaalt%2Fparsplice/repository/archive.tar.gz?sha=v1.1" + git = "https://gitlab.com/exaalt/parsplice.git" tags = ['ecp', 'ecp-apps'] + version('develop', branch='master') version('1.1', '3a72340d49d731a076e8942f2ae2f4e9') - version('develop', git='https://gitlab.com/exaalt/parsplice', branch='master') depends_on("cmake@3.1:", type='build') depends_on("berkeley-db") diff --git a/var/spack/repos/builtin/packages/pbmpi/package.py b/var/spack/repos/builtin/packages/pbmpi/package.py index 4ea4eb7a20..ba7099d711 100644 --- a/var/spack/repos/builtin/packages/pbmpi/package.py +++ b/var/spack/repos/builtin/packages/pbmpi/package.py @@ -30,9 +30,9 @@ class Pbmpi(MakefilePackage): """ homepage = "http://megasun.bch.umontreal.ca/People/lartillot/www/index.htm" - url = "https://github.com/bayesiancook/pbmpi" + git = "https://github.com/bayesiancook/pbmpi.git" - version('partition', git='https://github.com/bayesiancook/pbmpi.git', branch='partition') + version('partition', branch='partition') depends_on('mpi') depends_on('libfabric') diff --git a/var/spack/repos/builtin/packages/pegtl/package.py b/var/spack/repos/builtin/packages/pegtl/package.py index c297854797..0896371c3f 100644 --- a/var/spack/repos/builtin/packages/pegtl/package.py +++ b/var/spack/repos/builtin/packages/pegtl/package.py @@ -35,7 +35,8 @@ class Pegtl(CMakePackage): homepage = "https://github.com/taocpp/PEGTL" url = "https://github.com/taocpp/PEGTL/tarball/1.3.1" + git = "https://github.com/taocpp/PEGTL.git" - version('develop', git='https://github.com/taocpp/PEGTL', branch='master') + version('develop', branch='master') version('2.1.4', 'e5288b6968e6e910287fce93dc5557bf') version('2.0.0', 'c772828e7188459338a920c21f9896db') diff --git a/var/spack/repos/builtin/packages/percept/package.py b/var/spack/repos/builtin/packages/percept/package.py index db1ac11452..f3e62dc9f8 100644 --- a/var/spack/repos/builtin/packages/percept/package.py +++ b/var/spack/repos/builtin/packages/percept/package.py @@ -31,12 +31,11 @@ class Percept(CMakePackage): """ homepage = "https://github.com/PerceptTools/percept" - url = "https://github.com/PerceptTools/percept.git" + git = "https://github.com/PerceptTools/percept.git" # This package file was created at percept # commit dc1c8ec0175213146ac139946beca185a84c22e8 - version('develop', - git='https://github.com/PerceptTools/percept.git', branch='master') + version('develop', branch='master') depends_on('googletest~shared') depends_on('opennurbs@percept') diff --git a/var/spack/repos/builtin/packages/perl-star-fusion/package.py b/var/spack/repos/builtin/packages/perl-star-fusion/package.py index 68ba8af1f8..7e23809a8c 100644 --- a/var/spack/repos/builtin/packages/perl-star-fusion/package.py +++ b/var/spack/repos/builtin/packages/perl-star-fusion/package.py @@ -34,9 +34,9 @@ class PerlStarFusion(Package): and spanning reads to a reference annotation set.""" homepage = "https://github.com/STAR-Fusion/STAR-Fusion" - url = "https://github.com/STAR-Fusion/STAR-Fusion.git" + git = "https://github.com/STAR-Fusion/STAR-Fusion.git" - version('master', git='https://github.com/STAR-Fusion/STAR-Fusion.git', commit='a16a0a8') + version('master', commit='a16a0a8') extends('perl') diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index 52d7314e91..a376303e04 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -35,12 +35,13 @@ class Petsc(Package): """ homepage = "http://www.mcs.anl.gov/petsc/index.html" - url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-3.5.3.tar.gz" + url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-3.5.3.tar.gz" + git = "https://bitbucket.org/petsc/petsc.git" maintainers = ['balay', 'barrysmith', 'jedbrown'] - version('develop', git='https://bitbucket.org/petsc/petsc.git', branch='master') - version('xsdk-0.2.0', git='https://bitbucket.org/petsc/petsc.git', tag='xsdk-0.2.0') + version('develop', branch='master') + version('xsdk-0.2.0', tag='xsdk-0.2.0') version('3.9.3', '7b71d705f66f9961cb0e2da3f9da79a1') version('3.9.2', '8bedc0cd8c8603d54bfd99a6e8f77b3d') diff --git a/var/spack/repos/builtin/packages/pflotran/package.py b/var/spack/repos/builtin/packages/pflotran/package.py index 47474e54c9..2f5321406d 100644 --- a/var/spack/repos/builtin/packages/pflotran/package.py +++ b/var/spack/repos/builtin/packages/pflotran/package.py @@ -32,15 +32,16 @@ class Pflotran(AutotoolsPackage): """ homepage = "http://www.pflotran.org" + git = "https://bitbucket.org/pflotran/pflotran.git" - version('develop', git='https://bitbucket.org/pflotran/pflotran') - version('xsdk-0.2.0', git='https://bitbucket.org/pflotran/pflotran', tag='master') - version('xsdk-0.3.0', git='https://bitbucket.org/pflotran/pflotran', branch='release/xsdk-0.3.0') + version('develop') + version('xsdk-0.2.0', tag='master') + version('xsdk-0.3.0', branch='release/xsdk-0.3.0') depends_on('mpi') depends_on('hdf5@1.8.12:+mpi+fortran') depends_on('petsc@develop+hdf5+metis', when='@develop') - depends_on('petsc@xsdk-0.2.0+hdf5+metis', when='@xsdk-0.2.0') + depends_on('petsc@xsdk-0.2.0+hdf5+metis', when='@xsdk-0.2.0') depends_on('petsc@3.8.0:+hdf5+metis', when='@xsdk-0.3.0') parallel = False diff --git a/var/spack/repos/builtin/packages/pgmath/package.py b/var/spack/repos/builtin/packages/pgmath/package.py index 64742813db..9358d353ce 100644 --- a/var/spack/repos/builtin/packages/pgmath/package.py +++ b/var/spack/repos/builtin/packages/pgmath/package.py @@ -28,10 +28,12 @@ from spack import * class Pgmath(CMakePackage): """Flang's math library""" + homepage = "https://github.com/flang-compiler/flang" - url = "https://github.com/flang-compiler/flang/archive/pgmath_20180319.tar.gz" + git = "https://github.com/flang-compiler/flang" - version('develop', git='https://github.com/flang-compiler/flang', branch='master') + version('develop', branch='master') conflicts("%gcc@:7.1.9999") + root_cmakelists_dir = 'runtime/libpgmath' diff --git a/var/spack/repos/builtin/packages/phasta/package.py b/var/spack/repos/builtin/packages/phasta/package.py index 7308c70349..24f97c5c66 100644 --- a/var/spack/repos/builtin/packages/phasta/package.py +++ b/var/spack/repos/builtin/packages/phasta/package.py @@ -30,12 +30,10 @@ class Phasta(CMakePackage): (PHASTA) of compressible and incompressible Navier Stokes equations.""" homepage = "https://www.scorec.rpi.edu/software.php" - url = "https://github.com/PHASTA/phasta.git" + git = "https://github.com/PHASTA/phasta.git" - version('0.0.1', git='https://github.com/PHASTA/phasta.git', - commit='11f431f2d1a53a529dab4b0f079ab8aab7ca1109') - version('develop', git='https://github.com/PHASTA/phasta.git', - branch='master') + version('develop', branch='master') + version('0.0.1', commit='11f431f2d1a53a529dab4b0f079ab8aab7ca1109') depends_on('mpi') diff --git a/var/spack/repos/builtin/packages/phist/package.py b/var/spack/repos/builtin/packages/phist/package.py index 7ffd34099b..95b16488ff 100644 --- a/var/spack/repos/builtin/packages/phist/package.py +++ b/var/spack/repos/builtin/packages/phist/package.py @@ -38,12 +38,11 @@ class Phist(CMakePackage): """ homepage = "https://bitbucket.org/essex/phist/" - url = 'https://bitbucket.org/essex/phist/get/phist-1.4.3.tar.gz' + url = "https://bitbucket.org/essex/phist/get/phist-1.4.3.tar.gz" + git = "https://bitbucket.org/essex/phist/phist.git" - version('develop', - git='https://bitbucket.org/essex/phist/phist.git', branch='devel') - version('master', - git='https://bitbucket.org/essex/phist/phist.git', branch='master') + version('develop', branch='devel') + version('master', branch='master') version('1.6.0', '751f855230d6227b972b5ab7bce2c65f') version('1.4.3', 'af3300378d4282366d148e38c3a3199a') diff --git a/var/spack/repos/builtin/packages/pidx/package.py b/var/spack/repos/builtin/packages/pidx/package.py index 75a2886b80..c8d130c1ad 100644 --- a/var/spack/repos/builtin/packages/pidx/package.py +++ b/var/spack/repos/builtin/packages/pidx/package.py @@ -33,9 +33,9 @@ class Pidx(CMakePackage): """ homepage = "http://www.cedmav.com/pidx" + git = "https://github.com/sci-visus/PIDX.git" - version('1.0', git='https://github.com/sci-visus/PIDX.git', - commit='6afa1cf71d1c41263296dc049c8fabaf73c296da') + version('1.0', commit='6afa1cf71d1c41263296dc049c8fabaf73c296da') depends_on('cmake@2.8.4:', type='build') depends_on('mpi') diff --git a/var/spack/repos/builtin/packages/piranha/package.py b/var/spack/repos/builtin/packages/piranha/package.py index 4c75a77fe2..21a6324d7b 100644 --- a/var/spack/repos/builtin/packages/piranha/package.py +++ b/var/spack/repos/builtin/packages/piranha/package.py @@ -32,9 +32,10 @@ class Piranha(CMakePackage): homepage = "https://bluescarni.github.io/piranha/sphinx/" url = "https://github.com/bluescarni/piranha/archive/v0.5.tar.gz" + git = "https://github.com/bluescarni/piranha.git" + version('develop', git=git) version('0.5', '99546bae2be115737b6316751eb0b84d') - version('develop', git='https://github.com/bluescarni/piranha.git') variant('python', default=True, description='Build the Python bindings') diff --git a/var/spack/repos/builtin/packages/pism/package.py b/var/spack/repos/builtin/packages/pism/package.py index fd9f2a30fb..33e76e1aa5 100644 --- a/var/spack/repos/builtin/packages/pism/package.py +++ b/var/spack/repos/builtin/packages/pism/package.py @@ -30,19 +30,14 @@ class Pism(CMakePackage): homepage = "http://pism-docs.org/wiki/doku.php:=" url = "https://github.com/pism/pism/archive/v0.7.3.tar.gz" + git = "https://github.com/pism/pism.git" maintainers = ['citibeth'] + version('develop', branch='dev') version('0.7.3', '7cfb034100d99d5c313c4ac06b7f17b6') - - version('0.7.x', git='https://github.com/pism/pism.git', - branch='stable0.7') - - version('icebin', git='https://github.com/pism/pism.git', - branch='efischer/dev') - - version('develop', git='https://github.com/pism/pism.git', - branch='dev') + version('0.7.x', branch='stable0.7') + version('icebin', branch='efischer/dev') variant('extra', default=False, description='Build extra executables (testing/verification)') diff --git a/var/spack/repos/builtin/packages/pngwriter/package.py b/var/spack/repos/builtin/packages/pngwriter/package.py index ba8544ab1b..f65b0d8cd3 100644 --- a/var/spack/repos/builtin/packages/pngwriter/package.py +++ b/var/spack/repos/builtin/packages/pngwriter/package.py @@ -37,12 +37,12 @@ class Pngwriter(CMakePackage): homepage = "http://pngwriter.sourceforge.net/" url = "https://github.com/pngwriter/pngwriter/archive/0.5.6.tar.gz" + git = "https://github.com/pngwriter/pngwriter.git" + maintainers = ['ax3l'] - version('develop', branch='dev', - git='https://github.com/pngwriter/pngwriter.git') - version('master', branch='master', - git='https://github.com/pngwriter/pngwriter.git') + version('develop', branch='dev') + version('master', branch='master') version('0.7.0', 'a68aa0889f120f5bb07848afce278a95') version('0.6.0', '0a19bc55c5f6379fea7343752fd3ffae') version('0.5.6', 'c13bd1fdc0e331a246e6127b5f262136') diff --git a/var/spack/repos/builtin/packages/pocl/package.py b/var/spack/repos/builtin/packages/pocl/package.py index f4fef47af4..17288b1080 100644 --- a/var/spack/repos/builtin/packages/pocl/package.py +++ b/var/spack/repos/builtin/packages/pocl/package.py @@ -35,12 +35,11 @@ class Pocl(CMakePackage): GPUs/accelerators.""" homepage = "http://portablecl.org" - url = "http://portablecl.org/downloads/pocl-0.13.tar.gz" + url = "http://portablecl.org/downloads/pocl-0.13.tar.gz" + git = "https://github.com/pocl/pocl.git" - version("master", git="https://github.com/pocl/pocl.git") + version("master", git=git) version('0.14', '1d35f09299e76b9e3918c42826555194') - # version("0.14-rc", - # git="https://github.com/pocl/pocl.git", branch="release_0_14") version("0.13", "344480864d4269f2f63f1509395898bd") version("0.12", "e197ba3aa01a35f40581c48e053330dd") version("0.11", "9be0640cde2983062c47393d9e8e8fe7") diff --git a/var/spack/repos/builtin/packages/portage/package.py b/var/spack/repos/builtin/packages/portage/package.py index b70139c3ed..ed7667f308 100644 --- a/var/spack/repos/builtin/packages/portage/package.py +++ b/var/spack/repos/builtin/packages/portage/package.py @@ -32,12 +32,12 @@ class Portage(CMakePackage): remapping library for transfer of field data between meshes. """ homepage = "http://portage.lanl.gov/" - url = "https://github.com/laristra/portage/tarball/v1.0" + git = "https://github.com/laristra/portage.git" # tarballs don't have submodules, so use git tags - version('1.1.1', git='https://github.com/laristra/portage', tag='v1.1.1', submodules=True) - version('1.1.0', git='https://github.com/laristra/portage', tag='v1.1.0', submodules=True) - version('develop', git='https://github.com/laristra/portage', branch='master', submodules=True) + version('develop', branch='master', submodules=True) + version('1.1.1', tag='v1.1.1', submodules=True) + version('1.1.0', tag='v1.1.0', submodules=True) variant('mpi', default=True, description='Support MPI') diff --git a/var/spack/repos/builtin/packages/precice/package.py b/var/spack/repos/builtin/packages/precice/package.py index 69e7d16592..ef106a74a8 100644 --- a/var/spack/repos/builtin/packages/precice/package.py +++ b/var/spack/repos/builtin/packages/precice/package.py @@ -32,10 +32,10 @@ class Precice(CMakePackage): a simulation.""" homepage = 'https://www.precice.org' - gitrepo = 'https://github.com/precice/precice.git' + git = 'https://github.com/precice/precice.git' # Skip version 1.1.1 entirely, the cmake was lacking install. - version('develop', branch='develop', git=gitrepo) + version('develop', branch='develop') variant('mpi', default=True, description='Enable MPI support') variant('petsc', default=False, description='Enable PETSc support') diff --git a/var/spack/repos/builtin/packages/ps-lite/package.py b/var/spack/repos/builtin/packages/ps-lite/package.py index ea9cc34ed4..e11831eef1 100644 --- a/var/spack/repos/builtin/packages/ps-lite/package.py +++ b/var/spack/repos/builtin/packages/ps-lite/package.py @@ -30,11 +30,10 @@ class PsLite(CMakePackage): of the parameter server framework.""" homepage = "https://github.com/dmlc/ps-lite" - url = "https://github.com/dmlc/ps-lite.git" + git = "https://github.com/dmlc/ps-lite.git" - version('master', git='https://github.com/dmlc/ps-lite.git', branch='master') - version('20170328', git='https://github.com/dmlc/ps-lite.git', - commit='acdb698fa3bb80929ef83bb37c705f025e119b82') + version('master', branch='master') + version('20170328', commit='acdb698fa3bb80929ef83bb37c705f025e119b82') depends_on('protobuf@3:') depends_on('zeromq') diff --git a/var/spack/repos/builtin/packages/psm/package.py b/var/spack/repos/builtin/packages/psm/package.py index ba65f963d3..7fee9318e1 100644 --- a/var/spack/repos/builtin/packages/psm/package.py +++ b/var/spack/repos/builtin/packages/psm/package.py @@ -30,9 +30,10 @@ class Psm(MakefilePackage): homepage = "https://github.com/intel/psm" url = "https://github.com/intel/psm/archive/v3.3.tar.gz" + git = "https://github.com/intel/psm.git" version('3.3', '031eb27688c932867d55054e76d00875', preferred=True) - version('2017-04-28', git='https://github.com/intel/psm.git', commit='604758e') + version('2017-04-28', commit='604758e') conflicts('%gcc@6:', when='@3.3') diff --git a/var/spack/repos/builtin/packages/psmc/package.py b/var/spack/repos/builtin/packages/psmc/package.py index 45dfeff9ec..bd1f27aa4b 100644 --- a/var/spack/repos/builtin/packages/psmc/package.py +++ b/var/spack/repos/builtin/packages/psmc/package.py @@ -30,8 +30,9 @@ class Psmc(MakefilePackage): (PSMC) model""" homepage = "https://github.com/lh3/psmc" + git = "https://github.com/lh3/psmc.git" - version('2016-1-21', git='https://github.com/lh3/psmc.git', commit='e5f7df5d00bb75ec603ae0beff62c0d7e37640b9') + version('2016-1-21', commit='e5f7df5d00bb75ec603ae0beff62c0d7e37640b9') def setup_environment(self, spack_env, run_env): run_env.prepend_path('PATH', prefix.bin.utils) diff --git a/var/spack/repos/builtin/packages/pumi/package.py b/var/spack/repos/builtin/packages/pumi/package.py index a6ec15af2b..0e23420c8a 100644 --- a/var/spack/repos/builtin/packages/pumi/package.py +++ b/var/spack/repos/builtin/packages/pumi/package.py @@ -36,12 +36,10 @@ class Pumi(CMakePackage): and dynamic load balancing.""" homepage = "https://www.scorec.rpi.edu/pumi" - url = "https://github.com/SCOREC/core.git" + git = "https://github.com/SCOREC/core.git" - version('2.1.0', git='https://github.com/SCOREC/core.git', - commit='840fbf6ec49a63aeaa3945f11ddb224f6055ac9f') - version('develop', git='https://github.com/SCOREC/core.git', - branch='master') + version('develop', branch='master') + version('2.1.0', commit='840fbf6ec49a63aeaa3945f11ddb224f6055ac9f') variant('zoltan', default=False, description='Enable Zoltan Features') variant('fortran', default=False, description='Enable FORTRAN interface') diff --git a/var/spack/repos/builtin/packages/pxz/package.py b/var/spack/repos/builtin/packages/pxz/package.py index 1c7084e392..f6acaee49f 100644 --- a/var/spack/repos/builtin/packages/pxz/package.py +++ b/var/spack/repos/builtin/packages/pxz/package.py @@ -30,8 +30,9 @@ class Pxz(MakefilePackage): homepage = "https://jnovy.fedorapeople.org/pxz/pxz.html" url = "http://jnovy.fedorapeople.org/pxz/pxz-4.999.9beta.20091201git.tar.xz" + git = "https://github.com/jnovy/pxz.git" - version('develop', git='https://github.com/jnovy/pxz') + version('develop', git=git) version('4.999.9beta.20091201git', '4ae3926185978f5c95c9414dc4634451') depends_on('lzma') diff --git a/var/spack/repos/builtin/packages/py-adios/package.py b/var/spack/repos/builtin/packages/py-adios/package.py index 40b8faad1a..70b9daff32 100644 --- a/var/spack/repos/builtin/packages/py-adios/package.py +++ b/var/spack/repos/builtin/packages/py-adios/package.py @@ -30,10 +30,11 @@ class PyAdios(PythonPackage): homepage = "https://www.olcf.ornl.gov/center-projects/adios/" url = "https://github.com/ornladios/ADIOS/archive/v1.12.0.tar.gz" + git = "https://github.com/ornladios/ADIOS.git" + maintainers = ['ax3l'] - version('develop', git='https://github.com/ornladios/ADIOS.git', - branch='master') + version('develop', branch='master') version('1.13.0', '68af36b821debbdf4748b20320a990ce') version('1.12.0', '84a1c71b6698009224f6f748c5257fc9') version('1.11.1', '5639bfc235e50bf17ba9dafb14ea4185') diff --git a/var/spack/repos/builtin/packages/py-dryscrape/package.py b/var/spack/repos/builtin/packages/py-dryscrape/package.py index 83adbb8227..8382b9ad72 100644 --- a/var/spack/repos/builtin/packages/py-dryscrape/package.py +++ b/var/spack/repos/builtin/packages/py-dryscrape/package.py @@ -31,9 +31,9 @@ class PyDryscrape(PythonPackage): homepage = "https://github.com/niklasb/dryscrape" url = "https://pypi.io/packages/source/d/dryscrape/dryscrape-1.0.tar.gz" + git = "https://github.com/niklasb/dryscrape.git" - version('develop', git="https://github.com/niklasb/dryscrape", - branch="master") + version('develop', branch='master') version('1.0', '267e380a8efaf9cd8fd94de1639d3198') depends_on('py-lxml', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-edffile/package.py b/var/spack/repos/builtin/packages/py-edffile/package.py index 5a44a748c2..a6159d5760 100644 --- a/var/spack/repos/builtin/packages/py-edffile/package.py +++ b/var/spack/repos/builtin/packages/py-edffile/package.py @@ -29,12 +29,11 @@ class PyEdffile(PythonPackage): """Generic class for Edf files manipulation.""" homepage = "https://github.com/vasole/pymca/blob/master/PyMca5/PyMcaIO/EdfFile.py" - url = "https://github.com/conda-forge/edffile-feedstock.git" + git = "https://github.com/conda-forge/edffile-feedstock.git" import_modules = ['EdfFile'] - version('5.0.0', git='https://github.com/conda-forge/edffile-feedstock.git', - commit='be5ab4199db9f8209c59e31874934b8536b52301') + version('5.0.0', commit='be5ab4199db9f8209c59e31874934b8536b52301') depends_on('py-setuptools', type='build') depends_on('py-numpy', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-espresso/package.py b/var/spack/repos/builtin/packages/py-espresso/package.py index 19bf7bec31..a1a57c2413 100644 --- a/var/spack/repos/builtin/packages/py-espresso/package.py +++ b/var/spack/repos/builtin/packages/py-espresso/package.py @@ -38,15 +38,14 @@ class PyEspresso(CMakePackage): particle couplings to the LB fluid. """ homepage = "http://espressomd.org/" - url = "https://github.com/espressomd/espresso/tarball/v4.0" + git = "https://github.com/espressomd/espresso.git" - version('develop', git='https://github.com/espressomd/espresso.git', branch='python') + version('develop', branch='python') depends_on("cmake@3.0:", type='build') depends_on("mpi") depends_on("boost+serialization+filesystem+system+python+mpi") extends("python") - depends_on("python") - depends_on("py-cython@0.23:") - depends_on("py-numpy") + depends_on("py-cython@0.23:", type="build") + depends_on("py-numpy", type=("build", "run")) depends_on("fftw") diff --git a/var/spack/repos/builtin/packages/py-espressopp/package.py b/var/spack/repos/builtin/packages/py-espressopp/package.py index 2a3c17ab8f..4b43bc9fe6 100644 --- a/var/spack/repos/builtin/packages/py-espressopp/package.py +++ b/var/spack/repos/builtin/packages/py-espressopp/package.py @@ -34,11 +34,12 @@ class PyEspressopp(CMakePackage): """ homepage = "https://espressopp.github.io" url = "https://github.com/espressopp/espressopp/tarball/v1.9.4.1" + git = "https://github.com/espressopp/espressopp.git" - version('develop', git='https://github.com/espressopp/espressopp.git', branch='master') - version('1.9.5', '13a93c30b07132b5e5fa0d828aa17d79') + version('develop', branch='master') + version('1.9.5', '13a93c30b07132b5e5fa0d828aa17d79') version('1.9.4.1', '0da74a6d4e1bfa6a2a24fca354245a4f') - version('1.9.4', 'f2a27993a83547ad014335006eea74ea') + version('1.9.4', 'f2a27993a83547ad014335006eea74ea') variant('ug', default=False, description='Build user guide') variant('pdf', default=False, description='Build user guide in pdf format') diff --git a/var/spack/repos/builtin/packages/py-fiscalyear/package.py b/var/spack/repos/builtin/packages/py-fiscalyear/package.py index 133677264a..45f44261ed 100644 --- a/var/spack/repos/builtin/packages/py-fiscalyear/package.py +++ b/var/spack/repos/builtin/packages/py-fiscalyear/package.py @@ -33,11 +33,12 @@ class PyFiscalyear(PythonPackage): homepage = "https://github.com/adamjstewart/fiscalyear" url = "https://pypi.io/packages/source/f/fiscalyear/fiscalyear-0.1.0.tar.gz" + git = "https://github.com/adamjstewart/fiscalyear.git" + maintainers = ['adamjstewart'] import_modules = ['fiscalyear'] - version('master', branch='master', - git='https://github.com/adamjstewart/fiscalyear.git') + version('master', branch='master') version('0.1.0', '30e36b259f3e72e4929abbf259335742') depends_on('python@2.5:') diff --git a/var/spack/repos/builtin/packages/py-fparser/package.py b/var/spack/repos/builtin/packages/py-fparser/package.py index cebcddb79b..0b6a9c7da6 100644 --- a/var/spack/repos/builtin/packages/py-fparser/package.py +++ b/var/spack/repos/builtin/packages/py-fparser/package.py @@ -31,11 +31,11 @@ class PyFparser(PythonPackage): homepage = "https://github.com/stfc/fparser" url = "https://github.com/stfc/fparser/archive/0.0.5.tar.gz" - giturl = "https://github.com/stfc/fparser.git" + git = "https://github.com/stfc/fparser.git" + version('develop', branch='master') version('0.0.6', '15553fde76b4685fa8edb0a5472b1b53d308c3b8') version('0.0.5', '14630afdb8c8bd025e5504c5ab19d133aa8cf8c7') - version('develop', git=giturl, branch='master') depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-libensemble/package.py b/var/spack/repos/builtin/packages/py-libensemble/package.py index 7324f137c3..ea7034b290 100644 --- a/var/spack/repos/builtin/packages/py-libensemble/package.py +++ b/var/spack/repos/builtin/packages/py-libensemble/package.py @@ -31,8 +31,9 @@ class PyLibensemble(PythonPackage): homepage = "https://libensemble.readthedocs.io" url = "https://pypi.io/packages/source/l/libensemble/libensemble-0.2.0.tar.gz" + git = "https://github.com/Libensemble/libensemble.git" - version('develop', git='https://github.com/Libensemble/libensemble.git', branch='master') + version('develop', branch='master') version('0.2.0', 'ee96047594a3f5a1533f24d3b1f365f9') version('0.1.0', '0c3d45dd139429de1a5273e5bd8e46ec') diff --git a/var/spack/repos/builtin/packages/py-mg-rast-tools/package.py b/var/spack/repos/builtin/packages/py-mg-rast-tools/package.py index 4b23651842..a01cc62b6a 100644 --- a/var/spack/repos/builtin/packages/py-mg-rast-tools/package.py +++ b/var/spack/repos/builtin/packages/py-mg-rast-tools/package.py @@ -30,8 +30,9 @@ class PyMgRastTools(PythonPackage): MG-RAST data.""" homepage = "https://github.com/MG-RAST/MG-RAST-Tools" + git = "https://github.com/MG-RAST/MG-RAST-Tools.git" - version('2018.04.17', git='https://github.com/MG-RAST/MG-RAST-Tools.git', commit='a40c6e6539ad0bc1c08e1b03dfc0a9759755a326') + version('2018.04.17', commit='a40c6e6539ad0bc1c08e1b03dfc0a9759755a326') depends_on('perl', type=('build', 'run')) depends_on('py-setuptools@28.0:', type='build') diff --git a/var/spack/repos/builtin/packages/py-mpi4py/package.py b/var/spack/repos/builtin/packages/py-mpi4py/package.py index c87a0a5abc..ccd850795a 100644 --- a/var/spack/repos/builtin/packages/py-mpi4py/package.py +++ b/var/spack/repos/builtin/packages/py-mpi4py/package.py @@ -30,12 +30,12 @@ class PyMpi4py(PythonPackage): Interface (MPI) standard. It is implemented on top of the MPI-1/MPI-2 specification and exposes an API which grounds on the standard MPI-2 C++ bindings. - """ homepage = "https://pypi.python.org/pypi/mpi4py" url = "https://pypi.io/packages/source/m/mpi4py/mpi4py-3.0.0.tar.gz" + git = "https://github.com/mpi4py/mpi4py.git" - version('develop', git='https://github.com/mpi4py/mpi4py.git', branch='master') + version('develop', branch='master') version('3.0.0', 'bfe19f20cef5e92f6e49e50fb627ee70') version('2.0.0', '4f7d8126d7367c239fd67615680990e3') version('1.3.1', 'dbe9d22bdc8ed965c23a7ceb6f32fc3c') diff --git a/var/spack/repos/builtin/packages/py-opentuner/package.py b/var/spack/repos/builtin/packages/py-opentuner/package.py index 9fcc51a402..141fa1243a 100644 --- a/var/spack/repos/builtin/packages/py-opentuner/package.py +++ b/var/spack/repos/builtin/packages/py-opentuner/package.py @@ -29,9 +29,9 @@ class PyOpentuner(PythonPackage): """An extensible framework for program autotuning.""" homepage = "http://opentuner.org/" - url = "https://github.com/jansel/opentuner" + git = "https://github.com/jansel/opentuner.git" - version('0.8.0', git='https://github.com/jansel/opentuner', commit='4cb9135') + version('0.8.0', commit='4cb9135') # No support for Python 3 yet depends_on('python@2.7:2.8', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-proj/package.py b/var/spack/repos/builtin/packages/py-proj/package.py index ee8451aa1c..60a09f3af0 100644 --- a/var/spack/repos/builtin/packages/py-proj/package.py +++ b/var/spack/repos/builtin/packages/py-proj/package.py @@ -27,13 +27,14 @@ from spack import * class PyProj(PythonPackage): """Python interface to the PROJ.4 Library.""" + homepage = "http://jswhit.github.io/pyproj/" url = "https://github.com/jswhit/pyproj/tarball/v1.9.5.1rel" + git = "https://www.github.com/jswhit/pyproj.git" # This is not a tagged release of pyproj. # The changes in this "version" fix some bugs, especially with Python3 use. - version('1.9.5.1.1', git='https://www.github.com/jswhit/pyproj.git', - commit='0be612cc9f972e38b50a90c946a9b353e2ab140f') + version('1.9.5.1.1', commit='0be612cc9f972e38b50a90c946a9b353e2ab140f') version('1.9.5.1', 'a4b80d7170fc82aee363d7f980279835') depends_on('py-cython', type='build') diff --git a/var/spack/repos/builtin/packages/py-projectq/package.py b/var/spack/repos/builtin/packages/py-projectq/package.py index e6d300dc63..690b8d958e 100644 --- a/var/spack/repos/builtin/packages/py-projectq/package.py +++ b/var/spack/repos/builtin/packages/py-projectq/package.py @@ -34,9 +34,9 @@ class PyProjectq(PythonPackage): classical computer of an actual quantum chip. """ - # URL and HOMEPAGE + # Homepage and git repository homepage = "https://projectq.ch" - url = "https://github.com/ProjectQ-Framework/ProjectQ/archive/v0.3.6.tar.gz" + git = "https://github.com/projectq-framework/projectq.git" # Provided python modules import_modules = ['projectq', 'projectq.backends', 'projectq.cengines', @@ -44,10 +44,8 @@ class PyProjectq(PythonPackage): 'projectq.setups', 'projectq.types'] # Versions - version('develop', branch='develop', - git='https://github.com/projectq-framework/projectq.git') - version('0.3.6', commit='fa484fe037a3a1772127bbd00fe4628ddba34611', - git='https://github.com/projectq-framework/projectq.git') + version('develop', branch='develop') + version('0.3.6', commit='fa484fe037a3a1772127bbd00fe4628ddba34611') # Dependencies depends_on('py-setuptools', type=('build')) diff --git a/var/spack/repos/builtin/packages/py-psyclone/package.py b/var/spack/repos/builtin/packages/py-psyclone/package.py index 094d3c205f..e991296bd7 100644 --- a/var/spack/repos/builtin/packages/py-psyclone/package.py +++ b/var/spack/repos/builtin/packages/py-psyclone/package.py @@ -32,11 +32,10 @@ class PyPsyclone(PythonPackage): homepage = "https://github.com/stfc/PSyclone" url = "https://github.com/stfc/PSyclone/archive/1.5.1.tar.gz" - giturl = "https://github.com/stfc/PSyclone.git" + git = "https://github.com/stfc/PSyclone.git" - version('1.5.1', git=giturl, - commit='eba7a097175b02f75dec70616cf267b7b3170d78') - version('develop', git=giturl, branch='master') + version('develop', branch='master') + version('1.5.1', commit='eba7a097175b02f75dec70616cf267b7b3170d78') depends_on('py-setuptools', type='build') depends_on('py-pyparsing', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pybind11/package.py b/var/spack/repos/builtin/packages/py-pybind11/package.py index 69183be75c..79bab0cbca 100644 --- a/var/spack/repos/builtin/packages/py-pybind11/package.py +++ b/var/spack/repos/builtin/packages/py-pybind11/package.py @@ -36,9 +36,9 @@ class PyPybind11(CMakePackage): homepage = "https://pybind11.readthedocs.io" url = "https://github.com/pybind/pybind11/archive/v2.1.0.tar.gz" + git = "https://github.com/pybind/pybind11.git" - version('develop', branch='master', - git='https://github.com/pybind/pybind11.git') + version('develop', branch='master') version('2.2.3', '55b637945bbf47d99d2c906bf0c13f49') version('2.2.2', 'fc174e1bbfe7ec069af7eea86ec37b5c') version('2.2.1', 'bab1d46bbc465af5af3a4129b12bfa3b') @@ -47,7 +47,7 @@ class PyPybind11(CMakePackage): version('2.1.0', '3cf07043d677d200720c928569635e12') depends_on('py-pytest', type='test') - depends_on('py-setuptools', type='build') + depends_on('py-setuptools', type='build') extends('python') diff --git a/var/spack/repos/builtin/packages/py-pynn/package.py b/var/spack/repos/builtin/packages/py-pynn/package.py index 0bc23e1cee..51947b8e50 100644 --- a/var/spack/repos/builtin/packages/py-pynn/package.py +++ b/var/spack/repos/builtin/packages/py-pynn/package.py @@ -32,11 +32,11 @@ class PyPynn(PythonPackage): homepage = "http://neuralensemble.org/PyNN/" url = "https://pypi.io/packages/source/P/PyNN/PyNN-0.8.3.tar.gz" + git = "https://github.com/NeuralEnsemble/PyNN.git" version('0.9.1', '3b8a6c63dc59d7ac751029f84dcaf7e6') version('0.8.3', '28c63f898093806a57198e9271ed7b82') - version('0.8beta', git='https://github.com/NeuralEnsemble/PyNN.git', - commit='ffb0cb1661f2b0f2778db8f71865978fe7a7a6a4') + version('0.8beta', commit='ffb0cb1661f2b0f2778db8f71865978fe7a7a6a4') version('0.8.1', '7fb165ed5af35a115cb9c60991645ae6') version('0.7.5', 'd8280544e4c9b34b40fd372b16342841') diff --git a/var/spack/repos/builtin/packages/py-pypeflow/package.py b/var/spack/repos/builtin/packages/py-pypeflow/package.py index 1e05b57cfd..6788e502f1 100644 --- a/var/spack/repos/builtin/packages/py-pypeflow/package.py +++ b/var/spack/repos/builtin/packages/py-pypeflow/package.py @@ -30,11 +30,9 @@ class PyPypeflow(PythonPackage): library written in Python.""" homepage = "https://github.com/PacificBiosciences/pypeFLOW" - url = "https://github.com/PacificBiosciences/pypeFLOW" + git = "https://github.com/PacificBiosciences/pypeFLOW.git" - version('2017-05-04', - git='https://github.com/PacificBiosciences/pypeFLOW.git', - commit='f23a1b290876bbdf130611000934ae4247158073') + version('2017-05-04', commit='f23a1b290876bbdf130611000934ae4247158073') depends_on('py-setuptools', type='build') depends_on('py-networkx@1.7:1.11', type=['build', 'run']) diff --git a/var/spack/repos/builtin/packages/py-pytorch/package.py b/var/spack/repos/builtin/packages/py-pytorch/package.py index b8c648d6fe..22c52e8aad 100644 --- a/var/spack/repos/builtin/packages/py-pytorch/package.py +++ b/var/spack/repos/builtin/packages/py-pytorch/package.py @@ -30,12 +30,10 @@ class PyPytorch(PythonPackage): with strong GPU acceleration.""" homepage = "http://pytorch.org/" - url = "https://github.com/pytorch/pytorch/archive/v0.3.1.tar.gz" + git = "https://github.com/pytorch/pytorch.git" - version('0.4.0', git='https://github.com/pytorch/pytorch.git', - tag='v0.4.0', submodules=True) - version('0.3.1', git='https://github.com/pytorch/pytorch.git', - tag='v0.3.1', submodules=True) + version('0.4.0', tag='v0.4.0', submodules=True) + version('0.3.1', tag='v0.3.1', submodules=True) variant('cuda', default='False', description='Add GPU support') variant('cudnn', default='False', description='Add cuDNN support') diff --git a/var/spack/repos/builtin/packages/py-spefile/package.py b/var/spack/repos/builtin/packages/py-spefile/package.py index 618e17c34d..db82492efe 100644 --- a/var/spack/repos/builtin/packages/py-spefile/package.py +++ b/var/spack/repos/builtin/packages/py-spefile/package.py @@ -30,12 +30,11 @@ class PySpefile(PythonPackage): analysis of x-ray scattering experiments""" homepage = "https://github.com/conda-forge/spefile-feedstock" - url = "https://github.com/conda-forge/spefile-feedstock.git" + git = "https://github.com/conda-forge/spefile-feedstock.git" import_modules = ['spefile'] - version('1.6', git='https://github.com/conda-forge/spefile-feedstock.git', - commit='24394e066da8dee5e7608f556ca0203c9db217f9') + version('1.6', commit='24394e066da8dee5e7608f556ca0203c9db217f9') depends_on('py-setuptools', type='build') depends_on('py-numpy', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-symengine/package.py b/var/spack/repos/builtin/packages/py-symengine/package.py index 86625127fa..8b3187ef37 100644 --- a/var/spack/repos/builtin/packages/py-symengine/package.py +++ b/var/spack/repos/builtin/packages/py-symengine/package.py @@ -29,10 +29,11 @@ class PySymengine(PythonPackage): """Python wrappers for SymEngine, a symbolic manipulation library.""" homepage = "https://github.com/symengine/symengine.py" - url = "https://github.com/symengine/symengine.py/archive/v0.2.0.tar.gz" + url = "https://github.com/symengine/symengine.py/archive/v0.2.0.tar.gz" + git = "https://github.com/symengine/symengine.py.git" + version('develop', git=git) version('0.2.0', 'e1d114fa12be4c8c7e9f24007e07718c') - version('develop', git='https://github.com/symengine/symengine.py.git') # Build dependencies depends_on('python@2.7:2.8,3.3:') diff --git a/var/spack/repos/builtin/packages/py-theano/package.py b/var/spack/repos/builtin/packages/py-theano/package.py index a8b32f5781..e5f77a1e9a 100644 --- a/var/spack/repos/builtin/packages/py-theano/package.py +++ b/var/spack/repos/builtin/packages/py-theano/package.py @@ -30,12 +30,13 @@ class PyTheano(PythonPackage): and GPUs.""" homepage = "http://deeplearning.net/software/theano/" - url = "https://pypi.io/packages/source/T/Theano/Theano-0.8.2.tar.gz" + url = "https://pypi.io/packages/source/T/Theano/Theano-0.8.2.tar.gz" + git = "https://github.com/Theano/Theano.git" + version('master', branch='master') version('1.0.2', 'fcae24dfa76babe15f5f3c556d67c9f2') version('1.0.1', 'a38b36c0fdc3126c574163db0a253e69') version('0.8.2', 'f2d0dfe7df141115201077cd933b2c52') - version('master', git='https://github.com/Theano/Theano.git', branch='master') variant('gpu', default=False, description='Builds with support for GPUs via CUDA and cuDNN') diff --git a/var/spack/repos/builtin/packages/py-webkit-server/package.py b/var/spack/repos/builtin/packages/py-webkit-server/package.py index 7bf3ddde40..fa42d1b5e8 100644 --- a/var/spack/repos/builtin/packages/py-webkit-server/package.py +++ b/var/spack/repos/builtin/packages/py-webkit-server/package.py @@ -30,6 +30,7 @@ class PyWebkitServer(PythonPackage): homepage = "https://github.com/niklasb/webkit-server" url = "https://pypi.io/packages/source/w/webkit-server/webkit-server-1.0.tar.gz" + git = "https://github.com/niklasb/webkit-server.git" - version('develop', git="https://github.com/niklasb/webkit-server", branch="master") + version('develop', branch='master') version('1.0', '8463245c2b4f0264d934c0ae20bd4654') diff --git a/var/spack/repos/builtin/packages/py-xattr/package.py b/var/spack/repos/builtin/packages/py-xattr/package.py index 188e077811..15f4aeffd4 100644 --- a/var/spack/repos/builtin/packages/py-xattr/package.py +++ b/var/spack/repos/builtin/packages/py-xattr/package.py @@ -30,9 +30,9 @@ class PyXattr(PythonPackage): sans libattr dependency""" homepage = "http://pyxattr.k1024.org/" + git = "https://github.com/fwang2/pyxattr.git" - version('develop', git='https://github.com/fwang2/pyxattr.git', - branch='dev') + version('develop', branch='dev') depends_on('python@2.7:') depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-yt/package.py b/var/spack/repos/builtin/packages/py-yt/package.py index 5c95ec621a..94b7583b8a 100644 --- a/var/spack/repos/builtin/packages/py-yt/package.py +++ b/var/spack/repos/builtin/packages/py-yt/package.py @@ -35,8 +35,8 @@ class PyYt(PythonPackage): interdisciplinary community. """ homepage = "http://yt-project.org" - url = "https://github.com/yt-project/yt/archive/yt-3.4.0.tar.gz" - git = "https://github.com/yt-project/yt.git" + url = "https://github.com/yt-project/yt/archive/yt-3.4.0.tar.gz" + git = "https://github.com/yt-project/yt.git" version("develop", branch="master") diff --git a/var/spack/repos/builtin/packages/qmcpack/package.py b/var/spack/repos/builtin/packages/qmcpack/package.py index 8003a3c0d1..4caa10f8e3 100644 --- a/var/spack/repos/builtin/packages/qmcpack/package.py +++ b/var/spack/repos/builtin/packages/qmcpack/package.py @@ -32,7 +32,7 @@ class Qmcpack(CMakePackage): # Package information homepage = "http://www.qmcpack.org/" - url = "https://github.com/QMCPACK/qmcpack.git" + git = "https://github.com/QMCPACK/qmcpack.git" tags = ['ecp', 'ecp-apps'] @@ -40,12 +40,12 @@ class Qmcpack(CMakePackage): # Spack manual. However, it is easier to maintain because github hashes # can occasionally change. # NOTE: 12/19/2017 QMCPACK 3.0.0 does not build properly with Spack. - version('3.4.0', git=url, tag='v3.4.0') - version('3.3.0', git=url, tag='v3.3.0') - version('3.2.0', git=url, tag='v3.2.0') - version('3.1.1', git=url, tag='v3.1.1') - version('3.1.0', git=url, tag='v3.1.0') - version('develop', git=url) + version('develop') + version('3.4.0', tag='v3.4.0') + version('3.3.0', tag='v3.3.0') + version('3.2.0', tag='v3.2.0') + version('3.1.1', tag='v3.1.1') + version('3.1.0', tag='v3.1.0') # These defaults match those in the QMCPACK manual variant('debug', default=False, description='Build debug version') diff --git a/var/spack/repos/builtin/packages/qmd-progress/package.py b/var/spack/repos/builtin/packages/qmd-progress/package.py index 3d2df5a31d..e4c05030ea 100644 --- a/var/spack/repos/builtin/packages/qmd-progress/package.py +++ b/var/spack/repos/builtin/packages/qmd-progress/package.py @@ -33,10 +33,11 @@ class QmdProgress(CMakePackage): homepage = "https://github.com/lanl/qmd-progress" url = "https://github.com/lanl/qmd-progress/tarball/v1.1.0" + git = "https://github.com/lanl/qmd-progress.git" + version('develop', branch='master') version('1.1.0', 'dda155134f0925629bf116e562c0a4bd') version('1.0.0', 'c950bead2719a47a78864e3376ba143e') - version('develop', git='https://github.com/lanl/qmd-progress', branch='master') variant('graphlib', default=False, description='Build with Metis Suppport') variant('mpi', default=True, description='Build with MPI Support') diff --git a/var/spack/repos/builtin/packages/qtgraph/package.py b/var/spack/repos/builtin/packages/qtgraph/package.py index d151c98076..cf8f229273 100644 --- a/var/spack/repos/builtin/packages/qtgraph/package.py +++ b/var/spack/repos/builtin/packages/qtgraph/package.py @@ -49,13 +49,10 @@ class Qtgraph(QMakePackage): libgvc within the Qt Graphics View Framework.""" homepage = "https://github.com/OpenSpeedShop/QtGraph" - url = "https://github.com/OpenSpeedShop/QtGraph.git" + git = "https://github.com/OpenSpeedShop/QtGraph.git" - version('1.0.0.0', branch='1.0.0.0', - git='https://github.com/OpenSpeedShop/QtGraph.git') - - version('develop', branch='master', - git='https://github.com/OpenSpeedShop/QtGraph.git') + version('develop', branch='master') + version('1.0.0.0', branch='1.0.0.0') # qtgraph depends on these packages depends_on('qt@4.8.6:', when='@develop') diff --git a/var/spack/repos/builtin/packages/quinoa/package.py b/var/spack/repos/builtin/packages/quinoa/package.py index 5a47d355d9..e00814950d 100644 --- a/var/spack/repos/builtin/packages/quinoa/package.py +++ b/var/spack/repos/builtin/packages/quinoa/package.py @@ -34,9 +34,9 @@ class Quinoa(CMakePackage): """ homepage = "http://quinoacomputing.org" - url = "https://github.com/quinoacomputing/quinoa/tarball/quinoa_v0.1" + git = "https://github.com/quinoacomputing/quinoa.git" - version('develop', git='https://github.com/quinoacomputing/quinoa', branch='master') + version('develop', branch='master') depends_on('hdf5+mpi') depends_on("charm backend=mpi") -- cgit v1.2.3-70-g09d2 From a1572bb9991fc8fd8aa5a2d9a17f3b978a0d0bb6 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 23 Jul 2018 21:56:48 -0500 Subject: Add top-level attributes for git R (Bioconductor) packages --- var/spack/repos/builtin/packages/r-a4/package.py | 6 +++--- var/spack/repos/builtin/packages/r-a4base/package.py | 6 +++--- var/spack/repos/builtin/packages/r-a4classif/package.py | 5 ++--- var/spack/repos/builtin/packages/r-a4core/package.py | 4 ++-- var/spack/repos/builtin/packages/r-a4preproc/package.py | 4 ++-- var/spack/repos/builtin/packages/r-a4reporting/package.py | 6 +++--- var/spack/repos/builtin/packages/r-abaenrichment/package.py | 4 ++-- var/spack/repos/builtin/packages/r-absseq/package.py | 4 ++-- var/spack/repos/builtin/packages/r-acgh/package.py | 4 ++-- var/spack/repos/builtin/packages/r-acme/package.py | 4 ++-- var/spack/repos/builtin/packages/r-adsplit/package.py | 4 ++-- var/spack/repos/builtin/packages/r-affxparser/package.py | 5 ++--- var/spack/repos/builtin/packages/r-affy/package.py | 5 ++--- var/spack/repos/builtin/packages/r-affycomp/package.py | 4 ++-- var/spack/repos/builtin/packages/r-affycompatible/package.py | 2 +- var/spack/repos/builtin/packages/r-affycontam/package.py | 4 ++-- var/spack/repos/builtin/packages/r-affycoretools/package.py | 4 ++-- var/spack/repos/builtin/packages/r-affyexpress/package.py | 4 ++-- var/spack/repos/builtin/packages/r-affyilm/package.py | 4 ++-- var/spack/repos/builtin/packages/r-affyio/package.py | 6 +++--- var/spack/repos/builtin/packages/r-affypdnn/package.py | 4 ++-- var/spack/repos/builtin/packages/r-affyplm/package.py | 4 ++-- var/spack/repos/builtin/packages/r-affyqcreport/package.py | 4 ++-- var/spack/repos/builtin/packages/r-affyrnadegradation/package.py | 4 ++-- var/spack/repos/builtin/packages/r-agdex/package.py | 4 ++-- var/spack/repos/builtin/packages/r-agilp/package.py | 4 ++-- var/spack/repos/builtin/packages/r-agimicrorna/package.py | 4 ++-- var/spack/repos/builtin/packages/r-aims/package.py | 4 ++-- var/spack/repos/builtin/packages/r-aldex2/package.py | 4 ++-- var/spack/repos/builtin/packages/r-allelicimbalance/package.py | 4 ++-- var/spack/repos/builtin/packages/r-alpine/package.py | 4 ++-- var/spack/repos/builtin/packages/r-alsace/package.py | 4 ++-- var/spack/repos/builtin/packages/r-altcdfenvs/package.py | 4 ++-- var/spack/repos/builtin/packages/r-ampliqueso/package.py | 4 ++-- var/spack/repos/builtin/packages/r-analysispageserver/package.py | 4 ++-- var/spack/repos/builtin/packages/r-anaquin/package.py | 4 ++-- var/spack/repos/builtin/packages/r-aneufinder/package.py | 4 ++-- var/spack/repos/builtin/packages/r-aneufinderdata/package.py | 4 ++-- var/spack/repos/builtin/packages/r-annaffy/package.py | 4 ++-- var/spack/repos/builtin/packages/r-annotate/package.py | 6 +++--- var/spack/repos/builtin/packages/r-annotationdbi/package.py | 8 +++----- var/spack/repos/builtin/packages/r-annotationfilter/package.py | 5 ++--- var/spack/repos/builtin/packages/r-annotationforge/package.py | 4 ++-- var/spack/repos/builtin/packages/r-annotationhub/package.py | 5 ++--- var/spack/repos/builtin/packages/r-bamsignals/package.py | 4 ++-- var/spack/repos/builtin/packages/r-biobase/package.py | 9 ++++----- var/spack/repos/builtin/packages/r-biocgenerics/package.py | 9 ++++----- var/spack/repos/builtin/packages/r-biocinstaller/package.py | 5 ++--- var/spack/repos/builtin/packages/r-biocparallel/package.py | 5 ++--- var/spack/repos/builtin/packages/r-biocstyle/package.py | 4 ++-- var/spack/repos/builtin/packages/r-biomart/package.py | 6 +++--- var/spack/repos/builtin/packages/r-biomformat/package.py | 4 ++-- var/spack/repos/builtin/packages/r-biostrings/package.py | 5 ++--- var/spack/repos/builtin/packages/r-biovizbase/package.py | 4 ++-- var/spack/repos/builtin/packages/r-bsgenome/package.py | 7 +++---- var/spack/repos/builtin/packages/r-bumphunter/package.py | 5 ++--- var/spack/repos/builtin/packages/r-category/package.py | 4 ++-- var/spack/repos/builtin/packages/r-clusterprofiler/package.py | 4 ++-- var/spack/repos/builtin/packages/r-cner/package.py | 4 ++-- var/spack/repos/builtin/packages/r-complexheatmap/package.py | 5 ++--- var/spack/repos/builtin/packages/r-delayedarray/package.py | 7 +++---- var/spack/repos/builtin/packages/r-deseq/package.py | 4 ++-- var/spack/repos/builtin/packages/r-deseq2/package.py | 6 +++--- .../repos/builtin/packages/r-dirichletmultinomial/package.py | 4 ++-- var/spack/repos/builtin/packages/r-dnacopy/package.py | 4 ++-- var/spack/repos/builtin/packages/r-dose/package.py | 4 ++-- var/spack/repos/builtin/packages/r-edger/package.py | 5 ++--- var/spack/repos/builtin/packages/r-ensembldb/package.py | 5 ++--- var/spack/repos/builtin/packages/r-fgsea/package.py | 4 ++-- var/spack/repos/builtin/packages/r-gcrma/package.py | 5 ++--- var/spack/repos/builtin/packages/r-gdsfmt/package.py | 4 ++-- var/spack/repos/builtin/packages/r-genefilter/package.py | 6 +++--- var/spack/repos/builtin/packages/r-geneplotter/package.py | 4 ++-- var/spack/repos/builtin/packages/r-genie3/package.py | 4 ++-- var/spack/repos/builtin/packages/r-genomeinfodb/package.py | 7 +++---- var/spack/repos/builtin/packages/r-genomicalignments/package.py | 7 +++---- var/spack/repos/builtin/packages/r-genomicfeatures/package.py | 5 ++--- var/spack/repos/builtin/packages/r-genomicranges/package.py | 7 +++---- var/spack/repos/builtin/packages/r-geoquery/package.py | 5 ++--- var/spack/repos/builtin/packages/r-ggbio/package.py | 5 ++--- var/spack/repos/builtin/packages/r-gosemsim/package.py | 4 ++-- var/spack/repos/builtin/packages/r-gostats/package.py | 4 ++-- var/spack/repos/builtin/packages/r-graph/package.py | 4 ++-- var/spack/repos/builtin/packages/r-gseabase/package.py | 4 ++-- var/spack/repos/builtin/packages/r-gtrellis/package.py | 5 ++--- var/spack/repos/builtin/packages/r-gviz/package.py | 4 ++-- var/spack/repos/builtin/packages/r-hypergraph/package.py | 4 ++-- var/spack/repos/builtin/packages/r-illuminaio/package.py | 5 ++--- var/spack/repos/builtin/packages/r-impute/package.py | 4 ++-- .../repos/builtin/packages/r-interactivedisplaybase/package.py | 5 ++--- var/spack/repos/builtin/packages/r-iranges/package.py | 7 +++---- var/spack/repos/builtin/packages/r-irkernel/package.py | 5 ++--- var/spack/repos/builtin/packages/r-jaspar2018/package.py | 4 ++-- var/spack/repos/builtin/packages/r-kegggraph/package.py | 4 ++-- var/spack/repos/builtin/packages/r-keggrest/package.py | 7 +++---- var/spack/repos/builtin/packages/r-limma/package.py | 8 +++----- var/spack/repos/builtin/packages/r-makecdfenv/package.py | 4 ++-- var/spack/repos/builtin/packages/r-mergemaid/package.py | 4 ++-- var/spack/repos/builtin/packages/r-minfi/package.py | 5 ++--- var/spack/repos/builtin/packages/r-mlinterfaces/package.py | 4 ++-- var/spack/repos/builtin/packages/r-msnbase/package.py | 4 ++-- var/spack/repos/builtin/packages/r-multtest/package.py | 4 ++-- var/spack/repos/builtin/packages/r-mzid/package.py | 4 ++-- var/spack/repos/builtin/packages/r-mzr/package.py | 4 ++-- var/spack/repos/builtin/packages/r-oligoclasses/package.py | 4 ++-- var/spack/repos/builtin/packages/r-organismdbi/package.py | 5 ++--- var/spack/repos/builtin/packages/r-pathview/package.py | 4 ++-- var/spack/repos/builtin/packages/r-pcamethods/package.py | 6 +++--- var/spack/repos/builtin/packages/r-phyloseq/package.py | 4 ++-- var/spack/repos/builtin/packages/r-preprocesscore/package.py | 5 ++--- var/spack/repos/builtin/packages/r-protgenerics/package.py | 5 ++--- var/spack/repos/builtin/packages/r-quantro/package.py | 5 ++--- var/spack/repos/builtin/packages/r-qvalue/package.py | 4 ++-- var/spack/repos/builtin/packages/r-rbgl/package.py | 4 ++-- var/spack/repos/builtin/packages/r-reportingtools/package.py | 4 ++-- var/spack/repos/builtin/packages/r-rgraphviz/package.py | 4 ++-- var/spack/repos/builtin/packages/r-rhdf5/package.py | 4 ++-- var/spack/repos/builtin/packages/r-rsamtools/package.py | 5 ++--- var/spack/repos/builtin/packages/r-rtracklayer/package.py | 5 ++--- var/spack/repos/builtin/packages/r-s4vectors/package.py | 7 +++---- var/spack/repos/builtin/packages/r-seqlogo/package.py | 4 ++-- var/spack/repos/builtin/packages/r-shortread/package.py | 4 ++-- var/spack/repos/builtin/packages/r-siggenes/package.py | 5 ++--- var/spack/repos/builtin/packages/r-simpleaffy/package.py | 5 ++--- var/spack/repos/builtin/packages/r-snprelate/package.py | 4 ++-- var/spack/repos/builtin/packages/r-somaticsignatures/package.py | 5 ++--- var/spack/repos/builtin/packages/r-spem/package.py | 5 ++--- .../repos/builtin/packages/r-summarizedexperiment/package.py | 7 +++---- var/spack/repos/builtin/packages/r-sva/package.py | 4 ++-- var/spack/repos/builtin/packages/r-tfbstools/package.py | 4 ++-- var/spack/repos/builtin/packages/r-tmixclust/package.py | 5 ++--- var/spack/repos/builtin/packages/r-topgo/package.py | 6 +++--- var/spack/repos/builtin/packages/r-variantannotation/package.py | 5 ++--- var/spack/repos/builtin/packages/r-vsn/package.py | 4 ++-- var/spack/repos/builtin/packages/r-xde/package.py | 4 ++-- var/spack/repos/builtin/packages/r-xmapbridge/package.py | 5 ++--- var/spack/repos/builtin/packages/r-xvector/package.py | 5 ++--- var/spack/repos/builtin/packages/r-yapsa/package.py | 5 ++--- var/spack/repos/builtin/packages/r-yaqcaffy/package.py | 5 ++--- var/spack/repos/builtin/packages/r-yarn/package.py | 5 ++--- var/spack/repos/builtin/packages/r-zlibbioc/package.py | 6 +++--- 141 files changed, 307 insertions(+), 360 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-a4/package.py b/var/spack/repos/builtin/packages/r-a4/package.py index 312df82954..b32540f771 100644 --- a/var/spack/repos/builtin/packages/r-a4/package.py +++ b/var/spack/repos/builtin/packages/r-a4/package.py @@ -29,9 +29,9 @@ class RA4(RPackage): """Automated Affymetrix Array Analysis Umbrella Package.""" homepage = "https://www.bioconductor.org/packages/a4/" - url = "https://git.bioconductor.org/packages/a4" - list_url = homepage - version('1.24.0', git='https://git.bioconductor.org/packages/a4', commit='79b5143652176787c85a0d587b3bbfad6b4a19f4') + git = "https://git.bioconductor.org/packages/a4.git" + + version('1.24.0', commit='79b5143652176787c85a0d587b3bbfad6b4a19f4') depends_on('r@3.4.0:3.4.9', when='@1.24.0') depends_on('r-a4base', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-a4base/package.py b/var/spack/repos/builtin/packages/r-a4base/package.py index 3eaf8fa1cf..7bc66f0db6 100644 --- a/var/spack/repos/builtin/packages/r-a4base/package.py +++ b/var/spack/repos/builtin/packages/r-a4base/package.py @@ -29,9 +29,9 @@ class RA4base(RPackage): """Automated Affymetrix Array Analysis.""" homepage = "https://www.bioconductor.org/packages/a4Base/" - url = "'https://git.bioconductor.org/packages/a4Base'" - list_url = homepage - version('1.24.0', git='https://git.bioconductor.org/packages/a4Base', commit='f674afe424a508df2c8ee6c87a06fbd4aa410ef6') + git = "https://git.bioconductor.org/packages/a4Base.git" + + version('1.24.0', commit='f674afe424a508df2c8ee6c87a06fbd4aa410ef6') depends_on('r@3.4.0:3.4.9', when='@1.24.0') depends_on('r-biobase', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-a4classif/package.py b/var/spack/repos/builtin/packages/r-a4classif/package.py index 2f7d609d0c..75d87a3b0b 100644 --- a/var/spack/repos/builtin/packages/r-a4classif/package.py +++ b/var/spack/repos/builtin/packages/r-a4classif/package.py @@ -29,10 +29,9 @@ class RA4classif(RPackage): """Automated Affymetrix Array Analysis Classification Package.""" homepage = "https://www.bioconductor.org/packages/a4Classif/" - url = "https://git.bioconductor.org/packages/a4Classif" - list_url = homepage + git = "https://git.bioconductor.org/packages/a4Classif.git" - version('1.24.0', git='https://git.bioconductor.org/packages/a4Classif', commit='ca06bf274c87a73fc12c29a6eea4b90289fe30b1') + version('1.24.0', commit='ca06bf274c87a73fc12c29a6eea4b90289fe30b1') depends_on('r@3.4.0:3.4.9', when='@1.24.0') depends_on('r-a4core', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-a4core/package.py b/var/spack/repos/builtin/packages/r-a4core/package.py index ab35a2f241..8079871158 100644 --- a/var/spack/repos/builtin/packages/r-a4core/package.py +++ b/var/spack/repos/builtin/packages/r-a4core/package.py @@ -29,9 +29,9 @@ class RA4core(RPackage): """Automated Affymetrix Array Analysis Core Package.""" homepage = "https://www.bioconductor.org/packages/a4Core/" - url = "https://git.bioconductor.org/packages/a4Core" + git = "https://git.bioconductor.org/packages/a4Core.git" - version('1.24.0', git='https://git.bioconductor.org/packages/a4Core', commit='c871faa3e1ab6be38a9ea3018816cf31b58b0ed3') + version('1.24.0', commit='c871faa3e1ab6be38a9ea3018816cf31b58b0ed3') depends_on('r@3.4.0:3.4.9', when='@1.24.0') depends_on('r-biobase', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-a4preproc/package.py b/var/spack/repos/builtin/packages/r-a4preproc/package.py index a03ce0e524..8517e776a5 100644 --- a/var/spack/repos/builtin/packages/r-a4preproc/package.py +++ b/var/spack/repos/builtin/packages/r-a4preproc/package.py @@ -29,9 +29,9 @@ class RA4preproc(RPackage): """Automated Affymetrix Array Analysis Preprocessing Package.""" homepage = "https://www.bioconductor.org/packages/a4Preproc/" - url = "https://git.bioconductor.org/packages/a4Preproc" + git = "https://git.bioconductor.org/packages/a4Preproc.git" - version('1.24.0', git='https://git.bioconductor.org/packages/a4Preproc', commit='651014b8102807aea4f1274e34e083e70b5e7ee7') + version('1.24.0', commit='651014b8102807aea4f1274e34e083e70b5e7ee7') depends_on('r@3.4.0:3.4.9', when='@1.24.0') depends_on('r-annotationdbi', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-a4reporting/package.py b/var/spack/repos/builtin/packages/r-a4reporting/package.py index 091da1f5d1..7a02e9a800 100644 --- a/var/spack/repos/builtin/packages/r-a4reporting/package.py +++ b/var/spack/repos/builtin/packages/r-a4reporting/package.py @@ -29,9 +29,9 @@ class RA4reporting(RPackage): """Automated Affymetrix Array Analysis Reporting Package.""" homepage = "https://www.bioconductor.org/packages/a4Reporting" - url = "https://git.bioconductor.org/packages/a4Reporting" - list_url = homepage - version('1.24.0', git='https://git.bioconductor.org/packages/a4Reporting', commit='bf22c4d50daf40fc9eaf8c476385bf4a24a5b5ce') + git = "https://git.bioconductor.org/packages/a4Reporting.git" + + version('1.24.0', commit='bf22c4d50daf40fc9eaf8c476385bf4a24a5b5ce') depends_on('r@3.4.0:3.4.9', when='@1.24.0') depends_on('r-annaffy', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-abaenrichment/package.py b/var/spack/repos/builtin/packages/r-abaenrichment/package.py index 50b2e64a69..7be6dbb13f 100644 --- a/var/spack/repos/builtin/packages/r-abaenrichment/package.py +++ b/var/spack/repos/builtin/packages/r-abaenrichment/package.py @@ -42,9 +42,9 @@ class RAbaenrichment(RPackage): user-defined brain regions.""" homepage = "https://bioconductor.org/packages/ABAEnrichment/" - url = "https://git.bioconductor.org/packages/ABAEnrichment" + git = "https://git.bioconductor.org/packages/ABAEnrichment.git" - version('1.6.0', git='https://git.bioconductor.org/packages/ABAEnrichment', commit='d2a0467dcb7aa6e103e3b83dccd6510b0e142ac1') + version('1.6.0', commit='d2a0467dcb7aa6e103e3b83dccd6510b0e142ac1') depends_on('r@3.4.0:3.4.9', when='@1.6.0') depends_on('r-rcpp', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-absseq/package.py b/var/spack/repos/builtin/packages/r-absseq/package.py index 72c825df6b..39cf5800d1 100644 --- a/var/spack/repos/builtin/packages/r-absseq/package.py +++ b/var/spack/repos/builtin/packages/r-absseq/package.py @@ -32,9 +32,9 @@ class RAbsseq(RPackage): of dispersion across expression level.""" homepage = "https://www.bioconductor.org/packages/ABSSeq/" - url = "https://git.bioconductor.org/packages/ABSSeq" + git = "https://git.bioconductor.org/packages/ABSSeq.git" - version('1.22.8', git='https://git.bioconductor.org/packages/ABSSeq', commit='a67ba49bc156a4522092519644f3ec83d58ebd6a') + version('1.22.8', commit='a67ba49bc156a4522092519644f3ec83d58ebd6a') depends_on('r@3.4.0:3.4.9', when='@1.22.8') depends_on('r-locfit', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-acgh/package.py b/var/spack/repos/builtin/packages/r-acgh/package.py index ee941c33d2..a929fe6781 100644 --- a/var/spack/repos/builtin/packages/r-acgh/package.py +++ b/var/spack/repos/builtin/packages/r-acgh/package.py @@ -32,9 +32,9 @@ class RAcgh(RPackage): printing and plotting aCGH objects.""" homepage = "https://www.bioconductor.org/packages/aCGH/" - url = "https://git.bioconductor.org/packages/aCGH" + git = "https://git.bioconductor.org/packages/aCGH.git" - version('1.54.0', git='https://git.bioconductor.org/packages/aCGH', commit='be2ed339449f55c8d218e10c435e4ad356683693') + version('1.54.0', commit='be2ed339449f55c8d218e10c435e4ad356683693') depends_on('r@3.4.0:3.4.9', when='@1.54.0') depends_on('r-cluster', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-acme/package.py b/var/spack/repos/builtin/packages/r-acme/package.py index d815249e48..ef04920ff0 100644 --- a/var/spack/repos/builtin/packages/r-acme/package.py +++ b/var/spack/repos/builtin/packages/r-acme/package.py @@ -37,9 +37,9 @@ class RAcme(RPackage): experiments quite easily with enough memory.""" homepage = "https://www.bioconductor.org/packages/ACME/" - url = "https://git.bioconductor.org/packages/ACME" + git = "https://git.bioconductor.org/packages/ACME.git" - version('2.32.0', git='https://git.bioconductor.org/packages/ACME', commit='76372255d7714a0c8128a11c028bf70214dac407') + version('2.32.0', commit='76372255d7714a0c8128a11c028bf70214dac407') depends_on('r@3.4.0:3.4.9', when='@2.32.0') depends_on('r-biobase', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-adsplit/package.py b/var/spack/repos/builtin/packages/r-adsplit/package.py index 4405026fd2..0839856872 100644 --- a/var/spack/repos/builtin/packages/r-adsplit/package.py +++ b/var/spack/repos/builtin/packages/r-adsplit/package.py @@ -32,9 +32,9 @@ class RAdsplit(RPackage): significance of the supporting gene set is determined.""" homepage = "https://www.bioconductor.org/packages/adSplit/" - url = "https://git.bioconductor.org/packages/adSplit" + git = "https://git.bioconductor.org/packages/adSplit.git" - version('1.46.0', git='https://git.bioconductor.org/packages/adSplit', commit='7e81a83f34d371447f491b3a146bf6851e260c7c') + version('1.46.0', commit='7e81a83f34d371447f491b3a146bf6851e260c7c') depends_on('r@3.4.0:3.4.9', when='@1.46.0') depends_on('r-annotationdbi', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-affxparser/package.py b/var/spack/repos/builtin/packages/r-affxparser/package.py index fc36c42cfa..1440802f23 100644 --- a/var/spack/repos/builtin/packages/r-affxparser/package.py +++ b/var/spack/repos/builtin/packages/r-affxparser/package.py @@ -36,9 +36,8 @@ class RAffxparser(RPackage): from a set of CEL files into a convenient list structure.""" homepage = "https://www.bioconductor.org/packages/affxparser/" - url = "https://git.bioconductor.org/packages/affxparser" - list_url = homepage + git = "https://git.bioconductor.org/packages/affxparser.git" - version('1.48.0', git='https://git.bioconductor.org/packages/affxparser', commit='2461ea88f310b59c4a9a997a4b3dadedbd65a4aa') + version('1.48.0', commit='2461ea88f310b59c4a9a997a4b3dadedbd65a4aa') depends_on('r@3.4.0:3.4.9', when='@1.48.0') diff --git a/var/spack/repos/builtin/packages/r-affy/package.py b/var/spack/repos/builtin/packages/r-affy/package.py index 5b169f8175..2d1637673a 100644 --- a/var/spack/repos/builtin/packages/r-affy/package.py +++ b/var/spack/repos/builtin/packages/r-affy/package.py @@ -31,10 +31,9 @@ class RAffy(RPackage): functions. 'affy' is fully functional without it.""" homepage = "https://bioconductor.org/packages/affy/" - url = "https://git.bioconductor.org/packages/affy" - list_url = homepage + git = "https://git.bioconductor.org/packages/affy.git" - version('1.54.0', git='https://git.bioconductor.org/packages/affy', commit='a815f02906fcf491b28ed0a356d6fce95a6bd20e') + version('1.54.0', commit='a815f02906fcf491b28ed0a356d6fce95a6bd20e') depends_on('r-biocgenerics', type=('build', 'run')) depends_on('r-biobase', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-affycomp/package.py b/var/spack/repos/builtin/packages/r-affycomp/package.py index 8d023f346e..d153ad2052 100644 --- a/var/spack/repos/builtin/packages/r-affycomp/package.py +++ b/var/spack/repos/builtin/packages/r-affycomp/package.py @@ -30,9 +30,9 @@ class RAffycomp(RPackage): expression measures for Affymetrix Oligonucleotide Arrays.""" homepage = "https://www.bioconductor.org/packages/affycomp/" - url = "https://git.bioconductor.org/packages/affycomp" + git = "https://git.bioconductor.org/packages/affycomp.git" - version('1.52.0', git='https://git.bioconductor.org/packages/affycomp', commit='1b97a1cb21ec93bf1e5c88d5d55b988059612790') + version('1.52.0', commit='1b97a1cb21ec93bf1e5c88d5d55b988059612790') depends_on('r@3.4.0:3.4.9', when='@1.52.0') depends_on('r-biobase', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-affycompatible/package.py b/var/spack/repos/builtin/packages/r-affycompatible/package.py index 3747cb7649..9499c20ab0 100644 --- a/var/spack/repos/builtin/packages/r-affycompatible/package.py +++ b/var/spack/repos/builtin/packages/r-affycompatible/package.py @@ -34,7 +34,7 @@ class RAffycompatible(RPackage): (AGCC)-compatible sample annotation files.""" homepage = "https://www.bioconductor.org/packages/AffyCompatible/" - git = "https://git.bioconductor.org/packages/AffyCompatible" + git = "https://git.bioconductor.org/packages/AffyCompatible.git" version('1.36.0', commit='dbbfd43a54ae1de6173336683a9461084ebf38c3') diff --git a/var/spack/repos/builtin/packages/r-affycontam/package.py b/var/spack/repos/builtin/packages/r-affycontam/package.py index 1c39f1f357..994684e1c7 100644 --- a/var/spack/repos/builtin/packages/r-affycontam/package.py +++ b/var/spack/repos/builtin/packages/r-affycontam/package.py @@ -30,9 +30,9 @@ class RAffycontam(RPackage): effectiveness.""" homepage = "https://www.bioconductor.org/packages/affyContam/" - url = "https://git.bioconductor.org/packages/affyContam" + git = "https://git.bioconductor.org/packages/affyContam.git" - version('1.34.0', git='https://git.bioconductor.org/packages/affyContam', commit='03529f26d059c19e069cdda358dbf7789b6d4c40') + version('1.34.0', commit='03529f26d059c19e069cdda358dbf7789b6d4c40') depends_on('r@3.4.0:3.4.9', when=('@1.34.0')) depends_on('r-biobase', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-affycoretools/package.py b/var/spack/repos/builtin/packages/r-affycoretools/package.py index 1e838948b3..4156c9d460 100644 --- a/var/spack/repos/builtin/packages/r-affycoretools/package.py +++ b/var/spack/repos/builtin/packages/r-affycoretools/package.py @@ -30,9 +30,9 @@ class RAffycoretools(RPackage): the more common analyses that a core Biostatistician might see.""" homepage = "https://www.bioconductor.org/packages/affycoretools/" - url = "https://git.bioconductor.org/packages/affycoretools" + git = "https://git.bioconductor.org/packages/affycoretools.git" - version('1.48.0', git='https://git.bioconductor.org/packages/affycoretools', commit='e0d52e34eead1ac45d3e60c59efd940e4889eb99') + version('1.48.0', commit='e0d52e34eead1ac45d3e60c59efd940e4889eb99') depends_on('r@3.4.0:3.4.9', when='@1.48.0') depends_on('r-biobase', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-affyexpress/package.py b/var/spack/repos/builtin/packages/r-affyexpress/package.py index e5e591eb91..2077f01377 100644 --- a/var/spack/repos/builtin/packages/r-affyexpress/package.py +++ b/var/spack/repos/builtin/packages/r-affyexpress/package.py @@ -31,9 +31,9 @@ class RAffyexpress(RPackage): expressed genes in the Affymetrix gene expression data.""" homepage = "https://www.bioconductor.org/packages/AffyExpress/" - url = "https://git.bioconductor.org/packages/AffyExpress" + git = "https://git.bioconductor.org/packages/AffyExpress.git" - version('1.42.0', git='https://git.bioconductor.org/packages/AffyExpress', commit='f5c5cf6173f4419e25f4aeff5e6b705a40abc371') + version('1.42.0', commit='f5c5cf6173f4419e25f4aeff5e6b705a40abc371') depends_on('r@3.4.0:3.4.9', when='@1.42.0') depends_on('r-affy', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-affyilm/package.py b/var/spack/repos/builtin/packages/r-affyilm/package.py index 946785eb6f..5be8e7e95d 100644 --- a/var/spack/repos/builtin/packages/r-affyilm/package.py +++ b/var/spack/repos/builtin/packages/r-affyilm/package.py @@ -33,9 +33,9 @@ class RAffyilm(RPackage): of the Langmuir model.""" homepage = "https://www.bioconductor.org/packages/affyILM/" - url = "https://git.bioconductor.org/packages/affyILM" + git = "https://git.bioconductor.org/packages/affyILM.git" - version('1.28.0', git='https://git.bioconductor.org/packages/affyILM', commit='307bee3ebc599e0ea4a1d6fa8d5511ccf8bef7de') + version('1.28.0', commit='307bee3ebc599e0ea4a1d6fa8d5511ccf8bef7de') depends_on('r@3.4.0:3.4.9', when='@1.28.0') depends_on('r-gcrma', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-affyio/package.py b/var/spack/repos/builtin/packages/r-affyio/package.py index 5e3d66dbfb..2950776157 100644 --- a/var/spack/repos/builtin/packages/r-affyio/package.py +++ b/var/spack/repos/builtin/packages/r-affyio/package.py @@ -31,9 +31,9 @@ class RAffyio(RPackage): formats.""" homepage = "https://bioconductor.org/packages/affyio/" - url = "https://git.bioconductor.org/packages/affyio" - list_url = homepage + git = "https://git.bioconductor.org/packages/affyio.git" + + version('1.46.0', commit='977597f2772e08273d86579486f452170566c880') - version('1.46.0', git='https://git.bioconductor.org/packages/affyio', commit='977597f2772e08273d86579486f452170566c880') depends_on('r-zlibbioc', type=('build', 'run')) depends_on('r@3.4.0:3.4.9', when='@1.46.0') diff --git a/var/spack/repos/builtin/packages/r-affypdnn/package.py b/var/spack/repos/builtin/packages/r-affypdnn/package.py index 24442119f6..e08b6a5bad 100644 --- a/var/spack/repos/builtin/packages/r-affypdnn/package.py +++ b/var/spack/repos/builtin/packages/r-affypdnn/package.py @@ -30,9 +30,9 @@ class RAffypdnn(RPackage): described by Li Zhang et al.""" homepage = "https://www.bioconductor.org/packages/affypdnn/" - url = "https://git.bioconductor.org/packages/affypdnn" + git = "https://git.bioconductor.org/packages/affypdnn.git" - version('1.50.0', git='https://git.bioconductor.org/packages/affypdnn', commit='97ff68e9f51f31333c0330435ea23b212b3ed18a') + version('1.50.0', commit='97ff68e9f51f31333c0330435ea23b212b3ed18a') depends_on('r@3.4.0:3.4.9', when='@1.50.0') depends_on('r-affy', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-affyplm/package.py b/var/spack/repos/builtin/packages/r-affyplm/package.py index 57f7c1ba44..ac52e2fba3 100644 --- a/var/spack/repos/builtin/packages/r-affyplm/package.py +++ b/var/spack/repos/builtin/packages/r-affyplm/package.py @@ -33,9 +33,9 @@ class RAffyplm(RPackage): PLM based quality assessment tools.""" homepage = "https://www.bioconductor.org/packages/affyPLM/" - url = "https://git.bioconductor.org/packages/affyPLM" + git = "https://git.bioconductor.org/packages/affyPLM.git" - version('1.52.1', git='https://git.bioconductor.org/packages/affyPLM', commit='e8613a6018c4ee58045df6bf19128844f50a1f43') + version('1.52.1', commit='e8613a6018c4ee58045df6bf19128844f50a1f43') depends_on('r@3.4.0:3.4.9', when='@1.52.1') depends_on('r-biocgenerics', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-affyqcreport/package.py b/var/spack/repos/builtin/packages/r-affyqcreport/package.py index 8b87830561..d983861890 100644 --- a/var/spack/repos/builtin/packages/r-affyqcreport/package.py +++ b/var/spack/repos/builtin/packages/r-affyqcreport/package.py @@ -31,9 +31,9 @@ class RAffyqcreport(RPackage): quality of a set of arrays in an AffyBatch object.""" homepage = "https://www.bioconductor.org/packages/affyQCReport/" - url = "https://git.bioconductor.org/packages/affyQCReport" + git = "https://git.bioconductor.org/packages/affyQCReport.git" - version('1.54.0', git='https://git.bioconductor.org/packages/affyQCReport', commit='5572e9981dc874b78b4adebf58080cac3fbb69e1') + version('1.54.0', commit='5572e9981dc874b78b4adebf58080cac3fbb69e1') depends_on('r@3.4.0:3.4.9', when='@1.54.0') depends_on('r-biobase', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-affyrnadegradation/package.py b/var/spack/repos/builtin/packages/r-affyrnadegradation/package.py index d05f8965c6..0201cb6324 100644 --- a/var/spack/repos/builtin/packages/r-affyrnadegradation/package.py +++ b/var/spack/repos/builtin/packages/r-affyrnadegradation/package.py @@ -34,9 +34,9 @@ class RAffyrnadegradation(RPackage): by RNA degradation.""" homepage = "https://www.bioconductor.org/packages/AffyRNADegradation/" - url = "https://git.bioconductor.org/packages/AffyRNADegradation" + git = "https://git.bioconductor.org/packages/AffyRNADegradation.git" - version('1.22.0', git='https://git.bioconductor.org/packages/AffyRNADegradation', commit='0fa78f8286494711a239ded0ba587b0de47c15d3') + version('1.22.0', commit='0fa78f8286494711a239ded0ba587b0de47c15d3') depends_on('r@3.4.0:3.4.9', when='@1.22.0') depends_on('r-affy', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-agdex/package.py b/var/spack/repos/builtin/packages/r-agdex/package.py index 64a9a4f229..6872f56642 100644 --- a/var/spack/repos/builtin/packages/r-agdex/package.py +++ b/var/spack/repos/builtin/packages/r-agdex/package.py @@ -30,9 +30,9 @@ class RAgdex(RPackage): for cross-species genomics.""" homepage = "http://bioconductor.org/packages/AGDEX/" - url = "https://git.bioconductor.org/packages/AGDEX" + git = "https://git.bioconductor.org/packages/AGDEX.git" - version('1.24.0', git='https://git.bioconductor.org/packages/AGDEX', commit='29c6bcfa6919a5c6d8bcb36b44e75145a60ce7b5') + version('1.24.0', commit='29c6bcfa6919a5c6d8bcb36b44e75145a60ce7b5') depends_on('r@3.4.0:3.4.9', when='@1.24.0') depends_on('r-biobase', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-agilp/package.py b/var/spack/repos/builtin/packages/r-agilp/package.py index e4ab94f979..a89ef223d4 100644 --- a/var/spack/repos/builtin/packages/r-agilp/package.py +++ b/var/spack/repos/builtin/packages/r-agilp/package.py @@ -29,8 +29,8 @@ class RAgilp(RPackage): """Agilent expression array processing package.""" homepage = "http://bioconductor.org/packages/agilp/" - url = "https://git.bioconductor.org/packages/agilp" + git = "https://git.bioconductor.org/packages/agilp.git" - version('3.8.0', git='https://git.bioconductor.org/packages/agilp', commit='c772a802af1b4c0741f2edd78053a0425160ea53') + version('3.8.0', commit='c772a802af1b4c0741f2edd78053a0425160ea53') depends_on('r@3.4.0:3.4.9', when='@3.8.0') diff --git a/var/spack/repos/builtin/packages/r-agimicrorna/package.py b/var/spack/repos/builtin/packages/r-agimicrorna/package.py index e5b17dc0ef..e311c4a32e 100644 --- a/var/spack/repos/builtin/packages/r-agimicrorna/package.py +++ b/var/spack/repos/builtin/packages/r-agimicrorna/package.py @@ -29,9 +29,9 @@ class RAgimicrorna(RPackage): """Processing and Analysis of Agilent microRNA data.""" homepage = "https://www.bioconductor.org/packages/AgiMicroRna/" - url = "https://git.bioconductor.org/packages/AgiMicroRna" + git = "https://git.bioconductor.org/packages/AgiMicroRna.git" - version('2.26.0', git='https://git.bioconductor.org/packages/AgiMicroRna', commit='6dd74bae47986f2a23d03e3f1f9f78f701dd8053') + version('2.26.0', commit='6dd74bae47986f2a23d03e3f1f9f78f701dd8053') depends_on('r@3.4.0:3.4.9', when='@2.26.0') depends_on('r-affycoretools', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-aims/package.py b/var/spack/repos/builtin/packages/r-aims/package.py index fc7883f7f7..e0b132f85d 100644 --- a/var/spack/repos/builtin/packages/r-aims/package.py +++ b/var/spack/repos/builtin/packages/r-aims/package.py @@ -33,9 +33,9 @@ class RAims(RPackage): as well as on dataset of gene expression data.""" homepage = "http://bioconductor.org/packages/AIMS/" - url = "https://git.bioconductor.org/packages/AIMS" + git = "https://git.bioconductor.org/packages/AIMS.git" - version('1.8.0', git='https://git.bioconductor.org/packages/AIMS', commit='86b866c20e191047492c51b43e3f73082c3f8357') + version('1.8.0', commit='86b866c20e191047492c51b43e3f73082c3f8357') depends_on('r@3.4.0:3.4.9', when='@1.8.0') depends_on('r-e1071', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-aldex2/package.py b/var/spack/repos/builtin/packages/r-aldex2/package.py index 80a9fd07ba..6305c13b49 100644 --- a/var/spack/repos/builtin/packages/r-aldex2/package.py +++ b/var/spack/repos/builtin/packages/r-aldex2/package.py @@ -39,9 +39,9 @@ class RAldex2(RPackage): and fdr values calculated by the Benjamini Hochberg correction.""" homepage = "http://bioconductor.org/packages/ALDEx2/" - url = "https://git.bioconductor.org/packages/ALDEx2" + git = "https://git.bioconductor.org/packages/ALDEx2.git" - version('1.8.0', git='https://git.bioconductor.org/packages/ALDEx2', commit='24104824ca2402ad4f54fbf1ed9cee7fac2aaaf1') + version('1.8.0', commit='24104824ca2402ad4f54fbf1ed9cee7fac2aaaf1') depends_on('r@3.4.0:3.4.9', when='@1.8.0') depends_on('r-s4vectors', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-allelicimbalance/package.py b/var/spack/repos/builtin/packages/r-allelicimbalance/package.py index 961c07a0c8..b3440cd6fd 100644 --- a/var/spack/repos/builtin/packages/r-allelicimbalance/package.py +++ b/var/spack/repos/builtin/packages/r-allelicimbalance/package.py @@ -30,9 +30,9 @@ class RAllelicimbalance(RPackage): investigation using RNA-seq data.""" homepage = "http://bioconductor.org/packages/AllelicImbalance/" - url = "https://git.bioconductor.org/packages/AllelicImbalance" + git = "https://git.bioconductor.org/packages/AllelicImbalance.git" - version('1.14.0', git='https://git.bioconductor.org/packages/AllelicImbalance', commit='35958534945819baafde0e13d1eb4d05a514142c') + version('1.14.0', commit='35958534945819baafde0e13d1eb4d05a514142c') depends_on('r@3.4.0:3.4.9', when='@1.14.0') depends_on('r-genomicranges', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-alpine/package.py b/var/spack/repos/builtin/packages/r-alpine/package.py index 100008c502..9f7e5dc9b6 100644 --- a/var/spack/repos/builtin/packages/r-alpine/package.py +++ b/var/spack/repos/builtin/packages/r-alpine/package.py @@ -30,9 +30,9 @@ class RAlpine(RPackage): transcript abundance estimation.""" homepage = "http://bioconductor.org/packages/alpine/" - url = "https://git.bioconductor.org/packages/alpine" + git = "https://git.bioconductor.org/packages/alpine.git" - version('1.2.0', git='https://git.bioconductor.org/packages/alpine', commit='896872e6071769e1ac2cf786974edb8b875c45eb') + version('1.2.0', commit='896872e6071769e1ac2cf786974edb8b875c45eb') depends_on('r@3.4.0:3.4.9', when='@1.2.0') depends_on('r-biostrings', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-alsace/package.py b/var/spack/repos/builtin/packages/r-alsace/package.py index aebffee9ac..401e2ce380 100644 --- a/var/spack/repos/builtin/packages/r-alsace/package.py +++ b/var/spack/repos/builtin/packages/r-alsace/package.py @@ -35,9 +35,9 @@ class RAlsace(RPackage): retention time correction, etcetera.""" homepage = "https://www.bioconductor.org/packages/alsace/" - url = "https://git.bioconductor.org/packages/alsace" + git = "https://git.bioconductor.org/packages/alsace.git" - version('1.12.0', git='https://git.bioconductor.org/packages/alsace', commit='1364c65bbff05786d05c02799fd44fd57748fae3') + version('1.12.0', commit='1364c65bbff05786d05c02799fd44fd57748fae3') depends_on('r-als', type=('build', 'run')) depends_on('r-ptw', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-altcdfenvs/package.py b/var/spack/repos/builtin/packages/r-altcdfenvs/package.py index 78d661cce6..e994ee1949 100644 --- a/var/spack/repos/builtin/packages/r-altcdfenvs/package.py +++ b/var/spack/repos/builtin/packages/r-altcdfenvs/package.py @@ -29,9 +29,9 @@ class RAltcdfenvs(RPackage): """Convenience data structures and functions to handle cdfenvs.""" homepage = "https://www.bioconductor.org/packages/altcdfenvs/" - url = "https://git.bioconductor.org/packages/altcdfenvs" + git = "https://git.bioconductor.org/packages/altcdfenvs.git" - version('2.38.0', git='https://git.bioconductor.org/packages/altcdfenvs', commit='2e92b9da76dbe50af4bf33c525134e29e9809291') + version('2.38.0', commit='2e92b9da76dbe50af4bf33c525134e29e9809291') depends_on('r@3.4.0:3.4.9', when='@2.38.0') depends_on('r-biocgenerics', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-ampliqueso/package.py b/var/spack/repos/builtin/packages/r-ampliqueso/package.py index d6f5b6899f..47239e3cef 100644 --- a/var/spack/repos/builtin/packages/r-ampliqueso/package.py +++ b/var/spack/repos/builtin/packages/r-ampliqueso/package.py @@ -30,9 +30,9 @@ class RAmpliqueso(RPackage): amplicon sequencing panels, such as AmpliSeq.""" homepage = "https://www.bioconductor.org/packages/ampliQueso/" - url = "https://git.bioconductor.org/packages/ampliQueso" + git = "https://git.bioconductor.org/packages/ampliQueso.git" - version('1.14.0', git='https://git.bioconductor.org/packages/ampliQueso', commit='9a4c26ec594171279aba8ab7fe59c4a2ea09b06b') + version('1.14.0', commit='9a4c26ec594171279aba8ab7fe59c4a2ea09b06b') depends_on('r@3.4.0:3.4.9', when='@1.14.0') depends_on('r-samr', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-analysispageserver/package.py b/var/spack/repos/builtin/packages/r-analysispageserver/package.py index 401cc4cedb..59f3d906e4 100644 --- a/var/spack/repos/builtin/packages/r-analysispageserver/package.py +++ b/var/spack/repos/builtin/packages/r-analysispageserver/package.py @@ -30,9 +30,9 @@ class RAnalysispageserver(RPackage): of customizable R analyses via the web.""" homepage = "https://www.bioconductor.org/packages/AnalysisPageServer/" - url = "https://git.bioconductor.org/packages/AnalysisPageServer" + git = "https://git.bioconductor.org/packages/AnalysisPageServer.git" - version('1.10.0', git='https://git.bioconductor.org/packages/AnalysisPageServer', commit='876c87073be116fa15a1afdd407e21152eb80d50') + version('1.10.0', commit='876c87073be116fa15a1afdd407e21152eb80d50') depends_on('r@3.4.0:3.4.9', when='@1.10.0') depends_on('r-log4r', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-anaquin/package.py b/var/spack/repos/builtin/packages/r-anaquin/package.py index 21938a4ea3..2436acfd51 100644 --- a/var/spack/repos/builtin/packages/r-anaquin/package.py +++ b/var/spack/repos/builtin/packages/r-anaquin/package.py @@ -33,9 +33,9 @@ class RAnaquin(RPackage): modelling and visualization of spike-in controls.""" homepage = "https://www.bioconductor.org/packages/Anaquin/" - url = "https://git.bioconductor.org/packages/Anaquin" + git = "https://git.bioconductor.org/packages/Anaquin.git" - version('1.2.0', git='https://git.bioconductor.org/packages/Anaquin', commit='584d1970cc9dc1d354f9a6d7c1306bd7e8567119') + version('1.2.0', commit='584d1970cc9dc1d354f9a6d7c1306bd7e8567119') depends_on('r@3.4.0:3.4.9', when='@1.2.0') depends_on('r-deseq2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-aneufinder/package.py b/var/spack/repos/builtin/packages/r-aneufinder/package.py index 9113851ff8..d01f13f333 100644 --- a/var/spack/repos/builtin/packages/r-aneufinder/package.py +++ b/var/spack/repos/builtin/packages/r-aneufinder/package.py @@ -30,9 +30,9 @@ class RAneufinder(RPackage): export and analysis from whole-genome single cell sequencing data.""" homepage = "https://www.bioconductor.org/packages/AneuFinder/" - url = "https://git.bioconductor.org/packages/AneuFinder" + git = "https://git.bioconductor.org/packages/AneuFinder.git" - version('1.4.0', git='https://git.bioconductor.org/packages/AneuFinder', commit='e5bdf4d5e4f84ee5680986826ffed636ed853b8e') + version('1.4.0', commit='e5bdf4d5e4f84ee5680986826ffed636ed853b8e') depends_on('r@3.4.0:3.4.9', when='@1.4.0') depends_on('r-genomicranges', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-aneufinderdata/package.py b/var/spack/repos/builtin/packages/r-aneufinderdata/package.py index 7482c6c83a..f6c6279ad5 100644 --- a/var/spack/repos/builtin/packages/r-aneufinderdata/package.py +++ b/var/spack/repos/builtin/packages/r-aneufinderdata/package.py @@ -30,8 +30,8 @@ class RAneufinderdata(RPackage): purposes in the AneuFinder package.""" homepage = "https://www.bioconductor.org/packages/AneuFinderData/" - url = "https://git.bioconductor.org/packages/AneuFinderData" + git = "https://git.bioconductor.org/packages/AneuFinderData.git" - version('1.4.0', git='https://git.bioconductor.org/packages/AneuFinderData', commit='55c8807ee4a37a2eb6d0defafaf843f980b22c40') + version('1.4.0', commit='55c8807ee4a37a2eb6d0defafaf843f980b22c40') depends_on('r@3.4.0:3.4.9', when='@1.4.0') diff --git a/var/spack/repos/builtin/packages/r-annaffy/package.py b/var/spack/repos/builtin/packages/r-annaffy/package.py index 4769d335c5..9968fcea04 100644 --- a/var/spack/repos/builtin/packages/r-annaffy/package.py +++ b/var/spack/repos/builtin/packages/r-annaffy/package.py @@ -35,9 +35,9 @@ class RAnnaffy(RPackage): using various criteria.""" homepage = "https://www.bioconductor.org/packages/annaffy/" - url = "https://git.bioconductor.org/packages/annaffy" + git = "https://git.bioconductor.org/packages/annaffy.git" - version('1.48.0', git='https://git.bioconductor.org/packages/annaffy', commit='89a03c64ac9df5d963ed60b87893a3fffa6798a0') + version('1.48.0', commit='89a03c64ac9df5d963ed60b87893a3fffa6798a0') depends_on('r@3.4.0:3.4.9', when='@1.48.0') depends_on('r-biobase', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-annotate/package.py b/var/spack/repos/builtin/packages/r-annotate/package.py index dc07740c87..0f4960a4e6 100644 --- a/var/spack/repos/builtin/packages/r-annotate/package.py +++ b/var/spack/repos/builtin/packages/r-annotate/package.py @@ -29,9 +29,9 @@ class RAnnotate(RPackage): """Using R enviroments for annotation.""" homepage = "https://www.bioconductor.org/packages/annotate/" - url = "https://git.bioconductor.org/packages/annotate" - list_url = homepage - version('1.54.0', git='https://git.bioconductor.org/packages/annotate', commit='860cc5b696795a31b18beaf4869f9c418d74549e') + git = "https://git.bioconductor.org/packages/annotate.git" + + version('1.54.0', commit='860cc5b696795a31b18beaf4869f9c418d74549e') depends_on('r@3.4.0:3.4.9', when='@1.54.0') depends_on('r-annotationdbi', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-annotationdbi/package.py b/var/spack/repos/builtin/packages/r-annotationdbi/package.py index da5b9d3186..28c833a33f 100644 --- a/var/spack/repos/builtin/packages/r-annotationdbi/package.py +++ b/var/spack/repos/builtin/packages/r-annotationdbi/package.py @@ -22,8 +22,6 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## -# -# from spack import * @@ -32,9 +30,9 @@ class RAnnotationdbi(RPackage): annotation data packages using SQLite data storage.""" homepage = "https://www.bioconductor.org/packages/AnnotationDbi/" - url = "https://git.bioconductor.org/packages/AnnotationDbi" - list_url = homepage - version('1.38.2', git='https://git.bioconductor.org/packages/AnnotationDbi', commit='67d46facba8c15fa5f0eb47c4e39b53dbdc67c36') + git = "https://git.bioconductor.org/packages/AnnotationDbi.git" + + version('1.38.2', commit='67d46facba8c15fa5f0eb47c4e39b53dbdc67c36') depends_on('r@3.4.0:3.4.9', when='@1.38.2') depends_on('r-biocgenerics', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-annotationfilter/package.py b/var/spack/repos/builtin/packages/r-annotationfilter/package.py index 072c43ab0d..3337589be8 100644 --- a/var/spack/repos/builtin/packages/r-annotationfilter/package.py +++ b/var/spack/repos/builtin/packages/r-annotationfilter/package.py @@ -32,10 +32,9 @@ class RAnnotationfilter(RPackage): packages.""" homepage = "https://bioconductor.org/packages/AnnotationFilter/" - url = "https://git.bioconductor.org/packages/AnnotationFilter" - list_url = homepage + git = "https://git.bioconductor.org/packages/AnnotationFilter.git" - version('1.0.0', git='https://git.bioconductor.org/packages/AnnotationFilter', commit='a9f79b26defe3021eea60abe16ce1fa379813ec9') + version('1.0.0', commit='a9f79b26defe3021eea60abe16ce1fa379813ec9') depends_on('r-genomicranges', type=('build', 'run')) depends_on('r-lazyeval', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-annotationforge/package.py b/var/spack/repos/builtin/packages/r-annotationforge/package.py index 12555c1138..bb1f91a579 100644 --- a/var/spack/repos/builtin/packages/r-annotationforge/package.py +++ b/var/spack/repos/builtin/packages/r-annotationforge/package.py @@ -31,9 +31,9 @@ class RAnnotationforge(RPackage): with AnnotationDbi.""" homepage = "https://www.bioconductor.org/packages/AnnotationForge/" - url = "https://git.bioconductor.org/packages/AnnotationForge" + git = "https://git.bioconductor.org/packages/AnnotationForge.git" - version('1.18.2', git='https://git.bioconductor.org/packages/AnnotationForge', commit='44ca3d4ef9e9825c14725ffdbbaa57ea059532e1') + version('1.18.2', commit='44ca3d4ef9e9825c14725ffdbbaa57ea059532e1') depends_on('r@3.4.0:3.4.9', when='@1.18.2') depends_on('r-biocgenerics', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-annotationhub/package.py b/var/spack/repos/builtin/packages/r-annotationhub/package.py index e4a42dce9e..5d93003cce 100644 --- a/var/spack/repos/builtin/packages/r-annotationhub/package.py +++ b/var/spack/repos/builtin/packages/r-annotationhub/package.py @@ -36,10 +36,9 @@ class RAnnotationhub(RPackage): quick and reproducible access.""" homepage = "https://bioconductor.org/packages/AnnotationHub/" - url = "https://git.bioconductor.org/packages/AnnotationHub" - list_url = homepage + git = "https://git.bioconductor.org/packages/AnnotationHub.git" - version('2.8.3', git='https://git.bioconductor.org/packages/AnnotationHub', commit='8aa9c64262a8d708d2bf1c82f82dfc3d7d4ccc0c') + version('2.8.3', commit='8aa9c64262a8d708d2bf1c82f82dfc3d7d4ccc0c') depends_on('r-rsqlite', type=('build', 'run')) depends_on('r-biocinstaller', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-bamsignals/package.py b/var/spack/repos/builtin/packages/r-bamsignals/package.py index abc3b50d96..3c354bc342 100644 --- a/var/spack/repos/builtin/packages/r-bamsignals/package.py +++ b/var/spack/repos/builtin/packages/r-bamsignals/package.py @@ -32,9 +32,9 @@ class RBamsignals(RPackage): profiles. It also handles paired-end data.""" homepage = "https://www.bioconductor.org/packages/bamsignals/" - url = "https://git.bioconductor.org/packages/bamsignals" + git = "https://git.bioconductor.org/packages/bamsignals.git" - version('1.8.0', git='https://git.bioconductor.org/packages/bamsignals', commit='b123b83e8e026c9ec91209d4498aff3e95a5de23') + version('1.8.0', commit='b123b83e8e026c9ec91209d4498aff3e95a5de23') depends_on('r@3.4.0:3.4.9', when='@1.8.0') depends_on('r-biocgenerics', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-biobase/package.py b/var/spack/repos/builtin/packages/r-biobase/package.py index ef6a84d090..e3cb9530dc 100644 --- a/var/spack/repos/builtin/packages/r-biobase/package.py +++ b/var/spack/repos/builtin/packages/r-biobase/package.py @@ -28,14 +28,13 @@ from spack import * class RBiobase(RPackage): """Functions that are needed by many other packages - or which replace R functions.""" + or which replace R functions.""" homepage = "https://www.bioconductor.org/packages/Biobase/" - url = "https://git.bioconductor.org/packages/Biobase" - list_url = homepage + git = "https://git.bioconductor.org/packages/Biobase.git" - version('2.38.0', git='https://git.bioconductor.org/packages/Biobase', commit='83f89829e0278ac014b0bc6664e621ac147ba424') - version('2.36.2', git='https://git.bioconductor.org/packages/Biobase', commit='15f50912f3fa08ccb15c33b7baebe6b8a59ce075') + version('2.38.0', commit='83f89829e0278ac014b0bc6664e621ac147ba424') + version('2.36.2', commit='15f50912f3fa08ccb15c33b7baebe6b8a59ce075') depends_on('r-biocgenerics@0.16.1:', type=('build', 'run')) depends_on('r@3.4.0:3.4.9', when='@2.36.2:') diff --git a/var/spack/repos/builtin/packages/r-biocgenerics/package.py b/var/spack/repos/builtin/packages/r-biocgenerics/package.py index cba33db40d..3366eef19b 100644 --- a/var/spack/repos/builtin/packages/r-biocgenerics/package.py +++ b/var/spack/repos/builtin/packages/r-biocgenerics/package.py @@ -22,17 +22,16 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## -# from spack import * class RBiocgenerics(RPackage): """S4 generic functions needed by many Bioconductor packages.""" + homepage = "https://www.bioconductor.org/packages/BiocGenerics/" - url = "https://git.bioconductor.org/packages/BiocGenerics" - list_url = homepage + git = "https://git.bioconductor.org/packages/BiocGenerics.git" - version('0.24.0', git='https://git.bioconductor.org/packages/BiocGenerics', commit='3db111e8c1f876267da89f4f0c5406a9d5c31cd1') - version('0.22.1', git='https://git.bioconductor.org/packages/BiocGenerics', commit='9c90bb8926885289d596a81ff318ee3745cbb6ad') + version('0.24.0', commit='3db111e8c1f876267da89f4f0c5406a9d5c31cd1') + version('0.22.1', commit='9c90bb8926885289d596a81ff318ee3745cbb6ad') depends_on('r@3.4.0:3.4.9', when='@0.22.1:') diff --git a/var/spack/repos/builtin/packages/r-biocinstaller/package.py b/var/spack/repos/builtin/packages/r-biocinstaller/package.py index afc83961e6..3cf25e679e 100644 --- a/var/spack/repos/builtin/packages/r-biocinstaller/package.py +++ b/var/spack/repos/builtin/packages/r-biocinstaller/package.py @@ -30,9 +30,8 @@ class RBiocinstaller(RPackage): and (some) github packages.""" homepage = "https://bioconductor.org/packages/BiocInstaller/" - url = "https://git.bioconductor.org/packages/BiocInstaller" - list_url = homepage + git = "https://git.bioconductor.org/packages/BiocInstaller.git" - version('1.26.1', git='https://git.bioconductor.org/packages/BiocInstaller', commit='9049b82a77aefa98e3f8e4dd7068317505d70e98') + version('1.26.1', commit='9049b82a77aefa98e3f8e4dd7068317505d70e98') depends_on('r@3.4.0:3.4.9', when='@1.26.1') diff --git a/var/spack/repos/builtin/packages/r-biocparallel/package.py b/var/spack/repos/builtin/packages/r-biocparallel/package.py index cb2ac2e9a6..07106ce5a6 100644 --- a/var/spack/repos/builtin/packages/r-biocparallel/package.py +++ b/var/spack/repos/builtin/packages/r-biocparallel/package.py @@ -31,10 +31,9 @@ class RBiocparallel(RPackage): objects.""" homepage = "https://bioconductor.org/packages/BiocParallel/" - url = "https://git.bioconductor.org/packages/BiocParallel" - list_url = homepage + git = "https://git.bioconductor.org/packages/BiocParallel.git" - version('1.10.1', git='https://git.bioconductor.org/packages/BiocParallel', commit='a76c58cf99fd585ba5ea33065649e68f1afe0a7d') + version('1.10.1', commit='a76c58cf99fd585ba5ea33065649e68f1afe0a7d') depends_on('r-futile-logger', type=('build', 'run')) depends_on('r-snow', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-biocstyle/package.py b/var/spack/repos/builtin/packages/r-biocstyle/package.py index 51c02c7615..630f7ddab7 100644 --- a/var/spack/repos/builtin/packages/r-biocstyle/package.py +++ b/var/spack/repos/builtin/packages/r-biocstyle/package.py @@ -30,9 +30,9 @@ class RBiocstyle(RPackage): documents. Package vignettes illustrate use and functionality.""" homepage = "https://www.bioconductor.org/packages/BiocStyle/" - url = "https://git.bioconductor.org/packages/BiocStyle" + git = "https://git.bioconductor.org/packages/BiocStyle.git" - version('2.4.1', git='https://git.bioconductor.org/packages/BiocStyle', commit='ef10764b68ac23a3a7a8ec3b6a6436187309c138') + version('2.4.1', commit='ef10764b68ac23a3a7a8ec3b6a6436187309c138') depends_on('r-bookdown', type=('build', 'run')) depends_on('r-knitr@1.12:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-biomart/package.py b/var/spack/repos/builtin/packages/r-biomart/package.py index d327e47ee7..2936418e3b 100644 --- a/var/spack/repos/builtin/packages/r-biomart/package.py +++ b/var/spack/repos/builtin/packages/r-biomart/package.py @@ -40,10 +40,10 @@ class RBiomart(RPackage): online queries from gene annotation to database mining.""" homepage = "https://bioconductor.org/packages/biomaRt/" - url = "https://git.bioconductor.org/packages/biomaRt" + git = "https://git.bioconductor.org/packages/biomaRt.git" - version('2.34.2', git='https://git.bioconductor.org/packages/biomaRt', commit='a7030915fbc6120cc6812aefdedba423a207459b') - version('2.32.1', git='https://git.bioconductor.org/packages/biomaRt', commit='f84d74424fa599f6d08f8db4612ca09914a9087f') + version('2.34.2', commit='a7030915fbc6120cc6812aefdedba423a207459b') + version('2.32.1', commit='f84d74424fa599f6d08f8db4612ca09914a9087f') depends_on('r-xml', type=('build', 'run')) depends_on('r-rcurl', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-biomformat/package.py b/var/spack/repos/builtin/packages/r-biomformat/package.py index 545a61e582..f428f41a5a 100644 --- a/var/spack/repos/builtin/packages/r-biomformat/package.py +++ b/var/spack/repos/builtin/packages/r-biomformat/package.py @@ -37,9 +37,9 @@ class RBiomformat(RPackage): as extensions of common core functions/methods.""" homepage = "https://www.bioconductor.org/packages/biomformat/" - url = "https://git.bioconductor.org/packages/biomformat" + git = "https://git.bioconductor.org/packages/biomformat.git" - version('1.4.0', git='https://git.bioconductor.org/packages/biomformat', commit='83b4b1883bc56ea93a0a6ca90fc1b18712ef0f1a') + version('1.4.0', commit='83b4b1883bc56ea93a0a6ca90fc1b18712ef0f1a') depends_on('r-plyr', type=('build', 'run')) depends_on('r-jsonlite', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-biostrings/package.py b/var/spack/repos/builtin/packages/r-biostrings/package.py index f28424421c..8803843ea6 100644 --- a/var/spack/repos/builtin/packages/r-biostrings/package.py +++ b/var/spack/repos/builtin/packages/r-biostrings/package.py @@ -31,10 +31,9 @@ class RBiostrings(RPackage): or sets of sequences.""" homepage = "https://bioconductor.org/packages/Biostrings/" - url = "https://git.bioconductor.org/packages/Biostrings" - list_url = homepage + git = "https://git.bioconductor.org/packages/Biostrings.git" - version('2.44.2', git='https://git.bioconductor.org/packages/Biostrings', commit='e4a2b320fb21c5cab3ece7b3c6fecaedfb1e5200') + version('2.44.2', commit='e4a2b320fb21c5cab3ece7b3c6fecaedfb1e5200') depends_on('r-biocgenerics', type=('build', 'run')) depends_on('r-s4vectors', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-biovizbase/package.py b/var/spack/repos/builtin/packages/r-biovizbase/package.py index 239bb12164..ed61008d26 100644 --- a/var/spack/repos/builtin/packages/r-biovizbase/package.py +++ b/var/spack/repos/builtin/packages/r-biovizbase/package.py @@ -33,9 +33,9 @@ class RBiovizbase(RPackage): and encourages consistency.""" homepage = "http://bioconductor.org/packages/biovizBase/" - url = "https://git.bioconductor.org/packages/biovizBase" + git = "https://git.bioconductor.org/packages/biovizBase.git" - version('1.24.0', git='https://git.bioconductor.org/packages/biovizBase', commit='ae9cd2ff665b74a8f45ed9c1d17fc0a778b4af6c') + version('1.24.0', commit='ae9cd2ff665b74a8f45ed9c1d17fc0a778b4af6c') depends_on('r@3.4.0:3.4.9', when='@1.24.0') depends_on('r-scales', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-bsgenome/package.py b/var/spack/repos/builtin/packages/r-bsgenome/package.py index 35eaf00e21..84f458d37e 100644 --- a/var/spack/repos/builtin/packages/r-bsgenome/package.py +++ b/var/spack/repos/builtin/packages/r-bsgenome/package.py @@ -30,11 +30,10 @@ class RBsgenome(RPackage): packages.""" homepage = "https://www.bioconductor.org/packages/BSgenome/" - url = "https://git.bioconductor.org/packages/BSgenome" - list_url = homepage + git = "https://git.bioconductor.org/packages/BSgenome.git" - version('1.46.0', git='https://git.bioconductor.org/packages/BSgenome', commit='bdfbd6d09820993585b8231ddea5e11c99008dc5') - version('1.44.2', git='https://git.bioconductor.org/packages/BSgenome', commit='105b00588a758d5ec7c347a7dff2756aea4516a0') + version('1.46.0', commit='bdfbd6d09820993585b8231ddea5e11c99008dc5') + version('1.44.2', commit='105b00588a758d5ec7c347a7dff2756aea4516a0') depends_on('r-biocgenerics@0.13.8:', type=('build', 'run')) depends_on('r-s4vectors@0.9.36:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-bumphunter/package.py b/var/spack/repos/builtin/packages/r-bumphunter/package.py index 36b2797233..825be998e3 100644 --- a/var/spack/repos/builtin/packages/r-bumphunter/package.py +++ b/var/spack/repos/builtin/packages/r-bumphunter/package.py @@ -29,10 +29,9 @@ class RBumphunter(RPackage): """Tools for finding bumps in genomic data""" homepage = "http://bioconductor.org/packages/bumphunter/" - url = "https://git.bioconductor.org/packages/bumphunter" - list_url = homepage + git = "https://git.bioconductor.org/packages/bumphunter.git" - version('1.16.0', git='https://git.bioconductor.org/packages/bumphunter', commit='1c3ab4d1fd2d75b1586ccef12665960b3602080a') + version('1.16.0', commit='1c3ab4d1fd2d75b1586ccef12665960b3602080a') depends_on('r-s4vectors', type=('build', 'run')) depends_on('r-iranges', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-category/package.py b/var/spack/repos/builtin/packages/r-category/package.py index 42f08d3fa6..a262a4e91f 100644 --- a/var/spack/repos/builtin/packages/r-category/package.py +++ b/var/spack/repos/builtin/packages/r-category/package.py @@ -29,9 +29,9 @@ class RCategory(RPackage): """A collection of tools for performing category analysis.""" homepage = "https://www.bioconductor.org/packages/Category/" - url = "https://git.bioconductor.org/packages/Category" + git = "https://git.bioconductor.org/packages/Category.git" - version('2.42.1', git='https://git.bioconductor.org/packages/Category', commit='382c817a2371671a72f8f949dfb4050361ebabcd') + version('2.42.1', commit='382c817a2371671a72f8f949dfb4050361ebabcd') depends_on('r@3.4.0:3.4.9', when='@2.42.1') depends_on('r-biocgenerics', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-clusterprofiler/package.py b/var/spack/repos/builtin/packages/r-clusterprofiler/package.py index 558dbfeefc..8df5fccb70 100644 --- a/var/spack/repos/builtin/packages/r-clusterprofiler/package.py +++ b/var/spack/repos/builtin/packages/r-clusterprofiler/package.py @@ -30,9 +30,9 @@ class RClusterprofiler(RPackage): profiles (GO and KEGG) of gene and gene clusters.""" homepage = "https://www.bioconductor.org/packages/clusterProfiler/" - url = "https://git.bioconductor.org/packages/clusterProfiler" + git = "https://git.bioconductor.org/packages/clusterProfiler.git" - version('3.4.4', git='https://git.bioconductor.org/packages/clusterProfiler', commit='b86b00e8405fe130e439362651a5567736e2d9d7') + version('3.4.4', commit='b86b00e8405fe130e439362651a5567736e2d9d7') depends_on('r@3.4.0:3.4.9', when='@3.4.4') depends_on('r-tidyr', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-cner/package.py b/var/spack/repos/builtin/packages/r-cner/package.py index 3af527dec1..77fd5f0274 100644 --- a/var/spack/repos/builtin/packages/r-cner/package.py +++ b/var/spack/repos/builtin/packages/r-cner/package.py @@ -30,9 +30,9 @@ class RCner(RPackage): conserved noncoding elements.""" homepage = "https://bioconductor.org/packages/CNEr/" - url = "https://git.bioconductor.org/packages/CNEr" + git = "https://git.bioconductor.org/packages/CNEr.git" - version('1.14.0', git='https://git.bioconductor.org/packages/CNEr', commit='b8634d65c51728c815127e22b45eba7c9b9db897') + version('1.14.0', commit='b8634d65c51728c815127e22b45eba7c9b9db897') depends_on('r-biostrings@2.33.4:', type=('build', 'run')) depends_on('r-dbi@0.7:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-complexheatmap/package.py b/var/spack/repos/builtin/packages/r-complexheatmap/package.py index 5645c1a269..1897595a28 100644 --- a/var/spack/repos/builtin/packages/r-complexheatmap/package.py +++ b/var/spack/repos/builtin/packages/r-complexheatmap/package.py @@ -32,10 +32,9 @@ class RComplexheatmap(RPackage): multiple heatmaps and supports self-defined annotation graphics.""" homepage = "https://bioconductor.org/packages/ComplexHeatmap/" - url = "https://git.bioconductor.org/packages/ComplexHeatmap" - list_url = homepage + git = "https://git.bioconductor.org/packages/ComplexHeatmap.git" - version('1.14.0', git='https://git.bioconductor.org/packages/ComplexHeatmap', commit='0acd8974fb5cedde8cd96efea6dfa39324d25b34') + version('1.14.0', commit='0acd8974fb5cedde8cd96efea6dfa39324d25b34') depends_on('r-circlize', type=('build', 'run')) depends_on('r-getoptlong', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-delayedarray/package.py b/var/spack/repos/builtin/packages/r-delayedarray/package.py index 94aa4beeb2..0ffbd43dd7 100644 --- a/var/spack/repos/builtin/packages/r-delayedarray/package.py +++ b/var/spack/repos/builtin/packages/r-delayedarray/package.py @@ -43,11 +43,10 @@ class RDelayedarray(RPackage): frames.""" homepage = "https://bioconductor.org/packages/DelayedArray/" - url = "https://git.bioconductor.org/packages/DelayedArray" - list_url = homepage + git = "https://git.bioconductor.org/packages/DelayedArray.git" - version('0.4.1', git='https://git.bioconductor.org/packages/DelayedArray', commit='ffe932ef8c255614340e4856fc6e0b44128a27a1') - version('0.2.7', git='https://git.bioconductor.org/packages/DelayedArray', commit='909c2ce1665ebae2543172ead50abbe10bd42bc4') + version('0.4.1', commit='ffe932ef8c255614340e4856fc6e0b44128a27a1') + version('0.2.7', commit='909c2ce1665ebae2543172ead50abbe10bd42bc4') depends_on('r-biocgenerics', type=('build', 'run')) depends_on('r-s4vectors@0.14.3:', type=('build', 'run'), when='@0.2.7') diff --git a/var/spack/repos/builtin/packages/r-deseq/package.py b/var/spack/repos/builtin/packages/r-deseq/package.py index d0d203b3ba..a9c378d294 100644 --- a/var/spack/repos/builtin/packages/r-deseq/package.py +++ b/var/spack/repos/builtin/packages/r-deseq/package.py @@ -32,9 +32,9 @@ class RDeseq(RPackage): distribution.""" homepage = "https://www.bioconductor.org/packages/DESeq/" - url = "https://git.bioconductor.org/packages/DESeq" + git = "https://git.bioconductor.org/packages/DESeq.git" - version('1.28.0', git='https://git.bioconductor.org/packages/DESeq', commit='738371466e6ccf00179fd35b617c8ba0e1e91630') + version('1.28.0', commit='738371466e6ccf00179fd35b617c8ba0e1e91630') depends_on('r-biocgenerics', type=('build', 'run')) depends_on('r-biobase', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-deseq2/package.py b/var/spack/repos/builtin/packages/r-deseq2/package.py index b9007190f2..ecdad2a563 100644 --- a/var/spack/repos/builtin/packages/r-deseq2/package.py +++ b/var/spack/repos/builtin/packages/r-deseq2/package.py @@ -32,10 +32,10 @@ class RDeseq2(RPackage): distribution.""" homepage = "https://www.bioconductor.org/packages/DESeq2/" - url = "https://git.bioconductor.org/packages/DESeq2" + git = "https://git.bioconductor.org/packages/DESeq2.git" - version('1.18.1', git='https://git.bioconductor.org/packages/DESeq2', commit='ef65091d46436af68915124b752f5e1cc55e93a7') - version('1.16.1', git='https://git.bioconductor.org/packages/DESeq2', commit='0a815574382704a08ef8b906eceb0296f81cded5') + version('1.18.1', commit='ef65091d46436af68915124b752f5e1cc55e93a7') + version('1.16.1', commit='0a815574382704a08ef8b906eceb0296f81cded5') depends_on('r@3.4.0:3.4.9', when='@1.16.1:') depends_on("r-rcpparmadillo", type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-dirichletmultinomial/package.py b/var/spack/repos/builtin/packages/r-dirichletmultinomial/package.py index 0414ef4fc3..2452277912 100644 --- a/var/spack/repos/builtin/packages/r-dirichletmultinomial/package.py +++ b/var/spack/repos/builtin/packages/r-dirichletmultinomial/package.py @@ -34,9 +34,9 @@ class RDirichletmultinomial(RPackage): further in the man page for this package, ?DirichletMultinomial.""" homepage = "https://bioconductor.org/packages/DirichletMultinomial/" - url = "https://git.bioconductor.org/packages/DirichletMultinomial" + git = "https://git.bioconductor.org/packages/DirichletMultinomial.git" - version('1.20.0', git='https://git.bioconductor.org/packages/DirichletMultinomial', commit='251529f301da1482551142240aeb6baf8dab2272') + version('1.20.0', commit='251529f301da1482551142240aeb6baf8dab2272') depends_on('r-s4vectors', type=('build', 'run')) depends_on('r-iranges', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-dnacopy/package.py b/var/spack/repos/builtin/packages/r-dnacopy/package.py index 5f19298098..b3428cd993 100644 --- a/var/spack/repos/builtin/packages/r-dnacopy/package.py +++ b/var/spack/repos/builtin/packages/r-dnacopy/package.py @@ -31,6 +31,6 @@ class RDnacopy(RPackage): with abnormal copy number.""" homepage = "https://www.bioconductor.org/packages/DNAcopy/" - url = "https://git.bioconductor.org/packages/DNAcopy" + git = "https://git.bioconductor.org/packages/DNAcopy.git" - version('1.50.1', git='https://git.bioconductor.org/packages/DNAcopy', commit='a20153029e28c009df813dbaf13d9f519fafa4e8') + version('1.50.1', commit='a20153029e28c009df813dbaf13d9f519fafa4e8') diff --git a/var/spack/repos/builtin/packages/r-dose/package.py b/var/spack/repos/builtin/packages/r-dose/package.py index d55f02dd9b..aaeb05d532 100644 --- a/var/spack/repos/builtin/packages/r-dose/package.py +++ b/var/spack/repos/builtin/packages/r-dose/package.py @@ -34,9 +34,9 @@ class RDose(RPackage): biological data.""" homepage = "https://www.bioconductor.org/packages/DOSE/" - url = "https://git.bioconductor.org/packages/DOSE" + git = "https://git.bioconductor.org/packages/DOSE.git" - version('3.2.0', git='https://git.bioconductor.org/packages/DOSE', commit='71f563fc39d02dfdf65184c94e0890a63b96b86b') + version('3.2.0', commit='71f563fc39d02dfdf65184c94e0890a63b96b86b') depends_on('r@3.4.0:3.4.9', when='@3.2.0') depends_on('r-scales', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-edger/package.py b/var/spack/repos/builtin/packages/r-edger/package.py index 7eaf61ce86..a4840869b5 100644 --- a/var/spack/repos/builtin/packages/r-edger/package.py +++ b/var/spack/repos/builtin/packages/r-edger/package.py @@ -35,10 +35,9 @@ class REdger(RPackage): SAGE and CAGE.""" homepage = "https://bioconductor.org/packages/edgeR/" - url = "https://git.bioconductor.org/packages/edgeR" - list_url = homepage + git = "https://git.bioconductor.org/packages/edgeR.git" - version('3.18.1', git='https://git.bioconductor.org/packages/edgeR', commit='101106f3fdd9e2c45d4a670c88f64c12e97a0495') + version('3.18.1', commit='101106f3fdd9e2c45d4a670c88f64c12e97a0495') depends_on('r-limma', type=('build', 'run')) depends_on('r-locfit', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-ensembldb/package.py b/var/spack/repos/builtin/packages/r-ensembldb/package.py index 54928bafa2..3f02413dbc 100644 --- a/var/spack/repos/builtin/packages/r-ensembldb/package.py +++ b/var/spack/repos/builtin/packages/r-ensembldb/package.py @@ -37,10 +37,9 @@ class REnsembldb(RPackage): region or transcript models of lincRNA genes.""" homepage = "https://bioconductor.org/packages/ensembldb/" - url = "https://git.bioconductor.org/packages/ensembldb" - list_url = homepage + git = "https://git.bioconductor.org/packages/ensembldb.git" - version('2.0.4', git='https://git.bioconductor.org/packages/ensembldb', commit='514623d71e3cca7a4e547adb579b5a958702ef86') + version('2.0.4', commit='514623d71e3cca7a4e547adb579b5a958702ef86') depends_on('r-biocgenerics', type=('build', 'run')) depends_on('r-genomicranges', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-fgsea/package.py b/var/spack/repos/builtin/packages/r-fgsea/package.py index c3b7954b5c..da00f4b172 100644 --- a/var/spack/repos/builtin/packages/r-fgsea/package.py +++ b/var/spack/repos/builtin/packages/r-fgsea/package.py @@ -32,9 +32,9 @@ class RFgsea(RPackage): stantard approaches to multiple hypothesis correction.""" homepage = "https://www.bioconductor.org/packages/fgsea/" - url = "https://git.bioconductor.org/packages/fgsea" + git = "https://git.bioconductor.org/packages/fgsea.git" - version('1.2.1', git='https://git.bioconductor.org/packages/fgsea', commit='99b04eef664204d0dca4b9f8027cd7eefb006b72') + version('1.2.1', commit='99b04eef664204d0dca4b9f8027cd7eefb006b72') depends_on('r@3.4.0:3.4.9', when='@1.2.1') depends_on('r-fastmatch', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-gcrma/package.py b/var/spack/repos/builtin/packages/r-gcrma/package.py index 9767371315..66a2e1f2e2 100644 --- a/var/spack/repos/builtin/packages/r-gcrma/package.py +++ b/var/spack/repos/builtin/packages/r-gcrma/package.py @@ -29,10 +29,9 @@ class RGcrma(RPackage): """Background adjustment using sequence information""" homepage = "https://bioconductor.org/packages/gcrma/" - url = "https://git.bioconductor.org/packages/gcrma" - list_url = homepage + git = "https://git.bioconductor.org/packages/gcrma.git" - version('2.48.0', git='https://git.bioconductor.org/packages/gcrma', commit='3ea0eb0b5c15ffb24df76620667ae7996ed715b4') + version('2.48.0', commit='3ea0eb0b5c15ffb24df76620667ae7996ed715b4') depends_on('r-affy', type=('build', 'run')) depends_on('r-biobase', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-gdsfmt/package.py b/var/spack/repos/builtin/packages/r-gdsfmt/package.py index 1e3aa44a6a..3df7379e38 100644 --- a/var/spack/repos/builtin/packages/r-gdsfmt/package.py +++ b/var/spack/repos/builtin/packages/r-gdsfmt/package.py @@ -40,8 +40,8 @@ class RGdsfmt(RPackage): processes supported by the package parallel.""" homepage = "http://bioconductor.org/packages/gdsfmt/" - url = "https://git.bioconductor.org/packages/gdsfmt" + git = "https://git.bioconductor.org/packages/gdsfmt.git" - version('1.14.1', git='https://git.bioconductor.org/packages/gdsfmt', commit='15743647b7eea5b82d3284858b4591fb6e59959d') + version('1.14.1', commit='15743647b7eea5b82d3284858b4591fb6e59959d') depends_on('r@3.4.0:3.4.9', when='@1.14.1') diff --git a/var/spack/repos/builtin/packages/r-genefilter/package.py b/var/spack/repos/builtin/packages/r-genefilter/package.py index 65df911a9c..c7e1c13596 100644 --- a/var/spack/repos/builtin/packages/r-genefilter/package.py +++ b/var/spack/repos/builtin/packages/r-genefilter/package.py @@ -29,9 +29,9 @@ class RGenefilter(RPackage): """Some basic functions for filtering genes""" homepage = "https://bioconductor.org/packages/genefilter/" - url = "https://git.bioconductor.org/packages/genefilter" - list_url = homepage - version('1.58.1', git='https://git.bioconductor.org/packages/genefilter', commit='ace2556049677f60882adfe91f8cc96791556fc2') + git = "https://git.bioconductor.org/packages/genefilter.git" + + version('1.58.1', commit='ace2556049677f60882adfe91f8cc96791556fc2') depends_on('r@3.4.0:3.4.9', when='@1.58.1') depends_on('r-s4vectors', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-geneplotter/package.py b/var/spack/repos/builtin/packages/r-geneplotter/package.py index 1af12fddd0..a5b032a0c6 100644 --- a/var/spack/repos/builtin/packages/r-geneplotter/package.py +++ b/var/spack/repos/builtin/packages/r-geneplotter/package.py @@ -29,9 +29,9 @@ class RGeneplotter(RPackage): """Functions for plotting genomic data.""" homepage = "https://www.bioconductor.org/packages/geneplotter/" - url = "https://git.bioconductor.org/packages/geneplotter" + git = "https://git.bioconductor.org/packages/geneplotter.git" - version('1.54.0', git='https://git.bioconductor.org/packages/geneplotter', commit='efdd946e092e44e35fde1eb4bcc5ec1d52090940') + version('1.54.0', commit='efdd946e092e44e35fde1eb4bcc5ec1d52090940') depends_on('r@3.4.0:3.4.9', when='@1.54.0') depends_on('r-biobase', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-genie3/package.py b/var/spack/repos/builtin/packages/r-genie3/package.py index 49dc72debc..cd61d010b7 100644 --- a/var/spack/repos/builtin/packages/r-genie3/package.py +++ b/var/spack/repos/builtin/packages/r-genie3/package.py @@ -30,9 +30,9 @@ class RGenie3(RPackage): regulatory networks from expression data.""" homepage = "https://bioconductor.org/packages/GENIE3/" + git = "https://git.bioconductor.org/packages/GENIE3.git" - version('1.2.0', git='https://git.bioconductor.org/packages/GENIE3', - commit='cafe6a1a85095cda6cc3c812eb6f53501fcbaf93') + version('1.2.0', commit='cafe6a1a85095cda6cc3c812eb6f53501fcbaf93') depends_on('r-reshape2', type=('build', 'run')) depends_on('r@3.5.0:', when='@1.2.0') diff --git a/var/spack/repos/builtin/packages/r-genomeinfodb/package.py b/var/spack/repos/builtin/packages/r-genomeinfodb/package.py index 6619a0b59f..214f88e4d3 100644 --- a/var/spack/repos/builtin/packages/r-genomeinfodb/package.py +++ b/var/spack/repos/builtin/packages/r-genomeinfodb/package.py @@ -32,11 +32,10 @@ class RGenomeinfodb(RPackage): names in their natural, rather than lexicographic, order.""" homepage = "https://bioconductor.org/packages/GenomeInfoDb/" - url = "https://git.bioconductor.org/packages/GenomeInfoDb" - list_url = homepage + git = "https://git.bioconductor.org/packages/GenomeInfoDb.git" - version('1.14.0', git='https://git.bioconductor.org/packages/GenomeInfoDb', commit='4978308a57d887b764cc4ce83724ca1758f580f6') - version('1.12.3', git='https://git.bioconductor.org/packages/GenomeInfoDb', commit='2deef3f0571b7f622483257bc22d2509ab5a0369') + version('1.14.0', commit='4978308a57d887b764cc4ce83724ca1758f580f6') + version('1.12.3', commit='2deef3f0571b7f622483257bc22d2509ab5a0369') depends_on('r-biocgenerics', type=('build', 'run')) depends_on('r-s4vectors', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-genomicalignments/package.py b/var/spack/repos/builtin/packages/r-genomicalignments/package.py index 2c58758efb..1cf1580da5 100644 --- a/var/spack/repos/builtin/packages/r-genomicalignments/package.py +++ b/var/spack/repos/builtin/packages/r-genomicalignments/package.py @@ -32,11 +32,10 @@ class RGenomicalignments(RPackage): detection, and working with the nucleotide content of the alignments.""" homepage = "https://bioconductor.org/packages/GenomicAlignments/" - url = "https://git.bioconductor.org/packages/GenomicAlignments" - list_url = homepage + git = "https://git.bioconductor.org/packages/GenomicAlignments.git" - version('1.14.2', git='https://git.bioconductor.org/packages/GenomicAlignments', commit='57b0b35d8b36069d4d94af86af051f0129b28eef') - version('1.12.2', git='https://git.bioconductor.org/packages/GenomicAlignments', commit='b5d6f19e4a89b6c1c3e9e58e5ea4eb13870874ef') + version('1.14.2', commit='57b0b35d8b36069d4d94af86af051f0129b28eef') + version('1.12.2', commit='b5d6f19e4a89b6c1c3e9e58e5ea4eb13870874ef') depends_on('r-biocgenerics@0.15.3:', type=('build', 'run')) depends_on('r-s4vectors@0.13.13:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-genomicfeatures/package.py b/var/spack/repos/builtin/packages/r-genomicfeatures/package.py index 2b211c7c9f..06ff4cae60 100644 --- a/var/spack/repos/builtin/packages/r-genomicfeatures/package.py +++ b/var/spack/repos/builtin/packages/r-genomicfeatures/package.py @@ -36,10 +36,9 @@ class RGenomicfeatures(RPackage): desired features in a convenient format.""" homepage = "http://bioconductor.org/packages/GenomicFeatures/" - url = "https://git.bioconductor.org/packages/GenomicFeatures" - list_url = homepage + git = "https://git.bioconductor.org/packages/GenomicFeatures.git" - version('1.28.5', git='https://git.bioconductor.org/packages/GenomicFeatures', commit='ba92381ae93cb1392dad5e6acfab8f6c1d744834') + version('1.28.5', commit='ba92381ae93cb1392dad5e6acfab8f6c1d744834') depends_on('r-biocgenerics', type=('build', 'run')) depends_on('r-s4vectors', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-genomicranges/package.py b/var/spack/repos/builtin/packages/r-genomicranges/package.py index d3941e81a6..2c3bd55ff1 100644 --- a/var/spack/repos/builtin/packages/r-genomicranges/package.py +++ b/var/spack/repos/builtin/packages/r-genomicranges/package.py @@ -38,11 +38,10 @@ class RGenomicranges(RPackage): infrastructure.""" homepage = "https://bioconductor.org/packages/GenomicRanges/" - url = "https://git.bioconductor.org/packages/GenomicRanges" - list_url = homepage + git = "https://git.bioconductor.org/packages/GenomicRanges.git" - version('1.30.3', git='https://git.bioconductor.org/packages/GenomicRanges', commit='e99979054bc50ed8c0109bc54563036c1b368997') - version('1.28.6', git='https://git.bioconductor.org/packages/GenomicRanges', commit='197472d618f3ed04c795dc6ed435500c29619563') + version('1.30.3', commit='e99979054bc50ed8c0109bc54563036c1b368997') + version('1.28.6', commit='197472d618f3ed04c795dc6ed435500c29619563') depends_on('r-biocgenerics@0.21.2:', type=('build', 'run')) depends_on('r-s4vectors@0.9.47:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-geoquery/package.py b/var/spack/repos/builtin/packages/r-geoquery/package.py index b07978e7d4..1e5cd8469c 100644 --- a/var/spack/repos/builtin/packages/r-geoquery/package.py +++ b/var/spack/repos/builtin/packages/r-geoquery/package.py @@ -32,10 +32,9 @@ class RGeoquery(RPackage): GEOquery is the bridge between GEO and BioConductor.""" homepage = "https://bioconductor.org/packages/GEOquery/" - url = "https://git.bioconductor.org/packages/GEOquery" - list_url = homepage + git = "https://git.bioconductor.org/packages/GEOquery.git" - version('2.42.0', git='https://git.bioconductor.org/packages/GEOquery', commit='c26adef8d3ddbd6932a3170f2f84f6e4327641fb') + version('2.42.0', commit='c26adef8d3ddbd6932a3170f2f84f6e4327641fb') depends_on('r-biobase', type=('build', 'run')) depends_on('r-xml', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-ggbio/package.py b/var/spack/repos/builtin/packages/r-ggbio/package.py index c10266a86c..9401e34441 100644 --- a/var/spack/repos/builtin/packages/r-ggbio/package.py +++ b/var/spack/repos/builtin/packages/r-ggbio/package.py @@ -37,10 +37,9 @@ class RGgbio(RPackage): and several splicing summaries.""" homepage = "http://bioconductor.org/packages/ggbio/" - url = "https://git.bioconductor.org/packages/ggbio" - list_url = homepage + git = "https://git.bioconductor.org/packages/ggbio.git" - version('1.24.1', git='https://git.bioconductor.org/packages/ggbio', commit='ef04c1bca1330f37152bcc21080cbde94849a094') + version('1.24.1', commit='ef04c1bca1330f37152bcc21080cbde94849a094') depends_on('r-gridextra', type=('build', 'run')) depends_on('r-scales', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-gosemsim/package.py b/var/spack/repos/builtin/packages/r-gosemsim/package.py index 9afc35eecb..c8861e4614 100644 --- a/var/spack/repos/builtin/packages/r-gosemsim/package.py +++ b/var/spack/repos/builtin/packages/r-gosemsim/package.py @@ -35,9 +35,9 @@ class RGosemsim(RPackage): Schlicker, Jiang, Lin and Wang respectively.""" homepage = "https://www.bioconductor.org/packages/GOSemSim/" - url = "https://git.bioconductor.org/packages/GOSemSim" + git = "https://git.bioconductor.org/packages/GOSemSim.git" - version('2.2.0', git='https://git.bioconductor.org/packages/GOSemSim', commit='247434790e6c8cf99e5643f569390362b8c87c52') + version('2.2.0', commit='247434790e6c8cf99e5643f569390362b8c87c52') depends_on('r@3.4.0:3.4.9', when='@2.2.0') depends_on('r-annotationdbi', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-gostats/package.py b/var/spack/repos/builtin/packages/r-gostats/package.py index 34388f93f1..b8ee160598 100644 --- a/var/spack/repos/builtin/packages/r-gostats/package.py +++ b/var/spack/repos/builtin/packages/r-gostats/package.py @@ -31,9 +31,9 @@ class RGostats(RPackage): testing and other simple calculations.""" homepage = "https://www.bioconductor.org/packages/GOstats/" - url = "https://git.bioconductor.org/packages/GOstats" + git = "https://git.bioconductor.org/packages/GOstats.git" - version('2.42.0', git='https://git.bioconductor.org/packages/GOstats', commit='8b29709064a3b66cf1d963b2be0c996fb48c873e') + version('2.42.0', commit='8b29709064a3b66cf1d963b2be0c996fb48c873e') depends_on('r@3.4.1:3.4.9', when='@2.42.0') depends_on('r-biobase', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-graph/package.py b/var/spack/repos/builtin/packages/r-graph/package.py index 3368467674..0dbd4c25b6 100644 --- a/var/spack/repos/builtin/packages/r-graph/package.py +++ b/var/spack/repos/builtin/packages/r-graph/package.py @@ -29,9 +29,9 @@ class RGraph(RPackage): """A package that implements some simple graph handling capabilities.""" homepage = "https://www.bioconductor.org/packages/graph/" - url = "https://git.bioconductor.org/packages/graph" + git = "https://git.bioconductor.org/packages/graph.git" - version('1.54.0', git='https://git.bioconductor.org/packages/graph', commit='2a8b08520096241620421078fc1098f4569c7301') + version('1.54.0', commit='2a8b08520096241620421078fc1098f4569c7301') depends_on('r@3.4.0:3.4.9', when='@1.54.0') depends_on('r-biocgenerics', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-gseabase/package.py b/var/spack/repos/builtin/packages/r-gseabase/package.py index a337d38e66..082d4ef382 100644 --- a/var/spack/repos/builtin/packages/r-gseabase/package.py +++ b/var/spack/repos/builtin/packages/r-gseabase/package.py @@ -30,9 +30,9 @@ class RGseabase(RPackage): Set Enrichment Analysis (GSEA).""" homepage = "https://www.bioconductor.org/packages/GSEABase/" - url = "https://git.bioconductor.org/packages/GSEABase" + git = "https://git.bioconductor.org/packages/GSEABase.git" - version('1.38.2', git='https://git.bioconductor.org/packages/GSEABase', commit='84c9f10c316163118ca990900a7a67555b96e75b') + version('1.38.2', commit='84c9f10c316163118ca990900a7a67555b96e75b') depends_on('r@3.4.0:3.4.9', when='@1.38.2') depends_on('r-biocgenerics', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-gtrellis/package.py b/var/spack/repos/builtin/packages/r-gtrellis/package.py index b4a1d90fae..9fdc67a21e 100644 --- a/var/spack/repos/builtin/packages/r-gtrellis/package.py +++ b/var/spack/repos/builtin/packages/r-gtrellis/package.py @@ -34,10 +34,9 @@ class RGtrellis(RPackage): graphics in the plot.""" homepage = "https://bioconductor.org/packages/gtrellis/" - url = "https://git.bioconductor.org/packages/gtrellis" - list_url = homepage + git = "https://git.bioconductor.org/packages/gtrellis.git" - version('1.8.0', git='https://git.bioconductor.org/packages/gtrellis', commit='f813b420a008c459f63a2a13e5e64c5507c4c472') + version('1.8.0', commit='f813b420a008c459f63a2a13e5e64c5507c4c472') depends_on('r-iranges', type=('build', 'run')) depends_on('r-genomicranges', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-gviz/package.py b/var/spack/repos/builtin/packages/r-gviz/package.py index 4498f0fcf5..2ec7adc275 100644 --- a/var/spack/repos/builtin/packages/r-gviz/package.py +++ b/var/spack/repos/builtin/packages/r-gviz/package.py @@ -35,9 +35,9 @@ class RGviz(RPackage): together with your data.""" homepage = "http://bioconductor.org/packages/Gviz/" - url = "https://git.bioconductor.org/packages/Gviz" + git = "https://git.bioconductor.org/packages/Gviz.git" - version('1.20.0', git='https://git.bioconductor.org/packages/Gviz', commit='299b8255e1b03932cebe287c3690d58c88f5ba5c') + version('1.20.0', commit='299b8255e1b03932cebe287c3690d58c88f5ba5c') depends_on('r@3.4.0:3.4.9', when='@1.20.0') depends_on('r-s4vectors', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-hypergraph/package.py b/var/spack/repos/builtin/packages/r-hypergraph/package.py index 3e9c634c51..579c32f1cb 100644 --- a/var/spack/repos/builtin/packages/r-hypergraph/package.py +++ b/var/spack/repos/builtin/packages/r-hypergraph/package.py @@ -30,9 +30,9 @@ class RHypergraph(RPackage): representing and manipulating hypergraphs.""" homepage = "https://www.bioconductor.org/packages/hypergraph/" - url = "https://git.bioconductor.org/packages/hypergraph" + git = "https://git.bioconductor.org/packages/hypergraph.git" - version('1.48.0', git='https://git.bioconductor.org/packages/hypergraph', commit='a4c19ea0b5f15204f706a7bfdea5363706382820') + version('1.48.0', commit='a4c19ea0b5f15204f706a7bfdea5363706382820') depends_on('r@3.4.0:3.4.9', when='@1.48.0') depends_on('r-graph', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-illuminaio/package.py b/var/spack/repos/builtin/packages/r-illuminaio/package.py index 2653ffa8df..abcd2713d3 100644 --- a/var/spack/repos/builtin/packages/r-illuminaio/package.py +++ b/var/spack/repos/builtin/packages/r-illuminaio/package.py @@ -30,10 +30,9 @@ class RIlluminaio(RPackage): IDAT.""" homepage = "http://bioconductor.org/packages/illuminaio/" - url = "https://git.bioconductor.org/packages/illuminaio" - list_url = homepage + git = "https://git.bioconductor.org/packages/illuminaio.git" - version('0.18.0', git='https://git.bioconductor.org/packages/illuminaio', commit='e6b8ab1f8eacb760aebdb4828e9cfbf07da06eda') + version('0.18.0', commit='e6b8ab1f8eacb760aebdb4828e9cfbf07da06eda') depends_on('r-base64', type=('build', 'run')) depends_on('r@3.4.0:3.4.9', when='@0.18.0') diff --git a/var/spack/repos/builtin/packages/r-impute/package.py b/var/spack/repos/builtin/packages/r-impute/package.py index 7fa3459467..233ce1b3f7 100644 --- a/var/spack/repos/builtin/packages/r-impute/package.py +++ b/var/spack/repos/builtin/packages/r-impute/package.py @@ -29,8 +29,8 @@ class RImpute(RPackage): """Imputation for microarray data (currently KNN only).""" homepage = "https://www.bioconductor.org/packages/impute/" - url = "https://git.bioconductor.org/packages/impute" + git = "https://git.bioconductor.org/packages/impute.git" - version('1.50.1', git='https://git.bioconductor.org/packages/impute', commit='31d1cc141797afdc83743e1d95aab8a90ee19b71') + version('1.50.1', commit='31d1cc141797afdc83743e1d95aab8a90ee19b71') depends_on('r@3.4.0:3.4.9', when='@1.50.1') diff --git a/var/spack/repos/builtin/packages/r-interactivedisplaybase/package.py b/var/spack/repos/builtin/packages/r-interactivedisplaybase/package.py index afe36cd49e..74aff4a11f 100644 --- a/var/spack/repos/builtin/packages/r-interactivedisplaybase/package.py +++ b/var/spack/repos/builtin/packages/r-interactivedisplaybase/package.py @@ -31,10 +31,9 @@ class RInteractivedisplaybase(RPackage): Bioconductor objects.""" homepage = "https://bioconductor.org/packages/interactiveDisplayBase/" - url = "https://git.bioconductor.org/packages/interactiveDisplayBase" - list_url = homepage + git = "https://git.bioconductor.org/packages/interactiveDisplayBase.git" - version('1.14.0', git='https://git.bioconductor.org/packages/interactiveDisplayBase', commit='e2ccc7eefdd904e3b1032dc6b3f4a28d08c1cd40') + version('1.14.0', commit='e2ccc7eefdd904e3b1032dc6b3f4a28d08c1cd40') depends_on('r-biocgenerics', type=('build', 'run')) depends_on('r-shiny', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-iranges/package.py b/var/spack/repos/builtin/packages/r-iranges/package.py index d4375d7f8b..caed7081fd 100644 --- a/var/spack/repos/builtin/packages/r-iranges/package.py +++ b/var/spack/repos/builtin/packages/r-iranges/package.py @@ -38,11 +38,10 @@ class RIranges(RPackage): i.e., collections of atomic vectors and DataFrames.""" homepage = "https://www.bioconductor.org/packages/IRanges/" - url = "https://git.bioconductor.org/packages/IRanges" - list_url = homepage + git = "https://git.bioconductor.org/packages/IRanges.git" - version('2.12.0', git='https://git.bioconductor.org/packages/IRanges', commit='1b1748655a8529ba87ad0f223f035ef0c08e7fcd') - version('2.10.5', git='https://git.bioconductor.org/packages/IRanges', commit='b00d1d5025e3c480d17c13100f0da5a0132b1614') + version('2.12.0', commit='1b1748655a8529ba87ad0f223f035ef0c08e7fcd') + version('2.10.5', commit='b00d1d5025e3c480d17c13100f0da5a0132b1614') depends_on('r-biocgenerics@0.21.1:', type=('build', 'run'), when='@2.10.5') depends_on('r-biocgenerics@0.23.3:', type=('build', 'run'), when='@2.12.0') diff --git a/var/spack/repos/builtin/packages/r-irkernel/package.py b/var/spack/repos/builtin/packages/r-irkernel/package.py index 5c4707165c..cfda326326 100644 --- a/var/spack/repos/builtin/packages/r-irkernel/package.py +++ b/var/spack/repos/builtin/packages/r-irkernel/package.py @@ -30,10 +30,9 @@ class RIrkernel(RPackage): """R kernel for Jupyter""" homepage = "https://irkernel.github.io/" + git = "https://github.com/IRkernel/IRkernel.git" - # Git repository - version('master', git='https://github.com/IRkernel/IRkernel.git', - tag='0.7') + version('master', tag='0.7') depends_on('r-repr', type=('build', 'run')) depends_on('r-irdisplay', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-jaspar2018/package.py b/var/spack/repos/builtin/packages/r-jaspar2018/package.py index 1e9e92afb8..a82aa89e8a 100644 --- a/var/spack/repos/builtin/packages/r-jaspar2018/package.py +++ b/var/spack/repos/builtin/packages/r-jaspar2018/package.py @@ -30,8 +30,8 @@ class RJaspar2018(RPackage): please use the package TFBSTools (>= 1.15.6).""" homepage = "http://jaspar.genereg.net/" - url = "https://git.bioconductor.org/packages/JASPAR2018" + git = "https://git.bioconductor.org/packages/JASPAR2018.git" - version('1.0.0', git='https://git.bioconductor.org/packages/JASPAR2018', commit='4c84092b3737bb1c57ab56f4321f2f5e4b0efeaa') + version('1.0.0', commit='4c84092b3737bb1c57ab56f4321f2f5e4b0efeaa') depends_on('r@3.4.0:') diff --git a/var/spack/repos/builtin/packages/r-kegggraph/package.py b/var/spack/repos/builtin/packages/r-kegggraph/package.py index ba883e7e3c..579ce11f52 100644 --- a/var/spack/repos/builtin/packages/r-kegggraph/package.py +++ b/var/spack/repos/builtin/packages/r-kegggraph/package.py @@ -34,9 +34,9 @@ class RKegggraph(RPackage): etc.""" homepage = "https://www.bioconductor.org/packages/KEGGgraph/" - url = "https://git.bioconductor.org/packages/KEGGgraph" + git = "https://git.bioconductor.org/packages/KEGGgraph.git" - version('1.38.1', git='https://git.bioconductor.org/packages/KEGGgraph', commit='dd31665beb36d5aad8ed09ed56c603633b6b2292') + version('1.38.1', commit='dd31665beb36d5aad8ed09ed56c603633b6b2292') depends_on('r-graph', type=('build', 'run')) depends_on('r-xml', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-keggrest/package.py b/var/spack/repos/builtin/packages/r-keggrest/package.py index 8f3c311265..573ca54a64 100644 --- a/var/spack/repos/builtin/packages/r-keggrest/package.py +++ b/var/spack/repos/builtin/packages/r-keggrest/package.py @@ -34,11 +34,10 @@ class RKeggrest(RPackage): catalogue) are provided.""" homepage = "http://bioconductor.org/packages/KEGGREST" - url = "https://git.bioconductor.org/packages/KEGGREST" - list_url = homepage + git = "https://git.bioconductor.org/packages/KEGGREST.git" - version('1.18.1', git='https://git.bioconductor.org/packages/KEGGREST', commit='f6e6f1987e4db9d977a75609fab0cb710be2e2e4') - version('1.2.0', git='https://git.bioconductor.org/packages/KEGGREST', commit='ed48de0def57a909894e237fa4731c4a052d8849') + version('1.18.1', commit='f6e6f1987e4db9d977a75609fab0cb710be2e2e4') + version('1.2.0', commit='ed48de0def57a909894e237fa4731c4a052d8849') depends_on('r-httr', type=('build', 'run')) depends_on('r-png', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-limma/package.py b/var/spack/repos/builtin/packages/r-limma/package.py index 78d513b80c..f9fc1de8b0 100644 --- a/var/spack/repos/builtin/packages/r-limma/package.py +++ b/var/spack/repos/builtin/packages/r-limma/package.py @@ -30,11 +30,9 @@ class RLimma(RPackage): for microarray data.""" homepage = "https://www.bioconductor.org/packages/limma/" - url = "https://git.bioconductor.org/packages/limma" - list_url = homepage + git = "https://git.bioconductor.org/packages/limma.git" - version('3.34.9', git='https://git.bioconductor.org/packages/limma', commit='6755278a929f942a49e2441fb002a3ed393e1139') - version('3.32.10', git='https://git.bioconductor.org/packages/limma', commit='593edf28e21fe054d64137ae271b8a52ab05bc60') - version('3.32.6', 'df5dc2b85189a24e939efa3a8e6abc41') + version('3.34.9', commit='6755278a929f942a49e2441fb002a3ed393e1139') + version('3.32.10', commit='593edf28e21fe054d64137ae271b8a52ab05bc60') depends_on('r@3.4.0:3.4.9', when='@3.32.10:') diff --git a/var/spack/repos/builtin/packages/r-makecdfenv/package.py b/var/spack/repos/builtin/packages/r-makecdfenv/package.py index 749801b0d8..e78c88d9ee 100644 --- a/var/spack/repos/builtin/packages/r-makecdfenv/package.py +++ b/var/spack/repos/builtin/packages/r-makecdfenv/package.py @@ -33,9 +33,9 @@ class RMakecdfenv(RPackage): that environment.""" homepage = "https://www.bioconductor.org/packages/makecdfenv/" - url = "https://git.bioconductor.org/packages/makecdfenv" + git = "https://git.bioconductor.org/packages/makecdfenv.git" - version('1.52.0', git='https://git.bioconductor.org/packages/makecdfenv', commit='b88a3e93e3b7feeeca69eda7c1fc5a0826c81120') + version('1.52.0', commit='b88a3e93e3b7feeeca69eda7c1fc5a0826c81120') depends_on('r@3.4.0:3.4.9', when='@1.52.0') depends_on('r-affyio', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-mergemaid/package.py b/var/spack/repos/builtin/packages/r-mergemaid/package.py index bfec39da95..8a4dd4dcbf 100644 --- a/var/spack/repos/builtin/packages/r-mergemaid/package.py +++ b/var/spack/repos/builtin/packages/r-mergemaid/package.py @@ -38,9 +38,9 @@ class RMergemaid(RPackage): cross-validate associations of gene expression data with survival.""" homepage = "https://www.bioconductor.org/packages/MergeMaid/" - url = "https://git.bioconductor.org/packages/MergeMaid" + git = "https://git.bioconductor.org/packages/MergeMaid.git" - version('2.48.0', git='https://git.bioconductor.org/packages/MergeMaid', commit='aee89c523fcafff4c166ff3db4fff90df16a1ed4') + version('2.48.0', commit='aee89c523fcafff4c166ff3db4fff90df16a1ed4') depends_on('r-survival', type=('build', 'run')) depends_on('r-biobase', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-minfi/package.py b/var/spack/repos/builtin/packages/r-minfi/package.py index d659b95500..bb5d305752 100644 --- a/var/spack/repos/builtin/packages/r-minfi/package.py +++ b/var/spack/repos/builtin/packages/r-minfi/package.py @@ -29,10 +29,9 @@ class RMinfi(RPackage): """Tools to analyze & visualize Illumina Infinium methylation arrays.""" homepage = "https://bioconductor.org/packages/minfi/" - url = "https://git.bioconductor.org/packages/minfi" - list_url = homepage + git = "https://git.bioconductor.org/packages/minfi.git" - version('1.22.1', git='https://git.bioconductor.org/packages/minfi', commit='b2faf84bcbb291e32d470a0e029450093527545b') + version('1.22.1', commit='b2faf84bcbb291e32d470a0e029450093527545b') depends_on('r-biocgenerics', type=('build', 'run')) depends_on('r-genomicranges', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-mlinterfaces/package.py b/var/spack/repos/builtin/packages/r-mlinterfaces/package.py index c1d2c5cbcd..709a3754b7 100644 --- a/var/spack/repos/builtin/packages/r-mlinterfaces/package.py +++ b/var/spack/repos/builtin/packages/r-mlinterfaces/package.py @@ -30,9 +30,9 @@ class RMlinterfaces(RPackage): code for data in R and Bioconductor containers.""" homepage = "https://www.bioconductor.org/packages/MLInterfaces/" - url = "https://git.bioconductor.org/packages/MLInterfaces" + git = "https://git.bioconductor.org/packages/MLInterfaces.git" - version('1.56.0', git='https://git.bioconductor.org/packages/MLInterfaces', commit='31fe6fb20d859fcb01d5552f42bca6bab16cc67f') + version('1.56.0', commit='31fe6fb20d859fcb01d5552f42bca6bab16cc67f') depends_on('r@3.4.0:3.4.9', when='@1.56.0') depends_on('r-biocgenerics', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-msnbase/package.py b/var/spack/repos/builtin/packages/r-msnbase/package.py index 7f20505f7b..d59737a8a9 100644 --- a/var/spack/repos/builtin/packages/r-msnbase/package.py +++ b/var/spack/repos/builtin/packages/r-msnbase/package.py @@ -30,9 +30,9 @@ class RMsnbase(RPackage): proteomics data.""" homepage = "https://www.bioconductor.org/packages/MSnbase/" - url = "https://git.bioconductor.org/packages/MSnbase" + git = "https://git.bioconductor.org/packages/MSnbase.git" - version('2.2.0', git='https://git.bioconductor.org/packages/MSnbase', commit='d6e8fb7f106d05096fa9074da0f829ac8f02c197') + version('2.2.0', commit='d6e8fb7f106d05096fa9074da0f829ac8f02c197') depends_on('r-biocgenerics', type=('build', 'run')) depends_on('r-biobase', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-multtest/package.py b/var/spack/repos/builtin/packages/r-multtest/package.py index aa6676bffd..89739c78b7 100644 --- a/var/spack/repos/builtin/packages/r-multtest/package.py +++ b/var/spack/repos/builtin/packages/r-multtest/package.py @@ -29,9 +29,9 @@ class RMulttest(RPackage): """Resampling-based multiple hypothesis testing""" homepage = "https://www.bioconductor.org/packages/multtest/" - url = "https://git.bioconductor.org/packages/multtest" + git = "https://git.bioconductor.org/packages/multtest.git" - version('2.32.0', git='https://git.bioconductor.org/packages/multtest', commit='c5e890dfbffcc3a3f107303a24b6085614312f4a') + version('2.32.0', commit='c5e890dfbffcc3a3f107303a24b6085614312f4a') depends_on('r@3.4.0:3.4.9', when='@2.32.0') depends_on('r-biocgenerics', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-mzid/package.py b/var/spack/repos/builtin/packages/r-mzid/package.py index 3a866ff705..9abc4465c9 100644 --- a/var/spack/repos/builtin/packages/r-mzid/package.py +++ b/var/spack/repos/builtin/packages/r-mzid/package.py @@ -33,9 +33,9 @@ class RMzid(RPackage): supply an mzIdentML file so the problems can be fixed quickly.""" homepage = "https://www.bioconductor.org/packages/mzID/" - url = "https://git.bioconductor.org/packages/mzID" + git = "https://git.bioconductor.org/packages/mzID.git" - version('1.14.0', git='https://git.bioconductor.org/packages/mzID', commit='1c53aa6523ae61d3ebb13381381fc119d6cc6115') + version('1.14.0', commit='1c53aa6523ae61d3ebb13381381fc119d6cc6115') depends_on('r-xml', type=('build', 'run')) depends_on('r-plyr', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-mzr/package.py b/var/spack/repos/builtin/packages/r-mzr/package.py index c429c9c97a..18c65bb1e3 100644 --- a/var/spack/repos/builtin/packages/r-mzr/package.py +++ b/var/spack/repos/builtin/packages/r-mzr/package.py @@ -34,9 +34,9 @@ class RMzr(RPackage): reading code has previously been used in XCMS.""" homepage = "https://www.bioconductor.org/packages/mzR/" - url = "https://git.bioconductor.org/packages/mzR" + git = "https://git.bioconductor.org/packages/mzR.git" - version('2.10.0', git='https://git.bioconductor.org/packages/mzR', commit='a6168b68e48c281e88de9647254a8db1e21df388') + version('2.10.0', commit='a6168b68e48c281e88de9647254a8db1e21df388') depends_on('r-biobase', type=('build', 'run')) depends_on('r-biocgenerics', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-oligoclasses/package.py b/var/spack/repos/builtin/packages/r-oligoclasses/package.py index 694277b30d..aee2afeb96 100644 --- a/var/spack/repos/builtin/packages/r-oligoclasses/package.py +++ b/var/spack/repos/builtin/packages/r-oligoclasses/package.py @@ -31,9 +31,9 @@ class ROligoclasses(RPackage): crlmm packages.""" homepage = "https://www.bioconductor.org/packages/oligoClasses/" - url = "https://git.bioconductor.org/packages/oligoClasses" + git = "https://git.bioconductor.org/packages/oligoClasses.git" - version('1.38.0', git='https://git.bioconductor.org/packages/oligoClasses', commit='fe2bb7f02c7ed3cbd338254c27ceba6ff829a962') + version('1.38.0', commit='fe2bb7f02c7ed3cbd338254c27ceba6ff829a962') depends_on('r@3.4.0:3.4.9', when='@1.38.0') depends_on('r-biocgenerics', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-organismdbi/package.py b/var/spack/repos/builtin/packages/r-organismdbi/package.py index 7b6672122a..35a83281b2 100644 --- a/var/spack/repos/builtin/packages/r-organismdbi/package.py +++ b/var/spack/repos/builtin/packages/r-organismdbi/package.py @@ -31,10 +31,9 @@ class ROrganismdbi(RPackage): fact that each of these packages implements a select methods.""" homepage = "https://bioconductor.org/packages/OrganismDbi/" - url = "https://git.bioconductor.org/packages/OrganismDbi" - list_url = homepage + git = "https://git.bioconductor.org/packages/OrganismDbi.git" - version('1.18.1', git='https://git.bioconductor.org/packages/OrganismDbi', commit='ba2d1237256805e935d9534a0c6f1ded07b42e95') + version('1.18.1', commit='ba2d1237256805e935d9534a0c6f1ded07b42e95') depends_on('r-biocgenerics', type=('build', 'run')) depends_on('r-annotationdbi', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-pathview/package.py b/var/spack/repos/builtin/packages/r-pathview/package.py index df01a762bb..d8539ccf7e 100644 --- a/var/spack/repos/builtin/packages/r-pathview/package.py +++ b/var/spack/repos/builtin/packages/r-pathview/package.py @@ -36,9 +36,9 @@ class RPathview(RPackage): tools for large-scale and fully automated analysis.""" homepage = "https://www.bioconductor.org/packages/pathview/" - url = "https://git.bioconductor.org/packages/pathview" + git = "https://git.bioconductor.org/packages/pathview.git" - version('1.16.7', git='https://git.bioconductor.org/packages/pathview', commit='fc560ed15ef7393a73d35e714716cc24dc835339') + version('1.16.7', commit='fc560ed15ef7393a73d35e714716cc24dc835339') depends_on('r-keggrest', type=('build', 'run')) depends_on('r-png', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-pcamethods/package.py b/var/spack/repos/builtin/packages/r-pcamethods/package.py index 46fb07ba13..7578de6421 100644 --- a/var/spack/repos/builtin/packages/r-pcamethods/package.py +++ b/var/spack/repos/builtin/packages/r-pcamethods/package.py @@ -37,9 +37,9 @@ class RPcamethods(RPackage): Physiology, Golm, Germany.""" homepage = "http://bioconductor.org/packages/pcaMethods/" - url = "https://git.bioconductor.org/packages/pcaMethods" - list_url = homepage - version('1.68.0', git='https://git.bioconductor.org/packages/pcaMethods', commit='c8d7c93dcaf7ef728f3d089ae5d55771b320bdab') + git = "https://git.bioconductor.org/packages/pcaMethods.git" + + version('1.68.0', commit='c8d7c93dcaf7ef728f3d089ae5d55771b320bdab') depends_on('r-biobase', type=('build', 'run')) depends_on('r-biocgenerics', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-phyloseq/package.py b/var/spack/repos/builtin/packages/r-phyloseq/package.py index ee6be01977..b71670dc87 100644 --- a/var/spack/repos/builtin/packages/r-phyloseq/package.py +++ b/var/spack/repos/builtin/packages/r-phyloseq/package.py @@ -30,9 +30,9 @@ class RPhyloseq(RPackage): storage, analysis, and graphical display of microbiome census data.""" homepage = "https://www.bioconductor.org/packages/phyloseq/" - url = "https://git.bioconductor.org/packages/phyloseq" + git = "https://git.bioconductor.org/packages/phyloseq.git" - version('1.20.0', git='https://git.bioconductor.org/packages/phyloseq', commit='107d1d5e3437a6e33982c06a548d3cc91df2a7e0') + version('1.20.0', commit='107d1d5e3437a6e33982c06a548d3cc91df2a7e0') depends_on('r@3.4.0:3.4.9', when='@1.20.0') depends_on('r-biocgenerics', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-preprocesscore/package.py b/var/spack/repos/builtin/packages/r-preprocesscore/package.py index b053574b48..3200115cc6 100644 --- a/var/spack/repos/builtin/packages/r-preprocesscore/package.py +++ b/var/spack/repos/builtin/packages/r-preprocesscore/package.py @@ -29,9 +29,8 @@ class RPreprocesscore(RPackage): """A library of core preprocessing routines""" homepage = "https://bioconductor.org/packages/preprocessCore/" - url = "https://git.bioconductor.org/packages/preprocessCore" - list_url = homepage + git = "https://git.bioconductor.org/packages/preprocessCore.git" - version('1.38.1', git='https://git.bioconductor.org/packages/preprocessCore', commit='c58cb4c720eda0f1c733b989b14912093a7c5fbc') + version('1.38.1', commit='c58cb4c720eda0f1c733b989b14912093a7c5fbc') depends_on('r@3.4.0:3.4.9', when='@1.38.1') diff --git a/var/spack/repos/builtin/packages/r-protgenerics/package.py b/var/spack/repos/builtin/packages/r-protgenerics/package.py index 4fbd0c4f63..c6f0c92322 100644 --- a/var/spack/repos/builtin/packages/r-protgenerics/package.py +++ b/var/spack/repos/builtin/packages/r-protgenerics/package.py @@ -29,9 +29,8 @@ class RProtgenerics(RPackage): """S4 generic functions needed by Bioconductor proteomics packages.""" homepage = "https://bioconductor.org/packages/ProtGenerics/" - url = "https://git.bioconductor.org/packages/ProtGenerics" - list_url = homepage + git = "https://git.bioconductor.org/packages/ProtGenerics.git" - version('1.8.0', git='https://git.bioconductor.org/packages/ProtGenerics', commit='b2b3bb0938e20f58fca905f6870de7dbc9dfd7a3') + version('1.8.0', commit='b2b3bb0938e20f58fca905f6870de7dbc9dfd7a3') depends_on('r@3.4.0:3.4.9', when='@1.8.0') diff --git a/var/spack/repos/builtin/packages/r-quantro/package.py b/var/spack/repos/builtin/packages/r-quantro/package.py index 23b52f25f4..d8cbf0e8b2 100644 --- a/var/spack/repos/builtin/packages/r-quantro/package.py +++ b/var/spack/repos/builtin/packages/r-quantro/package.py @@ -34,10 +34,9 @@ class RQuantro(RPackage): user-defined groups.""" homepage = "https://www.bioconductor.org/packages/quantro/" - url = "https://git.bioconductor.org/packages/quantro" - list_url = homepage + git = "https://git.bioconductor.org/packages/quantro.git" - version('1.10.0', git='https://git.bioconductor.org/packages/quantro', commit='111337c0aba052aa49c3d2e2d3042794b28858c9') + version('1.10.0', commit='111337c0aba052aa49c3d2e2d3042794b28858c9') depends_on('r-biobase', type=('build', 'run')) depends_on('r-minfi', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-qvalue/package.py b/var/spack/repos/builtin/packages/r-qvalue/package.py index d7e16d0634..e7a1b86400 100644 --- a/var/spack/repos/builtin/packages/r-qvalue/package.py +++ b/var/spack/repos/builtin/packages/r-qvalue/package.py @@ -41,9 +41,9 @@ class RQvalue(RPackage): and data mining.""" homepage = "https://www.bioconductor.org/packages/qvalue/" - url = "https://git.bioconductor.org/packages/qvalue" + git = "https://git.bioconductor.org/packages/qvalue.git" - version('2.8.0', git='https://git.bioconductor.org/packages/qvalue', commit='c7bf3315619d42d800f57a36670c25a7495ded72') + version('2.8.0', commit='c7bf3315619d42d800f57a36670c25a7495ded72') depends_on('r@3.4.0:3.4.9', when='@2.8.0') depends_on('r-ggplot2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-rbgl/package.py b/var/spack/repos/builtin/packages/r-rbgl/package.py index 235cc7b49b..c6c48d6973 100644 --- a/var/spack/repos/builtin/packages/r-rbgl/package.py +++ b/var/spack/repos/builtin/packages/r-rbgl/package.py @@ -30,9 +30,9 @@ class RRbgl(RPackage): algorithms contained in the BOOST library.""" homepage = "https://www.bioconductor.org/packages/RBGL/" - url = "https://git.bioconductor.org/packages/RBGL" + git = "https://git.bioconductor.org/packages/RBGL.git" - version('1.52.0', git='https://git.bioconductor.org/packages/RBGL', commit='93e8fcfafec8f1cd5638fe30dc0f9506d15b49c0') + version('1.52.0', commit='93e8fcfafec8f1cd5638fe30dc0f9506d15b49c0') depends_on('r@3.4.0:3.4.9', when='@1.52.0') depends_on('r-graph', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-reportingtools/package.py b/var/spack/repos/builtin/packages/r-reportingtools/package.py index 6a0835a129..e5b7962e5b 100644 --- a/var/spack/repos/builtin/packages/r-reportingtools/package.py +++ b/var/spack/repos/builtin/packages/r-reportingtools/package.py @@ -40,9 +40,9 @@ class RReportingtools(RPackage): site: http:// research-pub.gene.com/ReportingTools.""" homepage = "https://bioconductor.org/packages/ReportingTools/" - url = "https://git.bioconductor.org/packages/ReportingTools" + git = "https://git.bioconductor.org/packages/ReportingTools.git" - version('2.16.0', git='https://git.bioconductor.org/packages/ReportingTools', commit='b1aa0ea302da7f2993ce8087b1d09c11ddf03663') + version('2.16.0', commit='b1aa0ea302da7f2993ce8087b1d09c11ddf03663') depends_on('r@3.4.0:3.4.9', when='@2.16.0') depends_on('r-knitr', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-rgraphviz/package.py b/var/spack/repos/builtin/packages/r-rgraphviz/package.py index be4f12d535..1e9dd09edb 100644 --- a/var/spack/repos/builtin/packages/r-rgraphviz/package.py +++ b/var/spack/repos/builtin/packages/r-rgraphviz/package.py @@ -30,9 +30,9 @@ class RRgraphviz(RPackage): R graph objects from the graph package.""" homepage = "http://bioconductor.org/packages/Rgraphviz/" - url = "https://git.bioconductor.org/packages/Rgraphviz" + git = "https://git.bioconductor.org/packages/Rgraphviz.git" - version('2.20.0', git='https://git.bioconductor.org/packages/Rgraphviz', commit='eface6298150667bb22eac672f1a45e52fbf8c90') + version('2.20.0', commit='eface6298150667bb22eac672f1a45e52fbf8c90') depends_on('r@3.4.0:3.4.9', when='@2.20.0') depends_on('r-graph', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-rhdf5/package.py b/var/spack/repos/builtin/packages/r-rhdf5/package.py index 24e9e7b81f..1fac7872d8 100644 --- a/var/spack/repos/builtin/packages/r-rhdf5/package.py +++ b/var/spack/repos/builtin/packages/r-rhdf5/package.py @@ -35,9 +35,9 @@ class RRhdf5(RPackage): applications work on datasets that are larger than the available RAM.""" homepage = "https://www.bioconductor.org/packages/rhdf5/" - url = "https://git.bioconductor.org/packages/rhdf5" + git = "https://git.bioconductor.org/packages/rhdf5.git" - version('2.20.0', git='https://git.bioconductor.org/packages/rhdf5', commit='37b5165325062728bbec9167f89f5f4b794f30bc') + version('2.20.0', commit='37b5165325062728bbec9167f89f5f4b794f30bc') depends_on('r@3.4.0:3.4.9', when='@2.20.0') depends_on('r-zlibbioc', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-rsamtools/package.py b/var/spack/repos/builtin/packages/r-rsamtools/package.py index 0491c77933..0789fd3580 100644 --- a/var/spack/repos/builtin/packages/r-rsamtools/package.py +++ b/var/spack/repos/builtin/packages/r-rsamtools/package.py @@ -32,10 +32,9 @@ class RRsamtools(RPackage): indexed tab-delimited (tabix) files.""" homepage = "https://bioconductor.org/packages/Rsamtools/" - url = "https://git.bioconductor.org/packages/Rsamtools" - list_url = homepage + git = "https://git.bioconductor.org/packages/Rsamtools.git" - version('1.28.0', git='https://git.bioconductor.org/packages/Rsamtools', commit='dfa5b6abef68175586f21add7927174786412472') + version('1.28.0', commit='dfa5b6abef68175586f21add7927174786412472') depends_on('r-genomeinfodb', type=('build', 'run')) depends_on('r-genomicranges', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-rtracklayer/package.py b/var/spack/repos/builtin/packages/r-rtracklayer/package.py index 171a49de82..3737eb5205 100644 --- a/var/spack/repos/builtin/packages/r-rtracklayer/package.py +++ b/var/spack/repos/builtin/packages/r-rtracklayer/package.py @@ -34,10 +34,9 @@ class RRtracklayer(RPackage): current viewport.""" homepage = "http://bioconductor.org/packages/rtracklayer/" - url = "https://git.bioconductor.org/packages/rtracklayer" - list_url = homepage + git = "https://git.bioconductor.org/packages/rtracklayer.git" - version('1.36.6', git='https://git.bioconductor.org/packages/rtracklayer', commit='8c0ac7230f94e0c5a981acbb178c8de70e968131') + version('1.36.6', commit='8c0ac7230f94e0c5a981acbb178c8de70e968131') depends_on('r-xml', type=('build', 'run')) depends_on('r-biocgenerics', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-s4vectors/package.py b/var/spack/repos/builtin/packages/r-s4vectors/package.py index d6b6293f99..d5d0e216ba 100644 --- a/var/spack/repos/builtin/packages/r-s4vectors/package.py +++ b/var/spack/repos/builtin/packages/r-s4vectors/package.py @@ -36,11 +36,10 @@ class RS4vectors(RPackage): package and in other Bioconductor infrastructure packages).""" homepage = "https://bioconductor.org/packages/S4Vectors/" - url = "https://git.bioconductor.org/packages/S4Vectors" - list_url = homepage + git = "https://git.bioconductor.org/packages/S4Vectors.git" - version('0.16.0', git='https://git.bioconductor.org/packages/S4Vectors', commit='00fec03fcbcb7cff37917fab0da28d91fdf9dc3d') - version('0.14.7', git='https://git.bioconductor.org/packages/S4Vectors', commit='40af17fe0b8e93b6a72fc787540d2961773b8e23') + version('0.16.0', commit='00fec03fcbcb7cff37917fab0da28d91fdf9dc3d') + version('0.14.7', commit='40af17fe0b8e93b6a72fc787540d2961773b8e23') depends_on('r-biocgenerics@0.21.1:', type=('build', 'run'), when='@0.14.7') depends_on('r-biocgenerics@0.23.3:', type=('build', 'run'), when='@0.16.0') diff --git a/var/spack/repos/builtin/packages/r-seqlogo/package.py b/var/spack/repos/builtin/packages/r-seqlogo/package.py index 07207b2b80..88d30f4e73 100644 --- a/var/spack/repos/builtin/packages/r-seqlogo/package.py +++ b/var/spack/repos/builtin/packages/r-seqlogo/package.py @@ -31,8 +31,8 @@ class RSeqlogo(RPackage): Stephens (1990).""" homepage = "https://bioconductor.org/packages/seqLogo/" - url = "https://git.bioconductor.org/packages/seqLogo" + git = "https://git.bioconductor.org/packages/seqLogo.git" - version('1.44.0', git='https://git.bioconductor.org/packages/seqLogo', commit='4cac14ff29f413d6de1a9944eb5d21bfe5045fac') + version('1.44.0', commit='4cac14ff29f413d6de1a9944eb5d21bfe5045fac') depends_on('r@3.4.3:3.4.9', when='@1.44.0') diff --git a/var/spack/repos/builtin/packages/r-shortread/package.py b/var/spack/repos/builtin/packages/r-shortread/package.py index b5a53d4c7c..db5dcc2877 100644 --- a/var/spack/repos/builtin/packages/r-shortread/package.py +++ b/var/spack/repos/builtin/packages/r-shortread/package.py @@ -34,9 +34,9 @@ class RShortread(RPackage): for early single-end, ungapped alignment formats.""" homepage = "https://www.bioconductor.org/packages/ShortRead/" - url = "https://git.bioconductor.org/packages/ShortRead" + git = "https://git.bioconductor.org/packages/ShortRead.git" - version('1.34.2', git='https://git.bioconductor.org/packages/ShortRead', commit='25daac63b301df66a8ef6e98cc2977522c6786cd') + version('1.34.2', commit='25daac63b301df66a8ef6e98cc2977522c6786cd') depends_on('r@3.4.0:3.4.9', when='@1.34.2') depends_on('r-latticeextra', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-siggenes/package.py b/var/spack/repos/builtin/packages/r-siggenes/package.py index b3f7786a18..8dec8aac97 100644 --- a/var/spack/repos/builtin/packages/r-siggenes/package.py +++ b/var/spack/repos/builtin/packages/r-siggenes/package.py @@ -32,10 +32,9 @@ class RSiggenes(RPackage): (EBAM).""" homepage = "http://bioconductor.org/packages/siggenes/" - url = "https://git.bioconductor.org/packages/siggenes" - list_url = homepage + git = "https://git.bioconductor.org/packages/siggenes.git" - version('1.50.0', git='https://git.bioconductor.org/packages/siggenes', commit='b1818f26e1449005ffd971df6bda8da0303080bc') + version('1.50.0', commit='b1818f26e1449005ffd971df6bda8da0303080bc') depends_on('r-biobase', type=('build', 'run')) depends_on('r-multtest', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-simpleaffy/package.py b/var/spack/repos/builtin/packages/r-simpleaffy/package.py index 627e8982c5..04e13e1913 100644 --- a/var/spack/repos/builtin/packages/r-simpleaffy/package.py +++ b/var/spack/repos/builtin/packages/r-simpleaffy/package.py @@ -33,10 +33,9 @@ class RSimpleaffy(RPackage): for generating high resolution journal figures...""" homepage = "http://bioconductor.org/packages/simpleaffy/" - url = "https://git.bioconductor.org/packages/simpleaffy" - list_url = homepage + git = "https://git.bioconductor.org/packages/simpleaffy.git" - version('2.52.0', git='https://git.bioconductor.org/packages/simpleaffy', commit='f2b43fb9b8e6fa4c03fe28b4efb3144a0a42a385') + version('2.52.0', commit='f2b43fb9b8e6fa4c03fe28b4efb3144a0a42a385') depends_on('r-biocgenerics', type=('build', 'run')) depends_on('r-biobase', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-snprelate/package.py b/var/spack/repos/builtin/packages/r-snprelate/package.py index ed97780f8a..5c5126b14e 100644 --- a/var/spack/repos/builtin/packages/r-snprelate/package.py +++ b/var/spack/repos/builtin/packages/r-snprelate/package.py @@ -44,9 +44,9 @@ class RSnprelate(RPackage): structural variation calls.""" homepage = "https://bioconductor.org/packages/SNPRelate" - url = "https://git.bioconductor.org/packages/SNPRelate" + git = "https://git.bioconductor.org/packages/SNPRelate.git" - version('1.12.2', git='https://git.bioconductor.org/packages/SNPRelate', commit='dce2e2b6f36483a9f905bb5df6ae834a9f1136fe') + version('1.12.2', commit='dce2e2b6f36483a9f905bb5df6ae834a9f1136fe') depends_on('r@3.4.0:3.4.9', when='@1.12.2') depends_on('r-gdsfmt@1.8.3:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-somaticsignatures/package.py b/var/spack/repos/builtin/packages/r-somaticsignatures/package.py index 7f3d2a9b58..cebb1f70e5 100644 --- a/var/spack/repos/builtin/packages/r-somaticsignatures/package.py +++ b/var/spack/repos/builtin/packages/r-somaticsignatures/package.py @@ -32,10 +32,9 @@ class RSomaticsignatures(RPackage): flexibility in the matrix decomposition algorithms.""" homepage = "https://bioconductor.org/packages/SomaticSignatures/" - url = "https://git.bioconductor.org/packages/SomaticSignatures" - list_url = homepage + git = "https://git.bioconductor.org/packages/SomaticSignatures.git" - version('2.12.1', git='https://git.bioconductor.org/packages/SomaticSignatures', commit='932298c6877d076004de5541cec85a14e819517a') + version('2.12.1', commit='932298c6877d076004de5541cec85a14e819517a') depends_on('r-variantannotation', type=('build', 'run')) depends_on('r-genomicranges', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-spem/package.py b/var/spack/repos/builtin/packages/r-spem/package.py index bcc7e4716e..b2c9761c95 100644 --- a/var/spack/repos/builtin/packages/r-spem/package.py +++ b/var/spack/repos/builtin/packages/r-spem/package.py @@ -30,10 +30,9 @@ class RSpem(RPackage): series data""" homepage = "https://bioconductor.org/packages/SPEM/" - url = "https://git.bioconductor.org/packages/SPEM" + git = "https://git.bioconductor.org/packages/SPEM.git" - version('1.18.0', git='https://git.bioconductor.org/packages/SPEM', - commit='3ab425dd9889885eac328d26b73366a875cd250b') + version('1.18.0', commit='3ab425dd9889885eac328d26b73366a875cd250b') depends_on('r-rsolnp', type=('build', 'run')) depends_on('r-biobase', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-summarizedexperiment/package.py b/var/spack/repos/builtin/packages/r-summarizedexperiment/package.py index f06523e96d..080765caeb 100644 --- a/var/spack/repos/builtin/packages/r-summarizedexperiment/package.py +++ b/var/spack/repos/builtin/packages/r-summarizedexperiment/package.py @@ -32,11 +32,10 @@ class RSummarizedexperiment(RPackage): represent samples.""" homepage = "https://bioconductor.org/packages/SummarizedExperiment/" - url = "https://git.bioconductor.org/packages/SummarizedExperiment" - list_url = homepage + git = "https://git.bioconductor.org/packages/SummarizedExperiment.git" - version('1.8.1', git='https://git.bioconductor.org/packages/SummarizedExperiment', commit='9d8a29aa9c78bbc7dcc6472537e13fc0d11dc1f7') - version('1.6.5', git='https://git.bioconductor.org/packages/SummarizedExperiment', commit='ec69cd5cfbccaef148a9f6abdfb3e22e888695d0') + version('1.8.1', commit='9d8a29aa9c78bbc7dcc6472537e13fc0d11dc1f7') + version('1.6.5', commit='ec69cd5cfbccaef148a9f6abdfb3e22e888695d0') depends_on('r-genomicranges@1.27.22:', type=('build', 'run'), when='@1.6.5') depends_on('r-genomicranges@1.29.14:', type=('build', 'run'), when='@1.8.1') diff --git a/var/spack/repos/builtin/packages/r-sva/package.py b/var/spack/repos/builtin/packages/r-sva/package.py index 01531d8a01..60f4add8a2 100644 --- a/var/spack/repos/builtin/packages/r-sva/package.py +++ b/var/spack/repos/builtin/packages/r-sva/package.py @@ -29,9 +29,9 @@ class RSva(RPackage): """Surrogate Variable Analysis.""" homepage = "https://www.bioconductor.org/packages/sva/" - url = "https://git.bioconductor.org/packages/sva" + git = "https://git.bioconductor.org/packages/sva.git" - version('3.24.4', git='https://git.bioconductor.org/packages/sva', commit='ed2ebb6e33374dc9ec50e6ea97cc1d9aef836c73') + version('3.24.4', commit='ed2ebb6e33374dc9ec50e6ea97cc1d9aef836c73') depends_on('r@3.4.0:3.4.9', when='@3.24.4') depends_on('r-mgcv', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-tfbstools/package.py b/var/spack/repos/builtin/packages/r-tfbstools/package.py index 655b7a4044..0f65c3baef 100644 --- a/var/spack/repos/builtin/packages/r-tfbstools/package.py +++ b/var/spack/repos/builtin/packages/r-tfbstools/package.py @@ -41,9 +41,9 @@ class RTfbstools(RPackage): of de novo motif discovery software.""" homepage = "http://bioconductor.org/packages/TFBSTools/" - url = "https://git.bioconductor.org/packages/TFBSTools" + git = "https://git.bioconductor.org/packages/TFBSTools.git" - version('1.16.0', git='https://git.bioconductor.org/packages/TFBSTools', commit='565436a5a674d4dea7279e796a20c5bd2034f65a') + version('1.16.0', commit='565436a5a674d4dea7279e796a20c5bd2034f65a') depends_on('r-biobase@2.28:', type=('build', 'run')) depends_on('r-biostrings@2.36.4:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-tmixclust/package.py b/var/spack/repos/builtin/packages/r-tmixclust/package.py index d36787c8b9..cef3ccd5f3 100644 --- a/var/spack/repos/builtin/packages/r-tmixclust/package.py +++ b/var/spack/repos/builtin/packages/r-tmixclust/package.py @@ -33,10 +33,9 @@ class RTmixclust(RPackage): series datasets.""" homepage = "https://bioconductor.org/packages/TMixClust/" - url = "https://git.bioconductor.org/packages/TMixClust" + git = "https://git.bioconductor.org/packages/TMixClust.git" - version('1.0.1', git='https://git.bioconductor.org/packages/TMixClust', - commit='0ac800210e3eb9da911767a80fb5582ab33c0cad') + version('1.0.1', commit='0ac800210e3eb9da911767a80fb5582ab33c0cad') depends_on('r-gss', type=('build', 'run')) depends_on('r-mvtnorm', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-topgo/package.py b/var/spack/repos/builtin/packages/r-topgo/package.py index bf901d7a3a..c03a557806 100644 --- a/var/spack/repos/builtin/packages/r-topgo/package.py +++ b/var/spack/repos/builtin/packages/r-topgo/package.py @@ -32,10 +32,10 @@ class RTopgo(RPackage): between GO terms can be implemented and applied.""" homepage = "https://www.bioconductor.org/packages/topGO/" - url = "https://git.bioconductor.org/packages/topGO" + git = "https://git.bioconductor.org/packages/topGO.git" - version('2.30.1', git='https://git.bioconductor.org/packages/topGO', commit='b1469ce1d198ccb73ef79ca22cab81659e16dbaa') - version('2.28.0', git='https://git.bioconductor.org/packages/topGO', commit='066a975d460046cce33fb27e74e6a0ebc33fd716') + version('2.30.1', commit='b1469ce1d198ccb73ef79ca22cab81659e16dbaa') + version('2.28.0', commit='066a975d460046cce33fb27e74e6a0ebc33fd716') depends_on('r@3.4.0:3.4.9') depends_on('r-dbi', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-variantannotation/package.py b/var/spack/repos/builtin/packages/r-variantannotation/package.py index 66b4ff014d..e4fd563f54 100644 --- a/var/spack/repos/builtin/packages/r-variantannotation/package.py +++ b/var/spack/repos/builtin/packages/r-variantannotation/package.py @@ -30,10 +30,9 @@ class RVariantannotation(RPackage): outcomes.""" homepage = "https://www.bioconductor.org/packages/VariantAnnotation/" - url = "https://git.bioconductor.org/packages/VariantAnnotation" - list_url = homepage + git = "https://git.bioconductor.org/packages/VariantAnnotation.git" - version('1.22.3', git='https://git.bioconductor.org/packages/VariantAnnotation', commit='3a91b6d4297aa416d5f056dec6f8925eb1a8eaee') + version('1.22.3', commit='3a91b6d4297aa416d5f056dec6f8925eb1a8eaee') depends_on('r-biocgenerics', type=('build', 'run')) depends_on('r-genomeinfodb', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-vsn/package.py b/var/spack/repos/builtin/packages/r-vsn/package.py index 20a761b1f9..b98a9db1bb 100644 --- a/var/spack/repos/builtin/packages/r-vsn/package.py +++ b/var/spack/repos/builtin/packages/r-vsn/package.py @@ -40,9 +40,9 @@ class RVsn(RPackage): differential transcription.""" homepage = "https://www.bioconductor.org/packages/vsn/" - url = "https://git.bioconductor.org/packages/vsn" + git = "https://git.bioconductor.org/packages/vsn.git" - version('3.44.0', git='https://git.bioconductor.org/packages/vsn', commit='e54513fcdd07ccfb8094359e93cef145450f0ee0') + version('3.44.0', commit='e54513fcdd07ccfb8094359e93cef145450f0ee0') depends_on('r-biobase', type=('build', 'run')) depends_on('r-affy', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-xde/package.py b/var/spack/repos/builtin/packages/r-xde/package.py index baac09e451..f48b174e25 100644 --- a/var/spack/repos/builtin/packages/r-xde/package.py +++ b/var/spack/repos/builtin/packages/r-xde/package.py @@ -30,9 +30,9 @@ class RXde(RPackage): expression.""" homepage = "https://www.bioconductor.org/packages/XDE/" - url = "https://git.bioconductor.org/packages/XDE" + git = "https://git.bioconductor.org/packages/XDE.git" - version('2.22.0', git='https://git.bioconductor.org/packages/XDE', commit='25bcec965ae42a410dd285a9db9be46d112d8e81') + version('2.22.0', commit='25bcec965ae42a410dd285a9db9be46d112d8e81') depends_on('r-biobase', type=('build', 'run')) depends_on('r-biocgenerics', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-xmapbridge/package.py b/var/spack/repos/builtin/packages/r-xmapbridge/package.py index d36f6d4922..c098824fb4 100644 --- a/var/spack/repos/builtin/packages/r-xmapbridge/package.py +++ b/var/spack/repos/builtin/packages/r-xmapbridge/package.py @@ -30,9 +30,8 @@ class RXmapbridge(RPackage): exports plotting files in a suitable format.""" homepage = "https://www.bioconductor.org/packages/xmapbridge/" - url = "https://git.bioconductor.org/packages/xmapbridge" - list_url = homepage + git = "https://git.bioconductor.org/packages/xmapbridge.git" - version('1.34.0', git='https://git.bioconductor.org/packages/xmapbridge', commit='f162e1f72ead5f5a1aede69032d5771a6572d965') + version('1.34.0', commit='f162e1f72ead5f5a1aede69032d5771a6572d965') depends_on('r@3.4.0:3.4.9', when='@1.34.0') diff --git a/var/spack/repos/builtin/packages/r-xvector/package.py b/var/spack/repos/builtin/packages/r-xvector/package.py index e30f302403..50b75182e1 100644 --- a/var/spack/repos/builtin/packages/r-xvector/package.py +++ b/var/spack/repos/builtin/packages/r-xvector/package.py @@ -30,10 +30,9 @@ class RXvector(RPackage): an R external pointer, or on disk).""" homepage = "https://bioconductor.org/packages/XVector/" - url = "https://git.bioconductor.org/packages/XVector" - list_url = homepage + git = "https://git.bioconductor.org/packages/XVector.git" - version('0.16.0', git='https://git.bioconductor.org/packages/XVector', commit='54615888e1a559da4a81de33e934fc0f1c3ad99f') + version('0.16.0', commit='54615888e1a559da4a81de33e934fc0f1c3ad99f') depends_on('r-biocgenerics', type=('build', 'run')) depends_on('r-s4vectors', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-yapsa/package.py b/var/spack/repos/builtin/packages/r-yapsa/package.py index ffe5067227..99df404e06 100644 --- a/var/spack/repos/builtin/packages/r-yapsa/package.py +++ b/var/spack/repos/builtin/packages/r-yapsa/package.py @@ -34,10 +34,9 @@ class RYapsa(RPackage): catalogue) are provided.""" homepage = "http://bioconductor.org/packages/YAPSA/" - url = "https://git.bioconductor.org/packages/YAPSA" - list_url = homepage + git = "https://git.bioconductor.org/packages/YAPSA.git" - version('1.2.0', git='https://git.bioconductor.org/packages/YAPSA', commit='320809b69e470e30a777a383f8341f93064ec24d') + version('1.2.0', commit='320809b69e470e30a777a383f8341f93064ec24d') depends_on('r-genomicranges', type=('build', 'run')) depends_on('r-ggplot2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-yaqcaffy/package.py b/var/spack/repos/builtin/packages/r-yaqcaffy/package.py index 5d34329f90..f645ef4d4c 100644 --- a/var/spack/repos/builtin/packages/r-yaqcaffy/package.py +++ b/var/spack/repos/builtin/packages/r-yaqcaffy/package.py @@ -31,10 +31,9 @@ class RYaqcaffy(RPackage): reference datasets.""" homepage = "http://bioconductor.org/packages/yaqcaffy/" - url = "https://git.bioconductor.org/packages/yaqcaffy" - list_url = homepage + git = "https://git.bioconductor.org/packages/yaqcaffy.git" - version('1.36.0', git='https://git.bioconductor.org/packages/yaqcaffy', commit='4d46fe77b2c8de2230a77b0c07dd5dd726e3abd6') + version('1.36.0', commit='4d46fe77b2c8de2230a77b0c07dd5dd726e3abd6') depends_on('r-simpleaffy', type=('build', 'run')) depends_on('r@3.4.0:3.4.9', when='@1.36.0') diff --git a/var/spack/repos/builtin/packages/r-yarn/package.py b/var/spack/repos/builtin/packages/r-yarn/package.py index 6744f9cde1..16208137de 100644 --- a/var/spack/repos/builtin/packages/r-yarn/package.py +++ b/var/spack/repos/builtin/packages/r-yarn/package.py @@ -34,10 +34,9 @@ class RYarn(RPackage): sparsity found in very large RNA-seq experiments.""" homepage = "https://bioconductor.org/packages/yarn/" - url = "https://git.bioconductor.org/packages/yarn" - list_url = homepage + git = "https://git.bioconductor.org/packages/yarn.git" - version('1.2.0', git='https://git.bioconductor.org/packages/yarn', commit='28af616ef8c27dcadf6568e276dea8465486a697') + version('1.2.0', commit='28af616ef8c27dcadf6568e276dea8465486a697') depends_on('r-biobase', type=('build', 'run')) depends_on('r-biomart', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-zlibbioc/package.py b/var/spack/repos/builtin/packages/r-zlibbioc/package.py index 408609875b..6ee69c0455 100644 --- a/var/spack/repos/builtin/packages/r-zlibbioc/package.py +++ b/var/spack/repos/builtin/packages/r-zlibbioc/package.py @@ -33,8 +33,8 @@ class RZlibbioc(RPackage): on use.""" homepage = "http://bioconductor.org/packages/release/bioc/html/Zlibbioc.html" - url = "https://git.bioconductor.org/packages/zlibbioc" - list_url = homepage + git = "https://git.bioconductor.org/packages/zlibbioc.git" + + version('1.22.0', commit='30377f830af2bc1ff17bbf3fdd2cb6442015fea5') - version('1.22.0', git='https://git.bioconductor.org/packages/zlibbioc', commit='30377f830af2bc1ff17bbf3fdd2cb6442015fea5') depends_on('r@3.4.0:3.4.9', when='@1.22.0') -- cgit v1.2.3-70-g09d2 From 3f18c048658cfaede38a9c66a8e7ccb8e0447b88 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Tue, 24 Jul 2018 20:52:35 -0500 Subject: Add top-level attributes for git R-Z packages --- var/spack/repos/builtin/packages/raft/package.py | 5 +++-- var/spack/repos/builtin/packages/raja/package.py | 18 ++++++++++-------- var/spack/repos/builtin/packages/rankstr/package.py | 7 ++++--- var/spack/repos/builtin/packages/readfq/package.py | 3 ++- var/spack/repos/builtin/packages/redset/package.py | 7 ++++--- var/spack/repos/builtin/packages/relion/package.py | 8 ++++---- var/spack/repos/builtin/packages/rmlab/package.py | 9 ++++----- var/spack/repos/builtin/packages/rose/package.py | 6 +++--- var/spack/repos/builtin/packages/rust/package.py | 5 +++-- var/spack/repos/builtin/packages/sabre/package.py | 4 ++-- var/spack/repos/builtin/packages/sambamba/package.py | 4 ++-- var/spack/repos/builtin/packages/satsuma2/package.py | 4 ++-- var/spack/repos/builtin/packages/savanna/package.py | 8 +++----- var/spack/repos/builtin/packages/saws/package.py | 6 ++++-- .../repos/builtin/packages/scorec-core/package.py | 4 ++-- var/spack/repos/builtin/packages/scr/package.py | 5 +++-- var/spack/repos/builtin/packages/shuffile/package.py | 7 ++++--- .../repos/builtin/packages/simulationio/package.py | 5 +++-- .../repos/builtin/packages/singularity/package.py | 3 ++- var/spack/repos/builtin/packages/slepc/package.py | 9 ++++----- var/spack/repos/builtin/packages/snap/package.py | 7 ++++--- var/spack/repos/builtin/packages/snbone/package.py | 4 ++-- var/spack/repos/builtin/packages/sortmerna/package.py | 4 ++-- var/spack/repos/builtin/packages/sosflow/package.py | 4 ++-- var/spack/repos/builtin/packages/sst-dumpi/package.py | 10 ++++------ var/spack/repos/builtin/packages/sst-macro/package.py | 11 ++++------- var/spack/repos/builtin/packages/stream/package.py | 3 ++- .../repos/builtin/packages/superlu-dist/package.py | 8 +++++--- var/spack/repos/builtin/packages/sw4lite/package.py | 4 ++-- var/spack/repos/builtin/packages/swfft/package.py | 8 ++++---- var/spack/repos/builtin/packages/symengine/package.py | 3 ++- var/spack/repos/builtin/packages/sz/package.py | 4 ++-- var/spack/repos/builtin/packages/tabix/package.py | 4 ++-- var/spack/repos/builtin/packages/tassel/package.py | 5 ++--- var/spack/repos/builtin/packages/tcoffee/package.py | 4 ++-- var/spack/repos/builtin/packages/tethex/package.py | 3 ++- var/spack/repos/builtin/packages/tioga/package.py | 5 ++--- var/spack/repos/builtin/packages/tmuxinator/package.py | 7 +++---- var/spack/repos/builtin/packages/trilinos/package.py | 10 ++++------ var/spack/repos/builtin/packages/tycho2/package.py | 4 ++-- var/spack/repos/builtin/packages/typhon/package.py | 5 ++--- var/spack/repos/builtin/packages/typhonio/package.py | 4 ++-- var/spack/repos/builtin/packages/umpire/package.py | 11 ++++++----- var/spack/repos/builtin/packages/valgrind/package.py | 6 +++--- var/spack/repos/builtin/packages/veclibfort/package.py | 3 ++- var/spack/repos/builtin/packages/veloc/package.py | 7 ++++--- var/spack/repos/builtin/packages/verrou/package.py | 6 ++---- var/spack/repos/builtin/packages/votca-csg/package.py | 3 ++- var/spack/repos/builtin/packages/votca-ctp/package.py | 5 ++--- .../repos/builtin/packages/votca-tools/package.py | 3 ++- var/spack/repos/builtin/packages/votca-xtp/package.py | 3 ++- var/spack/repos/builtin/packages/vpfft/package.py | 7 ++++--- var/spack/repos/builtin/packages/vpic/package.py | 4 ++-- var/spack/repos/builtin/packages/vtkh/package.py | 7 ++----- var/spack/repos/builtin/packages/vtkm/package.py | 6 ++---- var/spack/repos/builtin/packages/wgsim/package.py | 3 ++- var/spack/repos/builtin/packages/wt/package.py | 6 +++--- var/spack/repos/builtin/packages/wx/package.py | 5 +++-- .../repos/builtin/packages/xcb-util-xrm/package.py | 7 ++----- var/spack/repos/builtin/packages/xclip/package.py | 4 ++-- var/spack/repos/builtin/packages/xhmm/package.py | 5 ++--- .../repos/builtin/packages/xsdktrilinos/package.py | 5 +++-- var/spack/repos/builtin/packages/xsimd/package.py | 5 +++-- .../repos/builtin/packages/xtensor-python/package.py | 5 +++-- var/spack/repos/builtin/packages/xtensor/package.py | 5 +++-- var/spack/repos/builtin/packages/xtl/package.py | 5 +++-- var/spack/repos/builtin/packages/yajl/package.py | 3 ++- var/spack/repos/builtin/packages/yaml-cpp/package.py | 3 ++- var/spack/repos/builtin/packages/yasm/package.py | 4 +++- var/spack/repos/builtin/packages/yorick/package.py | 7 +++---- var/spack/repos/builtin/packages/zeromq/package.py | 7 ++++--- 71 files changed, 204 insertions(+), 194 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/raft/package.py b/var/spack/repos/builtin/packages/raft/package.py index 64313f127a..48d8cd12f6 100644 --- a/var/spack/repos/builtin/packages/raft/package.py +++ b/var/spack/repos/builtin/packages/raft/package.py @@ -31,10 +31,11 @@ class Raft(CMakePackage): Toolbox under development at Brazilian Synchrotron Light Source.""" homepage = "https://bitbucket.org/gill_martinez/raft_aps" - url = "https://bitbucket.org/gill_martinez/raft_aps/get/1.2.3.tar.gz" + url = "https://bitbucket.org/gill_martinez/raft_aps/get/1.2.3.tar.gz" + git = "https://bitbucket.org/gill_martinez/raft_aps.git" + version('develop', git=git) version('1.2.3', '4d1b106d9b3493e63dde96f7dd44b834') - version('develop', git='https://bitbucket.org/gill_martinez/raft_aps.git') depends_on('mpi') depends_on('cmake', type='build') diff --git a/var/spack/repos/builtin/packages/raja/package.py b/var/spack/repos/builtin/packages/raja/package.py index 29a48078d4..660d9d6547 100644 --- a/var/spack/repos/builtin/packages/raja/package.py +++ b/var/spack/repos/builtin/packages/raja/package.py @@ -27,16 +27,18 @@ from spack import * class Raja(CMakePackage): """RAJA Parallel Framework.""" + homepage = "http://software.llnl.gov/RAJA/" + git = "https://github.com/LLNL/RAJA.git" - version('master', git='https://github.com/LLNL/RAJA.git', branch='master', submodules='True') - version('develop', git='https://github.com/LLNL/RAJA.git', branch='develop', submodules='True') - version('0.5.3', git='https://github.com/LLNL/RAJA.git', tag='v0.5.3', submodules="True") - version('0.5.2', git='https://github.com/LLNL/RAJA.git', tag='v0.5.2', submodules="True") - version('0.5.1', git='https://github.com/LLNL/RAJA.git', tag='v0.5.1', submodules="True") - version('0.5.0', git='https://github.com/LLNL/RAJA.git', tag='v0.5.0', submodules="True") - version('0.4.1', git='https://github.com/LLNL/RAJA.git', tag='v0.4.1', submodules="True") - version('0.4.0', git='https://github.com/LLNL/RAJA.git', tag='v0.4.0', submodules="True") + version('develop', branch='develop', submodules='True') + version('master', branch='master', submodules='True') + version('0.5.3', tag='v0.5.3', submodules="True") + version('0.5.2', tag='v0.5.2', submodules="True") + version('0.5.1', tag='v0.5.1', submodules="True") + version('0.5.0', tag='v0.5.0', submodules="True") + version('0.4.1', tag='v0.4.1', submodules="True") + version('0.4.0', tag='v0.4.0', submodules="True") variant('cuda', default=False, description='Build with CUDA backend') variant('openmp', default=True, description='Build OpenMP backend') diff --git a/var/spack/repos/builtin/packages/rankstr/package.py b/var/spack/repos/builtin/packages/rankstr/package.py index 88963be60b..82df492092 100644 --- a/var/spack/repos/builtin/packages/rankstr/package.py +++ b/var/spack/repos/builtin/packages/rankstr/package.py @@ -30,11 +30,12 @@ class Rankstr(CMakePackage): homepage = "https://github.com/ECP-VeloC/rankstr" url = "https://github.com/ECP-VeloC/rankstr/archive/v0.0.1.zip" - tags = ['ecp'] + git = "https://github.com/ecp-veloc/rankstr.git" + tags = ['ecp'] + + version('master', branch='master') version('0.0.1', 'abe06fa6a78cfe20ec0c78717ac2f2ed') - version('master', git='https://github.com/ecp-veloc/rankstr.git', - branch='master') depends_on('mpi') diff --git a/var/spack/repos/builtin/packages/readfq/package.py b/var/spack/repos/builtin/packages/readfq/package.py index 0550f0cc40..6fad0215c1 100644 --- a/var/spack/repos/builtin/packages/readfq/package.py +++ b/var/spack/repos/builtin/packages/readfq/package.py @@ -31,8 +31,9 @@ class Readfq(Package): interface.""" homepage = "https://github.com/lh3/readfq" + git = "https://github.com/lh3/readfq.git" - version('2013.04.10', git='https://github.com/lh3/readfq.git', commit='4fb766095d8f459e0f8025be70f9173673905d12') + version('2013.04.10', commit='4fb766095d8f459e0f8025be70f9173673905d12') def install(self, spec, prefix): install_tree('.', prefix.bin) diff --git a/var/spack/repos/builtin/packages/redset/package.py b/var/spack/repos/builtin/packages/redset/package.py index 8f2ac8af04..2211da06e7 100644 --- a/var/spack/repos/builtin/packages/redset/package.py +++ b/var/spack/repos/builtin/packages/redset/package.py @@ -30,11 +30,12 @@ class Redset(CMakePackage): homepage = "https://github.com/ECP-VeloC/redset" url = "https://github.com/ECP-VeloC/redset/archive/v0.0.1.zip" - tags = ['ecp'] + git = "https://github.com/ecp-veloc/redset.git" + tags = ['ecp'] + + version('master', branch='master') version('0.0.2', '370d4dd477ebcfdd28dcc6375c22f731') - version('master', git='https://github.com/ecp-veloc/redset.git', - branch='master') depends_on('mpi') depends_on('rankstr') diff --git a/var/spack/repos/builtin/packages/relion/package.py b/var/spack/repos/builtin/packages/relion/package.py index abd8e82821..120ef6bd83 100644 --- a/var/spack/repos/builtin/packages/relion/package.py +++ b/var/spack/repos/builtin/packages/relion/package.py @@ -32,11 +32,11 @@ class Relion(CMakePackage, CudaPackage): electron cryo-microscopy (cryo-EM).""" homepage = "http://http://www2.mrc-lmb.cam.ac.uk/relion" - url = "https://github.com/3dem/relion" + git = "https://github.com/3dem/relion.git" - version('2.1', git='https://github.com/3dem/relion.git', tag='2.1') - version('2.0.3', git='https://github.com/3dem/relion.git', tag='2.0.3') - version('develop', git='https://github.com/3dem/relion.git') + version('develop') + version('2.1', tag='2.1') + version('2.0.3', tag='2.0.3') variant('gui', default=True, description="build the gui") variant('cuda', default=True, description="enable compute on gpu") diff --git a/var/spack/repos/builtin/packages/rmlab/package.py b/var/spack/repos/builtin/packages/rmlab/package.py index 7a3a643ddb..900ceb6b5e 100644 --- a/var/spack/repos/builtin/packages/rmlab/package.py +++ b/var/spack/repos/builtin/packages/rmlab/package.py @@ -26,15 +26,14 @@ from spack import * class Rmlab(CMakePackage): - """C++ File API for the reMarkable tablet - """ + """C++ File API for the reMarkable tablet""" homepage = "https://github.com/ax3l/lines-are-beautiful" - url = "https://plasma.ninja/blog/devices/remarkable/binary/format/2017/12/26/reMarkable-lines-file-format.html" + git = "https://github.com/ax3l/lines-are-beautiful.git" + maintainers = ['ax3l'] - version('develop', branch='develop', - git='https://github.com/ax3l/lines-are-beautiful.git') + version('develop', branch='develop') variant('png', default=True, description='Enable PNG conversion support') diff --git a/var/spack/repos/builtin/packages/rose/package.py b/var/spack/repos/builtin/packages/rose/package.py index ffa9a91caa..12c1f4223d 100644 --- a/var/spack/repos/builtin/packages/rose/package.py +++ b/var/spack/repos/builtin/packages/rose/package.py @@ -35,11 +35,11 @@ class Rose(Package): (Developed at Lawrence Livermore National Lab)""" homepage = "http://rosecompiler.org/" - url = "https://github.com/rose-compiler/rose/archive/v0.9.7.tar.gz" + url = "https://github.com/rose-compiler/rose/archive/v0.9.7.tar.gz" + git = "https://github.com/rose-compiler/rose.git" + version('master', branch='master') version('0.9.7', 'e14ce5250078df4b09f4f40559d46c75') - version('master', branch='master', - git='https://github.com/rose-compiler/rose.git') patch('add_spack_compiler_recognition.patch') diff --git a/var/spack/repos/builtin/packages/rust/package.py b/var/spack/repos/builtin/packages/rust/package.py index 88632f0fdf..4b098c34ac 100644 --- a/var/spack/repos/builtin/packages/rust/package.py +++ b/var/spack/repos/builtin/packages/rust/package.py @@ -33,10 +33,11 @@ def get_submodules(): class Rust(Package): """The rust programming language toolchain""" + homepage = "http://www.rust-lang.org" - url = "https://github.com/rust-lang/rust" + git = "https://github.com/rust-lang/rust.git" - version('1.8.0', tag='1.8.0', git="https://github.com/rust-lang/rust") + version('1.8.0', tag='1.8.0') resource(name='cargo', git="https://github.com/rust-lang/cargo.git", diff --git a/var/spack/repos/builtin/packages/sabre/package.py b/var/spack/repos/builtin/packages/sabre/package.py index d205ca5090..5d65806e48 100644 --- a/var/spack/repos/builtin/packages/sabre/package.py +++ b/var/spack/repos/builtin/packages/sabre/package.py @@ -37,9 +37,9 @@ class Sabre(MakefilePackage): """ homepage = "https://github.com/najoshi/sabre" - url = "https://github.com/najoshi/sabre" + git = "https://github.com/najoshi/sabre.git" - version('2013-09-27', git='https://github.com/najoshi/sabre.git', commit='039a55e500ba07b7e6432ea6ec2ddcfb3471d949') + version('2013-09-27', commit='039a55e500ba07b7e6432ea6ec2ddcfb3471d949') depends_on('zlib') diff --git a/var/spack/repos/builtin/packages/sambamba/package.py b/var/spack/repos/builtin/packages/sambamba/package.py index 98e07478c7..3b8631a0ca 100644 --- a/var/spack/repos/builtin/packages/sambamba/package.py +++ b/var/spack/repos/builtin/packages/sambamba/package.py @@ -29,9 +29,9 @@ class Sambamba(Package): """Sambamba: process your BAM data faster (bioinformatics)""" homepage = "http://lomereiter.github.io/sambamba/" + git = "https://github.com/lomereiter/sambamba.git" - version('0.6.6', git='https://github.com/lomereiter/sambamba.git', - tag='v0.6.6', submodules=True) + version('0.6.6', tag='v0.6.6', submodules=True) depends_on('ldc~shared', type=('build', 'link')) depends_on('python', type='build') diff --git a/var/spack/repos/builtin/packages/satsuma2/package.py b/var/spack/repos/builtin/packages/satsuma2/package.py index 3bbec608c6..e171ed316b 100644 --- a/var/spack/repos/builtin/packages/satsuma2/package.py +++ b/var/spack/repos/builtin/packages/satsuma2/package.py @@ -33,9 +33,9 @@ class Satsuma2(CMakePackage): """ homepage = "https://github.com/bioinfologics/satsuma2" - url = "https://github.com/bioinfologics/satsuma2" + git = "https://github.com/bioinfologics/satsuma2.git" - version('2016-11-22', git='https://github.com/bioinfologics/satsuma2.git', commit='da694aeecf352e344b790bea4a7aaa529f5b69e6') + version('2016-11-22', commit='da694aeecf352e344b790bea4a7aaa529f5b69e6') def install(self, spec, prefix): install_tree(join_path('spack-build', 'bin'), prefix.bin) diff --git a/var/spack/repos/builtin/packages/savanna/package.py b/var/spack/repos/builtin/packages/savanna/package.py index 641560f6de..1e5ea83f5b 100644 --- a/var/spack/repos/builtin/packages/savanna/package.py +++ b/var/spack/repos/builtin/packages/savanna/package.py @@ -32,12 +32,10 @@ class Savanna(MakefilePackage): """ homepage = "https://github.com/CODARcode/savanna" - url = "https://github.com/CODARcode/savanna/archive/v0.5.tar.gz" + git = "https://github.com/CODARcode/savanna.git" - version('develop', git='https://github.com/CODARcode/savanna.git', - branch='master', submodules=True) - version('0.5', git='https://github.com/CODARcode/savanna.git', - tag='0.5', submodules=True) + version('develop', branch='master', submodules=True) + version('0.5', tag='0.5', submodules=True) variant('tau', default=False, description='Enable TAU profiling support') diff --git a/var/spack/repos/builtin/packages/saws/package.py b/var/spack/repos/builtin/packages/saws/package.py index 901fdd9577..53aa4c11e2 100644 --- a/var/spack/repos/builtin/packages/saws/package.py +++ b/var/spack/repos/builtin/packages/saws/package.py @@ -30,7 +30,9 @@ class Saws(AutotoolsPackage): scientific or engineering application code into a webserver, allowing one to examine (and even modify) the state of the simulation with any browser from anywhere.""" + homepage = "https://bitbucket.org/saws/saws/wiki/Home" + git = "https://bitbucket.org/saws/saws.git" - version('develop', git='https://bitbucket.org/saws/saws.git', tag='master') - version('0.1.0', git='https://bitbucket.org/saws/saws.git', tag='v0.1.0') + version('develop', tag='master') + version('0.1.0', tag='v0.1.0') diff --git a/var/spack/repos/builtin/packages/scorec-core/package.py b/var/spack/repos/builtin/packages/scorec-core/package.py index 673749ab0e..329d7c8a01 100644 --- a/var/spack/repos/builtin/packages/scorec-core/package.py +++ b/var/spack/repos/builtin/packages/scorec-core/package.py @@ -31,9 +31,9 @@ class ScorecCore(CMakePackage): """ homepage = 'https://www.scorec.rpi.edu/' - url = 'https://github.com/SCOREC/core.git' + git = 'https://github.com/SCOREC/core.git' - version('develop', git=url) + version('develop') depends_on('mpi') depends_on('zoltan') diff --git a/var/spack/repos/builtin/packages/scr/package.py b/var/spack/repos/builtin/packages/scr/package.py index 9758db1f35..7ec0a5351e 100644 --- a/var/spack/repos/builtin/packages/scr/package.py +++ b/var/spack/repos/builtin/packages/scr/package.py @@ -34,15 +34,16 @@ class Scr(CMakePackage): capability for MPI codes""" homepage = "http://computation.llnl.gov/projects/scalable-checkpoint-restart-for-mpi" + url = "https://github.com/LLNL/scr/archive/v1.2.0.tar.gz" + git = "https://github.com/llnl/scr.git" # NOTE: scr-v1.1.8 is built with autotools and is not properly build here. # scr-v1.1.8 will be deprecated with the upcoming release of v1.2.0 # url = "https://github.com/LLNL/scr/releases/download/v1.1.8/scr-1.1.8.tar.gz" # version('1.1.8', '6a0f11ad18e27fcfc00a271ff587b06e') - url = "https://github.com/LLNL/scr/archive/v1.2.0.tar.gz" + version('master', branch='master') version('1.2.0', '060e9e9c7604c1765f3991f9cd6e9d2d') - version('master', git='https://github.com/llnl/scr.git', branch='master') depends_on('pdsh+static_modules', type=('build', 'run')) depends_on('zlib') diff --git a/var/spack/repos/builtin/packages/shuffile/package.py b/var/spack/repos/builtin/packages/shuffile/package.py index 096d968b1f..05d9d94e0b 100644 --- a/var/spack/repos/builtin/packages/shuffile/package.py +++ b/var/spack/repos/builtin/packages/shuffile/package.py @@ -30,11 +30,12 @@ class Shuffile(CMakePackage): homepage = "https://github.com/ECP-VeloC/shuffile" url = "https://github.com/ECP-VeloC/shuffile/archive/v0.0.1.zip" - tags = ['ecp'] + git = "https://github.com/ecp-veloc/shuffile.git" + tags = ['ecp'] + + version('master', branch='master') version('0.0.2', 'eca45150d83e21ac51049133a2308d34') - version('master', git='https://github.com/ecp-veloc/shuffile.git', - branch='master') depends_on('mpi') depends_on('kvtree') diff --git a/var/spack/repos/builtin/packages/simulationio/package.py b/var/spack/repos/builtin/packages/simulationio/package.py index 6ed7145254..568e8e4eed 100644 --- a/var/spack/repos/builtin/packages/simulationio/package.py +++ b/var/spack/repos/builtin/packages/simulationio/package.py @@ -28,13 +28,14 @@ from spack import * class Simulationio(CMakePackage): """SimulationIO: Efficient and convenient I/O for large PDE simulations""" + homepage = "https://github.com/eschnett/SimulationIO" url = "https://github.com/eschnett/SimulationIO/archive/version/0.1.0.tar.gz" + git = "https://github.com/eschnett/SimulationIO.git" + version('develop', branch='master') version('1.0.0', '5cbf1d0084eb436d861ffcdd297eaa08') version('0.1.0', '00f7dabc08ed1ab77858785ce0809f50') - version('develop', - git='https://github.com/eschnett/SimulationIO.git', branch='master') variant('julia', default=False) variant('python', default=True) diff --git a/var/spack/repos/builtin/packages/singularity/package.py b/var/spack/repos/builtin/packages/singularity/package.py index 5951973916..e85b51d6ad 100644 --- a/var/spack/repos/builtin/packages/singularity/package.py +++ b/var/spack/repos/builtin/packages/singularity/package.py @@ -31,11 +31,12 @@ class Singularity(AutotoolsPackage): homepage = "https://www.sylabs.io/singularity/" url = "https://github.com/singularityware/singularity/releases/download/2.5.2/singularity-2.5.2.tar.gz" + git = "https://github.com/singularityware/singularity.git" # Versions before 2.5.2 suffer from a serious security problem. # https://nvd.nist.gov/vuln/detail/CVE-2018-12021 + version('develop', branch='master') version('2.5.2', '2edc1a8ac9a4d7d26fba6244f1c5fd95') - version('develop', git='https://github.com/singularityware/singularity.git', branch='master') depends_on('libarchive', when='@2.5.2:') # these are only needed if we're grabbing the unreleased tree diff --git a/var/spack/repos/builtin/packages/slepc/package.py b/var/spack/repos/builtin/packages/slepc/package.py index cdd69f48cb..9bdb4436e3 100644 --- a/var/spack/repos/builtin/packages/slepc/package.py +++ b/var/spack/repos/builtin/packages/slepc/package.py @@ -27,13 +27,13 @@ from spack import * class Slepc(Package): - """ - Scalable Library for Eigenvalue Problem Computations. - """ + """Scalable Library for Eigenvalue Problem Computations.""" homepage = "http://www.grycap.upv.es/slepc" - url = "http://slepc.upv.es/download/distrib/slepc-3.6.2.tar.gz" + url = "http://slepc.upv.es/download/distrib/slepc-3.6.2.tar.gz" + git = "https://bitbucket.org/slepc/slepc.git" + version('develop', git=git) version('3.9.1', 'e174ea7c127d9161eef976b0288f0c56d443a58d6ab2dc8af1e8bd66f156ce17') version('3.9.0', '1f3930db56b4065aaf214ea758ddff1a70bf19d45544cbdfd19d2787db4bfe0b') version('3.8.2', '1e7d20d20eb26da307d36017461fe4a55f40e947e232739179dbe6412e22ed13') @@ -43,7 +43,6 @@ class Slepc(Package): version('3.7.1', '670216f263e3074b21e0623c01bc0f562fdc0bffcd7bd42dd5d8edbe73a532c2') version('3.6.3', '384939d009546db37bc05ed81260c8b5ba451093bf891391d32eb7109ccff876') version('3.6.2', '2ab4311bed26ccf7771818665991b2ea3a9b15f97e29fd13911ab1293e8e65df') - version('develop', git='https://bitbucket.org/slepc/slepc.git') variant('arpack', default=True, description='Enables Arpack wrappers') diff --git a/var/spack/repos/builtin/packages/snap/package.py b/var/spack/repos/builtin/packages/snap/package.py index d12c3520ea..7ed808a8e4 100644 --- a/var/spack/repos/builtin/packages/snap/package.py +++ b/var/spack/repos/builtin/packages/snap/package.py @@ -34,10 +34,11 @@ class Snap(MakefilePackage): It is modeled off the Los Alamos National Laboratory code PARTISN.""" homepage = "https://github.com/lanl/SNAP" - url = "" - tags = ['proxy-app'] + git = "https://github.com/lanl/SNAP.git" - version('master', git='https://github.com/lanl/SNAP.git') + tags = ['proxy-app'] + + version('master') variant('openmp', default=False, description='Build with OpenMP support') variant('opt', default=True, description='Build with debugging') diff --git a/var/spack/repos/builtin/packages/snbone/package.py b/var/spack/repos/builtin/packages/snbone/package.py index dd8ee25ab6..93421d429b 100644 --- a/var/spack/repos/builtin/packages/snbone/package.py +++ b/var/spack/repos/builtin/packages/snbone/package.py @@ -31,9 +31,9 @@ class Snbone(MakefilePackage): continuous finite element based transport equation solver.""" homepage = "https://github.com/ANL-CESAR/" - url = "https://github.com/ANL-CESAR/SNbone.git" + git = "https://github.com/ANL-CESAR/SNbone.git" - version('develop', git='https://github.com/ANL-CESAR/SNbone.git') + version('develop') tags = ['proxy-app'] diff --git a/var/spack/repos/builtin/packages/sortmerna/package.py b/var/spack/repos/builtin/packages/sortmerna/package.py index 501055b9ec..cb91cbe516 100644 --- a/var/spack/repos/builtin/packages/sortmerna/package.py +++ b/var/spack/repos/builtin/packages/sortmerna/package.py @@ -30,9 +30,9 @@ class Sortmerna(CMakePackage): reads in metatranscriptomic and metagenomic data""" homepage = "https://github.com/biocore/sortmerna" - url = "https://github.com/biocore/sortmerna" + git = "https://github.com/biocore/sortmerna.git" - version('2017-07-13', git='https://github.com/biocore/sortmerna.git', commit='8bde6fa113a5d99a23ae81b48eeea6760e966094') + version('2017-07-13', commit='8bde6fa113a5d99a23ae81b48eeea6760e966094') depends_on('zlib') diff --git a/var/spack/repos/builtin/packages/sosflow/package.py b/var/spack/repos/builtin/packages/sosflow/package.py index ae12663204..45dc004569 100644 --- a/var/spack/repos/builtin/packages/sosflow/package.py +++ b/var/spack/repos/builtin/packages/sosflow/package.py @@ -31,9 +31,9 @@ class Sosflow(CMakePackage): observation, introspection, feedback, and control of HPC applications.""" homepage = "https://github.com/cdwdirect/sos_flow/wiki" - url = "https://github.com/cdwdirect/sos_flow.git" + git = "https://github.com/cdwdirect/sos_flow.git" - version('spack', git='https://github.com/cdwdirect/sos_flow.git', tag='spack-build-v0.9901') + version('spack', tag='spack-build-v0.9901') depends_on('libevpath') depends_on('sqlite@3:') diff --git a/var/spack/repos/builtin/packages/sst-dumpi/package.py b/var/spack/repos/builtin/packages/sst-dumpi/package.py index 9c234ff158..b372109235 100644 --- a/var/spack/repos/builtin/packages/sst-dumpi/package.py +++ b/var/spack/repos/builtin/packages/sst-dumpi/package.py @@ -39,14 +39,12 @@ class SstDumpi(AutotoolsPackage): homepage = "http://sst.sandia.gov/about_dumpi.html" url = "https://github.com/sstsimulator/sst-dumpi/archive/6.1.0.tar.gz" + git = "https://github.com/sstsimulator/sst-dumpi.git" + + version('master', branch='master') + version('6.1.0', '31c3f40a697dc85bf23dd34270982319') depends_on('autoconf@1.68:', type='build') depends_on('automake@1.11.1:', type='build') depends_on('libtool@1.2.4:', type='build') depends_on('m4', type='build') - - version('master', - git='https://github.com/sstsimulator/sst-dumpi.git', - branch='master') - - version('6.1.0', '31c3f40a697dc85bf23dd34270982319') diff --git a/var/spack/repos/builtin/packages/sst-macro/package.py b/var/spack/repos/builtin/packages/sst-macro/package.py index a5f3b69a26..20da0481af 100644 --- a/var/spack/repos/builtin/packages/sst-macro/package.py +++ b/var/spack/repos/builtin/packages/sst-macro/package.py @@ -40,6 +40,10 @@ class SstMacro(AutotoolsPackage): homepage = "http://sst.sandia.gov/about_sstmacro.html" url = "https://github.com/sstsimulator/sst-macro/releases/download/v6.1.0_Final/sstmacro-6.1.0.tar.gz" + git = "https://github.com/sstsimulator/sst-macro.git" + + version('master', branch='master') + version('6.1.0', '98b737be6326b8bd711de832ccd94d14') depends_on('boost@1.59:') depends_on('autoconf@1.68:', type='build', when='@master') @@ -47,13 +51,6 @@ class SstMacro(AutotoolsPackage): depends_on('libtool@1.2.4:', type='build', when='@master') depends_on('m4', type='build', when='@master') - version('master', - git='https://github.com/sstsimulator/sst-macro.git', - branch='master') - - version('6.1.0', '98b737be6326b8bd711de832ccd94d14', - url='https://github.com/sstsimulator/sst-macro/releases/download/v6.1.0_Final/sstmacro-6.1.0.tar.gz') - @run_before('autoreconf') def bootstrap(self): if '@master' in self.spec: diff --git a/var/spack/repos/builtin/packages/stream/package.py b/var/spack/repos/builtin/packages/stream/package.py index f4d01faa90..c4020f4312 100644 --- a/var/spack/repos/builtin/packages/stream/package.py +++ b/var/spack/repos/builtin/packages/stream/package.py @@ -31,8 +31,9 @@ class Stream(MakefilePackage): computation rate for simple vector kernels.""" homepage = "https://www.cs.virginia.edu/stream/ref.html" + git = "https://github.com/jeffhammond/STREAM.git" - version('5.10', git='https://github.com/jeffhammond/STREAM.git') + version('5.10') variant('openmp', default=False, description='Build with OpenMP support') diff --git a/var/spack/repos/builtin/packages/superlu-dist/package.py b/var/spack/repos/builtin/packages/superlu-dist/package.py index ecd404a350..87567eafc2 100644 --- a/var/spack/repos/builtin/packages/superlu-dist/package.py +++ b/var/spack/repos/builtin/packages/superlu-dist/package.py @@ -30,11 +30,13 @@ from spack import * class SuperluDist(Package): """A general purpose library for the direct solution of large, sparse, nonsymmetric systems of linear equations on high performance machines.""" + homepage = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/" - url = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_dist_4.1.tar.gz" + url = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_dist_4.1.tar.gz" + git = "https://github.com/xiaoyeli/superlu_dist.git" - version('develop', git='https://github.com/xiaoyeli/superlu_dist', branch='master') - version('xsdk-0.2.0', git='https://github.com/xiaoyeli/superlu_dist', tag='xsdk-0.2.0') + version('develop', branch='master') + version('xsdk-0.2.0', tag='xsdk-0.2.0') version('5.4.0', 'e64645c5be352ae2c88327af2cac66e1') version('5.3.0', '35d5aa8e0a246efaf327988b20106714') version('5.2.2', 'a685ef7fb7859b24c8c9d5d5f121a8a5') diff --git a/var/spack/repos/builtin/packages/sw4lite/package.py b/var/spack/repos/builtin/packages/sw4lite/package.py index 868fc88ec2..75ed9ac76e 100644 --- a/var/spack/repos/builtin/packages/sw4lite/package.py +++ b/var/spack/repos/builtin/packages/sw4lite/package.py @@ -34,9 +34,9 @@ class Sw4lite(MakefilePackage): homepage = "https://geodynamics.org/cig/software/sw4" url = "https://github.com/geodynamics/sw4lite/archive/v1.0.zip" + git = "https://github.com/geodynamics/sw4lite" - version('develop', git='https://github.com/geodynamics/sw4lite', - branch='master') + version('develop', branch='master') version('1.0', '3d911165f4f2ff6d5f9c1bd56ab6723f') variant('openmp', default=True, description='Build with OpenMP support') diff --git a/var/spack/repos/builtin/packages/swfft/package.py b/var/spack/repos/builtin/packages/swfft/package.py index ba77704770..1ffecb82ce 100644 --- a/var/spack/repos/builtin/packages/swfft/package.py +++ b/var/spack/repos/builtin/packages/swfft/package.py @@ -30,12 +30,12 @@ class Swfft(MakefilePackage): """A stand-alone version of HACC's distributed-memory, pencil-decomposed, parallel 3D FFT.""" - homepage = 'https://xgitlab.cels.anl.gov/hacc/SWFFT' - url = "https://xgitlab.cels.anl.gov/api/v4/projects/hacc%2FSWFFT/repository/archive.tar.gz?sha=v1.0" + homepage = "https://xgitlab.cels.anl.gov/hacc/SWFFT" + url = "https://xgitlab.cels.anl.gov/api/v4/projects/hacc%2FSWFFT/repository/archive.tar.gz?sha=v1.0" + git = "https://xgitlab.cels.anl.gov/hacc/SWFFT" version('1.0', '0fbc34544b97ba9c3fb19ef2d7a0f076') - version('develop', git='https://xgitlab.cels.anl.gov/hacc/SWFFT', - branch='master') + version('develop', branch='master') depends_on('mpi') depends_on('fftw') diff --git a/var/spack/repos/builtin/packages/symengine/package.py b/var/spack/repos/builtin/packages/symengine/package.py index 5c42c5f5d8..6a8837f6a0 100644 --- a/var/spack/repos/builtin/packages/symengine/package.py +++ b/var/spack/repos/builtin/packages/symengine/package.py @@ -31,11 +31,12 @@ class Symengine(CMakePackage): homepage = "https://github.com/symengine/symengine" url = "https://github.com/symengine/symengine/archive/v0.2.0.tar.gz" + git = "https://github.com/symengine/symengine.git" + version('develop', git=git) version('0.3.0', 'e61d7513cca4963cd062616891de54c6') version('0.2.0', '45401561add36a13c1f0b0c5f8d7422d') version('0.1.0', '41ad7daed61fc5a77c285eb6c7303425') - version('develop', git='https://github.com/symengine/symengine.git') variant('boostmp', default=False, description='Compile with Boost multi-precision integer library') diff --git a/var/spack/repos/builtin/packages/sz/package.py b/var/spack/repos/builtin/packages/sz/package.py index 149a29e14f..850e2f795f 100644 --- a/var/spack/repos/builtin/packages/sz/package.py +++ b/var/spack/repos/builtin/packages/sz/package.py @@ -31,9 +31,9 @@ class Sz(AutotoolsPackage): homepage = "https://collab.cels.anl.gov/display/ESR/SZ" url = "https://github.com/disheng222/SZ/archive/v1.4.13.5.tar.gz" + git = "https://github.com/disheng222/SZ.git" - version('develop', git='https://github.com/disheng222/SZ.git', - branch='master') + version('develop', branch='master') version('1.4.13.5', 'a2f6147c3c74d74c938dd17d914a4cb8') version('1.4.13.4', '1c47170a9eebeadbf0f7e9b675d68d76') version('1.4.12.3', '5f51be8530cdfa5280febb410ac6dd94') diff --git a/var/spack/repos/builtin/packages/tabix/package.py b/var/spack/repos/builtin/packages/tabix/package.py index f098e465d3..b192112003 100644 --- a/var/spack/repos/builtin/packages/tabix/package.py +++ b/var/spack/repos/builtin/packages/tabix/package.py @@ -29,9 +29,9 @@ class Tabix(MakefilePackage): """Generic indexer for TAB-delimited genome position files""" homepage = "https://github.com/samtools/tabix" - url = "https://github.com/samtools/tabix" + git = "https://github.com/samtools/tabix.git" - version('2013-12-16', git='https://github.com/samtools/tabix.git', commit='1ae158ac79b459f5feeed7490c67519b14ce9f35') + version('2013-12-16', commit='1ae158ac79b459f5feeed7490c67519b14ce9f35') depends_on('perl', type=('build', 'run')) depends_on('python', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/tassel/package.py b/var/spack/repos/builtin/packages/tassel/package.py index 33cf6e8e80..d2c803997e 100644 --- a/var/spack/repos/builtin/packages/tassel/package.py +++ b/var/spack/repos/builtin/packages/tassel/package.py @@ -30,10 +30,9 @@ class Tassel(Package): evolutionary patterns, and linkage disequilibrium.""" homepage = "http://www.maizegenetics.net/tassel" - url = "https://bitbucket.org/tasseladmin/tassel-5-source/get/master.tar.gz" + git = "https://bitbucket.org/tasseladmin/tassel-5-standalone.git" - version('2017-07-22', git='https://bitbucket.org/tasseladmin/tassel-5-standalone.git', - commit='ae96ae75c3c9a9e8026140b6c775fa4685bdf531') + version('2017-07-22', commit='ae96ae75c3c9a9e8026140b6c775fa4685bdf531') depends_on('java', type=('build', 'run')) depends_on('perl', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/tcoffee/package.py b/var/spack/repos/builtin/packages/tcoffee/package.py index a3f2bec266..2aac10efdd 100644 --- a/var/spack/repos/builtin/packages/tcoffee/package.py +++ b/var/spack/repos/builtin/packages/tcoffee/package.py @@ -29,9 +29,9 @@ class Tcoffee(MakefilePackage): """T-Coffee is a multiple sequence alignment program.""" homepage = "http://www.tcoffee.org/" - url = "https://github.com/cbcrg/tcoffee" + git = "https://github.com/cbcrg/tcoffee.git" - version('2017-08-17', git='https://github.com/cbcrg/tcoffee.git', commit='f389b558e91d0f82e7db934d9a79ce285f853a71') + version('2017-08-17', commit='f389b558e91d0f82e7db934d9a79ce285f853a71') depends_on('perl', type=('build', 'run')) depends_on('blast-plus') diff --git a/var/spack/repos/builtin/packages/tethex/package.py b/var/spack/repos/builtin/packages/tethex/package.py index 7f04668eb4..dc1f834920 100644 --- a/var/spack/repos/builtin/packages/tethex/package.py +++ b/var/spack/repos/builtin/packages/tethex/package.py @@ -34,11 +34,12 @@ class Tethex(CMakePackage): homepage = "https://github.com/martemyev/tethex" url = "https://github.com/martemyev/tethex/archive/v0.0.7.tar.gz" + git = "https://github.com/martemyev/tethex.git" maintainers = ['davydden'] + version('develop', git=git) version('0.0.7', '6c9e4a18a6637deb4400c6d77ec03184') - version('develop', git='https://github.com/martemyev/tethex.git') variant('build_type', default='Release', description='The build type to build', diff --git a/var/spack/repos/builtin/packages/tioga/package.py b/var/spack/repos/builtin/packages/tioga/package.py index 5d9b1bb40d..f3cfb139ad 100644 --- a/var/spack/repos/builtin/packages/tioga/package.py +++ b/var/spack/repos/builtin/packages/tioga/package.py @@ -29,11 +29,10 @@ class Tioga(CMakePackage): """Topology Independent Overset Grid Assembly (TIOGA)""" homepage = "https://github.com/jsitaraman/tioga" - url = "https://github.com/jsitaraman/tioga.git" + git = "https://github.com/jsitaraman/tioga.git" # The master branch doesn't support CMake - version('develop', git="https://github.com/jsitaraman/tioga.git", - branch='nalu-api') + version('develop', branch='nalu-api') variant('shared', default=False, description="Enable building shared libraries") diff --git a/var/spack/repos/builtin/packages/tmuxinator/package.py b/var/spack/repos/builtin/packages/tmuxinator/package.py index 240a4b16d9..3f472fe785 100644 --- a/var/spack/repos/builtin/packages/tmuxinator/package.py +++ b/var/spack/repos/builtin/packages/tmuxinator/package.py @@ -27,12 +27,11 @@ from spack import * class Tmuxinator(Package): """A session configuration creator and manager for tmux""" + homepage = "https://github.com/tmuxinator/tmuxinator" - url = "https://github.com/tmuxinator/tmuxinator" + git = "https://github.com/tmuxinator/tmuxinator.git" - version('0.6.11', - git='https://github.com/tmuxinator/tmuxinator', - tag='v0.6.11') + version('0.6.11', tag='v0.6.11') extends('ruby') diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 9cce2f028e..b91811e17b 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -45,17 +45,15 @@ class Trilinos(CMakePackage): """ homepage = "https://trilinos.org/" url = "https://github.com/trilinos/Trilinos/archive/trilinos-release-12-12-1.tar.gz" + git = "https://github.com/trilinos/Trilinos.git" maintainers = ['aprokop'] # ###################### Versions ########################## - version('xsdk-0.2.0', - git='https://github.com/trilinos/Trilinos.git', tag='xsdk-0.2.0') - version('develop', - git='https://github.com/trilinos/Trilinos.git', branch='develop') - version('master', - git='https://github.com/trilinos/Trilinos.git', branch='master') + version('xsdk-0.2.0', tag='xsdk-0.2.0') + version('develop', branch='develop') + version('master', branch='master') version('12.12.1', 'ecd4606fa332212433c98bf950a69cc7') version('12.10.1', '667333dbd7c0f031d47d7c5511fd0810') version('12.8.1', '9f37f683ee2b427b5540db8a20ed6b15') diff --git a/var/spack/repos/builtin/packages/tycho2/package.py b/var/spack/repos/builtin/packages/tycho2/package.py index 0f54c2e661..0eed0746cb 100644 --- a/var/spack/repos/builtin/packages/tycho2/package.py +++ b/var/spack/repos/builtin/packages/tycho2/package.py @@ -31,9 +31,9 @@ class Tycho2(MakefilePackage): on unstructured, 3D tetrahedral meshes. """ homepage = "https://github.com/lanl/tycho2" - url = "https://github.com/lanl/tycho2/tarball/v0.1" + git = "https://github.com/lanl/tycho2.git" - version('develop', git='https://github.com/lanl/tycho2', branch='master') + version('develop', branch='master') depends_on("mpi") diff --git a/var/spack/repos/builtin/packages/typhon/package.py b/var/spack/repos/builtin/packages/typhon/package.py index e08f2f1eb7..618a3ec20f 100644 --- a/var/spack/repos/builtin/packages/typhon/package.py +++ b/var/spack/repos/builtin/packages/typhon/package.py @@ -32,10 +32,9 @@ class Typhon(CMakePackage): """ homepage = "https://github.com/UK-MAC/Typhon" - url = "https://github.com/UK-MAC/Typhon/archive/v3.0.tar.gz" + git = "https://github.com/UK-MAC/Typhon.git" - version('develop', git='https://github.com/UK-MAC/Typhon', - branch='develop') + version('develop', branch='develop') version('3.0.1', '89045decfba5fd468ef05ad4c924df8c') version('3.0', 'ec67cd1aa585ce2410d4fa50514a916f') diff --git a/var/spack/repos/builtin/packages/typhonio/package.py b/var/spack/repos/builtin/packages/typhonio/package.py index f5f4461841..02f87f7746 100644 --- a/var/spack/repos/builtin/packages/typhonio/package.py +++ b/var/spack/repos/builtin/packages/typhonio/package.py @@ -31,10 +31,10 @@ class Typhonio(CMakePackage): homepage = "http://uk-mac.github.io/typhonio/" url = "https://github.com/UK-MAC/typhonio/archive/v1.6_CMake.tar.gz" + git = "https://github.com/UK-MAC/typhonio.git" + version('develop', branch='cmake_build') version('1.6_CMake', '8e8b2940a57874205e6d451856db5c2755884bf9') - version('develop', git='https://github.com/UK-MAC/typhonio.git', - branch='cmake_build') variant('build_type', default='Release', description='The build type to build', values=('Debug', 'Release')) diff --git a/var/spack/repos/builtin/packages/umpire/package.py b/var/spack/repos/builtin/packages/umpire/package.py index 9285e3b932..df3628e2da 100644 --- a/var/spack/repos/builtin/packages/umpire/package.py +++ b/var/spack/repos/builtin/packages/umpire/package.py @@ -29,13 +29,14 @@ from spack import * class Umpire(CMakePackage): """An application-focused API for memory management on NUMA & GPU architectures""" - url = 'https://github.com/LLNL/Umpire/releases/download/v0.1.4/umpire-0.1.4.tar.gz' + homepage = 'https://github.com/LLNL/Umpire' + git = 'https://github.com/LLNL/Umpire.git' - version('master', git='https://github.com/LLNL/Umpire.git', branch='master', submodules='True') - version('develop', git='https://github.com/LLNL/Umpire.git', branch='develop', submodules='True') - version('0.1.4', git='https://github.com/LLNL/Umpire.git', tag='v0.1.4', submodules='True') - version('0.1.3', git='https://github.com/LLNL/Umpire.git', tag='v0.1.3', submodules='True') + version('develop', branch='develop', submodules='True') + version('master', branch='master', submodules='True') + version('0.1.4', tag='v0.1.4', submodules='True') + version('0.1.3', tag='v0.1.3', submodules='True') variant('cuda', default=False, description='Build with CUDA support') variant('fortran', default=False, description='Build C/Fortran API') diff --git a/var/spack/repos/builtin/packages/valgrind/package.py b/var/spack/repos/builtin/packages/valgrind/package.py index 20c8431788..baa22f157d 100644 --- a/var/spack/repos/builtin/packages/valgrind/package.py +++ b/var/spack/repos/builtin/packages/valgrind/package.py @@ -35,17 +35,17 @@ class Valgrind(AutotoolsPackage): Valgrind is Open Source / Free Software, and is freely available under the GNU General Public License, version 2. - """ homepage = "http://valgrind.org/" - url = "https://sourceware.org/pub/valgrind/valgrind-3.13.0.tar.bz2" + url = "https://sourceware.org/pub/valgrind/valgrind-3.13.0.tar.bz2" + git = "git://sourceware.org/git/valgrind.git" + version('develop', git=git) version('3.13.0', '817dd08f1e8a66336b9ff206400a5369') version('3.12.0', '6eb03c0c10ea917013a7622e483d61bb') version('3.11.0', '4ea62074da73ae82e0162d6550d3f129') version('3.10.1', '60ddae962bc79e7c95cfc4667245707f') version('3.10.0', '7c311a72a20388aceced1aa5573ce970') - version('develop', git='git://sourceware.org/git/valgrind.git') variant('mpi', default=True, description='Activates MPI support for valgrind') diff --git a/var/spack/repos/builtin/packages/veclibfort/package.py b/var/spack/repos/builtin/packages/veclibfort/package.py index 1f55c1c873..21512e4d8e 100644 --- a/var/spack/repos/builtin/packages/veclibfort/package.py +++ b/var/spack/repos/builtin/packages/veclibfort/package.py @@ -33,9 +33,10 @@ class Veclibfort(Package): homepage = "https://github.com/mcg1969/vecLibFort" url = "https://github.com/mcg1969/vecLibFort/archive/0.4.2.tar.gz" + git = "https://github.com/mcg1969/vecLibFort.git" + version('develop', git=git) version('0.4.2', '83395ffcbe8a2122c3f726a5c3a7cf93') - version('develop', git='https://github.com/mcg1969/vecLibFort.git') variant('shared', default=True, description="Build shared libraries as well as static libs.") diff --git a/var/spack/repos/builtin/packages/veloc/package.py b/var/spack/repos/builtin/packages/veloc/package.py index 0d098e7e85..0db99088c6 100644 --- a/var/spack/repos/builtin/packages/veloc/package.py +++ b/var/spack/repos/builtin/packages/veloc/package.py @@ -31,12 +31,13 @@ class Veloc(CMakePackage): homepage = "https://github.com/ECP-VeloC/VELOC" url = "https://github.com/ECP-VeloC/VELOC/archive/veloc-1.0rc1.zip" - tags = ['ecp'] + git = "https://github.com/ecp-veloc/veloc.git" + tags = ['ecp'] + + version('master', branch='master') version('1.0', '98fe2d9abd2a1b53d7a52267dab91fae') version('1.0rc1', 'c6db0de56b5b865183b1fa719ac74c1d') - version('master', git='https://github.com/ecp-veloc/veloc.git', - branch='master') depends_on('boost~atomic~chrono~clanglibcpp~date_time~debug~exception' '~filesystem~graph~icu~iostreams~locale~log~math~mpi' diff --git a/var/spack/repos/builtin/packages/verrou/package.py b/var/spack/repos/builtin/packages/verrou/package.py index 0562c600be..6ff2cf642f 100644 --- a/var/spack/repos/builtin/packages/verrou/package.py +++ b/var/spack/repos/builtin/packages/verrou/package.py @@ -41,11 +41,9 @@ class Verrou(AutotoolsPackage): homepage = "https://github.com/edf-hpc/verrou" url = "https://github.com/edf-hpc/verrou/archive/v2.0.0.tar.gz" + git = "https://github.com/edf-hpc/verrou.git" - version('develop', - git='https://github.com/edf-hpc/verrou.git', - branch='master') - + version('develop', branch='master') version('2.0.0', '388d493df3f253c9b049ce0ceae55fd6') version('1.1.0', '9752d776fb534890e5e29f9721ee6125') diff --git a/var/spack/repos/builtin/packages/votca-csg/package.py b/var/spack/repos/builtin/packages/votca-csg/package.py index 50dd0ed40e..011137cc37 100644 --- a/var/spack/repos/builtin/packages/votca-csg/package.py +++ b/var/spack/repos/builtin/packages/votca-csg/package.py @@ -35,8 +35,9 @@ class VotcaCsg(CMakePackage): """ homepage = "http://www.votca.org" url = "https://github.com/votca/csg/tarball/v1.4" + git = "https://github.com/votca/csg.git" - version('develop', git='https://github.com/votca/csg', branch='master') + version('develop', branch='master') version('1.4', 'd009e761e5e3afd51eed89c420610a67') version('1.4.1', 'e4195d69db2036e9d76f22115ae31f81') diff --git a/var/spack/repos/builtin/packages/votca-ctp/package.py b/var/spack/repos/builtin/packages/votca-ctp/package.py index 202c7c7bbf..a1a95a7048 100644 --- a/var/spack/repos/builtin/packages/votca-ctp/package.py +++ b/var/spack/repos/builtin/packages/votca-ctp/package.py @@ -34,10 +34,9 @@ class VotcaCtp(CMakePackage): This package contains the VOTCA charge transport engine. """ homepage = "http://www.votca.org" - # No release yet - # url = "https://github.com/votca/ctp/tarball/v1.4" + git = "https://github.com/votca/ctp.git" - version('develop', git='https://github.com/votca/ctp', branch='master') + version('develop', branch='master') depends_on("cmake@2.8:", type='build') depends_on("votca-tools@develop", when='@develop') diff --git a/var/spack/repos/builtin/packages/votca-tools/package.py b/var/spack/repos/builtin/packages/votca-tools/package.py index 579df3c8c2..5c43d13b51 100644 --- a/var/spack/repos/builtin/packages/votca-tools/package.py +++ b/var/spack/repos/builtin/packages/votca-tools/package.py @@ -35,8 +35,9 @@ class VotcaTools(CMakePackage): """ homepage = "http://www.votca.org" url = "https://github.com/votca/tools/tarball/v1.4" + git = "https://github.com/votca/tools.git" - version('develop', git='https://github.com/votca/tools', branch='master') + version('develop', branch='master') version('1.4', 'cd47868e9f28e2c7b9d01f95aa0185ca') version('1.4.1', '3176b72f8a41ec053cc740a5398e7dc4') diff --git a/var/spack/repos/builtin/packages/votca-xtp/package.py b/var/spack/repos/builtin/packages/votca-xtp/package.py index ce06ba19a3..c4740f0f8b 100644 --- a/var/spack/repos/builtin/packages/votca-xtp/package.py +++ b/var/spack/repos/builtin/packages/votca-xtp/package.py @@ -35,8 +35,9 @@ class VotcaXtp(CMakePackage): """ homepage = "http://www.votca.org" url = "https://github.com/votca/xtp/tarball/v1.4" + git = "https://github.com/votca/xtp.git" - version('develop', git='https://github.com/votca/xtp', branch='master') + version('develop', branch='master') version('1.4.1', '31a2dbd8bd48bf337bc88b20ab312050') depends_on("cmake@2.8:", type='build') diff --git a/var/spack/repos/builtin/packages/vpfft/package.py b/var/spack/repos/builtin/packages/vpfft/package.py index 331a55d2cc..5035021823 100644 --- a/var/spack/repos/builtin/packages/vpfft/package.py +++ b/var/spack/repos/builtin/packages/vpfft/package.py @@ -35,10 +35,11 @@ class Vpfft(MakefilePackage): """ homepage = "http://www.exmatex.org/vpfft.html" - url = "https://github.com/exmatex/VPFFT/archive/master.tar.gz" - tag = ['proxy-app'] + git = "https://github.com/exmatex/VPFFT.git" - version('develop', git='https://github.com/exmatex/VPFFT.git') + tag = ['proxy-app'] + + version('develop') depends_on('eigen') depends_on('fftw') diff --git a/var/spack/repos/builtin/packages/vpic/package.py b/var/spack/repos/builtin/packages/vpic/package.py index b5be3c6b82..db229fe0ea 100644 --- a/var/spack/repos/builtin/packages/vpic/package.py +++ b/var/spack/repos/builtin/packages/vpic/package.py @@ -36,9 +36,9 @@ class Vpic(CMakePackage): order finite-difference-time-domain (FDTD) solve. """ homepage = "https://github.com/lanl/vpic" - url = "https://github.com/lanl/vpic/tarball/v1.0" + git = "https://github.com/lanl/vpic.git" - version('develop', git='https://github.com/lanl/vpic', branch='master', submodules=True) + version('develop', branch='master', submodules=True) depends_on("cmake@3.1:", type='build') depends_on('mpi') diff --git a/var/spack/repos/builtin/packages/vtkh/package.py b/var/spack/repos/builtin/packages/vtkh/package.py index 117c9dc773..2f16afa901 100644 --- a/var/spack/repos/builtin/packages/vtkh/package.py +++ b/var/spack/repos/builtin/packages/vtkh/package.py @@ -33,12 +33,9 @@ class Vtkh(Package): and DIY2 to provide a toolkit with hybrid parallel capabilities.""" homepage = "https://github.com/Alpine-DAV/vtk-h" - url = "https://github.com/Alpine-DAV/vtk-h" + git = "https://github.com/Alpine-DAV/vtk-h.git" - version('master', - git='https://github.com/Alpine-DAV/vtk-h.git', - branch='master', - submodules=True) + version('master', branch='master', submodules=True) maintainers = ['cyrush'] diff --git a/var/spack/repos/builtin/packages/vtkm/package.py b/var/spack/repos/builtin/packages/vtkm/package.py index f9075b33da..a9c76cd5ee 100644 --- a/var/spack/repos/builtin/packages/vtkm/package.py +++ b/var/spack/repos/builtin/packages/vtkm/package.py @@ -37,13 +37,11 @@ class Vtkm(Package): homepage = "https://m.vtk.org/" url = "https://gitlab.kitware.com/api/v4/projects/vtk%2Fvtk-m/repository/archive.tar.gz?sha=v1.1.0" + git = "https://gitlab.kitware.com/vtk/vtk-m.git" + version('master', branch='master') version('1.1.0', "6aab1c0885f6ffaaffcf07930873d0df") - version('master', - git='https://gitlab.kitware.com/vtk/vtk-m.git', - branch='master') - variant("cuda", default=False, description="build cuda support") variant("tbb", default=True, description="build TBB support") diff --git a/var/spack/repos/builtin/packages/wgsim/package.py b/var/spack/repos/builtin/packages/wgsim/package.py index fa3cc8c13e..cf825ec5da 100644 --- a/var/spack/repos/builtin/packages/wgsim/package.py +++ b/var/spack/repos/builtin/packages/wgsim/package.py @@ -35,8 +35,9 @@ class Wgsim(Package): can be partly compensated by simulating INDEL polymorphisms.""" homepage = "https://github.com/lh3/wgsim" + git = "https://github.com/lh3/wgsim.git" - version('2011.10.17', git='https://github.com/lh3/wgsim.git', commit='a12da3375ff3b51a5594d4b6fa35591173ecc229') + version('2011.10.17', commit='a12da3375ff3b51a5594d4b6fa35591173ecc229') depends_on('zlib') diff --git a/var/spack/repos/builtin/packages/wt/package.py b/var/spack/repos/builtin/packages/wt/package.py index 72851b4121..e116ca6c0a 100644 --- a/var/spack/repos/builtin/packages/wt/package.py +++ b/var/spack/repos/builtin/packages/wt/package.py @@ -31,11 +31,11 @@ class Wt(CMakePackage): Wt is a C++ library for developing web applications.""" homepage = "http://www.webtoolkit.eu/wt" - url = "https://github.com/emweb/wt/archive/3.3.7.tar.gz" + url = "https://github.com/emweb/wt/archive/3.3.7.tar.gz" + git = "https://github.com/emweb/wt.git" + version('master', branch='master') version('3.3.7', '09858901f2dcf5c3d36a9237daba3e3f') - version('master', branch='master', - git='https://github.com/emweb/wt.git') # wt builds in parallel, but requires more than 5 GByte RAM per -j # which most machines do not provide and crash the build diff --git a/var/spack/repos/builtin/packages/wx/package.py b/var/spack/repos/builtin/packages/wx/package.py index cf9312603d..a3a119185e 100644 --- a/var/spack/repos/builtin/packages/wx/package.py +++ b/var/spack/repos/builtin/packages/wx/package.py @@ -35,15 +35,16 @@ class Wx(AutotoolsPackage): native look and feel because it uses the platform's native API rather than emulating the GUI. It's also extensive, free, open-source and mature.""" + homepage = "http://www.wxwidgets.org/" url = "https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.0/wxWidgets-3.1.0.tar.bz2" + git = "https://github.com/wxWidgets/wxWidgets.git" + version('develop', branch='master') version('3.1.0', '2170839cfa9d9322e8ee8368b21a15a2497b4f11') version('3.0.2', '6461eab4428c0a8b9e41781b8787510484dea800') version('3.0.1', '73e58521d6871c9f4d1e7974c6e3a81629fddcf8') - version('develop', git='https://github.com/wxWidgets/wxWidgets.git', branch='master') - patch('math_include.patch', when='@3.0.1:3.0.2') depends_on('pkgconfig', type='build') diff --git a/var/spack/repos/builtin/packages/xcb-util-xrm/package.py b/var/spack/repos/builtin/packages/xcb-util-xrm/package.py index 20b0c9cd2c..f1d53071dd 100644 --- a/var/spack/repos/builtin/packages/xcb-util-xrm/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-xrm/package.py @@ -30,14 +30,11 @@ class XcbUtilXrm(AutotoolsPackage): for the X resource manager.""" homepage = "https://github.com/Airblader/xcb-util-xrm" - url = "https://github.com/Airblader/xcb-util-xrm/archive/v1.2.tar.gz" + git = "https://github.com/Airblader/xcb-util-xrm.git" # This GitHub project includes some git submodules, which must be fetched # in order to build it. - version('1.2', - git='https://github.com/Airblader/xcb-util-xrm', - tag='v1.2', - submodules=True) + version('1.2', tag='v1.2', submodules=True) depends_on('autoconf', type='build') depends_on('automake', type='build') diff --git a/var/spack/repos/builtin/packages/xclip/package.py b/var/spack/repos/builtin/packages/xclip/package.py index 76b8cc0d81..43b1b79081 100644 --- a/var/spack/repos/builtin/packages/xclip/package.py +++ b/var/spack/repos/builtin/packages/xclip/package.py @@ -34,9 +34,9 @@ class Xclip(AutotoolsPackage): which can then be redirected to a file or another program.""" homepage = "https://github.com/astrand/xclip" - url = "https://github.com/astrand/xclip" + git = "https://github.com/astrand/xclip.git" - version('0.13', git='https://github.com/astrand/xclip', commit='9aa7090c3b8b437c6489edca32ae43d82e0c1281') + version('0.13', commit='9aa7090c3b8b437c6489edca32ae43d82e0c1281') depends_on('libxmu') depends_on('libx11') diff --git a/var/spack/repos/builtin/packages/xhmm/package.py b/var/spack/repos/builtin/packages/xhmm/package.py index e85102daeb..7e5d16b12a 100644 --- a/var/spack/repos/builtin/packages/xhmm/package.py +++ b/var/spack/repos/builtin/packages/xhmm/package.py @@ -32,10 +32,9 @@ class Xhmm(MakefilePackage): (or targeted sequencing, more generally).""" homepage = "http://atgu.mgh.harvard.edu/xhmm/index.shtml" - url = "https://bitbucket.org/statgen/xhmm.git" + git = "https://bitbucket.org/statgen/xhmm.git" - version('20160104', git='https://bitbucket.org/statgen/xhmm.git', - commit='cc14e528d90932f059ac4fe94e869e81221fd732') + version('20160104', commit='cc14e528d90932f059ac4fe94e869e81221fd732') depends_on('lapack') diff --git a/var/spack/repos/builtin/packages/xsdktrilinos/package.py b/var/spack/repos/builtin/packages/xsdktrilinos/package.py index a0d6713d2c..6aecbf3368 100644 --- a/var/spack/repos/builtin/packages/xsdktrilinos/package.py +++ b/var/spack/repos/builtin/packages/xsdktrilinos/package.py @@ -33,9 +33,10 @@ class Xsdktrilinos(CMakePackage): """ homepage = "https://trilinos.org/" url = "https://github.com/trilinos/xSDKTrilinos/archive/trilinos-release-12-8-1.tar.gz" + git = "https://github.com/trilinos/xSDKTrilinos.git" - version('develop', git='https://github.com/trilinos/xSDKTrilinos.git', tag='master') - version('xsdk-0.2.0', git='https://github.com/trilinos/xSDKTrilinos.git', tag='xsdk-0.2.0') + version('develop', tag='master') + version('xsdk-0.2.0', tag='xsdk-0.2.0') version('12.8.1', '9cc338ded17d1e10ea6c0dc18b22dcd4') version('12.6.4', '44c4c54ccbac73bb8939f68797b9454a') diff --git a/var/spack/repos/builtin/packages/xsimd/package.py b/var/spack/repos/builtin/packages/xsimd/package.py index e08eab8606..46913d671f 100644 --- a/var/spack/repos/builtin/packages/xsimd/package.py +++ b/var/spack/repos/builtin/packages/xsimd/package.py @@ -30,10 +30,11 @@ class Xsimd(CMakePackage): homepage = "http://quantstack.net/xsimd" url = "https://github.com/QuantStack/xsimd/archive/3.1.0.tar.gz" + git = "https://github.com/QuantStack/xsimd.git" + maintainers = ['ax3l'] - version('develop', branch='master', - git='https://github.com/QuantStack/xsimd.git') + version('develop', branch='master') version('4.0.0', '4186ec94985daa3fc284d9d0d4aa03e8') version('3.1.0', '29c1c525116cbda28f610e2bf24a827e') diff --git a/var/spack/repos/builtin/packages/xtensor-python/package.py b/var/spack/repos/builtin/packages/xtensor-python/package.py index 4607c04891..a189334324 100644 --- a/var/spack/repos/builtin/packages/xtensor-python/package.py +++ b/var/spack/repos/builtin/packages/xtensor-python/package.py @@ -30,10 +30,11 @@ class XtensorPython(CMakePackage): homepage = "https://xtensor-python.readthedocs.io" url = "https://github.com/QuantStack/xtensor-python/archive/0.17.0.tar.gz" + git = "https://github.com/QuantStack/xtensor-python.git" + maintainers = ['ax3l'] - version('develop', branch='master', - git='https://github.com/QuantStack/xtensor-python.git') + version('develop', branch='master') version('0.17.0', '51d22e42909a81201c3421d9e119eed0') depends_on('xtensor@0.15.1:0.15.99', when='@0.17.0:') diff --git a/var/spack/repos/builtin/packages/xtensor/package.py b/var/spack/repos/builtin/packages/xtensor/package.py index d09e33edb4..b27094085a 100644 --- a/var/spack/repos/builtin/packages/xtensor/package.py +++ b/var/spack/repos/builtin/packages/xtensor/package.py @@ -30,10 +30,11 @@ class Xtensor(CMakePackage): homepage = "http://quantstack.net/xtensor" url = "https://github.com/QuantStack/xtensor/archive/0.13.1.tar.gz" + git = "https://github.com/QuantStack/xtensor.git" + maintainers = ['ax3l'] - version('develop', branch='master', - git='https://github.com/QuantStack/xtensor.git') + version('develop', branch='master') version('0.15.1', 'c24ecc406003bd1ac22291f1f7cac29a') version('0.13.1', '80e7e33f05066d17552bf0f8b582dcc5') diff --git a/var/spack/repos/builtin/packages/xtl/package.py b/var/spack/repos/builtin/packages/xtl/package.py index faf6e905c8..33b7a500a2 100644 --- a/var/spack/repos/builtin/packages/xtl/package.py +++ b/var/spack/repos/builtin/packages/xtl/package.py @@ -30,10 +30,11 @@ class Xtl(CMakePackage): homepage = "https://github.com/QuantStack/xtl" url = "https://github.com/QuantStack/xtl/archive/0.3.4.tar.gz" + git = "https://github.com/QuantStack/xtl.git" + maintainers = ['ax3l'] - version('develop', branch='master', - git='https://github.com/QuantStack/xtl.git') + version('develop', branch='master') version('0.4.0', '48c76b63ab12e497a53fb147c41ae747') version('0.3.4', 'b76548a55f1e171a9c849e5ed543e8b3') version('0.3.3', '09b6d9611e460d9280bf1156bcca20f5') diff --git a/var/spack/repos/builtin/packages/yajl/package.py b/var/spack/repos/builtin/packages/yajl/package.py index 604144c6e5..c42ead6a2d 100644 --- a/var/spack/repos/builtin/packages/yajl/package.py +++ b/var/spack/repos/builtin/packages/yajl/package.py @@ -30,6 +30,7 @@ class Yajl(CMakePackage): homepage = "http://lloyd.github.io/yajl/" url = "https://github.com/lloyd/yajl/archive/2.1.0.zip" + git = "https://github.com/lloyd/yajl.git" - version('develop', git='https://github.com/lloyd/yajl.git', branch='master') + version('develop', branch='master') version('2.1.0', '5eb9c16539bf354b937fcb20e263d1eb') diff --git a/var/spack/repos/builtin/packages/yaml-cpp/package.py b/var/spack/repos/builtin/packages/yaml-cpp/package.py index c9141e3201..b73a8b95b4 100644 --- a/var/spack/repos/builtin/packages/yaml-cpp/package.py +++ b/var/spack/repos/builtin/packages/yaml-cpp/package.py @@ -30,10 +30,11 @@ class YamlCpp(CMakePackage): homepage = "https://github.com/jbeder/yaml-cpp" url = "https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.5.3.tar.gz" + git = "https://github.com/jbeder/yaml-cpp.git" + version('develop', branch='master') version('0.6.2', '5b943e9af0060d0811148b037449ef82') version('0.5.3', '2bba14e6a7f12c7272f87d044e4a7211') - version('develop', git='https://github.com/jbeder/yaml-cpp', branch='master') variant('shared', default=True, description='Enable build of shared libraries') diff --git a/var/spack/repos/builtin/packages/yasm/package.py b/var/spack/repos/builtin/packages/yasm/package.py index 7483312ac2..9bcc2ee8ab 100644 --- a/var/spack/repos/builtin/packages/yasm/package.py +++ b/var/spack/repos/builtin/packages/yasm/package.py @@ -30,10 +30,12 @@ class Yasm(AutotoolsPackage): supports the x86 and AMD64 instruction sets, accepts NASM and GAS assembler syntaxes and outputs binary, ELF32 and ELF64 object formats.""" + homepage = "http://yasm.tortall.net" url = "http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz" + git = "https://github.com/yasm/yasm.git" - version('develop', git='https://github.com/yasm/yasm/') + version('develop', git=git) version('1.3.0', 'fc9e586751ff789b34b1f21d572d96af') depends_on('autoconf', when='@develop') diff --git a/var/spack/repos/builtin/packages/yorick/package.py b/var/spack/repos/builtin/packages/yorick/package.py index 6ec6139cd5..2f4a3a349e 100644 --- a/var/spack/repos/builtin/packages/yorick/package.py +++ b/var/spack/repos/builtin/packages/yorick/package.py @@ -40,12 +40,11 @@ class Yorick(Package): homepage = "http://dhmunro.github.io/yorick-doc/" url = "https://github.com/dhmunro/yorick/archive/y_2_2_04.tar.gz" + git = "https://github.com/dhmunro/yorick.git" + version('master', branch='master') version('2.2.04', '1b5b0da6ad81b2d9dba64d991ec17939') - version('master', branch='master', - git='https://github.com/dhmunro/yorick.git') - version('f90-plugin', branch='f90-plugin', - git='https://github.com/trmwzm/yorick.git') + version('f90-plugin', branch='f90-plugin') variant('X', default=False, description='Enable X11 support') diff --git a/var/spack/repos/builtin/packages/zeromq/package.py b/var/spack/repos/builtin/packages/zeromq/package.py index c9645145f6..68504675e1 100644 --- a/var/spack/repos/builtin/packages/zeromq/package.py +++ b/var/spack/repos/builtin/packages/zeromq/package.py @@ -26,12 +26,13 @@ from spack import * class Zeromq(AutotoolsPackage): - """ The ZMQ networking/concurrency library and core API """ + """The ZMQ networking/concurrency library and core API""" + homepage = "http://zguide.zeromq.org/" url = "http://download.zeromq.org/zeromq-4.1.2.tar.gz" + git = "https://github.com/zeromq/libzmq.git" - version('develop', branch='master', - git='https://github.com/zeromq/libzmq.git') + version('develop', branch='master') version('4.2.5', 'a1c95b34384257e986842f4d006957b8', url='https://github.com/zeromq/libzmq/releases/download/v4.2.5/zeromq-4.2.5.tar.gz') version('4.2.2', '52499909b29604c1e47a86f1cb6a9115') -- cgit v1.2.3-70-g09d2 From 31417bf66c3f1a3590d39e5c9892d07252094aa7 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Tue, 24 Jul 2018 21:08:43 -0500 Subject: Replace git=git with explicit branch names --- var/spack/repos/builtin/packages/bash-completion/package.py | 2 +- var/spack/repos/builtin/packages/charm/package.py | 4 ++-- var/spack/repos/builtin/packages/cppad/package.py | 2 +- var/spack/repos/builtin/packages/flint/package.py | 2 +- var/spack/repos/builtin/packages/hoomd-blue/package.py | 2 +- var/spack/repos/builtin/packages/hub/package.py | 4 ++-- var/spack/repos/builtin/packages/kahip/package.py | 2 +- var/spack/repos/builtin/packages/libev/package.py | 2 +- var/spack/repos/builtin/packages/libxsmm/package.py | 2 +- var/spack/repos/builtin/packages/lrzip/package.py | 2 +- var/spack/repos/builtin/packages/mfem/package.py | 3 +-- var/spack/repos/builtin/packages/mpifileutils/package.py | 2 +- var/spack/repos/builtin/packages/mpir/package.py | 2 +- var/spack/repos/builtin/packages/mrnet/package.py | 2 +- var/spack/repos/builtin/packages/nekbone/package.py | 2 +- var/spack/repos/builtin/packages/neuron/package.py | 2 +- var/spack/repos/builtin/packages/openfoam-org/package.py | 2 +- var/spack/repos/builtin/packages/piranha/package.py | 2 +- var/spack/repos/builtin/packages/pocl/package.py | 2 +- var/spack/repos/builtin/packages/pxz/package.py | 2 +- var/spack/repos/builtin/packages/py-symengine/package.py | 2 +- var/spack/repos/builtin/packages/r-rhtslib/package.py | 4 ++-- var/spack/repos/builtin/packages/raft/package.py | 2 +- var/spack/repos/builtin/packages/slepc/package.py | 2 +- var/spack/repos/builtin/packages/symengine/package.py | 2 +- var/spack/repos/builtin/packages/tethex/package.py | 2 +- var/spack/repos/builtin/packages/valgrind/package.py | 2 +- var/spack/repos/builtin/packages/veclibfort/package.py | 2 +- var/spack/repos/builtin/packages/yasm/package.py | 2 +- 29 files changed, 32 insertions(+), 33 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bash-completion/package.py b/var/spack/repos/builtin/packages/bash-completion/package.py index 71de10bc22..1c8126b0fd 100644 --- a/var/spack/repos/builtin/packages/bash-completion/package.py +++ b/var/spack/repos/builtin/packages/bash-completion/package.py @@ -32,7 +32,7 @@ class BashCompletion(AutotoolsPackage): url = "https://github.com/scop/bash-completion/archive/2.3.tar.gz" git = "https://github.com/scop/bash-completion.git" - version('develop', git=git) + version('develop', branch='master') version('2.7', 'f72c9e2e877d188c3159956a3496a450e7279b76') version('2.3', '67e50f5f3c804350b43f2b664c33dde811d24292') diff --git a/var/spack/repos/builtin/packages/charm/package.py b/var/spack/repos/builtin/packages/charm/package.py index fcd81db8de..4135fc8ca7 100644 --- a/var/spack/repos/builtin/packages/charm/package.py +++ b/var/spack/repos/builtin/packages/charm/package.py @@ -38,9 +38,9 @@ class Charm(Package): homepage = "http://charmplusplus.org" url = "http://charm.cs.illinois.edu/distrib/charm-6.8.2.tar.gz" - git = "https://github.com/UIUC-PPL/charm" + git = "https://github.com/UIUC-PPL/charm.git" - version("develop", git=git) + version("develop", branch="charm") version("6.8.2", "a887a34b638a5b2f7fcf7ff3c262496d") version("6.8.1", "3e95ffa760909154ef16b643c9bb8193") version("6.8.0", "54df066a5aefb0bbc1a263c2383c2bba") diff --git a/var/spack/repos/builtin/packages/cppad/package.py b/var/spack/repos/builtin/packages/cppad/package.py index 40ed6a0de4..4130c1d253 100644 --- a/var/spack/repos/builtin/packages/cppad/package.py +++ b/var/spack/repos/builtin/packages/cppad/package.py @@ -32,7 +32,7 @@ class Cppad(CMakePackage): url = "http://www.coin-or.org/download/source/CppAD/cppad-20170114.gpl.tgz" git = "https://github.com/coin-or/CppAD.git" - version('develop', git=git) + version('develop', branch='master') version('20170114', '565a534dc813fa1289764222cd8c11ea') def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/flint/package.py b/var/spack/repos/builtin/packages/flint/package.py index 134dffa587..47134b5e74 100644 --- a/var/spack/repos/builtin/packages/flint/package.py +++ b/var/spack/repos/builtin/packages/flint/package.py @@ -32,7 +32,7 @@ class Flint(Package): url = "http://mirrors.mit.edu/sage/spkg/upstream/flint/flint-2.5.2.tar.gz" git = "https://github.com/wbhart/flint2.git" - version('develop', git=git) + version('develop', branch='trunk') version('2.5.2', 'cda885309362150196aed66a5e0f0383') version('2.4.5', '6504b9deabeafb9313e57153a1730b33') diff --git a/var/spack/repos/builtin/packages/hoomd-blue/package.py b/var/spack/repos/builtin/packages/hoomd-blue/package.py index 5b74cf82f3..a0093a30cb 100644 --- a/var/spack/repos/builtin/packages/hoomd-blue/package.py +++ b/var/spack/repos/builtin/packages/hoomd-blue/package.py @@ -39,7 +39,7 @@ class HoomdBlue(CMakePackage): homepage = "http://glotzerlab.engin.umich.edu/hoomd-blue/" git = "https://bitbucket.org/glotzer/hoomd-blue" - version('develop', git=git, submodules=True) + version('develop', submodules=True) # Bitbucket has tarballs for each release, but they cannot be built. # The tarball doesn't come with the git submodules, nor does it come diff --git a/var/spack/repos/builtin/packages/hub/package.py b/var/spack/repos/builtin/packages/hub/package.py index d14d6b87fd..1aa13f270d 100644 --- a/var/spack/repos/builtin/packages/hub/package.py +++ b/var/spack/repos/builtin/packages/hub/package.py @@ -31,9 +31,9 @@ class Hub(Package): homepage = "https://github.com/github/hub" url = "https://github.com/github/hub/archive/v2.2.3.tar.gz" - git = "https://github.com/github/hub" + git = "https://github.com/github/hub.git" - version('head', git=git) + version('head', branch='master') version('2.2.3', '6675992ddd16d186eac7ba4484d57f5b') version('2.2.2', '7edc8f5b5d3c7c392ee191dd999596fc') version('2.2.1', '889a31ee9d10ae9cb333480d8dbe881f') diff --git a/var/spack/repos/builtin/packages/kahip/package.py b/var/spack/repos/builtin/packages/kahip/package.py index a7d8d836dd..6b3d8c4441 100644 --- a/var/spack/repos/builtin/packages/kahip/package.py +++ b/var/spack/repos/builtin/packages/kahip/package.py @@ -46,7 +46,7 @@ class Kahip(SConsPackage): url = 'http://algo2.iti.kit.edu/schulz/software_releases/KaHIP_2.00.tar.gz' git = 'https://github.com/schulzchristian/KaHIP.git' - version('develop', git=git) + version('develop', branch='master') version('2.00', '0a66b0a604ad72cfb7e3dce00e2c9fdfac82b855') depends_on('argtable') diff --git a/var/spack/repos/builtin/packages/libev/package.py b/var/spack/repos/builtin/packages/libev/package.py index 19fd42f700..d824719780 100644 --- a/var/spack/repos/builtin/packages/libev/package.py +++ b/var/spack/repos/builtin/packages/libev/package.py @@ -34,7 +34,7 @@ class Libev(AutotoolsPackage): git = "https://github.com/enki/libev.git" list_url = "http://dist.schmorp.de/libev/Attic/" - version('develop', git=git) + version('develop', branch='master') version('4.24', '94459a5a22db041dec6f98424d6efe54') depends_on('autoconf', type='build', when='@develop') diff --git a/var/spack/repos/builtin/packages/libxsmm/package.py b/var/spack/repos/builtin/packages/libxsmm/package.py index e88ce2c8ad..724718cd37 100644 --- a/var/spack/repos/builtin/packages/libxsmm/package.py +++ b/var/spack/repos/builtin/packages/libxsmm/package.py @@ -35,7 +35,7 @@ class Libxsmm(MakefilePackage): url = 'https://github.com/hfp/libxsmm/archive/1.9.tar.gz' git = 'https://github.com/hfp/libxsmm.git' - version('develop', git=git) + version('develop', branch='master') version('1.9', 'a001a491d9b98239bc2bfd906bd09d90') version('1.8.3', '3415928340929c3a29773934de05c978') version('1.8.2', '8f11ece699244c28dcb6742969a2ccd4') diff --git a/var/spack/repos/builtin/packages/lrzip/package.py b/var/spack/repos/builtin/packages/lrzip/package.py index 268f0ed817..30aa0c40cc 100644 --- a/var/spack/repos/builtin/packages/lrzip/package.py +++ b/var/spack/repos/builtin/packages/lrzip/package.py @@ -37,7 +37,7 @@ class Lrzip(Package): url = 'https://github.com/ckolivas/lrzip/archive/v0.630.tar.gz' git = 'https://github.com/ckolivas/lrzip.git' - version('master', git=git) + version('master', branch='master') version('0.630', '3ca7f1d1365aa105089d1fbfc6b0924a') version('0.621', '1f07227b39ae81a98934411e8611e341') version('0.616', 'd40bdb046d0807ef602e36b1e9782cc0') diff --git a/var/spack/repos/builtin/packages/mfem/package.py b/var/spack/repos/builtin/packages/mfem/package.py index 832ad61191..6f83a45a7f 100644 --- a/var/spack/repos/builtin/packages/mfem/package.py +++ b/var/spack/repos/builtin/packages/mfem/package.py @@ -73,8 +73,7 @@ class Mfem(Package): 'b70fa3c5080b9ec514fc05f4a04ff74322b99ac4ecd6d99c229f0ed5188fc0ce', url='https://goo.gl/Kd7Jk8', extension='.tar.gz') - version('laghos-v1.0', git='https://github.com/mfem/mfem', - tag='laghos-v1.0') + version('laghos-v1.0', tag='laghos-v1.0') version('3.3', 'b17bd452593aada93dc0fee748fcfbbf4f04ce3e7d77fdd0341cc9103bcacd0b', diff --git a/var/spack/repos/builtin/packages/mpifileutils/package.py b/var/spack/repos/builtin/packages/mpifileutils/package.py index 32ec11a0ed..61a2a2d11d 100644 --- a/var/spack/repos/builtin/packages/mpifileutils/package.py +++ b/var/spack/repos/builtin/packages/mpifileutils/package.py @@ -39,7 +39,7 @@ class Mpifileutils(AutotoolsPackage): url = "https://github.com/hpc/mpifileutils/releases/download/v0.6/mpifileutils-0.6.tar.gz" git = "https://github.com/hpc/mpifileutils.git" - version('develop', git=git) + version('develop', branch='master') version('0.7', 'c081f7f72c4521dddccdcf9e087c5a2b') version('0.6', '620bcc4966907481f1b1a965b28fc9bf') diff --git a/var/spack/repos/builtin/packages/mpir/package.py b/var/spack/repos/builtin/packages/mpir/package.py index 4f26bfe45b..c7fd5aff54 100644 --- a/var/spack/repos/builtin/packages/mpir/package.py +++ b/var/spack/repos/builtin/packages/mpir/package.py @@ -32,7 +32,7 @@ class Mpir(Package): url = "https://github.com/wbhart/mpir/archive/mpir-2.7.0.tar.gz" git = "https://github.com/wbhart/mpir.git" - version('develop', git=git) + version('develop', branch='master') version('2.7.0', '985b5d57bd0e74c74125ee885b9c8f71') version('2.6.0', 'ec17d6a7e026114ceb734b2466aa0a91') diff --git a/var/spack/repos/builtin/packages/mrnet/package.py b/var/spack/repos/builtin/packages/mrnet/package.py index dc7ca9acf9..5e68f7b847 100644 --- a/var/spack/repos/builtin/packages/mrnet/package.py +++ b/var/spack/repos/builtin/packages/mrnet/package.py @@ -33,7 +33,7 @@ class Mrnet(AutotoolsPackage): git = "https://github.com/dyninst/mrnet.git" list_url = "http://ftp.cs.wisc.edu/paradyn/mrnet" - version('5.0.1-3', git=git) + version('5.0.1-3', branch='master') version('5.0.1-2', commit='20b1eacfc6d680d9f6472146d2dfaa0f900cc2e9') version('5.0.1', '17f65738cf1b9f9b95647ff85f69ecdd') version('4.1.0', '5a248298b395b329e2371bf25366115c') diff --git a/var/spack/repos/builtin/packages/nekbone/package.py b/var/spack/repos/builtin/packages/nekbone/package.py index f610c9e416..7dbef6df0e 100644 --- a/var/spack/repos/builtin/packages/nekbone/package.py +++ b/var/spack/repos/builtin/packages/nekbone/package.py @@ -37,7 +37,7 @@ class Nekbone(Package): tags = ['proxy-app', 'ecp-proxy-app'] - version('develop', git=git) + version('develop', branch='master') version('17.0', sha256='ae361cc61368a924398a28a296f675b7f0c4a9516788a7f8fa3c09d787cdf69b') # Variants diff --git a/var/spack/repos/builtin/packages/neuron/package.py b/var/spack/repos/builtin/packages/neuron/package.py index b84ec2db34..cec0f027d7 100644 --- a/var/spack/repos/builtin/packages/neuron/package.py +++ b/var/spack/repos/builtin/packages/neuron/package.py @@ -40,7 +40,7 @@ class Neuron(Package): url = "http://www.neuron.yale.edu/ftp/neuron/versions/v7.5/nrn-7.5.tar.gz" git = "https://github.com/nrnhines/nrn.git" - version('develop', git=git) + version('develop', branch='master') version('7.5', 'fb72c841374dfacbb6c2168ff57bfae9') version('7.4', '2c0bbee8a9e55d60fa26336f4ab7acbf') version('7.3', '993e539cb8bf102ca52e9fefd644ab61') diff --git a/var/spack/repos/builtin/packages/openfoam-org/package.py b/var/spack/repos/builtin/packages/openfoam-org/package.py index 74c7cac236..dfb3af51f6 100644 --- a/var/spack/repos/builtin/packages/openfoam-org/package.py +++ b/var/spack/repos/builtin/packages/openfoam-org/package.py @@ -82,7 +82,7 @@ class OpenfoamOrg(Package): url = "https://github.com/OpenFOAM/OpenFOAM-4.x/archive/version-4.1.tar.gz" git = "https://github.com/OpenFOAM/OpenFOAM-dev.git" - version('develop', git=git) + version('develop', branch='master') version('5.0', 'cd8c5bdd3ff39c34f61747c8e55f59d1', url=baseurl + '/OpenFOAM-5.x/archive/version-5.0.tar.gz') version('4.1', 'afd7d8e66e7db0ffaf519b14f1a8e1d4', diff --git a/var/spack/repos/builtin/packages/piranha/package.py b/var/spack/repos/builtin/packages/piranha/package.py index 21a6324d7b..aaf4102dbb 100644 --- a/var/spack/repos/builtin/packages/piranha/package.py +++ b/var/spack/repos/builtin/packages/piranha/package.py @@ -34,7 +34,7 @@ class Piranha(CMakePackage): url = "https://github.com/bluescarni/piranha/archive/v0.5.tar.gz" git = "https://github.com/bluescarni/piranha.git" - version('develop', git=git) + version('develop', branch='master') version('0.5', '99546bae2be115737b6316751eb0b84d') variant('python', default=True, diff --git a/var/spack/repos/builtin/packages/pocl/package.py b/var/spack/repos/builtin/packages/pocl/package.py index 17288b1080..538e1cfc66 100644 --- a/var/spack/repos/builtin/packages/pocl/package.py +++ b/var/spack/repos/builtin/packages/pocl/package.py @@ -38,7 +38,7 @@ class Pocl(CMakePackage): url = "http://portablecl.org/downloads/pocl-0.13.tar.gz" git = "https://github.com/pocl/pocl.git" - version("master", git=git) + version("master", branch="master") version('0.14', '1d35f09299e76b9e3918c42826555194') version("0.13", "344480864d4269f2f63f1509395898bd") version("0.12", "e197ba3aa01a35f40581c48e053330dd") diff --git a/var/spack/repos/builtin/packages/pxz/package.py b/var/spack/repos/builtin/packages/pxz/package.py index f6acaee49f..38ebffa629 100644 --- a/var/spack/repos/builtin/packages/pxz/package.py +++ b/var/spack/repos/builtin/packages/pxz/package.py @@ -32,7 +32,7 @@ class Pxz(MakefilePackage): url = "http://jnovy.fedorapeople.org/pxz/pxz-4.999.9beta.20091201git.tar.xz" git = "https://github.com/jnovy/pxz.git" - version('develop', git=git) + version('develop', branch='master') version('4.999.9beta.20091201git', '4ae3926185978f5c95c9414dc4634451') depends_on('lzma') diff --git a/var/spack/repos/builtin/packages/py-symengine/package.py b/var/spack/repos/builtin/packages/py-symengine/package.py index 8b3187ef37..b3efc57390 100644 --- a/var/spack/repos/builtin/packages/py-symengine/package.py +++ b/var/spack/repos/builtin/packages/py-symengine/package.py @@ -32,7 +32,7 @@ class PySymengine(PythonPackage): url = "https://github.com/symengine/symengine.py/archive/v0.2.0.tar.gz" git = "https://github.com/symengine/symengine.py.git" - version('develop', git=git) + version('develop', branch='master') version('0.2.0', 'e1d114fa12be4c8c7e9f24007e07718c') # Build dependencies diff --git a/var/spack/repos/builtin/packages/r-rhtslib/package.py b/var/spack/repos/builtin/packages/r-rhtslib/package.py index 4a43685abf..c6568fca67 100644 --- a/var/spack/repos/builtin/packages/r-rhtslib/package.py +++ b/var/spack/repos/builtin/packages/r-rhtslib/package.py @@ -33,9 +33,9 @@ class RRhtslib(RPackage): are in the vignette, vignette(package="Rhtslib", "Rhtslib").""" homepage = "https://www.bioconductor.org/packages/Rhtslib/" - url = "https://git.bioconductor.org/packages/Rhtslib" + git = "https://git.bioconductor.org/packages/Rhtslib.git" - version('1.8.0', git='https://git.bioconductor.org/packages/Rhtslib', commit='3b5493473bed42958614091c58c739932ffcfa79') + version('1.8.0', commit='3b5493473bed42958614091c58c739932ffcfa79') depends_on('r@3.4.0:3.4.9', when='@1.8.0') depends_on('r-zlibbioc', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/raft/package.py b/var/spack/repos/builtin/packages/raft/package.py index 48d8cd12f6..37a49e69c5 100644 --- a/var/spack/repos/builtin/packages/raft/package.py +++ b/var/spack/repos/builtin/packages/raft/package.py @@ -34,7 +34,7 @@ class Raft(CMakePackage): url = "https://bitbucket.org/gill_martinez/raft_aps/get/1.2.3.tar.gz" git = "https://bitbucket.org/gill_martinez/raft_aps.git" - version('develop', git=git) + version('develop', branch='master') version('1.2.3', '4d1b106d9b3493e63dde96f7dd44b834') depends_on('mpi') diff --git a/var/spack/repos/builtin/packages/slepc/package.py b/var/spack/repos/builtin/packages/slepc/package.py index 9bdb4436e3..1030f04849 100644 --- a/var/spack/repos/builtin/packages/slepc/package.py +++ b/var/spack/repos/builtin/packages/slepc/package.py @@ -33,7 +33,7 @@ class Slepc(Package): url = "http://slepc.upv.es/download/distrib/slepc-3.6.2.tar.gz" git = "https://bitbucket.org/slepc/slepc.git" - version('develop', git=git) + version('develop', branch='master') version('3.9.1', 'e174ea7c127d9161eef976b0288f0c56d443a58d6ab2dc8af1e8bd66f156ce17') version('3.9.0', '1f3930db56b4065aaf214ea758ddff1a70bf19d45544cbdfd19d2787db4bfe0b') version('3.8.2', '1e7d20d20eb26da307d36017461fe4a55f40e947e232739179dbe6412e22ed13') diff --git a/var/spack/repos/builtin/packages/symengine/package.py b/var/spack/repos/builtin/packages/symengine/package.py index 6a8837f6a0..8518ac66bf 100644 --- a/var/spack/repos/builtin/packages/symengine/package.py +++ b/var/spack/repos/builtin/packages/symengine/package.py @@ -33,7 +33,7 @@ class Symengine(CMakePackage): url = "https://github.com/symengine/symengine/archive/v0.2.0.tar.gz" git = "https://github.com/symengine/symengine.git" - version('develop', git=git) + version('develop', branch='master') version('0.3.0', 'e61d7513cca4963cd062616891de54c6') version('0.2.0', '45401561add36a13c1f0b0c5f8d7422d') version('0.1.0', '41ad7daed61fc5a77c285eb6c7303425') diff --git a/var/spack/repos/builtin/packages/tethex/package.py b/var/spack/repos/builtin/packages/tethex/package.py index dc1f834920..d3e6f4ae93 100644 --- a/var/spack/repos/builtin/packages/tethex/package.py +++ b/var/spack/repos/builtin/packages/tethex/package.py @@ -38,7 +38,7 @@ class Tethex(CMakePackage): maintainers = ['davydden'] - version('develop', git=git) + version('develop', branch='master') version('0.0.7', '6c9e4a18a6637deb4400c6d77ec03184') variant('build_type', default='Release', diff --git a/var/spack/repos/builtin/packages/valgrind/package.py b/var/spack/repos/builtin/packages/valgrind/package.py index baa22f157d..095dd98232 100644 --- a/var/spack/repos/builtin/packages/valgrind/package.py +++ b/var/spack/repos/builtin/packages/valgrind/package.py @@ -40,7 +40,7 @@ class Valgrind(AutotoolsPackage): url = "https://sourceware.org/pub/valgrind/valgrind-3.13.0.tar.bz2" git = "git://sourceware.org/git/valgrind.git" - version('develop', git=git) + version('develop', branch='master') version('3.13.0', '817dd08f1e8a66336b9ff206400a5369') version('3.12.0', '6eb03c0c10ea917013a7622e483d61bb') version('3.11.0', '4ea62074da73ae82e0162d6550d3f129') diff --git a/var/spack/repos/builtin/packages/veclibfort/package.py b/var/spack/repos/builtin/packages/veclibfort/package.py index 21512e4d8e..5297d2d7d9 100644 --- a/var/spack/repos/builtin/packages/veclibfort/package.py +++ b/var/spack/repos/builtin/packages/veclibfort/package.py @@ -35,7 +35,7 @@ class Veclibfort(Package): url = "https://github.com/mcg1969/vecLibFort/archive/0.4.2.tar.gz" git = "https://github.com/mcg1969/vecLibFort.git" - version('develop', git=git) + version('develop', branch='master') version('0.4.2', '83395ffcbe8a2122c3f726a5c3a7cf93') variant('shared', default=True, diff --git a/var/spack/repos/builtin/packages/yasm/package.py b/var/spack/repos/builtin/packages/yasm/package.py index 9bcc2ee8ab..0581bf6b45 100644 --- a/var/spack/repos/builtin/packages/yasm/package.py +++ b/var/spack/repos/builtin/packages/yasm/package.py @@ -35,7 +35,7 @@ class Yasm(AutotoolsPackage): url = "http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz" git = "https://github.com/yasm/yasm.git" - version('develop', git=git) + version('develop', branch='master') version('1.3.0', 'fc9e586751ff789b34b1f21d572d96af') depends_on('autoconf', when='@develop') -- cgit v1.2.3-70-g09d2 From e948a54d8e44ca5b20d4c41c8c6f2344fde32f0f Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Tue, 24 Jul 2018 21:17:01 -0500 Subject: All git URLs end in .git --- var/spack/repos/builtin/packages/amg/package.py | 2 +- var/spack/repos/builtin/packages/branson/package.py | 2 +- var/spack/repos/builtin/packages/foam-extend/package.py | 8 ++++---- var/spack/repos/builtin/packages/hoomd-blue/package.py | 2 +- var/spack/repos/builtin/packages/hpctoolkit-externals/package.py | 2 +- var/spack/repos/builtin/packages/hpctoolkit/package.py | 2 +- var/spack/repos/builtin/packages/intel-xed/package.py | 2 +- var/spack/repos/builtin/packages/lammps/package.py | 2 +- var/spack/repos/builtin/packages/mad-numdiff/package.py | 2 +- var/spack/repos/builtin/packages/pgmath/package.py | 2 +- var/spack/repos/builtin/packages/poppler/package.py | 2 +- var/spack/repos/builtin/packages/ruby-narray/package.py | 2 +- var/spack/repos/builtin/packages/sw4lite/package.py | 2 +- var/spack/repos/builtin/packages/swfft/package.py | 2 +- var/spack/repos/builtin/packages/trilinos/package.py | 4 ++-- 15 files changed, 19 insertions(+), 19 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/amg/package.py b/var/spack/repos/builtin/packages/amg/package.py index f2745ed26d..271c1ba0fc 100644 --- a/var/spack/repos/builtin/packages/amg/package.py +++ b/var/spack/repos/builtin/packages/amg/package.py @@ -33,7 +33,7 @@ class Amg(MakefilePackage): tags = ['proxy-app', 'ecp-proxy-app'] homepage = "https://codesign.llnl.gov/amg2013.php" - git = "https://github.com/LLNL/AMG" + git = "https://github.com/LLNL/AMG.git" version('develop', branch='master') version('1.0', tag='1.0') diff --git a/var/spack/repos/builtin/packages/branson/package.py b/var/spack/repos/builtin/packages/branson/package.py index 999a08d891..a5bf0d4f7f 100644 --- a/var/spack/repos/builtin/packages/branson/package.py +++ b/var/spack/repos/builtin/packages/branson/package.py @@ -32,7 +32,7 @@ class Branson(CMakePackage): homepage = "https://github.com/lanl/branson" url = "https://github.com/lanl/branson/archive/1.01.zip" - git = "https://github.com/lanl/branson" + git = "https://github.com/lanl/branson.git" tags = ['proxy-app'] diff --git a/var/spack/repos/builtin/packages/foam-extend/package.py b/var/spack/repos/builtin/packages/foam-extend/package.py index 9d103b914b..7de30232a3 100644 --- a/var/spack/repos/builtin/packages/foam-extend/package.py +++ b/var/spack/repos/builtin/packages/foam-extend/package.py @@ -76,10 +76,10 @@ class FoamExtend(Package): homepage = "http://www.extend-project.de/" - version('4.0', git='http://git.code.sf.net/p/foam-extend/foam-extend-4.0') - version('3.2', git='http://git.code.sf.net/p/foam-extend/foam-extend-3.2') - version('3.1', git='http://git.code.sf.net/p/foam-extend/foam-extend-3.1') - version('3.0', git='http://git.code.sf.net/p/foam-extend/foam-extend-3.0') + version('4.0', git='http://git.code.sf.net/p/foam-extend/foam-extend-4.0.git') + version('3.2', git='http://git.code.sf.net/p/foam-extend/foam-extend-3.2.git') + version('3.1', git='http://git.code.sf.net/p/foam-extend/foam-extend-3.1.git') + version('3.0', git='http://git.code.sf.net/p/foam-extend/foam-extend-3.0.git') # variant('int64', default=False, # description='Compile with 64-bit label') diff --git a/var/spack/repos/builtin/packages/hoomd-blue/package.py b/var/spack/repos/builtin/packages/hoomd-blue/package.py index a0093a30cb..c8808549dc 100644 --- a/var/spack/repos/builtin/packages/hoomd-blue/package.py +++ b/var/spack/repos/builtin/packages/hoomd-blue/package.py @@ -37,7 +37,7 @@ class HoomdBlue(CMakePackage): and perform in situ analysis.""" homepage = "http://glotzerlab.engin.umich.edu/hoomd-blue/" - git = "https://bitbucket.org/glotzer/hoomd-blue" + git = "https://bitbucket.org/glotzer/hoomd-blue.git" version('develop', submodules=True) diff --git a/var/spack/repos/builtin/packages/hpctoolkit-externals/package.py b/var/spack/repos/builtin/packages/hpctoolkit-externals/package.py index 78f33e161d..6b836eb838 100644 --- a/var/spack/repos/builtin/packages/hpctoolkit-externals/package.py +++ b/var/spack/repos/builtin/packages/hpctoolkit-externals/package.py @@ -30,7 +30,7 @@ class HpctoolkitExternals(Package): HpctoolkitExternals package provides all these prerequisites.""" homepage = "http://hpctoolkit.org" - git = "https://github.com/HPCToolkit/hpctoolkit-externals" + git = "https://github.com/HPCToolkit/hpctoolkit-externals.git" version('master') version('2017.06', tag='release-2017.06') diff --git a/var/spack/repos/builtin/packages/hpctoolkit/package.py b/var/spack/repos/builtin/packages/hpctoolkit/package.py index 9dfa96d7d8..5943b7f2d2 100644 --- a/var/spack/repos/builtin/packages/hpctoolkit/package.py +++ b/var/spack/repos/builtin/packages/hpctoolkit/package.py @@ -34,7 +34,7 @@ class Hpctoolkit(Package): and attributes them to the full calling context in which they occur.""" homepage = "http://hpctoolkit.org" - git = "https://github.com/HPCToolkit/hpctoolkit" + git = "https://github.com/HPCToolkit/hpctoolkit.git" version('master') version('2017.06', tag='release-2017.06') diff --git a/var/spack/repos/builtin/packages/intel-xed/package.py b/var/spack/repos/builtin/packages/intel-xed/package.py index 5905868ae3..3fe66b9f6f 100644 --- a/var/spack/repos/builtin/packages/intel-xed/package.py +++ b/var/spack/repos/builtin/packages/intel-xed/package.py @@ -38,7 +38,7 @@ class IntelXed(Package): version('2018.02.14', commit='44d06033b69aef2c20ab01bfb518c52cd71bb537') resource(name='mbuild', - git='https://github.com/intelxed/mbuild', + git='https://github.com/intelxed/mbuild.git', commit='bb9123152a330c7fa1ff1a502950dc199c83e177', destination='') diff --git a/var/spack/repos/builtin/packages/lammps/package.py b/var/spack/repos/builtin/packages/lammps/package.py index 238e56500a..b05f566cb2 100644 --- a/var/spack/repos/builtin/packages/lammps/package.py +++ b/var/spack/repos/builtin/packages/lammps/package.py @@ -35,7 +35,7 @@ class Lammps(CMakePackage): """ homepage = "http://lammps.sandia.gov/" url = "https://github.com/lammps/lammps/archive/patch_1Sep2017.tar.gz" - git = "https://github.com/lammps/lammps" + git = "https://github.com/lammps/lammps.git" tags = ['ecp', 'ecp-apps'] diff --git a/var/spack/repos/builtin/packages/mad-numdiff/package.py b/var/spack/repos/builtin/packages/mad-numdiff/package.py index b4a0235f55..6003072b2b 100644 --- a/var/spack/repos/builtin/packages/mad-numdiff/package.py +++ b/var/spack/repos/builtin/packages/mad-numdiff/package.py @@ -31,7 +31,7 @@ class MadNumdiff(CMakePackage): homepage = "https://github.com/quinoacomputing/ndiff" url = "https://github.com/quinoacomputing/ndiff/tarball/20150724" - git = "https://github.com/quinoacomputing/ndiff" + git = "https://github.com/quinoacomputing/ndiff.git" version('develop', branch='master') version('20150724', '7723c0f2499aea8fd960377c5bed28d8') diff --git a/var/spack/repos/builtin/packages/pgmath/package.py b/var/spack/repos/builtin/packages/pgmath/package.py index 9358d353ce..45a9c77bc3 100644 --- a/var/spack/repos/builtin/packages/pgmath/package.py +++ b/var/spack/repos/builtin/packages/pgmath/package.py @@ -30,7 +30,7 @@ class Pgmath(CMakePackage): """Flang's math library""" homepage = "https://github.com/flang-compiler/flang" - git = "https://github.com/flang-compiler/flang" + git = "https://github.com/flang-compiler/flang.git" version('develop', branch='master') diff --git a/var/spack/repos/builtin/packages/poppler/package.py b/var/spack/repos/builtin/packages/poppler/package.py index 3d168c1cdc..03ad826327 100644 --- a/var/spack/repos/builtin/packages/poppler/package.py +++ b/var/spack/repos/builtin/packages/poppler/package.py @@ -70,7 +70,7 @@ class Poppler(CMakePackage): # Only needed to run `make test` resource( name='test', - git='https://anongit.freedesktop.org/git/poppler/test', + git='https://anongit.freedesktop.org/git/poppler/test.git', placement='testdata' ) diff --git a/var/spack/repos/builtin/packages/ruby-narray/package.py b/var/spack/repos/builtin/packages/ruby-narray/package.py index 97d30d96d4..1f9922cf01 100644 --- a/var/spack/repos/builtin/packages/ruby-narray/package.py +++ b/var/spack/repos/builtin/packages/ruby-narray/package.py @@ -31,7 +31,7 @@ class RubyNarray(Package): similar to numpy.ndaray.""" homepage = "https://rubygems.org/gems/narray" - git = "https://github.com/ruby-numo/narray" + git = "https://github.com/ruby-numo/narray.git" version('0.9.0.9', commit='9cadbbccf1e01b6d1bc143c19d598cad1c420869') diff --git a/var/spack/repos/builtin/packages/sw4lite/package.py b/var/spack/repos/builtin/packages/sw4lite/package.py index 75ed9ac76e..d6358f98a9 100644 --- a/var/spack/repos/builtin/packages/sw4lite/package.py +++ b/var/spack/repos/builtin/packages/sw4lite/package.py @@ -34,7 +34,7 @@ class Sw4lite(MakefilePackage): homepage = "https://geodynamics.org/cig/software/sw4" url = "https://github.com/geodynamics/sw4lite/archive/v1.0.zip" - git = "https://github.com/geodynamics/sw4lite" + git = "https://github.com/geodynamics/sw4lite.git" version('develop', branch='master') version('1.0', '3d911165f4f2ff6d5f9c1bd56ab6723f') diff --git a/var/spack/repos/builtin/packages/swfft/package.py b/var/spack/repos/builtin/packages/swfft/package.py index 1ffecb82ce..21ccabfb46 100644 --- a/var/spack/repos/builtin/packages/swfft/package.py +++ b/var/spack/repos/builtin/packages/swfft/package.py @@ -32,7 +32,7 @@ class Swfft(MakefilePackage): homepage = "https://xgitlab.cels.anl.gov/hacc/SWFFT" url = "https://xgitlab.cels.anl.gov/api/v4/projects/hacc%2FSWFFT/repository/archive.tar.gz?sha=v1.0" - git = "https://xgitlab.cels.anl.gov/hacc/SWFFT" + git = "https://xgitlab.cels.anl.gov/hacc/SWFFT.git" version('1.0', '0fbc34544b97ba9c3fb19ef2d7a0f076') version('develop', branch='master') diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index b91811e17b..b16d00bb65 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -191,12 +191,12 @@ class Trilinos(CMakePackage): description='Enable ForTrilinos') resource(name='dtk', - git='https://github.com/ornl-cees/DataTransferKit', + git='https://github.com/ornl-cees/DataTransferKit.git', tag='master', placement='DataTransferKit', when='+dtk') resource(name='fortrilinos', - git='https://github.com/trilinos/ForTrilinos', + git='https://github.com/trilinos/ForTrilinos.git', tag='develop', placement='packages/ForTrilinos', when='+fortrilinos') -- cgit v1.2.3-70-g09d2 From 68c2bdfaf6399ee3584bd30edad1b0b2607ab952 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Tue, 24 Jul 2018 21:56:56 -0500 Subject: Further improvements to version parsing --- var/spack/repos/builtin/packages/assimp/package.py | 2 +- .../repos/builtin/packages/bohrium/package.py | 2 +- var/spack/repos/builtin/packages/er/package.py | 2 +- var/spack/repos/builtin/packages/essl/package.py | 1 - .../repos/builtin/packages/gearshifft/package.py | 3 ++- .../repos/builtin/packages/go-bootstrap/package.py | 2 +- var/spack/repos/builtin/packages/kvtree/package.py | 2 +- var/spack/repos/builtin/packages/latte/package.py | 2 +- var/spack/repos/builtin/packages/ldc/package.py | 2 +- .../repos/builtin/packages/libconfig/package.py | 2 +- .../repos/builtin/packages/miniamr/package.py | 2 +- var/spack/repos/builtin/packages/opengl/package.py | 1 - .../repos/builtin/packages/openglu/package.py | 1 - var/spack/repos/builtin/packages/pegtl/package.py | 2 +- .../packages/perl-contextual-return/package.py | 2 +- .../builtin/packages/perl-gd-graph/package.py | 2 +- .../builtin/packages/perl-io-compress/package.py | 2 +- .../builtin/packages/perl-soap-lite/package.py | 2 +- .../repos/builtin/packages/perl-version/package.py | 2 +- .../repos/builtin/packages/py-pylint/package.py | 3 ++- .../builtin/packages/quantum-espresso/package.py | 29 ++++------------------ .../repos/builtin/packages/r-cluster/package.py | 2 +- var/spack/repos/builtin/packages/r-rda/package.py | 3 ++- .../repos/builtin/packages/r-rsqlite/package.py | 3 ++- .../repos/builtin/packages/r-sfsmisc/package.py | 3 ++- .../repos/builtin/packages/r-spatial/package.py | 2 +- var/spack/repos/builtin/packages/redset/package.py | 2 +- .../repos/builtin/packages/rockstar/package.py | 1 - .../repos/builtin/packages/sailfish/package.py | 2 +- .../repos/builtin/packages/shuffile/package.py | 2 +- .../repos/builtin/packages/spectrum-mpi/package.py | 6 +---- .../repos/builtin/packages/votca-xtp/package.py | 2 +- var/spack/repos/builtin/packages/yambo/package.py | 2 +- 33 files changed, 38 insertions(+), 60 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/assimp/package.py b/var/spack/repos/builtin/packages/assimp/package.py index e365e83e72..9e3687a95d 100644 --- a/var/spack/repos/builtin/packages/assimp/package.py +++ b/var/spack/repos/builtin/packages/assimp/package.py @@ -30,7 +30,7 @@ class Assimp(CMakePackage): import various well-known 3D model formats in a uniform manner.""" homepage = "https://www.assimp.org" - url = "https://github.com/assimp/assimp/archive/v3.3.1.tar.gz" + url = "https://github.com/assimp/assimp/archive/v4.0.1.tar.gz" version('4.0.1', '23a6301c728a413aafbfa1cca19ba91f') diff --git a/var/spack/repos/builtin/packages/bohrium/package.py b/var/spack/repos/builtin/packages/bohrium/package.py index 1a2a39a8e1..704240d311 100644 --- a/var/spack/repos/builtin/packages/bohrium/package.py +++ b/var/spack/repos/builtin/packages/bohrium/package.py @@ -33,7 +33,7 @@ class Bohrium(CMakePackage, CudaPackage): """Library for automatic acceleration of array operations""" homepage = "http://bh107.org" - url = "https://github.com/bh107/bohrium/archive/v0.8.9.tar.gz" + url = "https://github.com/bh107/bohrium/archive/v0.9.0.tar.gz" git = "https://github.com/bh107/bohrium.git" maintainers = ['mfherbst'] diff --git a/var/spack/repos/builtin/packages/er/package.py b/var/spack/repos/builtin/packages/er/package.py index 90f7805da5..baf2d01db7 100644 --- a/var/spack/repos/builtin/packages/er/package.py +++ b/var/spack/repos/builtin/packages/er/package.py @@ -29,7 +29,7 @@ class Er(CMakePackage): """Encoding and redundancy on a file set""" homepage = "https://github.com/ECP-VeloC/er" - url = "https://github.com/ECP-VeloC/er/archive/v0.0.1.zip" + url = "https://github.com/ECP-VeloC/er/archive/v0.0.2.zip" git = "https://github.com/ecp-veloc/er.git" tags = ['ecp'] diff --git a/var/spack/repos/builtin/packages/essl/package.py b/var/spack/repos/builtin/packages/essl/package.py index f153735699..b1a7e39ea9 100644 --- a/var/spack/repos/builtin/packages/essl/package.py +++ b/var/spack/repos/builtin/packages/essl/package.py @@ -29,7 +29,6 @@ class Essl(Package): """IBM's Engineering and Scientific Subroutine Library (ESSL).""" homepage = "https://www.ibm.com/systems/power/software/essl/" - url = "ibm-essl" version('6.1') version('5.5') diff --git a/var/spack/repos/builtin/packages/gearshifft/package.py b/var/spack/repos/builtin/packages/gearshifft/package.py index 685a3e692f..f2a4d015a6 100644 --- a/var/spack/repos/builtin/packages/gearshifft/package.py +++ b/var/spack/repos/builtin/packages/gearshifft/package.py @@ -29,7 +29,8 @@ class Gearshifft(CMakePackage): """Benchmark Suite for Heterogenuous FFT Implementations""" homepage = "https://github.com/mpicbg-scicomp/gearshifft" - url = "https://github.com/mpicbg-scicomp/gearshifft/archive/v0.2.0.tar.gz" + url = "https://github.com/mpicbg-scicomp/gearshifft/archive/v0.2.1-lw.tar.gz" + maintainers = ['ax3l'] version('0.2.1-lw', 'c3208b767b24255b488a83e5d9e517ea') diff --git a/var/spack/repos/builtin/packages/go-bootstrap/package.py b/var/spack/repos/builtin/packages/go-bootstrap/package.py index 3e7784c22d..c7794a40e9 100644 --- a/var/spack/repos/builtin/packages/go-bootstrap/package.py +++ b/var/spack/repos/builtin/packages/go-bootstrap/package.py @@ -36,8 +36,8 @@ from spack import * class GoBootstrap(Package): """Old C-bootstrapped go to bootstrap real go""" + homepage = "https://golang.org" - url = "https://go.googlesource.com/go" extendable = True diff --git a/var/spack/repos/builtin/packages/kvtree/package.py b/var/spack/repos/builtin/packages/kvtree/package.py index aeff98804d..46392716df 100644 --- a/var/spack/repos/builtin/packages/kvtree/package.py +++ b/var/spack/repos/builtin/packages/kvtree/package.py @@ -30,7 +30,7 @@ class Kvtree(CMakePackage): hashes.""" homepage = "https://github.com/ECP-VeloC/KVTree" - url = "https://github.com/ECP-VeloC/KVTree/archive/v1.0.0.zip" + url = "https://github.com/ECP-VeloC/KVTree/archive/v1.0.1.zip" git = "https://github.com/ecp-veloc/kvtree.git" tags = ['ecp'] diff --git a/var/spack/repos/builtin/packages/latte/package.py b/var/spack/repos/builtin/packages/latte/package.py index ce4246123f..badc09fbb1 100644 --- a/var/spack/repos/builtin/packages/latte/package.py +++ b/var/spack/repos/builtin/packages/latte/package.py @@ -30,7 +30,7 @@ class Latte(CMakePackage): """Open source density functional tight binding molecular dynamics.""" homepage = "https://github.com/lanl/latte" - url = "https://github.com/lanl/latte/tarball/v1.0" + url = "https://github.com/lanl/latte/tarball/v1.2.1" git = "https://github.com/lanl/latte.git" tags = ['ecp', 'ecp-apps'] diff --git a/var/spack/repos/builtin/packages/ldc/package.py b/var/spack/repos/builtin/packages/ldc/package.py index f4b007361f..04b2639192 100644 --- a/var/spack/repos/builtin/packages/ldc/package.py +++ b/var/spack/repos/builtin/packages/ldc/package.py @@ -36,7 +36,7 @@ class Ldc(CMakePackage): """ homepage = "https://dlang.org/" - url = "https://github.com/ldc-developers/ldc/releases/download/v0.17.4/ldc-0.17.4-src.tar.gz" + url = "https://github.com/ldc-developers/ldc/releases/download/v1.3.0/ldc-1.3.0-src.tar.gz" version('1.3.0', '537d992a361b0fd0440b24a5145c9107') diff --git a/var/spack/repos/builtin/packages/libconfig/package.py b/var/spack/repos/builtin/packages/libconfig/package.py index ea337d057e..b4a4927d61 100644 --- a/var/spack/repos/builtin/packages/libconfig/package.py +++ b/var/spack/repos/builtin/packages/libconfig/package.py @@ -29,7 +29,7 @@ class Libconfig(AutotoolsPackage): """C/C++ Configuration File Library""" homepage = "http://www.hyperrealm.com/libconfig/" - url = "https://github.com/hyperrealm/libconfig/archive/v1.6.tar.gz" + url = "https://github.com/hyperrealm/libconfig/archive/v1.5.tar.gz" force_autoreconf = True # there is currently a build error with version 1.6, see: diff --git a/var/spack/repos/builtin/packages/miniamr/package.py b/var/spack/repos/builtin/packages/miniamr/package.py index 838872fd7a..ae725bb868 100644 --- a/var/spack/repos/builtin/packages/miniamr/package.py +++ b/var/spack/repos/builtin/packages/miniamr/package.py @@ -32,7 +32,7 @@ class Miniamr(MakefilePackage): """ homepage = "https://mantevo.org" - url = "https://github.com/Mantevo/miniAMR/archive/v1.4.tar.gz" + url = "https://github.com/Mantevo/miniAMR/archive/v1.4.0.tar.gz" tags = ['proxy-app', 'ecp-proxy-app'] diff --git a/var/spack/repos/builtin/packages/opengl/package.py b/var/spack/repos/builtin/packages/opengl/package.py index ddcc273c3e..b970015c21 100644 --- a/var/spack/repos/builtin/packages/opengl/package.py +++ b/var/spack/repos/builtin/packages/opengl/package.py @@ -29,7 +29,6 @@ class Opengl(Package): """Placeholder for external OpenGL libraries from hardware vendors""" homepage = "https://www.opengl.org/" - url = "https://www.opengl.org/" # A second argument (usually the hash) must be supplied to the # version directive, but 'n/a' is used here because this package diff --git a/var/spack/repos/builtin/packages/openglu/package.py b/var/spack/repos/builtin/packages/openglu/package.py index a6e3283f30..3ffd6b1536 100644 --- a/var/spack/repos/builtin/packages/openglu/package.py +++ b/var/spack/repos/builtin/packages/openglu/package.py @@ -30,7 +30,6 @@ class Openglu(Package): vendors""" homepage = "https://www.opengl.org/resources/libraries" - url = "https://www.opengl.org/resources/libraries" # A second argument (usually the has) must be supplied to the # version directive, but 'n/a' is used here because this package diff --git a/var/spack/repos/builtin/packages/pegtl/package.py b/var/spack/repos/builtin/packages/pegtl/package.py index 0896371c3f..60fde4896f 100644 --- a/var/spack/repos/builtin/packages/pegtl/package.py +++ b/var/spack/repos/builtin/packages/pegtl/package.py @@ -34,7 +34,7 @@ class Pegtl(CMakePackage): """ homepage = "https://github.com/taocpp/PEGTL" - url = "https://github.com/taocpp/PEGTL/tarball/1.3.1" + url = "https://github.com/taocpp/PEGTL/tarball/2.1.4" git = "https://github.com/taocpp/PEGTL.git" version('develop', branch='master') diff --git a/var/spack/repos/builtin/packages/perl-contextual-return/package.py b/var/spack/repos/builtin/packages/perl-contextual-return/package.py index 8ed3db939a..fe8e271f8a 100644 --- a/var/spack/repos/builtin/packages/perl-contextual-return/package.py +++ b/var/spack/repos/builtin/packages/perl-contextual-return/package.py @@ -29,7 +29,7 @@ class PerlContextualReturn(PerlPackage): """Create context-sensitive return values""" homepage = "http://search.cpan.org/~dconway/Contextual-Return/lib/Contextual/Return.pm" - url = "http://search.cpan.org/CPAN/authors/id/D/DC/DCONWAY/Contextual-Return-0.004008.tar.gz" + url = "http://search.cpan.org/CPAN/authors/id/D/DC/DCONWAY/Contextual-Return-0.004014.tar.gz" version('0.004014', '5cb31f1637c17af6a8e5b852d820af79') diff --git a/var/spack/repos/builtin/packages/perl-gd-graph/package.py b/var/spack/repos/builtin/packages/perl-gd-graph/package.py index ea34760ae1..c745c6f75e 100644 --- a/var/spack/repos/builtin/packages/perl-gd-graph/package.py +++ b/var/spack/repos/builtin/packages/perl-gd-graph/package.py @@ -29,7 +29,7 @@ class PerlGdGraph(PerlPackage): """Graph Plotting Module for Perl 5""" homepage = "http://search.cpan.org/~bwarfield/GDGraph/Graph.pm" - url = "http://search.cpan.org/CPAN/authors/id/B/BW/BWARFIELD/GDGraph-1.44.tar.gz" + url = "http://search.cpan.org/CPAN/authors/id/B/BW/BWARFIELD/GDGraph-1.4308.tar.gz" version('1.4308', 'fcdd34d5e09ae917b5d264887734b3b1') diff --git a/var/spack/repos/builtin/packages/perl-io-compress/package.py b/var/spack/repos/builtin/packages/perl-io-compress/package.py index 5ae1dacd3a..c0eaac5aa4 100644 --- a/var/spack/repos/builtin/packages/perl-io-compress/package.py +++ b/var/spack/repos/builtin/packages/perl-io-compress/package.py @@ -30,7 +30,7 @@ class PerlIoCompress(PerlPackage): or lzop file/buffer.""" homepage = "http://search.cpan.org/~pmqs/IO-Compress-2.070/lib/IO/Uncompress/AnyUncompress.pm" - url = "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/IO-Compress-2.070.tar.gz" + url = "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/IO-Compress-2.081.tar.gz" version('2.081', '379932c1b9428b873ed7ad3c1db15872') diff --git a/var/spack/repos/builtin/packages/perl-soap-lite/package.py b/var/spack/repos/builtin/packages/perl-soap-lite/package.py index e0c6c4ad01..a2c4e94e38 100644 --- a/var/spack/repos/builtin/packages/perl-soap-lite/package.py +++ b/var/spack/repos/builtin/packages/perl-soap-lite/package.py @@ -29,7 +29,7 @@ class PerlSoapLite(PerlPackage): """Perl's Web Services Toolkit""" homepage = "http://search.cpan.org/~phred/SOAP-Lite-1.20/lib/SOAP/Lite.pm" - url = "http://search.cpan.org/CPAN/authors/id/P/PH/PHRED/SOAP-Lite-1.20.tar.gz" + url = "http://search.cpan.org/CPAN/authors/id/P/PH/PHRED/SOAP-Lite-1.22.tar.gz" version('1.22', '86c31341311498a08c6309e62168f655') diff --git a/var/spack/repos/builtin/packages/perl-version/package.py b/var/spack/repos/builtin/packages/perl-version/package.py index 77c963433a..8cbdc2bde0 100644 --- a/var/spack/repos/builtin/packages/perl-version/package.py +++ b/var/spack/repos/builtin/packages/perl-version/package.py @@ -29,7 +29,7 @@ class PerlVersion(PerlPackage): """Parse and manipulate Perl version strings""" homepage = "http://search.cpan.org/~bdfoy/Perl-Version-1.013/lib/Perl/Version.pm" - url = "http://search.cpan.org/CPAN/authors/id/B/BD/BDFOY/Perl-Version-1.013.tar.gz" + url = "http://search.cpan.org/CPAN/authors/id/B/BD/BDFOY/Perl-Version-1.013_03.tar.gz" version('1.013_03', 'b2c94c8b33ccfa1635c760fcfa1c5358') diff --git a/var/spack/repos/builtin/packages/py-pylint/package.py b/var/spack/repos/builtin/packages/py-pylint/package.py index 891b4c356a..0a5ab5b676 100644 --- a/var/spack/repos/builtin/packages/py-pylint/package.py +++ b/var/spack/repos/builtin/packages/py-pylint/package.py @@ -27,8 +27,9 @@ from spack import * class PyPylint(PythonPackage): """array processing for numbers, strings, records, and objects.""" + homepage = "https://pypi.python.org/pypi/pylint" - url = "https://pypi.io/packages/source/p/pylint/pylint-1.7.2.tar.gz" + url = "https://pypi.io/packages/source/p/pylint/pylint-1.6.5.tar.gz" # version('1.7.2', '27ee752cdcfacb05bf4940947e6b35c6') # see dependencies version('1.6.5', '31da2185bf59142479e4fa16d8a9e347') diff --git a/var/spack/repos/builtin/packages/quantum-espresso/package.py b/var/spack/repos/builtin/packages/quantum-espresso/package.py index a90eaf4b9d..989dba3147 100644 --- a/var/spack/repos/builtin/packages/quantum-espresso/package.py +++ b/var/spack/repos/builtin/packages/quantum-espresso/package.py @@ -36,31 +36,12 @@ class QuantumEspresso(Package): """ homepage = 'http://quantum-espresso.org' - url = 'https://github.com/QEF/q-e/archive/qe-5.3.tar.gz' + url = 'https://github.com/QEF/q-e/archive/qe-6.2.0.tar.gz' - version( - '6.2.0', - '972176a58d16ae8cf0c9a308479e2b97', - url='https://github.com/QEF/q-e/archive/qe-6.2.0.tar.gz' - ) - - version( - '6.1.0', - '3fe861dcb5f6ec3d15f802319d5d801b', - url='https://github.com/QEF/q-e/archive/qe-6.1.0.tar.gz' - ) - - version( - '5.4.0', - '085f7e4de0952e266957bbc79563c54e', - url='https://github.com/QEF/q-e/archive/qe-5.4.tar.gz' - ) - - version( - '5.3.0', - 'be3f8778e302cffb89258a5f936a7592', - url='https://github.com/QEF/q-e/archive/qe-5.3.tar.gz' - ) + version('6.2.0', '972176a58d16ae8cf0c9a308479e2b97') + version('6.1.0', '3fe861dcb5f6ec3d15f802319d5d801b') + version('5.4', '085f7e4de0952e266957bbc79563c54e') + version('5.3', 'be3f8778e302cffb89258a5f936a7592') variant('mpi', default=True, description='Builds with mpi support') variant('openmp', default=False, description='Enables openMP support') diff --git a/var/spack/repos/builtin/packages/r-cluster/package.py b/var/spack/repos/builtin/packages/r-cluster/package.py index 5a7e222a14..e1ff7957fc 100644 --- a/var/spack/repos/builtin/packages/r-cluster/package.py +++ b/var/spack/repos/builtin/packages/r-cluster/package.py @@ -31,7 +31,7 @@ class RCluster(RPackage): (1990) "Finding Groups in Data".""" homepage = "https://cran.r-project.org/web/packages/cluster/index.html" - url = "https://cran.rstudio.com/src/contrib/cluster_2.0.6.tar.gz" + url = "https://cran.rstudio.com/src/contrib/cluster_2.0.7-1.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/cluster" version('2.0.7-1', 'a37add21b91d3e4f3883d005331e0d45') diff --git a/var/spack/repos/builtin/packages/r-rda/package.py b/var/spack/repos/builtin/packages/r-rda/package.py index dd3da00eac..b0f46b3e5b 100644 --- a/var/spack/repos/builtin/packages/r-rda/package.py +++ b/var/spack/repos/builtin/packages/r-rda/package.py @@ -30,6 +30,7 @@ class RRda(RPackage): classification purpose in high dimensional data.""" homepage = "https://cran.r-project.org/web/packages/rda/index.html" - url = "https://cran.r-project.org/src/contrib/rda_1.0.2-2.tar.gz" + url = "https://cran.r-project.org/src/contrib/rda_1.0.2-1.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/rda" + version('1.0.2-1', '78060c5e054a63a2df4ae4002d7247bc') diff --git a/var/spack/repos/builtin/packages/r-rsqlite/package.py b/var/spack/repos/builtin/packages/r-rsqlite/package.py index 4366a07841..91ba461a51 100644 --- a/var/spack/repos/builtin/packages/r-rsqlite/package.py +++ b/var/spack/repos/builtin/packages/r-rsqlite/package.py @@ -31,8 +31,9 @@ class RRsqlite(RPackage): (version 3.8.6) is included.""" homepage = "https://cran.rstudio.com/web/packages/RSQLite/index.html" - url = "https://cran.r-project.org/src/contrib/RSQLite_1.0.0.tar.gz" + url = "https://cran.r-project.org/src/contrib/RSQLite_2.0.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/RSQLite" + version('2.0', '63842410e78ccdfc52d4ee97992521d5') depends_on('r-dbi', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-sfsmisc/package.py b/var/spack/repos/builtin/packages/r-sfsmisc/package.py index d7b58773b0..a57616e249 100644 --- a/var/spack/repos/builtin/packages/r-sfsmisc/package.py +++ b/var/spack/repos/builtin/packages/r-sfsmisc/package.py @@ -31,6 +31,7 @@ class RSfsmisc(RPackage): some were ported from S-plus.""" homepage = "https://cran.r-project.org/web/packages/sfsmisc/index.html" - url = "https://cran.r-project.org/src/contrib/sfsmisc_1.1-1.tar.gz" + url = "https://cran.r-project.org/src/contrib/sfsmisc_1.1-0.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/sfsmisc" + version('1.1-0', '1ba4303076e2bbf018f7eecc7d04e178') diff --git a/var/spack/repos/builtin/packages/r-spatial/package.py b/var/spack/repos/builtin/packages/r-spatial/package.py index cad613f7a4..6435d70f0e 100644 --- a/var/spack/repos/builtin/packages/r-spatial/package.py +++ b/var/spack/repos/builtin/packages/r-spatial/package.py @@ -29,7 +29,7 @@ class RSpatial(RPackage): """Functions for kriging and point pattern analysis.""" homepage = "http://www.stats.ox.ac.uk/pub/MASS4/" - url = "https://cran.r-project.org/src/contrib/spatial_7.3-11.tar.gz" + url = "https://cran.r-project.org/src/contrib/spatial_7.3-10.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/spatial" version('7.3-10', 'e544e3e3fd92e6868f29b8da2925b214') diff --git a/var/spack/repos/builtin/packages/redset/package.py b/var/spack/repos/builtin/packages/redset/package.py index 2211da06e7..0bd4ffc39f 100644 --- a/var/spack/repos/builtin/packages/redset/package.py +++ b/var/spack/repos/builtin/packages/redset/package.py @@ -29,7 +29,7 @@ class Redset(CMakePackage): """Create MPI communicators for disparate redundancy sets""" homepage = "https://github.com/ECP-VeloC/redset" - url = "https://github.com/ECP-VeloC/redset/archive/v0.0.1.zip" + url = "https://github.com/ECP-VeloC/redset/archive/v0.0.2.zip" git = "https://github.com/ecp-veloc/redset.git" tags = ['ecp'] diff --git a/var/spack/repos/builtin/packages/rockstar/package.py b/var/spack/repos/builtin/packages/rockstar/package.py index 5b32230b59..f77403495f 100644 --- a/var/spack/repos/builtin/packages/rockstar/package.py +++ b/var/spack/repos/builtin/packages/rockstar/package.py @@ -32,7 +32,6 @@ class Rockstar(MakefilePackage): """The Rockstar Halo Finder""" homepage = "https://bitbucket.org/gfcstanford/rockstar" - url = "https://bitbucket.org/gfcstanford/rockstar" version('develop', git='https://bitbucket.org/gfcstanford/rockstar.git') version('yt', hg='https://bitbucket.org/MatthewTurk/rockstar') diff --git a/var/spack/repos/builtin/packages/sailfish/package.py b/var/spack/repos/builtin/packages/sailfish/package.py index 3be75d169d..132cc55770 100644 --- a/var/spack/repos/builtin/packages/sailfish/package.py +++ b/var/spack/repos/builtin/packages/sailfish/package.py @@ -29,7 +29,7 @@ class Sailfish(CMakePackage): """Sailfish is a tool for transcript quantification from RNA-seq data.""" homepage = "http://www.cs.cmu.edu/~ckingsf/software/sailfish" - url = "https://github.com/kingsfordgroup/sailfish/archive/v0.10.0.tar.gz" + url = "https://github.com/kingsfordgroup/sailfish/archive/v0.10.1.tar.gz" version('0.10.1', 'e6dab4cf3a39f346df7c28f40eb58cad') diff --git a/var/spack/repos/builtin/packages/shuffile/package.py b/var/spack/repos/builtin/packages/shuffile/package.py index 05d9d94e0b..2026f51b28 100644 --- a/var/spack/repos/builtin/packages/shuffile/package.py +++ b/var/spack/repos/builtin/packages/shuffile/package.py @@ -29,7 +29,7 @@ class Shuffile(CMakePackage): """Shuffle files between MPI ranks""" homepage = "https://github.com/ECP-VeloC/shuffile" - url = "https://github.com/ECP-VeloC/shuffile/archive/v0.0.1.zip" + url = "https://github.com/ECP-VeloC/shuffile/archive/v0.0.2.zip" git = "https://github.com/ecp-veloc/shuffile.git" tags = ['ecp'] diff --git a/var/spack/repos/builtin/packages/spectrum-mpi/package.py b/var/spack/repos/builtin/packages/spectrum-mpi/package.py index e094f1c3ad..cbbd65a5f3 100644 --- a/var/spack/repos/builtin/packages/spectrum-mpi/package.py +++ b/var/spack/repos/builtin/packages/spectrum-mpi/package.py @@ -26,13 +26,9 @@ from spack import * class SpectrumMpi(Package): - """ - IBM MPI implementation from Spectrum MPI. - - """ + """IBM MPI implementation from Spectrum MPI.""" homepage = "http://www-03.ibm.com/systems/spectrum-computing/products/mpi" - url = "http://www-03.ibm.com/systems/spectrum-computing/products/mpi" provides('mpi') diff --git a/var/spack/repos/builtin/packages/votca-xtp/package.py b/var/spack/repos/builtin/packages/votca-xtp/package.py index c4740f0f8b..2d0408cb87 100644 --- a/var/spack/repos/builtin/packages/votca-xtp/package.py +++ b/var/spack/repos/builtin/packages/votca-xtp/package.py @@ -34,7 +34,7 @@ class VotcaXtp(CMakePackage): This package contains the VOTCA exciton transport engine. """ homepage = "http://www.votca.org" - url = "https://github.com/votca/xtp/tarball/v1.4" + url = "https://github.com/votca/xtp/tarball/v1.4.1" git = "https://github.com/votca/xtp.git" version('develop', branch='master') diff --git a/var/spack/repos/builtin/packages/yambo/package.py b/var/spack/repos/builtin/packages/yambo/package.py index 7605af81d3..5fc66fe2d4 100644 --- a/var/spack/repos/builtin/packages/yambo/package.py +++ b/var/spack/repos/builtin/packages/yambo/package.py @@ -37,7 +37,7 @@ class Yambo(AutotoolsPackage): """ homepage = "http://www.yambo-code.org/index.php" - url = "https://github.com/yambo-code/yambo/archive/4.1.3.tar.gz" + url = "https://github.com/yambo-code/yambo/archive/4.2.2.tar.gz" version('4.2.2', '97f3513bd726141be5e18072118b6fb5') version('4.2.1', '99027014192c0f0f4b5d9b48414ad85d') -- cgit v1.2.3-70-g09d2 From 5d07042f23fbdbac22712abcf2df7b4374cfba53 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Tue, 24 Jul 2018 22:44:55 -0500 Subject: Unit test fixes --- var/spack/repos/builtin/packages/essl/package.py | 3 --- var/spack/repos/builtin/packages/opengl/package.py | 5 ----- var/spack/repos/builtin/packages/openglu/package.py | 5 ----- var/spack/repos/builtin/packages/typhon/package.py | 1 + 4 files changed, 1 insertion(+), 13 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/essl/package.py b/var/spack/repos/builtin/packages/essl/package.py index b1a7e39ea9..ba3db4cb3e 100644 --- a/var/spack/repos/builtin/packages/essl/package.py +++ b/var/spack/repos/builtin/packages/essl/package.py @@ -30,9 +30,6 @@ class Essl(Package): homepage = "https://www.ibm.com/systems/power/software/essl/" - version('6.1') - version('5.5') - variant('ilp64', default=False, description='64 bit integers') variant( 'threads', default='openmp', diff --git a/var/spack/repos/builtin/packages/opengl/package.py b/var/spack/repos/builtin/packages/opengl/package.py index b970015c21..6d0ee752d3 100644 --- a/var/spack/repos/builtin/packages/opengl/package.py +++ b/var/spack/repos/builtin/packages/opengl/package.py @@ -30,11 +30,6 @@ class Opengl(Package): homepage = "https://www.opengl.org/" - # A second argument (usually the hash) must be supplied to the - # version directive, but 'n/a' is used here because this package - # is a placeholder for a system/vendor installation of OpenGL - version('3.2', 'n/a') - provides('gl@:4.5', when='@4.5:') provides('gl@:4.4', when='@4.4:') provides('gl@:4.3', when='@4.3:') diff --git a/var/spack/repos/builtin/packages/openglu/package.py b/var/spack/repos/builtin/packages/openglu/package.py index 3ffd6b1536..992a13fbcb 100644 --- a/var/spack/repos/builtin/packages/openglu/package.py +++ b/var/spack/repos/builtin/packages/openglu/package.py @@ -31,11 +31,6 @@ class Openglu(Package): homepage = "https://www.opengl.org/resources/libraries" - # A second argument (usually the has) must be supplied to the - # version directive, but 'n/a' is used here because this package - # is a placeholder for a system/vendor installation of OpenGL - version('1.3', 'n/a') - provides('glu@:1.3', when='@1.3:') provides('glu@:1.2', when='@1.2:') provides('glu@:1.1', when='@1.1:') diff --git a/var/spack/repos/builtin/packages/typhon/package.py b/var/spack/repos/builtin/packages/typhon/package.py index 618a3ec20f..2fbedf36a8 100644 --- a/var/spack/repos/builtin/packages/typhon/package.py +++ b/var/spack/repos/builtin/packages/typhon/package.py @@ -32,6 +32,7 @@ class Typhon(CMakePackage): """ homepage = "https://github.com/UK-MAC/Typhon" + url = "https://github.com/UK-MAC/Typhon/archive/v3.0.tar.gz" git = "https://github.com/UK-MAC/Typhon.git" version('develop', branch='develop') -- cgit v1.2.3-70-g09d2 From 7902f3eb49b616c681e6ca69d2ec70d1d1cbaa21 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 25 Jul 2018 20:35:12 -0500 Subject: Add docs on new top-level VCS attributes --- lib/spack/docs/packaging_guide.rst | 289 +++++++++++++-------- .../packages/the-platinum-searcher/package.py | 7 +- 2 files changed, 184 insertions(+), 112 deletions(-) (limited to 'var') diff --git a/lib/spack/docs/packaging_guide.rst b/lib/spack/docs/packaging_guide.rst index 706144403d..12abcfd7ea 100644 --- a/lib/spack/docs/packaging_guide.rst +++ b/lib/spack/docs/packaging_guide.rst @@ -413,27 +413,26 @@ The most straightforward way to add new versions to your package is to add a line like this in the package class: .. code-block:: python - :linenos: class Foo(Package): - url = 'http://example.com/foo-1.0.tar.gz' + + url = "http://example.com/foo-1.0.tar.gz" + version('8.2.1', '4136d7b4c04df68b686570afa26988ac') - ... + version('8.2.0', '1c9f62f0778697a09d36121ead88e08e') + version('8.1.2', 'd47dd09ed7ae6e7fd6f9a816d7f5fdf6') -Versions should be listed with the newest version first. +Versions should be listed in descending order, from newest to oldest. ^^^^^^^^^^^^^ Date Versions ^^^^^^^^^^^^^ If you wish to use dates as versions, it is best to use the format -``@date-yyyy-mm-dd``. This will ensure they sort in the correct -order. If you want your date versions to be numeric (assuming they -don't conflict with other numeric versions), you can use just -``yyyy.mm.dd``. +``@yyyy-mm-dd``. This will ensure they sort in the correct order. Alternately, you might use a hybrid release-version / date scheme. -For example, ``@1.3.2016.08.31`` would mean the version from the +For example, ``@1.3_2016-08-31`` would mean the version from the ``1.3`` branch, as of August 31, 2016. ^^^^^^^^^^^^ @@ -442,7 +441,7 @@ Version URLs By default, each version's URL is extrapolated from the ``url`` field in the package. For example, Spack is smart enough to download -version ``8.2.1.`` of the ``Foo`` package above from +version ``8.2.1`` of the ``Foo`` package above from http://example.com/foo-8.2.1.tar.gz. If the URL is particularly complicated or changes based on the release, @@ -515,44 +514,28 @@ of its versions, you can add an explicit URL for a particular version: When you supply a custom URL for a version, Spack uses that URL -*verbatim* and does not perform extrapolation. +*verbatim* and does not perform extrapolation. The order of precedence +of these methods is: -^^^^^^^^^^^^^^^^^^^^^ -PyPI and version URLs -^^^^^^^^^^^^^^^^^^^^^ - -In addition to their developer websites, many python packages are hosted at the -`Python Package Index (PyPi) `_. Although links to -these individual files are typically `generated using a hash -`_ it is often possible to find a -reliable link of the format - -.. code-block:: sh +#. package-level ``url`` +#. ``url_for_version()`` +#. version-specific ``url`` - https://pypi.python.org/packages/source///-. - -Packages hosted on GitHub and the like are often developer versions that do not -contain all of the files (e.g. configuration scripts) necessary to support -compilation. For this reason it is ideal to link to a repository such as PyPi -if possible. - -More recently, sources are being indexed at `pypi.io `_ as -well. Links obtained from this site follow a similar pattern, namely - -.. code-block:: sh - - https://pypi.io/packages/source///-. - -These links currently redirect back to `pypi.python.org -`_, but this `may change in the future -`_. +so if your package contains a ``url_for_version()``, it can be overridden +by a version-specific ``url``. +If your package does not contain a package-level ``url`` or ``url_for_version()``, +Spack can determine which URL to download from even if only some of the versions +specify their own ``url``. Spack will use the nearest URL *before* the requested +version. This is useful for packages that have an easy to extrapolate URL, but +keep changing their URL format every few releases. With this method, you only +need to specify the ``url`` when the URL changes. ^^^^^^^^^^^^^^^^^^^^^^^^ Skipping the expand step ^^^^^^^^^^^^^^^^^^^^^^^^ -Spack normally expands archives (e.g. `*.tar.gz` and `*.zip`) automatically +Spack normally expands archives (e.g. ``*.tar.gz`` and ``*.zip``) automatically after downloading them. If you want to skip this step (e.g., for self-extracting executables and other custom archive types), you can add ``expand=False`` to a ``version`` directive. @@ -560,7 +543,7 @@ self-extracting executables and other custom archive types), you can add .. code-block:: python version('8.2.1', '4136d7b4c04df68b686570afa26988ac', - url='http://example.com/foo-8.2.1-special-version.tar.gz', expand=False) + url='http://example.com/foo-8.2.1-special-version.sh', expand=False) When ``expand`` is set to ``False``, Spack sets the current working directory to the directory containing the downloaded archive before it @@ -605,7 +588,7 @@ here will suffice; for example, ``@develop``, ``@master``, ``@local``. The following rules determine the sort order of numeric vs. non-numeric versions: -#. The non-numeric versions ``@develop`` is considered greatest (newest). +#. The non-numeric version ``@develop`` is considered greatest (newest). #. Numeric versions are all less than ``@develop`` version, and are sorted numerically. @@ -617,7 +600,7 @@ The logic behind this sort order is two-fold: #. Non-numeric versions are usually used for special cases while developing or debugging a piece of software. Keeping most of them - less than numeric versions ensures that Spack choose numeric + less than numeric versions ensures that Spack chooses numeric versions by default whenever possible. #. The most-recent development version of a package will usually be @@ -679,7 +662,7 @@ example for ``libelf``: ... 0.5.2 http://www.mr511.de/software/libelf-0.5.2.tar.gz - How many would you like to checksum? (default is 5, q to abort) + How many would you like to checksum? (default is 1, q to abort) This does the same thing that ``spack create`` does, but it allows you to go back and add new versions easily as you need them (e.g., as @@ -805,12 +788,12 @@ But its downloads are in many different subdirectories of homepage = "http://www.mpich.org" url = "http://www.mpich.org/static/downloads/3.0.4/mpich-3.0.4.tar.gz" list_url = "http://www.mpich.org/static/downloads/" - list_depth = 2 + list_depth = 1 By default, Spack only looks at the top-level page available at -``list_url``. ``list_depth`` tells it to follow up to 2 levels of -links from the top-level page. Note that here, this implies two -levels of subdirectories, as the ``mpich`` website is structured much +``list_url``. ``list_depth = 1`` tells it to follow up to 1 level of +links from the top-level page. Note that here, this implies 1 +level of subdirectories, as the ``mpich`` website is structured much like a filesystem. But ``list_depth`` really refers to link depth when spidering the page. @@ -823,13 +806,57 @@ Fetching from code repositories For some packages, source code is provided in a Version Control System (VCS) repository rather than in a tarball. Spack can fetch packages from VCS repositories. Currently, Spack supports fetching with `Git -`_, `Mercurial (hg) `_, and `Subversion (SVN) -`_. +`_, `Mercurial (hg) `_, `Subversion (svn) +`_, and `Go `_. + +To fetch a package from a source repository, Spack needs to know which +VCS to use and where to download from. Much like with ``url``, package +authors can specify a class-level ``git``, ``hg``, ``svn``, or ``go`` +attribute containing the correct download location. + +Many packages developed with Git have both a Git repository as well as +release tarballs available for download. Packages can define both a +class-level tarball URL and VCS. For example: + +.. code-block:: python + + class Trilinos(CMakePackage): + + homepage = "https://trilinos.org/" + url = "https://github.com/trilinos/Trilinos/archive/trilinos-release-12-12-1.tar.gz" + git = "https://github.com/trilinos/Trilinos.git" + + version('develop', branch='develop') + version('master', branch='master') + version('12.12.1', 'ecd4606fa332212433c98bf950a69cc7') + version('12.10.1', '667333dbd7c0f031d47d7c5511fd0810') + version('12.8.1', '9f37f683ee2b427b5540db8a20ed6b15') + +If a package contains both a ``url`` and ``git`` class-level attribute, +Spack decides which to use based on the arguments to the ``version()`` +directive. Versions containing a specific branch, tag, or revision are +assumed to be for VCS download methods, while versions containing a +checksum are assumed to be for URL download methods. + +Like ``url``, if a specific version downloads from a different repository +than the default repo, it can be overridden with a version-specific argument. + +.. note:: + + In order to reduce ambiguity, each package can only have a single VCS + top-level attribute in addition to ``url``. In the rare case that a + package uses multiple VCS, a fetch strategy can be specified for each + version. For example, the ``rockstar`` package contains: + + .. code-block:: python + + class Rockstar(MakefilePackage): + + homepage = "https://bitbucket.org/gfcstanford/rockstar" + + version('develop', git='https://bitbucket.org/gfcstanford/rockstar.git') + version('yt', hg='https://bitbucket.org/MatthewTurk/rockstar') -To fetch a package from a source repository, you add a ``version()`` -call to your package with parameters indicating the repository URL and -any branch, tag, or revision to fetch. See below for the parameters -you'll need for each VCS system. .. _git-fetch: @@ -837,11 +864,11 @@ you'll need for each VCS system. Git ^^^ -Git fetching is enabled with the following parameters to ``version``: +Git fetching supports the following parameters to ``version``: -* ``git``: URL of the git repository. -* ``tag``: name of a tag to fetch. -* ``branch``: name of a branch to fetch. +* ``git``: URL of the git repository, if different than the class-level ``git``. +* ``branch``: Name of a branch to fetch. +* ``tag``: Name of a tag to fetch. * ``commit``: SHA hash (or prefix) of a commit to fetch. * ``submodules``: Also fetch submodules recursively when checking out this repository. @@ -853,66 +880,72 @@ Default branch .. code-block:: python class Example(Package): - ... - version('develop', git='https://github.com/example-project/example.git') - This download method is untrusted, and is not recommended. + git = "https://github.com/example-project/example.git" -Tags - To fetch from a particular tag, use the ``tag`` parameter along with - ``git``: + version('develop') + + This download method is untrusted, and is not recommended. Aside from HTTPS, + there is no way to verify that the repository has not been compromised, and + the commit you get when you install the package likely won't be the same + commit that was used when the package was first written. Additionally, the + default branch may change. It is best to at least specify a branch name. + +Branches + To fetch a particular branch, use the ``branch`` parameter: .. code-block:: python - version('1.0.1', git='https://github.com/example-project/example.git', - tag='v1.0.1') + version('experimental', branch='experimental') - This download method is untrusted, and is not recommended. + This download method is untrusted, and is not recommended. Branches are + moving targets, so the commit you get when you install the package likely + won't be the same commit that was used when the package was first written. -Branches - To fetch a particular branch, use ``branch`` instead: +Tags + To fetch from a particular tag, use ``tag`` instead: .. code-block:: python - version('experimental', git='https://github.com/example-project/example.git', - branch='experimental') + version('1.0.1', tag='v1.0.1') - This download method is untrusted, and is not recommended. + This download method is untrusted, and is not recommended. Although tags + are generally more stable than branches, Git allows tags to be moved. + Many developers use tags to denote rolling releases, and may move the + tag when a bug is patched. Commits Finally, to fetch a particular commit, use ``commit``: .. code-block:: python - version('2014-10-08', git='https://github.com/example-project/example.git', - commit='9d38cd4e2c94c3cea97d0e2924814acc') + version('2014-10-08', commit='9d38cd4e2c94c3cea97d0e2924814acc') This doesn't have to be a full hash; you can abbreviate it as you'd expect with git: .. code-block:: python - version('2014-10-08', git='https://github.com/example-project/example.git', - commit='9d38cd') + version('2014-10-08', commit='9d38cd') This download method *is trusted*. It is the recommended way to securely download from a Git repository. It may be useful to provide a saner version for commits like this, - e.g. you might use the date as the version, as done above. Or you - could just use the abbreviated commit hash. It's up to the package - author to decide what makes the most sense. + e.g. you might use the date as the version, as done above. Or, if you + know the commit at which a release was cut, you can use the release + version. It's up to the package author to decide what makes the most + sense. Although you can use the commit hash as the version number, + this is not recommended, as it won't sort properly. Submodules - You can supply ``submodules=True`` to cause Spack to fetch submodules recursively along with the repository at fetch time. For more information about git submodules see the manpage of git: ``man git-submodule``. .. code-block:: python - version('1.0.1', git='https://github.com/example-project/example.git', - tag='v1.0.1', submodules=True) + version('1.0.1', tag='v1.0.1', submodules=True) .. _github-fetch: @@ -921,7 +954,7 @@ Submodules GitHub ^^^^^^ -If a project is hosted on GitHub, *any* valid Git branch, tag or hash +If a project is hosted on GitHub, *any* valid Git branch, tag, or hash may be downloaded as a tarball. This is accomplished simply by constructing an appropriate URL. Spack can checksum any package downloaded this way, thereby producing a trusted download. For @@ -931,7 +964,7 @@ checksum. .. code-block:: python version('1.9.5.1.1', 'd035e4bc704d136db79b43ab371b27d2', - url='https://www.github.com/jswhit/pyproj/tarball/0be612cc9f972e38b50a90c946a9b353e2ab140f') + url='https://www.github.com/jswhit/pyproj/tarball/0be612cc9f972e38b50a90c946a9b353e2ab140f') .. _hg-fetch: @@ -939,34 +972,38 @@ checksum. Mercurial ^^^^^^^^^ -Fetching with mercurial works much like `git `_, but you +Fetching with Mercurial works much like `Git `_, but you use the ``hg`` parameter. -Default - Add the ``hg`` parameter with no ``revision``: +Default branch + Add the ``hg`` attribute with no ``revision`` passed to ``version``: .. code-block:: python - version('develop', hg='https://jay.grs.rwth-aachen.de/hg/example') + class Example(Package): + + hg = "https://bitbucket.org/example-project/example" - This download method is untrusted, and is not recommended. + version('develop') + + This download method is untrusted, and is not recommended. As with + Git's default fetching strategy, there is no way to verify the + integrity of the download. Revisions - Add ``hg`` and ``revision`` parameters: + To fetch a particular revision, use the ``revision`` parameter: .. code-block:: python - version('1.0', hg='https://jay.grs.rwth-aachen.de/hg/example', - revision='v1.0') - - This download method is untrusted, and is not recommended. + version('1.0', revision='v1.0') Unlike ``git``, which has special parameters for different types of revisions, you can use ``revision`` for branches, tags, and commits - when you fetch with Mercurial. + when you fetch with Mercurial. Like Git, fetching specific branches + or tags is an untrusted download method, and is not recommended. + The recommended fetch strategy is to specify a particular commit + hash as the revision. -As with git, you can fetch these versions using the ``spack install -example@`` command-line syntax. .. _svn-fetch: @@ -974,34 +1011,70 @@ example@`` command-line syntax. Subversion ^^^^^^^^^^ -To fetch with subversion, use the ``svn`` and ``revision`` parameters: +To fetch with subversion, use the ``svn`` and ``revision`` parameters. Fetching the head - Simply add an ``svn`` parameter to ``version``: + Simply add an ``svn`` parameter to the package: .. code-block:: python - version('develop', svn='https://outreach.scidac.gov/svn/libmonitor/trunk') + class Example(Package): + + svn = "https://outreach.scidac.gov/svn/example/trunk" - This download method is untrusted, and is not recommended. + version('develop') + + This download method is untrusted, and is not recommended for the + same reasons as mentioned above. Fetching a revision - To fetch a particular revision, add a ``revision`` to the - version call: + To fetch a particular revision, add a ``revision`` argument to the + version directive: .. code-block:: python - version('develop', svn='https://outreach.scidac.gov/svn/libmonitor/trunk', - revision=128) + version('develop', revision=128) This download method is untrusted, and is not recommended. + Unfortunately, Subversion has no commit hashing scheme like Git and + Mercurial do, so there is no way to guarantee that the download you + get is the same as the download used when the package was created. + Use at your own risk. + Subversion branches are handled as part of the directory structure, so -you can check out a branch or tag by changing the ``url``. +you can check out a branch or tag by changing the URL. If you want to +package multiple branches, simply add a ``svn`` argument to each +version directive. + +.. _go-fetch: + +^^ +Go +^^ + +Go isn't a VCS, it is a programming language with a builtin command, +`go get `_, +that fetches packages and their dependencies automatically. +It can clone a Git repository, or download from another source location. +For example: + +.. code-block:: python + + class ThePlatinumSearcher(Package): + + homepage = "https://github.com/monochromegane/the_platinum_searcher" + go = "github.com/monochromegane/the_platinum_searcher/..." + + version('head') + +Go cannot be used to fetch a particular commit or branch, it always +downloads the head of the repository. This download method is untrusted, +and is not recommended. Use another fetch strategy whenever possible. -------------------------------------------------- +------------------------------------ Resources (expanding extra tarballs) -------------------------------------------------- +------------------------------------ Some packages (most notably compilers) provide optional features if additional resources are expanded within their source tree before building. In Spack it is diff --git a/var/spack/repos/builtin/packages/the-platinum-searcher/package.py b/var/spack/repos/builtin/packages/the-platinum-searcher/package.py index e3f61395c2..e3d7629e1a 100644 --- a/var/spack/repos/builtin/packages/the-platinum-searcher/package.py +++ b/var/spack/repos/builtin/packages/the-platinum-searcher/package.py @@ -29,12 +29,11 @@ import shutil class ThePlatinumSearcher(Package): """Fast parallel recursive grep alternative""" - homepage = "https://github.com/monochromegane/the_platinum_searcher" - url = "https://github.com/monochromegane/the_platinum_searcher" - package = 'github.com/monochromegane/the_platinum_searcher/...' + homepage = "https://github.com/monochromegane/the_platinum_searcher" + go = "github.com/monochromegane/the_platinum_searcher/..." - version('head', go=package) + version('head') extends("go", deptypes='build') -- cgit v1.2.3-70-g09d2 From af60f962cdf5047bef2cd53ec72f38e033146aa4 Mon Sep 17 00:00:00 2001 From: "Mark W. Krentel" Date: Thu, 26 Jul 2018 01:14:17 -0500 Subject: intel-tbb: Add `tm` variant to disable transactional memory. (#8799) * intel-tbb: Add variant `tm` to disable transactional memory. Some AMD or very old Intel systems don't support transactional memory. This commit adds a variant `tm` that defaults to `True`, but can be switched off to allow running on those systems. --- .../repos/builtin/packages/intel-tbb/disable-tm.patch | 15 +++++++++++++++ var/spack/repos/builtin/packages/intel-tbb/package.py | 6 ++++++ 2 files changed, 21 insertions(+) create mode 100644 var/spack/repos/builtin/packages/intel-tbb/disable-tm.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/intel-tbb/disable-tm.patch b/var/spack/repos/builtin/packages/intel-tbb/disable-tm.patch new file mode 100644 index 0000000000..7ef0e93b78 --- /dev/null +++ b/var/spack/repos/builtin/packages/intel-tbb/disable-tm.patch @@ -0,0 +1,15 @@ +Disable transactional memory. This is needed for some AMD or very old +Intel systems. See issue #6090. + +diff -Naurb tbb-2018_U4.orig/include/tbb/tbb_config.h tbb-2018_U4/include/tbb/tbb_config.h +--- tbb-2018_U4.orig/include/tbb/tbb_config.h 2018-05-30 07:35:25.000000000 -0500 ++++ tbb-2018_U4/include/tbb/tbb_config.h 2018-07-24 16:26:11.662673434 -0500 +@@ -98,7 +98,7 @@ + #define __TBB_DEFINE_MIC 1 + #endif + +-#define __TBB_TSX_AVAILABLE ((__TBB_x86_32 || __TBB_x86_64) && !__TBB_DEFINE_MIC) ++#define __TBB_TSX_AVAILABLE 0 + + /** Presence of compiler features **/ + diff --git a/var/spack/repos/builtin/packages/intel-tbb/package.py b/var/spack/repos/builtin/packages/intel-tbb/package.py index ab486bf896..4e884dd0ab 100644 --- a/var/spack/repos/builtin/packages/intel-tbb/package.py +++ b/var/spack/repos/builtin/packages/intel-tbb/package.py @@ -73,6 +73,9 @@ class IntelTbb(Package): multi=False, description='Use the specified C++ standard when building.') + variant('tm', default=True, + description='Enable use of transactional memory on x86') + # Build and install CMake config files if we're new enough. depends_on('cmake@3.0.0:', type='build', when='@2017.0:') @@ -84,6 +87,9 @@ class IntelTbb(Package): # Patch cmakeConfig.cmake.in to find the libraries where we install them. patch("tbb_cmakeConfig.patch", level=0, when='@2017.0:') + # Some very old systems don't support transactional memory. + patch("disable-tm.patch", when='~tm') + def url_for_version(self, version): url = 'https://github.com/01org/tbb/archive/{0}.tar.gz' if (version[0] >= 2017) and len(version) > 1: -- cgit v1.2.3-70-g09d2 From d5957f147b6c8e7bc218b38efea435eff5d529af Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Thu, 26 Jul 2018 09:47:28 -0500 Subject: mfem: mfem-3.3-3.4-petsc-3.9.patch is not needed for latest develop version (#8809) --- var/spack/repos/builtin/packages/mfem/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mfem/package.py b/var/spack/repos/builtin/packages/mfem/package.py index 6f83a45a7f..7515e425ea 100644 --- a/var/spack/repos/builtin/packages/mfem/package.py +++ b/var/spack/repos/builtin/packages/mfem/package.py @@ -203,7 +203,7 @@ class Mfem(Package): patch('mfem_ppc_build.patch', when='@3.2:3.3.0 arch=ppc64le') patch('mfem-3.4.patch', when='@3.4.0') patch('mfem-3.3-3.4-petsc-3.9.patch', - when='@3.3.0:3.4.0,develop +petsc ^petsc@3.9.0:') + when='@3.3.0:3.4.0 +petsc ^petsc@3.9.0:') phases = ['configure', 'build', 'install'] -- cgit v1.2.3-70-g09d2 From cb410b30031e8034636e1a532cacaf66d733ff7a Mon Sep 17 00:00:00 2001 From: Mario Melara Date: Thu, 26 Jul 2018 07:47:55 -0700 Subject: Add package DMTCP (#8808) --- var/spack/repos/builtin/packages/dmtcp/package.py | 36 +++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 var/spack/repos/builtin/packages/dmtcp/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dmtcp/package.py b/var/spack/repos/builtin/packages/dmtcp/package.py new file mode 100644 index 0000000000..9ec0932f0e --- /dev/null +++ b/var/spack/repos/builtin/packages/dmtcp/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Dmtcp(AutotoolsPackage): + """DMTCP (Distributed MultiThreaded Checkpointing) transparently + checkpoints a single-host or distributed computation in user-space -- + with no modifications to user code or to the O/S.""" + + homepage = "http://dmtcp.sourceforge.net/" + url = "https://sourceforge.net/projects/dmtcp/files/2.5.2/dmtcp-2.5.2.tar.gz/download" + + version('2.5.2', sha256='0e3e5e15bd401b7b6937f2b678cd7d6a252eab0a143d5740b89cc3bebb4282be') -- cgit v1.2.3-70-g09d2 From 643a4fbb5995034a7ecdee6f35bd72376bf439e0 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Thu, 26 Jul 2018 17:02:07 +0200 Subject: papi: Update to 5.6.0 and fix build with %gcc@8 (#8796) --- var/spack/repos/builtin/packages/papi/package.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/papi/package.py b/var/spack/repos/builtin/packages/papi/package.py index 04e1f498d5..0e9edca7f6 100644 --- a/var/spack/repos/builtin/packages/papi/package.py +++ b/var/spack/repos/builtin/packages/papi/package.py @@ -41,12 +41,17 @@ class Papi(Package): homepage = "http://icl.cs.utk.edu/papi/index.html" url = "http://icl.cs.utk.edu/projects/papi/downloads/papi-5.4.1.tar.gz" + version('5.6.0', 'fdd075860b2bc4b8de8b8b5c3abf594a') version('5.5.1', '86a8a6f3d0f34cd83251da3514aae15d') version('5.5.0', '5e1244a04ca031d4cc29b46ce3dd05b5') version('5.4.3', '3211b5a5bb389fe692370f5cf4cc2412') version('5.4.1', '9134a99219c79767a11463a76b0b01a2') version('5.3.0', '367961dd0ab426e5ae367c2713924ffb') + # Does not build with newer versions of gcc, see + # https://bitbucket.org/icl/papi/issues/46/cannot-compile-on-arch-linux + patch('https://bitbucket.org/icl/papi/commits/53de184a162b8a7edff48fed01a15980664e15b1/raw', sha256='64c57b3ad4026255238cc495df6abfacc41de391a0af497c27d0ac819444a1f8', when='@5.4.0:5.6.99%gcc@8') + def install(self, spec, prefix): with working_dir("src"): -- cgit v1.2.3-70-g09d2 From 80741bc4275cadb9b78bf64faead6d8f44424a85 Mon Sep 17 00:00:00 2001 From: Simon Flood Date: Thu, 26 Jul 2018 16:07:55 +0100 Subject: hmmer: added version 3.2.1 & updated URL (#8787) Add HMMER 3.2.1 and updated URL then removed url_for_version function as no longer required - all HMMER downloads available from updated URL. --- var/spack/repos/builtin/packages/hmmer/package.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hmmer/package.py b/var/spack/repos/builtin/packages/hmmer/package.py index e38dfc80bb..1eea95c75f 100644 --- a/var/spack/repos/builtin/packages/hmmer/package.py +++ b/var/spack/repos/builtin/packages/hmmer/package.py @@ -31,8 +31,9 @@ class Hmmer(Package): probabilistic models called profile hidden Markov models (profile HMMs). """ homepage = 'http://www.hmmer.org' - url = 'http://eddylab.org/software/hmmer3/3.1b2/hmmer-3.1b2.tar.gz' + url = 'http://eddylab.org/software/hmmer/hmmer-3.2.1.tar.gz' + version('3.2.1', '4e0ad5ed45462d4e36807d21e6d82b69') version('3.1b2', 'c8c141018bc0ccd7fc37b33f2b945d5f') version('3.0', '4cf685f3bc524ba5b5cdaaa070a83588') version('2.4i', 'dab234c87e026ac1de942450750acd20') @@ -45,14 +46,6 @@ class Hmmer(Package): depends_on('mpi', when='+mpi') depends_on('gsl', when='+gsl') - def url_for_version(self, version): - base_url = 'http://eddylab.org/software' - - if version >= Version('3.0'): - return '{0}/hmmer3/{1}/hmmer-{1}.tar.gz'.format(base_url, version) - else: - return '{0}/hmmer/{1}/hmmer-{1}.tar.gz'.format(base_url, version) - def install(self, spec, prefix): configure_args = [ '--prefix={0}'.format(prefix) -- cgit v1.2.3-70-g09d2 From 8b718e7cd60dd4c389385ca987eedcfa8f51d4ef Mon Sep 17 00:00:00 2001 From: Hadrien G Date: Thu, 26 Jul 2018 18:19:14 +0200 Subject: Templight package (#8782) * First draft of a templight recipe * Let's be explicit for now, we can be clever later on * The clang6 version does not work, drop it * Reorder FIXMEs more logically * Add patch for current templight develop branch * Create an artificial stable release of templight * Take some additional inspiration from llvm package * Added the templight supporting tools * Remove old notes from the no-url branch * Avoid unnecessary join_path --- .../builtin/packages/templight-tools/package.py | 37 +++++ .../packages/templight/develop-20180720.patch | 44 ++++++ .../repos/builtin/packages/templight/package.py | 166 +++++++++++++++++++++ 3 files changed, 247 insertions(+) create mode 100644 var/spack/repos/builtin/packages/templight-tools/package.py create mode 100644 var/spack/repos/builtin/packages/templight/develop-20180720.patch create mode 100644 var/spack/repos/builtin/packages/templight/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/templight-tools/package.py b/var/spack/repos/builtin/packages/templight-tools/package.py new file mode 100644 index 0000000000..810b43d8b8 --- /dev/null +++ b/var/spack/repos/builtin/packages/templight-tools/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class TemplightTools(CMakePackage): + """Supporting tools for the Templight Profiler""" + + homepage = "https://github.com/mikael-s-persson/templight-tools" + git = "https://github.com/mikael-s-persson/templight-tools.git" + + version('develop', branch='master') + + depends_on('cmake @2.8.7:', type='build') + depends_on('boost @1.48.1: +filesystem +graph +program_options +test') diff --git a/var/spack/repos/builtin/packages/templight/develop-20180720.patch b/var/spack/repos/builtin/packages/templight/develop-20180720.patch new file mode 100644 index 0000000000..986d6a7783 --- /dev/null +++ b/var/spack/repos/builtin/packages/templight/develop-20180720.patch @@ -0,0 +1,44 @@ +--- a/templight_driver.cpp 2018-07-20 17:32:51.064430826 +0200 ++++ b/templight_driver.cpp 2018-07-20 17:33:58.476431081 +0200 +@@ -57,6 +57,9 @@ + #include "llvm/Support/TargetSelect.h" + #include "llvm/Support/Timer.h" + #include "llvm/Support/raw_ostream.h" ++#ifdef _WIN32 ++#include "Windows/WindowsSupport.h" ++#endif + + #include "TemplightAction.h" + +@@ -475,7 +478,21 @@ + + } + +- ++// llvm::sys::Process::GetArgumentVector was renamed as of rL330216 ++// https://reviews.llvm.org/rL330216 ++// This aims to preserves compatibility, but the better way to do it would ++// be to let InitLLVM do the job ++std::error_code GetArgumentVector( ++ SmallVectorImpl &ArgsOut, ArrayRef ArgsIn, ++ SpecificBumpPtrAllocator &ArgAllocator) { ++#ifdef _WIN32 ++ return windows::GetCommandLineArguments(ArgsOut, ArgAllocator); ++#else ++ ArgsOut.append(ArgsIn.begin(), ArgsIn.end()); ++ (void)ArgAllocator; ++ return std::error_code(); ++#endif ++} + + int main(int argc_, const char **argv_) { + llvm::sys::PrintStackTraceOnErrorSignal(argv_[0]); +@@ -486,7 +503,7 @@ + + SmallVector argv; + llvm::SpecificBumpPtrAllocator ArgAllocator; +- std::error_code EC = llvm::sys::Process::GetArgumentVector( ++ std::error_code EC = GetArgumentVector( + argv, llvm::makeArrayRef(argv_, argc_), ArgAllocator); + if (EC) { + llvm::errs() << "error: couldn't get arguments: " << EC.message() << '\n'; diff --git a/var/spack/repos/builtin/packages/templight/package.py b/var/spack/repos/builtin/packages/templight/package.py new file mode 100644 index 0000000000..dd03b217e9 --- /dev/null +++ b/var/spack/repos/builtin/packages/templight/package.py @@ -0,0 +1,166 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import os + + +class Templight(CMakePackage): + """Templight is a Clang-based tool to profile the time and memory + consumption of template instantiations and to perform interactive + debugging sessions to gain introspection into the template + instantiation process.""" + + homepage = "https://github.com/mikael-s-persson/templight" + git = "https://github.com/mikael-s-persson/templight.git" + llvm_svn = "http://llvm.org/svn/llvm-project/{0}/trunk" + + family = 'compiler' # Used by lmod + + # Templight is a patch to clang, so we have three versions to care about: + # - The one that will be used in Spack specifications + # - The git branch that we need to fetch from in the templight repo + # - The svn tag that we need to fetch from in the LLVM repos + version('develop', branch='master') + resource(name='llvm-trunk', + svn=llvm_svn.format('llvm'), + destination='.', + placement='llvm', + when='@develop') + resource(name='clang-trunk', + svn=llvm_svn.format('cfe'), + destination='llvm/tools', + placement='clang', + when='@develop') + + # Templight has no stable release yet, and is supposed to be built against + # the LLVM trunk. As this is a brittle combination, I decided to + # artificially create a stable release based on what works today. Please + # feel free to remove this version once templight has stabilized. + version('2018.07.20', commit='91589f95427620dd0a2346bd69ba922f374aa42a') + resource(name='llvm-r337566', + svn=llvm_svn.format('llvm'), + revision=337566, + destination='.', + placement='llvm', + when='@2018.07.20') + resource(name='clang-r337566', + svn=llvm_svn.format('cfe'), + revision=337566, + destination='llvm/tools', + placement='clang', + when='@2018.07.20') + patch('develop-20180720.patch', when='@2018.07.20') + + # Clang debug builds can be _huge_ (20+ GB), make sure you know what you + # are doing before switching to them + variant('build_type', default='Release', + description='CMake build type', + values=('Debug', 'Release', 'RelWithDebInfo', 'MinSizeRel')) + + # NOTE: LLVM has many configurable tweaks and optional tools/extensions. + # I did not think that propagating all of these to a debugging and + # performance analysis tool was worth the maintenance burden. But + # if you disagree, the llvm package can be used for inspiration. + + depends_on('cmake@3.4.3:', type='build') + depends_on('python') + depends_on('py-lit', type=('build', 'run')) + + def patch(self): + # We start with the templight source tree and an "llvm" subdir. + # But we actually need an llvm source tree with a "templight" subdir. + # Let's flip the directory organization around + templight_files = os.listdir('.') + templight_files.remove('llvm') + templight_dir = 'llvm/tools/clang/tools/templight' + os.mkdir(templight_dir) + for name in templight_files: + os.rename(name, os.path.join(templight_dir, name)) + for name in os.listdir('llvm'): + os.rename(os.path.join('llvm', name), name) + os.rmdir('llvm') + + # Tell the clang build system that it needs to build templight + with open("tools/clang/tools/CMakeLists.txt", "a") as cmake_lists: + cmake_lists.write("add_clang_subdirectory(templight)") + + def setup_environment(self, spack_env, run_env): + spack_env.append_flags('CXXFLAGS', self.compiler.cxx11_flag) + run_env.set('CC', join_path(self.spec.prefix.bin, 'templight')) + run_env.set('CXX', join_path(self.spec.prefix.bin, 'templight++')) + + def cmake_args(self): + spec = self.spec + + # Templight is a debugging tool, not a production compiler, so we only + # need a very bare-bones build of clang + # + # Minimal build config ideas were taken from the llvm package, with + # the templight-specific assumption that we will always be building + # for LLVM / Clang 5.0+ and can safely ignore older tricks. + # + cmake_args = [ + '-DLLVM_REQUIRES_RTTI:BOOL=ON', + '-DCLANG_DEFAULT_OPENMP_RUNTIME:STRING=libomp', + '-DPYTHON_EXECUTABLE:PATH={0}'.format(spec['python'].command.path), + '-DLLVM_EXTERNAL_POLLY_BUILD:Bool=OFF', + '-DLLVM_TOOL_POLLY_BUILD:Bool=OFF', + '-DLLVM_POLLY_BUILD:Bool=OFF', + '-DLLVM_POLLY_LINK_INTO_TOOLS:Bool=OFF', + '-DLLVM_EXTERNAL_LLDB_BUILD:Bool=OFF', + '-DLLVM_TOOL_LLDB_BUILD:Bool=OFF', + '-DLLVM_TOOL_LLD_BUILD:Bool=OFF', + '-DLLVM_EXTERNAL_LIBUNWIND_BUILD:Bool=OFF', + '-DLLVM_EXTERNAL_LIBCXX_BUILD:Bool=OFF', + '-DLLVM_EXTERNAL_LIBCXXABI_BUILD:Bool=OFF', + '-DLLVM_EXTERNAL_COMPILER_RT_BUILD:Bool=OFF', + ] + + targets = ['NVPTX', 'AMDGPU'] + + if 'x86' in spec.architecture.target.lower(): + targets.append('X86') + elif 'arm' in spec.architecture.target.lower(): + targets.append('ARM') + elif 'aarch64' in spec.architecture.target.lower(): + targets.append('AArch64') + elif 'sparc' in spec.architecture.target.lower(): + targets.append('Sparc') + elif ('ppc' in spec.architecture.target.lower() or + 'power' in spec.architecture.target.lower()): + targets.append('PowerPC') + + cmake_args.append( + '-DLLVM_TARGETS_TO_BUILD:Bool=' + ';'.join(targets)) + + if spec.satisfies('platform=linux'): + cmake_args.append('-DCMAKE_BUILD_WITH_INSTALL_RPATH=1') + + return cmake_args + + @run_after('install') + def post_install(self): + with working_dir(self.build_directory): + install_tree('bin', self.prefix.libexec.llvm) -- cgit v1.2.3-70-g09d2 From 61aa1831e3d93a51abf38591d795e5507195c6c5 Mon Sep 17 00:00:00 2001 From: mic84 Date: Thu, 26 Jul 2018 11:29:03 -0700 Subject: AMReX: update package.py (#8697) --- var/spack/repos/builtin/packages/amrex/package.py | 100 +++++++++++----------- 1 file changed, 51 insertions(+), 49 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/amrex/package.py b/var/spack/repos/builtin/packages/amrex/package.py index 4810af5e25..03be9f78e2 100644 --- a/var/spack/repos/builtin/packages/amrex/package.py +++ b/var/spack/repos/builtin/packages/amrex/package.py @@ -26,61 +26,63 @@ from spack import * class Amrex(CMakePackage): - """AMReX is the successor to BoxLib. - It is a Block-Structured AMR Framework. - """ + """AMReX is a publicly available software framework designed + for building massively parallel block- structured adaptive + mesh refinement (AMR) applications.""" - homepage = "https://ccse.lbl.gov/AMReX/index.html" + homepage = "https://amrex-codes.github.io/amrex/" git = "https://github.com/AMReX-Codes/amrex.git" - version('develop', tag='development') - version('master', tag='master') - version('17.06', commit='836d3c7') + version('develop', branch='development') - variant('dims', - default='3', - values=('1', '2', '3'), - multi=False, - description='Number of spatial dimensions') - - variant('prec', - default='DOUBLE', - values=('FLOAT', 'DOUBLE'), - multi=False, - description='Floating point precision') - - variant('mpi', default=True, description='Enable MPI parallel support') - variant('openmp', default=False, description='Enable OpenMP parallel support') - variant('fortran', default=True, description='Enable Fortran support') - variant('debug', default=False, description='Enable debugging features') - variant('particles', default=False, description='Include particle classes in build') + # Config options + variant('dimensions', default='3', + description='Dimensionality', values=('2', '3')) + variant('shared', default=False, + description='Build shared library') + variant('mpi', default=True, + description='Build with MPI support') + variant('openmp', default=False, + description='Build with OpenMP support') + variant('precision', default='double', + description='Real precision (double/single)', + values=('single', 'double')) + variant('eb', default=False, + description='Build Embedded Boundary classes') + variant('fortran', default=False, + description='Build Fortran API') + variant('linear_solvers', default=True, + description='Build linear solvers') + variant('amrdata', default=False, + description='Build data services') + variant('particles', default=False, + description='Build particle classes') + variant('build_type', default='Release', + description='The build type to build', + values=('Debug', 'Release')) + # Build dependencies depends_on('mpi', when='+mpi') + depends_on('python@2.7:', type='build') + depends_on('cmake@3.5:', type='build') - def cmake_args(self): - spec = self.spec + def cmake_is_on(self, option): + return 'ON' if option in self.spec else 'OFF' - cmake_args = [ - '-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON', - '-DBL_SPACEDIM:INT=%d' % int(spec.variants['dims'].value), - '-DBL_PRECISION:STRING=%s' % spec.variants['prec'].value, - '-DENABLE_FMG=%s' % ('+fortran' in spec), - '-DENABLE_FBASELIB=%s' % ('+fortran' in spec), - '-DBL_DEBUG:INT=%d' % int('+debug' in spec), - '-DBL_USE_PARTICLES:INT=%d' % int('+particles' in spec), - '-DENABLE_MPI:INT=%d' % int('+mpi' in spec), - '-DENABLE_OpenMP:INT=%d' % int('+openmp' in spec), + def cmake_args(self): + args = [ + '-DUSE_XSDK_DEFAULTS=ON', + '-DDIM:STRING=%s' % self.spec.variants['dimensions'].value, + '-DBUILD_SHARED_LIBS:BOOL=%s' % self.cmake_is_on('+shared'), + '-DENABLE_MPI:BOOL=%s' % self.cmake_is_on('+mpi'), + '-DENABLE_OMP:BOOL=%s' % self.cmake_is_on('+openmp'), + '-DXSDK_PRECISION:STRING=%s' % + self.spec.variants['precision'].value.upper(), + '-DENABLE_EB:BOOL=%s' % self.cmake_is_on('+eb'), + '-DXSDK_ENABLE_Fortran:BOOL=%s' % self.cmake_is_on('+fortran'), + '-DENABLE_LINEAR_SOLVERS:BOOL=%s' % + self.cmake_is_on('+linear_solvers'), + '-DENABLE_AMRDATA:BOOL=%s' % self.cmake_is_on('+amrdata'), + '-DENABLE_PARTICLES:BOOL=%s' % self.cmake_is_on('+particles') ] - - if '+mpi' in spec: - cmake_args += [ - '-DCMAKE_C_COMPILER=%s' % spec['mpi'].mpicc, - '-DCMAKE_CXX_COMPILER=%s' % spec['mpi'].mpicxx - ] - if '+fortran' in spec: - cmake_args += [ - '-DCMAKE_Fortran_COMPILER=%s' % spec['mpi'].mpifc - ] - cmake_args += ['-DENABLE_FORTRAN_MPI=%s' % ('+fortran' in spec)] - - return cmake_args + return args -- cgit v1.2.3-70-g09d2 From c03dcdedb183f6aa4a8680a0c04d48e7a4d520a8 Mon Sep 17 00:00:00 2001 From: Hadrien G Date: Thu, 26 Jul 2018 22:54:46 +0200 Subject: FTGL package workarounds (#8812) * FTGL package workarounds * Remove blank line * Only require doxygen at build time --- var/spack/repos/builtin/packages/ftgl/package.py | 10 ++++++++++ .../repos/builtin/packages/ftgl/remove-extra-qualifier.diff | 11 +++++++++++ 2 files changed, 21 insertions(+) create mode 100644 var/spack/repos/builtin/packages/ftgl/remove-extra-qualifier.diff (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ftgl/package.py b/var/spack/repos/builtin/packages/ftgl/package.py index 95e968e371..a2fcb7c702 100644 --- a/var/spack/repos/builtin/packages/ftgl/package.py +++ b/var/spack/repos/builtin/packages/ftgl/package.py @@ -37,6 +37,9 @@ class Ftgl(AutotoolsPackage): version('2.1.2', 'f81c0a7128192ba11e036186f9a968f2') + # There is an unnecessary qualifier around, which makes modern GCC sad + patch('remove-extra-qualifier.diff') + # Ftgl does not come with a configure script depends_on('autoconf', type='build') depends_on('automake', type='build') @@ -48,6 +51,13 @@ class Ftgl(AutotoolsPackage): depends_on('glu') depends_on('freetype@2.0.9:') + # Currently, "make install" will fail if the docs weren't built + # + # FIXME: Can someone with autotools experience fix the build system + # so that it doesn't fail when that happens? + # + depends_on('doxygen', type='build') + @property @when('@2.1.2') def configure_directory(self): diff --git a/var/spack/repos/builtin/packages/ftgl/remove-extra-qualifier.diff b/var/spack/repos/builtin/packages/ftgl/remove-extra-qualifier.diff new file mode 100644 index 0000000000..cff9a3836e --- /dev/null +++ b/var/spack/repos/builtin/packages/ftgl/remove-extra-qualifier.diff @@ -0,0 +1,11 @@ +--- FTGL/include/FTTextureGlyph.h 2018-07-26 08:30:55.144488976 +0000 ++++ FTGL/include/FTTextureGlyph.h 2018-07-26 08:29:42.072489186 +0000 +@@ -52,7 +52,7 @@ + * Reset the currently active texture to zero to get into a known state before + * drawing a string. This is to get round possible threading issues. + */ +- static void FTTextureGlyph::ResetActiveTexture(){ activeTextureID = 0;} ++ static void ResetActiveTexture(){ activeTextureID = 0;} + + private: + /** -- cgit v1.2.3-70-g09d2 From d25866a8f85ea3be1395e6011a51e2dc1021d810 Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Thu, 26 Jul 2018 15:55:43 -0500 Subject: halc: Create new package. (#8795) * halc: Create new package. * fix flake8 error. * Modification --- var/spack/repos/builtin/packages/halc/package.py | 48 ++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 var/spack/repos/builtin/packages/halc/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/halc/package.py b/var/spack/repos/builtin/packages/halc/package.py new file mode 100644 index 0000000000..2e9b50779a --- /dev/null +++ b/var/spack/repos/builtin/packages/halc/package.py @@ -0,0 +1,48 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Halc(MakefilePackage): + """HALC is software that makes error correction for long reads with + high throughput.""" + + homepage = "https://github.com/lanl001/halc" + url = "https://github.com/lanl001/halc/archive/v1.1.tar.gz" + + version('1.1', '4b289b366f6a5400ca481993aa68dd9c') + + depends_on('blasr', type='run') + depends_on('lordec', type='run') + depends_on('dos2unix', type='build') + depends_on('python', type='run') + + parallel = False + + def install(self, spec, prefix): + install_tree('bin', prefix.bin) + install('runHALC.py', prefix.bin) + dos2unix = which('dos2unix') + dos2unix(join_path(self.prefix.bin, 'runHALC.py')) -- cgit v1.2.3-70-g09d2 From 3d86c7fef57dda2562e683d110521e1417406f9a Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Thu, 26 Jul 2018 22:58:00 +0200 Subject: hdf5: Fix build with %gcc@8 (#8788) --- var/spack/repos/builtin/packages/hdf5/package.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index f70e294b17..ad4fc1458a 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -111,6 +111,10 @@ class Hdf5(AutotoolsPackage): # three src files and leaves the hdf5 build system alone. patch('pre-c99-comments.patch', when='@1.8.10') + # There are build errors with GCC 8, see + # https://forum.hdfgroup.org/t/1-10-2-h5detect-compile-error-gcc-8-1-0-on-centos-7-2-solved/4441 + patch('https://salsa.debian.org/debian-gis-team/hdf5/raw/bf94804af5f80f662cad80a5527535b3c6537df6/debian/patches/gcc-8.patch', sha256='57cee5ff1992b4098eda079815c36fc2da9b10e00a9056df054f2384c4fc7523', when='@1.10.2%gcc@8:') + filter_compiler_wrappers('h5cc', 'h5c++', 'h5fc', relative_root='bin') def url_for_version(self, version): -- cgit v1.2.3-70-g09d2 From bf2c232756a0c44cf5d21a9a4bf6222296fc5f2f Mon Sep 17 00:00:00 2001 From: Sheng Di Date: Thu, 26 Jul 2018 17:46:48 -0500 Subject: sz: new version 2.0.2.0 (#8786) --- var/spack/repos/builtin/packages/sz/package.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sz/package.py b/var/spack/repos/builtin/packages/sz/package.py index 850e2f795f..0e3e29f6c0 100644 --- a/var/spack/repos/builtin/packages/sz/package.py +++ b/var/spack/repos/builtin/packages/sz/package.py @@ -30,13 +30,20 @@ class Sz(AutotoolsPackage): """Error-bounded Lossy Compressor for HPC Data.""" homepage = "https://collab.cels.anl.gov/display/ESR/SZ" - url = "https://github.com/disheng222/SZ/archive/v1.4.13.5.tar.gz" + url = "https://github.com/disheng222/SZ/archive/v2.0.2.0.tar.gz" + git = "https://github.com/disheng222/SZ.git" version('develop', branch='master') - version('1.4.13.5', 'a2f6147c3c74d74c938dd17d914a4cb8') - version('1.4.13.4', '1c47170a9eebeadbf0f7e9b675d68d76') - version('1.4.12.3', '5f51be8530cdfa5280febb410ac6dd94') + version('2.0.2.0', sha256='59d1b51d4461049a67e6390a259549eba37f53e20c2d97e3189f22a46d8e6fd4') + version('1.4.13.5', sha256='b5e37bf3c377833eed0a7ca0471333c96cd2a82863abfc73893561aaba5f18b9') + version('1.4.13.4', sha256='c99b95793c48469cac60e6cf82f921babf732ca8c50545a719e794886289432b') + version('1.4.13.3', sha256='9d80390f09816bf01b7a817e07339030d596026b00179275616af55ed3c1af98') + version('1.4.13.2', sha256='bc45329bf54876ed0f721998940855dbd5fda54379ef35dad8463325488ea4c6') + version('1.4.13.0', sha256='baaa7fa740a47e152c319b8d7b9a69fe96b4fea5360621cdc96cb250635f946f') + version('1.4.12.3', sha256='c1413e1c260fac7a48cb11c6dd705730525f134b9f9b244af59885d564ac7a6f') + version('1.4.12.1', sha256='98289d75481a6e407e4027b5e23013ae83b4aed88b3f150327ea711322cd54b6') + version('1.4.11.1', sha256='6cbc5b233a3663a166055f1874f17c96ba29aa5a496d352707ab508288baa65c') version('1.4.11.0', '10dee28b3503821579ce35a50e352cc6') version('1.4.10.0', '82e23dc5a51bcce1f70ba7e3b68a5965') version('1.4.9.2', '028ce90165b7a4c4051d4c0189f193c0') -- cgit v1.2.3-70-g09d2 From 3494c6e403b05c4c2f097d996671c63e3ca8a0b2 Mon Sep 17 00:00:00 2001 From: Neil Flood Date: Fri, 27 Jul 2018 08:47:18 +1000 Subject: Updated llvm to version 6.0.1. The previous 6.0.0 had an incorrectly … (#8801) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Updated llvm to version 6.0.1. The previous 6.0.0 had an incorrectly declared symbol, discussed at https://reviews.llvm.org/D44140, which, amongst other things, broke py-numba. This version works fine with py-numba. * Flag the conflict between py-numba and llvm@6.0.0 * Removed a single trailing space to satisfy checks --- var/spack/repos/builtin/packages/llvm/package.py | 16 ++++++++++++++++ var/spack/repos/builtin/packages/py-numba/package.py | 4 ++++ 2 files changed, 20 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index 8d5d2a6ec8..f2f03ad28b 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -180,6 +180,22 @@ class Llvm(CMakePackage): 'libunwind': 'http://llvm.org/svn/llvm-project/libunwind/trunk', } }, + { + 'version': '6.0.1', + 'md5': 'c88c98709300ce2c285391f387fecce0', + 'resources': { + 'compiler-rt': '99bf8bcb68ba96dda74f6aee6c55f639', + 'openmp': '4826402ae3633c36c51ba4d0e5527d30', + 'polly': '4e5937753d1f77e2c0feca485fc7f9da', + 'libcxx': '2c13cd0136ab6f8060a4cde85b5f86e2', + 'libcxxabi': '41764959176d5fcc7baee8cd22ed1705', + 'cfe': '4e419bd4e3b55aa06d872320f754bd85', + 'clang-tools-extra': '431cba2b652e9c227a59a6d681388160', + 'lldb': '482eba39e78c75a83216cf2d5b7a54b4', + 'lld': '31cc580b32be124972c40c19c0839fed', + 'libunwind': '569eed6f508af4c4c053b1112e6f3d0b' + } + }, { 'version': '6.0.0', 'md5': '788a11a35fa62eb008019b37187d09d2', diff --git a/var/spack/repos/builtin/packages/py-numba/package.py b/var/spack/repos/builtin/packages/py-numba/package.py index 45091118ca..7b10e3aa25 100644 --- a/var/spack/repos/builtin/packages/py-numba/package.py +++ b/var/spack/repos/builtin/packages/py-numba/package.py @@ -38,3 +38,7 @@ class PyNumba(PythonPackage): depends_on('py-argparse', type=('build', 'run')) depends_on('py-funcsigs', type=('build', 'run'), when='^python@:3.3.99') depends_on('py-singledispatch', type=('build', 'run'), when='^python@:3.3.99') + + # Version 6.0.0 of llvm had a hidden symbol which breaks numba at runtime. + # See https://reviews.llvm.org/D44140 + conflicts('^llvm@6.0.0') -- cgit v1.2.3-70-g09d2 From 90f7fca1940a1779426f979f0afe72ae9905fd30 Mon Sep 17 00:00:00 2001 From: Oliver Breitwieser Date: Fri, 27 Jul 2018 00:50:00 +0200 Subject: py-numpy: Add CPATH in modulefile (#8466) Also fix setup_dependent_package to include the ".egg-less"-include path. Change-Id: I06e66a505ece25cba8896f47e69a5be374bac6d2 --- var/spack/repos/builtin/packages/py-numpy/package.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-numpy/package.py b/var/spack/repos/builtin/packages/py-numpy/package.py index 54af4da6ae..435491f658 100644 --- a/var/spack/repos/builtin/packages/py-numpy/package.py +++ b/var/spack/repos/builtin/packages/py-numpy/package.py @@ -76,14 +76,11 @@ class PyNumpy(PythonPackage): def setup_dependent_package(self, module, dependent_spec): python_version = self.spec['python'].version.up_to(2) - arch = '{0}-{1}'.format(platform.system().lower(), platform.machine()) self.spec.include = join_path( self.prefix.lib, 'python{0}'.format(python_version), 'site-packages', - 'numpy-{0}-py{1}-{2}.egg'.format( - self.spec.version, python_version, arch), 'numpy/core/include') def patch(self): @@ -158,6 +155,17 @@ class PyNumpy(PythonPackage): return args + def setup_environment(self, spack_env, run_env): + python_version = self.spec['python'].version.up_to(2) + + include_path = join_path( + self.prefix.lib, + 'python{0}'.format(python_version), + 'site-packages', + 'numpy/core/include') + + run_env.prepend_path('CPATH', include_path) + def test(self): # `setup.py test` is not supported. Use one of the following # instead: -- cgit v1.2.3-70-g09d2 From d02c4bbd9a0574f67f7c24c79df89a73422df15c Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Fri, 27 Jul 2018 15:14:49 +0200 Subject: gcc: Add 8.2.0 (#8813) --- var/spack/repos/builtin/packages/gcc/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py index 13f7e1abf8..0bfcd26e2b 100644 --- a/var/spack/repos/builtin/packages/gcc/package.py +++ b/var/spack/repos/builtin/packages/gcc/package.py @@ -41,6 +41,7 @@ class Gcc(AutotoolsPackage): list_url = 'http://ftp.gnu.org/gnu/gcc/' list_depth = 1 + version('8.2.0', '64898a165f67e136d802a92e7633bf1b06c85266027e52127ea025bf5fc2291b5e858288aac0bdba246e6cdf7c6ec88bc8e0e7f3f6f1985f4297710cafde56ed') version('8.1.0', '65f7c65818dc540b3437605026d329fc') version('7.3.0', 'be2da21680f27624f3a87055c4ba5af2') version('7.2.0', 'ff370482573133a7fcdd96cd2f552292') -- cgit v1.2.3-70-g09d2 From 440a5fbfcb432e294d75eb34e173aa13e1710e29 Mon Sep 17 00:00:00 2001 From: 健美猞猁 Date: Fri, 27 Jul 2018 22:57:05 +0800 Subject: Skip update check. (#8683) * Skip update check. * mkefile -> makefile. * Fix emboss. --- var/spack/repos/builtin/packages/emboss/package.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/emboss/package.py b/var/spack/repos/builtin/packages/emboss/package.py index 585b44081b..a871db1636 100644 --- a/var/spack/repos/builtin/packages/emboss/package.py +++ b/var/spack/repos/builtin/packages/emboss/package.py @@ -38,3 +38,8 @@ class Emboss(AutotoolsPackage): depends_on('libxpm') depends_on('libgd') depends_on('postgresql') + + @run_after('configure') + def skip_update_checks(self): + # Delete $(bindir)/embossupdate to skip update checks + filter_file('$(bindir)/embossupdate', '', 'Makefile', string=True) -- cgit v1.2.3-70-g09d2 From 71f85cff2c7198faf7916bc9fa3f05891d0a5787 Mon Sep 17 00:00:00 2001 From: Miroslav Stoyanov <30537612+mkstoyanov@users.noreply.github.com> Date: Fri, 27 Jul 2018 11:10:32 -0400 Subject: added Tasmanian versions 5.1 and development, enabled the Tasmanian options through +~ flags (#8804) --- .../repos/builtin/packages/tasmanian/package.py | 93 +++++++++++++++++++++- 1 file changed, 90 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/tasmanian/package.py b/var/spack/repos/builtin/packages/tasmanian/package.py index a01781ad7d..71ea84d502 100644 --- a/var/spack/repos/builtin/packages/tasmanian/package.py +++ b/var/spack/repos/builtin/packages/tasmanian/package.py @@ -30,7 +30,94 @@ class Tasmanian(CMakePackage): ApproximatioN is a robust library for high dimensional integration and interpolation as well as parameter calibration.""" - homepage = "http://tasmanian.ornl.gov" - url = "http://tasmanian.ornl.gov/documents/Tasmanian_v5.0.zip" + homepage = 'http://tasmanian.ornl.gov' + url = 'https://github.com/ORNL/TASMANIAN/archive/v5.1.tar.gz' + git = 'https://github.com/ORNL/TASMANIAN.git' - version('5.0', '4bf131841d786033863d271739be0f7a') + version('xsdk-0.3.0', branch='master') + version('develop', branch='master') + + version('5.1', '5d904029a24470a6acf4a87d3339846e') + + version('5.0', '4bf131841d786033863d271739be0f7a', + url='http://tasmanian.ornl.gov/documents/Tasmanian_v5.0.zip') + + variant('xsdkflags', default=False, + description='enable XSDK defaults for Tasmanian') + + variant('openmp', default=True, + description='add OpenMP support to Tasmanian') + # tested with OpenMP 3.1 (clang4) through 4.0-4.5 (gcc 5 - 8) + + variant('blas', default=False, + description='add BLAS support to Tasmanian') + + variant('mpi', default=False, + description='add MPI support to Tasmanian') + + variant('cuda', default=False, + description='add CUDA support to Tasmanian') + + variant('magma', default=False, + description='add UTK MAGMA support to Tasmanian') + + variant('python', default=False, + description='add Python binding for Tasmanian') + + depends_on('cmake@3.5.0:', type='build') + + depends_on('python@2.7:', when='+python', type=('build', 'run')) + depends_on('py-numpy', when='+python', type=('build', 'run')) + + extends('python', when='+python') + + depends_on('mpi', when="+mpi") # openmpi 2 and 3 tested + + depends_on('blas', when="+blas") # openblas 0.2.18 or newer + + depends_on('cuda@9.1', when='+cuda', type=('build', 'run')) + depends_on('cuda@9.1', when='+magma', type=('build', 'run')) + + depends_on('magma@2.3.0', when='+magma', type=('build', 'run')) + + def cmake_args(self): + spec = self.spec + + if '+xsdkflags' in spec: + args = [ + '-DUSE_XSDK_DEFAULTS:BOOL=ON', + '-DXSDK_ENABLE_PYTHON:BOOL={0}'.format( + 'ON' if '+python' in spec else 'OFF'), + '-DTasmanian_ENABLE_MPI:BOOL={0}'.format( + 'ON' if '+mpi' in spec else 'OFF'), + '-DXSDK_ENABLE_OPENMP:BOOL={0}'.format( + 'ON' if '+openmp' in spec else 'OFF'), + '-DTPL_ENABLE_BLAS:BOOL={0}'.format( + 'ON' if '+blas' in spec else 'OFF'), + '-DXSDK_ENABLE_CUDA:BOOL={0}'.format( + 'ON' if '+cuda' in spec else 'OFF'), + '-DXSDK_ENABLE_CUDA:BOOL={0}'.format( + 'ON' if '+magma' in spec else 'OFF'), + '-DTPL_ENABLE_MAGMA:BOOL={0}'.format( + 'ON' if '+magma' in spec else 'OFF'), ] + else: + args = [ + '-DTasmanian_ENABLE_OPENMP:BOOL={0}'.format( + 'ON' if '+openmp' in spec else 'OFF'), + '-DTasmanian_ENABLE_BLAS:BOOL={0}'.format( + 'ON' if '+blas' in spec else 'OFF'), + '-DTasmanian_ENABLE_PYTHON:BOOL={0}'.format( + 'ON' if '+python' in spec else 'OFF'), + '-DTasmanian_ENABLE_MPI:BOOL={0}'.format( + 'ON' if '+mpi' in spec else 'OFF'), + '-DTasmanian_ENABLE_CUDA:BOOL={0}'.format( + 'ON' if '+cuda' in spec else 'OFF'), + '-DTasmanian_ENABLE_CUDA:BOOL={0}'.format( + 'ON' if '+magma' in spec else 'OFF'), + '-DTasmanian_ENABLE_MAGMA:BOOL={0}'.format( + 'ON' if '+magma' in spec else 'OFF'), ] + + if spec.satisfies('+python'): + args.append('-DPYTHON_EXECUTABLE:FILEPATH={0}'.format( + self.spec['python'].command.path)) + return args -- cgit v1.2.3-70-g09d2 From dba7f715cf1c3d0a4024cb33324a712d12e82a44 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Sun, 29 Jul 2018 08:44:17 -0700 Subject: libunwind: document platform=darwin conflict (#8824) --- var/spack/repos/builtin/packages/libunwind/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libunwind/package.py b/var/spack/repos/builtin/packages/libunwind/package.py index 6a78fe1ca8..ed0c824d1e 100644 --- a/var/spack/repos/builtin/packages/libunwind/package.py +++ b/var/spack/repos/builtin/packages/libunwind/package.py @@ -31,5 +31,8 @@ class Libunwind(AutotoolsPackage): homepage = "http://www.nongnu.org/libunwind/" url = "http://download.savannah.gnu.org/releases/libunwind/libunwind-1.1.tar.gz" + conflicts('platform=darwin', + msg='Non-GNU libunwind needs ELF libraries Darwin does not have') + version('1.2.1', '06ba9e60d92fd6f55cd9dadb084df19e') version('1.1', 'fb4ea2f6fbbe45bf032cd36e586883ce') -- cgit v1.2.3-70-g09d2 From 13cf6d55e42042a5b605c2d91c1ac68e41466164 Mon Sep 17 00:00:00 2001 From: "Kelly (KT) Thompson" Date: Mon, 30 Jul 2018 00:38:37 -0600 Subject: GSL: 2.5 is a new version. (#8827) --- var/spack/repos/builtin/packages/gsl/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gsl/package.py b/var/spack/repos/builtin/packages/gsl/package.py index c10b35347b..0ac2e2b1a5 100644 --- a/var/spack/repos/builtin/packages/gsl/package.py +++ b/var/spack/repos/builtin/packages/gsl/package.py @@ -36,6 +36,7 @@ class Gsl(AutotoolsPackage): homepage = "http://www.gnu.org/software/gsl" url = "http://mirror.switch.ch/ftp/mirror/gnu/gsl/gsl-2.3.tar.gz" + version('2.5', sha256='0460ad7c2542caaddc6729762952d345374784100223995eb14d614861f2258d') version('2.4', 'dba736f15404807834dc1c7b93e83b92') version('2.3', '905fcbbb97bc552d1037e34d200931a0') version('2.2.1', '3d90650b7cfe0a6f4b29c2d7b0f86458') -- cgit v1.2.3-70-g09d2 From 15d96f01660057463863a05049b287df3341175e Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Mon, 30 Jul 2018 13:02:09 -0600 Subject: Add extra_rpaths to OpenMPI wrappers (#8687) If the OpenMPI build finds the infiniband drivers in /usr/lib64, it adds -Wl,-rpath -Wl,/usr/lib64 to the OpenMPI wrappers. If the wrappers are using a compiler outside of /usr, and the OpenMPI wrappers are used to build software outside of Spack, they will rpath /usr/lib64 into the executable which then has GLIBC, GLIBCXX runtime errors due to it picking up GCC libraries in /usr/lib64. This adds the directories specified in "extra_rpaths" to the OpenMPI wrappers, which allows them to use the correct compiler when invoked outside of Spack builds. --- var/spack/repos/builtin/packages/openmpi/package.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index e276528f21..79ad131132 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -342,6 +342,13 @@ class Openmpi(AutotoolsPackage): '--enable-shared', ] + # Add extra_rpaths dirs from compilers.yaml into link wrapper + rpaths = [self.compiler.cc_rpath_arg + path + for path in self.compiler.extra_rpaths] + config_args.extend([ + '--with-wrapper-ldflags={0}'.format(' '.join(rpaths)) + ]) + # According to this comment on github: # # https://github.com/open-mpi/ompi/issues/4338#issuecomment-383982008 -- cgit v1.2.3-70-g09d2 From f7761d108159ba914748a2ab28a169bcc389cf18 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Mon, 30 Jul 2018 16:18:36 -0700 Subject: slepc: add blopex variant (#8820) --- var/spack/repos/builtin/packages/slepc/package.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/slepc/package.py b/var/spack/repos/builtin/packages/slepc/package.py index 1030f04849..19155bf0fd 100644 --- a/var/spack/repos/builtin/packages/slepc/package.py +++ b/var/spack/repos/builtin/packages/slepc/package.py @@ -23,6 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## import os +import sys from spack import * @@ -45,6 +46,7 @@ class Slepc(Package): version('3.6.2', '2ab4311bed26ccf7771818665991b2ea3a9b15f97e29fd13911ab1293e8e65df') variant('arpack', default=True, description='Enables Arpack wrappers') + variant('blopex', default=False, description='Enables BLOPEX wrappers') # NOTE: make sure PETSc and SLEPc use the same python. depends_on('python@2.6:2.8', type='build') @@ -62,6 +64,13 @@ class Slepc(Package): # Arpack can not be used with 64bit integers. conflicts('+arpack', when='^petsc+int64') + resource(name='blopex', + url='http://slepc.upv.es/download/external/blopex-1.1.2.tar.gz', + sha256='0081ee4c4242e635a8113b32f655910ada057c59043f29af4b613508a762f3ac', + destination=join_path('installed-arch-' + sys.platform + '-c-opt', + 'externalpackages'), + when='+blopex') + def install(self, spec, prefix): # set SLEPC_DIR for installation # Note that one should set the current (temporary) directory instead @@ -83,6 +92,11 @@ class Slepc(Package): '--with-arpack-flags=-lparpack,-larpack' ]) + # It isn't possible to install BLOPEX separately and link to it; + # BLOPEX has to be downloaded with SLEPc at configure time + if '+blopex' in spec: + options.append('--download-blopex') + configure('--prefix=%s' % prefix, *options) make('MAKE_NP=%s' % make_jobs, parallel=False) -- cgit v1.2.3-70-g09d2 From db79c86ed60db084033b160b64e94e23beb5f0cb Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Tue, 31 Jul 2018 23:19:41 -0700 Subject: lmod: add version 7.8 (#8838) --- var/spack/repos/builtin/packages/lmod/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lmod/package.py b/var/spack/repos/builtin/packages/lmod/package.py index 98a62466b8..94a32593b0 100644 --- a/var/spack/repos/builtin/packages/lmod/package.py +++ b/var/spack/repos/builtin/packages/lmod/package.py @@ -38,6 +38,7 @@ class Lmod(AutotoolsPackage): homepage = 'https://www.tacc.utexas.edu/research-development/tacc-projects/lmod' url = 'https://github.com/TACC/Lmod/archive/7.4.11.tar.gz' + version('7.8', sha256='40388380a36a00c3ce929a9f88c8fffc93deeabf87a7c3f8864a82acad38c3ba') version('7.7.29', 'bd3f171995e6863505e8a958d158ced1') version('7.7.13', 'e1d222fa04148707dceb08c82d7e9fa5') version('7.7', '8ac594401716c6d1b40cac22bc1030ca') -- cgit v1.2.3-70-g09d2 From de60e9d5829c47f26c6dced63470bec69538dd34 Mon Sep 17 00:00:00 2001 From: Stephen Herbein Date: Wed, 1 Aug 2018 03:58:54 -0700 Subject: lmod: fix use of custom separator in prepend_path etc. (#8737) fixes #8736 --- .../data/modules/lmod/module_path_separator.yaml | 5 +++ lib/spack/spack/test/modules/lmod.py | 14 +++++++ share/spack/templates/modules/modulefile.lua | 6 +-- .../packages/module-path-separator/package.py | 44 ++++++++++++++++++++++ 4 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 lib/spack/spack/test/data/modules/lmod/module_path_separator.yaml create mode 100644 var/spack/repos/builtin.mock/packages/module-path-separator/package.py (limited to 'var') diff --git a/lib/spack/spack/test/data/modules/lmod/module_path_separator.yaml b/lib/spack/spack/test/data/modules/lmod/module_path_separator.yaml new file mode 100644 index 0000000000..208554968f --- /dev/null +++ b/lib/spack/spack/test/data/modules/lmod/module_path_separator.yaml @@ -0,0 +1,5 @@ +enable: + - lmod +lmod: + core_compilers: + - 'clang@3.3' diff --git a/lib/spack/spack/test/modules/lmod.py b/lib/spack/spack/test/modules/lmod.py index b615619a92..2b3949621d 100644 --- a/lib/spack/spack/test/modules/lmod.py +++ b/lib/spack/spack/test/modules/lmod.py @@ -23,6 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## +import re import pytest import spack.modules.lmod @@ -151,6 +152,19 @@ class TestLmod(object): assert len([x for x in content if 'setenv("FOO", "foo")' in x]) == 0 assert len([x for x in content if 'unsetenv("BAR")' in x]) == 0 + def test_prepend_path_separator(self, modulefile_content, + module_configuration): + """Tests modifications to run-time environment.""" + + module_configuration('module_path_separator') + content = modulefile_content('module-path-separator') + + for line in content: + if re.match(r'[a-z]+_path\("COLON"', line): + assert line.endswith('"foo", ":")') + elif re.match(r'[a-z]+_path\("SEMICOLON"', line): + assert line.endswith('"bar", ";")') + def test_blacklist(self, modulefile_content, module_configuration): """Tests blacklisting the generation of selected modules.""" diff --git a/share/spack/templates/modules/modulefile.lua b/share/spack/templates/modules/modulefile.lua index cf37595228..a8eae9bef1 100644 --- a/share/spack/templates/modules/modulefile.lua +++ b/share/spack/templates/modules/modulefile.lua @@ -73,11 +73,11 @@ end {% block environment %} {% for command_name, cmd in environment_modifications %} {% if command_name == 'PrependPath' %} -prepend_path("{{ cmd.name }}", "{{ cmd.value }}") +prepend_path("{{ cmd.name }}", "{{ cmd.value }}", "{{ cmd.separator }}") {% elif command_name == 'AppendPath' %} -append_path("{{ cmd.name }}", "{{ cmd.value }}") +append_path("{{ cmd.name }}", "{{ cmd.value }}", "{{ cmd.separator }}") {% elif command_name == 'RemovePath' %} -remove_path("{{ cmd.name }}", "{{ cmd.value }}") +remove_path("{{ cmd.name }}", "{{ cmd.value }}", "{{ cmd.separator }}") {% elif command_name == 'SetEnv' %} setenv("{{ cmd.name }}", "{{ cmd.value }}") {% elif command_name == 'UnsetEnv' %} diff --git a/var/spack/repos/builtin.mock/packages/module-path-separator/package.py b/var/spack/repos/builtin.mock/packages/module-path-separator/package.py new file mode 100644 index 0000000000..c29a538588 --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/module-path-separator/package.py @@ -0,0 +1,44 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class ModulePathSeparator(Package): + homepage = "http://www.llnl.gov" + url = "http://www.llnl.gov/module-path-separator-1.0.tar.gz" + + version(1.0, 'foobarbaz') + + def install(self, spec, prefix): + pass + + def setup_environment(self, senv, renv): + renv.append_path("COLON", "foo") + renv.prepend_path("COLON", "foo") + renv.remove_path("COLON", "foo") + + renv.append_path("SEMICOLON", "bar", separator=";") + renv.prepend_path("SEMICOLON", "bar", separator=";") + renv.remove_path("SEMICOLON", "bar", separator=";") -- cgit v1.2.3-70-g09d2 From 23b685084935cd8730f7e29175cfa2e1883e15b4 Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Thu, 2 Aug 2018 01:53:53 +0200 Subject: Conflict for cmake 3.11.x and Intel. (#8855) --- var/spack/repos/builtin/packages/cmake/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index 09352b7ae2..4e0460544d 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -89,6 +89,9 @@ class Cmake(Package): conflicts('+qt', when='^qt@5.4.0') # qt-5.4.0 has broken CMake modules + # https://gitlab.kitware.com/cmake/cmake/issues/18166 + conflicts('%intel', when='@3.11.0:3.11.4') + phases = ['bootstrap', 'build', 'install'] def url_for_version(self, version): -- cgit v1.2.3-70-g09d2 From abfb16af7879ca932f67b4fc1a9cf448c27c3796 Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Thu, 2 Aug 2018 01:55:07 +0200 Subject: Small patch for netlib-lapack. (#8854) --- var/spack/repos/builtin/packages/netlib-lapack/package.py | 5 +++++ .../repos/builtin/packages/netlib-lapack/testing.patch | 13 +++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 var/spack/repos/builtin/packages/netlib-lapack/testing.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/netlib-lapack/package.py b/var/spack/repos/builtin/packages/netlib-lapack/package.py index 7293b6c0f4..8c56da718d 100644 --- a/var/spack/repos/builtin/packages/netlib-lapack/package.py +++ b/var/spack/repos/builtin/packages/netlib-lapack/package.py @@ -65,6 +65,11 @@ class NetlibLapack(CMakePackage): # containing the fix is released and added to Spack. patch('undefined_declarations.patch', when='@3.8.0:') + # https://github.com/Reference-LAPACK/lapack/pull/268 + # TODO: update 'when' once the version of lapack + # containing the fix is released and added to Spack. + patch('testing.patch', when='@3.7.0:') + # virtual dependency provides('blas', when='~external-blas') provides('lapack') diff --git a/var/spack/repos/builtin/packages/netlib-lapack/testing.patch b/var/spack/repos/builtin/packages/netlib-lapack/testing.patch new file mode 100644 index 0000000000..fce18548c4 --- /dev/null +++ b/var/spack/repos/builtin/packages/netlib-lapack/testing.patch @@ -0,0 +1,13 @@ +diff --git a/TESTING/LIN/alahd.f b/TESTING/LIN/alahd.f +index 8f4cd58d..6a4946e0 100644 +--- a/TESTING/LIN/alahd.f ++++ b/TESTING/LIN/alahd.f +@@ -1036,7 +1036,7 @@ + 9929 FORMAT( ' Test ratios (1-3: ', A1, 'TZRZF):' ) + 9920 FORMAT( 3X, ' 7-10: same as 3-6', 3X, ' 11-14: same as 3-6' ) + 9921 FORMAT( ' Test ratios:', / ' (1-2: ', A1, 'GELS, 3-6: ', A1, +- $ 'GELSY, 7-10: ', A1, 'GELSS, 11-14: ', A1, 'GELSD, 15-16: ' ++ $ 'GELSY, 7-10: ', A1, 'GELSS, 11-14: ', A1, 'GELSD, 15-16: ', + $ A1, 'GETSLS)') + 9928 FORMAT( 7X, 'where ALPHA = ( 1 + SQRT( 17 ) ) / 8' ) + 9927 FORMAT( 3X, I2, ': ABS( Largest element in L )', / 12X, -- cgit v1.2.3-70-g09d2 From 432a5ecd36d47148290cbbde5bf2f1d5a616c13d Mon Sep 17 00:00:00 2001 From: "Kelly (KT) Thompson" Date: Wed, 1 Aug 2018 18:12:17 -0600 Subject: Dia needs access to gettext and pkg-config. (#8840) When using spack on a ubuntu baseline system, I was unable to build dia with adding these build dependencies on gettext and pkg-config. --- var/spack/repos/builtin/packages/dia/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dia/package.py b/var/spack/repos/builtin/packages/dia/package.py index 871845c93d..735e150c67 100644 --- a/var/spack/repos/builtin/packages/dia/package.py +++ b/var/spack/repos/builtin/packages/dia/package.py @@ -33,6 +33,8 @@ class Dia(Package): version('0.97.3', '0e744a0f6a6c4cb6a089e4d955392c3c') depends_on('intltool', type='build') + depends_on('gettext', type='build') + depends_on('pkg-config', type='build') depends_on('gtkplus@2.6.0:') depends_on('libxslt') depends_on('python') -- cgit v1.2.3-70-g09d2 From e793f29173f21209005832f563f455bac820fce3 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Wed, 1 Aug 2018 17:14:48 -0700 Subject: openblas: add version 0.3.2 (#8833) --- var/spack/repos/builtin/packages/openblas/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openblas/package.py b/var/spack/repos/builtin/packages/openblas/package.py index ed5301cb03..a4c226584b 100644 --- a/var/spack/repos/builtin/packages/openblas/package.py +++ b/var/spack/repos/builtin/packages/openblas/package.py @@ -37,6 +37,7 @@ class Openblas(MakefilePackage): git = 'https://github.com/xianyi/OpenBLAS.git' version('develop', branch='develop') + version('0.3.2', sha256='e8ba64f6b103c511ae13736100347deb7121ba9b41ba82052b1a018a65c0cb15') version('0.3.0', '42cde2c1059a8a12227f1e6551c8dbd2') version('0.2.20', '48637eb29f5b492b91459175dcc574b1') version('0.2.19', '28c998054fd377279741c6f0b9ea7941') -- cgit v1.2.3-70-g09d2 From c79cd5fe51352eba3a2855a60ce90421701ed3bc Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Wed, 1 Aug 2018 22:25:57 -0700 Subject: suite-sparse: add version 5.3.0 (#8837) --- var/spack/repos/builtin/packages/suite-sparse/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/suite-sparse/package.py b/var/spack/repos/builtin/packages/suite-sparse/package.py index be52030057..865ac4a84f 100644 --- a/var/spack/repos/builtin/packages/suite-sparse/package.py +++ b/var/spack/repos/builtin/packages/suite-sparse/package.py @@ -32,6 +32,7 @@ class SuiteSparse(Package): homepage = 'http://faculty.cse.tamu.edu/davis/suitesparse.html' url = 'http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-5.2.0.tar.gz' + version('5.3.0', sha256='90e69713d8c454da5a95a839aea5d97d8d03d00cc1f667c4bdfca03f640f963d') version('5.2.0', '8e625539dbeed061cc62fbdfed9be7cf') version('5.1.0', '9c34d7c07ad5ce1624b8187faa132046') version('4.5.5', '0a5b38af0016f009409a9606d2f1b555') @@ -62,7 +63,7 @@ class SuiteSparse(Package): # This patch adds '-lm' when linking libgraphblas and when using clang. # Fixes 'libgraphblas.so.2.0.1: undefined reference to `__fpclassify'' - patch('graphblas_libm_dep.patch', when='@5.2.0:%clang') + patch('graphblas_libm_dep.patch', when='@5.2.0:5.2.99%clang') def install(self, spec, prefix): # The build system of SuiteSparse is quite old-fashioned. -- cgit v1.2.3-70-g09d2 From 03dc78a894cfc572368483f55403c7fe112fd167 Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Thu, 2 Aug 2018 15:32:20 +0200 Subject: netcdf-fortran: enforce autoreconf when building with NAG. (#8844) * netcdf-fortran: enforce autoreconf when building with NAG. * netcdf-fortran: patch the configure script instead of running autoreconf to get rid of additional dependencies. * netcdf-fortran: add comment for the patch. --- .../builtin/packages/netcdf-fortran/nag.patch | 31 ++++++++++++++++++++++ .../builtin/packages/netcdf-fortran/package.py | 4 +++ 2 files changed, 35 insertions(+) create mode 100644 var/spack/repos/builtin/packages/netcdf-fortran/nag.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/netcdf-fortran/nag.patch b/var/spack/repos/builtin/packages/netcdf-fortran/nag.patch new file mode 100644 index 0000000000..458c18813e --- /dev/null +++ b/var/spack/repos/builtin/packages/netcdf-fortran/nag.patch @@ -0,0 +1,31 @@ +diff --git a/configure b/configure +index 06ac8b0..d518a1a 100755 +--- a/configure ++++ b/configure +@@ -10657,6 +10657,8 @@ _LT_EOF + lf95*) # Lahey Fortran 8.1 + whole_archive_flag_spec= + tmp_sharedflag='--shared' ;; ++ nagfor*) ++ tmp_sharedflag='-Wl,-shared' ;; + xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; +@@ -14252,6 +14254,8 @@ _LT_EOF + lf95*) # Lahey Fortran 8.1 + whole_archive_flag_spec_F77= + tmp_sharedflag='--shared' ;; ++ nagfor*) ++ tmp_sharedflag='-Wl,-shared' ;; + xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; +@@ -17142,6 +17146,8 @@ _LT_EOF + lf95*) # Lahey Fortran 8.1 + whole_archive_flag_spec_FC= + tmp_sharedflag='--shared' ;; ++ nagfor*) ++ tmp_sharedflag='-Wl,-shared' ;; + xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; diff --git a/var/spack/repos/builtin/packages/netcdf-fortran/package.py b/var/spack/repos/builtin/packages/netcdf-fortran/package.py index a923bb0e81..725804d22c 100644 --- a/var/spack/repos/builtin/packages/netcdf-fortran/package.py +++ b/var/spack/repos/builtin/packages/netcdf-fortran/package.py @@ -36,6 +36,10 @@ class NetcdfFortran(AutotoolsPackage): depends_on('netcdf') + # The default libtool.m4 is too old to handle NAG compiler properly: + # https://github.com/Unidata/netcdf-fortran/issues/94 + patch('nag.patch', when='@:4.4.4%nag') + def configure_args(self): return ['CPPFLAGS=-I' + self.spec['netcdf'].prefix.include] -- cgit v1.2.3-70-g09d2 From 4a6a19be855fe682f9e8fd0945f9ddccce4f3716 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Thu, 2 Aug 2018 18:16:17 +0200 Subject: adios2: add 2.2.0 (#8871) This also enables the bzip2 and zfp variants. The sz variant is currently broken. --- var/spack/repos/builtin/packages/adios2/package.py | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/adios2/package.py b/var/spack/repos/builtin/packages/adios2/package.py index bda425443a..f838996e20 100644 --- a/var/spack/repos/builtin/packages/adios2/package.py +++ b/var/spack/repos/builtin/packages/adios2/package.py @@ -35,6 +35,7 @@ class Adios2(CMakePackage): maintainers = ['ax3l'] version('develop', branch='master') + version('2.2.0', sha256='77058ea2ff7224dc02ea519733de42d89112cf21ffe7474fb2fa3c5696152948') version('2.1.0', '431fa5b015349f1838b96b8f5a1cc8f8') version('2.0.0', 'da39655b51745d2c5f3f1e46c5abc4d7') @@ -42,11 +43,14 @@ class Adios2(CMakePackage): description='Also build shared libraries') variant('mpi', default=True, description='Enable MPI') - # transforms (not yet implemented) - # variant('bzip2', default=True, - # description='Enable BZip2 compression') - # variant('zfp', default=True, - # description='Enable ZFP compression') + # transforms + variant('bzip2', default=True, + description='Enable BZip2 compression') + variant('zfp', default=True, + description='Enable ZFP compression') + # sz is broken in 2.2.0: https://github.com/ornladios/ADIOS2/issues/705 + # variant('sz', default=True, + # description='Enable SZ compression') # transport engines variant('dataman', default=True, description='Enable the DataMan engine for WAN transports') @@ -72,6 +76,11 @@ class Adios2(CMakePackage): conflicts('+dataman', when='~shared') depends_on('cmake@3.5.0:', type='build') + depends_on('pkgconfig', type='build', when='@2.2.0:') + # The included ffs requires bison and flex but using them makes + # the build fail due to an undefined reference. + # depends_on('bison', type='build', when='@2.2.0:') + # depends_on('flex', when='@2.2.0:') # contained in thirdparty/ # depends_on('googletest') @@ -90,6 +99,7 @@ class Adios2(CMakePackage): depends_on('bzip2', when='+bzip2') depends_on('zfp', when='+zfp') + # depends_on('sz@:1.4.12', when='+sz') extends('python', when='+python') depends_on('python@2.7:', type=('build', 'run'), when='+python') @@ -109,6 +119,8 @@ class Adios2(CMakePackage): 'ON' if '+bzip2' in spec else 'OFF'), '-DADIOS2_USE_ZFP={0}'.format( 'ON' if '+zfp' in spec else 'OFF'), + '-DADIOS2_USE_SZ={0}'.format( + 'ON' if '+sz' in spec else 'OFF'), '-DADIOS2_USE_DataMan={0}'.format( 'ON' if '+dataman' in spec else 'OFF'), '-DADIOS2_USE_ZeroMQ={0}'.format( -- cgit v1.2.3-70-g09d2 From ec174dae69e3e2722c767d0ff03175376b0e4b2a Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Thu, 2 Aug 2018 18:17:15 +0200 Subject: CMake: patch for NAG. (#8869) --- var/spack/repos/builtin/packages/cmake/nag-response-files.patch | 9 +++++++++ var/spack/repos/builtin/packages/cmake/package.py | 3 +++ 2 files changed, 12 insertions(+) create mode 100644 var/spack/repos/builtin/packages/cmake/nag-response-files.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cmake/nag-response-files.patch b/var/spack/repos/builtin/packages/cmake/nag-response-files.patch new file mode 100644 index 0000000000..07dc4a1aa1 --- /dev/null +++ b/var/spack/repos/builtin/packages/cmake/nag-response-files.patch @@ -0,0 +1,9 @@ +diff --git a/Modules/Compiler/NAG-Fortran.cmake b/Modules/Compiler/NAG-Fortran.cmake +index 39aae1883..9973febc3 100644 +--- a/Modules/Compiler/NAG-Fortran.cmake ++++ b/Modules/Compiler/NAG-Fortran.cmake +@@ -34,3 +34,4 @@ set(CMAKE_Fortran_FORMAT_FIXED_FLAG "-fixed") + set(CMAKE_Fortran_FORMAT_FREE_FLAG "-free") + set(CMAKE_Fortran_COMPILE_OPTIONS_PIC "-PIC") + set(CMAKE_Fortran_COMPILE_OPTIONS_PIE "-PIC") ++set(CMAKE_Fortran_RESPONSE_FILE_LINK_FLAG "-Wl,@") diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index 4e0460544d..8090a1b992 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -87,6 +87,9 @@ class Cmake(Package): # https://gitlab.kitware.com/cmake/cmake/issues/16226 patch('intel-c-gnu11.patch', when='@3.6.0:3.6.1') + # https://gitlab.kitware.com/cmake/cmake/issues/18232 + patch('nag-response-files.patch', when='@3.7:3.12') + conflicts('+qt', when='^qt@5.4.0') # qt-5.4.0 has broken CMake modules # https://gitlab.kitware.com/cmake/cmake/issues/18166 -- cgit v1.2.3-70-g09d2 From da959ba220b67965c479838c5d80f4c6c92249e1 Mon Sep 17 00:00:00 2001 From: Douglas Duckworth Date: Thu, 2 Aug 2018 12:24:26 -0400 Subject: added py-setuptools as dependency (#8843) * added py-setuptools as dependency * more changes --- var/spack/repos/builtin/packages/py-vmd-python/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-vmd-python/package.py b/var/spack/repos/builtin/packages/py-vmd-python/package.py index 65c59a1aaf..57c15c5ffb 100644 --- a/var/spack/repos/builtin/packages/py-vmd-python/package.py +++ b/var/spack/repos/builtin/packages/py-vmd-python/package.py @@ -33,8 +33,9 @@ class PyVmdPython(PythonPackage): version('2.0.10', '8c746d961497a676053b66e3dd692794') - depends_on('python@2.7:2.8') - depends_on('py-numpy') + depends_on('python@2.7:2.8', type=('build', 'run')) + depends_on('py-numpy', type=('build', 'run')) + depends_on('py-setuptools', type='run') depends_on('tcl') depends_on('netcdf') depends_on('expat') -- cgit v1.2.3-70-g09d2 From 3a919c6abb1eb4001421eb52d7e4467a919e4075 Mon Sep 17 00:00:00 2001 From: Takayuki Kobayashi <27466252+irisTa56@users.noreply.github.com> Date: Fri, 3 Aug 2018 01:24:57 +0900 Subject: Update and Bugfix for pexsi/package.py (#8822) * Update and Bugfix for pexsi/package.py 1. pexsi@0.10.2 is not compatible with superlu-dist@5.4.0 due to [Change LargeDiag to LargeDiag_MC64; Add LargeDiag_AWPM](https://github.com/xiaoyeli/superlu_dist/commit/d7dce5a3488f80645023ab8431d82399e5546ebf). 2. In the 'edit' phase, '@MPICXX_LIB' must be substituted before '@MPICXX' is substituted. * change dict to list of tuples Use a list of tuples to remember the order of `substitutions`. * Update package.py * Update package.py --- var/spack/repos/builtin/packages/pexsi/package.py | 45 +++++++++++++---------- 1 file changed, 25 insertions(+), 20 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pexsi/package.py b/var/spack/repos/builtin/packages/pexsi/package.py index f0882dba06..c730d34756 100644 --- a/var/spack/repos/builtin/packages/pexsi/package.py +++ b/var/spack/repos/builtin/packages/pexsi/package.py @@ -54,7 +54,7 @@ class Pexsi(MakefilePackage): depends_on('parmetis') depends_on('superlu-dist@3.3:3.999', when='@:0.9.0') depends_on('superlu-dist@4.3:4.999', when='@0.9.2') - depends_on('superlu-dist@5.1.2:', when='@0.10.2:') + depends_on('superlu-dist@5.1.2:5.3.999', when='@0.10.2:') variant( 'fortran', default=False, description='Builds the Fortran interface' @@ -64,27 +64,32 @@ class Pexsi(MakefilePackage): def edit(self, spec, prefix): - substitutions = { - '@MPICC': self.spec['mpi'].mpicc, - '@MPICXX': self.spec['mpi'].mpicxx, - '@MPIFC': self.spec['mpi'].mpifc, - '@MPICXX_LIB': self.spec['mpi:cxx'].libs.joined(), - '@RANLIB': 'ranlib', - '@PEXSI_STAGE': self.stage.source_path, - '@SUPERLU_PREFIX': self.spec['superlu-dist'].prefix, - '@METIS_PREFIX': self.spec['metis'].prefix, - '@PARMETIS_PREFIX': self.spec['parmetis'].prefix, - '@LAPACK_PREFIX': self.spec['lapack'].prefix, - '@BLAS_PREFIX': self.spec['blas'].prefix, - '@LAPACK_LIBS': self.spec['lapack'].libs.joined(), - '@BLAS_LIBS': self.spec['blas'].libs.joined(), + substitutions = [ + ('@MPICC', self.spec['mpi'].mpicc), + ('@MPICXX_LIB', self.spec['mpi:cxx'].libs.joined()), + ('@MPICXX', self.spec['mpi'].mpicxx), + ('@MPIFC', self.spec['mpi'].mpifc), + ('@RANLIB', 'ranlib'), + ('@PEXSI_STAGE', self.stage.source_path), + ('@SUPERLU_PREFIX', self.spec['superlu-dist'].prefix), + ('@METIS_PREFIX', self.spec['metis'].prefix), + ('@PARMETIS_PREFIX', self.spec['parmetis'].prefix), + ('@LAPACK_PREFIX', self.spec['lapack'].prefix), + ('@BLAS_PREFIX', self.spec['blas'].prefix), + ('@LAPACK_LIBS', self.spec['lapack'].libs.joined()), + ('@BLAS_LIBS', self.spec['blas'].libs.joined()), # FIXME : what to do with compiler provided libraries ? - '@STDCXX_LIB': ' '.join(self.compiler.stdcxx_libs), - '@FLDFLAGS': '' - } + ('@STDCXX_LIB', ' '.join(self.compiler.stdcxx_libs)) + ] if '@0.9.2' in self.spec: - substitutions['@FLDFLAGS'] = '-Wl,--allow-multiple-definition' + substitutions.append( + ('@FLDFLAGS', '-Wl,--allow-multiple-definition') + ) + else: + substitutions.append( + ('@FLDFLAGS', '') + ) template = join_path( os.path.dirname(inspect.getmodule(self).__file__), @@ -95,7 +100,7 @@ class Pexsi(MakefilePackage): 'make.inc' ) shutil.copy(template, makefile) - for key, value in substitutions.items(): + for key, value in substitutions: filter_file(key, value, makefile) def build(self, spec, prefix): -- cgit v1.2.3-70-g09d2 From d68338cc8ccaee168d6e607936ee6918a53c31b8 Mon Sep 17 00:00:00 2001 From: "Kelly (KT) Thompson" Date: Thu, 2 Aug 2018 10:25:30 -0600 Subject: Trilinos: Update rules for superlu-dist version compatibility. (#8851) --- var/spack/repos/builtin/packages/trilinos/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index b16d00bb65..ebcd27c28a 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -295,6 +295,7 @@ class Trilinos(CMakePackage): depends_on('scalapack', when='+mumps') depends_on('superlu-dist', when='+superlu-dist') depends_on('superlu-dist@:4.3', when='@:12.6.1+superlu-dist') + depends_on('superlu-dist@4.4:5.3', when='@12.6.2:12.12.1+superlu-dist') depends_on('superlu-dist@develop', when='@develop+superlu-dist') depends_on('superlu-dist@xsdk-0.2.0', when='@xsdk-0.2.0+superlu-dist') depends_on('superlu+pic@4.3', when='+superlu') -- cgit v1.2.3-70-g09d2 From ec3ffd9d286991362601176e0be8406039ea2c44 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Thu, 2 Aug 2018 18:43:59 +0200 Subject: sz: fix checksum for 2.0.2.0 (#8868) --- var/spack/repos/builtin/packages/sz/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sz/package.py b/var/spack/repos/builtin/packages/sz/package.py index 0e3e29f6c0..c6f97e91ea 100644 --- a/var/spack/repos/builtin/packages/sz/package.py +++ b/var/spack/repos/builtin/packages/sz/package.py @@ -35,7 +35,7 @@ class Sz(AutotoolsPackage): git = "https://github.com/disheng222/SZ.git" version('develop', branch='master') - version('2.0.2.0', sha256='59d1b51d4461049a67e6390a259549eba37f53e20c2d97e3189f22a46d8e6fd4') + version('2.0.2.0', sha256='176c65b421bdec8e91010ffbc9c7bf7852c799972101d6b66d2a30d9702e59b0') version('1.4.13.5', sha256='b5e37bf3c377833eed0a7ca0471333c96cd2a82863abfc73893561aaba5f18b9') version('1.4.13.4', sha256='c99b95793c48469cac60e6cf82f921babf732ca8c50545a719e794886289432b') version('1.4.13.3', sha256='9d80390f09816bf01b7a817e07339030d596026b00179275616af55ed3c1af98') -- cgit v1.2.3-70-g09d2 From 1aa01873c7e0b02939e990d65015b8311bf7f225 Mon Sep 17 00:00:00 2001 From: Matthias Wolf Date: Thu, 2 Aug 2018 18:44:16 +0200 Subject: Adding lazy property python module (#47) (#8867) --- .../builtin/packages/py-lazy-property/package.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-lazy-property/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-lazy-property/package.py b/var/spack/repos/builtin/packages/py-lazy-property/package.py new file mode 100644 index 0000000000..51b6edefec --- /dev/null +++ b/var/spack/repos/builtin/packages/py-lazy-property/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyLazyProperty(PythonPackage): + """A package for making properties lazy""" + + homepage = "https://github.com/jackmaney/lazy-property" + url = "https://github.com/jackmaney/lazy-property/archive/0.0.1.tar.gz" + + version('0.0.1', '7e046c2441abe1bd272d5360827237b3') + version('0.0.0', 'fda622b7f1c46ee72ad25f5e88c928f5') + + depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From d07e9e13ab8c45df101f0df4ff0e4254e4c66865 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 2 Aug 2018 12:03:52 -0500 Subject: Update homepage for laghos (#8864) --- var/spack/repos/builtin/packages/laghos/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/laghos/package.py b/var/spack/repos/builtin/packages/laghos/package.py index 11abe46fdf..52f9fc6a39 100644 --- a/var/spack/repos/builtin/packages/laghos/package.py +++ b/var/spack/repos/builtin/packages/laghos/package.py @@ -33,7 +33,7 @@ class Laghos(MakefilePackage): """ tags = ['proxy-app', 'ecp-proxy-app'] - homepage = "https://codesign.llnl.gov/laghos.php" + homepage = "https://github.com/CEED/Laghos" url = "https://github.com/CEED/Laghos/archive/v1.0.tar.gz" git = "https://github.com/CEED/Laghos.git" -- cgit v1.2.3-70-g09d2 From b1c35e1e13d4669bfa632623f2aeba63107254bf Mon Sep 17 00:00:00 2001 From: Matthias Wolf Date: Thu, 2 Aug 2018 19:04:59 +0200 Subject: package neovim: add info for version 0.3.1 (#8866) --- var/spack/repos/builtin/packages/neovim/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/neovim/package.py b/var/spack/repos/builtin/packages/neovim/package.py index ad685a79f6..9497fd1991 100644 --- a/var/spack/repos/builtin/packages/neovim/package.py +++ b/var/spack/repos/builtin/packages/neovim/package.py @@ -32,6 +32,7 @@ class Neovim(CMakePackage): homepage = "http://neovim.io" url = "https://github.com/neovim/neovim/archive/v0.2.0.tar.gz" + version('0.3.1', '5405bced1c929ebc245c75409cd6c7ef') version('0.3.0', 'e5fdb2025757c337c17449c296eddf5b') version('0.2.2', '44b69f8ace88b646ec890670f1e462c4') version('0.2.1', 'f4271f22d2a46fa18dace42849c56a98') -- cgit v1.2.3-70-g09d2 From 12fb1cdbe51a5fb66f4244752cc2ba68fec40320 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Thu, 2 Aug 2018 19:29:05 +0200 Subject: Replace pkg-config dependencies with virtual (#8783) Several packages specified pkg-config as a dependency, which is a specific implementation of the pkgconfig virtual. Most packages do not request a specific implementation. The current concretizer may choose a different implentation of pkgconfig for the nonspecific dependents, which conflicts with the request for pkg-config. This replaces all requests for a specific implementation of pkgconfig with the virtual package as a temporary solution to the issue. --- var/spack/repos/builtin/packages/fluxbox/package.py | 2 +- var/spack/repos/builtin/packages/gdal/package.py | 2 +- var/spack/repos/builtin/packages/graphviz/package.py | 2 +- var/spack/repos/builtin/packages/i3/package.py | 10 +++++----- var/spack/repos/builtin/packages/mc/package.py | 2 +- var/spack/repos/builtin/packages/neuron/package.py | 4 ++-- var/spack/repos/builtin/packages/pandaseq/package.py | 2 +- .../repos/builtin/packages/perl-extutils-pkgconfig/package.py | 2 +- var/spack/repos/builtin/packages/wireshark/package.py | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fluxbox/package.py b/var/spack/repos/builtin/packages/fluxbox/package.py index 41c6e65d2f..f6474e576f 100644 --- a/var/spack/repos/builtin/packages/fluxbox/package.py +++ b/var/spack/repos/builtin/packages/fluxbox/package.py @@ -38,7 +38,7 @@ class Fluxbox(AutotoolsPackage): version('1.3.7', 'd99d7710f9daf793e0246dae5304b595') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('freetype') depends_on('libxrender') depends_on('libxext') diff --git a/var/spack/repos/builtin/packages/gdal/package.py b/var/spack/repos/builtin/packages/gdal/package.py index 996564f337..e49f473198 100644 --- a/var/spack/repos/builtin/packages/gdal/package.py +++ b/var/spack/repos/builtin/packages/gdal/package.py @@ -93,7 +93,7 @@ class Gdal(AutotoolsPackage): # GDAL depends on GNUmake on Unix platforms. # https://trac.osgeo.org/gdal/wiki/BuildingOnUnix depends_on('gmake', type='build') - depends_on('pkg-config@0.25:', type='build') + depends_on('pkgconfig', type='build') # Required dependencies depends_on('libtiff@3.6.0:') # 3.9.0+ needed to pass testsuite diff --git a/var/spack/repos/builtin/packages/graphviz/package.py b/var/spack/repos/builtin/packages/graphviz/package.py index a06e5e3458..5ff3aabc77 100644 --- a/var/spack/repos/builtin/packages/graphviz/package.py +++ b/var/spack/repos/builtin/packages/graphviz/package.py @@ -134,7 +134,7 @@ class Graphviz(AutotoolsPackage): depends_on('gtkplus', when='+gtkplus') # Build dependencies - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') # The following are needed when building from git depends_on('automake', type='build') depends_on('autoconf', type='build') diff --git a/var/spack/repos/builtin/packages/i3/package.py b/var/spack/repos/builtin/packages/i3/package.py index cc12027578..44757b9e29 100644 --- a/var/spack/repos/builtin/packages/i3/package.py +++ b/var/spack/repos/builtin/packages/i3/package.py @@ -36,11 +36,11 @@ class I3(AutotoolsPackage): version('4.14.1', 'bdbb6d7bb5a647c8b7b53ed10de84cc5') - depends_on('autoconf', type='build') - depends_on('automake', type='build') - depends_on('libtool', type='build') - depends_on('m4', type='build') - depends_on('pkg-config', type='build') + depends_on('autoconf', type='build') + depends_on('automake', type='build') + depends_on('libtool', type='build') + depends_on('m4', type='build') + depends_on('pkgconfig', type='build') depends_on('libev') depends_on('startup-notification') diff --git a/var/spack/repos/builtin/packages/mc/package.py b/var/spack/repos/builtin/packages/mc/package.py index 4b4519b953..f5cc3249ff 100644 --- a/var/spack/repos/builtin/packages/mc/package.py +++ b/var/spack/repos/builtin/packages/mc/package.py @@ -34,7 +34,7 @@ class Mc(AutotoolsPackage): version('4.8.20', 'dcfc7aa613c62291a0f71f6b698d8267') depends_on('ncurses') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('glib@2.14:') depends_on('libssh2@1.2.5:') diff --git a/var/spack/repos/builtin/packages/neuron/package.py b/var/spack/repos/builtin/packages/neuron/package.py index cec0f027d7..faae212806 100644 --- a/var/spack/repos/builtin/packages/neuron/package.py +++ b/var/spack/repos/builtin/packages/neuron/package.py @@ -59,7 +59,7 @@ class Neuron(Package): depends_on('automake', type='build') depends_on('autoconf', type='build') depends_on('libtool', type='build') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('mpi', when='+mpi') depends_on('python@2.6:', when='+python') @@ -87,7 +87,7 @@ class Neuron(Package): def patch(self): # aclocal need complete include path (especially on os x) - pkgconf_inc = '-I %s/share/aclocal/' % (self.spec['pkg-config'].prefix) + pkgconf_inc = '-I %s/share/aclocal/' % (self.spec['pkgconfig'].prefix) libtool_inc = '-I %s/share/aclocal/' % (self.spec['libtool'].prefix) newpath = 'aclocal -I m4 %s %s' % (pkgconf_inc, libtool_inc) filter_file(r'aclocal -I m4', r'%s' % newpath, "build.sh") diff --git a/var/spack/repos/builtin/packages/pandaseq/package.py b/var/spack/repos/builtin/packages/pandaseq/package.py index 686fa698db..2d269293c2 100644 --- a/var/spack/repos/builtin/packages/pandaseq/package.py +++ b/var/spack/repos/builtin/packages/pandaseq/package.py @@ -41,7 +41,7 @@ class Pandaseq(AutotoolsPackage): depends_on('libtool', type=('build', 'link')) depends_on('m4', type='build') depends_on('zlib', type='build') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('bzip2', type='link') def autoreconf(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py b/var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py index 50cbd959e1..a1496dbd0b 100644 --- a/var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py +++ b/var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py @@ -33,4 +33,4 @@ class PerlExtutilsPkgconfig(PerlPackage): version('1.16', 'b86318f2b6ac6af3ee985299e1e38fe5') - depends_on('pkg-config', type=('build', 'run')) + depends_on('pkgconfig', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/wireshark/package.py b/var/spack/repos/builtin/packages/wireshark/package.py index 939a632043..27b049a31f 100644 --- a/var/spack/repos/builtin/packages/wireshark/package.py +++ b/var/spack/repos/builtin/packages/wireshark/package.py @@ -55,7 +55,7 @@ class Wireshark(CMakePackage): depends_on('libpcap') depends_on('lua@5.0.0:5.2.99') depends_on('krb5') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('libsmi', when='+smi') depends_on('libssh', when='+libssh') depends_on('nghttp2', when='+nghttp2') -- cgit v1.2.3-70-g09d2 From 6f2a7390530d9ddca418e06ab74f3642b68b3e95 Mon Sep 17 00:00:00 2001 From: Yifan Zhu Date: Thu, 2 Aug 2018 13:46:36 -0400 Subject: New package: GRNBoost (#8763) --- .../repos/builtin/packages/grnboost/package.py | 61 ++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 var/spack/repos/builtin/packages/grnboost/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/grnboost/package.py b/var/spack/repos/builtin/packages/grnboost/package.py new file mode 100644 index 0000000000..b1aedc05ba --- /dev/null +++ b/var/spack/repos/builtin/packages/grnboost/package.py @@ -0,0 +1,61 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Grnboost(Package): + """GRNBoost is a library built on top of Apache Spark that implements a + scalable strategy for gene regulatory network (GRN) inference. + + See https://github.com/aertslab/GRNBoost/blob/master/docs/user_guide.md + for the user guide. The location of xgboost4j-.jar and + GRNBoost.jar are set to $XGBOOST_JAR and $GRNBOOST_JAR. Path to + xgboost4j-.jar is also added to CLASSPATH.""" + + homepage = "https://github.com/aertslab/GRNBoost" + + version('2017-10-9', git='https://github.com/aertslab/GRNBoost.git', + commit='26c836b3dcbb85852d3c6f4b8340e8655434da02') + + depends_on('sbt', type='build') + depends_on('java', type=('build', 'run')) + depends_on('xgboost+jvm-packages', type='run') + depends_on('spark+hadoop', type='run') + + def setup_environment(self, spack_env, run_env): + grnboost_jar = join_path(self.prefix, 'target', + 'scala-2.11', 'GRNBoost.jar') + xgboost_version = self.spec['xgboost'].version.string + xgboost_jar = join_path(self.spec['xgboost'].prefix, + 'xgboost4j-' + xgboost_version + '.jar') + run_env.set('GRNBOOST_JAR', grnboost_jar) + run_env.set('JAVA_HOME', self.spec['java'].prefix) + run_env.set('CLASSPATH', xgboost_jar) + run_env.set('XGBOOST_JAR', xgboost_jar) + + def install(self, spec, prefix): + sbt = which('sbt') + sbt('assembly') + install_tree('target', prefix.target) -- cgit v1.2.3-70-g09d2 From c94109c34cf3a1a0385d3a4c03fd43cf3015cbe1 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Thu, 2 Aug 2018 12:51:51 -0500 Subject: Package py-biom-format fixes (#8727) * py-biom-format: needs py-setuptools at runtime * py-biom-format: needs py-pyqi --- var/spack/repos/builtin/packages/py-biom-format/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-biom-format/package.py b/var/spack/repos/builtin/packages/py-biom-format/package.py index 441f5c1952..4863450037 100644 --- a/var/spack/repos/builtin/packages/py-biom-format/package.py +++ b/var/spack/repos/builtin/packages/py-biom-format/package.py @@ -37,7 +37,7 @@ class PyBiomFormat(PythonPackage): variant('h5py', default=True, description='For use with BIOM 2.0+ files') - depends_on('py-setuptools', type='build') + depends_on('py-setuptools', type=('build', 'run')) depends_on('py-cython', type='build') depends_on('py-h5py', type=('build', 'run'), when='+h5py') depends_on('py-click', type=('build', 'run')) @@ -46,3 +46,4 @@ class PyBiomFormat(PythonPackage): depends_on('py-scipy@0.13.0:', type=('build', 'run')) depends_on('py-pandas@0.19.2:', type=('build', 'run')) depends_on('py-six@1.10.0:', type=('build', 'run')) + depends_on('py-pyqi', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 51aa604ed275ca54ee8121b3b5607153a81378ea Mon Sep 17 00:00:00 2001 From: Tom Merrick Date: Thu, 2 Aug 2018 13:06:39 -0500 Subject: Fix openmpi to work with slurm/pmi and mxm (#8427) * Add binutils+libiberty for mxm fabric * Help find the pmi library when using the slurm scheduler --- var/spack/repos/builtin/packages/openmpi/package.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 79ad131132..fbe75db893 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -242,6 +242,8 @@ class Openmpi(AutotoolsPackage): depends_on('valgrind~mpi', when='+memchecker') depends_on('ucx', when='fabrics=ucx') depends_on('libfabric', when='fabrics=libfabric') + depends_on('slurm', when='schedulers=slurm') + depends_on('binutils+libiberty', when='fabrics=mxm') conflicts('+cuda', when='@:1.6') # CUDA support was added in 1.7 conflicts('fabrics=psm2', when='@:1.8') # PSM2 support was added in 1.10.0 @@ -354,8 +356,11 @@ class Openmpi(AutotoolsPackage): # https://github.com/open-mpi/ompi/issues/4338#issuecomment-383982008 # # adding --enable-static silently disables slurm support via pmi/pmi2 - if not spec.satisfies('schedulers=slurm'): + if spec.satisfies('schedulers=slurm'): + config_args.append('--with-pmi={0}'.format(spec['slurm'].prefix)) + else: config_args.append('--enable-static') + config_args.extend(self.with_or_without('pmi')) if spec.satisfies('@2.0:'): # for Open-MPI 2.0:, C++ bindings are disabled by default. @@ -368,8 +373,6 @@ class Openmpi(AutotoolsPackage): config_args.extend(self.with_or_without('fabrics')) # Schedulers config_args.extend(self.with_or_without('schedulers')) - # PMI - config_args.extend(self.with_or_without('pmi')) config_args.extend(self.enable_or_disable('memchecker')) if spec.satisfies('+memchecker', strict=True): -- cgit v1.2.3-70-g09d2 From e554add64b7b0f2d395d0c67aa2dcf8ef046a027 Mon Sep 17 00:00:00 2001 From: Dan FitzGerald <38731008+djfitzgerald@users.noreply.github.com> Date: Thu, 2 Aug 2018 14:23:37 -0400 Subject: Change MUMPS to allow it to build with clang+xlf compiler combination (#8388) The mumps package was unable to build using the llvm clang compiler suite, as it defaulted to using mpif90 for linking and mpif90 cannot be used for linking shared library code. This PR modifies the MUMPS package.py to allow it to use IBM XL Fortran for linking. It also eliminates the need for the existing MUMPS IBM XL patches by having package.py specify the compiler-dependent "shared" flag to the linker, and always using the compiler suite's Fortran compiler for linking. --- .../repos/builtin/packages/mumps/examples.patch | 41 +++++++++ .../mumps/mumps-5.0.2-spectrum-mpi-xl.patch | 75 ----------------- .../mumps/mumps-5.1.1-spectrum-mpi-xl.patch | 79 ------------------ var/spack/repos/builtin/packages/mumps/package.py | 97 ++++++++++++---------- 4 files changed, 92 insertions(+), 200 deletions(-) create mode 100644 var/spack/repos/builtin/packages/mumps/examples.patch delete mode 100644 var/spack/repos/builtin/packages/mumps/mumps-5.0.2-spectrum-mpi-xl.patch delete mode 100644 var/spack/repos/builtin/packages/mumps/mumps-5.1.1-spectrum-mpi-xl.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mumps/examples.patch b/var/spack/repos/builtin/packages/mumps/examples.patch new file mode 100644 index 0000000000..78003935a6 --- /dev/null +++ b/var/spack/repos/builtin/packages/mumps/examples.patch @@ -0,0 +1,41 @@ +--- a/examples/Makefile ++++ b/examples/Makefile +@@ -27,32 +27,32 @@ + LIBSMUMPS = $(libdir)/libsmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON) + + ssimpletest: $(LIBSMUMPS) $$@.o +- $(FL) -o $@ $(OPTL) ssimpletest.o $(LIBSMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) ++ $(FL) -o $@ ssimpletest.o $(LIBSMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) + + + LIBDMUMPS = $(libdir)/libdmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON) + + dsimpletest: $(LIBDMUMPS) $$@.o +- $(FL) -o $@ $(OPTL) dsimpletest.o $(LIBDMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) ++ $(FL) -o $@ dsimpletest.o $(LIBDMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) + + + LIBCMUMPS = $(libdir)/libcmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON) + + csimpletest: $(LIBCMUMPS) $$@.o +- $(FL) -o $@ $(OPTL) csimpletest.o $(LIBCMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) ++ $(FL) -o $@ csimpletest.o $(LIBCMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) + + + LIBZMUMPS = $(libdir)/libzmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON) + + zsimpletest: $(LIBZMUMPS) $$@.o +- $(FL) -o $@ $(OPTL) zsimpletest.o $(LIBZMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) ++ $(FL) -o $@ zsimpletest.o $(LIBZMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) + + c_example: $(LIBDMUMPS) $$@.o +- $(FL) -o $@ $(OPTL) $@.o $(LIBDMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) ++ $(FL) -o $@ $@.o $(LIBDMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) + + + multiple_arithmetics_example: $(LIBSMUMPS) $(LIBDMUMPS) $(LIBCMUMPS) $(LIBZMUMPS) $$@.o +- $(FL) -o $@ $(OPTL) $@.o $(LIBSMUMPS) $(LIBDMUMPS) $(LIBCMUMPS) $(LIBZMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) ++ $(FL) -o $@ $@.o $(LIBSMUMPS) $(LIBDMUMPS) $(LIBCMUMPS) $(LIBZMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) + + + .SUFFIXES: .c .F .o diff --git a/var/spack/repos/builtin/packages/mumps/mumps-5.0.2-spectrum-mpi-xl.patch b/var/spack/repos/builtin/packages/mumps/mumps-5.0.2-spectrum-mpi-xl.patch deleted file mode 100644 index d2bd17cb44..0000000000 --- a/var/spack/repos/builtin/packages/mumps/mumps-5.0.2-spectrum-mpi-xl.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -Naur MUMPS_5.0.1/Makefile MUMPS_5.0.1-patched/MUMPS_5.0.1/Makefile ---- ./Makefile 2015-07-23 13:08:29.000000000 -0400 -+++ ./Makefile 2016-12-05 14:08:30.788638382 -0500 -@@ -62,7 +62,7 @@ - $(libdir)/libpord$(PLAT)$(LIBEXT): - if [ "$(LPORDDIR)" != "" ] ; then \ - cd $(LPORDDIR); \ -- $(MAKE) CC="$(CC)" CFLAGS="$(OPTC)" AR="$(AR)" RANLIB="$(RANLIB)" OUTC="$(OUTC)" LIBEXT=$(LIBEXT); \ -+ $(MAKE) CC="$(CC)" CFLAGS="$(OPTC)" SAR="$(SAR)" RANLIB="$(RANLIB)" OUTC="$(OUTC)" LIBEXT=$(LIBEXT); \ - fi; - if [ "$(LPORDDIR)" != "" ] ; then \ - cp $(LPORDDIR)/libpord$(LIBEXT) $@; \ -diff -Naur MUMPS_5.0.1/PORD/lib/Makefile MUMPS_5.0.1-patched/PORD/lib/MUMPS_5.0.1/Makefile ---- ./PORD/lib/Makefile 2015-07-23 13:08:29.000000000 -0400 -+++ ./PORD/lib/Makefile 2016-12-05 11:26:24.785317467 -0500 -@@ -25,7 +25,7 @@ - $(CC) $(COPTIONS) -c $*.c $(OUTC)$*.o - - libpord$(LIBEXT):$(OBJS) -- $(AR)$@ $(OBJS) -+ $(SAR)$@ $(OBJS) - $(RANLIB) $@ - - clean: -diff -Naur MUMPS_5.0.1/examples/Makefile MUMPS_5.0.1-patched/examples/Makefile ---- ./examples/Makefile 2015-07-23 13:08:32.000000000 -0400 -+++ ./examples/Makefile 2016-12-05 14:36:10.692857906 -0500 -@@ -25,37 +25,30 @@ - - LIBSMUMPS = $(libdir)/libsmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON) - --ssimpletest: $(LIBSMUMPS) $$@.o -- $(FL) -o $@ $(OPTL) ssimpletest.o $(LIBSMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) -+ssimpletest: $(LIBSMUMPS) $$@.F -+ $(FC) -o $@ $(OPTF) $(INCS) -I. -I$(topdir)/include ssimpletest.F $(LIBSMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) - - - LIBDMUMPS = $(libdir)/libdmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON) - --dsimpletest: $(LIBDMUMPS) $$@.o -- $(FL) -o $@ $(OPTL) dsimpletest.o $(LIBDMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) -+dsimpletest: $(LIBDMUMPS) $$@.F -+ $(FC) -o $@ $(OPTF) $(INCS) -I. -I$(topdir)/include dsimpletest.F $(LIBDMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) - - - LIBCMUMPS = $(libdir)/libcmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON) - --csimpletest: $(LIBCMUMPS) $$@.o -- $(FL) -o $@ $(OPTL) csimpletest.o $(LIBCMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) -+csimpletest: $(LIBCMUMPS) $$@.F -+ $(FC) -o $@ $(OPTF) $(INCS) -I. -I$(topdir)/include csimpletest.F $(LIBCMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) - - - LIBZMUMPS = $(libdir)/libzmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON) - --zsimpletest: $(LIBZMUMPS) $$@.o -- $(FL) -o $@ $(OPTL) zsimpletest.o $(LIBZMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) -+zsimpletest: $(LIBZMUMPS) $$@.F -+ $(FC) -o $@ $(OPTF) $(INCS) -I. -I$(topdir)/include zsimpletest.F $(LIBZMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) - - --c_example: $(LIBDMUMPS) $$@.o -- $(FL) -o $@ $(OPTL) $@.o $(LIBDMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) -- -- --.SUFFIXES: .c .F .o --.F.o: -- $(FC) $(OPTF) $(INCS) -I. -I$(topdir)/include -c $*.F $(OUTF)$*.o --.c.o: -- $(CC) $(OPTC) $(INCS) $(CDEFS) -I. -I$(topdir)/include -I$(topdir)/src -c $*.c $(OUTC)$*.o -+c_example: $(LIBDMUMPS) $$@.c -+ $(CC) -o $@ $(OPTC) $(INCS) -I. -I$(topdir)/include c_example.c $(LIBDMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) - - - $(libdir)/libsmumps$(PLAT)$(LIBEXT): diff --git a/var/spack/repos/builtin/packages/mumps/mumps-5.1.1-spectrum-mpi-xl.patch b/var/spack/repos/builtin/packages/mumps/mumps-5.1.1-spectrum-mpi-xl.patch deleted file mode 100644 index 8d9c1fb93a..0000000000 --- a/var/spack/repos/builtin/packages/mumps/mumps-5.1.1-spectrum-mpi-xl.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -Naur MUMPS_5.0.1/Makefile MUMPS_5.0.1-patched/MUMPS_5.0.1/Makefile ---- ./Makefile 2015-07-23 13:08:29.000000000 -0400 -+++ ./Makefile 2016-12-05 14:08:30.788638382 -0500 -@@ -62,7 +62,7 @@ - $(libdir)/libpord$(PLAT)$(LIBEXT): - if [ "$(LPORDDIR)" != "" ] ; then \ - cd $(LPORDDIR); \ -- $(MAKE) CC="$(CC)" CFLAGS="$(OPTC)" AR="$(AR)" RANLIB="$(RANLIB)" OUTC="$(OUTC)" LIBEXT=$(LIBEXT); \ -+ $(MAKE) CC="$(CC)" CFLAGS="$(OPTC)" SAR="$(SAR)" RANLIB="$(RANLIB)" OUTC="$(OUTC)" LIBEXT=$(LIBEXT); \ - fi; - if [ "$(LPORDDIR)" != "" ] ; then \ - cp $(LPORDDIR)/libpord$(LIBEXT) $@; \ -diff -Naur MUMPS_5.0.1/PORD/lib/Makefile MUMPS_5.0.1-patched/PORD/lib/MUMPS_5.0.1/Makefile ---- ./PORD/lib/Makefile 2015-07-23 13:08:29.000000000 -0400 -+++ ./PORD/lib/Makefile 2016-12-05 11:26:24.785317467 -0500 -@@ -25,7 +25,7 @@ - $(CC) $(COPTIONS) -c $*.c $(OUTC)$*.o - - libpord$(LIBEXT):$(OBJS) -- $(AR)$@ $(OBJS) -+ $(SAR)$@ $(OBJS) - $(RANLIB) $@ - - clean: ---- ./examples/Makefile 2017-06-07 15:40:49.366671322 -0400 -+++ ./examples/Makefile 2017-06-07 15:47:55.666685772 -0400 -@@ -26,40 +26,33 @@ - - LIBSMUMPS = $(libdir)/libsmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON) - --ssimpletest: $(LIBSMUMPS) $$@.o -- $(FL) -o $@ $(OPTL) ssimpletest.o $(LIBSMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) -+ssimpletest: $(LIBSMUMPS) $$@.F -+ $(FC) -o $@ $(OPTF) $(INCS) -I. -I$(topdir)/include ssimpletest.F $(LIBSMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) - - - LIBDMUMPS = $(libdir)/libdmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON) - --dsimpletest: $(LIBDMUMPS) $$@.o -- $(FL) -o $@ $(OPTL) dsimpletest.o $(LIBDMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) -+dsimpletest: $(LIBDMUMPS) $$@.F -+ $(FC) -o $@ $(OPTF) $(INCS) -I. -I$(topdir)/include dsimpletest.F $(LIBDMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) - - - LIBCMUMPS = $(libdir)/libcmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON) - --csimpletest: $(LIBCMUMPS) $$@.o -- $(FL) -o $@ $(OPTL) csimpletest.o $(LIBCMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) -+csimpletest: $(LIBCMUMPS) $$@.F -+ $(FC) -o $@ $(OPTF) $(INCS) -I. -I$(topdir)/include csimpletest.F $(LIBCMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) - - - LIBZMUMPS = $(libdir)/libzmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON) - --zsimpletest: $(LIBZMUMPS) $$@.o -- $(FL) -o $@ $(OPTL) zsimpletest.o $(LIBZMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) -+zsimpletest: $(LIBZMUMPS) $$@.F -+ $(FC) -o $@ $(OPTF) $(INCS) -I. -I$(topdir)/include zsimpletest.F $(LIBZMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) - --c_example: $(LIBDMUMPS) $$@.o -- $(FL) -o $@ $(OPTL) $@.o $(LIBDMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) -+c_example: $(LIBDMUMPS) $$@.c -+ $(CC) -o $@ $(OPTC) $(INCS) -I. -I$(topdir)/include c_example.c $(LIBDMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) - - --multiple_arithmetics_example: $(LIBSMUMPS) $(LIBDMUMPS) $(LIBCMUMPS) $(LIBZMUMPS) $$@.o -- $(FL) -o $@ $(OPTL) $@.o $(LIBSMUMPS) $(LIBDMUMPS) $(LIBCMUMPS) $(LIBZMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) -- -- --.SUFFIXES: .c .F .o --.F.o: -- $(FC) $(OPTF) $(INCS) -I. -I$(topdir)/include -c $*.F $(OUTF)$*.o --.c.o: -- $(CC) $(OPTC) $(INCS) $(CDEFS) -I. -I$(topdir)/include -I$(topdir)/src -c $*.c $(OUTC)$*.o -+multiple_arithmetics_example: $(LIBSMUMPS) $(LIBDMUMPS) $(LIBCMUMPS) $(LIBZMUMPS) $$@.F -+ $(FC) -o $@ $(OPTF) $(INCS) -I. -I$(topdir)/include multiple_arithmetics_example.F $(LIBSMUMPS) $(LIBDMUMPS) $(LIBCMUMPS) $(LIBZMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) - - - $(libdir)/libsmumps$(PLAT)$(LIBEXT): diff --git a/var/spack/repos/builtin/packages/mumps/package.py b/var/spack/repos/builtin/packages/mumps/package.py index 79cf0e9ac6..98e669ed29 100644 --- a/var/spack/repos/builtin/packages/mumps/package.py +++ b/var/spack/repos/builtin/packages/mumps/package.py @@ -69,10 +69,7 @@ class Mumps(Package): depends_on('scalapack', when='+mpi') depends_on('mpi', when='+mpi') - patch('mumps-5.0.2-spectrum-mpi-xl.patch', when='@5.0.2%xl^spectrum-mpi') - patch('mumps-5.0.2-spectrum-mpi-xl.patch', when='@5.0.2%xl_r^spectrum-mpi') - patch('mumps-5.1.1-spectrum-mpi-xl.patch', when='@5.1.1%xl^spectrum-mpi') - patch('mumps-5.1.1-spectrum-mpi-xl.patch', when='@5.1.1%xl_r^spectrum-mpi') + patch('examples.patch', when='@5.1.1%clang^spectrum-mpi') # this function is not a patch function because in case scalapack # is needed it uses self.spec['scalapack'].fc_link set by the @@ -133,6 +130,18 @@ class Mumps(Package): makefile_conf.append("ORDERINGSF = %s" % (' '.join(orderings))) + # Determine which compiler suite we are using + using_gcc = self.compiler.name == "gcc" + using_pgi = self.compiler.name == "pgi" + using_intel = self.compiler.name == "intel" + using_xl = self.compiler.name in ['xl', 'xl_r'] + + # The llvm compiler suite does not contain a Fortran compiler by + # default. Its possible that a Spack user may have configured + # ~/.spack//compilers.yaml for using xlf. + using_xlf = using_xl or \ + (spack_f77.endswith('xlf') or spack_f77.endswith('xlf_r')) + # when building shared libs need -fPIC, otherwise # /usr/bin/ld: graph.o: relocation R_X86_64_32 against `.rodata.str1.1' # can not be used when making a shared object; recompile with -fPIC @@ -140,32 +149,37 @@ class Mumps(Package): # TODO: test this part, it needs a full blas, scalapack and # partitionning environment with 64bit integers - using_xl = self.compiler.name in ['xl', 'xl_r'] + opt_level = '3' if using_xl else '' + if '+int64' in self.spec: - if self.compiler.name == "xl" or self.compiler.name == "xl_r": - makefile_conf.extend( - ['OPTF = -O3', - 'OPTL = %s -O3' % fpic, - 'OPTC = %s -O3-DINTSIZE64' % fpic]) + if using_xlf: + makefile_conf.append('OPTF = -O%s' % opt_level) else: - makefile_conf.extend( - # the fortran compilation flags most probably are - # working only for intel and gnu compilers this is - # perhaps something the compiler should provide - ['OPTF = %s -O -DALLOW_NON_INIT %s' % (fpic, '-fdefault-integer-8' if self.compiler.name == "gcc" else '-i8'), # noqa - 'OPTL = %s -O ' % fpic, - 'OPTC = %s -O -DINTSIZE64' % fpic]) + # the fortran compilation flags most probably are + # working only for intel and gnu compilers this is + # perhaps something the compiler should provide + makefile_conf.extend([ + 'OPTF = %s -O -DALLOW_NON_INIT %s' % ( + fpic, + '-fdefault-integer-8' if using_gcc + else '-i8'), # noqa + ]) + + makefile_conf.extend([ + 'OPTL = %s -O%s' % (fpic, opt_level), + 'OPTC = %s -O%s -DINTSIZE64' % (fpic, opt_level) + ]) else: - if using_xl: - makefile_conf.extend( - ['OPTF = -O3 -qfixed', - 'OPTL = %s -O3' % fpic, - 'OPTC = %s -O3' % fpic]) + if using_xlf: + makefile_conf.append('OPTF = -O%s -qfixed' % opt_level) else: - makefile_conf.extend( - ['OPTF = %s -O -DALLOW_NON_INIT' % fpic, - 'OPTL = %s -O ' % fpic, - 'OPTC = %s -O ' % fpic]) + makefile_conf.append('OPTF = %s -O%s -DALLOW_NON_INIT' % ( + fpic, opt_level)) + + makefile_conf.extend([ + 'OPTL = %s -O%s' % (fpic, opt_level), + 'OPTC = %s -O%s' % (fpic, opt_level) + ]) if '+mpi' in self.spec: scalapack = self.spec['scalapack'].libs if not shared \ @@ -173,16 +187,9 @@ class Mumps(Package): makefile_conf.extend( ['CC = {0}'.format(self.spec['mpi'].mpicc), 'FC = {0}'.format(self.spec['mpi'].mpifc), + 'FL = {0}'.format(self.spec['mpi'].mpifc), "SCALAP = %s" % scalapack.ld_flags, "MUMPS_TYPE = par"]) - # The FL makefile variable is used for linking the examples and - # linking the shared mumps libraries (in some cases). - if using_xl and self.spec.satisfies('^spectrum-mpi'): - makefile_conf.extend( - ['FL = {0}'.format(self.spec['mpi'].mpicc)]) - else: - makefile_conf.extend( - ['FL = {0}'.format(self.spec['mpi'].mpifc)]) else: makefile_conf.extend( ["CC = cc", @@ -192,14 +199,14 @@ class Mumps(Package): # TODO: change the value to the correct one according to the # compiler possible values are -DAdd_, -DAdd__ and/or -DUPPER - if self.compiler.name == 'intel' or self.compiler.name == 'pgi': + if using_intel or using_pgi: # Intel & PGI Fortran compiler provides the main() function so # C examples linked with the Fortran compiler require a # hack defined by _DMAIN_COMP (see examples/c_example.c) makefile_conf.append("CDEFS = -DAdd_ -DMAIN_COMP") else: - if not using_xl: - makefile_conf.append("CDEFS = -DAdd_") + if not using_xlf: + makefile_conf.append("CDEFS = -DAdd_") if '+shared' in self.spec: # All Mumps libraries will be linked with 'inject_libs'. @@ -230,11 +237,16 @@ class Mumps(Package): 'RANLIB=echo' ]) else: + if using_xlf: + build_shared_flag = "qmkshrobj" + else: + build_shared_flag = "shared" + makefile_conf.extend([ 'LIBEXT=.so', - 'AR=link_cmd() { $(FL) -shared -Wl,-soname ' + 'AR=link_cmd() { $(FL) -%s -Wl,-soname ' '-Wl,%s/$(notdir $@) -o "$$@" %s; }; link_cmd ' % - (prefix.lib, inject_libs), + (build_shared_flag, prefix.lib, inject_libs), 'RANLIB=ls' ]) # When building libpord, read AR from Makefile.inc instead of @@ -245,13 +257,6 @@ class Mumps(Package): '\\1\ninclude ../../Makefile.inc', join_path('PORD', 'lib', 'Makefile')) - if using_xl: - # The patches for xl + spectrum-mpi use SAR for linking - # libpord. - makefile_conf.extend([ - 'SAR=%s -shared -Wl,-soname -Wl,%s/$(notdir $@) %s -o' - % (env['CC'], prefix.lib, inject_libs) - ]) else: makefile_conf.extend([ 'LIBEXT = .a', -- cgit v1.2.3-70-g09d2 From 3b0983a217f07a956a7e306580fbc806f3b00440 Mon Sep 17 00:00:00 2001 From: Stephen Herbein Date: Thu, 2 Aug 2018 13:20:55 -0700 Subject: flux: update flux-core package and add a flux-sched package (#8818) Renames the flux package to flux-core and updates its dependencies, versions, and variants. Adds a flux-sched package. This also updates two flux-core dependencies: lua and czmq. --- var/spack/repos/builtin/packages/czmq/package.py | 2 + .../repos/builtin/packages/flux-core/package.py | 131 +++++++++++++++++++++ .../repos/builtin/packages/flux-sched/package.py | 105 +++++++++++++++++ var/spack/repos/builtin/packages/flux/package.py | 80 ------------- var/spack/repos/builtin/packages/lua/package.py | 33 ++++-- 5 files changed, 261 insertions(+), 90 deletions(-) create mode 100644 var/spack/repos/builtin/packages/flux-core/package.py create mode 100644 var/spack/repos/builtin/packages/flux-sched/package.py delete mode 100644 var/spack/repos/builtin/packages/flux/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/czmq/package.py b/var/spack/repos/builtin/packages/czmq/package.py index 076c9d0f03..ba4a2983ff 100644 --- a/var/spack/repos/builtin/packages/czmq/package.py +++ b/var/spack/repos/builtin/packages/czmq/package.py @@ -30,6 +30,7 @@ class Czmq(AutotoolsPackage): homepage = "http://czmq.zeromq.org" url = "https://github.com/zeromq/czmq/archive/v4.0.2.tar.gz" + version('4.1.1', 'a2ab03cddd14399c6ba75b030a256211') version('4.0.2', 'a65317a3fb8238cf70e3e992e381f9cc') version('3.0.2', '23e9885f7ee3ce88d99d0425f52e9be1') @@ -37,6 +38,7 @@ class Czmq(AutotoolsPackage): depends_on('automake', type='build') depends_on('autoconf', type='build') depends_on('pkgconfig', type='build') + depends_on("libuuid") depends_on('zeromq') def configure_args(self): diff --git a/var/spack/repos/builtin/packages/flux-core/package.py b/var/spack/repos/builtin/packages/flux-core/package.py new file mode 100644 index 0000000000..7de8903af1 --- /dev/null +++ b/var/spack/repos/builtin/packages/flux-core/package.py @@ -0,0 +1,131 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import os + + +class FluxCore(AutotoolsPackage): + """ A next-generation resource manager (pre-alpha) """ + + 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" + + version('master', branch='master') + version('0.10.0', 'a84a1ed53a69c805c253bc940540cbf667a059b2008fd2a6a9bb890a985ead08e88dcbba68c01567f887357306fbfded41b93cc33edfa7809955ba5ba5870284') + version('0.9.0', '70eaec1005aa49e8d8cf397570789cebedfb5d917efe963390d456ee4c473eefb15b0c81ea83f60a1fd057fe7be356bbafdebcae64b499844d194c48f6aefa05') + version('0.8.0', 'b0fec05acedc530bcdf75b2477ac22f39d2adddc7af8ff76496208a5e1e8185b1b4a18677871d95c3cfbf34b05f391953651200917fe029931f4e2beb79d70df') + + # Avoid the infinite symlink issue + # This workaround is documented in PR #3543 + build_directory = 'spack-build' + + variant('doc', default=False, description='Build flux manpages') + variant('cuda', default=False, description='Build dependencies with support for CUDA') + + depends_on("zeromq@4.0.4:") + depends_on("czmq@2.2:") + depends_on("hwloc@1.11.1:1.99") + depends_on("hwloc +cuda", when='+cuda') + depends_on("lua", 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-luaposix") + depends_on("munge") + depends_on("libuuid") + depends_on("python", type=('build', 'run')) + depends_on("py-cffi", type=('build', 'run')) + depends_on("jansson") + depends_on("yaml-cpp") + + # 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("asciidoc", type='build', when="+docs") + + # Need autotools when building on master: + depends_on("autoconf", type='build', when='@master') + depends_on("automake", type='build', when='@master') + depends_on("libtool", type='build', when='@master') + + def setup(self): + pass + + @when('@master') + def setup(self): + # Check in case we are running `spack diy` from an "unshallow" clone + if os.path.exists('.git/shallow'): + # Allow git-describe to get last tag so flux-version works: + git = which('git') + git('fetch', '--unshallow') + + def autoreconf(self, spec, prefix): + self.setup() + if not os.path.exists('configure'): + # Bootstrap with autotools + bash = which('bash') + bash('./autogen.sh') + + @property + def lua_version(self): + return self.spec['lua'].version.up_to(2) + + @property + def lua_share_dir(self): + return os.path.join('share', 'lua', str(self.lua_version)) + + @property + def lua_lib_dir(self): + return os.path.join('lib', 'lua', str(self.lua_version)) + + def setup_environment(self, spack_env, run_env): + # Ensure ./fluxometer.lua can be found during flux's make check + spack_env.append_path('LUA_PATH', './?.lua', separator=';') + + run_env.prepend_path( + 'LUA_PATH', + os.path.join(self.spec.prefix, self.lua_share_dir, '?.lua'), + separator=';') + run_env.prepend_path( + 'LUA_CPATH', + os.path.join(self.spec.prefix, self.lua_lib_dir, '?.so'), + separator=';') + run_env.prepend_path( + 'PYTHONPATH', + os.path.join( + self.spec.prefix.lib, + "python{0}".format(self.spec['python'].version.up_to(2)), + "site-packages"), + ) + run_env.prepend_path('FLUX_MODULE_PATH', self.prefix.lib.flux.modules) + run_env.prepend_path('FLUX_EXEC_PATH', self.prefix.libexec.flux.cmd) + run_env.prepend_path('FLUX_RC_PATH', self.prefix.etc.flux) + + def configure_args(self): + args = ['--enable-pylint=no'] + if '+docs' not in self.spec: + args.append('--disable-docs') + return args diff --git a/var/spack/repos/builtin/packages/flux-sched/package.py b/var/spack/repos/builtin/packages/flux-sched/package.py new file mode 100644 index 0000000000..6170f6b19e --- /dev/null +++ b/var/spack/repos/builtin/packages/flux-sched/package.py @@ -0,0 +1,105 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import os + + +class FluxSched(AutotoolsPackage): + """ A scheduler for flux-core (pre-alpha) """ + + 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" + + version('master', branch='master') + version('0.5.0', 'a9835c9c478aa41123a4e12672500052228aaf1ea770f74cb0901dbf4a049bd7d329e99d8d3484e39cfed1f911705030b2775dcfede39bc8bea59c6afe2549b1') + version('0.4.0', '82732641ac4594ffe9b94ca442a99e92bf5f91bc14745af92203a887a40610dd44edda3ae07f9b6c8d63799b2968d87c8da28f1488edef1310d0d12be9bd6319') + + variant('cuda', default=False, description='Build dependencies with support for CUDA') + + depends_on("boost+graph", when='@0.5.0:,master') + + depends_on("flux-core", type=('build', 'link', 'run')) + depends_on("flux-core+cuda", when='+cuda') + 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.10.0", when='@0.6.0') + depends_on("flux-core@master", when='@master') + + # Need autotools when building on master: + depends_on("autoconf", type='build', when='@master') + depends_on("automake", type='build', when='@master') + depends_on("libtool", type='build', when='@master') + + def setup(self): + pass + + @when('@master') + def setup(self): + # Check in case we are running `spack diy` from an "unshallow" clone + if os.path.exists('.git/shallow'): + # Allow git-describe to get last tag so flux-version works: + git = which('git') + git('fetch', '--unshallow') + + def autoreconf(self, spec, prefix): + self.setup() + if not os.path.exists('configure'): + # Bootstrap with autotools + bash = which('bash') + bash('./autogen.sh') + + def configure_args(self): + # flux-sched's ax_boost is sometimes weird about non-system locations + # explicitly setting the path guarantees success + return ['--with-boost={0}'.format(self.spec['boost'].prefix)] + + @property + def lua_version(self): + return self.spec['lua'].version.up_to(2) + + @property + def lua_share_dir(self): + return os.path.join('share', 'lua', str(self.lua_version)) + + @property + def lua_lib_dir(self): + return os.path.join('lib', 'lua', str(self.lua_version)) + + def setup_environment(self, spack_env, run_env): + run_env.prepend_path( + 'LUA_PATH', + os.path.join(self.spec.prefix, self.lua_share_dir, '?.lua'), + separator=';') + run_env.prepend_path( + 'LUA_CPATH', + os.path.join(self.spec.prefix, self.lua_lib_dir, '?.so'), + separator=';') + + run_env.prepend_path('FLUX_MODULE_PATH', self.prefix.lib.flux.modules) + run_env.prepend_path('FLUX_MODULE_PATH', + self.prefix.lib.flux.modules.sched) + run_env.prepend_path('FLUX_EXEC_PATH', self.prefix.libexec.flux.cmd) + run_env.prepend_path('FLUX_RC_EXTRA', self.prefix.etc.flux) diff --git a/var/spack/repos/builtin/packages/flux/package.py b/var/spack/repos/builtin/packages/flux/package.py deleted file mode 100644 index ddad8365e4..0000000000 --- a/var/spack/repos/builtin/packages/flux/package.py +++ /dev/null @@ -1,80 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -from spack import * -import os - - -class Flux(AutotoolsPackage): - """ A next-generation resource manager (pre-alpha) """ - - 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" - - version('master', branch='master') - version('0.8.0', md5='9ee12974a8b2ab9a30533f69826f3bec') - - variant('doc', default=False, description='Build flux manpages') - - depends_on("zeromq@4.0.4:") - depends_on("czmq@2.2:") - depends_on("hwloc") - depends_on("lua@5.1:5.1.99") - depends_on("lua-luaposix") - depends_on("munge") - depends_on("libuuid") - depends_on("python") - depends_on("py-cffi", type=('build', 'run')) - depends_on("jansson") - - depends_on("asciidoc", type='build', when="+docs") - - # Need autotools when building on master: - depends_on("autoconf", type='build', when='@master') - depends_on("automake", type='build', when='@master') - depends_on("libtool", type='build', when='@master') - - def setup(): - pass - - @when('@master') - def setup(self): - # Allow git-describe to get last tag so flux-version works: - git = which('git') - git('pull', '--depth=50', '--tags') - - def autoreconf(self, spec, prefix): - self.setup() - if os.path.exists('autogen.sh'): - # Bootstrap with autotools - bash = which('bash') - bash('./autogen.sh') - - def setup_environment(self, spack_env, run_env): - # Ensure ./fluxometer.lua can be found during flux's make check - spack_env.append_path('LUA_PATH', './?.lua', separator=';') - - def configure_args(self): - return ['--disable-docs'] if '+docs' not in self.spec else [] diff --git a/var/spack/repos/builtin/packages/lua/package.py b/var/spack/repos/builtin/packages/lua/package.py index eec46f9d4c..4faae8fc48 100644 --- a/var/spack/repos/builtin/packages/lua/package.py +++ b/var/spack/repos/builtin/packages/lua/package.py @@ -64,28 +64,41 @@ class Lua(Package): else: target = 'linux' make('INSTALL_TOP=%s' % prefix, - 'MYCFLAGS=%s' % ( - self.compiler.pic_flag), 'MYLDFLAGS=-L%s -L%s' % ( spec['readline'].prefix.lib, spec['ncurses'].prefix.lib), 'MYLIBS=-lncursesw', - 'CC=%s -std=gnu99' % spack_cc, + 'CC=%s -std=gnu99 %s' % (spack_cc, + self.compiler.pic_flag), target) make('INSTALL_TOP=%s' % prefix, - 'MYCFLAGS=%s' % ( - self.compiler.pic_flag), - 'MYLDFLAGS=-L%s -L%s' % ( - spec['readline'].prefix.lib, - spec['ncurses'].prefix.lib), - 'MYLIBS=-lncursesw', - 'CC=%s -std=gnu99' % spack_cc, 'install') static_to_shared_library(join_path(prefix.lib, 'liblua.a'), arguments=['-lm'], version=self.version, compat_version=self.version.up_to(2)) + # compatibility with ax_lua.m4 from autoconf-archive + # https://www.gnu.org/software/autoconf-archive/ax_lua.html + with working_dir(prefix.lib): + # e.g., liblua.so.5.1.5 + src_path = 'liblua.{0}.{1}'.format(dso_suffix, + str(self.version.up_to(3))) + + # For lua version 5.1.X, the symlinks should be: + # liblua5.1.so + # liblua51.so + # liblua-5.1.so + # liblua-51.so + version_formats = [str(self.version.up_to(2)), + Version(str(self.version.up_to(2))).joined] + for version_str in version_formats: + for joiner in ['', '-']: + dest_path = 'liblua{0}{1}.{2}'.format(joiner, + version_str, + dso_suffix) + os.symlink(src_path, dest_path) + with working_dir(os.path.join('luarocks', 'luarocks')): configure('--prefix=' + prefix, '--with-lua=' + prefix) make('build') -- cgit v1.2.3-70-g09d2 From 1ec06e61114ef8eb69b96491d9f7f09707dafc20 Mon Sep 17 00:00:00 2001 From: dorier Date: Thu, 2 Aug 2018 21:28:19 +0100 Subject: new package: XSD (#8784) --- var/spack/repos/builtin/packages/xsd/package.py | 52 +++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 var/spack/repos/builtin/packages/xsd/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/xsd/package.py b/var/spack/repos/builtin/packages/xsd/package.py new file mode 100644 index 0000000000..a93d2ec19b --- /dev/null +++ b/var/spack/repos/builtin/packages/xsd/package.py @@ -0,0 +1,52 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class Xsd(MakefilePackage): + """CodeSynthesis XSD is an open-source, cross-platform W3C XML Schema + to C++ data binding compiler. It support in-memory and event-driven XML + processing models and is available for a wide range of C++ compilers + and platforms.""" + + homepage = "https://www.codesynthesis.com" + url = "https://www.codesynthesis.com/download/xsd/4.0/xsd-4.0.0+dep.tar.bz2" + + version('4.0.0', 'ad3de699eb140e747a0a214462d95fc81a21b494') + + depends_on('xerces-c') + depends_on('libtool', type='build') + + def install(self, spec, prefix): + make('install', 'install_prefix=' + prefix) + + def setup_environment(self, spack_env, run_env): + xercesc_lib_flags = self.spec['xerces-c'].libs.search_flags + spack_env.append_flags('LDFLAGS', xercesc_lib_flags) + + def url_for_version(self, version): + url = "https://www.codesynthesis.com/download/xsd/{0}/xsd-{1}+dep.tar.bz2" + return url.format(version.up_to(2), version) -- cgit v1.2.3-70-g09d2 From 43c77ac3cb819ebfc8a35aa7df6012c8fcd3ec4a Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Wed, 1 Aug 2018 20:59:07 -0700 Subject: libdwarf: remove use of hide_files() - This was a nasty workaround due to the way our compiler wrappers used to work. We don't want to have to modify our elfutils installation to install libdwarf. - Since cd9691de5, we no longer need this because the package will always come before dependencies in our include order. --- lib/spack/llnl/util/filesystem.py | 13 -- .../repos/builtin/packages/libdwarf/package.py | 134 ++++++++++----------- 2 files changed, 63 insertions(+), 84 deletions(-) (limited to 'var') diff --git a/lib/spack/llnl/util/filesystem.py b/lib/spack/llnl/util/filesystem.py index f43745a551..ace6cfded6 100644 --- a/lib/spack/llnl/util/filesystem.py +++ b/lib/spack/llnl/util/filesystem.py @@ -60,7 +60,6 @@ __all__ = [ 'fix_darwin_install_name', 'force_remove', 'force_symlink', - 'hide_files', 'install', 'install_tree', 'is_exe', @@ -392,18 +391,6 @@ def replace_directory_transaction(directory_name, tmp_root=None): tty.debug('TEMPORARY DIRECTORY DELETED [{0}]'.format(tmp_dir)) -@contextmanager -def hide_files(*file_list): - try: - baks = ['%s.bak' % f for f in file_list] - for f, bak in zip(file_list, baks): - shutil.move(f, bak) - yield - finally: - for f, bak in zip(file_list, baks): - shutil.move(bak, f) - - def hash_directory(directory): """Hashes recursively the content of a directory. diff --git a/var/spack/repos/builtin/packages/libdwarf/package.py b/var/spack/repos/builtin/packages/libdwarf/package.py index 75288d66b1..7fa23300cf 100644 --- a/var/spack/repos/builtin/packages/libdwarf/package.py +++ b/var/spack/repos/builtin/packages/libdwarf/package.py @@ -61,77 +61,69 @@ class Libdwarf(Package): filter_file(r'^typedef struct Elf Elf;$', '', 'libdwarf/libdwarf.h.in') def install(self, spec, prefix): - - # elfutils contains a dwarf.h that conflicts with libdwarf's - # TODO: we should remove this when we can modify the include order - hide_list = [] - if spec.satisfies('^elfutils'): - dwarf_h = join_path(spec['elfutils'].prefix, 'include/dwarf.h') - hide_list.append(dwarf_h) - with hide_files(*hide_list): - # dwarf build does not set arguments for ar properly - make.add_default_arg('ARFLAGS=rcs') - - # Dwarf doesn't provide an install, so we have to do it. - mkdirp(prefix.bin, prefix.include, prefix.lib, prefix.man.man1) - - with working_dir('libdwarf'): - extra_config_args = [] - - # this is to prevent picking up system /usr/include/libelf.h - if spec.satisfies('^libelf'): - libelf_inc_dir = join_path(spec['libelf'].prefix, - 'include/libelf') - extra_config_args.append( - 'CFLAGS=-I{0} -Wl,-L{1} -Wl,-lelf'.format( - libelf_inc_dir, spec['libelf'].prefix.lib)) - configure("--prefix=" + prefix, "--enable-shared", - *extra_config_args) - filter_file(r'^dwfzlib\s*=\s*-lz', - 'dwfzlib=-L{0} -lz'.format( - self.spec['zlib'].prefix.lib), - 'Makefile') - make() - - libdwarf_name = 'libdwarf.{0}'.format(dso_suffix) - libdwarf1_name = 'libdwarf.{0}'.format(dso_suffix) + ".1" - install('libdwarf.a', prefix.lib) - install('libdwarf.so', join_path(prefix.lib, libdwarf1_name)) - if spec.satisfies('@20160507:'): - with working_dir(prefix.lib): - os.symlink(libdwarf1_name, libdwarf_name) - install('libdwarf.h', prefix.include) - install('dwarf.h', prefix.include) - - # It seems like fix_darwin_install_name can't be used - # here directly; the install name of the library in - # the stage directory must be fixed in order for dyld - # to locate it on Darwin when spack builds dwarfdump - if sys.platform == 'darwin': - install_name_tool = which('install_name_tool') - install_name_tool('-id', - join_path('..', 'libdwarf', - 'libdwarf.so'), - 'libdwarf.so') - - if spec.satisfies('@20130126:20130729'): - dwarfdump_dir = 'dwarfdump2' - else: - dwarfdump_dir = 'dwarfdump' - with working_dir(dwarfdump_dir): - configure("--prefix=" + prefix) - filter_file(r'^dwfzlib\s*=\s*-lz', - 'dwfzlib=-L{0} -lz'.format( - self.spec['zlib'].prefix.lib), - 'Makefile') - - # This makefile has strings of copy commands that - # cause a race in parallel - make(parallel=False) - - install('dwarfdump', prefix.bin) - install('dwarfdump.conf', prefix.lib) - install('dwarfdump.1', prefix.man.man1) + # dwarf build does not set arguments for ar properly + make.add_default_arg('ARFLAGS=rcs') + + # Dwarf doesn't provide an install, so we have to do it. + mkdirp(prefix.bin, prefix.include, prefix.lib, prefix.man.man1) + + with working_dir('libdwarf'): + extra_config_args = [] + + # this is to prevent picking up system /usr/include/libelf.h + if spec.satisfies('^libelf'): + libelf_inc_dir = join_path(spec['libelf'].prefix, + 'include/libelf') + extra_config_args.append( + 'CFLAGS=-I{0} -Wl,-L{1} -Wl,-lelf'.format( + libelf_inc_dir, spec['libelf'].prefix.lib)) + configure("--prefix=" + prefix, "--enable-shared", + *extra_config_args) + filter_file(r'^dwfzlib\s*=\s*-lz', + 'dwfzlib=-L{0} -lz'.format( + self.spec['zlib'].prefix.lib), + 'Makefile') + make() + + libdwarf_name = 'libdwarf.{0}'.format(dso_suffix) + libdwarf1_name = 'libdwarf.{0}'.format(dso_suffix) + ".1" + install('libdwarf.a', prefix.lib) + install('libdwarf.so', join_path(prefix.lib, libdwarf1_name)) + if spec.satisfies('@20160507:'): + with working_dir(prefix.lib): + os.symlink(libdwarf1_name, libdwarf_name) + install('libdwarf.h', prefix.include) + install('dwarf.h', prefix.include) + + # It seems like fix_darwin_install_name can't be used + # here directly; the install name of the library in + # the stage directory must be fixed in order for dyld + # to locate it on Darwin when spack builds dwarfdump + if sys.platform == 'darwin': + install_name_tool = which('install_name_tool') + install_name_tool('-id', + join_path('..', 'libdwarf', + 'libdwarf.so'), + 'libdwarf.so') + + if spec.satisfies('@20130126:20130729'): + dwarfdump_dir = 'dwarfdump2' + else: + dwarfdump_dir = 'dwarfdump' + with working_dir(dwarfdump_dir): + configure("--prefix=" + prefix) + filter_file(r'^dwfzlib\s*=\s*-lz', + 'dwfzlib=-L{0} -lz'.format( + self.spec['zlib'].prefix.lib), + 'Makefile') + + # This makefile has strings of copy commands that + # cause a race in parallel + make(parallel=False) + + install('dwarfdump', prefix.bin) + install('dwarfdump.conf', prefix.lib) + install('dwarfdump.1', prefix.man.man1) @run_after('install') def darwin_fix(self): -- cgit v1.2.3-70-g09d2 From 8e1cc26be7b1d6594ada6d1433ce4fa5b1bb4de1 Mon Sep 17 00:00:00 2001 From: 健美猞猁 Date: Fri, 3 Aug 2018 11:07:01 +0800 Subject: dmd: a new package. (#8826) * dmd: a new package. * Install src for dmd. * Install src to prefix.src. * Replace copy_tree with install_tree. --- var/spack/repos/builtin/packages/dmd/package.py | 51 +++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 var/spack/repos/builtin/packages/dmd/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dmd/package.py b/var/spack/repos/builtin/packages/dmd/package.py new file mode 100644 index 0000000000..1396d80878 --- /dev/null +++ b/var/spack/repos/builtin/packages/dmd/package.py @@ -0,0 +1,51 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Dmd(MakefilePackage): + """DMD is the reference compiler for the D programming language.""" + + homepage = "https://github.com/dlang/dmd" + url = "https://github.com/dlang/dmd/archive/v2.081.1.tar.gz" + + version('2.081.1', sha256='14f3aafe1c93c86646aaeb3ed7361a5fc5a24374cf25c8848c81942bfd9fae1a') + + depends_on('openssl') + depends_on('curl') + + def setup_environment(self, spack_env, run_env): + run_env.prepend_path('PATH', self.prefix.linux.bin64) + + def edit(self, spec, prefix): + makefile = FileFilter('posix.mak') + makefile.filter('$(PWD)/../install', prefix, string=True) + + def build(self, spec, prefix): + make('-f', 'posix.mak', 'AUTO_BOOTSTRAP=1') + + def install(self, spec, prefix): + make('-f', 'posix.mak', 'install', 'AUTO_BOOTSTRAP=1') + install_tree('src', prefix.src) -- cgit v1.2.3-70-g09d2 From 0c01f42a9fedba71e741b27ad7697c27586f422b Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Fri, 3 Aug 2018 07:53:44 -0700 Subject: arpack: add version 3.6.2 (#8881) --- var/spack/repos/builtin/packages/arpack-ng/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/arpack-ng/package.py b/var/spack/repos/builtin/packages/arpack-ng/package.py index 76a1929b2d..72fc32a6b0 100644 --- a/var/spack/repos/builtin/packages/arpack-ng/package.py +++ b/var/spack/repos/builtin/packages/arpack-ng/package.py @@ -58,6 +58,7 @@ class ArpackNg(Package): git = 'https://github.com/opencollab/arpack-ng.git' version('develop', branch='master') + version('3.6.2', sha256='673c8202de996fd3127350725eb1818e534db4e79de56d5dcee8c00768db599a') version('3.6.0', 'f2607c1d5f80e922d55751fbed86a8ec') version('3.5.0', '9762c9ae6d739a9e040f8201b1578874') version('3.4.0', 'ae9ca13f2143a7ea280cb0e2fd4bfae4') -- cgit v1.2.3-70-g09d2 From febfa609350f4845fd7f387070308305671b7fb7 Mon Sep 17 00:00:00 2001 From: Abhinav Bhatele Date: Fri, 3 Aug 2018 08:25:10 -0700 Subject: Update broken codesign.llnl.gov urls (#8880) * amg2013: fix homepage and url * kripke: fix homepage and url * lcals: fix homepage and url * lulesh: fix homepage and move to git * urls on single line --- var/spack/repos/builtin/packages/amg/package.py | 2 +- var/spack/repos/builtin/packages/amg2013/package.py | 6 +++--- var/spack/repos/builtin/packages/kripke/package.py | 4 ++-- var/spack/repos/builtin/packages/lcals/package.py | 4 ++-- var/spack/repos/builtin/packages/lulesh/package.py | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/amg/package.py b/var/spack/repos/builtin/packages/amg/package.py index 271c1ba0fc..4ac0cf2e64 100644 --- a/var/spack/repos/builtin/packages/amg/package.py +++ b/var/spack/repos/builtin/packages/amg/package.py @@ -32,7 +32,7 @@ class Amg(MakefilePackage): """ tags = ['proxy-app', 'ecp-proxy-app'] - homepage = "https://codesign.llnl.gov/amg2013.php" + homepage = "https://computation.llnl.gov/projects/co-design/amg2013" git = "https://github.com/LLNL/AMG.git" version('develop', branch='master') diff --git a/var/spack/repos/builtin/packages/amg2013/package.py b/var/spack/repos/builtin/packages/amg2013/package.py index 0475c2bc0a..15d20eb7ca 100644 --- a/var/spack/repos/builtin/packages/amg2013/package.py +++ b/var/spack/repos/builtin/packages/amg2013/package.py @@ -33,11 +33,11 @@ class Amg2013(MakefilePackage): in the Center for Applied Scientific Computing (CASC) at LLNL. """ tags = ['proxy-app'] - homepage = "https://codesign.llnl.gov/amg2013.php" - url = "https://codesign.llnl.gov/amg2013/amg2013.tgz" + homepage = "https://computation.llnl.gov/projects/co-design/amg2013" + url = "https://computation.llnl.gov/projects/co-design/download/amg2013.tgz" version('master', '9d918d2a69528b83e6e0aba6ba601fef', - url='https://codesign.llnl.gov/amg2013/amg2013.tgz') + url='https://computation.llnl.gov/projects/co-design/download/amg2013.tgz') variant('openmp', default=True, description='Build with OpenMP support') variant('assumedpartition', default=False, description='Use assumed partition (for thousands of processors)') diff --git a/var/spack/repos/builtin/packages/kripke/package.py b/var/spack/repos/builtin/packages/kripke/package.py index a902d9f538..ec2a9af1ac 100644 --- a/var/spack/repos/builtin/packages/kripke/package.py +++ b/var/spack/repos/builtin/packages/kripke/package.py @@ -29,8 +29,8 @@ class Kripke(CMakePackage): """Kripke is a simple, scalable, 3D Sn deterministic particle transport proxy/mini app. """ - homepage = "https://codesign.llnl.gov/kripke.php" - url = "https://codesign.llnl.gov/downloads/kripke-openmp-1.1.tar.gz" + homepage = "https://computation.llnl.gov/projects/co-design/kripke" + url = "https://computation.llnl.gov/projects/co-design/download/kripke-openmp-1.1.tar.gz" tags = ['proxy-app'] version('1.1', '7fe6f2b26ed983a6ce5495ab701f85bf') diff --git a/var/spack/repos/builtin/packages/lcals/package.py b/var/spack/repos/builtin/packages/lcals/package.py index b4a919b73f..0659b1710f 100644 --- a/var/spack/repos/builtin/packages/lcals/package.py +++ b/var/spack/repos/builtin/packages/lcals/package.py @@ -35,8 +35,8 @@ class Lcals(MakefilePackage): by Frank H. McMahon, UCRL-53745.). The suite contains facilities to generate timing statistics and reports.""" - homepage = "https://codesign.llnl.gov/LCALS-downloads/" - url = "https://codesign.llnl.gov/LCALS-downloads/lcals-v1.0.2.tgz" + homepage = "https://computation.llnl.gov/projects/co-design/lcals" + url = "https://computation.llnl.gov/projects/co-design/download/lcals-v1.0.2.tgz" tags = ['proxy-app'] diff --git a/var/spack/repos/builtin/packages/lulesh/package.py b/var/spack/repos/builtin/packages/lulesh/package.py index 60be952152..1bf51282d5 100644 --- a/var/spack/repos/builtin/packages/lulesh/package.py +++ b/var/spack/repos/builtin/packages/lulesh/package.py @@ -31,10 +31,10 @@ class Lulesh(MakefilePackage): code to only solve a Sedov blast problem with analytic answer """ tags = ['proxy-app'] - homepage = "https://codesign.llnl.gov/lulesh.php" - url = "https://codesign.llnl.gov/lulesh/lulesh2.0.3.tgz" + homepage = "https://computation.llnl.gov/projects/co-design/lulesh" + git = "https://github.com/LLNL/LULESH.git" - version('2.0.3', '336644a8750f71c7c6b9d2960976e7aa') + version('2.0.3', tag='2.0.3') variant('mpi', default=True, description='Build with MPI support') variant('openmp', default=True, description='Build with OpenMP support') -- cgit v1.2.3-70-g09d2 From 69641851ea9fab604fbe664df8b44b4ce61dfe44 Mon Sep 17 00:00:00 2001 From: "Mark W. Krentel" Date: Fri, 3 Aug 2018 13:00:12 -0500 Subject: libmonitor: update version and add variant to configure (#8834) * libmonitor: update to version 2018.07.18 and add variant to configure for hpctoolkit. * Specify the @2013.02.18 version in cbtf-argonavis and cbtf-krell, since this is no longer the default version. These are the only other packages that use libmonitor. --- .../builtin/packages/cbtf-argonavis/package.py | 2 +- .../repos/builtin/packages/cbtf-krell/package.py | 2 +- .../repos/builtin/packages/libmonitor/package.py | 67 ++++++++++++++++++++-- 3 files changed, 63 insertions(+), 8 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py index 0ec1114211..3c1bb0de49 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py @@ -94,7 +94,7 @@ class CbtfArgonavis(CMakePackage): depends_on("cbtf@1.9.1.0:9999+runtime", when='@1.9.1.0:9999+runtime') # For libmonitor - depends_on("libmonitor+krellpatch") + depends_on("libmonitor@2013.02.18+krellpatch") # For PAPI depends_on("papi", when='@develop') diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py index 6ca54a8433..62d6833adf 100644 --- a/var/spack/repos/builtin/packages/cbtf-krell/package.py +++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py @@ -120,7 +120,7 @@ class CbtfKrell(CMakePackage): depends_on("cbtf@1.9.1.0:9999+runtime", when='@1.9.1.0:9999+runtime') # for services and collectors - depends_on("libmonitor+krellpatch") + depends_on("libmonitor@2013.02.18+krellpatch") depends_on("libunwind", when='@develop') depends_on("libunwind@1.1", when='@1.9.1.0:9999') diff --git a/var/spack/repos/builtin/packages/libmonitor/package.py b/var/spack/repos/builtin/packages/libmonitor/package.py index 168389d450..db6c755778 100644 --- a/var/spack/repos/builtin/packages/libmonitor/package.py +++ b/var/spack/repos/builtin/packages/libmonitor/package.py @@ -26,16 +26,71 @@ from spack import * class Libmonitor(AutotoolsPackage): - """Libmonitor is a library for process and thread control.""" + """Libmonitor is a library providing callback functions for the + begin and end of processes and threads. It provides a layer on + which to build process monitoring tools and profilers.""" homepage = "https://github.com/HPCToolkit/libmonitor" git = "https://github.com/HPCToolkit/libmonitor.git" - version('20130218', commit='4f2311e') + version('master', branch='master') + version('2018.07.18', commit='d28cc1d3c08c02013a68a022a57a6ac73db88166', + preferred=True) + version('2013.02.18', commit='4f2311e413fd90583263d6f20453bbe552ccfef3') + # Configure for Rice HPCToolkit. + variant('hpctoolkit', default=False, + description='Configure for HPCToolkit') + + variant('bgq', default=False, + description='Configure for Blue Gene/Q') + + # Configure for Krell and OpenSpeedshop. variant('krellpatch', default=False, - description="build with openspeedshop based patch.") + description="Build with openspeedshop based patch.") + + patch('libmonitorkrell-0000.patch', when='@2013.02.18+krellpatch') + patch('libmonitorkrell-0001.patch', when='@2013.02.18+krellpatch') + patch('libmonitorkrell-0002.patch', when='@2013.02.18+krellpatch') + + signals = 'SIGBUS, SIGSEGV, SIGPROF, 36, 37, 38' + + # Set default cflags (-g -O2) and move to the configure line. + def flag_handler(self, name, flags): + if name != 'cflags': + return (flags, None, None) + + if '-g' not in flags: + flags.append('-g') + for flag in flags: + if flag.startswith('-O'): + break + else: + flags.append('-O2') + + return (None, None, flags) + + def configure_args(self): + args = [] + + if '+hpctoolkit' in self.spec: + args.append('--enable-client-signals=%s' % self.signals) + + # TODO: Spack has trouble finding cross-compilers; the +bgq variant + # manually specifies the appropriate compiler to build for BGQ (by + # setting that here, Spack's choice of CC is overridden). + # If the user manually defines an entry in compilers.yaml, the bgq + # variant should not be required if the user specifies the bgq + # architecture for the libmonitor package. See #8860 + # TODO: users want to build this for the backend and dependents for the + # frontend. Spack ought to make that easy by finding the appropriate + # compiler for each if the root and libmonitor are designated to build + # on the frontend and backend, respectively. As of now though, there + # is an issue with compiler concretization such that spack will attempt + # to assign the compiler chosen for libmonitor to the root (unless the + # user specifies the compiler for each in addition to the arch). + # See #8859 + if '+bgq' in self.spec: + args.append('CC=powerpc64-bgq-linux-gcc') - patch('libmonitorkrell-0000.patch', when='@20130218+krellpatch') - patch('libmonitorkrell-0001.patch', when='@20130218+krellpatch') - patch('libmonitorkrell-0002.patch', when='@20130218+krellpatch') + return args -- cgit v1.2.3-70-g09d2 From c73d237d087792a00b6c0aceaf56674e398ea8e0 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Fri, 3 Aug 2018 14:31:06 -0500 Subject: simplemoc: version bump (#8884) --- var/spack/repos/builtin/packages/simplemoc/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/simplemoc/package.py b/var/spack/repos/builtin/packages/simplemoc/package.py index 989bb5523d..b6e35abd95 100644 --- a/var/spack/repos/builtin/packages/simplemoc/package.py +++ b/var/spack/repos/builtin/packages/simplemoc/package.py @@ -33,9 +33,9 @@ class Simplemoc(MakefilePackage): light water reactor simulation.""" homepage = "https://github.com/ANL-CESAR/SimpleMOC/" - url = "https://github.com/ANL-CESAR/SimpleMOC/archive/master.tar.gz" + url = "https://github.com/ANL-CESAR/SimpleMOC/archive/v4.tar.gz" - version('1.0', 'd8827221a4ae76e9766a32e16d143e60') + version('4', sha256='a39906014fdb234c43bf26e1919bdc8a13097788812e0b353a492b8e568816a6') tags = ['proxy-app'] -- cgit v1.2.3-70-g09d2 From eb39d0c729348fff8cb2ff17aeaaae89af297012 Mon Sep 17 00:00:00 2001 From: Tin Huynh Date: Fri, 3 Aug 2018 17:35:09 -0700 Subject: Package/flang: Updated to use own version of llvm (#8766) Flang now uses its own version of llvm and clang (called flang-driver). This is handled by adding flang-specific versions of the LLVM package and updates flang to depend on those versions. --- var/spack/repos/builtin/packages/flang/package.py | 56 ++++++------------ var/spack/repos/builtin/packages/llvm/package.py | 68 ++++++++++++++++++++++ var/spack/repos/builtin/packages/pgmath/package.py | 2 + 3 files changed, 89 insertions(+), 37 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/flang/package.py b/var/spack/repos/builtin/packages/flang/package.py index c96a9c0176..782216427f 100644 --- a/var/spack/repos/builtin/packages/flang/package.py +++ b/var/spack/repos/builtin/packages/flang/package.py @@ -31,30 +31,21 @@ class Flang(CMakePackage): """Flang is a Fortran compiler targeting LLVM.""" homepage = "https://github.com/flang-compiler/flang" - url = "https://github.com/flang-compiler/flang/archive/flang_20180319.tar.gz" + + url = "https://github.com/flang-compiler/flang/archive/flang_20180612.tar.gz" git = "https://github.com/flang-compiler/flang.git" version('develop', branch='master') - version('20180319', 'e659bad83b791f90af2c5cd672864669') + version('20180612', '62284e26214eaaff261a922c67f6878c') - depends_on( - "llvm+clang@4.0.1,5.0.0,6.0.0", - patches=[ - patch('https://github.com/llvm-mirror/clang/pull/33.diff', - sha256='e46d7ab305e5e95c51f4656d9b52058143cd85d859b312b3c80e93a02d54b4a5', - when='@4.0.1', level=1, working_dir='tools/clang'), - patch('https://github.com/llvm-mirror/clang/pull/35.diff', - sha256='7f39555783993f78b75c380ca5ef167c1d8b88cc75c6542f6c94e0b6acfb7c5d', - when='@5.0.0', level=1, working_dir='tools/clang'), - patch('https://github.com/llvm-mirror/llvm/pull/56.diff', - sha256='2ee155aa1017766cdae3a860050d82ed48961a2f88bcef760d4922ff25ce381e', - when='@6.0.0', level=1), - patch('https://github.com/llvm-mirror/clang/pull/40.diff', - sha256='5021f2ea54e957eb1c712f9e9a87b3dc33616ebd2e84735b6735f788fd2c45e9', - when='@6.0.0', level=1, working_dir='tools/clang') - ] - ) - depends_on("pgmath@develop", when="@develop") + depends_on('llvm@flang-develop', when='@develop') + depends_on('llvm@flang-20180612', when='@20180612 target=x86_64') + + # LLVM version specific to OpenPOWER. + depends_on('llvm@flang-ppc64le-20180612', when='@20180612 target=ppc64le') + + depends_on('pgmath@develop', when='@develop') + depends_on('pgmath@20180612', when='@20180612') def cmake_args(self): options = [ @@ -81,23 +72,14 @@ class Flang(CMakePackage): flang = os.path.join(self.spec.prefix.bin, 'flang') with open(flang, 'w') as out: out.write('#!/bin/bash\n') - if '@develop' in self.spec: - out.write( - '{0} -I{1} -L{2} -L{3} {4}{5} {6}{7} -B{8} "$@"\n'.format( - self.spec['llvm'].prefix.bin.flang, - self.prefix.include, self.prefix.lib, - self.spec['pgmath'].prefix.lib, - self.compiler.fc_rpath_arg, self.prefix.lib, - self.compiler.fc_rpath_arg, - self.spec['pgmath'].prefix.lib, - self.spec.prefix.bin)) - else: - out.write( - '{0} -I{1} -L{2} {3}{4} -B{5} "$@"\n'.format( - self.spec['llvm'].prefix.bin.flang, - self.prefix.include, self.prefix.lib, - self.compiler.fc_rpath_arg, self.prefix.lib, - self.spec.prefix.bin)) + out.write( + '{0} -I{1} -L{2} -L{3} {4}{5} {6}{7} -B{8} "$@"\n'.format( + self.spec['llvm'].prefix.bin.flang, + self.prefix.include, self.prefix.lib, + self.spec['pgmath'].prefix.lib, + self.compiler.fc_rpath_arg, self.prefix.lib, + self.compiler.fc_rpath_arg, + self.spec['pgmath'].prefix.lib, self.spec.prefix.bin)) out.close() chmod = which('chmod') chmod('+x', flang) diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index f2f03ad28b..2ecd61d75a 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -100,6 +100,8 @@ class Llvm(CMakePackage): base_url = 'http://llvm.org/releases/%%(version)s/%(pkg)s-%%(version)s.src.tar.xz' llvm_url = base_url % {'pkg': 'llvm'} + # Flang uses its own fork of llvm. + flang_llvm_url = 'https://github.com/flang-compiler/llvm.git' resources = { 'compiler-rt': { @@ -402,6 +404,47 @@ class Llvm(CMakePackage): }, ] + # Flang uses its own fork of clang (renamed flang-driver). + flang_resources = { + 'flang-driver': { + 'git': 'https://github.com/flang-compiler/flang-driver.git', + 'destination': 'tools', + 'placement': 'clang' + }, + 'openmp': { + 'git': 'https://github.com/llvm-mirror/openmp.git', + 'destination': 'projects', + 'placement': 'openmp' + } + } + + flang_releases = [ + { + 'version': 'develop', + 'branch': 'release_60', + 'resources': { + 'flang-driver': 'release_60', + 'openmp': 'release_60', + } + }, + { + 'version': '20180612', + 'commit': 'f26a3ece4ccd68a52f5aa970ec42837ee0743296', + 'resources': { + 'flang-driver': 'e079fa68cb35a53c88c41a1939f90b94d539e984', + 'openmp': 'd5aa29cb3bcf51289d326b4e565613db8aff65ef' + } + }, + { + 'version': 'ppc64le-20180612', + 'commit': '4158932a46eb2f06a166f22a4a52ae48c7d2949e', + 'resources': { + 'flang-driver': '50c1828a134d5a0f1553b355bf0946db48b0aa6d', + 'openmp': '29b515e1e6d26b5b0d32d47d28dcdb4b8a11470d' + } + } + ] + for release in releases: if release['version'] == 'trunk': version(release['version'], svn=release['repo']) @@ -425,6 +468,31 @@ class Llvm(CMakePackage): resources[name].get('variant', "")), placement=resources[name].get('placement', None)) + for release in flang_releases: + if release['version'] == 'develop': + version('flang-' + release['version'], git=flang_llvm_url, branch=release['branch']) + + for name, branch in release['resources'].items(): + flang_resource = flang_resources[name] + resource(name=name, + git=flang_resource['git'], + branch=branch, + destination=flang_resource['destination'], + placement=flang_resource['placement'], + when='@flang-' + release['version']) + + else: + version('flang-' + release['version'], git=flang_llvm_url, commit=release['commit']) + + for name, commit in release['resources'].items(): + flang_resource = flang_resources[name] + resource(name=name, + git=flang_resource['git'], + commit=commit, + destination=flang_resource['destination'], + placement=flang_resource['placement'], + when='@flang-' + release['version']) + conflicts('+clang_extra', when='~clang') conflicts('+lldb', when='~clang') diff --git a/var/spack/repos/builtin/packages/pgmath/package.py b/var/spack/repos/builtin/packages/pgmath/package.py index 45a9c77bc3..b17bfb7c05 100644 --- a/var/spack/repos/builtin/packages/pgmath/package.py +++ b/var/spack/repos/builtin/packages/pgmath/package.py @@ -30,9 +30,11 @@ class Pgmath(CMakePackage): """Flang's math library""" homepage = "https://github.com/flang-compiler/flang" + url = "https://github.com/flang-compiler/flang/archive/flang_20180612.tar.gz" git = "https://github.com/flang-compiler/flang.git" version('develop', branch='master') + version('20180612', '62284e26214eaaff261a922c67f6878c') conflicts("%gcc@:7.1.9999") -- cgit v1.2.3-70-g09d2 From abd1dfc333224e019478ab339e24f68bd7a9ac06 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Sat, 4 Aug 2018 16:47:35 -0500 Subject: kim-api: initial commit (#8873) * kim-api: initial commit * Update package.py --- .../repos/builtin/packages/kim-api/package.py | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 var/spack/repos/builtin/packages/kim-api/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/kim-api/package.py b/var/spack/repos/builtin/packages/kim-api/package.py new file mode 100644 index 0000000000..b24e46bf3b --- /dev/null +++ b/var/spack/repos/builtin/packages/kim-api/package.py @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class KimApi(CMakePackage): + """OpenKIM is an online framework for making molecular simulations + reliable, reproducible, and portable. Computer implementations of + inter-atomic models are archived in OpenKIM, verified for coding + integrity, and tested by computing their predictions for a variety + of material properties. Models conforming to the KIM application + programming interface (API) work seamlessly with major simulation + codes that have adopted the KIM API standard. + """ + homepage = "https://openkim.org/" + git = "https://github.com/openkim/kim-api" + + version('develop', branch='master') + version('2.0rc1', commit="c2ab409ec0154ebd85d20a0a1a0bd2ba6ea95a9c") + + def cmake_args(self): + args = ['-DBUILD_MODULES=OFF'] + + return args -- cgit v1.2.3-70-g09d2 From 9c2c6c7f7eebc6c2c7fa90cc86807c9693264dd2 Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Sun, 5 Aug 2018 11:26:22 -0700 Subject: Add unzip runtime dependency to lua package (#8831) * Add unzip to lua-luaposix I ended up on an [Ubuntu] system that hadn't had unzip employed and discovered lua-luaposix requires it (while buildig Lmod). Closes #8533 * Move unzip prereq to lua, type=run Rather than touching up each of the lua rocks (packages) that need unzip, make it available as a run dependency in lua. Tested by building lmod on a minimal Ubuntu system. --- var/spack/repos/builtin/packages/lua/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lua/package.py b/var/spack/repos/builtin/packages/lua/package.py index 4faae8fc48..b0f559db50 100644 --- a/var/spack/repos/builtin/packages/lua/package.py +++ b/var/spack/repos/builtin/packages/lua/package.py @@ -49,6 +49,8 @@ class Lua(Package): depends_on('ncurses') depends_on('readline') + # luarocks needs unzip for some packages (e.g. lua-luaposix) + depends_on('unzip', type='run') resource( name="luarocks", -- cgit v1.2.3-70-g09d2 From 4dc8936b63c71ff4b1943aa623e047dcff42b74e Mon Sep 17 00:00:00 2001 From: 健美猞猁 Date: Mon, 6 Aug 2018 18:03:33 +0800 Subject: Bump mvapich2 to the latest v2.3 release. (#8892) --- var/spack/repos/builtin/packages/mvapich2/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mvapich2/package.py b/var/spack/repos/builtin/packages/mvapich2/package.py index c3e9f1c2f4..daa96593fb 100644 --- a/var/spack/repos/builtin/packages/mvapich2/package.py +++ b/var/spack/repos/builtin/packages/mvapich2/package.py @@ -46,7 +46,8 @@ class Mvapich2(AutotoolsPackage): version('2.3a', '87c3fbf8a755b53806fa9ecb21453445') # Prefer the latest stable release - version('2.2', '939b65ebe5b89a5bc822cdab0f31f96e', preferred=True) + version('2.3', sha256='01d5fb592454ddd9ecc17e91c8983b6aea0e7559aa38f410b111c8ef385b50dd', preferred=True) + version('2.2', '939b65ebe5b89a5bc822cdab0f31f96e') version('2.1', '0095ceecb19bbb7fb262131cb9c2cdd6') version('2.0', '9fbb68a4111a8b6338e476dc657388b4') -- cgit v1.2.3-70-g09d2 From 377e957f3be0489e7ae69a2f1194af15b552cf27 Mon Sep 17 00:00:00 2001 From: Thomas Roehl Date: Mon, 6 Aug 2018 16:21:30 +0200 Subject: LIKWID: Switch to perf_event backend to allow user installations but with limited features (#8886) * Switch to perf_event backend to allow user installations but with limited features. * Fix flake8 issues * Fix flake8 issues remove filter for INSTALL_CHOWN * Incorporate the comments --- var/spack/repos/builtin/packages/likwid/package.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/likwid/package.py b/var/spack/repos/builtin/packages/likwid/package.py index e5e04e252a..913886c5eb 100644 --- a/var/spack/repos/builtin/packages/likwid/package.py +++ b/var/spack/repos/builtin/packages/likwid/package.py @@ -30,7 +30,10 @@ import os class Likwid(Package): """Likwid is a simple to install and use toolsuite of command line applications for performance oriented programmers. It works for Intel and - AMD processors on the Linux operating system.""" + AMD processors on the Linux operating system. This version uses the + perf_event backend which reduces the feature set but allows user installs. + See https://github.com/RRZE-HPC/likwid/wiki/TutorialLikwidPerf#feature-limitations + for information.""" homepage = "https://github.com/RRZE-HPC/likwid" url = "https://github.com/RRZE-HPC/likwid/archive/4.1.2.tar.gz" @@ -40,9 +43,6 @@ class Likwid(Package): version('4.3.2', '2cf00e220dfe22c8d9b6e44f7534e11d') version('4.3.1', 'ff28250f622185688bf5e2e0975368ea') version('4.3.0', '7f8f6981d7d341fce2621554323f8c8b') - version('4.2.1', 'c408ddcf0317cdd894af4c580cd74294') - version('4.2.0', 'e41ff334b8f032a323d941ce32907a75') - version('4.1.2', 'a857ce5bd23e31d96e2963fe81cb38f0') # NOTE: There is no way to use an externally provided hwloc with Likwid. # The reason is that the internal hwloc is patched to contain extra @@ -87,8 +87,16 @@ class Likwid(Package): prefix, 'config.mk') - filter_file('^INSTALL_CHOWN.*', - 'INSTALL_CHOWN = -o $(USER)', + # FIXME: once https://github.com/spack/spack/issues/4432 is + # resolved, install as root by default and remove this + filter_file('^ACCESSMODE .*', + 'ACCESSMODE = perf_event', + 'config.mk') + filter_file('^BUILDFREQ .*', + 'BUILDFREQ = false', + 'config.mk') + filter_file('^BUILDDAEMON .*', + 'BUILDDAEMON = false', 'config.mk') if spec.satisfies('^lua'): -- cgit v1.2.3-70-g09d2 From 3fc1a65867632d43d10d874e7ef89e98c083af8f Mon Sep 17 00:00:00 2001 From: Sajid Ali <30510036+s-sajid-ali@users.noreply.github.com> Date: Mon, 6 Aug 2018 09:21:49 -0500 Subject: modified: var/spack/repos/builtin/packages/py-pytest/package.py (#8890) --- var/spack/repos/builtin/packages/py-pytest/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pytest/package.py b/var/spack/repos/builtin/packages/py-pytest/package.py index 5f0a0bc8fc..a2339f3ef2 100644 --- a/var/spack/repos/builtin/packages/py-pytest/package.py +++ b/var/spack/repos/builtin/packages/py-pytest/package.py @@ -29,13 +29,14 @@ class PyPytest(PythonPackage): """pytest: simple powerful testing with Python.""" homepage = "http://pytest.org/" - url = "https://pypi.io/packages/source/p/pytest/pytest-3.5.1.tar.gz" + url = "https://pypi.io/packages/source/p/pytest/pytest-3.7.1.tar.gz" import_modules = [ '_pytest', '_pytest.assertion', '_pytest._code', '_pytest.mark', 'pytest' ] + version('3.7.1', '2704e16bb2c11af494167f80a7cd37c4') version('3.5.1', 'ffd870ee3ca561695d2f916f0f0f3c0b') version('3.0.7', '89c60546507dc7eb6e9e40a6e9f720bd') version('3.0.2', '61dc36e65a6f6c11c53b1388e043a9f5') -- cgit v1.2.3-70-g09d2 From 7cc11debdd20947e19ef3c390267d1b9dbe8ea91 Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Mon, 6 Aug 2018 17:43:26 +0200 Subject: Libtool: version 'develop' (#8894) * libtool: add version 'develop'. * libtool: patch: correct parsing of compiler output when collecting predeps and postdeps. --- .../repos/builtin/packages/libtool/flag_space.patch | 19 +++++++++++++++++++ var/spack/repos/builtin/packages/libtool/package.py | 15 +++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 var/spack/repos/builtin/packages/libtool/flag_space.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libtool/flag_space.patch b/var/spack/repos/builtin/packages/libtool/flag_space.patch new file mode 100644 index 0000000000..4ec1fc8c98 --- /dev/null +++ b/var/spack/repos/builtin/packages/libtool/flag_space.patch @@ -0,0 +1,19 @@ +diff --git a/m4/libtool.m4 b/m4/libtool.m4 +index b55a6e57..26febc87 100644 +--- a/m4/libtool.m4 ++++ b/m4/libtool.m4 +@@ -7557,10 +7557,11 @@ if AC_TRY_EVAL(ac_compile); then + case $prev$p in + + -L* | -R* | -l*) +- # Some compilers place space between "-{L,R}" and the path. ++ # Some compilers place space between "-{L,R,l}" and the path (value). + # Remove the space. +- if test x-L = "$p" || +- test x-R = "$p"; then ++ if test x-L = x"$p" || ++ test x-R = x"$p" || ++ test x-l = x"$p"; then + prev=$p + continue + fi diff --git a/var/spack/repos/builtin/packages/libtool/package.py b/var/spack/repos/builtin/packages/libtool/package.py index 98be32a601..e6477fb3b3 100644 --- a/var/spack/repos/builtin/packages/libtool/package.py +++ b/var/spack/repos/builtin/packages/libtool/package.py @@ -31,13 +31,28 @@ class Libtool(AutotoolsPackage): homepage = 'https://www.gnu.org/software/libtool/' url = 'http://ftpmirror.gnu.org/libtool/libtool-2.4.2.tar.gz' + version('develop', git='https://git.savannah.gnu.org/git/libtool.git', + branch='master') version('2.4.6', 'addf44b646ddb4e3919805aa88fa7c5e') version('2.4.2', 'd2f3b7d4627e69e13514a40e72a24d50') depends_on('m4@1.4.6:', type='build') + depends_on('autoconf', type='build', when='@develop') + depends_on('automake', type='build', when='@develop') + depends_on('help2man', type='build', when='@develop') + depends_on('xz', type='build', when='@develop') + depends_on('texinfo', type='build', when='@develop') + + # Fix parsing of compiler output when collecting predeps and postdeps + # http://lists.gnu.org/archive/html/bug-libtool/2016-03/msg00003.html + patch('flag_space.patch', when='@develop') build_directory = 'spack-build' + @when('@develop') + def autoreconf(self, spec, prefix): + Executable('./bootstrap')() + def _make_executable(self, name): return Executable(join_path(self.prefix.bin, name)) -- cgit v1.2.3-70-g09d2 From a816397322a84796ce8c9d354b9170daad457bf8 Mon Sep 17 00:00:00 2001 From: 健美猞猁 Date: Tue, 7 Aug 2018 00:16:27 +0800 Subject: Bump R to v3.5.1. (#8895) --- var/spack/repos/builtin/packages/r/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py index 78aee97001..6ae13af9f5 100644 --- a/var/spack/repos/builtin/packages/r/package.py +++ b/var/spack/repos/builtin/packages/r/package.py @@ -40,6 +40,7 @@ class R(AutotoolsPackage): extendable = True + version('3.5.1', sha256='0463bff5eea0f3d93fa071f79c18d0993878fd4f2e18ae6cf22c1639d11457ed') version('3.5.0', 'c0455dbfa76ca807e4dfa93d49dcc817') version('3.4.4', '9d6f73be072531e95884c7965ff80cd8') version('3.4.3', 'bc55db54f992fda9049201ca62d2a584') -- cgit v1.2.3-70-g09d2 From ed9a1b7a45cf333dc23ba20d7024c339a31d854c Mon Sep 17 00:00:00 2001 From: Reid Priedhorsky <1682574+reidpr@users.noreply.github.com> Date: Mon, 6 Aug 2018 16:43:00 -0600 Subject: add Charliecloud 0.9.1 (#8902) --- var/spack/repos/builtin/packages/charliecloud/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/charliecloud/package.py b/var/spack/repos/builtin/packages/charliecloud/package.py index 032684fbb0..3a3251eebe 100644 --- a/var/spack/repos/builtin/packages/charliecloud/package.py +++ b/var/spack/repos/builtin/packages/charliecloud/package.py @@ -31,6 +31,7 @@ class Charliecloud(MakefilePackage): homepage = "https://hpc.github.io/charliecloud" url = "https://github.com/hpc/charliecloud/archive/v0.2.4.tar.gz" + version('0.9.1', sha256='8e69150a271285da71ece7a09b48251ef6593f72207c5126741d9976aa737d95') version('0.9.0', sha256='7e74cb16e31fd9d502198f7509bab14d1049ec68ba90b15e277e76f805db9458') version('0.2.4', 'b112de661c2c360174b42c99022c1967') -- cgit v1.2.3-70-g09d2 From ea6918c1bf42254ed22ec060b0381272e5cb564d Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Mon, 6 Aug 2018 17:43:14 -0500 Subject: py-crossmap: needs py-setuptools (#8898) * py-crossmap: needs py-setuptools * py-crossmap: additional deps * py-crossmap: make bx build/run --- var/spack/repos/builtin/packages/py-crossmap/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-crossmap/package.py b/var/spack/repos/builtin/packages/py-crossmap/package.py index 3331b1583d..ad94df9bc4 100644 --- a/var/spack/repos/builtin/packages/py-crossmap/package.py +++ b/var/spack/repos/builtin/packages/py-crossmap/package.py @@ -36,4 +36,6 @@ class PyCrossmap(PythonPackage): depends_on('python@2.7:2.7.999', type=('build', 'run')) depends_on('py-cython@0.17:', type='build') - depends_on('py-pysam', type='build') + depends_on('py-pysam', type=('build', 'run')) + depends_on('py-setuptools', type='build') + depends_on('py-bx-python', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 853a3f14c7d4341515e158a9ebc7da23c6828971 Mon Sep 17 00:00:00 2001 From: Geoffrey Malcolm Oxberry Date: Sun, 29 Jul 2018 03:27:01 -0700 Subject: Make libunwind provider of unwind virtual pkg This commit begins addressing the ideas discussed in #8823. The libunwind library now provides the "unwind" virtual package, which represents the "libunwind base API" common to LLVM libunwind, Apple's LLVM libunwind, and non-GNU libunwind. --- var/spack/repos/builtin/packages/libunwind/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libunwind/package.py b/var/spack/repos/builtin/packages/libunwind/package.py index ed0c824d1e..3c5c60aa21 100644 --- a/var/spack/repos/builtin/packages/libunwind/package.py +++ b/var/spack/repos/builtin/packages/libunwind/package.py @@ -36,3 +36,5 @@ class Libunwind(AutotoolsPackage): version('1.2.1', '06ba9e60d92fd6f55cd9dadb084df19e') version('1.1', 'fb4ea2f6fbbe45bf032cd36e586883ce') + + provides('unwind') -- cgit v1.2.3-70-g09d2 From 163fc4cd188cf644f06ef5680b35f7010a3b2059 Mon Sep 17 00:00:00 2001 From: Geoffrey Malcolm Oxberry Date: Sun, 29 Jul 2018 03:41:58 -0700 Subject: apple-libunwind: new package, provides unwind This commit continues the changes discussed in #8823 by creating a new "apple-libunwind" placeholder package that supplies instructions for how to configure packages.yaml to register Apple's libunwind implementation with spack. This package also provides the "unwind" virtual package representing the libunwind base API. The clang-apple compiler version should be specified in packages.yaml so that apple-unwind is only used with Apple's clang compiler, not the stock LLVM compiler. --- .../builtin/packages/apple-libunwind/package.py | 84 ++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 var/spack/repos/builtin/packages/apple-libunwind/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/apple-libunwind/package.py b/var/spack/repos/builtin/packages/apple-libunwind/package.py new file mode 100644 index 0000000000..1aacf98c2b --- /dev/null +++ b/var/spack/repos/builtin/packages/apple-libunwind/package.py @@ -0,0 +1,84 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class AppleLibunwind(Package): + """Placeholder package for Apple's analogue to non-GNU libunwind""" + + homepage = "https://opensource.apple.com/source/libunwind/libunwind-35.3/" + + provides('unwind') + + # The 'conflicts' directive only accepts valid spack specs; + # platforms cannot be negated -- 'platform!=darwin' is not a valid + # spec -- so expressing a conflict for any platform that isn't + # Darwin must be expressed by listing a conflict with every + # platform that isn't Darwin/macOS + conflicts('platform=linux') + conflicts('platform=bgq') + conflicts('platform=cray') + + # Override the fetcher method to throw a useful error message; + # avoids GitHub issue (#7061) in which the opengl placeholder + # package threw a generic, uninformative error during the `fetch` + # step, + @property + def fetcher(self): + msg = """This package is intended to be a placeholder for Apple's + system-provided, non-GNU-compatible libunwind library. + + Add to your packages.yaml: + + packages: + apple-libunwind: + paths: + apple-libunwind@35.3: /usr + buildable: False + + """ + raise InstallError(msg) + + def install(self, spec, prefix): + pass + + @property + def libs(self): + """ Export the Apple libunwind library + """ + libs = find_libraries('libunwind', + join_path(self.prefix.lib, 'system'), + shared=True, recursive=False) + if libs: + return libs + return None + + @property + def headers(self): + """ Export the Apple libunwind header + """ + hdrs = HeaderList(find(self.prefix.include, 'libunwind.h', + recursive=False)) + return hdrs or None -- cgit v1.2.3-70-g09d2 From f395aaa71ded1d2e8589d32ab97313ddce27e50b Mon Sep 17 00:00:00 2001 From: Geoffrey Malcolm Oxberry Date: Mon, 30 Jul 2018 02:23:26 -0700 Subject: mfem+libunwind: use "unwind" virtual package --- var/spack/repos/builtin/packages/mfem/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mfem/package.py b/var/spack/repos/builtin/packages/mfem/package.py index 7515e425ea..9e26473f21 100644 --- a/var/spack/repos/builtin/packages/mfem/package.py +++ b/var/spack/repos/builtin/packages/mfem/package.py @@ -194,7 +194,7 @@ class Mfem(Package): # when='+petsc') depends_on('mpfr', when='+mpfr') depends_on('netcdf', when='+netcdf') - depends_on('libunwind', when='+libunwind') + depends_on('unwind', when='+libunwind') depends_on('zlib', when='+gzstream') depends_on('gnutls', when='+gnutls') depends_on('conduit@0.3.1:', when='+conduit') @@ -373,7 +373,7 @@ class Mfem(Package): ld_flags_from_dirs([spec['gnutls'].prefix.lib], ['gnutls'])] if '+libunwind' in spec: - libunwind = spec['libunwind'] + libunwind = spec['unwind'] headers = find_headers('libunwind', libunwind.prefix.include) headers.add_macro('-g') libs = find_optional_library('libunwind', libunwind.prefix) -- cgit v1.2.3-70-g09d2 From 6d92a88eb4fef9015a48c8ccd9814f678a6e3acd Mon Sep 17 00:00:00 2001 From: Geoffrey Malcolm Oxberry Date: Mon, 30 Jul 2018 06:44:46 -0700 Subject: gperftools: use unwind virtual package --- var/spack/repos/builtin/packages/gperftools/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gperftools/package.py b/var/spack/repos/builtin/packages/gperftools/package.py index 49305fe7ff..984f9834c1 100644 --- a/var/spack/repos/builtin/packages/gperftools/package.py +++ b/var/spack/repos/builtin/packages/gperftools/package.py @@ -39,4 +39,4 @@ class Gperftools(AutotoolsPackage): version('2.3', 'f54dd119f0e46ac1f13264f8d97adf90', url="https://googledrive.com/host/0B6NtGsLhIcf7MWxMMF9JdTN3UVk/gperftools-2.3.tar.gz") - depends_on("libunwind") + depends_on("unwind") -- cgit v1.2.3-70-g09d2 From 4f251345fb177061661318c5afd26d27313e065e Mon Sep 17 00:00:00 2001 From: Geoffrey Malcolm Oxberry Date: Mon, 30 Jul 2018 07:03:25 -0700 Subject: caliper: update to use unwind virtual package --- var/spack/repos/builtin/packages/caliper/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/caliper/package.py b/var/spack/repos/builtin/packages/caliper/package.py index b2ba46253f..ddbe538362 100644 --- a/var/spack/repos/builtin/packages/caliper/package.py +++ b/var/spack/repos/builtin/packages/caliper/package.py @@ -70,7 +70,7 @@ class Caliper(CMakePackage): depends_on('papi', when='+papi') depends_on('libpfm4', when='+libpfm') depends_on('mpi', when='+mpi') - depends_on('libunwind', when='+callpath') + depends_on('unwind', when='+callpath') depends_on('sosflow', when='+sosflow') depends_on('cmake', type='build') -- cgit v1.2.3-70-g09d2 From 79e7359f4de2d16b3d35ca89288d3d5f6256e000 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Tue, 7 Aug 2018 03:18:05 -0500 Subject: Add libs attribute to mesa and mesa-glu packages (#8904) Also fix dependency version in glvis package. Fixes build errors mentioned in #8454. --- var/spack/repos/builtin/packages/glvis/package.py | 2 +- var/spack/repos/builtin/packages/mesa-glu/package.py | 9 ++++++++- var/spack/repos/builtin/packages/mesa/package.py | 8 ++++++++ var/spack/repos/builtin/packages/opengl/package.py | 4 ---- var/spack/repos/builtin/packages/openglu/package.py | 4 ---- 5 files changed, 17 insertions(+), 10 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/glvis/package.py b/var/spack/repos/builtin/packages/glvis/package.py index a79ca2dd1a..3330656439 100644 --- a/var/spack/repos/builtin/packages/glvis/package.py +++ b/var/spack/repos/builtin/packages/glvis/package.py @@ -82,7 +82,7 @@ class Glvis(MakefilePackage): description='Use antialiased fonts via freetype & fontconfig') depends_on('mfem@develop', when='@develop') - depends_on('mfem@3.4', when='@3.4') + depends_on('mfem@3.4.0', when='@3.4') depends_on('mfem@3.3', when='@3.3') depends_on('mfem@3.2', when='@3.2') depends_on('mfem@3.1', when='@3.1') diff --git a/var/spack/repos/builtin/packages/mesa-glu/package.py b/var/spack/repos/builtin/packages/mesa-glu/package.py index 608a23cd8b..39b56a37e9 100644 --- a/var/spack/repos/builtin/packages/mesa-glu/package.py +++ b/var/spack/repos/builtin/packages/mesa-glu/package.py @@ -22,7 +22,6 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## -# from spack import * @@ -39,3 +38,11 @@ class MesaGlu(AutotoolsPackage): depends_on('mesa', when='+mesa') provides('glu@1.3') + + @property + def libs(self): + for dir in ['lib64', 'lib']: + libs = find_libraries('libGLU', join_path(self.prefix, dir), + shared=True, recursive=False) + if libs: + return libs diff --git a/var/spack/repos/builtin/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py index 1fcd8214af..9869286e03 100644 --- a/var/spack/repos/builtin/packages/mesa/package.py +++ b/var/spack/repos/builtin/packages/mesa/package.py @@ -197,3 +197,11 @@ class Mesa(AutotoolsPackage): configure(*options) else: raise + + @property + def libs(self): + for dir in ['lib64', 'lib']: + libs = find_libraries('libGL', join_path(self.prefix, dir), + shared=True, recursive=False) + if libs: + return libs diff --git a/var/spack/repos/builtin/packages/opengl/package.py b/var/spack/repos/builtin/packages/opengl/package.py index 6d0ee752d3..31be247dad 100644 --- a/var/spack/repos/builtin/packages/opengl/package.py +++ b/var/spack/repos/builtin/packages/opengl/package.py @@ -80,9 +80,6 @@ class Opengl(Package): of OpenGL your Mac uses.""" raise InstallError(msg) - def install(self, spec, prefix): - pass - @property def libs(self): for dir in ['lib64', 'lib']: @@ -90,4 +87,3 @@ class Opengl(Package): shared=True, recursive=False) if libs: return libs - return None diff --git a/var/spack/repos/builtin/packages/openglu/package.py b/var/spack/repos/builtin/packages/openglu/package.py index 992a13fbcb..125c3e4da5 100644 --- a/var/spack/repos/builtin/packages/openglu/package.py +++ b/var/spack/repos/builtin/packages/openglu/package.py @@ -76,9 +76,6 @@ class Openglu(Package): raise InstallError(msg) - def install(self, spec, prefix): - pass - @property def libs(self): for dir in ['lib64', 'lib']: @@ -86,4 +83,3 @@ class Openglu(Package): shared=True, recursive=False) if libs: return libs - return None -- cgit v1.2.3-70-g09d2 From f152063898051de6187a33af542a9f1492ae887a Mon Sep 17 00:00:00 2001 From: "Mark W. Krentel" Date: Tue, 7 Aug 2018 14:04:05 -0500 Subject: elfutils: update version and add variants (#8891) * elfutils: update version and add variants Add latest version 0.173. Add variants bzip2, xz and zlib to support reading compressed DWARF sections, default True. Move maintainer-mode to a variant with default False. This is only useful for developers who want to modify the source for generated files. * Add dependency on zlib for reading compressed DWARF sections. Add variants to use bzip2 and xz for compressed sections. Remove maintainer mode and the dependencies on flex and bison. These are not used for one-time builds. Be sure to squash both the commits and the commit messages. --- .../repos/builtin/packages/elfutils/package.py | 48 ++++++++++++++++++---- 1 file changed, 40 insertions(+), 8 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/elfutils/package.py b/var/spack/repos/builtin/packages/elfutils/package.py index faf972151e..9c93b187e5 100644 --- a/var/spack/repos/builtin/packages/elfutils/package.py +++ b/var/spack/repos/builtin/packages/elfutils/package.py @@ -39,13 +39,26 @@ class Elfutils(AutotoolsPackage): list_url = "https://sourceware.org/elfutils/ftp" list_depth = 1 + version('0.173', '35decb1ebfb90d565e4c411bee4185cc') version('0.170', '03599aee98c9b726c7a732a2dd0245d5') version('0.168', '52adfa40758d0d39e5d5c57689bf38d6') version('0.163', '77ce87f259987d2e54e4d87b86cbee41') - depends_on('flex', type='build') - depends_on('bison', type='build') - depends_on('gettext') + # Libraries for reading compressed DWARF sections. + variant('bzip2', default=False, + description='Support bzip2 compressed sections.') + variant('xz', default=False, + description='Support xz compressed sections.') + + # Native language support from libintl. + variant('nls', default=True, + description='Enable Native Language Support.') + + depends_on('bzip2', type='link', when='+bzip2') + depends_on('xz', type='link', when='+xz') + depends_on('zlib', type='link') + depends_on('gettext', when='+nls') + conflicts('%gcc@7.2.0:', when='@0.163') provides('elf@1') @@ -57,8 +70,27 @@ class Elfutils(AutotoolsPackage): conflicts('%clang') def configure_args(self): - # configure doesn't use LIBS correctly - gettext_lib = self.spec['gettext'].prefix.lib, - return [ - 'LDFLAGS=-Wl,--no-as-needed -L%s -lintl' % gettext_lib, - '--enable-maintainer-mode'] + spec = self.spec + args = [] + + if '+bzip2' in spec: + args.append('--with-bzlib=%s' % spec['bzip2'].prefix) + else: + args.append('--without-bzlib') + + if '+xz' in spec: + args.append('--with-lzma=%s' % spec['xz'].prefix) + else: + args.append('--without-lzma') + + # zlib is required + args.append('--with-zlib=%s' % spec['zlib'].prefix) + + if '+nls' in spec: + # configure doesn't use LIBS correctly + args.append('LDFLAGS=-Wl,--no-as-needed -L%s -lintl' % + spec['gettext'].prefix.lib) + else: + args.append('--disable-nls') + + return args -- cgit v1.2.3-70-g09d2 From 2e891a6312c02ebd64cfa73d5154f2afe39b8e89 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Wed, 8 Aug 2018 19:50:48 -0500 Subject: superlu_dist should be built with 'HAVE_PARMETIS=TRUE'. (#8917) --- var/spack/repos/builtin/packages/superlu-dist/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/superlu-dist/package.py b/var/spack/repos/builtin/packages/superlu-dist/package.py index 87567eafc2..fb17a28598 100644 --- a/var/spack/repos/builtin/packages/superlu-dist/package.py +++ b/var/spack/repos/builtin/packages/superlu-dist/package.py @@ -71,6 +71,7 @@ class SuperluDist(Package): 'BLASLIB = %s' % lapack_blas.ld_flags, 'METISLIB = %s' % spec['metis'].libs.ld_flags, 'PARMETISLIB = %s' % spec['parmetis'].libs.ld_flags, + 'HAVE_PARMETIS= TRUE', 'FLIBS =', 'LIBS = $(DSUPERLULIB) $(BLASLIB) $(PARMETISLIB) $(METISLIB)', # noqa 'ARCH = ar', -- cgit v1.2.3-70-g09d2 From 1cd33e7052e00ff2d194c3635f8c9435dec48789 Mon Sep 17 00:00:00 2001 From: "Elsa Gonsiorowski, PhD" Date: Wed, 8 Aug 2018 18:40:38 -0700 Subject: ECP VELOC Package update (#8910) * update of veloc & dep versions (replace old non-working versions) * veloc doesn't work with gcc <= 4.9.3 * explicitly pass MPI to CMake for veloc build --- var/spack/repos/builtin/packages/axl/package.py | 4 ++-- var/spack/repos/builtin/packages/er/package.py | 2 +- var/spack/repos/builtin/packages/kvtree/package.py | 2 +- var/spack/repos/builtin/packages/rankstr/package.py | 2 +- var/spack/repos/builtin/packages/redset/package.py | 2 +- var/spack/repos/builtin/packages/shuffile/package.py | 2 +- var/spack/repos/builtin/packages/veloc/package.py | 7 +++++-- 7 files changed, 12 insertions(+), 9 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/axl/package.py b/var/spack/repos/builtin/packages/axl/package.py index 21ba3f797e..32bbac6914 100644 --- a/var/spack/repos/builtin/packages/axl/package.py +++ b/var/spack/repos/builtin/packages/axl/package.py @@ -45,7 +45,7 @@ class Axl(CMakePackage): tags = ['ecp'] version('master', branch='master') - version('0.1.0', '1ff16c046c3a080c252e0bf4251b83bc') + version('0.1.1', sha256='7ec0417447c5a3cc0b6e46ff3f646984410c77e6c2081cf0c748781384be739b') variant('async_api', default='daemon', description="Set of async transfer APIs to enable", @@ -64,7 +64,7 @@ class Axl(CMakePackage): args.append("-DAXL_LINK_STATIC=ON") args.append("-DWITH_KVTREE_PREFIX=%s" % self.spec['kvtree'].prefix) - apis = self.spec.variants['async_api'].value.split(',') + apis = list(self.spec.variants['async_api'].value) if 'daemon' in apis: args.append('-DAXL_ASYNC_DAEMON=ON') apis.remove('daemon') diff --git a/var/spack/repos/builtin/packages/er/package.py b/var/spack/repos/builtin/packages/er/package.py index baf2d01db7..ea1773204d 100644 --- a/var/spack/repos/builtin/packages/er/package.py +++ b/var/spack/repos/builtin/packages/er/package.py @@ -35,7 +35,7 @@ class Er(CMakePackage): tags = ['ecp'] version('master', branch='master') - version('0.0.2', '24ad8f87bce2b6d900f1fb67452c3672') + version('0.0.3', sha256='9aa08f9fe70e42f0da27a5d90d4643b520d61f24742303bf016322823b3c4d26') depends_on('mpi') depends_on('kvtree') diff --git a/var/spack/repos/builtin/packages/kvtree/package.py b/var/spack/repos/builtin/packages/kvtree/package.py index 46392716df..1e027b498f 100644 --- a/var/spack/repos/builtin/packages/kvtree/package.py +++ b/var/spack/repos/builtin/packages/kvtree/package.py @@ -36,7 +36,7 @@ class Kvtree(CMakePackage): tags = ['ecp'] version('master', branch='master') - version('1.0.1', 'f007b4b930d12fc0eb784b4dc3af823e') + version('1.0.2', sha256='6b54f4658e5ebab747c0c2472b1505ac1905eefc8a0b2a97d8776f800ee737a3') variant('mpi', default=True, description="Build with MPI message packing") depends_on('mpi', when='+mpi') diff --git a/var/spack/repos/builtin/packages/rankstr/package.py b/var/spack/repos/builtin/packages/rankstr/package.py index 82df492092..f976744fc0 100644 --- a/var/spack/repos/builtin/packages/rankstr/package.py +++ b/var/spack/repos/builtin/packages/rankstr/package.py @@ -35,7 +35,7 @@ class Rankstr(CMakePackage): tags = ['ecp'] version('master', branch='master') - version('0.0.1', 'abe06fa6a78cfe20ec0c78717ac2f2ed') + version('0.0.2', sha256='c16d53aa9bb79934cbe2dcd8612e2db7d59de80be500c104e39e8623d4eacd8e') depends_on('mpi') diff --git a/var/spack/repos/builtin/packages/redset/package.py b/var/spack/repos/builtin/packages/redset/package.py index 0bd4ffc39f..971be198b4 100644 --- a/var/spack/repos/builtin/packages/redset/package.py +++ b/var/spack/repos/builtin/packages/redset/package.py @@ -35,7 +35,7 @@ class Redset(CMakePackage): tags = ['ecp'] version('master', branch='master') - version('0.0.2', '370d4dd477ebcfdd28dcc6375c22f731') + version('0.0.3', sha256='f110c9b42209d65f84a8478b919b27ebe2d566839cb0cd0c86ccbdb1f51598f4') depends_on('mpi') depends_on('rankstr') diff --git a/var/spack/repos/builtin/packages/shuffile/package.py b/var/spack/repos/builtin/packages/shuffile/package.py index 2026f51b28..817f5c70b5 100644 --- a/var/spack/repos/builtin/packages/shuffile/package.py +++ b/var/spack/repos/builtin/packages/shuffile/package.py @@ -35,7 +35,7 @@ class Shuffile(CMakePackage): tags = ['ecp'] version('master', branch='master') - version('0.0.2', 'eca45150d83e21ac51049133a2308d34') + version('0.0.3', sha256='6debdd9d6e6f1c4ec31015d7956e8b556acd61ce31f757e4d1fa5002029c75e2') depends_on('mpi') depends_on('kvtree') diff --git a/var/spack/repos/builtin/packages/veloc/package.py b/var/spack/repos/builtin/packages/veloc/package.py index 0db99088c6..18ba133f04 100644 --- a/var/spack/repos/builtin/packages/veloc/package.py +++ b/var/spack/repos/builtin/packages/veloc/package.py @@ -36,7 +36,7 @@ class Veloc(CMakePackage): tags = ['ecp'] version('master', branch='master') - version('1.0', '98fe2d9abd2a1b53d7a52267dab91fae') + version('1.0', '98fe2d9abd2a1b53d7a52267dab91fae', preferred=True) version('1.0rc1', 'c6db0de56b5b865183b1fa719ac74c1d') depends_on('boost~atomic~chrono~clanglibcpp~date_time~debug~exception' @@ -50,6 +50,8 @@ class Veloc(CMakePackage): depends_on('axl') depends_on('cmake@3.9:', type='build') + conflicts('%gcc@:4.9.3') + # requires C++11 def flag_handler(self, name, flags): flags = list(flags) @@ -61,7 +63,8 @@ class Veloc(CMakePackage): args = [ "-DWITH_AXL_PREFIX=%s" % self.spec['axl'].prefix, "-DWITH_ER_PREFIX=%s" % self.spec['er'].prefix, - "-DBOOST_ROOT=%s" % self.spec['boost'].prefix + "-DBOOST_ROOT=%s" % self.spec['boost'].prefix, + "-DMPI_CXX_COMPILER=%s" % self.spec['mpi'].mpicxx ] return args -- cgit v1.2.3-70-g09d2 From 393d3c64fc6275e6e6d20269cbc155e4fdea97f8 Mon Sep 17 00:00:00 2001 From: "Mark W. Krentel" Date: Thu, 9 Aug 2018 08:19:09 -0500 Subject: libiberty: new package (#8912) * libiberty: new package The libiberty.a library from GNU binutils. Libiberty provides demangling and support functions for the GNU toolchain. This package uses the binutils tarfile but only builds the libiberty subdirectory. This is useful for other packages that want the demangling functions without the rest of binutils. Add variant 'fpic' to compile with -fPIC. Addresses some issues raised in PR #8806. * libiberty: change variant name to 'pic'. Allow libiberty to install the library in lib64 and don't try to copy it to lib. --- .../repos/builtin/packages/libiberty/package.py | 73 ++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 var/spack/repos/builtin/packages/libiberty/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libiberty/package.py b/var/spack/repos/builtin/packages/libiberty/package.py new file mode 100644 index 0000000000..d07f966413 --- /dev/null +++ b/var/spack/repos/builtin/packages/libiberty/package.py @@ -0,0 +1,73 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +# Libiberty has two homes: binutils and gcc. This package uses the +# binutils tarfile but only builds the libiberty subdirectory. This +# is useful for other packages that want the demangling functions +# without the rest of binutils. + +class Libiberty(AutotoolsPackage): + """The libiberty.a library from GNU binutils. Libiberty provides + demangling and support functions for the GNU toolchain.""" + + homepage = "https://www.gnu.org/software/binutils/" + url = "https://ftp.gnu.org/gnu/binutils/binutils-2.31.1.tar.xz" + + version('2.31.1', '5b7c9d4ce96f507d95c1b9a255e52418') + version('2.30', 'ffc476dd46c96f932875d1b2e27e929f') + version('2.29.1', 'acc9cd826edb9954ac7cecb81c727793') + version('2.28.1', 'a3bf359889e4b299fce1f4cb919dc7b6') + + variant('pic', default=False, + description='Compile with position independent code.') + + # Configure and build just libiberty. + configure_directory = 'libiberty' + + # Set default cflags (-g -O2), add -fPIC if requested, and move to + # the configure line. + def flag_handler(self, name, flags): + if name != 'cflags': + return (flags, None, None) + + if '-g' not in flags: + flags.append('-g') + + for flag in flags: + if flag.startswith('-O'): + break + else: + flags.append('-O2') + + if '+pic' in self.spec: + flags.append(self.compiler.pic_flag) + + return (None, None, flags) + + def configure_args(self): + args = ['--enable-install-libiberty'] + return args -- cgit v1.2.3-70-g09d2 From 9e981fc73fee8d93cf47e0469b9d94849018fde1 Mon Sep 17 00:00:00 2001 From: Hadrien G Date: Thu, 9 Aug 2018 17:29:57 +0200 Subject: Remove duplicate variant in Boost package (#8923) --- var/spack/repos/builtin/packages/boost/package.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index 6fac5541c7..a7dbb35ff0 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -132,8 +132,6 @@ class Boost(Package): description="Build single-threaded versions of libraries") variant('icu', default=False, description="Build with Unicode and ICU suport") - variant('graph', default=False, - description="Build the Boost Graph library") variant('taggedlayout', default=False, description="Augment library names with build options") variant('versionedlayout', default=False, -- cgit v1.2.3-70-g09d2 From a4d0e62dbd6c1c05ead6d3146026f982e37bed51 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Thu, 9 Aug 2018 10:35:54 -0500 Subject: perl6-slurp: new package (#8672) * perl6-slurp: new package * perl-perl6-slurp: changing perl version dependency --- .../builtin/packages/perl-perl6-slurp/package.py | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-perl6-slurp/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-perl6-slurp/package.py b/var/spack/repos/builtin/packages/perl-perl6-slurp/package.py new file mode 100644 index 0000000000..6256affb4e --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-perl6-slurp/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlPerl6Slurp(PerlPackage): + """Perl6::Slurp - Implements the Perl 6 'slurp' built-in""" + + homepage = "http://search.cpan.org/~dconway/Perl6-Slurp-0.051005/lib/Perl6/Slurp.pm" + url = "http://search.cpan.org/CPAN/authors/id/D/DC/DCONWAY/Perl6-Slurp-0.051005.tar.gz" + + version('0.051005', '6095c8df495c7983f36996ed78c5ead7') + + depends_on('perl@5.8:5.999', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From bbcb2bb8ca37236b559bcaae9eb7b55970fc769c Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Thu, 9 Aug 2018 08:56:08 -0700 Subject: add fgfs variant to stat and develop version (#8919) --- .../packages/fast-global-file-status/package.py | 47 ++++++++++++++++++++++ .../packages/mount-point-attributes/package.py | 39 ++++++++++++++++++ var/spack/repos/builtin/packages/stat/package.py | 12 ++++-- 3 files changed, 95 insertions(+), 3 deletions(-) create mode 100644 var/spack/repos/builtin/packages/fast-global-file-status/package.py create mode 100644 var/spack/repos/builtin/packages/mount-point-attributes/package.py (limited to 'var') 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 new file mode 100644 index 0000000000..186f7a8e98 --- /dev/null +++ b/var/spack/repos/builtin/packages/fast-global-file-status/package.py @@ -0,0 +1,47 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class FastGlobalFileStatus(AutotoolsPackage): + """provides a scalable mechanism to retrieve such information of a file, + including its degree of distribution or replication and consistency.""" + + homepage = "https://github.com/LLNL/FastGlobalFileStatus" + url = 'https://github.com/LLNL/FastGlobalFileStatus/files/2271592/fastglobalfilestatus-1.1.tar.gz' + + version('1.1', 'c3d764c47a60310823947c489cd0f2df') + + depends_on('mrnet') + depends_on('mount-point-attributes') + depends_on('mpi') + + def configure_args(self): + spec = self.spec + args = [ + "--with-mpa=%s" % spec['mount-point-attributes'].prefix, + "--with-mrnet=%s" % spec['mrnet'].prefix + ] + return args diff --git a/var/spack/repos/builtin/packages/mount-point-attributes/package.py b/var/spack/repos/builtin/packages/mount-point-attributes/package.py new file mode 100644 index 0000000000..c2ac3c8ee2 --- /dev/null +++ b/var/spack/repos/builtin/packages/mount-point-attributes/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class MountPointAttributes(AutotoolsPackage): + """Library to turn expensive, non-scalable file system calls into simple + string comparison operations.""" + + homepage = "https://github.com/LLNL/MountPointAttributes" + url = 'https://github.com/LLNL/MountPointAttributes/files/2270601/mountpointattr-1.1.tar.gz' + + version('1.1', 'c9f0e7f5a3e16b9a022e5948712ecb2a') + + depends_on('autoconf', type='build') + depends_on('automake', type='build') + depends_on('libtool', type='build') diff --git a/var/spack/repos/builtin/packages/stat/package.py b/var/spack/repos/builtin/packages/stat/package.py index a39228f93b..6455acee3f 100644 --- a/var/spack/repos/builtin/packages/stat/package.py +++ b/var/spack/repos/builtin/packages/stat/package.py @@ -29,8 +29,10 @@ class Stat(AutotoolsPackage): """Library to create, manipulate, and export graphs Graphlib.""" homepage = "http://paradyn.org/STAT/STAT.html" - url = "https://github.com/lee218llnl/stat/archive/v2.0.0.tar.gz" + url = "https://github.com/LLNL/STAT/archive/v2.0.0.tar.gz" + git = "https://github.com/llnl/stat.git" + version('develop', branch='develop') version('4.0.0', 'b357160662ced251bc55cb1b884c3407', url='https://github.com/LLNL/STAT/releases/download/v4.0.0/stat-4.0.0.tar.gz') version('3.0.1', 'dac6f23c3639a0b21f923dc6219ba385', @@ -44,13 +46,14 @@ class Stat(AutotoolsPackage): # TODO: dysect requires Dyninst patch for version 3.0.0b variant('dysect', default=False, description="enable DySectAPI") variant('examples', default=False, description="enable examples") + variant('fgfs', default=True, description="enable file broadcasting") depends_on('autoconf', type='build') depends_on('automake', type='build') depends_on('libtool', type='build') - depends_on('libdwarf') depends_on('dyninst', when='~dysect') depends_on('dyninst@8.2.1+stat_dysect', when='+dysect') + depends_on('fast-global-file-status', 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')) @@ -58,6 +61,7 @@ class Stat(AutotoolsPackage): depends_on('mrnet') depends_on('python@:2.8') depends_on('py-pygtk', type=('build', 'run')) + depends_on('py-enum34', type=('run')) depends_on('swig') depends_on('mpi', when='+examples') @@ -70,9 +74,11 @@ class Stat(AutotoolsPackage): "--with-mrnet=%s" % spec['mrnet'].prefix, "--with-graphlib=%s" % spec['graphlib'].prefix, "--with-stackwalker=%s" % spec['dyninst'].prefix, - "--with-libdwarf=%s" % spec['libdwarf'].prefix, "--with-python=%s" % spec['python'].command.path, ] + if '+fgfs' in spec: + args.append('--with-fgfs=%s' + % spec['fast-global-file-status'].prefix) if '+dysect' in spec: args.append('--enable-dysectapi') if '~examples' in spec: -- cgit v1.2.3-70-g09d2 From 2a94d59433bbaa7ec5a9960e4b3419f8a92bdfea Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Fri, 10 Aug 2018 00:08:20 +0200 Subject: boost: add 1.68.0 (#8931) --- var/spack/repos/builtin/packages/boost/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index a7dbb35ff0..e625591813 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -43,6 +43,7 @@ class Boost(Package): list_depth = 1 version('develop', branch='develop', submodules=True) + version('1.68.0', '18863a7cae4d58ae85eb63d400f774f60a383411') version('1.67.0', '694ae3f4f899d1a80eb7a3b31b33be73c423c1ae') version('1.66.0', 'b6b284acde2ad7ed49b44e856955d7b1ea4e9459') version('1.65.1', '41d7542ce40e171f3f7982aff008ff0d') -- cgit v1.2.3-70-g09d2 From 14f6b13a7b334d6ad263caac918465a5157026f1 Mon Sep 17 00:00:00 2001 From: jthies Date: Fri, 10 Aug 2018 10:53:18 -0700 Subject: Phist 1.6.1 (#8933) * packages/phist: new version 1.6.1 * packages/phist: depends on Python 3.x for generating Fortran and C++ bindings * packages/phist: new version 1.7.2 * phist: depend on python@3 only for versions later than 1.7 * packages/phist: depend on python@3: rather than 3 * phist: python dependency is type='build', thans @adamjstewart --- var/spack/repos/builtin/packages/phist/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/phist/package.py b/var/spack/repos/builtin/packages/phist/package.py index 95b16488ff..692bf8ae32 100644 --- a/var/spack/repos/builtin/packages/phist/package.py +++ b/var/spack/repos/builtin/packages/phist/package.py @@ -43,6 +43,8 @@ class Phist(CMakePackage): version('develop', branch='devel') version('master', branch='master') + version('1.7.2', sha256='29b504d78b5efd57b87d2ca6e20bc8a32b1ba55b40f5a5b7189cc0d28e43bcc0') + version('1.6.1', sha256='4ed4869f24f920a494aeae0f7d1d94fe9efce55ebe0d298a5948c9603e07994d') version('1.6.0', '751f855230d6227b972b5ab7bce2c65f') version('1.4.3', 'af3300378d4282366d148e38c3a3199a') @@ -79,6 +81,7 @@ class Phist(CMakePackage): depends_on('cmake@3.8:', type='build') depends_on('blas') depends_on('lapack') + depends_on('python@3:', when='@1.7:', type='build') depends_on('mpi', when='+mpi') depends_on('trilinos+anasazi+belos+teuchos', when='+trilinos') depends_on('trilinos@12:+tpetra', when='kernel_lib=tpetra') -- cgit v1.2.3-70-g09d2 From b78c198b623b9107352b8aa2b30c15659bd0ead3 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Fri, 10 Aug 2018 15:01:12 -0500 Subject: r-fastcluster: new package (#8934) * r-fastcluster: new package * r-fastcluster: add list_url --- .../builtin/packages/r-fastcluster/package.py | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-fastcluster/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-fastcluster/package.py b/var/spack/repos/builtin/packages/r-fastcluster/package.py new file mode 100644 index 0000000000..7a1e20f00c --- /dev/null +++ b/var/spack/repos/builtin/packages/r-fastcluster/package.py @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RFastcluster(RPackage): + """This is a two-in-one package which provides interfaces to both R + and 'Python'. It implements fast hierarchical, agglomerative + clustering routines. Part of the functionality is designed as drop-in + replacement for existing routines: linkage() in the 'SciPy' package + 'scipy.cluster.hierarchy', hclust() in R's 'stats' package, and the + 'flashClust' package. It provides the same functionality with the + benefit of a much faster implementation. Moreover, there are + memory-saving routines for clustering of vector data, which go beyond + what the existing packages provide. For information on how to install + the 'Python' files, see the file INSTALL in the source distribution.""" + + homepage = "http://danifold.net/fastcluster.html" + url = "https://cran.r-project.org/src/contrib/fastcluster_1.1.25.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/fastcluster/" + + version('1.1.25', sha256='f3661def975802f3dd3cec5b2a1379f3707eacff945cf448e33aec0da1ed4205') + + depends_on('r@3.0.0:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 7e1e689e4cd50acd5f15e84a1ef44105503aae06 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Fri, 10 Aug 2018 15:21:22 -0500 Subject: r-amap: new package (#8935) * r-amap: new package * r-amap: add list_url * r-amap: dep type --- var/spack/repos/builtin/packages/r-amap/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-amap/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-amap/package.py b/var/spack/repos/builtin/packages/r-amap/package.py new file mode 100644 index 0000000000..b83cd017b5 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-amap/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RAmap(RPackage): + """Tools for Clustering and Principal Component Analysis + (With robust methods, and parallelized functions).""" + + homepage = "http://mulcyber.toulouse.inra.fr/projects/amap/" + url = "https://cran.rstudio.com/src/contrib/amap_0.8-16.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/amap/" + + version('0.8-16', sha256='d3775ad7f660581f7d2f070e426be95ae0d6743622943e6f5491988e5217d4e2') + + depends_on('r@2.10.0:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From c2b913d709741f9ecb452d3901fbb90ab2768c4a Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Fri, 10 Aug 2018 16:08:31 -0500 Subject: r-biasedurn: new package (#8937) * r-biasedurn: new package * r-biasedurn: add list_url --- .../repos/builtin/packages/r-biasedurn/package.py | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-biasedurn/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-biasedurn/package.py b/var/spack/repos/builtin/packages/r-biasedurn/package.py new file mode 100644 index 0000000000..eb8329cd1e --- /dev/null +++ b/var/spack/repos/builtin/packages/r-biasedurn/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RBiasedurn(RPackage): + """Statistical models of biased sampling in the form of univariate and + multivariate noncentral hypergeometric distributions, including + Wallenius' noncentral hypergeometric distribution and Fisher's + noncentral hypergeometric distribution (also called extended + hypergeometric distribution). See vignette("UrnTheory") for + explanation of these distributions.""" + + homepage = "http://www.agner.org/random/" + url = "https://cran.rstudio.com/src/contrib/BiasedUrn_1.07.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/BiasedUrn/" + + version('1.07', sha256='2377c2e59d68e758a566452d7e07e88663ae61a182b9ee455d8b4269dda3228e') -- cgit v1.2.3-70-g09d2 From c1daedfdbf39eab450653e1b5c83c943d493b001 Mon Sep 17 00:00:00 2001 From: 健美猞猁 Date: Sat, 11 Aug 2018 21:37:51 +0800 Subject: Gromacs conflicts with cmake@3.10: . (#8956) --- var/spack/repos/builtin/packages/gromacs/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gromacs/package.py b/var/spack/repos/builtin/packages/gromacs/package.py index aa663890e8..1382555761 100644 --- a/var/spack/repos/builtin/packages/gromacs/package.py +++ b/var/spack/repos/builtin/packages/gromacs/package.py @@ -69,8 +69,8 @@ class Gromacs(CMakePackage): depends_on('plumed+mpi', when='+plumed+mpi') depends_on('plumed~mpi', when='+plumed~mpi') depends_on('fftw') - depends_on('cmake@2.8.8:', type='build') - depends_on('cmake@3.4.3:', type='build', when='@2018:') + depends_on('cmake@2.8.8:3.9.99', type='build') + depends_on('cmake@3.4.3:3.9.99', type='build', when='@2018:') depends_on('cuda', when='+cuda') def patch(self): -- cgit v1.2.3-70-g09d2 From 84675e50d12c7e0e77f0b1f8415f233d4741fe06 Mon Sep 17 00:00:00 2001 From: 健美猞猁 Date: Sat, 11 Aug 2018 21:38:20 +0800 Subject: Add new versions for cmake. (#8955) --- var/spack/repos/builtin/packages/cmake/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index 8090a1b992..ed876d0b8e 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -33,15 +33,18 @@ class Cmake(Package): list_url = 'https://cmake.org/files/' list_depth = 1 + version('3.12.1', '10109246a51102bfda45ff3935275fbf') version('3.12.0', 'ab4aa7df9301c94cdd6f8ee4fe66458b') version('3.11.4', '72e168b3bad2f9c34dcebbad7af56ff0') version('3.11.3', '3f923154ed47128f13b08eacd207d9ee') version('3.11.2', 'd2d554c05fc07cfae7846d2aa205f12a') version('3.11.1', '12a3177477e4e2c7bc514193d421dafe') version('3.11.0', 'f3ebc79b5dec85b49abe75958ffa1a03') + version('3.10.3', '1c38c67295ca696aeafd8c059d748b38') version('3.10.2', '732808e17fc14dc8cee50d51518c34eb') version('3.10.1', '9a726e5ec69618b172aa4b06d18c3998') version('3.10.0', 'f3f8e70ca3055f3cd288f89ff233057e') + version('3.9.6', '084b1c8b2efc1c1ba432dea37243c0ae') version('3.9.4', '33769e001bdcd788f565bf378692e5ae') version('3.9.0', '180e23b4c9b55915d271b315297f6951') version('3.8.2', 'b5dff61f6a7f1305271ab3f6ae261419') -- cgit v1.2.3-70-g09d2 From 08addef275f7c6690b2d8bae6f01f2380f12597a Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Sat, 11 Aug 2018 09:21:05 -0500 Subject: r-bindrcpp: add new version (#8950) * r-bindrcpp: add new version * r-bindrcpp: version ordering and removing r version restriction --- var/spack/repos/builtin/packages/r-bindrcpp/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-bindrcpp/package.py b/var/spack/repos/builtin/packages/r-bindrcpp/package.py index 6b850006cb..8406c4915b 100644 --- a/var/spack/repos/builtin/packages/r-bindrcpp/package.py +++ b/var/spack/repos/builtin/packages/r-bindrcpp/package.py @@ -33,9 +33,9 @@ class RBindrcpp(RPackage): url = "https://cran.r-project.org/src/contrib/bindrcpp_0.2.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/bindrcpp" + version('0.2.2', '48130709eba9d133679a0e959e49a7b14acbce4f47c1e15c4ab46bd9e48ae467') version('0.2', '2ed7f19fd9a12587f882d90060e7a343') - depends_on('r@3.4.0:3.4.9') depends_on('r-rcpp', type=('build', 'run')) depends_on('r-bindr', type=('build', 'run')) depends_on('r-plogr', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 3addf5c380b5478662cccf2e2a28a1b6510af085 Mon Sep 17 00:00:00 2001 From: Tom Merrick Date: Sat, 11 Aug 2018 09:21:20 -0500 Subject: Add version 1.12.8 to dbus (#8949) --- var/spack/repos/builtin/packages/dbus/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dbus/package.py b/var/spack/repos/builtin/packages/dbus/package.py index 6d585c8952..fe28740824 100644 --- a/var/spack/repos/builtin/packages/dbus/package.py +++ b/var/spack/repos/builtin/packages/dbus/package.py @@ -38,6 +38,7 @@ class Dbus(Package): homepage = "http://dbus.freedesktop.org/" url = "http://dbus.freedesktop.org/releases/dbus/dbus-1.8.8.tar.gz" + version('1.12.8', '2764bf150e5aa8005b7bc0d6c388756a') version('1.11.2', '957a07f066f3730d2bb3ea0932f0081b') version('1.9.0', 'ec6895a4d5c0637b01f0d0e7689e2b36') version('1.8.8', 'b9f4a18ee3faa1e07c04aa1d83239c43') -- cgit v1.2.3-70-g09d2 From c4c84b7567bdab483a1d3d0c6a2ea6c1e911ca2f Mon Sep 17 00:00:00 2001 From: 健美猞猁 Date: Sat, 11 Aug 2018 22:21:32 +0800 Subject: Add version 5.1.5 for gromacs. (#8948) --- var/spack/repos/builtin/packages/gromacs/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gromacs/package.py b/var/spack/repos/builtin/packages/gromacs/package.py index 1382555761..b934b5bb47 100644 --- a/var/spack/repos/builtin/packages/gromacs/package.py +++ b/var/spack/repos/builtin/packages/gromacs/package.py @@ -49,6 +49,7 @@ class Gromacs(CMakePackage): version('2016.5', 'f41807e5b2911ccb547a3fd11f105d47') version('2016.4', '19c8b5c85f3ec62df79d2249a3c272f8') version('2016.3', 'e9e3a41bd123b52fbcc6b32d09f8202b') + version('5.1.5', '831fe741bcd9f1612155dffc919885f2') version('5.1.4', 'ba2e34d59b3982603b4935d650c08040') version('5.1.2', '614d0be372f1a6f1f36382b7a6fcab98') -- cgit v1.2.3-70-g09d2 From 8ef5beebbfd575df61537e6d68cd6d16acfac00d Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Sat, 11 Aug 2018 09:22:21 -0500 Subject: r-sm: new package (#8945) --- var/spack/repos/builtin/packages/r-sm/package.py | 39 ++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-sm/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-sm/package.py b/var/spack/repos/builtin/packages/r-sm/package.py new file mode 100644 index 0000000000..b5dd5e8157 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-sm/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RSm(RPackage): + """This is software linked to the book 'Applied Smoothing Techniques for + Data Analysis - The Kernel Approach with S-Plus Illustrations' + Oxford University Press.""" + + homepage = "http://www.stats.gla.ac.uk/~adrian/sm" + url = "https://cran.r-project.org/src/contrib/sm_2.2-5.5.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/sm" + + version('2.2-5.5', sha256='43e212a14c364b98b10018b56fe0a619ccffe4bde1294e6c45b3eafe7caf82e7') + + depends_on('r@3.1.0:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From d4349b49453655acc482b1c4525731a26ff6be69 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Sat, 11 Aug 2018 09:23:34 -0500 Subject: r-findpython: new package (#8943) --- .../repos/builtin/packages/r-findpython/package.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-findpython/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-findpython/package.py b/var/spack/repos/builtin/packages/r-findpython/package.py new file mode 100644 index 0000000000..0d2dc7ee6d --- /dev/null +++ b/var/spack/repos/builtin/packages/r-findpython/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RFindpython(RPackage): + """Package designed to find an acceptable python binary.""" + + homepage = "https://github.com/trevorld/findpython" + url = "https://cran.r-project.org/src/contrib/findpython_1.0.3.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/findpython" + + version('1.0.3', sha256='5486535ae2f0a123b630d8eabf93a61b730765f55dfcc8ef4f6e56e7c49408f8') + + depends_on('python', type='run') -- cgit v1.2.3-70-g09d2 From 2a4b7a4dc4a5747211729123ea40b20b797ea303 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Sat, 11 Aug 2018 09:26:16 -0500 Subject: r-goplot: new package (#8942) --- .../repos/builtin/packages/r-goplot/package.py | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-goplot/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-goplot/package.py b/var/spack/repos/builtin/packages/r-goplot/package.py new file mode 100644 index 0000000000..13ce8a1bc5 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-goplot/package.py @@ -0,0 +1,49 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RGoplot(RPackage): + """Implementation of multilayered visualizations for enhanced graphical + representation of functional analysis data. It combines and integrates + omics data derived from expression and functional annotation enrichment + analyses. Its plotting functions have been developed with an + hierarchical structure in mind: starting from a general overview to + identify the most enriched categories (modified bar plot, bubble plot) + to a more detailed one displaying different types of relevant + information for the molecules in a given set of categories + (circle plot, chord plot, cluster plot, Venn diagram, heatmap).""" + + homepage = "https://github.com/wencke/wencke.github.io/issues" + url = "https://cran.r-project.org/src/contrib/GOplot_1.0.2.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/GOplot" + + version('1.0.2', sha256='3ddaa2b6d1297ad6daad30d18af708adf43d86e8804b1b92fa29dfbf26d80df9') + + depends_on('r@3.2.3:', type=('build', 'run')) + depends_on('r-ggplot2@2.0.0:', type=('build', 'run')) + depends_on('r-ggdendro@0.1-17:', type=('build', 'run')) + depends_on('r-gridextra@2.0.0:', type=('build', 'run')) + depends_on('r-rcolorbrewer@1.1.2:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 0b9434b4ba7e4f9fa933521d50a1e57a117e46e8 Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Sat, 11 Aug 2018 09:38:31 -0700 Subject: Add package for fasta (#8953) * Add package for fasta Add a package for the fasta sequence alignment tools. The build system is novel (fasta is "venerable", so...). The source tree includes nearly 50 variant Makefiles, the installer is expected to pick one that's appropriate and then edit the "XDIR" variable to specify the installation path. I can only test 64 bit darwin and linux, so that's all I've included. I'm also assuming that every 64bit x86 system we'll see supports the SSE2 extensions. Other situations can be dealt with when someone has a test case. * Switch to MakefilePackage and clean up a bit - Clean up the description - Switch to MakefilePackage - generalize the path to the chosen Makefile - implement separate `edit`, `build`, and `install` phases. * Fix call to format() * Fix broken if logic --- var/spack/repos/builtin/packages/fasta/package.py | 77 +++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 var/spack/repos/builtin/packages/fasta/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fasta/package.py b/var/spack/repos/builtin/packages/fasta/package.py new file mode 100644 index 0000000000..55e30ece73 --- /dev/null +++ b/var/spack/repos/builtin/packages/fasta/package.py @@ -0,0 +1,77 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Fasta(MakefilePackage): + """The FASTA programs find regions of local or global similarity + between Protein or DNA sequences, either by searching Protein or + DNA databases, or by identifying local duplications within a + sequence. Other programs provide information on the statistical + significance of an alignment. Like BLAST, FASTA can be used to + infer functional and evolutionary relationships between sequences + as well as help identify members of gene families. + """ + + homepage = "https://fasta.bioch.virginia.edu/fasta_www2/fasta_list2.shtml" + url = "https://github.com/wrpearson/fasta36/archive/fasta-v36.3.8g.tar.gz" + + version('36.3.8g', sha256='fa5318b6f8d6a3cfdef0d29de530eb005bfd3ca05835faa6ad63663f8dce7b2e') + + depends_on('zlib') + + # The src tree includes a plethora of variant Makefiles and the + # builder is expected to choose one that's appropriate. This'll + # do for a first cut. I can't test anything else.... + @property + def makefile_name(self): + if self.spec.satisfies('platform=darwin'): + name = 'Makefile.os_x86_64' + elif (self.spec.satisfies('platform=linux') and + self.spec.satisfies('target=x86_64')): + name = 'Makefile.linux64_sse2' + else: + tty.die('''Unsupported platform/target, must be +Darwin (assumes 64-bit) +Linux x86_64 +''') + return name + + @property + def makefile_path(self): + return join_path(self.stage.source_path, 'make', self.makefile_name) + + def edit(self, spec, prefix): + makefile = FileFilter(self.makefile_path) + makefile.filter('XDIR = .*', 'XDIR = {0}'.format(prefix.bin)) + + def build(self, spec, prefix): + with working_dir('src'): + make('-f', self.makefile_path) + + def install(self, spec, prefix): + with working_dir('src'): + mkdir(prefix.bin) + make('-f', self.makefile_path, 'install') -- cgit v1.2.3-70-g09d2 From c68fa10e6b085df1c8fe37a222072868788dc98f Mon Sep 17 00:00:00 2001 From: 健美猞猁 Date: Mon, 13 Aug 2018 00:58:25 +0800 Subject: Install headers and lib files to destination for legacy apps (#8960) * Install sam.h and libbam.a for legacy apps. * Install bam.h. * Remove which(mkdir). --- var/spack/repos/builtin/packages/samtools/package.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/samtools/package.py b/var/spack/repos/builtin/packages/samtools/package.py index a442229e8a..ae379c55ab 100644 --- a/var/spack/repos/builtin/packages/samtools/package.py +++ b/var/spack/repos/builtin/packages/samtools/package.py @@ -59,3 +59,9 @@ class Samtools(Package): else: make("prefix=%s" % prefix) make("prefix=%s" % prefix, "install") + # Install dev headers and libs for legacy apps depending on them + mkdir(prefix.include) + mkdir(prefix.lib) + install('sam.h', prefix.include) + install('bam.h', prefix.include) + install('libbam.a', prefix.lib) -- cgit v1.2.3-70-g09d2 From 7a5d54760e8b5754aab3f78b732a94392971a6c0 Mon Sep 17 00:00:00 2001 From: 健美猞猁 Date: Mon, 13 Aug 2018 07:54:50 +0800 Subject: Add samtools 1.9 (#8961) * Add smtools 1.9. * Add hstlib 1.9. --- var/spack/repos/builtin/packages/htslib/package.py | 1 + var/spack/repos/builtin/packages/samtools/package.py | 2 ++ 2 files changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/htslib/package.py b/var/spack/repos/builtin/packages/htslib/package.py index ba9fcc5edb..d2318b6e0f 100644 --- a/var/spack/repos/builtin/packages/htslib/package.py +++ b/var/spack/repos/builtin/packages/htslib/package.py @@ -30,6 +30,7 @@ class Htslib(AutotoolsPackage): homepage = "https://github.com/samtools/htslib" + version('1.9', '2ac92c9c3eef9986345ac69a05dd4d24') version('1.8', '54e9b3a04251fa59b1878f6b546b5c79') version('1.7', 'd3cc7e080a9a8c4161d8f62b56d3b98d') version('1.6', 'd6fd14e208aca7e08cbe9072233d0af9') diff --git a/var/spack/repos/builtin/packages/samtools/package.py b/var/spack/repos/builtin/packages/samtools/package.py index ae379c55ab..dd59b78d36 100644 --- a/var/spack/repos/builtin/packages/samtools/package.py +++ b/var/spack/repos/builtin/packages/samtools/package.py @@ -33,6 +33,7 @@ class Samtools(Package): homepage = "www.htslib.org" url = "https://github.com/samtools/samtools/releases/download/1.3.1/samtools-1.3.1.tar.bz2" + version('1.9', 'cca9a40d9b91b007af2ff905cb8b5924') version('1.8', 'c6e981c92ca00a44656a708c4b52aba3') version('1.7', '2240175242b5183bfa6baf1483f68023') version('1.6', 'b756f05fd5d1a7042074417edb8c9aea') @@ -42,6 +43,7 @@ class Samtools(Package): depends_on('ncurses') # htslib became standalone @1.3.1, must use corresponding version + depends_on('htslib@1.9', when='@1.9') depends_on('htslib@1.8', when='@1.8') depends_on('htslib@1.7', when='@1.7') depends_on('htslib@1.6', when='@1.6') -- cgit v1.2.3-70-g09d2 From 45825673158c9b78f54df8bddc9a192855ddca51 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Sun, 12 Aug 2018 19:46:14 -0500 Subject: r-ctc: new package (#8936) * r-ctc: new package * r-ctc: fixing package directory name * r-ctc: git not url * r-ctc: dep types --- var/spack/repos/builtin/packages/r-ctc/package.py | 38 +++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-ctc/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-ctc/package.py b/var/spack/repos/builtin/packages/r-ctc/package.py new file mode 100644 index 0000000000..d9471a9749 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-ctc/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RCtc(RPackage): + """Tools for export and import classification trees and clusters + to other programs""" + + homepage = "https://www.bioconductor.org/packages/release/bioc/html/ctc.html" + git = "https://git.bioconductor.org/packages/ctc.git" + + version('1.54.0', commit='0c3df81dfc8fabe12e11884bed44b64e11fd6d4e') + + depends_on('r-amap', type=('build', 'run')) + depends_on('r@3.5.0:3.5.9', when='@1.54.0:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From ae1a9baade6f2ed1be7f54ca0e528754c77f5dce Mon Sep 17 00:00:00 2001 From: Julien Adam Date: Mon, 13 Aug 2018 15:06:19 +0200 Subject: git: v2.18.0 (#8965) --- var/spack/repos/builtin/packages/git/package.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index 35fdc9e1c7..7c3499bfe1 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -44,6 +44,11 @@ class Git(AutotoolsPackage): # You can find the source here: https://mirrors.edge.kernel.org/pub/software/scm/git/sha256sums.asc releases = [ + { + 'version': '2.18.0', + 'sha256': '94faf2c0b02a7920b0b46f4961d8e9cad08e81418614102898a55f980fa3e7e4', + 'sha256_manpages': '6cf38ab3ad43ccdcd6a73ffdcf2a016d56ab6b4b240a574b0bb96f520a04ff55' + }, { 'version': '2.17.1', 'sha256': 'ec6452f0c8d5c1f3bcceabd7070b8a8a5eea11d4e2a04955c139b5065fd7d09a', -- cgit v1.2.3-70-g09d2 From 8f7b51aa5c1d7b2943f3f1006fe50f912ad66089 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Mon, 13 Aug 2018 22:18:12 -0500 Subject: r-limma: new version (#8952) --- var/spack/repos/builtin/packages/r-limma/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-limma/package.py b/var/spack/repos/builtin/packages/r-limma/package.py index f9fc1de8b0..772f8ae430 100644 --- a/var/spack/repos/builtin/packages/r-limma/package.py +++ b/var/spack/repos/builtin/packages/r-limma/package.py @@ -32,7 +32,10 @@ class RLimma(RPackage): homepage = "https://www.bioconductor.org/packages/limma/" git = "https://git.bioconductor.org/packages/limma.git" + version('3.36.2', commit='0cd5c13e22565182226bd2937ffcf8c59de1ca59') version('3.34.9', commit='6755278a929f942a49e2441fb002a3ed393e1139') version('3.32.10', commit='593edf28e21fe054d64137ae271b8a52ab05bc60') - depends_on('r@3.4.0:3.4.9', when='@3.32.10:') + depends_on('r@3.5.0:3.5.9', when='@3.36.2') + depends_on('r@3.4.2:3.4.9', when='@3.34.9') + depends_on('r@3.4.0:3.4.9', when='@3.32.10') -- cgit v1.2.3-70-g09d2 From e1ebc02676e1dc0ca929eb04c2bab39660ace4f6 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Mon, 13 Aug 2018 22:18:34 -0500 Subject: r-edger: new version (#8951) --- var/spack/repos/builtin/packages/r-edger/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-edger/package.py b/var/spack/repos/builtin/packages/r-edger/package.py index a4840869b5..5748bda314 100644 --- a/var/spack/repos/builtin/packages/r-edger/package.py +++ b/var/spack/repos/builtin/packages/r-edger/package.py @@ -37,8 +37,10 @@ class REdger(RPackage): homepage = "https://bioconductor.org/packages/edgeR/" git = "https://git.bioconductor.org/packages/edgeR.git" + version('3.22.3', commit='e82e54afc9398ac54dc4caba0f7ae5c43e572203') version('3.18.1', commit='101106f3fdd9e2c45d4a670c88f64c12e97a0495') depends_on('r-limma', type=('build', 'run')) depends_on('r-locfit', type=('build', 'run')) + depends_on('r@3.5.0:3.5.9', when='@3.22.3') depends_on('r@3.4.0:3.4.9', when='@3.18.1') -- cgit v1.2.3-70-g09d2 From 7fd6291d59d184cd06dfbe702559562460d04f15 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Mon, 13 Aug 2018 22:20:41 -0500 Subject: r-glimma: new package (#8940) * r-glimma: new package * r-glimma: git not url * r-glimma: adding runtime deps * r-glimma: dep types --- .../repos/builtin/packages/r-glimma/package.py | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-glimma/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-glimma/package.py b/var/spack/repos/builtin/packages/r-glimma/package.py new file mode 100644 index 0000000000..768d94bbe1 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-glimma/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RGlimma(RPackage): + """This package generates interactive visualisations for analysis of + RNA-sequencing data using output from limma, edgeR or DESeq2 packages + in an HTML page. The interactions are built on top of the popular + static representations of analysis results in order to provide + additional information.""" + + homepage = "https://bioconductor.org/packages/release/bioc/html/Glimma.html" + git = "https://git.bioconductor.org/packages/Glimma.git" + + version('1.8.2', commit='f4aa1f05c2890d04b01ad4c0ab27f2f729f2c969') + + depends_on('r@3.5.0:3.5.9', when='@1.8.2:', type=('build', 'run')) + depends_on('r-edger', type=('build', 'run')) + depends_on('r-jsonlite', type=('build', 'run')) + depends_on('r-s4vectors', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 221a1293aa038ee794d49c533b8836e073040be0 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Mon, 13 Aug 2018 22:21:03 -0500 Subject: r-genelendatabase: new package (#8938) * r-genelendatabase: new package * r-genelendatabase: git not url * r-genelendatabase: add runtime deps and fix package type * r-genelendatabase: dep type --- .../builtin/packages/r-genelendatabase/package.py | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-genelendatabase/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-genelendatabase/package.py b/var/spack/repos/builtin/packages/r-genelendatabase/package.py new file mode 100644 index 0000000000..6d0ac4b3fd --- /dev/null +++ b/var/spack/repos/builtin/packages/r-genelendatabase/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RGenelendatabase(RPackage): + """Length of mRNA transcripts for a number of genomes and gene ID + formats, largely based on UCSC table browser""" + + homepage = "https://bioconductor.org/packages/release/data/experiment/html/geneLenDataBase.html" + git = "https://git.bioconductor.org/packages/geneLenDataBase.git" + + version('1.16.0', commit='c2a8b2359c6c59388853d6f6d15d71dffb17a198') + + depends_on('r@3.5.0:3.5.9', when='@1.16.0:', type=('build', 'run')) + depends_on('r-rtracklayer', type=('build', 'run')) + depends_on('r-genomicfeatures@1.3.15:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 2b727796dae1ce90b5db48acd7fdda08ee62ac1e Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Mon, 13 Aug 2018 22:21:30 -0500 Subject: r-argparse: new package (#8944) * r-argparse: new package * r-argparse: dep types --- .../repos/builtin/packages/r-argparse/package.py | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-argparse/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-argparse/package.py b/var/spack/repos/builtin/packages/r-argparse/package.py new file mode 100644 index 0000000000..95b16e39e7 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-argparse/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RArgparse(RPackage): + """A command line parser to be used with Rscript to write "#!" + shebang scripts that gracefully accept positional and optional + arguments and automatically generate usage.""" + + homepage = "https://github.com/trevorld/argparse" + url = "https://cran.r-project.org/src/contrib/argparse_1.1.1.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/argparse" + + version('1.1.1', sha256='441449f0816411a868fd1b15cf4b2bc45931bbd4b67d6592dbe48875905cf93b') + + depends_on('r-proto@1:', type=('build', 'run')) + depends_on('r-findpython', type=('build', 'run')) + depends_on('r-getopt@1.19', type=('build', 'run')) + depends_on('r-jsonlite', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 783435c1def87cd2a8012c9ac93aaabb08af9a0e Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Tue, 14 Aug 2018 00:17:17 -0500 Subject: xsdk: add slepc and amrex [and handle clang conflict wrt amrex] (#8932) --- var/spack/repos/builtin/packages/amrex/package.py | 1 + var/spack/repos/builtin/packages/xsdk/package.py | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/amrex/package.py b/var/spack/repos/builtin/packages/amrex/package.py index 03be9f78e2..2b7a2d7249 100644 --- a/var/spack/repos/builtin/packages/amrex/package.py +++ b/var/spack/repos/builtin/packages/amrex/package.py @@ -65,6 +65,7 @@ class Amrex(CMakePackage): depends_on('mpi', when='+mpi') depends_on('python@2.7:', type='build') depends_on('cmake@3.5:', type='build') + conflicts('%clang') def cmake_is_on(self, option): return 'ON' if option in self.spec else 'OFF' diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py index 9b20a7e374..415fd98c9a 100644 --- a/var/spack/repos/builtin/packages/xsdk/package.py +++ b/var/spack/repos/builtin/packages/xsdk/package.py @@ -87,6 +87,11 @@ class Xsdk(Package): depends_on('magma@2.2.0', when='@0.3.0 +cuda') depends_on('magma@2.2.0', when='@develop +cuda') + depends_on('amrex@develop', when='@develop %gcc') + depends_on('amrex@develop', when='@develop %intel') + + depends_on('slepc@develop', when='@develop') + # xSDKTrilinos depends on the version of Trilinos built with # +tpetra which is turned off for faster xSDK # depends_on('xsdktrilinos@xsdk-0.2.0', when='@xsdk-0.2.0') -- cgit v1.2.3-70-g09d2 From 3d1cfaeb393008255844ebc8c67af98800191fb0 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Tue, 14 Aug 2018 07:14:06 -0500 Subject: r-rots: new package (#8941) * r-rots: new package * r-rots: hash is a commit * r-rots: dep types --- var/spack/repos/builtin/packages/r-rots/package.py | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-rots/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-rots/package.py b/var/spack/repos/builtin/packages/r-rots/package.py new file mode 100644 index 0000000000..0bf0fcb064 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-rots/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RRots(Package): + """Calculates the Reproducibility-Optimized Test Statistic (ROTS) + for differential testing in omics data.""" + + homepage = "https://bioconductor.org/packages/release/bioc/html/ROTS.html" + git = "https://git.bioconductor.org/packages/ROTS.git" + + version('1.8.0', commit='02e3c6455bb1afe7c4cc59ad6d4d8bae7b01428b') + + depends_on('r@3.5.0:3.5.9', when='@1.8.0:', type=('build', 'run')) + depends_on('r-rcpp', type=('build', 'run')) + depends_on('r-biobase', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 85d00c5ef4df6713d7f054b8e2d625d07cdd28af Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Tue, 14 Aug 2018 11:46:15 -0500 Subject: Change bzip2 download URL (#8976) * Change bzip2 download URL * bzip2.org -> bzip.org --- var/spack/repos/builtin/packages/bzip2/package.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bzip2/package.py b/var/spack/repos/builtin/packages/bzip2/package.py index c2d574152c..1e15669174 100644 --- a/var/spack/repos/builtin/packages/bzip2/package.py +++ b/var/spack/repos/builtin/packages/bzip2/package.py @@ -32,9 +32,11 @@ class Bzip2(Package): compressors), whilst being around twice as fast at compression and six times faster at decompression.""" - homepage = "http://www.bzip.org" - url = "http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz" - list_url = "http://www.bzip.org/downloads.html" + # FIXME: The bzip.org domain has expired: + # https://lwn.net/Articles/762264/ + # This package will need to be updated when a new home is found. + homepage = "https://sourceware.org/bzip2/" + url = "https://fossies.org/linux/misc/bzip2-1.0.6.tar.gz" version('1.0.6', '00b516f4704d4a7cb50a1d97e6e8e15b') -- cgit v1.2.3-70-g09d2 From 62026ce30272349c33c5ff9c8977e2db31d82203 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Tue, 14 Aug 2018 00:07:46 -0700 Subject: tests: make the dependency patching test more complete - dependency patching test didn't attempt to apply patches; just to see whether they were on the spec. - it applies the patch now and verifies that that patch was applied. --- lib/spack/spack/test/conftest.py | 1 + lib/spack/spack/test/patch.py | 23 +++++++++++++++++++--- .../packages/patch-a-dependency/foo.patch | 1 - .../packages/patch-a-dependency/libelf.patch | 11 +++++++++++ .../packages/patch-a-dependency/package.py | 2 +- 5 files changed, 33 insertions(+), 5 deletions(-) delete mode 100644 var/spack/repos/builtin.mock/packages/patch-a-dependency/foo.patch create mode 100644 var/spack/repos/builtin.mock/packages/patch-a-dependency/libelf.patch (limited to 'var') diff --git a/lib/spack/spack/test/conftest.py b/lib/spack/spack/test/conftest.py index 860732b873..5a2ee699e1 100644 --- a/lib/spack/spack/test/conftest.py +++ b/lib/spack/spack/test/conftest.py @@ -388,6 +388,7 @@ def install_mockery(tmpdir, config, mock_packages): with spack.config.override('config:checksum', False): yield + tmpdir.join('opt').remove() spack.store.store = real_store diff --git a/lib/spack/spack/test/patch.py b/lib/spack/spack/test/patch.py index 3e8bc62ba0..0b16a3f5be 100644 --- a/lib/spack/spack/test/patch.py +++ b/lib/spack/spack/test/patch.py @@ -31,6 +31,7 @@ from llnl.util.filesystem import working_dir, mkdirp import spack.paths import spack.util.compression +from spack.util.executable import Executable from spack.stage import Stage from spack.spec import Spec @@ -108,16 +109,32 @@ def test_patch_in_spec(mock_packages, config): spec.variants['patches'].value) -def test_patched_dependency(mock_packages, config): +def test_patched_dependency( + mock_packages, config, install_mockery, mock_fetch): """Test whether patched dependencies work.""" spec = Spec('patch-a-dependency') spec.concretize() assert 'patches' in list(spec['libelf'].variants.keys()) - # foo - assert (('b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c',) == + # make sure the patch makes it into the dependency spec + assert (('c45c1564f70def3fc1a6e22139f62cb21cd190cc3a7dbe6f4120fa59ce33dcb8',) == spec['libelf'].variants['patches'].value) + # make sure the patch in the dependent's directory is applied to the + # dependency + libelf = spec['libelf'] + pkg = libelf.package + pkg.do_patch() + with pkg.stage: + with working_dir(pkg.stage.source_path): + # output a Makefile with 'echo Patched!' as the default target + configure = Executable('./configure') + configure() + + # Make sure the Makefile contains the patched text + with open('Makefile') as mf: + assert 'Patched!' in mf.read() + def test_multiple_patched_dependencies(mock_packages, config): """Test whether multiple patched dependencies work.""" diff --git a/var/spack/repos/builtin.mock/packages/patch-a-dependency/foo.patch b/var/spack/repos/builtin.mock/packages/patch-a-dependency/foo.patch deleted file mode 100644 index 257cc5642c..0000000000 --- a/var/spack/repos/builtin.mock/packages/patch-a-dependency/foo.patch +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/var/spack/repos/builtin.mock/packages/patch-a-dependency/libelf.patch b/var/spack/repos/builtin.mock/packages/patch-a-dependency/libelf.patch new file mode 100644 index 0000000000..02bfad9103 --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/patch-a-dependency/libelf.patch @@ -0,0 +1,11 @@ +--- patch-a-dependency/configure 2018-08-13 23:13:51.000000000 -0700 ++++ patch-a-dependency/configure.patched 2018-08-13 23:14:15.000000000 -0700 +@@ -2,7 +2,7 @@ + prefix=$(echo $1 | sed 's/--prefix=//') + cat > Makefile < Date: Wed, 15 Aug 2018 16:54:08 +0200 Subject: grass improvement: specify proj data directory (#8984) --- var/spack/repos/builtin/packages/grass/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/grass/package.py b/var/spack/repos/builtin/packages/grass/package.py index 7b5f78749b..d2b952ff01 100644 --- a/var/spack/repos/builtin/packages/grass/package.py +++ b/var/spack/repos/builtin/packages/grass/package.py @@ -95,6 +95,8 @@ class Grass(AutotoolsPackage): '--with-x', '--with-gdal={0}/bin/gdal-config'.format( spec['gdal'].prefix), + '--with-proj-share={0}/share/proj'.format( + spec['proj'].prefix), ] if '+cxx' in spec: -- cgit v1.2.3-70-g09d2 From c0699539d56bc16271861dc0de61534f369f1bb9 Mon Sep 17 00:00:00 2001 From: TZ Date: Wed, 15 Aug 2018 17:40:58 +0200 Subject: zoltan: fix building with Intel compilers (#8985) * zoltan: fix building with Intel compilers - building with the Intel compilers may require explicit linking with the Intel Fortran library (libifcore) * simplify code; get rid of format() for static strings --- var/spack/repos/builtin/packages/zoltan/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/zoltan/package.py b/var/spack/repos/builtin/packages/zoltan/package.py index f141c4720d..3dc2806bf9 100644 --- a/var/spack/repos/builtin/packages/zoltan/package.py +++ b/var/spack/repos/builtin/packages/zoltan/package.py @@ -84,7 +84,9 @@ class Zoltan(Package): config_args.append('--with-ar=$(CXX) -shared $(LDFLAGS) -o') config_cflags.append(self.compiler.pic_flag) if spec.satisfies('%gcc'): - config_args.append('--with-libs={0}'.format('-lgfortran')) + config_args.append('--with-libs=-lgfortran') + if spec.satisfies('%intel'): + config_args.append('--with-libs=-lifcore') if '+parmetis' in spec: config_args.append('--with-parmetis') -- cgit v1.2.3-70-g09d2 From 73c978ddd99973e29f2ba42078b10455c1de5ca8 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 15 Aug 2018 11:30:09 -0500 Subject: install_tree, copy_tree can install into existing directory structures (#8289) Replace use of `shutil.copytree` with `copy_tree` and `install_tree` functions in `llnl.util.filesystem`. - `copy_tree` copies without setting permissions. It should be used to copy files around in the build directory. - `install_tree` copies files and sets permissions. It should be used to copy files into the installation directory. - `install` and `copy` are analogous single-file functions. - add more extensive tests for these functions - update packages to use these functions. --- lib/spack/llnl/util/filesystem.py | 97 ++++++++-- lib/spack/spack/test/llnl/util/filesystem.py | 209 +++++++++++++++++++++ lib/spack/spack/test/util/filesystem.py | 61 ------ var/spack/repos/builtin/packages/alglib/package.py | 3 +- .../repos/builtin/packages/arlecore/package.py | 3 +- .../repos/builtin/packages/atom-dft/package.py | 4 +- .../builtin/packages/autodock-vina/package.py | 8 +- .../repos/builtin/packages/bcl2fastq2/package.py | 3 +- var/spack/repos/builtin/packages/bioawk/package.py | 8 +- .../repos/builtin/packages/biopieces/package.py | 3 +- var/spack/repos/builtin/packages/casper/package.py | 3 +- var/spack/repos/builtin/packages/charm/package.py | 2 +- .../repos/builtin/packages/chlorop/package.py | 3 +- var/spack/repos/builtin/packages/chombo/package.py | 5 +- .../repos/builtin/packages/clapack/package.py | 5 +- .../builtin/packages/codar-cheetah/package.py | 3 +- var/spack/repos/builtin/packages/comd/package.py | 4 +- var/spack/repos/builtin/packages/cosp2/package.py | 3 +- var/spack/repos/builtin/packages/cp2k/package.py | 6 +- .../repos/builtin/packages/cppcheck/package.py | 13 +- var/spack/repos/builtin/packages/cudnn/package.py | 3 +- .../repos/builtin/packages/farmhash/package.py | 5 +- var/spack/repos/builtin/packages/fastqc/package.py | 17 +- .../builtin/packages/fermisciencetools/package.py | 3 +- var/spack/repos/builtin/packages/fsl/package.py | 3 +- var/spack/repos/builtin/packages/gatk/package.py | 3 +- .../repos/builtin/packages/gaussian/package.py | 3 +- var/spack/repos/builtin/packages/gcc/package.py | 3 +- .../builtin/packages/genomefinisher/package.py | 7 +- var/spack/repos/builtin/packages/git/package.py | 3 +- var/spack/repos/builtin/packages/glib/package.py | 3 +- .../repos/builtin/packages/go-bootstrap/package.py | 13 +- var/spack/repos/builtin/packages/go/package.py | 15 +- .../repos/builtin/packages/grackle/package.py | 3 +- var/spack/repos/builtin/packages/gradle/package.py | 3 +- var/spack/repos/builtin/packages/gurobi/package.py | 4 +- .../repos/builtin/packages/hdf5-blosc/package.py | 4 +- .../repos/builtin/packages/igvtools/package.py | 7 +- var/spack/repos/builtin/packages/jdk/package.py | 3 +- var/spack/repos/builtin/packages/jmol/package.py | 3 +- var/spack/repos/builtin/packages/kaldi/package.py | 3 +- .../repos/builtin/packages/leveldb/package.py | 21 +-- .../repos/builtin/packages/libgridxc/package.py | 4 +- .../repos/builtin/packages/libiconv/package.py | 5 +- var/spack/repos/builtin/packages/llvm/package.py | 3 +- .../repos/builtin/packages/masurca/package.py | 3 +- var/spack/repos/builtin/packages/maven/package.py | 3 +- var/spack/repos/builtin/packages/mefit/package.py | 3 +- var/spack/repos/builtin/packages/mfem/package.py | 2 +- .../builtin/packages/mpix-launch-swift/package.py | 6 +- .../repos/builtin/packages/mrtrix3/package.py | 5 +- var/spack/repos/builtin/packages/namd/package.py | 5 +- var/spack/repos/builtin/packages/ncl/package.py | 5 +- .../repos/builtin/packages/ncurses/package.py | 3 +- var/spack/repos/builtin/packages/occa/package.py | 9 +- var/spack/repos/builtin/packages/pexsi/package.py | 3 +- var/spack/repos/builtin/packages/picard/package.py | 7 +- var/spack/repos/builtin/packages/pilon/package.py | 7 +- var/spack/repos/builtin/packages/pindel/package.py | 10 +- var/spack/repos/builtin/packages/python/package.py | 3 +- var/spack/repos/builtin/packages/qbox/package.py | 8 +- var/spack/repos/builtin/packages/qorts/package.py | 3 +- var/spack/repos/builtin/packages/r/package.py | 3 +- .../repos/builtin/packages/repeatmasker/package.py | 3 +- .../repos/builtin/packages/rna-seqc/package.py | 5 +- .../repos/builtin/packages/rockstar/package.py | 4 +- .../repos/builtin/packages/savanna/package.py | 3 +- var/spack/repos/builtin/packages/sbt/package.py | 5 +- var/spack/repos/builtin/packages/scr/package.py | 3 +- var/spack/repos/builtin/packages/sctk/package.py | 4 +- var/spack/repos/builtin/packages/snpeff/package.py | 7 +- .../repos/builtin/packages/snphylo/package.py | 3 +- var/spack/repos/builtin/packages/spark/package.py | 3 +- .../repos/builtin/packages/sublime-text/package.py | 3 +- .../repos/builtin/packages/supernova/package.py | 3 +- .../packages/the-platinum-searcher/package.py | 5 +- .../repos/builtin/packages/tinyxml/package.py | 5 +- .../repos/builtin/packages/trimmomatic/package.py | 10 +- .../repos/builtin/packages/trinity/package.py | 3 +- .../repos/builtin/packages/wannier90/package.py | 3 +- .../repos/builtin/packages/workrave/package.py | 3 +- var/spack/repos/builtin/packages/yorick/package.py | 13 +- 82 files changed, 422 insertions(+), 344 deletions(-) create mode 100644 lib/spack/spack/test/llnl/util/filesystem.py delete mode 100644 lib/spack/spack/test/util/filesystem.py (limited to 'var') diff --git a/lib/spack/llnl/util/filesystem.py b/lib/spack/llnl/util/filesystem.py index ace6cfded6..40eb6a7aa8 100644 --- a/lib/spack/llnl/util/filesystem.py +++ b/lib/spack/llnl/util/filesystem.py @@ -60,7 +60,9 @@ __all__ = [ 'fix_darwin_install_name', 'force_remove', 'force_symlink', + 'copy', 'install', + 'copy_tree', 'install_tree', 'is_exe', 'join_path', @@ -264,27 +266,98 @@ def unset_executable_mode(path): os.chmod(path, mode) -def install(src, dest): - """Manually install a file to a particular location.""" - tty.debug("Installing %s to %s" % (src, dest)) +def copy(src, dest, _permissions=False): + """Copies the file *src* to the file or directory *dest*. + + If *dest* specifies a directory, the file will be copied into *dest* + using the base filename from *src*. + + Parameters: + src (str): the file to copy + dest (str): the destination file or directory + _permissions (bool): for internal use only + """ + if _permissions: + tty.debug('Installing {0} to {1}'.format(src, dest)) + else: + tty.debug('Copying {0} to {1}'.format(src, dest)) # Expand dest to its eventual full path if it is a directory. if os.path.isdir(dest): dest = join_path(dest, os.path.basename(src)) shutil.copy(src, dest) - set_install_permissions(dest) - copy_mode(src, dest) + + if _permissions: + set_install_permissions(dest) + copy_mode(src, dest) + + +def install(src, dest): + """Installs the file *src* to the file or directory *dest*. + + Same as :py:func:`copy` with the addition of setting proper + permissions on the installed file. + + Parameters: + src (str): the file to install + dest (str): the destination file or directory + """ + copy(src, dest, _permissions=True) -def install_tree(src, dest, **kwargs): - """Manually install a directory tree to a particular location.""" - tty.debug("Installing %s to %s" % (src, dest)) - shutil.copytree(src, dest, **kwargs) +def copy_tree(src, dest, symlinks=True, _permissions=False): + """Recursively copy an entire directory tree rooted at *src*. - for s, d in traverse_tree(src, dest, follow_nonexisting=False): - set_install_permissions(d) - copy_mode(s, d) + If the destination directory *dest* does not already exist, it will + be created as well as missing parent directories. + + If *symlinks* is true, symbolic links in the source tree are represented + as symbolic links in the new tree and the metadata of the original links + will be copied as far as the platform allows; if false, the contents and + metadata of the linked files are copied to the new tree. + + Parameters: + src (str): the directory to copy + dest (str): the destination directory + symlinks (bool): whether or not to preserve symlinks + _permissions (bool): for internal use only + """ + if _permissions: + tty.debug('Installing {0} to {1}'.format(src, dest)) + else: + tty.debug('Copying {0} to {1}'.format(src, dest)) + + mkdirp(dest) + + for s, d in traverse_tree(src, dest, order='pre', follow_nonexisting=True): + if symlinks and os.path.islink(s): + # Note that this won't rewrite absolute links into the old + # root to point at the new root. Should we handle that case? + target = os.readlink(s) + os.symlink(os.path.abspath(target), d) + elif os.path.isdir(s): + mkdirp(d) + else: + shutil.copyfile(s, d) + + if _permissions: + set_install_permissions(d) + copy_mode(s, d) + + +def install_tree(src, dest, symlinks=True): + """Recursively install an entire directory tree rooted at *src*. + + Same as :py:func:`copy_tree` with the addition of setting proper + permissions on the installed files and directories. + + Parameters: + src (str): the directory to install + dest (str): the destination directory + symlinks (bool): whether or not to preserve symlinks + """ + copy_tree(src, dest, symlinks, _permissions=True) def is_exe(path): diff --git a/lib/spack/spack/test/llnl/util/filesystem.py b/lib/spack/spack/test/llnl/util/filesystem.py new file mode 100644 index 0000000000..7701185dbe --- /dev/null +++ b/lib/spack/spack/test/llnl/util/filesystem.py @@ -0,0 +1,209 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +"""Tests for ``llnl/util/filesystem.py``""" + +import llnl.util.filesystem as fs +import os +import pytest + + +@pytest.fixture() +def stage(tmpdir_factory): + """Creates a stage with the directory structure for the tests.""" + + s = tmpdir_factory.mktemp('filesystem_test') + + with s.as_cwd(): + # Create source file hierarchy + fs.touchp('source/1') + fs.touchp('source/a/b/2') + fs.touchp('source/a/b/3') + fs.touchp('source/c/4') + fs.touchp('source/c/d/5') + fs.touchp('source/c/d/6') + fs.touchp('source/c/d/e/7') + + # Create symlink + os.symlink(os.path.abspath('source/1'), 'source/2') + + # Create destination directory + fs.mkdirp('dest') + + yield s + + +class TestCopy: + """Tests for ``filesystem.copy``""" + + def test_file_dest(self, stage): + """Test using a filename as the destination.""" + + with fs.working_dir(str(stage)): + fs.copy('source/1', 'dest/1') + + assert os.path.exists('dest/1') + assert os.stat('source/1').st_mode == os.stat('dest/1').st_mode + + def test_dir_dest(self, stage): + """Test using a directory as the destination.""" + + with fs.working_dir(str(stage)): + fs.copy('source/1', 'dest') + + assert os.path.exists('dest/1') + assert os.stat('source/1').st_mode == os.stat('dest/1').st_mode + + +class TestInstall: + """Tests for ``filesystem.install``""" + + def test_file_dest(self, stage): + """Test using a filename as the destination.""" + + with fs.working_dir(str(stage)): + fs.install('source/1', 'dest/1') + + assert os.path.exists('dest/1') + assert os.stat('source/1').st_mode == os.stat('dest/1').st_mode + + def test_dir_dest(self, stage): + """Test using a directory as the destination.""" + + with fs.working_dir(str(stage)): + fs.install('source/1', 'dest') + + assert os.path.exists('dest/1') + assert os.stat('source/1').st_mode == os.stat('dest/1').st_mode + + +class TestCopyTree: + """Tests for ``filesystem.copy_tree``""" + + def test_existing_dir(self, stage): + """Test copying to an existing directory.""" + + with fs.working_dir(str(stage)): + fs.copy_tree('source', 'dest') + + assert os.path.exists('dest/a/b/2') + + def test_non_existing_dir(self, stage): + """Test copying to a non-existing directory.""" + + with fs.working_dir(str(stage)): + fs.copy_tree('source', 'dest/sub/directory') + + assert os.path.exists('dest/sub/directory/a/b/2') + + def test_symlinks_true(self, stage): + """Test copying with symlink preservation.""" + + with fs.working_dir(str(stage)): + fs.copy_tree('source', 'dest', symlinks=True) + + assert os.path.exists('dest/2') + assert os.path.islink('dest/2') + + def test_symlinks_false(self, stage): + """Test copying without symlink preservation.""" + + with fs.working_dir(str(stage)): + fs.copy_tree('source', 'dest', symlinks=False) + + assert os.path.exists('dest/2') + assert not os.path.islink('dest/2') + + +class TestInstallTree: + """Tests for ``filesystem.install_tree``""" + + def test_existing_dir(self, stage): + """Test installing to an existing directory.""" + + with fs.working_dir(str(stage)): + fs.install_tree('source', 'dest') + + assert os.path.exists('dest/a/b/2') + + def test_non_existing_dir(self, stage): + """Test installing to a non-existing directory.""" + + with fs.working_dir(str(stage)): + fs.install_tree('source', 'dest/sub/directory') + + assert os.path.exists('dest/sub/directory/a/b/2') + + def test_symlinks_true(self, stage): + """Test installing with symlink preservation.""" + + with fs.working_dir(str(stage)): + fs.install_tree('source', 'dest', symlinks=True) + + assert os.path.exists('dest/2') + assert os.path.islink('dest/2') + + def test_symlinks_false(self, stage): + """Test installing without symlink preservation.""" + + with fs.working_dir(str(stage)): + fs.install_tree('source', 'dest', symlinks=False) + + assert os.path.exists('dest/2') + assert not os.path.islink('dest/2') + + +def test_move_transaction_commit(tmpdir): + + fake_library = tmpdir.mkdir('lib').join('libfoo.so') + fake_library.write('Just some fake content.') + + old_md5 = fs.hash_directory(str(tmpdir)) + + with fs.replace_directory_transaction(str(tmpdir.join('lib'))): + fake_library = tmpdir.mkdir('lib').join('libfoo.so') + fake_library.write('Other content.') + new_md5 = fs.hash_directory(str(tmpdir)) + + assert old_md5 != fs.hash_directory(str(tmpdir)) + assert new_md5 == fs.hash_directory(str(tmpdir)) + + +def test_move_transaction_rollback(tmpdir): + + fake_library = tmpdir.mkdir('lib').join('libfoo.so') + fake_library.write('Just some fake content.') + + h = fs.hash_directory(str(tmpdir)) + + try: + with fs.replace_directory_transaction(str(tmpdir.join('lib'))): + assert h != fs.hash_directory(str(tmpdir)) + fake_library = tmpdir.mkdir('lib').join('libfoo.so') + fake_library.write('Other content.') + raise RuntimeError('') + except RuntimeError: + pass + + assert h == fs.hash_directory(str(tmpdir)) diff --git a/lib/spack/spack/test/util/filesystem.py b/lib/spack/spack/test/util/filesystem.py deleted file mode 100644 index 86c3332bb5..0000000000 --- a/lib/spack/spack/test/util/filesystem.py +++ /dev/null @@ -1,61 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## - -import llnl.util.filesystem as fs - - -def test_move_transaction_commit(tmpdir): - - fake_library = tmpdir.mkdir('lib').join('libfoo.so') - fake_library.write('Just some fake content.') - - old_md5 = fs.hash_directory(str(tmpdir)) - - with fs.replace_directory_transaction(str(tmpdir.join('lib'))): - fake_library = tmpdir.mkdir('lib').join('libfoo.so') - fake_library.write('Other content.') - new_md5 = fs.hash_directory(str(tmpdir)) - - assert old_md5 != fs.hash_directory(str(tmpdir)) - assert new_md5 == fs.hash_directory(str(tmpdir)) - - -def test_move_transaction_rollback(tmpdir): - - fake_library = tmpdir.mkdir('lib').join('libfoo.so') - fake_library.write('Just some fake content.') - - h = fs.hash_directory(str(tmpdir)) - - try: - with fs.replace_directory_transaction(str(tmpdir.join('lib'))): - assert h != fs.hash_directory(str(tmpdir)) - fake_library = tmpdir.mkdir('lib').join('libfoo.so') - fake_library.write('Other content.') - raise RuntimeError('') - except RuntimeError: - pass - - assert h == fs.hash_directory(str(tmpdir)) diff --git a/var/spack/repos/builtin/packages/alglib/package.py b/var/spack/repos/builtin/packages/alglib/package.py index f5fa8f32fd..ff280fc747 100644 --- a/var/spack/repos/builtin/packages/alglib/package.py +++ b/var/spack/repos/builtin/packages/alglib/package.py @@ -26,7 +26,6 @@ from spack import * import glob import os import sys -import shutil class Alglib(MakefilePackage): @@ -48,7 +47,7 @@ class Alglib(MakefilePackage): make_file_src = join_path(os.path.dirname(self.module.__file__), 'Makefile') make_file = join_path(self.stage.source_path, 'src', 'Makefile') - shutil.copy(make_file_src, make_file) + copy(make_file_src, make_file) filter_file(r'so', dso_suffix, make_file) def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/arlecore/package.py b/var/spack/repos/builtin/packages/arlecore/package.py index 97d152d28c..31daa17f85 100644 --- a/var/spack/repos/builtin/packages/arlecore/package.py +++ b/var/spack/repos/builtin/packages/arlecore/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -import distutils.dir_util class Arlecore(Package): @@ -37,4 +36,4 @@ class Arlecore(Package): depends_on('r', type=('build', 'run')) def install(self, spec, prefix): - distutils.dir_util.copy_tree(".", prefix) + install_tree('.', prefix) diff --git a/var/spack/repos/builtin/packages/atom-dft/package.py b/var/spack/repos/builtin/packages/atom-dft/package.py index d16d3283dc..644b064fb7 100644 --- a/var/spack/repos/builtin/packages/atom-dft/package.py +++ b/var/spack/repos/builtin/packages/atom-dft/package.py @@ -22,9 +22,7 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## - from spack import * -import shutil class AtomDft(MakefilePackage): @@ -40,7 +38,7 @@ class AtomDft(MakefilePackage): depends_on('xmlf90') def edit(self, spec, prefix): - shutil.copyfile('arch.make.sample', 'arch.make') + copy('arch.make.sample', 'arch.make') @property def build_targets(self): diff --git a/var/spack/repos/builtin/packages/autodock-vina/package.py b/var/spack/repos/builtin/packages/autodock-vina/package.py index c34376bac1..4907854a73 100644 --- a/var/spack/repos/builtin/packages/autodock-vina/package.py +++ b/var/spack/repos/builtin/packages/autodock-vina/package.py @@ -23,8 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from shutil import copyfile -from shutil import copymode import sys @@ -66,7 +64,5 @@ class AutodockVina(MakefilePackage): def install(self, spec, prefix): with working_dir(self.build_directory): mkdirp(prefix.bin) - copyfile("vina", join_path(prefix.bin, "vina")) - copymode("vina", join_path(prefix.bin, "vina")) - copyfile("vina_split", join_path(prefix.bin, "vina_split")) - copymode("vina_split", join_path(prefix.bin, "vina_split")) + install('vina', prefix.bin) + install('vina_split', prefix.bin) diff --git a/var/spack/repos/builtin/packages/bcl2fastq2/package.py b/var/spack/repos/builtin/packages/bcl2fastq2/package.py index b6e476b55c..eb86367fb0 100644 --- a/var/spack/repos/builtin/packages/bcl2fastq2/package.py +++ b/var/spack/repos/builtin/packages/bcl2fastq2/package.py @@ -24,7 +24,6 @@ ############################################################################## from spack import * import os -import shutil import glob import llnl.util.tty as tty @@ -94,7 +93,7 @@ class Bcl2fastq2(Package): tty.msg("cwd sez: {0}".format(os.getcwd())) tarball = glob.glob(join_path('spack-expanded-archive', 'bcl2fastq2*.tar.gz'))[0] - shutil.move(tarball, '.') + copy(tarball, '.') os.rmdir('spack-expanded-archive') tar = which('tar') tarball = os.path.basename(tarball) diff --git a/var/spack/repos/builtin/packages/bioawk/package.py b/var/spack/repos/builtin/packages/bioawk/package.py index ae43dff5f5..8ea38bf293 100644 --- a/var/spack/repos/builtin/packages/bioawk/package.py +++ b/var/spack/repos/builtin/packages/bioawk/package.py @@ -23,8 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from shutil import copyfile -from shutil import copymode class Bioawk(MakefilePackage): @@ -45,7 +43,5 @@ class Bioawk(MakefilePackage): def install(self, spec, prefix): mkdirp(prefix.bin) - copyfile("bioawk", join_path(prefix.bin, "bioawk")) - copymode("bioawk", join_path(prefix.bin, "bioawk")) - copyfile("maketab", join_path(prefix.bin, "maketab")) - copymode("maketab", join_path(prefix.bin, "maketab")) + install('bioawk', prefix.bin) + install('maketab', prefix.bin) diff --git a/var/spack/repos/builtin/packages/biopieces/package.py b/var/spack/repos/builtin/packages/biopieces/package.py index 30435af0e3..c72eba1b68 100644 --- a/var/spack/repos/builtin/packages/biopieces/package.py +++ b/var/spack/repos/builtin/packages/biopieces/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -import distutils.dir_util class Biopieces(Package): @@ -79,7 +78,7 @@ class Biopieces(Package): depends_on('scan-for-matches') def install(self, spec, prefix): - distutils.dir_util.copy_tree(".", prefix) + install_tree('.', prefix) def setup_environment(self, spack_env, run_env): # Note: user will need to set environment variables on their own, diff --git a/var/spack/repos/builtin/packages/casper/package.py b/var/spack/repos/builtin/packages/casper/package.py index 2a0f04b64d..1469ec68df 100644 --- a/var/spack/repos/builtin/packages/casper/package.py +++ b/var/spack/repos/builtin/packages/casper/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -import distutils.dir_util class Casper(MakefilePackage): @@ -43,7 +42,7 @@ class Casper(MakefilePackage): conflicts('%gcc@7.1.0') def install(self, spec, prefix): - distutils.dir_util.copy_tree(".", prefix) + install_tree('.', prefix) def setup_environment(self, spack_env, run_env): run_env.prepend_path('PATH', self.spec.prefix) diff --git a/var/spack/repos/builtin/packages/charm/package.py b/var/spack/repos/builtin/packages/charm/package.py index 4135fc8ca7..b4fc48ae9f 100644 --- a/var/spack/repos/builtin/packages/charm/package.py +++ b/var/spack/repos/builtin/packages/charm/package.py @@ -249,7 +249,7 @@ class Charm(Package): tmppath = filepath + ".tmp" # Skip dangling symbolic links try: - shutil.copy2(filepath, tmppath) + copy(filepath, tmppath) os.remove(filepath) os.rename(tmppath, filepath) except (IOError, OSError): diff --git a/var/spack/repos/builtin/packages/chlorop/package.py b/var/spack/repos/builtin/packages/chlorop/package.py index 96fdf70be4..96b348c840 100644 --- a/var/spack/repos/builtin/packages/chlorop/package.py +++ b/var/spack/repos/builtin/packages/chlorop/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -import distutils.dir_util import os @@ -47,7 +46,7 @@ class Chlorop(Package): def install(self, spec, prefix): os.rename('chlorop', 'bin/chlorop') - distutils.dir_util.copy_tree(".", prefix) + install_tree('.', prefix) def setup_environment(self, spack_env, run_env): run_env.set('CHLOROP', self.prefix) diff --git a/var/spack/repos/builtin/packages/chombo/package.py b/var/spack/repos/builtin/packages/chombo/package.py index 74717b88d4..7136680c4b 100644 --- a/var/spack/repos/builtin/packages/chombo/package.py +++ b/var/spack/repos/builtin/packages/chombo/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from shutil import copyfile import glob @@ -71,8 +70,8 @@ class Chombo(MakefilePackage): # Set remaining variables in Make.defs.local # Make.defs.local.template.patch ensures lines for USE_TIMER, # USE_LAPACK and lapackincflags are present - copyfile('./lib/mk/Make.defs.local.template', - './lib/mk/Make.defs.local') + copy('./lib/mk/Make.defs.local.template', + './lib/mk/Make.defs.local') defs_file = FileFilter('./lib/mk/Make.defs.local') diff --git a/var/spack/repos/builtin/packages/clapack/package.py b/var/spack/repos/builtin/packages/clapack/package.py index 73c4414d31..dd0076db43 100644 --- a/var/spack/repos/builtin/packages/clapack/package.py +++ b/var/spack/repos/builtin/packages/clapack/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from distutils.dir_util import copy_tree class Clapack(MakefilePackage): @@ -46,7 +45,7 @@ class Clapack(MakefilePackage): depends_on('atlas', when='+external-blas') def edit(self, spec, prefix): - install('make.inc.example', 'make.inc') + copy('make.inc.example', 'make.inc') if '+external-blas' in spec: make_inc = FileFilter('make.inc') make_inc.filter(r'^BLASLIB.*', @@ -60,4 +59,4 @@ class Clapack(MakefilePackage): make('lib') def install(self, spec, prefix): - copy_tree('.', prefix) + install_tree('.', prefix) diff --git a/var/spack/repos/builtin/packages/codar-cheetah/package.py b/var/spack/repos/builtin/packages/codar-cheetah/package.py index c2754f5f8a..de9a12eb6e 100644 --- a/var/spack/repos/builtin/packages/codar-cheetah/package.py +++ b/var/spack/repos/builtin/packages/codar-cheetah/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from distutils.dir_util import copy_tree class CodarCheetah(Package): @@ -42,4 +41,4 @@ class CodarCheetah(Package): depends_on('savanna') def install(self, spec, prefix): - copy_tree('.', prefix) + install_tree('.', prefix) diff --git a/var/spack/repos/builtin/packages/comd/package.py b/var/spack/repos/builtin/packages/comd/package.py index 2aed00a924..baa9c89d59 100644 --- a/var/spack/repos/builtin/packages/comd/package.py +++ b/var/spack/repos/builtin/packages/comd/package.py @@ -22,9 +22,7 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## - from spack import * -import shutil class Comd(MakefilePackage): @@ -58,7 +56,7 @@ class Comd(MakefilePackage): def edit(self, spec, prefix): with working_dir('src-mpi') or working_dir('src-openmp'): - shutil.copy('Makefile.vanilla', 'Makefile') + copy('Makefile.vanilla', 'Makefile') @property def build_targets(self): diff --git a/var/spack/repos/builtin/packages/cosp2/package.py b/var/spack/repos/builtin/packages/cosp2/package.py index 001206132a..5eb59d53e6 100644 --- a/var/spack/repos/builtin/packages/cosp2/package.py +++ b/var/spack/repos/builtin/packages/cosp2/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -import shutil class Cosp2(MakefilePackage): @@ -62,7 +61,7 @@ class Cosp2(MakefilePackage): if '+double' in spec: filter_file('DOUBLE_PRECISION = O.*', 'DOUBLE_PRECISION = OFF', 'Makefile.vanilla') - shutil.copy('Makefile.vanilla', 'Makefile') + copy('Makefile.vanilla', 'Makefile') def install(self, spec, prefix): install_tree('bin/', prefix.bin) diff --git a/var/spack/repos/builtin/packages/cp2k/package.py b/var/spack/repos/builtin/packages/cp2k/package.py index 4aa79a4592..52eecc61ed 100644 --- a/var/spack/repos/builtin/packages/cp2k/package.py +++ b/var/spack/repos/builtin/packages/cp2k/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## import os -import shutil import copy from spack import * @@ -266,8 +265,7 @@ class Cp2k(Package): lib_dir = join_path('lib', cp2k_architecture, cp2k_version) mkdirp(lib_dir) try: - shutil.copy(env['LIBSMM_PATH'], - join_path(lib_dir, 'libsmm.a')) + copy(env['LIBSMM_PATH'], join_path(lib_dir, 'libsmm.a')) except KeyError: raise KeyError('Point environment variable LIBSMM_PATH to ' 'the absolute path of the libsmm.a file') @@ -315,4 +313,4 @@ class Cp2k(Package): 'VERSION={0}'.format(cp2k_version)) env['PWD'] = pwd_backup exe_dir = join_path('exe', cp2k_architecture) - shutil.copytree(exe_dir, self.prefix.bin) + install_tree(exe_dir, self.prefix.bin) diff --git a/var/spack/repos/builtin/packages/cppcheck/package.py b/var/spack/repos/builtin/packages/cppcheck/package.py index 6286941b84..dfd2adb4eb 100644 --- a/var/spack/repos/builtin/packages/cppcheck/package.py +++ b/var/spack/repos/builtin/packages/cppcheck/package.py @@ -23,11 +23,9 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -import os -import shutil -class Cppcheck(Package): +class Cppcheck(MakefilePackage): """A tool for static C/C++ code analysis.""" homepage = "http://cppcheck.sourceforge.net/" url = "https://downloads.sourceforge.net/project/cppcheck/cppcheck/1.78/cppcheck-1.78.tar.bz2" @@ -41,12 +39,13 @@ class Cppcheck(Package): depends_on('py-pygments', when='+htmlreport', type='run') + def build(self, spec, prefix): + make('CFGDIR={0}'.format(prefix.cfg)) + def install(self, spec, prefix): - # cppcheck does not have a configure script - make("CFGDIR=%s" % os.path.join(prefix, 'cfg')) - # manually install the final cppcheck binary + # Manually install the final cppcheck binary mkdirp(prefix.bin) install('cppcheck', prefix.bin) - shutil.copytree('cfg', os.path.join(prefix, 'cfg')) + install_tree('cfg', prefix.cfg) if spec.satisfies('+htmlreport'): install('htmlreport/cppcheck-htmlreport', prefix.bin) diff --git a/var/spack/repos/builtin/packages/cudnn/package.py b/var/spack/repos/builtin/packages/cudnn/package.py index 2752a1458f..a9958537c3 100644 --- a/var/spack/repos/builtin/packages/cudnn/package.py +++ b/var/spack/repos/builtin/packages/cudnn/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from distutils.dir_util import copy_tree class Cudnn(Package): @@ -40,4 +39,4 @@ class Cudnn(Package): depends_on('cuda@8:') def install(self, spec, prefix): - copy_tree('.', prefix) + install_tree('.', prefix) diff --git a/var/spack/repos/builtin/packages/farmhash/package.py b/var/spack/repos/builtin/packages/farmhash/package.py index 23c9af82a4..a8aa8f2c9f 100644 --- a/var/spack/repos/builtin/packages/farmhash/package.py +++ b/var/spack/repos/builtin/packages/farmhash/package.py @@ -24,7 +24,6 @@ ############################################################################## from spack import * import os.path -from shutil import copyfile class Farmhash(CMakePackage): @@ -36,5 +35,5 @@ class Farmhash(CMakePackage): version('92e897', commit='92e897b282426729f4724d91a637596c7e2fe28f') def patch(self): - copyfile(join_path(os.path.dirname(__file__), "CMakeLists.txt"), - "CMakeLists.txt") + copy(join_path(os.path.dirname(__file__), "CMakeLists.txt"), + "CMakeLists.txt") diff --git a/var/spack/repos/builtin/packages/fastqc/package.py b/var/spack/repos/builtin/packages/fastqc/package.py index 1b0eb876ae..c793713618 100644 --- a/var/spack/repos/builtin/packages/fastqc/package.py +++ b/var/spack/repos/builtin/packages/fastqc/package.py @@ -23,8 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from distutils.dir_util import copy_tree, mkpath -from distutils.file_util import copy_file class Fastqc(Package): @@ -43,15 +41,15 @@ class Fastqc(Package): patch('fastqc.patch', level=0) def install(self, spec, prefix): - mkpath(self.prefix.bin) - mkpath(self.prefix.lib) - copy_file('fastqc', self.prefix.bin) + mkdir(prefix.bin) + mkdir(prefix.lib) + install('fastqc', prefix.bin) for j in ['cisd-jhdf5.jar', 'jbzip2-0.9.jar', 'sam-1.103.jar']: - copy_file(j, self.prefix.lib) + install(j, prefix.lib) for d in ['Configuration', 'net', 'org', 'Templates', 'uk']: - copy_tree(d, join_path(self.prefix.lib, d)) + install_tree(d, join_path(prefix.lib, d)) chmod = which('chmod') - chmod('+x', join_path(self.prefix.bin, 'fastqc')) + chmod('+x', prefix.bin.fastqc) # In theory the 'run' dependency on 'jdk' above should take # care of this for me. In practice, it does not. @@ -59,5 +57,4 @@ class Fastqc(Package): """Add to the path; the package has a script at the top level. """ - run_env.prepend_path('PATH', join_path(self.spec['java'].prefix, - 'bin')) + run_env.prepend_path('PATH', self.spec['java'].prefix.bin) diff --git a/var/spack/repos/builtin/packages/fermisciencetools/package.py b/var/spack/repos/builtin/packages/fermisciencetools/package.py index bdac786766..556123dd09 100644 --- a/var/spack/repos/builtin/packages/fermisciencetools/package.py +++ b/var/spack/repos/builtin/packages/fermisciencetools/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from distutils.dir_util import copy_tree class Fermisciencetools(Package): @@ -42,4 +41,4 @@ class Fermisciencetools(Package): version('11r5p3', 'cf050ddddfe9251b6ebe8d3fd7de3c3f') def install(self, spec, prefix): - copy_tree('x86_64-unknown-linux-gnu-libc2.17', prefix) + install_tree('x86_64-unknown-linux-gnu-libc2.17', prefix) diff --git a/var/spack/repos/builtin/packages/fsl/package.py b/var/spack/repos/builtin/packages/fsl/package.py index c14865622d..00d00db220 100644 --- a/var/spack/repos/builtin/packages/fsl/package.py +++ b/var/spack/repos/builtin/packages/fsl/package.py @@ -25,7 +25,6 @@ from spack import * from spack.environment import EnvironmentModifications import os -import distutils.dir_util class Fsl(Package): @@ -68,7 +67,7 @@ class Fsl(Package): build = Executable('./build') build() - distutils.dir_util.copy_tree(".", prefix) + install_tree('.', prefix) def setup_environment(self, spack_env, run_env): if not self.stage.source_path: diff --git a/var/spack/repos/builtin/packages/gatk/package.py b/var/spack/repos/builtin/packages/gatk/package.py index 8ca12f133a..f7ce7c1714 100644 --- a/var/spack/repos/builtin/packages/gatk/package.py +++ b/var/spack/repos/builtin/packages/gatk/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from shutil import copyfile import glob import os.path import re @@ -62,7 +61,7 @@ class Gatk(Package): # explicitly codes the path for java and the jar file. script_sh = join_path(os.path.dirname(__file__), "gatk.sh") script = join_path(prefix.bin, "gatk") - copyfile(script_sh, script) + install(script_sh, script) set_executable(script) # Munge the helper script to explicitly point to java and the diff --git a/var/spack/repos/builtin/packages/gaussian/package.py b/var/spack/repos/builtin/packages/gaussian/package.py index e928d475ad..c14c830b0e 100644 --- a/var/spack/repos/builtin/packages/gaussian/package.py +++ b/var/spack/repos/builtin/packages/gaussian/package.py @@ -24,7 +24,6 @@ ############################################################################## from spack import * import os -import shutil class Gaussian(Package): @@ -36,7 +35,7 @@ class Gaussian(Package): version('09', '7d4c95b535e68e48af183920df427e4e') def install(self, spec, prefix): - shutil.copytree(os.getcwd(), prefix.bin) + install_tree('.', prefix.bin) patch_install_files = ['flc', 'linda8.2/opteron-linux/bin/flc', 'linda8.2/opteron-linux/bin/LindaLauncher', diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py index 0bfcd26e2b..7bf95acb94 100644 --- a/var/spack/repos/builtin/packages/gcc/package.py +++ b/var/spack/repos/builtin/packages/gcc/package.py @@ -28,7 +28,6 @@ from llnl.util import tty import glob import os -import shutil import sys @@ -207,7 +206,7 @@ class Gcc(AutotoolsPackage): new_dispatch_dir = join_path(prefix, 'include', 'dispatch') mkdirp(new_dispatch_dir) new_header = join_path(new_dispatch_dir, 'object.h') - shutil.copyfile('/usr/include/dispatch/object.h', new_header) + install('/usr/include/dispatch/object.h', new_header) filter_file(r'typedef void \(\^dispatch_block_t\)\(void\)', 'typedef void* dispatch_block_t', new_header) diff --git a/var/spack/repos/builtin/packages/genomefinisher/package.py b/var/spack/repos/builtin/packages/genomefinisher/package.py index 7599c37505..2083c3b22b 100644 --- a/var/spack/repos/builtin/packages/genomefinisher/package.py +++ b/var/spack/repos/builtin/packages/genomefinisher/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from shutil import copyfile import os @@ -49,13 +48,13 @@ class Genomefinisher(Package): # Set up a helper script to call java on the jar file, # explicitly codes the path for java and the jar file. script_sh = join_path(os.path.dirname(__file__), "genomefinisher.sh") - script = join_path(prefix.bin, "genomefinisher") - copyfile(script_sh, script) + script = prefix.bin.genomefinisher + install(script_sh, script) set_executable(script) # Munge the helper script to explicitly point to java and the jar file # jar file. - java = join_path(self.spec['jdk'].prefix, 'bin', 'java') + java = spec['jdk'].prefix.bin.java kwargs = {'ignore_absent': False, 'backup': False, 'string': False} filter_file('^java', java, script, **kwargs) filter_file(jar_file, join_path(prefix.bin, jar_file), diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index 7c3499bfe1..3e8a11d69e 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -24,7 +24,6 @@ ############################################################################## import sys from spack import * -from distutils.dir_util import copy_tree class Git(AutotoolsPackage): @@ -241,7 +240,7 @@ class Git(AutotoolsPackage): @run_after('install') def install_completions(self): - copy_tree('contrib/completion', self.prefix.share) + install_tree('contrib/completion', self.prefix.share) @run_after('install') def install_manpages(self): diff --git a/var/spack/repos/builtin/packages/glib/package.py b/var/spack/repos/builtin/packages/glib/package.py index 6a004d8e64..87a0286950 100644 --- a/var/spack/repos/builtin/packages/glib/package.py +++ b/var/spack/repos/builtin/packages/glib/package.py @@ -25,7 +25,6 @@ from spack import * import os.path -import shutil class Glib(AutotoolsPackage): @@ -117,7 +116,7 @@ class Glib(AutotoolsPackage): dtrace_copy = join_path(self.dtrace_copy_path, 'dtrace') with working_dir(self.dtrace_copy_path, create=True): - shutil.copy(dtrace, dtrace_copy) + copy(dtrace, dtrace_copy) filter_file( '^#!/usr/bin/python', '#!/usr/bin/env python', diff --git a/var/spack/repos/builtin/packages/go-bootstrap/package.py b/var/spack/repos/builtin/packages/go-bootstrap/package.py index c7794a40e9..730f423d55 100644 --- a/var/spack/repos/builtin/packages/go-bootstrap/package.py +++ b/var/spack/repos/builtin/packages/go-bootstrap/package.py @@ -22,9 +22,6 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## -import os -import shutil -import glob from spack import * # THIS PACKAGE SHOULD NOT EXIST @@ -75,15 +72,7 @@ class GoBootstrap(Package): with working_dir('src'): bash('{0}.bash'.format('all' if self.run_tests else 'make')) - try: - os.makedirs(prefix) - except OSError: - pass - for f in glob.glob('*'): - if os.path.isdir(f): - shutil.copytree(f, os.path.join(prefix, f)) - else: - shutil.copy2(f, os.path.join(prefix, f)) + install_tree('.', prefix) def setup_dependent_environment(self, spack_env, run_env, dependent_spec): spack_env.set('GOROOT_BOOTSTRAP', self.spec.prefix) diff --git a/var/spack/repos/builtin/packages/go/package.py b/var/spack/repos/builtin/packages/go/package.py index e7c96af8af..48055f7722 100644 --- a/var/spack/repos/builtin/packages/go/package.py +++ b/var/spack/repos/builtin/packages/go/package.py @@ -23,8 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## import os -import shutil -import glob import llnl.util.tty as tty from spack import * @@ -101,15 +99,7 @@ class Go(Package): with working_dir('src'): bash('{0}.bash'.format('all' if self.run_tests else 'make')) - try: - os.makedirs(prefix) - except OSError: - pass - for f in glob.glob('*'): - if os.path.isdir(f): - shutil.copytree(f, os.path.join(prefix, f)) - else: - shutil.copy2(f, os.path.join(prefix, f)) + install_tree('.', prefix) def setup_environment(self, spack_env, run_env): spack_env.set('GOROOT_FINAL', self.spec.prefix) @@ -123,10 +113,9 @@ class Go(Package): In most cases, extensions will only need to set GOPATH and use go:: - env = os.environ env['GOPATH'] = self.source_path + ':' + env['GOPATH'] go('get', '', env=env) - shutil.copytree('bin', os.path.join(prefix, '/bin')) + install_tree('bin', prefix.bin) """ # Add a go command/compiler for extensions module.go = self.spec['go'].command diff --git a/var/spack/repos/builtin/packages/grackle/package.py b/var/spack/repos/builtin/packages/grackle/package.py index e88041dd8b..0df3f3bf81 100644 --- a/var/spack/repos/builtin/packages/grackle/package.py +++ b/var/spack/repos/builtin/packages/grackle/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## import os.path -import shutil import inspect from spack import * @@ -78,7 +77,7 @@ class Grackle(Package): 'clib', 'Make.mach.{0}'.format(grackle_architecture) ) - shutil.copy(template, makefile) + copy(template, makefile) for key, value in substitutions.items(): filter_file(key, value, makefile) diff --git a/var/spack/repos/builtin/packages/gradle/package.py b/var/spack/repos/builtin/packages/gradle/package.py index 055aac845f..f7ad851e9f 100644 --- a/var/spack/repos/builtin/packages/gradle/package.py +++ b/var/spack/repos/builtin/packages/gradle/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from distutils.dir_util import copy_tree class Gradle(Package): @@ -81,4 +80,4 @@ class Gradle(Package): depends_on('java') def install(self, spec, prefix): - copy_tree('.', prefix) + install_tree('.', prefix) diff --git a/var/spack/repos/builtin/packages/gurobi/package.py b/var/spack/repos/builtin/packages/gurobi/package.py index aebb6bf6c6..9720313b7e 100644 --- a/var/spack/repos/builtin/packages/gurobi/package.py +++ b/var/spack/repos/builtin/packages/gurobi/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from distutils.dir_util import copy_tree import os @@ -58,5 +57,4 @@ class Gurobi(Package): run_env.set('GUROBI_HOME', self.prefix) def install(self, spec, prefix): - with working_dir('linux64'): - copy_tree('.', prefix) + install_tree('linux64', prefix) diff --git a/var/spack/repos/builtin/packages/hdf5-blosc/package.py b/var/spack/repos/builtin/packages/hdf5-blosc/package.py index b0ff9536c7..0e0d6dd352 100644 --- a/var/spack/repos/builtin/packages/hdf5-blosc/package.py +++ b/var/spack/repos/builtin/packages/hdf5-blosc/package.py @@ -34,13 +34,13 @@ def _install_shlib(name, src, dst): if sys.platform == "darwin": shlib0 = name + ".0.dylib" shlib = name + ".dylib" - shutil.copyfile(join_path(src, shlib0), join_path(dst, shlib0)) + install(join_path(src, shlib0), join_path(dst, shlib0)) os.symlink(shlib0, join_path(dst, shlib)) else: shlib000 = name + ".so.0.0.0" shlib0 = name + ".so.0" shlib = name + ".dylib" - shutil.copyfile(join_path(src, shlib000), join_path(dst, shlib000)) + install(join_path(src, shlib000), join_path(dst, shlib000)) os.symlink(shlib000, join_path(dst, shlib0)) os.symlink(shlib0, join_path(dst, shlib)) diff --git a/var/spack/repos/builtin/packages/igvtools/package.py b/var/spack/repos/builtin/packages/igvtools/package.py index 03e8dee653..410a409d63 100644 --- a/var/spack/repos/builtin/packages/igvtools/package.py +++ b/var/spack/repos/builtin/packages/igvtools/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from shutil import copyfile import os @@ -47,13 +46,13 @@ class Igvtools(Package): # Set up a helper script to call java on the jar file, # explicitly codes the path for java and the jar file. script_sh = join_path(os.path.dirname(__file__), "igvtools.sh") - script = join_path(prefix.bin, "igvtools") - copyfile(script_sh, script) + script = prefix.bin.igvtools + install(script_sh, script) set_executable(script) # Munge the helper script to explicitly point to java and the # jar file. - java = join_path(self.spec['jdk'].prefix, 'bin', 'java') + java = spec['jdk'].prefix.bin.java kwargs = {'ignore_absent': False, 'backup': False, 'string': False} filter_file('^java', java, script, **kwargs) filter_file(jar_file, join_path(prefix.bin, jar_file), diff --git a/var/spack/repos/builtin/packages/jdk/package.py b/var/spack/repos/builtin/packages/jdk/package.py index b39c32bc07..f6f78b9501 100644 --- a/var/spack/repos/builtin/packages/jdk/package.py +++ b/var/spack/repos/builtin/packages/jdk/package.py @@ -25,7 +25,6 @@ # # Author: Justin Too # -import distutils.dir_util from spack import * @@ -72,7 +71,7 @@ class Jdk(Package): return url.format(version, minor_version) def install(self, spec, prefix): - distutils.dir_util.copy_tree(".", prefix) + install_tree('.', prefix) def setup_environment(self, spack_env, run_env): run_env.set('JAVA_HOME', self.spec.prefix) diff --git a/var/spack/repos/builtin/packages/jmol/package.py b/var/spack/repos/builtin/packages/jmol/package.py index eda8dbe877..cd9cbf1c83 100644 --- a/var/spack/repos/builtin/packages/jmol/package.py +++ b/var/spack/repos/builtin/packages/jmol/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from distutils.dir_util import copy_tree class Jmol(Package): @@ -38,7 +37,7 @@ class Jmol(Package): depends_on('java', type='run') def install(self, spec, prefix): - copy_tree('jmol-{0}'.format(self.version), prefix) + install_tree('jmol-{0}'.format(self.version), prefix) def setup_environment(self, spack_env, run_env): run_env.prepend_path('PATH', self.prefix) diff --git a/var/spack/repos/builtin/packages/kaldi/package.py b/var/spack/repos/builtin/packages/kaldi/package.py index 69981c85ca..7dbe7d9a3b 100644 --- a/var/spack/repos/builtin/packages/kaldi/package.py +++ b/var/spack/repos/builtin/packages/kaldi/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from distutils.dir_util import copy_tree from os.path import join from fnmatch import fnmatch import os @@ -105,7 +104,7 @@ class Kaldi(Package): # Does not use Autotools install(join(root, name), prefix.bin) mkdir(prefix.lib) - copy_tree('lib', prefix.lib) + install_tree('lib', prefix.lib) for root, dirs, files in os.walk('.'): for name in files: diff --git a/var/spack/repos/builtin/packages/leveldb/package.py b/var/spack/repos/builtin/packages/leveldb/package.py index cf66732170..75b7b9411e 100644 --- a/var/spack/repos/builtin/packages/leveldb/package.py +++ b/var/spack/repos/builtin/packages/leveldb/package.py @@ -26,7 +26,7 @@ import glob from spack import * -class Leveldb(Package): +class Leveldb(MakefilePackage): """LevelDB is a fast key-value storage library written at Google that provides an ordered mapping from string keys to string values.""" @@ -39,21 +39,14 @@ class Leveldb(Package): depends_on("snappy") def install(self, spec, prefix): - make() + mkdirp(prefix.lib.pkgconfig) - mkdirp(prefix.include) - mkdirp(prefix.lib) - mkdirp(join_path(prefix.lib, 'pkgconfig')) + libraries = glob.glob('out-shared/libleveldb.*') + libraries += glob.glob('out-static/libleveldb.*') + for library in libraries: + install(library, prefix.lib) - cp = which('cp') - - # cp --preserve=links libleveldb.* prefix/lib - args = glob.glob('out-shared/libleveldb.*') \ - + glob.glob('out-static/libleveldb.*') - args.append(prefix.lib) - cp('--preserve=links', *args) - - cp('-r', 'include/leveldb', prefix.include) + install_tree('include/leveldb', prefix.include) with open(join_path(prefix.lib, 'pkgconfig', 'leveldb.pc'), 'w') as f: f.write('prefix={0}\n'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/libgridxc/package.py b/var/spack/repos/builtin/packages/libgridxc/package.py index 42a2a05517..f2db4ab13f 100644 --- a/var/spack/repos/builtin/packages/libgridxc/package.py +++ b/var/spack/repos/builtin/packages/libgridxc/package.py @@ -22,9 +22,7 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## - from spack import * -import shutil class Libgridxc(Package): @@ -42,7 +40,7 @@ class Libgridxc(Package): sh = which('sh') with working_dir('build', create=True): sh('../src/config.sh') - shutil.copyfile('../extra/fortran.mk', 'fortran.mk') + copy('../extra/fortran.mk', 'fortran.mk') def install(self, spec, prefix): with working_dir('build'): diff --git a/var/spack/repos/builtin/packages/libiconv/package.py b/var/spack/repos/builtin/packages/libiconv/package.py index df57201d7e..d9ff4a251a 100644 --- a/var/spack/repos/builtin/packages/libiconv/package.py +++ b/var/spack/repos/builtin/packages/libiconv/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -import shutil class Libiconv(AutotoolsPackage): @@ -46,6 +45,6 @@ class Libiconv(AutotoolsPackage): args = ['--enable-extra-encodings'] # A hack to patch config.guess in the libcharset sub directory - shutil.copyfile('./build-aux/config.guess', - 'libcharset/build-aux/config.guess') + copy('./build-aux/config.guess', + 'libcharset/build-aux/config.guess') return args diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index 2ecd61d75a..3be612fecc 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -504,10 +504,9 @@ class Llvm(CMakePackage): if not self.spec.satisfies('+lldb platform=darwin'): return codesign = which('codesign') - cp = which('cp') mkdir('tmp') llvm_check_file = join_path('tmp', 'llvm_check') - cp('/usr/bin/false', llvm_check_file) + copy('/usr/bin/false', llvm_check_file) try: codesign('-f', '-s', 'lldb_codesign', '--dryrun', diff --git a/var/spack/repos/builtin/packages/masurca/package.py b/var/spack/repos/builtin/packages/masurca/package.py index 9c35f45657..a1786cd7f3 100644 --- a/var/spack/repos/builtin/packages/masurca/package.py +++ b/var/spack/repos/builtin/packages/masurca/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -import distutils.dir_util class Masurca(Package): @@ -44,4 +43,4 @@ class Masurca(Package): def install(self, spec, prefix): installer = Executable('./install.sh') installer() - distutils.dir_util.copy_tree(".", prefix) + install_tree('.', prefix) diff --git a/var/spack/repos/builtin/packages/maven/package.py b/var/spack/repos/builtin/packages/maven/package.py index aef6ddeaee..abd4cca16c 100644 --- a/var/spack/repos/builtin/packages/maven/package.py +++ b/var/spack/repos/builtin/packages/maven/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from distutils.dir_util import copy_tree class Maven(Package): @@ -39,4 +38,4 @@ class Maven(Package): def install(self, spec, prefix): # install pre-built distribution - copy_tree('.', prefix) + install_tree('.', prefix) diff --git a/var/spack/repos/builtin/packages/mefit/package.py b/var/spack/repos/builtin/packages/mefit/package.py index cbd05eb656..61e74dfbbe 100644 --- a/var/spack/repos/builtin/packages/mefit/package.py +++ b/var/spack/repos/builtin/packages/mefit/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -import distutils.dir_util class Mefit(Package): @@ -41,7 +40,7 @@ class Mefit(Package): depends_on('casper %gcc@4.8.5') def install(self, spec, prefix): - distutils.dir_util.copy_tree(".", prefix) + install_tree('.', prefix) def setup_environment(self, spack_env, run_env): run_env.prepend_path('PATH', self.prefix) diff --git a/var/spack/repos/builtin/packages/mfem/package.py b/var/spack/repos/builtin/packages/mfem/package.py index 9e26473f21..7d76ee8db9 100644 --- a/var/spack/repos/builtin/packages/mfem/package.py +++ b/var/spack/repos/builtin/packages/mfem/package.py @@ -440,7 +440,7 @@ class Mfem(Package): # installed shared mfem library: with working_dir('config'): os.rename('config.mk', 'config.mk.orig') - shutil.copyfile(str(self.config_mk), 'config.mk') + copy(str(self.config_mk), 'config.mk') shutil.copystat('config.mk.orig', 'config.mk') if '+examples' in spec: diff --git a/var/spack/repos/builtin/packages/mpix-launch-swift/package.py b/var/spack/repos/builtin/packages/mpix-launch-swift/package.py index f72b0fff4f..57cb59eb20 100644 --- a/var/spack/repos/builtin/packages/mpix-launch-swift/package.py +++ b/var/spack/repos/builtin/packages/mpix-launch-swift/package.py @@ -23,10 +23,9 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from distutils.dir_util import copy_tree -class MpixLaunchSwift(Package): +class MpixLaunchSwift(MakefilePackage): """Library that allows a child MPI application to be launched inside a subset of processes in a parent MPI application. """ @@ -42,5 +41,4 @@ class MpixLaunchSwift(Package): depends_on('swig', type='build') def install(self, spec, prefix): - make() - copy_tree('.', prefix) + install_tree('.', prefix) diff --git a/var/spack/repos/builtin/packages/mrtrix3/package.py b/var/spack/repos/builtin/packages/mrtrix3/package.py index a61a19cc4c..26b083daf5 100644 --- a/var/spack/repos/builtin/packages/mrtrix3/package.py +++ b/var/spack/repos/builtin/packages/mrtrix3/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -import distutils.dir_util class Mrtrix3(Package): @@ -53,9 +52,7 @@ class Mrtrix3(Package): build = Executable('./build') configure() build() - # install_tree('.', prefix) does not work since the prefix - # directory already exists by this point - distutils.dir_util.copy_tree('.', prefix) + install_tree('.', prefix) def setup_environment(self, spac_env, run_env): run_env.prepend_path('PATH', self.prefix) diff --git a/var/spack/repos/builtin/packages/namd/package.py b/var/spack/repos/builtin/packages/namd/package.py index 837ae1a5c8..6179cacd84 100644 --- a/var/spack/repos/builtin/packages/namd/package.py +++ b/var/spack/repos/builtin/packages/namd/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## import platform -import shutil import sys import os from spack import * @@ -58,8 +57,8 @@ class Namd(MakefilePackage): def _copy_arch_file(self, lib): config_filename = 'arch/{0}.{1}'.format(self.arch, lib) - shutil.copy('arch/Linux-x86_64.{0}'.format(lib), - config_filename) + copy('arch/Linux-x86_64.{0}'.format(lib), + config_filename) if lib == 'tcl': filter_file(r'-ltcl8\.5', '-ltcl{0}'.format(self.spec['tcl'].version.up_to(2)), diff --git a/var/spack/repos/builtin/packages/ncl/package.py b/var/spack/repos/builtin/packages/ncl/package.py index 573acb664c..218fc31eb9 100644 --- a/var/spack/repos/builtin/packages/ncl/package.py +++ b/var/spack/repos/builtin/packages/ncl/package.py @@ -25,7 +25,6 @@ from spack import * import glob import os -import shutil import tempfile @@ -263,8 +262,8 @@ class Ncl(Package): triangle_src = join_path(self.stage.source_path, 'triangle_src') triangle_dst = join_path(self.stage.source_path, 'ni', 'src', 'lib', 'hlu') - shutil.copy(join_path(triangle_src, 'triangle.h'), triangle_dst) - shutil.copy(join_path(triangle_src, 'triangle.c'), triangle_dst) + copy(join_path(triangle_src, 'triangle.h'), triangle_dst) + copy(join_path(triangle_src, 'triangle.c'), triangle_dst) @staticmethod def delete_files(*filenames): diff --git a/var/spack/repos/builtin/packages/ncurses/package.py b/var/spack/repos/builtin/packages/ncurses/package.py index c54cbcd71f..cc1b6a7287 100644 --- a/var/spack/repos/builtin/packages/ncurses/package.py +++ b/var/spack/repos/builtin/packages/ncurses/package.py @@ -26,7 +26,6 @@ from spack import * from glob import glob from os.path import exists, join from os import makedirs -from shutil import copy class Ncurses(AutotoolsPackage): @@ -109,7 +108,7 @@ class Ncurses(AutotoolsPackage): if not exists(path): makedirs(path) for header in headers: - copy(header, path) + install(header, path) @property def libs(self): diff --git a/var/spack/repos/builtin/packages/occa/package.py b/var/spack/repos/builtin/packages/occa/package.py index a27d3c6b34..ff9285518e 100644 --- a/var/spack/repos/builtin/packages/occa/package.py +++ b/var/spack/repos/builtin/packages/occa/package.py @@ -23,8 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -import os -import shutil class Occa(Package): @@ -63,12 +61,7 @@ class Occa(Package): def install(self, spec, prefix): # The build environment is set by the 'setup_environment' method. # Copy the source to the installation directory and build OCCA there. - for file in os.listdir('.'): - dest = join_path(prefix, os.path.basename(file)) - if os.path.isdir(file): - shutil.copytree(file, dest) - else: - shutil.copy2(file, dest) + install_tree('.', prefix) make('-C', prefix) if self.run_tests: diff --git a/var/spack/repos/builtin/packages/pexsi/package.py b/var/spack/repos/builtin/packages/pexsi/package.py index c730d34756..931f951a09 100644 --- a/var/spack/repos/builtin/packages/pexsi/package.py +++ b/var/spack/repos/builtin/packages/pexsi/package.py @@ -25,7 +25,6 @@ import inspect import os.path -import shutil from spack import * @@ -99,7 +98,7 @@ class Pexsi(MakefilePackage): self.stage.source_path, 'make.inc' ) - shutil.copy(template, makefile) + copy(template, makefile) for key, value in substitutions: filter_file(key, value, makefile) diff --git a/var/spack/repos/builtin/packages/picard/package.py b/var/spack/repos/builtin/packages/picard/package.py index cca0ae2f7b..6cab04e592 100644 --- a/var/spack/repos/builtin/packages/picard/package.py +++ b/var/spack/repos/builtin/packages/picard/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from shutil import copyfile import glob import os.path import re @@ -69,13 +68,13 @@ class Picard(Package): # Set up a helper script to call java on the jar file, # explicitly codes the path for java and the jar file. script_sh = join_path(os.path.dirname(__file__), "picard.sh") - script = join_path(prefix.bin, "picard") - copyfile(script_sh, script) + script = prefix.bin.picard + install(script_sh, script) set_executable(script) # Munge the helper script to explicitly point to java and the # jar file. - java = join_path(self.spec['java'].prefix, 'bin', 'java') + java = self.spec['java'].prefix.bin.java kwargs = {'ignore_absent': False, 'backup': False, 'string': False} filter_file('^java', java, script, **kwargs) filter_file('picard.jar', join_path(prefix.bin, 'picard.jar'), diff --git a/var/spack/repos/builtin/packages/pilon/package.py b/var/spack/repos/builtin/packages/pilon/package.py index 8fba2c2376..0fec636fba 100644 --- a/var/spack/repos/builtin/packages/pilon/package.py +++ b/var/spack/repos/builtin/packages/pilon/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from shutil import copyfile import os.path @@ -47,13 +46,13 @@ class Pilon(Package): # Set up a helper script to call java on the jar file, # explicitly codes the path for java and the jar file. script_sh = join_path(os.path.dirname(__file__), "pilon.sh") - script = join_path(prefix.bin, "pilon") - copyfile(script_sh, script) + script = prefix.bin.pilon + install(script_sh, script) set_executable(script) # Munge the helper script to explicitly point to java and the # jar file. - java = join_path(self.spec['java'].prefix, 'bin', 'java') + java = self.spec['java'].prefix.bin.java kwargs = {'ignore_absent': False, 'backup': False, 'string': False} filter_file('^java', java, script, **kwargs) filter_file('pilon-{0}.jar', join_path(prefix.bin, jar_file), diff --git a/var/spack/repos/builtin/packages/pindel/package.py b/var/spack/repos/builtin/packages/pindel/package.py index 479128707b..d0acc28472 100644 --- a/var/spack/repos/builtin/packages/pindel/package.py +++ b/var/spack/repos/builtin/packages/pindel/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from shutil import copytree, copyfile class Pindel(MakefilePackage): @@ -51,9 +50,8 @@ class Pindel(MakefilePackage): # def edit(self, spec, prefix): - makefile2 = join_path(self.build_directory, 'Makefile2') - copyfile(join_path(self.build_directory, 'Makefile'), makefile2) - myedit = FileFilter(makefile2) + copy('Makefile', 'Makefile2') + myedit = FileFilter('Makefile2') myedit.filter('-include Makefile.local', '#removed include') myedit.filter('@false', '#removed autofailure') @@ -69,6 +67,4 @@ class Pindel(MakefilePackage): install('src/pindel2vcf', prefix.bin) install('src/sam2pindel', prefix.bin) install('src/pindel2vcf4tcga', prefix.bin) - copytree(join_path(self.build_directory, 'demo'), - prefix.doc, - symlinks=True) + install_tree('demo', prefix.doc) diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 94e6b61bd4..5b8c7e94e3 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -27,7 +27,6 @@ import os import platform import re import sys -import shutil import llnl.util.tty as tty from llnl.util.lang import match_predicate @@ -709,7 +708,7 @@ class Python(AutotoolsPackage): if not path_contains_subdirectory(src, bin_dir): view.link(src, dst) elif not os.path.islink(src): - shutil.copy2(src, dst) + copy(src, dst) if 'script' in get_filetype(src): filter_file( self.spec.prefix, os.path.abspath(view.root), dst) diff --git a/var/spack/repos/builtin/packages/qbox/package.py b/var/spack/repos/builtin/packages/qbox/package.py index 19d83773a8..805a567e55 100644 --- a/var/spack/repos/builtin/packages/qbox/package.py +++ b/var/spack/repos/builtin/packages/qbox/package.py @@ -22,8 +22,6 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## - -import shutil from spack import * @@ -88,6 +86,6 @@ class Qbox(MakefilePackage): def install(self, spec, prefix): mkdir(prefix.src) install('src/qb', prefix.src) - shutil.move('test', prefix) - shutil.move('xml', prefix) - shutil.move('util', prefix) + install_tree('test', prefix) + install_tree('xml', prefix) + install_tree('util', prefix) diff --git a/var/spack/repos/builtin/packages/qorts/package.py b/var/spack/repos/builtin/packages/qorts/package.py index bb71f15b8f..7e745dc304 100644 --- a/var/spack/repos/builtin/packages/qorts/package.py +++ b/var/spack/repos/builtin/packages/qorts/package.py @@ -24,7 +24,6 @@ ############################################################################## from spack import * import os.path -from shutil import copyfile class Qorts(RPackage): @@ -59,7 +58,7 @@ class Qorts(RPackage): # explicitly codes the path for java and the jar file. script_sh = join_path(os.path.dirname(__file__), "QoRTs.sh") script = self.prefix.bin.QoRTs - copyfile(script_sh, script) + install(script_sh, script) set_executable(script) # Munge the helper script to explicitly point to java and the diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py index 6ae13af9f5..52d11f5bbb 100644 --- a/var/spack/repos/builtin/packages/r/package.py +++ b/var/spack/repos/builtin/packages/r/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## import os -import shutil from spack import * @@ -142,7 +141,7 @@ class R(AutotoolsPackage): # dependencies in Spack. src_makeconf = join_path(self.etcdir, 'Makeconf') dst_makeconf = join_path(self.etcdir, 'Makeconf.spack') - shutil.copy(src_makeconf, dst_makeconf) + install(src_makeconf, dst_makeconf) # ======================================================================== # Set up environment to make install easy for R extensions. diff --git a/var/spack/repos/builtin/packages/repeatmasker/package.py b/var/spack/repos/builtin/packages/repeatmasker/package.py index 72aa492f3d..6177bb5710 100644 --- a/var/spack/repos/builtin/packages/repeatmasker/package.py +++ b/var/spack/repos/builtin/packages/repeatmasker/package.py @@ -24,7 +24,6 @@ ############################################################################## from spack import * import inspect -import distutils.dir_util class Repeatmasker(Package): @@ -78,4 +77,4 @@ class Repeatmasker(Package): with open(config_answers_filename, 'r') as f: inspect.getmodule(self).perl('configure', input=f) - distutils.dir_util.copy_tree(".", prefix.bin) + install_tree('.', prefix.bin) diff --git a/var/spack/repos/builtin/packages/rna-seqc/package.py b/var/spack/repos/builtin/packages/rna-seqc/package.py index 9fe5bcc096..cc58cb7e0e 100644 --- a/var/spack/repos/builtin/packages/rna-seqc/package.py +++ b/var/spack/repos/builtin/packages/rna-seqc/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from shutil import copyfile import os.path @@ -51,12 +50,12 @@ class RnaSeqc(Package): # explicitly codes the path for java and the jar file. script_sh = join_path(os.path.dirname(__file__), "rna-seqc.sh") script = join_path(prefix.bin, "rna-seqc") - copyfile(script_sh, script) + install(script_sh, script) set_executable(script) # Munge the helper script to explicitly point to java and the # jar file. - java = join_path(self.spec['jdk'].prefix, 'bin', 'java') + java = self.spec['jdk'].prefix.bin.java kwargs = {'ignore_absent': False, 'backup': False, 'string': False} filter_file('^java', java, script, **kwargs) filter_file('RNA-SeQC_v{0}.jar', join_path(prefix.bin, jar_file), diff --git a/var/spack/repos/builtin/packages/rockstar/package.py b/var/spack/repos/builtin/packages/rockstar/package.py index f77403495f..ba4134f731 100644 --- a/var/spack/repos/builtin/packages/rockstar/package.py +++ b/var/spack/repos/builtin/packages/rockstar/package.py @@ -22,10 +22,8 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## - import os from spack import * -from distutils.dir_util import copy_tree class Rockstar(MakefilePackage): @@ -59,7 +57,7 @@ class Rockstar(MakefilePackage): def install(self, spec, prefix): # Install all files and directories - copy_tree(".", prefix) + install_tree('.', prefix) mkdir(prefix.bin) mkdir(prefix.lib) diff --git a/var/spack/repos/builtin/packages/savanna/package.py b/var/spack/repos/builtin/packages/savanna/package.py index 1e5ea83f5b..126c79a5ba 100644 --- a/var/spack/repos/builtin/packages/savanna/package.py +++ b/var/spack/repos/builtin/packages/savanna/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from distutils.dir_util import copy_tree class Savanna(MakefilePackage): @@ -46,4 +45,4 @@ class Savanna(MakefilePackage): depends_on('tau', when='+tau') def install(self, spec, prefix): - copy_tree('.', prefix) + install_tree('.', prefix) diff --git a/var/spack/repos/builtin/packages/sbt/package.py b/var/spack/repos/builtin/packages/sbt/package.py index d5eecc145c..5ad2bd2745 100644 --- a/var/spack/repos/builtin/packages/sbt/package.py +++ b/var/spack/repos/builtin/packages/sbt/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -import shutil class Sbt(Package): @@ -40,5 +39,5 @@ class Sbt(Package): depends_on('java') def install(self, spec, prefix): - shutil.copytree('bin', join_path(prefix, 'bin'), symlinks=True) - shutil.copytree('conf', join_path(prefix, 'conf'), symlinks=True) + install_tree('bin', prefix.bin) + install_tree('conf', prefix.conf) diff --git a/var/spack/repos/builtin/packages/scr/package.py b/var/spack/repos/builtin/packages/scr/package.py index 7ec0a5351e..8fc0ecd489 100644 --- a/var/spack/repos/builtin/packages/scr/package.py +++ b/var/spack/repos/builtin/packages/scr/package.py @@ -25,7 +25,6 @@ from spack import * import os -import shutil class Scr(CMakePackage): @@ -151,4 +150,4 @@ class Scr(CMakePackage): if spec.variants['copy_config'].value: dest_path = self.get_abs_path_rel_prefix( spec.variants['scr_config'].value) - shutil.copyfile(spec.variants['copy_config'].value, dest_path) + install(spec.variants['copy_config'].value, dest_path) diff --git a/var/spack/repos/builtin/packages/sctk/package.py b/var/spack/repos/builtin/packages/sctk/package.py index 089b8c04fc..97326572ff 100644 --- a/var/spack/repos/builtin/packages/sctk/package.py +++ b/var/spack/repos/builtin/packages/sctk/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from distutils.dir_util import copy_tree class Sctk(Package): @@ -49,5 +48,4 @@ class Sctk(Package): make('config') make('all') make('install') - mkdirp(prefix.bin) - copy_tree('bin', prefix.bin) + install_tree('bin', prefix.bin) diff --git a/var/spack/repos/builtin/packages/snpeff/package.py b/var/spack/repos/builtin/packages/snpeff/package.py index 44652ccee0..2d8c7900ce 100644 --- a/var/spack/repos/builtin/packages/snpeff/package.py +++ b/var/spack/repos/builtin/packages/snpeff/package.py @@ -24,7 +24,6 @@ ############################################################################## from spack import * import os.path -from shutil import copyfile class Snpeff(Package): @@ -45,13 +44,13 @@ class Snpeff(Package): # Set up a helper script to call java on the jar file, # explicitly codes the path for java and the jar file. script_sh = join_path(os.path.dirname(__file__), "snpEff.sh") - script = join_path(prefix.bin, "snpEff") - copyfile(script_sh, script) + script = prefix.bin.snpEff + install(script_sh, script) set_executable(script) # Munge the helper script to explicitly point to java and the # jar file. - java = join_path(self.spec['java'].prefix.bin, 'java') + java = self.spec['java'].prefix.bin.java kwargs = {'backup': False} filter_file('^java', java, script, **kwargs) filter_file('snpEff.jar', join_path(prefix.bin, 'snpEff.jar'), diff --git a/var/spack/repos/builtin/packages/snphylo/package.py b/var/spack/repos/builtin/packages/snphylo/package.py index 2add84ad26..5066b41e28 100644 --- a/var/spack/repos/builtin/packages/snphylo/package.py +++ b/var/spack/repos/builtin/packages/snphylo/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -import distutils.dir_util class Snphylo(Package): @@ -51,7 +50,7 @@ class Snphylo(Package): with open(install_answer_input, 'r') as f: bash = which('bash') bash('./setup.sh', input=f) - distutils.dir_util.copy_tree(".", prefix) + install_tree('.', prefix) def setup_environment(self, spack_env, run_env): run_env.prepend_path('PATH', self.spec.prefix) diff --git a/var/spack/repos/builtin/packages/spark/package.py b/var/spack/repos/builtin/packages/spark/package.py index 7cdd6b175f..1b318e8c78 100644 --- a/var/spack/repos/builtin/packages/spark/package.py +++ b/var/spack/repos/builtin/packages/spark/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## import re -import shutil from spack import * @@ -64,7 +63,7 @@ class Spark(Package): install_dir('yarn') # required for spark to recognize binary distribution - shutil.copy('RELEASE', prefix) + install('RELEASE', prefix) @when('+hadoop') def setup_environment(self, spack_env, run_env): diff --git a/var/spack/repos/builtin/packages/sublime-text/package.py b/var/spack/repos/builtin/packages/sublime-text/package.py index dad8ca0db4..83dd2f380b 100644 --- a/var/spack/repos/builtin/packages/sublime-text/package.py +++ b/var/spack/repos/builtin/packages/sublime-text/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from distutils.dir_util import copy_tree class SublimeText(Package): @@ -57,4 +56,4 @@ class SublimeText(Package): def install(self, spec, prefix): # Sublime text comes as a pre-compiled binary. - copy_tree('.', prefix) + install_tree('.', prefix) diff --git a/var/spack/repos/builtin/packages/supernova/package.py b/var/spack/repos/builtin/packages/supernova/package.py index 3e6ac97bc2..f358dd4939 100644 --- a/var/spack/repos/builtin/packages/supernova/package.py +++ b/var/spack/repos/builtin/packages/supernova/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from distutils.dir_util import copy_tree import os @@ -62,4 +61,4 @@ class Supernova(Package): # remove the broken symlinks rm('anaconda-cs/2.2.0-anaconda-cs-c7/lib/libtcl.so', 'anaconda-cs/2.2.0-anaconda-cs-c7/lib/libtk.so') - copy_tree('.', prefix, preserve_symlinks=1) + install_tree('.', prefix) diff --git a/var/spack/repos/builtin/packages/the-platinum-searcher/package.py b/var/spack/repos/builtin/packages/the-platinum-searcher/package.py index e3d7629e1a..858a0d5eba 100644 --- a/var/spack/repos/builtin/packages/the-platinum-searcher/package.py +++ b/var/spack/repos/builtin/packages/the-platinum-searcher/package.py @@ -23,8 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -import os -import shutil class ThePlatinumSearcher(Package): @@ -38,7 +36,6 @@ class ThePlatinumSearcher(Package): extends("go", deptypes='build') def install(self, spec, prefix): - env = os.environ env['GOPATH'] = self.stage.source_path + ':' + env['GOPATH'] go('install', self.package, env=env) - shutil.copytree('bin', os.path.join(prefix, 'bin')) + install_tree('bin', prefix.bin) diff --git a/var/spack/repos/builtin/packages/tinyxml/package.py b/var/spack/repos/builtin/packages/tinyxml/package.py index e34315882f..afd3c7f6b5 100644 --- a/var/spack/repos/builtin/packages/tinyxml/package.py +++ b/var/spack/repos/builtin/packages/tinyxml/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from shutil import copyfile import os.path @@ -42,8 +41,8 @@ class Tinyxml(CMakePackage): return url.format(version.dotted, version.underscored) def patch(self): - copyfile(join_path(os.path.dirname(__file__), - "CMakeLists.txt"), "CMakeLists.txt") + copy(join_path(os.path.dirname(__file__), + "CMakeLists.txt"), "CMakeLists.txt") def cmake_args(self): spec = self.spec diff --git a/var/spack/repos/builtin/packages/trimmomatic/package.py b/var/spack/repos/builtin/packages/trimmomatic/package.py index 470ba69def..41459502ae 100644 --- a/var/spack/repos/builtin/packages/trimmomatic/package.py +++ b/var/spack/repos/builtin/packages/trimmomatic/package.py @@ -23,8 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from distutils.dir_util import copy_tree -from shutil import copyfile import os.path @@ -47,18 +45,18 @@ class Trimmomatic(Package): install(jar_file, prefix.bin) # Put the adapter files someplace sensible - copy_tree('adapters', join_path(self.prefix.share, 'adapters')) + install_tree('adapters', prefix.share.adapters) # Set up a helper script to call java on the jar file, # explicitly codes the path for java and the jar file. script_sh = join_path(os.path.dirname(__file__), "trimmomatic.sh") - script = join_path(prefix.bin, "trimmomatic") - copyfile(script_sh, script) + script = prefix.bin.trimmomatic + install(script_sh, script) set_executable(script) # Munge the helper script to explicitly point to java and the # jar file. - java = join_path(self.spec['java'].prefix, 'bin', 'java') + java = self.spec['java'].prefix.bin.java kwargs = {'ignore_absent': False, 'backup': False, 'string': False} filter_file('^java', java, script, **kwargs) filter_file('trimmomatic.jar', join_path(prefix.bin, jar_file), diff --git a/var/spack/repos/builtin/packages/trinity/package.py b/var/spack/repos/builtin/packages/trinity/package.py index eab36f9ae4..5daad5e02f 100644 --- a/var/spack/repos/builtin/packages/trinity/package.py +++ b/var/spack/repos/builtin/packages/trinity/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from distutils.dir_util import copy_tree class Trinity(MakefilePackage): @@ -59,7 +58,7 @@ class Trinity(MakefilePackage): make("plugins") def install(self, spec, prefix): - copy_tree('.', prefix.bin, preserve_symlinks=1) + install_tree('.', prefix.bin) force_remove(join_path(prefix.bin, '.gitmodules')) force_remove(join_path(prefix.bin, 'Butterfly', '.err')) force_remove(join_path(prefix.bin, 'Butterfly', 'src', '.classpath')) diff --git a/var/spack/repos/builtin/packages/wannier90/package.py b/var/spack/repos/builtin/packages/wannier90/package.py index 60dcd21fff..f8b7b9adfc 100644 --- a/var/spack/repos/builtin/packages/wannier90/package.py +++ b/var/spack/repos/builtin/packages/wannier90/package.py @@ -24,7 +24,6 @@ ############################################################################## import inspect import os.path -import shutil from spack import * @@ -77,7 +76,7 @@ class Wannier90(MakefilePackage): 'make.sys' ) - shutil.copy(template, self.makefile_name) + copy(template, self.makefile_name) for key, value in substitutions.items(): filter_file(key, value, self.makefile_name) diff --git a/var/spack/repos/builtin/packages/workrave/package.py b/var/spack/repos/builtin/packages/workrave/package.py index 76434acad3..a11fd9523e 100644 --- a/var/spack/repos/builtin/packages/workrave/package.py +++ b/var/spack/repos/builtin/packages/workrave/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from shutil import copyfile class Workrave(AutotoolsPackage): @@ -102,4 +101,4 @@ class Workrave(AutotoolsPackage): for fname in self.m4files: src = '%s/%s/%s.m4' % (self.stage.source_path, fname, fname) dest = '%s/m4/%s.m4' % (self.stage.source_path, fname) - copyfile(src, dest) + copy(src, dest) diff --git a/var/spack/repos/builtin/packages/yorick/package.py b/var/spack/repos/builtin/packages/yorick/package.py index 2f4a3a349e..63ba54761e 100644 --- a/var/spack/repos/builtin/packages/yorick/package.py +++ b/var/spack/repos/builtin/packages/yorick/package.py @@ -24,8 +24,6 @@ ############################################################################## from spack import * import os -import shutil -import glob class Yorick(Package): @@ -74,13 +72,4 @@ class Yorick(Package): make() make("install") - try: - os.makedirs(prefix) - except OSError: - pass - os.chdir("relocate") - for f in glob.glob('*'): - if os.path.isdir(f): - shutil.copytree(f, os.path.join(prefix, f)) - else: - shutil.copy2(f, os.path.join(prefix, f)) + install_tree('relocate', prefix) -- cgit v1.2.3-70-g09d2 From ae2ef7b63bd17a02428f07a931ade28facf83830 Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Wed, 15 Aug 2018 20:45:29 +0200 Subject: libtool: recursive cloning for the develop version. (#8987) --- var/spack/repos/builtin/packages/libtool/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libtool/package.py b/var/spack/repos/builtin/packages/libtool/package.py index e6477fb3b3..b0b8208bb9 100644 --- a/var/spack/repos/builtin/packages/libtool/package.py +++ b/var/spack/repos/builtin/packages/libtool/package.py @@ -32,7 +32,7 @@ class Libtool(AutotoolsPackage): url = 'http://ftpmirror.gnu.org/libtool/libtool-2.4.2.tar.gz' version('develop', git='https://git.savannah.gnu.org/git/libtool.git', - branch='master') + branch='master', submodules=True) version('2.4.6', 'addf44b646ddb4e3919805aa88fa7c5e') version('2.4.2', 'd2f3b7d4627e69e13514a40e72a24d50') -- cgit v1.2.3-70-g09d2 From 44e13b0478d7fd05193e848585e9a4496bc8b32d Mon Sep 17 00:00:00 2001 From: dorier Date: Wed, 15 Aug 2018 22:24:28 +0100 Subject: ROSS: added ROSS package (#8964) --- var/spack/repos/builtin/packages/ross/package.py | 47 ++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 var/spack/repos/builtin/packages/ross/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ross/package.py b/var/spack/repos/builtin/packages/ross/package.py new file mode 100644 index 0000000000..13cda0c90b --- /dev/null +++ b/var/spack/repos/builtin/packages/ross/package.py @@ -0,0 +1,47 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Ross(CMakePackage): + """Rensselaer's Optimistic Simulation System""" + + homepage = "http://carothersc.github.io/ROSS/" + git = "https://github.com/carothersc/ROSS.git" + + version('master') + + depends_on('mpi') + + def cmake_args(self): + if 'x86_64' not in spec.architecture: + raise InstallError( + 'This package currently only builds on x86_64 architectures') + + args = ["-DBUILD_SHARED_LIBS=ON", + "-DARCH=x86_64", + "-DCMAKE_C_COMPILER=%s" % self.spec['mpi'].mpicc, + "-DCMAKE_CXX_COMPILER=%s" % self.spec['mpi'].mpicxx] + return args -- cgit v1.2.3-70-g09d2 From 5be5c486ace6e0e67f67caa6d553d556df1cc5ba Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 16 Aug 2018 01:27:21 -0500 Subject: Download GNU packages from mirrors (#8992) --- var/spack/repos/builtin/packages/aspell6-de/package.py | 2 +- var/spack/repos/builtin/packages/aspell6-en/package.py | 2 +- var/spack/repos/builtin/packages/aspell6-es/package.py | 2 +- var/spack/repos/builtin/packages/autoconf/package.py | 2 +- var/spack/repos/builtin/packages/autogen/package.py | 2 +- var/spack/repos/builtin/packages/automake/package.py | 2 +- var/spack/repos/builtin/packages/bash/package.py | 2 +- var/spack/repos/builtin/packages/bc/package.py | 2 +- var/spack/repos/builtin/packages/binutils/package.py | 2 +- var/spack/repos/builtin/packages/bison/package.py | 2 +- var/spack/repos/builtin/packages/coreutils/package.py | 2 +- var/spack/repos/builtin/packages/cvs/package.py | 2 +- var/spack/repos/builtin/packages/datamash/package.py | 2 +- var/spack/repos/builtin/packages/dejagnu/package.py | 2 +- var/spack/repos/builtin/packages/ed/package.py | 2 +- var/spack/repos/builtin/packages/emacs/package.py | 2 +- var/spack/repos/builtin/packages/findutils/package.py | 2 +- var/spack/repos/builtin/packages/gawk/package.py | 2 +- var/spack/repos/builtin/packages/gcc/package.py | 2 +- var/spack/repos/builtin/packages/gdb/package.py | 2 +- var/spack/repos/builtin/packages/gdbm/package.py | 2 +- var/spack/repos/builtin/packages/gettext/package.py | 2 +- var/spack/repos/builtin/packages/glpk/package.py | 2 +- var/spack/repos/builtin/packages/gmake/package.py | 2 +- var/spack/repos/builtin/packages/gmp/package.py | 2 +- var/spack/repos/builtin/packages/gperf/package.py | 2 +- var/spack/repos/builtin/packages/groff/package.py | 2 +- var/spack/repos/builtin/packages/gsl/package.py | 2 +- var/spack/repos/builtin/packages/guile/package.py | 2 +- var/spack/repos/builtin/packages/help2man/package.py | 2 +- var/spack/repos/builtin/packages/libiberty/package.py | 2 +- var/spack/repos/builtin/packages/libiconv/package.py | 2 +- var/spack/repos/builtin/packages/libmatheval/package.py | 2 +- var/spack/repos/builtin/packages/libsigsegv/package.py | 2 +- var/spack/repos/builtin/packages/libtool/package.py | 2 +- var/spack/repos/builtin/packages/libunistring/package.py | 2 +- var/spack/repos/builtin/packages/m4/package.py | 2 +- var/spack/repos/builtin/packages/mpc/package.py | 2 +- var/spack/repos/builtin/packages/mpfr/package.py | 2 +- var/spack/repos/builtin/packages/ncurses/package.py | 2 +- var/spack/repos/builtin/packages/nettle/package.py | 2 +- var/spack/repos/builtin/packages/octave/package.py | 2 +- var/spack/repos/builtin/packages/parallel/package.py | 2 +- var/spack/repos/builtin/packages/patch/package.py | 2 +- var/spack/repos/builtin/packages/readline/package.py | 2 +- var/spack/repos/builtin/packages/screen/package.py | 2 +- var/spack/repos/builtin/packages/sed/package.py | 2 +- var/spack/repos/builtin/packages/stow/package.py | 2 +- var/spack/repos/builtin/packages/tar/package.py | 2 +- var/spack/repos/builtin/packages/texinfo/package.py | 2 +- var/spack/repos/builtin/packages/units/package.py | 2 +- var/spack/repos/builtin/packages/wget/package.py | 2 +- 52 files changed, 52 insertions(+), 52 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/aspell6-de/package.py b/var/spack/repos/builtin/packages/aspell6-de/package.py index 0ce4d045a1..18db0a16ea 100644 --- a/var/spack/repos/builtin/packages/aspell6-de/package.py +++ b/var/spack/repos/builtin/packages/aspell6-de/package.py @@ -29,6 +29,6 @@ class Aspell6De(AspellDictPackage): """German (de) dictionary for aspell.""" homepage = "http://aspell.net/" - url = "ftp://ftp.gnu.org/gnu/aspell/dict/de/aspell6-de-20030222-1.tar.bz2" + url = "https://ftpmirror.gnu.org/aspell/dict/de/aspell6-de-20030222-1.tar.bz2" version('6-de-20030222-1', '5950c5c8a36fc93d4d7616591bace6a6') diff --git a/var/spack/repos/builtin/packages/aspell6-en/package.py b/var/spack/repos/builtin/packages/aspell6-en/package.py index f5502ed40e..dc74dc7c51 100644 --- a/var/spack/repos/builtin/packages/aspell6-en/package.py +++ b/var/spack/repos/builtin/packages/aspell6-en/package.py @@ -29,6 +29,6 @@ class Aspell6En(AspellDictPackage): """English (en) dictionary for aspell.""" homepage = "http://aspell.net/" - url = "ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-2017.01.22-0.tar.bz2" + url = "https://ftpmirror.gnu.org/aspell/dict/en/aspell6-en-2017.01.22-0.tar.bz2" version('2017.01.22-0', 'a6e002076574de9dc4915967032a1dab') diff --git a/var/spack/repos/builtin/packages/aspell6-es/package.py b/var/spack/repos/builtin/packages/aspell6-es/package.py index 8005f34694..7b513aae12 100644 --- a/var/spack/repos/builtin/packages/aspell6-es/package.py +++ b/var/spack/repos/builtin/packages/aspell6-es/package.py @@ -29,6 +29,6 @@ class Aspell6Es(AspellDictPackage): """Spanish (es) dictionary for aspell.""" homepage = "http://aspell.net/" - url = "ftp://ftp.gnu.org/gnu/aspell/dict/es/aspell6-es-1.11-2.tar.bz2" + url = "https://ftpmirror.gnu.org/aspell/dict/es/aspell6-es-1.11-2.tar.bz2" version('1.11-2', '8406336a89c64e47e96f4153d0af70c4') diff --git a/var/spack/repos/builtin/packages/autoconf/package.py b/var/spack/repos/builtin/packages/autoconf/package.py index 402f7e9767..fb202bbce3 100644 --- a/var/spack/repos/builtin/packages/autoconf/package.py +++ b/var/spack/repos/builtin/packages/autoconf/package.py @@ -29,7 +29,7 @@ class Autoconf(AutotoolsPackage): """Autoconf -- system configuration part of autotools""" homepage = 'https://www.gnu.org/software/autoconf/' - url = 'http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz' + url = 'https://ftpmirror.gnu.org/autoconf/autoconf-2.69.tar.gz' version('2.69', '82d05e03b93e45f5a39b828dc9c6c29b') version('2.62', '6c1f3b3734999035d77da5024aab4fbd') diff --git a/var/spack/repos/builtin/packages/autogen/package.py b/var/spack/repos/builtin/packages/autogen/package.py index d7f70fdb4c..fa74a7aa4f 100644 --- a/var/spack/repos/builtin/packages/autogen/package.py +++ b/var/spack/repos/builtin/packages/autogen/package.py @@ -32,7 +32,7 @@ class Autogen(AutotoolsPackage): synchronized.""" homepage = "https://www.gnu.org/software/autogen/index.html" - url = "https://ftp.gnu.org/gnu/autogen/rel5.18.12/autogen-5.18.12.tar.gz" + url = "https://ftpmirror.gnu.org/autogen/rel5.18.12/autogen-5.18.12.tar.gz" list_url = "https://ftp.gnu.org/gnu/autogen" list_depth = 1 diff --git a/var/spack/repos/builtin/packages/automake/package.py b/var/spack/repos/builtin/packages/automake/package.py index e25a3264a0..77d6cf2e9d 100644 --- a/var/spack/repos/builtin/packages/automake/package.py +++ b/var/spack/repos/builtin/packages/automake/package.py @@ -29,7 +29,7 @@ class Automake(AutotoolsPackage): """Automake -- make file builder part of autotools""" homepage = 'http://www.gnu.org/software/automake/' - url = 'http://ftp.gnu.org/gnu/automake/automake-1.15.tar.gz' + url = 'https://ftpmirror.gnu.org/automake/automake-1.15.tar.gz' version('1.16.1', '83cc2463a4080efd46a72ba2c9f6b8f5') version('1.15.1', '95df3f2d6eb8f81e70b8cb63a93c8853') diff --git a/var/spack/repos/builtin/packages/bash/package.py b/var/spack/repos/builtin/packages/bash/package.py index 3839314ca8..606d992bc9 100644 --- a/var/spack/repos/builtin/packages/bash/package.py +++ b/var/spack/repos/builtin/packages/bash/package.py @@ -29,7 +29,7 @@ class Bash(AutotoolsPackage): """The GNU Project's Bourne Again SHell.""" homepage = "https://www.gnu.org/software/bash/" - url = "https://ftp.gnu.org/gnu/bash/bash-4.4.tar.gz" + url = "https://ftpmirror.gnu.org/bash/bash-4.4.tar.gz" version('4.4.12', '7c112970cbdcadfc331e10eeb5f6aa41') version('4.4', '148888a7c95ac23705559b6f477dfe25') diff --git a/var/spack/repos/builtin/packages/bc/package.py b/var/spack/repos/builtin/packages/bc/package.py index 835a535e40..d2acb24752 100644 --- a/var/spack/repos/builtin/packages/bc/package.py +++ b/var/spack/repos/builtin/packages/bc/package.py @@ -31,7 +31,7 @@ class Bc(AutotoolsPackage): interactive execution of statements.""" homepage = "https://www.gnu.org/software/bc" - url = "https://ftp.gnu.org/gnu/bc/bc-1.07.tar.gz" + url = "https://ftpmirror.gnu.org/bc/bc-1.07.tar.gz" version('1.07', 'e91638a947beadabf4d7770bdbb3d512') diff --git a/var/spack/repos/builtin/packages/binutils/package.py b/var/spack/repos/builtin/packages/binutils/package.py index cd9f7fc74c..6c3735a351 100644 --- a/var/spack/repos/builtin/packages/binutils/package.py +++ b/var/spack/repos/builtin/packages/binutils/package.py @@ -29,7 +29,7 @@ class Binutils(AutotoolsPackage): """GNU binutils, which contain the linker, assembler, objdump and others""" homepage = "http://www.gnu.org/software/binutils/" - url = "https://ftp.gnu.org/gnu/binutils/binutils-2.28.tar.bz2" + url = "https://ftpmirror.gnu.org/binutils/binutils-2.28.tar.bz2" version('2.29.1', '9af59a2ca3488823e453bb356fe0f113') version('2.28', '9e8340c96626b469a603c15c9d843727') diff --git a/var/spack/repos/builtin/packages/bison/package.py b/var/spack/repos/builtin/packages/bison/package.py index 8a2d4a111b..577c30b5ca 100644 --- a/var/spack/repos/builtin/packages/bison/package.py +++ b/var/spack/repos/builtin/packages/bison/package.py @@ -33,7 +33,7 @@ class Bison(AutotoolsPackage): generalized LR (GLR) parser employing LALR(1) parser tables.""" homepage = "http://www.gnu.org/software/bison/" - url = "http://ftp.gnu.org/gnu/bison/bison-3.0.4.tar.gz" + url = "https://ftpmirror.gnu.org/bison/bison-3.0.4.tar.gz" version('3.0.4', 'a586e11cd4aff49c3ff6d3b6a4c9ccf8') version('2.7', 'ded660799e76fb1667d594de1f7a0da9') diff --git a/var/spack/repos/builtin/packages/coreutils/package.py b/var/spack/repos/builtin/packages/coreutils/package.py index eca635a712..5d41e715f7 100644 --- a/var/spack/repos/builtin/packages/coreutils/package.py +++ b/var/spack/repos/builtin/packages/coreutils/package.py @@ -32,7 +32,7 @@ class Coreutils(AutotoolsPackage): operating system. """ homepage = "http://www.gnu.org/software/coreutils/" - url = "http://ftp.gnu.org/gnu/coreutils/coreutils-8.26.tar.xz" + url = "https://ftpmirror.gnu.org/coreutils/coreutils-8.26.tar.xz" version('8.29', '960cfe75a42c9907c71439f8eb436303') version('8.26', 'd5aa2072f662d4118b9f4c63b94601a6') diff --git a/var/spack/repos/builtin/packages/cvs/package.py b/var/spack/repos/builtin/packages/cvs/package.py index 726d7e8e9f..9f6f12590c 100644 --- a/var/spack/repos/builtin/packages/cvs/package.py +++ b/var/spack/repos/builtin/packages/cvs/package.py @@ -29,7 +29,7 @@ from spack import * class Cvs(AutotoolsPackage): """CVS a very traditional source control system""" homepage = "http://www.nongnu.org/cvs/" - url = "https://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2" + url = "https://ftpmirror.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2" version('1.12.13', '93a8dacc6ff0e723a130835713235863f1f5ada9') diff --git a/var/spack/repos/builtin/packages/datamash/package.py b/var/spack/repos/builtin/packages/datamash/package.py index 0b5ed4663a..309ad5a01f 100644 --- a/var/spack/repos/builtin/packages/datamash/package.py +++ b/var/spack/repos/builtin/packages/datamash/package.py @@ -31,7 +31,7 @@ class Datamash(AutotoolsPackage): """ homepage = "https://www.gnu.org/software/datamash/" - url = "http://ftp.gnu.org/gnu/datamash/datamash-1.0.5.tar.gz" + url = "https://ftpmirror.gnu.org/datamash/datamash-1.0.5.tar.gz" version('1.3', '47d382090e367ddb4967d640aba77b66') version('1.1.0', '79a6affca08107a095e97e4237fc8775') diff --git a/var/spack/repos/builtin/packages/dejagnu/package.py b/var/spack/repos/builtin/packages/dejagnu/package.py index d49268bf22..62e972c3a2 100644 --- a/var/spack/repos/builtin/packages/dejagnu/package.py +++ b/var/spack/repos/builtin/packages/dejagnu/package.py @@ -30,7 +30,7 @@ class Dejagnu(AutotoolsPackage): is to provide a single front end for all tests.""" homepage = "https://www.gnu.org/software/dejagnu/" - url = "http://mirror.team-cymru.org/gnu/dejagnu/dejagnu-1.6.tar.gz" + url = "https://ftpmirror.gnu.org/dejagnu/dejagnu-1.6.tar.gz" version('1.6', '1fdc2eb0d592c4f89d82d24dfdf02f0b') version('1.4.4', '053f18fd5d00873de365413cab17a666') diff --git a/var/spack/repos/builtin/packages/ed/package.py b/var/spack/repos/builtin/packages/ed/package.py index 39fff79178..fdb111fcf9 100644 --- a/var/spack/repos/builtin/packages/ed/package.py +++ b/var/spack/repos/builtin/packages/ed/package.py @@ -31,7 +31,7 @@ class Ed(AutotoolsPackage): interactively and via shell scripts.""" homepage = "https://www.gnu.org/software/ed" - url = "https://ftp.gnu.org/gnu/ed/ed-1.4.tar.gz" + url = "https://ftpmirror.gnu.org/ed/ed-1.4.tar.gz" version('1.4', 'da0ddc0e0b0bec2da4b13b0d0d1bce2b') diff --git a/var/spack/repos/builtin/packages/emacs/package.py b/var/spack/repos/builtin/packages/emacs/package.py index 9fa1c30fd8..2377d747fb 100644 --- a/var/spack/repos/builtin/packages/emacs/package.py +++ b/var/spack/repos/builtin/packages/emacs/package.py @@ -31,7 +31,7 @@ class Emacs(AutotoolsPackage): """The Emacs programmable text editor.""" homepage = "https://www.gnu.org/software/emacs" - url = "http://ftp.gnu.org/gnu/emacs/emacs-24.5.tar.gz" + url = "https://ftpmirror.gnu.org/emacs/emacs-24.5.tar.gz" version('26.1', '544d2ab5eb142e9ca69adb023d17bf4b') version('25.3', '74ddd373dc52ac05ca7a8c63b1ddbf58') diff --git a/var/spack/repos/builtin/packages/findutils/package.py b/var/spack/repos/builtin/packages/findutils/package.py index 37bfd87a31..c1a7e08167 100644 --- a/var/spack/repos/builtin/packages/findutils/package.py +++ b/var/spack/repos/builtin/packages/findutils/package.py @@ -30,7 +30,7 @@ class Findutils(AutotoolsPackage): utilities of the GNU operating system.""" homepage = "https://www.gnu.org/software/findutils/" - url = "http://ftpmirror.gnu.org/findutils/findutils-4.6.0.tar.gz" + url = "https://ftpmirror.gnu.org/findutils/findutils-4.6.0.tar.gz" version('4.6.0', '9936aa8009438ce185bea2694a997fc1') version('4.4.2', '351cc4adb07d54877fa15f75fb77d39f') diff --git a/var/spack/repos/builtin/packages/gawk/package.py b/var/spack/repos/builtin/packages/gawk/package.py index 57744ceaa7..271e40902d 100644 --- a/var/spack/repos/builtin/packages/gawk/package.py +++ b/var/spack/repos/builtin/packages/gawk/package.py @@ -40,7 +40,7 @@ class Gawk(AutotoolsPackage): """ homepage = "https://www.gnu.org/software/gawk/" - url = "http://ftp.gnu.org/gnu/gawk/gawk-4.1.4.tar.xz" + url = "https://ftpmirror.gnu.org/gawk/gawk-4.1.4.tar.xz" version('4.1.4', '4e7dbc81163e60fd4f0b52496e7542c9') diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py index 7bf95acb94..2003bdfcd8 100644 --- a/var/spack/repos/builtin/packages/gcc/package.py +++ b/var/spack/repos/builtin/packages/gcc/package.py @@ -36,7 +36,7 @@ class Gcc(AutotoolsPackage): Fortran, Ada, and Go, as well as libraries for these languages.""" homepage = 'https://gcc.gnu.org' - url = 'http://ftp.gnu.org/gnu/gcc/gcc-7.1.0/gcc-7.1.0.tar.bz2' + url = 'https://ftpmirror.gnu.org/gcc/gcc-7.1.0/gcc-7.1.0.tar.bz2' list_url = 'http://ftp.gnu.org/gnu/gcc/' list_depth = 1 diff --git a/var/spack/repos/builtin/packages/gdb/package.py b/var/spack/repos/builtin/packages/gdb/package.py index 15dfb1d491..1e5bc7be18 100644 --- a/var/spack/repos/builtin/packages/gdb/package.py +++ b/var/spack/repos/builtin/packages/gdb/package.py @@ -32,7 +32,7 @@ class Gdb(AutotoolsPackage): """ homepage = "https://www.gnu.org/software/gdb" - url = "http://ftp.gnu.org/gnu/gdb/gdb-7.10.tar.gz" + url = "https://ftpmirror.gnu.org/gdb/gdb-7.10.tar.gz" version('8.1', '0c85ecbb43569ec43b1c9230622e84ab') version('8.0.1', 'bb45869f8126a84ea2ba13a8c0e7c90e') diff --git a/var/spack/repos/builtin/packages/gdbm/package.py b/var/spack/repos/builtin/packages/gdbm/package.py index 5898d8ca78..a4abc46f58 100644 --- a/var/spack/repos/builtin/packages/gdbm/package.py +++ b/var/spack/repos/builtin/packages/gdbm/package.py @@ -33,7 +33,7 @@ class Gdbm(AutotoolsPackage): manipulate a hashed database.""" homepage = "http://www.gnu.org.ua/software/gdbm/gdbm.html" - url = "http://ftp.gnu.org/gnu/gdbm/gdbm-1.13.tar.gz" + url = "https://ftpmirror.gnu.org/gdbm/gdbm-1.13.tar.gz" version('1.14.1', 'c2ddcb3897efa0f57484af2bd4f4f848') version('1.13', '8929dcda2a8de3fd2367bdbf66769376') diff --git a/var/spack/repos/builtin/packages/gettext/package.py b/var/spack/repos/builtin/packages/gettext/package.py index c36d518ef3..c7f2d396a1 100644 --- a/var/spack/repos/builtin/packages/gettext/package.py +++ b/var/spack/repos/builtin/packages/gettext/package.py @@ -29,7 +29,7 @@ class Gettext(AutotoolsPackage): """GNU internationalization (i18n) and localization (l10n) library.""" homepage = "https://www.gnu.org/software/gettext/" - url = "http://ftpmirror.gnu.org/gettext/gettext-0.19.7.tar.xz" + url = "https://ftpmirror.gnu.org/gettext/gettext-0.19.7.tar.xz" version('0.19.8.1', 'df3f5690eaa30fd228537b00cb7b7590') version('0.19.7', 'f81e50556da41b44c1d59ac93474dca5') diff --git a/var/spack/repos/builtin/packages/glpk/package.py b/var/spack/repos/builtin/packages/glpk/package.py index 7710bdf91c..f449edd9a6 100644 --- a/var/spack/repos/builtin/packages/glpk/package.py +++ b/var/spack/repos/builtin/packages/glpk/package.py @@ -33,7 +33,7 @@ class Glpk(AutotoolsPackage): """ homepage = "https://www.gnu.org/software/glpk" - url = "http://ftp.gnu.org/gnu/glpk/glpk-4.65.tar.gz" + url = "https://ftpmirror.gnu.org/glpk/glpk-4.65.tar.gz" version('4.65', '470a984a8b1c0e027bdb6d5859063fe8') version('4.61', '3ce3e224a8b6e75a1a0b378445830f21') diff --git a/var/spack/repos/builtin/packages/gmake/package.py b/var/spack/repos/builtin/packages/gmake/package.py index a47d3a0fdc..d0133ea33f 100644 --- a/var/spack/repos/builtin/packages/gmake/package.py +++ b/var/spack/repos/builtin/packages/gmake/package.py @@ -30,7 +30,7 @@ class Gmake(AutotoolsPackage): other non-source files of a program from the program's source files.""" homepage = "https://www.gnu.org/software/make/" - url = "https://ftp.gnu.org/gnu/make/make-4.2.1.tar.gz" + url = "https://ftpmirror.gnu.org/make/make-4.2.1.tar.gz" version('4.2.1', '7d0dcb6c474b258aab4d54098f2cf5a7') version('4.0', 'b5e558f981326d9ca1bfdb841640721a') diff --git a/var/spack/repos/builtin/packages/gmp/package.py b/var/spack/repos/builtin/packages/gmp/package.py index df0b3865d7..19bc4f8bbb 100644 --- a/var/spack/repos/builtin/packages/gmp/package.py +++ b/var/spack/repos/builtin/packages/gmp/package.py @@ -30,7 +30,7 @@ class Gmp(AutotoolsPackage): on signed integers, rational numbers, and floating-point numbers.""" homepage = "https://gmplib.org" - url = "https://ftp.gnu.org/gnu/gmp/gmp-6.1.2.tar.bz2" + url = "https://ftpmirror.gnu.org/gmp/gmp-6.1.2.tar.bz2" version('6.1.2', '8ddbb26dc3bd4e2302984debba1406a5') version('6.1.1', '4c175f86e11eb32d8bf9872ca3a8e11d') diff --git a/var/spack/repos/builtin/packages/gperf/package.py b/var/spack/repos/builtin/packages/gperf/package.py index 8dbb394878..3565ab3629 100644 --- a/var/spack/repos/builtin/packages/gperf/package.py +++ b/var/spack/repos/builtin/packages/gperf/package.py @@ -34,7 +34,7 @@ class Gperf(AutotoolsPackage): single string comparison only.""" homepage = "https://www.gnu.org/software/gperf/" - url = "http://ftp.gnu.org/pub/gnu/gperf/gperf-3.0.4.tar.gz" + url = "https://ftpmirror.gnu.org/gperf/gperf-3.0.4.tar.gz" version('3.0.4', 'c1f1db32fb6598d6a93e6e88796a8632') diff --git a/var/spack/repos/builtin/packages/groff/package.py b/var/spack/repos/builtin/packages/groff/package.py index 480184f2a7..365be697e4 100644 --- a/var/spack/repos/builtin/packages/groff/package.py +++ b/var/spack/repos/builtin/packages/groff/package.py @@ -32,7 +32,7 @@ class Groff(AutotoolsPackage): ASCII/UTF8 for display at the terminal.""" homepage = "https://www.gnu.org/software/groff/" - url = "http://ftp.gnu.org/gnu/groff/groff-1.22.3.tar.gz" + url = "https://ftpmirror.gnu.org/groff/groff-1.22.3.tar.gz" # TODO: add html variant, spack doesn't have netpbm and its too # complicated for me to find out at this point in time. diff --git a/var/spack/repos/builtin/packages/gsl/package.py b/var/spack/repos/builtin/packages/gsl/package.py index 0ac2e2b1a5..0eb95c4576 100644 --- a/var/spack/repos/builtin/packages/gsl/package.py +++ b/var/spack/repos/builtin/packages/gsl/package.py @@ -34,7 +34,7 @@ class Gsl(AutotoolsPackage): over 1000 functions in total with an extensive test suite.""" homepage = "http://www.gnu.org/software/gsl" - url = "http://mirror.switch.ch/ftp/mirror/gnu/gsl/gsl-2.3.tar.gz" + url = "https://ftpmirror.gnu.org/gsl/gsl-2.3.tar.gz" version('2.5', sha256='0460ad7c2542caaddc6729762952d345374784100223995eb14d614861f2258d') version('2.4', 'dba736f15404807834dc1c7b93e83b92') diff --git a/var/spack/repos/builtin/packages/guile/package.py b/var/spack/repos/builtin/packages/guile/package.py index 0bf23011b2..69fe8f1bf4 100644 --- a/var/spack/repos/builtin/packages/guile/package.py +++ b/var/spack/repos/builtin/packages/guile/package.py @@ -30,7 +30,7 @@ class Guile(AutotoolsPackage): the official extension language for the GNU operating system.""" homepage = "https://www.gnu.org/software/guile/" - url = "https://ftp.gnu.org/gnu/guile/guile-2.2.0.tar.gz" + url = "https://ftpmirror.gnu.org/guile/guile-2.2.0.tar.gz" version('2.2.0', '0d5de8075b965f9ee5ea04399b60a3f9') version('2.0.14', '333b6eec83e779935a45c818f712484e') diff --git a/var/spack/repos/builtin/packages/help2man/package.py b/var/spack/repos/builtin/packages/help2man/package.py index ede8d67848..f7940547d4 100644 --- a/var/spack/repos/builtin/packages/help2man/package.py +++ b/var/spack/repos/builtin/packages/help2man/package.py @@ -30,7 +30,7 @@ class Help2man(AutotoolsPackage): output of other commands.""" homepage = "https://www.gnu.org/software/help2man/" - url = "http://gnu.askapache.com/help2man/help2man-1.47.4.tar.xz" + url = "https://ftpmirror.gnu.org/help2man/help2man-1.47.4.tar.xz" version('1.47.4', '544aca496a7d89de3e5d99e56a2f03d3') diff --git a/var/spack/repos/builtin/packages/libiberty/package.py b/var/spack/repos/builtin/packages/libiberty/package.py index d07f966413..3d4fbe66b7 100644 --- a/var/spack/repos/builtin/packages/libiberty/package.py +++ b/var/spack/repos/builtin/packages/libiberty/package.py @@ -35,7 +35,7 @@ class Libiberty(AutotoolsPackage): demangling and support functions for the GNU toolchain.""" homepage = "https://www.gnu.org/software/binutils/" - url = "https://ftp.gnu.org/gnu/binutils/binutils-2.31.1.tar.xz" + url = "https://ftpmirror.gnu.org/binutils/binutils-2.31.1.tar.xz" version('2.31.1', '5b7c9d4ce96f507d95c1b9a255e52418') version('2.30', 'ffc476dd46c96f932875d1b2e27e929f') diff --git a/var/spack/repos/builtin/packages/libiconv/package.py b/var/spack/repos/builtin/packages/libiconv/package.py index d9ff4a251a..af3f0bbc1f 100644 --- a/var/spack/repos/builtin/packages/libiconv/package.py +++ b/var/spack/repos/builtin/packages/libiconv/package.py @@ -30,7 +30,7 @@ class Libiconv(AutotoolsPackage): and the iconv program for character set conversion.""" homepage = "https://www.gnu.org/software/libiconv/" - url = "http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.15.tar.gz" + url = "https://ftpmirror.gnu.org/libiconv/libiconv-1.15.tar.gz" version('1.15', 'ace8b5f2db42f7b3b3057585e80d9808') version('1.14', 'e34509b1623cec449dfeb73d7ce9c6c6') diff --git a/var/spack/repos/builtin/packages/libmatheval/package.py b/var/spack/repos/builtin/packages/libmatheval/package.py index 223f6b4a8e..a37c15e10f 100644 --- a/var/spack/repos/builtin/packages/libmatheval/package.py +++ b/var/spack/repos/builtin/packages/libmatheval/package.py @@ -34,7 +34,7 @@ class Libmatheval(AutotoolsPackage): compute symbolic derivatives and output expressions to strings.""" homepage = "https://www.gnu.org/software/libmatheval/" - url = "https://ftp.gnu.org/gnu/libmatheval/libmatheval-1.1.11.tar.gz" + url = "https://ftpmirror.gnu.org/libmatheval/libmatheval-1.1.11.tar.gz" version('1.1.11', '595420ea60f6ddd75623847f46ca45c4') diff --git a/var/spack/repos/builtin/packages/libsigsegv/package.py b/var/spack/repos/builtin/packages/libsigsegv/package.py index e625d238ef..70bf343458 100644 --- a/var/spack/repos/builtin/packages/libsigsegv/package.py +++ b/var/spack/repos/builtin/packages/libsigsegv/package.py @@ -29,7 +29,7 @@ class Libsigsegv(AutotoolsPackage): """GNU libsigsegv is a library for handling page faults in user mode.""" homepage = "https://www.gnu.org/software/libsigsegv/" - url = "https://ftp.gnu.org/gnu/libsigsegv/libsigsegv-2.11.tar.gz" + url = "https://ftpmirror.gnu.org/libsigsegv/libsigsegv-2.11.tar.gz" patch('patch.new_config_guess', when='@2.10') diff --git a/var/spack/repos/builtin/packages/libtool/package.py b/var/spack/repos/builtin/packages/libtool/package.py index b0b8208bb9..b2490cc941 100644 --- a/var/spack/repos/builtin/packages/libtool/package.py +++ b/var/spack/repos/builtin/packages/libtool/package.py @@ -29,7 +29,7 @@ class Libtool(AutotoolsPackage): """libtool -- library building part of autotools.""" homepage = 'https://www.gnu.org/software/libtool/' - url = 'http://ftpmirror.gnu.org/libtool/libtool-2.4.2.tar.gz' + url = 'https://ftpmirror.gnu.org/libtool/libtool-2.4.2.tar.gz' version('develop', git='https://git.savannah.gnu.org/git/libtool.git', branch='master', submodules=True) diff --git a/var/spack/repos/builtin/packages/libunistring/package.py b/var/spack/repos/builtin/packages/libunistring/package.py index 52b29dda56..ff69c02247 100644 --- a/var/spack/repos/builtin/packages/libunistring/package.py +++ b/var/spack/repos/builtin/packages/libunistring/package.py @@ -30,7 +30,7 @@ class Libunistring(AutotoolsPackage): and for manipulating C strings according to the Unicode standard.""" homepage = "https://www.gnu.org/software/libunistring/" - url = "http://ftp.gnu.org/gnu/libunistring/libunistring-0.9.7.tar.xz" + url = "https://ftpmirror.gnu.org/libunistring/libunistring-0.9.7.tar.xz" version('0.9.7', '82e0545363d111bfdfec2ddbfe62ffd3') version('0.9.6', 'cb09c398020c27edac10ca590e9e9ef3') diff --git a/var/spack/repos/builtin/packages/m4/package.py b/var/spack/repos/builtin/packages/m4/package.py index 35adc3c0af..0265accf5f 100644 --- a/var/spack/repos/builtin/packages/m4/package.py +++ b/var/spack/repos/builtin/packages/m4/package.py @@ -29,7 +29,7 @@ class M4(AutotoolsPackage): """GNU M4 is an implementation of the traditional Unix macro processor.""" homepage = "https://www.gnu.org/software/m4/m4.html" - url = "https://ftp.gnu.org/gnu/m4/m4-1.4.18.tar.gz" + url = "https://ftpmirror.gnu.org/m4/m4-1.4.18.tar.gz" version('1.4.18', 'a077779db287adf4e12a035029002d28') version('1.4.17', 'a5e9954b1dae036762f7b13673a2cf76') diff --git a/var/spack/repos/builtin/packages/mpc/package.py b/var/spack/repos/builtin/packages/mpc/package.py index 77e293c3bf..e7b591c0fe 100644 --- a/var/spack/repos/builtin/packages/mpc/package.py +++ b/var/spack/repos/builtin/packages/mpc/package.py @@ -31,7 +31,7 @@ class Mpc(AutotoolsPackage): result.""" homepage = "http://www.multiprecision.org" - url = "https://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz" + url = "https://ftpmirror.gnu.org/mpc/mpc-1.1.0.tar.gz" list_url = "http://www.multiprecision.org/mpc/download.html" version('1.1.0', '4125404e41e482ec68282a2e687f6c73') diff --git a/var/spack/repos/builtin/packages/mpfr/package.py b/var/spack/repos/builtin/packages/mpfr/package.py index 67c07b66e7..3b385aabe5 100644 --- a/var/spack/repos/builtin/packages/mpfr/package.py +++ b/var/spack/repos/builtin/packages/mpfr/package.py @@ -30,7 +30,7 @@ class Mpfr(AutotoolsPackage): floating-point computations with correct rounding.""" homepage = "http://www.mpfr.org" - url = "https://ftp.gnu.org/gnu/mpfr/mpfr-4.0.1.tar.bz2" + url = "https://ftpmirror.gnu.org/mpfr/mpfr-4.0.1.tar.bz2" version('4.0.1', '8c21d8ac7460493b2b9f3ef3cc610454') version('4.0.0', 'ef619f3bb68039e35c4a219e06be72d0') diff --git a/var/spack/repos/builtin/packages/ncurses/package.py b/var/spack/repos/builtin/packages/ncurses/package.py index cc1b6a7287..a8ff84755b 100644 --- a/var/spack/repos/builtin/packages/ncurses/package.py +++ b/var/spack/repos/builtin/packages/ncurses/package.py @@ -36,7 +36,7 @@ class Ncurses(AutotoolsPackage): SYSV-curses enhancements over BSD curses.""" homepage = "http://invisible-island.net/ncurses/ncurses.html" - url = "http://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.1.tar.gz" + url = "https://ftpmirror.gnu.org/ncurses/ncurses-6.1.tar.gz" version('6.1', '98c889aaf8d23910d2b92d65be2e737a') version('6.0', 'ee13d052e1ead260d7c28071f46eefb1') diff --git a/var/spack/repos/builtin/packages/nettle/package.py b/var/spack/repos/builtin/packages/nettle/package.py index 60a76789ac..5c1855c523 100644 --- a/var/spack/repos/builtin/packages/nettle/package.py +++ b/var/spack/repos/builtin/packages/nettle/package.py @@ -30,7 +30,7 @@ class Nettle(AutotoolsPackage): that is designed to fit easily in many contexts.""" homepage = "https://www.lysator.liu.se/~nisse/nettle/" - url = "http://ftp.gnu.org/gnu/nettle/nettle-3.3.tar.gz" + url = "https://ftpmirror.gnu.org/nettle/nettle-3.3.tar.gz" version('3.4', 'dc0f13028264992f58e67b4e8915f53d') version('3.3', '10f969f78a463704ae73529978148dbe') diff --git a/var/spack/repos/builtin/packages/octave/package.py b/var/spack/repos/builtin/packages/octave/package.py index 2076725bb1..5587e79396 100644 --- a/var/spack/repos/builtin/packages/octave/package.py +++ b/var/spack/repos/builtin/packages/octave/package.py @@ -34,7 +34,7 @@ class Octave(AutotoolsPackage): Matlab. It may also be used as a batch-oriented language.""" homepage = "https://www.gnu.org/software/octave/" - url = "https://ftp.gnu.org/gnu/octave/octave-4.0.0.tar.gz" + url = "https://ftpmirror.gnu.org/octave/octave-4.0.0.tar.gz" extendable = True diff --git a/var/spack/repos/builtin/packages/parallel/package.py b/var/spack/repos/builtin/packages/parallel/package.py index 97d0abfc1c..eab85c166b 100644 --- a/var/spack/repos/builtin/packages/parallel/package.py +++ b/var/spack/repos/builtin/packages/parallel/package.py @@ -32,7 +32,7 @@ class Parallel(AutotoolsPackage): """ homepage = "http://www.gnu.org/software/parallel/" - url = "http://ftp.gnu.org/gnu/parallel/parallel-20170122.tar.bz2" + url = "https://ftpmirror.gnu.org/parallel/parallel-20170122.tar.bz2" version('20170322', '4fe1b8d2e3974d26c77f0b514988214d') version('20170122', 'c9f0ec01463dc75dbbf292fd8be5f1eb') diff --git a/var/spack/repos/builtin/packages/patch/package.py b/var/spack/repos/builtin/packages/patch/package.py index 8177a3ba5a..7b7ed2b19f 100644 --- a/var/spack/repos/builtin/packages/patch/package.py +++ b/var/spack/repos/builtin/packages/patch/package.py @@ -32,7 +32,7 @@ class Patch(AutotoolsPackage): """ homepage = "http://savannah.gnu.org/projects/patch/" - url = "http://ftp.gnu.org/gnu/patch/patch-2.7.6.tar.xz" + url = "https://ftpmirror.gnu.org/patch/patch-2.7.6.tar.xz" version('2.7.6', '78ad9937e4caadcba1526ef1853730d5') version('2.7.5', 'e3da7940431633fb65a01b91d3b7a27a') diff --git a/var/spack/repos/builtin/packages/readline/package.py b/var/spack/repos/builtin/packages/readline/package.py index 8a48361f1b..2e83fc4e82 100644 --- a/var/spack/repos/builtin/packages/readline/package.py +++ b/var/spack/repos/builtin/packages/readline/package.py @@ -34,7 +34,7 @@ class Readline(AutotoolsPackage): csh-like history expansion on previous commands.""" homepage = "http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" - url = "https://ftp.gnu.org/gnu/readline/readline-7.0.tar.gz" + url = "https://ftpmirror.gnu.org/readline/readline-7.0.tar.gz" version('7.0', '205b03a87fc83dab653b628c59b9fc91') version('6.3', '33c8fb279e981274f485fd91da77e94a') diff --git a/var/spack/repos/builtin/packages/screen/package.py b/var/spack/repos/builtin/packages/screen/package.py index 40bcf4b5b4..cb1daf4da7 100644 --- a/var/spack/repos/builtin/packages/screen/package.py +++ b/var/spack/repos/builtin/packages/screen/package.py @@ -31,7 +31,7 @@ class Screen(AutotoolsPackage): """ homepage = "https://www.gnu.org/software/screen/" - url = "http://ftp.gnu.org/gnu/screen/screen-4.3.1.tar.gz" + url = "https://ftpmirror.gnu.org/screen/screen-4.3.1.tar.gz" version('4.6.2', 'a0f529d3333b128dfaa324d978ba73a8') version('4.3.1', '5bb3b0ff2674e29378c31ad3411170ad') diff --git a/var/spack/repos/builtin/packages/sed/package.py b/var/spack/repos/builtin/packages/sed/package.py index 4bf6fa56d3..90ad6729ee 100644 --- a/var/spack/repos/builtin/packages/sed/package.py +++ b/var/spack/repos/builtin/packages/sed/package.py @@ -28,6 +28,6 @@ from spack import * class Sed(AutotoolsPackage): """GNU implementation of the famous stream editor.""" homepage = "http://www.gnu.org/software/sed/" - url = "http://ftpmirror.gnu.org/sed/sed-4.2.2.tar.bz2" + url = "https://ftpmirror.gnu.org/sed/sed-4.2.2.tar.bz2" version('4.2.2', '7ffe1c7cdc3233e1e0c4b502df253974') diff --git a/var/spack/repos/builtin/packages/stow/package.py b/var/spack/repos/builtin/packages/stow/package.py index 2e539b7e88..efea5991ad 100644 --- a/var/spack/repos/builtin/packages/stow/package.py +++ b/var/spack/repos/builtin/packages/stow/package.py @@ -34,7 +34,7 @@ class Stow(AutotoolsPackage): installed in the same place.""" homepage = "https://www.gnu.org/software/stow/" - url = "https://mirrors.kernel.org/gnu/stow/stow-2.2.2.tar.bz2" + url = "https://ftpmirror.gnu.org/stow/stow-2.2.2.tar.bz2" version('2.2.2', 'af1e1de9d973c835bee80c745b5ee849') version('2.2.0', '5bb56592eff9aaf9dfb6c975b3004240') diff --git a/var/spack/repos/builtin/packages/tar/package.py b/var/spack/repos/builtin/packages/tar/package.py index af78a051bd..92674de7f8 100644 --- a/var/spack/repos/builtin/packages/tar/package.py +++ b/var/spack/repos/builtin/packages/tar/package.py @@ -30,7 +30,7 @@ class Tar(AutotoolsPackage): other kinds of manipulation.""" homepage = "https://www.gnu.org/software/tar/" - url = "https://ftp.gnu.org/gnu/tar/tar-1.29.tar.gz" + url = "https://ftpmirror.gnu.org/tar/tar-1.29.tar.gz" version('1.30', 'e0c5ed59e4dd33d765d6c90caadd3c73') version('1.29', 'cae466e6e58c7292355e7080248f244db3a4cf755f33f4fa25ca7f9a7ed09af0') diff --git a/var/spack/repos/builtin/packages/texinfo/package.py b/var/spack/repos/builtin/packages/texinfo/package.py index 487f5f2e45..10a1a4ba52 100644 --- a/var/spack/repos/builtin/packages/texinfo/package.py +++ b/var/spack/repos/builtin/packages/texinfo/package.py @@ -34,7 +34,7 @@ class Texinfo(AutotoolsPackage): of the time. It is used by many non-GNU projects as well.""" homepage = "https://www.gnu.org/software/texinfo/" - url = "http://ftp.gnu.org/gnu/texinfo/texinfo-6.0.tar.gz" + url = "https://ftpmirror.gnu.org/texinfo/texinfo-6.0.tar.gz" version('6.5', '94e8f7149876793030e5518dd8d6e956') version('6.3', '9b08daca9bf8eccae9b0f884aba41f9e') diff --git a/var/spack/repos/builtin/packages/units/package.py b/var/spack/repos/builtin/packages/units/package.py index d5f437a6f1..a855969fac 100644 --- a/var/spack/repos/builtin/packages/units/package.py +++ b/var/spack/repos/builtin/packages/units/package.py @@ -29,7 +29,7 @@ class Units(AutotoolsPackage): """GNU units converts between different systems of units""" homepage = "https://www.gnu.org/software/units/" - url = "https://ftp.gnu.org/gnu/units/units-2.13.tar.gz" + url = "https://ftpmirror.gnu.org/units/units-2.13.tar.gz" version('2.13', '5cbf2a6af76e94ba0ac55fc8d99d5a3e') diff --git a/var/spack/repos/builtin/packages/wget/package.py b/var/spack/repos/builtin/packages/wget/package.py index d3ebfbd0fb..85c750252a 100644 --- a/var/spack/repos/builtin/packages/wget/package.py +++ b/var/spack/repos/builtin/packages/wget/package.py @@ -32,7 +32,7 @@ class Wget(AutotoolsPackage): cron jobs, terminals without X-Windows support, etc.""" homepage = "http://www.gnu.org/software/wget/" - url = "http://ftp.gnu.org/gnu/wget/wget-1.19.1.tar.gz" + url = "https://ftpmirror.gnu.org/wget/wget-1.19.1.tar.gz" version('1.19.1', '87cea36b7161fd43e3fd51a4e8b89689') version('1.17', 'c4c4727766f24ac716936275014a0536') -- cgit v1.2.3-70-g09d2 From ead9363bee6cc90132a5bb4888c3444b726de5a2 Mon Sep 17 00:00:00 2001 From: Andreas Baumbach Date: Thu, 16 Aug 2018 14:51:09 +0200 Subject: add patch for gcc@8 for python 2.7.14 (#8990) * add gcc8 patch for python 2.7.14 Change-Id: I48cb5e717577d8158d1f7f1fe270156a01940d8a * add explaining comment Change-Id: Ia46168e2269d7de47d7ec8d0bf9e3b7696ea8e31 * remove unnecessary part of the patch Change-Id: Iee763effe2439f0f160c1547640eca4bb9451a68 --- .../builtin/packages/python/gcc-8-2.7.14.patch | 35 ++++++++++++++++++++++ var/spack/repos/builtin/packages/python/package.py | 4 +++ 2 files changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/python/gcc-8-2.7.14.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/python/gcc-8-2.7.14.patch b/var/spack/repos/builtin/packages/python/gcc-8-2.7.14.patch new file mode 100644 index 0000000000..72c879cdea --- /dev/null +++ b/var/spack/repos/builtin/packages/python/gcc-8-2.7.14.patch @@ -0,0 +1,35 @@ +diff --git a/Include/objimpl.h b/Include/objimpl.h +index 5f2868332955..cbf6bc3f8763 100644 +--- a/Include/objimpl.h ++++ b/Include/objimpl.h +@@ -248,6 +248,20 @@ PyAPI_FUNC(PyVarObject *) _PyObject_GC_Resize(PyVarObject *, Py_ssize_t); + /* for source compatibility with 2.2 */ + #define _PyObject_GC_Del PyObject_GC_Del + ++/* ++ * Former over-aligned definition of PyGC_Head, used to compute the size of the ++ * padding for the new version below. ++ */ ++union _gc_head; ++union _gc_head_old { ++ struct { ++ union _gc_head_old *gc_next; ++ union _gc_head_old *gc_prev; ++ Py_ssize_t gc_refs; ++ } gc; ++ long double dummy; ++}; ++ + /* GC information is stored BEFORE the object structure. */ + typedef union _gc_head { + struct { +@@ -255,7 +269,8 @@ typedef union _gc_head { + union _gc_head *gc_prev; + Py_ssize_t gc_refs; + } gc; +- long double dummy; /* force worst-case alignment */ ++ double dummy; /* Force at least 8-byte alignment. */ ++ char dummy_padding[sizeof(union _gc_head_old)]; + } PyGC_Head; + + extern PyGC_Head *_PyGC_generation0; diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 5b8c7e94e3..ac42ffa547 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -118,6 +118,10 @@ class Python(AutotoolsPackage): patch('cray-rpath-2.3.patch', when="@2.3:3.0.1 platform=cray") patch('cray-rpath-3.1.patch', when="@3.1:3.99 platform=cray") + # Fixes an alignment problem with more aggressive optimization in gcc8 + # https://github.com/python/cpython/commit/0b91f8a668201fc58fa732b8acc496caedfdbae0 + patch('gcc-8-2.7.14.patch', when="@2.7.14 %gcc@8:") + # For more information refer to this bug report: # https://bugs.python.org/issue29712 conflicts( -- cgit v1.2.3-70-g09d2 From d099eba8c418399643e8980e93e382449719fed1 Mon Sep 17 00:00:00 2001 From: Tom Merrick Date: Thu, 16 Aug 2018 10:43:56 -0500 Subject: glib: patch for rhel6, centos6, and sl6 (#8947) --- var/spack/repos/builtin/packages/glib/old-kernels.patch | 16 ++++++++++++++++ var/spack/repos/builtin/packages/glib/package.py | 4 ++++ 2 files changed, 20 insertions(+) create mode 100644 var/spack/repos/builtin/packages/glib/old-kernels.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/glib/old-kernels.patch b/var/spack/repos/builtin/packages/glib/old-kernels.patch new file mode 100644 index 0000000000..4061410320 --- /dev/null +++ b/var/spack/repos/builtin/packages/glib/old-kernels.patch @@ -0,0 +1,16 @@ +--- a/gio/gfile.c 2018-06-11 15:28:30.527667202 -0500 ++++ b/gio/gfile.c 2018-03-12 11:23:37.000000000 -0500 +@@ -3014,11 +3014,11 @@ + + /* Try a 1MiB buffer for improved throughput. If that fails, use the default + * pipe size. See: https://bugzilla.gnome.org/791457 */ +- buffer_size = fcntl (buffer[1], F_SETPIPE_SZ, 1024 * 1024); ++ buffer_size = -1; + if (buffer_size <= 0) + { + int errsv; +- buffer_size = fcntl (buffer[1], F_GETPIPE_SZ); ++ buffer_size = 65536; + errsv = errno; + + if (buffer_size <= 0) diff --git a/var/spack/repos/builtin/packages/glib/package.py b/var/spack/repos/builtin/packages/glib/package.py index 87a0286950..76e411aa71 100644 --- a/var/spack/repos/builtin/packages/glib/package.py +++ b/var/spack/repos/builtin/packages/glib/package.py @@ -72,6 +72,10 @@ class Glib(AutotoolsPackage): # Clang doesn't seem to acknowledge the pragma lines to disable the -Werror # around a legitimate usage. patch('no-Werror=format-security.patch') + # Patch to prevent compiler errors in kernels older than 2.6.35 + patch('old-kernels.patch', when='@2.56: os=rhel6') + patch('old-kernels.patch', when='@2.56: os=centos6') + patch('old-kernels.patch', when='@2.56: os=sl6') def url_for_version(self, version): """Handle glib's version-based custom URLs.""" -- cgit v1.2.3-70-g09d2 From cd446a9668c0248e3240a1531f537fb4e0b3a411 Mon Sep 17 00:00:00 2001 From: TZ Date: Thu, 16 Aug 2018 17:44:30 +0200 Subject: openfoam-com: correctly use foam_add_lib() (#8969) - foam_add_lib() must be used instead of the undefined foamAddLib() for adding VTK --- var/spack/repos/builtin/packages/openfoam-com/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openfoam-com/package.py b/var/spack/repos/builtin/packages/openfoam-com/package.py index b86398d230..08d5dbcf8b 100644 --- a/var/spack/repos/builtin/packages/openfoam-com/package.py +++ b/var/spack/repos/builtin/packages/openfoam-com/package.py @@ -608,7 +608,7 @@ class OpenfoamCom(Package): self.etc_config['vtk'] = [ ('VTK_DIR', spec['vtk'].prefix), ('LD_LIBRARY_PATH', - foamAddLib(pkglib(spec['vtk'], '${VTK_DIR}'))), + foam_add_lib(pkglib(spec['vtk'], '${VTK_DIR}'))), ] # Optional -- cgit v1.2.3-70-g09d2 From be11608732f1d54cd856940519149eac36f0f8fc Mon Sep 17 00:00:00 2001 From: Douglas Duckworth Date: Thu, 16 Aug 2018 11:51:58 -0400 Subject: added relion version 3 (beta) (#8872) * added relion 3 beta - WIP * added relion 3 beta - WIP * more relion changes - still WIP * more changes for relion * more changes * now correctly handling cuda_arch * now correctly handling cuda_arch * fixed flake8 syntax errors * fixed flake8 syntax errors * merge * fixed flake8 errors again * relion 3 finished * added print message to cuda_arch exception * relion - shortened explination * still need tag=2.0.3 for v 2.0.3 - removed @develop since it no longer exists * correct cuda versions now used properly * relion 3 done * added tags back * fixed exception message * relion - added develop back as master --- var/spack/repos/builtin/packages/relion/package.py | 53 +++++++++++++++------- 1 file changed, 36 insertions(+), 17 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/relion/package.py b/var/spack/repos/builtin/packages/relion/package.py index 120ef6bd83..62a0b2c0a0 100644 --- a/var/spack/repos/builtin/packages/relion/package.py +++ b/var/spack/repos/builtin/packages/relion/package.py @@ -34,29 +34,45 @@ class Relion(CMakePackage, CudaPackage): homepage = "http://http://www2.mrc-lmb.cam.ac.uk/relion" git = "https://github.com/3dem/relion.git" - version('develop') - version('2.1', tag='2.1') + version('3.0_beta', + git='https://bitbucket.org/scheres/relion-3.0_beta.git') + version('2.1', preferred='true', tag='2.1') version('2.0.3', tag='2.0.3') + # relion has no develop branch though pulling from master + # should be considered the same as develop + version('develop', branch='master') variant('gui', default=True, description="build the gui") variant('cuda', default=True, description="enable compute on gpu") variant('double', default=True, description="double precision (cpu) code") - variant('double-gpu', default=False, description="double precision (gpu) code") + variant('double-gpu', default=False, description="double precision gpu") + # if built with purpose=cluster then relion will link to gpfs libraries + # if that's not desirable then use purpose=desktop + variant('purpose', default='cluster', values=('cluster', 'desktop'), + description="build relion for use in cluster or desktop") variant('build_type', default='RelWithDebInfo', description='The build type to build', values=('Debug', 'Release', 'RelWithDebInfo', 'Profiling', 'Benchmarking')) depends_on('mpi') + # relion will not build with newer versions of cmake + # per https://github.com/3dem/relion/issues/380 + depends_on('cmake@3:3.9.4', type='build') depends_on('fftw+float+double') depends_on('fltk', when='+gui') - # cuda 9 not yet supported - # https://github.com/3dem/relion/issues/296 - depends_on('cuda@8.0:8.99', when='+cuda') - # use gcc < 5 when compiled with cuda 8 - conflicts('%gcc@5:', when='+cuda') + depends_on('libtiff') + + # relion 3 supports cuda 9 + # relion < 3 does not + depends_on('cuda', when='+cuda') + depends_on('cuda@9:', when='@3: +cuda') + depends_on('cuda@8.0:8.99', when='@:2 +cuda') def cmake_args(self): + + carch = self.spec.variants['cuda_arch'].value[0] + args = [ '-DCMAKE_C_FLAGS=-g', '-DCMAKE_CXX_FLAGS=-g', @@ -65,14 +81,17 @@ class Relion(CMakePackage, CudaPackage): '-DDoublePrec_GPU=%s' % ('+double-gpu' in self.spec), ] - carch = self.spec.variants['cuda_arch'].value - if '+cuda' in self.spec: - args += [ - '-DCUDA=on', - ] - if carch is not None: - args += [ - '-DCUDA_ARCH=%s' % (carch), - ] + # relion+cuda requires selecting cuda_arch + if not carch: + raise ValueError("select cuda_arch when building with +cuda") + else: + args += ['-DCUDA=ON', '-DCudaTexture=ON', + '-DCUDA_ARCH=%s' % (carch)] + + # these new values were added in relion 3 + # do not seem to cause problems with < 3 + else: + args += ['-DMKLFFT=ON', '-DFORCE_OWN_TBB=ON', '-DALTCPU=ON'] + return args -- cgit v1.2.3-70-g09d2 From cde5116bb2aca54e2bdb36ef967f458ec8b0561e Mon Sep 17 00:00:00 2001 From: Sajid Ali <30510036+s-sajid-ali@users.noreply.github.com> Date: Thu, 16 Aug 2018 11:26:43 -0500 Subject: Add blis package (#8925) --- var/spack/repos/builtin/packages/blis/package.py | 136 +++++++++++++++++++++++ 1 file changed, 136 insertions(+) create mode 100644 var/spack/repos/builtin/packages/blis/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/blis/package.py b/var/spack/repos/builtin/packages/blis/package.py new file mode 100644 index 0000000000..cf9ed62d28 --- /dev/null +++ b/var/spack/repos/builtin/packages/blis/package.py @@ -0,0 +1,136 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + +# Although this looks like an Autotools package, it's not one. Refer to: +# https://github.com/flame/blis/issues/17 +# https://github.com/flame/blis/issues/195 +# https://github.com/flame/blis/issues/197 + + +class Blis(Package): + """BLIS is a portable software framework for instantiating high-performance + BLAS-like dense linear algebra libraries. The framework was designed to + isolate essential kernels of computation that, when optimized, immediately + enable optimized implementations of most of its commonly used and + computationally intensive operations. BLIS is written in ISO C99 and + available under a new/modified/3-clause BSD license. While BLIS exports a + new BLAS-like API, it also includes a BLAS compatibility layer which gives + application developers access to BLIS implementations via traditional BLAS + routine calls. An object-based API unique to BLIS is also available.""" + + homepage = "https://github.com/flame/blis" + url = "https://github.com/flame/blis/archive/0.4.0.tar.gz" + git = "https://github.com/flame/blis.git" + + version('develop', branch='master') + version('0.4.0', sha256='9c7efd75365a833614c01b5adfba93210f869d92e7649e0b5d9edc93fc20ea76') + version('0.3.2', sha256='b87e42c73a06107d647a890cbf12855925777dc7124b0c7698b90c5effa7f58f') + version('0.3.1', sha256='957f28d47c5cf71ffc62ce8cc1277e17e44d305b1c2fa8506b0b55617a9f28e4') + version('0.3.0', sha256='d34d17df7bdc2be8771fe0b7f867109fd10437ac91e2a29000a4a23164c7f0da') + version('0.2.2', sha256='4a7ecb56034fb20e9d1d8b16e2ef587abbc3d30cb728e70629ca7e795a7998e8') + + depends_on('python@2.7:2.8,3.4:', type=('build', 'run')) + + variant( + 'threads', default='none', + description='Multithreading support', + values=('pthreads', 'openmp', 'none'), + multi=False + ) + + variant( + 'blas', default=True, + description='BLAS compatibility', + ) + + variant( + 'cblas', default=False, + description='CBLAS compatibility', + ) + + variant( + 'shared', default=True, + description='Build shared library', + ) + + variant( + 'static', default=True, + description='Build static library', + ) + + # TODO: add cpu variants. Currently using auto. + # If one knl, should the default be memkind ? + + # BLIS has it's own API but can be made compatible with BLAS + # enabling CBLAS automatically enables BLAS. + + provides('blas', when="+blas") + provides('blas', when="+cblas") + + phases = ['configure', 'build', 'install'] + + def configure(self, spec, prefix): + config_args = [] + + config_args.append("--enable-threading=" + + spec.variants['threads'].value) + + if '+cblas' in spec: + config_args.append("--enable-cblas") + else: + config_args.append("--disable-cblas") + + if '+blas' in spec: + config_args.append("--enable-blas") + else: + config_args.append("--disable-blas") + + if '+shared' in spec: + config_args.append("--enable-shared") + else: + config_args.append("--disable-shared") + + if '+static' in spec: + config_args.append("--enable-static") + else: + config_args.append("--disable-static") + + # FIXME: add cpu isa variants. + config_args.append("auto") + + configure("--prefix=" + prefix, + *config_args) + + def build(self, spec, prefix): + make() + + @run_after('build') + @on_package_attributes(run_tests=True) + def check(self): + make('check') + + def install(self, spec, prefix): + make('install') -- cgit v1.2.3-70-g09d2 From 2f8168c778fc997628022d33ac17ee34bdfc6cd4 Mon Sep 17 00:00:00 2001 From: rvinaybharadwaj Date: Thu, 16 Aug 2018 13:22:45 -0600 Subject: fix for issue #8845 (#8988) --- var/spack/repos/builtin/packages/nekbone/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nekbone/package.py b/var/spack/repos/builtin/packages/nekbone/package.py index 7dbef6df0e..cad14fa177 100644 --- a/var/spack/repos/builtin/packages/nekbone/package.py +++ b/var/spack/repos/builtin/packages/nekbone/package.py @@ -62,7 +62,7 @@ class Nekbone(Package): cc = spec['mpi'].mpicc # Install Nekbone in prefix.bin - install_tree("../Nekbone", prefix.bin.Nekbone) + install_tree(self.stage.source_path, prefix.bin.Nekbone) # Install scripts in prefix.bin nekpmpi = 'test/example1/nekpmpi' -- cgit v1.2.3-70-g09d2 From f838b5e8c093b60916beb7d62d177301688088b2 Mon Sep 17 00:00:00 2001 From: "Michael F. Herbst" Date: Thu, 16 Aug 2018 22:59:26 +0200 Subject: libcint: New version 3.0.12 (#9003) --- var/spack/repos/builtin/packages/libcint/package.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libcint/package.py b/var/spack/repos/builtin/packages/libcint/package.py index 863603182e..e24614876c 100644 --- a/var/spack/repos/builtin/packages/libcint/package.py +++ b/var/spack/repos/builtin/packages/libcint/package.py @@ -35,14 +35,15 @@ class Libcint(CMakePackage): # # Versions # - version('3.0.12', 'e69117782ff9f443373f30c80ecb6ab7') - version('3.0.11', '1fb1db5a426280d38cddbb0098f6c678') - version('3.0.10', 'b368e257dba99febf1cdd1391f2e58a3') - version('3.0.8', '61f415ad9c7854963136c6bba7a661eb') - version('3.0.7', 'f0f3c971c0d5bb5565ac9ab5e271aa79') - version('3.0.6', '1aafd91107e2418f794ce02b9d88ea8b') - version('3.0.5', 'facb1ddabd9497e99d22176a9b9a895f') - version('3.0.4', '55607a61313225ef4434d3e96624a008') + version('3.0.13', sha256='ee64f0bc7fb6073063ac3c9bbef8951feada141e197b1a5cc389c8cccf8dc360') + version('3.0.12', sha256='7409ef41f1465cf4c1ae9834dfc0b0585c0fdc63b55d8ee8b8a7a6d5e31f309d') + version('3.0.11', sha256='4c9c24d4bd4791391848f19a4be5177137aca27a8e0375574101a7a1261157cf') + version('3.0.10', sha256='aac6d9630dc4c62840f03262166e877d3aeaf27b6b33498fb490fa3428f12fe4') + version('3.0.8', sha256='ca94772f74aaf7b8ad4d7c1b09578c9115ec909c3d8b82dacc908c351c631c35') + version('3.0.7', sha256='e603cd90567c6116d4f704ea66a010b447c11052e90db1d91488adc187142ead') + version('3.0.6', sha256='a7d6d46de9be044409270b27727a1d620d21b5fda6aa7291548938e1ced25404') + version('3.0.5', sha256='7bde241ce83c00b89c80459e3af5734d40925d8fd9fcaaa7245f61b08192c722') + version('3.0.4', sha256='0f25ef7ad282dd7a20e4decf283558e4f949243a5423ff4c0cd875276c310c47') # # Variants -- cgit v1.2.3-70-g09d2 From e8e672972a1d010009f2bdc9ed20bee942be88d3 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Thu, 16 Aug 2018 16:10:08 -0700 Subject: binutils@2.31.1: new version (#9007) --- var/spack/repos/builtin/packages/binutils/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/binutils/package.py b/var/spack/repos/builtin/packages/binutils/package.py index 6c3735a351..2f2a9642fa 100644 --- a/var/spack/repos/builtin/packages/binutils/package.py +++ b/var/spack/repos/builtin/packages/binutils/package.py @@ -31,6 +31,7 @@ class Binutils(AutotoolsPackage): homepage = "http://www.gnu.org/software/binutils/" url = "https://ftpmirror.gnu.org/binutils/binutils-2.28.tar.bz2" + version('2.31.1', 'ffcc382695bf947da6135e7436b8ed52d991cf270db897190f19d6f9838564d0') version('2.29.1', '9af59a2ca3488823e453bb356fe0f113') version('2.28', '9e8340c96626b469a603c15c9d843727') version('2.27', '2869c9bf3e60ee97c74ac2a6bf4e9d68') @@ -45,7 +46,7 @@ class Binutils(AutotoolsPackage): variant('gold', default=True, description="build the gold linker") variant('libiberty', default=False, description='Also install libiberty.') - patch('cr16.patch') + patch('cr16.patch', when='@:2.29.1') patch('update_symbol-2.26.patch', when='@2.26') depends_on('zlib') -- cgit v1.2.3-70-g09d2 From f5b4209543c033e507625a1efdb79ecb19a944a3 Mon Sep 17 00:00:00 2001 From: Tom Merrick Date: Thu, 16 Aug 2018 18:11:52 -0500 Subject: Packages/atk (#9002) * initial atk update * Add coreqs * Fixed flake8 errors * corrected gnome's version URLs * Added correct list_url's * Changed list_depth --- .../repos/builtin/packages/at-spi2-atk/package.py | 46 +++++++++++++++++++++ .../repos/builtin/packages/at-spi2-core/package.py | 48 ++++++++++++++++++++++ var/spack/repos/builtin/packages/atk/package.py | 26 ++++++++++-- 3 files changed, 117 insertions(+), 3 deletions(-) create mode 100644 var/spack/repos/builtin/packages/at-spi2-atk/package.py create mode 100644 var/spack/repos/builtin/packages/at-spi2-core/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/at-spi2-atk/package.py b/var/spack/repos/builtin/packages/at-spi2-atk/package.py new file mode 100644 index 0000000000..7ede5cf32b --- /dev/null +++ b/var/spack/repos/builtin/packages/at-spi2-atk/package.py @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class AtSpi2Atk(MesonPackage): + """The At-Spi2 Atk package contains a library that bridges ATK to + At-Spi2 D-Bus service.""" + + homepage = "http://www.linuxfromscratch.org/blfs/view/cvs/x/at-spi2-atk.html" + url = "http://ftp.gnome.org/pub/gnome/sources/at-spi2-atk/2.26/at-spi2-atk-2.26.1.tar.xz" + list_url = "http://ftp.gnome.org/pub/gnome/sources/at-spi2-atk" + list_depth = 1 + + version('2.26.2', '355c7916a69513490cb83ad34016b169') + version('2.26.1', 'eeec6cead3350dca48a235271c105b3e') + + depends_on('at-spi2-core@2.28.0:') + depends_on('atk@2.28.1:') + + def url_for_version(self, version): + """Handle gnome's version-based custom URLs.""" + url = 'http://ftp.gnome.org/pub/gnome/sources/at-spi2-atk' + return url + '/%s/at-spi2-atk-%s.tar.xz' % (version.up_to(2), version) diff --git a/var/spack/repos/builtin/packages/at-spi2-core/package.py b/var/spack/repos/builtin/packages/at-spi2-core/package.py new file mode 100644 index 0000000000..d3a639e194 --- /dev/null +++ b/var/spack/repos/builtin/packages/at-spi2-core/package.py @@ -0,0 +1,48 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class AtSpi2Core(MesonPackage): + """The At-Spi2 Core package provides a Service Provider Interface for the + Assistive Technologies available on the GNOME platform and a library + against which applications can be linked.""" + + homepage = "http://www.linuxfromscratch.org/blfs/view/cvs/x/at-spi2-core.html" + url = "http://ftp.gnome.org/pub/gnome/sources/at-spi2-core/2.28/at-spi2-core-2.28.0.tar.xz" + list_url = "http://ftp.gnome.org/pub/gnome/sources/at-spi2-core" + list_depth = 1 + + version('2.28.0', '9c42f79636ed1c0e908b7483d789b32e') + + depends_on('glib@2.56.1:') + depends_on('dbus@1.12.8:') + depends_on('libx11') + depends_on('libxi') + + def url_for_version(self, version): + """Handle gnome's version-based custom URLs.""" + url = 'http://ftp.gnome.org/pub/gnome/sources/at-spi2-core' + return url + '/%s/at-spi2-core-%s.tar.xz' % (version.up_to(2), version) diff --git a/var/spack/repos/builtin/packages/atk/package.py b/var/spack/repos/builtin/packages/atk/package.py index 6a1b4b25d6..64140d99a7 100644 --- a/var/spack/repos/builtin/packages/atk/package.py +++ b/var/spack/repos/builtin/packages/atk/package.py @@ -25,23 +25,27 @@ from spack import * -class Atk(AutotoolsPackage): +class Atk(Package): """ATK provides the set of accessibility interfaces that are implemented by other toolkits and applications. Using the ATK interfaces, accessibility tools have full access to view and control running applications.""" homepage = "https://developer.gnome.org/atk/" - url = "http://ftp.gnome.org/pub/gnome/sources/atk/2.14/atk-2.14.0.tar.xz" + url = "http://ftp.gnome.org/pub/gnome/sources/atk/2.28/atk-2.28.1.tar.xz" + list_url = "http://ftp.gnome.org/pub/gnome/sources/atk" + list_depth = 1 + version('2.28.1', 'dfb5e7474220afa3f4ca7e45af9f3a11') version('2.20.0', '5187b0972f4d3905f285540b31395e20') version('2.14.0', 'ecb7ca8469a5650581b1227d78051b8b') + depends_on('meson', type='build', when='@2.28.0:') depends_on('glib') depends_on('pkgconfig', type='build') depends_on('gobject-introspection') def url_for_version(self, version): - """Handle atk's version-based custom URLs.""" + """Handle gnome's version-based custom URLs.""" url = 'http://ftp.gnome.org/pub/gnome/sources/atk' return url + '/%s/atk-%s.tar.xz' % (version.up_to(2), version) @@ -50,3 +54,19 @@ class Atk(AutotoolsPackage): self.prefix.share) run_env.prepend_path("XDG_DATA_DIRS", self.prefix.share) + + def install(self, spec, prefix): + with working_dir('spack-build', create=True): + meson('..', *std_meson_args) + ninja('-v') + ninja('install') + + @when('@:2.27') + def install(self, spec, prefix): + configure('--prefix={0}'.format(prefix)) + make() + if self.run_tests: + make('check') + make('install') + if self.run_tests: + make('installcheck') -- cgit v1.2.3-70-g09d2 From e92e14e330c736ecdd59290deee052b14f02fe7b Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Thu, 16 Aug 2018 17:38:02 -0700 Subject: gperftools@2.7: new version; homepage, URL, hash updates (#9010) * gperftools@2.7: new version * gperftools: update homepage & url The URL in the homepage field of the gperftools package redirects to its GitHub repo, and the URL for version 2.3 returns a 404 error. This commit updates both fields to the most recent sensible values. * gperftools: update commit hashes to sha256 This commit deletes the url field for all listed versions because it is no longer needed as a result of updating the package url field. In addition, all commit hashes are updated to SHA256. --- var/spack/repos/builtin/packages/gperftools/package.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gperftools/package.py b/var/spack/repos/builtin/packages/gperftools/package.py index 984f9834c1..a60c86cfec 100644 --- a/var/spack/repos/builtin/packages/gperftools/package.py +++ b/var/spack/repos/builtin/packages/gperftools/package.py @@ -31,12 +31,11 @@ class Gperftools(AutotoolsPackage): heap-profiler, and cpu-profiler. """ - homepage = "https://code.google.com/p/gperftools" - url = "https://googledrive.com/host/0B6NtGsLhIcf7MWxMMF9JdTN3UVk/gperftools-2.3.tar.gz" + homepage = "https://github.com/gperftools/gperftools" + url = "https://github.com/gperftools/gperftools/releases/download/gperftools-2.7/gperftools-2.7.tar.gz" - version('2.4', '2171cea3bbe053036fb5d5d25176a160', - url="https://github.com/gperftools/gperftools/releases/download/gperftools-2.4/gperftools-2.4.tar.gz") - version('2.3', 'f54dd119f0e46ac1f13264f8d97adf90', - url="https://googledrive.com/host/0B6NtGsLhIcf7MWxMMF9JdTN3UVk/gperftools-2.3.tar.gz") + version('2.7', '1ee8c8699a0eff6b6a203e59b43330536b22bbcbe6448f54c7091e5efb0763c9') + version('2.4', '982a37226eb42f40714e26b8076815d5ea677a422fb52ff8bfca3704d9c30a2d') + version('2.3', '093452ad45d639093c144b4ec732a3417e8ee1f3744f2b0f8d45c996223385ce') depends_on("unwind") -- cgit v1.2.3-70-g09d2 From c06c02bce590da930d250bb4e6535f547faa09e3 Mon Sep 17 00:00:00 2001 From: "Mark W. Krentel" Date: Fri, 17 Aug 2018 08:22:04 -0500 Subject: libunwind: add version 1.3-rc1 and variant xz (#8989) * libunwind: add version 1.3-rc1 and variant xz Version 1.3-rc1 is the latest published snapshot from libunwind. Variant xz adds spack-built support for reading compressed symbol tables, or else disables this feature. Without the variant, libunwind will look for liblzma in /usr/lib. * Add preferred=True to version 1.2.1 as the last official stable release. --- .../repos/builtin/packages/libunwind/package.py | 24 +++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libunwind/package.py b/var/spack/repos/builtin/packages/libunwind/package.py index 3c5c60aa21..c44f902284 100644 --- a/var/spack/repos/builtin/packages/libunwind/package.py +++ b/var/spack/repos/builtin/packages/libunwind/package.py @@ -28,13 +28,31 @@ from spack import * class Libunwind(AutotoolsPackage): """A portable and efficient C programming interface (API) to determine the call-chain of a program.""" + homepage = "http://www.nongnu.org/libunwind/" url = "http://download.savannah.gnu.org/releases/libunwind/libunwind-1.1.tar.gz" + version('1.3-rc1', 'f09b670de5db6430a3de666e6aed60e3') + version('1.2.1', '06ba9e60d92fd6f55cd9dadb084df19e', preferred=True) + version('1.1', 'fb4ea2f6fbbe45bf032cd36e586883ce') + + variant('xz', default=False, + description='Support xz (lzma) compressed symbol tables.') + + depends_on('xz', type='link', when='+xz') + conflicts('platform=darwin', msg='Non-GNU libunwind needs ELF libraries Darwin does not have') - version('1.2.1', '06ba9e60d92fd6f55cd9dadb084df19e') - version('1.1', 'fb4ea2f6fbbe45bf032cd36e586883ce') - provides('unwind') + + def configure_args(self): + spec = self.spec + args = [] + + if '+xz' in spec: + args.append('--enable-minidebuginfo') + else: + args.append('--disable-minidebuginfo') + + return args -- cgit v1.2.3-70-g09d2 From e04fb382b17ecab15ab7dffe3f92a4a282d4a256 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Fri, 17 Aug 2018 15:22:30 +0200 Subject: libmongoc: Fix build (#9012) libmongoc requires pkg-config to detect several of its dependencies. --- var/spack/repos/builtin/packages/libmongoc/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libmongoc/package.py b/var/spack/repos/builtin/packages/libmongoc/package.py index 56c3e0992d..a0455b4ce7 100644 --- a/var/spack/repos/builtin/packages/libmongoc/package.py +++ b/var/spack/repos/builtin/packages/libmongoc/package.py @@ -51,6 +51,7 @@ class Libmongoc(AutotoolsPackage): depends_on('automake', type='build', when='@1.8.1') depends_on('libtool', type='build', when='@1.8.1') depends_on('m4', type='build', when='@1.8.1') + depends_on('pkgconfig', type='build') depends_on('libbson') -- cgit v1.2.3-70-g09d2 From 99492dc910a93c6d44ab37e5331b67dba0c4cbaf Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Fri, 17 Aug 2018 14:51:49 -0500 Subject: Specify Python executable in VTK package (#9000) --- var/spack/repos/builtin/packages/vtk/package.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py index e413b4c4e6..22c9c4fe77 100644 --- a/var/spack/repos/builtin/packages/vtk/package.py +++ b/var/spack/repos/builtin/packages/vtk/package.py @@ -116,15 +116,20 @@ class Vtk(CMakePackage): '-DNETCDF_C_ROOT={0}'.format(spec['netcdf'].prefix), '-DNETCDF_CXX_ROOT={0}'.format(spec['netcdf-cxx'].prefix), - # Enable/Disable wrappers for Python. - '-DVTK_WRAP_PYTHON={0}'.format( - 'ON' if '+python' in spec else 'OFF'), - # Disable wrappers for other languages. '-DVTK_WRAP_JAVA=OFF', '-DVTK_WRAP_TCL=OFF', ] + # Enable/Disable wrappers for Python. + if '+python' in spec: + cmake_args.extend([ + '-DVTK_WRAP_PYTHON=ON', + '-DPYTHON_EXECUTABLE={0}'.format(spec['python'].command.path) + ]) + else: + cmake_args.append('-DVTK_WRAP_PYTHON=OFF') + if 'darwin' in spec.architecture: cmake_args.extend([ '-DCMAKE_MACOSX_RPATH=ON' -- cgit v1.2.3-70-g09d2 From a7a674512013d4c79fda14dbbf98bced955c437b Mon Sep 17 00:00:00 2001 From: Jim Galarowicz Date: Fri, 17 Aug 2018 17:58:08 -0500 Subject: qtgraph and cbtf-argonavis create proper library paths in modules (#8797) --- var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py | 10 +++++++++- var/spack/repos/builtin/packages/qtgraph/package.py | 9 ++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py index 668cd5c8d5..7e2b1db644 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py @@ -41,6 +41,7 @@ ########################################################################## from spack import * +import os class CbtfArgonavisGui(QMakePackage): @@ -107,10 +108,17 @@ class CbtfArgonavisGui(QMakePackage): # The implementor of qtgraph has set up the library and include # paths in a non-conventional way. We reflect that here. + # What library suffix should be used based on library existence + if os.path.isdir(self.spec['qtgraph'].prefix.lib64): + qtgraph_lib_dir = self.spec['qtgraph'].prefix.lib64 + else: + qtgraph_lib_dir = self.spec['qtgraph'].prefix.lib + run_env.prepend_path( 'LD_LIBRARY_PATH', join_path( - self.spec['qtgraph'].prefix.lib64, + qtgraph_lib_dir, '{0}'.format(self.spec['qt'].version.up_to(3)))) + # The openspeedshop libraries are needed to actually load the # performance information into the GUI. run_env.prepend_path( diff --git a/var/spack/repos/builtin/packages/qtgraph/package.py b/var/spack/repos/builtin/packages/qtgraph/package.py index cf8f229273..57d374d902 100644 --- a/var/spack/repos/builtin/packages/qtgraph/package.py +++ b/var/spack/repos/builtin/packages/qtgraph/package.py @@ -40,6 +40,7 @@ # Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * +import os class Qtgraph(QMakePackage): @@ -66,11 +67,17 @@ class Qtgraph(QMakePackage): spack_env.set('GRAPHVIZ_ROOT', self.spec['graphviz'].prefix) spack_env.set('INSTALL_ROOT', self.prefix) + # What library suffix should be used based on library existence + if os.path.isdir(self.prefix.lib64): + lib_dir = self.prefix.lib64 + else: + lib_dir = self.prefix.lib + # The implementor has set up the library and include paths in # a non-conventional way. We reflect that here. run_env.prepend_path( 'LD_LIBRARY_PATH', join_path( - self.prefix.lib64, + lib_dir, '{0}'.format(self.spec['qt'].version.up_to(3)))) run_env.prepend_path('CPATH', self.prefix.include.QtGraph) -- cgit v1.2.3-70-g09d2 From 638cc64571fd038f5ae7f47a664399b9f2629d66 Mon Sep 17 00:00:00 2001 From: scheibelp Date: Fri, 17 Aug 2018 22:08:38 -0400 Subject: install_tree: symlink handling and add 'ignore' option (#9019) Fixes #9001 #8289 added support for install_tree and copy_tree to merge into an existing directory structure. However, it did not properly handle relative symlinks and also removed support for the 'ignore' keyword. Additionally, some of the tests were overly-strict when checking the permissions on the copied files. This updates the install_tree/copy_tree methods and their tests: * copy_tree/install_tree now preserve relative link targets (if the symlink in the source directory structure is relative, the symlink created in the destination will be relative) * Added support for 'ignore' argument back to copy_tree/install_tree (removed in #8289). It is no longer the object output by shutil.ignore_patterns: you pass a function that accepts a path relative to the source and returns whether that path should be copied. * The openfoam packages (currently the only ones making use of the 'ignore' argument) are updated for the new API * When a symlink target is absolute, copy_tree and install_tree now rewrite the source prefix to be the destination prefix * copy_tree tests no longer check permissions: copy_tree doesn't enforce anything about permissions so its tests don't check for that * install_tree tests no longer check for exact permission matching since it can add file permissions --- lib/spack/llnl/util/filesystem.py | 68 +++++++++++++++++----- lib/spack/spack/test/llnl/util/filesystem.py | 37 ++++++++++-- .../repos/builtin/packages/foam-extend/package.py | 11 ++-- .../repos/builtin/packages/openfoam-com/package.py | 6 +- .../repos/builtin/packages/openfoam-org/package.py | 6 +- 5 files changed, 98 insertions(+), 30 deletions(-) (limited to 'var') diff --git a/lib/spack/llnl/util/filesystem.py b/lib/spack/llnl/util/filesystem.py index 40eb6a7aa8..7dacb9804f 100644 --- a/lib/spack/llnl/util/filesystem.py +++ b/lib/spack/llnl/util/filesystem.py @@ -306,7 +306,21 @@ def install(src, dest): copy(src, dest, _permissions=True) -def copy_tree(src, dest, symlinks=True, _permissions=False): +def resolve_link_target_relative_to_the_link(l): + """ + os.path.isdir uses os.path.exists, which for links will check + the existence of the link target. If the link target is relative to + the link, we need to construct a pathname that is valid from + our cwd (which may not be the same as the link's directory) + """ + target = os.readlink(l) + if os.path.isabs(target): + return target + link_dir = os.path.dirname(os.path.abspath(l)) + return os.path.join(link_dir, target) + + +def copy_tree(src, dest, symlinks=True, ignore=None, _permissions=False): """Recursively copy an entire directory tree rooted at *src*. If the destination directory *dest* does not already exist, it will @@ -317,10 +331,14 @@ def copy_tree(src, dest, symlinks=True, _permissions=False): will be copied as far as the platform allows; if false, the contents and metadata of the linked files are copied to the new tree. + If *ignore* is set, then each path relative to *src* will be passed to + this function; the function returns whether that path should be skipped. + Parameters: src (str): the directory to copy dest (str): the destination directory symlinks (bool): whether or not to preserve symlinks + ignore (function): function indicating which files to ignore _permissions (bool): for internal use only """ if _permissions: @@ -330,23 +348,41 @@ def copy_tree(src, dest, symlinks=True, _permissions=False): mkdirp(dest) - for s, d in traverse_tree(src, dest, order='pre', follow_nonexisting=True): - if symlinks and os.path.islink(s): - # Note that this won't rewrite absolute links into the old - # root to point at the new root. Should we handle that case? - target = os.readlink(s) - os.symlink(os.path.abspath(target), d) - elif os.path.isdir(s): - mkdirp(d) + src = os.path.abspath(src) + dest = os.path.abspath(dest) + + for s, d in traverse_tree(src, dest, order='pre', + follow_symlinks=not symlinks, + ignore=ignore, + follow_nonexisting=True): + if os.path.islink(s): + link_target = resolve_link_target_relative_to_the_link(s) + if symlinks: + target = os.readlink(s) + if os.path.isabs(target): + new_target = re.sub(src, dest, target) + if new_target != target: + tty.debug("Redirecting link {0} to {1}" + .format(target, new_target)) + target = new_target + + os.symlink(target, d) + elif os.path.isdir(link_target): + mkdirp(d) + else: + shutil.copyfile(s, d) else: - shutil.copyfile(s, d) + if os.path.isdir(s): + mkdirp(d) + else: + shutil.copyfile(s, d) if _permissions: set_install_permissions(d) copy_mode(s, d) -def install_tree(src, dest, symlinks=True): +def install_tree(src, dest, symlinks=True, ignore=None): """Recursively install an entire directory tree rooted at *src*. Same as :py:func:`copy_tree` with the addition of setting proper @@ -356,8 +392,9 @@ def install_tree(src, dest, symlinks=True): src (str): the directory to install dest (str): the destination directory symlinks (bool): whether or not to preserve symlinks + ignore (function): function indicating which files to ignore """ - copy_tree(src, dest, symlinks, _permissions=True) + copy_tree(src, dest, symlinks=symlinks, ignore=ignore, _permissions=True) def is_exe(path): @@ -564,7 +601,7 @@ def traverse_tree(source_root, dest_root, rel_path='', **kwargs): Keyword Arguments: order (str): Whether to do pre- or post-order traversal. Accepted values are 'pre' and 'post' - ignore (str): Predicate indicating which files to ignore + ignore (function): function indicating which files to ignore follow_nonexisting (bool): Whether to descend into directories in ``src`` that do not exit in ``dest``. Default is True follow_links (bool): Whether to descend into symlinks in ``src`` @@ -578,7 +615,7 @@ def traverse_tree(source_root, dest_root, rel_path='', **kwargs): raise ValueError("Order must be 'pre' or 'post'.") # List of relative paths to ignore under the src root. - ignore = kwargs.get('ignore', lambda filename: False) + ignore = kwargs.get('ignore', None) or (lambda filename: False) # Don't descend into ignored directories if ignore(rel_path): @@ -597,6 +634,9 @@ def traverse_tree(source_root, dest_root, rel_path='', **kwargs): rel_child = os.path.join(rel_path, f) # Treat as a directory + # TODO: for symlinks, os.path.isdir looks for the link target. If the + # target is relative to the link, then that may not resolve properly + # relative to our cwd - see resolve_link_target_relative_to_the_link if os.path.isdir(source_child) and ( follow_links or not os.path.islink(source_child)): diff --git a/lib/spack/spack/test/llnl/util/filesystem.py b/lib/spack/spack/test/llnl/util/filesystem.py index 7701185dbe..24ab02a613 100644 --- a/lib/spack/spack/test/llnl/util/filesystem.py +++ b/lib/spack/spack/test/llnl/util/filesystem.py @@ -26,6 +26,7 @@ import llnl.util.filesystem as fs import os +import stat import pytest @@ -45,8 +46,10 @@ def stage(tmpdir_factory): fs.touchp('source/c/d/6') fs.touchp('source/c/d/e/7') - # Create symlink + # Create symlinks os.symlink(os.path.abspath('source/1'), 'source/2') + os.symlink('b/2', 'source/a/b2') + os.symlink('a/b', 'source/f') # Create destination directory fs.mkdirp('dest') @@ -64,7 +67,6 @@ class TestCopy: fs.copy('source/1', 'dest/1') assert os.path.exists('dest/1') - assert os.stat('source/1').st_mode == os.stat('dest/1').st_mode def test_dir_dest(self, stage): """Test using a directory as the destination.""" @@ -73,7 +75,14 @@ class TestCopy: fs.copy('source/1', 'dest') assert os.path.exists('dest/1') - assert os.stat('source/1').st_mode == os.stat('dest/1').st_mode + + +def check_added_exe_permissions(src, dst): + src_mode = os.stat(src).st_mode + dst_mode = os.stat(dst).st_mode + for perm in [stat.S_IXUSR, stat.S_IXGRP, stat.S_IXOTH]: + if src_mode & perm: + assert dst_mode & perm class TestInstall: @@ -86,7 +95,7 @@ class TestInstall: fs.install('source/1', 'dest/1') assert os.path.exists('dest/1') - assert os.stat('source/1').st_mode == os.stat('dest/1').st_mode + check_added_exe_permissions('source/1', 'dest/1') def test_dir_dest(self, stage): """Test using a directory as the destination.""" @@ -95,7 +104,7 @@ class TestInstall: fs.install('source/1', 'dest') assert os.path.exists('dest/1') - assert os.stat('source/1').st_mode == os.stat('dest/1').st_mode + check_added_exe_permissions('source/1', 'dest/1') class TestCopyTree: @@ -126,6 +135,24 @@ class TestCopyTree: assert os.path.exists('dest/2') assert os.path.islink('dest/2') + assert os.path.exists('dest/a/b2') + with fs.working_dir('dest/a'): + assert os.path.exists(os.readlink('b2')) + + assert (os.path.realpath('dest/f/2') == + os.path.abspath('dest/a/b/2')) + assert os.path.realpath('dest/2') == os.path.abspath('dest/1') + + def test_symlinks_true_ignore(self, stage): + """Test copying when specifying relative paths that should be ignored + """ + with fs.working_dir(str(stage)): + ignore = lambda p: p in ['c/d/e', 'a'] + fs.copy_tree('source', 'dest', symlinks=True, ignore=ignore) + assert not os.path.exists('dest/a') + assert os.path.exists('dest/c/d') + assert not os.path.exists('dest/c/d/e') + def test_symlinks_false(self, stage): """Test copying without symlink preservation.""" diff --git a/var/spack/repos/builtin/packages/foam-extend/package.py b/var/spack/repos/builtin/packages/foam-extend/package.py index 7de30232a3..2821c58eb9 100644 --- a/var/spack/repos/builtin/packages/foam-extend/package.py +++ b/var/spack/repos/builtin/packages/foam-extend/package.py @@ -54,7 +54,6 @@ ############################################################################## import glob import re -import shutil import os from spack import * @@ -382,7 +381,6 @@ class FoamExtend(Package): def install(self, spec, prefix): """Install under the projectdir""" - opts = str(self.foam_arch) # Fairly ugly since intermediate targets are scattered inside sources appdir = 'applications' @@ -419,19 +417,22 @@ class FoamExtend(Package): subitem = join_path(appdir, 'Allwmake') install(subitem, join_path(self.projectdir, subitem)) - ignored = [opts] # Ignore intermediate targets + foam_arch_str = str(self.foam_arch) + # Ignore intermediate targets + ignore = lambda p: os.path.basename(p) == foam_arch_str + for d in ['src', 'tutorials']: install_tree( d, join_path(self.projectdir, d), - ignore=shutil.ignore_patterns(*ignored), + ignore=ignore, symlinks=True) for d in ['solvers', 'utilities']: install_tree( join_path(appdir, d), join_path(self.projectdir, appdir, d), - ignore=shutil.ignore_patterns(*ignored), + ignore=ignore, symlinks=True) etc_dir = join_path(self.projectdir, 'etc') diff --git a/var/spack/repos/builtin/packages/openfoam-com/package.py b/var/spack/repos/builtin/packages/openfoam-com/package.py index 08d5dbcf8b..7613d688f7 100644 --- a/var/spack/repos/builtin/packages/openfoam-com/package.py +++ b/var/spack/repos/builtin/packages/openfoam-com/package.py @@ -60,7 +60,6 @@ ############################################################################## import glob import re -import shutil import os from spack import * @@ -692,12 +691,13 @@ class OpenfoamCom(Package): dirs.extend(['doc']) # Install platforms (and doc) skipping intermediate targets - ignored = ['src', 'applications', 'html', 'Guides'] + relative_ignore_paths = ['src', 'applications', 'html', 'Guides'] + ignore = lambda p: p in relative_ignore_paths for d in dirs: install_tree( d, join_path(self.projectdir, d), - ignore=shutil.ignore_patterns(*ignored), + ignore=ignore, symlinks=True) etc_dir = join_path(self.projectdir, 'etc') diff --git a/var/spack/repos/builtin/packages/openfoam-org/package.py b/var/spack/repos/builtin/packages/openfoam-org/package.py index dfb3af51f6..9db7597c49 100644 --- a/var/spack/repos/builtin/packages/openfoam-org/package.py +++ b/var/spack/repos/builtin/packages/openfoam-org/package.py @@ -55,7 +55,6 @@ ############################################################################## import glob import re -import shutil import os import llnl.util.tty as tty @@ -345,12 +344,13 @@ class OpenfoamOrg(Package): dirs.extend(['doc']) # Install platforms (and doc) skipping intermediate targets - ignored = ['src', 'applications', 'html', 'Guides'] + relative_ignore_paths = ['src', 'applications', 'html', 'Guides'] + ignore = lambda p: p in relative_ignore_paths for d in dirs: install_tree( d, join_path(self.projectdir, d), - ignore=shutil.ignore_patterns(*ignored), + ignore=ignore, symlinks=True) etc_dir = join_path(self.projectdir, 'etc') -- cgit v1.2.3-70-g09d2 From ce682165749d76d55571538f1612b1cfa69c2c59 Mon Sep 17 00:00:00 2001 From: "Michael F. Herbst" Date: Sat, 18 Aug 2018 16:22:16 +0200 Subject: Update bohrium version (#9020) --- var/spack/repos/builtin/packages/bohrium/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bohrium/package.py b/var/spack/repos/builtin/packages/bohrium/package.py index 704240d311..097b9d9194 100644 --- a/var/spack/repos/builtin/packages/bohrium/package.py +++ b/var/spack/repos/builtin/packages/bohrium/package.py @@ -42,7 +42,8 @@ class Bohrium(CMakePackage, CudaPackage): # Versions # version("develop", branch="master") - version('0.9.0', sha256="6f6379f1555de5a6a19138beac891a470df7df1fc9594e2b9404cf01b6e17d93") + version('0.9.1', sha256='a8675db35ea4587ef12d5885a1aa19b59fd9c3f1366e239059de8b0f3cf51e04') + version('0.9.0', sha256='6f6379f1555de5a6a19138beac891a470df7df1fc9594e2b9404cf01b6e17d93') # # Variants -- cgit v1.2.3-70-g09d2 From 879bdec2850044b9fd180e5220e6632c69dc9b9a Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sat, 18 Aug 2018 11:19:24 -0500 Subject: CBLAS: Don't hardcode BLAS library name (#9017) --- var/spack/repos/builtin/packages/cblas/package.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cblas/package.py b/var/spack/repos/builtin/packages/cblas/package.py index d5ce17c99d..0917dd70f2 100644 --- a/var/spack/repos/builtin/packages/cblas/package.py +++ b/var/spack/repos/builtin/packages/cblas/package.py @@ -42,10 +42,10 @@ class Cblas(Package): def patch(self): mf = FileFilter('Makefile.in') - mf.filter('^BLLIB =.*', 'BLLIB = %s/libblas.a' % - self.spec['blas'].prefix.lib) + mf.filter('^BLLIB =.*', 'BLLIB = {0}'.format( + ' '.join(self.spec['blas'].libs.libraries))) mf.filter('^CC =.*', 'CC = cc') - mf.filter('^FC =.*', 'FC = f90') + mf.filter('^FC =.*', 'FC = fc') def install(self, spec, prefix): make('all') @@ -53,6 +53,6 @@ class Cblas(Package): mkdirp(prefix.include) # Rename the generated lib file to libcblas.a - install('./lib/cblas_LINUX.a', '%s/libcblas.a' % prefix.lib) - install('./include/cblas.h', '%s' % prefix.include) - install('./include/cblas_f77.h', '%s' % prefix.include) + install('lib/cblas_LINUX.a', prefix.lib.join('libcblas.a')) + install('include/cblas.h', prefix.include) + install('include/cblas_f77.h', prefix.include) -- cgit v1.2.3-70-g09d2 From d14991a261a605c76e0b644ffa4d2e012003759a Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sat, 18 Aug 2018 11:19:40 -0500 Subject: Fix missing makefile variable in clapack package (#9016) --- var/spack/repos/builtin/packages/clapack/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/clapack/package.py b/var/spack/repos/builtin/packages/clapack/package.py index dd0076db43..e7832ef4ec 100644 --- a/var/spack/repos/builtin/packages/clapack/package.py +++ b/var/spack/repos/builtin/packages/clapack/package.py @@ -50,6 +50,7 @@ class Clapack(MakefilePackage): make_inc = FileFilter('make.inc') make_inc.filter(r'^BLASLIB.*', 'BLASLIB = ../../libcblaswr.a -lcblas -latlas') + makefile = FileFilter('Makefile') makefile.filter(r'^lib.*', 'lib: variants lapacklib tmglib') -- cgit v1.2.3-70-g09d2 From 412832159bfde08e66eb9c798f1f24cc0cea3d2e Mon Sep 17 00:00:00 2001 From: Abhinav Bhatele Date: Sat, 18 Aug 2018 09:25:05 -0700 Subject: scorep: make optional packages variants (#9011) * scorep: make optional packages variants add packages for cube sub-components: cubew, cubelib * fix style errors --- .../repos/builtin/packages/cubelib/package.py | 44 ++++++++++++++++ var/spack/repos/builtin/packages/cubew/package.py | 44 ++++++++++++++++ var/spack/repos/builtin/packages/scorep/package.py | 61 ++++++++++++++-------- 3 files changed, 128 insertions(+), 21 deletions(-) create mode 100644 var/spack/repos/builtin/packages/cubelib/package.py create mode 100644 var/spack/repos/builtin/packages/cubew/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cubelib/package.py b/var/spack/repos/builtin/packages/cubelib/package.py new file mode 100644 index 0000000000..5a6a7844b7 --- /dev/null +++ b/var/spack/repos/builtin/packages/cubelib/package.py @@ -0,0 +1,44 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Cubelib(AutotoolsPackage): + """Component of CubeBundle: General purpose C++ library and tools """ + + homepage = "http://www.scalasca.org/software/cube-4.x/download.html" + url = "http://apps.fz-juelich.de/scalasca/releases/cube/4.4/dist/cubelib-4.4.tar.gz" + + version('4.4', 'c903f3c44d3228ebefd00c831966988e') + + depends_on('zlib') + + def configure_args(self): + configure_args = ['--enable-shared'] + + return configure_args + + def install(self, spec, prefix): + make('install', parallel=False) diff --git a/var/spack/repos/builtin/packages/cubew/package.py b/var/spack/repos/builtin/packages/cubew/package.py new file mode 100644 index 0000000000..79d7c0617c --- /dev/null +++ b/var/spack/repos/builtin/packages/cubew/package.py @@ -0,0 +1,44 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Cubew(AutotoolsPackage): + """Component of CubeBundle: High performance C Writer library """ + + homepage = "http://www.scalasca.org/software/cube-4.x/download.html" + url = "http://apps.fz-juelich.de/scalasca/releases/cube/4.4/dist/cubew-4.4.tar.gz" + + version('4.4', 'e9beb140719c2ad3d971e1efb99e0916') + + depends_on('zlib') + + def configure_args(self): + configure_args = ['--enable-shared'] + + return configure_args + + def install(self, spec, prefix): + make('install', parallel=True) diff --git a/var/spack/repos/builtin/packages/scorep/package.py b/var/spack/repos/builtin/packages/scorep/package.py index 246ff59192..715006255c 100644 --- a/var/spack/repos/builtin/packages/scorep/package.py +++ b/var/spack/repos/builtin/packages/scorep/package.py @@ -43,13 +43,20 @@ class Scorep(AutotoolsPackage): patch('gcc7.patch', when='@:3') - ########## + variant('mpi', default=True, description="Enable MPI support") + variant('papi', default=True, description="Enable PAPI") + variant('pdt', default=False, description="Enable PDT") + variant('shmem', default=False, description='Enable shmem tracing') + # Dependencies for SCORE-P are quite tight. See the homepage for more - # information. + # information. Starting with scorep 4.0 / cube 4.4, Score-P only depends on + # two components of cube -- cubew and cubelib. + # SCOREP 4 depends_on('otf2@2.1:', when='@4:') depends_on('opari2@2.0:', when='@4:') - depends_on('cube@4.4:', when='@4:') + depends_on('cubew@4.4:', when='@4:') + depends_on('cubelib@4.4:', when='@4:') # SCOREP 3 depends_on('otf2@2:', when='@3:3.99') depends_on('opari2@2:', when='@3:3.99') @@ -66,13 +73,10 @@ class Scorep(AutotoolsPackage): depends_on("otf2@1.4", when='@1.3') depends_on("opari2@1.1.4", when='@1.3') depends_on("cube@4.2.3", when='@1.3') - ########## - depends_on("mpi") - depends_on("papi") - depends_on('pdt') - - variant('shmem', default=False, description='Enable shmem tracing') + depends_on('mpi', when="+mpi") + depends_on('papi', when="+papi") + depends_on('pdt', when="+pdt") # Score-P requires a case-sensitive file system, and therefore # does not work on macOS @@ -85,15 +89,29 @@ class Scorep(AutotoolsPackage): config_args = [ "--with-otf2=%s" % spec['otf2'].prefix.bin, "--with-opari2=%s" % spec['opari2'].prefix.bin, - "--with-cube=%s" % spec['cube'].prefix.bin, - "--with-papi-header=%s" % spec['papi'].prefix.include, - "--with-papi-lib=%s" % spec['papi'].prefix.lib, - "--with-pdt=%s" % spec['pdt'].prefix.bin, "--enable-shared"] cname = spec.compiler.name config_args.append('--with-nocross-compiler-suite={0}'.format(cname)) + if self.version >= Version('4.0'): + config_args.append("--with-cubew=%s" % spec['cubew'].prefix.bin) + config_args.append("--with-cubelib=%s" % + spec['cubelib'].prefix.bin) + else: + config_args.append("--with-cube=%s" % spec['cube'].prefix.bin) + + if "+papi" in spec: + config_args.append("--with-papi-header=%s" % + spec['papi'].prefix.include) + config_args.append("--with-papi-lib=%s" % spec['papi'].prefix.lib) + + if "+pdt" in spec: + config_args.append("--with-pdt=%s" % spec['pdt'].prefix.bin) + + config_args += self.with_or_without('shmem') + config_args += self.with_or_without('mpi') + if spec.satisfies('^intel-mpi'): config_args.append('--with-mpi=intel3') elif spec.satisfies('^mpich') or spec.satisfies('^mvapich2'): @@ -101,16 +119,17 @@ class Scorep(AutotoolsPackage): elif spec.satisfies('^openmpi'): config_args.append('--with-mpi=openmpi') - if '~shmem' in spec: - config_args.append("--without-shmem") - config_args.extend([ 'CFLAGS={0}'.format(self.compiler.pic_flag), - 'CXXFLAGS={0}'.format(self.compiler.pic_flag), - 'MPICC={0}'.format(spec['mpi'].mpicc), - 'MPICXX={0}'.format(spec['mpi'].mpicxx), - 'MPIF77={0}'.format(spec['mpi'].mpif77), - 'MPIFC={0}'.format(spec['mpi'].mpifc) + 'CXXFLAGS={0}'.format(self.compiler.pic_flag) ]) + if "+mpi" in spec: + config_args.extend([ + 'MPICC={0}'.format(spec['mpi'].mpicc), + 'MPICXX={0}'.format(spec['mpi'].mpicxx), + 'MPIF77={0}'.format(spec['mpi'].mpif77), + 'MPIFC={0}'.format(spec['mpi'].mpifc) + ]) + return config_args -- cgit v1.2.3-70-g09d2 From f4ee07527cd855c49e0288fc99430f2342c7862a Mon Sep 17 00:00:00 2001 From: "Nichols A. Romero" Date: Sat, 18 Aug 2018 11:26:17 -0500 Subject: QMCPACK Spack Package Update (Summer 2018) (#9008) * QMCPACK now supports QE 6.3. Dropped QE 5.3 due to incompatibilities. * QMCPACK general clean-up of depends_on. * Add QMCPACK 3.5.0 * More robust support of MKL detection in QMCPACK. --- .../repos/builtin/packages/qmcpack/package.py | 33 ++++++++++++++-------- 1 file changed, 21 insertions(+), 12 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/qmcpack/package.py b/var/spack/repos/builtin/packages/qmcpack/package.py index 4caa10f8e3..7d364baa31 100644 --- a/var/spack/repos/builtin/packages/qmcpack/package.py +++ b/var/spack/repos/builtin/packages/qmcpack/package.py @@ -41,6 +41,7 @@ class Qmcpack(CMakePackage): # can occasionally change. # NOTE: 12/19/2017 QMCPACK 3.0.0 does not build properly with Spack. version('develop') + version('3.5.0', tag='v3.5.0') version('3.4.0', tag='v3.4.0') version('3.3.0', tag='v3.3.0') version('3.2.0', tag='v3.2.0') @@ -68,7 +69,7 @@ class Qmcpack(CMakePackage): variant('gui', default=False, description='Install with Matplotlib (long installation time)') variant('qe', default=True, - description='Install with patched Quantum Espresso 5.3.0') + description='Install with patched Quantum Espresso 6.3.0') # cuda variant implies mixed precision variant by default, but there is # no way to express this in variant syntax, need something like @@ -99,23 +100,25 @@ class Qmcpack(CMakePackage): # qmcpack data analysis tools # basic command line tool based on Python and NumPy # blas and lapack patching fails often and so are disabled at this time - depends_on('py-numpy~blas~lapack', type='run', when='+da') + depends_on('py-numpy~blas~lapack', when='+da', type='run') # GUI is optional for data anlysis # py-matplotlib leads to a long complex DAG for dependencies - depends_on('py-matplotlib', type='run', when='+gui') + depends_on('py-matplotlib', when='+gui', type='run') # B-spline basis calculation require a patched version of - # Quantum Espresso 5.3.0 (see QMCPACK manual) - patch_url = 'https://raw.githubusercontent.com/QMCPACK/qmcpack/develop/external_codes/quantum_espresso/add_pw2qmcpack_to_espresso-5.3.0.diff' - patch_checksum = '0d8d7ba805313ddd4c02ee32c96d2f12e7091e9e82e22671d3ad5a24247860c4' - depends_on('quantum-espresso@5.3.0~elpa', + # Quantum Espresso 6.3 (see QMCPACK manual) + # Building explicitly without ELPA due to issues in Quantum Espresso + # Spack package + patch_url = 'https://raw.githubusercontent.com/QMCPACK/qmcpack/develop/external_codes/quantum_espresso/add_pw2qmcpack_to_qe-6.3.diff' + patch_checksum = '2ee346e24926479f5e96f8dc47812173a8847a58354bbc32cf2114af7a521c13' + depends_on('quantum-espresso@6.3~elpa+hdf5', patches=patch(patch_url, sha256=patch_checksum, when='+qe'), - when='+qe+mpi') + when='+qe+mpi', type='run') - depends_on('quantum-espresso@5.3.0~elpa~scalapack~mpi', + depends_on('quantum-espresso@6.3~elpa~scalapack~mpi+hdf5', patches=patch(patch_url, sha256=patch_checksum, when='+qe'), - when='+qe~mpi') + when='+qe~mpi', type='run') # Backport several patches from recent versions of QMCPACK # The test_numerics unit test is broken prior to QMCPACK 3.3.0 @@ -221,10 +224,16 @@ class Qmcpack(CMakePackage): ]) # Additionally, we need to pass the BLAS+LAPACK include directory for - # header files. Intel MKL requires special case due to differences in - # Darwin vs. Linux $MKLROOT naming schemes + # header files. This is to insure vectorized math and FFT libraries + # get properly detected. Intel MKL requires special case due to + # differences in Darwin vs. Linux $MKLROOT naming schemes. This section + # of code is intentionally redundant for backwards compatibility. if 'intel-mkl' in self.spec: lapack_dir = format(join_path(env['MKLROOT'], 'include')) + # Next two lines were introduced in QMCPACK 3.5.0 and later. + # Prior to v3.5.0, these lines should be benign. + args.append('-DENABLE_MKL=1') + args.append('-DMKL_ROOT=%s' % env['MKLROOT']) else: lapack_dir = ':'.join(( spec['lapack'].prefix.include, -- cgit v1.2.3-70-g09d2 From 9628181bd47fec467cd9daa5ea6c22db008eb09e Mon Sep 17 00:00:00 2001 From: Abhinav Bhatele Date: Sat, 18 Aug 2018 16:18:50 -0700 Subject: chatterbug: new spack package (#8994) --- .../repos/builtin/packages/chatterbug/package.py | 65 ++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 var/spack/repos/builtin/packages/chatterbug/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/chatterbug/package.py b/var/spack/repos/builtin/packages/chatterbug/package.py new file mode 100644 index 0000000000..9e27dcc28d --- /dev/null +++ b/var/spack/repos/builtin/packages/chatterbug/package.py @@ -0,0 +1,65 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Chatterbug(MakefilePackage): + """A suite of communication-intensive proxy applications that mimic + commonly found communication patterns in HPC codes. These codes can be + used as synthetic codes for benchmarking, or for trace generation using + Score-P / OTF2. + """ + tags = ['proxy-app'] + + homepage = "https://chatterbug.readthedocs.io" + git = "https://github.com/LLNL/chatterbug.git" + + version('develop', branch='master') + version('1.0', tag='v1.0') + + variant('scorep', default=False, description='Build with Score-P tracing') + + depends_on('mpi') + depends_on('scorep', when='+scorep') + + @property + def build_targets(self): + targets = [] + + targets.append('MPICXX = {0}'.format(self.spec['mpi'].mpicxx)) + + return targets + + def build(self, spec, prefix): + if "+scorep" in spec: + make('WITH_OTF2=YES') + else: + make() + + def install(self, spec, prefix): + if "+scorep" in spec: + make('WITH_OTF2=YES', 'PREFIX=' + spec.prefix, 'install') + else: + make('PREFIX=' + spec.prefix, 'install') -- cgit v1.2.3-70-g09d2 From 31380204c9d6795b7754a749e4004f61b2362a13 Mon Sep 17 00:00:00 2001 From: Daniel Topa Date: Sat, 18 Aug 2018 19:34:05 -0600 Subject: Openmpi add v2.1.4 (#9006) * Add latest release 3.0.2 https://www.open-mpi.org/software/ompi/v3.0/:x Signed-off-by: Daniel Topa * 1. Added correct md5 sum for Open MPI v3.1.1 (https://www.open-mpi.org//software/ompi/v3.1/) 2. Made v3.1.1 the default version 3. Added libmpiso versions for v3.1.1 and 3.0.2 Signed-off-by: Daniel Topa * Added Open MPI v2.14 to version list; Tested build; Added libmpi.so version Signed-off-by: Daniel Topa --- var/spack/repos/builtin/packages/openmpi/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index fbe75db893..899b81464f 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -79,7 +79,7 @@ class Openmpi(AutotoolsPackage): """ homepage = "http://www.open-mpi.org" - url = "https://www.open-mpi.org/software/ompi/v3.0/downloads/openmpi-3.0.0.tar.bz2" + url = "https://www.open-mpi.org/software/ompi/v3.1/downloads/openmpi-3.1.1.tar.bz2" list_url = "http://www.open-mpi.org/software/ompi/" # Current @@ -90,6 +90,7 @@ class Openmpi(AutotoolsPackage): version('3.0.2', '098fa89646f5b4438d9d8534bc960cd6') # libmpi.so.40.00.2 version('3.0.1', '565f5060e080b0871a64b295c3d4426a') # libmpi.so.40.00.1 version('3.0.0', '757d51719efec08f9f1a7f32d58b3305') # libmpi.so.40.00.0 + version('2.1.4', '003b356a24a5b7bd1705a23ddc69d9a0') # libmpi.so.20.10.3 version('2.1.3', '46079b6f898a412240a0bf523e6cd24b') # libmpi.so.20.10.2 version('2.1.2', 'ff2e55cc529802e7b0738cf87acd3ee4') # libmpi.so.20.10.2 version('2.1.1', 'ae542f5cf013943ffbbeb93df883731b') # libmpi.so.20.10.1 -- cgit v1.2.3-70-g09d2 From 11d94f4c4f25dac9b8ed60ddd0c2cfa21a321f46 Mon Sep 17 00:00:00 2001 From: Daniel Topa Date: Sat, 18 Aug 2018 21:44:14 -0600 Subject: Open MPI: add v2.1.5 (#9021) Final fix for v2.1 (hopefully) Test build on LANL CCSCS4, Desktop Signed-off-by: Daniel Topa --- var/spack/repos/builtin/packages/openmpi/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 899b81464f..f98db45830 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -90,6 +90,7 @@ class Openmpi(AutotoolsPackage): version('3.0.2', '098fa89646f5b4438d9d8534bc960cd6') # libmpi.so.40.00.2 version('3.0.1', '565f5060e080b0871a64b295c3d4426a') # libmpi.so.40.00.1 version('3.0.0', '757d51719efec08f9f1a7f32d58b3305') # libmpi.so.40.00.0 + version('2.1.5', '6019c8b67d4975d833801e72ba290918') # libmpi.so.20.10.3 version('2.1.4', '003b356a24a5b7bd1705a23ddc69d9a0') # libmpi.so.20.10.3 version('2.1.3', '46079b6f898a412240a0bf523e6cd24b') # libmpi.so.20.10.2 version('2.1.2', 'ff2e55cc529802e7b0738cf87acd3ee4') # libmpi.so.20.10.2 -- cgit v1.2.3-70-g09d2 From 4ba8c0cb58418547d4f9db2336725bf4c4d2e9d9 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Mon, 20 Aug 2018 14:56:53 +0200 Subject: update Intel packages (2018.u5 for TBB and 2018.u3 for the others) (#8928) --- var/spack/repos/builtin/packages/intel-daal/package.py | 2 ++ var/spack/repos/builtin/packages/intel-ipp/package.py | 2 ++ var/spack/repos/builtin/packages/intel-mkl/package.py | 2 ++ var/spack/repos/builtin/packages/intel-mpi/package.py | 2 ++ var/spack/repos/builtin/packages/intel-tbb/package.py | 1 + 5 files changed, 9 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/intel-daal/package.py b/var/spack/repos/builtin/packages/intel-daal/package.py index cc4c00a4a3..434ecf0f73 100644 --- a/var/spack/repos/builtin/packages/intel-daal/package.py +++ b/var/spack/repos/builtin/packages/intel-daal/package.py @@ -33,6 +33,8 @@ class IntelDaal(IntelPackage): homepage = "https://software.intel.com/en-us/daal" + version('2018.3.222', 'e688825c563e357b7b626ece610d6a85', + url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13007/l_daal_2018.3.222.tgz") version('2018.2.199', 'd015ff34a87a18922736b5fba0d0b0e0', url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12727/l_daal_2018.2.199.tgz") version('2018.1.163', '12a9586734a03a956095440161fd741a', diff --git a/var/spack/repos/builtin/packages/intel-ipp/package.py b/var/spack/repos/builtin/packages/intel-ipp/package.py index 545d0a6335..e7dfe3d4e6 100644 --- a/var/spack/repos/builtin/packages/intel-ipp/package.py +++ b/var/spack/repos/builtin/packages/intel-ipp/package.py @@ -33,6 +33,8 @@ class IntelIpp(IntelPackage): homepage = "https://software.intel.com/en-us/intel-ipp" + version('2018.3.222', '2ccc16ec002466e52f1e6e1bfe9b1149', + url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13006/l_ipp_2018.3.222.tgz') version('2018.2.199', 'f87276b485d2f6ec070c1b41ac1ed871', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12726/l_ipp_2018.2.199.tgz') version('2018.1.163', '183d4888f3d91f632b617fdd401f04ed', diff --git a/var/spack/repos/builtin/packages/intel-mkl/package.py b/var/spack/repos/builtin/packages/intel-mkl/package.py index 7c1ed17800..b8ce9a96aa 100644 --- a/var/spack/repos/builtin/packages/intel-mkl/package.py +++ b/var/spack/repos/builtin/packages/intel-mkl/package.py @@ -34,6 +34,8 @@ class IntelMkl(IntelPackage): homepage = "https://software.intel.com/en-us/intel-mkl" + version('2018.3.222', '3e63646a4306eff95e8d0aafd53a2983', + url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13005/l_mkl_2018.3.222.tgz") version('2018.2.199', 'fd31b656a8eb859c89495b9cc41230b4', url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12725/l_mkl_2018.2.199.tgz") version('2018.1.163', 'f1f7b6ddd7eb57dfe39bd4643446dc1c', diff --git a/var/spack/repos/builtin/packages/intel-mpi/package.py b/var/spack/repos/builtin/packages/intel-mpi/package.py index 40536d54f8..44b501fbe1 100644 --- a/var/spack/repos/builtin/packages/intel-mpi/package.py +++ b/var/spack/repos/builtin/packages/intel-mpi/package.py @@ -33,6 +33,8 @@ class IntelMpi(IntelPackage): homepage = "https://software.intel.com/en-us/intel-mpi-library" + version('2018.3.222', 'df92593818fadff63c57418669c6083b', + url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13112/l_mpi_2018.3.222.tgz') version('2018.2.199', '6ffeab59c83a8842537484d53e180520', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12748/l_mpi_2018.2.199.tgz') version('2018.1.163', '437ce50224c5bbf98fd578a810c3e401', diff --git a/var/spack/repos/builtin/packages/intel-tbb/package.py b/var/spack/repos/builtin/packages/intel-tbb/package.py index 4e884dd0ab..8fd537d4ee 100644 --- a/var/spack/repos/builtin/packages/intel-tbb/package.py +++ b/var/spack/repos/builtin/packages/intel-tbb/package.py @@ -37,6 +37,7 @@ class IntelTbb(Package): homepage = "http://www.threadingbuildingblocks.org/" # See url_for_version() below. + version('2018.5', 'ff3ae09f8c23892fbc3008c39f78288f') version('2018.4', '5e2e6ba0e25624a94331c945856551c2') version('2018.3', 'cd2e136598ffa5c136f077ee85a35b4c') version('2018.2', '0b8dfe30917a54e40828eeb0ed7562ae') -- cgit v1.2.3-70-g09d2 From 5aa126d850bbb529a972caedd08b2f4a212b55b1 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Mon, 20 Aug 2018 16:40:10 +0200 Subject: dealii: blacklist boost 1.68.0 due to segmentation fault in serialization lib (#9023) --- var/spack/repos/builtin/packages/dealii/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index f1b4e848ca..c2087ef7d0 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -98,12 +98,13 @@ class Dealii(CMakePackage, CudaPackage): # https://github.com/dealii/dealii/issues/5262 # we take the patch from https://github.com/boostorg/serialization/pull/79 # more precisely its variation https://github.com/dealii/dealii/pull/5572#issuecomment-349742019 - depends_on('boost@1.59.0:1.63,1.65.1,1.67.0:+thread+system+serialization+iostreams', + # 1.68.0 has issues with serialization https://github.com/dealii/dealii/issues/7074 + depends_on('boost@1.59.0:1.63,1.65.1,1.67.0:1.67.99+thread+system+serialization+iostreams', patches=patch('boost_1.65.1_singleton.patch', level=1, when='@1.65.1'), when='~python') - depends_on('boost@1.59.0:1.63,1.65.1,1.67.0:+thread+system+serialization+iostreams+python', + depends_on('boost@1.59.0:1.63,1.65.1,1.67.0:1.67.99+thread+system+serialization+iostreams+python', patches=patch('boost_1.65.1_singleton.patch', level=1, when='@1.65.1'), -- cgit v1.2.3-70-g09d2 From 271633ee939b43640a99423ac49e7d1c44244520 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Mon, 20 Aug 2018 17:43:30 +0200 Subject: dealii: add constraint on suite-sparse for old gcc (#9026) --- var/spack/repos/builtin/packages/dealii/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index c2087ef7d0..75b63576e2 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -114,6 +114,7 @@ class Dealii(CMakePackage, CudaPackage): depends_on('lapack') depends_on('muparser') depends_on('suite-sparse') + depends_on('suite-sparse@:5.1.0', when='%gcc@:4.8.99') depends_on('tbb') depends_on('zlib') -- cgit v1.2.3-70-g09d2 From af2dc7f3d3e5b79872544d5251bdc0575921cdb9 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Tue, 21 Aug 2018 14:13:27 -0500 Subject: r-biocparallel: new version (#9046) --- var/spack/repos/builtin/packages/r-biocparallel/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-biocparallel/package.py b/var/spack/repos/builtin/packages/r-biocparallel/package.py index 07106ce5a6..4f03ed175e 100644 --- a/var/spack/repos/builtin/packages/r-biocparallel/package.py +++ b/var/spack/repos/builtin/packages/r-biocparallel/package.py @@ -33,8 +33,10 @@ class RBiocparallel(RPackage): homepage = "https://bioconductor.org/packages/BiocParallel/" git = "https://git.bioconductor.org/packages/BiocParallel.git" + version('1.14.2', commit='1d5a44960b19e9dbbca04c7290c8c58b0a7fc299') version('1.10.1', commit='a76c58cf99fd585ba5ea33065649e68f1afe0a7d') depends_on('r-futile-logger', type=('build', 'run')) depends_on('r-snow', type=('build', 'run')) - depends_on('r@3.4.0:3.4.9', when='@1.10.1') + depends_on('r@3.4.0:3.4.9', when='@1.10.1', type=('build', 'run')) + depends_on('r@3.5.0:3.5.9', when='@1.14.2', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From eb74f493639f3c854cc77793e1f6d982ce44a0ee Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Tue, 21 Aug 2018 14:13:39 -0500 Subject: r-xvector: new version (#9045) --- var/spack/repos/builtin/packages/r-xvector/package.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-xvector/package.py b/var/spack/repos/builtin/packages/r-xvector/package.py index 50b75182e1..b56c8653ea 100644 --- a/var/spack/repos/builtin/packages/r-xvector/package.py +++ b/var/spack/repos/builtin/packages/r-xvector/package.py @@ -32,10 +32,15 @@ class RXvector(RPackage): homepage = "https://bioconductor.org/packages/XVector/" git = "https://git.bioconductor.org/packages/XVector.git" + version('0.20.0', commit='a83a7ea01f6a710f0ba7d9fb021cfa795b291cb4') version('0.16.0', commit='54615888e1a559da4a81de33e934fc0f1c3ad99f') depends_on('r-biocgenerics', type=('build', 'run')) + depends_on('r-biocgenerics@0.19.2:', when='@0.20.0', type=('build', 'run')) depends_on('r-s4vectors', type=('build', 'run')) + depends_on('r-s4vectors@0.17.24:', when='@0.20.0', type=('build', 'run')) depends_on('r-iranges', type=('build', 'run')) + depends_on('r-iranges@2.13.16:', when='@0.20.0', type=('build', 'run')) depends_on('r-zlibbioc', type=('build', 'run')) - depends_on('r@3.4.0:3.4.9', when='@0.16.0') + depends_on('r@3.4.0:3.4.9', when='@0.16.0', type=('build', 'run')) + depends_on('r@3.5.0:3.5.9', when='@0.20.0', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From efbb2c0733b33c738382192ea6100d2c7b20f892 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Tue, 21 Aug 2018 14:13:52 -0500 Subject: r-zlibbioc: new version (#9044) --- var/spack/repos/builtin/packages/r-zlibbioc/package.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-zlibbioc/package.py b/var/spack/repos/builtin/packages/r-zlibbioc/package.py index 6ee69c0455..9092694bba 100644 --- a/var/spack/repos/builtin/packages/r-zlibbioc/package.py +++ b/var/spack/repos/builtin/packages/r-zlibbioc/package.py @@ -32,9 +32,11 @@ class RZlibbioc(RPackage): direct need for this package). See the vignette for instructions on use.""" - homepage = "http://bioconductor.org/packages/release/bioc/html/Zlibbioc.html" + homepage = "http://bioconductor.org/packages/release/bioc/html/zlibbioc.html" git = "https://git.bioconductor.org/packages/zlibbioc.git" + version('1.26.0', commit='2e3ab097caa09a5e3ddaa3469b13e19a7224da0d') version('1.22.0', commit='30377f830af2bc1ff17bbf3fdd2cb6442015fea5') - depends_on('r@3.4.0:3.4.9', when='@1.22.0') + depends_on('r@3.4.0:3.4.9', when='@1.22.0', type=('build', 'run')) + depends_on('r@3.5.0:3.5.9', when='@1.26.0', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From c62c9257d77fd7bc2a8082818e7331bd4e5b7a42 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Tue, 21 Aug 2018 14:14:05 -0500 Subject: r-s4vectors: new version (#9043) --- var/spack/repos/builtin/packages/r-s4vectors/package.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-s4vectors/package.py b/var/spack/repos/builtin/packages/r-s4vectors/package.py index d5d0e216ba..cf3d39fde4 100644 --- a/var/spack/repos/builtin/packages/r-s4vectors/package.py +++ b/var/spack/repos/builtin/packages/r-s4vectors/package.py @@ -38,9 +38,11 @@ class RS4vectors(RPackage): homepage = "https://bioconductor.org/packages/S4Vectors/" git = "https://git.bioconductor.org/packages/S4Vectors.git" + version('0.18.3', commit='d6804f94ad3663828440914920ac933b934aeff1') version('0.16.0', commit='00fec03fcbcb7cff37917fab0da28d91fdf9dc3d') version('0.14.7', commit='40af17fe0b8e93b6a72fc787540d2961773b8e23') depends_on('r-biocgenerics@0.21.1:', type=('build', 'run'), when='@0.14.7') - depends_on('r-biocgenerics@0.23.3:', type=('build', 'run'), when='@0.16.0') - depends_on('r@3.4.0:3.4.9', when='@0.14.7:') + depends_on('r-biocgenerics@0.23.3:', type=('build', 'run'), when='@0.16.0:') + depends_on('r@3.4.0:3.4.9', when='@0.14.7', type=('build', 'run')) + depends_on('r@3.5.0:3.5.9', when='@0.18.3', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From c9fdb610f29d28b10ebed23b914f0a135504a68f Mon Sep 17 00:00:00 2001 From: Sam Gutiérrez Date: Tue, 21 Aug 2018 13:14:17 -0600 Subject: Add 1.6.1 release. (#9042) --- var/spack/repos/builtin/packages/libfabric/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libfabric/package.py b/var/spack/repos/builtin/packages/libfabric/package.py index c67a8e9987..cc5601436f 100644 --- a/var/spack/repos/builtin/packages/libfabric/package.py +++ b/var/spack/repos/builtin/packages/libfabric/package.py @@ -30,8 +30,9 @@ class Libfabric(AutotoolsPackage): fabric communication services to applications.""" homepage = "https://libfabric.org/" - url = "https://github.com/ofiwg/libfabric/releases/download/v1.6.0/libfabric-1.6.0.tar.gz" + url = "https://github.com/ofiwg/libfabric/releases/download/v1.6.1/libfabric-1.6.1.tar.gz" + version('1.6.1', 'ff78dc9fcbf273a119c737a4e1df46d1') version('1.6.0', '91d63ab3c0b9724a4db660019f928cab') version('1.5.3', '1fe07e972fe487c6a3e44c0fb68b49a2') version('1.5.0', 'fda3e9b31ebe184f5157288d059672d6') -- cgit v1.2.3-70-g09d2 From 2c92d50495d18a687d581433478600d63c8fd0eb Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Tue, 21 Aug 2018 14:15:18 -0500 Subject: r-annotationdbi : new version (#9040) * r-annotationdbi: new version * r-annotationdbi: dep type * r-annotationdbi: reordering versions --- var/spack/repos/builtin/packages/r-annotationdbi/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-annotationdbi/package.py b/var/spack/repos/builtin/packages/r-annotationdbi/package.py index 28c833a33f..4f5b3fc4d2 100644 --- a/var/spack/repos/builtin/packages/r-annotationdbi/package.py +++ b/var/spack/repos/builtin/packages/r-annotationdbi/package.py @@ -32,9 +32,11 @@ class RAnnotationdbi(RPackage): homepage = "https://www.bioconductor.org/packages/AnnotationDbi/" git = "https://git.bioconductor.org/packages/AnnotationDbi.git" + version('1.42.1', commit='71085b47ea2e1ef929bebe8b17eb8e8a573f98e3') version('1.38.2', commit='67d46facba8c15fa5f0eb47c4e39b53dbdc67c36') - depends_on('r@3.4.0:3.4.9', when='@1.38.2') + depends_on('r@3.4.0:3.4.9', when='@1.38.2', type=('build', 'run')) + depends_on('r@3.5.0:3.5.9', when='@1.42.1', type=('build', 'run')) depends_on('r-biocgenerics', type=('build', 'run')) depends_on('r-biobase', type=('build', 'run')) depends_on('r-iranges', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 1340abf1bcbd143b141910c98fcce8237e46f63b Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Tue, 21 Aug 2018 14:15:30 -0500 Subject: r-biocgenerics: new version (#9039) * r-biocgenerics: new version * r-biocgenerics: reordering versions --- var/spack/repos/builtin/packages/r-biocgenerics/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-biocgenerics/package.py b/var/spack/repos/builtin/packages/r-biocgenerics/package.py index 3366eef19b..c28eb8e803 100644 --- a/var/spack/repos/builtin/packages/r-biocgenerics/package.py +++ b/var/spack/repos/builtin/packages/r-biocgenerics/package.py @@ -31,7 +31,9 @@ class RBiocgenerics(RPackage): homepage = "https://www.bioconductor.org/packages/BiocGenerics/" git = "https://git.bioconductor.org/packages/BiocGenerics.git" + version('0.26.0', commit='5b2a6df639e48c3cd53789e0b174aec9dda6b67d') version('0.24.0', commit='3db111e8c1f876267da89f4f0c5406a9d5c31cd1') version('0.22.1', commit='9c90bb8926885289d596a81ff318ee3745cbb6ad') - depends_on('r@3.4.0:3.4.9', when='@0.22.1:') + depends_on('r@3.4.0:3.4.9', when='@0.22.1', type=('build', 'run')) + depends_on('r@3.5.0:3.5.9', when='@0.26.0', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From db09b71be1366f90a6381a42e6d3d13faf63144c Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Tue, 21 Aug 2018 14:15:42 -0500 Subject: r-biobase: new version (#9038) * r-biobase: new version * r-biobase: reordering versions --- var/spack/repos/builtin/packages/r-biobase/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-biobase/package.py b/var/spack/repos/builtin/packages/r-biobase/package.py index e3cb9530dc..02ea888446 100644 --- a/var/spack/repos/builtin/packages/r-biobase/package.py +++ b/var/spack/repos/builtin/packages/r-biobase/package.py @@ -33,8 +33,10 @@ class RBiobase(RPackage): homepage = "https://www.bioconductor.org/packages/Biobase/" git = "https://git.bioconductor.org/packages/Biobase.git" + version('2.40.0', commit='6555edbbcb8a04185ef402bfdea7ed8ac72513a5') version('2.38.0', commit='83f89829e0278ac014b0bc6664e621ac147ba424') version('2.36.2', commit='15f50912f3fa08ccb15c33b7baebe6b8a59ce075') depends_on('r-biocgenerics@0.16.1:', type=('build', 'run')) - depends_on('r@3.4.0:3.4.9', when='@2.36.2:') + depends_on('r@3.4.0:3.4.9', when='@2.36.2', type=('build', 'run')) + depends_on('r@3.5.0:3.5.9', when='@2.40.0', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From db508a8f8972aee456713d7e676363915752e23a Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Tue, 21 Aug 2018 15:02:52 -0500 Subject: r-iranges: new version (#9041) * r-iranges: new version * r-iranges: typo --- var/spack/repos/builtin/packages/r-iranges/package.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-iranges/package.py b/var/spack/repos/builtin/packages/r-iranges/package.py index caed7081fd..aeff9561e4 100644 --- a/var/spack/repos/builtin/packages/r-iranges/package.py +++ b/var/spack/repos/builtin/packages/r-iranges/package.py @@ -40,11 +40,15 @@ class RIranges(RPackage): homepage = "https://www.bioconductor.org/packages/IRanges/" git = "https://git.bioconductor.org/packages/IRanges.git" + version('2.14.10', commit='c76118a38e84c7c764141adbd66ee350d0882bc9') version('2.12.0', commit='1b1748655a8529ba87ad0f223f035ef0c08e7fcd') version('2.10.5', commit='b00d1d5025e3c480d17c13100f0da5a0132b1614') depends_on('r-biocgenerics@0.21.1:', type=('build', 'run'), when='@2.10.5') depends_on('r-biocgenerics@0.23.3:', type=('build', 'run'), when='@2.12.0') + depends_on('r-biocgenerics@0.25.3:', type=('build', 'run'), when='@2.14.10') depends_on('r-s4vectors@0.13.17:', type=('build', 'run'), when='@2.10.5') depends_on('r-s4vectors@0.15.5:', type=('build', 'run'), when='@2.12.0') - depends_on('r@3.4.0:3.4.9', when='@2.10.5:') + depends_on('r-s4vectors@0.18.2:', type=('build', 'run'), when='@2.14.10') + depends_on('r@3.4.0:3.4.9', when='@2.10.5', type=('build', 'run')) + depends_on('r@3.5.0:3.5.9', when='@2.14.10', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From c0855d9bd54be07162435cec605a1ad5efe1e4d1 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Tue, 21 Aug 2018 14:48:19 -0700 Subject: tests: add tests for warnings in build output - add tests for build warnings and error messages - simplify some code in build environment with plural() function --- lib/spack/spack/build_environment.py | 13 +++--- lib/spack/spack/test/cmd/install.py | 27 +++++++++++++ lib/spack/spack/test/util/util_string.py | 33 +++++++++++++++ lib/spack/spack/util/string.py | 20 +++++++++ .../packages/build-warnings/package.py | 47 ++++++++++++++++++++++ 5 files changed, 132 insertions(+), 8 deletions(-) create mode 100644 lib/spack/spack/test/util/util_string.py create mode 100644 var/spack/repos/builtin.mock/packages/build-warnings/package.py (limited to 'var') diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py index 6dde537e1d..92e86018bf 100644 --- a/lib/spack/spack/build_environment.py +++ b/lib/spack/spack/build_environment.py @@ -71,6 +71,7 @@ import spack.config import spack.main import spack.paths import spack.store +from spack.util.string import plural from spack.environment import EnvironmentModifications, validate from spack.environment import preserve_environment from spack.util.environment import env_flag, filter_system_paths, get_path @@ -914,17 +915,13 @@ class ChildError(InstallError): nwar = len(warnings) if nerr > 0: # If errors are found, only display errors - if nerr == 1: - out.write("\n1 error found in build log:\n") - else: - out.write("\n%d errors found in build log:\n" % nerr) + out.write( + "\n%s found in build log:\n" % plural(nerr, 'error')) out.write(make_log_context(errors)) elif nwar > 0: # If no errors are found but warnings are, display warnings - if nwar == 1: - out.write("\n1 warning found in build log:\n") - else: - out.write("\n%d warnings found in build log:\n" % nwar) + out.write( + "\n%s found in build log:\n" % plural(nwar, 'warning')) out.write(make_log_context(warnings)) else: diff --git a/lib/spack/spack/test/cmd/install.py b/lib/spack/spack/test/cmd/install.py index 084eb59072..56049271c1 100644 --- a/lib/spack/spack/test/cmd/install.py +++ b/lib/spack/spack/test/cmd/install.py @@ -429,3 +429,30 @@ def test_cdash_upload_build_error(tmpdir, mock_fetch, install_mockery, assert report_file in report_dir.listdir() content = report_file.open().read() assert 'configure: error: in /path/to/some/file:' in content + + +@pytest.mark.disable_clean_stage_check +def test_build_error_output(tmpdir, mock_fetch, install_mockery, capfd): + with capfd.disabled(): + msg = '' + try: + install('build-error') + assert False, "no exception was raised!" + except spack.build_environment.ChildError as e: + msg = e.long_message + + assert 'configure: error: in /path/to/some/file:' in msg + assert 'configure: error: cannot run C compiled programs.' in msg + + +@pytest.mark.disable_clean_stage_check +def test_build_warning_output(tmpdir, mock_fetch, install_mockery, capfd): + with capfd.disabled(): + msg = '' + try: + install('build-warnings') + except spack.build_environment.ChildError as e: + msg = e.long_message + + assert 'WARNING: ALL CAPITAL WARNING!' in msg + assert 'foo.c:89: warning: some weird warning!' in msg diff --git a/lib/spack/spack/test/util/util_string.py b/lib/spack/spack/test/util/util_string.py new file mode 100644 index 0000000000..48a6c60c45 --- /dev/null +++ b/lib/spack/spack/test/util/util_string.py @@ -0,0 +1,33 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack.util.string import plural + + +def test_plural(): + assert plural(0, 'thing') == '0 things' + assert plural(1, 'thing') == '1 thing' + assert plural(2, 'thing') == '2 things' + assert plural(1, 'thing', 'wombats') == '1 thing' + assert plural(2, 'thing', 'wombats') == '2 wombats' diff --git a/lib/spack/spack/util/string.py b/lib/spack/spack/util/string.py index 3bab0c652e..a6a5342f1f 100644 --- a/lib/spack/spack/util/string.py +++ b/lib/spack/spack/util/string.py @@ -53,3 +53,23 @@ def comma_and(sequence): def quote(sequence, q="'"): return ['%s%s%s' % (q, e, q) for e in sequence] + + +def plural(n, singular, plural=None): + """Pluralize word by adding an s if n != 1. + + Arguments: + n (int): number of things there are + singular (str): singular form of word + plural (str, optional): optional plural form, for when it's not just + singular + 's' + + Returns: + (str): "1 thing" if n == 1 or "n things" if n != 1 + """ + if n == 1: + return "%d %s" % (n, singular) + elif plural is not None: + return "%d %s" % (n, plural) + else: + return "%d %ss" % (n, singular) diff --git a/var/spack/repos/builtin.mock/packages/build-warnings/package.py b/var/spack/repos/builtin.mock/packages/build-warnings/package.py new file mode 100644 index 0000000000..9160c03f31 --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/build-warnings/package.py @@ -0,0 +1,47 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class BuildWarnings(Package): + """This package's install fails but only emits warnings.""" + + homepage = "http://www.example.com/trivial_install" + url = "http://www.unit-test-should-replace-this-url/trivial_install-1.0.tar.gz" + + version('1.0', 'foobarbaz') + + def install(self, spec, prefix): + with open('configure', 'w') as f: + f.write("""#!/bin/sh\n +echo 'checking for gcc... /Users/gamblin2/src/spack/lib/spack/env/clang/clang' +echo 'checking whether the C compiler works... yes' +echo 'checking for C compiler default output file name... a.out' +echo 'WARNING: ALL CAPITAL WARNING!' +echo 'checking for suffix of executables...' +echo 'foo.c:89: warning: some weird warning!' +exit 1 +""") + configure() -- cgit v1.2.3-70-g09d2 From 2f6a6a45a977cf766345e31a41daae0ff910a434 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 22 Aug 2018 05:21:43 -0500 Subject: r-biostrings: new version (#9048) --- var/spack/repos/builtin/packages/r-biostrings/package.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-biostrings/package.py b/var/spack/repos/builtin/packages/r-biostrings/package.py index 8803843ea6..3658c53107 100644 --- a/var/spack/repos/builtin/packages/r-biostrings/package.py +++ b/var/spack/repos/builtin/packages/r-biostrings/package.py @@ -33,10 +33,16 @@ class RBiostrings(RPackage): homepage = "https://bioconductor.org/packages/Biostrings/" git = "https://git.bioconductor.org/packages/Biostrings.git" + version('2.48.0', commit='aa3599a7d259d658014d087b86d71ab1deb5f12b') version('2.44.2', commit='e4a2b320fb21c5cab3ece7b3c6fecaedfb1e5200') depends_on('r-biocgenerics', type=('build', 'run')) + depends_on('r-biocgenerics@0.15.6:', when='@2.48.0', type=('build', 'run')) depends_on('r-s4vectors', type=('build', 'run')) + depends_on('r-s4vectors@0.17.25:', when='@2.48.0', type=('build', 'run')) depends_on('r-iranges', type=('build', 'run')) + depends_on('r-iranges@2.13.24:', when='@2.48.0', type=('build', 'run')) depends_on('r-xvector', type=('build', 'run')) - depends_on('r@3.4.0:3.4.9', when='@2.44.2') + depends_on('r-xvector@0.19.8:', when='@2.48.0', type=('build', 'run')) + depends_on('r@3.4.0:3.4.9', when='@2.44.2', type=('build', 'run')) + depends_on('r@3.5.0:3.5.9', when='@2.48.0', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 3a041b3fea3d9bc925c7a534ed5c150db4d31b66 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Wed, 22 Aug 2018 16:34:47 +0200 Subject: dealii: patch boost 1.68.0 (#9070) * dealii: patch boost 1.68.0 * indent for readability --- .../builtin/packages/dealii/boost_1.68.0.patch | 135 +++++++++++++++++++++ var/spack/repos/builtin/packages/dealii/package.py | 25 ++-- 2 files changed, 152 insertions(+), 8 deletions(-) create mode 100644 var/spack/repos/builtin/packages/dealii/boost_1.68.0.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dealii/boost_1.68.0.patch b/var/spack/repos/builtin/packages/dealii/boost_1.68.0.patch new file mode 100644 index 0000000000..e5b5e86f5e --- /dev/null +++ b/var/spack/repos/builtin/packages/dealii/boost_1.68.0.patch @@ -0,0 +1,135 @@ +diff --git a/boost/archive/impl/archive_serializer_map.ipp b/boost/archive/impl/archive_serializer_map.ipp +index 7f163ec..8dabf0d 100644 +--- a/boost/archive/impl/archive_serializer_map.ipp ++++ b/boost/archive/impl/archive_serializer_map.ipp +@@ -47,10 +47,6 @@ archive_serializer_map::insert(const basic_serializer * bs){ + template + BOOST_ARCHIVE_OR_WARCHIVE_DECL void + archive_serializer_map::erase(const basic_serializer * bs){ +- BOOST_ASSERT(! boost::serialization::singleton< +- extra_detail::map +- >::is_destroyed() +- ); + if(boost::serialization::singleton< + extra_detail::map + >::is_destroyed()) +diff --git a/boost/serialization/singleton.hpp b/boost/serialization/singleton.hpp +index 3437f38..3eac8eb 100644 +--- a/boost/serialization/singleton.hpp ++++ b/boost/serialization/singleton.hpp +@@ -108,6 +108,29 @@ public: + } + }; + ++namespace detail { ++// This is the class actually instantiated and hence the real singleton. ++// So there will only be one instance of this class. This does not hold ++// for singleton as a class derived from singleton could be ++// instantiated multiple times. ++template ++class singleton_wrapper : public T ++{ ++public: ++ singleton_wrapper(){ ++ BOOST_ASSERT(!get_is_destroyed()); ++ } ++ ~singleton_wrapper(){ ++ get_is_destroyed() = true; ++ } ++ static bool & get_is_destroyed(){ ++ // Prefer a static function member to avoid LNK1179. Note: Never reset! ++ static bool is_destroyed = false; ++ return is_destroyed; ++ } ++}; ++} // detail ++ + template + class singleton : public singleton_module + { +@@ -116,14 +139,11 @@ private: + // include this to provoke instantiation at pre-execution time + static void use(T const *) {} + static T & get_instance() { +- // use a wrapper so that types T with protected constructors +- // can be used +- class singleton_wrapper : public T {}; +- static singleton_wrapper t; ++ BOOST_ASSERT(!is_destroyed()); + +- // refer to instance, causing it to be instantiated (and +- // initialized at startup on working compilers) +- BOOST_ASSERT(! is_destroyed()); ++ // use a wrapper so that types T with protected constructors can be used ++ // Using a static function member avoids LNK1179 ++ static detail::singleton_wrapper< T > t; + + // note that the following is absolutely essential. + // commenting out this statement will cause compilers to fail to +@@ -134,10 +154,11 @@ private: + + return static_cast(t); + } +- static bool & get_is_destroyed(){ +- static bool is_destroyed; +- return is_destroyed; +- } ++ ++protected: ++ // Do not allow instantiation of a singleton. But we want to allow ++ // `class T: public singleton` so we can't delete this ctor ++ BOOST_DLLEXPORT singleton(){} + + public: + BOOST_DLLEXPORT static T & get_mutable_instance(){ +@@ -148,13 +169,7 @@ public: + return get_instance(); + } + BOOST_DLLEXPORT static bool is_destroyed(){ +- return get_is_destroyed(); +- } +- BOOST_DLLEXPORT singleton(){ +- get_is_destroyed() = false; +- } +- BOOST_DLLEXPORT ~singleton() { +- get_is_destroyed() = true; ++ return detail::singleton_wrapper< T >::get_is_destroyed(); + } + }; + +diff --git a/libs/serialization/src/extended_type_info.cpp b/libs/serialization/src/extended_type_info.cpp +index 364fe56..13a60c3 100644 +--- a/libs/serialization/src/extended_type_info.cpp ++++ b/libs/serialization/src/extended_type_info.cpp +@@ -125,7 +125,6 @@ BOOST_SERIALIZATION_DECL void + extended_type_info::key_unregister() const{ + if(NULL == get_key()) + return; +- BOOST_ASSERT(! singleton::is_destroyed()); + if(! singleton::is_destroyed()){ + detail::ktmap & x = singleton::get_mutable_instance(); + detail::ktmap::iterator start = x.lower_bound(this); +diff --git a/libs/serialization/src/extended_type_info_typeid.cpp b/libs/serialization/src/extended_type_info_typeid.cpp +index 7413d2e..af188ef 100644 +--- a/libs/serialization/src/extended_type_info_typeid.cpp ++++ b/libs/serialization/src/extended_type_info_typeid.cpp +@@ -95,7 +95,6 @@ BOOST_SERIALIZATION_DECL void + extended_type_info_typeid_0::type_unregister() + { + if(NULL != m_ti){ +- BOOST_ASSERT(! singleton::is_destroyed()); + if(! singleton::is_destroyed()){ + tkmap & x = singleton::get_mutable_instance(); + +diff --git a/libs/serialization/src/void_cast.cpp b/libs/serialization/src/void_cast.cpp +index 4051303..9009993 100644 +--- a/libs/serialization/src/void_cast.cpp ++++ b/libs/serialization/src/void_cast.cpp +@@ -276,7 +276,6 @@ void_caster::recursive_register(bool includes_virtual_base) const { + + BOOST_SERIALIZATION_DECL void + void_caster::recursive_unregister() const { +- BOOST_ASSERT(! void_caster_registry::is_destroyed()); + if(void_caster_registry::is_destroyed()) + return; + diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 75b63576e2..a3a46f132a 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -99,15 +99,24 @@ class Dealii(CMakePackage, CudaPackage): # we take the patch from https://github.com/boostorg/serialization/pull/79 # more precisely its variation https://github.com/dealii/dealii/pull/5572#issuecomment-349742019 # 1.68.0 has issues with serialization https://github.com/dealii/dealii/issues/7074 - depends_on('boost@1.59.0:1.63,1.65.1,1.67.0:1.67.99+thread+system+serialization+iostreams', - patches=patch('boost_1.65.1_singleton.patch', - level=1, - when='@1.65.1'), + # adopt https://github.com/boostorg/serialization/pull/105 as a fix + depends_on('boost@1.59.0:1.63,1.65.1,1.67.0:+thread+system+serialization+iostreams', + patches=[patch('boost_1.65.1_singleton.patch', + level=1, + when='@1.65.1'), + patch('boost_1.68.0.patch', + level=1, + when='@1.68.0'), + ], when='~python') - depends_on('boost@1.59.0:1.63,1.65.1,1.67.0:1.67.99+thread+system+serialization+iostreams+python', - patches=patch('boost_1.65.1_singleton.patch', - level=1, - when='@1.65.1'), + depends_on('boost@1.59.0:1.63,1.65.1,1.67.0:+thread+system+serialization+iostreams+python', + patches=[patch('boost_1.65.1_singleton.patch', + level=1, + when='@1.65.1'), + patch('boost_1.68.0.patch', + level=1, + when='@1.68.0'), + ], when='+python') # bzip2 is not needed since 9.0 depends_on('bzip2', when='@:8.99') -- cgit v1.2.3-70-g09d2 From 6ca7654df9ef6fc5ca02b216db44849a3745e4b9 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Wed, 22 Aug 2018 09:36:33 -0500 Subject: intel-parallel-studio: add version 2018.3 (#9047) * intel-parallel-studio: add version 2018.3 * update intel package too --- var/spack/repos/builtin/packages/intel-parallel-studio/package.py | 6 ++++++ var/spack/repos/builtin/packages/intel/package.py | 2 ++ 2 files changed, 8 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py index f9c9620d0b..e1f8c208d3 100644 --- a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py +++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py @@ -34,6 +34,12 @@ class IntelParallelStudio(IntelPackage): homepage = "https://software.intel.com/en-us/intel-parallel-studio-xe" + version('professional.2018.3', 'e0fb828de0a5f238f775b6122cc7e2c5', + url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12999/parallel_studio_xe_2018_update3_professional_edition.tgz') + version('cluster.2018.3', '7112837d20a100b895d9cd9ba9b6748d', + url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12998/parallel_studio_xe_2018_update3_cluster_edition.tgz') + version('composer.2018.3', '234223cc470717c2095456d9f048d690', + url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13002/parallel_studio_xe_2018_update3_composer_edition.tgz') version('professional.2018.1', '91669ff7afbfd07868a429a122c90357', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12375/parallel_studio_xe_2018_update1_professional_edition.tgz') version('cluster.2018.1', '9c007011e0e3fc72747b58756fbf01cd', diff --git a/var/spack/repos/builtin/packages/intel/package.py b/var/spack/repos/builtin/packages/intel/package.py index cba11db9af..220ff5bcf0 100644 --- a/var/spack/repos/builtin/packages/intel/package.py +++ b/var/spack/repos/builtin/packages/intel/package.py @@ -33,6 +33,8 @@ class Intel(IntelPackage): homepage = "https://software.intel.com/en-us/intel-parallel-studio-xe" + version('18.0.3', '234223cc470717c2095456d9f048d690', + url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13002/parallel_studio_xe_2018_update3_composer_edition.tgz') version('18.0.1', '28cb807126d713350f4aa6f9f167448a', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12381/parallel_studio_xe_2018_update1_composer_edition.tgz') version('18.0.0', '31ba768fba6e7322957b03feaa3add28', -- cgit v1.2.3-70-g09d2 From b1a619fdeb0b06b7c7f29d3c89251c301d47d01d Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 22 Aug 2018 09:37:03 -0500 Subject: r-rsamtools: new version (#9049) --- var/spack/repos/builtin/packages/r-rsamtools/package.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-rsamtools/package.py b/var/spack/repos/builtin/packages/r-rsamtools/package.py index 0789fd3580..aa1ed4b00b 100644 --- a/var/spack/repos/builtin/packages/r-rsamtools/package.py +++ b/var/spack/repos/builtin/packages/r-rsamtools/package.py @@ -34,16 +34,25 @@ class RRsamtools(RPackage): homepage = "https://bioconductor.org/packages/Rsamtools/" git = "https://git.bioconductor.org/packages/Rsamtools.git" + version('1.32.2', commit='2b3254ccdeb24dc6ad95a93c2eb527021631797e') version('1.28.0', commit='dfa5b6abef68175586f21add7927174786412472') depends_on('r-genomeinfodb', type=('build', 'run')) + depends_on('r-genomeinfodb@1.1.3:', when='@1.32.2', type=('build', 'run')) depends_on('r-genomicranges', type=('build', 'run')) + depends_on('r-genomicranges@1.31.8:', when='@1.32.2', type=('build', 'run')) depends_on('r-biostrings', type=('build', 'run')) + depends_on('r-biostrings@2.47.6:', when='@1.32.2', type=('build', 'run')) depends_on('r-biocgenerics', type=('build', 'run')) + depends_on('r-biocgenerics@0.25.1:', when='@1.32.2', type=('build', 'run')) depends_on('r-s4vectors', type=('build', 'run')) + depends_on('r-s4vectors@0.17.25:', when='@1.32.2', type=('build', 'run')) depends_on('r-iranges', type=('build', 'run')) + depends_on('r-iranges@2.13.12:', when='@1.32.2', type=('build', 'run')) depends_on('r-xvector', type=('build', 'run')) + depends_on('r-xvector@0.19.7:', when='@1.32.2', type=('build', 'run')) depends_on('r-zlibbioc', type=('build', 'run')) depends_on('r-bitops', type=('build', 'run')) depends_on('r-biocparallel', type=('build', 'run')) - depends_on('r@3.4.0:3.4.9', when='@1.28.0') + depends_on('r@3.4.0:3.4.9', when='@1.28.0', type=('build', 'run')) + depends_on('r@3.5.0:3.5.9', when='@1.32.2', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From a38e7c783dd7a5c3253033c7c9cd1fa729775da6 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 22 Aug 2018 09:37:56 -0500 Subject: r-genomeinfodbdata: new version (#9050) --- var/spack/repos/builtin/packages/r-genomeinfodbdata/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-genomeinfodbdata/package.py b/var/spack/repos/builtin/packages/r-genomeinfodbdata/package.py index 92e6ba4089..339f1eb4ab 100644 --- a/var/spack/repos/builtin/packages/r-genomeinfodbdata/package.py +++ b/var/spack/repos/builtin/packages/r-genomeinfodbdata/package.py @@ -32,5 +32,8 @@ class RGenomeinfodbdata(RPackage): homepage = "https://bioconductor.org/packages/GenomeInfoDbData/" url = "https://bioconductor.org/packages/3.5/data/annotation/src/contrib/GenomeInfoDbData_0.99.0.tar.gz" + version('1.1.0', '6efdca22839c90d455843bdab7c0ecb5d48e3b6c2f7b4882d3210a6bbad4304c', + url='https://bioconductor.org/packages/release/data/annotation/src/contrib/GenomeInfoDbData_1.1.0.tar.gz') version('0.99.0', '85977b51061dd02a90153db887040d05') - depends_on('r@3.4.0:3.4.9', when='@0.99.0') + depends_on('r@3.4.0:3.4.9', when='@0.99.0', type=('build', 'run')) + depends_on('r@3.5.0:3.5.9', when='@1.1.0', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From c0aabecbb104ee37bea0417a7a7a392efc8903c6 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 22 Aug 2018 09:38:28 -0500 Subject: r-genomeinfodb: new version (#9051) --- var/spack/repos/builtin/packages/r-genomeinfodb/package.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-genomeinfodb/package.py b/var/spack/repos/builtin/packages/r-genomeinfodb/package.py index 214f88e4d3..222dfcf679 100644 --- a/var/spack/repos/builtin/packages/r-genomeinfodb/package.py +++ b/var/spack/repos/builtin/packages/r-genomeinfodb/package.py @@ -34,12 +34,17 @@ class RGenomeinfodb(RPackage): homepage = "https://bioconductor.org/packages/GenomeInfoDb/" git = "https://git.bioconductor.org/packages/GenomeInfoDb.git" + version('1.16.0', commit='6543dad89bbc2c275010b329eb114b237fd712fa') version('1.14.0', commit='4978308a57d887b764cc4ce83724ca1758f580f6') version('1.12.3', commit='2deef3f0571b7f622483257bc22d2509ab5a0369') depends_on('r-biocgenerics', type=('build', 'run')) + depends_on('r-biocgenerics@0.13.8:', when='@1.16.0', type=('build', 'run')) depends_on('r-s4vectors', type=('build', 'run')) + depends_on('r-s4vectors@0.17.25:', when='@1.16.0', type=('build', 'run')) depends_on('r-iranges', type=('build', 'run')) + depends_on('r-iranges@2.13.12:', when='@1.16.0', type=('build', 'run')) depends_on('r-rcurl', type=('build', 'run')) depends_on('r-genomeinfodbdata', type=('build', 'run')) - depends_on('r@3.4.0:3.4.9', when='@1.12.3:') + depends_on('r@3.4.0:3.4.9', when='@1.12.3', type=('build', 'run')) + depends_on('r@3.5.0:3.5.9', when='@1.16.0', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 9a98f450640abea3bec122300816fff5b668c32c Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 22 Aug 2018 09:39:23 -0500 Subject: r-genomicranges: new version (#9052) --- .../repos/builtin/packages/r-genomicranges/package.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-genomicranges/package.py b/var/spack/repos/builtin/packages/r-genomicranges/package.py index 2c3bd55ff1..9e5baff6c7 100644 --- a/var/spack/repos/builtin/packages/r-genomicranges/package.py +++ b/var/spack/repos/builtin/packages/r-genomicranges/package.py @@ -40,14 +40,21 @@ class RGenomicranges(RPackage): homepage = "https://bioconductor.org/packages/GenomicRanges/" git = "https://git.bioconductor.org/packages/GenomicRanges.git" + version('1.32.6', commit='31426be0fd6b76f7858971dc45aaf6e6d1dbac4e') version('1.30.3', commit='e99979054bc50ed8c0109bc54563036c1b368997') version('1.28.6', commit='197472d618f3ed04c795dc6ed435500c29619563') depends_on('r-biocgenerics@0.21.2:', type=('build', 'run')) + depends_on('r-biocgenerics@0.25.3:', when='@1.32.6', type=('build', 'run')) depends_on('r-s4vectors@0.9.47:', type=('build', 'run')) - depends_on('r-iranges@2.9.11:', type=('build', 'run'), when='@1.28.6') - depends_on('r-iranges@2.11.16:', type=('build', 'run'), when='@1.30.3') - depends_on('r-genomeinfodb@1.11.5:', type=('build', 'run'), when='@1.28.6') - depends_on('r-genomeinfodb@1.13.1:', type=('build', 'run'), when='@1.30.3') + depends_on('r-s4vectors@0.17.32:', when='@1.32.6', type=('build', 'run')) + depends_on('r-iranges@2.9.11:', when='@1.28.6', type=('build', 'run')) + depends_on('r-iranges@2.11.16:', when='@1.30.3', type=('build', 'run')) + depends_on('r-iranges@2.14.4:', when='@1.32.6', type=('build', 'run')) + depends_on('r-genomeinfodb@1.11.5:', when='@1.28.6', type=('build', 'run')) + depends_on('r-genomeinfodb@1.13.1:', when='@1.30.3', type=('build', 'run')) + depends_on('r-genomeinfodb@1.15.2:', when='@1.32.6', type=('build', 'run')) depends_on('r-xvector', type=('build', 'run')) - depends_on('r@3.4.0:3.4.9', when='@1.28.6:') + depends_on('r-xvector@0.19.8:', when='@1.32.6', type=('build', 'run')) + depends_on('r@3.4.0:3.4.9', when='@1.28.6', type=('build', 'run')) + depends_on('r@3.5.0:3.5.9', when='@1.32.6', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 711c3d7d69acf6d9176fa80e0097ca89aeec5565 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 22 Aug 2018 09:39:52 -0500 Subject: r-delayedarray: new version (#9053) --- var/spack/repos/builtin/packages/r-delayedarray/package.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-delayedarray/package.py b/var/spack/repos/builtin/packages/r-delayedarray/package.py index 0ffbd43dd7..8eb378a0b1 100644 --- a/var/spack/repos/builtin/packages/r-delayedarray/package.py +++ b/var/spack/repos/builtin/packages/r-delayedarray/package.py @@ -45,13 +45,17 @@ class RDelayedarray(RPackage): homepage = "https://bioconductor.org/packages/DelayedArray/" git = "https://git.bioconductor.org/packages/DelayedArray.git" + version('0.6.5', commit='7d1cb6477cb024c38bf1ee0c9155e010249ed94e') version('0.4.1', commit='ffe932ef8c255614340e4856fc6e0b44128a27a1') version('0.2.7', commit='909c2ce1665ebae2543172ead50abbe10bd42bc4') depends_on('r-biocgenerics', type=('build', 'run')) - depends_on('r-s4vectors@0.14.3:', type=('build', 'run'), when='@0.2.7') - depends_on('r-s4vectors@0.15.3:', type=('build', 'run'), when='@0.4.1') + depends_on('r-biocgenerics@0.25.1:', when='@0.6.5', type=('build', 'run')) + depends_on('r-s4vectors@0.14.3:', when='@0.2.7', type=('build', 'run')) + depends_on('r-s4vectors@0.15.3:', when='@0.4.1', type=('build', 'run')) + depends_on('r-s4vectors@0.17.43:', when='@0.6.5', type=('build', 'run')) depends_on('r-iranges', type=('build', 'run')) - depends_on('r-iranges@2.11.17:', type=('build', 'run'), when='@0.4.1') + depends_on('r-iranges@2.11.17:', when='@0.4.1:', type=('build', 'run')) depends_on('r-matrixstats', type=('build', 'run')) - depends_on('r@3.4.0:3.4.9', when='@0.2.7:') + depends_on('r@3.4.0:3.4.9', when='@0.2.7', type=('build', 'run')) + depends_on('r@3.5.0:3.5.9', when='@0.6.5', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From bfe58cd4a9e530d30f7c0478e366662fa4c04f64 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 22 Aug 2018 09:41:38 -0500 Subject: r-genomicfeatures: new version (#9057) --- .../repos/builtin/packages/r-genomicfeatures/package.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-genomicfeatures/package.py b/var/spack/repos/builtin/packages/r-genomicfeatures/package.py index 06ff4cae60..cb5605d2bb 100644 --- a/var/spack/repos/builtin/packages/r-genomicfeatures/package.py +++ b/var/spack/repos/builtin/packages/r-genomicfeatures/package.py @@ -38,20 +38,32 @@ class RGenomicfeatures(RPackage): homepage = "http://bioconductor.org/packages/GenomicFeatures/" git = "https://git.bioconductor.org/packages/GenomicFeatures.git" + version('1.32.2', commit='8487aedc8be85a99f0c3fc90cd62430b3fec3a03') version('1.28.5', commit='ba92381ae93cb1392dad5e6acfab8f6c1d744834') depends_on('r-biocgenerics', type=('build', 'run')) depends_on('r-s4vectors', type=('build', 'run')) + depends_on('r-s4vectors@0.17.29:', when='@1.32.2', type=('build', 'run')) depends_on('r-iranges', type=('build', 'run')) + depends_on('r-iranges@2.13.23:', when='@1.32.2', type=('build', 'run')) depends_on('r-genomeinfodb', type=('build', 'run')) + depends_on('r-genomeinfodb@1.15.4:', when='@1.32.2', type=('build', 'run')) depends_on('r-genomicranges', type=('build', 'run')) + depends_on('r-genomicranges@1.31.17:', when='@1.32.2', type=('build', 'run')) depends_on('r-annotationdbi', type=('build', 'run')) + depends_on('r-annotationdbi@1.41.4:', when='@1.32.2', type=('build', 'run')) depends_on('r-dbi', type=('build', 'run')) - depends_on('r-rsqlite', type=('build', 'run')) + depends_on('r-rsqlite@2.0:', when='@1.28.5:', type=('build', 'run')) depends_on('r-rcurl', type=('build', 'run')) depends_on('r-xvector', type=('build', 'run')) + depends_on('r-xvector@0.19.7:', when='@1.32.2', type=('build', 'run')) depends_on('r-biostrings', type=('build', 'run')) + depends_on('r-biostrings@2.47.6:', when='@1.32.2', type=('build', 'run')) depends_on('r-rtracklayer', type=('build', 'run')) + depends_on('r-rtracklayer@1.39.7:', when='@1.32.2', type=('build', 'run')) depends_on('r-biomart', type=('build', 'run')) + depends_on('r-biomart@2.17.1:', when='@1.32.2', type=('build', 'run')) depends_on('r-biobase', type=('build', 'run')) - depends_on('r@3.4.0:3.4.9', when='@1.28.5') + depends_on('r-biobase@2.15.1:', when='@1.32.2', type=('build', 'run')) + depends_on('r@3.4.0:3.4.9', when='@1.28.5', type=('build', 'run')) + depends_on('r@3.5.0:3.5.9', when='@1.32.2', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From b474e0bdc9c3c8428e948f673bf9cb481f6f85e4 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 22 Aug 2018 09:43:25 -0500 Subject: r-rtracklayer: new version (#9056) --- var/spack/repos/builtin/packages/r-rtracklayer/package.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-rtracklayer/package.py b/var/spack/repos/builtin/packages/r-rtracklayer/package.py index 3737eb5205..eacb7ff1e3 100644 --- a/var/spack/repos/builtin/packages/r-rtracklayer/package.py +++ b/var/spack/repos/builtin/packages/r-rtracklayer/package.py @@ -36,17 +36,29 @@ class RRtracklayer(RPackage): homepage = "http://bioconductor.org/packages/rtracklayer/" git = "https://git.bioconductor.org/packages/rtracklayer.git" + version('1.40.5', commit='4e5b06daccd0bca1ddcd93052deca896ade58fd6') version('1.36.6', commit='8c0ac7230f94e0c5a981acbb178c8de70e968131') depends_on('r-xml', type=('build', 'run')) depends_on('r-biocgenerics', type=('build', 'run')) + depends_on('r-biocgenerics@0.25.1:', when='@1.40.5', type=('build', 'run')) depends_on('r-s4vectors', type=('build', 'run')) + depends_on('r-s4vectors@0.17.25:', when='@1.40.5', type=('build', 'run')) depends_on('r-iranges', type=('build', 'run')) + depends_on('r-iranges@2.13.13:', when='@1.40.5', type=('build', 'run')) depends_on('r-xvector', type=('build', 'run')) + depends_on('r-xvector@0.19.7:', when='@1.40.5', type=('build', 'run')) depends_on('r-genomeinfodb', type=('build', 'run')) + depends_on('r-genomeinfodb@1.15.2:', when='@1.40.5', type=('build', 'run')) depends_on('r-biostrings', type=('build', 'run')) + depends_on('r-biostrings@2.47.6:', when='@1.40.5', type=('build', 'run')) depends_on('r-zlibbioc', type=('build', 'run')) depends_on('r-rcurl', type=('build', 'run')) depends_on('r-rsamtools', type=('build', 'run')) + depends_on('r-rsamtools@1.31.2:', when='@1.40.5', type=('build', 'run')) depends_on('r-genomicalignments', type=('build', 'run')) - depends_on('r@3.4.0:3.4.9', when='@1.36.6') + depends_on('r-genomicalignments@1.15.6:', when='@1.40.5', type=('build', 'run')) + depends_on('r-genomicranges@1.21.20:', when='@1.36.3', type=('build', 'run')) + depends_on('r-genomicranges@1.31.8:', when='@1.40.5', type=('build', 'run')) + depends_on('r@3.4.0:3.4.9', when='@1.36.6', type=('build', 'run')) + depends_on('r@3.5.0:3.5.9', when='@1.40.5', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 96913f187612aad6c11b95b1fd9d95657c8438f4 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 22 Aug 2018 09:44:21 -0500 Subject: r-qvalue: new version (#9059) --- var/spack/repos/builtin/packages/r-qvalue/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-qvalue/package.py b/var/spack/repos/builtin/packages/r-qvalue/package.py index e7a1b86400..f718f3a42a 100644 --- a/var/spack/repos/builtin/packages/r-qvalue/package.py +++ b/var/spack/repos/builtin/packages/r-qvalue/package.py @@ -43,8 +43,10 @@ class RQvalue(RPackage): homepage = "https://www.bioconductor.org/packages/qvalue/" git = "https://git.bioconductor.org/packages/qvalue.git" + version('2.12.0', commit='7df64ebfcbe69dcbf8b88cb6ef0068bf16979673') version('2.8.0', commit='c7bf3315619d42d800f57a36670c25a7495ded72') - depends_on('r@3.4.0:3.4.9', when='@2.8.0') depends_on('r-ggplot2', type=('build', 'run')) depends_on('r-reshape2', type=('build', 'run')) + depends_on('r@3.4.0:3.4.9', when='@2.8.0', type=('build', 'run')) + depends_on('r@3.5.0:3.5.9', when='@2.12.0', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 51b3edc4f4c11df80c8c3d03342c8dcf79c78927 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 22 Aug 2018 09:44:48 -0500 Subject: r-geneplotter: new version (#9060) --- var/spack/repos/builtin/packages/r-geneplotter/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-geneplotter/package.py b/var/spack/repos/builtin/packages/r-geneplotter/package.py index a5b032a0c6..149378dcf0 100644 --- a/var/spack/repos/builtin/packages/r-geneplotter/package.py +++ b/var/spack/repos/builtin/packages/r-geneplotter/package.py @@ -31,12 +31,14 @@ class RGeneplotter(RPackage): homepage = "https://www.bioconductor.org/packages/geneplotter/" git = "https://git.bioconductor.org/packages/geneplotter.git" + version('1.58.0', commit='2b3f44804d61a40cfe7eaedf74ac9f5a054f7fde') version('1.54.0', commit='efdd946e092e44e35fde1eb4bcc5ec1d52090940') - depends_on('r@3.4.0:3.4.9', when='@1.54.0') depends_on('r-biobase', type=('build', 'run')) depends_on('r-biocgenerics', type=('build', 'run')) depends_on('r-lattice', type=('build', 'run')) depends_on('r-annotate', type=('build', 'run')) depends_on('r-annotationdbi', type=('build', 'run')) depends_on('r-rcolorbrewer', type=('build', 'run')) + depends_on('r@3.4.0:3.4.9', when='@1.54.0', type=('build', 'run')) + depends_on('r@3.5.0:3.5.9', when='@1.58.0', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 0b4774140015cb52bef94df96e0fb9dcd806ef0c Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 22 Aug 2018 09:45:11 -0500 Subject: r-annotate: new version (#9061) --- var/spack/repos/builtin/packages/r-annotate/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-annotate/package.py b/var/spack/repos/builtin/packages/r-annotate/package.py index 0f4960a4e6..dfe682f1c1 100644 --- a/var/spack/repos/builtin/packages/r-annotate/package.py +++ b/var/spack/repos/builtin/packages/r-annotate/package.py @@ -31,10 +31,12 @@ class RAnnotate(RPackage): homepage = "https://www.bioconductor.org/packages/annotate/" git = "https://git.bioconductor.org/packages/annotate.git" + version('1.58.0', commit='d1b5dd5feb8793f4f816d9a4aecbebb5ec7df7bc') version('1.54.0', commit='860cc5b696795a31b18beaf4869f9c418d74549e') - depends_on('r@3.4.0:3.4.9', when='@1.54.0') depends_on('r-annotationdbi', type=('build', 'run')) depends_on('r-xml', type=('build', 'run')) depends_on('r-rcurl', type=('build', 'run')) depends_on('r-xtable', type=('build', 'run')) + depends_on('r@3.4.0:3.4.9', when='@1.54.0', type=('build', 'run')) + depends_on('r@3.5.0:3.5.9', when='@1.58.0', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 8b092c242f5e99263ce6a37f0460247e9210b5b9 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 22 Aug 2018 09:45:56 -0500 Subject: r-genefilter: new version (#9063) * r-genefilter: new version * r-genefilter: fix version in dep --- var/spack/repos/builtin/packages/r-genefilter/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-genefilter/package.py b/var/spack/repos/builtin/packages/r-genefilter/package.py index c7e1c13596..904b9c73e4 100644 --- a/var/spack/repos/builtin/packages/r-genefilter/package.py +++ b/var/spack/repos/builtin/packages/r-genefilter/package.py @@ -31,10 +31,12 @@ class RGenefilter(RPackage): homepage = "https://bioconductor.org/packages/genefilter/" git = "https://git.bioconductor.org/packages/genefilter.git" + version('1.62.0', commit='eb119894f015c759f93f458af7733bdb770a22ad') version('1.58.1', commit='ace2556049677f60882adfe91f8cc96791556fc2') - depends_on('r@3.4.0:3.4.9', when='@1.58.1') depends_on('r-s4vectors', type=('build', 'run')) depends_on('r-annotationdbi', type=('build', 'run')) depends_on('r-annotate', type=('build', 'run')) depends_on('r-biobase', type=('build', 'run')) + depends_on('r@3.4.0:3.4.9', when='@1.58.1', type=('build', 'run')) + depends_on('r@3.5.0:3.5.9', when='@1.62.0', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 0b2a4aea6db46fdccfc5c5879991d8b768ef9c57 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Wed, 22 Aug 2018 16:46:11 +0200 Subject: leveldb: Fix header installation (#9069) leveldb headers are typically included via . The migration to install_tree in 73c978ddd99973e29f2ba42078b10455c1de5ca8 caused the headers to end up in prefix.include, which breaks existing applications. --- var/spack/repos/builtin/packages/leveldb/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/leveldb/package.py b/var/spack/repos/builtin/packages/leveldb/package.py index 75b7b9411e..2f649f4969 100644 --- a/var/spack/repos/builtin/packages/leveldb/package.py +++ b/var/spack/repos/builtin/packages/leveldb/package.py @@ -46,7 +46,7 @@ class Leveldb(MakefilePackage): for library in libraries: install(library, prefix.lib) - install_tree('include/leveldb', prefix.include) + install_tree('include', prefix.include) with open(join_path(prefix.lib, 'pkgconfig', 'leveldb.pc'), 'w') as f: f.write('prefix={0}\n'.format(prefix)) -- cgit v1.2.3-70-g09d2 From 66971f6ac8a0086c53dfb09280ac31a01aac420d Mon Sep 17 00:00:00 2001 From: Sam Gutiérrez Date: Wed, 22 Aug 2018 13:21:30 -0600 Subject: libfabric: Add develop version option. (#9074) Add develop version option to libfabric, conditionally bringing in additional build dependencies: m4, autoconf, automake, libtool. --- var/spack/repos/builtin/packages/libfabric/package.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libfabric/package.py b/var/spack/repos/builtin/packages/libfabric/package.py index cc5601436f..404b1826ee 100644 --- a/var/spack/repos/builtin/packages/libfabric/package.py +++ b/var/spack/repos/builtin/packages/libfabric/package.py @@ -31,7 +31,9 @@ class Libfabric(AutotoolsPackage): homepage = "https://libfabric.org/" url = "https://github.com/ofiwg/libfabric/releases/download/v1.6.1/libfabric-1.6.1.tar.gz" + git = "https://github.com/ofiwg/libfabric.git" + version('develop', branch='master') version('1.6.1', 'ff78dc9fcbf273a119c737a4e1df46d1') version('1.6.0', '91d63ab3c0b9724a4db660019f928cab') version('1.5.3', '1fe07e972fe487c6a3e44c0fb68b49a2') @@ -63,6 +65,16 @@ class Libfabric(AutotoolsPackage): depends_on('psm', when='fabrics=psm') depends_on('ucx', when='fabrics=mlx') + depends_on('m4', when='@develop', type='build') + depends_on('autoconf', when='@develop', type='build') + depends_on('automake', when='@develop', type='build') + depends_on('libtool', when='@develop', type='build') + + @when('@develop') + def autoreconf(self, spec, prefix): + bash = which('bash') + bash('./autogen.sh') + def configure_args(self): args = [] -- cgit v1.2.3-70-g09d2 From a6826a7a2d6e34c65447d0fecd77ce1ac4f2c747 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Wed, 22 Aug 2018 21:21:54 +0200 Subject: glib: Add 2.56.2 (#9071) This should finally fix build failures on RHEL6-based distributions. Also fix the patch to apply to the correct versions and distributions. --- var/spack/repos/builtin/packages/glib/package.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/glib/package.py b/var/spack/repos/builtin/packages/glib/package.py index 76e411aa71..cf4a6ce371 100644 --- a/var/spack/repos/builtin/packages/glib/package.py +++ b/var/spack/repos/builtin/packages/glib/package.py @@ -40,6 +40,7 @@ class Glib(AutotoolsPackage): homepage = "https://developer.gnome.org/glib/" url = "https://ftp.gnome.org/pub/gnome/sources/glib/2.53/glib-2.53.1.tar.xz" + version('2.56.2', 'd64abd16813501c956c4e123ae79f47f1b58de573df9fdd3b0795f1e2c1aa789') version('2.56.1', '40ef3f44f2c651c7a31aedee44259809b6f03d3d20be44545cd7d177221c0b8d') version('2.56.0', 'f2b59392f2fb514bbe7791dda0c36da5') version('2.55.1', '9cbb6b3c7e75ba75575588497c7707b6') @@ -73,9 +74,9 @@ class Glib(AutotoolsPackage): # around a legitimate usage. patch('no-Werror=format-security.patch') # Patch to prevent compiler errors in kernels older than 2.6.35 - patch('old-kernels.patch', when='@2.56: os=rhel6') - patch('old-kernels.patch', when='@2.56: os=centos6') - patch('old-kernels.patch', when='@2.56: os=sl6') + patch('old-kernels.patch', when='@2.56.0:2.56.1 os=rhel6') + patch('old-kernels.patch', when='@2.56.0:2.56.1 os=centos6') + patch('old-kernels.patch', when='@2.56.0:2.56.1 os=scientific6') def url_for_version(self, version): """Handle glib's version-based custom URLs.""" -- cgit v1.2.3-70-g09d2 From 8c89e676691244b4118c30415bd689120bcd307f Mon Sep 17 00:00:00 2001 From: Sam Gutiérrez Date: Wed, 22 Aug 2018 22:17:15 -0600 Subject: libquo: Packaging updates. (#9076) * libquo: Packaging updates. This commit accomplishes a few things: * Changes distribution fetch source * Removes a deprecated version (1.2.9) * Changes dependencies based on version type * Adds a custom autoreconf stage when using the 'develop' version, omitting this step when building from a distribution * Reintroduce v1.2.9. --- var/spack/repos/builtin/packages/libquo/package.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libquo/package.py b/var/spack/repos/builtin/packages/libquo/package.py index fa454bfcdc..c25bdf56a6 100644 --- a/var/spack/repos/builtin/packages/libquo/package.py +++ b/var/spack/repos/builtin/packages/libquo/package.py @@ -32,17 +32,24 @@ class Libquo(AutotoolsPackage): single- and multi-threaded libraries.""" homepage = "https://github.com/lanl/libquo" - url = "https://github.com/lanl/libquo/archive/v1.2.9.tar.gz" + url = "http://lanl.github.io/libquo/dists/libquo-1.3.tar.gz" git = "https://github.com/lanl/libquo.git" version('develop', branch='master') - version('1.3', '3ff74162837425a15ecf695ca0201e4a') - version('1.2.9', 'ca82ab33f13e2b89983f81e7c02e98c2') + version('1.3', '1a1fb83d2c9e99ef5d5fcd71037ef8e8') + version('1.2.9', '85907cfbdb8b1e57fc5fcf3bced7cfa8') depends_on('mpi') - depends_on('autoconf', type='build') - depends_on('automake', type='build') - depends_on('libtool', type='build') + + depends_on('m4', when='@develop', type='build') + depends_on('autoconf', when='@develop', type='build') + depends_on('automake', when='@develop', type='build') + depends_on('libtool', when='@develop', type='build') + + @when('@develop') + def autoreconf(self, spec, prefix): + bash = which('bash') + bash('./autogen') def configure_args(self): return [ -- cgit v1.2.3-70-g09d2 From 05c4ff4e9284a572838e16d693a0a1ad04856b3b Mon Sep 17 00:00:00 2001 From: Daniel Topa Date: Wed, 22 Aug 2018 22:17:48 -0600 Subject: Open mpi add v3.1.2 (#9078) * Add latest release 3.0.2 https://www.open-mpi.org/software/ompi/v3.0/:x Signed-off-by: Daniel Topa * 1. Added correct md5 sum for Open MPI v3.1.1 (https://www.open-mpi.org//software/ompi/v3.1/) 2. Made v3.1.1 the default version 3. Added libmpiso versions for v3.1.1 and 3.0.2 Signed-off-by: Daniel Topa * Added Open MPI v2.14 to version list; Tested build; Added libmpi.so version Signed-off-by: Daniel Topa * Open MPI 3.1.2 built and tested Signed-off-by: Daniel Topa --- var/spack/repos/builtin/packages/openmpi/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index f98db45830..651d36b3b9 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -79,10 +79,11 @@ class Openmpi(AutotoolsPackage): """ homepage = "http://www.open-mpi.org" - url = "https://www.open-mpi.org/software/ompi/v3.1/downloads/openmpi-3.1.1.tar.bz2" + url = "https://www.open-mpi.org/software/ompi/v3.1/downloads/openmpi-3.1.2.tar.bz2" list_url = "http://www.open-mpi.org/software/ompi/" # Current + version('3.1.2', '210df69fafd964158527e7f37e333239') # libmpi.so.40.10.2 version('3.1.1', '493f1db2f75afaab1c8ecba78d2f5aab') # libmpi.so.40.10.1 version('3.1.0', '0895e268ca27735d7654bf64cee6c256') # libmpi.so.40.10.0 -- cgit v1.2.3-70-g09d2 From 983957f7c05bbda048a589b02979e04374a2dddd Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Thu, 23 Aug 2018 14:32:46 +0200 Subject: mvapich2: Use rdma-core for mrail and nemesis*ib* fabrics (#9072) --- var/spack/repos/builtin/packages/mvapich2/package.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mvapich2/package.py b/var/spack/repos/builtin/packages/mvapich2/package.py index daa96593fb..966568cb71 100644 --- a/var/spack/repos/builtin/packages/mvapich2/package.py +++ b/var/spack/repos/builtin/packages/mvapich2/package.py @@ -121,6 +121,10 @@ class Mvapich2(AutotoolsPackage): depends_on('libpciaccess', when=(sys.platform != 'darwin')) depends_on('cuda', when='+cuda') depends_on('psm', when='fabrics=psm') + depends_on('rdma-core', when='fabrics=mrail') + depends_on('rdma-core', when='fabrics=nemesisib') + depends_on('rdma-core', when='fabrics=nemesistcpib') + depends_on('rdma-core', when='fabrics=nemesisibtcp') filter_compiler_wrappers( 'mpicc', 'mpicxx', 'mpif77', 'mpif90', 'mpifort', relative_root='bin' @@ -180,7 +184,8 @@ class Mvapich2(AutotoolsPackage): elif 'fabrics=nemesis' in self.spec: opts = ["--with-device=ch3:nemesis"] elif 'fabrics=mrail' in self.spec: - opts = ["--with-device=ch3:mrail", "--with-rdma=gen2"] + opts = ["--with-device=ch3:mrail", "--with-rdma=gen2", + "--disable-mcast"] return opts @property -- cgit v1.2.3-70-g09d2 From 87c2214b021a500ac5abedd25437b465b5d1bec7 Mon Sep 17 00:00:00 2001 From: Brian Spilner Date: Thu, 23 Aug 2018 15:27:35 +0000 Subject: add cdo releases 1.9.4 and 1.9.5 (#9079) --- var/spack/repos/builtin/packages/cdo/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cdo/package.py b/var/spack/repos/builtin/packages/cdo/package.py index 3e69d8caaa..807992f830 100644 --- a/var/spack/repos/builtin/packages/cdo/package.py +++ b/var/spack/repos/builtin/packages/cdo/package.py @@ -36,6 +36,8 @@ class Cdo(AutotoolsPackage): maintainers = ['skosukhin'] + version('1.9.5', '0c60f2c94dc5c76421ecf363153a5043') + version('1.9.4', '377c9e5aa7d8cbcb4a6c558abb2eb053') version('1.9.3', '13ae222164413dbd53532b03b072def5') version('1.9.2', '38e68d34f0b5b44a52c3241be6831423') version('1.9.1', 'e60a89f268ba24cee5c461f2c217829e') -- cgit v1.2.3-70-g09d2 From ca2e1e9019c50b905662b63041695bbbe6ad7630 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Thu, 23 Aug 2018 11:17:27 -0600 Subject: lammps: add v20180822 (#9081) --- var/spack/repos/builtin/packages/lammps/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lammps/package.py b/var/spack/repos/builtin/packages/lammps/package.py index b05f566cb2..0573317ade 100644 --- a/var/spack/repos/builtin/packages/lammps/package.py +++ b/var/spack/repos/builtin/packages/lammps/package.py @@ -40,6 +40,7 @@ class Lammps(CMakePackage): tags = ['ecp', 'ecp-apps'] version('develop', branch='master') + version('20180822', sha256='9f8942ca3f8e81377ae88ccfd075da4e27d0dd677526085e1a807777c8324074') version('20180629', '6d5941863ee25ad2227ff3b7577d5e7c') version('20180316', '25bad35679583e0dd8cb8753665bb84b') version('20180222', '4d0513e3183bd57721814d217fdaf957') -- cgit v1.2.3-70-g09d2 From 30cbca2c326f8e4b0796b5f72a8beb9cabd73360 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Thu, 23 Aug 2018 17:00:27 -0500 Subject: bison: add new version (#9085) --- var/spack/repos/builtin/packages/bison/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bison/package.py b/var/spack/repos/builtin/packages/bison/package.py index 577c30b5ca..7cf7faba71 100644 --- a/var/spack/repos/builtin/packages/bison/package.py +++ b/var/spack/repos/builtin/packages/bison/package.py @@ -35,6 +35,7 @@ class Bison(AutotoolsPackage): homepage = "http://www.gnu.org/software/bison/" url = "https://ftpmirror.gnu.org/bison/bison-3.0.4.tar.gz" + version('3.0.5', '41ad57813157b61bfa47e33067a9d6f0') version('3.0.4', 'a586e11cd4aff49c3ff6d3b6a4c9ccf8') version('2.7', 'ded660799e76fb1667d594de1f7a0da9') -- cgit v1.2.3-70-g09d2 From 95ca99bbdd8edb059801b31b0ddeb9522c4de7b3 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Thu, 23 Aug 2018 18:50:01 -0500 Subject: htop: add version 2.2.0 (#9086) --- var/spack/repos/builtin/packages/htop/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/htop/package.py b/var/spack/repos/builtin/packages/htop/package.py index 55865a6ee1..e9ea8ed9d1 100644 --- a/var/spack/repos/builtin/packages/htop/package.py +++ b/var/spack/repos/builtin/packages/htop/package.py @@ -33,6 +33,7 @@ class Htop(AutotoolsPackage): list_url = "https://hisham.hm/htop/releases" list_depth = 1 + version('2.2.0', '0d816b6beed31edc75babcfbf863ffa8') version('2.0.2', '7d354d904bad591a931ad57e99fea84a') depends_on('ncurses') -- cgit v1.2.3-70-g09d2 From 4fbcecd0cda27d89b66305f6b362f61d76c3aaf4 Mon Sep 17 00:00:00 2001 From: Hadrien G Date: Fri, 24 Aug 2018 16:41:25 +0200 Subject: range-v3 package (#9093) * Add first version of a Range-v3 package * Add C++ standard variant to range-v3 package --- .../repos/builtin/packages/range-v3/package.py | 59 ++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 var/spack/repos/builtin/packages/range-v3/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/range-v3/package.py b/var/spack/repos/builtin/packages/range-v3/package.py new file mode 100644 index 0000000000..93e2b857f3 --- /dev/null +++ b/var/spack/repos/builtin/packages/range-v3/package.py @@ -0,0 +1,59 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RangeV3(CMakePackage): + """Range library for C++11/14/17""" + + homepage = "https://github.com/ericniebler/range-v3" + url = "https://github.com/ericniebler/range-v3/archive/0.3.6.tar.gz" + git = "https://github.com/ericniebler/range-v3.git" + + version('develop', branch='master') + version('0.3.6', sha256='ce6e80c6b018ca0e03df8c54a34e1fd04282ac1b068cd39e902e2e5201ac117f') + version('0.3.5', sha256='0a0094b450fe17e1454468bef5b6bf60e73ef100aebe1663daf6fbdf2c353836') + version('0.3.0', sha256='cc29fbed5b06b11e7f9a732f7e1211483ebbd3cfe29d86e40c93209014790d74') + version('0.2.6', sha256='b1b448ead59bd726248bcb607b4a47335a00bed1c74630e09d550da3ff72d02c') + version('0.2.5', sha256='4125089da83dec3f0ed676066f0cf583fe55dd9270bc62f1736907f57656ca7e') + version('0.2.4', sha256='6fc4f9e80ee8eb22302db45c5648c665817aeeeee7f99b7effdf6a38a1be9a75') + version('0.2.3', sha256='214a3f0ea70d479ca58f0af8938de49a9ed476564213431ab3b8e02a849b8098') + version('0.2.2', sha256='01a7bee222570a55a79c84a54b2997ed718dac06f43a82122ff0150a11477f9d') + version('0.2.1', sha256='25d5e3dad8052d668873e960bd78f068bebfba3bd28a278f805ea386f9438790') + version('0.2.0', sha256='49b1a62a7a36dab582521c8034d8e736a8922af664d007c1529d3162b1294331') + + variant('cxxstd', + default='11', + values=('11', '14', '17'), + multi=False, + description='Use the specified C++ standard when building.') + + depends_on('cmake@3.6:', type='build') + + def cmake_args(self): + args = [ + '-DRANGES_CXX_STD={0}'.format(self.spec.variants['cxxstd'].value) + ] + return args -- cgit v1.2.3-70-g09d2 From b7e4be4d29e16c1552328eddff95cee24dd02d7d Mon Sep 17 00:00:00 2001 From: Hadrien G Date: Fri, 24 Aug 2018 16:49:38 +0200 Subject: Add new CLHEP releases and move to sha256 hashes (#9089) --- var/spack/repos/builtin/packages/clhep/package.py | 39 ++++++++++++----------- 1 file changed, 20 insertions(+), 19 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/clhep/package.py b/var/spack/repos/builtin/packages/clhep/package.py index 3f79e82b2e..d41cdf25bf 100644 --- a/var/spack/repos/builtin/packages/clhep/package.py +++ b/var/spack/repos/builtin/packages/clhep/package.py @@ -33,25 +33,26 @@ class Clhep(CMakePackage): list_url = "https://proj-clhep.web.cern.ch/proj-clhep/" list_depth = 1 - version('2.4.0.1', 'f06aa2924abbfee0afd5a9beaaa883cf') - version('2.4.0.0', '9af6644e4e04d6807f53956512b7396a') - version('2.3.4.5', '31b4785b40706ff7503bb9ffd412487a') - version('2.3.4.4', '8b8a33d0d19213b60d6c22ce5fc93761') - version('2.3.4.3', '6941279f70d69492fff1aa955f3f2562') - version('2.3.4.2', '1e7a9046c9ad0b347d6812f8031191da') - version('2.3.4.1', '5ae85571ff3d8b2c481c3f95ea89b751') - version('2.3.4.0', 'dd899d0791a823221927f97edf190348') - version('2.3.3.2', '8b9f8d7f4dccec6d058b3a078f66b6a3') - version('2.3.3.1', '456ef9d262ef4e776af984bfbe2f48c7') - version('2.3.3.0', '3637eaa6750606e589e52c9e155a382e') - version('2.3.2.2', '567b304b0fa017e1e9fbf199f456ebe9') - version('2.3.2.1', '064903cb5c23b54f520d04ca6230b901') - version('2.3.1.1', '16efca7641bc118c9d217cc96fe90bf5') - version('2.3.1.0', 'b084934fc26a4182a08c09c292e19161') - version('2.3.0.0', 'a00399a2ca867f2be902c22fc71d7e2e') - version('2.2.0.8', '5a23ed3af785ac100a25f6cb791846af') - version('2.2.0.5', '1584e8ce6ebf395821aed377df315c7c') - version('2.2.0.4', '71d2c7c2e39d86a0262e555148de01c1') + version('2.4.1.0', sha256='d14736eb5c3d21f86ce831dc1afcf03d423825b35c84deb6f8fd16773528c54d') + version('2.4.0.4', sha256='eb013841c57990befa1e977a11a552ab8328733c1c3b6cecfde86da40dc22113') + version('2.4.0.2', sha256='1e9891c5badb718c24933e7a5c6ee4d64fd4d5cf3a40c150ad18e864ec86b8a4') + version('2.4.0.1', sha256='4c7e2c6ac63e0237100e4ddcbfdc3d7e7dc6592f95bdbdcc0e43a6892b9fd6e0') + version('2.4.0.0', sha256='5e5cf284323898b4c807db6e684d65d379ade65fe0e93f7b10456890a6dee8cc') + version('2.3.4.6', sha256='3e53947036f8570c7a08bed670a862426dbca17328afcecd6c875d8487fef204') + version('2.3.4.5', sha256='1199d04626cb8bc1307e282b143018691077cc61fe2f286a382030262eda8764') + version('2.3.4.4', sha256='e54de15ffa5108a1913c4910845436345c89ddb83480cd03277a795fafabfb9d') + version('2.3.4.3', sha256='1019479265f956bd660c11cb439e1443d4fd1655e8d51accf8b1e703e4262dff') + version('2.3.4.2', sha256='6d1e15ccbe1ca6e71d541e78ca7e8c9f3d986ee0da5177a4b8cda00c619dc691') + version('2.3.3.2', sha256='4e69a5afb1b7ecc435395195140afc85bbbb9f4d3572f59451c3882f3015a7c1') + version('2.3.3.1', sha256='cd74bfae4773620dd0c7cc9c1696a08386931d7e47a3906aa632cc5cb44ed6bd') + version('2.3.3.0', sha256='0bcae1bed8d3aa4256e3a553a4f60484312f2121dcc83492a40f08a70881c8c0') + version('2.3.2.2', sha256='885481ae32c2f31c3b7f14a5e5d68bc56dc3df0c597be464d7ffa265b8a5a1af') + version('2.3.1.1', sha256='0e2b170df99176feb0aa4f20ea3b33463193c086682749790c5b9b79388d0ff4') + version('2.3.1.0', sha256='66272ae3100d3aec096b1298e1e24ec25b80e4dac28332b45ec3284023592963') + version('2.3.0.0', sha256='63e77f4f34baa5eaa0adb1ca2438734f2d6f5ca112d830650dd005a6109f2397') + version('2.2.0.8', sha256='f735e236b1f023ba7399269733b2e84eaed4de615081555b1ab3af25a1e92112') + version('2.2.0.5', sha256='92e8b5d32ae96154edd27d0c641ba048ad33cb69dd4f1cfb72fc578770a34818') + version('2.2.0.4', sha256='9bf7fcd9892313c8d1436bc4a4a285a016c4f8e81e1fc65bdf6783207ae57550') variant('cxx11', default=True, description="Compile using c++11 dialect.") variant('cxx14', default=False, description="Compile using c++14 dialect.") -- cgit v1.2.3-70-g09d2 From afff196a068a80d59721d7b7f6607d3e25015a53 Mon Sep 17 00:00:00 2001 From: Hadrien G Date: Fri, 24 Aug 2018 19:26:17 +0200 Subject: Update the pocl package (#9090) * Update the pocl package * Use url_for_version * Clarify hwloc version requirements * Apply hwloc dependency suggestion --- var/spack/repos/builtin/packages/pocl/package.py | 27 ++++++++++++++++++------ 1 file changed, 20 insertions(+), 7 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pocl/package.py b/var/spack/repos/builtin/packages/pocl/package.py index 538e1cfc66..4726d5809a 100644 --- a/var/spack/repos/builtin/packages/pocl/package.py +++ b/var/spack/repos/builtin/packages/pocl/package.py @@ -35,15 +35,17 @@ class Pocl(CMakePackage): GPUs/accelerators.""" homepage = "http://portablecl.org" - url = "http://portablecl.org/downloads/pocl-0.13.tar.gz" + url = "https://github.com/pocl/pocl/archive/v1.1.tar.gz" git = "https://github.com/pocl/pocl.git" version("master", branch="master") - version('0.14', '1d35f09299e76b9e3918c42826555194') - version("0.13", "344480864d4269f2f63f1509395898bd") - version("0.12", "e197ba3aa01a35f40581c48e053330dd") - version("0.11", "9be0640cde2983062c47393d9e8e8fe7") - version("0.10", "0096be4f595c7b5cbfa42430c8b3af6a") + version('1.1', sha256='1e8dd0693a88c84937754df947b202871a40545b1b0a97ebefa370b0281c3c53') + version('1.0', sha256='94bd86a2f9847c03e6c3bf8dca12af3734f8b272ffeacbc3fa8fcca58844b1d4') + version('0.14', sha256='2127bf925a91fbbe3daf2f1bac0da5c8aceb16e2a9434977a3057eade974106a') + version('0.13', sha256='a17f37d8f26819c0c8efc6de2b57f67a0c8a81514fc9cd5005434e49d67499f9') + version('0.12', sha256='5160d7a59721e6a7d0fc85868381c0afceaa7c07b9956c9be1e3b51e80c29f76') + version('0.11', sha256='24bb801fb87d104b66faaa95d1890776fdeabb37ad1b12fb977281737c7f29bb') + version('0.10', sha256='e9c38f774a77e61f66d850b705a5ba42d49356c40e75733db4c4811e091e5088') # This is Github's pocl/pocl#373 patch("uint.patch", when="@:0.13") @@ -56,6 +58,7 @@ class Pocl(CMakePackage): depends_on("cmake @2.8.12:", type="build") depends_on("hwloc") + depends_on("hwloc@:1.99.99", when="@:1.1.99") depends_on("libtool", type=("build", "link", "run")) depends_on("pkgconfig", type="build") @@ -63,7 +66,9 @@ class Pocl(CMakePackage): # enabled by default, and also because they fail to build for us # (see #1616) # These are the supported LLVM versions - depends_on("llvm +clang @3.7:3.9", when="@master") + depends_on("llvm +clang @6.0:7.0", when="@master") + depends_on("llvm +clang @5.0:6.0", when="@1.1") + depends_on("llvm +clang @4.0:5.0", when="@1.0") depends_on("llvm +clang @3.7:4.0", when="@0.14") depends_on("llvm +clang @3.7:3.8", when="@0.13") depends_on("llvm +clang @3.2:3.7", when="@0.12") @@ -77,6 +82,14 @@ class Pocl(CMakePackage): variant("icd", default=False, description="Support a system-wide ICD loader") + def url_for_version(self, version): + if version >= Version('1.0'): + url = "https://github.com/pocl/pocl/archive/v{0}.tar.gz" + else: + url = "http://portablecl.org/downloads/pocl-{0}.tar.gz" + + return url.format(version.up_to(2)) + def cmake_args(self): spec = self.spec args = ["-DINSTALL_OPENCL_HEADERS=ON"] -- cgit v1.2.3-70-g09d2 From a7f3fa01d5e06f2614087d35db51a400ff26c12c Mon Sep 17 00:00:00 2001 From: Hadrien G Date: Fri, 24 Aug 2018 23:45:18 +0200 Subject: new package: GSL - C++ Guideline Support Library (#9091) Since "GSL" is a highly overloaded acronym, the package name is "cppgsl". --- var/spack/repos/builtin/packages/cppgsl/package.py | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 var/spack/repos/builtin/packages/cppgsl/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cppgsl/package.py b/var/spack/repos/builtin/packages/cppgsl/package.py new file mode 100644 index 0000000000..06cd2570c0 --- /dev/null +++ b/var/spack/repos/builtin/packages/cppgsl/package.py @@ -0,0 +1,51 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Cppgsl(CMakePackage): + """C++ Guideline Support Library""" + + homepage = "https://github.com/Microsoft/GSL" + url = "https://github.com/Microsoft/GSL/archive/v2.0.0.tar.gz" + git = "https://github.com/Microsoft/GSL.git" + + version('develop', branch='master') + version('2.0.0', sha256='6cce6fb16b651e62711a4f58e484931013c33979b795d1b1f7646f640cfa9c8e') + version('1.0.0', sha256='9694b04cd78e5b1a769868f19fdd9eea2002de3d4c3a81a1b769209364543c36') + + variant('cxxstd', + default='14', + values=('14', '17'), + multi=False, + description='Use the specified C++ standard when building.') + + depends_on('cmake@3.1.3:', type='build') + + def cmake_args(self): + args = [ + '-DGSL_CXX_STANDARD={0}'.format(self.spec.variants['cxxstd'].value) + ] + return args -- cgit v1.2.3-70-g09d2 From 3c292de6bdfe4c058201afe4fdb34cf9a4da8da8 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Fri, 24 Aug 2018 11:45:35 -0700 Subject: bugfix: 'submodules' attribute should imply git fetch - 'submodules' wasn't properly declared as an optional attribute for git fetcher - add it and add a test. --- lib/spack/spack/fetch_strategy.py | 2 +- lib/spack/spack/test/packages.py | 7 +++++++ var/spack/repos/builtin.mock/packages/git-url-top-level/package.py | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/lib/spack/spack/fetch_strategy.py b/lib/spack/spack/fetch_strategy.py index 38b837b659..f5425d6bbd 100644 --- a/lib/spack/spack/fetch_strategy.py +++ b/lib/spack/spack/fetch_strategy.py @@ -596,7 +596,7 @@ class GitFetchStrategy(VCSFetchStrategy): """ enabled = True url_attr = 'git' - optional_attrs = ['tag', 'branch', 'commit'] + optional_attrs = ['tag', 'branch', 'commit', 'submodules'] def __init__(self, **kwargs): # Discards the keywords in kwargs that may conflict with the next call diff --git a/lib/spack/spack/test/packages.py b/lib/spack/spack/test/packages.py index 464e37a8d2..296a263479 100644 --- a/lib/spack/spack/test/packages.py +++ b/lib/spack/spack/test/packages.py @@ -341,6 +341,13 @@ def test_git_url_top_level_git_versions(mock_packages, config): assert fetcher.commit == 'abc34' assert fetcher.branch is None + fetcher = spack.fetch_strategy.for_package_version(pkg, 'submodules') + assert isinstance(fetcher, spack.fetch_strategy.GitFetchStrategy) + assert fetcher.url == 'https://example.com/some/git/repo' + assert fetcher.tag is None + assert fetcher.commit is None + assert fetcher.branch is None + fetcher = spack.fetch_strategy.for_package_version(pkg, 'develop') assert isinstance(fetcher, spack.fetch_strategy.GitFetchStrategy) assert fetcher.url == 'https://example.com/some/git/repo' diff --git a/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py b/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py index f3fe17bd0f..74f2aa69e5 100644 --- a/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py +++ b/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py @@ -39,6 +39,7 @@ class GitUrlTopLevel(Package): # These resolve to git fetchers version('develop', branch='develop') + version('submodules', submodules=True) version('3.4', commit='abc34') version('3.3', branch='releases/v3.3', commit='abc33') version('3.2', branch='releases/v3.2') -- cgit v1.2.3-70-g09d2 From cc01e89d6b0a615059fe3c8ac933230ed41930df Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sat, 25 Aug 2018 14:12:46 -0500 Subject: Update to latest version of pytest and dependencies (#9087) * Update to latest version of pytest and dependencies * Fix bug in installation tests --- lib/spack/spack/build_systems/python.py | 2 +- var/spack/repos/builtin/packages/gdal/package.py | 2 +- .../builtin/packages/py-atomicwrites/package.py | 38 ++++++++++++++++++++++ .../repos/builtin/packages/py-funcsigs/package.py | 11 +++++-- .../builtin/packages/py-more-itertools/package.py | 7 ++-- .../repos/builtin/packages/py-numpy/package.py | 13 ++++---- .../repos/builtin/packages/py-pathlib2/package.py | 8 +++-- .../repos/builtin/packages/py-pluggy/package.py | 4 ++- var/spack/repos/builtin/packages/py-py/package.py | 11 +++++-- .../repos/builtin/packages/py-pytest/package.py | 14 ++++---- .../repos/builtin/packages/py-scandir/package.py | 8 +++-- .../repos/builtin/packages/py-scipy/package.py | 2 +- .../builtin/packages/py-setuptools-scm/package.py | 8 +++-- .../builtin/packages/py-setuptools/package.py | 19 ++++++++--- 14 files changed, 111 insertions(+), 36 deletions(-) create mode 100644 var/spack/repos/builtin/packages/py-atomicwrites/package.py (limited to 'var') diff --git a/lib/spack/spack/build_systems/python.py b/lib/spack/spack/build_systems/python.py index 7933253eed..aadb4e24a2 100644 --- a/lib/spack/spack/build_systems/python.py +++ b/lib/spack/spack/build_systems/python.py @@ -400,7 +400,7 @@ class PythonPackage(PackageBase): # Make sure we are importing the installed modules, # not the ones in the current directory - with working_dir('..'): + with working_dir('spack-test', create=True): for module in self.import_modules: self.python('-c', 'import {0}'.format(module)) diff --git a/var/spack/repos/builtin/packages/gdal/package.py b/var/spack/repos/builtin/packages/gdal/package.py index e49f473198..cce78ae22d 100644 --- a/var/spack/repos/builtin/packages/gdal/package.py +++ b/var/spack/repos/builtin/packages/gdal/package.py @@ -440,7 +440,7 @@ class Gdal(AutotoolsPackage): @on_package_attributes(run_tests=True) def import_module_test(self): if '+python' in self.spec: - with working_dir('..'): + with working_dir('spack-test', create=True): for module in self.import_modules: python('-c', 'import {0}'.format(module)) diff --git a/var/spack/repos/builtin/packages/py-atomicwrites/package.py b/var/spack/repos/builtin/packages/py-atomicwrites/package.py new file mode 100644 index 0000000000..6bef606dd7 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-atomicwrites/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyAtomicwrites(PythonPackage): + """Atomic file writes.""" + + homepage = "https://github.com/untitaker/python-atomicwrites" + url = "https://pypi.io/packages/source/a/atomicwrites/atomicwrites-1.1.5.tar.gz" + + import_modules = ['atomicwrites'] + + version('1.1.5', sha256='240831ea22da9ab882b551b31d4225591e5e447a68c5e188db5b89ca1d487585') + + depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-funcsigs/package.py b/var/spack/repos/builtin/packages/py-funcsigs/package.py index ae52bade12..e51e760942 100644 --- a/var/spack/repos/builtin/packages/py-funcsigs/package.py +++ b/var/spack/repos/builtin/packages/py-funcsigs/package.py @@ -27,9 +27,14 @@ from spack import * class PyFuncsigs(PythonPackage): """Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2.""" + homepage = "https://pypi.python.org/pypi/funcsigs" - url = "https://pypi.io/packages/source/f/funcsigs/funcsigs-0.4.tar.gz" + url = "https://pypi.io/packages/source/f/funcsigs/funcsigs-1.0.2.tar.gz" + + import_modules = ['funcsigs'] - version('0.4', 'fb1d031f284233e09701f6db1281c2a5') + version('1.0.2', '7e583285b1fb8a76305d6d68f4ccc14e') + version('0.4', 'fb1d031f284233e09701f6db1281c2a5') - depends_on('py-setuptools', type='build') + depends_on('py-setuptools@17.1:', type='build') + depends_on('py-unittest2', type='test') diff --git a/var/spack/repos/builtin/packages/py-more-itertools/package.py b/var/spack/repos/builtin/packages/py-more-itertools/package.py index 736b908600..707bb2f06c 100644 --- a/var/spack/repos/builtin/packages/py-more-itertools/package.py +++ b/var/spack/repos/builtin/packages/py-more-itertools/package.py @@ -29,10 +29,13 @@ class PyMoreItertools(PythonPackage): """Additions to the standard Python itertools package.""" homepage = "https://github.com/erikrose/more-itertools" - url = "https://pypi.io/packages/source/m/more-itertools/more-itertools-4.1.0.tar.gz" + url = "https://pypi.io/packages/source/m/more-itertools/more-itertools-4.3.0.tar.gz" + import_modules = ['more_itertools', 'more_itertools.tests'] + + version('4.3.0', '42157ef9b677bdf6d3609ed6eadcbd4a') version('4.1.0', '246f46686d95879fbad37855c115dc52') - version('2.2', 'b8d328a33f966bf40bb829bcf8da35ce') + version('2.2', 'b8d328a33f966bf40bb829bcf8da35ce') depends_on('py-setuptools', type='build') depends_on('py-six@1.0.0:1.999', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-numpy/package.py b/var/spack/repos/builtin/packages/py-numpy/package.py index 435491f658..7c0dcafbef 100644 --- a/var/spack/repos/builtin/packages/py-numpy/package.py +++ b/var/spack/repos/builtin/packages/py-numpy/package.py @@ -34,7 +34,7 @@ class PyNumpy(PythonPackage): number capabilities""" homepage = "http://www.numpy.org/" - url = "https://pypi.io/packages/source/n/numpy/numpy-1.13.1.zip" + url = "https://pypi.io/packages/source/n/numpy/numpy-1.15.1.zip" install_time_test_callbacks = ['install_test', 'import_module_test'] @@ -45,9 +45,7 @@ class PyNumpy(PythonPackage): 'numpy.distutils.command', 'numpy.distutils.fcompiler' ] - # FIXME: numpy._build_utils and numpy.core.code_generators failed to import - # FIXME: Is this expected? - + version('1.15.1', '898004d5be091fde59ae353e3008fe9b') version('1.14.3', '97416212c0a172db4bc6b905e9c4634b') version('1.14.2', '080f01a19707cf467393e426382c7619') version('1.14.1', 'b8324ef90ac9064cd0eac46b8b388674') @@ -67,12 +65,13 @@ class PyNumpy(PythonPackage): variant('blas', default=True, description='Build with BLAS support') variant('lapack', default=True, description='Build with LAPACK support') - depends_on('python@2.7:2.8,3.4:') + depends_on('python@2.7:2.8,3.4:', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('blas', when='+blas') depends_on('lapack', when='+lapack') - depends_on('py-nose@1.0.0:', type='test') + depends_on('py-nose@1.0.0:', when='@:1.14', type='test') + depends_on('py-pytest', when='@1.15:', type='test') def setup_dependent_package(self, module, dependent_spec): python_version = self.spec['python'].version.up_to(2) @@ -182,5 +181,5 @@ class PyNumpy(PythonPackage): # ImportError: Error importing numpy: you should not try to import # numpy from its source directory; please exit the numpy # source tree, and relaunch your python interpreter from there. - with working_dir('..'): + with working_dir('spack-test', create=True): python('-c', 'import numpy; numpy.test("full", verbose=2)') diff --git a/var/spack/repos/builtin/packages/py-pathlib2/package.py b/var/spack/repos/builtin/packages/py-pathlib2/package.py index 352efb0811..0e3975c140 100644 --- a/var/spack/repos/builtin/packages/py-pathlib2/package.py +++ b/var/spack/repos/builtin/packages/py-pathlib2/package.py @@ -29,9 +29,13 @@ class PyPathlib2(PythonPackage): """Backport of pathlib from python 3.4""" homepage = "https://pypi.python.org/pypi/pathlib2" - url = "https://pypi.io/packages/source/p/pathlib2/pathlib2-2.1.0.tar.gz" + url = "https://pypi.io/packages/source/p/pathlib2/pathlib2-2.3.2.tar.gz" + import_modules = ['pathlib2'] + + version('2.3.2', 'fd76fb5d0baa798bfe12fb7965da97f8') version('2.1.0', '38e4f58b4d69dfcb9edb49a54a8b28d2') depends_on('py-setuptools', type='build') - depends_on('python@:3.3') + depends_on('py-six', type=('build', 'run')) + depends_on('py-scandir', when='^python@:3.4', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pluggy/package.py b/var/spack/repos/builtin/packages/py-pluggy/package.py index 6e77c7a8f2..5a51db0f50 100644 --- a/var/spack/repos/builtin/packages/py-pluggy/package.py +++ b/var/spack/repos/builtin/packages/py-pluggy/package.py @@ -29,12 +29,14 @@ class PyPluggy(PythonPackage): """Plugin and hook calling mechanisms for python.""" homepage = "https://github.com/pytest-dev/pluggy" - url = "https://pypi.io/packages/source/p/pluggy/pluggy-0.6.0.tar.gz" + url = "https://pypi.io/packages/source/p/pluggy/pluggy-0.7.1.tar.gz" import_modules = ['pluggy'] + version('0.7.1', 'cd5cc1003143f86dd6e2a865a20f8837') version('0.6.0', 'ffdde7c3a5ba9a440404570366ffb6d5') depends_on('python@2.7:2.8,3.4:', type=('build', 'run')) depends_on('py-setuptools', type='build') + depends_on('py-setuptools-scm', type='build') diff --git a/var/spack/repos/builtin/packages/py-py/package.py b/var/spack/repos/builtin/packages/py-py/package.py index f585c84616..ad6f253649 100644 --- a/var/spack/repos/builtin/packages/py-py/package.py +++ b/var/spack/repos/builtin/packages/py-py/package.py @@ -29,12 +29,14 @@ class PyPy(PythonPackage): """Library with cross-python path, ini-parsing, io, code, log facilities""" homepage = "http://pylib.readthedocs.io/en/latest/" - url = "https://pypi.io/packages/source/p/py/py-1.5.3.tar.gz" + url = "https://pypi.io/packages/source/p/py/py-1.5.4.tar.gz" import_modules = [ - 'py', 'py._code', 'py._io', 'py._log', 'py._path', 'py._process', + 'py', 'py._process', 'py._vendored_packages', 'py._path', + 'py._log', 'py._code', 'py._io' ] + version('1.5.4', '7502d66fa68ea4ae5b61c511cd177d6a') version('1.5.3', '667d37a148ad9fb81266492903f2d880') version('1.4.33', '15d7107cbb8b86593bf9afa16e56da65') version('1.4.31', '5d2c63c56dc3f2115ec35c066ecd582b') @@ -42,3 +44,8 @@ class PyPy(PythonPackage): depends_on('python@2.7:2.8,3.4:', type=('build', 'run')) depends_on('py-setuptools', type='build') + depends_on('py-setuptools-scm', type='build') + + def test(self): + # Tests require pytest, creating a circular dependency + pass diff --git a/var/spack/repos/builtin/packages/py-pytest/package.py b/var/spack/repos/builtin/packages/py-pytest/package.py index a2339f3ef2..90eab3738b 100644 --- a/var/spack/repos/builtin/packages/py-pytest/package.py +++ b/var/spack/repos/builtin/packages/py-pytest/package.py @@ -29,13 +29,14 @@ class PyPytest(PythonPackage): """pytest: simple powerful testing with Python.""" homepage = "http://pytest.org/" - url = "https://pypi.io/packages/source/p/pytest/pytest-3.7.1.tar.gz" + url = "https://pypi.io/packages/source/p/pytest/pytest-3.7.2.tar.gz" import_modules = [ '_pytest', '_pytest.assertion', '_pytest._code', '_pytest.mark', 'pytest' ] + version('3.7.2', 'd12d0d556a21fd8633e105f1a8d5a0f9') version('3.7.1', '2704e16bb2c11af494167f80a7cd37c4') version('3.5.1', 'ffd870ee3ca561695d2f916f0f0f3c0b') version('3.0.7', '89c60546507dc7eb6e9e40a6e9f720bd') @@ -51,9 +52,8 @@ class PyPytest(PythonPackage): depends_on('py-six@1.10.0:', type=('build', 'run')) depends_on('py-attrs@17.4.0:', type=('build', 'run')) depends_on('py-more-itertools@4.0.0:', type=('build', 'run')) - depends_on('py-pluggy@0.5:0.6', type=('build', 'run')) - depends_on('py-funcsigs', type=('build', 'run'), when='^python@:2') - - depends_on('py-nose', type='test') - depends_on('py-mock', type='test') - depends_on('py-requests', type='test') + depends_on('py-atomicwrites@1.0:', type=('build', 'run')) + depends_on('py-pluggy@0.7:', when='@3.7:', type=('build', 'run')) + depends_on('py-pluggy@0.5:0.6', when='@:3.6', type=('build', 'run')) + depends_on('py-funcsigs', when='^python@:2', type=('build', 'run')) + depends_on('py-pathlib2@2.2.0:', when='^python@:3.5', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-scandir/package.py b/var/spack/repos/builtin/packages/py-scandir/package.py index ff52559368..0bc069e198 100644 --- a/var/spack/repos/builtin/packages/py-scandir/package.py +++ b/var/spack/repos/builtin/packages/py-scandir/package.py @@ -29,9 +29,11 @@ class PyScandir(PythonPackage): """scandir, a better directory iterator and faster os.walk().""" homepage = "https://github.com/benhoyt/scandir" - url = "https://pypi.io/packages/source/s/scandir/scandir-1.6.tar.gz" + url = "https://pypi.io/packages/source/s/scandir/scandir-1.9.0.tar.gz" - version('1.6', '0180ddb97c96cbb2d4f25d2ae11c64ac') + import_modules = ['scandir'] + + version('1.9.0', '506c4cc5f38c00b301642a9cb0433910') + version('1.6', '0180ddb97c96cbb2d4f25d2ae11c64ac') - depends_on('python@2.7:') depends_on('py-setuptools', type=('build')) diff --git a/var/spack/repos/builtin/packages/py-scipy/package.py b/var/spack/repos/builtin/packages/py-scipy/package.py index 7aba6223ef..acf93a6f25 100644 --- a/var/spack/repos/builtin/packages/py-scipy/package.py +++ b/var/spack/repos/builtin/packages/py-scipy/package.py @@ -97,5 +97,5 @@ class PyScipy(PythonPackage): # ImportError: Error importing scipy: you should not try to import # scipy from its source directory; please exit the scipy # source tree, and relaunch your python interpreter from there. - with working_dir('..'): + with working_dir('spack-test', create=True): python('-c', 'import scipy; scipy.test("full", verbose=2)') diff --git a/var/spack/repos/builtin/packages/py-setuptools-scm/package.py b/var/spack/repos/builtin/packages/py-setuptools-scm/package.py index a1f2aa074f..bda8a527b9 100644 --- a/var/spack/repos/builtin/packages/py-setuptools-scm/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools-scm/package.py @@ -26,11 +26,15 @@ from spack import * class PySetuptoolsScm(PythonPackage): - """the blessed package to manage your versions by scm tags""" + """The blessed package to manage your versions by scm tags.""" homepage = "https://github.com/pypa/setuptools_scm" - url = "https://pypi.io/packages/source/s/setuptools_scm/setuptools_scm-1.15.6.tar.gz" + url = "https://pypi.io/packages/source/s/setuptools_scm/setuptools_scm-3.1.0.tar.gz" + import_modules = ['setuptools_scm'] + + version('3.1.0', '52a8dee23c9e5f7d7d18094563db516c') version('1.15.6', 'f17493d53f0d842bb0152f214775640b') depends_on('py-setuptools', type='build') + depends_on('python@2.7:2.8,3.4:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-setuptools/package.py b/var/spack/repos/builtin/packages/py-setuptools/package.py index 23bbc1cd5c..2ede7f4c51 100644 --- a/var/spack/repos/builtin/packages/py-setuptools/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools/package.py @@ -29,11 +29,18 @@ class PySetuptools(PythonPackage): """A Python utility that aids in the process of downloading, building, upgrading, installing, and uninstalling Python packages.""" - homepage = "https://pypi.python.org/pypi/setuptools" - url = "https://pypi.io/packages/source/s/setuptools/setuptools-39.0.1.zip" + homepage = "https://github.com/pypa/setuptools" + url = "https://pypi.io/packages/source/s/setuptools/setuptools-40.2.0.zip" - import_modules = ['pkg_resources', 'setuptools', 'setuptools.command'] + import_modules = [ + 'setuptools', 'pkg_resources', 'setuptools._vendor', + 'setuptools.command', 'setuptools.extern', + 'setuptools._vendor.packaging', 'pkg_resources._vendor', + 'pkg_resources.extern', 'pkg_resources._vendor.packaging', + 'easy_install' + ] + version('40.2.0', '592efabea3a65d8e97a025ed52f69b12') version('39.2.0', 'dd4e3fa83a21bf7bf9c51026dc8a4e59') version('39.0.1', '75310b72ca0ab4e673bf7679f69d7a62') version('35.0.2', 'c368b4970d3ad3eab5afe4ef4dbe2437') @@ -48,7 +55,7 @@ class PySetuptools(PythonPackage): version('16.0', '0ace0b96233516fc5f7c857d086aa3ad') version('11.3.1', '01f69212e019a2420c1693fb43593930') - depends_on('python@2.6:2.8,3.3:') + depends_on('python@2.7:2.8,3.4:', type=('build', 'run')) # Previously, setuptools vendored all of its dependencies to allow # easy bootstrapping. As of version 34.0.0, this is no longer done @@ -70,3 +77,7 @@ class PySetuptools(PythonPackage): url += '.tar.gz' return url + + def test(self): + # Unit tests require pytest, creating a circular dependency + pass -- cgit v1.2.3-70-g09d2 From 2ae1bfd2835b0227e5f85a1f44c0dce0a24ddb29 Mon Sep 17 00:00:00 2001 From: TZ Date: Mon, 27 Aug 2018 02:44:06 +0200 Subject: patch for OF.com@18.06 to correctly find KAHIP (#8982) - OpenFOAM-v1806/wmake/scripts/have_kahip must check $KAHIP_ARCH_PATH instead of $METIS_ARCH_PATH to detect the KAHIB library - use a local patch file until the issue is hopefully fixed upstream --- .../builtin/packages/openfoam-com/1806-have-kahip.patch | 17 +++++++++++++++++ .../repos/builtin/packages/openfoam-com/package.py | 1 + 2 files changed, 18 insertions(+) create mode 100644 var/spack/repos/builtin/packages/openfoam-com/1806-have-kahip.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openfoam-com/1806-have-kahip.patch b/var/spack/repos/builtin/packages/openfoam-com/1806-have-kahip.patch new file mode 100644 index 0000000000..3e10a44145 --- /dev/null +++ b/var/spack/repos/builtin/packages/openfoam-com/1806-have-kahip.patch @@ -0,0 +1,17 @@ +--- OpenFOAM-v1806/wmake/scripts/have_kahip-ORIG 2018-06-28 16:39:32.000000000 +0200 ++++ OpenFOAM-v1806/wmake/scripts/have_kahip 2018-08-11 13:37:18.250219013 +0200 +@@ -83,10 +83,10 @@ + # FOAM_EXT_LIBBIN is allowed to be unset + library=$(findFirstFile \ + $FOAM_EXT_LIBBIN/$library \ +- $METIS_ARCH_PATH/lib/$static \ +- $METIS_ARCH_PATH/lib/$library \ +- $METIS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/$static \ +- $METIS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/$library \ ++ $KAHIP_ARCH_PATH/lib/$static \ ++ $KAHIP_ARCH_PATH/lib/$library \ ++ $KAHIP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/$static \ ++ $KAHIP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/$library \ + ) + elif isSystem "$KAHIP_ARCH_PATH" + then diff --git a/var/spack/repos/builtin/packages/openfoam-com/package.py b/var/spack/repos/builtin/packages/openfoam-com/package.py index 7613d688f7..27e9de86b5 100644 --- a/var/spack/repos/builtin/packages/openfoam-com/package.py +++ b/var/spack/repos/builtin/packages/openfoam-com/package.py @@ -355,6 +355,7 @@ class OpenfoamCom(Package): # Version-specific patches patch('1612-spack-patches.patch', when='@1612') + patch('1806-have-kahip.patch', when='@1806') # Some user config settings # default: 'compile-option': 'RpathOpt', -- cgit v1.2.3-70-g09d2 From 7c06492d94d589000e48bcdb0c80d2d3e400716e Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Sun, 26 Aug 2018 19:44:53 -0500 Subject: braker: add new version 2.1.0 (#8946) * braker: add new version 2.1.0 * Set verison in descending order. * Update URL. * url * braker: change url format. --- var/spack/repos/builtin/packages/braker/package.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/braker/package.py b/var/spack/repos/builtin/packages/braker/package.py index c9f5e2f611..c72ec6e87d 100644 --- a/var/spack/repos/builtin/packages/braker/package.py +++ b/var/spack/repos/builtin/packages/braker/package.py @@ -30,13 +30,15 @@ class Braker(Package): that combines the advantages of GeneMark-ET and AUGUSTUS""" homepage = "http://exon.gatech.edu/braker1.html" - url = "http://bioinf.uni-greifswald.de/augustus/binaries/BRAKER1_v1.11.tar.gz" + url = "http://bioinf.uni-greifswald.de/augustus/binaries/BRAKER_v2.1.0.tar.gz" list_url = "http://bioinf.uni-greifswald.de/augustus/binaries/old" - version('1.11', '297efe4cabdd239b710ac2c45d81f6a5') + version('2.1.0', '5f974abcceb9f96a11668fa20a6f6a56') + version('1.11', '297efe4cabdd239b710ac2c45d81f6a5', + url='http://bioinf.uni-greifswald.de/augustus/binaries/old/BRAKER1_v1.11.tar.gz') depends_on('perl', type=('build', 'run')) - depends_on('augustus') + depends_on('augustus@3.2.3') depends_on('genemark-et') depends_on('bamtools') depends_on('samtools') -- cgit v1.2.3-70-g09d2 From bba5967dcc02e7df7d16b9cf416c6615f145d420 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Sun, 26 Aug 2018 19:45:23 -0500 Subject: r-goseq: new package (#8939) * r-goseq: new package * r-goseq: git not url * r-goseq: adding packages needed at runtime * r-goseq: package type * r-goseq: dep types * r-goseq: one more --- .../repos/builtin/packages/r-goseq/package.py | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-goseq/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-goseq/package.py b/var/spack/repos/builtin/packages/r-goseq/package.py new file mode 100644 index 0000000000..b296d8a5db --- /dev/null +++ b/var/spack/repos/builtin/packages/r-goseq/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RGoseq(RPackage): + """Detects Gene Ontology and/or other user defined categories which are + over/under represented in RNA-seq data""" + + homepage = "https://bioconductor.org/packages/release/bioc/html/goseq.html" + git = "https://git.bioconductor.org/packages/goseq.git" + + version('1.32.0', commit='32fcbe647eea17d7d0d7a262610811502c421d36') + + depends_on('r@3.5.0:3.5.9', when='@1.32.0:', type=('build', 'run')) + depends_on('r-biasedurn', type=('build', 'run')) + depends_on('r-genelendatabase@1.9.2:', type=('build', 'run')) + depends_on('r-mgcv', type=('build', 'run')) + depends_on('r-annotationdbi', type=('build', 'run')) + depends_on('r-go-db', type=('build', 'run')) + depends_on('r-biocgenerics', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From c56992587e9297663411ec8590f2a10b19597e8b Mon Sep 17 00:00:00 2001 From: Alan Williams Date: Sun, 26 Aug 2018 18:49:35 -0600 Subject: Add line in trilinos/stk configuration to enable stk_ngp package. (#9082) The Trilinos/stk configuration is pretty Nalu specific right now (and is acknowledged as such in a comment in package.py), and this commit enables a module that Nalu will be needing. --- var/spack/repos/builtin/packages/trilinos/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index ebcd27c28a..3a245e2df3 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -431,6 +431,7 @@ class Trilinos(CMakePackage): # They can likely change when necessary in the future options.extend([ '-DTrilinos_ENABLE_STKMesh:BOOL=ON', + '-DTrilinos_ENABLE_STKNGP:BOOL=ON', '-DTrilinos_ENABLE_STKSimd:BOOL=ON', '-DTrilinos_ENABLE_STKIO:BOOL=ON', '-DTrilinos_ENABLE_STKTransfer:BOOL=ON', -- cgit v1.2.3-70-g09d2 From 2fdfa4673571c053e1f1a72a4ead5d97464d720f Mon Sep 17 00:00:00 2001 From: Sasha Nícolas Date: Mon, 27 Aug 2018 16:34:05 -0500 Subject: dyninst: add dependency on libiberty (#8806) * Adding dependency of libiberty to Dyninst package configuration. * Now it depends on libiberty package and not binutils. --- var/spack/repos/builtin/packages/dyninst/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dyninst/package.py b/var/spack/repos/builtin/packages/dyninst/package.py index e2aa774126..59f1d91dc1 100644 --- a/var/spack/repos/builtin/packages/dyninst/package.py +++ b/var/spack/repos/builtin/packages/dyninst/package.py @@ -58,6 +58,7 @@ class Dyninst(Package): depends_on("elf@1", type='link', when='@9.3.0:') depends_on("libdwarf", when='@:9') depends_on("boost@1.42:") + depends_on('libiberty+pic') depends_on('cmake', type='build') patch('stat_dysect.patch', when='+stat_dysect') -- cgit v1.2.3-70-g09d2 From 04c25ac46866259b05c575637f2e7e1e2b21dfe7 Mon Sep 17 00:00:00 2001 From: Douglas Duckworth Date: Tue, 28 Aug 2018 13:22:18 -0400 Subject: perl-star-fusion package: update latest version (#9104) --- var/spack/repos/builtin/packages/perl-star-fusion/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-star-fusion/package.py b/var/spack/repos/builtin/packages/perl-star-fusion/package.py index 7e23809a8c..7de2950da2 100644 --- a/var/spack/repos/builtin/packages/perl-star-fusion/package.py +++ b/var/spack/repos/builtin/packages/perl-star-fusion/package.py @@ -36,7 +36,7 @@ class PerlStarFusion(Package): homepage = "https://github.com/STAR-Fusion/STAR-Fusion" git = "https://github.com/STAR-Fusion/STAR-Fusion.git" - version('master', commit='a16a0a8') + version('master', commit='8c5a541') extends('perl') -- cgit v1.2.3-70-g09d2 From be42b8df19f21d733c3fff1088a81685c19abd8a Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Tue, 28 Aug 2018 13:35:13 -0500 Subject: Java updates: new versions, classpath, and JAVA_HOME (#8613) This PR includes the following changes: * Added JDK 10 * Changed the JDK version numbers according to the consensus reached in #2284 * Added spec['java'].home and spec['java'].libs, similar to #3367 (JDK and IcedTea) * Added a check to prevent people from installing JDK on macOS * Set CLASSPATH for packages depending on Java (JDK and IcedTea) * Add TODO for extending virtual packages (not currently possible) * Add TODO for adding Java dependents to views * Add TODO for packages which extend multiple packages (e.g. Java and Python) --- .../repos/builtin/packages/icedtea/package.py | 49 +++++- var/spack/repos/builtin/packages/jdk/package.py | 176 +++++++++++++++++---- var/spack/repos/builtin/packages/octave/package.py | 6 +- .../repos/builtin/packages/openmpi/package.py | 4 +- var/spack/repos/builtin/packages/spark/package.py | 4 - var/spack/repos/builtin/packages/thrift/package.py | 1 - 6 files changed, 194 insertions(+), 46 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/icedtea/package.py b/var/spack/repos/builtin/packages/icedtea/package.py index bc0b5ddc66..366606cf44 100644 --- a/var/spack/repos/builtin/packages/icedtea/package.py +++ b/var/spack/repos/builtin/packages/icedtea/package.py @@ -37,7 +37,6 @@ class Icedtea(AutotoolsPackage): version('3.4.0', 'eba66765b92794495e16b83f23640872') - provides('java@8', when='@3.4.0:3.99.99') variant('X', default=False, description="Build with GUI support.") variant('shenandoah', default=False, description="Build with the shenandoah gc. Only for version 3+") @@ -82,6 +81,9 @@ class Icedtea(AutotoolsPackage): depends_on('zlib') depends_on('alsa-lib') + provides('java') + provides('java@8', when='@3.4.0:3.99.99') + force_autoreconf = True resource(name='corba', placement='corba_src', @@ -139,6 +141,20 @@ class Icedtea(AutotoolsPackage): url='http://icedtea.wildebeest.org/download/drops/icedtea8/3.4.0/shenandoah.tar.xz', when='@3.4.0') + # FIXME: + # 1. `extends('java')` doesn't work, you need to use `extends('icedtea')` + # 2. Packages cannot extend multiple packages, see #987 + # 3. Update `YamlFilesystemView.merge` to allow a Package to completely + # override how it is symlinked into a view prefix. Then, spack activate + # can symlink all *.jar files to `prefix.lib.ext` + extendable = True + + @property + def home(self): + """For compatibility with the ``jdk`` package, so that other packages + can say ``spec['java'].home`` regardless of the Java provider.""" + return self.prefix + def configure_args(self): os.environ['POTENTIAL_CXX'] = os.environ['CXX'] os.environ['POTENTIAL_CC'] = os.environ['CC'] @@ -175,7 +191,34 @@ class Icedtea(AutotoolsPackage): return args def setup_environment(self, spack_env, run_env): - run_env.set('JAVA_HOME', self.spec.prefix) + """Set JAVA_HOME.""" + + run_env.set('JAVA_HOME', self.home) def setup_dependent_environment(self, spack_env, run_env, dependent_spec): - spack_env.set('JAVA_HOME', self.prefix) + """Set JAVA_HOME and CLASSPATH. + + CLASSPATH contains the installation prefix for the extension and any + other Java extensions it depends on.""" + + spack_env.set('JAVA_HOME', self.home) + + class_paths = [] + for d in dependent_spec.traverse(deptype=('build', 'run', 'test')): + if d.package.extends(self.spec): + class_paths.extend(find(d.prefix, '*.jar')) + + classpath = os.pathsep.join(class_paths) + spack_env.set('CLASSPATH', classpath) + + # For runtime environment set only the path for + # dependent_spec and prepend it to CLASSPATH + if dependent_spec.package.extends(self.spec): + class_paths = find(dependent_spec.prefix, '*.jar') + classpath = os.pathsep.join(class_paths) + run_env.prepend_path('CLASSPATH', classpath) + + def setup_dependent_package(self, module, dependent_spec): + """Allows spec['java'].home to work.""" + + self.spec.home = self.home diff --git a/var/spack/repos/builtin/packages/jdk/package.py b/var/spack/repos/builtin/packages/jdk/package.py index f6f78b9501..ecd2690c7f 100644 --- a/var/spack/repos/builtin/packages/jdk/package.py +++ b/var/spack/repos/builtin/packages/jdk/package.py @@ -22,59 +22,169 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## -# -# Author: Justin Too -# +from spack.util.prefix import Prefix from spack import * +import llnl.util.tty as tty +import os + class Jdk(Package): - """The Java Development Kit (JDK) released by Oracle Corporation - in the form of a binary product aimed at Java developers.""" + """The Java Development Kit (JDK) released by Oracle Corporation in the + form of a binary product aimed at Java developers. Includes a complete JRE + plus tools for developing, debugging, and monitoring Java applications.""" + homepage = "http://www.oracle.com/technetwork/java/javase/downloads/index.html" + maintainers = ['justintoo'] + # Oracle requires that you accept their License Agreement in order # to access the Java packages in download.oracle.com. In order to # automate this process, we need to utilize these additional curl - # commandline options. - # - # See http://stackoverflow.com/questions/10268583/how-to-automate-download-and-installation-of-java-jdk-on-linux + # command-line options. See: + # http://stackoverflow.com/questions/10268583/how-to-automate-download-and-installation-of-java-jdk-on-linux curl_options = [ '-j', # junk cookies '-H', # specify required License Agreement cookie - 'Cookie: oraclelicense=accept-securebackup-cookie'] + 'Cookie: oraclelicense=accept-securebackup-cookie' + ] - # For instructions on how to find the magic URL, see: - # https://gist.github.com/P7h/9741922 - # https://linuxconfig.org/how-to-install-java-se-development-kit-on-debian-linux - version('8u172-b11', 'eda2945e8c02b84adbf78f46c37b71c1', curl_options=curl_options, + # To add the latest version, go to the homepage listed above, + # click "JDK Download", click "Accept License Agreement", right-click the + # Linux .tar.gz link, and select Copy Link Address. The checksum can be + # found in a link above. The build number can be deciphered from the URL. + # Alternatively, run `bin/java -version` after extracting. Replace '+' + # symbol in version with '_', otherwise it will be interpreted as a variant + version('10.0.1_10', 'ae8ed645e6af38432a56a847597ac61d4283b7536688dbab44ab536199d1e5a4', curl_options=curl_options, + url='http://download.oracle.com/otn-pub/java/jdk/10.0.1+10/fb4372174a714e6b8c52526dc134031e/jdk-10.0.1_linux-x64_bin.tar.gz') + version('1.8.0_172-b11', 'eda2945e8c02b84adbf78f46c37b71c1', curl_options=curl_options, url='http://download.oracle.com/otn-pub/java/jdk/8u172-b11/a58eab1ec242421181065cdc37240b08/jdk-8u172-linux-x64.tar.gz') - version('8u141-b15', '8cf4c4e00744bfafc023d770cb65328c', curl_options=curl_options, + version('1.8.0_141-b15', '8cf4c4e00744bfafc023d770cb65328c', curl_options=curl_options, url='http://download.oracle.com/otn-pub/java/jdk/8u141-b15/336fa29ff2bb4ef291e347e091f7f4a7/jdk-8u141-linux-x64.tar.gz') - version('8u131-b11', '75b2cb2249710d822a60f83e28860053', curl_options=curl_options, + version('1.8.0_131-b11', '75b2cb2249710d822a60f83e28860053', curl_options=curl_options, url='http://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.tar.gz') - version('8u92-b14', '65a1cc17ea362453a6e0eb4f13be76e4', curl_options=curl_options) - version('8u73-b02', '1b0120970aa8bc182606a16bf848a686', curl_options=curl_options) - version('8u66-b17', '88f31f3d642c3287134297b8c10e61bf', curl_options=curl_options) - # The 7u80 tarball is not readily available from Oracle. If you have - # the tarball, add it to your mirror as mirror/jdk/jdk-7u80.tar.gz and - # away you go. - version('7u80-b0', '6152f8a7561acf795ca4701daa10a965') - - provides('java@8', when='@8u0:8u999') - provides('java@7', when='@7u0:7u999') - - def url_for_version(self, version): - url = "http://download.oracle.com/otn-pub/java/jdk/{0}/jdk-{1}-linux-x64.tar.gz" - version = str(version) - minor_version = version[:version.index('-')] - return url.format(version, minor_version) + version('1.8.0_92-b14', '65a1cc17ea362453a6e0eb4f13be76e4', curl_options=curl_options) + version('1.8.0_73-b02', '1b0120970aa8bc182606a16bf848a686', curl_options=curl_options) + version('1.8.0_66-b17', '88f31f3d642c3287134297b8c10e61bf', curl_options=curl_options) + version('1.7.0_80-b0', '6152f8a7561acf795ca4701daa10a965', curl_options=curl_options) + + provides('java') + provides('java@10', when='@10.0:10.999') + provides('java@9', when='@9.0:9.999') + provides('java@8', when='@1.8.0:1.8.999') + provides('java@7', when='@1.7.0:1.7.999') + + # FIXME: + # 1. `extends('java')` doesn't work, you need to use `extends('jdk')` + # 2. Packages cannot extend multiple packages, see #987 + # 3. Update `YamlFilesystemView.merge` to allow a Package to completely + # override how it is symlinked into a view prefix. Then, spack activate + # can symlink all *.jar files to `prefix.lib.ext` + extendable = True + + @property + def home(self): + """Most of the time, ``JAVA_HOME`` is simply ``spec['java'].prefix``. + However, if the user is using an externally installed JDK, it may be + symlinked. For example, on macOS, the ``java`` executable can be found + in ``/usr/bin``, but ``JAVA_HOME`` is actually + ``/Library/Java/JavaVirtualMachines/jdk-10.0.1.jdk/Contents/Home``. + Users may not know the actual installation directory and add ``/usr`` + to their ``packages.yaml`` unknowingly. Run ``java_home`` if it exists + to determine exactly where it is installed. Specify which version we + are expecting in case multiple Java versions are installed. + See ``man java_home`` for more details.""" + + prefix = self.prefix + java_home = prefix.libexec.java_home + if os.path.exists(java_home): + java_home = Executable(java_home) + version = str(self.version.up_to(2)) + prefix = java_home('--version', version, output=str).strip() + prefix = Prefix(prefix) + + return prefix + + @property + def libs(self): + """Depending on the version number and whether the full JDK or just + the JRE was installed, Java libraries can be in several locations: + + * ``lib/libjvm.so`` + * ``jre/lib/libjvm.dylib`` + + Search recursively to find the correct library location.""" + + return find_libraries(['libjvm'], root=self.home, recursive=True) + + @run_before('install') + def macos_check(self): + if self.spec.satisfies('platform=darwin'): + msg = """\ +Spack's JDK package only supports Linux. If you need to install JDK on macOS, +manually download the .dmg from: + + {0} + +and double-click to install. Once JDK is installed, you can tell Spack where +to find it like so. To find the JDK installation directory, run: + + $ /usr/libexec/java_home + +If you have multiple versions of JDK installed, you can specify a particular +version to search for with the --version flag. To find the exact version +number, run: + + $ java -version + +If the version number contains a '+' symbol, replace it with '_', otherwise +Spack will think it is a variant. Add JDK as an external package by running: + + $ spack config edit packages + +and adding entries for each installation: + + packages: + jdk: + paths: + jdk@10.0.1_10: /path/to/jdk/Home + jdk@1.7.0_45-b18: /path/to/jdk/Home + buildable: False""".format(self.homepage) + + tty.die(msg) def install(self, spec, prefix): install_tree('.', prefix) def setup_environment(self, spack_env, run_env): - run_env.set('JAVA_HOME', self.spec.prefix) + """Set JAVA_HOME.""" + + run_env.set('JAVA_HOME', self.home) def setup_dependent_environment(self, spack_env, run_env, dependent_spec): - spack_env.set('JAVA_HOME', self.spec.prefix) + """Set JAVA_HOME and CLASSPATH. + + CLASSPATH contains the installation prefix for the extension and any + other Java extensions it depends on.""" + + spack_env.set('JAVA_HOME', self.home) + + class_paths = [] + for d in dependent_spec.traverse(deptype=('build', 'run', 'test')): + if d.package.extends(self.spec): + class_paths.extend(find(d.prefix, '*.jar')) + + classpath = os.pathsep.join(class_paths) + spack_env.set('CLASSPATH', classpath) + + # For runtime environment set only the path for + # dependent_spec and prepend it to CLASSPATH + if dependent_spec.package.extends(self.spec): + class_paths = find(dependent_spec.prefix, '*.jar') + classpath = os.pathsep.join(class_paths) + run_env.prepend_path('CLASSPATH', classpath) + + def setup_dependent_package(self, module, dependent_spec): + """Allows spec['java'].home to work.""" + + self.spec.home = self.home diff --git a/var/spack/repos/builtin/packages/octave/package.py b/var/spack/repos/builtin/packages/octave/package.py index 5587e79396..4a89992dac 100644 --- a/var/spack/repos/builtin/packages/octave/package.py +++ b/var/spack/repos/builtin/packages/octave/package.py @@ -186,9 +186,9 @@ class Octave(AutotoolsPackage): if '+jdk' in spec: config_args.extend([ - "--with-java-homedir=%s" % spec['java'].prefix, - "--with-java-includedir=%s" % spec['java'].prefix.include, - "--with-java-libdir=%s" % spec['java'].prefix.lib + "--with-java-homedir=%s" % spec['java'].home, + "--with-java-includedir=%s" % spec['java'].home.include, + "--with-java-libdir=%s" % spec['java'].libs.directories[0] ]) else: config_args.append("--disable-java") diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 651d36b3b9..4550c611ad 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -89,7 +89,7 @@ class Openmpi(AutotoolsPackage): # Still supported version('3.0.2', '098fa89646f5b4438d9d8534bc960cd6') # libmpi.so.40.00.2 - version('3.0.1', '565f5060e080b0871a64b295c3d4426a') # libmpi.so.40.00.1 + version('3.0.1', '565f5060e080b0871a64b295c3d4426a') # libmpi.so.40.00.1 version('3.0.0', '757d51719efec08f9f1a7f32d58b3305') # libmpi.so.40.00.0 version('2.1.5', '6019c8b67d4975d833801e72ba290918') # libmpi.so.20.10.3 version('2.1.4', '003b356a24a5b7bd1705a23ddc69d9a0') # libmpi.so.20.10.3 @@ -394,7 +394,7 @@ class Openmpi(AutotoolsPackage): config_args.extend([ '--enable-java', '--enable-mpi-java', - '--with-jdk-dir={0}'.format(spec['java'].prefix) + '--with-jdk-dir={0}'.format(spec['java'].home) ]) else: config_args.extend([ diff --git a/var/spack/repos/builtin/packages/spark/package.py b/var/spack/repos/builtin/packages/spark/package.py index 1b318e8c78..9dce9b81f0 100644 --- a/var/spack/repos/builtin/packages/spark/package.py +++ b/var/spack/repos/builtin/packages/spark/package.py @@ -67,10 +67,6 @@ class Spark(Package): @when('+hadoop') def setup_environment(self, spack_env, run_env): - - env['JAVA_HOME'] = self.spec['java'].prefix - # spack_env.set('JAVA_HOME', self.spec['jdk'].prefix) - hadoop = self.spec['hadoop'].command hadoop_classpath = hadoop('classpath', output=str) diff --git a/var/spack/repos/builtin/packages/thrift/package.py b/var/spack/repos/builtin/packages/thrift/package.py index 262aa9b106..8ae67b6ec2 100644 --- a/var/spack/repos/builtin/packages/thrift/package.py +++ b/var/spack/repos/builtin/packages/thrift/package.py @@ -73,7 +73,6 @@ class Thrift(Package): def install(self, spec, prefix): env['PY_PREFIX'] = prefix - env['JAVA_HOME'] = spec['java'].prefix # configure options options = ['--prefix=%s' % prefix] -- cgit v1.2.3-70-g09d2 From b78ccb74d8711995226388e7b033efe499469c91 Mon Sep 17 00:00:00 2001 From: Jannek Squar Date: Tue, 28 Aug 2018 22:35:30 +0200 Subject: atk package: hotfix #9099 (#9102) Adds explicit python3 dependency for meson --- var/spack/repos/builtin/packages/atk/package.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/atk/package.py b/var/spack/repos/builtin/packages/atk/package.py index 64140d99a7..9e641f65d0 100644 --- a/var/spack/repos/builtin/packages/atk/package.py +++ b/var/spack/repos/builtin/packages/atk/package.py @@ -41,6 +41,12 @@ class Atk(Package): depends_on('meson', type='build', when='@2.28.0:') depends_on('glib') + # FIXME: this constraint exists because of the meson dependency. + # It should not be required to specify it here, but "spack spec atk" will + # fail without it. + # See: #2632 + depends_on('python@3:') + depends_on('gettext') depends_on('pkgconfig', type='build') depends_on('gobject-introspection') -- cgit v1.2.3-70-g09d2 From cefc1069e6876d61c81e13457903d44660fbd713 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Tue, 28 Aug 2018 22:48:52 -0600 Subject: gasnet:version bump (#9127) --- var/spack/repos/builtin/packages/gasnet/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gasnet/package.py b/var/spack/repos/builtin/packages/gasnet/package.py index 44ff5bdfc9..d7e3021c7a 100644 --- a/var/spack/repos/builtin/packages/gasnet/package.py +++ b/var/spack/repos/builtin/packages/gasnet/package.py @@ -33,8 +33,9 @@ class Gasnet(AutotoolsPackage): Cray Chapel, and Titanium. """ homepage = "http://gasnet.lbl.gov" - url = "http://gasnet.lbl.gov/GASNet-1.24.0.tar.gz" + url = "http://gasnet.lbl.gov/download/GASNet-1.24.0.tar.gz" + version('1.32.0', sha256='42e4774b3bbc7c142f77c41b6ce86b594f579073f46c31f47f424c7e31ee1511') version('1.30.0', '2ddb1d8397d62acfd389095ca8da72f6') version('1.28.2', '6ca0463dc2430570e40646c4d1e97b36') version('1.28.0', 'b44446d951d3d8954aa1570e3556ba61') -- cgit v1.2.3-70-g09d2 From 168c6d9428d090c75a9ae7896c17e687402ad743 Mon Sep 17 00:00:00 2001 From: Andrew Gaspar Date: Tue, 28 Aug 2018 22:54:20 -0600 Subject: Add string-view-lite package for header only library (#9125) --- .../builtin/packages/string-view-lite/package.py | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 var/spack/repos/builtin/packages/string-view-lite/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/string-view-lite/package.py b/var/spack/repos/builtin/packages/string-view-lite/package.py new file mode 100644 index 0000000000..efaf1b6e16 --- /dev/null +++ b/var/spack/repos/builtin/packages/string-view-lite/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +from shutil import copytree + + +class StringViewLite(Package): + """ + A single-file header-only version of a C++17-like string_view for C++98, + C++11 and later + """ + + homepage = "https://github.com/martinmoene/string-view-lite" + url = "https://github.com/martinmoene/string-view-lite/archive/v1.0.0.tar.gz" + + version('1.0.0', sha256='44e30dedd6f4777e646da26528f9d2d5cc96fd0fa79e2e5c0adc14817d048d63') + version('0.2.0', sha256='c8ae699dfd2ccd15c5835e9b1d246834135bbb91b82f7fc4211b8ac366bffd34') + version('0.1.0', sha256='7de87d6595230a6085655dab6145340bc423f2cf206263ef73c9b78f7b153340') + + def install(self, spec, prefix): + copytree('include', prefix.include) -- cgit v1.2.3-70-g09d2 From 3d7457edde0a147fd1c615ffd941f98c5a3c3753 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Wed, 29 Aug 2018 07:00:40 +0200 Subject: go: Update to 1.11 (#9101) --- var/spack/repos/builtin/packages/go/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/go/package.py b/var/spack/repos/builtin/packages/go/package.py index 48055f7722..1915a5df8f 100644 --- a/var/spack/repos/builtin/packages/go/package.py +++ b/var/spack/repos/builtin/packages/go/package.py @@ -54,6 +54,7 @@ class Go(Package): extendable = True + version('1.11', 'afc1e12f5fe49a471e3aae7d906c73e9d5b1fdd36d52d72652dde8f6250152fb') version('1.10.3', '567b1cc66c9704d1c019c50bef946272e911ec6baf244310f87f4e678be155f2') version('1.10.2', '6264609c6b9cd8ed8e02ca84605d727ce1898d74efa79841660b2e3e985a98bd') version('1.10.1', '589449ff6c3ccbff1d391d4e7ab5bb5d5643a5a41a04c99315e55c16bbf73ddc') -- cgit v1.2.3-70-g09d2 From 1a7e9e58d09711db3aaa50cb0ed6aef8a4093624 Mon Sep 17 00:00:00 2001 From: Douglas Duckworth Date: Wed, 29 Aug 2018 01:34:04 -0400 Subject: added star 2.6.1a (#9103) --- var/spack/repos/builtin/packages/star/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/star/package.py b/var/spack/repos/builtin/packages/star/package.py index 76d4604eaa..a9a65a28b6 100644 --- a/var/spack/repos/builtin/packages/star/package.py +++ b/var/spack/repos/builtin/packages/star/package.py @@ -29,8 +29,9 @@ class Star(Package): """STAR is an ultrafast universal RNA-seq aligner.""" homepage = "https://github.com/alexdobin/STAR" - url = "https://github.com/alexdobin/STAR/archive/2.5.3a.tar.gz" + url = "https://github.com/alexdobin/STAR/archive/2.6.1a.tar.gz" + version('2.6.1a', '1ebaac553809c20900e0b42aadf75cc6') version('2.5.3a', 'baf8d1b62a50482cfa13acb7652dc391') version('2.4.2a', '8b9345f2685a5ec30731e0868e86d506', url='https://github.com/alexdobin/STAR/archive/STAR_2.4.2a.tar.gz') -- cgit v1.2.3-70-g09d2 From cf807f6fd15df20e9246468ce1ef3d72ecc3f9ef Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Wed, 29 Aug 2018 10:54:34 +0200 Subject: New package: channelflow (#9111) --- .../repos/builtin/packages/channelflow/package.py | 104 +++++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 var/spack/repos/builtin/packages/channelflow/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/channelflow/package.py b/var/spack/repos/builtin/packages/channelflow/package.py new file mode 100644 index 0000000000..90eba2e908 --- /dev/null +++ b/var/spack/repos/builtin/packages/channelflow/package.py @@ -0,0 +1,104 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Channelflow(CMakePackage): + """Channelflow is a software system for numerical analysis of the + incompressible fluid flow in channel geometries, written in C++. + """ + + homepage = 'https://github.com/epfl-ecps/channelflow' + url = 'https://github.com/epfl-ecps/channelflow.git' + + version( + 'develop', + git='https://github.com/epfl-ecps/channelflow.git', + branch='master' + ) + + variant('shared', default=True, description='Build shared libs') + variant('mpi', default=True, description='Enable MPI parallelism') + variant('hdf5', default=True, description='Enable support for HDF5 I/O') + variant( + 'netcdf', default='serial', values=('none', 'serial', 'parallel'), + multi=False, description='Level of support for NetCDF I/O' + ) + variant('python', default=False, description='Build python bindings') + + depends_on('eigen') + depends_on('fftw') + + # MPI related constraints + depends_on('mpi', when='+mpi') + depends_on('fftw+mpi', when='+mpi') + + # Support for different I/O formats + depends_on('hdf5+cxx', when='+hdf5') + depends_on('netcdf', when='netcdf=serial') + depends_on('netcdf+mpi', when='netcdf=parallel') + + # Python bindings + depends_on('boost+python', when='+python') + + conflicts('~mpi', when='netcdf=parallel', msg='Parallel NetCDF requires MPI') + conflicts( + '+mpi', when='+python', + msg='Building python bindings is possible only for the serial code' + ) + conflicts('~mpi', when='^mpi', + msg='There should be no MPI in the DAG when ~mpi is active') + + def cmake_args(self): + spec = self.spec + + on_or_off = lambda predicate: 'ON' if predicate else 'OFF' + + args = [ + '-DBUILD_SHARED_LIBS:BOOL={0}'.format( + on_or_off('+shared' in spec) + ), + '-DUSE_MPI:BOOL={0}'.format(on_or_off('+mpi' in spec)), + '-DWITH_HDF5CXX:BOOL={0}'.format(on_or_off('+hdf5' in spec)), + '-DWITH_PYTHON:BOOL={0}'.format(on_or_off('+python' in spec)) + ] + + netcdf_str = { + 'none': 'OFF', + 'serial': 'Serial', + 'parallel': 'Parallel' + } + + args.append('-DWITH_NETCDF:STRING={0}'.format( + netcdf_str[spec.variants['netcdf'].value] + )) + + # Set an MPI compiler for parallel builds + if '+mpi' in spec: + args.append( + '-DCMAKE_CXX_COMPILER:PATH={0}'.format(spec['mpi'].mpicxx) + ) + + return args -- cgit v1.2.3-70-g09d2 From c7a8b47e74b13b0c8775258d5aef974477dd3402 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Wed, 29 Aug 2018 01:58:05 -0700 Subject: ipopt@3.12.10: new version (#9120) --- var/spack/repos/builtin/packages/ipopt/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ipopt/package.py b/var/spack/repos/builtin/packages/ipopt/package.py index 3a9f606bb6..2b92d958ed 100644 --- a/var/spack/repos/builtin/packages/ipopt/package.py +++ b/var/spack/repos/builtin/packages/ipopt/package.py @@ -31,6 +31,7 @@ class Ipopt(AutotoolsPackage): homepage = "https://projects.coin-or.org/Ipopt" url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-3.12.4.tgz" + version('3.12.10', 'e1a3ad09e41edbfe41948555ece0bdc78757a5ca764b6be5a9a127af2e202d2e') version('3.12.9', '8ff3fe1a8560896fc5559839a87c2530cac4ed231b0806e487bfd3cf2d294ab8') version('3.12.8', '62c6de314220851b8f4d6898b9ae8cf0a8f1e96b68429be1161f8550bb7ddb03') version('3.12.7', '2a36e4a04717a8ed7012ac7d1253ae4ffbc1a8fd') -- cgit v1.2.3-70-g09d2 From eeaa924a6f572e23de8b2a5c8a1e0e97a222597f Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Wed, 29 Aug 2018 01:58:24 -0700 Subject: hdf5@1.10.3: new version (#9121) --- var/spack/repos/builtin/packages/hdf5/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index ad4fc1458a..ce747eee86 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -39,6 +39,7 @@ class Hdf5(AutotoolsPackage): list_url = "https://support.hdfgroup.org/ftp/HDF5/releases" list_depth = 3 + version('1.10.3', 'b600d7c914cfa80ae127cd1a1539981213fee9994ac22ebec9e3845e951d9b39') version('1.10.2', '8d4eae84e533efa57496638fd0dca8c3') version('1.10.1', '43a2f9466702fb1db31df98ae6677f15') version('1.10.0-patch1', '9180ff0ef8dc2ef3f61bd37a7404f295') -- cgit v1.2.3-70-g09d2 From f540b2ca1b47e4481b7f1ed55d83f1fada7b5f52 Mon Sep 17 00:00:00 2001 From: Andrew Gaspar Date: Wed, 29 Aug 2018 03:01:35 -0600 Subject: Adds a package for span-lite header-only library (#9118) --- .../repos/builtin/packages/span-lite/package.py | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 var/spack/repos/builtin/packages/span-lite/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/span-lite/package.py b/var/spack/repos/builtin/packages/span-lite/package.py new file mode 100644 index 0000000000..116ed64cf1 --- /dev/null +++ b/var/spack/repos/builtin/packages/span-lite/package.py @@ -0,0 +1,43 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +from shutil import copytree + + +class SpanLite(Package): + """ + A single-file header-only version of a C++20-like span for C++98, C++11 and + later + """ + + homepage = "https://github.com/martinmoene/span-lite" + url = "https://github.com/martinmoene/span-lite/archive/v0.3.0.tar.gz" + + version('0.3.0', sha256='e083f368167fe632f866956edaa2c7a7d57a33ffb0d8def9b9f1a9daa47834bb') + version('0.2.0', sha256='6e3305fe868442410a00962a39fc59ed494cecc4f99fe2aff187e33932f06e46') + version('0.1.0', sha256='0a84b9369f86beba326e2160b683fd0922f416ce136437751a9ed70afcc67a1c') + + def install(self, spec, prefix): + copytree('include', prefix.include) -- cgit v1.2.3-70-g09d2 From 5de47da74004a6dda6bbb219f9c632b9bcd6b18e Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Wed, 29 Aug 2018 09:23:02 -0600 Subject: flecsi: fix build (#9129) --- var/spack/repos/builtin/packages/flecsi/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/flecsi/package.py b/var/spack/repos/builtin/packages/flecsi/package.py index aefa2c2d0d..9903c59990 100644 --- a/var/spack/repos/builtin/packages/flecsi/package.py +++ b/var/spack/repos/builtin/packages/flecsi/package.py @@ -47,6 +47,7 @@ class Flecsi(CMakePackage): depends_on("cmake@3.1:", type='build') depends_on("legion+shared", when='~mpi') depends_on("legion+shared+mpi", when='+mpi') + depends_on("parmetis") def cmake_args(self): options = ['-DENABLE_UNIT_TESTS=ON'] -- cgit v1.2.3-70-g09d2 From ebf21d1d87a14e8e2ab317a4acaa0ec66c002573 Mon Sep 17 00:00:00 2001 From: Andrew Gaspar Date: Wed, 29 Aug 2018 10:14:59 -0600 Subject: Adds a package for optional-lite header-only library (#9117) --- .../builtin/packages/optional-lite/package.py | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 var/spack/repos/builtin/packages/optional-lite/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/optional-lite/package.py b/var/spack/repos/builtin/packages/optional-lite/package.py new file mode 100644 index 0000000000..84d67936ba --- /dev/null +++ b/var/spack/repos/builtin/packages/optional-lite/package.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +from shutil import copytree + + +class OptionalLite(Package): + """ + A single-file header-only version of a C++17-like optional, a nullable + object for C++98, C++11 and later. + """ + + homepage = "https://github.com/martinmoene/optional-lite" + url = "https://github.com/martinmoene/optional-lite/archive/v3.0.0.tar.gz" + + version('3.0.0', sha256='36ae58512c478610647978811f0f4dbe105880372bd7ed39417314d50a27254e') + version('2.3.0', sha256='8fe46216147234b172c6a5b182726834afc44dfdca1e976a264d6f96eb183916') + version('2.2.0', sha256='9ce1bb021de42f804f8d17ed30b79fc98296122bec8db60492104978cd282fa2') + version('2.0.0', sha256='e8d803cbc7be241df41a9ab267b525b7941df09747cd5a7deb55f863bd8a4e8d') + version('1.0.3', sha256='7a2fb0fe20d61d091f6730237add9bab58bc0df1288cb96f3e8a61b859539067') + + def install(self, spec, prefix): + copytree('include', prefix.include) -- cgit v1.2.3-70-g09d2 From 23f89ccc0bad541e14654d229926c609baebce36 Mon Sep 17 00:00:00 2001 From: Abhinav Bhatele Date: Wed, 29 Aug 2018 10:13:50 -0700 Subject: ROSS package: fix build error and add v7.0.0 (#9128) --- var/spack/repos/builtin/packages/ross/package.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ross/package.py b/var/spack/repos/builtin/packages/ross/package.py index 13cda0c90b..e43422caba 100644 --- a/var/spack/repos/builtin/packages/ross/package.py +++ b/var/spack/repos/builtin/packages/ross/package.py @@ -26,17 +26,18 @@ from spack import * class Ross(CMakePackage): - """Rensselaer's Optimistic Simulation System""" + """Rensselaer Optimistic Simulation System""" homepage = "http://carothersc.github.io/ROSS/" - git = "https://github.com/carothersc/ROSS.git" + git = "https://github.com/carothersc/ROSS.git" - version('master') + version('develop', branch='master') + version('7.0.0', tag='v7.0.0') depends_on('mpi') def cmake_args(self): - if 'x86_64' not in spec.architecture: + if 'x86_64' not in self.spec.architecture: raise InstallError( 'This package currently only builds on x86_64 architectures') @@ -44,4 +45,5 @@ class Ross(CMakePackage): "-DARCH=x86_64", "-DCMAKE_C_COMPILER=%s" % self.spec['mpi'].mpicc, "-DCMAKE_CXX_COMPILER=%s" % self.spec['mpi'].mpicxx] + return args -- cgit v1.2.3-70-g09d2 From 1e0c337fe9398cfd41e247dfc1caf2fb095cabc7 Mon Sep 17 00:00:00 2001 From: Andreas Baumbach Date: Wed, 29 Aug 2018 19:30:29 +0200 Subject: New package: NEST Simulator (#9092) --- var/spack/repos/builtin/packages/nest/package.py | 170 +++++++++++++++++++++++ 1 file changed, 170 insertions(+) create mode 100644 var/spack/repos/builtin/packages/nest/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nest/package.py b/var/spack/repos/builtin/packages/nest/package.py new file mode 100644 index 0000000000..77fe5e9b03 --- /dev/null +++ b/var/spack/repos/builtin/packages/nest/package.py @@ -0,0 +1,170 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Nest(CMakePackage): + """NEST is a simulator for spiking neural network models + + It focuses on the dynamics, size and structure of neural systems rather + than on the exact morphology of individual neurons.""" + + homepage = "http://www.nest-simulator.org" + url = "https://github.com/nest/nest-simulator/releases/download/v2.12.0/nest-2.12.0.tar.gz" + + version('2.14.0', sha256='d6316d6c9153100a3220488abfa738958c4b65bf2622bd15540e4aa81e79f17f') + version('2.12.0', sha256='bac578f38bb0621618ee9d5f2f1febfee60cddc000ff32e51a5f5470bb3df40d') + version('2.10.0', sha256='2b6fc562cd6362e812d94bb742562a5a685fb1c7e08403765dbe123d59b0996c') + version('2.8.0', sha256='d47325b27a5599b6ea58a3c4ef06656e7c5a4941c4e94dec6a5c2fa956209915') + version('2.6.0', sha256='5fe4924bc57d0c7dd820aa371de935eedf7e813832c0eee2c976b33c9a8db4cf') + version('2.4.2', sha256='8f86e58c1a12b733ffabd8b0400326e5a3494a458149ea8ebe9f19674d05b91b') + + variant('python', default=True, + description='Build the PyNest interface') + variant('mpi', default=True, + description='Build with MPI bindings') + variant('openmp', default=True, + description='"Enable OpenMP support"') + variant('optimize', default=True, + description='Build with MPI bindings') + variant('modules', default=False, + description='Enables external module support') + variant('gsl', default=True, + description="Enable GNU Scientific Library") + variant('shared', default=True, + description="Build shared libraries") + # TODO add variants for neurosim and music when these are in spack + + conflicts('~gsl', when='@:2.10.99', + msg='Option only introduced for non-ancient versions.') + conflicts('~shared', when='@:2.10.99', + msg='Option only introduced for non-ancient versions.') + conflicts('~openmp', when='@:2.10.99', + msg='Option only introduced for non-ancient versions.') + + depends_on('python@2.6:', when='+python', type=('build', 'run')) + depends_on('py-numpy', when='+python', type=('build', 'run')) + depends_on('py-cython@0.19.2:', when='+python', type='build') + depends_on('py-nose', when='+python', type='test') + depends_on('py-setuptools', when='+python', type='build') + + depends_on('mpi', when='+mpi') + + depends_on('doxygen', type='build') + + depends_on('gsl', when='+gsl') + depends_on('readline') + depends_on('libtool') + depends_on('pkg-config', type='build') + + extends('python', when='+python') + + # Before 2.12.0 it was an autotools package + @when('@:2.10.99') + def cmake(self, spec, prefix): + pass + + @when('@:2.10.99') + def build(self, spec, prefix): + pass + + @when('@:2.10.99') + def install(self, spec, prefix): + configure_args = ["CXXFLAGS=-std=c++03", + "--prefix=" + prefix, + "--with-openmp"] + if '+python' in spec: + configure_args.append("--with-python") + else: + configure_args.append("--without-python") + if '+mpi' in spec: + configure_args.append("--with-mpi") + else: + configure_args.append("--without-mpi") + if '+optimize' in spec: + configure_args.append("--with-optimize") + else: + configure_args.append("--without-optimize") + + configure(*configure_args) + + make() + make("install") + + def cmake_args(self): + args = [] + + if '+mpi' in self.spec: + args.append('-Dwith-mpi=ON') + else: + args.append('-Dwith-mpi=OFF') + + if '+python': + version = self.spec['python'].version[0] + args.append('-Dwith-python={0}'.format(version)) + args.append('-Dcythonize-pynest=' + self.spec['py-cython'].prefix) + else: + args.append('-Dwith-python=OFF') + args.append('-Dcythonize-pynest=OFF') + + if '+optimize' in self.spec: + args.append('-Dwith-optimize=ON') + else: + args.append('-Dwith-optimize=OFF') + + if '+gsl' in self.spec: + cmake_options.append('-Dwith-gsl=' + self.spec['gsl'].prefix) + else: + cmake_options.append('-Dwith-gsl=OFF') + + if '+openmp' in self.spec: + cmake_options.append('-Dwith-openmp=ON') + else: + cmake_options.append('-Dwith-openmp=OFF') + + if '+shared' in self.spec: + cmake_options.append('-Dstatic-libraries=OFF') + else: + cmake_options.append('-Dstatic-libraries=ON') + + return args + + @when('@:2.14.0+modules') + @run_after('install') + def install_headers(self): + # copy source files to installation folder for older versions + # (these are needed for modules to build against) + # see https://github.com/nest/nest-simulator/pull/844 + path_headers = join_path(prefix, "include", "nest") + + mkdirp(path_headers) + + for suffix in ["h", "hpp"]: + for f in find_headers('*.{0}'.format(suffix), + self.stage.source_path, recursive=True): + install(f, path_headers) + + def setup_environment(self, spack_env, run_env): + run_env.set("NEST_INSTALL_DIR", self.spec.prefix) -- cgit v1.2.3-70-g09d2 From 1383834d155479131fe1a845592652aa31713034 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 29 Aug 2018 12:35:56 -0500 Subject: Add MDB driver support to GDAL (#8614) --- .../repos/builtin/packages/commons-lang/package.py | 50 +++++++++++++++++++++ .../builtin/packages/commons-lang3/package.py | 49 +++++++++++++++++++++ .../builtin/packages/commons-logging/package.py | 51 ++++++++++++++++++++++ var/spack/repos/builtin/packages/gdal/package.py | 25 ++++++++--- .../repos/builtin/packages/jackcess/package.py | 46 +++++++++++++++++++ 5 files changed, 216 insertions(+), 5 deletions(-) create mode 100644 var/spack/repos/builtin/packages/commons-lang/package.py create mode 100644 var/spack/repos/builtin/packages/commons-lang3/package.py create mode 100644 var/spack/repos/builtin/packages/commons-logging/package.py create mode 100644 var/spack/repos/builtin/packages/jackcess/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/commons-lang/package.py b/var/spack/repos/builtin/packages/commons-lang/package.py new file mode 100644 index 0000000000..cdb1316c44 --- /dev/null +++ b/var/spack/repos/builtin/packages/commons-lang/package.py @@ -0,0 +1,50 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class CommonsLang(Package): + """The standard Java libraries fail to provide enough methods for + manipulation of its core classes. Apache Commons Lang provides these + extra methods. + + Lang provides a host of helper utilities for the java.lang API, notably + String manipulation methods, basic numerical methods, object reflection, + concurrency, creation and serialization and System properties. Additionally + it contains basic enhancements to java.util.Date and a series of utilities + dedicated to help with building methods, such as hashCode, toString and + equals.""" + + homepage = "http://commons.apache.org/proper/commons-lang/" + url = "https://archive.apache.org/dist/commons/lang/binaries/commons-lang-2.6-bin.tar.gz" + + version('2.6', '444075803459bffebfb5e28877861d23') + version('2.4', '5ff5d890e46021a2dbd77caba80f90f2') + + extends('jdk') + depends_on('java@2:', type='run') + + def install(self, spec, prefix): + install('commons-lang-{0}.jar'.format(self.version), prefix) diff --git a/var/spack/repos/builtin/packages/commons-lang3/package.py b/var/spack/repos/builtin/packages/commons-lang3/package.py new file mode 100644 index 0000000000..21959b3a61 --- /dev/null +++ b/var/spack/repos/builtin/packages/commons-lang3/package.py @@ -0,0 +1,49 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class CommonsLang3(Package): + """The standard Java libraries fail to provide enough methods for + manipulation of its core classes. Apache Commons Lang provides these + extra methods. + + Lang provides a host of helper utilities for the java.lang API, notably + String manipulation methods, basic numerical methods, object reflection, + concurrency, creation and serialization and System properties. Additionally + it contains basic enhancements to java.util.Date and a series of utilities + dedicated to help with building methods, such as hashCode, toString and + equals.""" + + homepage = "http://commons.apache.org/proper/commons-lang/" + url = "https://archive.apache.org/dist/commons/lang/binaries/commons-lang3-3.7-bin.tar.gz" + + version('3.7', 'c7577443639dc6efadc80f1cbc7fced5') + + extends('jdk') + depends_on('java@7:', type='run') + + def install(self, spec, prefix): + install('commons-lang3-{0}.jar'.format(self.version), prefix) diff --git a/var/spack/repos/builtin/packages/commons-logging/package.py b/var/spack/repos/builtin/packages/commons-logging/package.py new file mode 100644 index 0000000000..f634a98773 --- /dev/null +++ b/var/spack/repos/builtin/packages/commons-logging/package.py @@ -0,0 +1,51 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class CommonsLogging(Package): + """When writing a library it is very useful to log information. However + there are many logging implementations out there, and a library cannot + impose the use of a particular one on the overall application that the + library is a part of. + + The Logging package is an ultra-thin bridge between different logging + implementations. A library that uses the commons-logging API can be used + with any logging implementation at runtime. Commons-logging comes with + support for a number of popular logging implementations, and writing + adapters for others is a reasonably simple task.""" + + homepage = "http://commons.apache.org/proper/commons-logging/" + url = "http://archive.apache.org/dist/commons/logging/binaries/commons-logging-1.2-bin.tar.gz" + + version('1.2', 'ac043ce7ab3374eb4ed58354a6b2c3de') + version('1.1.3', 'b132f9a1e875677ae6b449406cff2a78') + version('1.1.1', 'e5de09672af9b386c30a311654d8541a') + + extends('jdk') + depends_on('java', type='run') + + def install(self, spec, prefix): + install('commons-logging-{0}.jar'.format(self.version), prefix) diff --git a/var/spack/repos/builtin/packages/gdal/package.py b/var/spack/repos/builtin/packages/gdal/package.py index cce78ae22d..f29d4b8709 100644 --- a/var/spack/repos/builtin/packages/gdal/package.py +++ b/var/spack/repos/builtin/packages/gdal/package.py @@ -83,6 +83,7 @@ class Gdal(AutotoolsPackage): variant('perl', default=False, description='Enable perl bindings') variant('python', default=False, description='Enable python bindings') variant('java', default=False, description='Include Java support') + variant('mdb', default=False, description='Include MDB driver') variant('armadillo', default=False, description='Include Armadillo support for faster TPS transform computation') variant('cryptopp', default=False, description='Include cryptopp support') variant('crypto', default=False, description='Include crypto (from openssl) support') @@ -117,7 +118,7 @@ class Gdal(AutotoolsPackage): depends_on('hdf5', when='+hdf5') depends_on('kealib', when='+kea @2:') depends_on('netcdf', when='+netcdf') - depends_on('jasper@1.900.1', patches=patch('uuid.patch'), when='+jasper') + depends_on('jasper@1.900.1', patches='uuid.patch', when='+jasper') depends_on('openjpeg', when='+openjpeg') depends_on('xerces-c', when='+xerces') depends_on('expat', when='+expat') @@ -136,7 +137,8 @@ class Gdal(AutotoolsPackage): # swig/python/setup.py depends_on('py-setuptools', type='build', when='+python') depends_on('py-numpy@1.0.0:', type=('build', 'run'), when='+python') - depends_on('java', type=('build', 'run'), when='+java') + depends_on('java', type=('build', 'link', 'run'), when='+java') + depends_on('jackcess@1.2.0:1.2.999', type='run', when='+mdb') depends_on('armadillo', when='+armadillo') depends_on('cryptopp', when='+cryptopp @2.1:') depends_on('openssl', when='+crypto @2.3:') @@ -149,6 +151,8 @@ class Gdal(AutotoolsPackage): conflicts('%xl@:13.0', msg=msg) conflicts('%xl_r@:13.0', msg=msg) + conflicts('+mdb', when='~java', msg='MDB driver requires Java') + def setup_environment(self, spack_env, run_env): # Needed to install Python bindings to GDAL installation # prefix instead of Python installation prefix. @@ -355,11 +359,24 @@ class Gdal(AutotoolsPackage): else: args.append('--with-python=no') + # https://trac.osgeo.org/gdal/wiki/GdalOgrInJava if '+java' in spec: - args.append('--with-java={0}'.format(spec['java'].prefix)) + args.extend([ + '--with-java={0}'.format(spec['java'].home), + '--with-jvm-lib={0}'.format( + spec['java'].libs.directories[0]), + '--with-jvm-lib-add-rpath' + ]) else: args.append('--with-java=no') + # https://trac.osgeo.org/gdal/wiki/mdbtools + # http://www.gdal.org/drv_mdb.html + if '+mdb' in spec: + args.append('--with-mdb=yes') + else: + args.append('--with-mdb=no') + if '+armadillo' in spec: args.append('--with-armadillo={0}'.format( spec['armadillo'].prefix)) @@ -410,8 +427,6 @@ class Gdal(AutotoolsPackage): '--with-pam=no', '--with-podofo=no', '--with-php=no', - # https://trac.osgeo.org/gdal/wiki/mdbtools - '--with-mdb=no', '--with-rasdaman=no', ]) diff --git a/var/spack/repos/builtin/packages/jackcess/package.py b/var/spack/repos/builtin/packages/jackcess/package.py new file mode 100644 index 0000000000..62b7279c11 --- /dev/null +++ b/var/spack/repos/builtin/packages/jackcess/package.py @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Jackcess(Package): + """Jackcess is a pure Java library for reading from and writing to + MS Access databases (currently supporting versions 2000-2016).""" + + homepage = "http://jackcess.sourceforge.net/" + url = "https://sourceforge.net/projects/jackcess/files/jackcess/2.1.12/jackcess-2.1.12.jar" + + version('2.1.12', '7d051d8dd93f2fe7e5e86389ea380619', expand=False) + version('1.2.14.3', 'ef778421c1385ac9ab4aa7edfb954caa', expand=False) + + extends('jdk') + depends_on('java', type='run') + depends_on('commons-lang@2.6', when='@2.1.12', type='run') + depends_on('commons-lang@2.4', when='@1.2.14.3', type='run') + depends_on('commons-logging@1.1.3', when='@2.1.12', type='run') + depends_on('commons-logging@1.1.1', when='@1.2.14.3', type='run') + + def install(self, spec, prefix): + install('jackcess-{0}.jar'.format(self.version), prefix) -- cgit v1.2.3-70-g09d2 From e860307c31567df9e270673a89a4e4974e4bc11f Mon Sep 17 00:00:00 2001 From: "Mark W. Krentel" Date: Wed, 29 Aug 2018 22:32:41 -0500 Subject: binutils: add variant 'nls' for native language support (#9124) Add variant 'nls' for native language support with default True. The default inside binutils was always on, but this gives a way of turning it off, if desired. Adjust the dependencies. Flex is never used for a one-time build. Bison and m4 should not be needed, except that prior to rev 2.30, gold did not include its generated files, so bison is needed when +gold. Drop configure option --enable-interwork. This option does not exist. --- var/spack/repos/builtin/packages/binutils/package.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/binutils/package.py b/var/spack/repos/builtin/packages/binutils/package.py index 2f2a9642fa..9d2e72f3ad 100644 --- a/var/spack/repos/builtin/packages/binutils/package.py +++ b/var/spack/repos/builtin/packages/binutils/package.py @@ -45,29 +45,30 @@ class Binutils(AutotoolsPackage): description="enable plugins, needed for gold linker") variant('gold', default=True, description="build the gold linker") variant('libiberty', default=False, description='Also install libiberty.') + variant('nls', default=True, description='Enable Native Language Support') patch('cr16.patch', when='@:2.29.1') patch('update_symbol-2.26.patch', when='@2.26') depends_on('zlib') + depends_on('gettext', when='+nls') - depends_on('m4', type='build') - depends_on('flex', type='build') - depends_on('bison', type='build') - depends_on('gettext') + # Prior to 2.30, gold did not distribute the generated files and + # thus needs bison, even for a one-time build. + depends_on('m4', type='build', when='@:2.29.99 +gold') + depends_on('bison', type='build', when='@:2.29.99 +gold') def configure_args(self): spec = self.spec configure_args = [ - '--with-system-zlib', '--disable-dependency-tracking', '--disable-werror', - '--enable-interwork', '--enable-multilib', '--enable-shared', '--enable-64-bit-bfd', '--enable-targets=all', + '--with-system-zlib', '--with-sysroot=/', ] @@ -80,6 +81,11 @@ class Binutils(AutotoolsPackage): if '+libiberty' in spec: configure_args.append('--enable-install-libiberty') + if '+nls' in spec: + configure_args.append('--enable-nls') + else: + configure_args.append('--disable-nls') + # To avoid namespace collisions with Darwin/BSD system tools, # prefix executables with "g", e.g., gar, gnm; see Homebrew # https://github.com/Homebrew/homebrew-core/blob/master/Formula/binutils.rb -- cgit v1.2.3-70-g09d2 From a86f22d755887c66b03b62c8be2fa708b79fad0a Mon Sep 17 00:00:00 2001 From: Michael Sternberg Date: Wed, 29 Aug 2018 23:09:34 -0500 Subject: Intel prefixes (#7469) Consolidate prefix calculation logic for intel packages into the IntelPackage class. Add documentation on installing Intel packages with Spack an (alternatively) adding them as external packages in Spack. --- lib/spack/docs/basic_usage.rst | 3 + lib/spack/docs/build_systems/intelpackage.rst | 1054 +++++++++++++++- lib/spack/docs/getting_started.rst | 3 + lib/spack/docs/module_file_support.rst | 3 + lib/spack/docs/packaging_guide.rst | 2 + lib/spack/docs/tutorial_configuration.rst | 2 + lib/spack/spack/build_systems/README-intel.rst | 660 ++++++++++ lib/spack/spack/build_systems/intel.py | 1256 ++++++++++++++++++-- .../repos/builtin/packages/intel-daal/package.py | 36 - .../repos/builtin/packages/intel-ipp/package.py | 37 +- .../repos/builtin/packages/intel-mkl/package.py | 169 +-- .../repos/builtin/packages/intel-mpi/package.py | 103 +- .../packages/intel-parallel-studio/package.py | 550 ++------- var/spack/repos/builtin/packages/intel/package.py | 104 +- 14 files changed, 3039 insertions(+), 943 deletions(-) create mode 100644 lib/spack/spack/build_systems/README-intel.rst (limited to 'var') diff --git a/lib/spack/docs/basic_usage.rst b/lib/spack/docs/basic_usage.rst index ae180c0659..622860b75f 100644 --- a/lib/spack/docs/basic_usage.rst +++ b/lib/spack/docs/basic_usage.rst @@ -596,6 +596,9 @@ name or compiler specifier to their left in the spec. If the compiler spec is omitted, Spack will choose a default compiler based on site policies. + +.. _basic-variants: + ^^^^^^^^ Variants ^^^^^^^^ diff --git a/lib/spack/docs/build_systems/intelpackage.rst b/lib/spack/docs/build_systems/intelpackage.rst index a21a0beb32..c03bbc30e0 100644 --- a/lib/spack/docs/build_systems/intelpackage.rst +++ b/lib/spack/docs/build_systems/intelpackage.rst @@ -4,10 +4,1052 @@ IntelPackage ------------ -Intel provides many licensed software packages, which all share the -same basic steps for configuring and installing, as well as license -management. +.. contents:: -This build system is a work-in-progress. See -https://github.com/spack/spack/pull/4300 and -https://github.com/spack/spack/pull/7469 for more information. +^^^^^^^^^^^^^^^^^^^^^^^^ +Intel packages in Spack +^^^^^^^^^^^^^^^^^^^^^^^^ + +Spack can install and use several software development products offered by Intel. +Some of these are available under no-cost terms, others require a paid license. +All share the same basic steps for configuration, installation, and, where +applicable, license management. The Spack Python class ``IntelPackage`` implements +these steps. + +Spack interacts with Intel tools in several routes, like it does for any +other package: + +.. _`route 1`: + +1. Accept system-provided tools after you declare them to Spack as *external packages*. + +.. _`route 2`: + +2. Install the products for you as *internal packages* in Spack. + +.. _`route 3`: + +3. *Use* the packages, regardless of installation route, to install what we'll + call *client packages* for you, this being Spack's primary purpose. + +An auxiliary route follows from route 2, as it would for most Spack +packages, namely: + +.. _`route 4`: + +4. Make Spack-installed Intel tools available outside of Spack for ad-hoc use, + typically through Spack-managed modulefiles. + +This document covers routes 1 through 3. + + +"""""""""""""""""""""""""""""""""" +Packages under no-cost license +"""""""""""""""""""""""""""""""""" + +Intel's standalone performance library products, notably MKL and MPI, are +available for use under a `simplified license +`_ +since 2017 [fn1]_. They are packaged in Spack as: + +* ``intel-mkl`` -- Math Kernel Library (linear algebra and FFT), +* ``intel-mpi`` -- The Intel-MPI implementation (derived from MPICH), +* ``intel-ipp`` -- Primitives for image-, signal-, and data-processing, +* ``intel-daal`` -- Machine learning and data analytics. + +Some earlier versions of these libraries were released under a paid license. +For these older versions, the license must be available at installation time of +the products and during compilation of client packages. + +The library packages work well with the Intel compilers but do not require them +-- those packages can just as well be used with other compilers. The Intel +compiler invocation commands offer custom options to simplify linking Intel +libraries (sometimes considerably), but Spack always uses fairly explicit +linkage anyway. + + +"""""""""""""""""" +Licensed packages +"""""""""""""""""" + +Intel's core software development products that provide compilers, analyzers, +and optimizers do require a paid license. In Spack, they are packaged as: + +* ``intel-parallel-studio`` -- the entire suite of compilers and libraries, +* ``intel`` -- a subset containing just the compilers and the Intel-MPI runtime [fn2]_. + +.. + TODO: Confirm and possible change(!) the scope of MPI components (runtime + vs. devel) in current (and previous?) *cluster/professional/composer* + editions, i.e., presence in downloads, possibly subject to license + coverage(!); see `disussion in PR #4300 + `_. [NB: + An "mpi" subdirectory is not indicative of the full MPI SDK being present + (i.e., ``mpicc``, ..., and header files). The directory may just as well + contain only the MPI runtime (``mpirun`` and shared libraries) .] + See also issue #8632. + +The license is needed at installation time and to compile client packages, but +never to merely run any resulting binaries. The license status for a given +Spack package is normally specified in the *package code* through directives like +`license_required` (see :ref:`Licensed software `). +For the Intel packages, however, the *class code* provides these directives (in +exchange of forfeiting a measure of OOP purity) and takes care of idiosyncasies +like historic version dependence. + +The libraries that are provided in the standalone packages are also included in the +all-encompassing ``intel-parallel-studio``. To complicate matters a bit, that +package is sold in 3 "editions", of which only the upper-tier ``cluster`` +edition supports *compiling* MPI applications, and hence only that edition can +provide the ``mpi`` virtual package. (As mentioned [fn2]_, all editions +provide support for *running* MPI applications.) + +The edition forms the leading part of the version number for Spack's +``intel*`` packages discussed here. This differs from the primarily numeric +version numbers seen with most other Spack packages. For example, we have: + + +.. code-block:: console + + $ spack info intel-parallel-studio + ... + Preferred version: + professional.2018.3 http:... + + Safe versions: + professional.2018.3 http:... + ... + composer.2018.3 http:... + ... + cluster.2018.3 http:... + ... + ... + +The full studio suite, capable of compiling MPI applications, currently +requires about 12 GB of disk space when installed (see section `Install steps +for packages with compilers and libraries`_ for detailed instructions). +If you need to save disk space or installation time, you could install the +``intel`` compilers-only subset (0.6 GB) and just the library packages you +need, for example ``intel-mpi`` (0.5 GB) and ``intel-mkl`` (2.5 GB). + + +"""""""""""""""""""" +Unrelated packages +"""""""""""""""""""" + +The following packages do not use the Intel installer and are not in class ``IntelPackage`` +that is discussed here: + +* ``intel-gpu-tools`` -- Test suite and low-level tools for the Linux `Direct + Rendering Manager `_ +* ``intel-mkl-dnn`` -- Math Kernel Library for Deep Neural Networks (``CMakePackage``) +* ``intel-xed`` -- X86 machine instructions encoder/decoder +* ``intel-tbb`` -- Standalone version of Intel Threading Building Blocks. Note that + a TBB runtime version is included with ``intel-mkl``, and development + versions are provided by the packages ``intel-parallel-studio`` (all + editions) and its ``intel`` subset. + +"""""""""""""""""""""""""""""""""""""""""" +Configuring Spack to use Intel licenses +"""""""""""""""""""""""""""""""""""""""""" + +If you wish to integrate licensed Intel products into Spack as external packages +(`route 1`_ above) we assume that their license configuration is in place and +is working [fn3]_. In this case, skip to section `Integration of Intel tools +installed external to Spack`_. + +If you plan to have Spack install licensed products for you (`route 2`_ above), +the Intel product installer that Spack will run underneath must have access to +a license that is either provided by a *license server* or as a *license file*. +The installer may be able to locate a license that is already configured on +your system. If it cannot, you must configure Spack to provide either the +server location or the license file. + +For authoritative information on Intel licensing, see: + +* https://software.intel.com/en-us/faq/licensing +* https://software.intel.com/en-us/articles/how-do-i-manage-my-licenses + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Pointing to an existing license server +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Installing and configuring a license server is outside the scope of Spack. We +assume that: + +* Your system administrator has a license server running. +* The license server offers valid licenses for the Intel packages of interest. +* You can access these licenses under the user id running Spack. + +Be aware of the difference between (a) installing and configuring a license +server, and (b) configuring client software to *use* a server's +so-called floating licenses. We are concerned here with (b) only. The +process of obtaining a license from a server for temporary use is called +"checking out a license". For that, a client application such as the Intel +package installer or a compiler needs to know the host name and port number of +one or more license servers that it may query [fn4]_. + +Follow one of three methods to `point client software to a floating license server +`_. +Ideally, your license administrator will already have implemented one that can +be used unchanged in Spack: Look for the environment variable +``INTEL_LICENSE_FILE`` or for files +``/opt/intel/licenses/*.lic`` that contain:: + + SERVER hostname hostid_or_ANY portnum + USE_SERVER + +The relevant tokens, among possibly others, are the ``USE_SERVER`` line, +intended specifically for clients, and one or more ``SERVER`` lines above it +which give the network address. + +If you cannot find pre-existing ``/opt/intel/licenses/*.lic`` files and the +``INTEL_LICENSE_FILE`` environment variable is not set (even after you loaded +any relevant modulefiles), ask your license administrator for the server +address(es) and place them in a "global" license file within your Spack +directory tree `as shown below `_). + + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Installing a standalone license file +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +If you purchased a user-specific license, follow `Intel's instructions +`_ +to "activate" it for your serial number, then download the resulting license file. +If needed, `request to have the file re-sent +`_ to you. + +Intel's license files are text files that contain tokens in the proprietary +"FLEXlm" format and whose name ends in ``.lic``. +Intel installers and compilers look for license files in several locations when they run. +Place your license by one of the following means, in order of decreasing preference: + +* Default directory + + Install your license file in the directory ``/opt/intel/licenses/`` if you + have write permission to it. This directory is inspected by all Intel tools + and is therefore preferred, as no further configuration will be needed. + Create the directory if it does not yet exist. For the file name, either + keep the downloaded name or use another suitably plain yet descriptive + name that ends in ``.lic``. Adjust file permissions for access by licensed + users. + + +* Directory given in environment variable + + If you cannot use the default directory, but your system already has set the + environment variable ``INTEL_LICENSE_FILE`` independent from Spack [fn5]_, + then, if you have the necessary write permissions, place your license file in + one of the directories mentioned in this environment variable. Adjust file + permissions to match licensed users. + + .. tip:: + + If your system has not yet set and used the environment variable + ``INTEL_LICENSE_FILE``, you could start using it with the ``spack + install`` stage of licensed tools and subsequent client packages. You + would, however, be in a bind to always set that variable in the same + manner, across updates and re-installations, and perhaps accommodate + additions to it. As this may be difficult in the long run, we recommend + that you do *not* attempt to start using the variable solely for Spack. + +.. _`Spack-managed file`: + +* Spack-managed file + + The first time Spack encounters an Intel package that requires a license, it + will initialize a Spack-global Intel-specific license file for you, as a + template with instructional comments, and bring up an editor [fn6]_. Spack + will do this *even if you have a working license elsewhere* on the system. + + * To proceed with an externally configured license, leave the newly templated + file as is (containing comments only) and close the editor. You do not need + to touch the file again. + + * To configure your own standalone license, copy the contents of your + downloaded license file into the opened file, save it, and close the editor. + + * To use a license server (i.e., a floating network license) that is not + already configured elsewhere on the system, supply your license server + address(es) in the form of ``SERVER`` and ``USE_SERVER`` lines at the + *beginning of the file* [fn7]_, in the format shown in section `Pointing to + an existing license server`_. Save the file and close the editor. + + To revisit and manually edit this file, such as prior to a subsequent + installation attempt, find it at + ``$SPACK_ROOT/etc/spack/licenses/intel/intel.lic`` . + + Spack will place symbolic links to this file in each directory where licensed + Intel binaries were installed. If you kept the template unchanged, Intel tools + will simply ignore it. + + +.. _integrate-external-intel: + +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Integration of Intel tools installed *external* to Spack +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +This section discusses `route 1`_ from the introduction. + +A site that already uses Intel tools, especially licensed ones, will likely +have some versions already installed on the system, especially at a time when +Spack is just being introduced. It will be useful to make such previously +installed tools available for use by Spack as they are. How to do this varies +depending on the type of the tools: + +"""""""""""""""""""""""""""""""""" +Integrating external compilers +"""""""""""""""""""""""""""""""""" + +For Spack to use external Intel compilers, you must tell it both *where* to +find them and *when* to use them. The present section documents the "where" +aspect, involving ``compilers.yaml`` and, in most cases, long absolute paths. +The "when" aspect actually relates to `route 3`_ and requires explicitly +stating the compiler as a spec component (in the form ``foo %intel`` or ``foo +%intel@compilerversion``) when installing client packages or altering Spack's +compiler default in ``packages.yaml``. +See section `Selecting Intel compilers `_ for details. + +To integrate a new set of externally installed Intel compilers into Spack +follow section +:ref:`Compiler configuration `. +Briefly, prepare your shell environment like you would if you were to use these +compilers normally, i.e., typically by a ``module load ...`` or a shell +``source ...`` command, then use ``spack compiler find`` to make Spack aware of +these compilers. This will create a new entry in a suitably scoped and possibly new +``compilers.yaml`` file. You could certainly create such a compiler entry +manually, but this is error-prone due to the indentation and different data +types involved. + +The Intel compilers need and use the system's native GCC compiler (``gcc`` on +most systems, ``clang`` on macOS) to provide certain functionality, notably to +support C++. To provide a different GCC compiler for the Intel tools, or more +generally set persistent flags for all invocations of the Intel compilers, locate +the ``compilers.yaml`` entry that defines your Intel compiler, and, using a +text editor, change one or both of the following: + +1. At the ``modules:`` tag, add a ``gcc`` module to the list. +2. At the ``flags:`` tag, add ``cflags:``, ``cxxflags:``, and ``fflags:`` key-value entries. + +Consult the examples under +:ref:`Compiler configuration ` +and +:ref:`Vendor-Specific Compiler Configuration ` +in the Spack documentation. +When done, validate your compiler definition by running +``spack compiler info intel@compilerversion`` (replacing ``compilerversion`` by +the version that you defined). + +Be aware that both the GCC integration and persistent compiler flags can also be +affected by an advanced third method: + +3. A modulefile that provides the Intel compilers for you + could, for the benefit of users outside of Spack, implicitly + integrate a specific ``gcc`` version via compiler flag environment variables + or (hopefully not) via a sneaky extra ``PATH`` addition. + +Next, visit section `Selecting Intel Compilers`_ to learn how to tell +Spack to use the newly configured compilers. + +"""""""""""""""""""""""""""""""""" +Integrating external libraries +"""""""""""""""""""""""""""""""""" + +Configure external library-type packages (as opposed to compilers) +in the files ``$SPACK_ROOT/etc/spack/packages.yaml`` or +``~/.spack/packages.yaml``, following the Spack documentation under +:ref:`External Packages `. + +Similar to ``compilers.yaml``, the ``packages.yaml`` files define a package +external to Spack in terms of a Spack spec and resolve each such spec via +either the ``paths`` or ``modules`` tokens to a specific pre-installed package +version on the system. Since Intel tools generally need environment variables +to interoperate, which cannot be conveyed in a mere ``paths`` specification, +the ``modules`` token will be more sensible to use. It resolves the Spack-side +spec to a modulefile generated and managed outside of Spack's purview, +which Spack will load internally and transiently when the corresponding spec is +called upon to compile client packages. + +Unlike for compilers, where ``spack find compilers [spec]`` generates an entry +in an existing or new ``compilers.yaml`` file, Spack does not offer a command +to generate an entirely new ``packages.yaml`` entry. You must create +new entries yourself in a text editor, though the command ``spack config +[--scope=...] edit packages`` can help with selecting the proper file. +See section +:ref:`Configuration Scopes ` +for an explanation about the different files +and section +:ref:`Build customization ` +for specifics and examples for ``packages.yaml`` files. + +.. If your system administrator did not provide modules for pre-installed Intel + tools, you could do well to ask for them, because installing multiple copies + of the Intel tools, as is wont to happen once Spack is in the picture, is + bound to stretch disk space and patience thin. If you *are* the system + administrator and are still new to modules, then perhaps it's best to follow + the `next section `_ and install the tools + solely within Spack. + +The following example integrates packages embodied by hypothetical +external modulefiles ``intel-mkl/18/...`` into +Spack as packages ``intel-mkl@...``: + +.. code-block:: console + + $ spack config edit packages + +Make sure the file begins with: + +.. code-block:: yaml + + packages: + +Adapt the following example. Be sure to maintain the indentation: + +.. code-block:: yaml + + # other content ... + + intel-mkl: + modules: + intel-mkl@2018.2.199 arch=linux-centos6-x86_64: intel-mkl/18/18.0.2 + intel-mkl@2018.3.222 arch=linux-centos6-x86_64: intel-mkl/18/18.0.3 + +The version numbers for the ``intel-mkl`` specs defined here correspond to file +and directory names that Intel uses for its products because they were adopted +and declared as such within Spack's package repository. You can inspect the +versions known to your current Spack installation by: + +.. code-block:: console + + $ spack info intel-mkl + +Using the same version numbers for external packages as for packages known +internally is useful for clarity, but not strictly necessary. Moreover, with a +``packages.yaml`` entry, you can go beyond internally known versions. + +.. _compiler-neutral-package: + +Note that the Spack spec in the example does not contain a compiler +specification. This is intentional, as the Intel library packages can be used +unmodified with different compilers. + +A slightly more advanced example illustrates how to provide +:ref:`variants ` +and how to use the ``buildable: False`` directive to prevent Spack from installing +other versions or variants of the named package through its normal internal +mechanism. + +.. code-block:: yaml + + packages: + intel-parallel-studio: + modules: + intel-parallel-studio@cluster.2018.2.199 +mkl+mpi+ipp+tbb+daal arch=linux-centos6-x86_64: intel/18/18.0.2 + intel-parallel-studio@cluster.2018.3.222 +mkl+mpi+ipp+tbb+daal arch=linux-centos6-x86_64: intel/18/18.0.3 + buildable: False + +One additional example illustrates the use of ``paths:`` instead of +``modules:``, useful when external modulefiles are not available or not +suitable: + +.. code-block:: yaml + + packages: + intel-parallel-studio: + paths: + intel-parallel-studio@cluster.2018.2.199 +mkl+mpi+ipp+tbb+daal: /opt/intel + intel-parallel-studio@cluster.2018.3.222 +mkl+mpi+ipp+tbb+daal: /opt/intel + buildable: False + +Note that for the Intel packages discussed here, the directory values in the +``paths:`` entries must be the high-level and typically version-less +"installation directory" that has been used by Intel's product installer. +Such a directory will typically accumulate various product versions. Amongst +them, Spack will select the correct version-specific product directory based on +the ``@version`` spec component that each path is being defined for. + +For further background and details, see +:ref:`External Packages `. + + +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Installing Intel tools *within* Spack +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +This section discusses `route 2`_ from the introduction. + +When a system does not yet have Intel tools installed already, or the installed +versions are undesirable, Spack can install these tools like any regular Spack +package for you and, with appropriate pre- and post-install configuration, use its +compilers and/or libraries to install client packages. + +.. _intel-install-studio: + +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +Install steps for packages with compilers and libraries +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""" + +The packages ``intel-parallel-studio`` and ``intel`` (which is a subset of the +former) are many-in-one products that contain both compilers and a set of +library packages whose scope depends on the edition. +Because they are general products geared towards shell environments, +it can be somewhat involved to integrate these packages at their full extent +into Spack. + +Note: To install library-only packages like ``intel-mkl``, ``intel-mpi``, and ``intel-daal`` +follow `the next section `_ instead. + +1. Review the section `Configuring spack to use intel licenses`_. + +.. _intel-compiler-anticipation: + +2. To install a version of ``intel-parallel-studio`` that provides Intel + compilers at a version that you have *not yet declared in Spack*, + the following preparatory steps are recommended: + + A. Determine the compiler spec that the new ``intel-parallel-studio`` package + will provide, as follows: From the package version, combine the last two + digits of the version year, a literal "0" (zero), and the version component + that immediately follows the year. + + ========================================== ====================== + Package version Compiler spec provided + ------------------------------------------ ---------------------- + ``intel-parallel-studio@edition.YYyy.u`` ``intel@yy.0.u`` + ========================================== ====================== + + Example: The package ``intel-parallel-studio@cluster.2018.3`` will provide + the compiler with spec ``intel@18.0.3``. + + .. _`config-compiler-anticipated`: + + B. Add a new compiler section with the newly anticipated version at the + end of a ``compilers.yaml`` file in a suitable scope. For example, run: + + .. code-block:: console + + $ spack config --scope=user/linux edit compilers + + and append a stub entry: + + .. code-block:: yaml + + - compiler: + target: x86_64 + operating_system: centos6 + modules: [] + spec: intel@18.0.3 + paths: + cc: stub + cxx: stub + f77: stub + fc: stub + + Replace ``18.0.3`` with the version that you determined in the preceeding + step. The contents under ``paths:`` do not matter yet. + + You are right to ask: "Why on earth is that necessary?" [fn8]_. + The answer lies in Spack striving for strict compiler consistency. + Consider what happens without such a pre-declared compiler stub: + Say, you ask Spack to install a particular version + ``intel-parallel-studio@edition.V``. Spack will apply an unrelated compiler + spec to concretize and install your request, resulting in + ``intel-parallel-studio@edition.V %X``. That compiler ``%X`` is not going to + be the version that this new package itself provides. Rather, it would + typically be ``%gcc@...`` in a default Spack installation or possibly indeed + ``%intel@...``, but at a version that precedes ``V``. + + The problem comes to the fore as soon as you try to use any virtual ``mkl`` + or ``mpi`` packages that you would expect to now be provided by + ``intel-parallel-studio@edition.V``. Spack will indeed see those virtual + packages, but only as being tied to the compiler that the package + ``intel-parallel-studio@edition.V`` was concretized with *at installation*. + If you were to install a client package with the new compilers now available + to you, you would naturally run ``spack install foo +mkl %intel@V``, yet + Spack will either complain about ``mkl%intel@V`` being missing (because it + only knows about ``mkl%X``) or it will go and attempt to install *another + instance* of ``intel-parallel-studio@edition.V %intel@V`` so as to match the + compiler spec ``%intel@V`` that you gave for your client package ``foo``. + This will be unexpected and will quickly get annoying because each + reinstallation takes up time and extra disk space. + + To escape this trap, put the compiler stub declaration shown here in place, + then use that pre-declared compiler spec to install the actual package, as + shown next. This approach works because during installation only the + package's own self-sufficient installer will be used, not any compiler. + + .. _`verify-compiler-anticipated`: + +3. Verify that the compiler version provided by the new ``studio`` version + would be used as expected if you were to compile a client package: + + .. code-block:: console + + $ spack spec zlib %intel + + If the version does not match, explicitly state the anticipated compiler version, e.g.: + + .. code-block:: console + + $ spack spec zlib %intel@18.0.3 + + if there are problems, review and correct the compiler's ``compilers.yaml`` + entry, be it still in stub form or already complete (as it would be for a + re-installation). + +4. Install the new ``studio`` package using Spack's regular ``install`` + command. + It may be wise to provide the anticipated compiler (`see above + `_) as an explicit concretization + element: + + .. code-block:: console + + $ spack install intel-parallel-studio@cluster.2018.3 %intel@18.0.3 + +5. Follow the same steps as under `Integrating external compilers`_ to tell + Spack the minutiae for actually using those compilers with client packages. + If you placed a stub entry in a ``compilers.yaml`` file, now is the time to + edit it and fill in the particulars. + + * Under ``paths:``, give the full paths to the actual compiler binaries (``icc``, + ``ifort``, etc.) located within the Spack installation tree, in all their + unsightly length [fn9]_. + + To determine the full path to the C compiler, adapt and run: + + .. code-block:: console + + $ find `spack location -i intel-parallel-studio@cluster.2018.3` \ + -name icc -type f -ls + + If you get hits for both ``intel64`` and ``ia32``, you almost certainly will + want to use the ``intel64`` variant. The ``icpc`` and ``ifort`` compilers + will be located in the same directory as ``icc``. + + * Use the ``modules:`` and/or ``cflags:`` tokens to specify a suitable accompanying + ``gcc`` version to help pacify picky client packages that ask for C++ + standards more recent than supported by your system-provided ``gcc`` and its + ``libstdc++.so``. + + * To set the Intel compilers for default use in Spack, instead of the usual ``%gcc``, + follow section `Selecting Intel compilers`_. + +.. tip:: + + Compiler packages like ``intel-parallel-studio`` can easily be above 10 GB + in size, which can tax the disk space available for temporary files on + small, busy, or restricted systems (like virtual machines). The Intel + installer will stop and report insufficient space as:: + + ==> './install.sh' '--silent' 'silent.cfg' + ... + Missing critical prerequisite + -- Not enough disk space + + As first remedy, clean Spack's existing staging area: + + .. code-block:: console + + $ spack clean --stage + + then retry installing the large package. Spack normally cleans staging + directories but certain failures may prevent it from doing so. + + If the error persists, tell Spack to use an alternative location for + temporary files: + + 1. Run ``df -h`` to identify an alternative location on your system. + + 2. Tell Spack to use that location for staging. Do **one** of the following: + + * Run Spack with the environment variable ``TMPDIR`` altered for just a + single command. For example, to use your ``$HOME`` directory: + + .. code-block:: console + + $ TMPDIR="$HOME/spack-stage" spack install .... + + This example uses Bourne shell syntax. Adapt for other shells as needed. + + * Alternatively, customize + Spack's ``build_stage`` :ref:`configuration setting `. + + .. code-block:: console + + $ spack config edit config + + Append: + + .. code-block:: yaml + + config: + build_stage: + - /home/$user/spack-stage + + Do not duplicate the ``config:`` line if it already is present. + Adapt the location, which here is the same as in the preceeding example. + + 3. Retry installing the large package. + + +.. _intel-install-libs: + +"""""""""""""""""""""""""""""""""""""""""""""""""""""""" +Install steps for library-only packages +"""""""""""""""""""""""""""""""""""""""""""""""""""""""" + +To install library-only packages like ``intel-mkl``, ``intel-mpi``, and ``intel-daal`` +follow the steps given here. +For packages that contain a compiler, follow `the previous section +`_ instead. + +1. For pre-2017 product releases, review the section `Configuring Spack to use Intel licenses`_. + +2. Inspect the package spec. Specify an explicit compiler if necessary, e.g.: + + .. code-block:: console + + $ spack spec intel-mpi@2018.3.199 + $ spack spec intel-mpi@2018.3.199 %intel + + Check that the package will use the compiler flavor and version that you expect. + +3. Install the package normally within Spack. Use the same spec as in the + previous command, i.e., as general or as specific as needed: + + .. code-block:: console + + $ spack install intel-mpi@2018.3.199 + $ spack install intel-mpi@2018.3.199 %intel@18 + +4. To prepare the new packages for use with client packages, + follow `Selecting libraries to satisfy virtual packages`_. + + +"""""""""""""""" +Debug notes +"""""""""""""""" + +* You can trigger a wall of additional diagnostics using Spack options, e.g.: + + .. code-block:: console + + $ spack --debug -v install intel-mpi + + The ``--debug`` option can also be useful while installing client + packages `(see below) `_ to confirm the integration of the Intel tools in Spack, notably + MKL and MPI. + +* The ``.spack/`` subdirectory of an installed ``IntelPackage`` will contain, + besides Spack's usual archival items, a copy of the ``silent.cfg`` file that + was passed to the Intel installer: + + .. code-block:: console + + $ grep COMPONENTS ...intel-mpi.../.spack/silent.cfg + COMPONENTS=ALL + +* If an installation error occurs, Spack will normally clean up and remove a + partially installed target directory. You can direct Spack to keep it using + ``--keep-prefix``, e.g.: + + .. code-block:: console + + $ spack install --keep-prefix intel-mpi + + You must, however, *remove such partial installations* prior to subsequent + installation attempts. Otherwise, the Intel installer will behave + incorrectly. + + +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Using Intel tools in Spack to install client packages +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Finally, this section pertains to `route 3`_ from the introduction. + +Once Intel tools are installed within Spack as external or internal packages +they can be used as intended for installing client packages. + + +.. _`select-intel-compilers`: + +"""""""""""""""""""""""""" +Selecting Intel compilers +"""""""""""""""""""""""""" + +Select Intel compilers to compile client packages, like any compiler in Spack, +by one of the following means: + +* Request the Intel compilers explicitly in the client spec, e.g.: + + .. code-block:: console + + $ spack install libxc@3.0.0%intel + + +* Alternatively, request Intel compilers implicitly by concretization preferences. + Configure the order of compilers in the appropriate ``packages.yaml`` file, + under either an ``all:`` or client-package-specific entry, in a + ``compiler:`` list. Consult the Spack documentation for + :ref:`Configuring Package Preferences ` + and + :ref:`Concretization Preferences `. + +Example: ``etc/spack/packages.yaml`` might simply contain: + +.. code-block:: yaml + + packages: + all: + compiler: [ intel, gcc, ] + +To be more specific, you can state partial or full compiler version numbers, +for example: + +.. code-block:: yaml + + packages: + all: + compiler: [ intel@18, intel@17, gcc@4.4.7, gcc@4.9.3, gcc@7.3.0, ] + + + +"""""""""""""""""""""""""""""""""""""""""""""""" +Selecting libraries to satisfy virtual packages +"""""""""""""""""""""""""""""""""""""""""""""""" + +Intel packages, whether integrated into Spack as external packages or +installed within Spack, can be called upon to satisfy the requirement of a +client package for a library that is available from different providers. +The relevant virtual packages for Intel are ``blas``, ``lapack``, +``scalapack``, and ``mpi``. + +In both integration routes, Intel packages can have optional +:ref:`variants ` +which alter the list of virtual packages they can satisfy. For Spack-external +packages, the active variants are a combination of the defaults declared in +Spack's package repository and the spec it is declared as in ``packages.yaml``. +Needless to say, those should match the components that are actually present in +the external product installation. Likewise, for Spack-internal packages, the +active variants are determined, persistently at installation time, from the +defaults in the repository and the spec selected to be installed. + +To have Intel packages satisfy virtual package requests for all or selected +client packages, edit the ``packages.yaml`` file. Customize, either in the +``all:`` or a more specific entry, a ``providers:`` dictionary whose keys are +the virtual packages and whose values are the Spack specs that satisfy the +virtual package, in order of decreasing preference. To learn more about the +``providers:`` settings, see the Spack tutorial for +:ref:`Configuring Package Preferences ` +and the section +:ref:`Concretization Preferences `. + +Example: The following fairly minimal example for ``packages.yaml`` shows how +to exclusively use the standalone ``intel-mkl`` package for all the linear +algebra virtual packages in Spack, and ``intel-mpi`` as the preferred MPI +implementation. Other providers can still be chosen on a per-package basis. + +.. code-block:: yaml + + packages: + all: + providers: + mpi: [intel-mpi] + blas: [intel-mkl] + lapack: [intel-mkl] + scalapack: [intel-mkl] + +If you have access to the ``intel-parallel-studio@cluster`` edition, you can +use instead: + +.. code-block:: yaml + + all: + providers: + mpi: [intel-parallel-studio+mpi] + # Note: +mpi vs. +mkl + blas: [intel-parallel-studio+mkl] + lapack: [intel-parallel-studio+mkl] + scalapack: [intel-parallel-studio+mkl] + +If you installed ``intel-parallel-studio`` within Spack ("`route 2`_"), make +sure you followed the `special installation step +`_ to ensure that its virtual packages match the +compilers it provides. + + +"""""""""""""""""""""""""""""""""""""""""""" +Using Intel tools as explicit dependency +"""""""""""""""""""""""""""""""""""""""""""" + +With the proper installation as detailed above, no special steps should be +required when a client package specifically (and thus deliberately) requests an +Intel package as dependency, this being one of the target use cases for Spack. + + +""""""""""""""""""""""""""""""""""""""""""""""" +Tips for configuring client packages to use MKL +""""""""""""""""""""""""""""""""""""""""""""""" + +The Math Kernel Library (MKL) is provided by several Intel packages, currently +``intel-parallel-studio`` when variant ``+mkl`` is active (it is by default) +and the standalone ``intel-mkl``. Because of these different provider packages, +a *virtual* ``mkl`` package is declared in Spack. + +* To use MKL-specific APIs in a client package: + + Declare a dependency on ``mkl``, rather than a specific provider like + ``intel-mkl``. Declare the dependency either absolutely or conditionally + based on variants that your package might have declared: + + .. code-block:: python + + # Examples for absolute and conditional dependencies: + depends_on('mkl') + depends_on('mkl', when='+mkl') + depends_on('mkl', when='fftw=mkl') + + The ``MKLROOT`` environment variable (part of the documented API) will be set + during all stages of client package installation, and is available to both + the Spack packaging code and the client code. + +* To use MKL as provider for BLAS, LAPACK, or ScaLAPACK: + + The packages that provide ``mkl`` also provide the narrower + virtual ``blas``, ``lapack``, and ``scalapack`` packages. + See the relevant :ref:`Packaging Guide section ` + for an introduction. + To portably use these virtual packages, construct preprocessor and linker + option strings in your package configuration code using the package functions + ``.headers`` and ``.libs`` in conjunction with utility functions from the + following classes: + + * :py:class:`llnl.util.filesystem.FileList`, + * :py:class:`llnl.util.filesystem.HeaderList`, + * :py:class:`llnl.util.filesystem.LibraryList`. + + .. tip:: + *Do not* use constructs like ``.prefix.include`` or ``.prefix.lib``, with + Intel or any other implementation of ``blas``, ``lapack``, and + ``scalapack``. + + For example, for an + :ref:`AutotoolsPackage ` + use ``.libs.ld_flags`` to transform the library file list into linker options + passed to ``./configure``: + + .. code-block:: python + + def configure_args(self): + args = [] + ... + args.append('--with-blas=%s' % self.spec['blas'].libs.ld_flags) + args.append('--with-lapack=%s' % self.spec['lapack'].libs.ld_flags) + ... + + .. tip:: + Even though ``.ld_flags`` will return a string of multiple words, *do not* + use quotes for options like ``--with-blas=...`` because Spack passes them + to ``./configure`` without invoking a shell. + + Likewise, in a + :ref:`MakefilePackage ` + or similiar package that does not use AutoTools you may need to provide include + and link options for use on command lines or in environment variables. + For example, to generate an option string of the form ``-I``, use: + + .. code-block:: python + + self.spec['blas'].headers.include_flags + + and to generate linker options (``-L -llibname ...``), use the same as above, + + .. code-block:: python + + self.spec['blas'].libs.ld_flags + + See + :ref:`MakefilePackage ` + and more generally the + :ref:`Packaging Guide ` + for background and further examples. + + +^^^^^^^^^^ +Footnotes +^^^^^^^^^^ + +.. [fn1] Strictly speaking, versions from ``2017.2`` onward. + +.. [fn2] The package ``intel`` intentionally does not have a ``+mpi`` variant since + it is meant to be small. The native installer will always add MPI *runtime* + components because it follows defaults defined in the download package, even + when ``intel-parallel-studio ~mpi`` has been requested. + + For ``intel-parallel-studio +mpi``, the class function + :py:func:``.IntelPackage.pset_components`` + will include ``"intel-mpi intel-imb"`` in a list of component patterns passed + to the Intel installer. The installer will extend each pattern word with an + implied glob-like ``*`` to resolve it to package names that are + *actually present in the product BOM*. + As a side effect, this pattern approach accommodates occasional package name + changes, e.g., capturing both ``intel-mpirt`` and ``intel-mpi-rt`` . + +.. [fn3] How could the external installation have succeeded otherwise? + +.. [fn4] According to Intel's documentation, there is supposedly a way to install a + product using a network license even `when a FLEXlm server is not running + `_: + Specify the license in the form ``port@serverhost`` in the + ``INTEL_LICENSE_FILE`` environment variable. All other means of specifying a + network license require that the license server be up. + +.. [fn5] Despite the name, ``INTEL_LICENSE_FILE`` can hold several and diverse entries. + They can be either directories (presumed to contain ``*.lic`` files), file + names, or network locations in the form ``port@host`` (on Linux and Mac), + with all items separated by ":" (on Linux and Mac). + +.. [fn6] Should said editor turn out to be ``vi``, you better be in a position + to know how to use it. + +.. [fn7] Comment lines in FLEXlm files, indicated by ``#`` as the first + non-whitespace character on the line, are generally allowed anywhere in the file. + There `have been reports `_, + however, that as of 2018, ``SERVER`` and ``USE_SERVER`` lines must precede + any comment lines. + +.. + .. [fnX] The name component ``intel`` of the compiler spec is separate from (in + a different namespace than) the names of the Spack packages + ``intel-parallel-studio`` and ``intel``. Both of the latter provide the former. + +.. [fn8] Spack's close coupling of installed packages to compilers, which both + necessitates the detour for installing ``intel-parallel-studio``, and + largely limits any of its provided virtual packages to a single compiler, heavily + favors `recommending to install Intel Parallel Studio outside of Spack + `_ and declare it for Spack in ``packages.yaml`` + by a `compiler-less spec `_. + +.. [fn9] With some effort, you can convince Spack to use shorter paths. + + .. warning:: Altering the naming scheme means that Spack will lose track of + all packages it has installed for you so far. + That said, the time is right for this kind of customization + when you are defining a new set of compilers. + + The relevant tunables are: + + 1. Set the ``install_tree`` location in ``config.yaml`` + (:ref:`see doc `). + 2. Set the hash length in ``install-path-scheme``, also in ``config.yaml`` + (:ref:`q.v. `). + 3. You will want to set the *same* hash length for + :ref:`tcl module files ` + if you have Spack produce them for you, under ``naming_scheme`` in + ``modules.yaml``. Other module dialects cannot be altered in this manner. diff --git a/lib/spack/docs/getting_started.rst b/lib/spack/docs/getting_started.rst index 1ea3c1a0e9..aaaeb9dec7 100644 --- a/lib/spack/docs/getting_started.rst +++ b/lib/spack/docs/getting_started.rst @@ -484,6 +484,9 @@ simple package. For example: $ spack install zlib%gcc@5.3.0 + +.. _vendor-specific-compiler-configuration: + -------------------------------------- Vendor-Specific Compiler Configuration -------------------------------------- diff --git a/lib/spack/docs/module_file_support.rst b/lib/spack/docs/module_file_support.rst index 41e1245d9a..e699f4244a 100644 --- a/lib/spack/docs/module_file_support.rst +++ b/lib/spack/docs/module_file_support.rst @@ -479,6 +479,9 @@ you will prevent the generation of module files for any package that is compiled with ``gcc@4.4.7``, with the only exception of any ``gcc`` or any ``llvm`` installation. + +.. _modules-naming-scheme: + """"""""""""""""""""""""""" Customize the naming scheme """"""""""""""""""""""""""" diff --git a/lib/spack/docs/packaging_guide.rst b/lib/spack/docs/packaging_guide.rst index 12abcfd7ea..683bb01503 100644 --- a/lib/spack/docs/packaging_guide.rst +++ b/lib/spack/docs/packaging_guide.rst @@ -2759,6 +2759,8 @@ is handy when a package supports additional variants like variant('openmp', default=True, description="Enable OpenMP support.") +.. _blas_lapack_scalapack: + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Blas, Lapack and ScaLapack libraries ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/lib/spack/docs/tutorial_configuration.rst b/lib/spack/docs/tutorial_configuration.rst index f185b8b722..2e97eab590 100644 --- a/lib/spack/docs/tutorial_configuration.rst +++ b/lib/spack/docs/tutorial_configuration.rst @@ -325,6 +325,8 @@ license server, you can set this in ``compilers.yaml`` as follows: ... +.. _configs-tutorial-package-prefs: + ------------------------------- Configuring Package Preferences ------------------------------- diff --git a/lib/spack/spack/build_systems/README-intel.rst b/lib/spack/spack/build_systems/README-intel.rst new file mode 100644 index 0000000000..6efbd09dd4 --- /dev/null +++ b/lib/spack/spack/build_systems/README-intel.rst @@ -0,0 +1,660 @@ +==================================== +Development Notes on Intel Packages +==================================== + +These are notes for concepts and development of +lib/spack/spack/build_systems/intel.py . + +For documentation on how to *use* ``IntelPackage``, see +lib/spack/docs/build_systems/intelpackage.rst . + +------------------------------------------------------------------------------- +Installation and path handling as implemented in ./intel.py +------------------------------------------------------------------------------- + + +*************************************************************************** +Prefix differences between Spack-external and Spack-internal installations +*************************************************************************** + + +Problem summary +~~~~~~~~~~~~~~~~ + +For Intel packages that were installed external to Spack, ``self.prefix`` will +be a *component-specific* path (e.g. to an MKL-specific dir hierarchy), whereas +for a package installed by Spack itself, ``self.prefix`` will be a +*vendor-level* path that holds one or more components (or parts thereof), and +must be further qualified down to a particular desired component. + +It is possible that a similar conceptual difference is inherent to other +package families that use a common vendor-style installer. + + +Description +~~~~~~~~~~~~ + +Spack makes packages available through two routes, let's call them A and B: + +A. Packages pre-installed external to Spack and configured *for* Spack +B. Packages built and installed *by* Spack. + +For a user who is interested in building end-user applications, it should not +matter through which route any of its dependent packages has been installed. +Most packages natively support a ``prefix`` concept which unifies the two +routes just fine. + +Intel packages, however, are more complicated because they consist of a number +of components that are released as a suite of varying extent, like "Intel +Parallel Studio *Foo* Edition", or subsetted into products like "MKL" or "MPI", +each of which also contain libraries from other components like the compiler +runtime and multithreading libraries. For this reason, an Intel package is +"anchored" during installation at a directory level higher than just the +user-facing directory that has the conventional hierarchy of ``bin``, ``lib``, +and others relevant for the end-product. + +As a result, internal to Spack, there is a conceptual difference in what +``self.prefix`` represents for the two routes. + +For route A, consider MKL installed outside of Spack. It will likely be one +product component among other products, at one particular release among others +that are installed in sibling or cousin directories on the local system. +Therefore, the path given to Spack in ``packages.yaml`` should be a +*product-specific and fully version-specific* directory. E.g., for an +``intel-mkl`` package, ``self.prefix`` should look like:: + + /opt/intel/compilers_and_libraries_2018.1.163/linux/mkl + +In this route, the interaction point with the user is encapsulated in an +environment variable which will be (in pseudo-code):: + + MKLROOT := {self.prefix} + +For route B, a Spack-based installation of MKL will be placed in the directory +given to the ``./install.sh`` script of Intel's package distribution. This +directory is taken to be the *vendor*-specific anchor directory, playing the +same role as the default ``/opt/intel``. In this case, ``self.prefix`` will +be:: + + $SPACK_ROOT/opt/spack/linux-centos6-x86_64/gcc-4.9.3/intel-mkl-2018.1.163- + +However, now the environment variable will have to be constructed as *several +directory levels down*:: + + MKLROOT := {self.prefix}/compilers_and_libraries_2018.1.163/linux/mkl + +A recent post on the Spack mailing list illustrates the confusion when route A +was taken while route B was the only one that was coded in Spack: +https://groups.google.com/d/msg/spack/x28qlmqPAys/Ewx6220uAgAJ + + +Solution +~~~~~~~~~ + +Introduce a series of functions which will return the appropriate +directories, regardless of whether the Intel package has been installed +external or internal to Spack: + +========================== ================================================== +Function Example return values +-------------------------- -------------------------------------------------- +normalize_suite_dir() Spack-external installation: + /opt/intel/compilers_and_libraries_2018.1.163 + Spack-internal installation: + $SPACK_ROOT/.../compilers_and_libraries_2018.1.163 +-------------------------- -------------------------------------------------- +normalize_path('mkl') /linux/mkl +component_bin_dir() /linux/mkl/bin +component_lib_dir() /linux/mkl/lib/intel64 +-------------------------- -------------------------------------------------- +normalize_path('mpi') /linux/mpi +component_bin_dir('mpi') /linux/mpi/intel64/bin +component_lib_dir('mpi') /linux/mpi/intel64/lib +========================== ================================================== + + +********************************* +Analysis of directory layouts +********************************* + +Let's look at some sample directory layouts, using ``ls -lF``, +but focusing on names and symlinks only. + +Spack-born installation of ``intel-mkl@2018.1.163`` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +:: + + $ ls -l + + bin/ + - compilervars.*sh (symlinked) ONLY + + compilers_and_libraries -> compilers_and_libraries_2018 + - generically-named entry point, stable across versions (one hopes) + + compilers_and_libraries_2018/ + - vaguely-versioned dirname, holding a stub hierarchy --ignorable + + $ ls -l compilers_and_libraries_2018/linux/ + bin - actual compilervars.*sh (reg. files) ONLY + documentation -> ../../documentation_2018/ + lib -> ../../compilers_and_libraries_2018.1.163/linux/compiler/lib/ + mkl -> ../../compilers_and_libraries_2018.1.163/linux/mkl/ + pkg_bin -> ../../compilers_and_libraries_2018.1.163/linux/bin/ + samples -> ../../samples_2018/ + tbb -> ../../compilers_and_libraries_2018.1.163/linux/tbb/ + + compilers_and_libraries_2018.1.163/ + - Main "product" + a minimal set of libs from related products + + $ ls -l compilers_and_libraries_2018.1.163/linux/ + bin/ - compilervars.*sh, link_install*sh ONLY + mkl/ - Main Product ==> to be assigned to MKLROOT + compiler/ - lib/intel64_lin/libiomp5* ONLY + tbb/ - tbb/lib/intel64_lin/gcc4.[147]/libtbb*.so* ONLY + + parallel_studio_xe_2018 -> parallel_studio_xe_2018.1.038/ + parallel_studio_xe_2018.1.038/ + - Alternate product packaging - ignorable + + $ ls -l parallel_studio_xe_2018.1.038/ + bin/ - actual psxevars.*sh (reg. files) + compilers_and_libraries_2018 -> /comp...aries_2018.1.163 + documentation_2018 -> /documentation_2018 + samples_2018 -> /samples_2018 + ... + + documentation_2018/ + samples_2018/ + lib -> compilers_and_libraries/linux/lib/ + mkl -> compilers_and_libraries/linux/mkl/ + tbb -> compilers_and_libraries/linux/tbb/ + - auxiliaries and convenience links + +Spack-external installation of Intel-MPI 2018 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +For MPI, the layout is slightly different than MKL. The prefix will have to +include an architecture directory (typically ``intel64``), which then contains +bin/, lib/, ..., all without further architecture branching. The environment +variable ``I_MPI_ROOT`` from the API documentation, however, must be the +package's top directory, not including the architecture. + +FIXME: For MANPATH, need the parent dir. + +:: + + $ ls -lF /opt/intel/compilers_and_libraries_2018.1.163/linux/mpi/ + bin64 -> intel64/bin/ + etc64 -> intel64/etc/ + include64 -> intel64/include/ + lib64 -> intel64/lib/ + + benchmarks/ + binding/ + intel64/ + man/ + test/ + +The package contains an MPI-2019 preview; Curiously, its release notes contain +the tag: "File structure clean-up." I could not find further documentation on +this, however, so it is unclear what, if any, changes will make it to release. + +https://software.intel.com/en-us/articles/restoring-legacy-path-structure-on-intel-mpi-library-2019 + +:: + + $ ls -lF /opt/intel/compilers_and_libraries_2018.1.163/linux/mpi_2019/ + binding/ + doc/ + imb/ + intel64/ + man/ + test/ + +Spack-external installation of Intel Parallel Studio 2018 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +This is the main product bundle that I actually downloaded and installed on my +system. Its nominal installation directory mostly holds merely symlinks +to components installed in sibling dirs:: + + $ ls -lF /opt/intel/parallel_studio_xe_2018.1.038/ + advisor_2018 -> /opt/intel/advisor_2018/ + clck_2018 -> /opt/intel/clck/2018.1/ + compilers_and_libraries_2018 -> /opt/intel/comp....aries_2018.1.163/ + documentation_2018 -> /opt/intel/documentation_2018/ + ide_support_2018 -> /opt/intel/ide_support_2018/ + inspector_2018 -> /opt/intel/inspector_2018/ + itac_2018 -> /opt/intel/itac/2018.1.017/ + man -> /opt/intel/man/ + samples_2018 -> /opt/intel/samples_2018/ + vtune_amplifier_2018 -> /opt/intel/vtune_amplifier_2018/ + + psxevars.csh -> ./bin/psxevars.csh* + psxevars.sh -> ./bin/psxevars.sh* + bin/ - *vars.*sh scripts + sshconnectivity.exp ONLY + + licensing/ + uninstall* + +The only relevant regular files are ``*vars.*sh``, but those also just churn +through the subordinate vars files of the components. + +Installation model +~~~~~~~~~~~~~~~~~~~~ + +Intel packages come with an ``install.sh`` script that is normally run +interactively (in either text or GUI mode) but can run unattended with a +``--silent `` option, which is of course what Spack uses. + +Format of configuration file +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The configuration file is conventionally called ``silent.cfg`` and has a simple +``token=value`` syntax. Before using the configuration file, the installer +calls ``/pset/check.awk`` to validate it. Example paths to the +validator are:: + + .../l_mkl_2018.1.163/pset/check.awk . + .../parallel_studio_xe_2018_update1_cluster_edition/pset/check.awk + +The tokens that are accepted in the configuration file vary between packages. +Tokens not supported for a given package **will cause the installer to stop +and fail.** This is particularly relevant for license-related tokens, which are +accepted only for packages that actually require a license. + +Reference: [Intel's documentation](https://software.intel.com/en-us/articles/configuration-file-format) + +See also: https://software.intel.com/en-us/articles/silent-installation-guide-for-intel-parallel-studio-xe-composer-edition-for-os-x + +The following is from ``.../parallel_studio_xe_2018_update1_cluster_edition/pset/check.awk``: + +* Tokens valid for all packages encountered:: + + ACCEPT_EULA {accept, decline} + CONTINUE_WITH_OPTIONAL_ERROR {yes, no} + PSET_INSTALL_DIR {/opt/intel, , filepat} + CONTINUE_WITH_INSTALLDIR_OVERWRITE {yes, no} + COMPONENTS {ALL, DEFAULTS, , anythingpat} + PSET_MODE {install, repair, uninstall} + NONRPM_DB_DIR {, filepat} + + SIGNING_ENABLED {yes, no} + ARCH_SELECTED {IA32, INTEL64, ALL} + +* Mentioned but unexplained in ``check.awk``:: + + NO_VALIDATE (?!) + +* Only for licensed packages:: + + ACTIVATION_SERIAL_NUMBER {, snpat} + ACTIVATION_LICENSE_FILE {, lspat, filepat} + ACTIVATION_TYPE {exist_lic, license_server, + license_file, trial_lic, + + PHONEHOME_SEND_USAGE_DATA {yes, no} + serial_number} + +* Only for Amplifier (obviously):: + + AMPLIFIER_SAMPLING_DRIVER_INSTALL_TYPE {build, kit} + AMPLIFIER_DRIVER_ACCESS_GROUP {, anythingpat, vtune} + AMPLIFIER_DRIVER_PERMISSIONS {, anythingpat, 666} + AMPLIFIER_LOAD_DRIVER {yes, no} + AMPLIFIER_C_COMPILER {, filepat, auto, none} + AMPLIFIER_KERNEL_SRC_DIR {, filepat, auto, none} + AMPLIFIER_MAKE_COMMAND {, filepat, auto, none} + AMPLIFIER_INSTALL_BOOT_SCRIPT {yes, no} + AMPLIFIER_DRIVER_PER_USER_MODE {yes, no} + +* Only for MKL and Studio:: + + CLUSTER_INSTALL_REMOTE {yes, no} + CLUSTER_INSTALL_TEMP {, filepat} + CLUSTER_INSTALL_MACHINES_FILE {, filepat} + +* "backward compatibility" (?):: + + INSTALL_MODE {RPM, NONRPM} + download_only {yes} + download_dir {, filepat} + + +Details for licensing tokens +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Quoted from +https://software.intel.com/en-us/articles/configuration-file-format, +for reference: + +[ed. note: As of 2018-05, the page incorrectly references ``ACTIVATION``, which +was used only until about 2012; this is corrected to ``ACTIVATION_TYPE`` here.] + + ... + + ``ACTIVATION_TYPE=exist_lic`` + This directive tells the install program to look for an existing + license during the install process. This is the preferred method for + silent installs. Take the time to register your serial number and get + a license file (see below). Having a license file on the system + simplifies the process. In addition, as an administrator it is good + practice to know WHERE your licenses are saved on your system. + License files are plain text files with a .lic extension. By default + these are saved in /opt/intel/licenses which is searched by default. + If you save your license elsewhere, perhaps under an NFS folder, set + environment variable **INTEL_LICENSE_FILE** to the full path to your + license file prior to starting the installation or use the + configuration file directive ``ACTIVATION_LICENSE_FILE`` to specify the + full pathname to the license file. + + Options for ``ACTIVATION_TYPE`` are ``{ exist_lic, license_file, server_lic, + serial_number, trial_lic }`` + + ``exist_lic`` + directs the installer to search for a valid license on the server. + Searches will utilize the environment variable **INTEL_LICENSE_FILE**, + search the default license directory /opt/intel/licenses, or use the + ``ACTIVATION_LICENSE_FILE`` directive to find a valid license file. + + ``license_file`` + is similar to exist_lic but directs the installer to use + ``ACTIVATION_LICENSE_FILE`` to find the license file. + + ``server_lic`` + is similar to exist_lic and exist_lic but directs the installer that + this is a client installation and a floating license server will be + contacted to active the product. This option will contact your + floating license server on your network to retrieve the license + information. BEFORE using this option make sure your client is + correctly set up for your network including all networking, routing, + name service, and firewall configuration. Insure that your client has + direct access to your floating license server and that firewalls are + set up to allow TCP/IP access for the 2 license server ports. + server_lic will use **INTEL_LICENSE_FILE** containing a port@host format + OR a client license file. The formats for these are described here + https://software.intel.com/en-us/articles/licensing-setting-up-the-client-floating-license + + ``serial_number`` + directs the installer to use directive ``ACTIVATION_SERIAL_NUMBER`` for + activation. This method will require the installer to contact an + external Intel activation server over the Internet to confirm your + serial number. Due to user and company firewalls, this method is more + complex and hence error prone of the available activation methods. We + highly recommend using a license file or license server for activation + instead. + + ``trial_lic`` + is used only if you do not have an existing license and intend to + temporarily evaluate the compiler. This method creates a temporary + trial license in Trusted Storage on your system. + + ... + +******************* +vars files +******************* + +Intel's product packages contain a number of shell initialization files let's call them vars files. + +There are three kinds: + +#. Component-specific vars files, such as `mklvars` or `tbbvars`. +#. Toplevel vars files such as "psxevars". They will scan for all + component-specific vars files associated with the product, and source them + if found. +#. Symbolic links to either of them. Links may appear under a different name + for backward compatibility. + +At present, IntelPackage class is only concerned with the toplevel vars files, +generally found in the product's toplevel bin/ directory. + +For reference, here is an overview of the names and locations of the vars files +in the 2018 product releases, as seen for Spack-native installation. NB: May be +incomplete as some components may have been omitted during installation. + +Names of vars files seen:: + + $ cd opt/spack/linux-centos6-x86_64 + $ find intel* -name \*vars.sh -printf '%f\n' | sort -u | nl + 1 advixe-vars.sh + 2 amplxe-vars.sh + 3 apsvars.sh + 4 compilervars.sh + 5 daalvars.sh + 6 debuggervars.sh + 7 iccvars.sh + 8 ifortvars.sh + 9 inspxe-vars.sh + 10 ippvars.sh + 11 mklvars.sh + 12 mpivars.sh + 13 pstlvars.sh + 14 psxevars.sh + 15 sep_vars.sh + 16 tbbvars.sh + +Names and locations of vars files, sorted by Spack package name:: + + $ cd opt/spack/linux-centos6-x86_64 + $ find intel* -name \*vars.sh -printf '%y\t%-15f\t%h\n' \ + | cut -d/ -f1,4- \ + | sed '/iccvars\|ifortvars/d; s,/,\t\t,; s,\.sh,,; s, */\(intel[/-]\),\1,' \ + | sort -k3,3 -k2,2 \ + | nl \ + | awk '{printf "%6i %-2s %-16s %-24s %s\n", $1, $2, $3, $4, $5}' + + -------------------------------------------------------------------------------------------------------- + item no. + file or link + name of vars file + Spack package name + dir relative to Spack install dir + -------------------------------------------------------------------------------------------------------- + + 1 f mpivars intel compilers_and_libraries_2018.1.163/linux/mpi/intel64/bin + 2 f mpivars intel compilers_and_libraries_2018.1.163/linux/mpirt/bin/ia32_lin + 3 f tbbvars intel compilers_and_libraries_2018.1.163/linux/tbb/bin + 4 f pstlvars intel compilers_and_libraries_2018.1.163/linux/pstl/bin + 5 f compilervars intel compilers_and_libraries_2018.1.163/linux/bin + 6 f compilervars intel compilers_and_libraries_2018/linux/bin + 7 l compilervars intel bin + 8 f daalvars intel-daal compilers_and_libraries_2018.2.199/linux/daal/bin + 9 f psxevars intel-daal parallel_studio_xe_2018.2.046/bin + 10 l psxevars intel-daal parallel_studio_xe_2018.2.046 + 11 f compilervars intel-daal compilers_and_libraries_2018.2.199/linux/bin + 12 f compilervars intel-daal compilers_and_libraries_2018/linux/bin + 13 l compilervars intel-daal bin + 14 f ippvars intel-ipp compilers_and_libraries_2018.2.199/linux/ipp/bin + 15 f psxevars intel-ipp parallel_studio_xe_2018.2.046/bin + 16 l psxevars intel-ipp parallel_studio_xe_2018.2.046 + 17 f compilervars intel-ipp compilers_and_libraries_2018.2.199/linux/bin + 18 f compilervars intel-ipp compilers_and_libraries_2018/linux/bin + 19 l compilervars intel-ipp bin + 20 f mklvars intel-mkl compilers_and_libraries_2018.2.199/linux/mkl/bin + 21 f psxevars intel-mkl parallel_studio_xe_2018.2.046/bin + 22 l psxevars intel-mkl parallel_studio_xe_2018.2.046 + 23 f compilervars intel-mkl compilers_and_libraries_2018.2.199/linux/bin + 24 f compilervars intel-mkl compilers_and_libraries_2018/linux/bin + 25 l compilervars intel-mkl bin + 26 f mpivars intel-mpi compilers_and_libraries_2018.2.199/linux/mpi_2019/intel64/bin + 27 f mpivars intel-mpi compilers_and_libraries_2018.2.199/linux/mpi/intel64/bin + 28 f psxevars intel-mpi parallel_studio_xe_2018.2.046/bin + 29 l psxevars intel-mpi parallel_studio_xe_2018.2.046 + 30 f compilervars intel-mpi compilers_and_libraries_2018.2.199/linux/bin + 31 f compilervars intel-mpi compilers_and_libraries_2018/linux/bin + 32 l compilervars intel-mpi bin + 33 f apsvars intel-parallel-studio vtune_amplifier_2018.1.0.535340 + 34 l apsvars intel-parallel-studio performance_snapshots_2018.1.0.535340 + 35 f ippvars intel-parallel-studio compilers_and_libraries_2018.1.163/linux/ipp/bin + 36 f ippvars intel-parallel-studio composer_xe_2015.6.233/ipp/bin + 37 f mklvars intel-parallel-studio compilers_and_libraries_2018.1.163/linux/mkl/bin + 38 f mklvars intel-parallel-studio composer_xe_2015.6.233/mkl/bin + 39 f mpivars intel-parallel-studio compilers_and_libraries_2018.1.163/linux/mpi/intel64/bin + 40 f mpivars intel-parallel-studio compilers_and_libraries_2018.1.163/linux/mpirt/bin/ia32_lin + 41 f tbbvars intel-parallel-studio compilers_and_libraries_2018.1.163/linux/tbb/bin + 42 f tbbvars intel-parallel-studio composer_xe_2015.6.233/tbb/bin + 43 f daalvars intel-parallel-studio compilers_and_libraries_2018.1.163/linux/daal/bin + 44 f pstlvars intel-parallel-studio compilers_and_libraries_2018.1.163/linux/pstl/bin + 45 f psxevars intel-parallel-studio parallel_studio_xe_2018.1.038/bin + 46 l psxevars intel-parallel-studio parallel_studio_xe_2018.1.038 + 47 f sep_vars intel-parallel-studio vtune_amplifier_2018.1.0.535340 + 48 f sep_vars intel-parallel-studio vtune_amplifier_2018.1.0.535340/target/android_v4.1_x86_64 + 49 f advixe-vars intel-parallel-studio advisor_2018.1.1.535164 + 50 f amplxe-vars intel-parallel-studio vtune_amplifier_2018.1.0.535340 + 51 f inspxe-vars intel-parallel-studio inspector_2018.1.1.535159 + 52 f compilervars intel-parallel-studio compilers_and_libraries_2018.1.163/linux/bin + 53 f compilervars intel-parallel-studio compilers_and_libraries_2018/linux/bin + 54 l compilervars intel-parallel-studio bin + 55 f debuggervars intel-parallel-studio debugger_2018/bin + + +******************** +MPI linkage +******************** + + +Library selection +~~~~~~~~~~~~~~~~~~~~~ + +In the Spack code so far, the library selections for MPI are: + +:: + + libnames = ['libmpifort', 'libmpi'] + if 'cxx' in self.spec.last_query.extra_parameters: + libnames = ['libmpicxx'] + libnames + return find_libraries(libnames, + root=self.component_lib_dir('mpi'), + shared=True, recursive=False) + +The problem is that there are multiple library versions under ``component_lib_dir``:: + + $ cd $I_MPI_ROOT + $ find . -name libmpi.so | sort + ./intel64/lib/debug/libmpi.so + ./intel64/lib/debug_mt/libmpi.so + ./intel64/lib/libmpi.so + ./intel64/lib/release/libmpi.so + ./intel64/lib/release_mt/libmpi.so + +"mt" refers to multi-threading, not in the explicit sense but in the sense of being thread-safe:: + + $ mpiifort -help | grep mt + -mt_mpi link the thread safe version of the Intel(R) MPI Library + +Well, why should we not inspect what the canonical script does? The wrapper +has its own hardcoded "prefix=..." and can thus tell us what it will do, from a +*wiped environment* no less!:: + + $ env - intel64/bin/mpiicc -show hello.c | ld-unwrap-args + icc 'hello.c' \ + -I/opt/intel/compilers_and_libraries_2018.1.163/linux/mpi/intel64/include \ + -L/opt/intel/compilers_and_libraries_2018.1.163/linux/mpi/intel64/lib/release_mt \ + -L/opt/intel/compilers_and_libraries_2018.1.163/linux/mpi/intel64/lib \ + -Xlinker --enable-new-dtags \ + -Xlinker -rpath=/opt/intel/compilers_and_libraries_2018.1.163/linux/mpi/intel64/lib/release_mt \ + -Xlinker -rpath=/opt/intel/compilers_and_libraries_2018.1.163/linux/mpi/intel64/lib \ + -Xlinker -rpath=/opt/intel/mpi-rt/2017.0.0/intel64/lib/release_mt \ + -Xlinker -rpath=/opt/intel/mpi-rt/2017.0.0/intel64/lib \ + -lmpifort \ + -lmpi \ + -lmpigi \ + -ldl \ + -lrt \ + -lpthread + + +MPI Wrapper options +~~~~~~~~~~~~~~~~~~~~~ + +For reference, here's the wrapper's builtin help output:: + + $ mpiifort -help + Simple script to compile and/or link MPI programs. + Usage: mpiifort [options] + ---------------------------------------------------------------------------- + The following options are supported: + -fc= | -f90= + specify a FORTRAN compiler name: i.e. -fc=ifort + -echo print the scripts during their execution + -show show command lines without real calling + -config= specify a configuration file: i.e. -config=ifort for mpif90-ifort.conf file + -v print version info of mpiifort and its native compiler + -profile= specify a profile configuration file (an MPI profiling + library): i.e. -profile=myprofile for the myprofile.cfg file. + As a special case, lib.so or lib.a may be used + if the library is found + -check_mpi link against the Intel(R) Trace Collector (-profile=vtmc). + -static_mpi link the Intel(R) MPI Library statically + -mt_mpi link the thread safe version of the Intel(R) MPI Library + -ilp64 link the ILP64 support of the Intel(R) MPI Library + -no_ilp64 disable ILP64 support explicitly + -fast the same as -static_mpi + pass -fast option to a compiler. + -t or -trace + link against the Intel(R) Trace Collector + -trace-imbalance + link against the Intel(R) Trace Collector imbalance library + (-profile=vtim) + -dynamic_log link against the Intel(R) Trace Collector dynamically + -static use static linkage method + -nostrip turn off the debug information stripping during static linking + -O enable optimization + -link_mpi= + link against the specified version of the Intel(R) MPI Library + All other options will be passed to the compiler without changing. + ---------------------------------------------------------------------------- + The following environment variables are used: + I_MPI_ROOT the Intel(R) MPI Library installation directory path + I_MPI_F90 or MPICH_F90 + the path/name of the underlying compiler to be used + I_MPI_FC_PROFILE or I_MPI_F90_PROFILE or MPIF90_PROFILE + the name of profile file (without extension) + I_MPI_COMPILER_CONFIG_DIR + the folder which contains configuration files *.conf + I_MPI_TRACE_PROFILE + specify a default profile for the -trace option + I_MPI_CHECK_PROFILE + specify a default profile for the -check_mpi option + I_MPI_CHECK_COMPILER + enable compiler setup checks + I_MPI_LINK specify the version of the Intel(R) MPI Library + I_MPI_DEBUG_INFO_STRIP + turn on/off the debug information stripping during static linking + I_MPI_FCFLAGS + special flags needed for compilation + I_MPI_LDFLAGS + special flags needed for linking + ---------------------------------------------------------------------------- + + +Side Note: MPI version divergence in 2015 release +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The package `intel-parallel-studio@cluster.2015.6` contains both a full MPI +development version in `$prefix/impi` and an MPI Runtime under the +`composer_xe*` suite directory. Curiously, these have *different versions*, +with a release date nearly 1 year apart:: + + $ $SPACK_ROOT/...uaxaw7/impi/5.0.3.049/intel64/bin/mpiexec --version + Intel(R) MPI Library for Linux* OS, Version 5.0 Update 3 Build 20150804 (build id: 12452) + Copyright (C) 2003-2015, Intel Corporation. All rights reserved. + + $ $SPACK_ROOT/...uaxaw7/composer_xe_2015.6.233/mpirt/bin/intel64/mpiexec --version + Intel(R) MPI Library for Linux* OS, Version 5.0 Update 1 Build 20140709 + Copyright (C) 2003-2014, Intel Corporation. All rights reserved. + +I'm not sure what to make of it. + + +************** +macOS support +************** + +- On macOS, the Spack methods here only include support to integrate an + externally installed MKL. + +- URLs in child packages will be Linux-specific; macOS download packages + are located in differently numbered dirs and are named m_*.dmg. diff --git a/lib/spack/spack/build_systems/intel.py b/lib/spack/spack/build_systems/intel.py index 3a67da7e09..0c5707a8ef 100644 --- a/lib/spack/spack/build_systems/intel.py +++ b/lib/spack/spack/build_systems/intel.py @@ -24,22 +24,79 @@ ############################################################################## import os +import sys +import glob +import tempfile +import re +import inspect import xml.etree.ElementTree as ET +import llnl.util.tty as tty -from llnl.util.filesystem import install -from spack.package import PackageBase, run_after +from llnl.util.filesystem import \ + install, ancestor, filter_file, \ + HeaderList, find_headers, \ + LibraryList, find_libraries, find_system_libraries + +from spack.version import Version, ver +from spack.package import PackageBase, run_after, InstallError from spack.util.executable import Executable +from spack.util.prefix import Prefix +from spack.build_environment import dso_suffix +from spack.environment import EnvironmentModifications + + +# A couple of utility functions that might be useful in general. If so, they +# should really be defined elsewhere, unless deemed heretical. +# (Or na"ive on my part). + +def debug_print(msg, *args): + '''Prints a message (usu. a variable) and the callers' names for a couple + of stack frames. + ''' + # https://docs.python.org/2/library/inspect.html#the-interpreter-stack + stack = inspect.stack() + _func_name = 3 + tty.debug("%s.%s:\t%s" % (stack[2][_func_name], stack[1][_func_name], msg), + *args) + + +def raise_lib_error(*args): + '''Bails out with an error message. Shows args after the first as one per + line, tab-indented, useful for long paths to line up and stand out. + ''' + raise InstallError("\n\t".join(str(i) for i in args)) + +def _expand_fields(s): + '''[Experimental] Expand arch-related fields in a string, typically a + filename. -def _valid_components(): - """A generator that yields valid components.""" + Supported fields and their typical expansions are:: - tree = ET.parse('pset/mediaconfig.xml') - root = tree.getroot() + {platform} linux, mac + {arch} intel64 (including on Mac) + {libarch} intel64, empty on Mac + {bits} 64 - components = root.findall('.//Abbr') - for component in components: - yield component.text + ''' + # Python-native string formatting requires arg list counts to match the + # replacement field count; optional fields are far easier with regexes. + + _bits = '64' + _arch = 'intel64' # TBD: ia32 + + if 'linux' in sys.platform: # NB: linux2 vs. linux + s = re.sub('{platform}', 'linux', s) + s = re.sub('{libarch}', _arch, s) + elif 'darwin' in sys.platform: + s = re.sub('{platform}', 'mac', s) + s = re.sub('{libarch}', '', s) # no arch dirs are used (as of 2018) + # elif 'win' in sys.platform: # TBD + # s = re.sub('{platform}', 'windows', s) + + s = re.sub('{arch}', _arch, s) + s = re.sub('{bits}', _bits, s) + return s class IntelPackage(PackageBase): @@ -51,7 +108,7 @@ class IntelPackage(PackageBase): 2. :py:meth:`~.IntelPackage.install` They both have sensible defaults and for many packages the - only thing necessary will be to override ``setup_environment`` + only thing necessary will be to override setup_environment to set the appropriate environment variables. """ #: Phases of an Intel package @@ -61,15 +118,31 @@ class IntelPackage(PackageBase): #: system base class build_system_class = 'IntelPackage' - #: By default, we assume that all Intel software requires a license. - #: This can be overridden for packages that do not require a license. - license_required = True + #: A dict that maps Spack version specs to release years, needed to infer + #: the installation directory layout for pre-2016 versions in the family of + #: Intel packages. + # + # Like any property, it can be overridden in client packages, should older + # versions ever be added there. The initial dict here contains the + # packages defined in Spack as of 2018-04. Keys could conceivably overlap + # but preferably should not - only the first key in hash traversal order + # that satisfies self.spec will be used. + version_years = { + # intel-daal is versioned 2016 and later, no divining is needed + 'intel-ipp@9.0:9.99': 2016, + 'intel-mkl@11.3.0:11.3.999': 2016, + 'intel-mpi@5.1:5.99': 2016, + } - #: Comment symbol used in the ``license.lic`` file - license_comment = '#' + @property + def license_required(self): + # The Intel libraries are provided without requiring a license as of + # version 2017.2. Trying to specify one anyway will fail. See: + # https://software.intel.com/en-us/articles/free-ipsxe-tools-and-libraries + return self._has_compilers or self.version < ver('2017.2') - #: Location where Intel searches for a license file - license_files = ['Licenses/license.lic'] + #: Comment symbol used in the license.lic file + license_comment = '#' #: Environment variables that Intel searches for a license file license_vars = ['INTEL_LICENSE_FILE'] @@ -77,116 +150,1115 @@ class IntelPackage(PackageBase): #: URL providing information on how to acquire a license key license_url = 'https://software.intel.com/en-us/articles/intel-license-manager-faq' - #: Components of the package to install. - #: By default, install 'ALL' components. - components = ['ALL'] + #: Location where Intel searches for a license file + @property + def license_files(self): + dirs = ['Licenses'] + + if self._has_compilers: + dirs.append(self.component_bin_dir('compiler')) + for variant, component_suite_dir in { + '+advisor': 'advisor', + '+inspector': 'inspector', + '+itac': 'itac', + '+vtune': 'vtune_amplifier', + }.items(): + if variant in self.spec: + dirs.append(self.normalize_path( + 'licenses', component_suite_dir, relative=True)) + + files = [os.path.join(d, 'license.lic') for d in dirs] + return files + + #: Components to install (list of name patterns from pset/mediaconfig.xml) + # NB: Renamed from plain components() for coding and maintainability. @property - def _filtered_components(self): - """Returns a list or set of valid components that match - the requested components from ``components``.""" + def pset_components(self): + # Do not detail single-purpose client packages. + if not self._has_compilers: + return ['ALL'] - # Don't filter 'ALL' - if self.components == ['ALL']: - return self.components + # tty.warn('DEBUG: installing ALL components') + # return ['ALL'] + + # Always include compilers and closely related components. + # Pre-2016 compiler components have different names - throw in all. + # Later releases have overlapping minor parts that differ by "edition". + # NB: The spack package 'intel' is a subset of + # 'intel-parallel-studio@composer' without the lib variants. + c = ' intel-icc intel-ifort' \ + ' intel-ccomp intel-fcomp intel-comp-' \ + ' intel-compilerproc intel-compilerprof intel-compilerpro-' \ + ' intel-psxe intel-openmp' + + additions_for = { + 'cluster': ' intel-icsxe', + 'professional': ' intel-ips-', + 'composer': ' intel-compxe', + } + if self._edition in additions_for: + c += additions_for[self._edition] + + for variant, components_to_add in { + '+daal': ' intel-daal', # Data Analytics Acceleration Lib + '+gdb': ' intel-gdb', # Integrated Performance Primitives + '+ipp': ' intel-ipp intel-crypto-ipp', + '+mkl': ' intel-mkl', # Math Kernel Library + '+mpi': ' intel-mpi intel-imb', # MPI runtime, SDK, benchm. + '+tbb': ' intel-tbb', # Threading Building Blocks + '+advisor': ' intel-advisor', + '+clck': ' intel_clck', # Cluster Checker + '+inspector': ' intel-inspector', + '+itac': ' intel-itac intel-ta intel-tc' + ' intel-trace-analyzer intel-trace-collector', + # Trace Analyzer and Collector + '+vtune': ' intel-vtune-amplifier', # VTune + }.items(): + if variant in self.spec: + c += components_to_add + + debug_print(c) + return c.split() + + # --------------------------------------------------------------------- + # Utilities + # --------------------------------------------------------------------- + @property + def _filtered_components(self): + '''Expands the list of desired component patterns to the exact names + present in the given download. + ''' + c = self.pset_components + if 'ALL' in c or 'DEFAULTS' in c: # No filter needed + return c # mediaconfig.xml is known to contain duplicate components. # If more than one copy of the same component is used, you # will get an error message about invalid components. - # Use a set to store components to prevent duplicates. - matches = set() + # Use sets to prevent duplicates and for efficient traversal. + requested = set(c) + confirmed = set() + + # NB: To get a reasonable overview in pretty much the documented way: + # + # grep -E '..[a-z]' pset/mediaconfig.xml + # + # https://software.intel.com/en-us/articles/configuration-file-format + # + xmltree = ET.parse('pset/mediaconfig.xml') + for entry in xmltree.getroot().findall('.//Abbr'): # XPath expression + name_present = entry.text + for name_requested in requested: + if name_present.startswith(name_requested): + confirmed.add(name_present) + + return list(confirmed) + + @property + def intel64_int_suffix(self): + '''Provide the suffix for Intel library names to match a client + application's desired int size, conveyed by the active spec variant. + The possible suffixes and their meanings are: + + ``ilp64`` all of int, long, and pointer are 64 bit, + `` lp64`` only long and pointer are 64 bit; int will be 32bit. + ''' + if '+ilp64' in self.spec: + return 'ilp64' + else: + return 'lp64' + + @property + def _has_compilers(self): + return self.name in ['intel', 'intel-parallel-studio'] + + @property + def _edition(self): + if self.name == 'intel-parallel-studio': + return self.version[0] # clearer than .up_to(1), I think. + elif self.name == 'intel': + return 'composer' + else: + return '' + + @property + def version_yearlike(self): + '''Return the version in a unified style, suitable for Version class + conditionals. + ''' + # Input data for this routine: self.version + # Returns: YYYY.Nupdate[.Buildseq] + # + # Specifics by package: + # + # Package Format of self.version + # ------------------------------------------------------------ + # 'intel-parallel-studio' .YYYY.Nupdate + # 'intel' YY.0.Nupdate (some assigned ad-hoc) + # Recent lib packages YYYY.Nupdate.Buildseq + # Early lib packages Major.Minor.Patch.Buildseq + # ------------------------------------------------------------ + # + # Package Output + # ------------------------------------------------------------ + # 'intel-parallel-studio' YYYY.Nupdate + # 'intel' YYYY.Nupdate + # Recent lib packages YYYY.Nupdate.Buildseq + # Known early lib packages YYYY.Minor.Patch.Buildseq (*) + # Unknown early lib packages (2000 + Major).Minor.Patch.Buildseq + # ---------------------------------------------------------------- + # + # (*) YYYY is taken from @property "version_years" (a dict of specs) + # + try: + if self.name == 'intel': + # Has a "Minor" version element, but it is always set as 0. To + # be useful for comparisons, drop it and get YYYY.Nupdate. + v_tail = self.version[2:] # coerced just fine via __getitem__ + else: + v_tail = self.version[1:] + except IndexError: + # Hmm - this happens on "spack install intel-mkl@11". + # I thought concretization picks an actual version?? + return self.version # give up + + if self.name == 'intel-parallel-studio': + return v_tail + + v_year = self.version[0] + if v_year < 2000: + # Shoehorn Major into release year until we know better. + v_year += 2000 + for spec, year in self.version_years.items(): + if self.spec.satisfies(spec): + v_year = year + break + + return ver('%s.%s' % (v_year, v_tail)) + + # --------------------------------------------------------------------- + # Directory handling common to all Intel components + # --------------------------------------------------------------------- + # For reference: classes using IntelPackage, as of Spack-0.11: + # + # intel/ intel-ipp/ intel-mpi/ + # intel-daal/ intel-mkl/ intel-parallel-studio/ + # + # Not using class IntelPackage: + # intel-gpu-tools/ intel-mkl-dnn/ intel-tbb/ + # + def normalize_suite_dir(self, suite_dir_name, version_globs=['*.*.*']): + '''Returns the version-specific and absolute path to the directory of + an Intel product or a suite of product components. + + Parameters: + + suite_dir_name (str): + Name of the product directory, without numeric version. + + - Examples:: + + composer_xe, parallel_studio_xe, compilers_and_libraries + + The following will work as well, even though they are not + directly targets for Spack installation:: + + advisor_xe, inspector_xe, vtune_amplifier_xe, + performance_snapshots (new name for vtune as of 2018) + + These are single-component products without subordinate + components and are normally made available to users by a + toplevel psxevars.sh or equivalent file to source (and thus by + the modulefiles that Spack produces). + + version_globs (list of str): Suffix glob patterns (most specific + first) expected to qualify suite_dir_name to its fully + version-specific install directory (as opposed to a + compatibility directory or symlink). + ''' + # See ./README-intel.rst for background and analysis of dir layouts. + + d = self.prefix + + # Distinguish between product installations that were done external to + # Spack (integrated via packages.yaml) and Spack-internal ones. The + # resulting prefixes may differ in directory depth and specificity. + unversioned_dirname = '' + if suite_dir_name and suite_dir_name in d: + # If e.g. MKL was installed outside of Spack, it is likely just one + # product or product component among possibly many other Intel + # products and their releases that were installed in sibling or + # cousin directories. In such cases, the prefix given to Spack + # will inevitably be a highly product-specific and preferably fully + # version-specific directory. This is what we want and need, and + # nothing more specific than that, i.e., if needed, convert, e.g.: + # .../compilers_and_libraries*/* -> .../compilers_and_libraries* + d = re.sub('(%s%s.*?)%s.*' % + (os.sep, re.escape(suite_dir_name), os.sep), r'\1', d) + + # The Intel installer scripts try hard to place compatibility links + # named like this in the install dir to convey upgrade benefits to + # traditional client apps. But such a generic name can be trouble + # when given to Spack: the link target is bound to change outside + # of Spack's purview and when it does, the outcome of subsequent + # builds of dependent packages may be affected. (Though Intel has + # been remarkably good at backward compatibility.) + # I'm not sure if Spack's package hashing includes link targets. + if d.endswith(suite_dir_name): + # NB: This could get tiresome without a seen++ test. + # tty.warn('Intel product found in a version-neutral directory' + # ' - future builds may not be reproducible.') + # + # Simply doing realpath() would not be enough, because: + # compilers_and_libraries -> compilers_and_libraries_2018 + # which is mostly a staging directory for symlinks (see next). + unversioned_dirname = d + else: + # By contrast, a Spack-internal MKL installation will inherit its + # prefix from install.sh of Intel's package distribution, where it + # means the high-level installation directory that is specific to + # the *vendor* (think of the default "/opt/intel"). We must now + # step down into the *product* directory to get the usual + # hierarchy. But let's not do that in haste ... + # + # For a Spack-born install, the fully-qualified release directory + # desired above may seem less important since product upgrades + # won't land in the same parent. However, only the fully qualified + # directory contains the regular files for the compiler commands: + # + # $ ls -lF /compilers_and_libraries*/linux/bin/intel64/icc + # + # /compilers_and_libraries_2018.1.163/linux/bin/intel64/icc* + # A regular file in the actual release directory. Bingo! + # + # /compilers_and_libraries_2018/linux/bin/intel64/icc -> ... + # A symlink - no good. Note that "compilers_and_libraries_2018/" + # is itself a directory (not symlink) but it merely holds a + # compatibility dir hierarchy with lots of symlinks into the + # release dir. + # + # /compilers_and_libraries/linux/bin/intel64/icc -> ... + # Ditto. + # + # Now, the Spack packages for MKL and MPI packges use version + # triplets, but the one for intel-parallel-studio does not. + # So, we can't have it quite as easy as: + # d = Prefix(d.append('compilers_and_libraries_' + self.version)) + # Alright, let's see what we can find instead: + unversioned_dirname = os.path.join(d, suite_dir_name) + + if unversioned_dirname: + for g in version_globs: + try_glob = unversioned_dirname + g + debug_print('trying %s' % try_glob) + + matching_dirs = sorted(glob.glob(try_glob)) + # NB: Python glob() returns results in arbitrary order - ugh! + # NB2: sorted() is a shortcut that is NOT number-aware. + + if matching_dirs: + debug_print('found %d:' % len(matching_dirs), + matching_dirs) + # Take the highest and thus presumably newest match, which + # better be the sole one anyway. + d = matching_dirs[-1] + break + + if not matching_dirs: + # No match -- this *will* happen during pre-build call to + # setup_environment() when the destination dir is still empty. + # Return a sensible value anyway. + d = unversioned_dirname + + debug_print(d) + return Prefix(d) + + def normalize_path(self, component_path, component_suite_dir=None, + relative=False): + '''Returns the absolute or relative path to a component or file under a + component suite directory. + + Intel's product names, scope, and directory layout changed over the + years. This function provides a unified interface to their directory + names. + + Parameters: + + component_path (str): a component name like 'mkl', or 'mpi', or a + deeper relative path. + + component_suite_dir (str): _Unversioned_ name of the expected + parent directory of component_path. When absent or `None`, an + appropriate default will be used. A present but empty string + `""` requests that `component_path` refer to `self.prefix` + directly. + + Typical values: `compilers_and_libraries`, `composer_xe`, + `parallel_studio_xe`. + + Also supported: `advisor`, `inspector`, `vtune`. The actual + directory name for these suites varies by release year. The + name will be corrected as needed for use in the return value. + + relative (bool): When True, return path relative to self.prefix, + otherwise, return an absolute path (the default). + ''' + # Design note: Choosing the default for `component_suite_dir` was a bit + # tricky since there better be a sensible means to specify direct + # parentage under self.prefix (even though you normally shouldn't need + # a function for that). I chose "" to allow that case be represented, + # and 'None' or the absence of the kwarg to represent the most relevant + # case for the time of writing. + # + # In the 2015 releases (the earliest in Spack as of 2018), there were + # nominally two separate products that provided the compilers: + # "Composer" as lower tier, and "Parallel Studio" as upper tier. In + # Spack, we justifiably retcon both as "intel-parallel-studio@composer" + # and "...@cluster", respectively. Both of these use the older + # "composer_xe" dir layout, as do their virtual package personas. + # + # All other "intel-foo" packages in Spack as of 2018-04 use the + # "compilers_and_libraries" layout, including the 2016 releases that + # are not natively versioned by year. + + cs = component_suite_dir + if cs is None and component_path.startswith('ism'): + cs = 'parallel_studio_xe' + + v = self.version_yearlike + + # Glob variants to complete component_suite_dir. + # Helper var for older MPI versions - those are reparented, with each + # version in their own version-named dir. + standalone_glob = '[1-9]*.*.*' + + # Most other components; try most specific glob first. + # flake8 is far too opinionated about lists - ugh. + normalize_kwargs = { + 'version_globs': [ + '_%s' % self.version, + '_%s.*' % v.up_to(2), # should be: YYYY.Nupdate + '_*.*.*', # last resort + ] + } + for rename_rule in [ + # cs given as arg, in years, dir actually used, [version_globs] + [None, ':2015', 'composer_xe'], + [None, '2016:', 'compilers_and_libraries'], + ['advisor', ':2016', 'advisor_xe'], + ['inspector', ':2016', 'inspector_xe'], + ['vtune_amplifier', ':2017', 'vtune_amplifier_xe'], + ['vtune', ':2017', 'vtune_amplifier_xe'], # alt. + ['itac', ':', 'itac', [os.sep + standalone_glob]], + ]: + if cs == rename_rule[0] and v.satisfies(ver(rename_rule[1])): + cs = rename_rule[2] + if len(rename_rule) > 3: + normalize_kwargs = {'version_globs': rename_rule[3]} + break + + d = self.normalize_suite_dir(cs, **normalize_kwargs) + + # Help find components not located directly under d. + # NB: ancestor() not well suited if version_globs may contain os.sep . + parent_dir = re.sub(os.sep + re.escape(cs) + '.*', '', d) + + reparent_as = {} + if cs == 'compilers_and_libraries': # must qualify further + d = os.path.join(d, _expand_fields('{platform}')) + elif cs == 'composer_xe': + reparent_as = {'mpi': 'impi'} + # ignore 'imb' (MPI Benchmarks) + + for nominal_p, actual_p in reparent_as.items(): + if component_path.startswith(nominal_p): + dirs = glob.glob( + os.path.join(parent_dir, actual_p, standalone_glob)) + debug_print('reparent dirs: %s' % dirs) + # Brazenly assume last match is the most recent version; + # convert back to relative of parent_dir, and re-assemble. + rel_dir = dirs[-1].split(parent_dir + os.sep, 1)[-1] + component_path = component_path.replace(nominal_p, rel_dir, 1) + d = parent_dir + + d = os.path.join(d, component_path) + + if relative: + d = os.path.relpath(os.path.realpath(d), parent_dir) + + debug_print(d) + return d + + def component_bin_dir(self, component, **kwargs): + d = self.normalize_path(component, **kwargs) + + if component == 'compiler': # bin dir is always under PARENT + d = os.path.join(ancestor(d), 'bin', _expand_fields('{libarch}')) + d = d.rstrip(os.sep) # cosmetics, when {libarch} is empty + # NB: Works fine even with relative=True, e.g.: + # composer_xe/compiler -> composer_xe/bin/intel64 + elif component == 'mpi': + d = os.path.join(d, _expand_fields('{libarch}'), 'bin') + else: + d = os.path.join(d, 'bin') + debug_print(d) + return d + + def component_lib_dir(self, component, **kwargs): + '''Provide directory suitable for find_libraries() and + SPACK_COMPILER_EXTRA_RPATHS. + ''' + d = self.normalize_path(component, **kwargs) + + if component == 'mpi': + d = os.path.join(d, _expand_fields('{libarch}'), 'lib') + else: + d = os.path.join(d, 'lib', _expand_fields('{libarch}')) + d = d.rstrip(os.sep) # cosmetics, when {libarch} is empty + + if component == 'tbb': # must qualify further for abi + d = os.path.join(d, self._tbb_abi) + + debug_print(d) + return d + + def component_include_dir(self, component, **kwargs): + d = self.normalize_path(component, **kwargs) + + if component == 'mpi': + d = os.path.join(d, _expand_fields('{libarch}'), 'include') + else: + d = os.path.join(d, 'include') + + debug_print(d) + return d + + @property + def file_to_source(self): + '''Full path of file to source for initializing an Intel package. + A client package could override as follows: + ` @property` + ` def file_to_source(self):` + ` return self.normalize_path("apsvars.sh", "vtune_amplifier")` + ''' + vars_file_info_for = { + # key (usu. spack package name) -> [rel_path, component_suite_dir] + # Extension note: handle additions by Spack name or ad-hoc keys. + '@early_compiler': ['bin/compilervars', None], + 'intel-parallel-studio': ['bin/psxevars', 'parallel_studio_xe'], + 'intel': ['bin/compilervars', None], + 'intel-daal': ['daal/bin/daalvars', None], + 'intel-ipp': ['ipp/bin/ippvars', None], + 'intel-mkl': ['mkl/bin/mklvars', None], + 'intel-mpi': ['mpi/{libarch}/bin/mpivars', None], + } + key = self.name + if self.version_yearlike.satisfies(ver(':2015')): + # Same file as 'intel' but 'None' for component_suite_dir will + # resolve differently. Listed as a separate entry to serve as + # example and to avoid pitfalls upon possible refactoring. + key = '@early_compiler' - for valid in _valid_components(): - for requested in self.components: - if valid.startswith(requested): - matches.add(valid) + f, component_suite_dir = vars_file_info_for[key] + f = _expand_fields(f) + '.sh' + # TODO?? win32 would have to handle os.sep, '.bat' (unless POSIX??) - return matches + f = self.normalize_path(f, component_suite_dir) + return f + # --------------------------------------------------------------------- + # Threading, including (WIP) support for virtual 'tbb' + # --------------------------------------------------------------------- + @property + def openmp_libs(self): + '''Supply LibraryList for linking OpenMP''' + + if '%intel' in self.spec: + # NB: Hunting down explicit library files may be the Spack way of + # doing things, but be aware that "{icc|ifort} --help openmp" + # steers us towards options instead: -qopenmp-link={dynamic,static} + + omp_libnames = ['libiomp5'] + omp_libs = find_libraries( + omp_libnames, + root=self.component_lib_dir('compiler'), + shared=('+shared' in self.spec)) + # Note about search root here: For MKL, the directory + # "$MKLROOT/../compiler" will be present even for an MKL-only + # product installation (as opposed to one being ghosted via + # packages.yaml), specificially to provide the 'iomp5' libs. + + elif '%gcc' in self.spec: + gcc = Executable(self.compiler.cc) + omp_lib_path = gcc( + '--print-file-name', 'libgomp.%s' % dso_suffix, output=str) + omp_libs = LibraryList(omp_lib_path) + + if len(omp_libs) < 1: + raise_lib_error('Cannot locate OpenMP libraries:', omp_libnames) + + debug_print(omp_libs) + return omp_libs + + @property + def tbb_libs(self): + '''Supply LibraryList for linking TBB''' + + # TODO: When is 'libtbbmalloc' needed? + tbb_lib = find_libraries( + ['libtbb'], root=self.component_lib_dir('tbb')) + # NB: Like icc with -qopenmp, so does icpc steer us towards using an + # option: "icpc -tbb" + + # TODO: clang(?) + gcc = Executable('gcc') # must be gcc, not self.compiler.cc + cxx_lib_path = gcc( + '--print-file-name', 'libstdc++.%s' % dso_suffix, output=str) + + libs = tbb_lib + LibraryList(cxx_lib_path) + debug_print(libs) + return libs + + @property + def _tbb_abi(self): + '''Select the ABI needed for linking TBB''' + # Match the available gcc, as it's done in tbbvars.sh. + gcc = Executable('gcc') + matches = re.search(r'(gcc|LLVM).* ([0-9]+\.[0-9]+\.[0-9]+).*', + gcc('--version', output=str), re.I | re.M) + abi = '' + if sys.platform == 'darwin': + pass + elif matches: + # TODO: Confirm that this covers clang (needed on Linux only) + gcc_version = Version(matches.groups()[1]) + if gcc_version >= ver('4.7'): + abi = 'gcc4.7' + elif gcc_version >= ver('4.4'): + abi = 'gcc4.4' + else: + abi = 'gcc4.1' # unlikely, one hopes. + + # Alrighty then ... + debug_print(abi) + return abi + + # --------------------------------------------------------------------- + # Support for virtual 'blas/lapack/scalapack' + # --------------------------------------------------------------------- + @property + def blas_libs(self): + # Main magic here. + # For reference, see The Intel Math Kernel Library Link Line Advisor: + # https://software.intel.com/en-us/articles/intel-mkl-link-line-advisor/ + + mkl_integer = 'libmkl_intel_' + self.intel64_int_suffix + + if self.spec.satisfies('threads=openmp'): + if '%intel' in self.spec: + mkl_threading = 'libmkl_intel_thread' + elif '%gcc' in self.spec: + mkl_threading = 'libmkl_gnu_thread' + threading_engine_libs = self.openmp_libs() + elif self.spec.satisfies('threads=tbb'): + mkl_threading = 'libmkl_tbb_thread' + threading_engine_libs = self.tbb_libs() + elif self.spec.satisfies('threads=none'): + mkl_threading = 'libmkl_sequential' + threading_engine_libs = LibraryList([]) + else: + raise_lib_error('Cannot determine MKL threading libraries.') + + mkl_libnames = [mkl_integer, mkl_threading, 'libmkl_core'] + mkl_libs = find_libraries( + mkl_libnames, + root=self.component_lib_dir('mkl'), + shared=('+shared' in self.spec)) + debug_print(mkl_libs) + + if len(mkl_libs) < 3: + raise_lib_error('Cannot locate core MKL libraries:', mkl_libnames) + + # The Intel MKL link line advisor recommends these system libraries + system_libs = find_system_libraries( + 'libpthread libm libdl'.split(), + shared=('+shared' in self.spec)) + debug_print(system_libs) + + return mkl_libs + threading_engine_libs + system_libs + + @property + def lapack_libs(self): + return self.blas_libs + + @property + def scalapack_libs(self): + # Intel MKL does not directly depend on MPI but the BLACS library + # which underlies ScaLapack does. It comes in several personalities; + # we must supply a personality matching the MPI implementation that + # is active for the root package that asked for ScaLapack. + spec_root = self.spec.root + if sys.platform == 'darwin' and '^mpich' in spec_root: + # The only supported choice for MKL 2018 on Mac. + blacs_lib = 'libmkl_blacs_mpich' + elif '^openmpi' in spec_root: + blacs_lib = 'libmkl_blacs_openmpi' + elif '^mpich@1' in spec_root: + # Was supported only up to 2015. + blacs_lib = 'libmkl_blacs' + elif ('^mpich@2:' in spec_root or + '^mvapich2' in spec_root or + '^intel-mpi' in spec_root): + blacs_lib = 'libmkl_blacs_intelmpi' + elif '^mpt' in spec_root: + blacs_lib = 'libmkl_blacs_sgimpt' + else: + raise_lib_error('Cannot find a BLACS library for the given MPI.') + + int_suff = '_' + self.intel64_int_suffix + scalapack_libnames = [ + 'libmkl_scalapack' + int_suff, + blacs_lib + int_suff, + ] + sca_libs = find_libraries( + scalapack_libnames, + root=self.component_lib_dir('mkl'), + shared=('+shared' in self.spec)) + debug_print(sca_libs) + + if len(sca_libs) < 2: + raise_lib_error( + 'Cannot locate ScaLapack/BLACS libraries:', scalapack_libnames) + # NB: ScaLapack is installed as "cluster" components within MKL or + # MKL-encompassing products. But those were *optional* for the ca. + # 2015/2016 product releases, which was easy to overlook, and I have + # been bitten by that. Thus, complain early because it'd be a sore + # disappointment to have missing ScaLapack libs show up as a link error + # near the end phase of a client package's build phase. + + return sca_libs + + # --------------------------------------------------------------------- + # Support for virtual 'mpi' + # --------------------------------------------------------------------- + @property + def mpi_compiler_wrappers(self): + '''Return paths to compiler wrappers as a dict of env-like names + ''' + # Intel comes with 2 different flavors of MPI wrappers: + # + # * mpiicc, mpiicpc, and mpiifort are hardcoded to wrap around + # the Intel compilers. + # * mpicc, mpicxx, mpif90, and mpif77 allow you to set which + # compilers to wrap using I_MPI_CC and friends. By default, + # wraps around the GCC compilers. + # + # In theory, these should be equivalent as long as I_MPI_CC + # and friends are set to point to the Intel compilers, but in + # practice, mpicc fails to compile some applications while + # mpiicc works. + bindir = self.component_bin_dir('mpi') + if self.compiler.name == 'intel': + wrapper_vars = { + # eschew Prefix objects -- emphasize the command strings. + 'MPICC': os.path.join(bindir, 'mpiicc'), + 'MPICXX': os.path.join(bindir, 'mpiicpc'), + 'MPIF77': os.path.join(bindir, 'mpiifort'), + 'MPIF90': os.path.join(bindir, 'mpiifort'), + 'MPIFC': os.path.join(bindir, 'mpiifort'), + } + else: + wrapper_vars = { + 'MPICC': os.path.join(bindir, 'mpicc'), + 'MPICXX': os.path.join(bindir, 'mpicxx'), + 'MPIF77': os.path.join(bindir, 'mpif77'), + 'MPIF90': os.path.join(bindir, 'mpif90'), + 'MPIFC': os.path.join(bindir, 'mpif90'), + } + # debug_print("wrapper_vars =", wrapper_vars) + return wrapper_vars + + def mpi_setup_dependent_environment( + self, spack_env, run_env, dependent_spec, compilers_of_client={}): + '''Unified back-end for setup_dependent_environment() of Intel packages + that provide 'mpi'. + + Parameters: + + spack_env, run_env, dependent_spec: same as in + setup_dependent_environment(). + + compilers_of_client (dict): Conveys spack_cc, spack_cxx, etc., + from the scope of dependent packages; constructed in caller. + ''' + # See also: setup_dependent_package() + wrapper_vars = { + 'I_MPI_CC': compilers_of_client['CC'], + 'I_MPI_CXX': compilers_of_client['CXX'], + 'I_MPI_F77': compilers_of_client['F77'], + 'I_MPI_F90': compilers_of_client['F90'], + 'I_MPI_FC': compilers_of_client['FC'], + # NB: Normally set by the modulefile, but that is not active here: + 'I_MPI_ROOT': self.normalize_path('mpi'), + } + + # CAUTION - SIMILAR code in: + # var/spack/repos/builtin/packages/mpich/package.py + # var/spack/repos/builtin/packages/openmpi/package.py + # var/spack/repos/builtin/packages/mvapich2/package.py + # + # On Cray, the regular compiler wrappers *are* the MPI wrappers. + if 'platform=cray' in self.spec: + # TODO: Confirm + wrapper_vars.update({ + 'MPICC': compilers_of_client['CC'], + 'MPICXX': compilers_of_client['CXX'], + 'MPIF77': compilers_of_client['F77'], + 'MPIF90': compilers_of_client['F90'], + }) + else: + compiler_wrapper_commands = self.mpi_compiler_wrappers + wrapper_vars.update({ + 'MPICC': compiler_wrapper_commands['MPICC'], + 'MPICXX': compiler_wrapper_commands['MPICXX'], + 'MPIF77': compiler_wrapper_commands['MPIF77'], + 'MPIF90': compiler_wrapper_commands['MPIF90'], + }) + + for key, value in wrapper_vars.items(): + spack_env.set(key, value) + + debug_print("adding to spack_env:", wrapper_vars) + + # --------------------------------------------------------------------- + # General support for child packages + # --------------------------------------------------------------------- + @property + def headers(self): + result = HeaderList([]) + if '+mpi' in self.spec or self.provides('mpi'): + result += find_headers( + ['mpi'], + root=self.component_include_dir('mpi'), + recursive=False) + if '+mkl' in self.spec or self.provides('mkl'): + result += find_headers( + ['mkl_cblas', 'mkl_lapacke'], + root=self.component_include_dir('mkl'), + recursive=False) + debug_print(result) + return result + + @property + def libs(self): + result = LibraryList([]) + if '+mpi' in self.spec or self.provides('mpi'): + # If prefix is too general, recursive searches may get files from + # supported but inappropriate sub-architectures like 'mic'. + libnames = ['libmpifort', 'libmpi'] + if 'cxx' in self.spec.last_query.extra_parameters: + libnames = ['libmpicxx'] + libnames + result += find_libraries( + libnames, + root=self.component_lib_dir('mpi'), + shared=True, recursive=True) + + # NB: MKL uses domain-specifics: blas_libs/lapack_libs/scalapack_libs + + debug_print(result) + return result + + def setup_environment(self, spack_env, run_env): + """Adds environment variables to the generated module file. + + These environment variables come from running: + + .. code-block:: console + + $ source parallel_studio_xe_2017/bin/psxevars.sh intel64 + [and likewise for MKL, MPI, and other components] + """ + # https://spack.readthedocs.io/en/latest/spack.html#spack.package.PackageBase.setup_environment + # + # spack_env -> Applied when dependent is built within Spack. + # Not used here. + # run_env -> Applied to the modulefile of dependent. + # + # NOTE: Spack runs setup_environment twice, once pre-build to set up + # the build environment, and once post-installation to determine + # the environment variables needed at run-time to add to the module + # file. The script we need to source is only present post-installation, + # so check for its existence before sourcing. + # TODO: At some point we should split setup_environment into + # setup_build_environment and setup_run_environment to get around + # this problem. + f = self.file_to_source + if not f or not os.path.isfile(f): + return + + tty.debug("sourcing " + f) + + # All Intel packages expect at least the architecture as argument. + # Some accept more args, but those are not (yet?) handled here. + args = (_expand_fields('{arch}'),) + + # On Mac, the platform is *also required*, at least as of 2018. + # I am not sure about earlier versions. + # if sys.platform == 'darwin': + # args = () + + run_env.extend(EnvironmentModifications.from_sourcing_file(f, *args)) + + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): + # https://spack.readthedocs.io/en/latest/spack.html#spack.package.PackageBase.setup_dependent_environment + # + # spack_env -> Applied when dependent is built within Spack. + # run_env -> Applied to the modulefile of dependent. + # Not used here. + # + # NB: This function is overwritten by 'mpi' provider packages: + # + # var/spack/repos/builtin/packages/intel-mpi/package.py + # var/spack/repos/builtin/packages/intel-parallel-studio/package.py + # + # They call _setup_dependent_env_callback() as well, but with the + # dictionary kwarg compilers_of_client{} present and populated. + + # Handle everything in a callback version. + self._setup_dependent_env_callback(spack_env, run_env, dependent_spec) + + def _setup_dependent_env_callback( + self, spack_env, run_env, dependent_spec, compilers_of_client={}): + # Expected to be called from a client's setup_dependent_environment(), + # with args extended to convey the client's compilers as needed. + + if '+mkl' in self.spec or self.provides('mkl'): + # Spack's env philosophy demands that we replicate some of the + # settings normally handled by file_to_source ... + # + # TODO: Why is setup_environment() [which uses file_to_source()] + # not called as a matter of course upon entering the current + # function? (guarding against multiple calls notwithstanding) + # + # Use a local dict to facilitate debug_print(): + env_mods = { + 'MKLROOT': self.normalize_path('mkl'), + 'SPACK_COMPILER_EXTRA_RPATHS': self.component_lib_dir('mkl'), + } + + spack_env.set('MKLROOT', env_mods['MKLROOT']) + spack_env.append_path('SPACK_COMPILER_EXTRA_RPATHS', + env_mods['SPACK_COMPILER_EXTRA_RPATHS']) + + debug_print("adding/modifying spack_env:", env_mods) + + if '+mpi' in self.spec or self.provides('mpi'): + if compilers_of_client: + self.mpi_setup_dependent_environment( + spack_env, run_env, dependent_spec, compilers_of_client) + # We could forego this nonce function and inline its code here, + # but (a) it sisters mpi_compiler_wrappers() [needed twice] + # which performs dizzyingly similar but necessarily different + # actions, and (b) function code leaves a bit more breathing + # room within the suffocating corset of flake8 line length. + else: + raise InstallError('compilers_of_client arg required for MPI') + + def setup_dependent_package(self, module, dep_spec): + # https://spack.readthedocs.io/en/latest/spack.html#spack.package.PackageBase.setup_dependent_package + # Reminder: "module" refers to Python module. + # Called before the install() method of dependents. + + if '+mpi' in self.spec or self.provides('mpi'): + compiler_wrapper_commands = self.mpi_compiler_wrappers + self.spec.mpicc = compiler_wrapper_commands['MPICC'] + self.spec.mpicxx = compiler_wrapper_commands['MPICXX'] + self.spec.mpif77 = compiler_wrapper_commands['MPIF77'] + self.spec.mpifc = compiler_wrapper_commands['MPIFC'] + debug_print(("spec '%s' received .mpi* properties:" % self.spec), + compiler_wrapper_commands) + + # --------------------------------------------------------------------- + # Specifics for installation phase + # --------------------------------------------------------------------- @property def global_license_file(self): - """Returns the path where a global license file should be stored. + """Returns the path where a Spack-global license file should be stored. All Intel software shares the same license, so we store it in a common 'intel' directory.""" - return os.path.join(self.global_license_dir, 'intel', - os.path.basename(self.license_files[0])) + return os.path.join(self.global_license_dir, 'intel', 'license.lic') + + @property + def _determine_license_type(self): + '''Provide appropriate license tokens for the installer (silent.cfg). + ''' + # See: + # ./README-intel.rst, section "Details for licensing tokens". + # ./build_systems/README-intel.rst, section "Licenses" + # + # Ideally, we just tell the installer to look around on the system. + # Thankfully, we neither need to care nor emulate where it looks: + license_type = {'ACTIVATION_TYPE': 'exist_lic', } + + # However (and only), if the spack-internal Intel license file has been + # populated beyond its templated explanatory comments, proffer it to + # the installer instead: + f = self.global_license_file + if os.path.isfile(f): + # The file will have been created upon self.license_required AND + # self.license_files having been populated, so the "if" is usually + # true by the time the present function runs; ../hooks/licensing.py + with open(f) as fh: + if re.search(r'^[ \t]*[^' + self.license_comment + '\n]', + fh.read(), re.MULTILINE): + license_type = { + 'ACTIVATION_TYPE': 'license_file', + 'ACTIVATION_LICENSE_FILE': f, + } + + debug_print(license_type) + return license_type def configure(self, spec, prefix): - """Writes the ``silent.cfg`` file used to configure the installation. + '''Generates the silent.cfg file to pass to installer.sh. See https://software.intel.com/en-us/articles/configuration-file-format - """ - # Patterns used to check silent configuration file - # - # anythingpat - any string - # filepat - the file location pattern (/path/to/license.lic) - # lspat - the license server address pattern (0123@hostname) - # snpat - the serial number pattern (ABCD-01234567) - config = { - # Accept EULA, valid values are: {accept, decline} - 'ACCEPT_EULA': 'accept', + ''' - # Optional error behavior, valid values are: {yes, no} - 'CONTINUE_WITH_OPTIONAL_ERROR': 'yes', - - # Install location, valid values are: {/opt/intel, filepat} - 'PSET_INSTALL_DIR': prefix, + # Both tokens AND values of the configuration file are validated during + # the run of the underlying binary installer. Any unknown token or + # unacceptable value will cause that installer to fail. Notably, this + # applies to trying to specify a license for a product that does not + # require one. + # + # Fortunately, the validator is a script from a solid code base that is + # only lightly adapted to the token vocabulary of each product and + # release. Let's get that script so we can preempt its objections. + # + # Rather than running the script on a trial file and dissecting its + # pronouncements, let's brazenly skim it for supported tokens and build + # our configuration accordingly. We can do this because the tokens are + # quite long and specific. - # Continue with overwrite of existing installation directory, - # valid values are: {yes, no} - 'CONTINUE_WITH_INSTALLDIR_OVERWRITE': 'yes', + validator_code = open('pset/check.awk', 'r').read() + # Let's go a little further and distill the tokens (plus some noise). + tokenlike_words = set(re.findall(r'[A-Z_]{4,}', validator_code)) - # List of components to install, - # valid values are: {ALL, DEFAULTS, anythingpat} - 'COMPONENTS': ';'.join(self._filtered_components), + # NB: .cfg files generated with the "--duplicate filename" option have + # the COMPONENTS string begin with a separator - do not worry about it. + components_joined = ';'.join(self._filtered_components) + nonrpm_db_dir = os.path.join(prefix, 'nonrpm-db') - # Installation mode, valid values are: {install, repair, uninstall} - 'PSET_MODE': 'install', + config_draft = { + # Basics first - these should be accepted in all products. + 'ACCEPT_EULA': 'accept', + 'PSET_MODE': 'install', + 'CONTINUE_WITH_OPTIONAL_ERROR': 'yes', + 'CONTINUE_WITH_INSTALLDIR_OVERWRITE': 'yes', + 'SIGNING_ENABLED': 'no', - # Directory for non-RPM database, valid values are: {filepat} - 'NONRPM_DB_DIR': prefix, + # Highly variable package specifics: + 'PSET_INSTALL_DIR': prefix, + 'NONRPM_DB_DIR': nonrpm_db_dir, + 'COMPONENTS': components_joined, - # Perform validation of digital signatures of RPM files, - # valid values are: {yes, no} - 'SIGNING_ENABLED': 'no', + # Conditional tokens; the first is supported post-2015 only. + # Ignore ia32; most recent products don't even provide it. + 'ARCH_SELECTED': 'INTEL64', # was: 'ALL' - # Select target architecture of your applications, - # valid values are: {IA32, INTEL64, ALL} - 'ARCH_SELECTED': 'ALL', + # 'ism' component -- see uninstall_ism(); also varies by release. + 'PHONEHOME_SEND_USAGE_DATA': 'no', + # Ah, as of 2018.2, that somewhat loaded term got replaced by one + # in business-speak. We uphold our preference, both out of general + # principles and for technical reasons like overhead and non-routed + # compute nodes. + 'INTEL_SW_IMPROVEMENT_PROGRAM_CONSENT': 'no', } + # Deal with licensing only if truly needed. + # NB: Token was 'ACTIVATION' pre ~2013, so basically irrelevant here. + if 'ACTIVATION_TYPE' in tokenlike_words: + config_draft.update(self._determine_license_type) - # Not all Intel software requires a license. Trying to specify - # one anyway will cause the installation to fail. - if self.license_required: - config.update({ - # License file or license server, - # valid values are: {lspat, filepat} - 'ACTIVATION_LICENSE_FILE': self.global_license_file, - - # Activation type, valid values are: {exist_lic, - # license_server, license_file, trial_lic, serial_number} - 'ACTIVATION_TYPE': 'license_file', - - # Intel(R) Software Improvement Program opt-in, - # valid values are: {yes, no} - 'PHONEHOME_SEND_USAGE_DATA': 'no', - }) - - with open('silent.cfg', 'w') as cfg: - for key in config: - cfg.write('{0}={1}\n'.format(key, config[key])) + # Write sorted *by token* so the file looks less like a hash dump. + f = open('silent.cfg', 'w') + for token, value in sorted(config_draft.items()): + if token in tokenlike_words: + f.write('%s=%s\n' % (token, value)) + f.close() def install(self, spec, prefix): - """Runs the ``install.sh`` installation script.""" + '''Runs Intel's install.sh installation script. Afterwards, save the + installer config and logs to /.spack + ''' + # prepare + tmpdir = tempfile.mkdtemp(prefix='spack-intel-') install_script = Executable('./install.sh') + install_script.add_default_env('TMPDIR', tmpdir) + + # perform install_script('--silent', 'silent.cfg') + # preserve config and logs + dst = os.path.join(self.prefix, '.spack') + install('silent.cfg', dst) + for f in glob.glob('%s/intel*log' % tmpdir): + install(f, dst) + + @run_after('install') + def configure_rpath(self): + if '+rpath' not in self.spec: + return + + # https://software.intel.com/en-us/cpp-compiler-18.0-developer-guide-and-reference-using-configuration-files + compilers_bin_dir = self.component_bin_dir('compiler') + compilers_lib_dir = self.component_lib_dir('compiler') + + for compiler_name in 'icc icpc ifort'.split(): + f = os.path.join(compilers_bin_dir, compiler_name) + if not os.path.isfile(f): + raise InstallError( + 'Cannot find compiler command to configure rpath:\n\t' + f) + + compiler_cfg = os.path.abspath(f + '.cfg') + with open(compiler_cfg, 'w') as fh: + fh.write('-Xlinker -rpath={0}\n'.format(compilers_lib_dir)) + @run_after('install') - def save_silent_cfg(self): - """Copies the silent.cfg configuration file to ``/.spack``.""" - install('silent.cfg', os.path.join(self.prefix, '.spack')) + def filter_compiler_wrappers(self): + if (('+mpi' in self.spec or self.provides('mpi')) and + '~newdtags' in self.spec): + bin_dir = self.component_bin_dir('mpi') + for f in 'mpif77 mpif90 mpigcc mpigxx mpiicc mpiicpc ' \ + 'mpiifort'.split(): + f = os.path.join(bin_dir, f) + filter_file('-Xlinker --enable-new-dtags', ' ', f, string=True) + + @run_after('install') + def uninstall_ism(self): + # The "Intel(R) Software Improvement Program" [ahem] gets installed, + # apparently regardless of PHONEHOME_SEND_USAGE_DATA. + # + # https://software.intel.com/en-us/articles/software-improvement-program + # https://software.intel.com/en-us/forums/intel-c-compiler/topic/506959 + # Hubert H. (Intel) Mon, 03/10/2014 - 03:02 wrote: + # "... you can also uninstall the Intel(R) Software Manager + # completely: /intel/ism/uninstall.sh" + + f = os.path.join(self.normalize_path('ism'), 'uninstall.sh') + if os.path.isfile(f): + tty.warn('Uninstalling "Intel Software Improvement Program"' + 'component') + uninstall = Executable(f) + uninstall('--silent') + + # TODO? also try + # ~/intel/ism/uninstall --silent + + debug_print(os.getcwd()) + return # Check that self.prefix is there after installation run_after('install')(PackageBase.sanity_check_prefix) diff --git a/var/spack/repos/builtin/packages/intel-daal/package.py b/var/spack/repos/builtin/packages/intel-daal/package.py index 434ecf0f73..420f8e009a 100644 --- a/var/spack/repos/builtin/packages/intel-daal/package.py +++ b/var/spack/repos/builtin/packages/intel-daal/package.py @@ -22,10 +22,7 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## -import os - from spack import * -from spack.environment import EnvironmentModifications class IntelDaal(IntelPackage): @@ -57,36 +54,3 @@ class IntelDaal(IntelPackage): url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8687/l_daal_2016.2.181.tgz") provides('daal') - - @property - def license_required(self): - # The Intel libraries are provided without requiring a license as of - # version 2017.2. Trying to specify the license will fail. See: - # https://software.intel.com/en-us/articles/free-ipsxe-tools-and-libraries - if self.version >= Version('2017.2'): - return False - else: - return True - - def setup_environment(self, spack_env, run_env): - """Adds environment variables to the generated module file. - - These environment variables come from running: - - .. code-block:: console - - $ source daal/bin/daalvars.sh intel64 - """ - # NOTE: Spack runs setup_environment twice, once pre-build to set up - # the build environment, and once post-installation to determine - # the environment variables needed at run-time to add to the module - # file. The script we need to source is only present post-installation, - # so check for its existence before sourcing. - # TODO: At some point we should split setup_environment into - # setup_build_environment and setup_run_environment to get around - # this problem. - daalvars = os.path.join(self.prefix.daal.bin, 'daalvars.sh') - - if os.path.isfile(daalvars): - run_env.extend(EnvironmentModifications.from_sourcing_file( - daalvars, 'intel64')) diff --git a/var/spack/repos/builtin/packages/intel-ipp/package.py b/var/spack/repos/builtin/packages/intel-ipp/package.py index e7dfe3d4e6..3e4a553090 100644 --- a/var/spack/repos/builtin/packages/intel-ipp/package.py +++ b/var/spack/repos/builtin/packages/intel-ipp/package.py @@ -22,10 +22,7 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## -import os - from spack import * -from spack.environment import EnvironmentModifications class IntelIpp(IntelPackage): @@ -49,40 +46,8 @@ class IntelIpp(IntelPackage): url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11031/l_ipp_2017.1.132.tgz") version('2017.0.098', 'e7be757ebe351d9f9beed7efdc7b7118', url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9663/l_ipp_2017.0.098.tgz") + # built from parallel_studio_xe_2016.3.067 version('9.0.3.210', '0e1520dd3de7f811a6ef6ebc7aa429a3', url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9067/l_ipp_9.0.3.210.tgz") provides('ipp') - - @property - def license_required(self): - # The Intel libraries are provided without requiring a license as of - # version 2017.2. Trying to specify the license will fail. See: - # https://software.intel.com/en-us/articles/free-ipsxe-tools-and-libraries - if self.version >= Version('2017.2'): - return False - else: - return True - - def setup_environment(self, spack_env, run_env): - """Adds environment variables to the generated module file. - - These environment variables come from running: - - .. code-block:: console - - $ source ipp/bin/ippvars.sh intel64 - """ - # NOTE: Spack runs setup_environment twice, once pre-build to set up - # the build environment, and once post-installation to determine - # the environment variables needed at run-time to add to the module - # file. The script we need to source is only present post-installation, - # so check for its existence before sourcing. - # TODO: At some point we should split setup_environment into - # setup_build_environment and setup_run_environment to get around - # this problem. - ippvars = os.path.join(self.prefix.ipp.bin, 'ippvars.sh') - - if os.path.isfile(ippvars): - run_env.extend(EnvironmentModifications.from_sourcing_file( - ippvars, 'intel64')) diff --git a/var/spack/repos/builtin/packages/intel-mkl/package.py b/var/spack/repos/builtin/packages/intel-mkl/package.py index b8ce9a96aa..7eb217ac38 100644 --- a/var/spack/repos/builtin/packages/intel-mkl/package.py +++ b/var/spack/repos/builtin/packages/intel-mkl/package.py @@ -22,11 +22,9 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## -import os import sys from spack import * -from spack.environment import EnvironmentModifications class IntelMkl(IntelPackage): @@ -52,8 +50,10 @@ class IntelMkl(IntelPackage): url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11024/l_mkl_2017.1.132.tgz") version('2017.0.098', '3cdcb739ab5ab1e047eb130b9ffdd8d0', url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9662/l_mkl_2017.0.098.tgz") + # built from parallel_studio_xe_2016.3.x version('11.3.3.210', 'f72546df27f5ebb0941b5d21fd804e34', url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9068/l_mkl_11.3.3.210.tgz") + # built from parallel_studio_xe_2016.2.062 version('11.3.2.181', '536dbd82896d6facc16de8f961d17d65', url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8711/l_mkl_11.3.2.181.tgz") @@ -62,7 +62,7 @@ class IntelMkl(IntelPackage): variant( 'threads', default='none', description='Multithreading support', - values=('openmp', 'none'), + values=('openmp', 'tbb', 'none'), multi=False ) @@ -74,166 +74,3 @@ class IntelMkl(IntelPackage): if sys.platform == 'darwin': # there is no libmkl_gnu_thread on macOS conflicts('threads=openmp', when='%gcc') - - @property - def license_required(self): - # The Intel libraries are provided without requiring a license as of - # version 2017.2. Trying to specify the license will fail. See: - # https://software.intel.com/en-us/articles/free-ipsxe-tools-and-libraries - if self.version >= Version('2017.2'): - return False - else: - return True - - @property - def blas_libs(self): - spec = self.spec - prefix = self.prefix - shared = '+shared' in spec - - if '+ilp64' in spec: - mkl_integer = ['libmkl_intel_ilp64'] - else: - mkl_integer = ['libmkl_intel_lp64'] - - mkl_threading = ['libmkl_sequential'] - - omp_libs = LibraryList([]) - - if spec.satisfies('threads=openmp'): - if '%intel' in spec: - mkl_threading = ['libmkl_intel_thread'] - omp_threading = ['libiomp5'] - - if sys.platform != 'darwin': - omp_root = prefix.compilers_and_libraries.linux.lib.intel64 - else: - omp_root = prefix.lib - omp_libs = find_libraries( - omp_threading, root=omp_root, shared=shared) - elif '%gcc' in spec: - mkl_threading = ['libmkl_gnu_thread'] - - gcc = Executable(self.compiler.cc) - libgomp = gcc('--print-file-name', 'libgomp.{0}'.format( - dso_suffix), output=str) - omp_libs = LibraryList(libgomp) - - # TODO: TBB threading: ['libmkl_tbb_thread', 'libtbb', 'libstdc++'] - - if sys.platform != 'darwin': - mkl_root = prefix.compilers_and_libraries.linux.mkl.lib.intel64 - else: - mkl_root = prefix.mkl.lib - - mkl_libs = find_libraries( - mkl_integer + mkl_threading + ['libmkl_core'], - root=mkl_root, - shared=shared - ) - - # Intel MKL link line advisor recommends these system libraries - system_libs = find_system_libraries( - ['libpthread', 'libm', 'libdl'], - shared=shared - ) - - return mkl_libs + omp_libs + system_libs - - @property - def lapack_libs(self): - return self.blas_libs - - @property - def scalapack_libs(self): - libnames = ['libmkl_scalapack'] - - # Intel MKL does not directly depend on mpi but the scalapack - # interface does and the corresponding BLACS library changes - # depending on the MPI implementation we are using. We need then to - # inspect the root package which asked for Scalapack and check which - # MPI it depends on. - root = self.spec.root - if sys.platform == 'darwin' and '^mpich' in root: - # MKL 2018 supports only MPICH on darwin - libnames.append('libmkl_blacs_mpich') - elif '^openmpi' in root: - libnames.append('libmkl_blacs_openmpi') - elif '^mpich@1' in root: - libnames.append('libmkl_blacs') - elif '^mpich@2:' in root: - libnames.append('libmkl_blacs_intelmpi') - elif '^mvapich2' in root: - libnames.append('libmkl_blacs_intelmpi') - elif '^mpt' in root: - libnames.append('libmkl_blacs_sgimpt') - elif '^intel-mpi' in root: - libnames.append('libmkl_blacs_intelmpi') - else: - raise InstallError('No MPI found for scalapack') - - integer = 'ilp64' if '+ilp64' in self.spec else 'lp64' - mkl_root = self.prefix.mkl.lib if sys.platform == 'darwin' else \ - self.prefix.compilers_and_libraries.linux.mkl.lib.intel64 - - shared = True if '+shared' in self.spec else False - - libs = find_libraries( - ['{0}_{1}'.format(l, integer) for l in libnames], - root=mkl_root, - shared=shared - ) - - return libs - - @property - def headers(self): - prefix = self.spec.prefix - if sys.platform != 'darwin': - include_dir = prefix.compilers_and_libraries.linux.mkl.include - else: - include_dir = prefix.include - - cblas_h = join_path(include_dir, 'mkl_cblas.h') - lapacke_h = join_path(include_dir, 'mkl_lapacke.h') - return HeaderList([cblas_h, lapacke_h]) - - def setup_dependent_environment(self, spack_env, run_env, dependent_spec): - # set up MKLROOT for everyone using MKL package - if sys.platform == 'darwin': - mkl_lib = self.prefix.mkl.lib - mkl_root = self.prefix.mkl - else: - mkl_lib = self.prefix.compilers_and_libraries.linux.mkl.lib.intel64 - mkl_root = self.prefix.compilers_and_libraries.linux.mkl - - spack_env.set('MKLROOT', mkl_root) - spack_env.append_path('SPACK_COMPILER_EXTRA_RPATHS', mkl_lib) - - def setup_environment(self, spack_env, run_env): - """Adds environment variables to the generated module file. - - These environment variables come from running: - - .. code-block:: console - - $ source mkl/bin/mklvars.sh intel64 - """ - # NOTE: Spack runs setup_environment twice, once pre-build to set up - # the build environment, and once post-installation to determine - # the environment variables needed at run-time to add to the module - # file. The script we need to source is only present post-installation, - # so check for its existence before sourcing. - # TODO: At some point we should split setup_environment into - # setup_build_environment and setup_run_environment to get around - # this problem. - mklvars = os.path.join(self.prefix.mkl.bin, 'mklvars.sh') - - if sys.platform == 'darwin': - if os.path.isfile(mklvars): - run_env.extend(EnvironmentModifications.from_sourcing_file( - mklvars)) - else: - if os.path.isfile(mklvars): - run_env.extend(EnvironmentModifications.from_sourcing_file( - mklvars, 'intel64')) diff --git a/var/spack/repos/builtin/packages/intel-mpi/package.py b/var/spack/repos/builtin/packages/intel-mpi/package.py index 44b501fbe1..ed2f87a0cc 100644 --- a/var/spack/repos/builtin/packages/intel-mpi/package.py +++ b/var/spack/repos/builtin/packages/intel-mpi/package.py @@ -22,10 +22,7 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## -import os - from spack import * -from spack.environment import EnvironmentModifications class IntelMpi(IntelPackage): @@ -49,95 +46,21 @@ class IntelMpi(IntelPackage): url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11334/l_mpi_2017.2.174.tgz') version('2017.1.132', 'd5e941ac2bcf7c5576f85f6bcfee4c18', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11014/l_mpi_2017.1.132.tgz') + # built from parallel_studio_xe_2016.3.068 version('5.1.3.223', '4316e78533a932081b1a86368e890800', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9278/l_mpi_p_5.1.3.223.tgz') provides('mpi') - @property - def license_required(self): - # The Intel libraries are provided without requiring a license as of - # version 2017.2. Trying to specify the license will fail. See: - # https://software.intel.com/en-us/articles/free-ipsxe-tools-and-libraries - if self.version >= Version('2017.2'): - return False - else: - return True - - @property - def mpi_libs(self): - mpi_root = self.prefix.compilers_and_libraries.linux.mpi.lib64 - query_parameters = self.spec.last_query.extra_parameters - libraries = ['libmpifort', 'libmpi'] - - if 'cxx' in query_parameters: - libraries = ['libmpicxx'] + libraries - - return find_libraries( - libraries, root=mpi_root, shared=True, recursive=True - ) - - @property - def mpi_headers(self): - # recurse from self.prefix will find too many things for all the - # supported sub-architectures like 'mic' - mpi_root = self.prefix.compilers_and_libraries.linux.mpi.include64 - return find_headers('mpi', root=mpi_root, recursive=False) - - def setup_dependent_environment(self, spack_env, run_env, dependent_spec): - spack_env.set('I_MPI_CC', spack_cc) - spack_env.set('I_MPI_CXX', spack_cxx) - spack_env.set('I_MPI_F77', spack_fc) - spack_env.set('I_MPI_F90', spack_f77) - spack_env.set('I_MPI_FC', spack_fc) - - def setup_dependent_package(self, module, dep_spec): - # Intel comes with 2 different flavors of MPI wrappers: - # - # * mpiicc, mpiicpc, and mpifort are hardcoded to wrap around - # the Intel compilers. - # * mpicc, mpicxx, mpif90, and mpif77 allow you to set which - # compilers to wrap using I_MPI_CC and friends. By default, - # wraps around the GCC compilers. - # - # In theory, these should be equivalent as long as I_MPI_CC - # and friends are set to point to the Intel compilers, but in - # practice, mpicc fails to compile some applications while - # mpiicc works. - bindir = self.prefix.compilers_and_libraries.linux.mpi.intel64.bin - - if self.compiler.name == 'intel': - self.spec.mpicc = bindir.mpiicc - self.spec.mpicxx = bindir.mpiicpc - self.spec.mpifc = bindir.mpiifort - self.spec.mpif77 = bindir.mpiifort - else: - self.spec.mpicc = bindir.mpicc - self.spec.mpicxx = bindir.mpicxx - self.spec.mpifc = bindir.mpif90 - self.spec.mpif77 = bindir.mpif77 - - def setup_environment(self, spack_env, run_env): - """Adds environment variables to the generated module file. - - These environment variables come from running: - - .. code-block:: console - - $ source compilers_and_libraries/linux/mpi/intel64/bin/mpivars.sh - """ - # NOTE: Spack runs setup_environment twice, once pre-build to set up - # the build environment, and once post-installation to determine - # the environment variables needed at run-time to add to the module - # file. The script we need to source is only present post-installation, - # so check for its existence before sourcing. - # TODO: At some point we should split setup_environment into - # setup_build_environment and setup_run_environment to get around - # this problem. - mpivars = os.path.join( - self.prefix.compilers_and_libraries.linux.mpi.intel64.bin, - 'mpivars.sh') - - if os.path.isfile(mpivars): - run_env.extend(EnvironmentModifications.from_sourcing_file( - mpivars)) + def setup_dependent_environment(self, *args): + # Handle in callback, conveying client's compilers in additional arg. + # CAUTION - DUP code in: + # ../intel-mpi/package.py + # ../intel-parallel-studio/package.py + self._setup_dependent_env_callback(*args, compilers_of_client={ + 'CC': spack_cc, + 'CXX': spack_cxx, + 'F77': spack_f77, + 'F90': spack_fc, + 'FC': spack_fc, + }) diff --git a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py index e1f8c208d3..ab72c95fc1 100644 --- a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py +++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py @@ -22,11 +22,7 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## -import glob -import os - from spack import * -from spack.environment import EnvironmentModifications class IntelParallelStudio(IntelPackage): @@ -34,80 +30,85 @@ class IntelParallelStudio(IntelPackage): homepage = "https://software.intel.com/en-us/intel-parallel-studio-xe" - version('professional.2018.3', 'e0fb828de0a5f238f775b6122cc7e2c5', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12999/parallel_studio_xe_2018_update3_professional_edition.tgz') - version('cluster.2018.3', '7112837d20a100b895d9cd9ba9b6748d', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12998/parallel_studio_xe_2018_update3_cluster_edition.tgz') - version('composer.2018.3', '234223cc470717c2095456d9f048d690', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13002/parallel_studio_xe_2018_update3_composer_edition.tgz') - version('professional.2018.1', '91669ff7afbfd07868a429a122c90357', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12375/parallel_studio_xe_2018_update1_professional_edition.tgz') - version('cluster.2018.1', '9c007011e0e3fc72747b58756fbf01cd', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12374/parallel_studio_xe_2018_update1_cluster_edition.tgz') - version('composer.2018.1', '28cb807126d713350f4aa6f9f167448a', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12381/parallel_studio_xe_2018_update1_composer_edition.tgz') - version('professional.2018.0', '9a233854e9218937bc5f46f02b3c7542', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12062/parallel_studio_xe_2018_professional_edition.tgz') - version('cluster.2018.0', 'fa9baeb83dd2e8e4a464e3db38f28d0f', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12058/parallel_studio_xe_2018_cluster_edition.tgz') - version('composer.2018.0', '31ba768fba6e7322957b03feaa3add28', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12067/parallel_studio_xe_2018_composer_edition.tgz') - version('cluster.2017.5', 'baeb8e584317fcdf1f60b8208bd4eab5', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12138/parallel_studio_xe_2017_update5.tgz') - version('professional.2017.4', '27398416078e1e4005afced3e9a6df7e', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11537/parallel_studio_xe_2017_update4.tgz') - version('cluster.2017.4', '27398416078e1e4005afced3e9a6df7e', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11537/parallel_studio_xe_2017_update4.tgz') - version('composer.2017.4', 'd03d351809e182c481dc65e07376d9a2', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11541/parallel_studio_xe_2017_update4_composer_edition.tgz') - version('professional.2017.3', '691874735458d3e88fe0bcca4438b2a9', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11460/parallel_studio_xe_2017_update3.tgz') - version('cluster.2017.3', '691874735458d3e88fe0bcca4438b2a9', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11460/parallel_studio_xe_2017_update3.tgz') - version('composer.2017.3', '52344df122c17ddff3687f84ceb21623', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11464/parallel_studio_xe_2017_update3_composer_edition.tgz') - version('professional.2017.2', '70e54b33d940a1609ff1d35d3c56e3b3', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11298/parallel_studio_xe_2017_update2.tgz') - version('cluster.2017.2', '70e54b33d940a1609ff1d35d3c56e3b3', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11298/parallel_studio_xe_2017_update2.tgz') - version('composer.2017.2', '2891ab1ece43eb61b6ab892f07c47f01', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11302/parallel_studio_xe_2017_update2_composer_edition.tgz') - version('professional.2017.1', '7f75a4a7e2c563be778c377f9d35a542', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/10973/parallel_studio_xe_2017_update1.tgz') - version('cluster.2017.1', '7f75a4a7e2c563be778c377f9d35a542', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/10973/parallel_studio_xe_2017_update1.tgz') - version('composer.2017.1', '1f31976931ed8ec424ac7c3ef56f5e85', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/10978/parallel_studio_xe_2017_update1_composer_edition.tgz') - version('professional.2017.0', '34c98e3329d6ac57408b738ae1daaa01', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9651/parallel_studio_xe_2017.tgz') - version('cluster.2017.0', '34c98e3329d6ac57408b738ae1daaa01', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9651/parallel_studio_xe_2017.tgz') - version('composer.2017.0', 'b67da0065a17a05f110ed1d15c3c6312', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9656/parallel_studio_xe_2017_composer_edition.tgz') - version('professional.2016.4', '16a641a06b156bb647c8a56e71f3bb33', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9781/parallel_studio_xe_2016_update4.tgz') - version('cluster.2016.4', '16a641a06b156bb647c8a56e71f3bb33', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9781/parallel_studio_xe_2016_update4.tgz') - version('composer.2016.4', '2bc9bfc9be9c1968a6e42efb4378f40e', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9785/parallel_studio_xe_2016_composer_edition_update4.tgz') - version('professional.2016.3', 'eda19bb0d0d19709197ede58f13443f3', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9061/parallel_studio_xe_2016_update3.tgz') - version('cluster.2016.3', 'eda19bb0d0d19709197ede58f13443f3', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9061/parallel_studio_xe_2016_update3.tgz') - version('composer.2016.3', '3208eeabee951fc27579177b593cefe9', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9063/parallel_studio_xe_2016_composer_edition_update3.tgz') - version('professional.2016.2', '70be832f2d34c9bf596a5e99d5f2d832', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8676/parallel_studio_xe_2016_update2.tgz') - version('cluster.2016.2', '70be832f2d34c9bf596a5e99d5f2d832', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8676/parallel_studio_xe_2016_update2.tgz') - version('composer.2016.2', '1133fb831312eb519f7da897fec223fa', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8680/parallel_studio_xe_2016_composer_edition_update2.tgz') - version('professional.2015.6', 'd460f362c30017b60f85da2e51ad25bf', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8469/parallel_studio_xe_2015_update6.tgz') - version('cluster.2015.6', 'd460f362c30017b60f85da2e51ad25bf', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8469/parallel_studio_xe_2015_update6.tgz') - version('composer.2015.6', 'da9f8600c18d43d58fba0488844f79c9', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8432/l_compxe_2015.6.233.tgz') + # As of 2016, the product comes in three "editions" that vary by scope. + # + # In Spack, select the edition via the version number in the spec, e.g.: + # intel-parallel-studio@cluster.2018 + + # Cluster Edition (top tier; all components included) + version('cluster.2018.3', '7112837d20a100b895d9cd9ba9b6748d', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12998/parallel_studio_xe_2018_update3_cluster_edition.tgz') + version('cluster.2018.2', '3b8d93a3fa10869dde024b739b96a9c4', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12717/parallel_studio_xe_2018_update2_cluster_edition.tgz') + version('cluster.2018.1', '9c007011e0e3fc72747b58756fbf01cd', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12374/parallel_studio_xe_2018_update1_cluster_edition.tgz') + version('cluster.2018.0', 'fa9baeb83dd2e8e4a464e3db38f28d0f', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12058/parallel_studio_xe_2018_cluster_edition.tgz') + # + version('cluster.2017.7', '158461b000b31f0ef8169b6f0277bfb5', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12856/parallel_studio_xe_2017_update7.tgz') + version('cluster.2017.6', 'b0bbddeec3e78a84b967c9ca70dade77', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12534/parallel_studio_xe_2017_update6.tgz') + version('cluster.2017.5', 'baeb8e584317fcdf1f60b8208bd4eab5', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12138/parallel_studio_xe_2017_update5.tgz') + version('cluster.2017.4', '27398416078e1e4005afced3e9a6df7e', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11537/parallel_studio_xe_2017_update4.tgz') + version('cluster.2017.3', '691874735458d3e88fe0bcca4438b2a9', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11460/parallel_studio_xe_2017_update3.tgz') + version('cluster.2017.2', '70e54b33d940a1609ff1d35d3c56e3b3', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11298/parallel_studio_xe_2017_update2.tgz') + version('cluster.2017.1', '7f75a4a7e2c563be778c377f9d35a542', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/10973/parallel_studio_xe_2017_update1.tgz') + version('cluster.2017.0', '34c98e3329d6ac57408b738ae1daaa01', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9651/parallel_studio_xe_2017.tgz') + # + version('cluster.2016.4', '16a641a06b156bb647c8a56e71f3bb33', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9781/parallel_studio_xe_2016_update4.tgz') + version('cluster.2016.3', 'eda19bb0d0d19709197ede58f13443f3', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9061/parallel_studio_xe_2016_update3.tgz') + version('cluster.2016.2', '70be832f2d34c9bf596a5e99d5f2d832', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8676/parallel_studio_xe_2016_update2.tgz') + version('cluster.2016.1', '83b260ef3fcfd4e30afbeb7eb31b6b20', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8365/parallel_studio_xe_2016_update1.tgz') + version('cluster.2016.0', '00b4de9727a906a3aff468c26dd3f89c', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/7997/parallel_studio_xe_2016.tgz') + # + version('cluster.2015.6', 'd460f362c30017b60f85da2e51ad25bf', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8469/parallel_studio_xe_2015_update6.tgz') + version('cluster.2015.1', '542b78c86beff9d7b01076a7be9c6ddc', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/4992/parallel_studio_xe_2015_update1.tgz') + + # Professional Edition (middle tier; excluded: MPI/TAC/Cluster Checker) + # + # NB: Pre-2018 download packages for Professional are the same as for + # Cluster; differences manifest only in the tokens present in the license + # file delivered as part of the purchase. + version('professional.2018.3', 'e0fb828de0a5f238f775b6122cc7e2c5', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12999/parallel_studio_xe_2018_update3_professional_edition.tgz') + version('professional.2018.2', '91ed14aeb6157d60a0ec39929d0bc778', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12718/parallel_studio_xe_2018_update2_professional_edition.tgz') + version('professional.2018.1', '91669ff7afbfd07868a429a122c90357', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12375/parallel_studio_xe_2018_update1_professional_edition.tgz') + version('professional.2018.0', '9a233854e9218937bc5f46f02b3c7542', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12062/parallel_studio_xe_2018_professional_edition.tgz') + # + version('professional.2017.7', '158461b000b31f0ef8169b6f0277bfb5', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12856/parallel_studio_xe_2017_update7.tgz') + version('professional.2017.6', 'b0bbddeec3e78a84b967c9ca70dade77', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12534/parallel_studio_xe_2017_update6.tgz') + version('professional.2017.5', 'baeb8e584317fcdf1f60b8208bd4eab5', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12138/parallel_studio_xe_2017_update5.tgz') + version('professional.2017.4', '27398416078e1e4005afced3e9a6df7e', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11537/parallel_studio_xe_2017_update4.tgz') + version('professional.2017.3', '691874735458d3e88fe0bcca4438b2a9', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11460/parallel_studio_xe_2017_update3.tgz') + version('professional.2017.2', '70e54b33d940a1609ff1d35d3c56e3b3', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11298/parallel_studio_xe_2017_update2.tgz') + version('professional.2017.1', '7f75a4a7e2c563be778c377f9d35a542', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/10973/parallel_studio_xe_2017_update1.tgz') + version('professional.2017.0', '34c98e3329d6ac57408b738ae1daaa01', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9651/parallel_studio_xe_2017.tgz') + # + version('professional.2016.4', '16a641a06b156bb647c8a56e71f3bb33', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9781/parallel_studio_xe_2016_update4.tgz') + version('professional.2016.3', 'eda19bb0d0d19709197ede58f13443f3', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9061/parallel_studio_xe_2016_update3.tgz') + version('professional.2016.2', '70be832f2d34c9bf596a5e99d5f2d832', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8676/parallel_studio_xe_2016_update2.tgz') + version('professional.2016.1', '83b260ef3fcfd4e30afbeb7eb31b6b20', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8365/parallel_studio_xe_2016_update1.tgz') + version('professional.2016.0', '00b4de9727a906a3aff468c26dd3f89c', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/7997/parallel_studio_xe_2016.tgz') + # + version('professional.2015.6', 'd460f362c30017b60f85da2e51ad25bf', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8469/parallel_studio_xe_2015_update6.tgz') + version('professional.2015.1', '542b78c86beff9d7b01076a7be9c6ddc', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/4992/parallel_studio_xe_2015_update1.tgz') + + # Composer Edition (basic tier; excluded: MPI/..., Advisor/Inspector/Vtune) + version('composer.2018.3', '234223cc470717c2095456d9f048d690', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13002/parallel_studio_xe_2018_update3_composer_edition.tgz') + version('composer.2018.2', '76f820f53de4c1ff998229c983cf4f53', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12722/parallel_studio_xe_2018_update2_composer_edition.tgz') + version('composer.2018.1', '28cb807126d713350f4aa6f9f167448a', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12381/parallel_studio_xe_2018_update1_composer_edition.tgz') + version('composer.2018.0', '31ba768fba6e7322957b03feaa3add28', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12067/parallel_studio_xe_2018_composer_edition.tgz') + # + version('composer.2017.7', '4c02a4a29a8f2424f31baa23116a1001', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12860/parallel_studio_xe_2017_update7_composer_edition.tgz') + version('composer.2017.6', 'd96cce0c3feef20091efde458f581a9f', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12538/parallel_studio_xe_2017_update6_composer_edition.tgz') + # version('composer.2017.5', -- TBD -- + version('composer.2017.4', 'd03d351809e182c481dc65e07376d9a2', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11541/parallel_studio_xe_2017_update4_composer_edition.tgz') + version('composer.2017.3', '52344df122c17ddff3687f84ceb21623', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11464/parallel_studio_xe_2017_update3_composer_edition.tgz') + version('composer.2017.2', '2891ab1ece43eb61b6ab892f07c47f01', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11302/parallel_studio_xe_2017_update2_composer_edition.tgz') + version('composer.2017.1', '1f31976931ed8ec424ac7c3ef56f5e85', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/10978/parallel_studio_xe_2017_update1_composer_edition.tgz') + version('composer.2017.0', 'b67da0065a17a05f110ed1d15c3c6312', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9656/parallel_studio_xe_2017_composer_edition.tgz') + # + version('composer.2016.4', '2bc9bfc9be9c1968a6e42efb4378f40e', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9785/parallel_studio_xe_2016_composer_edition_update4.tgz') + version('composer.2016.3', '3208eeabee951fc27579177b593cefe9', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9063/parallel_studio_xe_2016_composer_edition_update3.tgz') + version('composer.2016.2', '1133fb831312eb519f7da897fec223fa', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8680/parallel_studio_xe_2016_composer_edition_update2.tgz') + # + # Pre-2016, the only product was "Composer XE"; dir structure is different. + version('composer.2015.6', 'da9f8600c18d43d58fba0488844f79c9', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8432/l_compxe_2015.6.233.tgz') + version('composer.2015.1', '85beae681ae56411a8e791a7c44a5c0a', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/4933/l_compxe_2015.1.133.tgz') # Generic Variants variant('rpath', default=True, @@ -151,373 +152,46 @@ class IntelParallelStudio(IntelPackage): variant('vtune', default=False, description='Install the Intel VTune Amplifier XE') - provides('daal', when='+daal') - - provides('ipp', when='+ipp') + provides('daal', when='+daal') + provides('ipp', when='+ipp') - provides('mkl', when='+mkl') - provides('blas', when='+mkl') - provides('lapack', when='+mkl') - provides('scalapack', when='+mkl') + provides('mkl', when='+mkl') + provides('blas', when='+mkl') + provides('lapack', when='+mkl') + provides('scalapack', when='+mkl') - provides('mpi', when='+mpi') + provides('mpi', when='+mpi') + provides('tbb', when='+tbb') - provides('tbb', when='+tbb') + # For TBB, static linkage is not and has never been supported by Intel: + # https://www.threadingbuildingblocks.org/faq/there-version-tbb-provides-statically-linked-libraries + conflicts('+tbb', when='~shared') - # The following components are not available in the Composer Edition conflicts('+advisor', when='@composer.0:composer.9999') conflicts('+clck', when='@composer.0:composer.9999') conflicts('+inspector', when='@composer.0:composer.9999') conflicts('+itac', when='@composer.0:composer.9999') + conflicts('+mpi', when='@composer.0:composer.9999') conflicts('+vtune', when='@composer.0:composer.9999') - @property - def blas_libs(self): - spec = self.spec - prefix = self.prefix - shared = '+shared' in spec - - if '+ilp64' in spec: - mkl_integer = ['libmkl_intel_ilp64'] - else: - mkl_integer = ['libmkl_intel_lp64'] - - mkl_threading = ['libmkl_sequential'] - - omp_libs = LibraryList([]) - - if spec.satisfies('threads=openmp'): - if '%intel' in spec: - mkl_threading = ['libmkl_intel_thread'] - omp_threading = ['libiomp5'] - - omp_root = prefix.compilers_and_libraries.linux.lib.intel64 - omp_libs = find_libraries( - omp_threading, root=omp_root, shared=shared) - elif '%gcc' in spec: - mkl_threading = ['libmkl_gnu_thread'] - - gcc = Executable(self.compiler.cc) - omp_libs = gcc('--print-file-name', 'libgomp.{0}'.format( - dso_suffix), output=str) - omp_libs = LibraryList(omp_libs) - - # TODO: TBB threading: ['libmkl_tbb_thread', 'libtbb', 'libstdc++'] - - mkl_root = prefix.compilers_and_libraries.linux.mkl.lib.intel64 - - mkl_libs = find_libraries( - mkl_integer + mkl_threading + ['libmkl_core'], - root=mkl_root, - shared=shared - ) - - # Intel MKL link line advisor recommends these system libraries - system_libs = find_system_libraries( - ['libpthread', 'libm', 'libdl'], - shared=shared - ) - - return mkl_libs + omp_libs + system_libs - - @property - def lapack_libs(self): - return self.blas_libs - - @property - def scalapack_libs(self): - libnames = ['libmkl_scalapack'] - if self.spec.satisfies('^openmpi'): - libnames.append('libmkl_blacs_openmpi') - elif self.spec.satisfies('^mpich@1'): - libnames.append('libmkl_blacs') - elif self.spec.satisfies('^mpich@2:'): - libnames.append('libmkl_blacs_intelmpi') - elif self.spec.satisfies('^mvapich2'): - libnames.append('libmkl_blacs_intelmpi') - elif self.spec.satisfies('^mpt'): - libnames.append('libmkl_blacs_sgimpt') - # TODO: ^intel-parallel-studio can mean intel mpi, a compiler or a lib - # elif self.spec.satisfies('^intel-parallel-studio'): - # libnames.append('libmkl_blacs_intelmpi') - else: - raise InstallError('No MPI found for scalapack') - - integer = 'ilp64' if '+ilp64' in self.spec else 'lp64' - mkl_root = self.prefix.compilers_and_libraries.linux.mkl.lib.intel64 - shared = True if '+shared' in self.spec else False - - libs = find_libraries( - ['{0}_{1}'.format(l, integer) for l in libnames], - root=mkl_root, - shared=shared - ) - return libs - - @property - def mpi_libs(self): - mpi_root = self.prefix.compilers_and_libraries.linux.mpi.lib64 - query_parameters = self.spec.last_query.extra_parameters - libraries = ['libmpifort', 'libmpi'] - - if 'cxx' in query_parameters: - libraries = ['libmpicxx'] + libraries - - return find_libraries( - libraries, root=mpi_root, shared=True, recursive=True - ) - - @property - def mpi_headers(self): - # recurse from self.prefix will find too many things for all the - # supported sub-architectures like 'mic' - mpi_root = self.prefix.compilers_and_libraries.linux.mpi.include64 - return find_headers('mpi', root=mpi_root, recursive=False) - - @property - def components(self): - spec = self.spec - edition = self.version[0] - - # Intel(R) Compilers - components = [ - # Common files - 'intel-comp-', - 'intel-openmp', - - # C/C++ - 'intel-icc', - - # Fortran - 'intel-ifort', - - # Parallel Studio Documentation and Licensing Files - 'intel-psxe', - ] - - # Intel(R) Parallel Studio XE Suite Files and Documentation - if edition == 'cluster': - components.append('intel-icsxe') - elif edition == 'professional': - components.extend(['intel-ips', 'intel-ipsc', 'intel-ipsf']) - elif edition == 'composer': - components.extend([ - 'intel-compxe', 'intel-ccompxe', 'intel-fcompxe' - ]) - - # Intel(R) Data Analytics Acceleration Library - if '+daal' in spec: - components.append('intel-daal') - - # Intel(R) Debugger for Heterogeneous Compute - if '+gdb' in spec: - components.append('intel-gdb') - - # Intel(R) Integrated Performance Primitives - if '+ipp' in spec: - components.extend(['intel-ipp', 'intel-crypto-ipp']) - - # Intel(R) Math Kernel Library - if '+mkl' in spec: - components.append('intel-mkl') - - # Intel(R) MPI Library - if '+mpi' in spec: - components.extend(['intel-mpi', 'intel-mpirt', 'intel-imb']) - - # Intel(R) Threading Building Blocks - if '+tbb' in spec: - components.append('intel-tbb') - - # Intel(R) Advisor - if '+advisor' in spec: - components.append('intel-advisor') - - # Intel(R) Cluster Checker - if '+clck' in spec: - components.append('intel_clck') - - # Intel(R) Inspector - if '+inspector' in spec: - components.append('intel-inspector') - - # Intel(R) Trace Analyzer and Collector - if '+itac' in spec: - components.extend(['intel-itac', 'intel-ta', 'intel-tc']) - - # Intel(R) VTune(TM) Amplifier XE - if '+vtune' in spec: - components.append('intel-vtune-amplifier') - - return components - - @property - def bin_dir(self): - """The relative path to the bin directory with symlinks resolved.""" - - bin_path = os.path.join(self.prefix.bin, 'icc') - absolute_path = os.path.realpath(bin_path) # resolve symlinks - relative_path = os.path.relpath(absolute_path, self.prefix) - return os.path.dirname(relative_path) - - @property - def lib_dir(self): - """The relative path to the lib directory with symlinks resolved.""" - - lib_path = os.path.join(self.prefix.lib, 'intel64', 'libimf.a') - absolute_path = os.path.realpath(lib_path) # resolve symlinks - relative_path = os.path.relpath(absolute_path, self.prefix) - return os.path.dirname(relative_path) - - @property - def license_files(self): - spec = self.spec - year = self.version[1] - - directories = [ - 'Licenses', - self.bin_dir - ] - - if '+advisor' in spec: - advisor_dir = 'advisor_xe/licenses' - - if year >= 2017: - advisor_dir = 'advisor/licenses' - - directories.append(advisor_dir) - - if '+inspector' in spec: - inspector_dir = 'inspector_xe/licenses' - - if year >= 2017: - inspector_dir = 'inspector/licenses' - - directories.append(inspector_dir) - - if '+itac' in spec: - itac_dir = 'itac_{0}'.format(year) - - directories.append(itac_dir) - - if '+vtune' in spec: - vtune_dir = 'vtune_amplifier_xe/licenses' - - if year >= 2018: - vtune_dir = 'vtune_amplifier/licenses' - - directories.append(vtune_dir) - - return [os.path.join(dir, 'license.lic') for dir in directories] - - @run_after('install') - def filter_compiler_wrappers(self): - spec = self.spec - - if '+mpi' in spec: - if '~newdtags' in spec: - wrappers = [ - 'mpif77', 'mpif90', 'mpigcc', 'mpigxx', - 'mpiicc', 'mpiicpc', 'mpiifort' - ] - wrapper_paths = [] - for root, dirs, files in os.walk(spec.prefix): - for name in files: - if name in wrappers: - wrapper_paths.append(os.path.join(spec.prefix, - root, name)) - for wrapper in wrapper_paths: - filter_file('-Xlinker --enable-new-dtags', ' ', - wrapper, string=True) - - @run_after('install') - def rpath_configuration(self): - spec = self.spec - - if '+rpath' in spec: - lib_dir = os.path.join(self.prefix, self.lib_dir) - for compiler in ['icc', 'icpc', 'ifort']: - cfgfilename = os.path.join( - self.prefix, self.bin_dir, '{0}.cfg'.format(compiler)) - cfgfilename = os.path.abspath(cfgfilename) - with open(cfgfilename, 'w') as f: - f.write('-Xlinker -rpath -Xlinker {0}\n'.format(lib_dir)) - - @run_after('install') - def fix_psxevars(self): - """Newer versions (>2016) of Intel Parallel Studio have a bug in the - ``psxevars.sh`` script.""" - - bindir = glob.glob(join_path( - self.prefix, 'parallel_studio*', 'bin'))[0] - bindir = os.path.abspath(bindir) - if self.version[1] > 2016: - filter_file('^SCRIPTPATH=.*', 'SCRIPTPATH={0}'.format(self.prefix), - os.path.join(bindir, 'psxevars.sh'), - os.path.join(bindir, 'psxevars.csh')) - - def setup_dependent_environment(self, spack_env, run_env, dependent_spec): - if '+mpi' in self.spec: - spack_env.set('I_MPI_CC', spack_cc) - spack_env.set('I_MPI_CXX', spack_cxx) - spack_env.set('I_MPI_F77', spack_fc) - spack_env.set('I_MPI_F90', spack_f77) - spack_env.set('I_MPI_FC', spack_fc) - - # set up MKLROOT for everyone using MKL package - if '+mkl' in self.spec: - mkl_root = self.prefix.compilers_and_libraries.linux.mkl.lib.intel64 # noqa - - spack_env.set('MKLROOT', self.prefix) - spack_env.append_path('SPACK_COMPILER_EXTRA_RPATHS', mkl_root) - - def setup_dependent_package(self, module, dep_spec): - if '+mpi' in self.spec: - # Intel comes with 2 different flavors of MPI wrappers: - # - # * mpiicc, mpiicpc, and mpifort are hardcoded to wrap around - # the Intel compilers. - # * mpicc, mpicxx, mpif90, and mpif77 allow you to set which - # compilers to wrap using I_MPI_CC and friends. By default, - # wraps around the GCC compilers. - # - # In theory, these should be equivalent as long as I_MPI_CC - # and friends are set to point to the Intel compilers, but in - # practice, mpicc fails to compile some applications while - # mpiicc works. - bindir = self.prefix.compilers_and_libraries.linux.mpi.intel64.bin - - if self.compiler.name == 'intel': - self.spec.mpicc = bindir.mpiicc - self.spec.mpicxx = bindir.mpiicpc - self.spec.mpifc = bindir.mpiifort - self.spec.mpif77 = bindir.mpiifort - else: - self.spec.mpicc = bindir.mpicc - self.spec.mpicxx = bindir.mpicxx - self.spec.mpifc = bindir.mpif90 - self.spec.mpif77 = bindir.mpif77 - - def setup_environment(self, spack_env, run_env): - """Adds environment variables to the generated module file. - - These environment variables come from running: - - .. code-block:: console - - $ source parallel_studio_xe_2017/bin/psxevars.sh intel64 - """ - # NOTE: Spack runs setup_environment twice, once pre-build to set up - # the build environment, and once post-installation to determine - # the environment variables needed at run-time to add to the module - # file. The script we need to source is only present post-installation, - # so check for its existence before sourcing. - # TODO: At some point we should split setup_environment into - # setup_build_environment and setup_run_environment to get around - # this problem. - psxevars = glob.glob(join_path( - self.prefix, 'parallel_studio*', 'bin', 'psxevars.sh')) - - if psxevars: - run_env.extend(EnvironmentModifications.from_sourcing_file( - psxevars[0], 'intel64')) + conflicts('+clck', when='@professional.0:professional.9999') + conflicts('+itac', when='@professional.0:professional.9999') + conflicts('+mpi', when='@professional.0:professional.9999') + + # The following components are not available before 2016 + conflicts('+daal', when='@professional.0:professional.2015.7') + conflicts('+daal', when='@cluster.0:cluster.2015.7') + conflicts('+daal', when='@composer.0:composer.2015.7') + + def setup_dependent_environment(self, *args): + # Handle in callback, conveying client's compilers in additional arg. + # CAUTION - DUP code in: + # ../intel-mpi/package.py + # ../intel-parallel-studio/package.py + self._setup_dependent_env_callback(*args, compilers_of_client={ + 'CC': spack_cc, + 'CXX': spack_cxx, + 'F77': spack_f77, + 'F90': spack_fc, + 'FC': spack_fc, + }) diff --git a/var/spack/repos/builtin/packages/intel/package.py b/var/spack/repos/builtin/packages/intel/package.py index 220ff5bcf0..edb4526462 100644 --- a/var/spack/repos/builtin/packages/intel/package.py +++ b/var/spack/repos/builtin/packages/intel/package.py @@ -22,10 +22,7 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## -import os - from spack import * -from spack.environment import EnvironmentModifications class Intel(IntelPackage): @@ -33,82 +30,31 @@ class Intel(IntelPackage): homepage = "https://software.intel.com/en-us/intel-parallel-studio-xe" - version('18.0.3', '234223cc470717c2095456d9f048d690', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13002/parallel_studio_xe_2018_update3_composer_edition.tgz') - version('18.0.1', '28cb807126d713350f4aa6f9f167448a', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12381/parallel_studio_xe_2018_update1_composer_edition.tgz') - version('18.0.0', '31ba768fba6e7322957b03feaa3add28', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12067/parallel_studio_xe_2018_composer_edition.tgz') - version('17.0.4', 'd03d351809e182c481dc65e07376d9a2', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11541/parallel_studio_xe_2017_update4_composer_edition.tgz') - version('17.0.3', '52344df122c17ddff3687f84ceb21623', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11464/parallel_studio_xe_2017_update3_composer_edition.tgz') - version('17.0.2', '2891ab1ece43eb61b6ab892f07c47f01', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11302/parallel_studio_xe_2017_update2_composer_edition.tgz') - version('17.0.1', '1f31976931ed8ec424ac7c3ef56f5e85', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/10978/parallel_studio_xe_2017_update1_composer_edition.tgz') - version('17.0.0', 'b67da0065a17a05f110ed1d15c3c6312', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9656/parallel_studio_xe_2017_composer_edition.tgz') - version('16.0.4', '2bc9bfc9be9c1968a6e42efb4378f40e', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9785/parallel_studio_xe_2016_composer_edition_update4.tgz') - version('16.0.3', '3208eeabee951fc27579177b593cefe9', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9063/parallel_studio_xe_2016_composer_edition_update3.tgz') - version('16.0.2', '1133fb831312eb519f7da897fec223fa', - url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8680/parallel_studio_xe_2016_composer_edition_update2.tgz') + # Same as in ../intel-parallel-studio/package.py, Composer Edition, + # but the version numbering in Spack differs. + version('18.0.3', '234223cc470717c2095456d9f048d690', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13002/parallel_studio_xe_2018_update3_composer_edition.tgz') + version('18.0.2', '76f820f53de4c1ff998229c983cf4f53', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12722/parallel_studio_xe_2018_update2_composer_edition.tgz') + version('18.0.1', '28cb807126d713350f4aa6f9f167448a', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12381/parallel_studio_xe_2018_update1_composer_edition.tgz') + version('18.0.0', '31ba768fba6e7322957b03feaa3add28', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12067/parallel_studio_xe_2018_composer_edition.tgz') + # + version('17.0.7', '4c02a4a29a8f2424f31baa23116a1001', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12860/parallel_studio_xe_2017_update7_composer_edition.tgz') + version('17.0.6', 'd96cce0c3feef20091efde458f581a9f', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12538/parallel_studio_xe_2017_update6_composer_edition.tgz') + # version('17.0.5', -- TBD -- + version('17.0.4', 'd03d351809e182c481dc65e07376d9a2', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11541/parallel_studio_xe_2017_update4_composer_edition.tgz') + version('17.0.3', '52344df122c17ddff3687f84ceb21623', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11464/parallel_studio_xe_2017_update3_composer_edition.tgz') + version('17.0.2', '2891ab1ece43eb61b6ab892f07c47f01', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11302/parallel_studio_xe_2017_update2_composer_edition.tgz') + version('17.0.1', '1f31976931ed8ec424ac7c3ef56f5e85', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/10978/parallel_studio_xe_2017_update1_composer_edition.tgz') + version('17.0.0', 'b67da0065a17a05f110ed1d15c3c6312', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9656/parallel_studio_xe_2017_composer_edition.tgz') + # + version('16.0.4', '2bc9bfc9be9c1968a6e42efb4378f40e', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9785/parallel_studio_xe_2016_composer_edition_update4.tgz') + version('16.0.3', '3208eeabee951fc27579177b593cefe9', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9063/parallel_studio_xe_2016_composer_edition_update3.tgz') + version('16.0.2', '1133fb831312eb519f7da897fec223fa', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8680/parallel_studio_xe_2016_composer_edition_update2.tgz') + # + # Grandfathered release; different directory structure. + version('15.0.6', 'da9f8600c18d43d58fba0488844f79c9', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8432/l_compxe_2015.6.233.tgz') + version('15.0.1', '85beae681ae56411a8e791a7c44a5c0a', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/4933/l_compxe_2015.1.133.tgz') variant('rpath', default=True, description='Add rpath to .cfg files') - components = [ - # Common files - 'intel-comp-', - 'intel-openmp', - - # C/C++ - 'intel-icc', - - # Fortran - 'intel-ifort', - ] - - @property - def license_files(self): - return [ - 'Licenses/license.lic', - join_path('compilers_and_libraries', 'linux', 'bin', - 'intel64', 'license.lic') - ] - - @run_after('install') - def rpath_configuration(self): - if '+rpath' in self.spec: - bin_dir = join_path(self.prefix, 'compilers_and_libraries', - 'linux', 'bin', 'intel64') - lib_dir = join_path(self.prefix, 'compilers_and_libraries', - 'linux', 'compiler', 'lib', 'intel64_lin') - for compiler in ['icc', 'icpc', 'ifort']: - cfgfilename = join_path(bin_dir, '{0}.cfg'.format(compiler)) - with open(cfgfilename, 'w') as f: - f.write('-Xlinker -rpath -Xlinker {0}\n'.format(lib_dir)) - - def setup_environment(self, spack_env, run_env): - """Adds environment variables to the generated module file. - - These environment variables come from running: - - .. code-block:: console - - $ source bin/compilervars.sh intel64 - """ - # NOTE: Spack runs setup_environment twice, once pre-build to set up - # the build environment, and once post-installation to determine - # the environment variables needed at run-time to add to the module - # file. The script we need to source is only present post-installation, - # so check for its existence before sourcing. - # TODO: At some point we should split setup_environment into - # setup_build_environment and setup_run_environment to get around - # this problem. - compilervars = os.path.join(self.prefix.bin, 'compilervars.sh') - - if os.path.isfile(compilervars): - run_env.extend(EnvironmentModifications.from_sourcing_file( - compilervars, 'intel64')) + # Since the current package is a subset of 'intel-parallel-studio', + # all remaining Spack actions are handled in the package class. -- cgit v1.2.3-70-g09d2 From 535b09d81125c3626be02716dd0cff62e0517ebc Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Thu, 30 Aug 2018 08:41:21 -0500 Subject: singularity: new version --- var/spack/repos/builtin/packages/singularity/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/singularity/package.py b/var/spack/repos/builtin/packages/singularity/package.py index e85b51d6ad..d26a905fa7 100644 --- a/var/spack/repos/builtin/packages/singularity/package.py +++ b/var/spack/repos/builtin/packages/singularity/package.py @@ -36,6 +36,7 @@ class Singularity(AutotoolsPackage): # Versions before 2.5.2 suffer from a serious security problem. # https://nvd.nist.gov/vuln/detail/CVE-2018-12021 version('develop', branch='master') + version('2.6.0', sha256='7c425211a099f6fa6f74037e6e17be58fb5923b0bd11aea745e48ef83c488b49') version('2.5.2', '2edc1a8ac9a4d7d26fba6244f1c5fd95') depends_on('libarchive', when='@2.5.2:') -- cgit v1.2.3-70-g09d2 From 20a914374e5ee346d9824d95a32546915bb7f1e2 Mon Sep 17 00:00:00 2001 From: rice31 <42845593+rice31@users.noreply.github.com> Date: Fri, 31 Aug 2018 10:26:13 -0700 Subject: libpng package: add version (#9142) --- var/spack/repos/builtin/packages/libpng/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libpng/package.py b/var/spack/repos/builtin/packages/libpng/package.py index 7fcb9d15e2..c5178f1b4a 100644 --- a/var/spack/repos/builtin/packages/libpng/package.py +++ b/var/spack/repos/builtin/packages/libpng/package.py @@ -35,6 +35,7 @@ class Libpng(AutotoolsPackage): version('1.6.34', '03fbc5134830240104e96d3cda648e71') version('1.6.29', '68553080685f812d1dd7a6b8215c37d8') + version('1.6.28', '897ccec1ebfb0922e83c2bfaa1be8748') version('1.6.27', '58698519e9f6126c1caeefc28dbcbd5f') # From http://www.libpng.org/pub/png/libpng.html (2017-01-04) # Virtually all libpng versions through 1.6.26, 1.5.27, -- cgit v1.2.3-70-g09d2 From d54a91fd2b50fe459bebdcc4deaf4e29df92c074 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Fri, 31 Aug 2018 11:14:37 -0700 Subject: openblas@0.3.3: new version (#9143) --- var/spack/repos/builtin/packages/openblas/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openblas/package.py b/var/spack/repos/builtin/packages/openblas/package.py index a4c226584b..3add6db25c 100644 --- a/var/spack/repos/builtin/packages/openblas/package.py +++ b/var/spack/repos/builtin/packages/openblas/package.py @@ -37,6 +37,7 @@ class Openblas(MakefilePackage): git = 'https://github.com/xianyi/OpenBLAS.git' version('develop', branch='develop') + version('0.3.3', sha256='49d88f4494ae780e3d7fa51769c00d982d7cdb73e696054ac3baa81d42f13bab') version('0.3.2', sha256='e8ba64f6b103c511ae13736100347deb7121ba9b41ba82052b1a018a65c0cb15') version('0.3.0', '42cde2c1059a8a12227f1e6551c8dbd2') version('0.2.20', '48637eb29f5b492b91459175dcc574b1') -- cgit v1.2.3-70-g09d2 From 3d92b975f3c8fedf703ee5ecbebfed06f6e4e1c7 Mon Sep 17 00:00:00 2001 From: Francesco Di Natale Date: Fri, 31 Aug 2018 12:21:55 -0600 Subject: py-filelock: new package (#9136) * Addition of py-filelock and first page of versions. * Addition of setup.py patch for setuptools. * flake8 failure fixes. * Reduced url declaration to a single line. * Correction to py-filelock to use distutils. --- .../repos/builtin/packages/py-filelock/package.py | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-filelock/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-filelock/package.py b/var/spack/repos/builtin/packages/py-filelock/package.py new file mode 100644 index 0000000000..757cfb8006 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-filelock/package.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyFilelock(PythonPackage): + """This package contains a single module, which implements a platform + independent file lock in Python, which provides a simple way of + inter-process communication""" + + homepage = "https://github.com/benediktschmitt/py-filelock" + url = "https://github.com/benediktschmitt/py-filelock/archive/v3.0.4.tar.gz" + + version('3.0.4', '3cafce82375c3b635f2c872acaf3a00b') + version('3.0.3', 'e4bd69f15ebcc6d5a3d684cea3694840') + version('3.0.1', 'cbf41ad3d89c89e2b752bc85b501dff6') + version('3.0.0', '29d199e8998ac324d0d7cab7aa814943') + version('2.0.13', 'cdd0c4f3e905fbab76d1202ce8e8b454') + version('2.0.12', 'fffda24b6cfd459ea5d2d5c335e949e2') + version('2.0.11', '9e8cbbe18494d12647050bb32a7e624d') + version('2.0.10', '1791e72bb19e503fdd0f365fb8ce2a4d') + version('2.0.9', 'b0269e7f77a090cc0d5fc9cf5fbe6ac2') + version('2.0.8', '939ec6d4e2ecdc353a1f27fc452d8e8c') -- cgit v1.2.3-70-g09d2 From e7df911026d799adae6af28f6667b1a6145be212 Mon Sep 17 00:00:00 2001 From: Cody Balos Date: Fri, 31 Aug 2018 12:14:15 -0700 Subject: SUNDIALS: add new versions, update hashes, and apply clang fix (#9115) Added SUNDIALS 3.1.2 and 4.0.0-dev.1 versions and relevant dependencies (3.1.2 requires CMake 2.8.12). Updated all versions to use sha256 hashes. Addressed issue specific to clang compiler on macOS. --- .../repos/builtin/packages/sundials/package.py | 44 +++++++++++++++------- 1 file changed, 30 insertions(+), 14 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sundials/package.py b/var/spack/repos/builtin/packages/sundials/package.py index 138304c660..989dedd716 100644 --- a/var/spack/repos/builtin/packages/sundials/package.py +++ b/var/spack/repos/builtin/packages/sundials/package.py @@ -33,18 +33,29 @@ class Sundials(CMakePackage): homepage = "https://computation.llnl.gov/projects/sundials" url = "https://computation.llnl.gov/projects/sundials/download/sundials-2.7.0.tar.gz" - maintainers = ['cswoodward', 'gardner48'] + maintainers = ['cswoodward', 'gardner48', 'balos1'] # ========================================================================== # Versions # ========================================================================== - version('4.0.0-dev', '1d4b538721b84ebc91ce7ad92d94beae') - version('3.1.1', 'e63f4de0be5be97f750b30b0fa11ef34', preferred=True) - version('3.1.0', '1a84ca41c7f71067e03d519ddbcd9dae') - version('3.0.0', '5163a44cedd7398bddda442ba00313b8') - version('2.7.0', 'c304631b9bc82877d7b0e9f4d4fd94d3') - version('2.6.2', '3deeb0ede9f514184c6bd83ecab77d95') + version('4.0.0-dev.1', + sha256='6354e1d266b60c23766137b4ffa9bbde8bca97a562ccd94cab756b597ed753c1') + version('4.0.0-dev', + sha256='50e526327461aebe463accf6ef56f9c6773df65025f3020b9ce68b83bbf5dd27') + version('3.1.2', + sha256='a8985bb1e851d90e24260450667b134bc13d71f5c6effc9e1d7183bd874fe116', + preferred=True) + version('3.1.1', + sha256='a24d643d31ed1f31a25b102a1e1759508ce84b1e4739425ad0e18106ab471a24') + version('3.1.0', + sha256='18d52f8f329626f77b99b8bf91e05b7d16b49fde2483d3a0ea55496ce4cdd43a') + version('3.0.0', + sha256='28b8e07eecfdef66e2c0d0ea0cb1b91af6e4e94d71008abfe80c27bf39f63fde') + version('2.7.0', + sha256='d39fcac7175d701398e4eb209f7e92a5b30a78358d4a0c0fcc23db23c11ba104') + version('2.6.2', + sha256='d8ed0151509dd2b0f317b318a4175f8b95a174340fc3080b8c20617da8aa4d2f') # ========================================================================== # Variants @@ -166,6 +177,7 @@ class Sundials(CMakePackage): # Build dependencies depends_on('cmake@2.8.1:', type='build') + depends_on('cmake@2.8.12:', type='build', when='@3.1.2') depends_on('cmake@3.0.2:', type='build', when='@4.0.0:') # MPI related dependencies @@ -218,7 +230,7 @@ class Sundials(CMakePackage): return 'ON' if varstr in self.spec else 'OFF' fortran_flag = self.compiler.pic_flag - if spec.satisfies('%clang platform=darwin'): + if (spec.satisfies('%clang platform=darwin')) and ('+fcmix' in spec): f77 = Executable(self.compiler.f77) libgfortran = LibraryList(f77('--print-file-name', 'libgfortran.a', output=str)) @@ -377,6 +389,8 @@ class Sundials(CMakePackage): Spack's generic cc and f77. We want them to be bound to whatever compiler they were built with.""" + spec = self.spec + kwargs = {'ignore_absent': True, 'backup': False, 'string': True} dirname = os.path.join(self.prefix, 'examples') @@ -472,13 +486,15 @@ class Sundials(CMakePackage): filter_file(r'^CPP\s*=.*', self.compiler.cc, os.path.join(dirname, filename), **kwargs) - for filename in f77_files: - filter_file(os.environ['F77'], self.compiler.f77, - os.path.join(dirname, filename), **kwargs) + if ('+fcmix' in spec) and ('+examples-f77' in spec): + for filename in f77_files: + filter_file(os.environ['F77'], self.compiler.f77, + os.path.join(dirname, filename), **kwargs) - for filename in f90_files: - filter_file(os.environ['FC'], self.compiler.fc, - os.path.join(dirname, filename), **kwargs) + if ('+fcmix' in spec) and ('+examples-f90' in spec): + for filename in f90_files: + filter_file(os.environ['FC'], self.compiler.fc, + os.path.join(dirname, filename), **kwargs) @property def headers(self): -- cgit v1.2.3-70-g09d2 From c5c3b65c60be0034e140929135c8e4d7e2ade940 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sat, 1 Sep 2018 07:32:24 -0500 Subject: GDAL: add version 2.3.1 (#9156) --- var/spack/repos/builtin/packages/gdal/package.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gdal/package.py b/var/spack/repos/builtin/packages/gdal/package.py index f29d4b8709..250a3b9941 100644 --- a/var/spack/repos/builtin/packages/gdal/package.py +++ b/var/spack/repos/builtin/packages/gdal/package.py @@ -37,19 +37,22 @@ class Gdal(AutotoolsPackage): """ homepage = "http://www.gdal.org/" - url = "http://download.osgeo.org/gdal/2.3.0/gdal-2.3.0.tar.xz" + url = "http://download.osgeo.org/gdal/2.3.1/gdal-2.3.1.tar.xz" list_url = "http://download.osgeo.org/gdal/" list_depth = 1 + maintainers = ['adamjstewart'] + import_modules = [ 'osgeo', 'osgeo.gdal', 'osgeo.ogr', 'osgeo.osr', 'osgeo.gdal_array', 'osgeo.gdalconst' ] - version('2.3.0', '2fe9d64fcd9dc37645940df020d3e200') - version('2.1.2', 'ae85b78888514c75e813d658cac9478e') - version('2.0.2', '940208e737c87d31a90eaae43d0efd65') - version('1.11.5', '5fcee5622430fbeb25556a4d07c06dd7') + version('2.3.1', sha256='9c4625c45a3ee7e49a604ef221778983dd9fd8104922a87f20b99d9bedb7725a') + version('2.3.0', sha256='6f75e49aa30de140525ccb58688667efe3a2d770576feb7fbc91023b7f552aa2') + version('2.1.2', sha256='b597f36bd29a2b4368998ddd32b28c8cdf3c8192237a81b99af83cc17d7fa374') + version('2.0.2', sha256='90f838853cc1c07e55893483faa7e923e4b4b1659c6bc9df3538366030a7e622') + version('1.11.5', sha256='d4fdc3e987b9926545f0a514b4328cd733f2208442f8d03bde630fe1f7eff042') variant('libtool', default=True, description='Use libtool to build the library') variant('libz', default=True, description='Include libz support') @@ -88,7 +91,9 @@ class Gdal(AutotoolsPackage): variant('cryptopp', default=False, description='Include cryptopp support') variant('crypto', default=False, description='Include crypto (from openssl) support') - extends('perl', when='+perl') + # FIXME: Allow packages to extend multiple packages + # See https://github.com/spack/spack/issues/987 + # extends('perl', when='+perl') extends('python', when='+python') # GDAL depends on GNUmake on Unix platforms. @@ -131,9 +136,10 @@ class Gdal(AutotoolsPackage): depends_on('qhull', when='+qhull @2.1:') depends_on('opencl', when='+opencl') depends_on('poppler', when='+poppler') + depends_on('poppler@:0.63', when='@:2.3.0 +poppler') depends_on('proj', when='+proj @2.3:') depends_on('perl', type=('build', 'run'), when='+perl') - depends_on('python', type=('build', 'run'), when='+python') + depends_on('python', type=('build', 'link', 'run'), when='+python') # swig/python/setup.py depends_on('py-setuptools', type='build', when='+python') depends_on('py-numpy@1.0.0:', type=('build', 'run'), when='+python') -- cgit v1.2.3-70-g09d2 From 4920f1cff14b5a5f0224e2307745eabf2be77ec4 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sat, 1 Sep 2018 08:12:14 -0500 Subject: Vim: add version 8.1.0338 (#9155) --- var/spack/repos/builtin/packages/vim/package.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/vim/package.py b/var/spack/repos/builtin/packages/vim/package.py index 407ad12df9..e1c6d8bc55 100644 --- a/var/spack/repos/builtin/packages/vim/package.py +++ b/var/spack/repos/builtin/packages/vim/package.py @@ -35,8 +35,9 @@ class Vim(AutotoolsPackage): """ homepage = "http://www.vim.org" - url = "https://github.com/vim/vim/archive/v8.0.1376.tar.gz" + url = "https://github.com/vim/vim/archive/v8.1.0338.tar.gz" + version('8.1.0338', '94191b4141245a5deb4955c4a80359bb') version('8.1.0001', 'edb6f5c67cb3100ea9e3966a43b9c9da') version('8.0.1376', '62855881a2d96d48956859d74cfb8a3b') version('8.0.0503', '82b77bd5cb38b70514bed47cfe033b8c') @@ -142,6 +143,10 @@ class Vim(AutotoolsPackage): return configure_args + # Tests must be run in serial + def check(self): + make('test', parallel=False) + # Run the install phase with -j 1. There seems to be a problem with # parallel builds that results in the creation of the links (e.g. view) # to the vim binary silently failing. -- cgit v1.2.3-70-g09d2 From 734d6306a261d209579ae473e5a004b65f55f6e2 Mon Sep 17 00:00:00 2001 From: David Wells Date: Mon, 3 Sep 2018 10:43:00 -0400 Subject: Fix two dependencies with silo. (#9153) 1. I presently get errors of the sort ==> Error: KeyError: 'No spec with name mpi in silo@4.10.2%gcc@8.1.0+fortran+mpi [...] $HOME/spack/var/spack/repos/builtin/packages/silo/package.py:84, in configure_args: 81 'FCFLAGS={0}'.format(self.compiler.pic_flag)] 82 83 if '+mpi' in self.spec: >> 84 config_args.append('CC=%s' % self.spec['mpi'].mpicc) 85 config_args.append('CXX=%s' % self.spec['mpi'].mpicxx) 86 config_args.append('FC=%s' % self.spec['mpi'].mpifc) without the extra explicit MPI dependency. 2. Silo uses zlib, so we should explicitly depend on it. --- var/spack/repos/builtin/packages/silo/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/silo/package.py b/var/spack/repos/builtin/packages/silo/package.py index d236a661f2..86c19e77f9 100644 --- a/var/spack/repos/builtin/packages/silo/package.py +++ b/var/spack/repos/builtin/packages/silo/package.py @@ -48,8 +48,10 @@ class Silo(AutotoolsPackage): description='Compile with MPI Compatibility') depends_on('hdf5~mpi', when='~mpi') + depends_on('mpi', when='+mpi') depends_on('hdf5+mpi', when='+mpi') depends_on('qt', when='+silex') + depends_on('zlib') patch('remove-mpiposix.patch', when='@4.8:4.10.2') -- cgit v1.2.3-70-g09d2 From 4df60caf5bd95dd764ed13e2352b4d28cd595ee0 Mon Sep 17 00:00:00 2001 From: Matthias Wolf Date: Tue, 4 Sep 2018 03:25:17 +0200 Subject: msgpack-c, snappy: explicitly depend on googletest (#9167) --- var/spack/repos/builtin/packages/msgpack-c/package.py | 5 ++++- var/spack/repos/builtin/packages/snappy/link_gtest.patch | 11 +++++++++++ var/spack/repos/builtin/packages/snappy/package.py | 8 +++++++- 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 var/spack/repos/builtin/packages/snappy/link_gtest.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/msgpack-c/package.py b/var/spack/repos/builtin/packages/msgpack-c/package.py index 0312b874f0..d8104555bb 100644 --- a/var/spack/repos/builtin/packages/msgpack-c/package.py +++ b/var/spack/repos/builtin/packages/msgpack-c/package.py @@ -34,10 +34,13 @@ class MsgpackC(CMakePackage): version('1.4.1', 'e2fd3a7419b9bc49e5017fdbefab87e0') depends_on('cmake@2.8.12:', type='build') + depends_on('googletest', type='test') def cmake_args(self): args = [ "-DCMAKE_CXX_FLAGS=-Wno-implicit-fallthrough", - "-DCMAKE_C_FLAGS=-Wno-implicit-fallthrough" + "-DCMAKE_C_FLAGS=-Wno-implicit-fallthrough", + '-DMSGPACK_BUILD_TESTS:BOOL={0}'.format( + 'ON' if self.run_tests else 'OFF') ] return args diff --git a/var/spack/repos/builtin/packages/snappy/link_gtest.patch b/var/spack/repos/builtin/packages/snappy/link_gtest.patch new file mode 100644 index 0000000000..7a95b77036 --- /dev/null +++ b/var/spack/repos/builtin/packages/snappy/link_gtest.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt 2018-09-03 14:25:32.390110709 +0200 ++++ b/CMakeLists.txt 2018-09-03 14:24:16.198182317 +0200 +@@ -118,7 +118,7 @@ + "${PROJECT_SOURCE_DIR}/snappy-test.cc" + ) + target_compile_definitions(snappy_unittest PRIVATE -DHAVE_CONFIG_H) +- target_link_libraries(snappy_unittest snappy ${GFLAGS_LIBRARIES}) ++ target_link_libraries(snappy_unittest snappy ${GFLAGS_LIBRARIES} ${GTEST_LIBRARIES}) + + if(HAVE_LIBZ) + target_link_libraries(snappy_unittest z) diff --git a/var/spack/repos/builtin/packages/snappy/package.py b/var/spack/repos/builtin/packages/snappy/package.py index cdcd192056..5a689a05d0 100644 --- a/var/spack/repos/builtin/packages/snappy/package.py +++ b/var/spack/repos/builtin/packages/snappy/package.py @@ -36,6 +36,10 @@ class Snappy(CMakePackage): variant('shared', default=True, description='Build shared libraries') variant('pic', default=True, description='Build position independent code') + depends_on('googletest', type='test') + + patch('link_gtest.patch') + def cmake_args(self): spec = self.spec @@ -43,7 +47,9 @@ class Snappy(CMakePackage): '-DCMAKE_INSTALL_LIBDIR:PATH={0}'.format( self.prefix.lib), '-DBUILD_SHARED_LIBS:BOOL={0}'.format( - 'ON' if '+shared' in spec else 'OFF') + 'ON' if '+shared' in spec else 'OFF'), + '-DSNAPPY_BUILD_TESTS:BOOL={0}'.format( + 'ON' if self.run_tests else 'OFF') ] return args -- cgit v1.2.3-70-g09d2 From 801f1a0a7d5cb402d34005b433fa3b67dbbbd746 Mon Sep 17 00:00:00 2001 From: Adam Moody Date: Mon, 3 Sep 2018 18:34:07 -0700 Subject: mpifileutils: add v0.8 (#9152) --- var/spack/repos/builtin/packages/mpifileutils/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mpifileutils/package.py b/var/spack/repos/builtin/packages/mpifileutils/package.py index 61a2a2d11d..9d0132e93e 100644 --- a/var/spack/repos/builtin/packages/mpifileutils/package.py +++ b/var/spack/repos/builtin/packages/mpifileutils/package.py @@ -40,6 +40,7 @@ class Mpifileutils(AutotoolsPackage): git = "https://github.com/hpc/mpifileutils.git" version('develop', branch='master') + version('0.8', '1082600e7ac4e6b2c13d91bbec40cffb') version('0.7', 'c081f7f72c4521dddccdcf9e087c5a2b') version('0.6', '620bcc4966907481f1b1a965b28fc9bf') @@ -49,7 +50,8 @@ class Mpifileutils(AutotoolsPackage): # need precise version of dtcmp, since DTCMP_Segmented_exscan added # in v1.0.3 but renamed in v1.1.0 and later - depends_on('dtcmp@1.0.3') + depends_on('dtcmp@1.0.3', when='@:0.7') + depends_on('dtcmp@1.1.0:', when='@0.8:') depends_on('libarchive') -- cgit v1.2.3-70-g09d2 From e3bae8f9363a4942b31970f487dff266c05fffd2 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Mon, 3 Sep 2018 20:34:41 -0500 Subject: py-matplotlib: incorporate 8532 w/ version range (#9151) * py-matplotlib: Add patch to fix FreeType library detection Adds patch to add $CPATH to locations searched for FreeType header file Patch has been upstreamed: https://github.com/matplotlib/matplotlib/pull/11457 * py-matplotlib: Add patch to fix FreeType library detection * Make patch only apply to versin 2.2.2 (as already upstreamed) * Fix flake8 format issue * py-matplotlib: add range to freetype patch * py-matplotlib: whitespace --- .../packages/py-matplotlib/freetype-include-path.patch | 16 ++++++++++++++++ .../repos/builtin/packages/py-matplotlib/package.py | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-matplotlib/freetype-include-path.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-matplotlib/freetype-include-path.patch b/var/spack/repos/builtin/packages/py-matplotlib/freetype-include-path.patch new file mode 100644 index 0000000000..7007c88d0d --- /dev/null +++ b/var/spack/repos/builtin/packages/py-matplotlib/freetype-include-path.patch @@ -0,0 +1,16 @@ +diff --git a/setupext.py b/setupext.py +index 6d363012eb4..00ef3fe5a3d 100644 +--- a/setupext.py ++++ b/setupext.py +@@ -162,8 +162,10 @@ def get_include_dirs(): + """ + include_dirs = [os.path.join(d, 'include') for d in get_base_dirs()] + if sys.platform != 'win32': +- # gcc includes this dir automatically, so also look for headers in ++ # gcc includes these dirs automatically, so also look for headers in + # these dirs ++ include_dirs.extend( ++ os.environ.get('CPATH', '').split(os.pathsep)) + include_dirs.extend( + os.environ.get('CPLUS_INCLUDE_PATH', '').split(os.pathsep)) + return include_dirs diff --git a/var/spack/repos/builtin/packages/py-matplotlib/package.py b/var/spack/repos/builtin/packages/py-matplotlib/package.py index a1947b18dd..38db52146b 100644 --- a/var/spack/repos/builtin/packages/py-matplotlib/package.py +++ b/var/spack/repos/builtin/packages/py-matplotlib/package.py @@ -34,6 +34,7 @@ class PyMatplotlib(PythonPackage): homepage = "https://pypi.python.org/pypi/matplotlib" url = "https://pypi.io/packages/source/m/matplotlib/matplotlib-2.0.2.tar.gz" + version('2.2.3', '403b0bddd751d71187416f20d4cff100') version('2.2.2', 'dd1e49e041309a7fd4e32be8bf17c3b6') version('2.0.2', '061111784278bde89b5d4987014be4ca') version('2.0.0', '7aa54b06327f0e1c4f3877fc2f7d6b17') @@ -68,6 +69,7 @@ class PyMatplotlib(PythonPackage): depends_on('libpng@1.2:') depends_on('freetype@2.3:') + patch('freetype-include-path.patch', when='@2.2.2:2.9.9') # Patch to pick up correct freetype headers depends_on('py-numpy@1.6:', type=('build', 'run')) depends_on('py-dateutil@1.1:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From ccd96a2fedfc4ddf0d0eac931797ab59bc5e0a97 Mon Sep 17 00:00:00 2001 From: Jim Galarowicz Date: Mon, 3 Sep 2018 20:35:25 -0500 Subject: Update openspeedshop and cbtf version numbers (#9150) Update the version numbers and now depend on the develop version of dyninst because of a feature in openspeedshop depends on new code in the dyninst develop tree. Without dyninst develop, openspeedshop will not build. --- var/spack/repos/builtin/packages/cbtf-argonavis/package.py | 1 + var/spack/repos/builtin/packages/cbtf-krell/package.py | 4 +++- var/spack/repos/builtin/packages/cbtf-lanl/package.py | 1 + var/spack/repos/builtin/packages/cbtf/package.py | 1 + var/spack/repos/builtin/packages/openspeedshop-utils/package.py | 3 ++- var/spack/repos/builtin/packages/openspeedshop/package.py | 4 +++- 6 files changed, 11 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py index 3c1bb0de49..7f837e88a3 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py @@ -51,6 +51,7 @@ class CbtfArgonavis(CMakePackage): git = "https://github.com/OpenSpeedShop/cbtf-argonavis.git" version('develop', branch='master') + version('1.9.1.2', branch='1.9.1.2') version('1.9.1.1', branch='1.9.1.1') version('1.9.1.0', branch='1.9.1.0') diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py index 62d6833adf..e5658c778a 100644 --- a/var/spack/repos/builtin/packages/cbtf-krell/package.py +++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py @@ -55,6 +55,7 @@ class CbtfKrell(CMakePackage): git = "https://github.com/OpenSpeedShop/cbtf-krell.git" version('develop', branch='master') + version('1.9.1.2', branch='1.9.1.2') version('1.9.1.1', branch='1.9.1.1') version('1.9.1.0', branch='1.9.1.0') @@ -94,7 +95,8 @@ class CbtfKrell(CMakePackage): # For Dyninst depends_on("dyninst@develop", when='@develop') - depends_on("dyninst@9.3.2", when='@1.9.1.0:9999') + # This will change to dyninst@10.0 when it is released + depends_on("dyninst@develop", when='@1.9.1.0:9999') # For MRNet depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti') diff --git a/var/spack/repos/builtin/packages/cbtf-lanl/package.py b/var/spack/repos/builtin/packages/cbtf-lanl/package.py index b61723575b..dfbe7c4709 100644 --- a/var/spack/repos/builtin/packages/cbtf-lanl/package.py +++ b/var/spack/repos/builtin/packages/cbtf-lanl/package.py @@ -51,6 +51,7 @@ class CbtfLanl(CMakePackage): git = "https://github.com/OpenSpeedShop/cbtf-lanl.git" version('develop', branch='master') + version('1.9.1.2', branch='1.9.1.2') version('1.9.1.1', branch='1.9.1.1') version('1.9.1.0', branch='1.9.1.0') diff --git a/var/spack/repos/builtin/packages/cbtf/package.py b/var/spack/repos/builtin/packages/cbtf/package.py index e50b205180..1d588ade93 100644 --- a/var/spack/repos/builtin/packages/cbtf/package.py +++ b/var/spack/repos/builtin/packages/cbtf/package.py @@ -54,6 +54,7 @@ class Cbtf(CMakePackage): git = "https://github.com/OpenSpeedShop/cbtf.git" version('develop', branch='master') + version('1.9.1.2', branch='1.9.1.2') version('1.9.1.1', branch='1.9.1.1') version('1.9.1.0', branch='1.9.1.0') diff --git a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py index ef1be9dbfd..74dfeb8ffa 100644 --- a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py @@ -130,7 +130,8 @@ class OpenspeedshopUtils(CMakePackage): depends_on("boost@1.66.0", when='@2.3.1.3:9999') depends_on("dyninst@develop", when='@develop') - depends_on("dyninst@9.3.2", when='@2.3.1.3:9999') + # This will change to dyninst@10.0 when it is released + depends_on("dyninst@develop", when='@2.3.1.3:9999') depends_on("python", when='@develop') depends_on("python@2.7.14:2.7.15", when='@2.3.1.3:9999') diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py index 462b1abe4f..721466a2fe 100644 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop/package.py @@ -66,6 +66,7 @@ class Openspeedshop(CMakePackage): git = "https://github.com/OpenSpeedShop/openspeedshop.git" version('develop', branch='master') + version('2.3.1.5', branch='2.3.1.5') version('2.3.1.4', branch='2.3.1.4') version('2.3.1.3', branch='2.3.1.3') @@ -128,7 +129,8 @@ class Openspeedshop(CMakePackage): depends_on("boost@1.66.0", when='@2.3.1.3:9999') depends_on("dyninst@develop", when='@develop') - depends_on("dyninst@9.3.2", when='@2.3.1.3:9999') + # This will change to version dyninst@10.0 when it is released + depends_on("dyninst@develop", when='@2.3.1.3:9999') depends_on("python", when='@develop') depends_on("python@2.7.14:2.7.15", when='@2.3.1.3:9999') -- cgit v1.2.3-70-g09d2 From 89c77051fe7d6fbc5942a08e3453942150c9c869 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Mon, 3 Sep 2018 21:35:45 -0400 Subject: aspect: new version (#9146) --- var/spack/repos/builtin/packages/aspect/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/aspect/package.py b/var/spack/repos/builtin/packages/aspect/package.py index f19f6b470b..61a9efa3a8 100644 --- a/var/spack/repos/builtin/packages/aspect/package.py +++ b/var/spack/repos/builtin/packages/aspect/package.py @@ -36,7 +36,8 @@ class Aspect(CMakePackage): maintainers = ['tjhei'] version('develop', branch='master') - version('2.0.0', 'dfecc571fb221f28a0800034cd29c95c') + version('2.0.1', sha256='0bf5600c42afce9d39c1d285b0654ecfdeb0f30e9f3421651c95f54ca01ac165') + version('2.0.0', sha256='d485c07f54248e824bdfa35f3eec8971b65e8b7114552ffa2c771bc0dede8cc0') variant('build_type', default='Release', description='The build type to build', -- cgit v1.2.3-70-g09d2 From 6e7af3362e20251742f5d07febff8d4ffa99ecd3 Mon Sep 17 00:00:00 2001 From: rice31 <42845593+rice31@users.noreply.github.com> Date: Mon, 3 Sep 2018 18:36:15 -0700 Subject: added version for kull support (#9141) --- var/spack/repos/builtin/packages/py-pyyaml/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pyyaml/package.py b/var/spack/repos/builtin/packages/py-pyyaml/package.py index 60706df0fb..d3c7614519 100644 --- a/var/spack/repos/builtin/packages/py-pyyaml/package.py +++ b/var/spack/repos/builtin/packages/py-pyyaml/package.py @@ -30,4 +30,5 @@ class PyPyyaml(PythonPackage): homepage = "http://pyyaml.org/wiki/PyYAML" url = "http://pyyaml.org/download/pyyaml/PyYAML-3.11.tar.gz" + version('3.12', '4c129761b661d181ebf7ff4eb2d79950') version('3.11', 'f50e08ef0fe55178479d3a618efe21db') -- cgit v1.2.3-70-g09d2 From 187e110ab03f1bdcb09a5d574b00a8ff9ef489cb Mon Sep 17 00:00:00 2001 From: Edoardo Aprà Date: Mon, 3 Sep 2018 18:36:49 -0700 Subject: NWChem 6.8.1 (#9140) --- var/spack/repos/builtin/packages/nwchem/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nwchem/package.py b/var/spack/repos/builtin/packages/nwchem/package.py index d8fd12b72d..4cedd0943d 100644 --- a/var/spack/repos/builtin/packages/nwchem/package.py +++ b/var/spack/repos/builtin/packages/nwchem/package.py @@ -35,6 +35,8 @@ class Nwchem(Package): tags = ['ecp', 'ecp-apps'] + version('6.8.1', '6eccddc6db11886aa6f152626efc600c', + url='https://github.com/nwchemgit/nwchem/releases/download/6.8.1-release/nwchem-6.8.1-release.revision-v6.8-133-ge032219-srconly.2018-06-14.tar.bz2') version('6.8', '50b18116319f4c15d1cb7eaa1b433006', url='https://github.com/nwchemgit/nwchem/archive/v6.8-release.tar.gz') version('6.6', 'c581001c004ea5e5dfacb783385825e3', -- cgit v1.2.3-70-g09d2 From ed657e97fa8f9ae74c7af6b44e4e79bcb67b27cc Mon Sep 17 00:00:00 2001 From: Abhinav Bhatele Date: Mon, 3 Sep 2018 18:43:50 -0700 Subject: New package: CODES simulation framework (#9133) * New package: CODES simulation framework * CODES: add comments * CODES: remove -fi from extra autoreconf flags --- .../repos/builtin/packages/codes/codes-1.0.0.patch | 16 +++++ var/spack/repos/builtin/packages/codes/package.py | 70 ++++++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 var/spack/repos/builtin/packages/codes/codes-1.0.0.patch create mode 100644 var/spack/repos/builtin/packages/codes/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/codes/codes-1.0.0.patch b/var/spack/repos/builtin/packages/codes/codes-1.0.0.patch new file mode 100644 index 0000000000..d0fbaf7ebb --- /dev/null +++ b/var/spack/repos/builtin/packages/codes/codes-1.0.0.patch @@ -0,0 +1,16 @@ +diff --git a/configure.ac b/configure.ac +index b3650e5..5ec28b4 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -222,9 +222,9 @@ AS_IF([test "x$enable_valgrind_clean" = "xyes"], [ + + + dnl AC_CONFIG_FILES([src/iokernellang/codesparser.y]) +-if test "x$srcdir" != "x."; then ++AS_IF([test ! -d tests/conf], [ + AC_CONFIG_LINKS([tests/conf:$srcdir/tests/conf]) +-fi ++]) + + AC_CONFIG_FILES([Makefile]) + diff --git a/var/spack/repos/builtin/packages/codes/package.py b/var/spack/repos/builtin/packages/codes/package.py new file mode 100644 index 0000000000..6a04b05f07 --- /dev/null +++ b/var/spack/repos/builtin/packages/codes/package.py @@ -0,0 +1,70 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Codes(AutotoolsPackage): + """ CO-Design of multi-layer Exascale Storage (CODES) simulation framework + """ + + homepage = "http://www.mcs.anl.gov/projects/codes" + git = "https://xgitlab.cels.anl.gov/codes/codes.git" + + version('develop', branch='master') + version('1.0.0', tag='1.0.0') + + variant('dumpi', default=False, description="Enable DUMPI support") + + # Build dependencies + depends_on('autoconf', type='build') + depends_on('automake', type='build') + depends_on('libtool', type='build') + depends_on('m4', type='build') + depends_on('pkg-config', type='build') + depends_on('bison', type='build') + depends_on('flex', type='build') + + depends_on('mpi') + depends_on('ross') + depends_on('sst-dumpi', when="+dumpi") + + # add the local m4 directory to the search path + autoreconf_extra_args = ["-Im4"] + # Testing if srcdir is '.' in configure.ac does not work with spack + patch('codes-1.0.0.patch') + + def configure_args(self): + spec = self.spec + + config_args = [ + "CC=%s" % spec['mpi'].mpicc, + "CXX=%s" % spec['mpi'].mpicxx, + "PKG_CONFIG_PATH=%s/pkgconfig" % spec['ross'].prefix.lib] + + if "+dumpi" in spec: + config_args.extend([ + '--with-dumpi=%s'.format(spec['sst-dumpi'].prefix)]) + + return config_args -- cgit v1.2.3-70-g09d2 From 4bdfa19d974950b1b65cbe7f6bb5ae1d2aab5f16 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Mon, 3 Sep 2018 18:49:45 -0700 Subject: openblas: add @0.3.1, patch CMake export bug in @0.3.1:0.3.2 (#9123) * openblas@0.3.1:0.3.2: patch CMake export bug See https://github.com/xianyi/OpenBLAS/pull/1703. * openblas@0.3.1: new version --- .../packages/openblas/openblas-0.3.2-cmake.patch | 43 ++++++++++++++++++++++ .../repos/builtin/packages/openblas/package.py | 5 +++ 2 files changed, 48 insertions(+) create mode 100644 var/spack/repos/builtin/packages/openblas/openblas-0.3.2-cmake.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openblas/openblas-0.3.2-cmake.patch b/var/spack/repos/builtin/packages/openblas/openblas-0.3.2-cmake.patch new file mode 100644 index 0000000000..50df19805f --- /dev/null +++ b/var/spack/repos/builtin/packages/openblas/openblas-0.3.2-cmake.patch @@ -0,0 +1,43 @@ +From 8ebf541e97e7c0573cde6a51353a47e3c509ca00 Mon Sep 17 00:00:00 2001 +From: Scott Thornton +Date: Mon, 30 Jul 2018 15:18:29 -0500 +Subject: [PATCH 1/2] Set EXPORT_NAME to match OpenBLASConfig.cmake + +--- + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 97f8adeda..4dc18da99 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -169,6 +169,7 @@ endif() + # Set output for libopenblas + set_target_properties( ${OpenBLAS_LIBNAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) + set_target_properties( ${OpenBLAS_LIBNAME} PROPERTIES LIBRARY_OUTPUT_NAME_DEBUG "${OpenBLAS_LIBNAME}_d") ++set_target_properties( ${OpenBLAS_LIBNAME} PROPERTIES EXPORT_NAME "OpenBLAS") + + foreach (OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES}) + string( TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG ) + +From 2a9a9389ef6c3da56fda859c9586becc41a2e780 Mon Sep 17 00:00:00 2001 +From: Scott Thornton +Date: Thu, 2 Aug 2018 14:58:52 -0500 +Subject: [PATCH 2/2] Added target_include_directories() + +--- + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4dc18da99..20ce02e87 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -150,6 +150,7 @@ endif() + + # add objects to the openblas lib + add_library(${OpenBLAS_LIBNAME} ${LA_SOURCES} ${LAPACKE_SOURCES} ${RELA_SOURCES} ${TARGET_OBJS} ${OpenBLAS_DEF_FILE}) ++target_include_directories(${OpenBLAS_LIBNAME} INTERFACE $) + + # Android needs to explicitly link against libm + if(ANDROID) diff --git a/var/spack/repos/builtin/packages/openblas/package.py b/var/spack/repos/builtin/packages/openblas/package.py index 3add6db25c..b0a7f651dd 100644 --- a/var/spack/repos/builtin/packages/openblas/package.py +++ b/var/spack/repos/builtin/packages/openblas/package.py @@ -39,6 +39,7 @@ class Openblas(MakefilePackage): version('develop', branch='develop') version('0.3.3', sha256='49d88f4494ae780e3d7fa51769c00d982d7cdb73e696054ac3baa81d42f13bab') version('0.3.2', sha256='e8ba64f6b103c511ae13736100347deb7121ba9b41ba82052b1a018a65c0cb15') + version('0.3.1', sha256='1f5e956f35f3acdd3c74516e955d797a320c2e0135e31d838cbdb3ea94d0eb33') version('0.3.0', '42cde2c1059a8a12227f1e6551c8dbd2') version('0.2.20', '48637eb29f5b492b91459175dcc574b1') version('0.2.19', '28c998054fd377279741c6f0b9ea7941') @@ -93,6 +94,10 @@ class Openblas(MakefilePackage): # https://github.com/xianyi/OpenBLAS/pull/982 patch('openblas0.2.19.diff', when='@0.2.19') + # Fix CMake export symbol error + # https://github.com/xianyi/OpenBLAS/pull/1703 + patch('openblas-0.3.2-cmake.patch', when='@0.3.1:0.3.2') + parallel = False conflicts('%intel@16', when='@0.2.15:0.2.19') -- cgit v1.2.3-70-g09d2 From 585c69b94c7c9dd68033da33e7ddde939198e9f9 Mon Sep 17 00:00:00 2001 From: Miles Perry <37849532+Miles-Perry@users.noreply.github.com> Date: Mon, 3 Sep 2018 20:50:39 -0500 Subject: py-pymysql: new package (#9122) * py-pymysql: new package * added type build and run --- .../repos/builtin/packages/py-pymysql/package.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-pymysql/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pymysql/package.py b/var/spack/repos/builtin/packages/py-pymysql/package.py new file mode 100644 index 0000000000..6e47c1eb35 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pymysql/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPymysql(PythonPackage): + """Pure-Python MySQL client library""" + + homepage = "https://github.com/PyMySQL/PyMySQL/" + url = "https://pypi.io/packages/source/p/pymysql/PyMySQL-0.9.2.tar.gz" + + version('0.9.2', sha256='9ec760cbb251c158c19d6c88c17ca00a8632bac713890e465b2be01fdc30713f') + + depends_on('py-setuptools', type='build') + depends_on('py-cryptography', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From ad8fbe3c7f8bdd7c4b6a25dea5630e5b410b78b9 Mon Sep 17 00:00:00 2001 From: Miles Perry <37849532+Miles-Perry@users.noreply.github.com> Date: Mon, 3 Sep 2018 20:52:11 -0500 Subject: aperture-photometry: new package (#9119) --- .../builtin/packages/aperture-photometry/APT.sh | 4 ++ .../packages/aperture-photometry/package.py | 51 ++++++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 var/spack/repos/builtin/packages/aperture-photometry/APT.sh create mode 100644 var/spack/repos/builtin/packages/aperture-photometry/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/aperture-photometry/APT.sh b/var/spack/repos/builtin/packages/aperture-photometry/APT.sh new file mode 100644 index 0000000000..b51d30626b --- /dev/null +++ b/var/spack/repos/builtin/packages/aperture-photometry/APT.sh @@ -0,0 +1,4 @@ +#!/bin/sh +# convenience wrapper for the aperture jar file +java -jar APT.jar "$@" + diff --git a/var/spack/repos/builtin/packages/aperture-photometry/package.py b/var/spack/repos/builtin/packages/aperture-photometry/package.py new file mode 100644 index 0000000000..f750856e31 --- /dev/null +++ b/var/spack/repos/builtin/packages/aperture-photometry/package.py @@ -0,0 +1,51 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import os.path + + +class AperturePhotometry(Package): + """Aperture Photometry Tool APT is software for astronomical research""" + + homepage = "http://www.aperturephotometry.org/aptool/" + url = "http://www.aperturephotometry.org/aptool/wp-content/plugins/download-monitor/download.php?id=1" + + version('2.7.2', '2beca6aac14c5e0a94d115f81edf0caa9ec83dc9d32893ea00ee376c9360deb0', extension='tar.gz') + + depends_on('java') + + def install(self, spec, prefix): + mkdirp(prefix.bin) + jar_file = 'APT.jar' + install(jar_file, prefix.bin) + java = join_path(self.spec['java'].prefix, 'bin', 'java') + script_sh = join_path(os.path.dirname(__file__), "APT.sh") + script = join_path(prefix.bin, "apt") + install(script_sh, script) + set_executable(script) + kwargs = {'ignore_absent': False, 'backup': False, 'string': False} + filter_file('^java', java, script, **kwargs) + filter_file('APT.jar', join_path(prefix.bin, 'APT.jar'), + script, **kwargs) -- cgit v1.2.3-70-g09d2 From ee14d273e53736c6eeafcabe751d3d8ea274ef11 Mon Sep 17 00:00:00 2001 From: Neil Flood Date: Tue, 4 Sep 2018 11:56:48 +1000 Subject: nlopt: Only support release>=2.5.0, since earlier release tarballs were actually AutoTools, not CMake. (#9110) --- var/spack/repos/builtin/packages/nlopt/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nlopt/package.py b/var/spack/repos/builtin/packages/nlopt/package.py index 1b5a904132..d7343231c9 100644 --- a/var/spack/repos/builtin/packages/nlopt/package.py +++ b/var/spack/repos/builtin/packages/nlopt/package.py @@ -32,11 +32,11 @@ class Nlopt(CMakePackage): other algorithms.""" homepage = "https://nlopt.readthedocs.io" - url = "https://github.com/stevengj/nlopt/releases/download/nlopt-2.4.2/nlopt-2.4.2.tar.gz" + url = "https://github.com/stevengj/nlopt/archive/v2.5.0.tar.gz" git = "https://github.com/stevengj/nlopt.git" version('develop', branch='master') - version('2.4.2', 'd0b8f139a4acf29b76dbae69ade8ac54') + version('2.5.0', 'ada08c648bf9b52faf8729412ff6dd6d') variant('shared', default=True, description='Enables the build of shared libraries') variant('python', default=True, description='Build python wrappers') -- cgit v1.2.3-70-g09d2 From cb9e8eda8fc1c37816777377f828377c194f59aa Mon Sep 17 00:00:00 2001 From: Miles Perry <37849532+Miles-Perry@users.noreply.github.com> Date: Mon, 3 Sep 2018 20:58:49 -0500 Subject: Feature/py picrust New Package (#9096) * added py-picrust * flake8 edits * fixed boilerplate, added type='build', 'run' * fixed errors * added deps * fixed error * fixed numpy max version * fixed future version * fixed version issues --- .../repos/builtin/packages/py-picrust/package.py | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-picrust/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-picrust/package.py b/var/spack/repos/builtin/packages/py-picrust/package.py new file mode 100644 index 0000000000..dff2e89619 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-picrust/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPicrust(PythonPackage): + """bioinformatics software package designed to predict metagenome + functional content from marker gene surveys and full genomes.""" + + homepage = "http://picrust.github.io/picrust/index.html" + url = "https://github.com/picrust/picrust/releases/download/v1.1.3/picrust-1.1.3.tar.gz" + + version('1.1.3', sha256='7538c8544899b8855deb73a2d7a4ccac4808ff294e161530a8c8762d472d8906') + + depends_on('python@2.7.15:2.999', type=('build', 'run')) + depends_on('py-cogent@1.5.3', type=('build', 'run')) + depends_on('py-biom-format@2.1.4:2.1.999', type=('build', 'run')) + depends_on('py-setuptools', type='build') + depends_on('py-future@0.16.0', type=('build', 'run')) + depends_on('py-numpy@1.5.1:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 930e266a360464e9f65384df73e873a9b9f7c072 Mon Sep 17 00:00:00 2001 From: Hadrien G Date: Tue, 4 Sep 2018 04:02:06 +0200 Subject: New package: AIDA (#9094) * Trying to package old AIDA * Document the incompleteness * Install the jars too --- var/spack/repos/builtin/packages/aida/package.py | 38 ++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/aida/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/aida/package.py b/var/spack/repos/builtin/packages/aida/package.py new file mode 100644 index 0000000000..76e9c9b241 --- /dev/null +++ b/var/spack/repos/builtin/packages/aida/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Aida(Package): + """Abstract Interfaces for Data Analysis""" + + homepage = "http://aida.freehep.org/" + url = "ftp://ftp.slac.stanford.edu/software/freehep/AIDA/v3.2.1/aida-3.2.1.tar.gz" + + version('3.2.1', sha256='c51da83e99c0985a7ef3e8bc5a60c3ae61f3ca603b61100c2438b4cdadd5bb2e') + + def install(self, spec, prefix): + install_tree('src/cpp', prefix.include) + install_tree('lib', prefix) -- cgit v1.2.3-70-g09d2 From cb9a95fc3715b2b9732a57c45b68ed153dca71df Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Mon, 3 Sep 2018 21:03:08 -0500 Subject: r-deseq2: new version (#9062) * r-deseq2: new version * r-deseq2: fix r 3.4 dep range --- var/spack/repos/builtin/packages/r-deseq2/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-deseq2/package.py b/var/spack/repos/builtin/packages/r-deseq2/package.py index ecdad2a563..3ec8ea50db 100644 --- a/var/spack/repos/builtin/packages/r-deseq2/package.py +++ b/var/spack/repos/builtin/packages/r-deseq2/package.py @@ -34,10 +34,10 @@ class RDeseq2(RPackage): homepage = "https://www.bioconductor.org/packages/DESeq2/" git = "https://git.bioconductor.org/packages/DESeq2.git" + version('1.20.0', commit='7e88ea5c5e68473824ce0af6e10f19e22374cb7c') version('1.18.1', commit='ef65091d46436af68915124b752f5e1cc55e93a7') version('1.16.1', commit='0a815574382704a08ef8b906eceb0296f81cded5') - depends_on('r@3.4.0:3.4.9', when='@1.16.1:') depends_on("r-rcpparmadillo", type=('build', 'run')) depends_on('r-s4vectors', type=('build', 'run')) depends_on('r-iranges', type=('build', 'run')) @@ -52,3 +52,5 @@ class RDeseq2(RPackage): depends_on('r-ggplot2', type=('build', 'run')) depends_on('r-hmisc', type=('build', 'run')) depends_on('r-rcpp', type=('build', 'run')) + depends_on('r@3.4.0:3.4.9', when='@1.16.1:1.19', type=('build', 'run')) + depends_on('r@3.5.0:3.5.9', when='@1.20.0', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 35d87bdf095d0976b3069badbfc671404c497e15 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Mon, 3 Sep 2018 21:03:47 -0500 Subject: r-biomart: new version; (#9058) * r-biomart: new version; * r-biomart: ending range for r3.4 dep * r-biomart: fix version range --- var/spack/repos/builtin/packages/r-biomart/package.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-biomart/package.py b/var/spack/repos/builtin/packages/r-biomart/package.py index 2936418e3b..fd5a83d0c4 100644 --- a/var/spack/repos/builtin/packages/r-biomart/package.py +++ b/var/spack/repos/builtin/packages/r-biomart/package.py @@ -42,13 +42,15 @@ class RBiomart(RPackage): homepage = "https://bioconductor.org/packages/biomaRt/" git = "https://git.bioconductor.org/packages/biomaRt.git" + version('2.36.1', commit='5634e57e20199f9dc1f8b927eb3893143fc02f4f') version('2.34.2', commit='a7030915fbc6120cc6812aefdedba423a207459b') version('2.32.1', commit='f84d74424fa599f6d08f8db4612ca09914a9087f') depends_on('r-xml', type=('build', 'run')) depends_on('r-rcurl', type=('build', 'run')) depends_on('r-annotationdbi', type=('build', 'run')) - depends_on('r-progress', type=('build', 'run'), when='@2.34.2') - depends_on('r-stringr', type=('build', 'run'), when='@2.34.2') - depends_on('r-httr', type=('build', 'run'), when='@2.34.2') - depends_on('r@3.4.0:3.4.9', when='@2.32.1:') + depends_on('r-progress', type=('build', 'run'), when='@2.34.2:') + depends_on('r-stringr', type=('build', 'run'), when='@2.34.2:') + depends_on('r-httr', type=('build', 'run'), when='@2.34.2:') + depends_on('r@3.4.0:3.4.9', when='@2.32.1:2.35.9', type=('build', 'run')) + depends_on('r@3.5.0:3.5.9', when='@2.36.1', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 3c9b0ee2ea2c1f4fc983312f08d6ffd36c1818f0 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Mon, 3 Sep 2018 21:04:22 -0500 Subject: r-genomicalignments: new version (#9055) * r-genomicalignments: new version * r-genomicalignments: ending range for r3.4 dep * r-genomicalignments: fix range --- .../packages/r-genomicalignments/package.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-genomicalignments/package.py b/var/spack/repos/builtin/packages/r-genomicalignments/package.py index 1cf1580da5..f70717e52c 100644 --- a/var/spack/repos/builtin/packages/r-genomicalignments/package.py +++ b/var/spack/repos/builtin/packages/r-genomicalignments/package.py @@ -34,19 +34,27 @@ class RGenomicalignments(RPackage): homepage = "https://bioconductor.org/packages/GenomicAlignments/" git = "https://git.bioconductor.org/packages/GenomicAlignments.git" + version('1.16.0', commit='db032a459e5cf05a2a5c2059662a541827112974') version('1.14.2', commit='57b0b35d8b36069d4d94af86af051f0129b28eef') version('1.12.2', commit='b5d6f19e4a89b6c1c3e9e58e5ea4eb13870874ef') depends_on('r-biocgenerics@0.15.3:', type=('build', 'run')) depends_on('r-s4vectors@0.13.13:', type=('build', 'run')) - depends_on('r-iranges@2.5.36:', type=('build', 'run'), when='@1.12.2') - depends_on('r-iranges@2.11.16:', type=('build', 'run'), when='@1.14.2') - depends_on('r-genomeinfodb@1.11.5:', type=('build', 'run'), when='@1.12.2') - depends_on('r-genomeinfodb@1.13.1:', type=('build', 'run'), when='@1.14.2') - depends_on('r-genomicranges@1.27.19:', type=('build', 'run'), when='@1.12.2') - depends_on('r-genomicranges@1.29.14:', type=('build', 'run'), when='@1.14.2') + depends_on('r-s4vectors@0.17.28:', when='@1.16.0', type=('build', 'run')) + depends_on('r-iranges@2.5.36:', when='@1.12.2', type=('build', 'run')) + depends_on('r-iranges@2.11.16:', when='@1.14.2', type=('build', 'run')) + depends_on('r-iranges@2.13.25:', when='@1.16.0', type=('build', 'run')) + depends_on('r-genomeinfodb@1.11.5:', when='@1.12.2', type=('build', 'run')) + depends_on('r-genomeinfodb@1.13.1:', when='@1.14.2:', type=('build', 'run')) + depends_on('r-genomicranges@1.27.19:', when='@1.12.2', type=('build', 'run')) + depends_on('r-genomicranges@1.29.14:', when='@1.14.2', type=('build', 'run')) + depends_on('r-genomicranges@1.31.19:', when='@1.16.0', type=('build', 'run')) depends_on('r-summarizedexperiment@1.5.3:', type=('build', 'run')) + depends_on('r-summarizedexperiment@1.9.13:', when='@1.16.0', type=('build', 'run')) depends_on('r-biostrings@2.37.1:', type=('build', 'run')) + depends_on('r-biostrings@2.47.6:', when='@1.16.0', type=('build', 'run')) depends_on('r-rsamtools@1.21.4:', type=('build', 'run')) + depends_on('r-rsamtools@1.31.2:', when='@1.16.0', type=('build', 'run')) depends_on('r-biocparallel', type=('build', 'run')) - depends_on('r@3.4.0:3.4.9', when='@1.12.2:') + depends_on('r@3.4.0:3.4.9', when='@1.12.2:1.15.9', type=('build', 'run')) + depends_on('r@3.5.0:3.5.9', when='@1.16.0', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From e85f737d1f343afea36c53ebc20882521ffc4ae6 Mon Sep 17 00:00:00 2001 From: Francesco Di Natale Date: Tue, 4 Sep 2018 13:33:55 -0600 Subject: py-maestrowf: Addition of new releases. (#9135) * Addition of latest maestrowf releases. * Addition of filelock to dependencies. * Addition of when clause to depends_on for filelock and tabulate. * Correction of the tar url. --- var/spack/repos/builtin/packages/py-maestrowf/package.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-maestrowf/package.py b/var/spack/repos/builtin/packages/py-maestrowf/package.py index fbecbcd1a7..7a5ab5f975 100644 --- a/var/spack/repos/builtin/packages/py-maestrowf/package.py +++ b/var/spack/repos/builtin/packages/py-maestrowf/package.py @@ -30,11 +30,16 @@ class PyMaestrowf(PythonPackage): simulation studies.""" homepage = "https://github.com/LLNL/maestrowf/" - url = "https://github.com/LLNL/maestrowf/archive/v1.0.1.tar.gz" + url = "https://github.com/LLNL/maestrowf/archive/v1.1.2.tar.gz" + version('1.1.2', 'a9e05d82910cd2dd077321fb9b0c8dcd') + version('1.1.1', 'd38bbf634de4f29fd01d1864ba2f70e0') + version('1.1.0', '3c20bf36fbb85d14c3bfdb865944a409') version('1.0.1', '6838fc8bdc7ca0c1adbb6a0333f005b4') depends_on('py-setuptools', type='build') depends_on('py-pyyaml', type=('build', 'run')) depends_on('py-six', type=('build', 'run')) depends_on('py-enum34', type=('build', 'run')) + depends_on('py-tabulate', type=('build', 'run'), when='@1.1.0:') + depends_on('py-filelock', type=('build', 'run'), when='@1.1.0:') -- cgit v1.2.3-70-g09d2 From 447db2fe8d94c74b10c2dd6a1c952e735b091f04 Mon Sep 17 00:00:00 2001 From: Miles Perry <37849532+Miles-Perry@users.noreply.github.com> Date: Tue, 4 Sep 2018 14:34:18 -0500 Subject: Feature/py pycogent New-Version (#9095) * added py-pycogent * flake8 edits * added type=('build', 'run') to deps, changed py-matplotlib and mpi4py * changed python min version to 2.6 * fixed cython to py-cython dep * fixed mpi4py to py-mpi4py * fixed py-sqlalchemy * added 1.5.3 version * fixed version 1.5.3 install * changed deps names to reflect convention * added variants * changed download URL and added SHA256 hash * fixed deps * added github url for 1.5.3 * removed unneeded deps * doesn't require py-setuptools * fixed url and added py-setuptools specific to version 1.9 * fixed variant names and changed cython to normal dependency instead of variant * removed cython dep, failed to build when it was present. Changed variant name 'mpi4py' to 'mpi' and changed sqlalchemy variant name to mpi * fixed dependencies and added py-pymysql dep * added setup-environment step * changed download url for 1.5.3 to pypi * fixed flake8 issue * updated * added changes --- .../repos/builtin/packages/py-cogent/package.py | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-cogent/package.py b/var/spack/repos/builtin/packages/py-cogent/package.py index 2fb64fee08..cf910ae6d1 100644 --- a/var/spack/repos/builtin/packages/py-cogent/package.py +++ b/var/spack/repos/builtin/packages/py-cogent/package.py @@ -31,7 +31,23 @@ class PyCogent(PythonPackage): homepage = "http://pycogent.org" url = "https://pypi.io/packages/source/c/cogent/cogent-1.9.tar.gz" - version('1.9', '7d9f28cd17664c1cd18c568fc53060d6') + version('1.9', sha256='57d8c58e0273ffe4f2b907874f9b49dadfd0600f5507b7666369f4e44d56ce14') + version('1.5.3', url="https://pypi.io/packages/source/c/cogent/cogent-1.5.3.tgz", + sha256='1215ac219070b7b2207b0b47b4388510f3e30ccd88160aa9f02f25d24bcbcd95') - depends_on('py-setuptools', type='build') - depends_on('py-numpy', type=('build', 'run')) + variant('matplotlib', default=False, description="graphs related to codon usage") + variant('mpi', default=False, description='MPI required for parallel computation.') + variant('mysql', default=False, description='Required for the Ensembl querying code.') + + depends_on('py-setuptools', type=('build'), when='@1.9') + depends_on('python@2.6:2.999', type=('build', 'run')) + depends_on('py-numpy@1.3:', type=('build', 'run')) + depends_on('zlib') + depends_on('py-matplotlib', when='+matplotlib', type=('build', 'run')) + depends_on('py-mpi4py', when='+mpi', type=('build', 'run')) + depends_on('py-sqlalchemy', when='+mysql', type=('build', 'run')) + depends_on('py-pymysql', when='+mysql', type=('build', 'run')) + depends_on('py-cython@0.17.1:', type='build') + + def setup_environment(self, spack_env, run_env): + spack_env.set('DONT_USE_PYREX', '1') -- cgit v1.2.3-70-g09d2 From 059daa20128808533d241eb9562547bc9c6cd5d1 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Tue, 4 Sep 2018 14:34:45 -0500 Subject: r-summarizedexperiment: new version (#9054) * r-summarizedexperiment: new version * r-summarizedexperiment: add ending range for r3.4 dep * r-summarizedexperiment: fix range --- .../builtin/packages/r-summarizedexperiment/package.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-summarizedexperiment/package.py b/var/spack/repos/builtin/packages/r-summarizedexperiment/package.py index 080765caeb..70eb55a7aa 100644 --- a/var/spack/repos/builtin/packages/r-summarizedexperiment/package.py +++ b/var/spack/repos/builtin/packages/r-summarizedexperiment/package.py @@ -34,16 +34,23 @@ class RSummarizedexperiment(RPackage): homepage = "https://bioconductor.org/packages/SummarizedExperiment/" git = "https://git.bioconductor.org/packages/SummarizedExperiment.git" + version('1.10.0', commit='7ad2e991c8285bfc4b2e15b29d94cc86d07f8f2b') version('1.8.1', commit='9d8a29aa9c78bbc7dcc6472537e13fc0d11dc1f7') version('1.6.5', commit='ec69cd5cfbccaef148a9f6abdfb3e22e888695d0') - depends_on('r-genomicranges@1.27.22:', type=('build', 'run'), when='@1.6.5') - depends_on('r-genomicranges@1.29.14:', type=('build', 'run'), when='@1.8.1') + depends_on('r-genomicranges@1.27.22:', when='@1.6.5', type=('build', 'run')) + depends_on('r-genomicranges@1.29.14:', when='@1.8.1', type=('build', 'run')) + depends_on('r-genomicranges@1.31.17:', when='@1.10.0', type=('build', 'run')) depends_on('r-biobase', type=('build', 'run')) - depends_on('r-delayedarray@0.1.9:', type=('build', 'run'), when='@1.6.5') - depends_on('r-delayedarray@0.3.20', type=('build', 'run'), when='@1.8.1') + depends_on('r-delayedarray@0.1.9:', when='@1.6.5', type=('build', 'run')) + depends_on('r-delayedarray@0.3.20:', when='@1.8.1:', type=('build', 'run')) depends_on('r-matrix', type=('build', 'run')) depends_on('r-s4vectors', type=('build', 'run')) + depends_on('r-s4vectors@0.17.25:', when='@1.10.0', type=('build', 'run')) depends_on('r-iranges', type=('build', 'run')) + depends_on('r-iranges@2.13.16:', when='@1.10.0', type=('build', 'run')) depends_on('r-genomeinfodb', type=('build', 'run')) - depends_on('r@3.4.0:3.4.9', when='@1.6.5:') + depends_on('r-genomeinfodb@1.13.1:', when='@1.10.0', type=('build', 'run')) + depends_on('r-biocgenerics@0.15.3:', when='@1.6.5:', type=('build', 'run')) + depends_on('r@3.4.0:3.4.9', when='@1.6.5:1.9.9', type=('build', 'run')) + depends_on('r@3.5.0:3.5.9', when='@1.10.0', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 5737155dd0de1adc51bd2a758761dacac6fbf387 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Tue, 4 Sep 2018 14:35:06 -0500 Subject: trinity: full dependencies (#9064) --- .../repos/builtin/packages/trinity/package.py | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trinity/package.py b/var/spack/repos/builtin/packages/trinity/package.py index 5daad5e02f..635e07290f 100644 --- a/var/spack/repos/builtin/packages/trinity/package.py +++ b/var/spack/repos/builtin/packages/trinity/package.py @@ -52,6 +52,36 @@ class Trinity(MakefilePackage): depends_on("automake", type="build") depends_on("libtool", type="build") + # There is no documented list of these deps, but they're in the Dockerfile + # and we have runtime errors without them + # https://github.com/trinityrnaseq/trinityrnaseq/blob/master/Docker/Dockerfile + depends_on("blast-plus", type="run") + depends_on("bowtie", type="run") + depends_on("r", type="run") + depends_on("r-tidyverse", type="run") + depends_on("r-edger", type="run") + depends_on("r-deseq2", type="run") + depends_on("r-ape", type="run") + depends_on("r-gplots", type="run") + depends_on("r-biobase", type="run") + depends_on("r-qvalue", type="run") + depends_on("rsem", type="run") + depends_on("kallisto", type="run") + depends_on("fastqc", type="run") + depends_on("samtools", type="run") + depends_on("py-numpy", type="run") + depends_on("express", type="run") + depends_on("perl-dbfile", type="run") + depends_on("perl-uri-escape", type="run") + depends_on("r-fastcluster", type="run") + depends_on("r-ctc", type="run") + depends_on("r-goseq", type="run") + depends_on("r-glimma", type="run") + depends_on("r-rots", type="run") + depends_on("r-goplot", type="run") + depends_on("r-argparse", type="run") + depends_on("r-sm", type="run") + def build(self, spec, prefix): make() make("trinity_essentials") @@ -76,4 +106,5 @@ class Trinity(MakefilePackage): def setup_environment(self, spack_env, run_env): run_env.set('TRINITY_HOME', self.prefix.bin) + run_env.prepend_path('PATH', self.prefix.bin.util) spack_env.append_flags('CXXFLAGS', self.compiler.openmp_flag) -- cgit v1.2.3-70-g09d2 From 9fe7000dda636cefb4c8f0424b844aa214c41216 Mon Sep 17 00:00:00 2001 From: 健美猞猁 Date: Wed, 5 Sep 2018 03:35:33 +0800 Subject: Bamdst: a new package. (#9113) * Bamdst: a new package. * Remove duplicate make() in install(). --- var/spack/repos/builtin/packages/bamdst/package.py | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 var/spack/repos/builtin/packages/bamdst/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bamdst/package.py b/var/spack/repos/builtin/packages/bamdst/package.py new file mode 100644 index 0000000000..230c8edb57 --- /dev/null +++ b/var/spack/repos/builtin/packages/bamdst/package.py @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Bamdst(MakefilePackage): + "Bamdst is a a lightweight bam file depth statistical tool." + + homepage = "https://github.com/shiquan/bamdst" + git = "https://github.com/shiquan/bamdst.git" + + version('master', git='https://github.com/shiquan/bamdst.git') + + depends_on('zlib') + + parallel = False + + def edit(self, spec, prefix): + makefile = FileFilter('Makefile') + makefile.filter('CC= .*', 'CC = cc') + + def install(self, spec, prefix): + mkdir(prefix.bin) + install('bamdst', prefix.bin) -- cgit v1.2.3-70-g09d2 From 8b9b89b931ad033509e36d0582eb0e44e3686f85 Mon Sep 17 00:00:00 2001 From: 健美猞猁 Date: Wed, 5 Sep 2018 03:35:49 +0800 Subject: Onedrive: a new package. (#9130) * skilion-onedrive: a new package. * Fix flake8 issues. --- .../builtin/packages/skilion-onedrive/package.py | 56 ++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 var/spack/repos/builtin/packages/skilion-onedrive/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/skilion-onedrive/package.py b/var/spack/repos/builtin/packages/skilion-onedrive/package.py new file mode 100644 index 0000000000..978c3bef72 --- /dev/null +++ b/var/spack/repos/builtin/packages/skilion-onedrive/package.py @@ -0,0 +1,56 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class SkilionOnedrive(MakefilePackage): + """A complete tool to interact with OneDrive on Linux, + developed by Skilion, following the UNIX philosophy.""" + + homepage = "https://github.com/skilion/onedrive" + url = "https://github.com/skilion/onedrive/archive/v1.1.1.tar.gz" + + version('1.1.1', sha256='fb51c81ec95c28f3fe3b29e3b7f915e30161bd5f4b14bb53ae5c2233cc1e92e9') + + depends_on('dmd') + depends_on('curl') + depends_on('sqlite') + + def edit(self, spec, prefix): + makefile = FileFilter('Makefile') + # Generate the version file + makefile.filter('.git/HEAD .git/index', '', string=True) + makefile.filter('$(shell git describe --tags)', + '{0}'.format(spec.version), + string=True) + # Patch sqlite.d https://github.com/skilion/onedrive/issues/392 + sqlited = FileFilter('src/sqlite.d') + sqlited.filter('std.c.stdlib', 'core.stdc.stdlib', String=True) + + def build(self, spec, prefix): + make('onedrive', 'DESTDIR={0}'.format(prefix), 'PREFIX=/') + + def install(self, spec, prefix): + make('install', 'DESTDIR={0}'.format(prefix), 'PREFIX=/') -- cgit v1.2.3-70-g09d2 From 501669faba73d578fad745954f2deed8d653ebe2 Mon Sep 17 00:00:00 2001 From: 健美猞猁 Date: Wed, 5 Sep 2018 03:49:28 +0800 Subject: Pack dlang's stdlib into dmd. (#9131) * Update dmd. * Build dmd and druntime. * Build dmd. * Restore edit. * Flake8. --- var/spack/repos/builtin/packages/dmd/package.py | 55 ++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dmd/package.py b/var/spack/repos/builtin/packages/dmd/package.py index 1396d80878..dcbae9f869 100644 --- a/var/spack/repos/builtin/packages/dmd/package.py +++ b/var/spack/repos/builtin/packages/dmd/package.py @@ -23,6 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * +import os class Dmd(MakefilePackage): @@ -36,16 +37,60 @@ class Dmd(MakefilePackage): depends_on('openssl') depends_on('curl') + # https://wiki.dlang.org/Building_under_Posix + resource(name='druntime', + url='https://github.com/dlang/druntime/archive/v2.081.1.tar.gz', + md5='49c8ba48fcb1e53d553a52d8ed7f9164', + placement='druntime') + resource(name='phobos', + url='https://github.com/dlang/phobos/archive/v2.081.1.tar.gz', + md5='ccf4787275b490eb2ddfc6713f9e9882', + placement='phobos') + resource(name='tools', + url='https://github.com/dlang/tools/archive/v2.081.1.tar.gz', + md5='a3bc7ed3d60b39712ef011bf19b3d427', + placement='tools') + def setup_environment(self, spack_env, run_env): run_env.prepend_path('PATH', self.prefix.linux.bin64) + run_env.prepend_path('LIBRARY_PATH', self.prefix.linux.lib64) + run_env.prepend_path('LD_LIBRARY_PATH', self.prefix.linux.lib64) def edit(self, spec, prefix): - makefile = FileFilter('posix.mak') - makefile.filter('$(PWD)/../install', prefix, string=True) + # Move contents to dmd/ + mkdir = which('mkdir') + mkdir('dmd') + mv = which('mv') + dmd_files = [f for f in os.listdir('.') + if not f.startswith(('dmd', + 'druntime', + 'phobos', + 'tools', + 'spack-build'))] + for f in dmd_files: + mv(f, 'dmd') + # Edit + dmd_mak = FileFilter('dmd/posix.mak') + dmd_mak.filter('$(PWD)/../install', prefix, string=True) + dr_mak = FileFilter('druntime/posix.mak') + dr_mak.filter('INSTALL_DIR=.*', 'INSTALL_DIR={0}'.format(prefix)) + pb_mak = FileFilter('phobos/posix.mak') + pb_mak.filter('INSTALL_DIR = .*', 'INSTALL_DIR = {0}'.format(prefix)) + tl_mak = FileFilter('tools/posix.mak') + tl_mak.filter('INSTALL_DIR = .*', 'INSTALL_DIR = {0}'.format(prefix)) def build(self, spec, prefix): - make('-f', 'posix.mak', 'AUTO_BOOTSTRAP=1') + with working_dir('dmd'): + make('-f', 'posix.mak', 'AUTO_BOOTSTRAP=1') + with working_dir('phobos'): + make('-f', 'posix.mak') def install(self, spec, prefix): - make('-f', 'posix.mak', 'install', 'AUTO_BOOTSTRAP=1') - install_tree('src', prefix.src) + with working_dir('dmd'): + make('-f', 'posix.mak', 'install', 'AUTO_BOOTSTRAP=1') + with working_dir('phobos'): + make('-f', 'posix.mak', 'install') + with working_dir('tools'): + make('-f', 'posix.mak', 'install') + with working_dir('druntime'): + make('-f', 'posix.mak', 'install') -- cgit v1.2.3-70-g09d2 From a779e8744240c219e78ee5e8c468b68616451396 Mon Sep 17 00:00:00 2001 From: Tristan Carel Date: Wed, 5 Sep 2018 20:01:45 +0200 Subject: omega-h: add versions and variants (#9169) * add 5 most recent versions and git master branch * add trilinos, gmodel, throw, examples, optimize, symbols, and warnings variants * disable XSDK so that Trilinos dependencies are found. --- .../repos/builtin/packages/omega-h/package.py | 42 ++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/omega-h/package.py b/var/spack/repos/builtin/packages/omega-h/package.py index 5eb7f47546..210b2befdf 100644 --- a/var/spack/repos/builtin/packages/omega-h/package.py +++ b/var/spack/repos/builtin/packages/omega-h/package.py @@ -34,18 +34,43 @@ class OmegaH(CMakePackage): homepage = "https://github.com/ibaned/omega_h" url = "https://github.com/ibaned/omega_h/archive/v9.13.4.tar.gz" + git = "https://github.com/ibaned/omega_h.git" - version('9.13.4', '035f9986ec07ad97ae0aa1e171872307') + version('develop', branch='master') + version('9.15.0', sha256='342a506a0ff22f6cac759862efdcf34e360110f7901eb9b4c5de8afe38741522') + version('9.14.0', sha256='035d0f47142f965a57818d1cb6c5c00b5ae6b5a0178b67b0bc9177fa99ba083d') + version('9.13.14', sha256='f617dfd024c9cc323e56800ca23df3386bfa37e1b9bd378847d1f5d32d2b8e5d') + version('9.13.13', sha256='753702edf4bda9ae57ea21f09ca071e341604a468d8c86468c9aebba049f581c') variant('shared', default=True, description='Build shared libraries') variant('mpi', default=True, description='Activates MPI support') variant('zlib', default=True, description='Activates ZLib support') + variant('trilinos', default=True, description='Use Teuchos and Kokkos') + variant('build_type', default='') + variant('gmodel', default=True, description='Gmsh model generation library') + variant('throw', default=False, description='Errors throw exceptions instead of abort') + variant('examples', default=False, description='Compile examples') + variant('optimize', default=True, description='Compile C++ with optimization') + variant('symbols', default=True, description='Compile C++ with debug symbols') + variant('warnings', default=True, description='Compile C++ with warnings') + depends_on('gmodel', when='+gmodel') + depends_on('gmsh', when='+examples', type='build') depends_on('mpi', when='+mpi') + depends_on('trilinos +kokkos +teuchos', when='+trilinos') depends_on('zlib', when='+zlib') + def _bob_options(self): + cmake_var_prefix = self.name.capitalize() + '_CXX_' + for variant in ['optimize', 'symbols', 'warnings']: + cmake_var = cmake_var_prefix + variant.upper() + if '+' + variant in self.spec: + yield '-D' + cmake_var + ':BOOL=ON' + else: + yield '-D' + cmake_var + ':BOOL=FALSE' + def cmake_args(self): - args = ['-DUSE_XSDK_DEFAULTS:BOOL=ON'] + args = ['-DUSE_XSDK_DEFAULTS:BOOL=OFF'] if '+shared' in self.spec: args.append('-DBUILD_SHARED_LIBS:BOOL=ON') else: @@ -56,6 +81,10 @@ class OmegaH(CMakePackage): self.spec['mpi'].mpicxx)) else: args.append('-DOmega_h_USE_MPI:BOOL=OFF') + if '+trilinos' in self.spec: + args.append('-DOmega_h_USE_Trilinos:BOOL=ON') + if '+gmodel' in self.spec: + args.append('-DOmega_h_USE_Gmodel:BOOL=ON') if '+zlib' in self.spec: args.append('-DTPL_ENABLE_ZLIB:BOOL=ON') args.append('-DTPL_ZLIB_INCLUDE_DIRS:STRING={0}'.format( @@ -64,6 +93,15 @@ class OmegaH(CMakePackage): self.spec['zlib'].libs)) else: args.append('-DTPL_ENABLE_ZLIB:BOOL=OFF') + if '+examples' in self.spec: + args.append('-DOmega_h_EXAMPLES:BOOL=ON') + else: + args.append('-DOmega_h_EXAMPLES:BOOL=OFF') + if '+throw' in self.spec: + args.append('-DOmega_h_THROW:BOOL=ON') + else: + args.append('-DOmega_h_THROW:BOOL=OFF') + args += list(self._bob_options()) return args def flag_handler(self, name, flags): -- cgit v1.2.3-70-g09d2 From 901d76ef534140a578998e08bbe6f73c0e755b13 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Thu, 6 Sep 2018 10:41:45 +0200 Subject: openPMD-api: ^py-numpy@1.15+ (#9178) Due to an internal bug regarding the handling of scalars (ndim must be 0) in numpy prior to 1.15.0, openPMD-api will require the latest numpy 1.15+. Since there is a small regression with datetime pickling in 1.15.0 from the required fix and spack only packages 1.15.1 currently, we depend on 1.15.1 in the recipe. --- var/spack/repos/builtin/packages/openpmd-api/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openpmd-api/package.py b/var/spack/repos/builtin/packages/openpmd-api/package.py index 420465d1d1..cfb77bfcf4 100644 --- a/var/spack/repos/builtin/packages/openpmd-api/package.py +++ b/var/spack/repos/builtin/packages/openpmd-api/package.py @@ -63,7 +63,7 @@ class OpenpmdApi(CMakePackage): depends_on('adios2@2.1.0: +mpi', when='+mpi +adios2') # ideally we want 2.3.0+ for full C++11 CT function signature support depends_on('py-pybind11@2.2.3:', when='+python') - depends_on('py-numpy', when='+python', type=['test', 'run']) + depends_on('py-numpy@1.15.1:', when='+python', type=['test', 'run']) extends('python', when='+python') -- cgit v1.2.3-70-g09d2 From 26b68a2bc52e5ea33c69b8fe3d19aed01a126d40 Mon Sep 17 00:00:00 2001 From: Tristan Carel Date: Thu, 6 Sep 2018 10:42:40 +0200 Subject: gmsh: add git master and 4.0.0 versions (#9172) --- var/spack/repos/builtin/packages/gmsh/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gmsh/package.py b/var/spack/repos/builtin/packages/gmsh/package.py index ece75c4bde..cb4bed7ef0 100644 --- a/var/spack/repos/builtin/packages/gmsh/package.py +++ b/var/spack/repos/builtin/packages/gmsh/package.py @@ -38,12 +38,13 @@ class Gmsh(CMakePackage): homepage = 'http://gmsh.info' url = 'http://gmsh.info/src/gmsh-2.11.0-source.tgz' + version('4.0.0', sha256='fb0c8afa37425c6f4315ab3b3124e9e102fcf270a35198423a4002796f04155f') version('3.0.6', '9700bcc440d7a6b16a49cbfcdcdc31db33efe60e1f5113774316b6fa4186987b') version('3.0.1', '830b5400d9f1aeca79c3745c5c9fdaa2900cdb2fa319b664a5d26f7e615c749f') version('2.16.0', 'e829eaf32ea02350a385202cc749341f2a3217c464719384b18f653edd028eea') version('2.15.0', '992a4b580454105f719f5bc05441d3d392ab0b4b80d4ea07b61ca3bdc974070a') version('2.12.0', '7fbd2ec8071e79725266e72744d21e902d4fe6fa9e7c52340ad5f4be5c159d09') - version('2.11.0', 'f15b6e7ac9ca649c9a74440e1259d0db') + version('develop', branch='master', git='https://gitlab.onelab.info/gmsh/gmsh.git') variant('shared', default=True, description='Enables the build of shared libraries') variant('mpi', default=True, description='Builds MPI support for parser and solver') -- cgit v1.2.3-70-g09d2 From 733458347a884b9ad69c9c57af71b725ba844ef1 Mon Sep 17 00:00:00 2001 From: Tristan Carel Date: Thu, 6 Sep 2018 10:48:08 +0200 Subject: gmodel: new package starting at 2.1.0 (#9170) --- var/spack/repos/builtin/packages/gmodel/package.py | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/gmodel/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gmodel/package.py b/var/spack/repos/builtin/packages/gmodel/package.py new file mode 100644 index 0000000000..cea0106929 --- /dev/null +++ b/var/spack/repos/builtin/packages/gmodel/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Gmodel(CMakePackage): + """Gmsh model generation library + + Gmodel is a C++11 library that implements a minimal CAD kernel based + on the .geo format used by the Gmsh mesh generation code, and is + designed to make it easier for users to quickly construct CAD models + for Gmsh. + """ + homepage = "https://github.com/ibaned/gmodel" + url = "https://github.com/ibaned/gmodel/archive/v2.1.0.zip" + + version('2.1.0', '9130a90c93c40edde378f6d4086c5fe0') -- cgit v1.2.3-70-g09d2 From b6b8c7058a02e4e735901433c4b4e571a8b5906f Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Thu, 6 Sep 2018 12:01:53 -0500 Subject: Balay/xsdk trilinos develop (#9182) * xsdk: update xsdk@develop dependency on trilinos@develop * trilinos: enable tpetra, ifpack2, zoltan2, amesos2 --- .../repos/builtin/packages/trilinos/package.py | 1 + .../packages/trilinos/superlu_dist_v5.4.0.patch | 56 ++++++++++++++++++++++ var/spack/repos/builtin/packages/xsdk/package.py | 2 +- 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 var/spack/repos/builtin/packages/trilinos/superlu_dist_v5.4.0.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 3a245e2df3..87a8bf1e91 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -309,6 +309,7 @@ class Trilinos(CMakePackage): depends_on('py-numpy', when='+python', type=('build', 'run')) depends_on('swig', when='+python') + patch('superlu_dist_v5.4.0.patch', when='@develop') patch('umfpack_from_suitesparse.patch', when='@11.14.1:12.8.1') patch('xlf_seacas.patch', when='@12.10.1:12.12.1 %xl') patch('xlf_seacas.patch', when='@12.10.1:12.12.1 %xl_r') diff --git a/var/spack/repos/builtin/packages/trilinos/superlu_dist_v5.4.0.patch b/var/spack/repos/builtin/packages/trilinos/superlu_dist_v5.4.0.patch new file mode 100644 index 0000000000..b094adf944 --- /dev/null +++ b/var/spack/repos/builtin/packages/trilinos/superlu_dist_v5.4.0.patch @@ -0,0 +1,56 @@ +diff --git a/packages/amesos/src/Amesos_Superludist.cpp b/packages/amesos/src/Amesos_Superludist.cpp +index f0542faebe..ddca911356 100644 +--- a/packages/amesos/src/Amesos_Superludist.cpp ++++ b/packages/amesos/src/Amesos_Superludist.cpp +@@ -135,7 +135,7 @@ Amesos_Superludist::Amesos_Superludist(const Epetra_LinearProblem &prob) : + Equil_ = true; + ColPerm_ = "MMD_AT_PLUS_A"; + perm_c_ = 0; +- RowPerm_ = "LargeDiag"; ++ RowPerm_ = "LargeDiag_MC64"; + perm_r_ = 0; + IterRefine_ = "DOUBLE"; + ReplaceTinyPivot_ = true; +@@ -472,7 +472,7 @@ int Amesos_Superludist::Factor() + } + + if( RowPerm_ == "NATURAL" ) PrivateSuperluData_->options_.RowPerm = (rowperm_t)NATURAL; +- if( RowPerm_ == "LargeDiag" ) PrivateSuperluData_->options_.RowPerm = LargeDiag; ++ if( RowPerm_ == "LargeDiag_MC64" ) PrivateSuperluData_->options_.RowPerm = LargeDiag_MC64; + else if( ColPerm_ == "MY_PERMR" ) { + PrivateSuperluData_->options_.RowPerm = MY_PERMR; + PrivateSuperluData_->ScalePermstruct_.perm_r = perm_r_; +diff --git a/packages/amesos/test/TestOptions/TestSuperludist.cpp b/packages/amesos/test/TestOptions/TestSuperludist.cpp +index dc1235f62d..de2ab9459a 100644 +--- a/packages/amesos/test/TestOptions/TestSuperludist.cpp ++++ b/packages/amesos/test/TestOptions/TestSuperludist.cpp +@@ -35,9 +35,9 @@ + // 16 false/true false true 2 + // 17 SamePattern true false true 10 + // 18 RowPerm - NATURAL true false false 10 +-// 19 RowPerm - LargeDiag true false false 10 ++// 19 RowPerm - LargeDiag_MC64 true false false 10 + // 20 RowPerm - NATURAL true false false 10 +-// 21 RowPerm - LargeDiag true false false 10 ++// 21 RowPerm - LargeDiag_MC64 true false false 10 + // 22 RowPerm - TinyPivot=t true false false 10 + // 23 RowPerm - TinyPivot=f true false false 10 + // +@@ -703,7 +703,7 @@ int TestSuperludist( Epetra_CrsMatrix *& Amat, + ParamList.set( "AddZeroToDiag", false ); + Teuchos::ParameterList& SuperludistParams = ParamList.sublist("Superludist") ; + SuperludistParams.set( "ReuseSymbolic", false ); +- SuperludistParams.set( "RowPerm", "LargeDiag" ); ++ SuperludistParams.set( "RowPerm", "LargeDiag_MC64" ); + SuperludistParams.set( "MaxProcesses", 10 ); + // ParamList.print( std::cerr, 10 ) ; + +@@ -772,7 +772,7 @@ int TestSuperludist( Epetra_CrsMatrix *& Amat, + ParamList.set( "AddZeroToDiag", false ); + Teuchos::ParameterList& SuperludistParams = ParamList.sublist("Superludist") ; + SuperludistParams.set( "ReuseSymbolic", true ); +- SuperludistParams.set( "RowPerm", "LargeDiag" ); ++ SuperludistParams.set( "RowPerm", "LargeDiag_MC64" ); + SuperludistParams.set( "MaxProcesses", 10 ); + // ParamList.print( std::cerr, 10 ) ; + diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py index 415fd98c9a..6beee5a307 100644 --- a/var/spack/repos/builtin/packages/xsdk/package.py +++ b/var/spack/repos/builtin/packages/xsdk/package.py @@ -61,7 +61,7 @@ class Xsdk(Package): when='@0.3.0') depends_on('trilinos@xsdk-0.2.0+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse~tpetra~ifpack2~zoltan2~amesos2~exodus', when='@xsdk-0.2.0') - depends_on('trilinos@12.12.1+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse~tpetra+nox~ifpack2~zoltan2~amesos2~exodus', + depends_on('trilinos@develop+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse+tpetra+nox+ifpack2+zoltan2+amesos2~exodus', when='@develop') depends_on('petsc@3.8.2+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps+double~int64', -- cgit v1.2.3-70-g09d2 From 18ca19675354508a7a8593c8baf9e98b33e302e1 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Fri, 7 Sep 2018 02:22:17 +0200 Subject: xsdk: add dealii (#7529) --- var/spack/repos/builtin/packages/dealii/package.py | 5 +++-- var/spack/repos/builtin/packages/xsdk/package.py | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index a3a46f132a..ec6b537a2f 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -160,8 +160,9 @@ class Dealii(CMakePackage, CudaPackage): depends_on('slepc@:3.6.3', when='@:8.4.1+slepc+petsc+mpi') depends_on('slepc~arpack', when='+slepc+petsc+mpi+int64') depends_on('sundials~pthread', when='@9.0:+sundials') - depends_on('trilinos+amesos+aztec+epetra+ifpack+ml+muelu+rol+sacado+teuchos', when='+trilinos+mpi~int64~cuda') - depends_on('trilinos+amesos+aztec+epetra+ifpack+ml+muelu+rol+sacado+teuchos~hypre', when='+trilinos+mpi+int64~cuda') + # do not require +rol to make concretization of xsdk possible + depends_on('trilinos+amesos+aztec+epetra+ifpack+ml+muelu+sacado+teuchos', when='+trilinos+mpi~int64~cuda') + depends_on('trilinos+amesos+aztec+epetra+ifpack+ml+muelu+sacado+teuchos~hypre', when='+trilinos+mpi+int64~cuda') # FIXME: temporary disable Tpetra when using CUDA due to # namespace "Kokkos::Impl" has no member "cuda_abort" depends_on('trilinos@master+amesos+aztec+epetra+ifpack+ml+muelu+rol+sacado+teuchos~amesos2~ifpack2~intrepid2~kokkos~tpetra~zoltan2', when='+trilinos+mpi~int64+cuda') diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py index 6beee5a307..806ec638c5 100644 --- a/var/spack/repos/builtin/packages/xsdk/package.py +++ b/var/spack/repos/builtin/packages/xsdk/package.py @@ -71,6 +71,8 @@ class Xsdk(Package): depends_on('petsc@develop+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps+double~int64', when='@develop') + depends_on('dealii@develop~python~doc~slepc~gmsh+petsc+mpi+trilinos~int64+hdf5~netcdf+metis', when='@develop') + depends_on('pflotran@xsdk-0.3.0', when='@0.3.0') depends_on('pflotran@xsdk-0.2.0', when='@xsdk-0.2.0') depends_on('pflotran@develop', when='@develop') -- cgit v1.2.3-70-g09d2 From e67826655024e4da7bfc0bf65099af95194a894e Mon Sep 17 00:00:00 2001 From: Mike Pozulp Date: Fri, 7 Sep 2018 14:00:52 -0700 Subject: Tanim (#9158) * Added jdk version, added r-ks and r-multicool packages, made some r packages less conservative in their r version requirement * flake8 fixes * fix formatting in jdk version cmd * Added type=('build', 'run') to some R package dependencies, added some missing dependencies to r-ks. Thanks Adam. * fix flake8 error --- var/spack/repos/builtin/packages/jdk/package.py | 2 + .../builtin/packages/r-chemometrics/package.py | 2 +- var/spack/repos/builtin/packages/r-fnn/package.py | 2 +- var/spack/repos/builtin/packages/r-ks/package.py | 45 ++++++++++++++++++++++ var/spack/repos/builtin/packages/r-lars/package.py | 3 +- .../repos/builtin/packages/r-multicool/package.py | 36 +++++++++++++++++ .../repos/builtin/packages/r-pcapp/package.py | 1 - var/spack/repos/builtin/packages/r-som/package.py | 2 +- 8 files changed, 88 insertions(+), 5 deletions(-) create mode 100644 var/spack/repos/builtin/packages/r-ks/package.py create mode 100644 var/spack/repos/builtin/packages/r-multicool/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/jdk/package.py b/var/spack/repos/builtin/packages/jdk/package.py index ecd2690c7f..b2f6aa92f2 100644 --- a/var/spack/repos/builtin/packages/jdk/package.py +++ b/var/spack/repos/builtin/packages/jdk/package.py @@ -57,6 +57,8 @@ class Jdk(Package): # symbol in version with '_', otherwise it will be interpreted as a variant version('10.0.1_10', 'ae8ed645e6af38432a56a847597ac61d4283b7536688dbab44ab536199d1e5a4', curl_options=curl_options, url='http://download.oracle.com/otn-pub/java/jdk/10.0.1+10/fb4372174a714e6b8c52526dc134031e/jdk-10.0.1_linux-x64_bin.tar.gz') + version('1.8.0_181-b13', 'ef599e322eee42f6769991dd3e3b1a31', curl_options=curl_options, + url='http://download.oracle.com/otn-pub/java/jdk/8u181-b13/96a7b8442fe848ef90c96a2fad6ed6d1/jdk-8u181-linux-x64.tar.gz') version('1.8.0_172-b11', 'eda2945e8c02b84adbf78f46c37b71c1', curl_options=curl_options, url='http://download.oracle.com/otn-pub/java/jdk/8u172-b11/a58eab1ec242421181065cdc37240b08/jdk-8u172-linux-x64.tar.gz') version('1.8.0_141-b15', '8cf4c4e00744bfafc023d770cb65328c', curl_options=curl_options, diff --git a/var/spack/repos/builtin/packages/r-chemometrics/package.py b/var/spack/repos/builtin/packages/r-chemometrics/package.py index 22b16081dd..739bab2c36 100644 --- a/var/spack/repos/builtin/packages/r-chemometrics/package.py +++ b/var/spack/repos/builtin/packages/r-chemometrics/package.py @@ -39,7 +39,7 @@ class RChemometrics(RPackage): version('1.3.8', '7fad828bd094b5485fbf20bdf7d3d0d1') version('1.3.7', 'a9e2f32efb1545421dd96185fd849184') - depends_on('r@3.4.0:3.4.9') + depends_on('r@2.10:', type=('build', 'run')) depends_on('r-rpart', type=('build', 'run')) depends_on('r-mclust', type=('build', 'run')) depends_on('r-lars', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-fnn/package.py b/var/spack/repos/builtin/packages/r-fnn/package.py index d9b6c0761f..6511e0d081 100644 --- a/var/spack/repos/builtin/packages/r-fnn/package.py +++ b/var/spack/repos/builtin/packages/r-fnn/package.py @@ -40,6 +40,6 @@ class RFnn(RPackage): version('0.6-3', 'f0f0184e50f9f30a36ed5cff24d6cff2') version('0.6-2', '20648ba934ea32b1b00dafb75e1a830c') - depends_on('r@3.4.0:3.4.9') + depends_on('r@3.0.0:', type=('build', 'run')) depends_on('r-mvtnorm', type=('build', 'run')) depends_on('r-chemometrics', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-ks/package.py b/var/spack/repos/builtin/packages/r-ks/package.py new file mode 100644 index 0000000000..7ca72bdcb7 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-ks/package.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RKs(RPackage): + """Kernel smoothers for univariate and multivariate data.""" + + homepage = "https://cran.r-project.org/package=ks" + url = "https://cran.r-project.org/src/contrib/Archive/ks/ks_1.11.2.tar.gz" + + version('1.11.2', sha256='9dfd485096e1e67abc7dfcb7b76a83de110dd15bcfeffe5c899605b3a5592961') + + depends_on('r@2.10:', type=('build', 'run')) + + depends_on('r-fnn@1.1:', type=('build', 'run')) + depends_on('r-kernlab', type=('build', 'run')) + depends_on('r-mclust', type=('build', 'run')) + depends_on('r-multicool', type=('build', 'run')) + depends_on('r-mvtnorm@1.0:', type=('build', 'run')) + depends_on('r-kernsmooth@2.22:', type=('build', 'run')) + depends_on('r-matrix', type=('build', 'run')) + depends_on('r-mgcv', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-lars/package.py b/var/spack/repos/builtin/packages/r-lars/package.py index f03e91abc8..53a733cb7b 100644 --- a/var/spack/repos/builtin/packages/r-lars/package.py +++ b/var/spack/repos/builtin/packages/r-lars/package.py @@ -33,7 +33,8 @@ class RLars(RPackage): url = "https://cran.r-project.org/src/contrib/lars_1.2.tar.gz" list_url = "https://cran.rstudio.com/src/contrib/Archive/lars" - depends_on('r@3.4.0:3.4.9') version('1.2', '2571bae325f6cba1ad0202ea61695b8c') version('1.1', 'e94f6902aade09b13ec25ba2381384e5') version('0.9-8', 'e6f9fffab2d83898f6d3d811f04d177f') + + depends_on('r@2.10:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-multicool/package.py b/var/spack/repos/builtin/packages/r-multicool/package.py new file mode 100644 index 0000000000..4d112f45c6 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-multicool/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RMulticool(RPackage): + """Permutations of multisets in cool-lex order.""" + + homepage = "https://cran.r-project.org/package=multicool" + url = "https://cran.r-project.org/src/contrib/Archive/multicool/multicool_0.1-9.tar.gz" + + version('0.1-9', sha256='bdf92571cef1b649952d155395a92b8683099ee13114f73a9d41fc5d7d49d329') + + depends_on('r-rcpp@0.11.2:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-pcapp/package.py b/var/spack/repos/builtin/packages/r-pcapp/package.py index 1d1b6c6a2e..0ad4a5f94b 100644 --- a/var/spack/repos/builtin/packages/r-pcapp/package.py +++ b/var/spack/repos/builtin/packages/r-pcapp/package.py @@ -38,5 +38,4 @@ class RPcapp(RPackage): version('1.9-60', '23dd468abb9fedc11e40166446df1017') version('1.9-50', 'be44f173404fd6e86ba0a5515711bfa3') - depends_on('r@3.4.0:3.4.9') depends_on('r-mvtnorm', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-som/package.py b/var/spack/repos/builtin/packages/r-som/package.py index de3f2dfbac..992f4def3b 100644 --- a/var/spack/repos/builtin/packages/r-som/package.py +++ b/var/spack/repos/builtin/packages/r-som/package.py @@ -38,4 +38,4 @@ class RSom(RPackage): version('0.3-3', 'd4ac444be24f71d08b99974c2f4b96e5') version('0.3-2', '4ce28f46df68fbb73905711ba2416fac') - depends_on('r@3.4.0:3.4.9') + depends_on('r@2.10:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 7295c8aaadd966032fb1cee024109435c02e1ae1 Mon Sep 17 00:00:00 2001 From: Josh Deaton Date: Sat, 8 Sep 2018 00:13:34 -0400 Subject: libMesh: New variant and updated recent versions. (#9186) * libmesh: Added SLEPC eigensolver variant. * libmesh: Added new versions. * Corrected flake8 errors. * Corrected SLEPc variant with proper config & conflicts. --- var/spack/repos/builtin/packages/libmesh/package.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libmesh/package.py b/var/spack/repos/builtin/packages/libmesh/package.py index c7d55d10da..40ef632071 100644 --- a/var/spack/repos/builtin/packages/libmesh/package.py +++ b/var/spack/repos/builtin/packages/libmesh/package.py @@ -32,16 +32,23 @@ class Libmesh(Package): homepage = "http://libmesh.github.io/" url = "https://github.com/libMesh/libmesh/releases/download/v1.0.0/libmesh-1.0.0.tar.bz2" + git = "https://github.com/libMesh/libmesh.git" + version('1.3.0', sha256='a8cc2cd44f42b960989dba10fa438b04af5798c46db0b4ec3ed29591b8359786') + version('1.2.1', sha256='11c22c7d96874a17de6b8c74caa45d6745d40bf3610e88b2bd28fd3381f5ba70') version('1.0.0', 'cb464fc63ea0b71b1e69fa3f5d4f93a4') variant('mpi', default=True, description='Enables MPI parallelism') + variant('slepc', default=False, description='SLEPc eigensolver') + # Parallel version of libMesh needs MPI & parallel solvers depends_on('mpi', when='+mpi') - - # Parallel version of libmesh needs parallel solvers depends_on('petsc+mpi', when='+mpi') + # SLEPc version needs SLEPc and requires MPI + depends_on('slepc', when='+slepc') + conflicts('~mpi', when='+slepc') + def install(self, spec, prefix): config_args = ["--prefix=%s" % prefix] @@ -50,6 +57,9 @@ class Libmesh(Package): config_args.append('CXX=%s' % spec['mpi'].mpicxx) config_args.append('PETSC_DIR=%s' % spec['petsc'].prefix) + if '+slepc' in spec: + config_args.append('SLEPC_DIR=%s' % spec['slepc'].prefix) + configure(*config_args) make() -- cgit v1.2.3-70-g09d2 From ffca0647789e8c90571736a3d0ad5017a4bce9e6 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Sat, 8 Sep 2018 23:07:37 +0200 Subject: xsdk: disable assimp in deal.II (#9190) --- var/spack/repos/builtin/packages/xsdk/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py index 806ec638c5..97dd075bf5 100644 --- a/var/spack/repos/builtin/packages/xsdk/package.py +++ b/var/spack/repos/builtin/packages/xsdk/package.py @@ -71,7 +71,7 @@ class Xsdk(Package): depends_on('petsc@develop+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps+double~int64', when='@develop') - depends_on('dealii@develop~python~doc~slepc~gmsh+petsc+mpi+trilinos~int64+hdf5~netcdf+metis', when='@develop') + depends_on('dealii@develop~assimp~python~doc~slepc~gmsh+petsc+mpi+trilinos~int64+hdf5~netcdf+metis', when='@develop') depends_on('pflotran@xsdk-0.3.0', when='@0.3.0') depends_on('pflotran@xsdk-0.2.0', when='@xsdk-0.2.0') -- cgit v1.2.3-70-g09d2 From 8afc630e96aca12bb47e8e85bac9f150b8e6f695 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Sat, 8 Sep 2018 16:18:37 -0500 Subject: assimp: fix compile issues with intel compilers on knl/linux [a depen… (#9191) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * assimp: fix compile issues with intel compilers on knl/linux [a dependency for dealii] Fixes issue #9189 * assimp: add variant 'shared' with default value 'True' --- var/spack/repos/builtin/packages/assimp/package.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/assimp/package.py b/var/spack/repos/builtin/packages/assimp/package.py index 9e3687a95d..01b20b7da9 100644 --- a/var/spack/repos/builtin/packages/assimp/package.py +++ b/var/spack/repos/builtin/packages/assimp/package.py @@ -34,8 +34,21 @@ class Assimp(CMakePackage): version('4.0.1', '23a6301c728a413aafbfa1cca19ba91f') + variant('shared', default=True, + description='Enables the build of shared libraries') + depends_on('boost') def cmake_args(self): - args = ['-DASSIMP_BUILD_TESTS=OFF'] + args = [ + '-DASSIMP_BUILD_TESTS=OFF', + '-DBUILD_SHARED_LIBS:BOOL=%s' % ( + 'ON' if '+shared' in self.spec else 'OFF'), + ] return args + + def flag_handler(self, name, flags): + flags = list(flags) + if name == 'cxxflags': + flags.append(self.compiler.cxx11_flag) + return (None, None, flags) -- cgit v1.2.3-70-g09d2 From a537d7b56e32f04e640b34d5d5811ca48084141d Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Sat, 8 Sep 2018 23:51:16 -0500 Subject: trilinos: disable xlf_tpetra.patch for trilinos@develop (#9193) This patch does not apply cleanly anymore and breaks clang/Mac builds balay@asterix /home/balay/git-repo/github/trilinos (develop=) $ patch -Np1 < /home/balay/git-repo/github/spack/var/spack/repos/builtin/packages/trilinos/xlf_tpetra.patch can't find file to patch at input line 3 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- a/packages/tpetra/core/src/Tpetra_Details_libGemm.cpp |+++ b/packages/tpetra/core/src/Tpetra_Details_libGemm.cpp -------------------------- File to patch: --- var/spack/repos/builtin/packages/trilinos/package.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 87a8bf1e91..d43ad7999e 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -314,9 +314,9 @@ class Trilinos(CMakePackage): patch('xlf_seacas.patch', when='@12.10.1:12.12.1 %xl') patch('xlf_seacas.patch', when='@12.10.1:12.12.1 %xl_r') patch('xlf_seacas.patch', when='@12.10.1:12.12.1 %clang') - patch('xlf_tpetra.patch', when='@12.12.1:%xl') - patch('xlf_tpetra.patch', when='@12.12.1:%xl_r') - patch('xlf_tpetra.patch', when='@12.12.1:%clang') + patch('xlf_tpetra.patch', when='@12.12.1%xl') + patch('xlf_tpetra.patch', when='@12.12.1%xl_r') + patch('xlf_tpetra.patch', when='@12.12.1%clang') def url_for_version(self, version): url = "https://github.com/trilinos/Trilinos/archive/trilinos-release-{0}.tar.gz" -- cgit v1.2.3-70-g09d2 From 3dcbe50eb78bfb000790ce68466064afb0c32db2 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Mon, 10 Sep 2018 00:55:32 -0600 Subject: py-espresso: added v4.0.0 (#9192) Added v4.0.0 and workaround for cmake bug --- .../repos/builtin/packages/py-espresso/2244.patch | 25 ++++++++++++++++++++++ .../repos/builtin/packages/py-espresso/package.py | 6 ++++++ 2 files changed, 31 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-espresso/2244.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-espresso/2244.patch b/var/spack/repos/builtin/packages/py-espresso/2244.patch new file mode 100644 index 0000000000..9a6b95a573 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-espresso/2244.patch @@ -0,0 +1,25 @@ +From 8c1b77e48f2984f7a11434959e37d08514521595 Mon Sep 17 00:00:00 2001 +From: Christoph Junghans +Date: Sun, 9 Sep 2018 07:04:09 -0600 +Subject: [PATCH] cmake: workaround for cmake bug#18349 + +--- + CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8f384f423b..f84095b5f4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -286,7 +286,10 @@ endif(WITH_VALGRIND_INSTRUMENTATION) + ####################################################################### + + find_package(MPI REQUIRED) +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MPI_COMPILE_FLAGS}") ++# Workaround for https://gitlab.kitware.com/cmake/cmake/issues/18349 ++foreach(_MPI_FLAG ${MPI_COMPILE_FLAGS}) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_MPI_FLAG}") ++endforeach() + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MPI_LINK_FLAGS}") + include_directories(SYSTEM ${MPI_INCLUDE_PATH}) + list(APPEND LIBRARIES ${MPI_LIBRARIES}) diff --git a/var/spack/repos/builtin/packages/py-espresso/package.py b/var/spack/repos/builtin/packages/py-espresso/package.py index a1a57c2413..8d00a92f4a 100644 --- a/var/spack/repos/builtin/packages/py-espresso/package.py +++ b/var/spack/repos/builtin/packages/py-espresso/package.py @@ -39,8 +39,13 @@ class PyEspresso(CMakePackage): """ homepage = "http://espressomd.org/" git = "https://github.com/espressomd/espresso.git" + url = "https://github.com/espressomd/espresso/releases/download/4.0.0/espresso-4.0.0.tar.gz" version('develop', branch='python') + version('4.0.0', sha256='8e128847447eebd843de24be9b4ad14aa19c028ae48879a5a4535a9683836e6b') + + # https://github.com/espressomd/espresso/pull/2244 + patch('2244.patch') depends_on("cmake@3.0:", type='build') depends_on("mpi") @@ -49,3 +54,4 @@ class PyEspresso(CMakePackage): depends_on("py-cython@0.23:", type="build") depends_on("py-numpy", type=("build", "run")) depends_on("fftw") + depends_on("hdf5+hl+mpi") -- cgit v1.2.3-70-g09d2 From ccbff6e0cdc1e4e045656a784e28225f416a8ed4 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 10 Sep 2018 17:14:57 -0500 Subject: Improve spec['python'].command support for bwpy (#9157) --- var/spack/repos/builtin/packages/python/package.py | 43 ++++++++++------------ 1 file changed, 19 insertions(+), 24 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index ac42ffa547..7a28566386 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -398,37 +398,32 @@ class Python(AutotoolsPackage): on the version of Python and how it was installed. In general, Python 2 comes with ``python`` and ``python2`` commands, - while Python 3 only comes with a ``python3`` command. + while Python 3 only comes with a ``python3`` command. However, some + package managers will symlink ``python`` to ``python3``, while others + may contain ``python3.6``, ``python3.5``, and ``python3.4`` in the + same directory. - :returns: The Python command - :rtype: Executable + Returns: + Executable: the Python command """ # We need to be careful here. If the user is using an externally - # installed python, all 3 commands could be in the same directory. - - # Search for `python2` iff using Python 2 - if (self.spec.satisfies('@:2') and - os.path.exists(os.path.join(self.prefix.bin, 'python2'))): - command = 'python2' - # Search for `python3` iff using Python 3 - elif (self.spec.satisfies('@3:') and - os.path.exists(os.path.join(self.prefix.bin, 'python3'))): - command = 'python3' - # If neither were found, try `python` - elif os.path.exists(os.path.join(self.prefix.bin, 'python')): - command = 'python' + # installed python, several different commands could be located + # in the same directory. Be as specific as possible. Search for: + # + # * python3.6 + # * python3 + # * python + # + # in that order if using python@3.6.5, for example. + version = self.spec.version + for ver in [version.up_to(2), version.up_to(1), '']: + path = os.path.join(self.prefix.bin, 'python{0}'.format(ver)) + if os.path.exists(path): + return Executable(path) else: msg = 'Unable to locate {0} command in {1}' raise RuntimeError(msg.format(self.name, self.prefix.bin)) - # The python command may be a symlink if it was installed - # with Homebrew. Since some packages try to determine the - # location of libraries and headers based on the path, - # return the realpath - path = os.path.realpath(os.path.join(self.prefix.bin, command)) - - return Executable(path) - def print_string(self, string): """Returns the appropriate print string depending on the version of Python. -- cgit v1.2.3-70-g09d2 From 6d0933b2a068013c79e1a6aa24f4a3dd42a31af7 Mon Sep 17 00:00:00 2001 From: Tristan Carel Date: Tue, 11 Sep 2018 21:43:15 +0900 Subject: steps: new package starting at 3.3 (#9173) --- var/spack/repos/builtin/packages/steps/package.py | 80 +++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 var/spack/repos/builtin/packages/steps/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/steps/package.py b/var/spack/repos/builtin/packages/steps/package.py new file mode 100644 index 0000000000..d857ccdf15 --- /dev/null +++ b/var/spack/repos/builtin/packages/steps/package.py @@ -0,0 +1,80 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Steps(CMakePackage): + """STochastic Engine for Pathway Simulation""" + + homepage = "https://groups.oist.jp/cnu/software" + git = "https://github.com/CNS-OIST/STEPS.git" + + version("3.3.0", submodules=True) + version("3.2.0", submodules=True) + version("develop", branch="master", submodules=True) + + variant("native", default=True, description="Generate non-portable arch-specific code") + variant("lapack", default=False, description="Use new BDSystem/Lapack code for E-Field solver") + variant("petsc", default=False, description="Use PETSc library for parallel E-Field solver") + variant("mpi", default=True, description="Use MPI for parallel solvers") + + depends_on("blas") + depends_on("lapack", when="+lapack") + depends_on("mpi", when="+mpi") + depends_on("petsc~debug+int64", when="+petsc") + depends_on("python") + depends_on("py-cython") + + def cmake_args(self): + args = [] + spec = self.spec + + if "+native" in spec: + args.append("-DTARGET_NATIVE_ARCH:BOOL=True") + else: + args.append("-DTARGET_NATIVE_ARCH:BOOL=False") + + if "+lapack" in spec: + args.append("-DUSE_BDSYSTEM_LAPACK:BOOL=True") + else: + args.append("-DUSE_BDSYSTEM_LAPACK:BOOL=False") + + if "+petsc" in spec: + args.append("-DUSE_PETSC:BOOL=True") + else: + args.append("-DUSE_PETSC:BOOL=False") + + if "+mpi" in spec: + args.append("-DUSE_MPI:BOOL=True") + else: + args.append("-DUSE_MPI:BOOL=False") + + args.append('-DBLAS_LIBRARIES=' + spec['blas'].libs.joined(";")) + return args + + def setup_environment(self, spack_env, run_env): + # This recipe exposes a Python package from a C++ CMake project. + # This hook is required to reproduce what Spack PythonPackage does. + run_env.prepend_path('PYTHONPATH', self.prefix) -- cgit v1.2.3-70-g09d2 From ff13f3953e700c92117314d46bc1a338f817bb6d Mon Sep 17 00:00:00 2001 From: Abhinav Bhatele Date: Tue, 11 Sep 2018 14:10:49 -0700 Subject: ecp-proxy-apps: update dependencies for release 1.0 and 1.1 (#9217) --- var/spack/repos/builtin/packages/comd/package.py | 2 +- .../builtin/packages/ecp-proxy-apps/package.py | 30 +++++++++++++--------- 2 files changed, 19 insertions(+), 13 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/comd/package.py b/var/spack/repos/builtin/packages/comd/package.py index baa9c89d59..8cdad9087b 100644 --- a/var/spack/repos/builtin/packages/comd/package.py +++ b/var/spack/repos/builtin/packages/comd/package.py @@ -35,7 +35,7 @@ class Comd(MakefilePackage): versions of CoMD will be released to incorporate the lessons learned from the co-design process.""" - tags = ['proxy-app', 'ecp-proxy-app'] + tags = ['proxy-app'] homepage = "http://www.exmatex.org/comd.html" url = "https://github.com/ECP-copa/CoMD/archive/v1.1.tar.gz" diff --git a/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py b/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py index 4dd71335a8..6dc23ed2c3 100644 --- a/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py +++ b/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py @@ -40,20 +40,26 @@ class EcpProxyApps(Package): tags = ['proxy-app', 'ecp-proxy-app'] - version('1.0', '5a26b184f506afeb7d221f15c0e8f153') + version('1.1', '15825c318acd3726fd8e72803b1c1090') + version('1.0', '8b3f00f05e6cde88d8d913da4293ee62') - depends_on('amg@1.0', when='@1.0') - depends_on('candle-benchmarks@1.0', when='@1.0') + # Added with release 1.1 + depends_on('examinimd@1.0', when='@1.1:') + + depends_on('amg@1.0', when='@1.0:') + depends_on('candle-benchmarks@1.0', when='@1.0:') + depends_on('laghos@1.0', when='@1.0:') + depends_on('macsio@1.0', when='@1.0:') + depends_on('miniamr@1.4.0', when='@1.0:') + depends_on('minife@2.1.0', when='@1.0:') + depends_on('minitri@1.0', when='@1.0:') + depends_on('nekbone@17.0', when='@1.0:') + depends_on('sw4lite@1.0', when='@1.0:') + depends_on('swfft@1.0', when='@1.0:') + depends_on('xsbench@14', when='@1.0:') + + # Removed after release 1.0 depends_on('comd@1.1', when='@1.0') - depends_on('laghos@1.0', when='@1.0') - depends_on('macsio@1.0', when='@1.0') - depends_on('miniamr@1.4.0', when='@1.0') - depends_on('minife@2.1.0', when='@1.0') - depends_on('minitri@1.0', when='@1.0') - depends_on('nekbone@17.0', when='@1.0') - depends_on('sw4lite@1.0', when='@1.0') - depends_on('swfft@1.0', when='@1.0') - depends_on('xsbench@14', when='@1.0') # Dummy install for now, will be removed when metapackage is available def install(self, spec, prefix): -- cgit v1.2.3-70-g09d2 From 62977662e93bd8b29f34d5baa1a0d851147085a6 Mon Sep 17 00:00:00 2001 From: Ricardo Silva Date: Wed, 12 Sep 2018 20:18:41 +0200 Subject: petsc: fix compilation with intel (#9198) * mpiifort doesn't automatically link all run-time libraries * scalapack was being picked up accidentaly if intel-mkl was in the spec --- var/spack/repos/builtin/packages/petsc/package.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index a376303e04..07dfb09745 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -186,8 +186,12 @@ class Petsc(Package): compiler_opts = [ '--with-cc=%s' % self.spec['mpi'].mpicc, '--with-cxx=%s' % self.spec['mpi'].mpicxx, - '--with-fc=%s' % self.spec['mpi'].mpifc + '--with-fc=%s' % self.spec['mpi'].mpifc, ] + if self.spec.satisfies('%intel'): + # mpiifort needs some help to automatically link + # all necessary run-time libraries + compiler_opts.append('--FC_LINKER_FLAGS=-lintlc') return compiler_opts def install(self, spec, prefix): @@ -226,8 +230,9 @@ class Petsc(Package): else: options.append('--with-clanguage=C') - # Help PETSc pick up Scalapack from MKL: - if 'scalapack' in spec: + # PETSc depends on scalapack when '+mumps+mpi~int64' (see depends()) + # help PETSc pick up Scalapack from MKL + if spec.satisfies('+mumps+mpi~int64'): scalapack = spec['scalapack'].libs options.extend([ '--with-scalapack-lib=%s' % scalapack.joined(), -- cgit v1.2.3-70-g09d2 From 1e2b3b07687145388e51c4fa7764473fc3f4444f Mon Sep 17 00:00:00 2001 From: Abhinav Bhatele Date: Wed, 12 Sep 2018 13:11:05 -0700 Subject: AMG: update version (#9228) --- var/spack/repos/builtin/packages/amg/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/amg/package.py b/var/spack/repos/builtin/packages/amg/package.py index 4ac0cf2e64..9bd75a906f 100644 --- a/var/spack/repos/builtin/packages/amg/package.py +++ b/var/spack/repos/builtin/packages/amg/package.py @@ -36,6 +36,7 @@ class Amg(MakefilePackage): git = "https://github.com/LLNL/AMG.git" version('develop', branch='master') + version('1.1', tag='1.1') version('1.0', tag='1.0') variant('openmp', default=True, description='Build with OpenMP support') -- cgit v1.2.3-70-g09d2 From 98d8c4d7cac604ee53d8ba41d81bb7a727a461c9 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Thu, 13 Sep 2018 10:00:21 +0000 Subject: py-espresso: apply patch to v4.0.0 only (#9196) --- var/spack/repos/builtin/packages/py-espresso/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-espresso/package.py b/var/spack/repos/builtin/packages/py-espresso/package.py index 8d00a92f4a..a0559f2cff 100644 --- a/var/spack/repos/builtin/packages/py-espresso/package.py +++ b/var/spack/repos/builtin/packages/py-espresso/package.py @@ -44,8 +44,8 @@ class PyEspresso(CMakePackage): version('develop', branch='python') version('4.0.0', sha256='8e128847447eebd843de24be9b4ad14aa19c028ae48879a5a4535a9683836e6b') - # https://github.com/espressomd/espresso/pull/2244 - patch('2244.patch') + # espressomd/espresso#2244 merge upstream + patch('2244.patch', when="@4.0.0") depends_on("cmake@3.0:", type='build') depends_on("mpi") -- cgit v1.2.3-70-g09d2 From 1122fc3d1e715c3ceb2bb3d112960f8be52ae3e3 Mon Sep 17 00:00:00 2001 From: Neil Flood Date: Fri, 14 Sep 2018 23:11:16 +1000 Subject: r-nloptr: Explicit depends_on(nlopt). Previously there was a hidden d… (#9176) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * r-nloptr: Explicit depends_on(nlopt). Previously there was a hidden dependency, masked by the package's configure script. * r-nloptr: Change spelling of variables to satisfy pyflake8 * r-nloptr: Break a long line to satisfy pyflake8 * r-nloptr: larger indent on continuation, to satisfy pyflake8 * r-nloptr: another attempt at larger indent on continuation, to satisfy pyflake8 * r-nloptr: now a smaller indent on continuation, to satisfy pyflake8 * r-nloptr: Another attempt at right amount of indent. * r-nloptr: Another attempt at right amount of indent. * Use the correct attributes for finding the nlopt includes and libs. * Lines too long, split into pieces --- var/spack/repos/builtin/packages/r-nloptr/package.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-nloptr/package.py b/var/spack/repos/builtin/packages/r-nloptr/package.py index e5ac989522..f1fd3eaa83 100644 --- a/var/spack/repos/builtin/packages/r-nloptr/package.py +++ b/var/spack/repos/builtin/packages/r-nloptr/package.py @@ -42,3 +42,13 @@ class RNloptr(RPackage): version('1.0.4', 'f2775dfb4f7f5552d46937a04c062b0d') depends_on('r-testthat', type=('build', 'run')) + depends_on('nlopt') + + def configure_args(self): + include_flags = self.spec['nlopt'].headers.include_flags + libs = self.spec['nlopt'].libs.libraries[0] + args = [ + '--with-nlopt-cflags={0}'.format(include_flags), + '--with-nlopt-libs={0}'.format(libs) + ] + return args -- cgit v1.2.3-70-g09d2 From 466bc20874efc4a555348cb8b45e8b084a24670b Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Fri, 14 Sep 2018 11:36:39 -0500 Subject: cmake: add version 3.12.2 (#9248) --- var/spack/repos/builtin/packages/cmake/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index ed876d0b8e..b4494f75f9 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -33,6 +33,7 @@ class Cmake(Package): list_url = 'https://cmake.org/files/' list_depth = 1 + version('3.12.2', '6e7c550cfa1c2e216b35903dc70d80af') version('3.12.1', '10109246a51102bfda45ff3935275fbf') version('3.12.0', 'ab4aa7df9301c94cdd6f8ee4fe66458b') version('3.11.4', '72e168b3bad2f9c34dcebbad7af56ff0') -- cgit v1.2.3-70-g09d2 From 0ed58374e7e81f1039357c43c5f42ef39241e309 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Fri, 14 Sep 2018 12:35:45 -0500 Subject: py-colormath: new version, requires newer networkx (#9237) * py-colormath: new version requires newer networkx --- var/spack/repos/builtin/packages/py-colormath/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-colormath/package.py b/var/spack/repos/builtin/packages/py-colormath/package.py index fa1584e85d..712bc526eb 100644 --- a/var/spack/repos/builtin/packages/py-colormath/package.py +++ b/var/spack/repos/builtin/packages/py-colormath/package.py @@ -31,8 +31,10 @@ class PyColormath(PythonPackage): homepage = "https://pypi.python.org/pypi/colormath/2.1.1" url = "https://pypi.io/packages/source/c/colormath/colormath-2.1.1.tar.gz" + version('3.0.0', '3d4605af344527da0e4f9f504fad7ddbebda35322c566a6c72e28edb1ff31217') version('2.1.1', '10a0fb17e3c24363d0e1a3f2dccaa33b') depends_on('py-setuptools', type='build') depends_on('py-numpy', type=('build', 'run')) depends_on('py-networkx', type=('build', 'run')) + depends_on('py-networkx@2.0:', type=('build', 'run'), when='@3.0.0:') -- cgit v1.2.3-70-g09d2 From 056960870bd64bbdf4dcbb7dff781dcbe675b5c4 Mon Sep 17 00:00:00 2001 From: Daniel Topa Date: Fri, 14 Sep 2018 11:48:38 -0600 Subject: Hwloc add update 2.0.2 (#9244) Signed-off-by: Daniel Topa --- var/spack/repos/builtin/packages/hwloc/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hwloc/package.py b/var/spack/repos/builtin/packages/hwloc/package.py index 87f65b148d..6b3be96a2f 100644 --- a/var/spack/repos/builtin/packages/hwloc/package.py +++ b/var/spack/repos/builtin/packages/hwloc/package.py @@ -44,10 +44,11 @@ class Hwloc(AutotoolsPackage): """ homepage = "http://www.open-mpi.org/projects/hwloc/" - url = "http://www.open-mpi.org/software/hwloc/v1.9/downloads/hwloc-1.9.tar.gz" + url = "https://download.open-mpi.org/release/hwloc/v2.0/hwloc-2.0.2.tar.gz" list_url = "http://www.open-mpi.org/software/hwloc/" list_depth = 2 + version('2.0.2', '71d1211eaa4b25ac7ad80cf326784e87') version('2.0.1', '442b2482bb5b81983ed256522aadbf94') version('2.0.0', '027e6928ae0b5b64c821d0a71a61cd82') version('1.11.9', '4d5f5da8b1d09731d82e865ecf3fa399') -- cgit v1.2.3-70-g09d2 From 24dd24600c819a606a255fe676c73b8c9955cc19 Mon Sep 17 00:00:00 2001 From: sknigh Date: Fri, 14 Sep 2018 10:50:20 -0700 Subject: Added Kibana package, added Elasticsearch to 6.4.0 (#9239) * Added kibana, updated elasticsearch * Update elastic search to 6.4 --- .../builtin/packages/elasticsearch/package.py | 1 + var/spack/repos/builtin/packages/kibana/package.py | 40 ++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 var/spack/repos/builtin/packages/kibana/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/elasticsearch/package.py b/var/spack/repos/builtin/packages/elasticsearch/package.py index 97c4f4ff9d..c3e722ff2b 100644 --- a/var/spack/repos/builtin/packages/elasticsearch/package.py +++ b/var/spack/repos/builtin/packages/elasticsearch/package.py @@ -34,6 +34,7 @@ class Elasticsearch(Package): homepage = "https://www.elastic.co/" url = "https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.2.4.tar.gz" + version('6.4.0', '5c23c99a52600b250a6871bf6a744e8b') version('6.2.4', '692d01956fe7aee2d08ac0fbf7b7a19e') depends_on('jdk', type='run') diff --git a/var/spack/repos/builtin/packages/kibana/package.py b/var/spack/repos/builtin/packages/kibana/package.py new file mode 100644 index 0000000000..f483940fbd --- /dev/null +++ b/var/spack/repos/builtin/packages/kibana/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Kibana(Package): + """Kibana lets you visualize your Elasticsearch data and navigate the + Elastic Stack""" + + homepage = "https://www.elastic.co/products/kibana" + url = "https://artifacts.elastic.co/downloads/kibana/kibana-6.4.0-linux-x86_64.tar.gz" + + version('6.4.0', sha256='df2056105a08c206a1adf9caed09a152a53429a0f1efc1ba3ccd616092d78aee') + + depends_on('jdk', type='run') + + def install(self, spec, prefix): + install_tree('.', join_path(prefix, '.')) -- cgit v1.2.3-70-g09d2 From 451328d6e6b8bd29b4a840d9fdc6ab278a1cf14a Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Fri, 14 Sep 2018 13:01:30 -0500 Subject: mxnet: added 1.3.0 (#9236) * add version 1.3.0 * change build parameters, install process * mxnet will not compile against spack's nnvm and dmlc so we must use the distributions provided by the source package. * also removed 'bin' installation as mxnet is just a shared library. * improve BLAS linking * remove unnecessary args * added variant for python bindings --- var/spack/repos/builtin/packages/mxnet/package.py | 50 ++++++++++++++++++----- 1 file changed, 40 insertions(+), 10 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mxnet/package.py b/var/spack/repos/builtin/packages/mxnet/package.py index 968e31c0b7..e7ef2d4ce2 100644 --- a/var/spack/repos/builtin/packages/mxnet/package.py +++ b/var/spack/repos/builtin/packages/mxnet/package.py @@ -32,6 +32,8 @@ class Mxnet(MakefilePackage): homepage = "http://mxnet.io" url = "https://github.com/apache/incubator-mxnet/archive/0.10.0.post2.tar.gz" + version('1.3.0', 'c00d6fbb2947144ce36c835308e603f002c1eb90a9f4c5a62f4d398154eed4d2', + url='https://github.com/apache/incubator-mxnet/releases/download/1.3.0/apache-mxnet-src-1.3.0-incubating.tar.gz') version('0.10.0.post2', '7819d511cf4a6efad681e6662fa966e4', url="https://github.com/apache/incubator-mxnet/archive/0.10.0.post2.tar.gz") version('0.10.0.post1', '16d540f407cd22285555b3ab22040032', @@ -43,6 +45,7 @@ class Mxnet(MakefilePackage): variant('opencv', default=True, description='Enable OpenCV support') variant('openmp', default=False, description='Enable OpenMP support') variant('profiler', default=False, description='Enable Profiler (for verification and debug only).') + variant('python', default=True, description='Install python bindings') depends_on('dmlc-core@20170508') depends_on('dmlc-core+openmp', when='+openmp') @@ -50,29 +53,45 @@ class Mxnet(MakefilePackage): depends_on('mshadow@20170721') depends_on('ps-lite@20170328') depends_on('nnvm~shared@20170418') - depends_on('openblas') + depends_on('blas') depends_on('cudnn', when='+cuda') depends_on('cudnn', when='+cuda') depends_on('cub', when='+cuda') depends_on('opencv+core+imgproc+highgui+jpeg+png+tiff~eigen~ipp@3.0:', when='+opencv') + # python extensions + depends_on('python@2.7:', type=('build', 'run'), when='+python') + depends_on('py-setuptools', type='build', when='+python') + extends('python', when='+python') + patch('makefile.patch', when='@0.10:0.11') def build(self, spec, prefix): - filter_file('export CC = gcc', '', 'make/config.mk', string=True) - filter_file('export CXX = g++', '', 'make/config.mk', string=True) + # copy template configuration file + copy('make/config.mk', 'config.mk') + + # remove compiler overrides + filter_file('export CC = gcc', '', 'config.mk', string=True) + filter_file('export CXX = g++', '', 'config.mk', string=True) + + # add blas prefix to include paths + filter_file( + '-I$(NNVM_PATH)/include', + '-I$(NNVM_PATH)/include -I%s/include' % spec['blas'].prefix, + 'Makefile', string=True + ) + + # mxnet comes with its own version of nnvm and dmlc. + # building it will fail if we use the spack paths args = [ 'CC=%s' % self.compiler.cc, 'CXX=%s' % self.compiler.cxx, - 'DMLC_CORE=%s' % spec['dmlc-core'].prefix, 'MSHADOW_PATH=%s' % spec['mshadow'].prefix, 'PS_PATH=%s' % spec['ps-lite'].prefix, - 'NNVM_PATH=%s' % spec['nnvm'].prefix, 'USE_OPENMP=%s' % ('1' if '+openmp' in spec else '0'), 'USE_CUDA=%s' % ('1' if '+cuda' in spec else '0'), 'USE_CUDNN=%s' % ('1' if '+cuda' in spec else '0'), - 'CUB_INCLUDE=%s' % spec['cub'].prefix.include, 'USE_OPENCV=%s' % ('1' if '+opencv' in spec else '0'), 'USE_PROFILER=%s' % ('1' if '+profiler' in spec else '0'), ] @@ -86,16 +105,27 @@ class Mxnet(MakefilePackage): '-lopencv_core -lopencv_imgproc -lopencv_imgcodecs', 'Makefile', string=True) - # TODO: Add more BLAS support - args.append('USE_BLAS=openblas') + if 'openblas' in spec: + args.extend(['USE_BLAS=openblas']) + elif 'atlas' in spec or 'cblas' in spec: + args.extend(['USE_BLAS=atlas']) + else: + args.extend(['USE_BLAS=blas']) if '+cuda' in spec: args.extend(['USE_CUDA_PATH=%s' % spec['cuda'].prefix, - 'CUDNN_PATH=%s' % spec['cudnn'].prefix]) + 'CUDNN_PATH=%s' % spec['cudnn'].prefix, + 'CUB_INCLUDE=%s' % spec['cub'].prefix.include]) make(*args) def install(self, spec, prefix): + # mxnet is just a shared library -- no need to install a bin tree + install_tree('include', prefix.include) install_tree('lib', prefix.lib) - install_tree('bin', prefix.bin) + + # install python bindings + if '+python' in spec: + python = which('python') + python('python/setup.py', 'install', '--prefix={0}'.format(prefix)) -- cgit v1.2.3-70-g09d2 From ff6b9b99fae8d2c993dbf3689899ed8998a541c6 Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Fri, 14 Sep 2018 15:55:52 -0500 Subject: gatk: new version (#9202) * gatk: added 4.0.8.1, fixed binary install * gatk: fix flake8 conflict * gatk: improve comments and modify install --- var/spack/repos/builtin/packages/gatk/package.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gatk/package.py b/var/spack/repos/builtin/packages/gatk/package.py index f7ce7c1714..e2462ea4e6 100644 --- a/var/spack/repos/builtin/packages/gatk/package.py +++ b/var/spack/repos/builtin/packages/gatk/package.py @@ -35,6 +35,8 @@ class Gatk(Package): homepage = "https://software.broadinstitute.org/gatk/" url = "https://github.com/broadinstitute/gatk/releases/download/4.0.4.0/gatk-4.0.4.0.zip" + version('4.0.8.1', sha256='6d47463dfd8c16ffae82fd29e4e73503e5b7cd0fcc6fea2ed50ee3760dd9acd9', + url='https://github.com/broadinstitute/gatk/archive/4.0.8.1.tar.gz') version('4.0.4.0', '083d655883fb251e837eb2458141fc2b', url="https://github.com/broadinstitute/gatk/releases/download/4.0.4.0/gatk-4.0.4.0.zip") version('3.8-0', '0581308d2a25f10d11d3dfd0d6e4d28e', extension='tar.gz', @@ -46,10 +48,10 @@ class Gatk(Package): def install(self, spec, prefix): mkdirp(prefix.bin) - # The list of files to install varies with release... - # ... but skip the spack-{build.env}.out files and gatkdoc directory. + + # Install all executable non-script files to prefix bin files = [x for x in glob.glob("*") - if not re.match("^spack-", x) and not re.match("^gatkdoc", x)] + if not re.match("^.*\.sh$", x) and is_exe(x)] for f in files: install(f, prefix.bin) -- cgit v1.2.3-70-g09d2 From 36f396ad5bdf1d721254a7b00eac03f5154e6faa Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Fri, 14 Sep 2018 15:56:15 -0500 Subject: gdb: add version 8.2 (#9246) --- var/spack/repos/builtin/packages/gdb/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gdb/package.py b/var/spack/repos/builtin/packages/gdb/package.py index 1e5bc7be18..e5336c2910 100644 --- a/var/spack/repos/builtin/packages/gdb/package.py +++ b/var/spack/repos/builtin/packages/gdb/package.py @@ -34,6 +34,7 @@ class Gdb(AutotoolsPackage): homepage = "https://www.gnu.org/software/gdb" url = "https://ftpmirror.gnu.org/gdb/gdb-7.10.tar.gz" + version('8.2', '0783c6d86775c5aff06cccc8a3d7cad8') version('8.1', '0c85ecbb43569ec43b1c9230622e84ab') version('8.0.1', 'bb45869f8126a84ea2ba13a8c0e7c90e') version('8.0', '9bb49d134916e73b2c01d01bf20363df') -- cgit v1.2.3-70-g09d2 From 716ed92e32709f51b1f125378233418a7e23fcd8 Mon Sep 17 00:00:00 2001 From: Douglas Duckworth Date: Fri, 14 Sep 2018 16:57:22 -0400 Subject: motioncor2 - added version 1.1.0 and removed old, unlisted versions (#9229) --- var/spack/repos/builtin/packages/motioncor2/package.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/motioncor2/package.py b/var/spack/repos/builtin/packages/motioncor2/package.py index 47f9411c3e..08351e0838 100644 --- a/var/spack/repos/builtin/packages/motioncor2/package.py +++ b/var/spack/repos/builtin/packages/motioncor2/package.py @@ -36,12 +36,16 @@ class Motioncor2(Package): to keep up with automated data collection.""" homepage = "http://msg.ucsf.edu/em/software" - url = "http://msg.ucsf.edu/MotionCor2/MotionCor2-1.0.2.tar.gz" + url = "http://msg.ucsf.edu/MotionCor2/MotionCor2-1.1.0.zip" - version('1.0.4', '5fc0a35d9518b2df17104187dab63fc6') - version('1.0.2', 'f2f4c5b09170ab8480ca657f14cdba2b') - version('1.0.1', '73d94a80abdef9bf37bbc80fbbe76622') - version('1.0.0', '490f4df8daa9f5ddb9eec3962ba3ddf5') + version('1.1.0', + '6e37e7ed63a9f0aab5d794b2604d5ba79333960bb9440a1a218630b03dbeaeac') + version('1.0.5', + '4efa55af25644bcff1ca7882419267b8c094c9cc6155b37d2c204b154c56f5a8', + url='http://msg.ucsf.edu/MotionCor2/MotionCor2-1.0.5.tar.gz') + version('1.0.4', + 'c75738160ac18d3f27c33677e78e63313d8ec2b023b5a46173428c3fa0451a94', + url='http://msg.ucsf.edu/MotionCor2/MotionCor2-1.0.4.tar.gz') depends_on('cuda@8.0:8.99', type='run') # libtiff.so.3 is required -- cgit v1.2.3-70-g09d2 From dda27fc0d1595a086250c9da1f12d67c36d36e9c Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Fri, 14 Sep 2018 16:54:26 -0500 Subject: rmats: new package starting at 4.0.2 (#9243) * new package starting at 4.0.2 --- var/spack/repos/builtin/packages/rmats/package.py | 51 +++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 var/spack/repos/builtin/packages/rmats/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/rmats/package.py b/var/spack/repos/builtin/packages/rmats/package.py new file mode 100644 index 0000000000..3f969b4b1c --- /dev/null +++ b/var/spack/repos/builtin/packages/rmats/package.py @@ -0,0 +1,51 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * +from os import symlink + + +class Rmats(Package): + """MATS is a computational tool to detect differential alternative + splicing events from RNA-Seq data.""" + + homepage = "https://rnaseq-mats.sourceforge.net/index.html" + url = "https://downloads.sourceforge.net/project/rnaseq-mats/MATS/rMATS.4.0.2.tgz" + + version('4.0.2', sha256='afab002a9ae836d396909aede96318f6dab6e5818078246419dd563624bf26d1') + + depends_on('python@2.7:', type='run') + depends_on('py-numpy', type=('build', 'run')) + depends_on('openblas') + + def install(self, spec, prefix): + # since the tool is a python script we install it to /usr/lib + install_tree('rMATS-turbo-Linux-UCS4', join_path(prefix.lib, 'rmats')) + + # the script has an appropriate shebang so a quick symlink will do + set_executable(join_path(prefix.lib, 'rmats/rmats.py')) + mkdirp(prefix.bin) + symlink(join_path(prefix.lib, 'rmats/rmats.py'), + join_path(prefix.bin, 'rmats')) -- cgit v1.2.3-70-g09d2 From 17d4005a4f2756f6e820d99960b7961412a619f4 Mon Sep 17 00:00:00 2001 From: Ken Raffenetti Date: Fri, 14 Sep 2018 17:48:40 -0500 Subject: argobots: new package starting at 1.0b1 (#9238) --- .../repos/builtin/packages/argobots/package.py | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 var/spack/repos/builtin/packages/argobots/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/argobots/package.py b/var/spack/repos/builtin/packages/argobots/package.py new file mode 100644 index 0000000000..2f36bd22ee --- /dev/null +++ b/var/spack/repos/builtin/packages/argobots/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Argobots(AutotoolsPackage): + """Argobots, which was developed as a part of the Argo project, is + a lightweight runtime system that supports integrated computation + and data movement with massive concurrency. It will directly + leverage the lowest-level constructs in the hardware and OS: + lightweight notification mechanisms, data movement engines, memory + mapping, and data placement strategies. It consists of an + execution model and a memory model.""" + + homepage = "http://www.argobots.org/" + url = "https://github.com/pmodels/argobots/releases/download/v1.0b1/argobots-1.0b1.tar.gz" + + version("1.0b1", "5eeab7b2c639d08bbea22db3026cdf39") + version("1.0a1", "9d29d57d14d718f93b505178f6ba3e08") -- cgit v1.2.3-70-g09d2 From 31da75240269f54deb55f5c18eef658ec7b85cdb Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Fri, 14 Sep 2018 17:49:11 -0500 Subject: metasv: add required dependencies (#9254) * add runtime deps * revert to strict dep versions --- var/spack/repos/builtin/packages/metasv/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/metasv/package.py b/var/spack/repos/builtin/packages/metasv/package.py index eba6ae5697..540b2da2b9 100644 --- a/var/spack/repos/builtin/packages/metasv/package.py +++ b/var/spack/repos/builtin/packages/metasv/package.py @@ -37,3 +37,5 @@ class Metasv(PythonPackage): depends_on('py-pybedtools@0.6.9', type=('build', 'run')) depends_on('py-pysam@0.7.7', type=('build', 'run')) depends_on('py-pyvcf@0.6.7', type=('build', 'run')) + depends_on('py-setuptools', type=('build', 'run')) + depends_on('py-cython', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 881af613b312b156c8b459c018326f9ee5499dd9 Mon Sep 17 00:00:00 2001 From: Ken Raffenetti Date: Fri, 14 Sep 2018 17:49:36 -0500 Subject: bolt: new package starting at 1.0b1 (#9253) --- var/spack/repos/builtin/packages/bolt/package.py | 50 ++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 var/spack/repos/builtin/packages/bolt/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bolt/package.py b/var/spack/repos/builtin/packages/bolt/package.py new file mode 100644 index 0000000000..7af61eb9f4 --- /dev/null +++ b/var/spack/repos/builtin/packages/bolt/package.py @@ -0,0 +1,50 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Bolt(CMakePackage): + """BOLT targets a high-performing OpenMP implementation, + especially specialized for fine-grain parallelism. Unlike other + OpenMP implementations, BOLT utilizes a lightweight threading + model for its underlying threading mechanism. It currently adopts + Argobots, a new holistic, low-level threading and tasking runtime, + in order to overcome shortcomings of conventional OS-level + threads. The current BOLT implementation is based on the OpenMP + runtime in LLVM, and thus it can be used with LLVM/Clang, Intel + OpenMP compiler, and GCC.""" + + homepage = "http://www.bolt-omp.org/" + url = "https://github.com/pmodels/bolt/releases/download/v1.0b1/bolt-1.0b1.tar.gz" + + version("1.0b1", "df76beb3a7f13ae2dcaf9ab099eea87b") + + def cmake_args(self): + options = [ + '-DLIBOMP_USE_ITT_NOTIFY=off', + '-DLIBOMP_USE_ARGOBOTS=on' + ] + + return options -- cgit v1.2.3-70-g09d2 From f52812e5711f353a2c01fec1e4280bb828311a4a Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Fri, 14 Sep 2018 17:50:18 -0500 Subject: perl-gdgraph-histogram: new package (#9250) --- .../packages/perl-gdgraph-histogram/package.py | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-gdgraph-histogram/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-gdgraph-histogram/package.py b/var/spack/repos/builtin/packages/perl-gdgraph-histogram/package.py new file mode 100644 index 0000000000..134c1994bb --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-gdgraph-histogram/package.py @@ -0,0 +1,35 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlGdgraphHistogram(PerlPackage): + """GD::Graph::histogram extends the GD::Graph module to create histograms. + The module allow creation of count or percentage histograms.""" + + homepage = "https://metacpan.org/pod/GD::Graph::histogram" + url = "https://cpan.metacpan.org/authors/id/W/WH/WHIZDOG/GDGraph-histogram-1.1.tar.gz" + + version('1.1', sha256='20f752d0e6deb59b29aa2ec3496b5883476d00280b6e83f5b47c33fac4097f8a') -- cgit v1.2.3-70-g09d2 From 49aed4584be35ecb6dc724d06f8d9216f7552bab Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Fri, 14 Sep 2018 17:51:20 -0500 Subject: py-markdown: fix url and hashes (#9235) --- .../repos/builtin/packages/py-markdown/package.py | 26 ++++++++++++---------- 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-markdown/package.py b/var/spack/repos/builtin/packages/py-markdown/package.py index 8954b0635c..79d867898d 100644 --- a/var/spack/repos/builtin/packages/py-markdown/package.py +++ b/var/spack/repos/builtin/packages/py-markdown/package.py @@ -34,18 +34,20 @@ class PyMarkdown(PythonPackage): """ homepage = "https://pythonhosted.org/Markdown/" - url = "https://github.com/waylan/Python-Markdown/archive/2.6.7-final.tar.gz" + url = "https://pypi.io/packages/source/m/markdown/Markdown-2.6.11.tar.gz" - version('2.6.7', 'fd27044042e197ad99249b3d60215d97') - version('2.6.6', '2b47a0ff7eb19ef34453fe198a0cccc4') - version('2.6.5', 'e4b6b65b2d6bcac07176fb209bc55614') - version('2.6.4', '5fb3cd9945eb534e71af597f8ee3622b') - version('2.6.3', 'ec7a50ce9fd4a5fd0b24555d47e9d7d1') - version('2.6.2', '6ce86913e9bf5bb34d9ee394ac71f044') - version('2.6.1', '0ae69693c5adb27caf0160941d7dcbdf') - version('2.6', '9acdde43d99847d0c4ef03ea56b1d2c5') - version('2.5.2', 'ed2a662d22799186c1ef85d173d38b8a') - version('2.5.1', 'be6f6ba65a8fb843d2aaf1fcdd68c755') - version('2.5', '8393ceab9c6e33357fb8a7be063a4849') + version('2.6.11', sha256='a856869c7ff079ad84a3e19cd87a64998350c2b94e9e08e44270faef33400f81') + version('2.6.7', sha256='daebf24846efa7ff269cfde8c41a48bb2303920c7b2c7c5e04fa82e6282d05c0') + version('2.6.6', sha256='9a292bb40d6d29abac8024887bcfc1159d7a32dc1d6f1f6e8d6d8e293666c504') + version('2.6.5', sha256='8d94cf6273606f76753fcb1324623792b3738c7612c2b180c85cc5e88642e560') + version('2.6.4', sha256='e436eee7aaf2a230ca3315034dd39e8a0fc27036708acaa3dd70625ec62a94ce') + version('2.6.3', sha256='ad75fc03c45492eba3bc63645e1e6465f65523a05fff0abf36910f810465a9af') + version('2.6.2', sha256='ee17d0d7dc091e645dd48302a2e21301cc68f188505c2069d8635f94554170bf') + version('2.6.1', sha256='b5879b87e8e5c125c92ab8c8f3babce78ad4e840446eed73c5b6e2984648d2b1') + version('2.6', sha256='e1c8a489bb7c7154bc5a8c14f0fd1fc356ee36c8b9988f9fd8febff22dd435da') + version('2.5.2', sha256='284e97e56db9ada03ede9c0ed2870ca6590ce7869f3119104d53510debf1533d') + version('2.5.1', sha256='8f81ed12c18608a502828acb7d318f362c42f4eca97d01e93cadfc52c1e40b73') + version('2.5', sha256='6ba74a1e7141c9603750d80711b639a7577bffb785708e6260090239ee5bc76d') depends_on('python@2.7:2.8,3.2:3.4') + depends_on('py-setuptools', type='build', when='@2.6.11:') -- cgit v1.2.3-70-g09d2 From 617ff8f12581ed359cddd692ebf48ce432e3e89f Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Fri, 14 Sep 2018 17:51:43 -0500 Subject: py-decorator: new version (#9240) --- var/spack/repos/builtin/packages/py-decorator/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-decorator/package.py b/var/spack/repos/builtin/packages/py-decorator/package.py index 96a9a90d84..6827e045f3 100644 --- a/var/spack/repos/builtin/packages/py-decorator/package.py +++ b/var/spack/repos/builtin/packages/py-decorator/package.py @@ -32,6 +32,7 @@ class PyDecorator(PythonPackage): homepage = "https://github.com/micheles/decorator" url = "https://pypi.io/packages/source/d/decorator/decorator-4.0.9.tar.gz" + version('4.3.0', sha256='c39efa13fbdeb4506c476c9b3babf6a718da943dab7811c206005a4a956c080c') version('4.0.9', 'f12c5651ccd707e12a0abaa4f76cd69a') depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From 3c33b5efef1456f5882e16509f3a2e60654da9dd Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Fri, 14 Sep 2018 17:52:02 -0500 Subject: py-networkx: new version (#9241) --- var/spack/repos/builtin/packages/py-networkx/package.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-networkx/package.py b/var/spack/repos/builtin/packages/py-networkx/package.py index 1e00f636a1..6ae530e8e0 100644 --- a/var/spack/repos/builtin/packages/py-networkx/package.py +++ b/var/spack/repos/builtin/packages/py-networkx/package.py @@ -31,8 +31,11 @@ class PyNetworkx(PythonPackage): homepage = "http://networkx.github.io/" url = "https://pypi.io/packages/source/n/networkx/networkx-1.11.tar.gz" - version('1.11', '6ef584a879e9163013e9a762e1cf7cd1') - version('1.10', 'eb7a065e37250a4cc009919dacfe7a9d') + version('2.1', sha256='64272ca418972b70a196cb15d9c85a5a6041f09a2f32e0d30c0255f25d458bb1', + url='https://pypi.io/packages/source/n/networkx/networkx-2.1.zip') + version('1.11', md5='6ef584a879e9163013e9a762e1cf7cd1') + version('1.10', md5='eb7a065e37250a4cc009919dacfe7a9d') depends_on('py-decorator', type=('build', 'run')) + depends_on('py-decorator@4.1.0:', type=('build', 'run'), when='@2.1:') depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From 62208afdb96ff93795a3dba34538f4a9e4440036 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Fri, 14 Sep 2018 17:52:29 -0500 Subject: py-multiqc: needs newer py-spectra (#9226) --- var/spack/repos/builtin/packages/py-multiqc/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-multiqc/package.py b/var/spack/repos/builtin/packages/py-multiqc/package.py index 1eea2b474f..044b76d336 100644 --- a/var/spack/repos/builtin/packages/py-multiqc/package.py +++ b/var/spack/repos/builtin/packages/py-multiqc/package.py @@ -43,8 +43,11 @@ class PyMultiqc(PythonPackage): depends_on('py-jinja2@2.9:', type=('build', 'run')) depends_on('py-lzstring', type=('build', 'run')) depends_on('py-future@0.14.1:', type=('build', 'run')) - depends_on('py-spectra', type=('build', 'run')) + depends_on('py-spectra@0.0.10:', type=('build', 'run')) depends_on('py-matplotlib', type=('build', 'run')) depends_on('py-numpy', type=('build', 'run')) depends_on('py-pyyaml', type=('build', 'run')) depends_on('py-simplejson', type=('build', 'run')) + depends_on('py-requests', type=('build', 'run'), when='@1.5:') + depends_on('py-enum34', type=('build', 'run'), when='@1.5:') + depends_on('py-markdown', type=('build', 'run'), when='@1.5:') -- cgit v1.2.3-70-g09d2 From a76aa364819baf88d7bd45bad134f1de1e2012d6 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Fri, 14 Sep 2018 15:53:06 -0700 Subject: hypre: add debug variant (#9222) --- var/spack/repos/builtin/packages/hypre/package.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hypre/package.py b/var/spack/repos/builtin/packages/hypre/package.py index a20e925208..b3c453e7e5 100644 --- a/var/spack/repos/builtin/packages/hypre/package.py +++ b/var/spack/repos/builtin/packages/hypre/package.py @@ -55,6 +55,8 @@ class Hypre(Package): variant('int64', default=False, description="Use 64bit integers") variant('mpi', default=True, description='Enable MPI support') + variant('debug', default=False, + description='Build debug instead of optimized version') # Patch to add ppc64le in config.guess patch('ibm-ppc64le.patch', when='@:2.11.1') @@ -104,6 +106,11 @@ class Hypre(Package): configure_args.append("--without-mli") configure_args.append("--without-fei") + if '+debug' in self.spec: + configure_args.append("--enable-debug") + else: + configure_args.append("--disable-debug") + # Hypre's source is staged under ./src so we'll have to manually # cd into it. with working_dir("src"): -- cgit v1.2.3-70-g09d2 From 69a9a3291af5889e50c0300622da39601eb11a63 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Fri, 14 Sep 2018 15:53:25 -0700 Subject: ipopt: add debug variant (#9223) --- var/spack/repos/builtin/packages/ipopt/package.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ipopt/package.py b/var/spack/repos/builtin/packages/ipopt/package.py index 2b92d958ed..33a818bd89 100644 --- a/var/spack/repos/builtin/packages/ipopt/package.py +++ b/var/spack/repos/builtin/packages/ipopt/package.py @@ -47,6 +47,8 @@ class Ipopt(AutotoolsPackage): description="Build with Coin Harwell Subroutine Libraries") variant('metis', default=False, description="Build with METIS partitioning support") + variant('debug', default=False, + description="Build debug instead of optimized version") depends_on("blas") depends_on("lapack") @@ -100,4 +102,12 @@ class Ipopt(AutotoolsPackage): '--with-metis-lib=%s' % spec['metis'].libs.ld_flags, '--with-metis-incdir=%s' % spec['metis'].prefix.include]) + # The IPOPT configure file states that '--enable-debug' implies + # '--disable-shared', but adding '--enable-shared' overrides + # '--disable-shared' and builds a shared library with debug symbols + if '+debug' in spec: + args.append('--enable-debug') + else: + args.append('--disable-debug') + return args -- cgit v1.2.3-70-g09d2 From 3bb12e38041cfb137886bd0bab9a1059e93f9af9 Mon Sep 17 00:00:00 2001 From: Abhinav Bhatele Date: Fri, 14 Sep 2018 15:54:21 -0700 Subject: miniQMC: add newer releases and ecp-proxy-app tag (#9233) --- var/spack/repos/builtin/packages/miniqmc/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/miniqmc/package.py b/var/spack/repos/builtin/packages/miniqmc/package.py index 4d7364e899..e7b53c84e6 100644 --- a/var/spack/repos/builtin/packages/miniqmc/package.py +++ b/var/spack/repos/builtin/packages/miniqmc/package.py @@ -33,9 +33,11 @@ class Miniqmc(CMakePackage): homepage = "https://github.com/QMCPACK/miniqmc" url = "https://github.com/QMCPACK/miniqmc/archive/0.2.0.tar.gz" + version('0.4.0', sha256='41ddb5de6dcc85404344c80dc7538aedf5e1f1eb0f2a67ebac069209f7dd11e4') + version('0.3.0', sha256='3ba494ba1055df91e157cb426d1fbe4192aa3f04b019277d9e571d057664d5a9') version('0.2.0', 'b96bacaf48b8e9c0de05d04a95066bc1') - tags = ['proxy-app'] + tags = ['proxy-app', 'ecp-proxy-app'] depends_on('mpi') depends_on('lapack') -- cgit v1.2.3-70-g09d2 From 8276256875ea89d362d28e0669d2b597ba4f644e Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Fri, 14 Sep 2018 17:55:58 -0500 Subject: portcullis: new package starting at 1.1.2 (#9218) --- .../repos/builtin/packages/portcullis/package.py | 73 ++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 var/spack/repos/builtin/packages/portcullis/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/portcullis/package.py b/var/spack/repos/builtin/packages/portcullis/package.py new file mode 100644 index 0000000000..24ec56fdc3 --- /dev/null +++ b/var/spack/repos/builtin/packages/portcullis/package.py @@ -0,0 +1,73 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class Portcullis(AutotoolsPackage): + """PORTable CULLing of Invalid Splice junctions""" + + homepage = "https://github.com/maplesond/portcullis" + url = "https://github.com/maplesond/portcullis/archive/Release-1.1.2.tar.gz" + + version('1.1.2', '5c581a7f827ffeecfe68107b7fe27ed60108325fd2f86a79d93f61b328687749') + + depends_on('autoconf@2.53:', type='build') + depends_on('automake@1.11:', type='build') + depends_on('libtool@2.4.2:', type='build') + depends_on('m4', type='build') + + depends_on('zlib', type='build') + depends_on('samtools', type='build') + + depends_on('python@3.4:', type=('build', 'run')) + depends_on('py-setuptools', type=('build', 'run')) + depends_on('py-pandas', type=('build', 'run')) + + # later versions of py-sphinx don't get detected by the configure script + depends_on('py-sphinx@1.3:1.4') + + def patch(self): + # remove static linking to libstdc++ + filter_file( + 'AM_LDFLAGS="-static-libstdc++"', + 'AM_LDFLAGS=""', + 'configure.ac', string=True + ) + + # prevent install scripts from ruining our PYTHONPATH + filter_file( + 'export PYTHONPATH=$(DESTDIR)$(pythondir)', + 'export PYTHONPATH="$(PYTHONPATH):$(DESTDIR)$(pythondir)"', + 'scripts/Makefile.am', string=True + ) + + def build(self, spec, prefix): + # build manpages + make('man') + + # run boost build script + sh = which('sh') + sh('build_boost.sh') -- cgit v1.2.3-70-g09d2 From cca6b673db8abbe485edb6390472881d75b40148 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Fri, 14 Sep 2018 17:56:44 -0500 Subject: py-h5py: add version 2.8.0 (#9231) --- .../repos/builtin/packages/py-h5py/package.py | 23 +++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-h5py/package.py b/var/spack/repos/builtin/packages/py-h5py/package.py index a39c58f697..566e1a50a8 100644 --- a/var/spack/repos/builtin/packages/py-h5py/package.py +++ b/var/spack/repos/builtin/packages/py-h5py/package.py @@ -29,9 +29,12 @@ class PyH5py(PythonPackage): """The h5py package provides both a high- and low-level interface to the HDF5 library from Python.""" - homepage = "https://pypi.python.org/pypi/h5py" - url = "https://pypi.io/packages/source/h/h5py/h5py-2.4.0.tar.gz" + homepage = "http://www.h5py.org/" + url = "https://pypi.io/packages/source/h/h5py/h5py-2.8.0.tar.gz" + import_modules = ['h5py', 'h5py._hl'] + + version('2.8.0', 'ece4f358e69fc8a416f95953b91bc373') version('2.7.1', 'da630aebe3ab9fa218ac405a218e95e0') version('2.7.0', 'f62937f40f68d3b128b3941be239dd93') version('2.6.0', 'ec476211bd1de3f5ac150544189b0bf4') @@ -41,20 +44,22 @@ class PyH5py(PythonPackage): variant('mpi', default=True, description='Build with MPI support') # Build dependencies - depends_on('py-cython@0.19:', type='build') + depends_on('py-cython@0.23:', type='build') depends_on('py-pkgconfig', type='build') depends_on('py-setuptools', type='build') + + # Build and runtime dependencies + depends_on('py-numpy@1.7:', type=('build', 'run')) + depends_on('py-six', type=('build', 'run')) + + # Link dependencies depends_on('hdf5@1.8.4:+hl') + + # MPI dependencies depends_on('hdf5+mpi', when='+mpi') depends_on('mpi', when='+mpi') depends_on('py-mpi4py', when='+mpi', type=('build', 'run')) - # Build and runtime dependencies - depends_on('py-numpy@1.6.1:', type=('build', 'run')) - - # Runtime dependencies - depends_on('py-six', type=('build', 'run')) - phases = ['configure', 'install'] def configure(self, spec, prefix): -- cgit v1.2.3-70-g09d2 From 9661748900d40a5819dbe513c1dccde408ae6d6f Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Fri, 14 Sep 2018 23:56:59 +0000 Subject: miniamr: added v1.4.1 (#9225) --- var/spack/repos/builtin/packages/miniamr/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/miniamr/package.py b/var/spack/repos/builtin/packages/miniamr/package.py index ae725bb868..c4aa2a0f61 100644 --- a/var/spack/repos/builtin/packages/miniamr/package.py +++ b/var/spack/repos/builtin/packages/miniamr/package.py @@ -36,6 +36,7 @@ class Miniamr(MakefilePackage): tags = ['proxy-app', 'ecp-proxy-app'] + version('1.4.1', sha256='dd8e8d9fd0768cb4f2c5d7fe6989dfa6bb95a8461f04deaccdbb50b0dd51e97a') version('1.4.0', '3aab0247047a94e343709cf2e51cc46e') variant('mpi', default=True, description='Build with MPI support') -- cgit v1.2.3-70-g09d2 From 5b9cbb518a18ed427f5fd3a2281377d4518b47f7 Mon Sep 17 00:00:00 2001 From: Mario Melara Date: Fri, 14 Sep 2018 16:59:19 -0700 Subject: OpenCoarrays: update v2.2.0 (#9215) This commit adds a patch that prevents the package from hanging. The package would hang because CMakeLists would look for a system MPI. This patch changes the behavior. --- .../builtin/packages/opencoarrays/CMakeLists.patch | 27 ++++++++++++++++++++++ .../repos/builtin/packages/opencoarrays/package.py | 6 ++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 var/spack/repos/builtin/packages/opencoarrays/CMakeLists.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/opencoarrays/CMakeLists.patch b/var/spack/repos/builtin/packages/opencoarrays/CMakeLists.patch new file mode 100644 index 0000000000..7ce5a60479 --- /dev/null +++ b/var/spack/repos/builtin/packages/opencoarrays/CMakeLists.patch @@ -0,0 +1,27 @@ +diff --git a/src/mpi/CMakeLists.txt b/src/mpi/CMakeLists.txt +index 590d646..3f2bded 100644 +--- a/src/mpi/CMakeLists.txt ++++ b/src/mpi/CMakeLists.txt +@@ -8,22 +8,6 @@ if (NOT MPI_C_FOUND) + include_directories(BEFORE ${MPI_C_INCLUDE_PATH} ${MPI_Fortran_INCLUDE_PATH}) + endif() + + -#---------------------------------- + -# Determine if we're using Open MPI + -#---------------------------------- + -cmake_host_system_information(RESULT N_CPU QUERY NUMBER_OF_LOGICAL_CORES) + -set(N_CPU ${N_CPU} PARENT_SCOPE) + -cmake_host_system_information(RESULT HOST_NAME QUERY HOSTNAME) + -set(HOSTNAME ${HOSTNAME} PARENT_SCOPE) + -execute_process(COMMAND ${MPIEXEC} --version + - OUTPUT_VARIABLE mpi_version_out) + -if (mpi_version_out MATCHES "[Oo]pen[ -][Mm][Pp][Ii]") + - message( STATUS "OpenMPI detected") + - set ( openmpi true PARENT_SCOPE) + - # Write out a host file because OMPI's mpiexec is dumb + - file(WRITE ${CMAKE_BINARY_DIR}/hostfile "${HOST_NAME} slots=${N_CPU}\n") + -endif () + - + if("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU") + set(gfortran_compiler true) + elseif("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "Cray") diff --git a/var/spack/repos/builtin/packages/opencoarrays/package.py b/var/spack/repos/builtin/packages/opencoarrays/package.py index 8b2c4f7bd5..f63c56d84b 100644 --- a/var/spack/repos/builtin/packages/opencoarrays/package.py +++ b/var/spack/repos/builtin/packages/opencoarrays/package.py @@ -34,8 +34,9 @@ class Opencoarrays(CMakePackage): """ homepage = "http://www.opencoarrays.org/" - url = "https://github.com/sourceryinstitute/OpenCoarrays/releases/download/1.8.4/OpenCoarrays-1.8.4.tar.gz" + url = "https://github.com/sourceryinstitute/OpenCoarrays/releases/download/2.2.0/OpenCoarrays-2.2.0.tar.gz" + version('2.2.0', '9311547a85a21853111f1e8555ceab4593731c6fd9edb64cfb9588805f9d1a0d') version('1.8.10', '9ba1670647db4d986634abf743abfd6a') version('1.8.4', '7c9eaffc3a0b5748d0d840e52ec9d4ad') version('1.8.0', 'ca78d1507b2a118c75128c6c2e093e27') @@ -48,6 +49,9 @@ class Opencoarrays(CMakePackage): 'MinSizeRel', 'CodeCoverage')) depends_on('mpi') + # This patch removes a bunch of checks for the version of MPI available on + # the system. They make the Crays hang. + patch('CMakeLists.patch', when='platform=cray') def cmake_args(self): args = [] -- cgit v1.2.3-70-g09d2 From e07aef88f88aec021f73c23faa28e39171cdb8a4 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Fri, 14 Sep 2018 18:59:50 -0500 Subject: py-spectra: new version (#9224) --- var/spack/repos/builtin/packages/py-spectra/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-spectra/package.py b/var/spack/repos/builtin/packages/py-spectra/package.py index 13593b435e..cbc87041ec 100644 --- a/var/spack/repos/builtin/packages/py-spectra/package.py +++ b/var/spack/repos/builtin/packages/py-spectra/package.py @@ -31,7 +31,9 @@ class PySpectra(PythonPackage): homepage = "https://pypi.python.org/pypi/spectra/0.0.8" url = "https://pypi.io/packages/source/s/spectra/spectra-0.0.8.tar.gz" + version('0.0.11', sha256='8eb362a5187cb63cee13cd01186799c0c791a3ad3bec57b279132e12521762b8') version('0.0.8', '83020b29e584389f24c7720f38f0136c') depends_on('py-setuptools', type='build') depends_on('py-colormath', type=('build', 'run')) + depends_on('py-colormath@3.0.0:', type=('build', 'run'), when='@0.0.11:') -- cgit v1.2.3-70-g09d2 From 055b0a442c5775d460dba8fdfb0f22b1375f7ea4 Mon Sep 17 00:00:00 2001 From: Abhinav Bhatele Date: Fri, 14 Sep 2018 17:01:07 -0700 Subject: Charmpp: rename charm to charmpp according to ++ conventions (#9216) * Charmpp: rename charm to charmpp according to ++ conventions * modify packages that depend on charmpp --- var/spack/repos/builtin/packages/charm/mpi.patch | 19 -- var/spack/repos/builtin/packages/charm/package.py | 263 --------------------- .../repos/builtin/packages/charm/strictpass.patch | 16 -- var/spack/repos/builtin/packages/charmpp/mpi.patch | 19 ++ .../repos/builtin/packages/charmpp/package.py | 263 +++++++++++++++++++++ .../builtin/packages/charmpp/strictpass.patch | 16 ++ var/spack/repos/builtin/packages/namd/package.py | 2 +- var/spack/repos/builtin/packages/quinoa/package.py | 2 +- 8 files changed, 300 insertions(+), 300 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/charm/mpi.patch delete mode 100644 var/spack/repos/builtin/packages/charm/package.py delete mode 100644 var/spack/repos/builtin/packages/charm/strictpass.patch create mode 100644 var/spack/repos/builtin/packages/charmpp/mpi.patch create mode 100644 var/spack/repos/builtin/packages/charmpp/package.py create mode 100644 var/spack/repos/builtin/packages/charmpp/strictpass.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/charm/mpi.patch b/var/spack/repos/builtin/packages/charm/mpi.patch deleted file mode 100644 index e909d5f876..0000000000 --- a/var/spack/repos/builtin/packages/charm/mpi.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- old/src/scripts/configure -+++ new/src/scripts/configure -@@ -3293,10 +3293,16 @@ - test_link "whether -lmpi" "ok" "no" "-lmpi" - if test $pass -eq 1 - then - add_flag CMK_SYSLIBS='"$CMK_SYSLIBS -lmpi"' "mpi lib" - else -+ test_link "whether -lmpi -lmpi_cxx" "ok" "no" "-lmpi -lmpi_cxx" -+ if test $pass -eq 1 -+ then -+ add_flag CMK_SYSLIBS='"$CMK_SYSLIBS -lmpi -lmpi_cxx"' "mpi lib" -+ else - echo "Error: can not find mpi library" - test_finish 1 -+ fi - fi - fi - else diff --git a/var/spack/repos/builtin/packages/charm/package.py b/var/spack/repos/builtin/packages/charm/package.py deleted file mode 100644 index b4fc48ae9f..0000000000 --- a/var/spack/repos/builtin/packages/charm/package.py +++ /dev/null @@ -1,263 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## - -import os -import platform -import shutil -import sys -from spack import * - - -class Charm(Package): - """Charm++ is a parallel programming framework in C++ supported by - an adaptive runtime system, which enhances user productivity and - allows programs to run portably from small multicore computers - (your laptop) to the largest supercomputers.""" - - homepage = "http://charmplusplus.org" - url = "http://charm.cs.illinois.edu/distrib/charm-6.8.2.tar.gz" - git = "https://github.com/UIUC-PPL/charm.git" - - version("develop", branch="charm") - version("6.8.2", "a887a34b638a5b2f7fcf7ff3c262496d") - version("6.8.1", "3e95ffa760909154ef16b643c9bb8193") - version("6.8.0", "54df066a5aefb0bbc1a263c2383c2bba") - version("6.7.1", "a8e20cf85e9c8721158f5bbd0ade48d9") - version("6.7.0", "35a39a7975f1954a7db2d76736158231") - version("6.6.1", "9554230f741e2599deaaac4d9d93d7ab") - version("6.6.0", "31e95901b3f7324d52107e6ad000fcc8") - version("6.5.1", "034d99458474a3ab96d8bede8a691a5d") - - # Support OpenMPI; see - # - # Patch is no longer needed in versions 6.8.0+ - patch("mpi.patch", when="@:6.7.1") - - # Ignore compiler warnings while configuring - patch("strictpass.patch", when="@:6.8.2") - - # Build targets - # "target" is reserved, so we have to use something else. - variant( - "build-target", - default="LIBS", - # AMPI also builds charm++, LIBS also builds AMPI and charm++ - values=("charm++", "AMPI", "LIBS"), - description="Specify the target to build" - ) - - # Communication mechanisms (choose exactly one) - variant( - "backend", - default="netlrts", - values=("mpi", "multicore", "netlrts", "verbs", "gni", - "ofi", "pami", "pamilrts"), - description="Set the backend to use" - ) - - # Other options - variant("papi", default=False, description="Enable PAPI integration") - variant("syncft", default=False, description="Compile with Charm++ fault tolerance support") - variant("smp", default=True, - description=( - "Enable SMP parallelism (does not work with +multicore)")) - variant("tcp", default=False, - description="Use TCP as transport mechanism (requires +net)") - variant("omp", default=False, description="Support for the integrated LLVM OpenMP runtime") - variant("pthreads", default=False, description="Compile with pthreads Converse threads") - variant("cuda", default=False, description="Enable CUDA toolkit") - - variant("shared", default=True, description="Enable shared link support") - variant("production", default=True, description="Build charm++ with all optimizations") - variant("tracing", default=False, description="Enable tracing modules") - - # FIXME: backend=mpi also provides mpi, but spack does not support - # depends_on("mpi") and provides("mpi") in the same package currently. - for b in ['multicore', 'netlrts', 'verbs', 'gni', 'ofi', 'pami', - 'pamilrts']: - provides('mpi@2', when='@6.7.1: build-target=AMPI backend={0}'.format(b)) - provides('mpi@2', when='@6.7.1: build-target=LIBS backend={0}'.format(b)) - - def setup_dependent_environment(self, spack_env, run_env, dependent_spec): - spack_env.set('MPICC', join_path(self.prefix.bin, 'ampicc')) - spack_env.set('MPICXX', join_path(self.prefix.bin, 'ampicxx')) - spack_env.set('MPIF77', join_path(self.prefix.bin, 'ampif77')) - spack_env.set('MPIF90', join_path(self.prefix.bin, 'ampif90')) - - def setup_dependent_package(self, module, dependent_spec): - self.spec.mpicc = join_path(self.prefix.bin, 'ampicc') - self.spec.mpicxx = join_path(self.prefix.bin, 'ampicxx') - self.spec.mpifc = join_path(self.prefix.bin, 'ampif90') - self.spec.mpif77 = join_path(self.prefix.bin, 'ampif77') - - depends_on("mpi", when="backend=mpi") - depends_on("papi", when="+papi") - depends_on("cuda", when="+cuda") - - # Git versions of Charm++ require automake and autoconf - depends_on("automake", when="@develop") - depends_on("autoconf", when="@develop") - - conflicts("~tracing", "+papi") - - conflicts("backend=multicore", "+smp") - - def install(self, spec, prefix): - target = spec.variants["build-target"].value - - plat = sys.platform - if plat.startswith("linux"): - plat = "linux" - elif plat.startswith("win"): - plat = "win" - elif plat.startswith("cnl"): - plat = "cnl" - elif plat.startswith("cnk"): - plat = "cnk" - - mach = platform.machine() - if mach.startswith("ppc"): - mach = "ppc" - elif mach.startswith("arm"): - mach = "arm" - - comm = spec.variants['backend'].value - - # Define Charm++ version names for various (plat, mach, comm) - # combinations. Note that not all combinations are supported. - versions = { - ("darwin", "x86_64", "mpi"): "mpi-darwin-x86_64", - ("darwin", "x86_64", "multicore"): "multicore-darwin-x86_64", - ("darwin", "x86_64", "netlrts"): "netlrts-darwin-x86_64", - ("linux", "i386", "mpi"): "mpi-linux", - ("linux", "i386", "multicore"): "multicore-linux", - ("linux", "i386", "netlrts"): "netlrts-linux", - ("linux", "i386", "uth"): "uth-linux", - ("linux", "x86_64", "mpi"): "mpi-linux-x86_64", - ("linux", "x86_64", "multicore"): "multicore-linux-x86_64", - ("linux", "x86_64", "netlrts"): "netlrts-linux-x86_64", - ("linux", "x86_64", "verbs"): "verbs-linux-x86_64", - ("linux", "x86_64", "ofi"): "ofi-linux-x86_64", - ("linux", "x86_64", "uth"): "uth-linux-x86_64", - ("linux", "ppc", "mpi"): "mpi-linux-ppc", - ("linux", "ppc", "multicore"): "multicore-linux-ppc", - ("linux", "ppc", "netlrts"): "netlrts-linux-ppc", - ("linux", "ppc", "pami"): "pami-linux-ppc64le", - ("linux", "ppc", "verbs"): "verbs-linux-ppc64le", - ("linux", "arm", "netlrts"): "netlrts-linux-arm7", - ("linux", "arm", "multicore"): "multicore-arm7", - ("win", "x86_64", "mpi"): "mpi-win-x86_64", - ("win", "x86_64", "multicore"): "multicore-win-x86_64", - ("win", "x86_64", "netlrts"): "netlrts-win-x86_64", - ("cnl", "x86_64", "gni"): "gni-crayxc", - ("cnl", "x86_64", "mpi"): "mpi-crayxc", - ("cnk", "x86_64", "mpi"): "mpi-bluegeneq", - ("cnk", "x86_64", "pami"): "pami-bluegeneq", - ("cnk", "x86_64", "pamilrts"): "pamilrts-bluegeneq", - } - if (plat, mach, comm) not in versions: - raise InstallError( - "The communication mechanism %s is not supported " - "on a %s platform with a %s CPU" % - (comm, plat, mach)) - version = versions[(plat, mach, comm)] - - # We assume that Spack's compiler wrappers make this work. If - # not, then we need to query the compiler vendor from Spack - # here. - options = [ - os.path.basename(self.compiler.cc), - os.path.basename(self.compiler.fc), - "-j%d" % make_jobs, - "--destination=%s" % prefix, - ] - - if 'backend=mpi' in spec: - # in intelmpi /include and /lib fails so --basedir - # cannot be used - options.extend([ - '--incdir={0}'.format(incdir) - for incdir in spec["mpi"].headers.directories - ]) - options.extend([ - '--libdir={0}'.format(libdir) - for libdir in spec["mpi"].libs.directories - ]) - if "+papi" in spec: - options.extend(["papi", "--basedir=%s" % spec["papi"].prefix]) - if "+smp" in spec: - options.append("smp") - if "+tcp" in spec: - if 'backend=netlrts' not in spec: - # This is a Charm++ limitation; it would lead to a - # build error - raise InstallError( - "The +tcp variant requires " - "the backend=netlrts communication mechanism") - options.append("tcp") - if "+omp" in spec: - options.append("omp") - if "+pthreads" in spec: - options.append("pthreads") - if "+cuda" in spec: - options.append("cuda") - - if "+shared" in spec: - options.append("--build-shared") - if "+production" in spec: - options.append("--with-production") - if "+tracing" in spec: - options.append("--enable-tracing") - - # Call "make" via the build script - # Note: This builds Charm++ in the "tmp" subdirectory of the - # install directory. Maybe we could set up a symbolic link - # back to the build tree to prevent this? Alternatively, we - # could dissect the build script; the build instructions say - # this wouldn't be difficult. - build = Executable(join_path(".", "build")) - build(target, version, *options) - - # Charm++'s install script does not copy files, it only creates - # symbolic links. Fix this. - for dirpath, dirnames, filenames in os.walk(prefix): - for filename in filenames: - filepath = join_path(dirpath, filename) - if os.path.islink(filepath): - tmppath = filepath + ".tmp" - # Skip dangling symbolic links - try: - copy(filepath, tmppath) - os.remove(filepath) - os.rename(tmppath, filepath) - except (IOError, OSError): - pass - shutil.rmtree(join_path(prefix, "tmp")) - - @run_after('install') - @on_package_attributes(run_tests=True) - def check_build(self): - make('-C', join_path(self.stage.path, 'charm/tests'), - 'test', parallel=False) diff --git a/var/spack/repos/builtin/packages/charm/strictpass.patch b/var/spack/repos/builtin/packages/charm/strictpass.patch deleted file mode 100644 index 44aa4fbd38..0000000000 --- a/var/spack/repos/builtin/packages/charm/strictpass.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- old/src/scripts/configure -+++ new/src/scripts/configure -@@ -2146,13 +2146,6 @@ - test_result $? "$1" "$2" "$3" - strictpass=$pass - strictfail=$fail -- if test $pass -eq 1 -- then -- if cat out | grep -i "warn" > /dev/null 2>&1 -- then -- strictpass="0" && strictfail="1" -- fi -- fi - cat out >> $charmout - /bin/rm -f out - } diff --git a/var/spack/repos/builtin/packages/charmpp/mpi.patch b/var/spack/repos/builtin/packages/charmpp/mpi.patch new file mode 100644 index 0000000000..e909d5f876 --- /dev/null +++ b/var/spack/repos/builtin/packages/charmpp/mpi.patch @@ -0,0 +1,19 @@ +--- old/src/scripts/configure ++++ new/src/scripts/configure +@@ -3293,10 +3293,16 @@ + test_link "whether -lmpi" "ok" "no" "-lmpi" + if test $pass -eq 1 + then + add_flag CMK_SYSLIBS='"$CMK_SYSLIBS -lmpi"' "mpi lib" + else ++ test_link "whether -lmpi -lmpi_cxx" "ok" "no" "-lmpi -lmpi_cxx" ++ if test $pass -eq 1 ++ then ++ add_flag CMK_SYSLIBS='"$CMK_SYSLIBS -lmpi -lmpi_cxx"' "mpi lib" ++ else + echo "Error: can not find mpi library" + test_finish 1 ++ fi + fi + fi + else diff --git a/var/spack/repos/builtin/packages/charmpp/package.py b/var/spack/repos/builtin/packages/charmpp/package.py new file mode 100644 index 0000000000..d713a61f5b --- /dev/null +++ b/var/spack/repos/builtin/packages/charmpp/package.py @@ -0,0 +1,263 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +import os +import platform +import shutil +import sys +from spack import * + + +class Charmpp(Package): + """Charm++ is a parallel programming framework in C++ supported by + an adaptive runtime system, which enhances user productivity and + allows programs to run portably from small multicore computers + (your laptop) to the largest supercomputers.""" + + homepage = "http://charmplusplus.org" + url = "http://charm.cs.illinois.edu/distrib/charm-6.8.2.tar.gz" + git = "https://github.com/UIUC-PPL/charm.git" + + version("develop", branch="charm") + version("6.8.2", "a887a34b638a5b2f7fcf7ff3c262496d") + version("6.8.1", "3e95ffa760909154ef16b643c9bb8193") + version("6.8.0", "54df066a5aefb0bbc1a263c2383c2bba") + version("6.7.1", "a8e20cf85e9c8721158f5bbd0ade48d9") + version("6.7.0", "35a39a7975f1954a7db2d76736158231") + version("6.6.1", "9554230f741e2599deaaac4d9d93d7ab") + version("6.6.0", "31e95901b3f7324d52107e6ad000fcc8") + version("6.5.1", "034d99458474a3ab96d8bede8a691a5d") + + # Support OpenMPI; see + # + # Patch is no longer needed in versions 6.8.0+ + patch("mpi.patch", when="@:6.7.1") + + # Ignore compiler warnings while configuring + patch("strictpass.patch", when="@:6.8.2") + + # Build targets + # "target" is reserved, so we have to use something else. + variant( + "build-target", + default="LIBS", + # AMPI also builds charm++, LIBS also builds AMPI and charm++ + values=("charm++", "AMPI", "LIBS"), + description="Specify the target to build" + ) + + # Communication mechanisms (choose exactly one) + variant( + "backend", + default="netlrts", + values=("mpi", "multicore", "netlrts", "verbs", "gni", + "ofi", "pami", "pamilrts"), + description="Set the backend to use" + ) + + # Other options + variant("papi", default=False, description="Enable PAPI integration") + variant("syncft", default=False, description="Compile with Charm++ fault tolerance support") + variant("smp", default=True, + description=( + "Enable SMP parallelism (does not work with +multicore)")) + variant("tcp", default=False, + description="Use TCP as transport mechanism (requires +net)") + variant("omp", default=False, description="Support for the integrated LLVM OpenMP runtime") + variant("pthreads", default=False, description="Compile with pthreads Converse threads") + variant("cuda", default=False, description="Enable CUDA toolkit") + + variant("shared", default=True, description="Enable shared link support") + variant("production", default=True, description="Build charm++ with all optimizations") + variant("tracing", default=False, description="Enable tracing modules") + + # FIXME: backend=mpi also provides mpi, but spack does not support + # depends_on("mpi") and provides("mpi") in the same package currently. + for b in ['multicore', 'netlrts', 'verbs', 'gni', 'ofi', 'pami', + 'pamilrts']: + provides('mpi@2', when='@6.7.1: build-target=AMPI backend={0}'.format(b)) + provides('mpi@2', when='@6.7.1: build-target=LIBS backend={0}'.format(b)) + + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): + spack_env.set('MPICC', join_path(self.prefix.bin, 'ampicc')) + spack_env.set('MPICXX', join_path(self.prefix.bin, 'ampicxx')) + spack_env.set('MPIF77', join_path(self.prefix.bin, 'ampif77')) + spack_env.set('MPIF90', join_path(self.prefix.bin, 'ampif90')) + + def setup_dependent_package(self, module, dependent_spec): + self.spec.mpicc = join_path(self.prefix.bin, 'ampicc') + self.spec.mpicxx = join_path(self.prefix.bin, 'ampicxx') + self.spec.mpifc = join_path(self.prefix.bin, 'ampif90') + self.spec.mpif77 = join_path(self.prefix.bin, 'ampif77') + + depends_on("mpi", when="backend=mpi") + depends_on("papi", when="+papi") + depends_on("cuda", when="+cuda") + + # Git versions of Charm++ require automake and autoconf + depends_on("automake", when="@develop") + depends_on("autoconf", when="@develop") + + conflicts("~tracing", "+papi") + + conflicts("backend=multicore", "+smp") + + def install(self, spec, prefix): + target = spec.variants["build-target"].value + + plat = sys.platform + if plat.startswith("linux"): + plat = "linux" + elif plat.startswith("win"): + plat = "win" + elif plat.startswith("cnl"): + plat = "cnl" + elif plat.startswith("cnk"): + plat = "cnk" + + mach = platform.machine() + if mach.startswith("ppc"): + mach = "ppc" + elif mach.startswith("arm"): + mach = "arm" + + comm = spec.variants['backend'].value + + # Define Charm++ version names for various (plat, mach, comm) + # combinations. Note that not all combinations are supported. + versions = { + ("darwin", "x86_64", "mpi"): "mpi-darwin-x86_64", + ("darwin", "x86_64", "multicore"): "multicore-darwin-x86_64", + ("darwin", "x86_64", "netlrts"): "netlrts-darwin-x86_64", + ("linux", "i386", "mpi"): "mpi-linux", + ("linux", "i386", "multicore"): "multicore-linux", + ("linux", "i386", "netlrts"): "netlrts-linux", + ("linux", "i386", "uth"): "uth-linux", + ("linux", "x86_64", "mpi"): "mpi-linux-x86_64", + ("linux", "x86_64", "multicore"): "multicore-linux-x86_64", + ("linux", "x86_64", "netlrts"): "netlrts-linux-x86_64", + ("linux", "x86_64", "verbs"): "verbs-linux-x86_64", + ("linux", "x86_64", "ofi"): "ofi-linux-x86_64", + ("linux", "x86_64", "uth"): "uth-linux-x86_64", + ("linux", "ppc", "mpi"): "mpi-linux-ppc", + ("linux", "ppc", "multicore"): "multicore-linux-ppc", + ("linux", "ppc", "netlrts"): "netlrts-linux-ppc", + ("linux", "ppc", "pami"): "pami-linux-ppc64le", + ("linux", "ppc", "verbs"): "verbs-linux-ppc64le", + ("linux", "arm", "netlrts"): "netlrts-linux-arm7", + ("linux", "arm", "multicore"): "multicore-arm7", + ("win", "x86_64", "mpi"): "mpi-win-x86_64", + ("win", "x86_64", "multicore"): "multicore-win-x86_64", + ("win", "x86_64", "netlrts"): "netlrts-win-x86_64", + ("cnl", "x86_64", "gni"): "gni-crayxc", + ("cnl", "x86_64", "mpi"): "mpi-crayxc", + ("cnk", "x86_64", "mpi"): "mpi-bluegeneq", + ("cnk", "x86_64", "pami"): "pami-bluegeneq", + ("cnk", "x86_64", "pamilrts"): "pamilrts-bluegeneq", + } + if (plat, mach, comm) not in versions: + raise InstallError( + "The communication mechanism %s is not supported " + "on a %s platform with a %s CPU" % + (comm, plat, mach)) + version = versions[(plat, mach, comm)] + + # We assume that Spack's compiler wrappers make this work. If + # not, then we need to query the compiler vendor from Spack + # here. + options = [ + os.path.basename(self.compiler.cc), + os.path.basename(self.compiler.fc), + "-j%d" % make_jobs, + "--destination=%s" % prefix, + ] + + if 'backend=mpi' in spec: + # in intelmpi /include and /lib fails so --basedir + # cannot be used + options.extend([ + '--incdir={0}'.format(incdir) + for incdir in spec["mpi"].headers.directories + ]) + options.extend([ + '--libdir={0}'.format(libdir) + for libdir in spec["mpi"].libs.directories + ]) + if "+papi" in spec: + options.extend(["papi", "--basedir=%s" % spec["papi"].prefix]) + if "+smp" in spec: + options.append("smp") + if "+tcp" in spec: + if 'backend=netlrts' not in spec: + # This is a Charm++ limitation; it would lead to a + # build error + raise InstallError( + "The +tcp variant requires " + "the backend=netlrts communication mechanism") + options.append("tcp") + if "+omp" in spec: + options.append("omp") + if "+pthreads" in spec: + options.append("pthreads") + if "+cuda" in spec: + options.append("cuda") + + if "+shared" in spec: + options.append("--build-shared") + if "+production" in spec: + options.append("--with-production") + if "+tracing" in spec: + options.append("--enable-tracing") + + # Call "make" via the build script + # Note: This builds Charm++ in the "tmp" subdirectory of the + # install directory. Maybe we could set up a symbolic link + # back to the build tree to prevent this? Alternatively, we + # could dissect the build script; the build instructions say + # this wouldn't be difficult. + build = Executable(join_path(".", "build")) + build(target, version, *options) + + # Charm++'s install script does not copy files, it only creates + # symbolic links. Fix this. + for dirpath, dirnames, filenames in os.walk(prefix): + for filename in filenames: + filepath = join_path(dirpath, filename) + if os.path.islink(filepath): + tmppath = filepath + ".tmp" + # Skip dangling symbolic links + try: + copy(filepath, tmppath) + os.remove(filepath) + os.rename(tmppath, filepath) + except (IOError, OSError): + pass + shutil.rmtree(join_path(prefix, "tmp")) + + @run_after('install') + @on_package_attributes(run_tests=True) + def check_build(self): + make('-C', join_path(self.stage.path, 'charm/tests'), + 'test', parallel=False) diff --git a/var/spack/repos/builtin/packages/charmpp/strictpass.patch b/var/spack/repos/builtin/packages/charmpp/strictpass.patch new file mode 100644 index 0000000000..44aa4fbd38 --- /dev/null +++ b/var/spack/repos/builtin/packages/charmpp/strictpass.patch @@ -0,0 +1,16 @@ +--- old/src/scripts/configure ++++ new/src/scripts/configure +@@ -2146,13 +2146,6 @@ + test_result $? "$1" "$2" "$3" + strictpass=$pass + strictfail=$fail +- if test $pass -eq 1 +- then +- if cat out | grep -i "warn" > /dev/null 2>&1 +- then +- strictpass="0" && strictfail="1" +- fi +- fi + cat out >> $charmout + /bin/rm -f out + } diff --git a/var/spack/repos/builtin/packages/namd/package.py b/var/spack/repos/builtin/packages/namd/package.py index 6179cacd84..96e3f3ad4b 100644 --- a/var/spack/repos/builtin/packages/namd/package.py +++ b/var/spack/repos/builtin/packages/namd/package.py @@ -43,7 +43,7 @@ class Namd(MakefilePackage): variant('interface', default='none', values=('none', 'tcl', 'python'), description='Enables TCL and/or python interface') - depends_on('charm') + depends_on('charmpp') depends_on('fftw@:2.99', when="fftw=2") depends_on('fftw@3:', when="fftw=3") diff --git a/var/spack/repos/builtin/packages/quinoa/package.py b/var/spack/repos/builtin/packages/quinoa/package.py index e00814950d..2f9f91a866 100644 --- a/var/spack/repos/builtin/packages/quinoa/package.py +++ b/var/spack/repos/builtin/packages/quinoa/package.py @@ -39,7 +39,7 @@ class Quinoa(CMakePackage): version('develop', branch='master') depends_on('hdf5+mpi') - depends_on("charm backend=mpi") + depends_on("charmpp backend=mpi") depends_on("trilinos+exodus") depends_on("boost") depends_on("hypre~internal-superlu") -- cgit v1.2.3-70-g09d2 From 4c414135504d4ad24b55a1af3a6e80d3732e1c6d Mon Sep 17 00:00:00 2001 From: Stephen McDowell Date: Fri, 14 Sep 2018 17:01:58 -0700 Subject: patch flann // gcc // cmake@3.11+ (#9214) See: https://github.com/mariusmuja/flann/issues/369 --- .../packages/flann/linux-gcc-cmakev3.11-plus.patch | 24 ++++++++++++++++++++++ var/spack/repos/builtin/packages/flann/package.py | 3 +++ 2 files changed, 27 insertions(+) create mode 100644 var/spack/repos/builtin/packages/flann/linux-gcc-cmakev3.11-plus.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/flann/linux-gcc-cmakev3.11-plus.patch b/var/spack/repos/builtin/packages/flann/linux-gcc-cmakev3.11-plus.patch new file mode 100644 index 0000000000..d8a7dbd0d2 --- /dev/null +++ b/var/spack/repos/builtin/packages/flann/linux-gcc-cmakev3.11-plus.patch @@ -0,0 +1,24 @@ +--- a/src/cpp/CMakeLists.txt ++++ b/src/cpp/CMakeLists.txt +@@ -29,7 +29,7 @@ if (BUILD_CUDA_LIB) + endif() + + if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC) +- add_library(flann_cpp SHARED "") ++ add_library(flann_cpp SHARED "empty.cpp") + set_target_properties(flann_cpp PROPERTIES LINKER_LANGUAGE CXX) + target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive) + +@@ -83,7 +83,7 @@ if (BUILD_C_BINDINGS) + set_property(TARGET flann_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC) + + if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC) +- add_library(flann SHARED "") ++ add_library(flann SHARED "empty.cpp") + set_target_properties(flann PROPERTIES LINKER_LANGUAGE CXX) + target_link_libraries(flann -Wl,-whole-archive flann_s -Wl,-no-whole-archive) + else() +--- /dev/null ++++ b/src/cpp/empty.cpp +@@ -0,0 +1 @@ ++/* empty */ diff --git a/var/spack/repos/builtin/packages/flann/package.py b/var/spack/repos/builtin/packages/flann/package.py index 4e817b109b..52441401fc 100644 --- a/var/spack/repos/builtin/packages/flann/package.py +++ b/var/spack/repos/builtin/packages/flann/package.py @@ -95,6 +95,9 @@ class Flann(CMakePackage): depends_on('hdf5', type='test') depends_on('gtest', type='test') + # See: https://github.com/mariusmuja/flann/issues/369 + patch('linux-gcc-cmakev3.11-plus.patch', when='%gcc^cmake@3.11:') + def patch(self): # Fix up the python setup.py call inside the install(CODE filter_file("setup.py install", -- cgit v1.2.3-70-g09d2 From 0b800720b1be604400f7f8580e648e496bef2587 Mon Sep 17 00:00:00 2001 From: Stephen McDowell Date: Fri, 14 Sep 2018 17:05:05 -0700 Subject: add opencv@3.4.3 (#9213) --- var/spack/repos/builtin/packages/opencv/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index f4b5a6012e..edbfcc2d13 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -44,6 +44,7 @@ class Opencv(CMakePackage): git = 'https://github.com/opencv/opencv.git' version('master', branch='master') + version('3.4.3', '712896f5815938c014c199dde142d508') version('3.4.1', 'a0b7a47899e67b3490ea31edc4f6e8e6') version('3.4.0', '170732dc760e5f7ddeccbe53ba5d16a6') version('3.3.1', 'b1ed9aea030bb5bd9df28524d97de84c') -- cgit v1.2.3-70-g09d2 From a9c434d7d73c83710410141fce4afe2e6df7efa2 Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Sat, 15 Sep 2018 02:07:13 +0200 Subject: Build Python 3.7 with external libffi. (#9245) --- var/spack/repos/builtin/packages/libffi/package.py | 5 +++ .../repos/builtin/packages/openssl/package.py | 4 +++ var/spack/repos/builtin/packages/python/package.py | 38 ++++++++++++++++++---- var/spack/repos/builtin/packages/sqlite/package.py | 4 +++ 4 files changed, 45 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libffi/package.py b/var/spack/repos/builtin/packages/libffi/package.py index a0c4109269..5ff694dd74 100644 --- a/var/spack/repos/builtin/packages/libffi/package.py +++ b/var/spack/repos/builtin/packages/libffi/package.py @@ -37,3 +37,8 @@ class Libffi(AutotoolsPackage): # version('3.1', 'f5898b29bbfd70502831a212d9249d10',url = # "ftp://sourceware.org/pub/libffi/libffi-3.1.tar.gz") # Has a bug # $(lib64) instead of ${lib64} in libffi.pc + + @property + def headers(self): + # The headers are probably in self.prefix.lib but we search everywhere + return find_headers('ffi', self.prefix, recursive=True) diff --git a/var/spack/repos/builtin/packages/openssl/package.py b/var/spack/repos/builtin/packages/openssl/package.py index 63fbfed533..cd8f06b9d0 100644 --- a/var/spack/repos/builtin/packages/openssl/package.py +++ b/var/spack/repos/builtin/packages/openssl/package.py @@ -72,6 +72,10 @@ class Openssl(Package): parallel = False + @property + def libs(self): + return find_libraries(['libssl', 'libcrypto'], root=self.prefix.lib) + def handle_fetch_error(self, error): tty.warn("Fetching OpenSSL failed. This may indicate that OpenSSL has " "been updated, and the version in your instance of Spack is " diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 7a28566386..bf7a39303f 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -101,6 +101,7 @@ class Python(AutotoolsPackage): description="Symlink 'python3' executable to 'python' " "(not PEP 394 compliant)") + depends_on("pkgconfig", type="build") depends_on("openssl") depends_on("bzip2") depends_on("readline") @@ -111,6 +112,10 @@ class Python(AutotoolsPackage): depends_on("tcl", when="+tk") depends_on("gdbm", when='+dbm') + # https://docs.python.org/3/whatsnew/3.7.html#build-changes + depends_on("libffi", when="@3.7:") + depends_on("openssl@1.0.2:", when="@3.7:") + # Patch does not work for Python 3.1 patch('ncurses.patch', when='@:2.8,3.2:') @@ -168,12 +173,33 @@ class Python(AutotoolsPackage): # setup.py needs to be able to read the CPPFLAGS and LDFLAGS # as it scans for the library and headers to build - dep_pfxs = [dspec.prefix for dspec in spec.dependencies('link')] - config_args = [ - '--with-threads', - 'CPPFLAGS=-I{0}'.format(' -I'.join(dp.include for dp in dep_pfxs)), - 'LDFLAGS=-L{0}'.format(' -L'.join(dp.lib for dp in dep_pfxs)), - ] + link_deps = spec.dependencies('link') + + # Header files are often included assuming they reside in a + # subdirectory of prefix.include, e.g. #include , + # which is why we don't use HeaderList here. The header files of + # libffi reside in prefix.lib but the configure script of Python + # finds them using pkg-config. + cppflags = '-I' + ' -I'.join(dep.prefix.include + for dep in link_deps + if dep.name != 'libffi') + + # Currently, the only way to get SpecBuildInterface wrappers of the + # dependencies (which we need to get their 'libs') is to get them + # using spec.__getitem__. + ldflags = ' '.join(spec[dep.name].libs.search_flags + for dep in link_deps) + + config_args = ['CPPFLAGS=' + cppflags, 'LDFLAGS=' + ldflags] + + # https://docs.python.org/3/whatsnew/3.7.html#build-changes + if spec.satisfies('@:3.6'): + config_args.append('--with-threads') + + if '^libffi' in spec: + config_args.append('--with-system-ffi') + else: + config_args.append('--without-system-ffi') if spec.satisfies('@2.7.13:2.8,3.5.3:', strict=True) \ and '+optimizations' in spec: diff --git a/var/spack/repos/builtin/packages/sqlite/package.py b/var/spack/repos/builtin/packages/sqlite/package.py index fea27c8661..b7010965dc 100644 --- a/var/spack/repos/builtin/packages/sqlite/package.py +++ b/var/spack/repos/builtin/packages/sqlite/package.py @@ -76,6 +76,10 @@ class Sqlite(AutotoolsPackage): 'extension-functions.c'}, when='+functions') + @property + def libs(self): + return find_libraries('libsqlite3', root=self.prefix.lib) + def get_arch(self): arch = architecture.Arch() arch.platform = architecture.platform() -- cgit v1.2.3-70-g09d2 From fa5bf11f164d78db2d1c0b87e3f2beb4534f65d9 Mon Sep 17 00:00:00 2001 From: snehring Date: Fri, 14 Sep 2018 19:13:22 -0500 Subject: plumed: updating plumed to latest version (#9227) --- var/spack/repos/builtin/packages/plumed/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/plumed/package.py b/var/spack/repos/builtin/packages/plumed/package.py index 96579c5e55..ff5b1cf151 100644 --- a/var/spack/repos/builtin/packages/plumed/package.py +++ b/var/spack/repos/builtin/packages/plumed/package.py @@ -43,6 +43,7 @@ class Plumed(AutotoolsPackage): homepage = 'http://www.plumed.org/' url = 'https://github.com/plumed/plumed2/archive/v2.2.3.tar.gz' + version('2.4.2', '0f66f24b4c763ae8b2f39574113e9935') version('2.4.1', '6558e1fd02fc46e847ab6a3fb5ed5411') version('2.3.5', '3cc5f025cb6f5d963f3c778f15c77d44') version('2.3.3', '9f5729e406e79a06a16976fcb020e024') -- cgit v1.2.3-70-g09d2 From affea920cfa40cf22a7883c530ad056f696fd199 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Fri, 14 Sep 2018 17:14:30 -0700 Subject: hypre: patch +shared@2.13.0: on darwin (#9220) --- .../darwin-shared-libs-for-hypre-2.13.0.patch | 578 +++++++++++++++++++++ .../darwin-shared-libs-for-hypre-2.14.0.patch | 553 ++++++++++++++++++++ var/spack/repos/builtin/packages/hypre/package.py | 13 +- 3 files changed, 1143 insertions(+), 1 deletion(-) create mode 100644 var/spack/repos/builtin/packages/hypre/darwin-shared-libs-for-hypre-2.13.0.patch create mode 100644 var/spack/repos/builtin/packages/hypre/darwin-shared-libs-for-hypre-2.14.0.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hypre/darwin-shared-libs-for-hypre-2.13.0.patch b/var/spack/repos/builtin/packages/hypre/darwin-shared-libs-for-hypre-2.13.0.patch new file mode 100644 index 0000000000..a793bec8fc --- /dev/null +++ b/var/spack/repos/builtin/packages/hypre/darwin-shared-libs-for-hypre-2.13.0.patch @@ -0,0 +1,578 @@ +From c8467e905debeff23b8403aab7184e128decbba3 Mon Sep 17 00:00:00 2001 +From: Geoffrey Malcolm Oxberry +Date: Tue, 11 Sep 2018 17:46:30 -0700 +Subject: [PATCH] build system: patch to build macOS shared libs + +--- + src/FEI_mv/fei-hypre/Makefile | 4 ++-- + src/FEI_mv/femli/Makefile | 4 ++-- + src/IJ_mv/Makefile | 4 ++-- + src/config/configure.in | 9 +++++++-- + src/configure | 9 +++++++-- + src/distributed_ls/Euclid/Makefile | 4 ++-- + src/distributed_ls/ParaSails/Makefile | 4 ++-- + src/distributed_ls/pilut/Makefile | 4 ++-- + src/distributed_matrix/Makefile | 4 ++-- + src/krylov/Makefile | 4 ++-- + src/lib/Makefile | 4 ++-- + src/matrix_matrix/Makefile | 4 ++-- + src/multivector/Makefile | 4 ++-- + src/parcsr_block_mv/Makefile | 4 ++-- + src/parcsr_ls/Makefile | 4 ++-- + src/parcsr_mv/Makefile | 4 ++-- + src/seq_mv/Makefile | 4 ++-- + src/sstruct_ls/Makefile | 4 ++-- + src/sstruct_mv/Makefile | 4 ++-- + src/struct_ls/Makefile | 4 ++-- + src/struct_mv/Makefile | 4 ++-- + src/test/Makefile | 8 +++++--- + src/utilities/Makefile | 4 ++-- + 23 files changed, 59 insertions(+), 47 deletions(-) + +diff --git a/src/FEI_mv/fei-hypre/Makefile b/src/FEI_mv/fei-hypre/Makefile +index 09cad91df..68e5b394b 100644 +--- a/src/FEI_mv/fei-hypre/Makefile ++++ b/src/FEI_mv/fei-hypre/Makefile +@@ -159,7 +159,7 @@ OBJSC = ${FILESC:.c=.o} + OBJSCXX = ${FILESCXX:.cxx=.o} + OBJS = ${OBJSC} ${OBJSCXX} + +-SONAME = libHYPRE_FEI-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_FEI-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -211,7 +211,7 @@ libHYPRE_FEI.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_FEI.so: ${OBJS} ++libHYPRE_FEI.so libHYPRE_FEI.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/FEI_mv/femli/Makefile b/src/FEI_mv/femli/Makefile +index eac52137f..2beea900e 100644 +--- a/src/FEI_mv/femli/Makefile ++++ b/src/FEI_mv/femli/Makefile +@@ -128,7 +128,7 @@ OBJSC = ${FILES:.c=.o} + OBJSCXX = ${OBJSC:.cxx=.o} + OBJS = ${OBJSCXX:.f=.o} + +-SONAME = libHYPRE_mli-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_mli-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -156,7 +156,7 @@ libHYPRE_mli.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_mli.so: ${OBJS} ++libHYPRE_mli.so libHYPRE_mli.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/IJ_mv/Makefile b/src/IJ_mv/Makefile +index ab014ff7d..4f92e717a 100644 +--- a/src/IJ_mv/Makefile ++++ b/src/IJ_mv/Makefile +@@ -53,7 +53,7 @@ FILES =\ + + OBJS = ${FILES:.c=.o} + +-SONAME = libHYPRE_IJ_mv-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_IJ_mv-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -84,7 +84,7 @@ libHYPRE_IJ_mv.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_IJ_mv.so: ${OBJS} ++libHYPRE_IJ_mv.so libHYPRE_IJ_mv.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/config/configure.in b/src/config/configure.in +index de8a10255..8f2d2c90e 100644 +--- a/src/config/configure.in ++++ b/src/config/configure.in +@@ -1383,6 +1383,8 @@ dnl ********************************************************************* + if test "$hypre_using_shared" = "yes" + then + HYPRE_LIBSUFFIX=".so" ++ SHARED_SET_SONAME="-Wl,-soname," ++ SHARED_OPTIONS="-Wl,-z,defs" + case $hypre_platform in + AIX* | aix* | Aix*) SHARED_COMPILE_FLAG="-qmkshrobj" + SHARED_BUILD_FLAG="-G" +@@ -1390,6 +1392,11 @@ dnl LINK_F77="${F77} -brtl" + LINK_FC="${FC} -brtl" + LINK_CC="${CC} -brtl" + LINK_CXX="${CXX} -brtl" ;; ++ DARWIN* | darwin* | Darwin*) SHARED_COMPILE_FLAG="-fPIC" ++ SHARED_BUILD_FLAG="-dynamiclib -undefined dynamic_lookup" ++ HYPRE_LIBSUFFIX=".dylib" ++ SHARED_SET_SONAME="-install_name @rpath/" ++ SHARED_OPTIONS="-undefined error" ;; + *) SHARED_COMPILE_FLAG="-fPIC" + SHARED_BUILD_FLAG="-shared" ;; + esac +@@ -1405,8 +1412,6 @@ dnl BUILD_F77_SHARED="${F77} ${SHARED_BUILD_FLAG}" + BUILD_CC_SHARED="${CC} ${SHARED_BUILD_FLAG}" + fi + BUILD_CXX_SHARED="${CXX} ${SHARED_BUILD_FLAG}" +- SHARED_SET_SONAME="-Wl,-soname," +- SHARED_OPTIONS="-Wl,-z,defs" + fi + + BUILD_PYTHON=0 +diff --git a/src/configure b/src/configure +index fa3d0717a..763a62dc5 100755 +--- a/src/configure ++++ b/src/configure +@@ -7676,12 +7676,19 @@ HYPRE_LIBSUFFIX=".a" + if test "$hypre_using_shared" = "yes" + then + HYPRE_LIBSUFFIX=".so" ++ SHARED_SET_SONAME="-Wl,-soname," ++ SHARED_OPTIONS="-Wl,-z,defs" + case $hypre_platform in + AIX* | aix* | Aix*) SHARED_COMPILE_FLAG="-qmkshrobj" + SHARED_BUILD_FLAG="-G" + LINK_FC="${FC} -brtl" + LINK_CC="${CC} -brtl" + LINK_CXX="${CXX} -brtl" ;; ++ DARWIN* | darwin* | Darwin*) SHARED_COMPILE_FLAG="-fPIC" ++ SHARED_BUILD_FLAG="-dynamiclib -undefined dynamic_lookup" ++ HYPRE_LIBSUFFIX=".dylib" ++ SHARED_SET_SONAME="-install_name @rpath/" ++ SHARED_OPTIONS="-undefined error" ;; + *) SHARED_COMPILE_FLAG="-fPIC" + SHARED_BUILD_FLAG="-shared" ;; + esac +@@ -7696,8 +7703,6 @@ then + BUILD_CC_SHARED="${CC} ${SHARED_BUILD_FLAG}" + fi + BUILD_CXX_SHARED="${CXX} ${SHARED_BUILD_FLAG}" +- SHARED_SET_SONAME="-Wl,-soname," +- SHARED_OPTIONS="-Wl,-z,defs" + fi + + BUILD_PYTHON=0 +diff --git a/src/distributed_ls/Euclid/Makefile b/src/distributed_ls/Euclid/Makefile +index 03d9db355..b8b71dddd 100644 +--- a/src/distributed_ls/Euclid/Makefile ++++ b/src/distributed_ls/Euclid/Makefile +@@ -87,7 +87,7 @@ FILES =\ + + OBJS = ${FILES:.c=.o} + +-SONAME = libHYPRE_Euclid-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_Euclid-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -114,7 +114,7 @@ libHYPRE_Euclid.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_Euclid.so: ${OBJS} ++libHYPRE_Euclid.so libHYPRE_Euclid.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/distributed_ls/ParaSails/Makefile b/src/distributed_ls/ParaSails/Makefile +index fe881b1f3..78091ad88 100644 +--- a/src/distributed_ls/ParaSails/Makefile ++++ b/src/distributed_ls/ParaSails/Makefile +@@ -59,7 +59,7 @@ FILES =\ + + OBJS = ${FILES:.c=.o} + +-SONAME = libHYPRE_ParaSails-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_ParaSails-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -86,7 +86,7 @@ libHYPRE_ParaSails.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_ParaSails.so: ${OBJS} ++libHYPRE_ParaSails.so libHYPRE_ParaSails.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/distributed_ls/pilut/Makefile b/src/distributed_ls/pilut/Makefile +index 2ed918e2c..333edbafa 100644 +--- a/src/distributed_ls/pilut/Makefile ++++ b/src/distributed_ls/pilut/Makefile +@@ -49,7 +49,7 @@ FILES =\ + + OBJS = ${FILES:.c=.o} + +-SONAME = libHYPRE_DistributedMatrixPilutSolver-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_DistributedMatrixPilutSolver-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -78,7 +78,7 @@ libHYPRE_DistributedMatrixPilutSolver.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_DistributedMatrixPilutSolver.so: ${OBJS} ++libHYPRE_DistributedMatrixPilutSolver.so libHYPRE_DistributedMatrixPilutSolver.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/distributed_matrix/Makefile b/src/distributed_matrix/Makefile +index b8d42944c..d30908fa2 100644 +--- a/src/distributed_matrix/Makefile ++++ b/src/distributed_matrix/Makefile +@@ -40,7 +40,7 @@ FILES =\ + + OBJS = ${FILES:.c=.o} + +-SONAME = libHYPRE_DistributedMatrix-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_DistributedMatrix-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -69,7 +69,7 @@ libHYPRE_DistributedMatrix.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_DistributedMatrix.so: ${OBJS} ++libHYPRE_DistributedMatrix.so libHYPRE_DistributedMatrix.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/krylov/Makefile b/src/krylov/Makefile +index 152d5153a..63d085431 100644 +--- a/src/krylov/Makefile ++++ b/src/krylov/Makefile +@@ -55,7 +55,7 @@ FILES =\ + + OBJS = ${FILES:.c=.o} + +-SONAME = libHYPRE_krylov-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_krylov-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -88,7 +88,7 @@ libHYPRE_krylov.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_krylov.so: ${OBJS} ++libHYPRE_krylov.so libHYPRE_krylov.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/lib/Makefile b/src/lib/Makefile +index 72875e2c1..f49d16838 100644 +--- a/src/lib/Makefile ++++ b/src/lib/Makefile +@@ -57,7 +57,7 @@ $(UTILITIESFILES)\ + $(BLASFILES)\ + $(LAPACKFILES) + +-SONAME = libHYPRE-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + SOLIBS = ${MPILIBDIRS} ${MPILIBS} ${LAPACKLIBDIRS} ${LAPACKLIBS}\ + ${BLASLIBDIRS} ${BLASLIBS} ${LIBS} ${FLIBS} + +@@ -103,7 +103,7 @@ libHYPRE.a: ${FILES_HYPRE} + ${AR} $@ $(UTILITIESFILES) $(BLASFILES) $(LAPACKFILES) + ${RANLIB} $@ + +-libHYPRE.so: ${FILES_HYPRE} ++libHYPRE.so libHYPRE.dylib: ${FILES_HYPRE} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${FILES_HYPRE} ${SOLIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS} ${LDFLAGS} + ln -s ${SONAME} $@ +diff --git a/src/matrix_matrix/Makefile b/src/matrix_matrix/Makefile +index 1da8ced0e..a611bee51 100644 +--- a/src/matrix_matrix/Makefile ++++ b/src/matrix_matrix/Makefile +@@ -35,7 +35,7 @@ FILES =\ + + OBJS = ${FILES:.c=.o} + +-SONAME = libHYPRE_MatrixMatrix-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_MatrixMatrix-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -64,7 +64,7 @@ libHYPRE_MatrixMatrix.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_MatrixMatrix.so: ${OBJS} ++libHYPRE_MatrixMatrix.so libHYPRE_MatrixMatrix.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/multivector/Makefile b/src/multivector/Makefile +index 915cf5e0e..fce270f13 100644 +--- a/src/multivector/Makefile ++++ b/src/multivector/Makefile +@@ -31,7 +31,7 @@ FILES =\ + + OBJS = ${FILES:.c=.o} + +-SONAME = libHYPRE_multivector-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_multivector-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -60,7 +60,7 @@ libHYPRE_multivector.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_multivector.so: ${OBJS} ++libHYPRE_multivector.so libHYPRE_multivector.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/parcsr_block_mv/Makefile b/src/parcsr_block_mv/Makefile +index 3f1e33db1..b7559d39e 100644 +--- a/src/parcsr_block_mv/Makefile ++++ b/src/parcsr_block_mv/Makefile +@@ -59,7 +59,7 @@ DRIVER_FILES = + OBJS = ${FILES:.c=.o} + DRIVER_OBJS = ${DRIVER_FILES:.c=.o} + +-SONAME = libHYPRE_parcsr_block_mv-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_parcsr_block_mv-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -114,7 +114,7 @@ libHYPRE_parcsr_block_mv.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_parcsr_block_mv.so: ${OBJS} ++libHYPRE_parcsr_block_mv.so libHYPRE_parcsr_block_mv.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/parcsr_ls/Makefile b/src/parcsr_ls/Makefile +index 74972be17..7670387e0 100644 +--- a/src/parcsr_ls/Makefile ++++ b/src/parcsr_ls/Makefile +@@ -133,7 +133,7 @@ FILES =\ + + OBJS = ${FILES:.c=.o} + +-SONAME = libHYPRE_parcsr_ls-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_parcsr_ls-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -165,7 +165,7 @@ libHYPRE_parcsr_ls.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_parcsr_ls.so: ${OBJS} ++libHYPRE_parcsr_ls.so libHYPRE_parcsr_ls.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/parcsr_mv/Makefile b/src/parcsr_mv/Makefile +index 99b4f7ba8..ff027bb30 100644 +--- a/src/parcsr_mv/Makefile ++++ b/src/parcsr_mv/Makefile +@@ -71,7 +71,7 @@ DRIVER_FILES =\ + OBJS = ${FILES:.c=.o} + DRIVER_OBJS = ${DRIVER_FILES:.c=.o} + +-SONAME = libHYPRE_parcsr_mv-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_parcsr_mv-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -127,7 +127,7 @@ libHYPRE_parcsr_mv.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_parcsr_mv.so: ${OBJS} ++libHYPRE_parcsr_mv.so libHYPRE_parcsr_mv.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/seq_mv/Makefile b/src/seq_mv/Makefile +index 6982fa067..b0692cd26 100644 +--- a/src/seq_mv/Makefile ++++ b/src/seq_mv/Makefile +@@ -49,7 +49,7 @@ FILES =\ + OBJS = ${FILES:.c=.o} + CUOBJS = ${FILES_NVCC:.cu=.o} + +-SONAME = libHYPRE_seq_mv-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_seq_mv-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -80,7 +80,7 @@ libHYPRE_seq_mv.a: ${OBJS} ${CUOBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_seq_mv.so: ${OBJS} ${CUOBJS} ++libHYPRE_seq_mv.so libHYPRE_seq_mv.dylib: ${OBJS} ${CUOBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/sstruct_ls/Makefile b/src/sstruct_ls/Makefile +index 28811f8bf..463843d9a 100644 +--- a/src/sstruct_ls/Makefile ++++ b/src/sstruct_ls/Makefile +@@ -109,7 +109,7 @@ FILES =\ + + OBJS = ${FILES:.c=.o} + +-SONAME = libHYPRE_sstruct_ls-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_sstruct_ls-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -140,7 +140,7 @@ libHYPRE_sstruct_ls.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_sstruct_ls.so: ${OBJS} ++libHYPRE_sstruct_ls.so libHYPRE_sstruct_ls.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/sstruct_mv/Makefile b/src/sstruct_mv/Makefile +index d9adda815..1f4dfc029 100644 +--- a/src/sstruct_mv/Makefile ++++ b/src/sstruct_mv/Makefile +@@ -59,7 +59,7 @@ FILES =\ + + OBJS = ${FILES:.c=.o} + +-SONAME = libHYPRE_sstruct_mv-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_sstruct_mv-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -90,7 +90,7 @@ libHYPRE_sstruct_mv.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_sstruct_mv.so: ${OBJS} ++libHYPRE_sstruct_mv.so libHYPRE_sstruct_mv.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/struct_ls/Makefile b/src/struct_ls/Makefile +index 4653b733d..007529823 100644 +--- a/src/struct_ls/Makefile ++++ b/src/struct_ls/Makefile +@@ -104,7 +104,7 @@ FILES =\ + + OBJS = ${FILES:.c=.o} + +-SONAME = libHYPRE_struct_ls-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_struct_ls-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -135,7 +135,7 @@ libHYPRE_struct_ls.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_struct_ls.so: ${OBJS} ++libHYPRE_struct_ls.so libHYPRE_struct_ls.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/struct_mv/Makefile b/src/struct_mv/Makefile +index eabf9b00f..349947a4f 100644 +--- a/src/struct_mv/Makefile ++++ b/src/struct_mv/Makefile +@@ -66,7 +66,7 @@ FILES =\ + + OBJS = ${FILES:.c=.o} + +-SONAME = libHYPRE_struct_mv-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_struct_mv-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -97,7 +97,7 @@ libHYPRE_struct_mv.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_struct_mv.so: ${OBJS} ++libHYPRE_struct_mv.so libHYPRE_struct_mv.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/test/Makefile b/src/test/Makefile +index 17e8f465d..4616c6de4 100644 +--- a/src/test/Makefile ++++ b/src/test/Makefile +@@ -40,7 +40,7 @@ F77_COMPILE_FLAGS = \ + -I${HYPRE_BUILD_DIR}/include\ + ${CINCLUDES} + +-MPILIBFLAGS = ${MPILIBDIRS} ${MPILIBS} ${MPIFLAGS} ++MPILIBFLAGS = ${MPILIBDIRS} ${MPILIBS} ${MPIFLAGS} + LAPACKLIBFLAGS = ${LAPACKLIBDIRS} ${LAPACKLIBS} + BLASLIBFLAGS = ${BLASLIBDIRS} ${BLASLIBS} + LIBFLAGS = ${LDFLAGS} ${LIBS} +@@ -48,6 +48,9 @@ LIBFLAGS = ${LDFLAGS} ${LIBS} + LFLAGS =\ + -L${HYPRE_BUILD_DIR}/lib\ + -lHYPRE\ ++ -Wl,-rpath,${HYPRE_BUILD_DIR}/lib\ ++ ${DSUPERLU_LIBS}\ ++ ${SUPERLU_LIBS}\ + ${MPILIBFLAGS}\ + ${LAPACKLIBFLAGS}\ + ${BLASLIBFLAGS}\ +@@ -265,7 +268,7 @@ fparcsr_mv: fparcsr_mv.f + @echo "Building" $@ "... " + ${LINK_FC} -c $@ + +-fsstruct_ls: fsstruct_ls.f ++fsstruct_ls: fsstruct_ls.f + @echo "Building" $@ "... " + ${LINK_FC} -c $@ + +@@ -280,4 +283,3 @@ fstruct_ls: fstruct_ls.f + fstruct_mv: fstruct_mv.f + @echo "Building" $@ "... " + ${LINK_FC} -c $@ +- +diff --git a/src/utilities/Makefile b/src/utilities/Makefile +index 512e6d0be..c1710766a 100644 +--- a/src/utilities/Makefile ++++ b/src/utilities/Makefile +@@ -66,7 +66,7 @@ FILES =\ + + OBJS = ${FILES:.c=.o} + +-SONAME = libHYPRE_utilities-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_utilities-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -100,7 +100,7 @@ libHYPRE_utilities.a: ${OBJS} + ${AR} $@ *.o + ${RANLIB} $@ + +-libHYPRE_utilities.so: ${OBJS} ++libHYPRE_utilities.so libHYPRE_utilities.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +-- +2.19.0 + diff --git a/var/spack/repos/builtin/packages/hypre/darwin-shared-libs-for-hypre-2.14.0.patch b/var/spack/repos/builtin/packages/hypre/darwin-shared-libs-for-hypre-2.14.0.patch new file mode 100644 index 0000000000..1d563f9a42 --- /dev/null +++ b/var/spack/repos/builtin/packages/hypre/darwin-shared-libs-for-hypre-2.14.0.patch @@ -0,0 +1,553 @@ +From c5db8367db7873cabe2d7e60a577eb1eb158f364 Mon Sep 17 00:00:00 2001 +From: Geoffrey Malcolm Oxberry +Date: Tue, 11 Sep 2018 17:46:30 -0700 +Subject: [PATCH] build system: patch to build macOS shared libs + +--- + src/FEI_mv/fei-hypre/Makefile | 4 ++-- + src/FEI_mv/femli/Makefile | 4 ++-- + src/IJ_mv/Makefile | 4 ++-- + src/config/configure.in | 9 +++++++-- + src/configure | 9 +++++++-- + src/distributed_ls/Euclid/Makefile | 4 ++-- + src/distributed_ls/ParaSails/Makefile | 4 ++-- + src/distributed_ls/pilut/Makefile | 4 ++-- + src/distributed_matrix/Makefile | 4 ++-- + src/krylov/Makefile | 4 ++-- + src/lib/Makefile | 4 ++-- + src/matrix_matrix/Makefile | 4 ++-- + src/multivector/Makefile | 4 ++-- + src/parcsr_block_mv/Makefile | 4 ++-- + src/parcsr_ls/Makefile | 4 ++-- + src/parcsr_mv/Makefile | 4 ++-- + src/seq_mv/Makefile | 4 ++-- + src/sstruct_ls/Makefile | 4 ++-- + src/sstruct_mv/Makefile | 4 ++-- + src/struct_ls/Makefile | 4 ++-- + src/struct_mv/Makefile | 4 ++-- + src/test/Makefile | 1 + + src/utilities/Makefile | 4 ++-- + 23 files changed, 55 insertions(+), 44 deletions(-) + +diff --git a/src/FEI_mv/fei-hypre/Makefile b/src/FEI_mv/fei-hypre/Makefile +index 09cad91df..68e5b394b 100644 +--- a/src/FEI_mv/fei-hypre/Makefile ++++ b/src/FEI_mv/fei-hypre/Makefile +@@ -159,7 +159,7 @@ OBJSC = ${FILESC:.c=.o} + OBJSCXX = ${FILESCXX:.cxx=.o} + OBJS = ${OBJSC} ${OBJSCXX} + +-SONAME = libHYPRE_FEI-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_FEI-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -211,7 +211,7 @@ libHYPRE_FEI.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_FEI.so: ${OBJS} ++libHYPRE_FEI.so libHYPRE_FEI.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/FEI_mv/femli/Makefile b/src/FEI_mv/femli/Makefile +index 07bf5dff3..499757ffa 100644 +--- a/src/FEI_mv/femli/Makefile ++++ b/src/FEI_mv/femli/Makefile +@@ -129,7 +129,7 @@ OBJSC = ${FILES:.c=.o} + OBJSCXX = ${OBJSC:.cxx=.o} + OBJS = ${OBJSCXX:.f=.o} + +-SONAME = libHYPRE_mli-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_mli-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -157,7 +157,7 @@ libHYPRE_mli.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_mli.so: ${OBJS} ++libHYPRE_mli.so libHYPRE_mli.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/IJ_mv/Makefile b/src/IJ_mv/Makefile +index ab014ff7d..4f92e717a 100644 +--- a/src/IJ_mv/Makefile ++++ b/src/IJ_mv/Makefile +@@ -53,7 +53,7 @@ FILES =\ + + OBJS = ${FILES:.c=.o} + +-SONAME = libHYPRE_IJ_mv-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_IJ_mv-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -84,7 +84,7 @@ libHYPRE_IJ_mv.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_IJ_mv.so: ${OBJS} ++libHYPRE_IJ_mv.so libHYPRE_IJ_mv.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/config/configure.in b/src/config/configure.in +index c0a0e3091..c05e13cd2 100644 +--- a/src/config/configure.in ++++ b/src/config/configure.in +@@ -1413,6 +1413,8 @@ dnl ********************************************************************* + if test "$hypre_using_shared" = "yes" + then + HYPRE_LIBSUFFIX=".so" ++ SHARED_SET_SONAME="-Wl,-soname," ++ SHARED_OPTIONS="-Wl,-z,defs" + case $hypre_platform in + AIX* | aix* | Aix*) SHARED_COMPILE_FLAG="-qmkshrobj" + SHARED_BUILD_FLAG="-G" +@@ -1420,6 +1422,11 @@ dnl LINK_F77="${F77} -brtl" + LINK_FC="${FC} -brtl" + LINK_CC="${CC} -brtl" + LINK_CXX="${CXX} -brtl" ;; ++ DARWIN* | darwin* | Darwin*) SHARED_COMPILE_FLAG="-fPIC" ++ SHARED_BUILD_FLAG="-dynamiclib -undefined dynamic_lookup" ++ HYPRE_LIBSUFFIX=".dylib" ++ SHARED_SET_SONAME="-install_name @rpath/" ++ SHARED_OPTIONS="-undefined error" ;; + *) SHARED_COMPILE_FLAG="-fPIC" + SHARED_BUILD_FLAG="-shared" ;; + esac +@@ -1435,8 +1442,6 @@ dnl BUILD_F77_SHARED="${F77} ${SHARED_BUILD_FLAG}" + BUILD_CC_SHARED="${CC} ${SHARED_BUILD_FLAG}" + fi + BUILD_CXX_SHARED="${CXX} ${SHARED_BUILD_FLAG}" +- SHARED_SET_SONAME="-Wl,-soname," +- SHARED_OPTIONS="-Wl,-z,defs" + fi + + BUILD_PYTHON=0 +diff --git a/src/configure b/src/configure +index c4b2e42cf..2de08ceae 100755 +--- a/src/configure ++++ b/src/configure +@@ -7876,12 +7876,19 @@ HYPRE_LIBSUFFIX=".a" + if test "$hypre_using_shared" = "yes" + then + HYPRE_LIBSUFFIX=".so" ++ SHARED_SET_SONAME="-Wl,-soname," ++ SHARED_OPTIONS="-Wl,-z,defs" + case $hypre_platform in + AIX* | aix* | Aix*) SHARED_COMPILE_FLAG="-qmkshrobj" + SHARED_BUILD_FLAG="-G" + LINK_FC="${FC} -brtl" + LINK_CC="${CC} -brtl" + LINK_CXX="${CXX} -brtl" ;; ++ DARWIN* | darwin* | Darwin*) SHARED_COMPILE_FLAG="-fPIC" ++ SHARED_BUILD_FLAG="-dynamiclib -undefined dynamic_lookup" ++ HYPRE_LIBSUFFIX=".dylib" ++ SHARED_SET_SONAME="-install_name @rpath/" ++ SHARED_OPTIONS="-undefined error" ;; + *) SHARED_COMPILE_FLAG="-fPIC" + SHARED_BUILD_FLAG="-shared" ;; + esac +@@ -7896,8 +7903,6 @@ then + BUILD_CC_SHARED="${CC} ${SHARED_BUILD_FLAG}" + fi + BUILD_CXX_SHARED="${CXX} ${SHARED_BUILD_FLAG}" +- SHARED_SET_SONAME="-Wl,-soname," +- SHARED_OPTIONS="-Wl,-z,defs" + fi + + BUILD_PYTHON=0 +diff --git a/src/distributed_ls/Euclid/Makefile b/src/distributed_ls/Euclid/Makefile +index 03d9db355..b8b71dddd 100644 +--- a/src/distributed_ls/Euclid/Makefile ++++ b/src/distributed_ls/Euclid/Makefile +@@ -87,7 +87,7 @@ FILES =\ + + OBJS = ${FILES:.c=.o} + +-SONAME = libHYPRE_Euclid-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_Euclid-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -114,7 +114,7 @@ libHYPRE_Euclid.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_Euclid.so: ${OBJS} ++libHYPRE_Euclid.so libHYPRE_Euclid.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/distributed_ls/ParaSails/Makefile b/src/distributed_ls/ParaSails/Makefile +index fe881b1f3..78091ad88 100644 +--- a/src/distributed_ls/ParaSails/Makefile ++++ b/src/distributed_ls/ParaSails/Makefile +@@ -59,7 +59,7 @@ FILES =\ + + OBJS = ${FILES:.c=.o} + +-SONAME = libHYPRE_ParaSails-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_ParaSails-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -86,7 +86,7 @@ libHYPRE_ParaSails.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_ParaSails.so: ${OBJS} ++libHYPRE_ParaSails.so libHYPRE_ParaSails.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/distributed_ls/pilut/Makefile b/src/distributed_ls/pilut/Makefile +index e24d4d224..67e00fb5b 100644 +--- a/src/distributed_ls/pilut/Makefile ++++ b/src/distributed_ls/pilut/Makefile +@@ -50,7 +50,7 @@ FILES =\ + + OBJS = ${FILES:.c=.o} + +-SONAME = libHYPRE_DistributedMatrixPilutSolver-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_DistributedMatrixPilutSolver-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -79,7 +79,7 @@ libHYPRE_DistributedMatrixPilutSolver.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_DistributedMatrixPilutSolver.so: ${OBJS} ++libHYPRE_DistributedMatrixPilutSolver.so libHYPRE_DistributedMatrixPilutSolver.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/distributed_matrix/Makefile b/src/distributed_matrix/Makefile +index b8d42944c..d30908fa2 100644 +--- a/src/distributed_matrix/Makefile ++++ b/src/distributed_matrix/Makefile +@@ -40,7 +40,7 @@ FILES =\ + + OBJS = ${FILES:.c=.o} + +-SONAME = libHYPRE_DistributedMatrix-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_DistributedMatrix-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -69,7 +69,7 @@ libHYPRE_DistributedMatrix.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_DistributedMatrix.so: ${OBJS} ++libHYPRE_DistributedMatrix.so libHYPRE_DistributedMatrix.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/krylov/Makefile b/src/krylov/Makefile +index bb3ec05cf..f4682b657 100644 +--- a/src/krylov/Makefile ++++ b/src/krylov/Makefile +@@ -58,7 +58,7 @@ FILES =\ + + OBJS = ${FILES:.c=.o} + +-SONAME = libHYPRE_krylov-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_krylov-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -91,7 +91,7 @@ libHYPRE_krylov.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_krylov.so: ${OBJS} ++libHYPRE_krylov.so libHYPRE_krylov.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/lib/Makefile b/src/lib/Makefile +index 72875e2c1..f49d16838 100644 +--- a/src/lib/Makefile ++++ b/src/lib/Makefile +@@ -57,7 +57,7 @@ $(UTILITIESFILES)\ + $(BLASFILES)\ + $(LAPACKFILES) + +-SONAME = libHYPRE-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + SOLIBS = ${MPILIBDIRS} ${MPILIBS} ${LAPACKLIBDIRS} ${LAPACKLIBS}\ + ${BLASLIBDIRS} ${BLASLIBS} ${LIBS} ${FLIBS} + +@@ -103,7 +103,7 @@ libHYPRE.a: ${FILES_HYPRE} + ${AR} $@ $(UTILITIESFILES) $(BLASFILES) $(LAPACKFILES) + ${RANLIB} $@ + +-libHYPRE.so: ${FILES_HYPRE} ++libHYPRE.so libHYPRE.dylib: ${FILES_HYPRE} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${FILES_HYPRE} ${SOLIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS} ${LDFLAGS} + ln -s ${SONAME} $@ +diff --git a/src/matrix_matrix/Makefile b/src/matrix_matrix/Makefile +index 1da8ced0e..a611bee51 100644 +--- a/src/matrix_matrix/Makefile ++++ b/src/matrix_matrix/Makefile +@@ -35,7 +35,7 @@ FILES =\ + + OBJS = ${FILES:.c=.o} + +-SONAME = libHYPRE_MatrixMatrix-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_MatrixMatrix-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -64,7 +64,7 @@ libHYPRE_MatrixMatrix.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_MatrixMatrix.so: ${OBJS} ++libHYPRE_MatrixMatrix.so libHYPRE_MatrixMatrix.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/multivector/Makefile b/src/multivector/Makefile +index 915cf5e0e..fce270f13 100644 +--- a/src/multivector/Makefile ++++ b/src/multivector/Makefile +@@ -31,7 +31,7 @@ FILES =\ + + OBJS = ${FILES:.c=.o} + +-SONAME = libHYPRE_multivector-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_multivector-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -60,7 +60,7 @@ libHYPRE_multivector.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_multivector.so: ${OBJS} ++libHYPRE_multivector.so libHYPRE_multivector.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/parcsr_block_mv/Makefile b/src/parcsr_block_mv/Makefile +index bac31a5ed..eba6d2589 100644 +--- a/src/parcsr_block_mv/Makefile ++++ b/src/parcsr_block_mv/Makefile +@@ -61,7 +61,7 @@ DRIVER_FILES = + OBJS = ${FILES:.c=.o} + DRIVER_OBJS = ${DRIVER_FILES:.c=.o} + +-SONAME = libHYPRE_parcsr_block_mv-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_parcsr_block_mv-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -116,7 +116,7 @@ libHYPRE_parcsr_block_mv.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_parcsr_block_mv.so: ${OBJS} ++libHYPRE_parcsr_block_mv.so libHYPRE_parcsr_block_mv.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/parcsr_ls/Makefile b/src/parcsr_ls/Makefile +index f25eda61f..980ccf283 100644 +--- a/src/parcsr_ls/Makefile ++++ b/src/parcsr_ls/Makefile +@@ -139,7 +139,7 @@ FILES =\ + + OBJS = ${FILES:.c=.o} + +-SONAME = libHYPRE_parcsr_ls-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_parcsr_ls-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -171,7 +171,7 @@ libHYPRE_parcsr_ls.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_parcsr_ls.so: ${OBJS} ++libHYPRE_parcsr_ls.so libHYPRE_parcsr_ls.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/parcsr_mv/Makefile b/src/parcsr_mv/Makefile +index 87c697ad9..654be6dd1 100644 +--- a/src/parcsr_mv/Makefile ++++ b/src/parcsr_mv/Makefile +@@ -73,7 +73,7 @@ DRIVER_FILES =\ + OBJS = ${FILES:.c=.o} + DRIVER_OBJS = ${DRIVER_FILES:.c=.o} + +-SONAME = libHYPRE_parcsr_mv-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_parcsr_mv-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -129,7 +129,7 @@ libHYPRE_parcsr_mv.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_parcsr_mv.so: ${OBJS} ++libHYPRE_parcsr_mv.so libHYPRE_parcsr_mv.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/seq_mv/Makefile b/src/seq_mv/Makefile +index 0f2c34d0d..da0b29a54 100644 +--- a/src/seq_mv/Makefile ++++ b/src/seq_mv/Makefile +@@ -50,7 +50,7 @@ FILES =\ + OBJS = ${FILES:.c=.o} + CUOBJS = ${FILES_NVCC:.cu=.o} + +-SONAME = libHYPRE_seq_mv-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_seq_mv-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -81,7 +81,7 @@ libHYPRE_seq_mv.a: ${OBJS} ${CUOBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_seq_mv.so: ${OBJS} ${CUOBJS} ++libHYPRE_seq_mv.so libHYPRE_seq_mv.dylib: ${OBJS} ${CUOBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/sstruct_ls/Makefile b/src/sstruct_ls/Makefile +index b4511f4ab..0f2a0a1f3 100644 +--- a/src/sstruct_ls/Makefile ++++ b/src/sstruct_ls/Makefile +@@ -111,7 +111,7 @@ FILES =\ + + OBJS = ${FILES:.c=.o} + +-SONAME = libHYPRE_sstruct_ls-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_sstruct_ls-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -142,7 +142,7 @@ libHYPRE_sstruct_ls.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_sstruct_ls.so: ${OBJS} ++libHYPRE_sstruct_ls.so libHYPRE_sstruct_ls.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/sstruct_mv/Makefile b/src/sstruct_mv/Makefile +index d9adda815..1f4dfc029 100644 +--- a/src/sstruct_mv/Makefile ++++ b/src/sstruct_mv/Makefile +@@ -59,7 +59,7 @@ FILES =\ + + OBJS = ${FILES:.c=.o} + +-SONAME = libHYPRE_sstruct_mv-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_sstruct_mv-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -90,7 +90,7 @@ libHYPRE_sstruct_mv.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_sstruct_mv.so: ${OBJS} ++libHYPRE_sstruct_mv.so libHYPRE_sstruct_mv.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/struct_ls/Makefile b/src/struct_ls/Makefile +index 4653b733d..007529823 100644 +--- a/src/struct_ls/Makefile ++++ b/src/struct_ls/Makefile +@@ -104,7 +104,7 @@ FILES =\ + + OBJS = ${FILES:.c=.o} + +-SONAME = libHYPRE_struct_ls-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_struct_ls-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -135,7 +135,7 @@ libHYPRE_struct_ls.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_struct_ls.so: ${OBJS} ++libHYPRE_struct_ls.so libHYPRE_struct_ls.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/struct_mv/Makefile b/src/struct_mv/Makefile +index eabf9b00f..349947a4f 100644 +--- a/src/struct_mv/Makefile ++++ b/src/struct_mv/Makefile +@@ -66,7 +66,7 @@ FILES =\ + + OBJS = ${FILES:.c=.o} + +-SONAME = libHYPRE_struct_mv-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_struct_mv-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -97,7 +97,7 @@ libHYPRE_struct_mv.a: ${OBJS} + ${AR} $@ ${OBJS} + ${RANLIB} $@ + +-libHYPRE_struct_mv.so: ${OBJS} ++libHYPRE_struct_mv.so libHYPRE_struct_mv.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +diff --git a/src/test/Makefile b/src/test/Makefile +index 86481720f..ec05bfcbd 100644 +--- a/src/test/Makefile ++++ b/src/test/Makefile +@@ -52,6 +52,7 @@ LIBFLAGS = ${LDFLAGS} ${LIBS} + LFLAGS =\ + -L${HYPRE_BUILD_DIR}/lib\ + -lHYPRE\ ++ -Wl,-rpath,${HYPRE_BUILD_DIR}/lib\ + ${DSUPERLU_LIBS}\ + ${SUPERLU_LIBS}\ + ${MPILIBFLAGS}\ +diff --git a/src/utilities/Makefile b/src/utilities/Makefile +index bd4a3fe67..a4993b9e4 100644 +--- a/src/utilities/Makefile ++++ b/src/utilities/Makefile +@@ -64,7 +64,7 @@ FILES =\ + + OBJS = ${FILES:.c=.o} + +-SONAME = libHYPRE_utilities-${HYPRE_RELEASE_VERSION}.so ++SONAME = libHYPRE_utilities-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} + + ################################################################## + # Targets +@@ -98,7 +98,7 @@ libHYPRE_utilities.a: ${OBJS} + ${AR} $@ *.o + ${RANLIB} $@ + +-libHYPRE_utilities.so: ${OBJS} ++libHYPRE_utilities.so libHYPRE_utilities.dylib: ${OBJS} + @echo "Building $@ ... " + ${BUILD_CC_SHARED} -o ${SONAME} ${OBJS} ${SHARED_SET_SONAME}${SONAME} + ln -s ${SONAME} $@ +-- +2.19.0 + diff --git a/var/spack/repos/builtin/packages/hypre/package.py b/var/spack/repos/builtin/packages/hypre/package.py index b3c453e7e5..20fb7cc867 100644 --- a/var/spack/repos/builtin/packages/hypre/package.py +++ b/var/spack/repos/builtin/packages/hypre/package.py @@ -46,7 +46,10 @@ class Hypre(Package): version('2.10.0b', '768be38793a35bb5d055905b271f5b8e') version('xsdk-0.2.0', tag='xsdk-0.2.0') - # hypre does not know how to build shared libraries on Darwin + # Versions 2.13.0 and later can be patched to build shared + # libraries on Darwin; the patch for this capability does not + # apply to version 2.12.1 and earlier due to changes in the build system + # between versions 2.12.1 and 2.13.0. variant('shared', default=(sys.platform != 'darwin'), description="Build shared library (disables static library)") # SuperluDist have conflicting headers with those in Hypre @@ -61,10 +64,18 @@ class Hypre(Package): # Patch to add ppc64le in config.guess patch('ibm-ppc64le.patch', when='@:2.11.1') + # Patch to build shared libraries on Darwin + patch('darwin-shared-libs-for-hypre-2.13.0.patch', when='+shared@2.13.0 platform=darwin') + patch('darwin-shared-libs-for-hypre-2.14.0.patch', when='+shared@2.14.0: platform=darwin') + depends_on("mpi", when='+mpi') depends_on("blas") depends_on("lapack") + # Patch to build shared libraries on Darwin does not apply to + # versions before 2.13.0 + conflicts("+shared@:2.12.99 platform=darwin") + def url_for_version(self, version): if version >= Version('2.12.0'): url = 'https://github.com/LLNL/hypre/archive/v{0}.tar.gz' -- cgit v1.2.3-70-g09d2 From ea3c59ed37ac54e16a50a5286006fb0e5179e627 Mon Sep 17 00:00:00 2001 From: Stephen McDowell Date: Fri, 14 Sep 2018 17:14:46 -0700 Subject: add eigen@3.3.5 (#9212) --- var/spack/repos/builtin/packages/eigen/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/eigen/package.py b/var/spack/repos/builtin/packages/eigen/package.py index 88d5ec409a..ee2c20d9e4 100644 --- a/var/spack/repos/builtin/packages/eigen/package.py +++ b/var/spack/repos/builtin/packages/eigen/package.py @@ -33,6 +33,7 @@ class Eigen(CMakePackage): homepage = 'http://eigen.tuxfamily.org/' url = 'https://bitbucket.org/eigen/eigen/get/3.3.4.tar.bz2' + version('3.3.5', 'e83549a79d1b721da0f8899ab34edf95') version('3.3.4', 'a7aab9f758249b86c93221ad417fbe18') version('3.3.3', 'b2ddade41040d9cf73b39b4b51e8775b') version('3.3.1', 'edb6799ef413b0868aace20d2403864c') -- cgit v1.2.3-70-g09d2 From ae1420bffc3066a228f66a3ac24016d89b7843de Mon Sep 17 00:00:00 2001 From: Stephen Hudson Date: Fri, 14 Sep 2018 19:15:31 -0500 Subject: Update py-libensemble package to v0.3.0 (#9210) --- var/spack/repos/builtin/packages/py-libensemble/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-libensemble/package.py b/var/spack/repos/builtin/packages/py-libensemble/package.py index ea7034b290..c6237c588d 100644 --- a/var/spack/repos/builtin/packages/py-libensemble/package.py +++ b/var/spack/repos/builtin/packages/py-libensemble/package.py @@ -30,10 +30,11 @@ class PyLibensemble(PythonPackage): """Library for managing ensemble-like collections of computations.""" homepage = "https://libensemble.readthedocs.io" - url = "https://pypi.io/packages/source/l/libensemble/libensemble-0.2.0.tar.gz" + url = "https://pypi.io/packages/source/l/libensemble/libensemble-0.3.0.tar.gz" git = "https://github.com/Libensemble/libensemble.git" version('develop', branch='master') + version('0.3.0', sha256='c8efdf45d0da0ef6299ee778cea1c285c95972af70d3a729ee6dc855e66f9294') version('0.2.0', 'ee96047594a3f5a1533f24d3b1f365f9') version('0.1.0', '0c3d45dd139429de1a5273e5bd8e46ec') -- cgit v1.2.3-70-g09d2 From 8f80ee7a409d473d34dfdbf08730672268b2bfc2 Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Fri, 14 Sep 2018 18:16:35 -0600 Subject: Updating amrvis to allow building with profiling support. (#9204) * Updating amrvis to allow building with profiling support. * Setting MPI default to true. --- var/spack/repos/builtin/packages/amrvis/package.py | 33 ++++++++++++++++++---- 1 file changed, 28 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/amrvis/package.py b/var/spack/repos/builtin/packages/amrvis/package.py index ca72e9e8eb..a655038138 100644 --- a/var/spack/repos/builtin/packages/amrvis/package.py +++ b/var/spack/repos/builtin/packages/amrvis/package.py @@ -52,6 +52,8 @@ class Amrvis(MakefilePackage): ) variant('mpi', default=True, description='Enable MPI parallel support') variant('debug', default=False, description='Enable debugging features') + variant('profiling', default=False, + description='Enable AMReX profiling features') depends_on('gmake', type='build') depends_on('mpi', when='+mpi') @@ -62,6 +64,17 @@ class Amrvis(MakefilePackage): depends_on('libxt') depends_on('libxext') depends_on('motif') + depends_on('flex') + depends_on('bison') + + conflicts( + '+profiling', when='dims=1', + msg='Amrvis profiling support requires a 2D build' + ) + conflicts( + '+profiling', when='dims=3', + msg='Amrvis profiling support requires a 2D build' + ) # Only doing gcc and clang at the moment. # Intel currently fails searching for mpiicc, mpiicpc, etc. @@ -81,7 +94,7 @@ class Amrvis(MakefilePackage): # Set all available makefile options to values we want makefile = FileFilter('GNUmakefile') makefile.filter( - r'^AMREX_HOME\s*=.*', + r'^AMREX_HOME\s*\?=.*', 'AMREX_HOME = {0}'.format('./amrex') ) makefile.filter( @@ -94,15 +107,21 @@ class Amrvis(MakefilePackage): ) makefile.filter( r'^PROFILE\s*=.*', - 'PROFILE = FALSE' + 'PROFILE = {0}'.format( + spec.variants['profiling'].value + ).upper() ) makefile.filter( r'^TRACE_PROFILE\s*=.*', - 'TRACE_PROFILE = FALSE' + 'TRACE_PROFILE = {0}'.format( + spec.variants['profiling'].value + ).upper() ) makefile.filter( r'^COMM_PROFILE\s*=.*', - 'COMM_PROFILE = FALSE' + 'COMM_PROFILE = {0}'.format( + spec.variants['profiling'].value + ).upper() ) makefile.filter( r'^COMP\s*=.*', @@ -134,7 +153,9 @@ class Amrvis(MakefilePackage): ) makefile.filter( r'^USE_PROFPARSER\s*=.*', - 'USE_PROFPARSER = FALSE' + 'USE_PROFPARSER = {0}'.format( + spec.variants['profiling'].value + ).upper() ) # A bit risky here deleting all /usr and /opt X @@ -171,6 +192,8 @@ class Amrvis(MakefilePackage): file.writelines(contents) def setup_environment(self, spack_env, run_env): + # We don't want an AMREX_HOME the user may have set already + spack_env.unset('AMREX_HOME') # Help force Amrvis to not pick up random system compilers if '+mpi' in self.spec: spack_env.set('MPI_HOME', self.spec['mpi'].prefix) -- cgit v1.2.3-70-g09d2 From b09ece58f6eff34d024bc95ea3653a3d96cedf32 Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Fri, 14 Sep 2018 19:17:32 -0500 Subject: jdk: added 10.0.2_13 (#9203) --- var/spack/repos/builtin/packages/jdk/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/jdk/package.py b/var/spack/repos/builtin/packages/jdk/package.py index b2f6aa92f2..95e4ce169c 100644 --- a/var/spack/repos/builtin/packages/jdk/package.py +++ b/var/spack/repos/builtin/packages/jdk/package.py @@ -55,6 +55,8 @@ class Jdk(Package): # found in a link above. The build number can be deciphered from the URL. # Alternatively, run `bin/java -version` after extracting. Replace '+' # symbol in version with '_', otherwise it will be interpreted as a variant + version('10.0.2_13', sha256='6633c20d53c50c20835364d0f3e172e0cbbce78fff81867488f22a6298fa372b', curl_options=curl_options, + url='http://download.oracle.com/otn-pub/java/jdk/10.0.2+13/19aef61b38124481863b1413dce1855f/jdk-10.0.2_linux-x64_bin.tar.gz') version('10.0.1_10', 'ae8ed645e6af38432a56a847597ac61d4283b7536688dbab44ab536199d1e5a4', curl_options=curl_options, url='http://download.oracle.com/otn-pub/java/jdk/10.0.1+10/fb4372174a714e6b8c52526dc134031e/jdk-10.0.1_linux-x64_bin.tar.gz') version('1.8.0_181-b13', 'ef599e322eee42f6769991dd3e3b1a31', curl_options=curl_options, -- cgit v1.2.3-70-g09d2 From c2f6c98ed994c79464e50afd7f940c2cfa3d1109 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Sat, 15 Sep 2018 02:21:05 +0200 Subject: rdma-core: Fix missing pkg-config dependency (#9195) rdma-core requires pkg-config, otherwise libnl can not be found. --- var/spack/repos/builtin/packages/rdma-core/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/rdma-core/package.py b/var/spack/repos/builtin/packages/rdma-core/package.py index 6548b0670c..5448a969ad 100644 --- a/var/spack/repos/builtin/packages/rdma-core/package.py +++ b/var/spack/repos/builtin/packages/rdma-core/package.py @@ -34,6 +34,7 @@ class RdmaCore(CMakePackage): version('17.1', '1d19caf554f815990af5c21356ac4d3a') version('13', '6b072b4307d1cfe45eba4373f68e2927') + depends_on('pkgconfig', type='build') depends_on('libnl') conflicts('platform=darwin', msg='rdma-core requires FreeBSD or Linux') -- cgit v1.2.3-70-g09d2 From 301643bdc463d023ecdbe5c0151da8b6f4035256 Mon Sep 17 00:00:00 2001 From: Miles Perry <37849532+Miles-Perry@users.noreply.github.com> Date: Fri, 14 Sep 2018 19:24:17 -0500 Subject: Feature/py picrust (#9184) --- var/spack/repos/builtin/packages/py-picrust/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-picrust/package.py b/var/spack/repos/builtin/packages/py-picrust/package.py index dff2e89619..05c17edafe 100644 --- a/var/spack/repos/builtin/packages/py-picrust/package.py +++ b/var/spack/repos/builtin/packages/py-picrust/package.py @@ -34,7 +34,7 @@ class PyPicrust(PythonPackage): version('1.1.3', sha256='7538c8544899b8855deb73a2d7a4ccac4808ff294e161530a8c8762d472d8906') - depends_on('python@2.7.15:2.999', type=('build', 'run')) + depends_on('python@2.7:2.999', type=('build', 'run')) depends_on('py-cogent@1.5.3', type=('build', 'run')) depends_on('py-biom-format@2.1.4:2.1.999', type=('build', 'run')) depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From 3f9fc0f765fdb4995775eaeea63d2f0b4f47e0e0 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Fri, 14 Sep 2018 22:11:34 -0500 Subject: breakdancer: fix several issues (#9251) * add perl dependencies * put bam2cfg in path * fix perl dir --- .../repos/builtin/packages/breakdancer/package.py | 33 +++++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/breakdancer/package.py b/var/spack/repos/builtin/packages/breakdancer/package.py index 570fd76230..d9d1236ea5 100644 --- a/var/spack/repos/builtin/packages/breakdancer/package.py +++ b/var/spack/repos/builtin/packages/breakdancer/package.py @@ -26,8 +26,8 @@ from spack import * class Breakdancer(CMakePackage): - """BreakDancer-1.3.6, released under GPLv3, is a Cpp package that provides - genome-wide detection of structural variants from next generation + """BreakDancer-1.3.6, released under GPLv3, is a perl/Cpp package that + provides genome-wide detection of structural variants from next generation paired-end sequencing reads. It includes two complementary programs. BreakDancerMax predicts five types of structural variants: insertions, deletions, inversions, inter- and intra-chromosomal translocations from @@ -37,10 +37,35 @@ class Breakdancer(CMakePackage): 100bp) using normally mapped read pairs..""" homepage = "http://gmt.genome.wustl.edu/packages/breakdancer" - git = "https://github.com/genome/breakdancer.git" + url = "https://github.com/genome/breakdancer/archive/v1.4.5.tar.gz" - version('master', submodules='true') + version('1.4.5', sha256='5d74f3a90f5c69026ebb4cf4cb9ccc51ec8dd49ac7a88595a1efabd5a73e92b6') + version('master', submodules='true', + git='https://github.com/genome/breakdancer.git', preferred=True) + + phases = ['edit', 'cmake', 'build', 'install'] depends_on('zlib') + depends_on('perl-statistics-descriptive', type='run') + depends_on('perl-math-cdf', type='run') + depends_on('perl-gd-graph', type='run') + depends_on('perl-gdgraph-histogram', type='run') + depends_on('perl-list-moreutils', type='run') + depends_on('perl-exporter-tiny', type='run') + + # TODO: remove git submodules, and depend on boost & samtools + parallel = False + + def setup_environment(self, spack_env, run_env): + # get the perl tools in the path + run_env.prepend_path('PATH', self.prefix.lib) + + def edit(self, spec, prefix): + # perl tools end up in a silly lib subdirectory, fixing that + filter_file(r'set\(SUPPORT_LIBDIR lib\/breakdancer-max\$ \ + \{EXE_VERSION_SUFFIX\}\)', + 'set(SUPPORT_LIBDIR lib)', + join_path(self.stage.source_path, + 'perl', 'CMakeLists.txt')) -- cgit v1.2.3-70-g09d2 From 4942237278c0e4f24e13625155b3e852b51da679 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Sat, 15 Sep 2018 09:06:16 -0500 Subject: gdb: add lzma support by default (#9247) This is required at least on RedHat/Fedora. Many (most?) other people distribute gdb with this support enabled: http://tomszilagyi.github.io/2018/03/Remote-gdb-with-stl-pp https://bugzilla.redhat.com/show_bug.cgi?id=1596490 --- var/spack/repos/builtin/packages/gdb/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gdb/package.py b/var/spack/repos/builtin/packages/gdb/package.py index e5336c2910..5dcb307331 100644 --- a/var/spack/repos/builtin/packages/gdb/package.py +++ b/var/spack/repos/builtin/packages/gdb/package.py @@ -47,7 +47,7 @@ class Gdb(AutotoolsPackage): version('7.8.2', '8b0ea8b3559d3d90b3ff4952f0aeafbc') variant('python', default=True, description='Compile with Python support') - variant('xz', default=False, description='Compile with lzma support') + variant('xz', default=True, description='Compile with lzma support') # Required dependency depends_on('texinfo', type='build') -- cgit v1.2.3-70-g09d2 From b3bdf92f266b89d50eae236e8d5e20d258ce2825 Mon Sep 17 00:00:00 2001 From: toffer93 Date: Sat, 15 Sep 2018 16:40:50 +0200 Subject: changed to new install_tree formalism (#9181) --- .../builtin/packages/dotnet-core-sdk/package.py | 53 ++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 var/spack/repos/builtin/packages/dotnet-core-sdk/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dotnet-core-sdk/package.py b/var/spack/repos/builtin/packages/dotnet-core-sdk/package.py new file mode 100644 index 0000000000..d89f451f33 --- /dev/null +++ b/var/spack/repos/builtin/packages/dotnet-core-sdk/package.py @@ -0,0 +1,53 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from os import symlink +from spack import * + + +class DotnetCoreSdk(Package): + """The .NET Core SDK is a powerful development environment to write + applications for all types of infrastructure.""" + + homepage = "https://www.microsoft.com/net/" + url = "https://github.com/dotnet/core/" + + version('2.1.300', + url='https://download.microsoft.com/download/8/8/5/88544F33-836A' + '-49A5-8B67-451C24709A8F/dotnet-sdk-2.1.300-linux-x64.tar.gz', + sha224='80a6bfb1db5862804e90f819c1adeebe3d624eae0d6147e5d6694333' + 'f0458afd7d34ce73623964752971495a310ff7fcc266030ce5aef82d5de' + '7293d94d13770') + + variant('telemetry', default=False, + description='allow collection of telemetry data') + + def setup_environment(self, spack_env, run_env): + if '-telemetry' in self.spec: + spack_env.set('DOTNET_CLI_TELEMETRY_OPTOUT', 1) + + def install(self, spec, prefix): + mkdirp('bin') + symlink('../dotnet', 'bin/dotnet') + install_tree(".", prefix) -- cgit v1.2.3-70-g09d2 From 50378c15a9fdbfee6c046e9b1a90c7f161a85721 Mon Sep 17 00:00:00 2001 From: Pramod Kumbhar Date: Sun, 16 Sep 2018 02:42:45 +0200 Subject: Update rdma-core : new version and conflict with intel (#9255) * Update rdma-core : new version and conflict with intel * address review comments --- var/spack/repos/builtin/packages/rdma-core/package.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/rdma-core/package.py b/var/spack/repos/builtin/packages/rdma-core/package.py index 5448a969ad..22307be6cb 100644 --- a/var/spack/repos/builtin/packages/rdma-core/package.py +++ b/var/spack/repos/builtin/packages/rdma-core/package.py @@ -31,12 +31,14 @@ class RdmaCore(CMakePackage): homepage = "https://github.com/linux-rdma/rdma-core" url = "https://github.com/linux-rdma/rdma-core/releases/download/v17.1/rdma-core-17.1.tar.gz" - version('17.1', '1d19caf554f815990af5c21356ac4d3a') - version('13', '6b072b4307d1cfe45eba4373f68e2927') + version('20', sha256='bc846989f807cd2b03643927d2b99fbf6f849cb1e766ab49bc9e81ce769d5421') + version('17.1', sha256='7f5ca9715dce922404851f6ca648399d3dfc3fc2789296f27e94bd2299c68aff') + version('13', sha256='e5230fd7cda610753ad1252b40a28b1e9cf836423a10d8c2525b081527760d97') depends_on('pkgconfig', type='build') depends_on('libnl') conflicts('platform=darwin', msg='rdma-core requires FreeBSD or Linux') + conflicts('%intel', msg='rdma-core cannot be built with intel (use gcc instead)') def cmake_args(self): cmake_args = ["-DCMAKE_INSTALL_SYSCONFDIR=" + -- cgit v1.2.3-70-g09d2 From f9aed03e83ceea3ce8abfaf22863d8fca8b2c017 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Sun, 16 Sep 2018 21:03:26 +0100 Subject: coinhsl: add @2015.06.23, explain versions, SHA256 (#9258) --- var/spack/repos/builtin/packages/coinhsl/package.py | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/coinhsl/package.py b/var/spack/repos/builtin/packages/coinhsl/package.py index b396727713..8b4ab7d613 100644 --- a/var/spack/repos/builtin/packages/coinhsl/package.py +++ b/var/spack/repos/builtin/packages/coinhsl/package.py @@ -44,8 +44,25 @@ class Coinhsl(AutotoolsPackage): homepage = "http://www.hsl.rl.ac.uk/ipopt/" url = "file://{0}/coinhsl-archive-2014.01.17.tar.gz".format(os.getcwd()) - version('2014.01.17', '9eb3dd40ed034814ed8dfee75b281180c1d9d2ae') - version('2014.01.10', '7c2be60a3913b406904c66ee83acdbd0709f229b652c4e39ee5d0876f6b2e907', + # CoinHSL has a few versions that vary with respect to stability/features + # and licensing terms. + + # Version 2015.06.23 is a full-featured "release candidate" + # version available via an "academic license" that can be used for + # personal teaching and research purposes only. For a full list of + # conditions, see http://www.hsl.rl.ac.uk/academic.html. + version('2015.06.23', sha256='3e955a2072f669b8f357ae746531b37aea921552e415dc219a5dd13577575fb3') + + # Version 2014.01.17 is a full-featured "stable" version available + # via an "academic license" that can be used for personal teaching + # and research purposes only. + version('2014.01.17', sha256='ed49fea62692c5d2f928d4007988930da9ff9a2e944e4c559d028671d122437b') + + # Version 2014.01.10 only has MA27, MA28, and MC19, and is + # available as a "personal license" that is free to all, and + # permits commercial use, but *not redistribution* (emphasis from + # original source). + version('2014.01.10', sha256='7c2be60a3913b406904c66ee83acdbd0709f229b652c4e39ee5d0876f6b2e907', preferred=True) # CoinHSL fails to build in parallel -- cgit v1.2.3-70-g09d2 From 842d75433830f0f07498c0c9b6f88e24654c0c9d Mon Sep 17 00:00:00 2001 From: Douglas Duckworth Date: Sun, 16 Sep 2018 16:44:33 -0400 Subject: star - added latest versions with shasum (#9257) * star - added latest versions with shasum * star - added latest versions with shasum --- var/spack/repos/builtin/packages/star/package.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/star/package.py b/var/spack/repos/builtin/packages/star/package.py index a9a65a28b6..270be180a0 100644 --- a/var/spack/repos/builtin/packages/star/package.py +++ b/var/spack/repos/builtin/packages/star/package.py @@ -29,12 +29,19 @@ class Star(Package): """STAR is an ultrafast universal RNA-seq aligner.""" homepage = "https://github.com/alexdobin/STAR" - url = "https://github.com/alexdobin/STAR/archive/2.6.1a.tar.gz" + url = "https://github.com/alexdobin/STAR/archive/2.6.1b.tar.gz" - version('2.6.1a', '1ebaac553809c20900e0b42aadf75cc6') - version('2.5.3a', 'baf8d1b62a50482cfa13acb7652dc391') - version('2.4.2a', '8b9345f2685a5ec30731e0868e86d506', - url='https://github.com/alexdobin/STAR/archive/STAR_2.4.2a.tar.gz') + version('2.6.1b', sha256='1bba5b26c1e6e9a7aca8473a99dbf37bad1dbdd0a589402448e278553bb6b3da') + version('2.6.1a', sha256='dc87357211432c05123ce49966aae712dec590cbe27c1fd0193c3aeb8d4abe4b') + version('2.6.0c', sha256='bebba6cc72da302429c44c20f3b07bdde6b0ddf33e538a99e297f1d342070387') + version('2.6.0b', sha256='1ebbecbb698a3de95990b35fe386189a2c00b07cd9d2d4e017ab8234e7dc042e') + version('2.6.0a', sha256='a6b0dd1918e1961eebec71e6c7c3c8e632f66d10e0620aa09c0710e2ab279179') + version('2.5.4b', sha256='bfa6ccd3b7b3878155a077a9c15eec5490dffad8e077ac93abe6f9bfa75bb2b4') + version('2.5.4a', sha256='17b02703cdd580c9fd426a14f20712ea252d32a4ded804eef759029b600e3afb') + version('2.5.3a', sha256='2a258e77cda103aa293e528f8597f25dc760cba188d0a7bc7c9452f4698e7c04') + version('2.5.2b', sha256='f88b992740807ab10f2ac3b83781bf56951617f210001fab523f6480d0b546d9') + version('2.5.2a', sha256='2a372d9bcab1dac8d35cbbed3f0ab58291e4fbe99d6c1842b094ba7449d55476') + version('2.4.2a', '8b9345f2685a5ec30731e0868e86d506', url='https://github.com/alexdobin/STAR/archive/STAR_2.4.2a.tar.gz') depends_on('zlib') -- cgit v1.2.3-70-g09d2 From 5135f03c03b01a8cab4c66c01e7854991bf47b49 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Tue, 18 Sep 2018 13:02:03 -0600 Subject: Packages/candle benchmarks (#9266) * candle-benchmarks: added v0.1 * ecp-proxy-apps: v1.0 now depends on candle-benchmarks@0.0 --- var/spack/repos/builtin/packages/candle-benchmarks/package.py | 3 ++- var/spack/repos/builtin/packages/ecp-proxy-apps/package.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/candle-benchmarks/package.py b/var/spack/repos/builtin/packages/candle-benchmarks/package.py index 4d86e18dd4..f36c8df52f 100644 --- a/var/spack/repos/builtin/packages/candle-benchmarks/package.py +++ b/var/spack/repos/builtin/packages/candle-benchmarks/package.py @@ -33,7 +33,8 @@ class CandleBenchmarks(Package): tags = ['proxy-app', 'ecp-proxy-app'] - version('1.0', '6eced30dc15374bc9f90a86d0396e470') + version('0.1', sha256='767f74f43ee3a5d4e0f26750f2a96b8433e25a9cd4f2d29938ac8acf263ab58d') + version('0.0', '6eced30dc15374bc9f90a86d0396e470') variant('mpi', default=True, description='Build with MPI support') diff --git a/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py b/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py index 6dc23ed2c3..cc3a45849a 100644 --- a/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py +++ b/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py @@ -47,7 +47,7 @@ class EcpProxyApps(Package): depends_on('examinimd@1.0', when='@1.1:') depends_on('amg@1.0', when='@1.0:') - depends_on('candle-benchmarks@1.0', when='@1.0:') + depends_on('candle-benchmarks@0.0', when='@1.0:') depends_on('laghos@1.0', when='@1.0:') depends_on('macsio@1.0', when='@1.0:') depends_on('miniamr@1.4.0', when='@1.0:') -- cgit v1.2.3-70-g09d2 From 41de79a1b6da68797318e70b9072a528951ebbe1 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Tue, 18 Sep 2018 14:07:37 -0600 Subject: xsbench: added v18 (#9269) --- var/spack/repos/builtin/packages/xsbench/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/xsbench/package.py b/var/spack/repos/builtin/packages/xsbench/package.py index c735826f36..b46c828ba0 100644 --- a/var/spack/repos/builtin/packages/xsbench/package.py +++ b/var/spack/repos/builtin/packages/xsbench/package.py @@ -37,6 +37,7 @@ class Xsbench(MakefilePackage): tags = ['proxy-app', 'ecp-proxy-app'] + version('18', sha256='a9a544eeacd1be8d687080d2df4eeb701c04eda31d3806e7c3ea1ff36c26f4b0') version('14', '94d5d28eb031fd4ef35507c9c1862169') version('13', '72a92232d2f5777fb52f5ea4082aff37') -- cgit v1.2.3-70-g09d2 From 21884d804f37788e9b64061b6f2e56642e7e9a74 Mon Sep 17 00:00:00 2001 From: Howard Pritchard Date: Tue, 18 Sep 2018 17:26:34 -0600 Subject: libhio: add patch for 1.4.1.2 release (#9270) Turns out that there was a configury problem in libhio which caused issues building the package on non-cray systems, aka when using mpicc and friends. Signed-off-by: Howard Pritchard --- ...fix-for-spack-to-work-on-non-cray-systems.patch | 31 ++++++++++++++++++++++ var/spack/repos/builtin/packages/libhio/package.py | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 var/spack/repos/builtin/packages/libhio/0001-spack-fix-for-spack-to-work-on-non-cray-systems.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libhio/0001-spack-fix-for-spack-to-work-on-non-cray-systems.patch b/var/spack/repos/builtin/packages/libhio/0001-spack-fix-for-spack-to-work-on-non-cray-systems.patch new file mode 100644 index 0000000000..f9b8b8e163 --- /dev/null +++ b/var/spack/repos/builtin/packages/libhio/0001-spack-fix-for-spack-to-work-on-non-cray-systems.patch @@ -0,0 +1,31 @@ +From f6f806c2ea46866c9490d2d2ddc3f119666d26d4 Mon Sep 17 00:00:00 2001 +From: Howard Pritchard +Date: Mon, 17 Sep 2018 05:05:01 -0600 +Subject: [PATCH] spack: fix for spack to work on non-cray systems + +or when one wants to use Open MPI on a cray system with spack. +The problem is that when using an MPI with spack, its going to +use a long value for the CC and CXX variables. This confused +the libhio configury, resulting in it being built without mpi +support, leading to failure of xexec to properly compile, etc. + +This commit fixes that problem. + +Signed-off-by: Howard Pritchard + +diff --git a/configure.ac b/configure.ac +index afab5553..62d35c85 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -37,7 +37,7 @@ if ( test -n "$XTOS_VERSION" || test -n "$CRAYPE_DIR" ) && (test -z $CC || test + if test ! -n "$LD" ; then + LD=ld + fi +-elif test ${MPICC} = "mpicc" ; then ++elif test -n "$MPICC" ; then + CC=${MPICC} + CXX=${MPICXX} + hio_use_mpi=1 +-- +1.8.3.1 + diff --git a/var/spack/repos/builtin/packages/libhio/package.py b/var/spack/repos/builtin/packages/libhio/package.py index ff5f28202e..fec5242d5c 100644 --- a/var/spack/repos/builtin/packages/libhio/package.py +++ b/var/spack/repos/builtin/packages/libhio/package.py @@ -64,6 +64,7 @@ class Libhio(AutotoolsPackage): # patch('0001-configury-fix-a-problem-with-bz2-configury.patch', when="@1.4.1.0") patch('0001-hdf5-make-docs-optional.patch', when="@1.4.1.0") + patch('0001-spack-fix-for-spack-to-work-on-non-cray-systems.patch', when="@1.4.1.2") def autoreconf(self, spec, prefix): autoreconf = which('autoreconf') @@ -76,4 +77,5 @@ class Libhio(AutotoolsPackage): args.append('--with-external_bz2={0}'.format(spec['bzip2'].prefix)) if '+hdf5' in spec: args.append('--with-hdf5={0}'.format(spec['hdf5'].prefix)) + return args -- cgit v1.2.3-70-g09d2 From d14971b06109d97add4b62ffe2dee00c3916ba8a Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Tue, 18 Sep 2018 20:39:07 -0500 Subject: new package: rclone (#9268) --- var/spack/repos/builtin/packages/rclone/package.py | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 var/spack/repos/builtin/packages/rclone/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/rclone/package.py b/var/spack/repos/builtin/packages/rclone/package.py new file mode 100644 index 0000000000..8ae8c91d4e --- /dev/null +++ b/var/spack/repos/builtin/packages/rclone/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Rclone(Package): + """Rclone is a command line program to sync files and directories + to and from various cloud storage providers""" + + homepage = "http://rclone.org" + url = "https://github.com/ncw/rclone/releases/download/v1.43/rclone-v1.43.tar.gz" + + version('1.43', sha256='d30527b00cecb4e5e7188dddb78e5cec62d67cf2422dab82190db58512b5a4e3') + + depends_on("go", type='build') + + def install(self, spec, prefix): + go('build') + mkdirp(prefix.bin) + install('rclone', prefix.bin) -- cgit v1.2.3-70-g09d2 From c971f6f1ebff8f263ff17ac9dbd777e664e37ed9 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Wed, 19 Sep 2018 02:48:53 +0100 Subject: apple-libunwind: update path to library (#9265) --- .../builtin/packages/apple-libunwind/package.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/apple-libunwind/package.py b/var/spack/repos/builtin/packages/apple-libunwind/package.py index 1aacf98c2b..b77301359a 100644 --- a/var/spack/repos/builtin/packages/apple-libunwind/package.py +++ b/var/spack/repos/builtin/packages/apple-libunwind/package.py @@ -66,10 +66,24 @@ class AppleLibunwind(Package): @property def libs(self): - """ Export the Apple libunwind library + """Export the Apple libunwind library. The Apple libunwind library + cannot be linked to directly using an absolute path; doing so + will cause the linker to throw an error 'cannot link directly + with /usr/lib/system/libunwind.dylib' and the linker will + suggest linking with System.framework instead. Linking to this + framework is equivalent to linking with libSystem.dylib, which + can be confirmed on a macOS system by executing at a terminal + the command `ls -l + /System/Library/Frameworks/System.Framework` -- the file + "System" is a symlink to `/usr/lib/libSystem.B.dylib`, and + `/usr/lib/libSystem.dylib` also symlinks to this file. + + Running `otool -L /usr/lib/libSystem.dylib` confirms that + it will link dynamically to `/usr/lib/system/libunwind.dylib`. + """ - libs = find_libraries('libunwind', - join_path(self.prefix.lib, 'system'), + libs = find_libraries('libSystem', + self.prefix.lib, shared=True, recursive=False) if libs: return libs -- cgit v1.2.3-70-g09d2 From 3f04ebf6007fd55babe7b89bce77016d728ebdf2 Mon Sep 17 00:00:00 2001 From: Geoffrey Lentner Date: Tue, 18 Sep 2018 21:49:52 -0400 Subject: hadoop package: fix url and checksum (#9263) --- var/spack/repos/builtin/packages/hadoop/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hadoop/package.py b/var/spack/repos/builtin/packages/hadoop/package.py index 013f1ebcbf..59dbded641 100644 --- a/var/spack/repos/builtin/packages/hadoop/package.py +++ b/var/spack/repos/builtin/packages/hadoop/package.py @@ -32,9 +32,9 @@ class Hadoop(Package): """ homepage = "http://hadoop.apache.org/" - url = "http://mirrors.ocf.berkeley.edu/apache/hadoop/common/hadoop-2.9.0/hadoop-2.9.0.tar.gz" + url = "http://mirrors.ocf.berkeley.edu/apache/hadoop/common/hadoop-3.1.1/hadoop-3.1.1.tar.gz" - version('3.1.0', 'f036ebd3fa0ef66ee1819e351d15b6cb') + version('3.1.1', '0b6ab06b59ae75f433de387783f19011') version('2.9.0', 'b443ead81aa2bd5086f99e62e66a8f64') depends_on('java', type='run') -- cgit v1.2.3-70-g09d2 From 467d501060dbad60584a310ab75d9c85778b1ee6 Mon Sep 17 00:00:00 2001 From: sknigh Date: Tue, 18 Sep 2018 19:06:13 -0700 Subject: sst-macro package: add versions and variants (#9271) Added variants for: mpi support, clang skeletonizer, building as static and/or shared, and more. --- .../repos/builtin/packages/sst-macro/package.py | 71 +++++++++++++++++----- 1 file changed, 55 insertions(+), 16 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sst-macro/package.py b/var/spack/repos/builtin/packages/sst-macro/package.py index 20da0481af..9722e30f36 100644 --- a/var/spack/repos/builtin/packages/sst-macro/package.py +++ b/var/spack/repos/builtin/packages/sst-macro/package.py @@ -22,40 +22,79 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## -# -# Author: Samuel Knight -# Date: Feb 3, 2017 -# from spack import * class SstMacro(AutotoolsPackage): - """The SST/macro software package provides a simulator for large-scale - parallel computer architectures for the coarse-grained study of - distributed-memory applications. The simulator is driven from either a + """The Structural Simulation Toolkit Macroscale Element Library simulates + large-scale parallel computer architectures for the coarse-grained study + of distributed-memory applications. The simulator is driven from either a trace file or skeleton application. SST/macro's modular architecture can - be extended with additional network models, trace file formats, - software services, and processor models. + be extended with additional network models, trace file formats, software + services, and processor models. """ homepage = "http://sst.sandia.gov/about_sstmacro.html" url = "https://github.com/sstsimulator/sst-macro/releases/download/v6.1.0_Final/sstmacro-6.1.0.tar.gz" git = "https://github.com/sstsimulator/sst-macro.git" - version('master', branch='master') + version('develop', branch='devel') + version('8.0.0', sha256='8618a259e98ede9a1a2ce854edd4930628c7c5a770c3915858fa840556c1861f') version('6.1.0', '98b737be6326b8bd711de832ccd94d14') - depends_on('boost@1.59:') - depends_on('autoconf@1.68:', type='build', when='@master') - depends_on('automake@1.11.1:', type='build', when='@master') - depends_on('libtool@1.2.4:', type='build', when='@master') - depends_on('m4', type='build', when='@master') + depends_on('boost@1.59:', when='@:6.1.0') + + depends_on('autoconf@1.68:', type='build', when='@develop') + depends_on('automake@1.11.1:', type='build', when='@develop') + depends_on('libtool@1.2.4:', type='build', when='@develop') + depends_on('m4', type='build', when='@develop') + + depends_on('binutils', type='build') + depends_on('zlib', type=('build', 'link')) + depends_on('otf2', when='+otf2') + depends_on('llvm+clang@:5.99.99', when='+skeletonizer') + depends_on('mpi', when='+mpi') + + variant('otf2', default=False, description='Enable OTF2 trace emission and replay support') + variant('skeletonizer', default=False, description='Enable Clang source-to-source autoskeletonization') + variant('threaded', default=False, description='Enable thread-parallel PDES simulation') + variant('mpi', default=True, description='Enable distributed PDES simulation') + variant('static', default=True, description='Build static libraries') + variant('shared', default=True, description='Build shared libraries') @run_before('autoreconf') def bootstrap(self): - if '@master' in self.spec: + if '@develop' in self.spec: Executable('./bootstrap.sh')() def configure_args(self): args = ['--disable-regex'] + + # Set CFLAGS and CXXFLAGS so they won't automatically insert '-g' + env['CFLAGS'] = '-O2' + env['CXXFLAGS'] = '-O2' + + spec = self.spec + args.append( + '--enable-static=%s' % ('yes' if '+static' in spec else 'no')) + args.append( + '--enable-shared=%s' % ('yes' if '+shared' in spec else 'no')) + + if spec.satisfies("@8.0.0:"): + args.extend([ + '--%sable-otf2' % ('en' if '+otf2' in spec else 'dis'), + '--%sable-multithread' % ( + 'en' if '+threaded' in spec else 'dis') + ]) + + if '+skeletonizer' in spec: + args.append('--with-clang=' + spec['llvm'].prefix) + + # Optional MPI support + if '+mpi' in spec: + env['CC'] = spec['mpi'].mpicc + env['CXX'] = spec['mpi'].mpicxx + env['F77'] = spec['mpi'].mpif77 + env['FC'] = spec['mpi'].mpifc + return args -- cgit v1.2.3-70-g09d2 From 133dd7a4ac7b621df9d2296ec933c2b44bcac3ed Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Tue, 18 Sep 2018 21:29:18 -0500 Subject: Fix version parsing for cistem package (#9260) Adds 'code' to the list of suffixes that are excluded from version parsing of URLs, such that if a URL contains the string 'cistem-1.0.0-beta-source-code', a version X will substitute in to produce a URL with cistem-X-source-code ('source' was already excluded). The 'cistem' package version is updated to make use of this (and fix a fetching bug with the cistem package). A unit test is added to check this parsing case. --- lib/spack/spack/test/url_parse.py | 2 ++ lib/spack/spack/url.py | 1 + var/spack/repos/builtin/packages/cistem/package.py | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/lib/spack/spack/test/url_parse.py b/lib/spack/spack/test/url_parse.py index 4a3550149d..9603a91213 100644 --- a/lib/spack/spack/test/url_parse.py +++ b/lib/spack/spack/test/url_parse.py @@ -43,6 +43,8 @@ from spack.version import Version ('jpegsrc.v9b', 'jpegsrc.v9b'), ('turbolinux702', 'turbolinux702'), ('converge_install_2.3.16', 'converge_install_2.3.16'), + # Download type - code, source + ('cistem-1.0.0-beta-source-code', 'cistem-1.0.0-beta'), # Download type - src ('apache-ant-1.9.7-src', 'apache-ant-1.9.7'), ('go1.7.4.src', 'go1.7.4'), diff --git a/lib/spack/spack/url.py b/lib/spack/spack/url.py index ed3867ba7b..ddcfe9c17e 100644 --- a/lib/spack/spack/url.py +++ b/lib/spack/spack/url.py @@ -169,6 +169,7 @@ def strip_version_suffixes(path): # Download type '[Ii]nstall', 'all', + 'code', 'src(_0)?', '[Ss]ources?', 'file', diff --git a/var/spack/repos/builtin/packages/cistem/package.py b/var/spack/repos/builtin/packages/cistem/package.py index 75a2dd30a9..b7e6e31bfa 100644 --- a/var/spack/repos/builtin/packages/cistem/package.py +++ b/var/spack/repos/builtin/packages/cistem/package.py @@ -34,7 +34,7 @@ class Cistem(AutotoolsPackage): homepage = "https://cistem.org/" url = "https://cistem.org/system/tdf/upload3/cistem-1.0.0-beta-source-code.tar.gz?file=1&type=cistem_details&id=37&force=0" - version('1.0.0', '479f395b30ad630df3cbba9c56eb29c2') + version('1.0.0-beta', '479f395b30ad630df3cbba9c56eb29c2') depends_on('wx@3.0.2') depends_on('fftw') -- cgit v1.2.3-70-g09d2 From 7b2b2fb96957b9ea94ddb0656fd047724564f31d Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Wed, 19 Sep 2018 13:30:28 -0600 Subject: sw4lite: add v1.1 (#9289) --- var/spack/repos/builtin/packages/sw4lite/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sw4lite/package.py b/var/spack/repos/builtin/packages/sw4lite/package.py index d6358f98a9..c3622e2c90 100644 --- a/var/spack/repos/builtin/packages/sw4lite/package.py +++ b/var/spack/repos/builtin/packages/sw4lite/package.py @@ -37,6 +37,7 @@ class Sw4lite(MakefilePackage): git = "https://github.com/geodynamics/sw4lite.git" version('develop', branch='master') + version('1.1', sha256='34b5f7b56f9e40474c14abebcaa024192de018de6beb6dafee53d3db5b07c6d3') version('1.0', '3d911165f4f2ff6d5f9c1bd56ab6723f') variant('openmp', default=True, description='Build with OpenMP support') -- cgit v1.2.3-70-g09d2 From 9e2ff95ec5ce62d7ed4e55168d313322930931d6 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Thu, 20 Sep 2018 15:55:18 +0200 Subject: Catch2: 2.3.0+ (#9300) * Catch2: 2.3.0+ Add the latest two releases of Catch2. In 2.3.0+, the include changed to a future-proof `` path which dependent projects will break upon. * openPMD-api: Catch2 2.3.0+ openPMD-api just updated to use the new, future-proof Catch2 headers ``. --- var/spack/repos/builtin/packages/catch/package.py | 3 +++ var/spack/repos/builtin/packages/openpmd-api/package.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/catch/package.py b/var/spack/repos/builtin/packages/catch/package.py index fdb8c09bd9..261b3952e5 100644 --- a/var/spack/repos/builtin/packages/catch/package.py +++ b/var/spack/repos/builtin/packages/catch/package.py @@ -39,6 +39,9 @@ class Catch(CMakePackage): # - CMake config package was added in 2.1.2 conflicts('~single_header', when='@:1.6.1') + version('2.4.0', sha256='ab176de36b886a33aa745fcf34642eac853bf677bda518a88655dc750c72d756') + version('2.3.0', sha256='aaf6bbf81ce8522131bae2ea4d013a77b003bbb2017614f5872d5787687f8f5f') + # releases 2.3.0+ changed to "catch2/catch.hpp" header version('2.2.1', '54e56803c84890636bd7fe6c3856b104') version('2.1.0', '70b44068976d46d48f3cd8796f675691d3bc726b') version('2.0.1', '5c191a031edebd0525640ed2f38cbf64bacb1803') diff --git a/var/spack/repos/builtin/packages/openpmd-api/package.py b/var/spack/repos/builtin/packages/openpmd-api/package.py index cfb77bfcf4..45fb7cbf26 100644 --- a/var/spack/repos/builtin/packages/openpmd-api/package.py +++ b/var/spack/repos/builtin/packages/openpmd-api/package.py @@ -50,7 +50,7 @@ class OpenpmdApi(CMakePackage): depends_on('cmake@3.10.0:', type='build') depends_on('mpark-variant@1.3.0:') - depends_on('catch@2.2.1: ~single_header', type='test') + depends_on('catch@2.3.0: ~single_header', type='test') depends_on('mpi@2.3:', when='+mpi') # might become MPI 3.0+ depends_on('hdf5@1.8.13:', when='+hdf5') depends_on('hdf5@1.8.13: ~mpi', when='~mpi +hdf5') -- cgit v1.2.3-70-g09d2 From 2bc895083b9b14fe24d3055c71902767c26f89bb Mon Sep 17 00:00:00 2001 From: sknigh Date: Thu, 20 Sep 2018 08:21:42 -0700 Subject: Added llvm 7.0.0 (#9296) --- var/spack/repos/builtin/packages/llvm/package.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index 3be612fecc..9999b79136 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -182,6 +182,22 @@ class Llvm(CMakePackage): 'libunwind': 'http://llvm.org/svn/llvm-project/libunwind/trunk', } }, + { + 'version': '7.0.0', + 'md5': 'e0140354db83cdeb8668531b431398f0', + 'resources': { + 'compiler-rt': '3b759c47076298363f4443395e0e51c1', + 'openmp': '8800aac08f2f9dad0ebf66e0e152bd63', + 'polly': 'ff689bbfdca3ea812d195f60e63d8346', + 'libcxx': '5ef835bf8c9f49611af4d5f3362d9658', + 'libcxxabi': 'f04adafa019f4f5cce9550007da251c1', + 'cfe': '2ac5d8d78be681e31611c5e546e11174', + 'clang-tools-extra': 'e98b37a5911cd556775cba0868a56981', + 'lldb': '76338963b3ccc4f9dccc923716207310', + 'lld': '5eb148c3064acff71d8e5856163c8323', + 'libunwind': 'e585a3e4ae6045f2561bc8a8fcd0bfbb' + } + }, { 'version': '6.0.1', 'md5': 'c88c98709300ce2c285391f387fecce0', -- cgit v1.2.3-70-g09d2 From 72be5c86faefe249bdebaae9e6b82c8e91f92a12 Mon Sep 17 00:00:00 2001 From: Andrew Gaspar Date: Thu, 20 Sep 2018 09:53:15 -0600 Subject: Add newer versions of spdlog (#9290) --- var/spack/repos/builtin/packages/spdlog/package.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/spdlog/package.py b/var/spack/repos/builtin/packages/spdlog/package.py index b239fb896f..bcd369c9d0 100644 --- a/var/spack/repos/builtin/packages/spdlog/package.py +++ b/var/spack/repos/builtin/packages/spdlog/package.py @@ -31,6 +31,16 @@ class Spdlog(CMakePackage): homepage = "https://github.com/gabime/spdlog" url = "https://github.com/gabime/spdlog/archive/v0.9.0.tar.gz" + version('1.1.0', sha256='3dbcbfd8c07e25f5e0d662b194d3a7772ef214358c49ada23c044c4747ce8b19') + version('1.0.0', sha256='90d5365121bcd2c41ce94dfe6a460e89507a2dfef6133fe5fad5bb35ac4ef0a1') + version('0.17.0', sha256='94f74fd1b3344733d1db3de2ec22e6cbeb769f93a8baa0d4a22b1f62dc7369f8') + version('0.16.3', sha256='b88d7be261d9089c817fc8cee6c000d69f349b357828e4c7f66985bc5d5360b8') + version('0.16.2', sha256='2081e5df5e87402398847431e16b87c71dd5c4d632314bb976ace8161f4d32de') + version('0.16.1', sha256='733260e1fbdcf1b3dc307fc585e4476240026de8be28eb905731d2ab0942deae') + version('0.16.0', sha256='9e64e3b10c2a3c54dfff63aa056057cf1db8a5fd506b3d9cf77207511820baac') + version('0.14.0', sha256='eb5beb4e53f4bfff5b32eb4db8588484bdc15a17b90eeefef3a9fc74fec1d83d') + version('0.13.0', sha256='d798a6ca19165f0a18a43938859359269f5a07fd8e0eb83ab8674739c9e8f361') + version('0.12.0', sha256='5cfd6a0b3182a88e1eb35bcb65a7ef9035140d7c73b16ba6095939dbf07325b9') version('0.11.0', '08232203f18a6f9ff47e083cc7a141a050805d3b') version('0.10.0', '57b471ef97a23cc29c38b62e00e89a411a87ea7f') version('0.9.0', 'dda741ef8e12d57d91f778d85e95a27d84a82ac4') -- cgit v1.2.3-70-g09d2 From 2656ed63eb488b6450829fb1abd8fd4a08ad0f35 Mon Sep 17 00:00:00 2001 From: rvinaybharadwaj Date: Fri, 21 Sep 2018 13:04:39 -0600 Subject: Spack package for Ember (#9292) --- var/spack/repos/builtin/packages/ember/package.py | 102 ++++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 var/spack/repos/builtin/packages/ember/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ember/package.py b/var/spack/repos/builtin/packages/ember/package.py new file mode 100644 index 0000000000..1f038b9545 --- /dev/null +++ b/var/spack/repos/builtin/packages/ember/package.py @@ -0,0 +1,102 @@ +############################################################################## +# Copyright (c) 2018, Los Alamos National Security, LLC. +# Produced at the Los Alamos National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Ember(MakefilePackage): + """ + Ember Communication Pattern Library + The Ember suite provides communication patterns in a simplified setting + (simplified by the removal of application calculations, control flow, + etc.). + """ + + tags = ['proxy-app', 'ecp-proxy-app'] + + homepage = "http://sst-simulator.org/SSTPages/SSTElementEmber/" + git = "https://github.com/sstsimulator/ember.git" + url = "https://github.com/sstsimulator/ember/archive/v1.0.0.tar.gz" + + version('1.0.0', sha256='5b2a6b8055b46ab3ea2c7baabaf4d280d837bb7c21eba0c9f59e092c6fc1c4a6') + + depends_on('mpi') + + # TODO: shmem variant disabled due to lack of shmem spackage + def edit(self, spec, prefix): + file = open('Makefile', 'w') + + file.write('CC = mpicc\n') + file.write('CFLAGS = -O3 -std=c99\n') + file.write('OSHMEM_CC=cc\n') + file.write('OSHMEM_C_FLAGS=-O3 -g\n') + + file.write('export CC CFLAGS OSHMEM_CC OSHMEM_C_FLAGS\n') + + file.write('all:\n') + file.write('\t@$(MAKE) -C mpi/halo3d -f Makefile\n') + file.write('\t@$(MAKE) -C mpi/halo3d-26 -f Makefile\n') + file.write('\t@$(MAKE) -C mpi/incast -f Makefile\n') + file.write('\t@$(MAKE) -C mpi/pingpong -f Makefile\n') + file.write('\t@$(MAKE) -C mpi/sweep3d -f Makefile\n') + # file.write('\t@$(MAKE) -C shmem/hotspotinc -f Makefile\n') + # file.write('\t@$(MAKE) -C shmem/randominc -f Makefile\n') + + file.write('.PHONY: clean\n') + file.write('clean:\n') + file.write('\t@$(MAKE) -C mpi/halo3d -f Makefile clean\n') + file.write('\t@$(MAKE) -C mpi/halo3d-26 -f Makefile clean\n') + file.write('\t@$(MAKE) -C mpi/incast -f Makefile clean\n') + file.write('\t@$(MAKE) -C mpi/pingpong -f Makefile clean\n') + file.write('\t@$(MAKE) -C mpi/sweep3d -f Makefile clean\n') + # file.write('\t@$(MAKE) -C shmem/hotspotinc -f Makefile clean\n') + # file.write('\t@$(MAKE) -C shmem/randominc -f Makefile clean\n') + + file.close() + + @property + def build_targets(self): + targets = [] + cc = self.spec['mpi'].mpicc + cflags = '-O3 -std=c99' + oshmem_cc = 'cc' + oshmem_c_flags = '-O3 -g' + + targets.append('CC = {0}'.format(cc)) + targets.append('CFLAGS = {0}'.format(cflags)) + targets.append('OSHMEM_CC = {0}'.format(oshmem_cc)) + targets.append('OSHMEM_C_FLAGS = {0}'.format(oshmem_c_flags)) + + return targets + + def install(self, spec, prefix): + mkdirp(prefix.doc) + install('README.md', prefix.doc) + install('LICENSE', prefix.doc) + install('README.MPI.halo3d', prefix.doc) + install('README.MPI.halo3d-26', prefix.doc) + install('README.MPI.incast', prefix.doc) + install('README.MPI.sweep3d', prefix.doc) + install('README.SHMEM.hotspotinc', prefix.doc) + install('README.SHMEM.randominc', prefix.doc) -- cgit v1.2.3-70-g09d2 From e227542500b0e357183f12039a371d740e87b3f3 Mon Sep 17 00:00:00 2001 From: rvinaybharadwaj Date: Mon, 24 Sep 2018 11:12:01 -0600 Subject: Spack package for PICSARlite (#9288) --- .../repos/builtin/packages/picsarlite/package.py | 138 +++++++++++++++++++++ 1 file changed, 138 insertions(+) create mode 100644 var/spack/repos/builtin/packages/picsarlite/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/picsarlite/package.py b/var/spack/repos/builtin/packages/picsarlite/package.py new file mode 100644 index 0000000000..2ec14f48f5 --- /dev/null +++ b/var/spack/repos/builtin/packages/picsarlite/package.py @@ -0,0 +1,138 @@ +############################################################################## +# Copyright (c) 2018, Los Alamos National Security, LLC. +# Produced at the Los Alamos National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Picsarlite(MakefilePackage): + """PICSARlite is a self-contained proxy that adequately portrays the + computational loads and dataflow of more complex PIC codes. + """ + + tags = ['proxy-app', 'ecp-proxy-app'] + + homepage = "https://picsar.net" + git = "https://bitbucket.org/berkeleylab/picsar.git" + + version('develop', branch='PICSARlite') + version('0.1', tag='PICSARlite-0.1') + + variant('prod', default=False, + description='Production mode (without FFTW)') + variant('prod_spectral', default=False, + description='Production mode with spectral solver and FFTW') + variant('debug', default=True, + description='Debug mode') + variant('vtune', default=False, + description='Vtune profiling') + variant('sde', default=False, + description='sde profiling') + variant('map', default=False, + description='Allinea Map profiling') + variant('library', default=False, + description='Create static and dynamic library') + + variant('cori2', default=False, + description='Build for cori2') + variant('cori1', default=False, + description='Build for cori1') + variant('edison', default=False, + description='Build for edison') + variant('default', default=True, + description='Default build') + + variant('knl', default=False, + description='Build for knl architecture') + variant('ivy', default=False, + description='Build for ivy bridge architecture') + variant('hsw', default=False, + description='Build for haswell architecture') + variant('host', default=True, + description='Build for the host architecture') + + depends_on('mpi') + depends_on('fftw@3.0: +mpi', when='+prod_spectral') + + @property + def build_targets(self): + targets = [] + serial = '-j1' + targets.append('FC={0}'.format(self.spec['mpi'].mpifc)) + targets.append('CC={0}'.format(self.spec['mpi'].mpicc)) + targets.append(format(serial)) + + comp = 'user' + vendors = {'%gcc': 'gnu', '%intel': 'intel'} + for key, value in vendors.items(): + if self.spec.satisfies(key): + comp = value + targets.append('COMP={0}'.format(comp)) + + if '+prod' in self.spec: + mode = 'prod' + elif '+prod_spectral' in self.spec: + mode = 'prod_spectral' + elif '+debug' in self.spec: + mode = 'debug' + elif '+vtune' in self.spec: + mode = 'vtune' + elif '+sde' in self.spec: + mode = 'sde' + elif '+map' in self.spec: + mode = 'map' + elif '+library' in self.spec: + mode = 'library' + targets.append('MODE = {0}'.format(mode)) + + if '+cori2' in self.spec: + sys = 'cori2' + elif '+cori1' in self.spec: + sys = 'cori1' + elif '+edison' in self.spec: + sys = 'edison' + elif '+default' in self.spec: + sys = 'default' + targets.append('SYS = {0}'.format(sys)) + + if '+knl' in self.spec: + arch = 'knl' + elif '+ivy' in self.spec: + arch = 'ivy' + elif '+hsw' in self.spec: + arch = 'hsw' + elif '+host' in self .spec: + arch = 'host' + targets.append('ARCH = {0}'.format(arch)) + + return targets + + def install(self, spec, prefix): + install_tree('Acceptance_testing', prefix.Acceptance_testing) + install_tree('performance_tests', prefix.performance_tests) + install_tree('examples', prefix.examples) + install_tree('python_module', prefix.python_module) + install_tree('utils', prefix.utils) + mkdirp(prefix.doc) + install('README.md', prefix.doc) + install('license.txt', prefix.doc) -- cgit v1.2.3-70-g09d2 From 82f19f72f756839c8661e521889f60726ddec212 Mon Sep 17 00:00:00 2001 From: Strahinja Trecakov Date: Mon, 24 Sep 2018 12:22:04 -0600 Subject: new versions of r-dplyr,r-plogr,r-rlang (#9313) --- var/spack/repos/builtin/packages/r-dplyr/package.py | 7 +++++-- var/spack/repos/builtin/packages/r-plogr/package.py | 6 ++++-- var/spack/repos/builtin/packages/r-rlang/package.py | 5 +++-- 3 files changed, 12 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-dplyr/package.py b/var/spack/repos/builtin/packages/r-dplyr/package.py index 8abc3883b7..6daee1b182 100644 --- a/var/spack/repos/builtin/packages/r-dplyr/package.py +++ b/var/spack/repos/builtin/packages/r-dplyr/package.py @@ -29,15 +29,18 @@ class RDplyr(RPackage): """A fast, consistent tool for working with data frame like objects, both in memory and out of memory.""" - homepage = "https://github.com/hadley/dplyr" - url = "https://cran.r-project.org/src/contrib/dplyr_0.7.4.tar.gz" + homepage = "https://cran.r-project.org/package=dplyr" + url = "https://cran.r-project.org/src/contrib/dplyr_0.7.6.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/dplyr" + version('0.7.5', sha256='2fbd8f316a59670076d43a0fe854654621941ee5f621ea5f0185a3f5daafda50') version('0.7.4', '9edee9b2db9831c2438054d0d2c1647d') version('0.7.3', 'f9760b796917747e9dcd927ebb531c7d') version('0.5.0', '1fcafcacca70806eea2e6d465cdb94ef') + depends_on('r-tidyselect@0.2.3', type=('build', 'run')) depends_on('r-assertthat', type=('build', 'run')) + depends_on('r-bindr@0.1.1', type=('build', 'run')) depends_on('r-r6', type=('build', 'run')) depends_on('r-rcpp', type=('build', 'run')) depends_on('r-tibble', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-plogr/package.py b/var/spack/repos/builtin/packages/r-plogr/package.py index 146bf7e570..54ab9e00e1 100644 --- a/var/spack/repos/builtin/packages/r-plogr/package.py +++ b/var/spack/repos/builtin/packages/r-plogr/package.py @@ -30,7 +30,9 @@ class RPlogr(RPackage): 'LinkingTo: plogr' to 'DESCRIPTION', and '#include ' in your C++ modules to use it.""" - homepage = "https://cran.r-project.org/web/packages/plogr/index.html" - url = "https://cran.r-project.org/src/contrib/plogr_0.1-1.tar.gz" + homepage = "https://cran.r-project.org/package=plogr" + url = "https://cran.r-project.org/src/contrib/plogr_0.2.0.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/plogr" + + version('0.2.0', sha256='0e63ba2e1f624005fe25c67cdd403636a912e063d682eca07f2f1d65e9870d29') version('0.1-1', '5ee46ed21b5c571d02900219098517c0') diff --git a/var/spack/repos/builtin/packages/r-rlang/package.py b/var/spack/repos/builtin/packages/r-rlang/package.py index 69cd847f93..b04c49a310 100644 --- a/var/spack/repos/builtin/packages/r-rlang/package.py +++ b/var/spack/repos/builtin/packages/r-rlang/package.py @@ -29,10 +29,11 @@ class RRlang(RPackage): """A toolbox for working with base types, core R features like the condition system, and core 'Tidyverse' features like tidy evaluation.""" - homepage = "https://cran.r-project.org/web/packages/rlang/index.html" - url = "https://cran.r-project.org/src/contrib/rlang_0.1.4.tar.gz" + homepage = "https://cran.r-project.org/package=rlang" + url = "https://cran.r-project.org/src/contrib/rlang_0.2.2.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/rlang" + version('0.2.2', 'df2abf3a1936c503ed1edd4350ffb5f0') version('0.1.4', 'daed5104d557c0cbfb4a654ec8ffb579') version('0.1.2', '170f8cf7b61898040643515a1746a53a') version('0.1.1', '38a51a0b8f8487eb52b4f3d986313682') -- cgit v1.2.3-70-g09d2 From 8947b6b909d390c324cd52fce9f6f58bf6ff3d32 Mon Sep 17 00:00:00 2001 From: Strahinja Trecakov Date: Mon, 24 Sep 2018 12:28:05 -0600 Subject: New package: r-animation (#9314) * adding r-animation package --- .../repos/builtin/packages/r-animation/package.py | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-animation/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-animation/package.py b/var/spack/repos/builtin/packages/r-animation/package.py new file mode 100644 index 0000000000..29d865668e --- /dev/null +++ b/var/spack/repos/builtin/packages/r-animation/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RAnimation(RPackage): + """Provides functions for animations in statistics, covering topics + in probability theory, mathematical statistics, multivariate statistics, + non-parametric statistics, sampling survey, linear models, time series, + computational statistics, data mining and machine learning. + These functions maybe helpful in teaching statistics and data analysis.""" + + homepage = "https://cran.r-project.org/package=animation" + url = "https://cran.r-project.org/src/contrib/animation_2.5.tar.gz" + + version('2.5', sha256='b232fef1b318c79710e5e1923d87baba4c85ffe2c77ddb188130e0911d8cb55f') + + extends('r') + depends_on('r', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 79eaa1611823fcbcde3436b7c56c01cede0d32b0 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Tue, 25 Sep 2018 04:27:43 +0200 Subject: intel: add 2019.0 (#9328) --- var/spack/repos/builtin/packages/intel-daal/package.py | 2 ++ var/spack/repos/builtin/packages/intel-ipp/package.py | 2 ++ var/spack/repos/builtin/packages/intel-mkl/package.py | 2 ++ var/spack/repos/builtin/packages/intel-mpi/package.py | 2 ++ var/spack/repos/builtin/packages/intel-tbb/package.py | 1 + 5 files changed, 9 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/intel-daal/package.py b/var/spack/repos/builtin/packages/intel-daal/package.py index 420f8e009a..407f8a7a90 100644 --- a/var/spack/repos/builtin/packages/intel-daal/package.py +++ b/var/spack/repos/builtin/packages/intel-daal/package.py @@ -30,6 +30,8 @@ class IntelDaal(IntelPackage): homepage = "https://software.intel.com/en-us/daal" + version('2019.0.117', 'd42fb6c3e8b31b1288049e89df37f2e8', + url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13577/l_daal_2019.0.117.tgz") version('2018.3.222', 'e688825c563e357b7b626ece610d6a85', url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13007/l_daal_2018.3.222.tgz") version('2018.2.199', 'd015ff34a87a18922736b5fba0d0b0e0', diff --git a/var/spack/repos/builtin/packages/intel-ipp/package.py b/var/spack/repos/builtin/packages/intel-ipp/package.py index 3e4a553090..a1b9d440ed 100644 --- a/var/spack/repos/builtin/packages/intel-ipp/package.py +++ b/var/spack/repos/builtin/packages/intel-ipp/package.py @@ -30,6 +30,8 @@ class IntelIpp(IntelPackage): homepage = "https://software.intel.com/en-us/intel-ipp" + version('2019.0.117', 'c96be6e138d32bf9b8abc789d25db71d', + url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13576/l_ipp_2019.0.117.tgz') version('2018.3.222', '2ccc16ec002466e52f1e6e1bfe9b1149', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13006/l_ipp_2018.3.222.tgz') version('2018.2.199', 'f87276b485d2f6ec070c1b41ac1ed871', diff --git a/var/spack/repos/builtin/packages/intel-mkl/package.py b/var/spack/repos/builtin/packages/intel-mkl/package.py index 7eb217ac38..764d6bacef 100644 --- a/var/spack/repos/builtin/packages/intel-mkl/package.py +++ b/var/spack/repos/builtin/packages/intel-mkl/package.py @@ -32,6 +32,8 @@ class IntelMkl(IntelPackage): homepage = "https://software.intel.com/en-us/intel-mkl" + version('2019.0.117', 'd9e1b6b96fbffd4b306c7e8291f141a2', + url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13575/l_mkl_2019.0.117.tgz") version('2018.3.222', '3e63646a4306eff95e8d0aafd53a2983', url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13005/l_mkl_2018.3.222.tgz") version('2018.2.199', 'fd31b656a8eb859c89495b9cc41230b4', diff --git a/var/spack/repos/builtin/packages/intel-mpi/package.py b/var/spack/repos/builtin/packages/intel-mpi/package.py index ed2f87a0cc..ff6ed1ac9e 100644 --- a/var/spack/repos/builtin/packages/intel-mpi/package.py +++ b/var/spack/repos/builtin/packages/intel-mpi/package.py @@ -30,6 +30,8 @@ class IntelMpi(IntelPackage): homepage = "https://software.intel.com/en-us/intel-mpi-library" + version('2019.0.117', '8572d5fa1f26a7de8edc8b64653b0955', + url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13584/l_mpi_2019.0.117.tgz') version('2018.3.222', 'df92593818fadff63c57418669c6083b', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13112/l_mpi_2018.3.222.tgz') version('2018.2.199', '6ffeab59c83a8842537484d53e180520', diff --git a/var/spack/repos/builtin/packages/intel-tbb/package.py b/var/spack/repos/builtin/packages/intel-tbb/package.py index 8fd537d4ee..c3a813f782 100644 --- a/var/spack/repos/builtin/packages/intel-tbb/package.py +++ b/var/spack/repos/builtin/packages/intel-tbb/package.py @@ -37,6 +37,7 @@ class IntelTbb(Package): homepage = "http://www.threadingbuildingblocks.org/" # See url_for_version() below. + version('2019', '2119f1db2f905dc5b423482d7689b7d6') version('2018.5', 'ff3ae09f8c23892fbc3008c39f78288f') version('2018.4', '5e2e6ba0e25624a94331c945856551c2') version('2018.3', 'cd2e136598ffa5c136f077ee85a35b4c') -- cgit v1.2.3-70-g09d2 From 43b094845748c20ea7a16f9010fce1ff9f14988c Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Mon, 24 Sep 2018 21:33:39 -0500 Subject: lighttpd: new package starting at 1.4.50 (#9325) --- .../repos/builtin/packages/lighttpd/package.py | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 var/spack/repos/builtin/packages/lighttpd/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lighttpd/package.py b/var/spack/repos/builtin/packages/lighttpd/package.py new file mode 100644 index 0000000000..b6e2066481 --- /dev/null +++ b/var/spack/repos/builtin/packages/lighttpd/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class Lighttpd(CMakePackage): + """a secure, fast, compliant and very flexible web-server""" + + homepage = "https://www.lighttpd.net" + url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.50.tar.gz" + + version('1.4.50', sha256='c9a9f175aca6db22ebebbc47de52c54a99bbd1dce8d61bb75103609a3d798235') + version('1.4.49', sha256='8b744baf9f29c386fff1a6d2e435491e726cb8d29cfdb1fe20ab782ee2fc2ac7') -- cgit v1.2.3-70-g09d2 From 6b1b84267d52222bea761220c4dd3f3706a4b2bb Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Mon, 24 Sep 2018 21:53:14 -0500 Subject: superlu_dist: (master) has cxx11 sources - so update make.inc to list cxx11 compilers (#9316) --- var/spack/repos/builtin/packages/superlu-dist/package.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/superlu-dist/package.py b/var/spack/repos/builtin/packages/superlu-dist/package.py index fb17a28598..63b06571d0 100644 --- a/var/spack/repos/builtin/packages/superlu-dist/package.py +++ b/var/spack/repos/builtin/packages/superlu-dist/package.py @@ -77,6 +77,11 @@ class SuperluDist(Package): 'ARCH = ar', 'ARCHFLAGS = cr', 'RANLIB = true', + 'CXX = {0}'.format(self.spec['mpi'].mpicxx), + 'CXXFLAGS = {0} {1} {2}'.format( + ' '.join(self.spec.compiler_flags['cxxflags']), + self.compiler.pic_flag, + self.compiler.cxx11_flag), 'CC = {0}'.format(self.spec['mpi'].mpicc), 'CFLAGS = %s %s -O2 %s %s %s' % ( self.compiler.pic_flag, -- cgit v1.2.3-70-g09d2 From 2c4a057fe4108e0e1bfcceb7245b6cb9e67a7540 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Mon, 24 Sep 2018 23:57:38 -0500 Subject: petsc: add new versions 3.9.4 and 3.10.0 (#9319) * petsc: add new versions 3.9.4 and 3.10.0 * petsc:update superlu_dist dependency for version 3.10 [might have to change this later for xsdk] * slepc: add in new releases 3.9.2 and 3.10.0 --- var/spack/repos/builtin/packages/petsc/package.py | 4 ++++ var/spack/repos/builtin/packages/slepc/package.py | 3 +++ 2 files changed, 7 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index 07dfb09745..d65da2a84a 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -43,6 +43,8 @@ class Petsc(Package): version('develop', branch='master') version('xsdk-0.2.0', tag='xsdk-0.2.0') + version('3.10.0', '0240c2ce8c54e47b3531a743ee844d41') + version('3.9.4', 'c98eb67573efb2f91c6f239368259e44') version('3.9.3', '7b71d705f66f9961cb0e2da3f9da79a1') version('3.9.2', '8bedc0cd8c8603d54bfd99a6e8f77b3d') version('3.9.1', 'd3a229a188dbeef9b3f29b9a63622fad') @@ -149,6 +151,8 @@ class Petsc(Package): depends_on('superlu-dist@5.0.0:+int64', when='@3.7:3.7.99+superlu-dist+mpi+int64') depends_on('superlu-dist@5.2:5.2.99~int64', when='@3.8:3.9.99+superlu-dist+mpi~int64') depends_on('superlu-dist@5.2:5.2.99+int64', when='@3.8:3.9.99+superlu-dist+mpi+int64') + depends_on('superlu-dist@5.4:5.4.99~int64', when='@3.10:3.10.99+superlu-dist+mpi~int64') + depends_on('superlu-dist@5.4:5.4.99+int64', when='@3.10:3.10.99+superlu-dist+mpi+int64') depends_on('superlu-dist@xsdk-0.2.0~int64', when='@xsdk-0.2.0+superlu-dist+mpi~int64') depends_on('superlu-dist@xsdk-0.2.0+int64', when='@xsdk-0.2.0+superlu-dist+mpi+int64') depends_on('superlu-dist@develop~int64', when='@develop+superlu-dist+mpi~int64') diff --git a/var/spack/repos/builtin/packages/slepc/package.py b/var/spack/repos/builtin/packages/slepc/package.py index 19155bf0fd..587850bbdb 100644 --- a/var/spack/repos/builtin/packages/slepc/package.py +++ b/var/spack/repos/builtin/packages/slepc/package.py @@ -35,6 +35,8 @@ class Slepc(Package): git = "https://bitbucket.org/slepc/slepc.git" version('develop', branch='master') + version('3.10.0', '069d7a579995e0be1567c5bc869251e29c00044369a786933ca3040149d0412a') + version('3.9.2', '247585b3f8c10bf50b9464cb8ef7b5f22bead6f96524384897a37ec4146eb03e') version('3.9.1', 'e174ea7c127d9161eef976b0288f0c56d443a58d6ab2dc8af1e8bd66f156ce17') version('3.9.0', '1f3930db56b4065aaf214ea758ddff1a70bf19d45544cbdfd19d2787db4bfe0b') version('3.8.2', '1e7d20d20eb26da307d36017461fe4a55f40e947e232739179dbe6412e22ed13') @@ -52,6 +54,7 @@ class Slepc(Package): depends_on('python@2.6:2.8', type='build') # Cannot mix release and development versions of SLEPc and PETSc: depends_on('petsc@develop', when='@develop') + depends_on('petsc@3.10:3.10.99', when='@3.10:3.10.99') depends_on('petsc@3.9:3.9.99', when='@3.9:3.9.99') depends_on('petsc@3.8:3.8.99', when='@3.8:3.8.99') depends_on('petsc@3.7:3.7.7', when='@3.7.1:3.7.4') -- cgit v1.2.3-70-g09d2 From 6c0f0dbdfd297bdacac1672dbe5a444faa3a970e Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Tue, 25 Sep 2018 11:33:19 -0500 Subject: qt: fix dbus builds (#9315) --- var/spack/repos/builtin/packages/qt/package.py | 1 - 1 file changed, 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 6bcc16a6bf..18fe4c16ae 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -281,7 +281,6 @@ class Qt(Package): config_args.append('-I%s/dbus-1.0/include' % dbus.lib) config_args.append('-I%s/dbus-1.0' % dbus.include) config_args.append('-L%s' % dbus.lib) - config_args.append('-ldbus-1') else: config_args.append('-no-dbus') -- cgit v1.2.3-70-g09d2 From f88735c1eb601dc405b1c8aaa028b7bd0bccfe37 Mon Sep 17 00:00:00 2001 From: lingnanyuan <1297162327@qq.com> Date: Wed, 26 Sep 2018 11:56:39 -0500 Subject: gmap-gsnap: Add variant for different cpu support. (#8087) * gmap-gsnap: Add variant for different cpu support. * gmap-gsnap: fix flake8 error. * gmap-gsnap: remove sys import. * Change variant type to multi-valued. * remove if-statement. * gmap-gsnap: Build in seperate directories. * gmap-gsnap: remove make distclean. * gmap-gsnap: rewrite the recipe. --- .../repos/builtin/packages/gmap-gsnap/package.py | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gmap-gsnap/package.py b/var/spack/repos/builtin/packages/gmap-gsnap/package.py index b653513f6a..36af8e1f4d 100644 --- a/var/spack/repos/builtin/packages/gmap-gsnap/package.py +++ b/var/spack/repos/builtin/packages/gmap-gsnap/package.py @@ -37,3 +37,33 @@ class GmapGsnap(AutotoolsPackage): version('2018-02-12', '13152aedeef9ac66be915fc6bf6464f2') version('2017-06-16', 'fcc91b8bdd4bf12ae3124de0c00db0c0') version('2014-12-28', '1ab07819c9e5b5b8970716165ccaa7da') + + variant( + 'simd', + description='CPU support.', + values=('avx2', 'sse42', 'avx512', 'sse2'), + multi=True + ) + + def configure(self, spec, prefix): + configure = Executable('../configure') + + for simd in spec.variants['simd'].value: + with working_dir(simd, create=True): + configure('--with-simd-level={0}'.format(simd), + '--prefix={0}'.format(prefix)) + + def build(self, spec, prefix): + for simd in spec.variants['simd'].value: + with working_dir(simd): + make() + + def check(self): + for simd in self.spec.variants['simd'].value: + with working_dir(simd): + make('check') + + def install(self, spec, prefix): + for simd in spec.variants['simd'].value: + with working_dir(simd): + make('install') -- cgit v1.2.3-70-g09d2 From 4be8ae2b7048e22e22b9e9fbfca5ce99a3aec119 Mon Sep 17 00:00:00 2001 From: dorier Date: Wed, 26 Sep 2018 19:20:01 +0100 Subject: VTK package: don't require "+llvm" for mesa dependency (#9256) --- var/spack/repos/builtin/packages/vtk/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py index 22c9c4fe77..8b0b3f732e 100644 --- a/var/spack/repos/builtin/packages/vtk/package.py +++ b/var/spack/repos/builtin/packages/vtk/package.py @@ -62,8 +62,9 @@ class Vtk(CMakePackage): # drivers is faster, but it must be done externally. depends_on('opengl', when='~osmesa') - # mesa default is software rendering, make it faster with llvm - depends_on('mesa+llvm', when='+osmesa') + # Note: it is recommended to use mesa+llvm, if possible. + # mesa default is software rendering, llvm makes it faster + depends_on('mesa', when='+osmesa') # VTK will need Qt5OpenGL, and qt needs '-opengl' for that depends_on('qt+opengl', when='+qt') -- cgit v1.2.3-70-g09d2 From d5cdb1a2a7255465264928ec43f27e1d81d8b717 Mon Sep 17 00:00:00 2001 From: Abhinav Bhatele Date: Wed, 26 Sep 2018 16:22:05 -0700 Subject: update URLs for Laghos and MACSio (#9351) --- var/spack/repos/builtin/packages/laghos/package.py | 2 +- var/spack/repos/builtin/packages/macsio/package.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/laghos/package.py b/var/spack/repos/builtin/packages/laghos/package.py index 52f9fc6a39..83aae55c90 100644 --- a/var/spack/repos/builtin/packages/laghos/package.py +++ b/var/spack/repos/builtin/packages/laghos/package.py @@ -33,7 +33,7 @@ class Laghos(MakefilePackage): """ tags = ['proxy-app', 'ecp-proxy-app'] - homepage = "https://github.com/CEED/Laghos" + homepage = "https://computation.llnl.gov/projects/co-design/laghos" url = "https://github.com/CEED/Laghos/archive/v1.0.tar.gz" git = "https://github.com/CEED/Laghos.git" diff --git a/var/spack/repos/builtin/packages/macsio/package.py b/var/spack/repos/builtin/packages/macsio/package.py index 1acb384f7c..c5440a2a05 100644 --- a/var/spack/repos/builtin/packages/macsio/package.py +++ b/var/spack/repos/builtin/packages/macsio/package.py @@ -30,7 +30,7 @@ class Macsio(CMakePackage): tags = ['proxy-app', 'ecp-proxy-app'] - homepage = "http://llnl.github.io/MACSio" + homepage = "https://computation.llnl.gov/projects/co-design/macsio" url = "https://github.com/LLNL/MACSio/archive/1.0.tar.gz" git = "https://github.com/LLNL/MACSio.git" -- cgit v1.2.3-70-g09d2 From 2f28bd7d7ff40658dbc1095039ae4ac868195b6c Mon Sep 17 00:00:00 2001 From: Peer-Timo Bremer Date: Wed, 26 Sep 2018 18:15:47 -0700 Subject: new package: TALASS (#9326) --- var/spack/repos/builtin/packages/talass/package.py | 77 ++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 var/spack/repos/builtin/packages/talass/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/talass/package.py b/var/spack/repos/builtin/packages/talass/package.py new file mode 100644 index 0000000000..2b9131ba67 --- /dev/null +++ b/var/spack/repos/builtin/packages/talass/package.py @@ -0,0 +1,77 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Talass(CMakePackage): + """TALASS: Topological Analysis of Large-Scale Simulations + This package compiles the talass tool chain thar implements + various topological algorithms to analyze large scale data. + The package is organized hierarchical FileFormat < Statistics + < StreamingTopology and any of the subsets can be build stand- + alone.""" + + homepage = "http://www.cedmav.org/research/project/16-talass.html" + git = "git@bitbucket.org:cedmav/talass.git" + + version('2018-09-21', commit='bf7da9bb54a026d8cb575b5be28b9c88095cb307') + + # The default precision and index space sizes + variant('precision', default='32', values=('32', '64'), + description='Precision of the function values') + variant('global', default='32', values=('16', '32', '64'), + description='Number of bits used for the global index space') + variant('local', default='32', values=('16', '32', '64'), + description='Number of bits used for the local index space') + + root_cmakelists_dir = 'StreamingTopology' + + def cmake_args(self): + variants = self.spec.variants + + args = [] + + if int(variants['local'].value) > int(variants['global'].value): + raise InstallError('The global index space (%d bits) must be at least as large\ + as the local index space (% bits)' % (variants['global'].value, + variants['local'].value)) + + if variants['precision'].value == '32': + args.append('-DFUNCTION_TYPE=float') + elif variants['precision'].value == '64': + args.append('-DFUNCTION_TYPE=double') + + # Set global index space + args.append('-DGLOBAL_INDEX_TYPE=uint{0}_t'.format( + variants['global'].value)) + + # Set local index space + args.append('-DLOCAL_INDEX_TYPE=uint{0}_t'.format( + variants['local'].value)) + + # Deal with the PROJECT_INSTALL_PREFIX to enable Talass super builds + args.append('-DPROJECT_INSTALL_PREFIX=%s' % self.prefix) + + return args -- cgit v1.2.3-70-g09d2 From 41b35a783e27650428261467f1d53675df2d8f72 Mon Sep 17 00:00:00 2001 From: Abhinav Bhatele Date: Wed, 26 Sep 2018 18:47:51 -0700 Subject: fix build errors, make mpi variant default and add openmp variant (#9364) --- var/spack/repos/builtin/packages/xsbench/package.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/xsbench/package.py b/var/spack/repos/builtin/packages/xsbench/package.py index b46c828ba0..ebad0f683e 100644 --- a/var/spack/repos/builtin/packages/xsbench/package.py +++ b/var/spack/repos/builtin/packages/xsbench/package.py @@ -41,7 +41,8 @@ class Xsbench(MakefilePackage): version('14', '94d5d28eb031fd4ef35507c9c1862169') version('13', '72a92232d2f5777fb52f5ea4082aff37') - variant('mpi', default=False, description='Build with MPI support') + variant('mpi', default=True, description='Build with MPI support') + variant('openmp', default=True, description='Build with OpenMP support') depends_on('mpi', when='+mpi') @@ -55,8 +56,11 @@ class Xsbench(MakefilePackage): cflags = '-std=gnu99' if '+mpi' in self.spec: targets.append('CC={0}'.format(self.spec['mpi'].mpicc)) + else: + targets.append('CC={0}'.format(self.compiler.cxx)) - cflags += ' ' + self.compiler.openmp_flag + if '+openmp' in self.spec: + cflags += ' ' + self.compiler.openmp_flag targets.append('CFLAGS={0}'.format(cflags)) targets.append('LDFLAGS=-lm') -- cgit v1.2.3-70-g09d2 From d0ed39f51a99bb31e33e31c21ee601021455448e Mon Sep 17 00:00:00 2001 From: Abhinav Bhatele Date: Wed, 26 Sep 2018 18:48:34 -0700 Subject: miniVite: new package (#9348) --- .../repos/builtin/packages/minivite/package.py | 65 ++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 var/spack/repos/builtin/packages/minivite/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/minivite/package.py b/var/spack/repos/builtin/packages/minivite/package.py new file mode 100644 index 0000000000..ca613929b2 --- /dev/null +++ b/var/spack/repos/builtin/packages/minivite/package.py @@ -0,0 +1,65 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 0s2111-1307 USA +############################################################################## +from spack import * + + +class Minivite(MakefilePackage): + """miniVite is a proxy application that implements a single phase of + Louvain method in distributed memory for graph community detection. + """ + tags = ['proxy-app', 'ecp-proxy-app'] + + homepage = "http://hpc.pnl.gov/people/hala/grappolo.html" + git = "https://github.com/Exa-Graph/miniVite.git" + + version('develop', branch='master') + version('1.0', tag='v1.0') + + variant('openmp', default=True, description='Build with OpenMP support') + variant('opt', default=True, description='Optimization flags') + + depends_on('mpi') + + @property + def build_targets(self): + targets = [] + cxxflags = ['-std=c++11 -g -DCHECK_NUM_EDGES -DPRINT_EXTRA_NEDGES'] + ldflags = [] + + if '+openmp' in self.spec: + cxxflags.append(self.compiler.openmp_flag) + ldflags.append(self.compiler.openmp_flag) + if '+opt' in self.spec: + cxxflags.append(' -O3 ') + + targets.append('CXXFLAGS={0}'.format(' '.join(cxxflags))) + targets.append('OPTFLAGS={0}'.format(' '.join(ldflags))) + targets.append('CXX={0}'.format(self.spec['mpi'].mpicxx)) + + return targets + + def install(self, spec, prefix): + mkdirp(prefix.bin) + install('dspl', prefix.bin) -- cgit v1.2.3-70-g09d2 From c9d8226bc635ee0f325361698a770518022406ab Mon Sep 17 00:00:00 2001 From: Daniel Topa Date: Wed, 26 Sep 2018 19:53:54 -0600 Subject: new package versions: ucx, libhio, and hwloc (#9365) --- var/spack/repos/builtin/packages/ucx/package.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ucx/package.py b/var/spack/repos/builtin/packages/ucx/package.py index 6b3e7a81c2..a3dc92a4af 100644 --- a/var/spack/repos/builtin/packages/ucx/package.py +++ b/var/spack/repos/builtin/packages/ucx/package.py @@ -30,12 +30,12 @@ class Ucx(AutotoolsPackage): MPI/PGAS frameworks""" homepage = "http://www.openucx.org" - url = "https://github.com/openucx/ucx/releases/download/v1.2.1/ucx-1.2.1.tar.gz" - + url = "https://github.com/openucx/ucx/releases/download/v1.3.1/ucx-1.3.1.tar.gz" # Current - version('1.3.0', '2fdc3028eac3ef3ee1b1b523d170c071') + version('1.3.1', '443ffdd64dc0e912b672a0ccb37ff666') # Still supported + version('1.3.0', '2fdc3028eac3ef3ee1b1b523d170c071') version('1.2.2', 'ff3fe65e4ebe78408fc3151a9ce5d286') version('1.2.1', '697c2fd7912614fb5a1dadff3bfa485c') -- cgit v1.2.3-70-g09d2 From b35dccf875bccf86a9decf2c63377566c983bf84 Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Wed, 26 Sep 2018 21:03:35 -0500 Subject: paml: remove old version, added 4.9h (#9360) --- var/spack/repos/builtin/packages/paml/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/paml/package.py b/var/spack/repos/builtin/packages/paml/package.py index 0bb2b83ff0..b09fbcdf65 100644 --- a/var/spack/repos/builtin/packages/paml/package.py +++ b/var/spack/repos/builtin/packages/paml/package.py @@ -30,9 +30,9 @@ class Paml(MakefilePackage): protein sewuences using maximum likelihood.""" homepage = "http://abacus.gene.ucl.ac.uk/software/paml.html" - url = "http://abacus.gene.ucl.ac.uk/software/paml4.9e.tgz" + url = "http://abacus.gene.ucl.ac.uk/software/paml4.9h.tgz" - version('4.9e', 'ac5a062bfea1f4eaac79008434030acf') + version('4.9h', sha256='623bf6cf4a018a4e7b4dbba189c41d6c0c25fdca3a0ae24703b82965c772edb3') build_directory = 'src' -- cgit v1.2.3-70-g09d2 From bf4ac40adefb3a277c7efc1b7b283a0646358828 Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Wed, 26 Sep 2018 21:08:55 -0500 Subject: new package: r-ps (#9341) --- var/spack/repos/builtin/packages/r-ps/package.py | 36 ++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-ps/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-ps/package.py b/var/spack/repos/builtin/packages/r-ps/package.py new file mode 100644 index 0000000000..045b6b8ce7 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-ps/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RPs(RPackage): + """Manipulate processes on Windows, Linux and MacOS""" + + homepage = "https://github.com/r-lib/ps" + url = "https://cran.r-project.org/src/contrib/ps_1.1.0.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/ps/ps_1.0.0.tar.gz" + + version('1.1.0', sha256='5d5240d5bf1d48c721b3fdf47cfc9dbf878e388ea1f057b764db05bffdc4a9fe') + version('1.0.0', sha256='9bdaf64aaa44ae11866868402eb75bf56c2e3022100476d9b9dcd16ca784ffd8') -- cgit v1.2.3-70-g09d2 From e41677b5609bf841be8b168287206b8b429f3d4b Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Wed, 26 Sep 2018 21:12:06 -0500 Subject: new package: r-processx (#9342) --- .../repos/builtin/packages/r-processx/package.py | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-processx/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-processx/package.py b/var/spack/repos/builtin/packages/r-processx/package.py new file mode 100644 index 0000000000..442a846e12 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-processx/package.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class RProcessx(RPackage): + """Tools to run system processes in the background""" + + homepage = "https://github.com/r-lib/processx" + url = "https://cran.r-project.org/src/contrib/processx_3.2.0.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/processx/processx_3.1.0.tar.gz" + + version('3.2.0', sha256='c4ba602fcbdc032ae9d94701b3e6b83a2dab1b53d0b4f9937b07a84eae22fddf') + version('3.1.0', sha256='11ac120ab4e4aa0e99c9b2eda87d07bc683bab735f1761e95e5ddacd311b5972') + version('3.0.3', sha256='53781dba3c538605a02e28b3b577e7de79e2064bfc502025f7ec0e5945e302bf') + version('2.0.0.1', sha256='8f61b2952d0f2d13c74465bfba174ce11eee559475c2f7b9be6bcb9e2e1d827b') + version('2.0.0', sha256='8325b56a60a276909228756281523cda9256bc754c5f3ca03b41c5c17cc398ad') + + depends_on('r-assertthat', type=('build', 'run')) + depends_on('r-crayon', type=('build', 'run')) + depends_on('r-ps', type=('build', 'run')) + depends_on('r-r6', type=('build', 'run')) + depends_on('r-utils', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 12c59c5b553c912cf29fbd017003dbd569b9c189 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Thu, 27 Sep 2018 04:12:41 +0200 Subject: arpack-ng: add version 3.6.3 (#9331) --- var/spack/repos/builtin/packages/arpack-ng/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/arpack-ng/package.py b/var/spack/repos/builtin/packages/arpack-ng/package.py index 72fc32a6b0..50a36156ba 100644 --- a/var/spack/repos/builtin/packages/arpack-ng/package.py +++ b/var/spack/repos/builtin/packages/arpack-ng/package.py @@ -58,6 +58,7 @@ class ArpackNg(Package): git = 'https://github.com/opencollab/arpack-ng.git' version('develop', branch='master') + version('3.6.3', sha256='64f3551e5a2f8497399d82af3076b6a33bf1bc95fc46bbcabe66442db366f453') version('3.6.2', sha256='673c8202de996fd3127350725eb1818e534db4e79de56d5dcee8c00768db599a') version('3.6.0', 'f2607c1d5f80e922d55751fbed86a8ec') version('3.5.0', '9762c9ae6d739a9e040f8201b1578874') -- cgit v1.2.3-70-g09d2 From 9e448d4c4ffecd3875b362de7c9fa6fd05b53b73 Mon Sep 17 00:00:00 2001 From: dorier Date: Thu, 27 Sep 2018 03:19:46 +0100 Subject: py-pybind11: add version 2.2.4 (#9355) --- var/spack/repos/builtin/packages/py-pybind11/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pybind11/package.py b/var/spack/repos/builtin/packages/py-pybind11/package.py index 79bab0cbca..7d50bba051 100644 --- a/var/spack/repos/builtin/packages/py-pybind11/package.py +++ b/var/spack/repos/builtin/packages/py-pybind11/package.py @@ -39,6 +39,7 @@ class PyPybind11(CMakePackage): git = "https://github.com/pybind/pybind11.git" version('develop', branch='master') + version('2.2.4', 'b69e83658513215b8d1443544d0549b7d231b9f201f6fc787a2b2218b408181e') version('2.2.3', '55b637945bbf47d99d2c906bf0c13f49') version('2.2.2', 'fc174e1bbfe7ec069af7eea86ec37b5c') version('2.2.1', 'bab1d46bbc465af5af3a4129b12bfa3b') -- cgit v1.2.3-70-g09d2 From 37918e0536a57967e970da7704bf41010d4227e1 Mon Sep 17 00:00:00 2001 From: Abhinav Bhatele Date: Thu, 27 Sep 2018 04:49:15 -0700 Subject: ember: put all READMEs into docs and add executables in bin (#9362) --- var/spack/repos/builtin/packages/ember/package.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ember/package.py b/var/spack/repos/builtin/packages/ember/package.py index 1f038b9545..6b47305e86 100644 --- a/var/spack/repos/builtin/packages/ember/package.py +++ b/var/spack/repos/builtin/packages/ember/package.py @@ -91,12 +91,16 @@ class Ember(MakefilePackage): return targets def install(self, spec, prefix): - mkdirp(prefix.doc) - install('README.md', prefix.doc) - install('LICENSE', prefix.doc) - install('README.MPI.halo3d', prefix.doc) - install('README.MPI.halo3d-26', prefix.doc) - install('README.MPI.incast', prefix.doc) - install('README.MPI.sweep3d', prefix.doc) - install('README.SHMEM.hotspotinc', prefix.doc) - install('README.SHMEM.randominc', prefix.doc) + mkdirp(prefix.docs) + install('README.md', prefix.docs) + install('README.MPI.halo3d', prefix.docs) + install('README.MPI.halo3d-26', prefix.docs) + install('README.MPI.incast', prefix.docs) + install('README.MPI.sweep3d', prefix.docs) + + mkdirp(prefix.bin) + install('mpi/halo3d/halo3d', prefix.bin) + install('mpi/halo3d-26/halo3d-26', prefix.bin) + install('mpi/incast/incast', prefix.bin) + install('mpi/pingpong/pingpong', prefix.bin) + install('mpi/sweep3d/sweep3d', prefix.bin) -- cgit v1.2.3-70-g09d2 From 2155163a37950b8c6ee982268cde62a2aaace3ec Mon Sep 17 00:00:00 2001 From: sknigh Date: Thu, 27 Sep 2018 13:33:53 -0700 Subject: Added Cuda 10 (#9310) --- var/spack/repos/builtin/packages/cuda/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cuda/package.py b/var/spack/repos/builtin/packages/cuda/package.py index 80e3d1cf67..56b51282f6 100644 --- a/var/spack/repos/builtin/packages/cuda/package.py +++ b/var/spack/repos/builtin/packages/cuda/package.py @@ -37,6 +37,8 @@ class Cuda(Package): homepage = "https://developer.nvidia.com/cuda-zone" + version('10.0.130', sha256='92351f0e4346694d0fcb4ea1539856c9eb82060c25654463bfd8574ec35ee39a', expand=False, + url="https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_10.0.130_410.48_linux") version('9.2.88', 'dd6e33e10d32a29914b7700c7b3d1ca0', expand=False, url="https://developer.nvidia.com/compute/cuda/9.2/Prod/local_installers/cuda_9.2.88_396.26_linux") version('9.1.85', '67a5c3933109507df6b68f80650b4b4a', expand=False, -- cgit v1.2.3-70-g09d2 From 7db31c6671ead13abcfd75156610a91c1c9dd010 Mon Sep 17 00:00:00 2001 From: sknigh Date: Thu, 27 Sep 2018 13:34:41 -0700 Subject: Added slurm 17.11 and 18.08 (#9345) --- var/spack/repos/builtin/packages/slurm/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/slurm/package.py b/var/spack/repos/builtin/packages/slurm/package.py index bfc53ae4a7..8dccb67def 100644 --- a/var/spack/repos/builtin/packages/slurm/package.py +++ b/var/spack/repos/builtin/packages/slurm/package.py @@ -43,6 +43,8 @@ class Slurm(AutotoolsPackage): homepage = 'https://slurm.schedmd.com' url = 'https://github.com/SchedMD/slurm/archive/slurm-17-02-6-1.tar.gz' + version('18-08-0-1', sha256='62129d0f2949bc8a68ef86fe6f12e0715cbbf42f05b8da6ef7c3e7e7240b50d9') + version('17-11-9-2', sha256='6e34328ed68262e776f524f59cca79ac75bcd18030951d45ea545a7ba4c45906') version('17-02-6-1', '8edbb9ad41819464350d9de013367020') variant('gtk', default=False, description='Enable GTK+ support') -- cgit v1.2.3-70-g09d2 From 5047d86732782d2537f1e52f3c0d8f41d7918ecf Mon Sep 17 00:00:00 2001 From: sknigh Date: Thu, 27 Sep 2018 13:37:36 -0700 Subject: yaml-cpp: conflict with gcc 4.7 instead of 4.8 (#9371) 4.8 has c++11 support, and RHEL/Centos 7 still use 4.8.5 --- var/spack/repos/builtin/packages/yaml-cpp/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/yaml-cpp/package.py b/var/spack/repos/builtin/packages/yaml-cpp/package.py index b73a8b95b4..a11277ad81 100644 --- a/var/spack/repos/builtin/packages/yaml-cpp/package.py +++ b/var/spack/repos/builtin/packages/yaml-cpp/package.py @@ -43,7 +43,7 @@ class YamlCpp(CMakePackage): depends_on('boost@:1.66.99', when='@:0.5.3') - conflicts('%gcc@:4.8', when='@0.6.0:', msg="versions 0.6.0: require c++11 support") + conflicts('%gcc@:4.7', when='@0.6.0:', msg="versions 0.6.0: require c++11 support") conflicts('%clang@:3.3.0', when='@0.6.0:', msg="versions 0.6.0: require c++11 support") # currently we can't check for apple-clang's version # conflicts('%clang@:4.0.0-apple', when='@0.6.0:', -- cgit v1.2.3-70-g09d2 From 496bc3cd23fd0745f1b73faa680a12262b12a091 Mon Sep 17 00:00:00 2001 From: sknigh Date: Thu, 27 Sep 2018 19:29:15 -0700 Subject: Added legacylaunchers variant to openmpi (#9336) Lots of programs still have mpiexec/mpirun baked in. --- var/spack/repos/builtin/packages/openmpi/package.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 4550c611ad..01314a6600 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -223,6 +223,12 @@ class Openmpi(AutotoolsPackage): description='Memchecker support for debugging [degrades performance]' ) + variant( + 'legacylaunchers', + default=False, + description='Do not remove mpirun/mpiexec when building with slurm' + ) + provides('mpi') provides('mpi@:2.2', when='@1.6.5') provides('mpi@:3.0', when='@1.7.5:') @@ -463,7 +469,7 @@ class Openmpi(AutotoolsPackage): # applications via mpirun or mpiexec, and leaves srun as the # only sensible choice (orterun is still present, but normal # users don't know about that). - if '@1.6: schedulers=slurm' in self.spec: + if '@1.6: ~legacylaunchers schedulers=slurm' in self.spec: os.remove(self.prefix.bin.mpirun) os.remove(self.prefix.bin.mpiexec) os.remove(self.prefix.bin.shmemrun) -- cgit v1.2.3-70-g09d2 From bd801da1bf906431602cf6f43f121bd3d07dd044 Mon Sep 17 00:00:00 2001 From: sknigh Date: Thu, 27 Sep 2018 19:34:18 -0700 Subject: Set libs property for tcl and tk (#9372) --- var/spack/repos/builtin/packages/tcl/package.py | 5 +++++ var/spack/repos/builtin/packages/tk/package.py | 4 ++++ 2 files changed, 9 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/tcl/package.py b/var/spack/repos/builtin/packages/tcl/package.py index e899ab55b4..bdbc8c397b 100644 --- a/var/spack/repos/builtin/packages/tcl/package.py +++ b/var/spack/repos/builtin/packages/tcl/package.py @@ -93,6 +93,11 @@ class Tcl(AutotoolsPackage): # ======================================================================== # Set up environment to make install easy for tcl extensions. # ======================================================================== + + @property + def libs(self): + return LibraryList([]) + @property def command(self): """Returns the tclsh command. diff --git a/var/spack/repos/builtin/packages/tk/package.py b/var/spack/repos/builtin/packages/tk/package.py index d765514bcf..5a12831453 100644 --- a/var/spack/repos/builtin/packages/tk/package.py +++ b/var/spack/repos/builtin/packages/tk/package.py @@ -47,6 +47,10 @@ class Tk(AutotoolsPackage): configure_directory = 'unix' + @property + def libs(self): + return LibraryList([]) + def setup_environment(self, spack_env, run_env): # When using Tkinter from within spack provided python+tk, python # will not be able to find Tcl/Tk unless TK_LIBRARY is set. -- cgit v1.2.3-70-g09d2 From 1e75aef0e91b855d027d46a6a84783b2b1a95f39 Mon Sep 17 00:00:00 2001 From: Eric Müller Date: Fri, 28 Sep 2018 04:37:31 +0200 Subject: Bazel: update env handling, add versions (#9369) Building bazel yielded errors since commit cd9691d. The first commit fixes the build for older bazel versions, the second commit adds new versions and ports the patches to these versions. --- .../packages/bazel/fix_env_handling-0.13.0.patch | 7 +- .../packages/bazel/fix_env_handling-0.17.2.patch | 131 +++++++++++++++++++++ var/spack/repos/builtin/packages/bazel/package.py | 10 +- .../packages/bazel/unix_cc_configure-0.17.2.patch | 25 ++++ 4 files changed, 170 insertions(+), 3 deletions(-) create mode 100644 var/spack/repos/builtin/packages/bazel/fix_env_handling-0.17.2.patch create mode 100644 var/spack/repos/builtin/packages/bazel/unix_cc_configure-0.17.2.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bazel/fix_env_handling-0.13.0.patch b/var/spack/repos/builtin/packages/bazel/fix_env_handling-0.13.0.patch index 8f1cea0e58..31b4cf1a8e 100644 --- a/var/spack/repos/builtin/packages/bazel/fix_env_handling-0.13.0.patch +++ b/var/spack/repos/builtin/packages/bazel/fix_env_handling-0.13.0.patch @@ -1,6 +1,6 @@ --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java.orig 2018-05-23 12:11:29.319402761 +0200 +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java 2018-05-23 12:35:21.817904301 +0200 -@@ -150,6 +150,121 @@ +@@ -150,6 +150,126 @@ builder.put("PATH", null); builder.put("LD_LIBRARY_PATH", null); } @@ -55,6 +55,11 @@ + builder.put("SPACK_SHORT_SPEC", spack_short_spec); + } + ++ String spack_system_dirs = System.getenv("SPACK_SYSTEM_DIRS"); ++ if (spack_system_dirs != null) { ++ builder.put("SPACK_SYSTEM_DIRS", spack_system_dirs); ++ } ++ + String spack_cc = System.getenv("SPACK_CC"); + if (spack_cc != null) { + builder.put("SPACK_CC", spack_cc); diff --git a/var/spack/repos/builtin/packages/bazel/fix_env_handling-0.17.2.patch b/var/spack/repos/builtin/packages/bazel/fix_env_handling-0.17.2.patch new file mode 100644 index 0000000000..89537387a6 --- /dev/null +++ b/var/spack/repos/builtin/packages/bazel/fix_env_handling-0.17.2.patch @@ -0,0 +1,131 @@ +diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java +index 72c40ac..2e73530 100755 +--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java ++++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java +@@ -168,6 +168,126 @@ public class BazelRuleClassProvider { + env.put("PATH", null); + } + ++ String spack_prefix = System.getenv("SPACK_PREFIX"); ++ if (spack_prefix != null) { ++ env.put("SPACK_PREFIX", spack_prefix); ++ } ++ ++ String spack_env_path = System.getenv("SPACK_ENV_PATH"); ++ if (spack_env_path != null) { ++ env.put("SPACK_ENV_PATH", spack_env_path); ++ } ++ ++ String spack_debug_log_id = System.getenv("SPACK_DEBUG_LOG_ID"); ++ if (spack_debug_log_id != null) { ++ env.put("SPACK_DEBUG_LOG_ID", spack_debug_log_id); ++ } ++ ++ String spack_debug_log_dir = System.getenv("SPACK_DEBUG_LOG_DIR"); ++ if (spack_debug_log_dir != null) { ++ env.put("SPACK_DEBUG_LOG_DIR", spack_debug_log_dir); ++ } ++ ++ String spack_compiler_spec = System.getenv("SPACK_COMPILER_SPEC"); ++ if (spack_compiler_spec != null) { ++ env.put("SPACK_COMPILER_SPEC", spack_compiler_spec); ++ } ++ ++ String spack_cc_rpath_arg = System.getenv("SPACK_CC_RPATH_ARG"); ++ if (spack_cc_rpath_arg != null) { ++ env.put("SPACK_CC_RPATH_ARG", spack_cc_rpath_arg); ++ } ++ ++ String spack_cxx_rpath_arg = System.getenv("SPACK_CXX_RPATH_ARG"); ++ if (spack_cxx_rpath_arg != null) { ++ env.put("SPACK_CXX_RPATH_ARG", spack_cxx_rpath_arg); ++ } ++ ++ String spack_f77_rpath_arg = System.getenv("SPACK_F77_RPATH_ARG"); ++ if (spack_f77_rpath_arg != null) { ++ env.put("SPACK_F77_RPATH_ARG", spack_f77_rpath_arg); ++ } ++ ++ String spack_fc_rpath_arg = System.getenv("SPACK_FC_RPATH_ARG"); ++ if (spack_fc_rpath_arg != null) { ++ env.put("SPACK_FC_RPATH_ARG", spack_fc_rpath_arg); ++ } ++ ++ String spack_short_spec = System.getenv("SPACK_SHORT_SPEC"); ++ if (spack_short_spec != null) { ++ env.put("SPACK_SHORT_SPEC", spack_short_spec); ++ } ++ ++ String spack_system_dirs = System.getenv("SPACK_SYSTEM_DIRS"); ++ if (spack_system_dirs != null) { ++ env.put("SPACK_SYSTEM_DIRS", spack_system_dirs); ++ } ++ ++ String spack_cc = System.getenv("SPACK_CC"); ++ if (spack_cc != null) { ++ env.put("SPACK_CC", spack_cc); ++ } ++ ++ String spack_cxx = System.getenv("SPACK_CXX"); ++ if (spack_cxx != null) { ++ env.put("SPACK_CXX", spack_cxx); ++ } ++ ++ String spack_f77 = System.getenv("SPACK_F77"); ++ if (spack_f77 != null) { ++ env.put("SPACK_F77", spack_f77); ++ } ++ ++ String spack_fc = System.getenv("SPACK_FC"); ++ if (spack_fc != null) { ++ env.put("SPACK_FC", spack_fc); ++ } ++ ++ String spack_cflags = System.getenv("SPACK_CFLAGS"); ++ if (spack_cflags != null) { ++ env.put("SPACK_CFLAGS", spack_cflags); ++ } ++ ++ String spack_cxxflags = System.getenv("SPACK_CXXFLAGS"); ++ if (spack_cxxflags != null) { ++ env.put("SPACK_CXXFLAGS", spack_cxxflags); ++ } ++ ++ String spack_fcflags = System.getenv("SPACK_FCFLAGS"); ++ if (spack_fcflags != null) { ++ env.put("SPACK_FCFLAGS", spack_fcflags); ++ } ++ ++ String spack_fflags = System.getenv("SPACK_FFLAGS"); ++ if (spack_fflags != null) { ++ env.put("SPACK_FFLAGS", spack_fflags); ++ } ++ ++ String spack_ldflags = System.getenv("SPACK_LDFLAGS"); ++ if (spack_ldflags != null) { ++ env.put("SPACK_LDFLAGS", spack_ldflags); ++ } ++ ++ String spack_ldlibs = System.getenv("SPACK_LDLIBS"); ++ if (spack_ldlibs != null) { ++ env.put("SPACK_LDLIBS", spack_ldlibs); ++ } ++ ++ String spack_debug = System.getenv("SPACK_DEBUG"); ++ if (spack_debug != null) { ++ env.put("SPACK_DEBUG", spack_debug); ++ } ++ ++ String spack_test_command = System.getenv("SPACK_TEST_COMMAND"); ++ if (spack_test_command != null) { ++ env.put("SPACK_TEST_COMMAND", spack_test_command); ++ } ++ ++ String spack_dependencies = System.getenv("SPACK_DEPENDENCIES"); ++ if (spack_dependencies != null) { ++ env.put("SPACK_DEPENDENCIES", spack_dependencies); ++ } ++ + // Shell environment variables specified via options take precedence over the + // ones inherited from the fragments. In the long run, these fragments will + // be replaced by appropriate default rc files anyway. diff --git a/var/spack/repos/builtin/packages/bazel/package.py b/var/spack/repos/builtin/packages/bazel/package.py index 22f26d31b7..69024cad14 100644 --- a/var/spack/repos/builtin/packages/bazel/package.py +++ b/var/spack/repos/builtin/packages/bazel/package.py @@ -34,6 +34,10 @@ class Bazel(Package): homepage = "https://www.bazel.io" url = "https://github.com/bazelbuild/bazel/releases/download/0.11.1/bazel-0.11.1-dist.zip" + version('0.17.2', '9805c0593e781295126af6b8be8cc7a9') + version('0.16.1', 'c333d903c5275286e79316eb19dd742d') + version('0.15.0', 'fb6b928b62f068697bd66ad6d13aad53') + version('0.14.1', '841900316b3ec9b996babe1c5b0b92e1') version('0.13.0', '64a5124025c1618b550faec64a9b6fa3') version('0.12.0', 'b5d67564ceecfe2005a885fe2ffe0da3') version('0.11.1', '80daac6b100b7f8e2b17d133150eba44') @@ -54,11 +58,13 @@ class Bazel(Package): patch('fix_env_handling.patch', when='@:0.4.5') patch('fix_env_handling-0.9.0.patch', when='@0.9.0:0.12.0') - patch('fix_env_handling-0.13.0.patch', when='@0.13.0:') + patch('fix_env_handling-0.13.0.patch', when='@0.13.0:0.13.999') + patch('fix_env_handling-0.17.2.patch', when='@0.14.0:') patch('link.patch') patch('cc_configure.patch', when='@:0.4.5') patch('unix_cc_configure.patch', when='@0.9.0') - patch('unix_cc_configure-0.10.0.patch', when='@0.10.0:') + patch('unix_cc_configure-0.10.0.patch', when='@0.10.0:0.14.999') + patch('unix_cc_configure-0.17.2.patch', when='@0.15.0:') def url_for_version(self, version): if version >= Version('0.4.1'): diff --git a/var/spack/repos/builtin/packages/bazel/unix_cc_configure-0.17.2.patch b/var/spack/repos/builtin/packages/bazel/unix_cc_configure-0.17.2.patch new file mode 100644 index 0000000000..d1a502a49a --- /dev/null +++ b/var/spack/repos/builtin/packages/bazel/unix_cc_configure-0.17.2.patch @@ -0,0 +1,25 @@ +diff --git a/tools/cpp/unix_cc_configure.bzl b/tools/cpp/unix_cc_configure.bzl +index 361931b..a79129b 100755 +--- a/tools/cpp/unix_cc_configure.bzl ++++ b/tools/cpp/unix_cc_configure.bzl +@@ -145,11 +145,19 @@ def get_escaped_cxx_inc_directories(repository_ctx, cc, lang_flag, additional_fl + else: + inc_dirs = result.stderr[index1 + 1:index2].strip() + +- return [ ++ default_inc_directories = [ + _prepare_include_path(repository_ctx, _cxx_inc_convert(p)) + for p in inc_dirs.split("\n") + ] + ++ env = repository_ctx.os.environ ++ if "SPACK_DEPENDENCIES" in env: ++ for dep in env["SPACK_DEPENDENCIES"].split(":"): ++ path = dep + "/include" ++ default_inc_directories.append(path) ++ ++ return default_inc_directories ++ + def _is_compiler_option_supported(repository_ctx, cc, option): + """Checks that `option` is supported by the C compiler. Doesn't %-escape the option.""" + result = repository_ctx.execute([ -- cgit v1.2.3-70-g09d2 From 2cd7783e9e73d1431643cb94cdf7d5d348208cf0 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Fri, 28 Sep 2018 15:18:55 +0200 Subject: mpich: fix 3.2 patch (#9330) patch does not apply to 3.2.1 (released in late 2017). Given that it fixes the issue discussed in May 2016, most likely it shall apply only to 3.2 --- var/spack/repos/builtin/packages/mpich/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mpich/package.py b/var/spack/repos/builtin/packages/mpich/package.py index 62fb44de29..dfa227f37e 100644 --- a/var/spack/repos/builtin/packages/mpich/package.py +++ b/var/spack/repos/builtin/packages/mpich/package.py @@ -80,7 +80,7 @@ spack package at this time.''', # fix MPI_Barrier segmentation fault # see https://lists.mpich.org/pipermail/discuss/2016-May/004764.html # and https://lists.mpich.org/pipermail/discuss/2016-June/004768.html - patch('mpich32_clang.patch', when='@3.2%clang') + patch('mpich32_clang.patch', when='@3.2:3.2.0%clang') depends_on('libfabric', when='netmod=ofi') -- cgit v1.2.3-70-g09d2 From f641a72a8b537a7ce4bf526402f25ddf85e51448 Mon Sep 17 00:00:00 2001 From: "Mark W. Krentel" Date: Fri, 28 Sep 2018 12:36:27 -0500 Subject: libpfm4: add version and compiler flags (#9291) Set default optimization level (-O2) if not specified in cflags. --- var/spack/repos/builtin/packages/libpfm4/package.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libpfm4/package.py b/var/spack/repos/builtin/packages/libpfm4/package.py index c10d61007d..44f710003d 100644 --- a/var/spack/repos/builtin/packages/libpfm4/package.py +++ b/var/spack/repos/builtin/packages/libpfm4/package.py @@ -33,11 +33,30 @@ class Libpfm4(MakefilePackage): homepage = "http://perfmon2.sourceforge.net" url = "https://downloads.sourceforge.net/project/perfmon2/libpfm4/libpfm-4.8.0.tar.gz" + version('4.10.1', 'd8f66cb9bfa7e1434434e0de6409db5b') + version('4.9.0', '42ad4a2e5b8e1f015310db8535739c73') version('4.8.0', '730383896db92e12fb2cc10f2d41dd43') # Fails to build libpfm4 with intel compiler version 16 and 17 conflicts('%intel@16:17') + # Set default optimization level (-O2) if not specified. + def flag_handler(self, name, flags): + if name == 'cflags': + for flag in flags: + if flag.startswith('-O'): + break + else: + flags.append('-O2') + + return (flags, None, None) + + # Remove -Werror from CFLAGS. Given the large space of platform, + # compiler, version, we don't want to fail the build over a stray + # warning. + def patch(self): + filter_file('-Werror', '', 'config.mk') + @property def install_targets(self): return ['DESTDIR={0}'.format(self.prefix), -- cgit v1.2.3-70-g09d2 From 3c713661b8956cc7b32ec0a63aeb4ed4939b5946 Mon Sep 17 00:00:00 2001 From: snehring Date: Fri, 28 Sep 2018 12:41:41 -0500 Subject: gmap-gsnap: set default value for simd variant (#9366) Also add zlib/bzip2 dependencies. --- var/spack/repos/builtin/packages/gmap-gsnap/package.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gmap-gsnap/package.py b/var/spack/repos/builtin/packages/gmap-gsnap/package.py index 36af8e1f4d..7268111652 100644 --- a/var/spack/repos/builtin/packages/gmap-gsnap/package.py +++ b/var/spack/repos/builtin/packages/gmap-gsnap/package.py @@ -38,11 +38,15 @@ class GmapGsnap(AutotoolsPackage): version('2017-06-16', 'fcc91b8bdd4bf12ae3124de0c00db0c0') version('2014-12-28', '1ab07819c9e5b5b8970716165ccaa7da') + depends_on('zlib') + depends_on('bzip2') + variant( 'simd', description='CPU support.', values=('avx2', 'sse42', 'avx512', 'sse2'), - multi=True + multi=True, + default='sse2' ) def configure(self, spec, prefix): -- cgit v1.2.3-70-g09d2 From 2ac648407e5302f6ae16ccf33c0f8c1b44d8f797 Mon Sep 17 00:00:00 2001 From: Serban Maerean Date: Fri, 28 Sep 2018 13:46:21 -0400 Subject: Add PETSc 3.10.1 to PETSc's spackage file (#9382) * Add version 3.10.1 to the PETSc spackage file. * Makefile changes required for building PETSc native tests with the XL compiler. --- var/spack/repos/builtin/packages/petsc/package.py | 1 + .../repos/builtin/packages/petsc/xlc-test-3.10.1.diff | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 var/spack/repos/builtin/packages/petsc/xlc-test-3.10.1.diff (limited to 'var') diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index d65da2a84a..7b89028820 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -43,6 +43,7 @@ class Petsc(Package): version('develop', branch='master') version('xsdk-0.2.0', tag='xsdk-0.2.0') + version('3.10.1', '2d0d5a9bd8112a4147a2a23f7f62a906') version('3.10.0', '0240c2ce8c54e47b3531a743ee844d41') version('3.9.4', 'c98eb67573efb2f91c6f239368259e44') version('3.9.3', '7b71d705f66f9961cb0e2da3f9da79a1') diff --git a/var/spack/repos/builtin/packages/petsc/xlc-test-3.10.1.diff b/var/spack/repos/builtin/packages/petsc/xlc-test-3.10.1.diff new file mode 100644 index 0000000000..7009ea450d --- /dev/null +++ b/var/spack/repos/builtin/packages/petsc/xlc-test-3.10.1.diff @@ -0,0 +1,19 @@ +--- a/gmakefile.test ++++ b/gmakefile.test +@@ -127,11 +127,14 @@ + endif + -@$(GFORTRAN_DEP_CLEANUP) + ++#add xlf2003 flags ++XLF2003FLAGS = "-qxlf2003=polymorphic:bozlitargs:stopexcept:volatile:autorealloc" ++ + $(TESTDIR)/%.o : $(EXAMPLESDIR)/%.F90 | $$(@D)/.DIR + ifeq ($(FC_MODULE_OUTPUT_FLAG),) + $(call quiet,FCMOD) $(MODDIR) && $(FC) -c $(FC_FLAGS) $(FFLAGS) $(FCPPFLAGS) $(FC_DEPFLAGS) -I$(dir $<) $(abspath $<) -o $(abspath $@) + else +- $(PETSC_COMPILE.F) -I$(dir $<) $(abspath $<) -o $@ $(FC_MODULE_OUTPUT_FLAG)$(MODDIR) $(FC_MODULE_FLAG)$(MODDIR) ++ $(PETSC_COMPILE.F) ${XLF2003FLAGS} -I$(dir $<) $(abspath $<) -o $@ $(FC_MODULE_OUTPUT_FLAG)$(MODDIR) $(FC_MODULE_FLAG)$(MODDIR) + endif + -@$(GFORTRAN_DEP_CLEANUP) + + -- cgit v1.2.3-70-g09d2 From a5d6f79fe0d3a698f64f10b3bfaecdb84d11bc30 Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Fri, 28 Sep 2018 13:11:09 -0500 Subject: r-rots: fix package type (#9344) --- var/spack/repos/builtin/packages/r-rots/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-rots/package.py b/var/spack/repos/builtin/packages/r-rots/package.py index 0bf0fcb064..d61efcf9c7 100644 --- a/var/spack/repos/builtin/packages/r-rots/package.py +++ b/var/spack/repos/builtin/packages/r-rots/package.py @@ -25,7 +25,7 @@ from spack import * -class RRots(Package): +class RRots(RPackage): """Calculates the Reproducibility-Optimized Test Statistic (ROTS) for differential testing in omics data.""" -- cgit v1.2.3-70-g09d2 From 43ae3bd2c97ea3f101009ca927bdf6ee6e21f6aa Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Fri, 28 Sep 2018 13:53:40 -0500 Subject: perl-cgi: new package starting at 4.37 (#9339) --- .../repos/builtin/packages/perl-cgi/package.py | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-cgi/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-cgi/package.py b/var/spack/repos/builtin/packages/perl-cgi/package.py new file mode 100644 index 0000000000..39d0126f71 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-cgi/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlCgi(PerlPackage): + """CGI - Handle Common Gateway Interface requests and responses + + CGI was included in the Perl distribution from 5.4 to 5.20 but + has since been removed.""" + + homepage = "https://metacpan.org/pod/CGI" + url = "https://cpan.metacpan.org/authors/id/L/LE/LEEJO/CGI-4.40.tar.gz" + + version('4.40', sha256='10efff3061b3c31a33b3cc59f955aef9c88d57d12dbac46389758cef92f24f56') + version('4.39', sha256='7e73417072445f24e03d63802ed3a9e368c9b103ddc96e2a9bcb6a251215fb76') + version('4.38', sha256='8c58f4a529bb92a914b22b7e64c5e31185c9854a4070a6dfad44fe5cc248e7d4') + version('4.37', sha256='7a14eee5df640f7141848f653cf48d99bfc9b5c68e18167338ee01b91cdfb883') + + depends_on('perl-html-parser', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 5d3fb74e24ea6109fc8254853e483d9aac868a94 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Fri, 28 Sep 2018 13:54:50 -0500 Subject: r-misc3d: add a real homepage (#9283) --- var/spack/repos/builtin/packages/r-misc3d/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-misc3d/package.py b/var/spack/repos/builtin/packages/r-misc3d/package.py index c4893d4919..8041858ef4 100644 --- a/var/spack/repos/builtin/packages/r-misc3d/package.py +++ b/var/spack/repos/builtin/packages/r-misc3d/package.py @@ -28,7 +28,7 @@ from spack import * class RMisc3d(RPackage): """A collection of miscellaneous 3d plots, including isosurfaces.""" - homepage = "http://www.example.com" + homepage = "https://cran.r-project.org/web/packages/misc3d/index.html" url = "https://cran.r-project.org/src/contrib/misc3d_0.8-4.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/misc3d" -- cgit v1.2.3-70-g09d2 From 6d0b3f0e7178227fa29a2336d1dc78d58b145468 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Fri, 28 Sep 2018 13:56:46 -0500 Subject: r-biocparallel: new link dependency added in last version (#9274) --- var/spack/repos/builtin/packages/r-biocparallel/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-biocparallel/package.py b/var/spack/repos/builtin/packages/r-biocparallel/package.py index 4f03ed175e..0f6c2d82b1 100644 --- a/var/spack/repos/builtin/packages/r-biocparallel/package.py +++ b/var/spack/repos/builtin/packages/r-biocparallel/package.py @@ -38,5 +38,6 @@ class RBiocparallel(RPackage): depends_on('r-futile-logger', type=('build', 'run')) depends_on('r-snow', type=('build', 'run')) + depends_on('r-bh', type=('build', 'link', 'run'), when='@1.14.2:') depends_on('r@3.4.0:3.4.9', when='@1.10.1', type=('build', 'run')) depends_on('r@3.5.0:3.5.9', when='@1.14.2', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From d6daa8fab5ff64006c281d31a7a3996e2697cb77 Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Fri, 28 Sep 2018 14:08:14 -0500 Subject: perl-dbd-sqlite: new package starting at 1.56 (#9338) --- .../builtin/packages/perl-dbd-sqlite/package.py | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-dbd-sqlite/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-dbd-sqlite/package.py b/var/spack/repos/builtin/packages/perl-dbd-sqlite/package.py new file mode 100644 index 0000000000..20935c1158 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-dbd-sqlite/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlDbdSqlite(PerlPackage): + """DBD::SQLite - Self-contained RDBMS in a DBI Driver""" + + homepage = "https://metacpan.org/pod/DBD::SQLite" + url = "https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.58.tar.gz" + + version('1.59_01', sha256='b6f331e4054688572c2010e72c355f7ba3f30d86051e50d9925d34d9df1001e2') + version('1.58', sha256='7120dd99d0338dea2802fda8bfe3fbf10077d5af559f6c67ae35e9270d1a1d3b') + version('1.57_01', sha256='fa7fb111fa8bfc257c3208f8980ac802a9cac4531ab98afc1988b88929672184') + version('1.56', sha256='c5f831a67a94f9bb2fb3c44051f309fc7994b2725d1896c018ad5d4cd865e991') + + depends_on('perl-dbi', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From e9863f56f3335c37e342556f6758f1439226fa1d Mon Sep 17 00:00:00 2001 From: "Aronnax, Miles V. [ISU/LAS]" Date: Fri, 28 Sep 2018 14:45:54 -0500 Subject: Gapfiller 1.10 f01 (#9163) * GapFiller.pl fixes: line endings, env perl, convert to Getopt::Std, requires perl with threads. * GapFiller.pl fixed source path, install location. * Fixed missing space. --- .../repos/builtin/packages/gapfiller/package.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gapfiller/package.py b/var/spack/repos/builtin/packages/gapfiller/package.py index dc4e9ac9c8..35f8b106c8 100644 --- a/var/spack/repos/builtin/packages/gapfiller/package.py +++ b/var/spack/repos/builtin/packages/gapfiller/package.py @@ -24,6 +24,7 @@ ############################################################################## from spack import * import os +import glob class Gapfiller(Package): @@ -44,9 +45,20 @@ class Gapfiller(Package): return "file://{0}/39GapFiller_v{1}_linux-x86_64.tar.gz".format( os.getcwd(), version.dashed) - depends_on('perl', type=('build', 'run')) + depends_on('perl+threads', type=('build', 'run')) + + def patch(self): + with working_dir('.'): + files = glob.iglob("*.pl") + for file in files: + change = FileFilter(file) + change.filter('usr/bin/perl', 'usr/bin/env perl') + change.filter('require "getopts.pl";', 'use Getopt::Std;') + change.filter('&Getopts', 'getopts') + change.filter('\r', '') + set_executable(file) def install(self, spec, prefix): - install_tree('bowtie', prefix.bowtie) - install_tree('bwa', prefix.bwa) - install('GapFiller.pl', prefix) + install_tree('bowtie', prefix.bin.bowtie) + install_tree('bwa', prefix.bin.bwa) + install('GapFiller.pl', prefix.bin) -- cgit v1.2.3-70-g09d2 From 6ac167a8916572431e7769c89b03f44c02b2f4bd Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Fri, 28 Sep 2018 14:48:31 -0500 Subject: libsigcpp: add a real homepage (#9282) --- var/spack/repos/builtin/packages/libsigcpp/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libsigcpp/package.py b/var/spack/repos/builtin/packages/libsigcpp/package.py index 2197f3f991..9669b1e491 100644 --- a/var/spack/repos/builtin/packages/libsigcpp/package.py +++ b/var/spack/repos/builtin/packages/libsigcpp/package.py @@ -28,7 +28,7 @@ from spack import * class Libsigcpp(AutotoolsPackage): """Libsigc++ is a C++ library for typesafe callbacks""" - homepage = "http://www.example.com" + homepage = "https://libsigcplusplus.github.io/libsigcplusplus/index.html" url = "https://ftp.acc.umu.se/pub/GNOME/sources/libsigc++/2.0/libsigc++-2.0.3.tar.gz" version('2.9.3', '0e5630fd0557ee80b5e5cbbcebaa2594') -- cgit v1.2.3-70-g09d2 From 017199b5d68d32c747c77bcae3a290ff59657b47 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Fri, 28 Sep 2018 14:49:45 -0500 Subject: py-flake8-polyfill: removing unnecessary build_args (#9284) --- var/spack/repos/builtin/packages/py-flake8-polyfill/package.py | 6 ------ 1 file changed, 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-flake8-polyfill/package.py b/var/spack/repos/builtin/packages/py-flake8-polyfill/package.py index e1ca84bd7d..38c593acce 100644 --- a/var/spack/repos/builtin/packages/py-flake8-polyfill/package.py +++ b/var/spack/repos/builtin/packages/py-flake8-polyfill/package.py @@ -37,9 +37,3 @@ class PyFlake8Polyfill(PythonPackage): extends('python', ignore='bin/(flake8|pyflakes|pycodestyle)') depends_on('py-flake8', type='run') - - def build_args(self, spec, prefix): - # FIXME: Add arguments other than --prefix - # FIXME: If not needed delete this function - args = [] - return args -- cgit v1.2.3-70-g09d2 From ad13a9989f706a0fe7ad0f69c59a4b66c5ae99e9 Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Fri, 28 Sep 2018 17:07:08 -0500 Subject: gsnap: add 2018-07-04 (#9356) --- var/spack/repos/builtin/packages/gmap-gsnap/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gmap-gsnap/package.py b/var/spack/repos/builtin/packages/gmap-gsnap/package.py index 7268111652..e9d6ab2841 100644 --- a/var/spack/repos/builtin/packages/gmap-gsnap/package.py +++ b/var/spack/repos/builtin/packages/gmap-gsnap/package.py @@ -33,6 +33,7 @@ class GmapGsnap(AutotoolsPackage): homepage = "http://research-pub.gene.com/gmap/" url = "http://research-pub.gene.com/gmap/src/gmap-gsnap-2017-06-16.tar.gz" + version('2018-07-04', sha256='a9f8c1f0810df65b2a089dc10be79611026f4c95e4681dba98fea3d55d598d24') version('2018-03-25', 'f08e65c1e4d9574a3eb7f15f8ca6af16') version('2018-02-12', '13152aedeef9ac66be915fc6bf6464f2') version('2017-06-16', 'fcc91b8bdd4bf12ae3124de0c00db0c0') -- cgit v1.2.3-70-g09d2 From bf757bd231f865ee732db90de83fc084dafffa59 Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Fri, 28 Sep 2018 20:38:51 -0500 Subject: lighttpd: install to bin vs sbin (#9337) --- var/spack/repos/builtin/packages/lighttpd/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lighttpd/package.py b/var/spack/repos/builtin/packages/lighttpd/package.py index b6e2066481..92ddc4e007 100644 --- a/var/spack/repos/builtin/packages/lighttpd/package.py +++ b/var/spack/repos/builtin/packages/lighttpd/package.py @@ -34,3 +34,6 @@ class Lighttpd(CMakePackage): version('1.4.50', sha256='c9a9f175aca6db22ebebbc47de52c54a99bbd1dce8d61bb75103609a3d798235') version('1.4.49', sha256='8b744baf9f29c386fff1a6d2e435491e726cb8d29cfdb1fe20ab782ee2fc2ac7') + + def cmake_args(self): + return ["-DSBINDIR=bin"] -- cgit v1.2.3-70-g09d2 From a6ab5edea638b69e9fcc9fddd236ea4a7a0308de Mon Sep 17 00:00:00 2001 From: Abhinav Bhatele Date: Sun, 30 Sep 2018 04:38:52 -0700 Subject: Laghos: add version 1.1 (#9389) --- var/spack/repos/builtin/packages/laghos/package.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/laghos/package.py b/var/spack/repos/builtin/packages/laghos/package.py index 83aae55c90..b9ca01689a 100644 --- a/var/spack/repos/builtin/packages/laghos/package.py +++ b/var/spack/repos/builtin/packages/laghos/package.py @@ -38,14 +38,16 @@ class Laghos(MakefilePackage): git = "https://github.com/CEED/Laghos.git" version('develop', branch='master') + version('1.1', sha256='53b9bfe2af263c63eb4544ca1731dd26f40b73a0d2775a9883db51821bf23b7f') version('1.0', '4c091e115883c79bed81c557ef16baff') variant('metis', default=True, description='Enable/disable METIS support') depends_on('mfem@develop+mpi+metis', when='@develop+metis') depends_on('mfem@develop+mpi~metis', when='@develop~metis') - depends_on('mfem@laghos-v1.0,3.3.2:+mpi+metis', when='@1.0+metis') - depends_on('mfem@laghos-v1.0,3.3.2:+mpi~metis', when='@1.0~metis') + + depends_on('mfem@laghos-v1.0,3.3.2:+mpi+metis', when='@1.0:+metis') + depends_on('mfem@laghos-v1.0,3.3.2:+mpi~metis', when='@1.0:~metis') @property def build_targets(self): -- cgit v1.2.3-70-g09d2 From 691a19226c11bdd301a33e821a70b8385c4f529a Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Mon, 1 Oct 2018 05:54:50 -0500 Subject: redundans: add py-numpy dep, snap-berkeley version constraint (#9354) --- var/spack/repos/builtin/packages/redundans/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/redundans/package.py b/var/spack/repos/builtin/packages/redundans/package.py index d54b54a4b4..ea3bea2c17 100644 --- a/var/spack/repos/builtin/packages/redundans/package.py +++ b/var/spack/repos/builtin/packages/redundans/package.py @@ -36,13 +36,14 @@ class Redundans(Package): depends_on('python', type=('build', 'run')) depends_on('py-pyscaf', type=('build', 'run')) depends_on('py-fastaindex', type=('build', 'run')) + depends_on('py-numpy', type=('build', 'run')) depends_on('perl', type=('build', 'run')) depends_on('sspace-standard') depends_on('bwa') depends_on('last') depends_on('gapcloser') depends_on('parallel') - depends_on('snap-berkeley') + depends_on('snap-berkeley@1.0beta.18:', type=('build', 'run')) def install(self, spec, prefix): mkdirp(prefix.bin) -- cgit v1.2.3-70-g09d2 From 57236fa2ce136ded8f9fdaaa36fbd8f46ab98666 Mon Sep 17 00:00:00 2001 From: Geoff Womeldorff Date: Mon, 1 Oct 2018 10:24:43 -0600 Subject: kokkos: add serial backend explicitly. add kokkos options and kokkos cuda options. (#9276) --- var/spack/repos/builtin/packages/kokkos/package.py | 98 +++++++++++++++++++++- 1 file changed, 95 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/kokkos/package.py b/var/spack/repos/builtin/packages/kokkos/package.py index 98304b4cda..f66e3edee4 100644 --- a/var/spack/repos/builtin/packages/kokkos/package.py +++ b/var/spack/repos/builtin/packages/kokkos/package.py @@ -45,13 +45,43 @@ class Kokkos(Package): version('2.02.15', 'de41e38f452a50bb03363c519fe20769') version('2.02.07', 'd5baeea70109249f7dca763074ffb202') + variant('serial', default=True, description="enable Serial backend (default)") variant('qthreads', default=False, description="enable Qthreads backend") variant('cuda', default=False, description="enable Cuda backend") variant('openmp', default=False, description="enable OpenMP backend") + # Kokkos options + variant('aggressive_vectorization', default=False, + description="set aggressive_vectorization Kokkos option") + variant('disable_profiling', default=False, + description="set disable_profiling Kokkos option") + variant('disable_dualview_modify_check', default=False, + description="set disable_dualview_modify_check Kokkos option") + variant('enable_profile_load_print', default=False, + description="set enable_profile_load_print Kokkos option") + variant('compiler_warnings', default=False, + description="set compiler_warnings Kokkos option") + variant('disable_deprecated_code', default=False, + description="set disable_deprecated_code Kokkos option") + variant('enable_eti', default=False, + description="set enable_eti Kokkos option") + + # CUDA options + variant('force_uvm', default=False, + description="set force_uvm Kokkos CUDA option") + variant('use_ldg', default=False, + description="set use_ldg Kokkos CUDA option") + variant('rdc', default=False, + description="set rdc Kokkos CUDA option") + variant('enable_lambda', default=False, + description="set enable_lambda Kokkos CUDA option") + gpu_values = ('Kepler30', 'Kepler32', 'Kepler35', 'Kepler37', 'Maxwell50', 'Maxwell52', 'Maxwell53', - 'Pascal60', 'Pascal61') + 'Pascal60', 'Pascal61', + 'Volta70', 'Volta72') + + cuda_options = ('force_uvm', 'use_ldg', 'rdc', 'enable_lambda') # Host architecture variant variant( @@ -71,18 +101,43 @@ class Kokkos(Package): description='Set the GPU architecture to use' ) + # Checks on Kokkos version and Kokkos options + conflicts('+aggressive_vectorization', when='@:2.0.99',) + conflicts('+disable_profiling', when='@:2.0.99',) + conflicts('+disable_dualview_modify_check', when='@:2.03.04',) + conflicts('+enable_profile_load_print', when='@:2.03.04',) + conflicts('+compiler_warnings', when='@:2.03.14',) + conflicts('+disable_deprecated_code', when='@:2.5.99',) + conflicts('+enable_eti', when='@:2.6.99',) + # Check that we haven't specified a gpu architecture # without specifying CUDA for p in gpu_values: conflicts('gpu_arch={0}'.format(p), when='~cuda', msg='Must specify CUDA backend to use a GPU architecture.') + # Check that we haven't specified a Kokkos CUDA option + # without specifying CUDA + conflicts('+force_uvm', when='~cuda', + msg='Must enable CUDA to use force_uvm.') + conflicts('+use_ldg', when='~cuda', + msg='Must enable CUDA to use use_ldg.') + conflicts('+rdc', when='~cuda', + msg='Must enable CUDA to use rdc.') + conflicts('+enable_lambda', when='~cuda', + msg='Must enable CUDA to use enable_lambda.') + + # Check that we haven't asked for a GPU architecture that + # the revision of kokkos does not support + conflicts('gpu_arch=Volta70', when='@:2.5.99') + conflicts('gpu_arch=Volta72', when='@:2.5.99') + # conflicts on kokkos version and cuda enabled # see kokkos issue #1296 # https://github.com/kokkos/kokkos/issues/1296 conflicts('+cuda', when='@2.5.00:develop', msg='Kokkos build system has issue when CUDA enabled' - ' in version 2.5.00, 2.7.00, and develop until ' + ' in version 2.5.00 through 2.7.00, and develop until ' 'issue #1296 is resolved.') # Specify that v1.x is required as v2.x has API changes @@ -97,10 +152,14 @@ class Kokkos(Package): g_args = [ '--prefix=%s' % prefix, '--with-hwloc=%s' % spec['hwloc'].prefix, - '--with-serial' ] arch_args = [] + kokkos_options_args = [] + cuda_options_args = [] + # Backends + if 'serial' in spec: + g_args.append('--with-serial') if '+openmp' in spec: g_args.append('--with-openmp') if 'qthreads' in spec: @@ -115,9 +174,42 @@ class Kokkos(Package): arch_args.append(host_arch) if gpu_arch: arch_args.append(gpu_arch) + # Combined architecture flags if arch_args: g_args.append('--arch={0}'.format(','.join(arch_args))) + # CUDA options + if '+force_uvm' in spec: + cuda_options_args.append('force_uvm') + if '+use_ldg' in spec: + cuda_options_args.append('use_ldg') + if '+rdc' in spec: + cuda_options_args.append('rdc') + if '+enable_lambda' in spec: + cuda_options_args.append('enable_lambda') + if cuda_options_args: + g_args.append('--with-cuda-options={0}' + .format(','.join(cuda_options_args))) + + # Kokkos options + if '+aggressive_vectorization' in spec: + kokkos_options_args.append('aggressive_vectorization') + if '+disable_profiling' in spec: + kokkos_options_args.append('disable_profiling') + if '+disable_dualview_modify_check' in spec: + kokkos_options_args.append('disable_dualview_modify_check') + if '+enable_profile_load_print' in spec: + kokkos_options_args.append('enable_profile_load_print') + if '+compiler_warnings' in spec: + kokkos_options_args.append('compiler_warnings') + if '+disable_deprecated_code' in spec: + kokkos_options_args.append('disable_deprecated_code') + if '+enable_eti' in spec: + kokkos_options_args.append('enable_eti') + if kokkos_options_args: + g_args.append('--with-options={0}' + .format(','.join(kokkos_options_args))) + generate(*g_args) make() make('install') -- cgit v1.2.3-70-g09d2 From d031bd7461159da78ad6c65c8acee01cd65c589d Mon Sep 17 00:00:00 2001 From: Ricardo Silva Date: Mon, 1 Oct 2018 22:43:40 +0200 Subject: patching p4est to select the proper openmp lib (#9381) * patching p4est to select the proper openmp lib * For when compiler.openmp_flag isn't supported * authored by @nrichart, I only tested it * Adding openmp variant Signed-off-by: Ricardo Silva --- var/spack/repos/builtin/packages/p4est/package.py | 27 ++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/p4est/package.py b/var/spack/repos/builtin/packages/p4est/package.py index e14061d126..e0b3478edb 100644 --- a/var/spack/repos/builtin/packages/p4est/package.py +++ b/var/spack/repos/builtin/packages/p4est/package.py @@ -36,6 +36,8 @@ class P4est(AutotoolsPackage): version('2.0', 'c522c5b69896aab39aa5a81399372a19a6b03fc6200d2d5d677d9a22fe31029a') version('1.1', '37ba7f4410958cfb38a2140339dbf64f') + variant('openmp', default=False, description='Enable OpenMP') + # build dependencies depends_on('automake', type='build') depends_on('autoconf', type='build') @@ -45,8 +47,20 @@ class P4est(AutotoolsPackage): depends_on('mpi') depends_on('zlib') + # from sc upstream, correct the default libraries + patch('https://github.com/cburstedde/libsc/commit/b506aab224b988fec210cc212469f2c4f58b2d04.patch', + sha256='e9418b1a9347a409be241cd185519b31950e42a7f55b6fb80ce53097657098ee', + working_dir='sc') + patch('https://github.com/cburstedde/libsc/commit/b45a51a7ef97883a3d4dcbd05cb2c77890a76f75.patch', + sha256='8fb829e34e3a1e28afdd6e56e0bdc1d377af569b7ccb9e9d8da0eeb5829ed27e', + working_dir='sc') + + def autoreconf(self, spec, prefix): + bootstrap = Executable('./bootstrap') + bootstrap() + def configure_args(self): - return [ + args = [ '--enable-mpi', '--enable-shared', '--disable-vtk-binary', @@ -58,3 +72,14 @@ class P4est(AutotoolsPackage): 'FC=%s' % self.spec['mpi'].mpifc, 'F77=%s' % self.spec['mpi'].mpif77 ] + + if '+openmp' in self.spec: + try: + args.append( + '--enable-openmp={0}'.format(self.compiler.openmp_flag)) + except UnsupportedCompilerFlag: + args.append('--enable-openmp') + else: + args.append('--disable-openmp') + + return args -- cgit v1.2.3-70-g09d2 From f38bfde6f36fe29efa5ed5317ed6b4890d8664b3 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Mon, 1 Oct 2018 16:55:41 -0500 Subject: nvptx-tools: add new package (#9378) * nvptx-tools: add new package * Update package.py * Update package.py --- .../repos/builtin/packages/nvptx-tools/package.py | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 var/spack/repos/builtin/packages/nvptx-tools/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nvptx-tools/package.py b/var/spack/repos/builtin/packages/nvptx-tools/package.py new file mode 100644 index 0000000000..4f3f40fb14 --- /dev/null +++ b/var/spack/repos/builtin/packages/nvptx-tools/package.py @@ -0,0 +1,50 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class NvptxTools(AutotoolsPackage): + """nvptx-tools: A collection of tools for use with nvptx-none GCC + toolchains. These tools are necessary when building a version + of GCC that enables offloading of OpenMP/OpenACC code to NVIDIA + GPUs.""" + + homepage = "https://github.com/MentorEmbedded/nvptx-tools" + git = "https://github.com/MentorEmbedded/nvptx-tools" + + version('2018-03-01', commit='5f6f343a302d620b0868edab376c00b15741e39e') + + depends_on('binutils') + depends_on('cuda') + + def configure_args(self): + cuda_dir = self.spec['cuda'].prefix + + config_args = [ + "--with-cuda-driver-include={0}".format(cuda_dir.include), + "--with-cuda-driver-lib={0}".format(cuda_dir.lib64) + ] + + return config_args -- cgit v1.2.3-70-g09d2 From 922c1a56520e3f376f4ce7a40324a5c452bc0f82 Mon Sep 17 00:00:00 2001 From: Geoff Womeldorff Date: Mon, 1 Oct 2018 17:36:55 -0600 Subject: kokkos: bugfix for case wherein kokkos backends enabled in spack but not parsed correctly (#9396) --- var/spack/repos/builtin/packages/kokkos/package.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/kokkos/package.py b/var/spack/repos/builtin/packages/kokkos/package.py index f66e3edee4..848be225c5 100644 --- a/var/spack/repos/builtin/packages/kokkos/package.py +++ b/var/spack/repos/builtin/packages/kokkos/package.py @@ -158,13 +158,13 @@ class Kokkos(Package): cuda_options_args = [] # Backends - if 'serial' in spec: + if '+serial' in spec: g_args.append('--with-serial') if '+openmp' in spec: g_args.append('--with-openmp') - if 'qthreads' in spec: + if '+qthreads' in spec: g_args.append('--with-qthreads=%s' % spec['qthreads'].prefix) - if 'cuda' in spec: + if '+cuda' in spec: g_args.append('--with-cuda=%s' % spec['cuda'].prefix) # Host architectures host_arch = spec.variants['host_arch'].value -- cgit v1.2.3-70-g09d2 From 658e42ae3f24299db778f3d190bdc1906cca11aa Mon Sep 17 00:00:00 2001 From: Prasanna Balaprakash Date: Tue, 2 Oct 2018 01:16:32 -0500 Subject: ytopt: new package (#9403) --- .../repos/builtin/packages/py-ytopt/package.py | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-ytopt/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-ytopt/package.py b/var/spack/repos/builtin/packages/py-ytopt/package.py new file mode 100644 index 0000000000..77b65d75dd --- /dev/null +++ b/var/spack/repos/builtin/packages/py-ytopt/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyYtopt(PythonPackage): + """Ytopt package implements search using Random Forest (SuRF), an autotuning + search method developed within Y-Tune ECP project.""" + + homepage = "https://xgitlab.cels.anl.gov/pbalapra/ytopt" + url = "https://xgitlab.cels.anl.gov/pbalapra/ytopt/raw/release/dist/ytopt-0.1.0.tar.gz" + + version('0.1.0', sha256='c7081fe3585a5b7a25bcb84733cd2326b72de3bfc4f84d6ad110341f24c3e612') + + depends_on('py-scikit-learn', type=('build', 'run')) + depends_on('py-scikit-optimize', type=('build', 'run')) + + def build_args(self, spec, prefix): + args = [] + return args -- cgit v1.2.3-70-g09d2 From 4e031d25a4e6e1ab36de5edcecdc1e08ab7658c3 Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Tue, 2 Oct 2018 09:20:47 -0500 Subject: raxml: build all matching variants (#9377) --- var/spack/repos/builtin/packages/raxml/package.py | 28 ++++++++++++----------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/raxml/package.py b/var/spack/repos/builtin/packages/raxml/package.py index b98866bfe2..4dea6f72d0 100644 --- a/var/spack/repos/builtin/packages/raxml/package.py +++ b/var/spack/repos/builtin/packages/raxml/package.py @@ -51,6 +51,9 @@ class Raxml(Package): conflicts('%xl') conflicts('%xl_r') + # can't build multiple binaries in parallel without things breaking + parallel = False + def install(self, spec, prefix): mkdirp(prefix.bin) files = glob.iglob("Makefile.*") @@ -62,46 +65,45 @@ class Raxml(Package): make('-f', 'Makefile.AVX.HYBRID.gcc') install('raxmlHPC-HYBRID-AVX', prefix.bin) - elif '+mpi' and '+sse' and '+pthreads' in spec: + if '+mpi' and '+sse' and '+pthreads' in spec: make('-f', 'Makefile.SSE3.HYBRID.gcc') install('raxmlHPC-HYBRID-SSE3', prefix.bin) - elif '+mpi' and '+pthreads' in spec: + if '+mpi' and '+pthreads' in spec: make('-f', 'Makefile.HYBRID.gcc') install('raxmlHPC-HYBRID', prefix.bin) - elif '+mpi' and '+avx' in spec: + if '+mpi' and '+avx' in spec: make('-f', 'Makefile.AVX.MPI.gcc') install('raxmlHPC-MPI-AVX', prefix.bin) - elif '+mpi' and '+sse' in spec: + if '+mpi' and '+sse' in spec: make('-f', 'Makefile.SSE3.MPI.gcc') install('raxmlHPC-MPI-SSE3', prefix.bin) - elif '+mpi' in spec: + if '+mpi' in spec: make('-f', 'Makefile.MPI.gcc') install('raxmlHPC-MPI', prefix.bin) - elif '+pthreads' and '+avx' in spec: + if '+pthreads' and '+avx' in spec: make('-f', 'Makefile.AVX.PTHREADS.gcc') install('raxmlHPC-PTHREADS-AVX', prefix.bin) - elif '+pthreads' and '+sse' in spec: + if '+pthreads' and '+sse' in spec: make('-f', 'Makefile.SSE3.PTHREADS.gcc') install('raxmlHPC-PTHREADS-SSE3', prefix.bin) - elif '+pthreads' in spec: + if '+pthreads' in spec: make('-f', 'Makefile.PTHREADS.gcc') install('raxmlHPC-PTHREADS', prefix.bin) - elif '+sse' in spec: + if '+sse' in spec: make('-f', 'Makefile.SSE3.gcc') install('raxmlHPC-SSE3', prefix.bin) - elif '+avx' in spec: + if '+avx' in spec: make('-f', 'Makefile.AVX.gcc') install('raxmlHPC-AVX', prefix.bin) - else: - make('-f', 'Makefile.gcc') - install('raxmlHPC', prefix.bin) + make('-f', 'Makefile.gcc') + install('raxmlHPC', prefix.bin) -- cgit v1.2.3-70-g09d2 From 25be114f75b6b709a6b89ea652e74c6e00e2885b Mon Sep 17 00:00:00 2001 From: Abhinav Bhatele Date: Tue, 2 Oct 2018 11:04:11 -0700 Subject: new package: TraceR (#9298) --- var/spack/repos/builtin/packages/tracer/package.py | 58 ++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 var/spack/repos/builtin/packages/tracer/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/tracer/package.py b/var/spack/repos/builtin/packages/tracer/package.py new file mode 100644 index 0000000000..9ebeebe11e --- /dev/null +++ b/var/spack/repos/builtin/packages/tracer/package.py @@ -0,0 +1,58 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Tracer(MakefilePackage): + """Trace Replay and Network Simulation Framework""" + + homepage = "https://tracer-codes.readthedocs.io" + git = "https://github.com/LLNL/tracer.git" + + maintainers = ['bhatele'] + + version('develop', branch='master') + + variant('otf2', default=True, description='Use OTF2 traces for simulation') + + depends_on('mpi') + depends_on('codes') + depends_on('otf2', when='+otf2') + + build_directory = 'tracer' + + @property + def build_targets(self): + targets = [] + + targets.append('CXX = {0}'.format(self.spec['mpi'].mpicxx)) + if "+otf2" in self.spec: + targets.append('SELECT_TRACE = -DTRACER_OTF_TRACES=1') + + return targets + + def install(self, spec, prefix): + with working_dir(self.build_directory): + make('PREFIX={0}'.format(prefix), 'install') -- cgit v1.2.3-70-g09d2 From e8af5847a0a370c86a8413b0a1277f658b27aeeb Mon Sep 17 00:00:00 2001 From: David Orman Date: Tue, 2 Oct 2018 13:04:57 -0500 Subject: Intel parallel studio 2019 cluster edition (#9295) * untracking file * intel-parallel-studio: added 2019 cluster edition and checksum --- var/spack/repos/builtin/packages/intel-parallel-studio/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py index ab72c95fc1..1e493d6b19 100644 --- a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py +++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py @@ -36,6 +36,8 @@ class IntelParallelStudio(IntelPackage): # intel-parallel-studio@cluster.2018 # Cluster Edition (top tier; all components included) + version('cluster.2019.0', 'd4c249c5438c1a55640291efcc96418d', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13589/parallel_studio_xe_2019_cluster_edition.tgz') + # version('cluster.2018.3', '7112837d20a100b895d9cd9ba9b6748d', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12998/parallel_studio_xe_2018_update3_cluster_edition.tgz') version('cluster.2018.2', '3b8d93a3fa10869dde024b739b96a9c4', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12717/parallel_studio_xe_2018_update2_cluster_edition.tgz') version('cluster.2018.1', '9c007011e0e3fc72747b58756fbf01cd', url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12374/parallel_studio_xe_2018_update1_cluster_edition.tgz') -- cgit v1.2.3-70-g09d2 From 1ba061f6ec86a841874fc134de16081b4d6adbe7 Mon Sep 17 00:00:00 2001 From: Abhinav Bhatele Date: Tue, 2 Oct 2018 14:46:09 -0700 Subject: MACSio: update package (#9412) --- var/spack/repos/builtin/packages/macsio/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/macsio/package.py b/var/spack/repos/builtin/packages/macsio/package.py index c5440a2a05..53cdb14842 100644 --- a/var/spack/repos/builtin/packages/macsio/package.py +++ b/var/spack/repos/builtin/packages/macsio/package.py @@ -31,10 +31,12 @@ class Macsio(CMakePackage): tags = ['proxy-app', 'ecp-proxy-app'] homepage = "https://computation.llnl.gov/projects/co-design/macsio" - url = "https://github.com/LLNL/MACSio/archive/1.0.tar.gz" + url = "https://github.com/LLNL/MACSio/archive/v1.1.tar.gz" git = "https://github.com/LLNL/MACSio.git" version('develop', branch='master') + + version('1.1', sha256='a86249b0f10647c0b631773db69568388094605ec1a0af149d9e61e95e6961ec') version('1.0', '90e8e00ea84af2a47bee387ad331dbde') variant('mpi', default=True, description="Build MPI plugin") -- cgit v1.2.3-70-g09d2 From f6fb176d10f67b9ab2edafe859416d9f4ed9c2ce Mon Sep 17 00:00:00 2001 From: Abhinav Bhatele Date: Tue, 2 Oct 2018 14:46:31 -0700 Subject: PICSARlite: actually builds PICSARlite now instead of PICSAR (#9410) also removed variants which shouldn't be there --- .../repos/builtin/packages/picsarlite/package.py | 77 ++++++---------------- 1 file changed, 19 insertions(+), 58 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/picsarlite/package.py b/var/spack/repos/builtin/packages/picsarlite/package.py index 2ec14f48f5..9a3280001e 100644 --- a/var/spack/repos/builtin/packages/picsarlite/package.py +++ b/var/spack/repos/builtin/packages/picsarlite/package.py @@ -38,49 +38,24 @@ class Picsarlite(MakefilePackage): version('develop', branch='PICSARlite') version('0.1', tag='PICSARlite-0.1') - variant('prod', default=False, - description='Production mode (without FFTW)') - variant('prod_spectral', default=False, + variant('prod', default=True, description='Production mode (without FFTW)') + variant('prod_spectral', default=False, description='Production mode with spectral solver and FFTW') - variant('debug', default=True, - description='Debug mode') - variant('vtune', default=False, - description='Vtune profiling') - variant('sde', default=False, - description='sde profiling') - variant('map', default=False, - description='Allinea Map profiling') + variant('debug', default=False, description='Debug mode') + variant('vtune', default=False, description='Vtune profiling') + variant('sde', default=False, description='sde profiling') + variant('map', default=False, description='Allinea Map profiling') variant('library', default=False, description='Create static and dynamic library') - variant('cori2', default=False, - description='Build for cori2') - variant('cori1', default=False, - description='Build for cori1') - variant('edison', default=False, - description='Build for edison') - variant('default', default=True, - description='Default build') - - variant('knl', default=False, - description='Build for knl architecture') - variant('ivy', default=False, - description='Build for ivy bridge architecture') - variant('hsw', default=False, - description='Build for haswell architecture') - variant('host', default=True, - description='Build for the host architecture') - depends_on('mpi') depends_on('fftw@3.0: +mpi', when='+prod_spectral') @property def build_targets(self): targets = [] - serial = '-j1' targets.append('FC={0}'.format(self.spec['mpi'].mpifc)) targets.append('CC={0}'.format(self.spec['mpi'].mpicc)) - targets.append(format(serial)) comp = 'user' vendors = {'%gcc': 'gnu', '%intel': 'intel'} @@ -88,6 +63,9 @@ class Picsarlite(MakefilePackage): if self.spec.satisfies(key): comp = value targets.append('COMP={0}'.format(comp)) + if comp is 'user': + targets.append('FARGS={0}{1}'.format('-g -O3 ', + self.compiler.openmp_flag)) if '+prod' in self.spec: mode = 'prod' @@ -105,34 +83,17 @@ class Picsarlite(MakefilePackage): mode = 'library' targets.append('MODE = {0}'.format(mode)) - if '+cori2' in self.spec: - sys = 'cori2' - elif '+cori1' in self.spec: - sys = 'cori1' - elif '+edison' in self.spec: - sys = 'edison' - elif '+default' in self.spec: - sys = 'default' - targets.append('SYS = {0}'.format(sys)) - - if '+knl' in self.spec: - arch = 'knl' - elif '+ivy' in self.spec: - arch = 'ivy' - elif '+hsw' in self.spec: - arch = 'hsw' - elif '+host' in self .spec: - arch = 'host' - targets.append('ARCH = {0}'.format(arch)) + targets.append('SYS = default') return targets + def build(self, spec, prefix): + with working_dir('PICSARlite'): + make(parallel=False) + def install(self, spec, prefix): - install_tree('Acceptance_testing', prefix.Acceptance_testing) - install_tree('performance_tests', prefix.performance_tests) - install_tree('examples', prefix.examples) - install_tree('python_module', prefix.python_module) - install_tree('utils', prefix.utils) - mkdirp(prefix.doc) - install('README.md', prefix.doc) - install('license.txt', prefix.doc) + mkdirp(prefix.docs) + install('PICSARlite/README.md', prefix.docs) + + mkdirp(prefix.bin) + install('PICSARlite/bin/picsar', prefix.bin) -- cgit v1.2.3-70-g09d2 From 46a9121f00f2bc21733b3120832395022a9ccd92 Mon Sep 17 00:00:00 2001 From: rvinaybharadwaj Date: Tue, 2 Oct 2018 16:03:58 -0600 Subject: Spackage for Thornado-mini (#9363) --- .../builtin/packages/thornado-mini/package.py | 96 ++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 var/spack/repos/builtin/packages/thornado-mini/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/thornado-mini/package.py b/var/spack/repos/builtin/packages/thornado-mini/package.py new file mode 100644 index 0000000000..68a385c2b9 --- /dev/null +++ b/var/spack/repos/builtin/packages/thornado-mini/package.py @@ -0,0 +1,96 @@ +############################################################################## +# Copyright (c) 2018, Los Alamos National Security, LLC. +# Produced at the Los Alamos National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * +import os + + +class ThornadoMini(MakefilePackage): + """Code to solve the equation of radiative transfer in the + multi-group two-moment approximation""" + + tags = ['proxy-app', 'ecp-proxy-app'] + + homepage = "https://sites.google.com/lbl.gov/exastar/home" + url = "https://github.com/ECP-Astro/thornado_mini/archive/v1.0.tar.gz" + git = "https://github.com/ECP-Astro/thornado_mini.git" + + version('1.0', sha256='8a9f97acc823d374cce567831270cfcc50fa968949e49159c7e3442b93a2827d') + + depends_on('mpi') + depends_on('hdf5+fortran') + depends_on('lapack') + + parallel = False + + def edit(self, spec, prefix): + os.environ['THORNADO_MACHINE'] = 'mymachine' + os.environ['THORNADO_DIR'] = os.getcwd() + + file = open('Makefile', 'w') + + file.write('FORTRAN_mymachine = %s %s\n' % (self.spec['mpi'].mpifc, + self.compiler.openmp_flag)) + file.write('FLINKER_mymachine = %s %s\n' % (self.spec['mpi'].mpifc, + self.compiler.openmp_flag)) + file.write('DEBUG_mymachine = -g -ffpe-trap=invalid,zero \ + -fcheck=bounds\n') + file.write('OPTIMIZE_mymachine = -O2\n') + file.write('INCLUDE_HDF5_mymachine = \n') + file.write('INCLUDE_LAPACK_mymachine = \n') + file.write('LIBRARIES_HDF5_mymachine = \n') + file.write('LIBRARIES_LAPACK_mymachine = \n') + file.write('export FORTRAN_mymachine FLINKER_mymachine \ + DEBUG_mymachine OPTIMIZE_mymachine\n') + + file.write('all:\n') + file.write('\t@$(MAKE) -C $(THORNADO_DIR)/DeleptonizationProblem/Executables \ + -f Makefile\n') + + file.close() + + @property + def build_targets(self): + targets = [] + + targets.append('INCLUDE_HDF5_mymachine = -I{0}' + .format(self.spec['hdf5'].prefix.include)) + targets.append('INCLUDE_LAPACK_mymachine = -I{0}' + .format(self.spec['lapack'].prefix.include)) + targets.append('LIBRARIES_HDF5_mymachine = {0} -lhdf5_fortran' + .format(self.spec['hdf5'].libs.ld_flags)) + targets.append('LIBRARIES_LAPACK_mymachine = {0}' + .format(self.spec['lapack'].libs.ld_flags)) + + return targets + + def install(self, spec, prefix): + install_tree('Documents', prefix.docs) + install('README.md', prefix.docs) + + mkdirp(prefix.bin) + install('DeleptonizationProblem/Executables/' + 'DeleptonizationProblem1D_%s' % + os.environ['THORNADO_MACHINE'], prefix.bin) -- cgit v1.2.3-70-g09d2 From d962e65cf22375b589e801c8fd75517583c14683 Mon Sep 17 00:00:00 2001 From: Abhinav Bhatele Date: Tue, 2 Oct 2018 15:04:49 -0700 Subject: PICSAR: new package (#9411) --- var/spack/repos/builtin/packages/picsar/package.py | 94 ++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 var/spack/repos/builtin/packages/picsar/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/picsar/package.py b/var/spack/repos/builtin/packages/picsar/package.py new file mode 100644 index 0000000000..eb15a6ae8b --- /dev/null +++ b/var/spack/repos/builtin/packages/picsar/package.py @@ -0,0 +1,94 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Picsar(MakefilePackage): + """PICSAR is a high performance library of optimized versions of the key + functionalities of the PIC loop. + """ + + homepage = "https://picsar.net" + git = "https://bitbucket.org/berkeleylab/picsar.git" + + version('develop', branch='master') + + variant('prod', default=True, description='Production mode (without FFTW)') + variant('prod_spectral', default=False, + description='Production mode with spectral solver and FFTW') + variant('debug', default=False, description='Debug mode') + variant('vtune', default=False, description='Vtune profiling') + variant('sde', default=False, description='sde profiling') + variant('map', default=False, description='Allinea Map profiling') + variant('library', default=False, + description='Create static and dynamic library') + + depends_on('mpi') + depends_on('fftw@3.0: +mpi', when='+prod_spectral') + + parallel = False + + @property + def build_targets(self): + targets = [] + targets.append('FC={0}'.format(self.spec['mpi'].mpifc)) + targets.append('CC={0}'.format(self.spec['mpi'].mpicc)) + + comp = 'user' + vendors = {'%gcc': 'gnu', '%intel': 'intel'} + for key, value in vendors.items(): + if self.spec.satisfies(key): + comp = value + targets.append('COMP={0}'.format(comp)) + if comp is 'user': + targets.append('FARGS={0}{1}'.format('-g -O3 ', + self.compiler.openmp_flag)) + + if '+prod' in self.spec: + mode = 'prod' + elif '+prod_spectral' in self.spec: + mode = 'prod_spectral' + elif '+debug' in self.spec: + mode = 'debug' + elif '+vtune' in self.spec: + mode = 'vtune' + elif '+sde' in self.spec: + mode = 'sde' + elif '+map' in self.spec: + mode = 'map' + elif '+library' in self.spec: + mode = 'library' + targets.append('MODE = {0}'.format(mode)) + + targets.append('SYS = default') + + return targets + + def install(self, spec, prefix): + mkdirp(prefix.docs) + install('README.md', prefix.docs) + + mkdirp(prefix.bin) + install('fortran_bin/picsar', prefix.bin) -- cgit v1.2.3-70-g09d2 From 676b3b0364d0ffd7f3e5360b50526145f0fecdae Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Tue, 2 Oct 2018 15:35:06 -0700 Subject: added py-matplotlib version 3.0.0 (#9335) --- var/spack/repos/builtin/packages/py-matplotlib/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-matplotlib/package.py b/var/spack/repos/builtin/packages/py-matplotlib/package.py index 38db52146b..a199a55a81 100644 --- a/var/spack/repos/builtin/packages/py-matplotlib/package.py +++ b/var/spack/repos/builtin/packages/py-matplotlib/package.py @@ -34,6 +34,7 @@ class PyMatplotlib(PythonPackage): homepage = "https://pypi.python.org/pypi/matplotlib" url = "https://pypi.io/packages/source/m/matplotlib/matplotlib-2.0.2.tar.gz" + version('3.0.0', '39c7f44c8fa0f24cbf684137371ce4ae') version('2.2.3', '403b0bddd751d71187416f20d4cff100') version('2.2.2', 'dd1e49e041309a7fd4e32be8bf17c3b6') version('2.0.2', '061111784278bde89b5d4987014be4ca') @@ -67,6 +68,7 @@ class PyMatplotlib(PythonPackage): # directories (i.e., matplotlib and basemap) depends_on('py-setuptools', type=('build', 'run')) + depends_on('python@3.5:', when='@3:') depends_on('libpng@1.2:') depends_on('freetype@2.3:') patch('freetype-include-path.patch', when='@2.2.2:2.9.9') # Patch to pick up correct freetype headers -- cgit v1.2.3-70-g09d2 From 0352b4808e0d8064e00493577dac7e6f7cf03b1a Mon Sep 17 00:00:00 2001 From: Abhinav Bhatele Date: Tue, 2 Oct 2018 15:35:41 -0700 Subject: [WIP] Release 2.0 of the ECP Proxy Apps suite (#9368) * Release 2.0 of the ECP Proxy Apps suite * update laghos version * make install dir structure consistent across all ecp-proxy-apps * minor * update macsio version --- .../builtin/packages/ecp-proxy-apps/package.py | 44 ++++++++++++++++------ .../repos/builtin/packages/examinimd/package.py | 6 +-- var/spack/repos/builtin/packages/macsio/package.py | 4 ++ .../repos/builtin/packages/miniamr/package.py | 4 +- .../repos/builtin/packages/miniqmc/package.py | 2 +- 5 files changed, 42 insertions(+), 18 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py b/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py index cc3a45849a..b792ae3f77 100644 --- a/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py +++ b/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py @@ -33,30 +33,50 @@ class EcpProxyApps(Package): installs the ECP proxy application suite. """ - homepage = "https://exascaleproject.github.io/proxy-apps" + tags = ['proxy-app', 'ecp-proxy-app'] + maintainers = ['bhatele'] + homepage = "https://exascaleproject.github.io/proxy-apps" # Dummy url url = 'https://github.com/exascaleproject/proxy-apps/archive/v1.0.tar.gz' - tags = ['proxy-app', 'ecp-proxy-app'] - + version('2.0', sha256='5f3cb3a772224e738c1dab42fb34d40f6b313af51ab1c575fb334e573e41e09a') version('1.1', '15825c318acd3726fd8e72803b1c1090') version('1.0', '8b3f00f05e6cde88d8d913da4293ee62') + # Added with release 2.0 + depends_on('ember@1.0.0', when='@2.0:') + depends_on('miniqmc@0.4.0', when='@2.0:') + depends_on('minivite@1.0', when='@2.0:') + depends_on('picsarlite@0.1', when='@2.0:') + depends_on('thornado-mini@1.0', when='@2.0:') + + depends_on('amg@1.1', when='@2.0:') + depends_on('candle-benchmarks@0.1', when='@2.0:') + depends_on('laghos@1.1', when='@2.0:') + depends_on('macsio@1.1', when='@2.0:') + depends_on('miniamr@1.4.1', when='@2.0:') + depends_on('sw4lite@1.1', when='@2.0:') + depends_on('xsbench@18', when='@2.0:') + # Added with release 1.1 depends_on('examinimd@1.0', when='@1.1:') - depends_on('amg@1.0', when='@1.0:') - depends_on('candle-benchmarks@0.0', when='@1.0:') - depends_on('laghos@1.0', when='@1.0:') - depends_on('macsio@1.0', when='@1.0:') - depends_on('miniamr@1.4.0', when='@1.0:') - depends_on('minife@2.1.0', when='@1.0:') - depends_on('minitri@1.0', when='@1.0:') depends_on('nekbone@17.0', when='@1.0:') - depends_on('sw4lite@1.0', when='@1.0:') depends_on('swfft@1.0', when='@1.0:') - depends_on('xsbench@14', when='@1.0:') + + # Dependencies for versions 1.0:1.1 + depends_on('amg@1.0', when='@1.0:1.1') + depends_on('candle-benchmarks@0.0', when='@1.0:1.1') + depends_on('laghos@1.0', when='@1.0:1.1') + depends_on('macsio@1.0', when='@1.0:1.1') + depends_on('miniamr@1.4.0', when='@1.0:1.1') + depends_on('sw4lite@1.0', when='@1.0:1.1') + depends_on('xsbench@14', when='@1.0:1.1') + + # Removed after release 1.1 + depends_on('minife@2.1.0', when='@1.0:1.1') + depends_on('minitri@1.0', when='@1.0:1.1') # Removed after release 1.0 depends_on('comd@1.1', when='@1.0') diff --git a/var/spack/repos/builtin/packages/examinimd/package.py b/var/spack/repos/builtin/packages/examinimd/package.py index f4a493342b..2bf30715b4 100644 --- a/var/spack/repos/builtin/packages/examinimd/package.py +++ b/var/spack/repos/builtin/packages/examinimd/package.py @@ -81,6 +81,6 @@ class Examinimd(MakefilePackage): mkdirp(prefix.bin) install('src/ExaMiniMD', prefix.bin) install_tree('input', prefix.input) - mkdirp(prefix.doc) - install('README.md', prefix.doc) - install('LICENSE', prefix.doc) + mkdirp(prefix.docs) + install('README.md', prefix.docs) + install('LICENSE', prefix.docs) diff --git a/var/spack/repos/builtin/packages/macsio/package.py b/var/spack/repos/builtin/packages/macsio/package.py index 53cdb14842..7539f6341a 100644 --- a/var/spack/repos/builtin/packages/macsio/package.py +++ b/var/spack/repos/builtin/packages/macsio/package.py @@ -116,3 +116,7 @@ class Macsio(CMakePackage): .format(spec['netcdf'].prefix)) return cmake_args + + def install(self, spec, prefix): + mkdirp(prefix.bin) + install('spack-build/macsio/macsio', prefix.bin) diff --git a/var/spack/repos/builtin/packages/miniamr/package.py b/var/spack/repos/builtin/packages/miniamr/package.py index c4aa2a0f61..cc97e0e3e5 100644 --- a/var/spack/repos/builtin/packages/miniamr/package.py +++ b/var/spack/repos/builtin/packages/miniamr/package.py @@ -60,8 +60,8 @@ class Miniamr(MakefilePackage): def install(self, spec, prefix): # Manual installation mkdir(prefix.bin) - mkdir(prefix.doc) + mkdir(prefix.docs) install('ref/ma.x', prefix.bin) # Install Support Documents - install('ref/README', prefix.doc) + install('ref/README', prefix.docs) diff --git a/var/spack/repos/builtin/packages/miniqmc/package.py b/var/spack/repos/builtin/packages/miniqmc/package.py index e7b53c84e6..974b1f9b86 100644 --- a/var/spack/repos/builtin/packages/miniqmc/package.py +++ b/var/spack/repos/builtin/packages/miniqmc/package.py @@ -26,7 +26,7 @@ from spack import * class Miniqmc(CMakePackage): - """a simplified real space QMC code for algorithm development, + """A simplified real space QMC code for algorithm development, performance portability testing, and computer science experiments """ -- cgit v1.2.3-70-g09d2 From 89ccaa2472cf88a548ba91050fa6b7f8ce410441 Mon Sep 17 00:00:00 2001 From: sknigh Date: Tue, 2 Oct 2018 15:48:28 -0700 Subject: Added perl 5.28 (#9379) --- var/spack/repos/builtin/packages/perl/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl/package.py b/var/spack/repos/builtin/packages/perl/package.py index ef69a88ad3..b2c662cc4f 100644 --- a/var/spack/repos/builtin/packages/perl/package.py +++ b/var/spack/repos/builtin/packages/perl/package.py @@ -53,6 +53,7 @@ class Perl(Package): # Perl doesn't use Autotools, it should subclass Package version('5.25.11', '37a398682c36cd85992b34b5c1c25dc1') # Maintenance releases (even numbers, recommended) + version('5.28.0', sha256='7e929f64d4cb0e9d1159d4a59fc89394e27fa1f7004d0836ca0d514685406ea8') version('5.26.2', 'dc0fea097f3992a8cd53f8ac0810d523', preferred=True) version('5.24.1', '765ef511b5b87a164e2531403ee16b3c') @@ -77,7 +78,7 @@ class Perl(Package): # Perl doesn't use Autotools, it should subclass Package # Fix build on Fedora 28 # https://bugzilla.redhat.com/show_bug.cgi?id=1536752 - patch('https://src.fedoraproject.org/rpms/perl/raw/004cea3a67df42e92ffdf4e9ac36d47a3c6a05a4/f/perl-5.26.1-guard_old_libcrypt_fix.patch', level=1, sha256='0eac10ed90aeb0459ad8851f88081d439a4e41978e586ec743069e8b059370ac') + patch('https://src.fedoraproject.org/rpms/perl/raw/004cea3a67df42e92ffdf4e9ac36d47a3c6a05a4/f/perl-5.26.1-guard_old_libcrypt_fix.patch', level=1, sha256='0eac10ed90aeb0459ad8851f88081d439a4e41978e586ec743069e8b059370ac', when='@:5.26.2') # Installing cpanm alongside the core makes it safe and simple for # people/projects to install their own sets of perl modules. Not -- cgit v1.2.3-70-g09d2 From d056427a0064ef01612981c42131c38633ed2271 Mon Sep 17 00:00:00 2001 From: sknigh Date: Tue, 2 Oct 2018 17:24:13 -0700 Subject: Added cudnn 7.3 (#9400) --- var/spack/repos/builtin/packages/cudnn/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cudnn/package.py b/var/spack/repos/builtin/packages/cudnn/package.py index a9958537c3..9abc66eb93 100644 --- a/var/spack/repos/builtin/packages/cudnn/package.py +++ b/var/spack/repos/builtin/packages/cudnn/package.py @@ -31,6 +31,8 @@ class Cudnn(Package): homepage = "https://developer.nvidia.com/cudnn" + version('7.3', '72666d3532850752612706601258a0b2', + url='https://developer.nvidia.com/compute/machine-learning/cudnn/secure/v7.3.0/prod/9.0_2018920/cudnn-9.0-linux-x64-v7.3.0.29.tgz') version('6.0', 'a08ca487f88774e39eb6b0ef6507451d', url='http://developer.download.nvidia.com/compute/redist/cudnn/v6.0/cudnn-8.0-linux-x64-v6.0.tgz') version('5.1', '406f4ac7f7ee8aa9e41304c143461a69', -- cgit v1.2.3-70-g09d2 From eff3ad33464ab7b44796d4b6e64edfc4014a2d8b Mon Sep 17 00:00:00 2001 From: Mario Melara Date: Tue, 2 Oct 2018 17:24:39 -0700 Subject: Spades: add version 3.12 (#9286) --- var/spack/repos/builtin/packages/spades/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/spades/package.py b/var/spack/repos/builtin/packages/spades/package.py index 4f2a6080ac..a286f6d174 100644 --- a/var/spack/repos/builtin/packages/spades/package.py +++ b/var/spack/repos/builtin/packages/spades/package.py @@ -32,6 +32,7 @@ class Spades(CMakePackage): homepage = "http://cab.spbu.ru/software/spades/" url = "http://cab.spbu.ru/files/release3.10.1/SPAdes-3.10.1.tar.gz" + version('3.12.0', '15b48a3bcbbe6a8ad58fd04ba5d3f1015990fbfd9bdf4913042803b171853ac7') version('3.11.1', '478677b560e2f98db025e8efd5245cdf') version('3.10.1', 'dcab7d145af81b59cc867562f27536c3') -- cgit v1.2.3-70-g09d2 From 8f29fbb6056d8ae520c8107c61f54f4070f7163c Mon Sep 17 00:00:00 2001 From: dorier Date: Wed, 3 Oct 2018 01:25:56 +0100 Subject: Adding new versions to Catalyst package (#9267) --- var/spack/repos/builtin/packages/catalyst/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/catalyst/package.py b/var/spack/repos/builtin/packages/catalyst/package.py index ca45b232fe..c4d8dcd8b0 100644 --- a/var/spack/repos/builtin/packages/catalyst/package.py +++ b/var/spack/repos/builtin/packages/catalyst/package.py @@ -37,9 +37,12 @@ class Catalyst(CMakePackage): simulation and analysis and/or visualization tasks.""" homepage = 'http://www.paraview.org' - url = "http://www.paraview.org/files/v5.4/ParaView-v5.4.1.tar.gz" + url = "http://www.paraview.org/files/v5.5/ParaView-v5.5.2.tar.gz" _urlfmt = 'http://www.paraview.org/files/v{0}/ParaView-v{1}{2}.tar.gz' + version('5.5.2', '7eb93c31a1e5deb7098c3b4275e53a4a') + version('5.5.1', 'a7d92a45837b67c3371006cc45163277') + version('5.5.0', 'a8f2f41edadffdcc89b37fdc9aa7f005') version('5.4.1', '4030c70477ec5a85aa72d6fc86a30753') version('5.4.0', 'b92847605bac9036414b644f33cb7163') version('5.3.0', '68fbbbe733aa607ec13d1db1ab5eba71') -- cgit v1.2.3-70-g09d2 From c46a7a61f0c71874b8b3df87125ffcdbb2d70762 Mon Sep 17 00:00:00 2001 From: alcharal Date: Wed, 3 Oct 2018 03:27:25 +0300 Subject: Abyss: added variant maxk (#9280) --- var/spack/repos/builtin/packages/abyss/package.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/abyss/package.py b/var/spack/repos/builtin/packages/abyss/package.py index cbf15ef039..f6fac09463 100644 --- a/var/spack/repos/builtin/packages/abyss/package.py +++ b/var/spack/repos/builtin/packages/abyss/package.py @@ -36,6 +36,10 @@ class Abyss(AutotoolsPackage): version('2.0.2', '1623f55ad7f4586e80f6e74b1f27c798') version('1.5.2', '10d6d72d1a915e618d41a5cbbcf2364c') + variant('maxk', values=int, default=0, + description='''set the maximum k-mer length. + This value must be a multiple of 32''') + depends_on('autoconf', type='build') depends_on('automake', type='build') @@ -52,9 +56,12 @@ class Abyss(AutotoolsPackage): conflicts('^spectrum-mpi') def configure_args(self): + maxk = int(self.spec.variants['maxk'].value) args = ['--with-boost=%s' % self.spec['boost'].prefix, '--with-sqlite=%s' % self.spec['sqlite'].prefix, '--with-mpi=%s' % self.spec['mpi'].prefix] + if maxk: + args.append('--enable-maxk=%s' % maxk) if self.spec['mpi'].name == 'mpich': args.append('--enable-mpich') return args -- cgit v1.2.3-70-g09d2 From 846e2c7ca92adabe697fb84c86df59ba8f68e455 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Wed, 3 Oct 2018 08:19:43 -0500 Subject: PETSc: configure use CFLAGS,FFLAGS,CXXFLAGS from spack (#9383) --- var/spack/repos/builtin/packages/petsc/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index 7b89028820..8faeff76e5 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -205,6 +205,9 @@ class Petsc(Package): '--download-c2html=0', '--download-sowing=0', '--download-hwloc=0', + 'CFLAGS=%s' % ' '.join(spec.compiler_flags['cflags']), + 'FFLAGS=%s' % ' '.join(spec.compiler_flags['fflags']), + 'CXXFLAGS=%s' % ' '.join(spec.compiler_flags['cxxflags']), 'COPTFLAGS=', 'FOPTFLAGS=', 'CXXOPTFLAGS='] -- cgit v1.2.3-70-g09d2 From 297f8537b52dcf80530451fd9c2eb371e3c4fb75 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Wed, 3 Oct 2018 09:52:12 -0500 Subject: trilinos: superlu_dist patch is now in trilinos develop - so removing it (#9422) https://github.com/trilinos/Trilinos/pull/3209 --- .../repos/builtin/packages/trilinos/package.py | 1 - .../packages/trilinos/superlu_dist_v5.4.0.patch | 56 ---------------------- 2 files changed, 57 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/trilinos/superlu_dist_v5.4.0.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index d43ad7999e..319e4bc977 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -309,7 +309,6 @@ class Trilinos(CMakePackage): depends_on('py-numpy', when='+python', type=('build', 'run')) depends_on('swig', when='+python') - patch('superlu_dist_v5.4.0.patch', when='@develop') patch('umfpack_from_suitesparse.patch', when='@11.14.1:12.8.1') patch('xlf_seacas.patch', when='@12.10.1:12.12.1 %xl') patch('xlf_seacas.patch', when='@12.10.1:12.12.1 %xl_r') diff --git a/var/spack/repos/builtin/packages/trilinos/superlu_dist_v5.4.0.patch b/var/spack/repos/builtin/packages/trilinos/superlu_dist_v5.4.0.patch deleted file mode 100644 index b094adf944..0000000000 --- a/var/spack/repos/builtin/packages/trilinos/superlu_dist_v5.4.0.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/packages/amesos/src/Amesos_Superludist.cpp b/packages/amesos/src/Amesos_Superludist.cpp -index f0542faebe..ddca911356 100644 ---- a/packages/amesos/src/Amesos_Superludist.cpp -+++ b/packages/amesos/src/Amesos_Superludist.cpp -@@ -135,7 +135,7 @@ Amesos_Superludist::Amesos_Superludist(const Epetra_LinearProblem &prob) : - Equil_ = true; - ColPerm_ = "MMD_AT_PLUS_A"; - perm_c_ = 0; -- RowPerm_ = "LargeDiag"; -+ RowPerm_ = "LargeDiag_MC64"; - perm_r_ = 0; - IterRefine_ = "DOUBLE"; - ReplaceTinyPivot_ = true; -@@ -472,7 +472,7 @@ int Amesos_Superludist::Factor() - } - - if( RowPerm_ == "NATURAL" ) PrivateSuperluData_->options_.RowPerm = (rowperm_t)NATURAL; -- if( RowPerm_ == "LargeDiag" ) PrivateSuperluData_->options_.RowPerm = LargeDiag; -+ if( RowPerm_ == "LargeDiag_MC64" ) PrivateSuperluData_->options_.RowPerm = LargeDiag_MC64; - else if( ColPerm_ == "MY_PERMR" ) { - PrivateSuperluData_->options_.RowPerm = MY_PERMR; - PrivateSuperluData_->ScalePermstruct_.perm_r = perm_r_; -diff --git a/packages/amesos/test/TestOptions/TestSuperludist.cpp b/packages/amesos/test/TestOptions/TestSuperludist.cpp -index dc1235f62d..de2ab9459a 100644 ---- a/packages/amesos/test/TestOptions/TestSuperludist.cpp -+++ b/packages/amesos/test/TestOptions/TestSuperludist.cpp -@@ -35,9 +35,9 @@ - // 16 false/true false true 2 - // 17 SamePattern true false true 10 - // 18 RowPerm - NATURAL true false false 10 --// 19 RowPerm - LargeDiag true false false 10 -+// 19 RowPerm - LargeDiag_MC64 true false false 10 - // 20 RowPerm - NATURAL true false false 10 --// 21 RowPerm - LargeDiag true false false 10 -+// 21 RowPerm - LargeDiag_MC64 true false false 10 - // 22 RowPerm - TinyPivot=t true false false 10 - // 23 RowPerm - TinyPivot=f true false false 10 - // -@@ -703,7 +703,7 @@ int TestSuperludist( Epetra_CrsMatrix *& Amat, - ParamList.set( "AddZeroToDiag", false ); - Teuchos::ParameterList& SuperludistParams = ParamList.sublist("Superludist") ; - SuperludistParams.set( "ReuseSymbolic", false ); -- SuperludistParams.set( "RowPerm", "LargeDiag" ); -+ SuperludistParams.set( "RowPerm", "LargeDiag_MC64" ); - SuperludistParams.set( "MaxProcesses", 10 ); - // ParamList.print( std::cerr, 10 ) ; - -@@ -772,7 +772,7 @@ int TestSuperludist( Epetra_CrsMatrix *& Amat, - ParamList.set( "AddZeroToDiag", false ); - Teuchos::ParameterList& SuperludistParams = ParamList.sublist("Superludist") ; - SuperludistParams.set( "ReuseSymbolic", true ); -- SuperludistParams.set( "RowPerm", "LargeDiag" ); -+ SuperludistParams.set( "RowPerm", "LargeDiag_MC64" ); - SuperludistParams.set( "MaxProcesses", 10 ); - // ParamList.print( std::cerr, 10 ) ; - -- cgit v1.2.3-70-g09d2 From 63844a97f813a6530c0e80bbda6094796386ce38 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Wed, 3 Oct 2018 09:12:14 -0600 Subject: openmc: version bump (#7974) * openmc: version bump * s/mit-crpg/openmc-dev/ --- var/spack/repos/builtin/packages/openmc/package.py | 61 ++++------------------ 1 file changed, 9 insertions(+), 52 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openmc/package.py b/var/spack/repos/builtin/packages/openmc/package.py index 9667c80cdd..20580b1623 100644 --- a/var/spack/repos/builtin/packages/openmc/package.py +++ b/var/spack/repos/builtin/packages/openmc/package.py @@ -26,66 +26,23 @@ from spack import * -class Openmc(MakefilePackage): +class Openmc(CMakePackage): """The OpenMC project aims to provide a fully-featured Monte Carlo particle transport code based on modern methods. It is a constructive solid geometry, continuous-energy transport code that uses ACE format cross sections. The project started under the Computational Reactor Physics Group at MIT.""" - homepage = "https://github.com/ANL-CESAR/" - git = "https://github.com/ANL-CESAR/openmc.git" - - tags = ['ecp', 'ecp-apps'] + homepage = "http://openmc.readthedocs.io/" + url = "https://github.com/openmc-dev/openmc/tarball/v0.10.0" + git = "https://github.com/openmc-dev/openmc.git" + version('0.10.0', 'abb57bd1b226eb96909dafeec31369b0') version('develop') - build_directory = 'src' - - parallel = False - - @property - def build_targets(self): - - targets = [] - - if self.compiler.name == 'gcc': - targets.append('COMPILER=gnu') - targets.append('MACHINE=UNKNOWN') - if self.compiler.name == 'intel': - targets.append('COMPILER=intel') - if self.compiler.name == 'pgi': - targets.append('COMPILER=pgi') - if self.compiler.name == 'xl': - targets.append('COMPILER=ibm') - if self.compiler.name == 'cce': - targets.append('COMPILER=cray') - - return targets + depends_on("hdf5+hl") - def install(self, spec, prefix): - with working_dir('src'): - pth_st_cmp = join_path(prefix.bin, 'statepoint_cmp') - pth_st_histogram = join_path(prefix.bin, 'statepoint_histogram') - pth_st_meshpoint = join_path(prefix.bin, 'statepoint_meshpoint') - pth_openmc = join_path(prefix, 'share/man/man1/openmc.1') - pth_copyright = join_path(prefix, 'share/doc/openmc/copyright') - mkdir(prefix.bin) - mkdirp(pth_st_cmp) - mkdirp(pth_st_histogram) - mkdirp(pth_st_meshpoint) - mkdirp(pth_openmc) - mkdirp(pth_copyright) + def cmake_args(self): + options = ['-DHDF5_ROOT:PATH=%s' % self.spec['hdf5'].prefix] - install('openmc', prefix.bin) - install('utils/statepoint_cmp.py', pth_st_cmp) - install('utils/statepoint_histogram.py', - pth_st_histogram) - install('utils/statepoint_meshplot.py', - pth_st_meshpoint) - install('man/man1/openmc.1', pth_openmc) - install('LICENSE', pth_copyright) - install_tree('docs/', prefix.docs) - install_tree('examples/', prefix.examples) - install_tree('data/', prefix.data) - install_tree('tests/', prefix.tests) + return options -- cgit v1.2.3-70-g09d2 From fe60b2f6def006feb1ca362006cb9b74fdb78d40 Mon Sep 17 00:00:00 2001 From: Matthias Wolf Date: Wed, 3 Oct 2018 17:12:30 +0200 Subject: py-progress: new package. (#9420) --- .../repos/builtin/packages/py-progress/package.py | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-progress/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-progress/package.py b/var/spack/repos/builtin/packages/py-progress/package.py new file mode 100644 index 0000000000..9a5da81545 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-progress/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyProgress(PythonPackage): + """Easy progress reporting for Python""" + + homepage = "https://github.com/verigak/progress/" + url = "https://pypi.org/packages/source/p/progress/progress-1.4.tar.gz" + + version('1.4', sha256='5e2f9da88ed8236a76fffbee3ceefd259589cf42dfbc2cec2877102189fae58a') + + depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From a97e9cb28254fc66b189a1f96fd748e8bc647317 Mon Sep 17 00:00:00 2001 From: "Valentin Clement (バレンタイン クレメン)" Date: Wed, 3 Oct 2018 17:17:13 +0200 Subject: CLAW Compiler: Add Spack Package (#9405) --- var/spack/repos/builtin/packages/claw/package.py | 28 ++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 var/spack/repos/builtin/packages/claw/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/claw/package.py b/var/spack/repos/builtin/packages/claw/package.py new file mode 100644 index 0000000000..28cef928b1 --- /dev/null +++ b/var/spack/repos/builtin/packages/claw/package.py @@ -0,0 +1,28 @@ +from spack import * + + +class Claw(CMakePackage): + """CLAW Compiler targets performance portability problem in climate and + weather application written in Fortran. From a single source code, it + generates architecture specific code decorated with OpenMP or OpenACC""" + + homepage = 'https://claw-project.github.io/' + git = 'https://github.com/claw-project/claw-compiler.git' + maintainers = ['clementval'] + + version('1.1.0', commit='16b165a443b11b025a77cad830b1280b8c9bcf01', submodules=True) + + depends_on('cmake@3.0:', type='build') + depends_on('java@7:') + depends_on('ant@1.9:') + depends_on('libxml2') + depends_on('bison') + + def cmake_args(self): + args = [] + spec = self.spec + + args.append('-DOMNI_CONF_OPTION=--with-libxml2={0}'. + format(spec['libxml2'].prefix)) + + return args -- cgit v1.2.3-70-g09d2 From 479e71a83240e8e34d94c3d60bc8a5d69945a275 Mon Sep 17 00:00:00 2001 From: Robert Pavel Date: Wed, 3 Oct 2018 11:47:17 -0600 Subject: Specified Maximum Matplotlib for Candle (#9425) Specifying that Candle-benchmarks requires matplotlib 2.x due to matplotlib 3.x requiring python 3.x --- var/spack/repos/builtin/packages/candle-benchmarks/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/candle-benchmarks/package.py b/var/spack/repos/builtin/packages/candle-benchmarks/package.py index f36c8df52f..ae6b1075fb 100644 --- a/var/spack/repos/builtin/packages/candle-benchmarks/package.py +++ b/var/spack/repos/builtin/packages/candle-benchmarks/package.py @@ -41,7 +41,7 @@ class CandleBenchmarks(Package): extends('python@2.7:') depends_on('py-theano +gpu', type=('build', 'run')) depends_on('py-keras', type=('build', 'run')) - depends_on('py-matplotlib +image', type=('build', 'run')) + depends_on('py-matplotlib +image@:2.2.3', type=('build', 'run')) depends_on('py-tqdm', type=('build', 'run')) depends_on('py-scikit-learn', type=('build', 'run')) depends_on('opencv@3.2.0: +core +highgui +imgproc +jpeg +png +tiff +zlib +python -dnn ~eigen') -- cgit v1.2.3-70-g09d2 From 98cdd616ca8541fadd9282dc60157679d77e1fd5 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Wed, 3 Oct 2018 19:33:22 -0700 Subject: py-flake8: enum34 not required for python 3.4 and up (#9415) py-flake8 only requires py-enum34 when using a python version earlier than 3.4 --- var/spack/repos/builtin/packages/py-flake8/package.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-flake8/package.py b/var/spack/repos/builtin/packages/py-flake8/package.py index 81a5838956..7de8251b3a 100644 --- a/var/spack/repos/builtin/packages/py-flake8/package.py +++ b/var/spack/repos/builtin/packages/py-flake8/package.py @@ -69,7 +69,12 @@ class PyFlake8(PythonPackage): # depends_on('py-configparser', when='^python@:3.3', type=('build', 'run')) # depends_on('py-enum34', when='^python@:3.1', type=('build', 'run')) depends_on('py-configparser', type=('build', 'run')) - depends_on('py-enum34', type=('build', 'run')) + + # py-enum34 provides enum module from Python 3.4 for Python + # versions 2.4, 2.5, 2.6, 2.7, 3.1, 3.2, and 3.3; use built-in enum + # module for Python versions 3.4 and later + depends_on('py-enum34', when='^python@2.4:2.7.999,3.1:3.3.999', + type=('build', 'run')) depends_on('py-nose', type='test') -- cgit v1.2.3-70-g09d2 From 7f4b436ab6a919c93b3e7baa82abfa95d7313e03 Mon Sep 17 00:00:00 2001 From: "Daryl W. Grunau" Date: Wed, 3 Oct 2018 20:34:38 -0600 Subject: ParaView: add versions (#9428) --- var/spack/repos/builtin/packages/paraview/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index 0bd2d85b11..fa60f97bff 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -34,6 +34,9 @@ class Paraview(CMakePackage): url = "http://www.paraview.org/files/v5.3/ParaView-v5.3.0.tar.gz" _urlfmt = 'http://www.paraview.org/files/v{0}/ParaView-v{1}{2}.tar.gz' + version('5.5.2', '7eb93c31a1e5deb7098c3b4275e53a4a') + version('5.5.1', 'a7d92a45837b67c3371006cc45163277') + version('5.5.0', 'a8f2f41edadffdcc89b37fdc9aa7f005') version('5.4.1', '4030c70477ec5a85aa72d6fc86a30753') version('5.4.0', 'b92847605bac9036414b644f33cb7163') version('5.3.0', '68fbbbe733aa607ec13d1db1ab5eba71') -- cgit v1.2.3-70-g09d2 From 219846684bef2313223e80ddf6578c2ec14fd540 Mon Sep 17 00:00:00 2001 From: Cody Balos Date: Wed, 3 Oct 2018 19:37:54 -0700 Subject: SUNDIALS: add new versions (#9401) * Add SUNDIALS 3.2.0 and 4.0.0-dev.2 releases. * Update CMake dependency version constraints * Update CMake args to find raja dependency --- .../repos/builtin/packages/sundials/package.py | 37 +++++++++++----------- 1 file changed, 18 insertions(+), 19 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sundials/package.py b/var/spack/repos/builtin/packages/sundials/package.py index 989dedd716..ba0e99d0a1 100644 --- a/var/spack/repos/builtin/packages/sundials/package.py +++ b/var/spack/repos/builtin/packages/sundials/package.py @@ -38,24 +38,16 @@ class Sundials(CMakePackage): # ========================================================================== # Versions # ========================================================================== - - version('4.0.0-dev.1', - sha256='6354e1d266b60c23766137b4ffa9bbde8bca97a562ccd94cab756b597ed753c1') - version('4.0.0-dev', - sha256='50e526327461aebe463accf6ef56f9c6773df65025f3020b9ce68b83bbf5dd27') - version('3.1.2', - sha256='a8985bb1e851d90e24260450667b134bc13d71f5c6effc9e1d7183bd874fe116', - preferred=True) - version('3.1.1', - sha256='a24d643d31ed1f31a25b102a1e1759508ce84b1e4739425ad0e18106ab471a24') - version('3.1.0', - sha256='18d52f8f329626f77b99b8bf91e05b7d16b49fde2483d3a0ea55496ce4cdd43a') - version('3.0.0', - sha256='28b8e07eecfdef66e2c0d0ea0cb1b91af6e4e94d71008abfe80c27bf39f63fde') - version('2.7.0', - sha256='d39fcac7175d701398e4eb209f7e92a5b30a78358d4a0c0fcc23db23c11ba104') - version('2.6.2', - sha256='d8ed0151509dd2b0f317b318a4175f8b95a174340fc3080b8c20617da8aa4d2f') + version('4.0.0-dev.2', sha256='124fc12f2a68d32210c20f5005510607e0833764afaef2a70b741bc922519984') + version('4.0.0-dev.1', sha256='6354e1d266b60c23766137b4ffa9bbde8bca97a562ccd94cab756b597ed753c1') + version('4.0.0-dev', sha256='50e526327461aebe463accf6ef56f9c6773df65025f3020b9ce68b83bbf5dd27') + version('3.2.0', sha256='d2b690afecadf8b5a048bb27ab341de591d714605b98d3518985dfc2250e93f9', preferred=True) + version('3.1.2', sha256='a8985bb1e851d90e24260450667b134bc13d71f5c6effc9e1d7183bd874fe116') + version('3.1.1', sha256='a24d643d31ed1f31a25b102a1e1759508ce84b1e4739425ad0e18106ab471a24') + version('3.1.0', sha256='18d52f8f329626f77b99b8bf91e05b7d16b49fde2483d3a0ea55496ce4cdd43a') + version('3.0.0', sha256='28b8e07eecfdef66e2c0d0ea0cb1b91af6e4e94d71008abfe80c27bf39f63fde') + version('2.7.0', sha256='d39fcac7175d701398e4eb209f7e92a5b30a78358d4a0c0fcc23db23c11ba104') + version('2.6.2', sha256='d8ed0151509dd2b0f317b318a4175f8b95a174340fc3080b8c20617da8aa4d2f') # ========================================================================== # Variants @@ -178,7 +170,8 @@ class Sundials(CMakePackage): # Build dependencies depends_on('cmake@2.8.1:', type='build') depends_on('cmake@2.8.12:', type='build', when='@3.1.2') - depends_on('cmake@3.0.2:', type='build', when='@4.0.0:') + depends_on('cmake@3.0.2:', type='build', when='@4.0.0-dev.1') + depends_on('cmake@3.1.3:', type='build', when='@3.2.0,4.0.0-dev.2') # MPI related dependencies depends_on('mpi', when='+mpi') @@ -340,6 +333,12 @@ class Sundials(CMakePackage): '-DPETSC_LIBRARY_DIR=%s' % spec['petsc'].prefix.lib ]) + # Building with RAJA + if '+raja' in spec: + args.extend([ + '-DRAJA_DIR=%s' % spec['raja'].prefix.share.raja.cmake + ]) + # Examples if spec.satisfies('@3.0.0:'): args.extend([ -- cgit v1.2.3-70-g09d2 From 600acbbe663c6b341eac53611611887242ffba87 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Thu, 4 Oct 2018 04:46:14 +0200 Subject: python: add details on missing library to error message (#9332) When a library cannot be found, the exception now includes the name of the library that was requested. --- var/spack/repos/builtin/packages/python/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index bf7a39303f..8342be482f 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -528,7 +528,7 @@ class Python(AutotoolsPackage): return LibraryList(os.path.join(frameworkprefix, ldlibrary)) else: msg = 'Unable to locate {0} libraries in {1}' - raise RuntimeError(msg.format(self.name, libdir)) + raise RuntimeError(msg.format(ldlibrary, libdir)) else: library = self.get_config_var('LIBRARY') @@ -538,7 +538,7 @@ class Python(AutotoolsPackage): return LibraryList(os.path.join(frameworkprefix, library)) else: msg = 'Unable to locate {0} libraries in {1}' - raise RuntimeError(msg.format(self.name, libdir)) + raise RuntimeError(msg.format(library, libdir)) @property def headers(self): -- cgit v1.2.3-70-g09d2 From 872e3c76f66b417123a0cbf76d3d2f4a69c804a8 Mon Sep 17 00:00:00 2001 From: dorier Date: Thu, 4 Oct 2018 03:48:42 +0100 Subject: Package mesa: added dependency on zlib (#9424) --- var/spack/repos/builtin/packages/mesa/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py index 9869286e03..ca63536c17 100644 --- a/var/spack/repos/builtin/packages/mesa/package.py +++ b/var/spack/repos/builtin/packages/mesa/package.py @@ -81,6 +81,7 @@ class Mesa(AutotoolsPackage): depends_on('libxfixes') depends_on('libxv') depends_on('libxvmc') + depends_on('zlib@1.2.3:') # For DRI and hardware acceleration depends_on('dri2proto@2.6:', type='build', when='+hwrender') -- cgit v1.2.3-70-g09d2 From 2b3e7dbd93a918d6a9b9b344b4926be43d26b94b Mon Sep 17 00:00:00 2001 From: Matthias Wolf Date: Thu, 4 Oct 2018 22:32:54 +0200 Subject: py-py4j: add version 0.10.6 (#9418) --- var/spack/repos/builtin/packages/py-py4j/package.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-py4j/package.py b/var/spack/repos/builtin/packages/py-py4j/package.py index 1e43b96a49..c8303af72d 100644 --- a/var/spack/repos/builtin/packages/py-py4j/package.py +++ b/var/spack/repos/builtin/packages/py-py4j/package.py @@ -30,9 +30,10 @@ class PyPy4j(PythonPackage): objects.""" homepage = "https://www.py4j.org/" - url = "https://pypi.io/packages/source/p/py4j/py4j-0.10.4.tar.gz" + url = "https://pypi.io/packages/source/p/py4j/py4j-0.10.4.zip" - version('0.10.4', 'de1ce072fb8d5bff8aba537b1700ace4') - version('0.10.3', '6c86aebb4f1cdd4bf192b16c8a8fe8e4') + version('0.10.6', sha256='d3e7ac7c2171c290eba87e70aa5095b7eb6d6ad34789c007c88d550d9f575083') + version('0.10.4', sha256='406fbfdbcbbb398739f61fafd25724670a405a668eb08c1721d832eadce06aae') + version('0.10.3', sha256='f4570108ad014dd52a65c2288418e31cb8227b5ecc39ad7fc7fe98314f7a26f2') depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From 9b5f3d77f38e3e13d93cd109865c1bb7dd80bcb4 Mon Sep 17 00:00:00 2001 From: Patrick Gartung Date: Thu, 4 Oct 2018 18:06:10 -0500 Subject: Valgrind: add ubsan and only64bit variants. (#9302) * Add conflict for +ubsan when building with clang on MacOS * only64bit is enabled by default --- .../repos/builtin/packages/valgrind/package.py | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/valgrind/package.py b/var/spack/repos/builtin/packages/valgrind/package.py index 095dd98232..a6009a1cff 100644 --- a/var/spack/repos/builtin/packages/valgrind/package.py +++ b/var/spack/repos/builtin/packages/valgrind/package.py @@ -51,7 +51,17 @@ class Valgrind(AutotoolsPackage): description='Activates MPI support for valgrind') variant('boost', default=True, description='Activates boost support for valgrind') + variant('only64bit', default=True, + description='Sets --enable-only64bit option for valgrind') + variant('ubsan', default=True, + description='Activates ubsan support for valgrind') + conflicts('+ubsan', when='platform=darwin %clang', + msg=""" +Cannot build libubsan with clang on macOS. +Otherwise with (Apple's) clang there is a linker error: +clang: error: unknown argument: '-static-libubsan' +""") depends_on('mpi', when='+mpi') depends_on('boost', when='+boost') @@ -66,14 +76,11 @@ class Valgrind(AutotoolsPackage): def configure_args(self): spec = self.spec options = [] - if not (spec.satisfies('%clang') and sys.platform == 'darwin'): - # Otherwise with (Apple's) clang there is a linker error: - # clang: error: unknown argument: '-static-libubsan' + if spec.satisfies('+ubsan'): options.append('--enable-ubsan') + if spec.satisfies('+only64bit'): + options.append('--enable-only64bit') if sys.platform == 'darwin': - options.extend([ - '--build=amd64-darwin', - '--enable-only64bit' - ]) + options.append('--build=amd64-darwin') return options -- cgit v1.2.3-70-g09d2 From 5a20217a54505b60af795dbc2d52bac407d96cef Mon Sep 17 00:00:00 2001 From: Patrick Gartung Date: Thu, 4 Oct 2018 18:11:28 -0500 Subject: VecGeom: add versions and cxxstd variant (#9303) --- .../repos/builtin/packages/vecgeom/package.py | 25 ++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/vecgeom/package.py b/var/spack/repos/builtin/packages/vecgeom/package.py index 8945f07ea5..c8b589e6da 100644 --- a/var/spack/repos/builtin/packages/vecgeom/package.py +++ b/var/spack/repos/builtin/packages/vecgeom/package.py @@ -34,8 +34,21 @@ class Vecgeom(CMakePackage): homepage = "https://gitlab.cern.ch/VecGeom/VecGeom" url = "https://gitlab.cern.ch/api/v4/projects/VecGeom%2FVecGeom/repository/archive.tar.gz?sha=v0.3.rc" + version('01.00.00', git='https://gitlab.cern.ch/VecGeom/VecGeom.git', tag='v01.00.00') + version('00.05.00', git='https://gitlab.cern.ch/VecGeom/VecGeom.git', tag='v00.05.00', preferred=True) version('0.3.rc', 'c1f5d620f655f3c0610a44e7735203b5') + variant('cxxstd', + default='17', + values=('14', '17'), + multi=False, + description='Use the specified C++ standard when building.') + variant('vector', + default='native', + values=('sse3', 'sse4.2', 'native'), + multi=False, + description='Specify the instruction set for vectorization.') + depends_on('cmake@3.5:', type='build') def cmake_args(self): @@ -43,12 +56,16 @@ class Vecgeom(CMakePackage): '-DBACKEND=Scalar', '-DGEANT4=OFF', '-DUSOLIDS=ON', - '-DUSOLIDS_VECGEOM=ON' - ] - + '-DUSOLIDS_VECGEOM=ON', + '-DROOT=OFF', + '-DNO_SPECIALIZATION=ON', + '-DCMAKE_VERBOSE_MAKEFILE=TRUE'] + options.append('-DCMAKE_CXX_STANDARD={0}'. + format(self.spec.variants['cxxstd'].value)) arch = platform.machine() if arch == 'x86_64': - options.append('-DVECGEOM_VECTOR=sse4.2') + options.append('-DVECGEOM_VECTOR={0}'. + format(self.spec.variants['vector'].value)) else: options.append('-DVECGEOM_VECTOR=' + arch) return options -- cgit v1.2.3-70-g09d2 From d981f28a8050acb077d206041669fc70b5f32568 Mon Sep 17 00:00:00 2001 From: Patrick Gartung Date: Thu, 4 Oct 2018 18:12:53 -0500 Subject: Davix version update (#9304) * Replace old version with new version * Remove patch only needed by CMS --- .../builtin/packages/davix/davix-0.6.7-uuid.patch | 66 ---------------------- var/spack/repos/builtin/packages/davix/package.py | 5 +- 2 files changed, 2 insertions(+), 69 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/davix/davix-0.6.7-uuid.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/davix/davix-0.6.7-uuid.patch b/var/spack/repos/builtin/packages/davix/davix-0.6.7-uuid.patch deleted file mode 100644 index 97d56315ca..0000000000 --- a/var/spack/repos/builtin/packages/davix/davix-0.6.7-uuid.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- - cmake/modules/Finduuid.cmake | 48 +++++++++++++++++------------------- - 1 file changed, 22 insertions(+), 26 deletions(-) - -diff --git a/cmake/modules/Finduuid.cmake b/cmake/modules/Finduuid.cmake -index 2f97a1f..e2c7d13 100644 ---- a/cmake/modules/Finduuid.cmake -+++ b/cmake/modules/Finduuid.cmake -@@ -1,32 +1,28 @@ --# Try to find uuid --# Once done, this will define --# --# UUID_FOUND - system has uuid --# UUID_INCLUDE_DIRS - uuid include directories --# UUID_LIBRARIES - libraries needed to use uuid -- -+include(CheckCXXSymbolExists) -+include(CheckLibraryExists) - include(FindPackageHandleStandardArgs) - --if(UUID_INCLUDE_DIRS AND UUID_LIBRARIES) -- set(UUID_FIND_QUIETLY TRUE) --else() -- find_path( -- UUID_INCLUDE_DIR -- NAMES uuid.h -- HINTS ${UUID_ROOT_DIR} -- PATH_SUFFIXES include uuid) -- -- find_library( -- UUID_LIBRARY -- NAMES uuid -- HINTS ${UUID_ROOT_DIR} -- PATH_SUFFIXES ${LIBRARY_PATH_PREFIX}) -+if(NOT UUID_INCLUDE_DIR) -+ find_path(UUID_INCLUDE_DIR uuid/uuid.h) -+endif() - -+if(EXISTS UUID_INCLUDE_DIR) - set(UUID_INCLUDE_DIRS ${UUID_INCLUDE_DIR}) -- set(UUID_LIBRARIES ${UUID_LIBRARY}) -- -- find_package_handle_standard_args( -- uuid DEFAULT_MSG UUID_LIBRARY UUID_INCLUDE_DIR) -+ set(CMAKE_REQUIRED_INCLUDES ${UUID_INCLUDE_DIRS}) -+ check_cxx_symbol_exists("uuid_generate_random" "uuid/uuid.h" _uuid_header_only) -+endif() - -- mark_as_advanced(UUID_INCLUDE_DIR UUID_LIBRARY) -+if(NOT _uuid_header_only AND NOT UUID_LIBRARY) -+ check_library_exists("uuid" "uuid_generate_random" "" _have_libuuid) -+ if(_have_libuuid) -+ set(UUID_LIBRARY "uuid") -+ set(UUID_LIBRARIES ${UUID_LIBRARY}) -+ endif() - endif() -+ -+unset(CMAKE_REQUIRED_INCLUDES) -+unset(_uuid_header_only) -+unset(_have_libuuid) -+ -+find_package_handle_standard_args(uuid DEFAULT_MSG UUID_INCLUDE_DIR) -+mark_as_advanced(UUID_INCLUDE_DIR UUID_LIBRARY) --- -2.17.0 - diff --git a/var/spack/repos/builtin/packages/davix/package.py b/var/spack/repos/builtin/packages/davix/package.py index c9bcde74ce..935d9669df 100644 --- a/var/spack/repos/builtin/packages/davix/package.py +++ b/var/spack/repos/builtin/packages/davix/package.py @@ -33,11 +33,10 @@ class Davix(CMakePackage): list_url = "http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/" list_depth = 1 - version('0.6.7', 'f811647d924a6dc5852c92110359ed91') + version('0.6.8', 'e1820f4cc3fc44858ae97197a3922cce2a1130ff553b080ba19e06eb8383ddf7', + url='http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/0.6.8/davix-0.6.8.tar.gz') depends_on('pkgconfig', type='build') depends_on('libxml2') depends_on('libuuid') depends_on('openssl') - - patch('davix-0.6.7-uuid.patch', when="@0.6.7") -- cgit v1.2.3-70-g09d2 From 011ad24950684b955a213f1b32662dd745fea3b1 Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Thu, 4 Oct 2018 20:57:33 -0500 Subject: salmon: remove static link to libstdc++ (#9343) --- var/spack/repos/builtin/packages/salmon/package.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/salmon/package.py b/var/spack/repos/builtin/packages/salmon/package.py index 552a1c44ac..f9c561ed29 100644 --- a/var/spack/repos/builtin/packages/salmon/package.py +++ b/var/spack/repos/builtin/packages/salmon/package.py @@ -38,6 +38,10 @@ class Salmon(CMakePackage): depends_on('tbb') depends_on('boost@:1.66.0') + def patch(self): + # remove static linking to libstdc++ + filter_file('-static-libstdc++', '', 'CMakeLists.txt', string=True) + def cmake_args(self): args = ['-DBOOST_ROOT=%s' % self.spec['boost'].prefix] return args -- cgit v1.2.3-70-g09d2 From 7c35c70217ab14422883d2e78f962cf6c5256432 Mon Sep 17 00:00:00 2001 From: Reid Priedhorsky <1682574+reidpr@users.noreply.github.com> Date: Fri, 5 Oct 2018 03:16:07 -0600 Subject: add Charliecloud 0.9.2 and 0.9.3 (#9441) --- var/spack/repos/builtin/packages/charliecloud/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/charliecloud/package.py b/var/spack/repos/builtin/packages/charliecloud/package.py index 3a3251eebe..f9cb229143 100644 --- a/var/spack/repos/builtin/packages/charliecloud/package.py +++ b/var/spack/repos/builtin/packages/charliecloud/package.py @@ -31,6 +31,8 @@ class Charliecloud(MakefilePackage): homepage = "https://hpc.github.io/charliecloud" url = "https://github.com/hpc/charliecloud/archive/v0.2.4.tar.gz" + version('0.9.3', sha256='f1bf032377b8845bc9a93b8a4fad6386161e35900223c0acc61d1f3aa3a87bc7') + version('0.9.2', sha256='8d0e4804d412beef720a66f886a0a78bce42f3269e880ebf11f602581f8047d4') version('0.9.1', sha256='8e69150a271285da71ece7a09b48251ef6593f72207c5126741d9976aa737d95') version('0.9.0', sha256='7e74cb16e31fd9d502198f7509bab14d1049ec68ba90b15e277e76f805db9458') version('0.2.4', 'b112de661c2c360174b42c99022c1967') -- cgit v1.2.3-70-g09d2 From b8fcc4d23089d548ab5ba425d57dc3cfcad37d37 Mon Sep 17 00:00:00 2001 From: DDevHan Date: Fri, 5 Oct 2018 10:56:03 -0500 Subject: Canu-Updated to lastest version:1.7.1 (#9413) * Canu-Updated to lastest version:1.7.1 * canu: added sha256 hash as comment above version * canu: changed to sha256 --- var/spack/repos/builtin/packages/canu/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/canu/package.py b/var/spack/repos/builtin/packages/canu/package.py index 441ce1db22..43f6e8459a 100644 --- a/var/spack/repos/builtin/packages/canu/package.py +++ b/var/spack/repos/builtin/packages/canu/package.py @@ -32,6 +32,7 @@ class Canu(MakefilePackage): homepage = "http://canu.readthedocs.io/" url = "https://github.com/marbl/canu/archive/v1.5.tar.gz" + version('1.7.1', sha256='c314659c929ee05fd413274f391463a93f19b8337eabb7ee5de1ecfc061caafa') version('1.5', '65df275baa28ecf11b15dfd7343361e3') depends_on('gnuplot', type='run') -- cgit v1.2.3-70-g09d2 From d77ed45bfe052891d760acd5eae70dc3801e6a89 Mon Sep 17 00:00:00 2001 From: Matthias Wolf Date: Fri, 5 Oct 2018 17:58:49 +0200 Subject: py-jprops: new package @ 1.0.2 (#9417) --- .../repos/builtin/packages/py-jprops/package.py | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-jprops/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-jprops/package.py b/var/spack/repos/builtin/packages/py-jprops/package.py new file mode 100644 index 0000000000..b268a5016a --- /dev/null +++ b/var/spack/repos/builtin/packages/py-jprops/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyJprops(PythonPackage): + """Java properties file parser for Python""" + + homepage = "https://github.com/mgood/jprops/" + url = "https://pypi.org/packages/source/j/jprops/jprops-2.0.2.tar.gz" + + version('2.0.2', sha256='d297231833b6cd0a3f982a48fe148a7f9817f2895661743d166b267e4d3d5b2c') + + depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From 75fe3a5436eb46498d0adb4791ce9284ee680162 Mon Sep 17 00:00:00 2001 From: DDevHan Date: Fri, 5 Oct 2018 12:07:22 -0500 Subject: Pacvim new (#9273) * pacvim: new package * pacvim: removed fixme's * pacvim: added full docstring * pacvim: fixing docstring --- var/spack/repos/builtin/packages/pacvim/package.py | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 var/spack/repos/builtin/packages/pacvim/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pacvim/package.py b/var/spack/repos/builtin/packages/pacvim/package.py new file mode 100644 index 0000000000..84634470f4 --- /dev/null +++ b/var/spack/repos/builtin/packages/pacvim/package.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class Pacvim(MakefilePackage): + """Pacvim is a command-line-based game based off of Pacman. + The main purpose of this software is to familiarize individuals + with Vim.""" + + homepage = "https://github.com/jmoon018/PacVim" + url = "https://github.com/jmoon018/PacVim/archive/v1.1.1.tar.gz" + + version('1.1.1', sha256='c869c5450fbafdfe8ba8a8a9bba3718775926f276f0552052dcfa090d21acb28') + + depends_on('ncurses') + + def edit(self, stage, prefix): + makefile = FileFilter('Makefile') + + makefile.filter(r'PREFIX = /usr/local', + 'PREFIX={0}'.format(self.prefix)) -- cgit v1.2.3-70-g09d2 From 2e11d5914c2216b4314b57055906c61bb443b93c Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Mon, 8 Oct 2018 00:58:02 -0600 Subject: Update HYPRE with version 2.15.0. (#9443) --- var/spack/repos/builtin/packages/hypre/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hypre/package.py b/var/spack/repos/builtin/packages/hypre/package.py index 20fb7cc867..1aef3a244c 100644 --- a/var/spack/repos/builtin/packages/hypre/package.py +++ b/var/spack/repos/builtin/packages/hypre/package.py @@ -37,6 +37,7 @@ class Hypre(Package): git = "https://github.com/LLNL/hypre.git" version('develop', branch='master') + version('2.15.0', '4645acc49141069cae1d53de96107a08') version('2.14.0', 'ecde5cc807ec45bfb647e9f28d2eaea1') version('2.13.0', '4b688a5c15b6b5e3de5e045ae081b89b') version('2.12.1', 'c6fcb6d7e57cec1c7ce4a44da885068c') -- cgit v1.2.3-70-g09d2 From c0249eddb11701968c66a63f58c5882ed756d75c Mon Sep 17 00:00:00 2001 From: Matthias Wolf Date: Mon, 8 Oct 2018 09:03:31 +0200 Subject: py-pyspark: new package (#9419) --- .../repos/builtin/packages/py-pyspark/package.py | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-pyspark/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-pyspark/package.py b/var/spack/repos/builtin/packages/py-pyspark/package.py new file mode 100644 index 0000000000..1107877a98 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pyspark/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyPyspark(PythonPackage): + """Python bindings for Apache Spark""" + + homepage = "http://spark.apache.org" + url = "https://pypi.org/packages/source/p/pyspark/pyspark-2.3.0.tar.gz" + + version('2.3.0', sha256='0b3536910e154c36a94239f0ba0a201f476aadc72006409e5787198ffd01986e') + + depends_on('py-setuptools', type='build') + depends_on('py-py4j', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From baa664ffaa5332d4392a9de7faad8c8f1732c932 Mon Sep 17 00:00:00 2001 From: dorier Date: Mon, 8 Oct 2018 08:08:50 +0100 Subject: Fix: bug in VTK package (#9431) * Fix: bug in VTK package Fix for issue 9423 (https://github.com/spack/spack/issues/9423): compilers other than clang don't have the `is_apple` property. * VTK package: removing trailing whitespace So flake8 stops complaining. --- var/spack/repos/builtin/packages/vtk/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py index 8b0b3f732e..4f1d88f2ee 100644 --- a/var/spack/repos/builtin/packages/vtk/package.py +++ b/var/spack/repos/builtin/packages/vtk/package.py @@ -212,7 +212,8 @@ class Vtk(CMakePackage): # string. This fix was recommended on the VTK mailing list # in March 2014 (see # https://public.kitware.com/pipermail/vtkusers/2014-March/083368.html) - if (self.compiler.is_apple and + if (self.spec.satisfies('%clang') and + self.compiler.is_apple and self.compiler.version >= Version('5.1.0')): cmake_args.extend(['-DVTK_REQUIRED_OBJCXX_FLAGS=""']) -- cgit v1.2.3-70-g09d2 From e51b48d9a1157fa80f02881a44e35c01b4156bea Mon Sep 17 00:00:00 2001 From: dorier Date: Mon, 8 Oct 2018 08:10:03 +0100 Subject: Catalyst Package: made Python mandatory at build time (#9432) The build process of Catalyst requires Python at build time (see line 86) even when the +python variant is not selected. When the +python variant is selected, Python becomes required at build, link, and run time. There doesn't seem to be any restriction on the version of Python required when +python is not selected. --- var/spack/repos/builtin/packages/catalyst/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/catalyst/package.py b/var/spack/repos/builtin/packages/catalyst/package.py index c4d8dcd8b0..91f9622873 100644 --- a/var/spack/repos/builtin/packages/catalyst/package.py +++ b/var/spack/repos/builtin/packages/catalyst/package.py @@ -58,7 +58,8 @@ class Catalyst(CMakePackage): depends_on('git') depends_on('mpi') - depends_on('python@2:2.8', when='+python') + depends_on('python@2:2.8', when='+python', type=("build", "link", "run")) + depends_on('python', when='~python', type=("build")) depends_on('mesa', when='+rendering') depends_on("libx11", when='+rendering') depends_on("libxt", when='+rendering') -- cgit v1.2.3-70-g09d2 From cf52083b74d5aac369906e6b32776e362d7fe72a Mon Sep 17 00:00:00 2001 From: Strahinja Trecakov Date: Mon, 8 Oct 2018 01:12:13 -0600 Subject: perl-module-build new version (#9404) --- var/spack/repos/builtin/packages/perl-module-build/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-module-build/package.py b/var/spack/repos/builtin/packages/perl-module-build/package.py index 48d9c84953..bed9815ddf 100644 --- a/var/spack/repos/builtin/packages/perl-module-build/package.py +++ b/var/spack/repos/builtin/packages/perl-module-build/package.py @@ -36,6 +36,7 @@ class PerlModuleBuild(PerlPackage): """ homepage = "http://search.cpan.org/perldoc/Module::Build" - url = "http://search.cpan.org/CPAN/authors/id/L/LE/LEONT/Module-Build-0.4220.tar.gz" + url = "http://search.cpan.org/CPAN/authors/id/L/LE/LEONT/Module-Build-0.4224.tar.gz" + version('0.4224', sha256='a6ca15d78244a7b50fdbf27f85c85f4035aa799ce7dd018a0d98b358ef7bc782') version('0.4220', '9df204e188462a4410d496f316c2c531') -- cgit v1.2.3-70-g09d2 From b62571ecdfe8b005943ee2402998b31df1d321e0 Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Mon, 8 Oct 2018 15:40:45 -0500 Subject: r-readxl: added 1.1.0 (#9454) --- var/spack/repos/builtin/packages/r-readxl/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-readxl/package.py b/var/spack/repos/builtin/packages/r-readxl/package.py index da124a9da1..b1b5b51578 100644 --- a/var/spack/repos/builtin/packages/r-readxl/package.py +++ b/var/spack/repos/builtin/packages/r-readxl/package.py @@ -33,8 +33,10 @@ class RReadxl(RPackage): without external dependencies.""" homepage = "http://readxl.tidyverse.org/" - url = "https://cran.r-project.org/src/contrib/readxl_1.0.0.tar.gz" + url = "https://cran.r-project.org/src/contrib/readxl_1.1.0.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/readxl/readxl_1.0.0.tar.gz" + version('1.1.0', sha256='b63d21fc6510acb373e96deaec45e966a523ec75cbec75a089529297ed443116') version('1.0.0', '030c47ae1af5dd4168087160c29131e4') depends_on('r-tibble', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From c379f4ee248a5a27b4a833aacdc0a572601400c6 Mon Sep 17 00:00:00 2001 From: snehring Date: Mon, 8 Oct 2018 15:41:36 -0500 Subject: sspace-standard: adding threads variant to perl dependency (#9452) --- var/spack/repos/builtin/packages/sspace-standard/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sspace-standard/package.py b/var/spack/repos/builtin/packages/sspace-standard/package.py index 6b40cd9a2d..b1bba3273e 100644 --- a/var/spack/repos/builtin/packages/sspace-standard/package.py +++ b/var/spack/repos/builtin/packages/sspace-standard/package.py @@ -41,7 +41,7 @@ class SspaceStandard(Package): version('3.0', '7e171b4861b9d514e80aafc3d9cdf554') - depends_on('perl', type=('build', 'run')) + depends_on('perl+threads', type=('build', 'run')) def install(self, spec, prefix): install_tree('bin', prefix.bin) -- cgit v1.2.3-70-g09d2 From b2e255fe5a8432e1bfbd157910f5478e61cf884b Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Mon, 8 Oct 2018 16:00:21 -0500 Subject: figtree: new package starting at 1.4.3 (#9359) * figtree: new package starting at 1.4.3 * figtree: add java dep * figtree: use portable octal format * figtree: remove boilerplate --- .../repos/builtin/packages/figtree/package.py | 58 ++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 var/spack/repos/builtin/packages/figtree/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/figtree/package.py b/var/spack/repos/builtin/packages/figtree/package.py new file mode 100644 index 0000000000..2bb63f3368 --- /dev/null +++ b/var/spack/repos/builtin/packages/figtree/package.py @@ -0,0 +1,58 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * +import os + + +class Figtree(Package): + """FigTree is designed as a graphical viewer of phylogenetic trees and + as a program for producing publication-ready figures. As with most of + my programs, it was written for my own needs so may not be as polished + and feature-complete as a commercial program. In particular it is + designed to display summarized and annotated trees produced by BEAST.""" + + homepage = "https://github.com/rambaut/figtree" + url = "https://github.com/rambaut/figtree/releases/download/v1.4.3/FigTree_v1.4.3.tgz" + + version('1.4.3', sha256='f497d4dd3a6d220f6b62495b6f47a12ade50d87dbd8d6089f168e94d202f937b') + + depends_on('java', type='run') + + def patch(self): + # we have to change up the executable to point to the right program + filter_file('lib/figtree.jar', + join_path(self.spec.prefix.lib, 'figtree.jar'), + 'bin/figtree', string=True) + + # also set proper executable flags + os.chmod('bin/figtree', 0o775) + + def install(self, spec, prefix): + mkdirp(prefix.bin) + install_tree('bin', prefix.bin) + + mkdirp(prefix.lib) + install_tree('lib', prefix.lib) -- cgit v1.2.3-70-g09d2 From 84046b79b29cbf681a7ef0022077ab9fdf4ee2f4 Mon Sep 17 00:00:00 2001 From: Simon Flood Date: Mon, 8 Oct 2018 22:02:12 +0100 Subject: New package: pplacer (#9112) * New package: pplacer Simple package - copies files and directory out of a zip file * Update package.py --- .../repos/builtin/packages/pplacer/package.py | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 var/spack/repos/builtin/packages/pplacer/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pplacer/package.py b/var/spack/repos/builtin/packages/pplacer/package.py new file mode 100644 index 0000000000..bc67736d03 --- /dev/null +++ b/var/spack/repos/builtin/packages/pplacer/package.py @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Pplacer(Package): + """Pplacer places query sequences on a fixed reference phylogenetic tree + to maximize phylogenetic likelihood or posterior probability according + to a reference alignment. Pplacer is designed to be fast, to give + useful information about uncertainty, and to offer advanced + visualization and downstream analysis. + """ + + homepage = "http://matsen.fhcrc.org/pplacer/" + url = "https://github.com/matsen/pplacer/releases/download/v1.1.alpha19/pplacer-linux-v1.1.alpha19.zip" + + version('1.1.alpha19', 'e6b78604882d41d4bf13592c7edebfa2') + + def install(self, spec, prefix): + install_tree('scripts', prefix.bin) + force_remove(join_path(prefix.bin, 'setup.py')) + install('guppy', prefix.bin) + install('pplacer', prefix.bin) + install('rppr', prefix.bin) -- cgit v1.2.3-70-g09d2 From b8e0d5824ed3c9464e1b89ce37781dea2017e312 Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Mon, 8 Oct 2018 16:25:31 -0500 Subject: r-edger: add r-rcpp dependency (#9457) * r-edger: add r-rcpp dependency * r-edger: add r-rcpp to link deps --- var/spack/repos/builtin/packages/r-edger/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-edger/package.py b/var/spack/repos/builtin/packages/r-edger/package.py index 5748bda314..6d77487ef3 100644 --- a/var/spack/repos/builtin/packages/r-edger/package.py +++ b/var/spack/repos/builtin/packages/r-edger/package.py @@ -42,5 +42,6 @@ class REdger(RPackage): depends_on('r-limma', type=('build', 'run')) depends_on('r-locfit', type=('build', 'run')) + depends_on('r-rcpp', type=('build', 'link', 'run')) depends_on('r@3.5.0:3.5.9', when='@3.22.3') depends_on('r@3.4.0:3.4.9', when='@3.18.1') -- cgit v1.2.3-70-g09d2 From 4e20b16dbe258eea05aa375de11a811151f20f6b Mon Sep 17 00:00:00 2001 From: Miles Perry <37849532+Miles-Perry@users.noreply.github.com> Date: Mon, 8 Oct 2018 16:25:52 -0500 Subject: added list URL for r-rodbc (#9460) --- var/spack/repos/builtin/packages/r-rodbc/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-rodbc/package.py b/var/spack/repos/builtin/packages/r-rodbc/package.py index 9b5f147e07..a3321ccc5b 100644 --- a/var/spack/repos/builtin/packages/r-rodbc/package.py +++ b/var/spack/repos/builtin/packages/r-rodbc/package.py @@ -30,6 +30,7 @@ class RRodbc(RPackage): homepage = "https://cran.rstudio.com/web/packages/RODBC/" url = "https://cran.rstudio.com/src/contrib/RODBC_1.3-13.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/RODBC/" version('1.3-13', 'c52ef9139c2ed85adc53ad6effa7d68e') -- cgit v1.2.3-70-g09d2 From 80100ffc39ad39f879ada62145d9e0add8266d40 Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Mon, 8 Oct 2018 16:26:51 -0500 Subject: treesub: new package starting at 0.2 (#9361) * treesub: new package starting at 0.2 * treesub: fix ant build, add exec script * treesub: use portable octal format * treesub: add license header not sure how it even went missing. --- .../repos/builtin/packages/treesub/package.py | 61 ++++++++++++++++++++++ var/spack/repos/builtin/packages/treesub/treesub | 2 + 2 files changed, 63 insertions(+) create mode 100644 var/spack/repos/builtin/packages/treesub/package.py create mode 100755 var/spack/repos/builtin/packages/treesub/treesub (limited to 'var') diff --git a/var/spack/repos/builtin/packages/treesub/package.py b/var/spack/repos/builtin/packages/treesub/package.py new file mode 100644 index 0000000000..6cec60fa22 --- /dev/null +++ b/var/spack/repos/builtin/packages/treesub/package.py @@ -0,0 +1,61 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * +import os + + +class Treesub(Package): + """A small program (which glues together other programs) that + allows a user to input a codon alignment in FASTA format and + produce an annotated phylogenetic tree showing which substitutions + occurred on a given branch. Originally written for colleagues at + the MRC NIMR.""" + + homepage = "https:/github.com/tamuri/treesub" + url = "https://github.com/tamuri/treesub/archive/v0.2.tar.gz" + + version('0.2', sha256='58b0d2638cf9ae1ad8705df26a57c32b52a69f50e7954debbd678c82772fdc56') + version('0.1', sha256='c083ecc5f7e9f11645a7e768f6a09fefcbb254b526212003527b4b8dd14723f1') + + depends_on('jdk', type='run') + depends_on('ant', type='build') + depends_on('paml', type='run') + depends_on('raxml', type='run') + depends_on('figtree', type='run') + + def install(self, spec, prefix): + ant = self.spec['ant'].command + ant('jar') + + mkdirp(prefix.bin) + install_tree('dist', prefix.bin) + + mkdirp(prefix.lib) + install_tree('lib', prefix.lib) + + execscript = join_path(self.package_dir, 'treesub') + os.chmod(execscript, 0o775) + install(execscript, prefix.bin) diff --git a/var/spack/repos/builtin/packages/treesub/treesub b/var/spack/repos/builtin/packages/treesub/treesub new file mode 100755 index 0000000000..8be7cb73e6 --- /dev/null +++ b/var/spack/repos/builtin/packages/treesub/treesub @@ -0,0 +1,2 @@ +#!/bin/sh +java -jar $(dirname $0)/treesub.jar -- cgit v1.2.3-70-g09d2 From b17fb74e5ff9368f30916d5847c7375150be1d8a Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Mon, 8 Oct 2018 17:09:56 -0500 Subject: ant: add tested 1.10.0, switch build target (#9358) --- var/spack/repos/builtin/packages/ant/package.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ant/package.py b/var/spack/repos/builtin/packages/ant/package.py index 1b6ef1f8f2..50df09f563 100644 --- a/var/spack/repos/builtin/packages/ant/package.py +++ b/var/spack/repos/builtin/packages/ant/package.py @@ -34,8 +34,7 @@ class Ant(Package): homepage = "http://ant.apache.org/" url = "https://archive.apache.org/dist/ant/source/apache-ant-1.9.7-src.tar.gz" - # 1.10.0 requires newer Java, not yet tested.... - # version('1.10.0', '2260301bb7734e34d8b96f1a5fd7979c') + version('1.10.0', '2260301bb7734e34d8b96f1a5fd7979c') version('1.9.9', '22c9d40dabafbec348aaada226581239') version('1.9.8', '16253d516d5c33c4af9ef8fafcf1004b') version('1.9.7', 'a2fd9458c76700b7be51ef12f07d4bb1') @@ -46,4 +45,4 @@ class Ant(Package): def install(self, spec, prefix): env['ANT_HOME'] = self.prefix bash = which('bash') - bash('./build.sh', 'install') + bash('./build.sh', 'install-lite') -- cgit v1.2.3-70-g09d2 From 8f4123e56475662aae4070add0fea6040a7d22e1 Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Tue, 9 Oct 2018 08:44:17 -0500 Subject: r-proto: added 1.0.0 (#9456) * r-proto: added 1.0.0 * r-proto: reorder versions --- var/spack/repos/builtin/packages/r-proto/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-proto/package.py b/var/spack/repos/builtin/packages/r-proto/package.py index 499611b77a..e0b389f35f 100644 --- a/var/spack/repos/builtin/packages/r-proto/package.py +++ b/var/spack/repos/builtin/packages/r-proto/package.py @@ -33,4 +33,5 @@ class RProto(RPackage): url = "https://cran.r-project.org/src/contrib/proto_0.3-10.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/proto" + version('1.0.0', sha256='9294d9a3b2b680bb6fac17000bfc97453d77c87ef68cfd609b4c4eb6d11d04d1') version('0.3-10', 'd5523943a5be6ca2f0ab557c900f8212') -- cgit v1.2.3-70-g09d2 From 838337da370b8b9e4667c4bc3dbb5ee32ee30030 Mon Sep 17 00:00:00 2001 From: Pieter Ghysels Date: Tue, 9 Oct 2018 06:44:49 -0700 Subject: STRUMPACK: new package (#9429) * Initial commit for new package STRUMPACK, a linear solver library. * Update to STRUMPACK version 3.0.3. This adds a check for OpenMP task priority support (since OpenMP 4.5) --- .../repos/builtin/packages/strumpack/package.py | 129 +++++++++++++++++++++ 1 file changed, 129 insertions(+) create mode 100644 var/spack/repos/builtin/packages/strumpack/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/strumpack/package.py b/var/spack/repos/builtin/packages/strumpack/package.py new file mode 100644 index 0000000000..cc3b4556a0 --- /dev/null +++ b/var/spack/repos/builtin/packages/strumpack/package.py @@ -0,0 +1,129 @@ +############################################################################## +# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class Strumpack(CMakePackage): + """STRUMPACK -- STRUctured Matrix PACKage - provides linear solvers + for sparse matrices and for dense rank-structured matrices, i.e., + matrices that exhibit some kind of low-rank property. It provides a + distributed memory fully algebraic sparse solver and + preconditioner. The preconditioner is mostly aimed at large sparse + linear systems which result from the discretization of a partial + differential equation, but is not limited to any particular type of + problem. STRUMPACK also provides preconditioned GMRES and BiCGStab + iterative solvers.""" + + homepage = "http://portal.nersc.gov/project/sparse/strumpack" + url = "https://github.com/pghysels/STRUMPACK/archive/v3.0.3.tar.gz" + git = "https://github.com/pghysels/STRUMPACK.git" + + version('master', branch='master') + version('3.0.3', sha256='2bd2a40d9585b769ae4ba461de02c6e36433bf2b21827f824a50f2fdf73389f7') + version('3.0.2', sha256='828e5ec59019b2c74e008745b04ceebbb7ef1313fb4e3ac01fa8ff350799df38') + version('3.0.1', sha256='b4a4d870c589937e22e77a6c4b52a96fd808f0b564e363f826ae5ffc94b9d000') + version('3.0.0', sha256='7acd9b4653b8b11380de733c80b164348ca00f9226904f5dc166a8e3db88cd20') + version('2.2.0', sha256='8fe73875cbbb29ed1faf714e3bf13ad538eb062e39d7d5e73cb9c4aafb571e24') + + variant('mpi', default=True, description='Use MPI') + variant('openmp', default=True, + description='Enable thread parallellism via tasking with OpenMP') + variant('parmetis', default=False, + description='Enable use of ParMetis') + variant('scotch', default=False, + description='Enable use of Scotch') + variant('c_interface', default=True, + description='Enable C interface') + variant('count_flops', default=False, + description='Build with flop counters') + variant('task_timers', default=False, + description='Build with timers for internal routines') + variant('build_dev_tests', default=False, + description='Build developer test routines') + variant('build_tests', default=False, + description='Build test routines') + + depends_on('cmake', type='build') + depends_on('mpi', when='+mpi') + depends_on('blas') + depends_on('lapack') + depends_on('scalapack', when='+mpi') + depends_on('metis') + depends_on('parmetis', when='+parmetis+mpi') + depends_on('scotch~metis', when='+scotch') + depends_on('scotch~metis+mpi', when='+scotch+mpi') + + def cmake_args(self): + spec = self.spec + + if '+mpi' in spec: + args = ['-DCMAKE_C_COMPILER=%s' % spec['mpi'].mpicc, + '-DCMAKE_CXX_COMPILER=%s' % spec['mpi'].mpicxx, + '-DCMAKE_Fortran_COMPILER=%s' % spec['mpi'].mpifc, + '-DSTRUMPACK_USE_MPI=ON'] + else: + args = ['-DSTRUMPACK_USE_MPI=OFF'] + + if '+openmp' in spec: + args.append('-DSTRUMPACK_USE_OPENMP=ON') + else: + args.append('-DSTRUMPACK_USE_OPENMP=OFF') + + if spec.satisfies('+parmetis+mpi'): + args.append('-DSTRUMPACK_USE_PARMETIS=ON') + else: + args.append('-DSTRUMPACK_USE_PARMETIS=OFF') + + if '+scotch' in spec: + args.append('-DSTRUMPACK_USE_SCOTCH=ON') + else: + args.append('-DSTRUMPACK_USE_SCOTCH=OFF') + + if '+c_interface' in spec: + args.append('-DSTRUMPACK_C_INTERFACE=ON') + else: + args.append('-DSTRUMPACK_C_INTERFACE=OFF') + + if '+count_flops' in spec: + args.append('-DSTRUMPACK_COUNT_FLOPS=ON') + else: + args.append('-DSTRUMPACK_COUNT_FLOPS=OFF') + + if '+task_timers' in spec: + args.append('-DSTRUMPACK_TASK_TIMERS=ON') + else: + args.append('-DSTRUMPACK_TASK_TIMERS=OFF') + + if '+build_dev_tests' in spec: + args.append('-DSTRUMPACK_DEV_TESTING=ON') + else: + args.append('-DSTRUMPACK_DEV_TESTING=OFF') + + if '+build_tests' in spec: + args.append('-DSTRUMPACK_BUILD_TESTS=ON') + else: + args.append('-DSTRUMPACK_BUILD_TESTS=OFF') + return args -- cgit v1.2.3-70-g09d2 From 22a56d86aecfbaf2bc6de326a4ed05b6721b8bb9 Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Tue, 9 Oct 2018 08:45:13 -0500 Subject: energyplus: new package starting at 8.9.0 (#9262) * energyplus: new package starting at 8.9.0 * energyplus: fix misleading comment * energyplus: remove redundant version url --- .../repos/builtin/packages/energyplus/package.py | 57 ++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 var/spack/repos/builtin/packages/energyplus/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/energyplus/package.py b/var/spack/repos/builtin/packages/energyplus/package.py new file mode 100644 index 0000000000..2b7d3bea9d --- /dev/null +++ b/var/spack/repos/builtin/packages/energyplus/package.py @@ -0,0 +1,57 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * +import glob +import os + + +class Energyplus(Package): + """EnergyPlus is a whole building energy simulation program that engineers, + architects, and researchers use to model both energy consumption for + heating, cooling, ventilation, lighting and plug and process loads + and water use in buildings""" + + homepage = "https://energyplus.net" + + # versions require explicit URLs as they contain hashes + version('8.9.0', sha256='13a5192b25815eb37b3ffd019ce3b99fd9f854935f8cc4362814f41c56e9ca98', + url="https://github.com/NREL/EnergyPlus/releases/download/v8.9.0-WithIDDFixes/EnergyPlus-8.9.0-eba93e8e1b-Linux-x86_64.tar.gz") + + def install(self, spec, prefix): + # binary distribution, we just unpack to lib/energyplus + # and then symlink the appropriate targets + + # there is only one folder with a semi-predictable name so we glob it + install_tree(glob.glob('EnergyPlus*')[0], + join_path(prefix.lib, 'energyplus')) + + mkdirp(prefix.bin) + os.symlink(join_path(prefix.lib, 'energyplus/energyplus'), + join_path(prefix.bin, 'energyplus')) + os.symlink(join_path(prefix.lib, 'energyplus/EPMacro'), + join_path(prefix.bin, 'EPMacro')) + os.symlink(join_path(prefix.lib, 'energyplus/ExpandObjects'), + join_path(prefix.bin, 'ExpandObjects')) -- cgit v1.2.3-70-g09d2 From 36941ffb45b109125fd5e66b0d99682274341dee Mon Sep 17 00:00:00 2001 From: Ricardo Silva Date: Tue, 9 Oct 2018 16:15:42 +0200 Subject: New package: tldd (#9434) * New package: tldd * https://gitlab.com/miscripts/tldd * Improvements * make it prefetchable by specifying a hash based version * specify the constraints on pstreams versions (from INSTALL) * Improvements * Make it a Makefile Package and only overwrite the install_targets * Remove the URL as there's really no downloadable 'tar ball' version --- var/spack/repos/builtin/packages/tldd/package.py | 47 ++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 var/spack/repos/builtin/packages/tldd/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/tldd/package.py b/var/spack/repos/builtin/packages/tldd/package.py new file mode 100644 index 0000000000..8473df4c55 --- /dev/null +++ b/var/spack/repos/builtin/packages/tldd/package.py @@ -0,0 +1,47 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Tldd(MakefilePackage): + """A program similar to ldd(1) but showing the output as a tree.""" + + homepage = "https://gitlab.com/miscripts/tldd" + git = "https://gitlab.com/miscripts/tldd.git" + + version('2018-10-05', commit='61cb512cc992ea6cbb7239e99ec7ac92ea072507') + version('master', branch='master') + + depends_on('pstreams@0.8.0:') + + def patch(self): + filter_file( + r'#include ', + r'#include ', + 'tldd.cc') + + @property + def install_targets(self): + return ['install', 'PREFIX={0}'.format(self.prefix)] -- cgit v1.2.3-70-g09d2 From 817ee344c565768d94a2a1dfa307f87c0629e709 Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Tue, 9 Oct 2018 09:17:21 -0500 Subject: perl-perl4-corelibs: new package (#9459) --- .../packages/perl-perl4-corelibs/package.py | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-perl4-corelibs/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-perl4-corelibs/package.py b/var/spack/repos/builtin/packages/perl-perl4-corelibs/package.py new file mode 100644 index 0000000000..d7d0c9cc18 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-perl4-corelibs/package.py @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class PerlPerl4Corelibs(PerlPackage): + """Perl4::CoreLibs - libraries historically supplied with Perl 4""" + + # doesn't look like a homepage but it is + homepage = "https://metacpan.org/pod/release/ZEFRAM/Perl4-CoreLibs-0.003/lib/Perl4/CoreLibs.pm" + url = "https://cpan.metacpan.org/authors/id/Z/ZE/ZEFRAM/Perl4-CoreLibs-0.003.tar.gz" + + version('0.004', sha256='78887e3365f8935ab00d528832e9b7a426fb684ffc5c03c20e67a217ca4ac64a') + version('0.003', sha256='55c9b2b032944406dbaa2fd97aa3692a1ebce558effc457b4e800dabfaad9ade') + version('0.002', sha256='c68272e8b0e37268d9fbb93f5ef5708e12e0a13bbb5a6123af3f493ea8852521') + version('0.001', sha256='f7479f63e8b0cc344752a59f66fd084a14ee87bcc2a1f67c1a413afab8d0ad37') + version('0.000', sha256='d8f2310ad0b0f48c8fc258a75042ebeedf47bcefb231be427761dba77e734875') + + depends_on('perl-module-build', type='build') -- cgit v1.2.3-70-g09d2 From f12b42e8e637cb18b8e31d2d3752865b70498296 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Tue, 9 Oct 2018 12:26:46 -0500 Subject: Autofact: new package (#9317) * autofact: new package * autofact: typo * autofact: syntax * autofact: deps * autofact: perl mods path * autofact: edit->patch and script path --- .../repos/builtin/packages/autofact/package.py | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 var/spack/repos/builtin/packages/autofact/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/autofact/package.py b/var/spack/repos/builtin/packages/autofact/package.py new file mode 100644 index 0000000000..47038685c4 --- /dev/null +++ b/var/spack/repos/builtin/packages/autofact/package.py @@ -0,0 +1,55 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import glob + + +class Autofact(Package): + """An Automatic Functional Annotation and Classification Tool""" + + homepage = "http://megasun.bch.umontreal.ca/Software/AutoFACT.htm" + url = "http://megasun.bch.umontreal.ca/Software/AutoFACT_v3_4.tar" + + version('3_4', sha256='1465d263b19adb42f01f6e636ac40ef1c2e3dbd63461f977b89da9493fe9c6f4') + + depends_on('perl', type='run') + depends_on('perl-bio-perl', type='run') + depends_on('perl-io-string', type='run') + depends_on('perl-lwp', type='run') + depends_on('blast-plus', type='run') + + def patch(self): + with working_dir('scripts'): + files = glob.iglob("*.pl") + for file in files: + change = FileFilter(file) + change.filter('usr/bin/perl', 'usr/bin/env perl') + + def install(self, spec, prefix): + install_tree(self.stage.source_path, prefix) + + def setup_environment(self, spack_env, run_env): + run_env.prepend_path('PATH', self.prefix.scripts) + run_env.set('PATH2AUTOFACT', self.prefix) -- cgit v1.2.3-70-g09d2 From 9c221228ef4602c313ca6132bb1fac30b30dd4a4 Mon Sep 17 00:00:00 2001 From: Robert Pavel Date: Tue, 9 Oct 2018 11:38:54 -0600 Subject: Removed gtk dependency from Candle (#9451) After talks with candle dev, removed unsatisfiable conflict with candle-benchmark and opencv by disabling gtk in the candle spec --- var/spack/repos/builtin/packages/candle-benchmarks/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/candle-benchmarks/package.py b/var/spack/repos/builtin/packages/candle-benchmarks/package.py index ae6b1075fb..6806b24a35 100644 --- a/var/spack/repos/builtin/packages/candle-benchmarks/package.py +++ b/var/spack/repos/builtin/packages/candle-benchmarks/package.py @@ -44,7 +44,7 @@ class CandleBenchmarks(Package): depends_on('py-matplotlib +image@:2.2.3', type=('build', 'run')) depends_on('py-tqdm', type=('build', 'run')) depends_on('py-scikit-learn', type=('build', 'run')) - depends_on('opencv@3.2.0: +core +highgui +imgproc +jpeg +png +tiff +zlib +python -dnn ~eigen') + depends_on('opencv@3.2.0: +core +highgui +imgproc +jpeg +png +tiff +zlib +python -dnn ~eigen ~gtk') depends_on('py-mdanalysis', type=('build', 'run')) depends_on('py-mpi4py', when='+mpi', type=('build', 'run')) depends_on('py-h5py~mpi', when='~mpi', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 9ee8a1055ba95c6495b2f8ad6e192496a2060e52 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Tue, 9 Oct 2018 13:14:41 -0500 Subject: petsc: add petsc-3.10.2 (#9467) --- var/spack/repos/builtin/packages/petsc/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index 8faeff76e5..7823afdcd0 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -43,6 +43,7 @@ class Petsc(Package): version('develop', branch='master') version('xsdk-0.2.0', tag='xsdk-0.2.0') + version('3.10.2', '63ed950653ae9b8d19daea47e24c0338') version('3.10.1', '2d0d5a9bd8112a4147a2a23f7f62a906') version('3.10.0', '0240c2ce8c54e47b3531a743ee844d41') version('3.9.4', 'c98eb67573efb2f91c6f239368259e44') -- cgit v1.2.3-70-g09d2 From 5ebdc6076f7031dd3bbde98768e50d931092ce8a Mon Sep 17 00:00:00 2001 From: Chris Green Date: Tue, 9 Oct 2018 13:56:43 -0500 Subject: New package: pythia6 (#9340) Includes optional extra code for compatibility with Root. --- .../repos/builtin/packages/pythia6/CMakeLists.txt | 115 +++++++++ .../repos/builtin/packages/pythia6/package.py | 172 +++++++++++++ .../repos/builtin/packages/pythia6/pythia6.patch | 278 +++++++++++++++++++++ 3 files changed, 565 insertions(+) create mode 100644 var/spack/repos/builtin/packages/pythia6/CMakeLists.txt create mode 100644 var/spack/repos/builtin/packages/pythia6/package.py create mode 100644 var/spack/repos/builtin/packages/pythia6/pythia6.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pythia6/CMakeLists.txt b/var/spack/repos/builtin/packages/pythia6/CMakeLists.txt new file mode 100644 index 0000000000..9362f03668 --- /dev/null +++ b/var/spack/repos/builtin/packages/pythia6/CMakeLists.txt @@ -0,0 +1,115 @@ +# ====================================================================== +# pythia6 main build file +# +# setup cmake +# cd .../path/to/build/directory +# cmake [-DCMAKE_INSTALL_PREFIX=/install/path] +# [-DCMAKE_BUILD_TYPE= ] +# [-Drun_long_tests:BOOL=ON] +# .../path/to/pythia/source +# make +# make test +# make install +# ====================================================================== + +# use cmake 2.6 or later +cmake_minimum_required (VERSION 2.6) + +project(pythia6 C Fortran) +message(STATUS "pythia version is ${PYTHIA6_VERSION}") + +enable_testing() + +#build all libraries in a single directory to enable testing +set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib) + +# set compiler flags +# default GNU compiler flags: +# DEBUG -g +# RELEASE -O3 -DNDEBUG +# MINSIZEREL -Os -DNDEBUG +# RELWITHDEBINFO -O2 -g +set( CMAKE_C_FLAGS_DEBUG "-g -O0" ) +set( CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG -fno-omit-frame-pointer" ) +set( CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG" ) +set( CMAKE_Fortran_FLAGS_DEBUG "-g -O0 -fno-second-underscore" ) +set( CMAKE_Fortran_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG -fno-omit-frame-pointer -fno-second-underscore" ) +set( CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG -fno-second-underscore" ) + +message(STATUS "CMAKE_Fortran_COMPILER_INIT = ${CMAKE_Fortran_COMPILER_INIT}") +message(STATUS "CMAKE_Fortran_COMPILER_FULLPATH = ${CMAKE_Fortran_COMPILER_FULLPATH}") +message(STATUS "CMAKE_Fortran_COMPILER = ${CMAKE_Fortran_COMPILER}") + +if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "" FORCE) +endif() +message(STATUS "cmake build type set to ${CMAKE_BUILD_TYPE}") + +message("ENV_FLAGS = $ENV{FFLAGS}") +string(TOUPPER ${CMAKE_BUILD_TYPE} BTYPE_UC ) +if( ${BTYPE_UC} MATCHES "DEBUG") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS_DEBUG}") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS_DEBUG}") +elseif( ${BTYPE_UC} MATCHES "RELEASE") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS_RELEASE}") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS_RELEASE}") +elseif( ${BTYPE_UC} MATCHES "RELWITHDEBINFO") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS_RELWITHDEBINFO}") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS_RELWITHDEBINFO}") +endif() +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} $ENV{CFLAGS}") +set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} $ENV{FFLAGS}") +message("CMAKE_C_FLAGS = ${CMAKE_C_FLAGS}") +message("CMAKE_Fortran_FLAGS = ${CMAKE_Fortran_FLAGS}") + +# source +# shared library +file(GLOB src_files *.c *.F *.f) +add_library(Pythia6 SHARED ${src_files}) + +# Installation: +# Library. +install(TARGETS Pythia6 DESTINATION lib) + +# Include-able file. +install( FILES example/main60.f + DESTINATION include ) + +# Documentation. +install(DIRECTORY doc DESTINATION .) + +# Examples +install(DIRECTORY example DESTINATION .) + +# tests +macro( pythia_test testname ) + set ( package_library_list ${PROJECT_BINARY_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP-${PACKAGE}-${VERSION}${CMAKE_STATIC_LIBRARY_SUFFIX} ) + link_libraries( Pythia6 ) + message( STATUS "building ${testname} from ${CMAKE_CURRENT_SOURCE_DIR}/example in ${CMAKE_CURRENT_BINARY_DIR}" ) + add_executable(${testname} example/${testname}.f) + add_test( ${testname} ${CMAKE_CURRENT_BINARY_DIR}/${testname} ) +endmacro( pythia_test ) + +pythia_test( main61 ) +pythia_test( main63 ) +pythia_test( main66 ) +pythia_test( main67 ) +pythia_test( main68 ) +pythia_test( main69 ) +pythia_test( main71 ) +pythia_test( main72 ) +pythia_test( main73 ) +pythia_test( main75 ) +pythia_test( main77 ) +pythia_test( main78 ) +pythia_test( main81 ) + +# these examples take a while to run +if( run_long_tests ) + pythia_test( main62 ) + pythia_test( main64 ) + pythia_test( main65 ) + pythia_test( main70 ) + pythia_test( main74 ) + pythia_test( main79 ) +endif( run_long_tests ) diff --git a/var/spack/repos/builtin/packages/pythia6/package.py b/var/spack/repos/builtin/packages/pythia6/package.py new file mode 100644 index 0000000000..7967092934 --- /dev/null +++ b/var/spack/repos/builtin/packages/pythia6/package.py @@ -0,0 +1,172 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +from spack import * +import numbers +import os +from six import iteritems +from six.moves.urllib.parse import urlparse + + +def _is_integral(x): + """Accepts only integral values.""" + try: + return isinstance(int(x), numbers.Integral) and \ + (not isinstance(x, bool)) and \ + int(x) == x + except ValueError: + return False + + +class Pythia6(CMakePackage): + """PYTHIA is a program for the generation of high-energy physics events, + i.e. for the description of collisions at high energies between elementary + particles such as e+, e-, p and pbar in various combinations. + + PYTHIA6 is a Fortran package which is no longer maintained: new + prospective users should use Pythia8 instead. + + This recipe includes patches required to interoperate with Root. + """ + + homepage = 'https://pythiasix.hepforge.org/' + url = 'http://www.hepforge.org/archive/pythiasix/pythia-6.4.28.tgz' + + version('6.4.28', + sha256='01cbff47e99365b5e46f6d62c1735d3cae1932c4710604850d59f538cb758020') + + # Root's TPythia6 interface requires extra sources to be built into + # the Pythia6 library. + variant('root', default=False, + description='Build extra (non OEM) code to allow use by Root.') + + # The maximum number of particles (NMXHEP) supported by the arrays + # in the /HEPEVT/ COMMON block may need tweaking if pythia6 is + # intended to be used with other code with different requirements. + variant('nmxhep', default=4000, values=_is_integral, description='Extent of particle arrays in the /HEPEVT/ COMMON block.') + + # In the unlikely event of new versions >6.4.28, + # pythia6_common_address.c should be checked for accuracy against + # the definitions of the relevant COMMON blocks in the Pythia6 + # Fortran source, and patched if necessaary. + resource( + name='root-pythia6-shim', + url='https://root.cern.ch/download/pythia6.tar.gz', + sha256='d613dcb27c905710e2f13a934913cc5545e3e5d0e477e580107385d9ef260056', + when='+root', + destination='.', + placement={'pythia6_common_address.c': 'pythia6_common_address.c', + 'tpythia6_called_from_cc.F': 'tpythia6_called_from_cc.F'} + ) + + # Download examples separately. + examples \ + = {'main60.f': + 'd713b8b267c4405cc9d31c58bba267ae3378902a26fa52393003bf35fd56902c', + 'main61.f': + 'e2a3d5524e43d16f60d9edc6e7198d41006d1ba127fb7b0e265aa509e13128b4', + 'main62.f': + 'dce822a72fe2d6cfb6d43c479ba98928fb0a39290a6ee26fdcacc66229313045', + 'main63.f': + 'b2dd343b3cd7969979b80c564d82b92e0d776d66bb19d346b52f2af27adeb62d', + 'main64.f': + 'a35f2f232e6e0d68d67fd350d4d46b0a353f5c7811de0c2db47ae16d17ed1843', + 'main65.f': + '03c81e0bbd77710b0461e18265e80e3bd51360b9f416c86013401f882ac39a5e', + 'main66.f': + '50dd9221a7e84ee7c5005db6758e5880d190eab8cce8a52e7c7b29e9fee8d3da', + 'main67.f': + '1984aa90fe4e3d628c3bcceaa6fca1b08231d835158d975fa171337d55ca4a2f', + 'main68.f': + 'c8d6def1298477ffec6a1d98c7e02dcee0debe6badc7c63f752f9194b82f212d', + 'main69.f': + 'd14399d43f8c4b670907558849d3e5a4d7625d027de3c10002185c58b20b061a', + 'main71.f': + '2e47af778003b0596e8999f0914033c6eda7335211b9e96ac3075d45a3cde12e', + 'main72.f': + 'e27ce2af68b40436c51c65767ebb5ff0955ab8dfdfc5fc5c217ae73cd53070da', + 'main73.f': + '567db2d1a66896ce5103ffa7e10742442b0e934088883e91339536e0249772c4', + 'main75.f': + 'b850986c43a5af1e7d13b66d22b01584e3c68bb338be32eac39e31f971b80be4', + 'main77.f': + '0679852c4f35719531ad38dc1dbb374b884181eb5e483c36d8867ccb449177a4', + 'main78.f': + '5babc59fe6a0bd57d97ec398cf01745bc9b72ce6ce0711e934d53c7821e21912', + 'main79.f': + '27ca84d6d0877f3605cbc1b865c3e1f571e7d2c9301094a4122e726a903dbead', + 'main81.f': + 'b02fecd1cd0f9ba16eaae53e9da0ba602569fdf0e46856cccdfb4c5b7ba33e8b', + 'ttbar.lhe': + 'fb0d43175cc392b19c2b6633dcf673d0b56229b60bec92df4aa782c7196b149c'} + + for example, checksum in iteritems(examples): + resource(name=example, + url='http://pythiasix.hepforge.org/examples/{0}'. + format(example), + sha256=checksum, + expand=False, + destination='example', + placement={example: example} + ) + + # Docs. + docs \ + = {'http://www.hepforge.org/archive/pythiasix/update_notes-6.4.28.txt': + 'a229be4ba9a4eb65a9d53600a5f388b620038d56694c6cb4671c2be224b67751', + 'http://home.thep.lu.se/~torbjorn/pythia6/lutp0613man2.pdf': + '03d637310ea80f0d7aea761492bd38452c602890d8cf913a1ec9edacd79fa43d', + 'https://pythiasix.hepforge.org/pythia6-announcement.txt': + '2a52def41f0c93e32e0db58dbcf072b987ebfbd32e42ccfc1f9382fcf65f1271'} + + for docurl, checksum in iteritems(docs): + doc = os.path.basename(urlparse(docurl).path) + resource(name=doc, + url=docurl, + sha256=checksum, + expand=False, + destination='doc', + placement={doc: doc} + ) + + # The included patch customizes some routines provided in dummy form + # by the original source to be useful out of the box in the vast + # majority of cases. If your case is different, platform- or + # variant-based adjustments should be made. + patch('pythia6.patch', level=0) + + def patch(self): + # Use our provided CMakeLists.txt. The Makefile provided with + # the source is GCC (gfortran) specific, and would have required + # additional patching for the +root variant. + llnl.util.filesystem.copy(os.path.join(os.path.dirname(__file__), + 'CMakeLists.txt'), + self.stage.source_path) + # Apply the variant value at the relevant place in the source. + filter_file(r'^(\s+PARAMETER\s*\(\s*NMXHEP\s*=\s*)\d+', + r'\1{0}'.format(self.spec.variants['nmxhep'].value), + 'pyhepc.f') + + def cmake_args(self): + args = ['-DPYTHIA6_VERSION={0}'.format(self.version.dotted)] + return args diff --git a/var/spack/repos/builtin/packages/pythia6/pythia6.patch b/var/spack/repos/builtin/packages/pythia6/pythia6.patch new file mode 100644 index 0000000000..5d45541e07 --- /dev/null +++ b/var/spack/repos/builtin/packages/pythia6/pythia6.patch @@ -0,0 +1,278 @@ +diff -Naur pytime.f pytime.f +--- pytime.f 2018-08-23 11:24:27.000000000 -0500 ++++ pytime.f 2018-08-23 11:46:08.189999826 -0500 +@@ -1,4 +1,3 @@ +- + C********************************************************************* + + C...PYTIME +@@ -59,17 +58,18 @@ + C IDATI(6)=ISEC + + C...Example 4: GNU LINUX libU77, SunOS. +-C CALL IDATE(IDTEMP) +-C IDATI(1)=IDTEMP(3) +-C IDATI(2)=IDTEMP(2) +-C IDATI(3)=IDTEMP(1) +-C CALL ITIME(IDTEMP) +-C IDATI(4)=IDTEMP(1) +-C IDATI(5)=IDTEMP(2) +-C IDATI(6)=IDTEMP(3) ++ CALL IDATE(IDTEMP) ++ IDATI(1)=IDTEMP(3) ++ IDATI(2)=IDTEMP(2) ++ IDATI(3)=IDTEMP(1) ++ CALL ITIME(IDTEMP) ++ IDATI(4)=IDTEMP(1) ++ IDATI(5)=IDTEMP(2) ++ IDATI(6)=IDTEMP(3) + + C...Common code to ensure right century. + IDATI(1)=2000+MOD(IDATI(1),100) + + RETURN + END ++ +diff -Naur upevnt.f upevnt.f +--- upevnt.f 2018-08-23 11:24:27.000000000 -0500 ++++ upevnt.f 2018-08-23 11:46:08.189999826 -0500 +@@ -1,56 +1,3 @@ +- +-C...Old example: handles a simple Pythia 6.4 initialization file. +- +-c SUBROUTINE UPINIT +- +-C...Double precision and integer declarations. +-c IMPLICIT DOUBLE PRECISION(A-H, O-Z) +-c IMPLICIT INTEGER(I-N) +- +-C...Commonblocks. +-c COMMON/PYDAT1/MSTU(200),PARU(200),MSTJ(200),PARJ(200) +-c COMMON/PYPARS/MSTP(200),PARP(200),MSTI(200),PARI(200) +-c SAVE /PYDAT1/,/PYPARS/ +- +-C...User process initialization commonblock. +-c INTEGER MAXPUP +-c PARAMETER (MAXPUP=100) +-c INTEGER IDBMUP,PDFGUP,PDFSUP,IDWTUP,NPRUP,LPRUP +-c DOUBLE PRECISION EBMUP,XSECUP,XERRUP,XMAXUP +-c COMMON/HEPRUP/IDBMUP(2),EBMUP(2),PDFGUP(2),PDFSUP(2), +-c &IDWTUP,NPRUP,XSECUP(MAXPUP),XERRUP(MAXPUP),XMAXUP(MAXPUP), +-c &LPRUP(MAXPUP) +-c SAVE /HEPRUP/ +- +-C...Read info from file. +-c IF(MSTP(161).GT.0) THEN +-c READ(MSTP(161),*,END=110,ERR=110) IDBMUP(1),IDBMUP(2),EBMUP(1), +-c & EBMUP(2),PDFGUP(1),PDFGUP(2),PDFSUP(1),PDFSUP(2),IDWTUP,NPRUP +-c DO 100 IPR=1,NPRUP +-c READ(MSTP(161),*,END=110,ERR=110) XSECUP(IPR),XERRUP(IPR), +-c & XMAXUP(IPR),LPRUP(IPR) +-c 100 CONTINUE +-c RETURN +-C...Error or prematurely reached end of file. +-c 110 WRITE(MSTU(11),5000) +-c STOP +- +-C...Else not implemented. +-c ELSE +-c WRITE(MSTU(11),5100) +-c STOP +-c ENDIF +- +-C...Format for error printout. +-c 5000 FORMAT(1X,'Error: UPINIT routine failed to read information'/ +-c &1X,'Execution stopped!') +-c 5100 FORMAT(1X,'Error: You have not implemented UPINIT routine'/ +-c &1X,'Dummy routine in PYTHIA file called instead.'/ +-c &1X,'Execution stopped!') +- +-c RETURN +-c END +- + C********************************************************************* + + C...UPEVNT +@@ -120,3 +67,54 @@ + + RETURN + END ++ ++C...Old example: handles a simple Pythia 6.4 event file. ++ ++c SUBROUTINE UPEVNT ++ ++C...Double precision and integer declarations. ++c IMPLICIT DOUBLE PRECISION(A-H, O-Z) ++c IMPLICIT INTEGER(I-N) ++ ++C...Commonblocks. ++c COMMON/PYDAT1/MSTU(200),PARU(200),MSTJ(200),PARJ(200) ++c COMMON/PYPARS/MSTP(200),PARP(200),MSTI(200),PARI(200) ++c SAVE /PYDAT1/,/PYPARS/ ++ ++C...User process event common block. ++c INTEGER MAXNUP ++c PARAMETER (MAXNUP=500) ++c INTEGER NUP,IDPRUP,IDUP,ISTUP,MOTHUP,ICOLUP ++c DOUBLE PRECISION XWGTUP,SCALUP,AQEDUP,AQCDUP,PUP,VTIMUP,SPINUP ++c COMMON/HEPEUP/NUP,IDPRUP,XWGTUP,SCALUP,AQEDUP,AQCDUP,IDUP(MAXNUP), ++c &ISTUP(MAXNUP),MOTHUP(2,MAXNUP),ICOLUP(2,MAXNUP),PUP(5,MAXNUP), ++c &VTIMUP(MAXNUP),SPINUP(MAXNUP) ++c SAVE /HEPEUP/ ++ ++C...Read info from file. ++c IF(MSTP(162).GT.0) THEN ++c READ(MSTP(162),*,END=110,ERR=110) NUP,IDPRUP,XWGTUP,SCALUP, ++c & AQEDUP,AQCDUP ++c DO 100 I=1,NUP ++c READ(MSTP(162),*,END=110,ERR=110) IDUP(I),ISTUP(I), ++c & MOTHUP(1,I),MOTHUP(2,I),ICOLUP(1,I),ICOLUP(2,I), ++c & (PUP(J,I),J=1,5),VTIMUP(I),SPINUP(I) ++c 100 CONTINUE ++c RETURN ++C...Special when reached end of file or other error. ++c 110 NUP=0 ++ ++C...Else not implemented. ++c ELSE ++c WRITE(MSTU(11),5000) ++c STOP ++c ENDIF ++ ++C...Format for error printout. ++c 5000 FORMAT(1X,'Error: You have not implemented UPEVNT routine'/ ++c &1X,'Dummy routine in PYTHIA file called instead.'/ ++c &1X,'Execution stopped!') ++ ++c RETURN ++c END ++ +diff -Naur upinit.f upinit.f +--- upinit.f 2018-08-23 11:24:27.000000000 -0500 ++++ upinit.f 2018-08-23 11:46:08.190999819 -0500 +@@ -1,4 +1,3 @@ +- + C********************************************************************* + + C...UPINIT +@@ -64,3 +63,56 @@ + + RETURN + END ++ ++C...Old example: handles a simple Pythia 6.4 initialization file. ++ ++c SUBROUTINE UPINIT ++ ++C...Double precision and integer declarations. ++c IMPLICIT DOUBLE PRECISION(A-H, O-Z) ++c IMPLICIT INTEGER(I-N) ++ ++C...Commonblocks. ++c COMMON/PYDAT1/MSTU(200),PARU(200),MSTJ(200),PARJ(200) ++c COMMON/PYPARS/MSTP(200),PARP(200),MSTI(200),PARI(200) ++c SAVE /PYDAT1/,/PYPARS/ ++ ++C...User process initialization commonblock. ++c INTEGER MAXPUP ++c PARAMETER (MAXPUP=100) ++c INTEGER IDBMUP,PDFGUP,PDFSUP,IDWTUP,NPRUP,LPRUP ++c DOUBLE PRECISION EBMUP,XSECUP,XERRUP,XMAXUP ++c COMMON/HEPRUP/IDBMUP(2),EBMUP(2),PDFGUP(2),PDFSUP(2), ++c &IDWTUP,NPRUP,XSECUP(MAXPUP),XERRUP(MAXPUP),XMAXUP(MAXPUP), ++c &LPRUP(MAXPUP) ++c SAVE /HEPRUP/ ++ ++C...Read info from file. ++c IF(MSTP(161).GT.0) THEN ++c READ(MSTP(161),*,END=110,ERR=110) IDBMUP(1),IDBMUP(2),EBMUP(1), ++c & EBMUP(2),PDFGUP(1),PDFGUP(2),PDFSUP(1),PDFSUP(2),IDWTUP,NPRUP ++c DO 100 IPR=1,NPRUP ++c READ(MSTP(161),*,END=110,ERR=110) XSECUP(IPR),XERRUP(IPR), ++c & XMAXUP(IPR),LPRUP(IPR) ++c 100 CONTINUE ++c RETURN ++C...Error or prematurely reached end of file. ++c 110 WRITE(MSTU(11),5000) ++c STOP ++ ++C...Else not implemented. ++c ELSE ++c WRITE(MSTU(11),5100) ++c STOP ++c ENDIF ++ ++C...Format for error printout. ++c 5000 FORMAT(1X,'Error: UPINIT routine failed to read information'/ ++c &1X,'Execution stopped!') ++c 5100 FORMAT(1X,'Error: You have not implemented UPINIT routine'/ ++c &1X,'Dummy routine in PYTHIA file called instead.'/ ++c &1X,'Execution stopped!') ++ ++c RETURN ++c END ++ +diff -Naur upveto.f upveto.f +--- upveto.f 2018-08-23 11:24:27.000000000 -0500 ++++ upveto.f 2018-08-23 11:46:08.190999819 -0500 +@@ -1,54 +1,3 @@ +- +-C...Old example: handles a simple Pythia 6.4 event file. +- +-c SUBROUTINE UPEVNT +- +-C...Double precision and integer declarations. +-c IMPLICIT DOUBLE PRECISION(A-H, O-Z) +-c IMPLICIT INTEGER(I-N) +- +-C...Commonblocks. +-c COMMON/PYDAT1/MSTU(200),PARU(200),MSTJ(200),PARJ(200) +-c COMMON/PYPARS/MSTP(200),PARP(200),MSTI(200),PARI(200) +-c SAVE /PYDAT1/,/PYPARS/ +- +-C...User process event common block. +-c INTEGER MAXNUP +-c PARAMETER (MAXNUP=500) +-c INTEGER NUP,IDPRUP,IDUP,ISTUP,MOTHUP,ICOLUP +-c DOUBLE PRECISION XWGTUP,SCALUP,AQEDUP,AQCDUP,PUP,VTIMUP,SPINUP +-c COMMON/HEPEUP/NUP,IDPRUP,XWGTUP,SCALUP,AQEDUP,AQCDUP,IDUP(MAXNUP), +-c &ISTUP(MAXNUP),MOTHUP(2,MAXNUP),ICOLUP(2,MAXNUP),PUP(5,MAXNUP), +-c &VTIMUP(MAXNUP),SPINUP(MAXNUP) +-c SAVE /HEPEUP/ +- +-C...Read info from file. +-c IF(MSTP(162).GT.0) THEN +-c READ(MSTP(162),*,END=110,ERR=110) NUP,IDPRUP,XWGTUP,SCALUP, +-c & AQEDUP,AQCDUP +-c DO 100 I=1,NUP +-c READ(MSTP(162),*,END=110,ERR=110) IDUP(I),ISTUP(I), +-c & MOTHUP(1,I),MOTHUP(2,I),ICOLUP(1,I),ICOLUP(2,I), +-c & (PUP(J,I),J=1,5),VTIMUP(I),SPINUP(I) +-c 100 CONTINUE +-c RETURN +-C...Special when reached end of file or other error. +-c 110 NUP=0 +- +-C...Else not implemented. +-c ELSE +-c WRITE(MSTU(11),5000) +-c STOP +-c ENDIF +- +-C...Format for error printout. +-c 5000 FORMAT(1X,'Error: You have not implemented UPEVNT routine'/ +-c &1X,'Dummy routine in PYTHIA file called instead.'/ +-c &1X,'Execution stopped!') +- +-c RETURN +-c END +- + C********************************************************************* + + C...UPVETO +@@ -98,3 +47,4 @@ + + RETURN + END ++ -- cgit v1.2.3-70-g09d2 From ab099e9ba341918ade51863abaec4d5abaca5ddc Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Tue, 9 Oct 2018 21:07:13 +0200 Subject: trilinos: extend TPetra explicit instantiations and fix missing Teuchos counterparts (#9448) --- .../repos/builtin/packages/trilinos/package.py | 63 ++++++++++++++-------- 1 file changed, 41 insertions(+), 22 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 319e4bc977..4efb3b6d29 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -77,12 +77,14 @@ class Trilinos(CMakePackage): description='Build python wrappers') # Build options + variant('complex', default=False, + description='Enable complex numbers in Trilinos') + variant('explicit_template_instantiation', default=True, + description='Enable explicit template instantiation (ETI)') + variant('float', default=False, + description='Enable single precision (float) numbers in Trilinos') variant('fortran', default=True, description='Compile with Fortran support') - variant('instantiate', default=True, - description='Compile with explicit instantiation') - variant('instantiate_cmplx', default=False, - description='Compile with explicit instantiation for complex') variant('openmp', default=False, description='Enable OpenMP') variant('shared', default=True, @@ -261,6 +263,14 @@ class Trilinos(CMakePackage): # For Trilinos v11 we need to force SuperLUDist=OFF, since only the # deprecated SuperLUDist v3.3 together with an Amesos patch is working. conflicts('+superlu-dist', when='@11.4.1:11.14.3') + # see https://github.com/trilinos/Trilinos/issues/3566 + conflicts('+superlu-dist', when='+float+amesos2+explicit_template_instantiation^superlu-dist@5.3.0:') + # Amesos, conflicting types of double and complex SLU_D + # see + # https://trilinos.org/pipermail/trilinos-users/2015-March/004731.html + # and + # https://trilinos.org/pipermail/trilinos-users/2015-March/004802.html + conflicts('+superlu-dist', when='+complex+amesos2') # PnetCDF was only added after v12.10.1 conflicts('+pnetcdf', when='@0:12.10.1') @@ -581,13 +591,7 @@ class Trilinos(CMakePackage): ]) if '+superlu-dist' in spec: - # Amesos, conflicting types of double and complex SLU_D - # see - # https://trilinos.org/pipermail/trilinos-users/2015-March/004731.html - # and - # https://trilinos.org/pipermail/trilinos-users/2015-March/004802.html options.extend([ - '-DTeuchos_ENABLE_COMPLEX:BOOL=OFF', '-DKokkosTSQR_ENABLE_Complex:BOOL=OFF' ]) options.extend([ @@ -649,7 +653,7 @@ class Trilinos(CMakePackage): ]) else: options.extend([ - '-DTPL_ENABLE_GGNS:BOOL=OFF' + '-DTPL_ENABLE_CGNS:BOOL=OFF' ]) # ################# Miscellaneous Stuff ###################### @@ -677,19 +681,34 @@ class Trilinos(CMakePackage): '-DTrilinos_ENABLE_Fortran=ON' ]) - # Explicit instantiation - if '+instantiate' in spec: + float_s = 'ON' if '+float' in spec else 'OFF' + complex_s = 'ON' if '+complex' in spec else 'OFF' + complex_float_s = 'ON' if ('+complex' in spec and + '+float' in spec) else 'OFF' + if '+teuchos' in spec: options.extend([ - '-DTrilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON' + '-DTeuchos_ENABLE_COMPLEX=%s' % complex_s, + '-DTeuchos_ENABLE_FLOAT=%s' % float_s + ]) + + # Explicit Template Instantiation (ETI) in Tpetra + # NOTE: Trilinos will soon move to fixed std::uint64_t for GO and + # std::int32_t or std::int64_t for local. + options.append( + '-DTrilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=%s' % ( + 'ON' if '+explicit_template_instantiation' in spec else 'OFF' + ) + ) + + if '+explicit_template_instantiation' in spec and '+tpetra' in spec: + options.extend([ + '-DTpetra_INST_DOUBLE:BOOL=ON', + '-DTpetra_INST_INT_LONG:BOOL=ON', + '-DTpetra_INST_COMPLEX_DOUBLE=%s' % complex_s, + '-DTpetra_INST_COMPLEX_FLOAT=%s' % complex_float_s, + '-DTpetra_INST_FLOAT=%s' % float_s, + '-DTpetra_INST_SERIAL=ON' ]) - if '+tpetra' in spec: - options.extend([ - '-DTpetra_INST_DOUBLE:BOOL=ON', - '-DTpetra_INST_INT_LONG:BOOL=ON' - '-DTpetra_INST_COMPLEX_DOUBLE=%s' % ( - 'ON' if '+instantiate_cmplx' in spec else 'OFF' - ) - ]) # disable due to compiler / config errors: if spec.satisfies('%xl') or spec.satisfies('%xl_r'): -- cgit v1.2.3-70-g09d2 From 5e4264ed890e292f103d40f30d29d85338315fb6 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Tue, 9 Oct 2018 14:19:29 -0500 Subject: xsdk: reorder develop version statements (#9469) --- var/spack/repos/builtin/packages/xsdk/package.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py index 97dd075bf5..41a2c8bcd5 100644 --- a/var/spack/repos/builtin/packages/xsdk/package.py +++ b/var/spack/repos/builtin/packages/xsdk/package.py @@ -46,51 +46,51 @@ class Xsdk(Package): variant('debug', default=False, description='Compile in debug mode') variant('cuda', default=False, description='Enable CUDA dependent packages') + depends_on('hypre@develop~internal-superlu', when='@develop') depends_on('hypre@2.12.1~internal-superlu', when='@0.3.0') depends_on('hypre@xsdk-0.2.0~internal-superlu', when='@xsdk-0.2.0') - depends_on('hypre@develop~internal-superlu', when='@develop') - depends_on('mfem@3.3.2+mpi+hypre+superlu-dist+petsc+sundials+examples+miniapps', when='@0.3.0') depends_on('mfem@develop+mpi+hypre+superlu-dist+petsc+sundials+examples+miniapps', when='@develop') + depends_on('mfem@3.3.2+mpi+hypre+superlu-dist+petsc+sundials+examples+miniapps', when='@0.3.0') + depends_on('superlu-dist@develop', when='@develop') depends_on('superlu-dist@5.2.2', when='@0.3.0') depends_on('superlu-dist@xsdk-0.2.0', when='@xsdk-0.2.0') - depends_on('superlu-dist@develop', when='@develop') + depends_on('trilinos@develop+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse+tpetra+nox+ifpack2+zoltan2+amesos2~exodus', + when='@develop') depends_on('trilinos@12.12.1+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse~tpetra~ifpack2~zoltan2~amesos2~exodus', when='@0.3.0') depends_on('trilinos@xsdk-0.2.0+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse~tpetra~ifpack2~zoltan2~amesos2~exodus', when='@xsdk-0.2.0') - depends_on('trilinos@develop+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse+tpetra+nox+ifpack2+zoltan2+amesos2~exodus', - when='@develop') + depends_on('petsc@develop+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps+double~int64', + when='@develop') depends_on('petsc@3.8.2+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps+double~int64', when='@0.3.0') depends_on('petsc@xsdk-0.2.0+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps+double~int64', when='@xsdk-0.2.0') - depends_on('petsc@develop+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps+double~int64', - when='@develop') depends_on('dealii@develop~assimp~python~doc~slepc~gmsh+petsc+mpi+trilinos~int64+hdf5~netcdf+metis', when='@develop') + depends_on('pflotran@develop', when='@develop') depends_on('pflotran@xsdk-0.3.0', when='@0.3.0') depends_on('pflotran@xsdk-0.2.0', when='@xsdk-0.2.0') - depends_on('pflotran@develop', when='@develop') + depends_on('alquimia@develop', when='@develop') depends_on('alquimia@xsdk-0.3.0', when='@0.3.0') depends_on('alquimia@xsdk-0.2.0', when='@xsdk-0.2.0') - depends_on('alquimia@develop', when='@develop') - depends_on('sundials@3.1.0~int64+hypre', when='@0.3.0') depends_on('sundials@3.1.0~int64+hypre', when='@develop') + depends_on('sundials@3.1.0~int64+hypre', when='@0.3.0') depends_on('plasma@17.2:', when='@develop %gcc@6.0:') - depends_on('magma@2.2.0', when='@0.3.0 +cuda') depends_on('magma@2.2.0', when='@develop +cuda') + depends_on('magma@2.2.0', when='@0.3.0 +cuda') - depends_on('amrex@develop', when='@develop %gcc') depends_on('amrex@develop', when='@develop %intel') + depends_on('amrex@develop', when='@develop %gcc') depends_on('slepc@develop', when='@develop') -- cgit v1.2.3-70-g09d2 From 5cafe1b4e8099c386ad4bd3adc4a9658f1958426 Mon Sep 17 00:00:00 2001 From: Dan Han Date: Tue, 9 Oct 2018 15:22:34 -0500 Subject: blastplus: newest version 2.7.1 (#9472) --- var/spack/repos/builtin/packages/blast-plus/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/blast-plus/package.py b/var/spack/repos/builtin/packages/blast-plus/package.py index 8e973f6124..f4c7c696cc 100644 --- a/var/spack/repos/builtin/packages/blast-plus/package.py +++ b/var/spack/repos/builtin/packages/blast-plus/package.py @@ -42,6 +42,7 @@ class BlastPlus(AutotoolsPackage): homepage = "http://blast.ncbi.nlm.nih.gov/" url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/2.6.0/ncbi-blast-2.6.0+-src.tar.gz" + version('2.7.1', sha256='10a78d3007413a6d4c983d2acbf03ef84b622b82bd9a59c6bd9fbdde9d0298ca') version('2.6.0', 'c8ce8055b10c4d774d995f88c7cc6225') version('2.2.30', 'f8e9a5eb368173142fe6867208b73715') @@ -107,6 +108,8 @@ class BlastPlus(AutotoolsPackage): depends_on('python', when='+python') depends_on('perl', when='+perl') + depends_on('lmdb', when='@2.7.1:') + configure_directory = 'c++' def configure_args(self): -- cgit v1.2.3-70-g09d2 From 54bd049d9944a1b9751a378d47aa0e59e58d2552 Mon Sep 17 00:00:00 2001 From: "Mark W. Krentel" Date: Tue, 9 Oct 2018 17:12:34 -0500 Subject: xerces-c: add variant for transcoder, rework config flags. (#9393) * xerces-c: Add variant for choice of transcoder (gnuiconv, iconv, icu, macos, windows). It's important to specify a --enable-transcoder option on the configure line or else xerces may make a different choice when multiple transcoders are available. * Pass the compile flags to configure. For cflags and cxxflags, this is necessary to respect the value from the spack install line. Otherwise, xerces (and any autotools package) will choose a default value that overrides the spack compiler wrapper. * Add xerces version 3.2.2. * icu4c needs the --enable-rpath configure option on Darwin --- var/spack/repos/builtin/packages/icu4c/package.py | 9 +++- .../repos/builtin/packages/xerces-c/package.py | 52 ++++++++++++++++++++-- 2 files changed, 56 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/icu4c/package.py b/var/spack/repos/builtin/packages/icu4c/package.py index 39523b1563..e6a3df465d 100644 --- a/var/spack/repos/builtin/packages/icu4c/package.py +++ b/var/spack/repos/builtin/packages/icu4c/package.py @@ -46,4 +46,11 @@ class Icu4c(AutotoolsPackage): return url.format(version.dotted, version.underscored) def configure_args(self): - return ['--enable-rpath'] + args = [] + + # The --enable-rpath option is only needed on MacOS, and it + # breaks the build for xerces-c on Linux. + if 'platform=darwin' in self.spec: + args.append('--enable-rpath') + + return args diff --git a/var/spack/repos/builtin/packages/xerces-c/package.py b/var/spack/repos/builtin/packages/xerces-c/package.py index 8733289069..7b321f61bd 100644 --- a/var/spack/repos/builtin/packages/xerces-c/package.py +++ b/var/spack/repos/builtin/packages/xerces-c/package.py @@ -23,6 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * +import sys class XercesC(AutotoolsPackage): @@ -35,13 +36,56 @@ class XercesC(AutotoolsPackage): homepage = "https://xerces.apache.org/xerces-c" url = "https://archive.apache.org/dist/xerces/c/3/sources/xerces-c-3.2.1.tar.bz2" + version('3.2.2', '4c395216ecbef3c88a756ff4090e6f7e') version('3.2.1', '8f98a81a3589bbc2dad9837452f7d319') version('3.1.4', 'd04ae9d8b2dee2157c6db95fa908abfd') - depends_on('libiconv') + # It's best to be explicit about the transcoder or else xerces may + # choose another value. + if sys.platform == 'darwin': + default_transcoder = 'macos' + elif sys.platform.startswith('win') or sys.platform == 'cygwin': + default_transcoder = 'windows' + else: + default_transcoder = 'gnuiconv' - def setup_environment(self, spack_env, run_env): - spack_env.append_flags('LDFLAGS', self.spec['libiconv'].libs.ld_flags) + variant('transcoder', default=default_transcoder, + values=('gnuiconv', 'iconv', 'icu', 'macos', 'windows'), + multi=False, + description='Use the specified transcoder') + + depends_on('libiconv', type='link', when='transcoder=gnuiconv') + depends_on('icu4c', type='link', when='transcoder=icu') + + # Pass flags to configure. This is necessary for CXXFLAGS or else + # the xerces default will override the spack wrapper. + def flag_handler(self, name, flags): + spec = self.spec + + # There is no --with-pkg for gnuiconv. + if name == 'ldflags' and 'transcoder=gnuiconv' in spec: + flags.append(spec['libiconv'].libs.ld_flags) + + return (None, None, flags) def configure_args(self): - return ['--disable-network'] + spec = self.spec + args = ['--disable-network'] + + if 'transcoder=gnuiconv' in spec: + args.append('--enable-transcoder-gnuiconv') + + if 'transcoder=iconv' in spec: + args.append('--enable-transcoder-iconv') + + if 'transcoder=icu' in spec: + args.append('--enable-transcoder-icu') + args.append('--with-icu=%s' % spec['icu4c'].prefix) + + if 'transcoder=macos' in spec: + args.append('--enable-transcoder-macosunicodeconverter') + + if 'transcoder=windows' in spec: + args.append('--enable-transcoder-windows') + + return args -- cgit v1.2.3-70-g09d2 From ca0d9ae7f024806a93295af19ec37aa491cdaac0 Mon Sep 17 00:00:00 2001 From: Greg Becker Date: Tue, 9 Oct 2018 15:18:31 -0700 Subject: Make builtin flag handlers available in package scope (#8668) * Push default flag handlers into module scope * Preserve backwards compatibility of builtin flag handler names Ensure Spack continues to work for packages using the `Package.env_flags` idiom and equivalent. * update docs and tests to match * Update packages to match new syntax --- lib/spack/docs/packaging_guide.rst | 13 +++--- lib/spack/spack/package.py | 52 +++++++++++++---------- lib/spack/spack/pkgkit.py | 1 + lib/spack/spack/test/flag_handlers.py | 17 ++++---- var/spack/repos/builtin/packages/hiop/package.py | 2 +- var/spack/repos/builtin/packages/ipopt/package.py | 2 +- 6 files changed, 47 insertions(+), 40 deletions(-) (limited to 'var') diff --git a/lib/spack/docs/packaging_guide.rst b/lib/spack/docs/packaging_guide.rst index 683bb01503..a9c8c13710 100644 --- a/lib/spack/docs/packaging_guide.rst +++ b/lib/spack/docs/packaging_guide.rst @@ -2689,13 +2689,13 @@ Here are the definitions of the three built-in flag handlers: .. code-block:: python - def inject_flags(self, name, flags): + def inject_flags(pkg, name, flags): return (flags, None, None) - def env_flags(self, name, flags): + def env_flags(pkg, name, flags): return (None, flags, None) - def build_system_flags(self, name, flags): + def build_system_flags(pkg, name, flags): return (None, None, flags) .. note:: @@ -2708,10 +2708,7 @@ the built-in flag handlers, .. code-block:: python - flag_handler = .env_flags - -where ```` can be any of the subclasses of PackageBase -discussed in :ref:`installation_procedure`, + flag_handler = env_flags or by implementing the flag_handler method. Suppose for a package ``Foo`` we need to pass ``cflags``, ``cxxflags``, and ``cppflags`` @@ -2737,7 +2734,7 @@ method of the ``EnvironmentModifications`` class to append values to a list of flags whenever the flag handler is ``env_flags``. If the package passes flags through the environment or the build system manually (in the install method, for example), we recommend using the -default flag handler, or removind manual references and implementing a +default flag handler, or removing manual references and implementing a custom flag handler method that adds the desired flags to export as environment variables or pass to the build system. Manual flag passing is likely to interfere with the ``env_flags`` and diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py index a614e108e4..6aa07ed0b9 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -1738,6 +1738,31 @@ class PackageBase(with_metaclass(PackageMeta, PackageViewMixin, object)): return __import__(self.__class__.__module__, fromlist=[self.__class__.__name__]) + @classmethod + def inject_flags(cls, name, flags): + """ + flag_handler that injects all flags through the compiler wrapper. + """ + return (flags, None, None) + + @classmethod + def env_flags(cls, name, flags): + """ + flag_handler that adds all flags to canonical environment variables. + """ + return (None, flags, None) + + @classmethod + def build_system_flags(cls, name, flags): + """ + flag_handler that passes flags to the build system arguments. Any + package using `build_system_flags` must also implement + `flags_to_build_system_args`, or derive from a class that + implements it. Currently, AutotoolsPackage and CMakePackage + implement it. + """ + return (None, None, flags) + def setup_environment(self, spack_env, run_env): """Set up the compile and runtime environments for a package. @@ -1838,28 +1863,6 @@ class PackageBase(with_metaclass(PackageMeta, PackageViewMixin, object)): """ pass - def inject_flags(self, name, flags): - """ - flag_handler that injects all flags through the compiler wrapper. - """ - return (flags, None, None) - - def env_flags(self, name, flags): - """ - flag_handler that adds all flags to canonical environment variables. - """ - return (None, flags, None) - - def build_system_flags(self, name, flags): - """ - flag_handler that passes flags to the build system arguments. Any - package using `build_system_flags` must also implement - `flags_to_build_system_args`, or derive from a class that - implements it. Currently, AutotoolsPackage and CMakePackage - implement it. - """ - return (None, None, flags) - flag_handler = inject_flags # The flag handler method is called for each of the allowed compiler flags. # It returns a triple of inject_flags, env_flags, build_system_flags. @@ -2196,6 +2199,11 @@ class PackageBase(with_metaclass(PackageMeta, PackageViewMixin, object)): tty.warn(msg.format(name)) +inject_flags = PackageBase.inject_flags +env_flags = PackageBase.env_flags +build_system_flags = PackageBase.build_system_flags + + class Package(PackageBase): """General purpose class with a single ``install`` phase that needs to be coded by packagers. diff --git a/lib/spack/spack/pkgkit.py b/lib/spack/spack/pkgkit.py index bb688d1acd..a9251335af 100644 --- a/lib/spack/spack/pkgkit.py +++ b/lib/spack/spack/pkgkit.py @@ -31,6 +31,7 @@ import llnl.util.filesystem from llnl.util.filesystem import * from spack.package import Package, run_before, run_after, on_package_attributes +from spack.package import inject_flags, env_flags, build_system_flags from spack.build_systems.makefile import MakefilePackage from spack.build_systems.aspell_dict import AspellDictPackage from spack.build_systems.autotools import AutotoolsPackage diff --git a/lib/spack/spack/test/flag_handlers.py b/lib/spack/spack/test/flag_handlers.py index 5366b60f11..441f3fcbae 100644 --- a/lib/spack/spack/test/flag_handlers.py +++ b/lib/spack/spack/test/flag_handlers.py @@ -29,6 +29,8 @@ import spack.spec import spack.repo import spack.build_environment +from spack.pkgkit import inject_flags, env_flags, build_system_flags + @pytest.fixture() def temp_env(): @@ -70,7 +72,6 @@ class TestFlagHandlers(object): pkg = spack.repo.get(s) pkg.flag_handler = pkg.__class__.inject_flags spack.build_environment.setup_package(pkg, False) - assert os.environ['SPACK_CPPFLAGS'] == '-g' assert 'CPPFLAGS' not in os.environ @@ -78,7 +79,7 @@ class TestFlagHandlers(object): s = spack.spec.Spec('mpileaks cppflags=-g') s.concretize() pkg = spack.repo.get(s) - pkg.flag_handler = pkg.inject_flags + pkg.flag_handler = inject_flags spack.build_environment.setup_package(pkg, False) assert os.environ['SPACK_CPPFLAGS'] == '-g' @@ -88,7 +89,7 @@ class TestFlagHandlers(object): s = spack.spec.Spec('mpileaks cppflags=-g') s.concretize() pkg = spack.repo.get(s) - pkg.flag_handler = pkg.env_flags + pkg.flag_handler = env_flags spack.build_environment.setup_package(pkg, False) assert os.environ['CPPFLAGS'] == '-g' @@ -98,7 +99,7 @@ class TestFlagHandlers(object): s = spack.spec.Spec('cmake-client cppflags=-g') s.concretize() pkg = spack.repo.get(s) - pkg.flag_handler = pkg.build_system_flags + pkg.flag_handler = build_system_flags spack.build_environment.setup_package(pkg, False) assert 'SPACK_CPPFLAGS' not in os.environ @@ -112,7 +113,7 @@ class TestFlagHandlers(object): s = spack.spec.Spec('patchelf cppflags=-g') s.concretize() pkg = spack.repo.get(s) - pkg.flag_handler = pkg.build_system_flags + pkg.flag_handler = build_system_flags spack.build_environment.setup_package(pkg, False) assert 'SPACK_CPPFLAGS' not in os.environ @@ -124,7 +125,7 @@ class TestFlagHandlers(object): s = spack.spec.Spec('mpileaks cppflags=-g') s.concretize() pkg = spack.repo.get(s) - pkg.flag_handler = pkg.build_system_flags + pkg.flag_handler = build_system_flags # Test the command line flags method raises a NotImplementedError try: @@ -161,7 +162,7 @@ class TestFlagHandlers(object): s = spack.spec.Spec('cmake-client ldflags=-mthreads') s.concretize() pkg = spack.repo.get(s) - pkg.flag_handler = pkg.build_system_flags + pkg.flag_handler = build_system_flags spack.build_environment.setup_package(pkg, False) assert 'SPACK_LDFLAGS' not in os.environ @@ -177,7 +178,7 @@ class TestFlagHandlers(object): s = spack.spec.Spec('cmake-client ldlibs=-lfoo') s.concretize() pkg = spack.repo.get(s) - pkg.flag_handler = pkg.build_system_flags + pkg.flag_handler = build_system_flags spack.build_environment.setup_package(pkg, False) assert 'SPACK_LDLIBS' not in os.environ diff --git a/var/spack/repos/builtin/packages/hiop/package.py b/var/spack/repos/builtin/packages/hiop/package.py index 2720973271..3cb55747fc 100644 --- a/var/spack/repos/builtin/packages/hiop/package.py +++ b/var/spack/repos/builtin/packages/hiop/package.py @@ -48,7 +48,7 @@ class Hiop(CMakePackage): depends_on('lapack') depends_on('blas') - flag_handler = CMakePackage.build_system_flags + flag_handler = build_system_flags def cmake_args(self): args = [] diff --git a/var/spack/repos/builtin/packages/ipopt/package.py b/var/spack/repos/builtin/packages/ipopt/package.py index 33a818bd89..200992e82a 100644 --- a/var/spack/repos/builtin/packages/ipopt/package.py +++ b/var/spack/repos/builtin/packages/ipopt/package.py @@ -59,7 +59,7 @@ class Ipopt(AutotoolsPackage): patch('ipopt_ppc_build.patch', when='arch=ppc64le') - flag_handler = AutotoolsPackage.build_system_flags + flag_handler = build_system_flags build_directory = 'spack-build' # IPOPT does not build correctly in parallel on OS X -- cgit v1.2.3-70-g09d2 From 6c4e0b1bf14476a9687b9de403b6002a90778ff0 Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Tue, 9 Oct 2018 18:54:32 -0500 Subject: sspace-standard: add perl-perl4-corelibs dep, fix perl scripts (#9473) perl scripts were pointing to /usr/bin/perl, changed to point to the spack-installed perl --- .../repos/builtin/packages/sspace-standard/package.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sspace-standard/package.py b/var/spack/repos/builtin/packages/sspace-standard/package.py index b1bba3273e..bf7f6a0679 100644 --- a/var/spack/repos/builtin/packages/sspace-standard/package.py +++ b/var/spack/repos/builtin/packages/sspace-standard/package.py @@ -24,6 +24,7 @@ ############################################################################## from spack import * import os +import glob class SspaceStandard(Package): @@ -42,14 +43,25 @@ class SspaceStandard(Package): version('3.0', '7e171b4861b9d514e80aafc3d9cdf554') depends_on('perl+threads', type=('build', 'run')) + depends_on('perl-perl4-corelibs', type=('build', 'run')) def install(self, spec, prefix): + rootscript = 'SSPACE_Standard_v{0}.pl'.format(self.version) + + scripts = [rootscript] + scripts.extend(glob.glob('tools/*.pl')) + scripts.extend(glob.glob('bwa/*.pl')) + + for s in scripts: + filter_file('/usr/bin/perl', '/usr/bin/env perl', + s, string=True) + install_tree('bin', prefix.bin) install_tree('bowtie', prefix.bowtie) install_tree('bwa', prefix.bwa) install_tree('dotlib', prefix.dotlib) install_tree('tools', prefix.tools) - install('SSPACE_Standard_v{0}.pl'.format(self.version), prefix) + install(rootscript, prefix) def setup_environment(self, spack_env, run_env): run_env.set('SSPACE_HOME', prefix) -- cgit v1.2.3-70-g09d2 From 03231a39db0ad634fd3c65c2263840ba2b557841 Mon Sep 17 00:00:00 2001 From: sknigh Date: Tue, 9 Oct 2018 16:54:59 -0700 Subject: Added nlohmann-json v3.3.0 (#9463) --- var/spack/repos/builtin/packages/nlohmann-json/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nlohmann-json/package.py b/var/spack/repos/builtin/packages/nlohmann-json/package.py index 75102675f7..9258810b62 100644 --- a/var/spack/repos/builtin/packages/nlohmann-json/package.py +++ b/var/spack/repos/builtin/packages/nlohmann-json/package.py @@ -32,6 +32,7 @@ class NlohmannJson(CMakePackage): url = "https://github.com/nlohmann/json/archive/v3.1.2.tar.gz" maintainers = ['ax3l'] + version('3.3.0', sha256='2fd1d207b4669a7843296c41d3b6ac5b23d00dec48dba507ba051d14564aa801') version('3.1.2', '557651b017c36ad596ba3b577ba1b539') variant('single_header', default=True, -- cgit v1.2.3-70-g09d2 From 3e565a734aaa113564ef1ed63cc790a06fc36d92 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Tue, 9 Oct 2018 18:55:28 -0500 Subject: braker: add missing deps (#9468) --- var/spack/repos/builtin/packages/braker/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/braker/package.py b/var/spack/repos/builtin/packages/braker/package.py index c72ec6e87d..5aba032e58 100644 --- a/var/spack/repos/builtin/packages/braker/package.py +++ b/var/spack/repos/builtin/packages/braker/package.py @@ -38,6 +38,9 @@ class Braker(Package): url='http://bioinf.uni-greifswald.de/augustus/binaries/old/BRAKER1_v1.11.tar.gz') depends_on('perl', type=('build', 'run')) + depends_on('perl-scalar-util-numeric', type=('build', 'run')) + depends_on('perl-parallel-forkmanager', type=('build', 'run')) + depends_on('perl-file-which', type=('build', 'run')) depends_on('augustus@3.2.3') depends_on('genemark-et') depends_on('bamtools') -- cgit v1.2.3-70-g09d2 From aede2275803e2e4ab003ef689b45c0203fb6d874 Mon Sep 17 00:00:00 2001 From: Dan Han Date: Tue, 9 Oct 2018 18:58:52 -0500 Subject: matlab: new version (#9427) --- var/spack/repos/builtin/packages/matlab/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/matlab/package.py b/var/spack/repos/builtin/packages/matlab/package.py index 5d7715c673..652a583e35 100644 --- a/var/spack/repos/builtin/packages/matlab/package.py +++ b/var/spack/repos/builtin/packages/matlab/package.py @@ -41,8 +41,8 @@ class Matlab(Package): mirror so that Spack can find it. For instructions on how to set up a mirror, see http://spack.readthedocs.io/en/latest/mirrors.html""" - homepage = "https://www.mathworks.com/products/matlab.html" - + homepage = "https://www.mathworks.com/products/matlab.html" + version('R2018b', sha256='8cfcddd3878d3a69371c4e838773bcabf12aaf0362cc2e1ae7e8820845635cac') version('R2016b', 'b0e0b688894282139fa787b5a86a5cf7') variant( -- cgit v1.2.3-70-g09d2 From 8ab6539c0e441a08ad886c7936cd70213111c539 Mon Sep 17 00:00:00 2001 From: "Seth R. Johnson" Date: Tue, 9 Oct 2018 20:05:49 -0400 Subject: Add important variants to MOAB and Geant4 (#9409) * Add option to disable threads for Geant4 * Add option to enable DagMC in MOAB * Explicitly add OFF flag when threading is disabled * Fix unintentional enabling of C++14 in Geant4 The following always evaluated to True: 'c++14' or 'c++1y' in spec: --- var/spack/repos/builtin/packages/geant4/package.py | 10 ++++++++-- var/spack/repos/builtin/packages/moab/package.py | 6 ++++++ 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/geant4/package.py b/var/spack/repos/builtin/packages/geant4/package.py index aa16b8e856..b40fd27d5d 100644 --- a/var/spack/repos/builtin/packages/geant4/package.py +++ b/var/spack/repos/builtin/packages/geant4/package.py @@ -50,9 +50,13 @@ class Geant4(CMakePackage): variant('opengl', default=False, description='Optional OpenGL support') variant('x11', default=False, description='Optional X11 support') variant('motif', default=False, description='Optional motif support') + variant('threads', default=True, description='Build with multithreading') depends_on('cmake@3.5:', type='build') + conflicts('+cxx14', when='+cxx11') + conflicts('+cxx11', when='+cxx14') + # C++11 support depends_on("clhep@2.4.0.0+cxx11~cxx14", when="@10.04+cxx11~cxx14") depends_on("clhep@2.3.4.3+cxx11~cxx14", when="@10.03.p03+cxx11~cxx14") @@ -86,7 +90,6 @@ class Geant4(CMakePackage): '-DGEANT4_USE_G3TOG4=ON', '-DGEANT4_INSTALL_DATA=ON', '-DGEANT4_BUILD_TLS_MODEL=global-dynamic', - '-DGEANT4_BUILD_MULTITHREADED=ON', '-DGEANT4_USE_SYSTEM_EXPAT=ON', '-DGEANT4_USE_SYSTEM_ZLIB=ON', '-DXERCESC_ROOT_DIR:STRING=%s' % @@ -103,7 +106,7 @@ class Geant4(CMakePackage): if '+cxx11' in spec: options.append('-DGEANT4_BUILD_CXXSTD=c++11') - if '+cxx14' or '+cxx1y' in spec: + if '+cxx14' in spec: options.append('-DGEANT4_BUILD_CXXSTD=c++14') if '+qt' in spec: @@ -117,6 +120,9 @@ class Geant4(CMakePackage): options.append('-DUSolids_DIR=%s' % spec[ 'vecgeom'].prefix.lib.CMake.USolids) + on_or_off = lambda opt: 'ON' if '+' + opt in spec else 'OFF' + options.append('-DGEANT4_BUILD_MULTITHREADED=' + on_or_off('threads')) + return options def url_for_version(self, version): diff --git a/var/spack/repos/builtin/packages/moab/package.py b/var/spack/repos/builtin/packages/moab/package.py index ae1ef0c35a..d0b1761fcd 100644 --- a/var/spack/repos/builtin/packages/moab/package.py +++ b/var/spack/repos/builtin/packages/moab/package.py @@ -60,6 +60,7 @@ class Moab(AutotoolsPackage): variant('irel', default=False, description='Enable irel interface') variant('fbigeom', default=False, description='Enable fbigeom interface') variant('coupler', default=True, description='Enable mbcoupler tool') + variant('dagmc', default=False, description='Enable dagmc tool') variant("debug", default=False, description='enable debug symbols') variant('shared', default=False, @@ -162,6 +163,11 @@ class Moab(AutotoolsPackage): else: options.append('--disable-mbcoupler') + if '+dagmc' in spec: + options.append('--enable-dagmc') + else: + options.append('--disable-dagmc') + if '+metis' in spec: options.append('--with-metis=%s' % spec['metis'].prefix) else: -- cgit v1.2.3-70-g09d2 From b85a910463950af830fce61f54bef2245768641f Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Wed, 10 Oct 2018 14:06:51 +0200 Subject: rdma-core: Fix checksum for @17.1 (#9480) --- var/spack/repos/builtin/packages/rdma-core/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/rdma-core/package.py b/var/spack/repos/builtin/packages/rdma-core/package.py index 22307be6cb..5113ec5206 100644 --- a/var/spack/repos/builtin/packages/rdma-core/package.py +++ b/var/spack/repos/builtin/packages/rdma-core/package.py @@ -32,7 +32,7 @@ class RdmaCore(CMakePackage): url = "https://github.com/linux-rdma/rdma-core/releases/download/v17.1/rdma-core-17.1.tar.gz" version('20', sha256='bc846989f807cd2b03643927d2b99fbf6f849cb1e766ab49bc9e81ce769d5421') - version('17.1', sha256='7f5ca9715dce922404851f6ca648399d3dfc3fc2789296f27e94bd2299c68aff') + version('17.1', sha256='b47444b7c05d3906deb8771eec3e634984dd83f5e620d5e37d3a83f74f0cc1ba') version('13', sha256='e5230fd7cda610753ad1252b40a28b1e9cf836423a10d8c2525b081527760d97') depends_on('pkgconfig', type='build') -- cgit v1.2.3-70-g09d2 From e176f2a2f5cffee81199a348e5f03dbd6d7f81bc Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Wed, 10 Oct 2018 14:17:12 +0200 Subject: Fix missing dependencies and glibc build failures (#9106) * bison: Add missing build dependencies bison also depends on cmp, which is currently not available in Spack. * help2man: Add missing build dependency * m4: Fix build with newer versions of glibc * openssl: Add missing build dependency openssl's configure script is actually a Perl script. * texinfo: Add missing perl dependency * diffutils: New package * findutils: Fix build with newer versions of glibc * mvapich2, mpich: Add missing findutils dependency --- var/spack/repos/builtin/packages/bison/package.py | 3 ++ var/spack/repos/builtin/packages/bzip2/package.py | 2 ++ .../repos/builtin/packages/diffutils/package.py | 37 ++++++++++++++++++++++ .../repos/builtin/packages/findutils/package.py | 29 +++++++++++++++++ .../repos/builtin/packages/help2man/package.py | 1 + var/spack/repos/builtin/packages/m4/package.py | 2 ++ var/spack/repos/builtin/packages/mpich/package.py | 2 ++ .../repos/builtin/packages/mvapich2/package.py | 1 + .../repos/builtin/packages/openssl/package.py | 2 +- .../repos/builtin/packages/texinfo/package.py | 2 ++ 10 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 var/spack/repos/builtin/packages/diffutils/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bison/package.py b/var/spack/repos/builtin/packages/bison/package.py index 7cf7faba71..7474950b7b 100644 --- a/var/spack/repos/builtin/packages/bison/package.py +++ b/var/spack/repos/builtin/packages/bison/package.py @@ -39,7 +39,10 @@ class Bison(AutotoolsPackage): version('3.0.4', 'a586e11cd4aff49c3ff6d3b6a4c9ccf8') version('2.7', 'ded660799e76fb1667d594de1f7a0da9') + depends_on('diffutils', type='build') depends_on('m4', type=('build', 'run')) + depends_on('perl', type='build') + depends_on('help2man', type='build') patch('pgi.patch', when='@3.0.4') diff --git a/var/spack/repos/builtin/packages/bzip2/package.py b/var/spack/repos/builtin/packages/bzip2/package.py index 1e15669174..6ba1c5ded6 100644 --- a/var/spack/repos/builtin/packages/bzip2/package.py +++ b/var/spack/repos/builtin/packages/bzip2/package.py @@ -42,6 +42,8 @@ class Bzip2(Package): variant('shared', default=True, description='Enables the build of shared libraries.') + depends_on('diffutils', type='build') + # override default implementation @property def libs(self): diff --git a/var/spack/repos/builtin/packages/diffutils/package.py b/var/spack/repos/builtin/packages/diffutils/package.py new file mode 100644 index 0000000000..bcc61fea4d --- /dev/null +++ b/var/spack/repos/builtin/packages/diffutils/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class Diffutils(AutotoolsPackage): + """GNU Diffutils is a package of several programs related to finding + differences between files.""" + + homepage = "https://www.gnu.org/software/diffutils/" + url = "https://ftp.gnu.org/gnu/diffutils/diffutils-3.6.tar.xz" + + version('3.6', sha256='d621e8bdd4b573918c8145f7ae61817d1be9deb4c8d2328a65cea8e11d783bd6') + + build_directory = 'spack-build' diff --git a/var/spack/repos/builtin/packages/findutils/package.py b/var/spack/repos/builtin/packages/findutils/package.py index c1a7e08167..1660268b66 100644 --- a/var/spack/repos/builtin/packages/findutils/package.py +++ b/var/spack/repos/builtin/packages/findutils/package.py @@ -51,3 +51,32 @@ class Findutils(AutotoolsPackage): version('4.2.15', 'a881b15aa7170aea045bf35cc92d48e7') version('4.1.20', 'e90ce7222daadeb8616b8db461e17cbc') version('4.1', '3ea8fe58ef5386da75f6c707713aa059') + + depends_on('autoconf', type='build', when='@4.6.0') + depends_on('automake', type='build', when='@4.6.0') + depends_on('libtool', type='build', when='@4.6.0') + depends_on('m4', type='build', when='@4.6.0') + depends_on('texinfo', type='build', when='@4.6.0') + + # findutils does not build with newer versions of glibc + patch('https://src.fedoraproject.org/rpms/findutils/raw/97ba2d7a18d1f9ae761b6ff0b4f1c4d33d7a8efc/f/findutils-4.6.0-gnulib-fflush.patch', sha256='84b916c0bf8c51b7e7b28417692f0ad3e7030d1f3c248ba77c42ede5c1c5d11e', when='@4.6.0') + patch('https://src.fedoraproject.org/rpms/findutils/raw/97ba2d7a18d1f9ae761b6ff0b4f1c4d33d7a8efc/f/findutils-4.6.0-gnulib-makedev.patch', sha256='bd9e4e5cc280f9753ae14956c4e4aa17fe7a210f55dd6c84aa60b12d106d47a2', when='@4.6.0') + + build_directory = 'spack-build' + + @property + def force_autoreconf(self): + # Run autoreconf due to build system patch (gnulib-makedev) + return self.spec.satisfies('@4.6.0') + + @when('@4.6.0') + def patch(self): + # We have to patch out gettext support, otherwise autoreconf tries to + # call autopoint, which depends on find, which is part of findutils. + filter_file('^AM_GNU_GETTEXT.*', + '', + 'configure.ac') + + filter_file(r'^SUBDIRS = (.*) po (.*)', + r'SUBDIRS = \1 \2', + 'Makefile.am') diff --git a/var/spack/repos/builtin/packages/help2man/package.py b/var/spack/repos/builtin/packages/help2man/package.py index f7940547d4..977f0394ee 100644 --- a/var/spack/repos/builtin/packages/help2man/package.py +++ b/var/spack/repos/builtin/packages/help2man/package.py @@ -35,3 +35,4 @@ class Help2man(AutotoolsPackage): version('1.47.4', '544aca496a7d89de3e5d99e56a2f03d3') depends_on('gettext', type='build') + depends_on('perl', type='build') diff --git a/var/spack/repos/builtin/packages/m4/package.py b/var/spack/repos/builtin/packages/m4/package.py index 0265accf5f..ac716cf622 100644 --- a/var/spack/repos/builtin/packages/m4/package.py +++ b/var/spack/repos/builtin/packages/m4/package.py @@ -39,6 +39,8 @@ class M4(AutotoolsPackage): # from: https://github.com/Homebrew/homebrew-core/blob/master/Formula/m4.rb # Patch credit to Jeremy Huddleston Sequoia patch('secure_snprintf.patch', when='platform_os = highsierra') + # https://bugzilla.redhat.com/show_bug.cgi?id=1573342 + patch('https://src.fedoraproject.org/rpms/m4/raw/5d147168d4b93f38a4833f5dd1d650ad88af5a8a/f/m4-1.4.18-glibc-change-work-around.patch', sha256='fc9b61654a3ba1a8d6cd78ce087e7c96366c290bc8d2c299f09828d793b853c8', when='@1.4.18') variant('sigsegv', default=True, description="Build the libsigsegv dependency") diff --git a/var/spack/repos/builtin/packages/mpich/package.py b/var/spack/repos/builtin/packages/mpich/package.py index dfa227f37e..28b083b332 100644 --- a/var/spack/repos/builtin/packages/mpich/package.py +++ b/var/spack/repos/builtin/packages/mpich/package.py @@ -82,6 +82,8 @@ spack package at this time.''', # and https://lists.mpich.org/pipermail/discuss/2016-June/004768.html patch('mpich32_clang.patch', when='@3.2:3.2.0%clang') + depends_on('findutils', type='build') + depends_on('libfabric', when='netmod=ofi') conflicts('device=ch4', when='@:3.2') diff --git a/var/spack/repos/builtin/packages/mvapich2/package.py b/var/spack/repos/builtin/packages/mvapich2/package.py index 966568cb71..7671e95a3a 100644 --- a/var/spack/repos/builtin/packages/mvapich2/package.py +++ b/var/spack/repos/builtin/packages/mvapich2/package.py @@ -117,6 +117,7 @@ class Mvapich2(AutotoolsPackage): multi=True ) + depends_on('findutils', type='build') depends_on('bison', type='build') depends_on('libpciaccess', when=(sys.platform != 'darwin')) depends_on('cuda', when='+cuda') diff --git a/var/spack/repos/builtin/packages/openssl/package.py b/var/spack/repos/builtin/packages/openssl/package.py index cd8f06b9d0..f6fca1d19c 100644 --- a/var/spack/repos/builtin/packages/openssl/package.py +++ b/var/spack/repos/builtin/packages/openssl/package.py @@ -68,7 +68,7 @@ class Openssl(Package): depends_on('zlib') - depends_on('perl@5.14.0:', type='test') + depends_on('perl@5.14.0:', type=('build', 'test')) parallel = False diff --git a/var/spack/repos/builtin/packages/texinfo/package.py b/var/spack/repos/builtin/packages/texinfo/package.py index 10a1a4ba52..af811b1f28 100644 --- a/var/spack/repos/builtin/packages/texinfo/package.py +++ b/var/spack/repos/builtin/packages/texinfo/package.py @@ -42,3 +42,5 @@ class Texinfo(AutotoolsPackage): version('5.2', '1b8f98b80a8e6c50422125e07522e8db') version('5.1', '54e250014fe698fb4832016158747c03') version('5.0', '918432285abe6fe96c98355594c5656a') + + depends_on('perl') -- cgit v1.2.3-70-g09d2 From 7699419fc12a087e145c41e00ffdd53b64420771 Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Wed, 10 Oct 2018 10:07:51 -0700 Subject: new xdot.py package and necessary updates to GUI libs (#9179) * new xdot.py package and necessary updates to GUI libs * new xdot.py package and necessary updates to GUI libs --- .../repos/builtin/packages/at-spi2-core/package.py | 10 +++ .../repos/builtin/packages/gtkplus/package.py | 13 +++- var/spack/repos/builtin/packages/mesa/package.py | 5 ++ .../repos/builtin/packages/py-pycairo/package.py | 47 +++++++++++++ .../repos/builtin/packages/py-pygobject/package.py | 34 +++++++-- .../repos/builtin/packages/py-pygtk/package.py | 5 ++ .../repos/builtin/packages/py-xdot/package.py | 81 ++++++++++++++++++++++ 7 files changed, 186 insertions(+), 9 deletions(-) create mode 100644 var/spack/repos/builtin/packages/py-pycairo/package.py create mode 100644 var/spack/repos/builtin/packages/py-xdot/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/at-spi2-core/package.py b/var/spack/repos/builtin/packages/at-spi2-core/package.py index d3a639e194..1d7be5b7c2 100644 --- a/var/spack/repos/builtin/packages/at-spi2-core/package.py +++ b/var/spack/repos/builtin/packages/at-spi2-core/package.py @@ -41,8 +41,18 @@ class AtSpi2Core(MesonPackage): depends_on('dbus@1.12.8:') depends_on('libx11') depends_on('libxi') + depends_on('libxtst', type='build') + depends_on('recordproto', type='build') + depends_on('inputproto', type='build') + depends_on('fixesproto', type='build') + depends_on('pkgconfig', type='build') + depends_on('python', type='build') def url_for_version(self, version): """Handle gnome's version-based custom URLs.""" url = 'http://ftp.gnome.org/pub/gnome/sources/at-spi2-core' return url + '/%s/at-spi2-core-%s.tar.xz' % (version.up_to(2), version) + + def setup_environment(self, spack_env, run_env): + # this avoids an "import site" error in the build + spack_env.unset('PYTHONHOME') diff --git a/var/spack/repos/builtin/packages/gtkplus/package.py b/var/spack/repos/builtin/packages/gtkplus/package.py index 72d6501adb..844a2e1749 100644 --- a/var/spack/repos/builtin/packages/gtkplus/package.py +++ b/var/spack/repos/builtin/packages/gtkplus/package.py @@ -30,7 +30,7 @@ class Gtkplus(AutotoolsPackage): interfaces for applications.""" homepage = "http://www.gtk.org" url = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.31.tar.xz" - + version('3.20.10', 'e81da1af1c5c1fee87ba439770e17272fa5c06e64572939814da406859e56b70') version('2.24.32', 'b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e') version('2.24.31', '68c1922732c7efc08df4656a5366dcc3afdc8791513400dac276009b40954658') version('2.24.25', '38af1020cb8ff3d10dda2c8807f11e92af9d2fa4045de61c62eedb7fbc7ea5b3') @@ -45,8 +45,17 @@ class Gtkplus(AutotoolsPackage): # see #6940 for rationale: depends_on('pango+X') depends_on('gobject-introspection') + depends_on('libepoxy', when='@3:') + depends_on('libxi', when='@3:') + depends_on('inputproto', when='@3:') + depends_on('fixesproto', when='@3:') + depends_on('at-spi2-atk', when='@3:') + + patch('no-demos.patch', when='@2:2.99') - patch('no-demos.patch') + def url_for_version(self, version): + url = 'http://ftp.gnome.org/pub/gnome/sources/gtk+' + return url + '/%s/gtk+-%s.tar.xz' % (version.up_to(2), version) def patch(self): # remove disable deprecated flag. diff --git a/var/spack/repos/builtin/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py index ca63536c17..884d80857a 100644 --- a/var/spack/repos/builtin/packages/mesa/package.py +++ b/var/spack/repos/builtin/packages/mesa/package.py @@ -206,3 +206,8 @@ class Mesa(AutotoolsPackage): shared=True, recursive=False) if libs: return libs + + @when('^python@3:') + def setup_environment(self, spack_env, run_env): + # this avoids an "import site" error in the build + spack_env.unset('PYTHONHOME') diff --git a/var/spack/repos/builtin/packages/py-pycairo/package.py b/var/spack/repos/builtin/packages/py-pycairo/package.py new file mode 100644 index 0000000000..1a0885b6e3 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pycairo/package.py @@ -0,0 +1,47 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import os + + +class PyPycairo(PythonPackage): + """Pycairo is a set of Python bindings for the cairo graphics library.""" + + homepage = "https://www.cairographics.org/pycairo/" + url = "https://github.com/pygobject/pycairo/releases/download/v1.17.1/pycairo-1.17.1.tar.gz" + url = "https://files.pythonhosted.org/packages/68/76/340ff847897296b2c8174dfa5a5ec3406e3ed783a2abac918cf326abad86/pycairo-1.17.1.tar.gz" + + version('1.17.1', '34c1ee106655b450c4bd57e29371a4a7') + + depends_on('cairo@1.2.0:') + depends_on('pkgconfig', type='build') + depends_on('py-setuptools', type='build') + + @run_after('install') + def post_install(self): + src = self.prefix.lib + '/pkgconfig/py3cairo.pc' + dst = self.prefix.lib + '/pkgconfig/pycairo.pc' + if os.path.exists(src) and not os.path.exists(dst): + copy(src, dst) diff --git a/var/spack/repos/builtin/packages/py-pygobject/package.py b/var/spack/repos/builtin/packages/py-pygobject/package.py index 2bf5235428..192a215bdb 100644 --- a/var/spack/repos/builtin/packages/py-pygobject/package.py +++ b/var/spack/repos/builtin/packages/py-pygobject/package.py @@ -25,24 +25,27 @@ from spack import * -class PyPygobject(AutotoolsPackage): +class PyPygobject(PythonPackage): """bindings for the GLib, and GObject, to be used in Python.""" homepage = "https://pypi.python.org/pypi/pygobject" - url = "http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.28/pygobject-2.28.6.tar.bz2" - - version('2.28.6', 'a43d783228dd32899e6908352b8308f3') - version('2.28.3', 'aa64900b274c4661a5c32e52922977f9') + version('3.28.3', '3bac63c86bb963aa401f97859464aa90') + version('2.28.6', '9415cb7f2b3a847f2310ccea258b101e') + version('2.28.3', 'aa64900b274c4661a5c32e52922977f9', + url='http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.28/pygobject-2.28.3.tar.bz2') extends('python') - depends_on('pkgconfig', type=('build')) + depends_on('py-setuptools', type=('build')) depends_on("libffi") depends_on('glib') - depends_on('py-py2cairo', type=('build', 'run')) + depends_on('python@2:2.99', when='@2:2.99', type=('build', 'run')) + depends_on('py-pycairo', type=('build', 'run'), when='@3:') + depends_on('py-py2cairo', type=('build', 'run'), when='@2:2.99') depends_on('gobject-introspection') + depends_on('gtkplus', when='@3:') patch('pygobject-2.28.6-introspection-1.patch', when='@2.28.3:2.28.6') @@ -50,5 +53,22 @@ class PyPygobject(AutotoolsPackage): # for https://bugzilla.gnome.org/show_bug.cgi?id=668522 patch('pygobject-2.28.6-gio-types-2.32.patch', when='@2.28.6') + def url_for_version(self, version): + url = 'http://ftp.gnome.org/pub/GNOME/sources/pygobject' + return url + '/%s/pygobject-%s.tar.xz' % (version.up_to(2), version) + + # pygobject version 2 requires an autotools build + @when('@2:2.99') + def build(self, spec, prefix): + configure('--prefix=%s' % spec.prefix) + + @when('@2:2.99') def install(self, spec, prefix): make('install', parallel=False) + + @when('^python@3:') + def patch(self): + filter_file( + r'Pycairo_IMPORT', + r'//Pycairo_IMPORT', + 'gi/pygi-foreign-cairo.c') diff --git a/var/spack/repos/builtin/packages/py-pygtk/package.py b/var/spack/repos/builtin/packages/py-pygtk/package.py index dca7275c98..4315c03e5f 100644 --- a/var/spack/repos/builtin/packages/py-pygtk/package.py +++ b/var/spack/repos/builtin/packages/py-pygtk/package.py @@ -37,6 +37,11 @@ class PyPygtk(AutotoolsPackage): depends_on('pkgconfig', type=('build')) depends_on("libffi") + # atk@2.28.1 depends on meson which requires python 3 + depends_on('atk@:2.20.0') + # PyGTK requires python 2 + # Use py-pygobject@3: for GTK bindings for python 3 + depends_on('python@2:2.99', type=('build', 'run')) depends_on('cairo') depends_on('glib') # for GTK 3.X use pygobject 3.X instead of pygtk diff --git a/var/spack/repos/builtin/packages/py-xdot/package.py b/var/spack/repos/builtin/packages/py-xdot/package.py new file mode 100644 index 0000000000..86a2d3a9b5 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-xdot/package.py @@ -0,0 +1,81 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyXdot(PythonPackage): + """xdot.py is an interactive viewer for graphs written in Graphviz's + dot language.""" + + homepage = "https://github.com/jrfonseca/xdot.py" + url = "https://github.com/jrfonseca/xdot.py/archive/0.9.tar.gz" + git = "https://github.com/jrfonseca/xdot.py.git" + + version('master', branch="master") + version('0.9.1', commit="0fa629166989576b05d509c7ef0329c0f7655190") + version('0.9', '19c78311d73b0f9ea059a6febf42eeea') + + # setuptools is required at runtime to avoid: + # No module named 'pkg_resources' + depends_on('py-setuptools', type=('build', 'run')) + depends_on('python@3:', type=('build', 'run')) + depends_on('py-pygobject', type=('build', 'run')) + depends_on('py-pycairo', type=('build', 'run')) + depends_on('pango', type=('build', 'run')) + depends_on('atk', type=('build', 'run')) + depends_on('gdk-pixbuf', type=('build', 'run')) + depends_on('gtkplus', type=('build', 'run')) + + @run_after('install') + def post_install(self): + spec = self.spec + repo_paths = '%s:%s:%s:%s' % ( + join_path(spec['pango'].prefix.lib, 'girepository-1.0'), + join_path(spec['atk'].prefix.lib64, 'girepository-1.0'), + join_path(spec['gdk-pixbuf'].prefix.lib, 'girepository-1.0'), + join_path(spec['gtkplus'].prefix.lib, 'girepository-1.0')) + dst = join_path(spec.prefix, spec['python'].package.site_packages_dir, + 'xdot/__init__.py') + filter_file("import sys", + "import sys\nimport os\nos.environ['GI_TYPELIB_PATH']" + + " = '%s'" % repo_paths, dst) + # regenerate the byte-compiled __init__.py + python3 = spec['python'].command + python3('-m', 'compileall', dst) + + def setup_environment(self, spack_env, run_env): + spec = self.spec + run_env.prepend_path('GI_TYPELIB_PATH', + join_path(spec['pango'].prefix.lib, + 'girepository-1.0')) + run_env.prepend_path('GI_TYPELIB_PATH', + join_path(spec['atk'].prefix.lib64, + 'girepository-1.0')) + run_env.prepend_path('GI_TYPELIB_PATH', + join_path(spec['gdk-pixbuf'].prefix.lib, + 'girepository-1.0')) + run_env.prepend_path('GI_TYPELIB_PATH', + join_path(spec['gtkplus'].prefix.lib, + 'girepository-1.0')) -- cgit v1.2.3-70-g09d2 From 53b19e7919054691a6186fb35b3d8e6c956ff513 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 10 Oct 2018 12:35:37 -0500 Subject: perl-scalar-util-numeric: new package (#9466) --- .../packages/perl-scalar-util-numeric/package.py | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 var/spack/repos/builtin/packages/perl-scalar-util-numeric/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/perl-scalar-util-numeric/package.py b/var/spack/repos/builtin/packages/perl-scalar-util-numeric/package.py new file mode 100644 index 0000000000..1b4ecea11e --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-scalar-util-numeric/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PerlScalarUtilNumeric(PerlPackage): + """This module exports a number of wrappers around perl's builtin grok_number + function, which returns the numeric type of its argument, or 0 if it + isn't numeric.""" + + homepage = "https://metacpan.org/pod/Scalar::Util::Numeric" + url = "https://cpan.metacpan.org/authors/id/C/CH/CHOCOLATE/Scalar-Util-Numeric-0.40.tar.gz" + + version('0.40', sha256='d7501b6d410703db5b1c1942fbfc41af8964a35525d7f766058acf5ca2cc4440') -- cgit v1.2.3-70-g09d2 From 013d4ad6a08ca005676ccc5b2138b53371d0fb94 Mon Sep 17 00:00:00 2001 From: sknigh Date: Wed, 10 Oct 2018 11:02:18 -0700 Subject: Added sst-core and variant for core to sst-macro. (#9380) --- .../repos/builtin/packages/sst-core/package.py | 63 ++++++++++++++++++++++ .../repos/builtin/packages/sst-macro/package.py | 12 +++-- 2 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 var/spack/repos/builtin/packages/sst-core/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sst-core/package.py b/var/spack/repos/builtin/packages/sst-core/package.py new file mode 100644 index 0000000000..b05cade162 --- /dev/null +++ b/var/spack/repos/builtin/packages/sst-core/package.py @@ -0,0 +1,63 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class SstCore(AutotoolsPackage): + """The Structural Simulation Toolkit (SST) was developed to explore + innovations in highly concurrent systems where the ISA, microarchitecture, + and memory interact with the programming model and communications system""" + + homepage = "http://sst-simulator.org/" + url = "https://github.com/sstsimulator/sst-core/releases/download/v8.0.0_Final/sstcore-8.0.0.tar.gz" + git = "https://github.com/sstsimulator/sst-core.git" + + version('develop', branch='devel') + version('8.0.0', sha256='34a62425c3209cf80b6bca99cb0dcc328b67fb84ed92d5e6d6c975ad9319ba8a') + + variant('mpi', default=True, description='Support multi-node simulations using MPI') + variant('boost', default=False, description='Use boost') + + depends_on('autoconf@1.68:', type='build', when='@develop') + depends_on('automake@1.11.1:', type='build', when='@develop') + depends_on('libtool@1.2.4:', type='build', when='@develop') + depends_on('m4', type='build', when='@develop') + + depends_on('python@:2') + depends_on('zlib', type='build') + depends_on('mpi', when='+mpi') + depends_on('boost@1.56.0:', type='build', when='+boost') + + def configure_args(self): + args = [] + spec = self.spec + + if '~mpi' in spec: + args.append('--disable-mpi') + + if '+boost' in spec: + args.append('--with-boost=%s' % spec['boost'].prefix) + + return args diff --git a/var/spack/repos/builtin/packages/sst-macro/package.py b/var/spack/repos/builtin/packages/sst-macro/package.py index 9722e30f36..5cd80275a3 100644 --- a/var/spack/repos/builtin/packages/sst-macro/package.py +++ b/var/spack/repos/builtin/packages/sst-macro/package.py @@ -54,13 +54,16 @@ class SstMacro(AutotoolsPackage): depends_on('otf2', when='+otf2') depends_on('llvm+clang@:5.99.99', when='+skeletonizer') depends_on('mpi', when='+mpi') + depends_on('sst-core@8.0.0', when='@8.0.0 +core') + depends_on('sst-core@develop', when='@develop +core') + variant('core', default=False, description='Use SST Core for PDES') + variant('mpi', default=True, description='Enable distributed PDES simulation') variant('otf2', default=False, description='Enable OTF2 trace emission and replay support') + variant('shared', default=True, description='Build shared libraries') variant('skeletonizer', default=False, description='Enable Clang source-to-source autoskeletonization') - variant('threaded', default=False, description='Enable thread-parallel PDES simulation') - variant('mpi', default=True, description='Enable distributed PDES simulation') variant('static', default=True, description='Build static libraries') - variant('shared', default=True, description='Build shared libraries') + variant('threaded', default=False, description='Enable thread-parallel PDES simulation') @run_before('autoreconf') def bootstrap(self): @@ -90,6 +93,9 @@ class SstMacro(AutotoolsPackage): if '+skeletonizer' in spec: args.append('--with-clang=' + spec['llvm'].prefix) + if '+core' in spec: + args.append('--with-sst-core=%s' % spec['sst-core'].prefix) + # Optional MPI support if '+mpi' in spec: env['CC'] = spec['mpi'].mpicc -- cgit v1.2.3-70-g09d2 From 113b750b8973892419975d7e0d2c09ea2a32cc15 Mon Sep 17 00:00:00 2001 From: Serban Maerean Date: Wed, 10 Oct 2018 17:16:50 -0400 Subject: Update compile flags for netlib-lapack when building with the XL compiler. (#9318) We need to use -O3 -qstrict -qnohot. Modified ibm-xl.patch and netlib-lapack package file. --- var/spack/repos/builtin/packages/netlib-lapack/ibm-xl.patch | 12 ++++++++++++ var/spack/repos/builtin/packages/netlib-lapack/package.py | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/netlib-lapack/ibm-xl.patch b/var/spack/repos/builtin/packages/netlib-lapack/ibm-xl.patch index fcb44af5a3..c6fba2a028 100644 --- a/var/spack/repos/builtin/packages/netlib-lapack/ibm-xl.patch +++ b/var/spack/repos/builtin/packages/netlib-lapack/ibm-xl.patch @@ -1,3 +1,15 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -62,7 +62,7 @@ + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fp-model strict") + endif() + if("${CMAKE_Fortran_COMPILER}" MATCHES "xlf") +- set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -qnosave -qstrict=none") ++ set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -qnosave -qstrict") + endif() + # Delete libmtsk in linking sequence for Sun/Oracle Fortran Compiler. + # This library is not present in the Sun package SolarisStudio12.3-linux-x86-bin + --- a/CMAKE/CheckLAPACKCompilerFlags.cmake +++ b/CMAKE/CheckLAPACKCompilerFlags.cmake @@ -43,12 +43,6 @@ diff --git a/var/spack/repos/builtin/packages/netlib-lapack/package.py b/var/spack/repos/builtin/packages/netlib-lapack/package.py index 8c56da718d..7b0cb7cd6c 100644 --- a/var/spack/repos/builtin/packages/netlib-lapack/package.py +++ b/var/spack/repos/builtin/packages/netlib-lapack/package.py @@ -178,7 +178,8 @@ class NetlibLapack(CMakePackage): # use F77 compiler if IBM XL args.extend(['-DCMAKE_Fortran_COMPILER=' + self.compiler.f77, '-DCMAKE_Fortran_FLAGS=' + - (' '.join(self.spec.compiler_flags['fflags']))]) + (' '.join(self.spec.compiler_flags['fflags'])) + + " -O3 -qnohot"]) # deprecated routines are commonly needed by, for example, suitesparse # Note that OpenBLAS spack is built with deprecated routines -- cgit v1.2.3-70-g09d2 From aac8d52075b26e66582b7b09b8594c07971a88d7 Mon Sep 17 00:00:00 2001 From: sknigh Date: Wed, 10 Oct 2018 14:57:28 -0700 Subject: vtk: added v8.1.1, added option to disable libharu (#9475) * Added VTK 8.1.1, added option to disable libharu * Add variant description to vtk+libharu --- var/spack/repos/builtin/packages/vtk/package.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py index 4f1d88f2ee..b71c38485f 100644 --- a/var/spack/repos/builtin/packages/vtk/package.py +++ b/var/spack/repos/builtin/packages/vtk/package.py @@ -36,6 +36,7 @@ class Vtk(CMakePackage): url = "http://www.vtk.org/files/release/8.0/VTK-8.0.1.tar.gz" list_url = "http://www.vtk.org/download/" + version('8.1.1', sha256='71a09b4340f0a9c58559fe946dc745ab68a866cf20636a41d97b6046cb736324') version('8.0.1', '692d09ae8fadc97b59d35cab429b261a') version('7.1.0', 'a7e814c1db503d896af72458c2d0228f') version('7.0.0', '5fe35312db5fb2341139b8e4955c367d') @@ -48,6 +49,10 @@ class Vtk(CMakePackage): variant('python', default=False, description='Enable Python support') variant('qt', default=False, description='Build with support for Qt') + # Haru causes trouble on Fedora and Ubuntu in v8.1.1 + # See https://bugzilla.redhat.com/show_bug.cgi?id=1460059#c13 + variant('haru', default=True, description='Enable libharu') + patch('gcc.patch', when='@6.1.0') # At the moment, we cannot build with both osmesa and qt, but as of @@ -69,13 +74,14 @@ class Vtk(CMakePackage): # VTK will need Qt5OpenGL, and qt needs '-opengl' for that depends_on('qt+opengl', when='+qt') + depends_on('libharu', when='+haru') + depends_on('expat') depends_on('freetype') depends_on('glew') depends_on('hdf5') depends_on('libjpeg') depends_on('jsoncpp') - depends_on('libharu') depends_on('libxml2') depends_on('lz4') depends_on('netcdf') @@ -104,6 +110,9 @@ class Vtk(CMakePackage): '-DBUILD_SHARED_LIBS=ON', '-DVTK_RENDERING_BACKEND:STRING={0}'.format(opengl_ver), + '-DVTK_USE_SYSTEM_LIBHARU=%s' % ( + 'ON' if '+haru' in spec else 'OFF'), + # In general, we disable use of VTK "ThirdParty" libs, preferring # spack-built versions whenever possible '-DVTK_USE_SYSTEM_LIBRARIES=ON', -- cgit v1.2.3-70-g09d2 From 312de47594aa751bddfd20daa341cea4a5e94ebe Mon Sep 17 00:00:00 2001 From: Phil Carns Date: Wed, 10 Oct 2018 21:51:19 -0400 Subject: update rdma-core package to specify rundir (#9370) --- var/spack/repos/builtin/packages/rdma-core/package.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/rdma-core/package.py b/var/spack/repos/builtin/packages/rdma-core/package.py index 5113ec5206..51559512a3 100644 --- a/var/spack/repos/builtin/packages/rdma-core/package.py +++ b/var/spack/repos/builtin/packages/rdma-core/package.py @@ -40,7 +40,12 @@ class RdmaCore(CMakePackage): conflicts('platform=darwin', msg='rdma-core requires FreeBSD or Linux') conflicts('%intel', msg='rdma-core cannot be built with intel (use gcc instead)') +# NOTE: specify CMAKE_INSTALL_RUNDIR explicitly to prevent rdma-core from +# using the spack staging build dir (which may be a very long file +# system path) as a component in compile-time static strings such as +# IBACM_SERVER_PATH. def cmake_args(self): cmake_args = ["-DCMAKE_INSTALL_SYSCONFDIR=" + - self.spec.prefix.etc] + self.spec.prefix.etc, + "-DCMAKE_INSTALL_RUNDIR=/var/run"] return cmake_args -- cgit v1.2.3-70-g09d2 From 2914644b30f3ab5d1a29125ac566e10d66a7fd27 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Thu, 11 Oct 2018 03:58:47 +0200 Subject: openblas: patch experimental USE_TLS makefile option for 0.3.3 (#9474) --- var/spack/repos/builtin/packages/openblas/package.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openblas/package.py b/var/spack/repos/builtin/packages/openblas/package.py index b0a7f651dd..6ac55cc507 100644 --- a/var/spack/repos/builtin/packages/openblas/package.py +++ b/var/spack/repos/builtin/packages/openblas/package.py @@ -98,6 +98,14 @@ class Openblas(MakefilePackage): # https://github.com/xianyi/OpenBLAS/pull/1703 patch('openblas-0.3.2-cmake.patch', when='@0.3.1:0.3.2') + # Disable experimental TLS code that lead to many threading issues + # https://github.com/xianyi/OpenBLAS/issues/1735#issuecomment-422954465 + # https://github.com/xianyi/OpenBLAS/issues/1761#issuecomment-421039174 + # https://github.com/xianyi/OpenBLAS/pull/1765 + patch('https://github.com/xianyi/OpenBLAS/commit/4d183e5567346f80f2ef97eb98f8601c47f8cb56.patch', + sha256='714aea33692304a50bd0ccde42590c176c82ded4a8ac7f06e573dc8071929c33', + when='@0.3.3') + parallel = False conflicts('%intel@16', when='@0.2.15:0.2.19') -- cgit v1.2.3-70-g09d2 From b100d1fc4045a9bf743f7f7cbf85c93d3e9b1898 Mon Sep 17 00:00:00 2001 From: Piotr Luszczek Date: Wed, 10 Oct 2018 22:14:31 -0400 Subject: Magma: add version 2.4.0 (#9478) --- var/spack/repos/builtin/packages/magma/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/magma/package.py b/var/spack/repos/builtin/packages/magma/package.py index fe04b3c47d..7c866a90c6 100644 --- a/var/spack/repos/builtin/packages/magma/package.py +++ b/var/spack/repos/builtin/packages/magma/package.py @@ -35,8 +35,9 @@ class Magma(CMakePackage): homepage = "http://icl.cs.utk.edu/magma/" url = "http://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-2.2.0.tar.gz" - version('2.3.0', '9aaf85a338d3a17303e0c69f86f0ec52') - version('2.2.0', '6c1ebf4cdf63eb302ff6258ff8c49217') + version('2.4.0', sha256='4eb839b1295405fd29c8a6f5b4ed578476010bf976af46573f80d1169f1f9a4f') + version('2.3.0', sha256='010a4a057d7aa1e57b9426bffc0958f3d06913c9151463737e289e67dd9ea608') + version('2.2.0', sha256='df5d4ace417e5bf52694eae0d91490c6bde4cde1b0da98e8d400c5c3a70d83a2') variant('fortran', default=True, description='Enable Fortran bindings support') -- cgit v1.2.3-70-g09d2 From b18fea6c8314da46b5e7b8fc58f404bb4623e4ef Mon Sep 17 00:00:00 2001 From: Robert Blake Date: Wed, 10 Oct 2018 19:15:33 -0700 Subject: ncdu: add new versions (#9477) --- var/spack/repos/builtin/packages/ncdu/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ncdu/package.py b/var/spack/repos/builtin/packages/ncdu/package.py index 9b6a0958b7..5be7d93ace 100644 --- a/var/spack/repos/builtin/packages/ncdu/package.py +++ b/var/spack/repos/builtin/packages/ncdu/package.py @@ -36,6 +36,8 @@ class Ncdu(Package): homepage = "http://dev.yorhel.nl/ncdu" url = "http://dev.yorhel.nl/download/ncdu-1.11.tar.gz" + version('1.13', sha256='f4d9285c38292c2de05e444d0ba271cbfe1a705eee37c2b23ea7c448ab37255a') + version('1.12', sha256='820e4e4747a2a2ec7a2e9f06d2f5a353516362c22496a10a9834f871b877499a') version('1.11', '9e44240a5356b029f05f0e70a63c4d12') version('1.10', '7535decc8d54eca811493e82d4bfab2d') version('1.9', '93258079db897d28bb8890e2db89b1fb') -- cgit v1.2.3-70-g09d2 From d8414dd7707b4a216759a4ea85e4f1f32448b7d9 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Thu, 11 Oct 2018 12:08:42 +0200 Subject: go: Add 1.11.1 (#9493) --- var/spack/repos/builtin/packages/go/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/go/package.py b/var/spack/repos/builtin/packages/go/package.py index 1915a5df8f..d71d1fc5aa 100644 --- a/var/spack/repos/builtin/packages/go/package.py +++ b/var/spack/repos/builtin/packages/go/package.py @@ -54,6 +54,7 @@ class Go(Package): extendable = True + version('1.11.1', '558f8c169ae215e25b81421596e8de7572bd3ba824b79add22fba6e284db1117') version('1.11', 'afc1e12f5fe49a471e3aae7d906c73e9d5b1fdd36d52d72652dde8f6250152fb') version('1.10.3', '567b1cc66c9704d1c019c50bef946272e911ec6baf244310f87f4e678be155f2') version('1.10.2', '6264609c6b9cd8ed8e02ca84605d727ce1898d74efa79841660b2e3e985a98bd') -- cgit v1.2.3-70-g09d2 From a6fb2fdea495ba53f3fae6a876ddc323307f8c15 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Thu, 11 Oct 2018 15:19:32 +0200 Subject: trilinos: disable superlu-dist by default (#9492) current stable releases of PETSc and Trilinos have non-overlapping requirements on Superlu-dist. For now turn it off by default in Trilinos, which requires older versions. --- var/spack/repos/builtin/packages/trilinos/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 4efb3b6d29..acce7d173e 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -113,7 +113,7 @@ class Trilinos(CMakePackage): description='Compile with parallel-netcdf') variant('suite-sparse', default=True, description='Compile with SuiteSparse solvers') - variant('superlu-dist', default=True, + variant('superlu-dist', default=False, description='Compile with SuperluDist solvers') variant('superlu', default=False, description='Compile with SuperLU solvers') -- cgit v1.2.3-70-g09d2 From 4b50928a36f061bf24b4744787f82d8d63641097 Mon Sep 17 00:00:00 2001 From: Gustavo Chávez Date: Thu, 11 Oct 2018 08:06:43 -0700 Subject: Update superlu-dist package.py to support latest release v6.0.0 (#9445) * superlu-dist: Update package.py for superlu-dist v6.0.0 using CMake * superlu_dist: Update the header of package.py * Specify lapack_blas and DCMAKE_INSTALL_LIBDIR disable support for superlu-dist before v5 --- .../repos/builtin/packages/superlu-dist/package.py | 105 +++++++-------------- 1 file changed, 32 insertions(+), 73 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/superlu-dist/package.py b/var/spack/repos/builtin/packages/superlu-dist/package.py index 63b06571d0..5be851c582 100644 --- a/var/spack/repos/builtin/packages/superlu-dist/package.py +++ b/var/spack/repos/builtin/packages/superlu-dist/package.py @@ -22,21 +22,20 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## -import glob -import os from spack import * -class SuperluDist(Package): +class SuperluDist(CMakePackage): """A general purpose library for the direct solution of large, sparse, nonsymmetric systems of linear equations on high performance machines.""" homepage = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/" - url = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_dist_4.1.tar.gz" + url = "https://github.com/xiaoyeli/superlu_dist/archive/v6.0.0.tar.gz" git = "https://github.com/xiaoyeli/superlu_dist.git" version('develop', branch='master') version('xsdk-0.2.0', tag='xsdk-0.2.0') + version('6.0.0', '2e3ce927fa5786470dacbdf8c41afb08') version('5.4.0', 'e64645c5be352ae2c88327af2cac66e1') version('5.3.0', '35d5aa8e0a246efaf327988b20106714') version('5.2.2', 'a685ef7fb7859b24c8c9d5d5f121a8a5') @@ -45,14 +44,9 @@ class SuperluDist(Package): version('5.1.1', '12638c631733a27dcbd87110e9f9cb1e') version('5.1.0', '6bb86e630bd4bd8650243aed8fd92eb9') version('5.0.0', '2b53baf1b0ddbd9fcf724992577f0670') - version('4.3', 'ee66c84e37b4f7cc557771ccc3dc43ae') - version('4.2', 'ae9fafae161f775fbac6eba11e530a65') - version('4.1', '4edee38cc29f687bd0c8eb361096a455') - version('4.0', 'c0b98b611df227ae050bc1635c6940e0') - version('3.3', 'f4805659157d93a962500902c219046b') - variant('int64', default=False, - description="Use 64bit integers") + variant('int64', default=False, description='Build with 64 bit integers') + variant('shared', default=True, description='Build shared libraries') depends_on('mpi') depends_on('blas') @@ -60,69 +54,34 @@ class SuperluDist(Package): depends_on('parmetis') depends_on('metis@5:') - def install(self, spec, prefix): + def cmake_args(self): + spec = self.spec lapack_blas = spec['lapack'].libs + spec['blas'].libs - makefile_inc = [] - makefile_inc.extend([ - 'PLAT = _mac_x', - 'DSuperLUroot = %s' % self.stage.source_path, - 'DSUPERLULIB = $(DSuperLUroot)/lib/libsuperlu_dist.a', - 'BLASDEF = -DUSE_VENDOR_BLAS', - 'BLASLIB = %s' % lapack_blas.ld_flags, - 'METISLIB = %s' % spec['metis'].libs.ld_flags, - 'PARMETISLIB = %s' % spec['parmetis'].libs.ld_flags, - 'HAVE_PARMETIS= TRUE', - 'FLIBS =', - 'LIBS = $(DSUPERLULIB) $(BLASLIB) $(PARMETISLIB) $(METISLIB)', # noqa - 'ARCH = ar', - 'ARCHFLAGS = cr', - 'RANLIB = true', - 'CXX = {0}'.format(self.spec['mpi'].mpicxx), - 'CXXFLAGS = {0} {1} {2}'.format( - ' '.join(self.spec.compiler_flags['cxxflags']), - self.compiler.pic_flag, - self.compiler.cxx11_flag), - 'CC = {0}'.format(self.spec['mpi'].mpicc), - 'CFLAGS = %s %s -O2 %s %s %s' % ( - self.compiler.pic_flag, - '' if '%pgi' in spec else '-std=c99', - spec['parmetis'].headers.cpp_flags, - spec['metis'].headers.cpp_flags, - '-D_LONGINT' if '+int64' in spec and not - self.spec.satisfies('@5.2.0:') else ''), - 'XSDK_INDEX_SIZE = %s' % ('64' if '+int64' in spec else '32'), - 'NOOPTS = %s -std=c99' % ( - self.compiler.pic_flag), - 'FORTRAN = {0}'.format(self.spec['mpi'].mpif77), - 'F90FLAGS = -O2', - 'LOADER = {0}'.format(self.spec['mpi'].mpif77), - 'INCLUDEDIR = $(SuperLUroot)/include', - 'LOADOPTS =', - 'CDEFS = %s' % ("-DNoChange" - if spack_f77.endswith('xlf') or - spack_f77.endswith('xlf_r') - else "-DAdd_") - ]) + args = [ + '-DCMAKE_C_COMPILER=%s' % spec['mpi'].mpicc, + '-DCMAKE_CXX_COMPILER=%s' % spec['mpi'].mpicxx, + '-DCMAKE_INSTALL_LIBDIR:STRING=%s' % self.prefix.lib, + '-DTPL_BLAS_LIBRARIES=%s' % lapack_blas.ld_flags, + '-DTPL_PARMETIS_LIBRARIES=%s' % spec['parmetis'].libs.ld_flags + + ';' + spec['metis'].libs.ld_flags, + '-DTPL_PARMETIS_INCLUDE_DIRS=%s' % spec['parmetis'].prefix.include + ] - with open('make.inc', 'w') as fh: - fh.write('\n'.join(makefile_inc)) + if '+int64' in spec: + args.append('-DXSDK_INDEX_SIZE=64') + else: + args.append('-DXSDK_INDEX_SIZE=32') - mkdirp(os.path.join(self.stage.source_path, 'lib')) - make("lib", parallel=False) + if '+shared' in spec: + args.append('-DBUILD_SHARED_LIBS:BOOL=ON') + else: + args.append('-DBUILD_SHARED_LIBS:BOOL=OFF') + return args - # FIXME: - # cd "EXAMPLE" do - # system "make" - - # need to install by hand - headers_location = self.prefix.include - mkdirp(headers_location) - mkdirp(prefix.lib) - - headers = glob.glob(join_path(self.stage.source_path, 'SRC', '*.h')) - for h in headers: - install(h, headers_location) - - superludist_lib = join_path(self.stage.source_path, - 'lib/libsuperlu_dist.a') - install(superludist_lib, self.prefix.lib) + def flag_handler(self, name, flags): + flags = list(flags) + if name == 'cxxflags': + flags.append(self.compiler.cxx11_flag) + if name == 'cflags' and '%pgi' not in self.spec: + flags.append('-std=c99') + return (None, None, flags) -- cgit v1.2.3-70-g09d2 From 0226546c29f532fcca9d27217a9b58cb1dee1f46 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Thu, 11 Oct 2018 10:59:27 -0500 Subject: superlu-dist: switch to sha256sum (#9499) replace 5.1.1 with 5.1.2 as 5.1.1 does not build for me. [and 5.1.3 is preferable in this 5.1 series anyway] --- .../repos/builtin/packages/superlu-dist/package.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/superlu-dist/package.py b/var/spack/repos/builtin/packages/superlu-dist/package.py index 5be851c582..2ee1c542d6 100644 --- a/var/spack/repos/builtin/packages/superlu-dist/package.py +++ b/var/spack/repos/builtin/packages/superlu-dist/package.py @@ -35,15 +35,15 @@ class SuperluDist(CMakePackage): version('develop', branch='master') version('xsdk-0.2.0', tag='xsdk-0.2.0') - version('6.0.0', '2e3ce927fa5786470dacbdf8c41afb08') - version('5.4.0', 'e64645c5be352ae2c88327af2cac66e1') - version('5.3.0', '35d5aa8e0a246efaf327988b20106714') - version('5.2.2', 'a685ef7fb7859b24c8c9d5d5f121a8a5') - version('5.2.1', 'af857778ffeb04aea02aa4843e6e8e1d') - version('5.1.3', '3a9e88a8469aa7f319f0364364b8da35') - version('5.1.1', '12638c631733a27dcbd87110e9f9cb1e') - version('5.1.0', '6bb86e630bd4bd8650243aed8fd92eb9') - version('5.0.0', '2b53baf1b0ddbd9fcf724992577f0670') + version('6.0.0', 'ff6cdfa0263d595708bbb6d11fb780915d8cfddab438db651e246ea292f37ee4') + version('5.4.0', '3ac238fe082106a2c4dbaf0c22af1ff1247308ffa8f053de9d78c3ec7dd0d801') + version('5.3.0', '49ed110bdef1e284a0181d6c7dd1fae3aa110cb45f67c6aa5cb791070304d670') + version('5.2.2', '65cfb9ace9a81f7affac4ad92b9571badf0f10155b3468531b0fffde3bd8e727') + version('5.2.1', '67cf3c46cbded4cee68e2a9d601c30ab13b08091c8cdad95b0a8e018b6d5d1f1') + version('5.1.3', '58e3dfdb4ae6f8e3f6f3d5ee5e851af59b967c4483cdb3b15ccd1dbdf38f44f9') + version('5.1.2', 'e34865ad6696ee6a6d178b4a01c8e19103a7d241ba9de043603970d63b0ee1e2') + version('5.1.0', '73f292ab748b590b6dd7469e6986aeb95d279b8b8b3da511c695a396bdbc996c') + version('5.0.0', '78d1d6460ff16b3f71e4bcd7306397574d54d421249553ccc26567f00a10bfc6') variant('int64', default=False, description='Build with 64 bit integers') variant('shared', default=True, description='Build shared libraries') -- cgit v1.2.3-70-g09d2 From a3ffaefebdafc8027dcea3aa9c2936474846b313 Mon Sep 17 00:00:00 2001 From: Miroslav Stoyanov <30537612+mkstoyanov@users.noreply.github.com> Date: Thu, 11 Oct 2018 12:25:20 -0400 Subject: updated tasmanian package with v6.0, improved depend_on and conflicts information (#9438) --- .../repos/builtin/packages/tasmanian/package.py | 51 +++++++++++++++------- 1 file changed, 36 insertions(+), 15 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/tasmanian/package.py b/var/spack/repos/builtin/packages/tasmanian/package.py index 71ea84d502..cae7108b04 100644 --- a/var/spack/repos/builtin/packages/tasmanian/package.py +++ b/var/spack/repos/builtin/packages/tasmanian/package.py @@ -31,12 +31,12 @@ class Tasmanian(CMakePackage): interpolation as well as parameter calibration.""" homepage = 'http://tasmanian.ornl.gov' - url = 'https://github.com/ORNL/TASMANIAN/archive/v5.1.tar.gz' + url = 'https://github.com/ORNL/TASMANIAN/archive/v6.0.tar.gz' git = 'https://github.com/ORNL/TASMANIAN.git' - version('xsdk-0.3.0', branch='master') version('develop', branch='master') + version('6.0', '43dcb1d2bcb2f2c829ad046d0e91e83d') # use for xsdk-0.4.0 version('5.1', '5d904029a24470a6acf4a87d3339846e') version('5.0', '4bf131841d786033863d271739be0f7a', @@ -64,21 +64,35 @@ class Tasmanian(CMakePackage): variant('python', default=False, description='add Python binding for Tasmanian') - depends_on('cmake@3.5.0:', type='build') + variant('fortran', default=False, + description='add Fortran 90/95 interface to Tasmanian') + + variant('build_type', default='Release', + description='CMake build type', + values=('Debug', 'Release')) + + depends_on('cmake@3.5.1:', type='build') depends_on('python@2.7:', when='+python', type=('build', 'run')) depends_on('py-numpy', when='+python', type=('build', 'run')) - extends('python', when='+python') + extends('python', when='+python', type=('build', 'run')) + + depends_on('mpi', when="+mpi", type=('build', 'run')) # openmpi 2 and 3 tested - depends_on('mpi', when="+mpi") # openmpi 2 and 3 tested + depends_on('blas', when="+blas", type=('build', 'run')) # openblas 0.2.18 or newer - depends_on('blas', when="+blas") # openblas 0.2.18 or newer + depends_on('cuda@8.0.61:', when='+cuda', type=('build', 'run')) + depends_on('cuda@8.0.61:', when='+magma', type=('build', 'run')) - depends_on('cuda@9.1', when='+cuda', type=('build', 'run')) - depends_on('cuda@9.1', when='+magma', type=('build', 'run')) + depends_on('magma@2.4.0:', when='+magma', type=('build', 'run')) - depends_on('magma@2.3.0', when='+magma', type=('build', 'run')) + conflicts('-cuda', when='+magma') # currently MAGMA only works with CUDA + + # old versions + conflicts('+magma', when='@:5.1') # magma does not work prior to 6.0 + conflicts('+mpi', when='@:5.1') # MPI is broken prior to 6.0 + conflicts('+xsdkflags', when='@:5.1') # 6.0 is the first version included in xSDK def cmake_args(self): spec = self.spec @@ -96,10 +110,10 @@ class Tasmanian(CMakePackage): 'ON' if '+blas' in spec else 'OFF'), '-DXSDK_ENABLE_CUDA:BOOL={0}'.format( 'ON' if '+cuda' in spec else 'OFF'), - '-DXSDK_ENABLE_CUDA:BOOL={0}'.format( - 'ON' if '+magma' in spec else 'OFF'), '-DTPL_ENABLE_MAGMA:BOOL={0}'.format( - 'ON' if '+magma' in spec else 'OFF'), ] + 'ON' if '+magma' in spec else 'OFF'), + '-DXSDK_ENABLE_FORTRAN:BOOL={0}'.format( + 'ON' if '+fortran' in spec else 'OFF'), ] else: args = [ '-DTasmanian_ENABLE_OPENMP:BOOL={0}'.format( @@ -112,12 +126,19 @@ class Tasmanian(CMakePackage): 'ON' if '+mpi' in spec else 'OFF'), '-DTasmanian_ENABLE_CUDA:BOOL={0}'.format( 'ON' if '+cuda' in spec else 'OFF'), - '-DTasmanian_ENABLE_CUDA:BOOL={0}'.format( - 'ON' if '+magma' in spec else 'OFF'), '-DTasmanian_ENABLE_MAGMA:BOOL={0}'.format( - 'ON' if '+magma' in spec else 'OFF'), ] + 'ON' if '+magma' in spec else 'OFF'), + '-DTasmanian_ENABLE_FORTRAN:BOOL={0}'.format( + 'ON' if '+fortran' in spec else 'OFF'), ] if spec.satisfies('+python'): args.append('-DPYTHON_EXECUTABLE:FILEPATH={0}'.format( self.spec['python'].command.path)) + + # _CUBLAS and _CUDA were separate options prior to 6.0 + # skipping _CUBLAS leads to peformance regression + if spec.satisfies('@:5.1'): + args.append('-DTasmanian_ENABLE_CUBLAS={0}'.format( + 'ON' if '+cuda' in spec else 'OFF')) + return args -- cgit v1.2.3-70-g09d2 From 91fbc59f226c9ddf1bc245848e4aadf6ac5c5587 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Thu, 11 Oct 2018 12:47:21 -0500 Subject: amrex: add in new version for xsdk [18.09.1, 18.10] (#9501) --- var/spack/repos/builtin/packages/amrex/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/amrex/package.py b/var/spack/repos/builtin/packages/amrex/package.py index 2b7a2d7249..79c83c750a 100644 --- a/var/spack/repos/builtin/packages/amrex/package.py +++ b/var/spack/repos/builtin/packages/amrex/package.py @@ -34,6 +34,8 @@ class Amrex(CMakePackage): git = "https://github.com/AMReX-Codes/amrex.git" version('develop', branch='development') + version('18.10', commit='d37a266c38092e1174096e245326e9eead1f4e03') # tag:18.10 + version('18.09.1', commit='88120db4736c325a2d3d2c291adacaffd3bf224b') # tag:18.09.1 # Config options variant('dimensions', default='3', -- cgit v1.2.3-70-g09d2 From 5196c1a51aac8cd0eed8da7eba2844b046de46b3 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Fri, 12 Oct 2018 09:17:26 +0200 Subject: dealii: add 9.0.1 and update to sha256 (#9511) --- var/spack/repos/builtin/packages/dealii/package.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index ec6b537a2f..230bfb9c0b 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -40,15 +40,16 @@ class Dealii(CMakePackage, CudaPackage): transitive_rpaths = False version('develop', branch='master') - version('9.0.0', 'a4d45a67b2b028ecf81a6cb621cfaf84') - version('8.5.1', '39b9ebd6ab083d63cfc9044319aaa2ee') - version('8.5.0', 'ef999cc310b007559a6343bf5b1759bc') - version('8.4.2', '84c6bd3f250d3e0681b645d24cb987a7') - version('8.4.1', 'efbaf16f9ad59cfccad62302f36c3c1d') - version('8.4.0', 'ac5dbf676096ff61e092ce98c80c2b00') - version('8.3.0', 'fc6cdcb16309ef4bea338a4f014de6fa') - version('8.2.1', '71c728dbec14f371297cd405776ccf08') - version('8.1.0', 'aa8fadc2ce5eb674f44f997461bf668d') + version('9.0.1', sha256='df2f0d666f2224be07e3741c0e8e02132fd67ea4579cd16a2429f7416146ee64') + version('9.0.0', sha256='c918dc5c1a31d62f6eea7b524dcc81c6d00b3c378d4ed6965a708ab548944f08') + version('8.5.1', sha256='d33e812c21a51f7e5e3d3e6af86aec343155650b611d61c1891fbc3cabce09ae') + version('8.5.0', sha256='e6913ff6f184d16bc2598c1ba31f879535b72b6dff043e15aef048043ff1d779') + version('8.4.2', sha256='ec7c00fadc9d298d1a0d16c08fb26818868410a9622c59ba624096872f3058e4') + version('8.4.1', sha256='00a0e92d069cdafd216816f1aff460f7dbd48744b0d9e0da193287ebf7d6b3ad') + version('8.4.0', sha256='36a20e097a03f17b557e11aad1400af8c6252d25f7feca40b611d5fc16d71990') + version('8.3.0', sha256='4ddf72632eb501e1c814e299f32fc04fd680d6fda9daff58be4209e400e41779') + version('8.2.1', sha256='d75674e45fe63cd9fa294460fe45228904d51a68f744dbb99cd7b60720f3b2a0') + version('8.1.0', sha256='d666bbda2a17b41b80221d7029468246f2658051b8c00d9c5907cd6434c4df99') variant('mpi', default=True, description='Compile with MPI') variant('assimp', default=True, -- cgit v1.2.3-70-g09d2 From 2ae75702c0f8ded1e7b71a22d89c48e79ca6a3b1 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Fri, 12 Oct 2018 09:34:09 +0200 Subject: libepoxy: fix build (#9508) - Add missing pkgconfig dependency - Explicitly disable egl --- var/spack/repos/builtin/packages/libepoxy/package.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libepoxy/package.py b/var/spack/repos/builtin/packages/libepoxy/package.py index e2feebf022..afb9677f69 100644 --- a/var/spack/repos/builtin/packages/libepoxy/package.py +++ b/var/spack/repos/builtin/packages/libepoxy/package.py @@ -35,5 +35,12 @@ class Libepoxy(AutotoolsPackage): version('1.4.3', 'af4c3ce0fb1143bdc4e43f85695a9bed') version('1.3.1', '96f6620a9b005a503e7b44b0b528287d') + depends_on('pkgconfig', type='build') depends_on('meson') depends_on('mesa') + + def configure_args(self): + # Disable egl, otherwise configure fails with: + # error: Package requirements (egl) were not met + # Package 'egl', required by 'virtual:world', not found + return ['--enable-egl=no'] -- cgit v1.2.3-70-g09d2 From a7dc725e2d790b273d6ed47831213f06c2df887c Mon Sep 17 00:00:00 2001 From: sknigh Date: Fri, 12 Oct 2018 00:45:54 -0700 Subject: Ease nlohmann-json conflict with gcc 4.8 (#9506) --- var/spack/repos/builtin/packages/nlohmann-json/package.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nlohmann-json/package.py b/var/spack/repos/builtin/packages/nlohmann-json/package.py index 9258810b62..dd37a9a8f0 100644 --- a/var/spack/repos/builtin/packages/nlohmann-json/package.py +++ b/var/spack/repos/builtin/packages/nlohmann-json/package.py @@ -43,8 +43,10 @@ class NlohmannJson(CMakePackage): depends_on('cmake@3.8:', type='build') # requires mature C++11 implementations - conflicts('%gcc@:4.8') - conflicts('%gcc@:3.3') + conflicts('%gcc@:4.7') + # v3.3.0 adds support for gcc 4.8 + # https://github.com/nlohmann/json/releases/tag/v3.3.0 + conflicts('%gcc@:4.8', when='@:3.2.9') conflicts('%intel@:16') conflicts('%pgi@:14') -- cgit v1.2.3-70-g09d2 From 1200b19b527f6bb0432def7e271435d6053c07fa Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Fri, 12 Oct 2018 09:55:33 +0200 Subject: dbus: add missing pkgconfig dependency (#9497) --- var/spack/repos/builtin/packages/dbus/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dbus/package.py b/var/spack/repos/builtin/packages/dbus/package.py index fe28740824..938a7bf2c8 100644 --- a/var/spack/repos/builtin/packages/dbus/package.py +++ b/var/spack/repos/builtin/packages/dbus/package.py @@ -46,6 +46,7 @@ class Dbus(Package): version('1.8.4', '4717cb8ab5b80978fcadf2b4f2f72e1b') version('1.8.2', 'd6f709bbec0a022a1847c7caec9d6068') + depends_on('pkgconfig', type='build') depends_on('expat') def install(self, spec, prefix): -- cgit v1.2.3-70-g09d2 From cfd0b46941f972610093bcddeb90f9da9bcfc3bd Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Fri, 12 Oct 2018 09:56:44 +0200 Subject: at-spi2-atk: add missing pkgconfig dependency (#9503) --- var/spack/repos/builtin/packages/at-spi2-atk/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/at-spi2-atk/package.py b/var/spack/repos/builtin/packages/at-spi2-atk/package.py index 7ede5cf32b..ab77a5c27f 100644 --- a/var/spack/repos/builtin/packages/at-spi2-atk/package.py +++ b/var/spack/repos/builtin/packages/at-spi2-atk/package.py @@ -37,6 +37,7 @@ class AtSpi2Atk(MesonPackage): version('2.26.2', '355c7916a69513490cb83ad34016b169') version('2.26.1', 'eeec6cead3350dca48a235271c105b3e') + depends_on('pkgconfig', type='build') depends_on('at-spi2-core@2.28.0:') depends_on('atk@2.28.1:') -- cgit v1.2.3-70-g09d2 From 24c75d39e44eb8f27c000a2edeac3c52b0bd0ed2 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Fri, 12 Oct 2018 09:57:44 +0200 Subject: codes, dia, nest: fix pkg-config dependency (#9498) pkgconfig is the virtual provider, pkg-config is a specific implementation. --- var/spack/repos/builtin/packages/codes/package.py | 2 +- var/spack/repos/builtin/packages/dia/package.py | 2 +- var/spack/repos/builtin/packages/nest/package.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/codes/package.py b/var/spack/repos/builtin/packages/codes/package.py index 6a04b05f07..3a29fc1052 100644 --- a/var/spack/repos/builtin/packages/codes/package.py +++ b/var/spack/repos/builtin/packages/codes/package.py @@ -42,7 +42,7 @@ class Codes(AutotoolsPackage): depends_on('automake', type='build') depends_on('libtool', type='build') depends_on('m4', type='build') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('bison', type='build') depends_on('flex', type='build') diff --git a/var/spack/repos/builtin/packages/dia/package.py b/var/spack/repos/builtin/packages/dia/package.py index 735e150c67..3c6bed82f7 100644 --- a/var/spack/repos/builtin/packages/dia/package.py +++ b/var/spack/repos/builtin/packages/dia/package.py @@ -34,7 +34,7 @@ class Dia(Package): depends_on('intltool', type='build') depends_on('gettext', type='build') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') depends_on('gtkplus@2.6.0:') depends_on('libxslt') depends_on('python') diff --git a/var/spack/repos/builtin/packages/nest/package.py b/var/spack/repos/builtin/packages/nest/package.py index 77fe5e9b03..dcc06d7917 100644 --- a/var/spack/repos/builtin/packages/nest/package.py +++ b/var/spack/repos/builtin/packages/nest/package.py @@ -77,7 +77,7 @@ class Nest(CMakePackage): depends_on('gsl', when='+gsl') depends_on('readline') depends_on('libtool') - depends_on('pkg-config', type='build') + depends_on('pkgconfig', type='build') extends('python', when='+python') -- cgit v1.2.3-70-g09d2 From 6db1472c58b9fa6280c93b4711d07266e766e27e Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Fri, 12 Oct 2018 11:33:01 +0200 Subject: vtk: Added mpi variant (#9494) --- var/spack/repos/builtin/packages/vtk/package.py | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py index b71c38485f..5d9650c16a 100644 --- a/var/spack/repos/builtin/packages/vtk/package.py +++ b/var/spack/repos/builtin/packages/vtk/package.py @@ -48,6 +48,7 @@ class Vtk(CMakePackage): variant('osmesa', default=False, description='Enable OSMesa support') variant('python', default=False, description='Enable Python support') variant('qt', default=False, description='Build with support for Qt') + variant('mpi', default=True, description='Enable MPI support') # Haru causes trouble on Fedora and Ubuntu in v8.1.1 # See https://bugzilla.redhat.com/show_bug.cgi?id=1460059#c13 @@ -74,6 +75,8 @@ class Vtk(CMakePackage): # VTK will need Qt5OpenGL, and qt needs '-opengl' for that depends_on('qt+opengl', when='+qt') + depends_on('mpi', when='+mpi') + depends_on('libharu', when='+haru') depends_on('expat') @@ -167,6 +170,12 @@ class Vtk(CMakePackage): '-DModule_vtkGUISupportQtOpenGL:BOOL=ON', ]) + if '+mpi' in spec: + cmake_args.extend([ + '-DVTK_Group_MPI:BOOL=ON', + '-DVTK_USE_SYSTEM_DIY2=OFF' + ]) + if '+osmesa' in spec: prefix = spec['mesa'].prefix osmesa_include_dir = prefix.include -- cgit v1.2.3-70-g09d2 From e38f39e4eafeaa6daed580cece935141e5d8f04b Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Fri, 12 Oct 2018 10:58:37 -0500 Subject: superlu-dist: fix v5.3.0 buid - its attempting to build internal blas (#9517) https://github.com/spack/spack/issues/9514 --- var/spack/repos/builtin/packages/superlu-dist/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/superlu-dist/package.py b/var/spack/repos/builtin/packages/superlu-dist/package.py index 2ee1c542d6..4846d042a5 100644 --- a/var/spack/repos/builtin/packages/superlu-dist/package.py +++ b/var/spack/repos/builtin/packages/superlu-dist/package.py @@ -62,6 +62,7 @@ class SuperluDist(CMakePackage): '-DCMAKE_CXX_COMPILER=%s' % spec['mpi'].mpicxx, '-DCMAKE_INSTALL_LIBDIR:STRING=%s' % self.prefix.lib, '-DTPL_BLAS_LIBRARIES=%s' % lapack_blas.ld_flags, + '-DUSE_XSDK_DEFAULTS=YES', '-DTPL_PARMETIS_LIBRARIES=%s' % spec['parmetis'].libs.ld_flags + ';' + spec['metis'].libs.ld_flags, '-DTPL_PARMETIS_INCLUDE_DIRS=%s' % spec['parmetis'].prefix.include -- cgit v1.2.3-70-g09d2 From 84f4e86358d58b4adc36a0e017f7217f2d2058e4 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Fri, 12 Oct 2018 18:51:52 +0200 Subject: Update scorep and friends (#9495) - cube: Add 4.4.2, add conflicts for ~gui, build 4.4 from cubegui tar - cubelib: Add 4.4.2 - cubew: Add 4.4.1 - opari2: Add 2.0.4 - scorep: Add 4.1 --- var/spack/repos/builtin/packages/cube/package.py | 20 +++++++++++++------- var/spack/repos/builtin/packages/cubelib/package.py | 8 +++++++- var/spack/repos/builtin/packages/cubew/package.py | 8 +++++++- var/spack/repos/builtin/packages/opari2/package.py | 1 + var/spack/repos/builtin/packages/scorep/package.py | 1 + 5 files changed, 29 insertions(+), 9 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cube/package.py b/var/spack/repos/builtin/packages/cube/package.py index 89bdcd873b..ad528e6806 100644 --- a/var/spack/repos/builtin/packages/cube/package.py +++ b/var/spack/repos/builtin/packages/cube/package.py @@ -34,31 +34,37 @@ class Cube(AutotoolsPackage): """ homepage = "http://www.scalasca.org/software/cube-4.x/download.html" - url = "http://apps.fz-juelich.de/scalasca/releases/cube/4.4/dist/CubeBundle-4.4.tar.gz" + url = "http://apps.fz-juelich.de/scalasca/releases/cube/4.4/dist/cubegui-4.4.2.tar.gz" - version('4.4', 'f4f0544883bdd5bad9e11a4a692858bf') + version('4.4.2', '29b6479616a524f8325f5031a883963bf965fb92569de33271a020f08650ec7b') + version('4.4', '0620bae3ac357d0486ce7f5f97e448eeb2494c9a31865b679380ee08c6750e70') version('4.3.5', 'e5dce986e3c6381ea3a5fcb66c553adc') version('4.3.4', '50f73060f55311cb12c5b3cb354d59fa') version('4.3.3', '07e109248ed8ffc7bdcce614264a2909') - version('4.2.3', '8f95b9531f5a8f8134f279c2767c9b20') - variant('gui', default=False, description='Build CUBE GUI') + variant('gui', default=True, description='Build Cube GUI') patch('qt-version.patch', when='@4.3.0:4.3.999 +gui') + depends_on('cubelib', when='@4.4:') + + depends_on('pkgconfig', type='build') + depends_on('dbus') depends_on('zlib') depends_on('qt@5:', when='@4.3.0: +gui') depends_on('qt@4.8:', when='@4.2.0:4.2.999 +gui') + conflicts('~gui', when='@4.4:') + def url_for_version(self, version): if version >= Version('4.4'): - filename = 'CubeBundle-{0}.tar.gz'.format(version) + url = 'http://apps.fz-juelich.de/scalasca/releases/cube/{0}/dist/cubegui-{1}.tar.gz' else: - filename = 'cube-{0}.tar.gz'.format(version) + url = 'http://apps.fz-juelich.de/scalasca/releases/cube/{0}/dist/cube-{1}.tar.gz' - return 'http://apps.fz-juelich.de/scalasca/releases/cube/{0}/dist/{1}'.format(version.up_to(2), filename) + return url.format(version.up_to(2), version) def configure_args(self): spec = self.spec diff --git a/var/spack/repos/builtin/packages/cubelib/package.py b/var/spack/repos/builtin/packages/cubelib/package.py index 5a6a7844b7..de1769e7dc 100644 --- a/var/spack/repos/builtin/packages/cubelib/package.py +++ b/var/spack/repos/builtin/packages/cubelib/package.py @@ -31,10 +31,16 @@ class Cubelib(AutotoolsPackage): homepage = "http://www.scalasca.org/software/cube-4.x/download.html" url = "http://apps.fz-juelich.de/scalasca/releases/cube/4.4/dist/cubelib-4.4.tar.gz" - version('4.4', 'c903f3c44d3228ebefd00c831966988e') + version('4.4.2', '843335c7d238493f1b4cb8e07555ccfe99a3fa521bf162e9d8eaa6733aa1f949') + version('4.4', 'c903f3c44d3228ebefd00c831966988e') depends_on('zlib') + def url_for_version(self, version): + url = 'http://apps.fz-juelich.de/scalasca/releases/cube/{0}/dist/cubelib-{1}.tar.gz' + + return url.format(version.up_to(2), version) + def configure_args(self): configure_args = ['--enable-shared'] diff --git a/var/spack/repos/builtin/packages/cubew/package.py b/var/spack/repos/builtin/packages/cubew/package.py index 79d7c0617c..3fcc101ace 100644 --- a/var/spack/repos/builtin/packages/cubew/package.py +++ b/var/spack/repos/builtin/packages/cubew/package.py @@ -31,10 +31,16 @@ class Cubew(AutotoolsPackage): homepage = "http://www.scalasca.org/software/cube-4.x/download.html" url = "http://apps.fz-juelich.de/scalasca/releases/cube/4.4/dist/cubew-4.4.tar.gz" - version('4.4', 'e9beb140719c2ad3d971e1efb99e0916') + version('4.4.1', 'c09e3f5a3533ebedee2cc7dfaacd7bac4680c14c3fa540669466583a23f04b67') + version('4.4', 'e9beb140719c2ad3d971e1efb99e0916') depends_on('zlib') + def url_for_version(self, version): + url = 'http://apps.fz-juelich.de/scalasca/releases/cube/{0}/dist/cubew-{1}.tar.gz' + + return url.format(version.up_to(2), version) + def configure_args(self): configure_args = ['--enable-shared'] diff --git a/var/spack/repos/builtin/packages/opari2/package.py b/var/spack/repos/builtin/packages/opari2/package.py index 2f1b89bd98..cd3f5acd79 100644 --- a/var/spack/repos/builtin/packages/opari2/package.py +++ b/var/spack/repos/builtin/packages/opari2/package.py @@ -39,6 +39,7 @@ class Opari2(AutotoolsPackage): homepage = "http://www.vi-hps.org/projects/score-p" url = "http://www.vi-hps.org/upload/packages/opari2/opari2-1.1.2.tar.gz" + version('2.0.4', 'f69e324792f66780b473daf2b3c81f58ee8188adc72b6fe0dacf43d4c1a0a131') version('2.0.3', 'f34674718ffdb098a48732a1eb9c1aa2') version('2.0.1', '74af78f1f27b8caaa4271e0b97fb0fba') version('2.0', '72350dbdb6139f2e68a5055a4f0ba16c') diff --git a/var/spack/repos/builtin/packages/scorep/package.py b/var/spack/repos/builtin/packages/scorep/package.py index 715006255c..b794f83f7a 100644 --- a/var/spack/repos/builtin/packages/scorep/package.py +++ b/var/spack/repos/builtin/packages/scorep/package.py @@ -34,6 +34,7 @@ class Scorep(AutotoolsPackage): homepage = "http://www.vi-hps.org/projects/score-p" url = "http://www.vi-hps.org/upload/packages/scorep/scorep-2.0.2.tar.gz" + version('4.1', '7bb6c1eecdd699b4a3207caf202866778ee01f15ff39a9ec198fcd872578fe63') version('4.0', 'f04478e0407d67eeb8c49c3c51d91e12') version('3.1', '065bf8eb08398e8146c895718ddb9145') version('3.0', '44da8beaa3f71436a5f6fe51938aab2f') -- cgit v1.2.3-70-g09d2 From b0430457aa079d009b8fd6034cc5a04b91b07d35 Mon Sep 17 00:00:00 2001 From: Leonhard Reichenbach Date: Fri, 12 Oct 2018 18:52:39 +0200 Subject: Added py-pandas@0.23.4 and py-bottleneck@1.2.1 (#9515) --- var/spack/repos/builtin/packages/py-bottleneck/package.py | 1 + var/spack/repos/builtin/packages/py-pandas/package.py | 1 + 2 files changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-bottleneck/package.py b/var/spack/repos/builtin/packages/py-bottleneck/package.py index 05068b6b53..b002ffd6cf 100644 --- a/var/spack/repos/builtin/packages/py-bottleneck/package.py +++ b/var/spack/repos/builtin/packages/py-bottleneck/package.py @@ -30,6 +30,7 @@ class PyBottleneck(PythonPackage): homepage = "https://pypi.python.org/pypi/Bottleneck/1.0.0" url = "https://pypi.io/packages/source/B/Bottleneck/Bottleneck-1.0.0.tar.gz" + version('1.2.1', sha256='6efcde5f830aed64feafca0359b51db0e184c72af8ba6675b4a99f263922eb36') version('1.0.0', '380fa6f275bd24f27e7cf0e0d752f5d2') depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-pandas/package.py b/var/spack/repos/builtin/packages/py-pandas/package.py index 6dae27e199..ff7cc2eeca 100644 --- a/var/spack/repos/builtin/packages/py-pandas/package.py +++ b/var/spack/repos/builtin/packages/py-pandas/package.py @@ -38,6 +38,7 @@ class PyPandas(PythonPackage): homepage = "http://pandas.pydata.org/" url = "https://pypi.io/packages/source/p/pandas/pandas-0.19.0.tar.gz" + version('0.23.4', sha256='5b24ca47acf69222e82530e89111dd9d14f9b970ab2cd3a1c2c78f0c4fbba4f4') version('0.21.1', '42ae7f81b81a86c3f91f663b66c525f7') version('0.19.2', '26df3ef7cd5686fa284321f4f48b38cd') version('0.19.0', 'bc9bb7188e510b5d44fbdd249698a2c3') -- cgit v1.2.3-70-g09d2 From 028391c0a3778d20d162882b6778a164984ceb2a Mon Sep 17 00:00:00 2001 From: Andreas Baumbach Date: Fri, 12 Oct 2018 19:57:32 +0200 Subject: py-spyder: update dependencies and fix build (#9207) * Remove py-setuptools dependency from py-spyder (fixes #9205) * Add constraint on transitive qt dependency to build with webkit extension (required for this package) * Update pycodestyle dependency constraints * reordered dependencies (py-zmq, py-chardet) to confirm to the ordering in setup.py --- var/spack/repos/builtin/packages/py-spyder/package.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-spyder/package.py b/var/spack/repos/builtin/packages/py-spyder/package.py index 6a3d8b3ccd..db7af50224 100644 --- a/var/spack/repos/builtin/packages/py-spyder/package.py +++ b/var/spack/repos/builtin/packages/py-spyder/package.py @@ -34,7 +34,7 @@ class PySpyder(PythonPackage): version('3.1.3', '4b9b7c8c3e6dc00001e6e98473473c36') version('2.3.9', 'dd01e07a77123c128ff79ba57b97c1d7') - depends_on('py-setuptools', type='build') + depends_on('python@2.7.0:2.8.0,3.3.0:', type=('build', 'run')) depends_on('py-rope@0.9.4:', type=('build', 'run'), when='^python@:3') # depends_on('py-rope_py3k', type=('build', 'run'), when='^python@3:') depends_on('py-jedi@0.9.0', type=('build', 'run')) @@ -44,12 +44,21 @@ class PySpyder(PythonPackage): depends_on('py-qtconsole@4.2.0:', type=('build', 'run')) depends_on('py-nbconvert', type=('build', 'run')) depends_on('py-sphinx', type=('build', 'run')) - depends_on('py-pycodestyle', type=('build', 'run')) + # The pycodestyle dependency is split in two, because internally it + # changes its name from pep8 to pycodestyle, and spyder does not cope + # with this change until @3.2.0 + # https://github.com/PyCQA/pycodestyle/issues/466 + # https://github.com/spyder-ide/spyder/blob/master/CHANGELOG.md#version-32-2017-07-24 + depends_on('py-pycodestyle@:1.7.1', when='@:3.1.99', type=('build', 'run')) + depends_on('py-pycodestyle@2.1.0:', when='@3.2.0:', type=('build', 'run')) depends_on('py-pylint', type=('build', 'run')) depends_on('py-psutil', type=('build', 'run')) depends_on('py-qtawesome@0.4.1:', type=('build', 'run')) depends_on('py-qtpy@1.1.0:', type=('build', 'run')) - depends_on('py-zmq', type=('build', 'run')) - depends_on('py-chardet@2:', type=('build', 'run')) + # technically this is a transitive dependency in order for py-pyqt + # to pick up webkit, but this is the easier solution (see #9207) + depends_on('qt+webkit', type=('build', 'run')) depends_on('py-pickleshare', type=('build', 'run')) + depends_on('py-zmq', type=('build', 'run')) + depends_on('py-chardet@2.0.0:', type=('build', 'run')) depends_on('py-numpydoc', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From ec81ec5f54494527340c902a8b8d9f382fd32aa9 Mon Sep 17 00:00:00 2001 From: Justin M Wozniak Date: Fri, 12 Oct 2018 19:32:27 -0500 Subject: Swift/T Release 1.3 (#4641) New release of Swift/T along with turbine, adlbx, and exmcutils dependencies. Update URLs for archive downloads. --- var/spack/repos/builtin/packages/adlbx/package.py | 13 ++++++++-- .../repos/builtin/packages/exmcutils/package.py | 4 +-- var/spack/repos/builtin/packages/stc/package.py | 6 ++--- .../repos/builtin/packages/turbine/package.py | 29 +++++++++++++++++++--- 4 files changed, 42 insertions(+), 10 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/adlbx/package.py b/var/spack/repos/builtin/packages/adlbx/package.py index fbbde8a996..0b0d3cd3bb 100644 --- a/var/spack/repos/builtin/packages/adlbx/package.py +++ b/var/spack/repos/builtin/packages/adlbx/package.py @@ -30,12 +30,21 @@ class Adlbx(AutotoolsPackage): """ADLB/X: Master-worker library + work stealing and data dependencies""" homepage = 'http://swift-lang.org/Swift-T' - url = 'http://swift-lang.github.io/swift-t-downloads/adlbx-0.8.0.tar.gz' + url = 'http://swift-lang.github.io/swift-t-downloads/spack/adlbx-0.0.0.tar.gz' + + version('0.9.1', '07151ddef5fb83d8f4b40700013d9daf') version('0.8.0', '34ade59ce3be5bc296955231d47a27dd') - depends_on('exmcutils') + depends_on('exmcutils@:0.5.3', when='@:0.8.0') + depends_on('exmcutils', when='@0.9.1:') depends_on('mpi') + def setup_environment(self, spack_env, run_env): + spec = self.spec + spack_env.set('CC', spec['mpi'].mpicc) + spack_env.set('CXX', spec['mpi'].mpicxx) + spack_env.set('CXXLD', spec['mpi'].mpicxx) + def configure_args(self): args = ['--with-c-utils=' + self.spec['exmcutils'].prefix] return args diff --git a/var/spack/repos/builtin/packages/exmcutils/package.py b/var/spack/repos/builtin/packages/exmcutils/package.py index fbccd6cfd3..48d3d8afef 100644 --- a/var/spack/repos/builtin/packages/exmcutils/package.py +++ b/var/spack/repos/builtin/packages/exmcutils/package.py @@ -30,8 +30,8 @@ class Exmcutils(AutotoolsPackage): """ExM C-Utils: Generic C utility library for ADLB/X and Swift/T""" homepage = 'http://swift-lang.org/Swift-T' - url = 'http://swift-lang.github.io/swift-t-downloads/exmcutils-0.5.3.tar.gz' + url = 'http://swift-lang.github.io/swift-t-downloads/spack/exmcutils-0.0.0.tar.gz' - version('0.5.3', '0e3ed6cc2991c684cd8f08db45c99a39') + version('0.5.6', 'b12a8dc163e3369492ec7c1403fe86e4') # This package has no dependencies. diff --git a/var/spack/repos/builtin/packages/stc/package.py b/var/spack/repos/builtin/packages/stc/package.py index b1f62b0fbf..2227b50c31 100644 --- a/var/spack/repos/builtin/packages/stc/package.py +++ b/var/spack/repos/builtin/packages/stc/package.py @@ -30,14 +30,14 @@ class Stc(AutotoolsPackage): """STC: The Swift-Turbine Compiler""" homepage = 'http://swift-lang.org/Swift-T' - url = 'http://swift-lang.github.io/swift-t-downloads/stc-0.7.3.tar.gz' + url = 'http://swift-lang.github.io/swift-t-downloads/spack/stc-0.0.0.tar.gz' - version('0.7.3', '6bf769f406f6c33d1c134521373718d3') + version('0.8.2', '883b0657f1aac9b81158ef0a8989be4c') depends_on('java') depends_on('ant') depends_on('turbine') - depends_on('zsh', type='run') + depends_on('zsh') def configure_args(self): args = ['--with-turbine=' + self.spec['turbine'].prefix] diff --git a/var/spack/repos/builtin/packages/turbine/package.py b/var/spack/repos/builtin/packages/turbine/package.py index 2289424f14..75e3f67a7a 100644 --- a/var/spack/repos/builtin/packages/turbine/package.py +++ b/var/spack/repos/builtin/packages/turbine/package.py @@ -30,18 +30,41 @@ class Turbine(AutotoolsPackage): """Turbine: The Swift/T runtime""" homepage = 'http://swift-lang.org/Swift-T' - url = 'http://swift-lang.github.io/swift-t-downloads/turbine-1.0.0.tar.gz' + url = 'http://swift-lang.github.io/swift-t-downloads/spack/turbine-0.0.0.tar.gz' - version('1.0.0', '7ed56d65d6db0bfe15a439d818b4259e') + version('1.2.3', 'f2e393c292c4248b4e77a19f8272ae88') + version('1.2.1', 'c8976b22849aafe02a8fb4259dfed434') + version('1.1.0', '9a347cf16df02707cb529f96c265a082') + variant('python', default=False, + description='Enable calling python') + variant('r', default=False, + description='Enable calling R') + depends_on('adlbx@:0.8.0', when='@:1.1.0') + depends_on('adlbx', when='@1.2.1:') depends_on('adlbx') depends_on('tcl') depends_on('zsh') - depends_on('swig') + depends_on('swig', type='build') + depends_on('python', when='+python') + depends_on('r', when='+r') + + def setup_environment(self, spack_env, run_env): + spec = self.spec + + spack_env.set('CC', spec['mpi'].mpicc) + spack_env.set('CXX', spec['mpi'].mpicxx) + spack_env.set('CXXLD', spec['mpi'].mpicxx) def configure_args(self): args = ['--with-c-utils=' + self.spec['exmcutils'].prefix, '--with-adlb=' + self.spec['adlbx'].prefix, '--with-tcl=' + self.spec['tcl'].prefix, '--with-mpi=' + self.spec['mpi'].prefix] + if '+python' in self.spec: + args.append('--with-python-exe={0}'.format( + self.spec['python'].command.path)) + if '+r' in self.spec: + args.append('--with-r={0}/rlib/R'.format( + self.spec['r'].prefix)) return args -- cgit v1.2.3-70-g09d2 From 91f9a25905f7c1032252a3e3bc8e0c1a4477ec1c Mon Sep 17 00:00:00 2001 From: Leonhard Reichenbach Date: Mon, 15 Oct 2018 19:25:05 +0200 Subject: py-scikit-learn: added version 0.20.0 (#9526) --- var/spack/repos/builtin/packages/py-scikit-learn/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-scikit-learn/package.py b/var/spack/repos/builtin/packages/py-scikit-learn/package.py index 652aeed709..46024fdfd4 100644 --- a/var/spack/repos/builtin/packages/py-scikit-learn/package.py +++ b/var/spack/repos/builtin/packages/py-scikit-learn/package.py @@ -31,6 +31,7 @@ class PyScikitLearn(PythonPackage): homepage = "https://pypi.python.org/pypi/scikit-learn" url = "https://pypi.io/packages/source/s/scikit-learn/scikit-learn-0.18.1.tar.gz" + version('0.20.0', sha256='97d1d971f8ec257011e64b7d655df68081dd3097322690afa1a71a1d755f8c18') version('0.19.1', 'b67143988c108862735a96cf2b1e827a') version('0.18.1', '6b0ff1eaa5010043895dd63d1e3c60c9') version('0.15.2', 'd9822ad0238e17b382a3c756ea94fe0d') -- cgit v1.2.3-70-g09d2 From 3a2088b4f7038d559da58462b9d5d14a7dd7d9a5 Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Mon, 15 Oct 2018 12:03:11 -0600 Subject: Build Nalu-Wind and Trilinos statically on Darwin (#9522) * Added conflict in Trilinos for STK when building as shared on Darwin. * Created shared variant for Nalu and Nalu-Wind to automatically build Trilinos as static library on Darwin. * Moved ECP tags from Nalu to Nalu-Wind (the latter is the official ECP application). --- var/spack/repos/builtin/packages/nalu-wind/package.py | 10 +++++++++- var/spack/repos/builtin/packages/nalu/package.py | 10 +++++++--- var/spack/repos/builtin/packages/trilinos/package.py | 7 ++++++- 3 files changed, 22 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nalu-wind/package.py b/var/spack/repos/builtin/packages/nalu-wind/package.py index 8ea04adf92..2c5c4679f4 100644 --- a/var/spack/repos/builtin/packages/nalu-wind/package.py +++ b/var/spack/repos/builtin/packages/nalu-wind/package.py @@ -22,6 +22,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * +import sys class NaluWind(CMakePackage): @@ -32,6 +33,8 @@ class NaluWind(CMakePackage): maintainers = ['jrood-nrel'] + tags = ['ecp', 'ecp-apps'] + version('master', branch='master') variant('openfast', default=False, @@ -40,10 +43,15 @@ class NaluWind(CMakePackage): description='Compile with Tioga support') variant('hypre', default=False, description='Compile with Hypre support') + variant('shared', default=(sys.platform != 'darwin'), + description='Build Trilinos as shared library') depends_on('mpi') depends_on('yaml-cpp@0.5.3:') - depends_on('trilinos+exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist+superlu+hdf5+zlib+pnetcdf+shards~hypre@master,develop') + depends_on('trilinos+exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist+superlu+hdf5+zlib+pnetcdf+shards~hypre@master,develop', when='+shared') + # Cannot build Trilinos as a shared library with STK on Darwin + # https://github.com/trilinos/Trilinos/issues/2994 + depends_on('trilinos~shared+exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist+superlu+hdf5+zlib+pnetcdf+shards~hypre@master,develop', when='~shared') depends_on('openfast+cxx', when='+openfast') depends_on('tioga', when='+tioga') depends_on('hypre+mpi+int64', when='+hypre') diff --git a/var/spack/repos/builtin/packages/nalu/package.py b/var/spack/repos/builtin/packages/nalu/package.py index 89084f51d3..f7e566e73f 100644 --- a/var/spack/repos/builtin/packages/nalu/package.py +++ b/var/spack/repos/builtin/packages/nalu/package.py @@ -23,6 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * +import sys class Nalu(CMakePackage): @@ -34,8 +35,6 @@ class Nalu(CMakePackage): homepage = "https://github.com/NaluCFD/Nalu" git = "https://github.com/NaluCFD/Nalu.git" - tags = ['ecp', 'ecp-apps'] - version('master', branch='master') variant('openfast', default=False, @@ -44,10 +43,15 @@ class Nalu(CMakePackage): description='Compile with Tioga support') variant('hypre', default=False, description='Compile with Hypre support') + variant('shared', default=(sys.platform != 'darwin'), + description='Build Trilinos as shared library') depends_on('mpi') depends_on('yaml-cpp@0.5.3:') - depends_on('trilinos+exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist+superlu+hdf5+zlib+pnetcdf+shards~hypre@master,develop') + depends_on('trilinos+exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist+superlu+hdf5+zlib+pnetcdf+shards~hypre@master,develop', when='+shared') + # Cannot build Trilinos as a shared library with STK on Darwin + # https://github.com/trilinos/Trilinos/issues/2994 + depends_on('trilinos~shared+exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist+superlu+hdf5+zlib+pnetcdf+shards~hypre@master,develop', when='~shared') depends_on('openfast+cxx', when='+openfast') depends_on('tioga', when='+tioga') depends_on('hypre+mpi+int64', when='+hypre') diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index acce7d173e..ffa836734f 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -273,6 +273,11 @@ class Trilinos(CMakePackage): conflicts('+superlu-dist', when='+complex+amesos2') # PnetCDF was only added after v12.10.1 conflicts('+pnetcdf', when='@0:12.10.1') + # https://github.com/trilinos/Trilinos/issues/2994 + conflicts( + '+shared', when='+stk platform=darwin', + msg='Cannot build Trilinos with STK as a shared library on Darwin.' + ) # ###################### Dependencies ########################## @@ -313,7 +318,7 @@ class Trilinos(CMakePackage): depends_on('hypre~internal-superlu~int64', when='+hypre') depends_on('hypre@xsdk-0.2.0~internal-superlu', when='@xsdk-0.2.0+hypre') depends_on('hypre@develop~internal-superlu', when='@develop+hypre') - # FIXME: concretizer bug? 'hl' req by netcdf is affecting this code. + # We need hdf5+hl to match with netcdf during concretization depends_on('hdf5+hl+mpi', when='+hdf5') depends_on('python', when='+python') depends_on('py-numpy', when='+python', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 24865fccdc70749d4174b819d14c9d45115d7e7b Mon Sep 17 00:00:00 2001 From: Ricardo Silva Date: Mon, 15 Oct 2018 20:09:00 +0200 Subject: sra-toolkit: new version and preserve symlinks (#9525) Before this, the same files were copied 3 times --- var/spack/repos/builtin/packages/sra-toolkit/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sra-toolkit/package.py b/var/spack/repos/builtin/packages/sra-toolkit/package.py index d2dfd34681..10a81db23f 100644 --- a/var/spack/repos/builtin/packages/sra-toolkit/package.py +++ b/var/spack/repos/builtin/packages/sra-toolkit/package.py @@ -33,13 +33,14 @@ class SraToolkit(Package): homepage = "https://trace.ncbi.nlm.nih.gov/Traces/sra" url = "https://ftp-trace.ncbi.nlm.nih.gov/sra/sdk/2.8.2-1/sratoolkit.2.8.2-1-centos_linux64.tar.gz" - version('2.8.2-1', '3a2910754aea71aba5662804efff2a68') + version('2.9.2', sha256='17dbe13aa1ed7955d31e1e76e8b62786e80a77e9ed9d396631162dc3ad8b716d') + version('2.8.2-1', sha256='b053061aae7c6d00162fe0f514be4128a60365b4b2b5b36e7f4798b348b55cf5') def url_for_version(self, version): url = 'https://ftp-trace.ncbi.nlm.nih.gov/sra/sdk/{0}/sratoolkit.{0}-centos_linux64.tar.gz' return url.format(version) def install(self, spec, prefix): - install_tree('bin', prefix.bin) + install_tree('bin', prefix.bin, symlinks=True) install_tree('example', prefix.example) install_tree('schema', prefix.schema) -- cgit v1.2.3-70-g09d2 From 13c83b8ca4d843989dcbcc69df01b0bb1f9d525c Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Mon, 15 Oct 2018 14:40:38 -0500 Subject: cmake: add version 3.12.3 (#9528) --- var/spack/repos/builtin/packages/cmake/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index b4494f75f9..d20b23f2b0 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -33,6 +33,7 @@ class Cmake(Package): list_url = 'https://cmake.org/files/' list_depth = 1 + version('3.12.3', 'acbf13af31a741794106b76e5d22448b004a66485fc99f6d7df4d22e99da164a') version('3.12.2', '6e7c550cfa1c2e216b35903dc70d80af') version('3.12.1', '10109246a51102bfda45ff3935275fbf') version('3.12.0', 'ab4aa7df9301c94cdd6f8ee4fe66458b') -- cgit v1.2.3-70-g09d2 From ac68ed8fa8319d2792eefaf81f8d8a8ae230ea1c Mon Sep 17 00:00:00 2001 From: snehring Date: Mon, 15 Oct 2018 14:43:02 -0500 Subject: redundans: replace incorrect hard-coded path for sspace-standard (#9483) --- var/spack/repos/builtin/packages/redundans/package.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/redundans/package.py b/var/spack/repos/builtin/packages/redundans/package.py index ea3bea2c17..2364ce082b 100644 --- a/var/spack/repos/builtin/packages/redundans/package.py +++ b/var/spack/repos/builtin/packages/redundans/package.py @@ -46,7 +46,12 @@ class Redundans(Package): depends_on('snap-berkeley@1.0beta.18:', type=('build', 'run')) def install(self, spec, prefix): + sspace_location = join_path(spec['sspace-standard'].prefix, + 'SSPACE_Standard_v3.0.pl') mkdirp(prefix.bin) + filter_file(r'sspacebin = os.path.join(.*)$', + 'sspacebin = \'' + sspace_location + '\'', + 'redundans.py') install('redundans.py', prefix.bin) with working_dir('bin'): install('fasta2homozygous.py', prefix.bin) -- cgit v1.2.3-70-g09d2 From 9176dc29b0f19a71b65bd50d62046e8ee7e6d4a9 Mon Sep 17 00:00:00 2001 From: Jordan Moxon <32072858+moxcodes@users.noreply.github.com> Date: Mon, 15 Oct 2018 12:44:09 -0700 Subject: ssht: new package (#9518) --- var/spack/repos/builtin/packages/ssht/package.py | 44 ++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 var/spack/repos/builtin/packages/ssht/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ssht/package.py b/var/spack/repos/builtin/packages/ssht/package.py new file mode 100644 index 0000000000..55ee33c15a --- /dev/null +++ b/var/spack/repos/builtin/packages/ssht/package.py @@ -0,0 +1,44 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class Ssht(Package): + """The SSHT code provides functionality to perform fast and exact + spin spherical harmonic transforms.""" + + homepage = "https://astro-informatics.github.io/ssht/" + git = "https://github.com/astro-informatics/ssht.git" + + version('1.2b1', commit='7378ce8853897cbd1b08adebf7ec088c1e40f860') + + depends_on('fftw') + + def install(self, spec, prefix): + make('default') + install_tree('include/c', join_path(prefix, 'include')) + install_tree('doc/c', join_path(prefix, 'doc')) + install_tree('lib/c', join_path(prefix, 'lib')) -- cgit v1.2.3-70-g09d2 From 79c44ddf20e934fee694e95b04e3757c2f4c02f2 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Mon, 15 Oct 2018 15:45:56 -0600 Subject: cabana: initial commit (#9444) * cabana: initial commit * Cabana: added v0.1.0-rc0 --- var/spack/repos/builtin/packages/cabana/package.py | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 var/spack/repos/builtin/packages/cabana/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cabana/package.py b/var/spack/repos/builtin/packages/cabana/package.py new file mode 100644 index 0000000000..2aca80b12f --- /dev/null +++ b/var/spack/repos/builtin/packages/cabana/package.py @@ -0,0 +1,55 @@ +############################################################################## +# Copyright (c) 2018, Los Alamos National Security, LLC +# Produced at the Los Alamos National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class Cabana(CMakePackage): + """The Exascale Co-Design Center for Particle Applications Toolkit + """ + homepage = "https://github.com/ECP-copa/Cabana" + git = "https://github.com/ECP-copa/Cabana.git" + url = "https://github.com/ECP-copa/Cabana/archive/0.1.0.tar.gz" + + version('develop', branch='master', submodules=True) + version('0.1.0-rc0', sha256='73754d38aaa0c2a1e012be6959787108fec142294774c23f70292f59c1bdc6c5') + + variant('serial', default=True, description="enable Serial backend (default)") + variant('openmp', default=False, description="enable OpenMP backend") + + depends_on("cmake@3.9:", type='build') + depends_on("kokkos+serial", when="+serial") + depends_on("kokkos+openmp", when="+openmp") + + def cmake_args(self): + options = [ + '-DCabana_ENABLE_TESTING=ON', + '-DCabana_ENABLE_Serial=%s' % ( + 'On' if '+serial' in self.spec else 'Off'), + '-DCabana_ENABLE_OpenMP=%s' % ( + 'On' if '+openmp' in self.spec else 'Off') + ] + + return options -- cgit v1.2.3-70-g09d2 From c5185b18cc99f6222da993cedb54ef3a53824d24 Mon Sep 17 00:00:00 2001 From: Daniel Topa Date: Mon, 15 Oct 2018 19:21:02 -0600 Subject: pmix package: add new versions (#9532) --- var/spack/repos/builtin/packages/pmix/package.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pmix/package.py b/var/spack/repos/builtin/packages/pmix/package.py index a5de237e9c..5d29d27cb4 100644 --- a/var/spack/repos/builtin/packages/pmix/package.py +++ b/var/spack/repos/builtin/packages/pmix/package.py @@ -49,6 +49,12 @@ class Pmix(AutotoolsPackage): homepage = "https://pmix.github.io/pmix" url = "https://github.com/pmix/pmix/releases/download/v2.0.1/pmix-2.0.1.tar.bz2" + version('3.0.2', 'dc2e501605dde93ab459a5e060e01500') + version('3.0.1', 'ffe6bc08ab600173ea6e7d4509777629') + version('3.0.0', '396969979a36d45bd292908e4bcec5c8') + version('2.1.4', 'edcfd7d1e2c2bcbb3e9852b66b57120e') + version('2.1.3', '9320a4f3aef305fab4f7ac3520153160') + version('2.1.2', '9f99fd893be49c2cb0cd8926cf6fcc78') version('2.1.1', 'f9f109421661b757245d5e0bd44a38b3') version('2.1.0', 'fc97513b601d78fe7c6bb20c6a21df3c') version('2.0.3', 'fae199c9fa1d1f1bc20c336f1292f950') -- cgit v1.2.3-70-g09d2 From aae994258cb7b2b35a1ca636e485f6f7d25660f5 Mon Sep 17 00:00:00 2001 From: Andreas Baumbach Date: Tue, 16 Oct 2018 03:27:13 +0200 Subject: update py-mock dependencies based on requirements.txt (#9496) --- var/spack/repos/builtin/packages/py-mock/package.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-mock/package.py b/var/spack/repos/builtin/packages/py-mock/package.py index 938c015ad1..154bc1191d 100644 --- a/var/spack/repos/builtin/packages/py-mock/package.py +++ b/var/spack/repos/builtin/packages/py-mock/package.py @@ -36,5 +36,9 @@ class PyMock(PythonPackage): version('2.0.0', '0febfafd14330c9dcaa40de2d82d40ad') version('1.3.0', '73ee8a4afb3ff4da1b4afa287f39fdeb') - depends_on('py-pbr', type=('build', 'run')) + depends_on('py-pbr@0.11:', type=('build', 'run')) + depends_on('py-six@1.7:', type=('build', 'run')) + depends_on('py-six@1.9:', type=('build', 'run'), when='@2.0.0:') + # requirements.txt references @1:, but 0.4 is newest available.. + depends_on('py-funcsigs', type=('build', 'run'), when='^python@:3.2.99') depends_on('py-setuptools@17.1:', type='build') -- cgit v1.2.3-70-g09d2 From 8e2015121b7b4efd6cb5f375d058ff5ecab70941 Mon Sep 17 00:00:00 2001 From: snehring Date: Mon, 15 Oct 2018 21:07:36 -0500 Subject: sspace-standard: use Getopt::Std instead of getopts.pl (#9516) getopts.pl is not listed as a Spack dependency of sspace-standard, so without this change, this package was only working on systems where getopts.pl was already installed. --- var/spack/repos/builtin/packages/sspace-standard/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sspace-standard/package.py b/var/spack/repos/builtin/packages/sspace-standard/package.py index bf7f6a0679..74e97d8a47 100644 --- a/var/spack/repos/builtin/packages/sspace-standard/package.py +++ b/var/spack/repos/builtin/packages/sspace-standard/package.py @@ -55,6 +55,9 @@ class SspaceStandard(Package): for s in scripts: filter_file('/usr/bin/perl', '/usr/bin/env perl', s, string=True) + filter_file('require "getopts.pl";', 'use Getopt::Std;', + s, string=True) + filter_file('&Getopts(', 'getopts(', s, string=True) install_tree('bin', prefix.bin) install_tree('bowtie', prefix.bowtie) -- cgit v1.2.3-70-g09d2 From 118f616b19afc95d260899b2e16c17ff74250014 Mon Sep 17 00:00:00 2001 From: Leonhard Reichenbach Date: Tue, 16 Oct 2018 20:03:03 +0200 Subject: py-setuptools: add version 40.4.3 (#9534) --- var/spack/repos/builtin/packages/py-setuptools/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-setuptools/package.py b/var/spack/repos/builtin/packages/py-setuptools/package.py index 2ede7f4c51..8f7a61e733 100644 --- a/var/spack/repos/builtin/packages/py-setuptools/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools/package.py @@ -40,6 +40,7 @@ class PySetuptools(PythonPackage): 'easy_install' ] + version('40.4.3', sha256='acbc5740dd63f243f46c2b4b8e2c7fd92259c2ddb55a4115b16418a2ed371b15') version('40.2.0', '592efabea3a65d8e97a025ed52f69b12') version('39.2.0', 'dd4e3fa83a21bf7bf9c51026dc8a4e59') version('39.0.1', '75310b72ca0ab4e673bf7679f69d7a62') -- cgit v1.2.3-70-g09d2 From ef11d27f7f12f3b2f424545a29a0d96bd59713a4 Mon Sep 17 00:00:00 2001 From: Jordan Moxon <32072858+moxcodes@users.noreply.github.com> Date: Tue, 16 Oct 2018 11:24:42 -0700 Subject: libsharp: new package (#9530) --- .../repos/builtin/packages/libsharp/package.py | 61 ++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 var/spack/repos/builtin/packages/libsharp/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libsharp/package.py b/var/spack/repos/builtin/packages/libsharp/package.py new file mode 100644 index 0000000000..54d7296400 --- /dev/null +++ b/var/spack/repos/builtin/packages/libsharp/package.py @@ -0,0 +1,61 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## + +from spack import * + + +class Libsharp(AutotoolsPackage): + """Libsharp is a code library for spherical harmonic transforms (SHTs) and + spin-weighted spherical harmonic transforms, which evolved from the libpsht + library.""" + + variant('openmp', default=True, description='Build with openmp support') + variant('mpi', default=True, description='Build with MPI support') + + homepage = "https://github.com/Libsharp/libsharp" + git = "https://github.com/Libsharp/libsharp.git" + + version('1.0.0', commit='cc4753ff4b0ef393f0d4ada41a175c6d1dd85d71') + version('2018-01-17', commit='593d4eba67d61827191c32fb94bf235cb31205e1') + + depends_on('autoconf', type='build') + depends_on('mpi', when='+mpi') + + def autoreconf(self, spec, prefix): + """Generate autotools configuration""" + bash = which('bash') + bash('autoconf') + + def configure_args(self): + args = [] + if '+openmp' not in self.spec: + args.append("--disable-openmp") + if '+mpi' not in self.spec: + args.append("--disable-mpi") + return args + + def install(self, spec, prefix): + install_tree('auto/include', join_path(prefix, 'include')) + install_tree('auto/lib', join_path(prefix, 'lib')) -- cgit v1.2.3-70-g09d2 From 1597d6762902ba6ddc4af0255cb82f87c2ae616f Mon Sep 17 00:00:00 2001 From: Justin M Wozniak Date: Tue, 16 Oct 2018 15:27:23 -0500 Subject: stc and turbine: fix depends_on(type) (#9537) --- var/spack/repos/builtin/packages/stc/package.py | 8 ++++---- var/spack/repos/builtin/packages/turbine/package.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/stc/package.py b/var/spack/repos/builtin/packages/stc/package.py index 2227b50c31..0f32f04d63 100644 --- a/var/spack/repos/builtin/packages/stc/package.py +++ b/var/spack/repos/builtin/packages/stc/package.py @@ -34,10 +34,10 @@ class Stc(AutotoolsPackage): version('0.8.2', '883b0657f1aac9b81158ef0a8989be4c') - depends_on('java') - depends_on('ant') - depends_on('turbine') - depends_on('zsh') + depends_on('java', type=('build', 'run')) + depends_on('ant', type='build') + depends_on('turbine', type=('build', 'run')) + depends_on('zsh', type=('build', 'run')) def configure_args(self): args = ['--with-turbine=' + self.spec['turbine'].prefix] diff --git a/var/spack/repos/builtin/packages/turbine/package.py b/var/spack/repos/builtin/packages/turbine/package.py index 75e3f67a7a..b5abaf337c 100644 --- a/var/spack/repos/builtin/packages/turbine/package.py +++ b/var/spack/repos/builtin/packages/turbine/package.py @@ -43,8 +43,8 @@ class Turbine(AutotoolsPackage): depends_on('adlbx@:0.8.0', when='@:1.1.0') depends_on('adlbx', when='@1.2.1:') depends_on('adlbx') - depends_on('tcl') - depends_on('zsh') + depends_on('tcl', type=('build', 'run')) + depends_on('zsh', type=('build', 'run')) depends_on('swig', type='build') depends_on('python', when='+python') depends_on('r', when='+r') -- cgit v1.2.3-70-g09d2 From bc213074cd31c0c2d611b6d31de04be2bacfd6b2 Mon Sep 17 00:00:00 2001 From: Dan Ibanez Date: Wed, 17 Oct 2018 06:49:00 -0600 Subject: Fixes to Omega_h C++ compiler flags (#9545) * omega-h: fix CMake CXX flag options * omega-h: turn warnings off by default --- var/spack/repos/builtin/packages/omega-h/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/omega-h/package.py b/var/spack/repos/builtin/packages/omega-h/package.py index 210b2befdf..68f1975f75 100644 --- a/var/spack/repos/builtin/packages/omega-h/package.py +++ b/var/spack/repos/builtin/packages/omega-h/package.py @@ -52,7 +52,7 @@ class OmegaH(CMakePackage): variant('examples', default=False, description='Compile examples') variant('optimize', default=True, description='Compile C++ with optimization') variant('symbols', default=True, description='Compile C++ with debug symbols') - variant('warnings', default=True, description='Compile C++ with warnings') + variant('warnings', default=False, description='Compile C++ with warnings') depends_on('gmodel', when='+gmodel') depends_on('gmsh', when='+examples', type='build') @@ -61,7 +61,7 @@ class OmegaH(CMakePackage): depends_on('zlib', when='+zlib') def _bob_options(self): - cmake_var_prefix = self.name.capitalize() + '_CXX_' + cmake_var_prefix = 'Omega_h_CXX_' for variant in ['optimize', 'symbols', 'warnings']: cmake_var = cmake_var_prefix + variant.upper() if '+' + variant in self.spec: -- cgit v1.2.3-70-g09d2 From 9838f9609ce35244c99cba2aa5d9e739e30d7ea8 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Wed, 17 Oct 2018 09:11:43 -0500 Subject: gmodel: switch from .zip to .tar.gz to avoid unzip dependency (#9549) --- var/spack/repos/builtin/packages/gmodel/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gmodel/package.py b/var/spack/repos/builtin/packages/gmodel/package.py index cea0106929..62b22811b5 100644 --- a/var/spack/repos/builtin/packages/gmodel/package.py +++ b/var/spack/repos/builtin/packages/gmodel/package.py @@ -34,6 +34,6 @@ class Gmodel(CMakePackage): for Gmsh. """ homepage = "https://github.com/ibaned/gmodel" - url = "https://github.com/ibaned/gmodel/archive/v2.1.0.zip" + url = "https://github.com/ibaned/gmodel/archive/v2.1.0.tar.gz" - version('2.1.0', '9130a90c93c40edde378f6d4086c5fe0') + version('2.1.0', '80df0c6dc413a9ffa0f0e7b65118b05b643ba3e1bfcac28fb91d2d3ad017fda0') -- cgit v1.2.3-70-g09d2 From 62d821d8431f5430484a95927cd5c0a882f808ff Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Wed, 17 Oct 2018 09:12:49 -0500 Subject: amrex: add version 18.10.1 (#9550) --- var/spack/repos/builtin/packages/amrex/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/amrex/package.py b/var/spack/repos/builtin/packages/amrex/package.py index 79c83c750a..771ba8d98e 100644 --- a/var/spack/repos/builtin/packages/amrex/package.py +++ b/var/spack/repos/builtin/packages/amrex/package.py @@ -34,6 +34,7 @@ class Amrex(CMakePackage): git = "https://github.com/AMReX-Codes/amrex.git" version('develop', branch='development') + version('18.10.1', commit='260b53169badaa760b91dfc60ea6b2ea3d9ccf06') # tag:18.10.1 version('18.10', commit='d37a266c38092e1174096e245326e9eead1f4e03') # tag:18.10 version('18.09.1', commit='88120db4736c325a2d3d2c291adacaffd3bf224b') # tag:18.09.1 -- cgit v1.2.3-70-g09d2 From da3f45eb6b15e4645000b4b9a0f0a014de437647 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Wed, 17 Oct 2018 09:57:20 -0500 Subject: pflotran: switch to parallel build (#9554) --- var/spack/repos/builtin/packages/pflotran/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pflotran/package.py b/var/spack/repos/builtin/packages/pflotran/package.py index 2f5321406d..e81139d59c 100644 --- a/var/spack/repos/builtin/packages/pflotran/package.py +++ b/var/spack/repos/builtin/packages/pflotran/package.py @@ -44,4 +44,6 @@ class Pflotran(AutotoolsPackage): depends_on('petsc@xsdk-0.2.0+hdf5+metis', when='@xsdk-0.2.0') depends_on('petsc@3.8.0:+hdf5+metis', when='@xsdk-0.3.0') - parallel = False + @property + def parallel(self): + return self.spec.satisfies('@develop') -- cgit v1.2.3-70-g09d2 From 4225dc106b470513b1878e1c3c794048861fac72 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Wed, 17 Oct 2018 10:28:48 -0500 Subject: omega-h: update to versions 9.19.0, 9.19.1 (#9548) * omega-h: update to versions 9.19.0, 9.19.1 * omega-h: add build conflict for gcc-8 --- var/spack/repos/builtin/packages/omega-h/package.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/omega-h/package.py b/var/spack/repos/builtin/packages/omega-h/package.py index 68f1975f75..4c0b4c0299 100644 --- a/var/spack/repos/builtin/packages/omega-h/package.py +++ b/var/spack/repos/builtin/packages/omega-h/package.py @@ -37,6 +37,8 @@ class OmegaH(CMakePackage): git = "https://github.com/ibaned/omega_h.git" version('develop', branch='master') + version('9.19.1', sha256='60ef65c2957ce03ef9d1b995d842fb65c32c5659d064de002c071effe66b1b1f') + version('9.19.0', sha256='4a1606c4e7287a1b67359cf6ef1c2d7e24b7dc379065566a1d2e0b0330c0abbd') version('9.15.0', sha256='342a506a0ff22f6cac759862efdcf34e360110f7901eb9b4c5de8afe38741522') version('9.14.0', sha256='035d0f47142f965a57818d1cb6c5c00b5ae6b5a0178b67b0bc9177fa99ba083d') version('9.13.14', sha256='f617dfd024c9cc323e56800ca23df3386bfa37e1b9bd378847d1f5d32d2b8e5d') @@ -60,6 +62,9 @@ class OmegaH(CMakePackage): depends_on('trilinos +kokkos +teuchos', when='+trilinos') depends_on('zlib', when='+zlib') + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86610 + conflicts('%gcc@8:') + def _bob_options(self): cmake_var_prefix = 'Omega_h_CXX_' for variant in ['optimize', 'symbols', 'warnings']: -- cgit v1.2.3-70-g09d2 From 470a45c51659156e7d154ea890e798ce32b8767d Mon Sep 17 00:00:00 2001 From: Dan Ibanez Date: Wed, 17 Oct 2018 12:30:19 -0600 Subject: omega-h: fix dependencies (#9552) * omega-h: fix dependencies 1. Remove Gmodel altogether. Omega_h doesn't actually call Gmodel for anything, it was more or less just doing additional unit testing for Gmodel 2. Make Trilinos off by default. Most codes do not need the ParameterList interface, and Kokkos through Trilinos is not well explored in Spack 3. Use modern CMake style to choose the zlib dependency --- var/spack/repos/builtin/packages/omega-h/package.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/omega-h/package.py b/var/spack/repos/builtin/packages/omega-h/package.py index 4c0b4c0299..6cf3db52a0 100644 --- a/var/spack/repos/builtin/packages/omega-h/package.py +++ b/var/spack/repos/builtin/packages/omega-h/package.py @@ -47,16 +47,14 @@ class OmegaH(CMakePackage): variant('shared', default=True, description='Build shared libraries') variant('mpi', default=True, description='Activates MPI support') variant('zlib', default=True, description='Activates ZLib support') - variant('trilinos', default=True, description='Use Teuchos and Kokkos') + variant('trilinos', default=False, description='Use Teuchos and Kokkos') variant('build_type', default='') - variant('gmodel', default=True, description='Gmsh model generation library') variant('throw', default=False, description='Errors throw exceptions instead of abort') variant('examples', default=False, description='Compile examples') variant('optimize', default=True, description='Compile C++ with optimization') variant('symbols', default=True, description='Compile C++ with debug symbols') variant('warnings', default=False, description='Compile C++ with warnings') - depends_on('gmodel', when='+gmodel') depends_on('gmsh', when='+examples', type='build') depends_on('mpi', when='+mpi') depends_on('trilinos +kokkos +teuchos', when='+trilinos') @@ -88,16 +86,12 @@ class OmegaH(CMakePackage): args.append('-DOmega_h_USE_MPI:BOOL=OFF') if '+trilinos' in self.spec: args.append('-DOmega_h_USE_Trilinos:BOOL=ON') - if '+gmodel' in self.spec: - args.append('-DOmega_h_USE_Gmodel:BOOL=ON') if '+zlib' in self.spec: - args.append('-DTPL_ENABLE_ZLIB:BOOL=ON') - args.append('-DTPL_ZLIB_INCLUDE_DIRS:STRING={0}'.format( - self.spec['zlib'].prefix.include)) - args.append('-DTPL_ZLIB_LIBRARIES:STRING={0}'.format( - self.spec['zlib'].libs)) + args.append('-DOmega_h_USE_ZLIB:BOOL=ON') + args.append('-DZLIB_ROOT:PATH={0}'.format( + self.spec['zlib'].prefix)) else: - args.append('-DTPL_ENABLE_ZLIB:BOOL=OFF') + args.append('-DOmega_h_USE_ZLIB:BOOL=OFF') if '+examples' in self.spec: args.append('-DOmega_h_EXAMPLES:BOOL=ON') else: -- cgit v1.2.3-70-g09d2 From 7ba4c6200c125a651eeb10b3cde964da8f81ae22 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Tue, 16 Oct 2018 22:53:18 -0700 Subject: relicense: remove significant contributions from peetsv - This is bundled into one commit to make it easy to revert if we do get consent from peetsv's company to relicense these contributions. - Revert "dialign-tx adding patch for gcc@5.4.0 (#6413)" - This reverts commit 09eeb991a2ac0d749ffdbfe2f1cc415dd5d5dc85. - Remove the following LGPL-2.1 packages because we have not gotten consent to relicense them: - fast-gbs - igv - metasv - perl-xml-libxml - py-cnvkit - py-crossmap - py-pybedtools - py-pyfaidx - py-pyvcf - py-vmd-python - r-cghflasso - r-dismo - r-proc - r-spatial - r-utf8 --- .../dialign-tx/dialign-1-0-2-gcc-5-4-0.patch | 80 ---------------------- .../repos/builtin/packages/dialign-tx/package.py | 2 - .../repos/builtin/packages/fast-gbs/package.py | 54 --------------- var/spack/repos/builtin/packages/igv/package.py | 54 --------------- var/spack/repos/builtin/packages/metasv/package.py | 41 ----------- .../builtin/packages/perl-xml-libxml/package.py | 35 ---------- .../repos/builtin/packages/py-cnvkit/package.py | 48 ------------- .../repos/builtin/packages/py-crossmap/package.py | 41 ----------- .../builtin/packages/py-pybedtools/package.py | 44 ------------ .../repos/builtin/packages/py-pyfaidx/package.py | 37 ---------- .../repos/builtin/packages/py-pyvcf/package.py | 39 ----------- .../builtin/packages/py-vmd-python/package.py | 41 ----------- .../repos/builtin/packages/r-cghflasso/package.py | 36 ---------- .../repos/builtin/packages/r-dismo/package.py | 40 ----------- var/spack/repos/builtin/packages/r-proc/package.py | 44 ------------ .../repos/builtin/packages/r-spatial/package.py | 37 ---------- var/spack/repos/builtin/packages/r-utf8/package.py | 38 ---------- 17 files changed, 711 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/dialign-tx/dialign-1-0-2-gcc-5-4-0.patch delete mode 100644 var/spack/repos/builtin/packages/fast-gbs/package.py delete mode 100644 var/spack/repos/builtin/packages/igv/package.py delete mode 100644 var/spack/repos/builtin/packages/metasv/package.py delete mode 100644 var/spack/repos/builtin/packages/perl-xml-libxml/package.py delete mode 100644 var/spack/repos/builtin/packages/py-cnvkit/package.py delete mode 100644 var/spack/repos/builtin/packages/py-crossmap/package.py delete mode 100644 var/spack/repos/builtin/packages/py-pybedtools/package.py delete mode 100644 var/spack/repos/builtin/packages/py-pyfaidx/package.py delete mode 100644 var/spack/repos/builtin/packages/py-pyvcf/package.py delete mode 100644 var/spack/repos/builtin/packages/py-vmd-python/package.py delete mode 100644 var/spack/repos/builtin/packages/r-cghflasso/package.py delete mode 100644 var/spack/repos/builtin/packages/r-dismo/package.py delete mode 100644 var/spack/repos/builtin/packages/r-proc/package.py delete mode 100644 var/spack/repos/builtin/packages/r-spatial/package.py delete mode 100644 var/spack/repos/builtin/packages/r-utf8/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dialign-tx/dialign-1-0-2-gcc-5-4-0.patch b/var/spack/repos/builtin/packages/dialign-tx/dialign-1-0-2-gcc-5-4-0.patch deleted file mode 100644 index 5a82f97e7b..0000000000 --- a/var/spack/repos/builtin/packages/dialign-tx/dialign-1-0-2-gcc-5-4-0.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- a/source/alig.c 2008-12-06 04:10:05.000000000 -0800 -+++ b/source/alig.c 2017-11-21 10:58:31.000000000 -0800 -@@ -520,7 +520,7 @@ - * datastructure (i.e. frontiers). The given diag must be consistent - * to the given alignment ! - */ --inline char align_diag(struct alignment *algn, struct scr_matrix *smatrix, struct diag* dg) { -+char align_diag(struct alignment *algn, struct scr_matrix *smatrix, struct diag* dg) { - - char alignedSomething = 0; - int i,j,k; -diff -Naur a/source/assemble.c b/source/assemble.c ---- a/source/assemble.c 2008-12-06 04:10:05.000000000 -0800 -+++ b/source/assemble.c 2017-11-21 10:57:55.000000000 -0800 -@@ -10,7 +10,7 @@ - - extern void error(char *message); - extern void merror(char *msg1, char *msg2); --extern inline void calc_weight(struct diag* dg, struct scr_matrix* smatrix, -+extern void calc_weight(struct diag* dg, struct scr_matrix* smatrix, - struct prob_dist *pdist); - extern inline void calc_ov_weight(struct diag* dg, struct diag_col *dcol, struct scr_matrix* smatrix, - struct prob_dist *pdist); -@@ -37,7 +37,7 @@ - extern inline struct algn_pos *find_eqc(struct algn_pos **ap, int seqnum, int pos); - extern struct alignment* copy_alignment( struct alignment *o_algn, struct alignment *algn, char doDgc); - //extern char adapt_diag(struct alignment *algn, struct scr_matrix *smatrix, struct diag* dg); --extern inline char align_diag(struct alignment *algn, struct scr_matrix *smatrix, struct diag* dg); -+extern char align_diag(struct alignment *algn, struct scr_matrix *smatrix, struct diag* dg); - //extern inline struct diag_cont* enter_sorted(struct diag_cont* backlog_diags, struct diag_cont *cand); - //extern inline char fit_fpos_diag(struct alignment *algn, struct diag* dg); - -@@ -574,7 +574,7 @@ - * returns a value <0 if there is an non-conflicting overlap - * returns 0 in all other non-conflicting cases - */ --inline char confl_diag(struct alignment *algn, char *layer, struct diag *dg1, struct diag *dg2) { -+static inline char confl_diag(struct alignment *algn, char *layer, struct diag *dg1, struct diag *dg2) { - // if(dg1->multi_dg || dg2->multi_dg) error(" confl_diag(): cannot accept multi dgs!"); - int s1_1 = dg1->seq_p1.num; - int s1_2 = dg1->seq_p2.num; -diff -Naur a/source/diag.c b/source/diag.c ---- a/source/diag.c 2008-12-06 04:10:05.000000000 -0800 -+++ b/source/diag.c 2017-11-21 10:55:43.000000000 -0800 -@@ -183,7 +183,7 @@ - * omitScore = 0: normal - * omitScore = 1: no score calculation - */ --inline void real_calc_weight(struct diag* dg, struct scr_matrix* smatrix, -+static inline void real_calc_weight(struct diag* dg, struct scr_matrix* smatrix, - struct prob_dist *pdist, char omitScore, long double **tmp_dist, struct alignment *algn ) { - - if(dg->multi_dg) { -@@ -302,7 +302,7 @@ - } - } - --inline void calc_weight(struct diag* dg, struct scr_matrix* smatrix, -+void calc_weight(struct diag* dg, struct scr_matrix* smatrix, - struct prob_dist *pdist) { - real_calc_weight(dg, smatrix, pdist, 0,NULL,NULL); - } -@@ -312,7 +312,7 @@ - /** - * calculates the overlap weight for the given diag - */ --inline void calc_ov_weight(struct diag* dg, struct diag_col *dcol, struct scr_matrix* smatrix, -+static inline void calc_ov_weight(struct diag* dg, struct diag_col *dcol, struct scr_matrix* smatrix, - struct prob_dist *pdist) { - int sn1 = dg->seq_p1.num; - int sn2 = dg->seq_p2.num; -@@ -958,7 +958,7 @@ - * The pointer returned (and the ones included in the struct) - * has to be deallocted explicitely from memory. - */ --inline struct simple_diag_col* find_diags_dialign(struct scr_matrix *smatrix, -+static inline struct simple_diag_col* find_diags_dialign(struct scr_matrix *smatrix, - struct prob_dist *pdist, struct seq* seq1, - struct seq* seq2, struct alignment *algn, - long double **tmp_dist, int round) { diff --git a/var/spack/repos/builtin/packages/dialign-tx/package.py b/var/spack/repos/builtin/packages/dialign-tx/package.py index ea7eddaf42..a5ba5ceedc 100644 --- a/var/spack/repos/builtin/packages/dialign-tx/package.py +++ b/var/spack/repos/builtin/packages/dialign-tx/package.py @@ -50,5 +50,3 @@ class DialignTx(MakefilePackage): install('dialign-tx', prefix.bin) # t-coffee recognizes as dialign-t install('dialign-tx', join_path(prefix.bin, 'dialign-t')) - - patch('dialign-1-0-2-gcc-5-4-0.patch', when='%gcc@5.4.0') diff --git a/var/spack/repos/builtin/packages/fast-gbs/package.py b/var/spack/repos/builtin/packages/fast-gbs/package.py deleted file mode 100644 index feddf105d9..0000000000 --- a/var/spack/repos/builtin/packages/fast-gbs/package.py +++ /dev/null @@ -1,54 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -from spack import * - - -class FastGbs(Package): - """A bioinformatic pipeline designed to extract a high-quality SNP catalog - starting from FASTQ files obtained from sequencing - genotyping-by-sequencing (GBS) libraries.""" - - homepage = "https://bitbucket.org/jerlar73/fast-gbs" - git = "https://bitbucket.org/jerlar73/fast-gbs.git" - - version('2017-01-25', commit='3b3cbffa84d269419692067c6a3de08b3b88849c') - - depends_on('parallel', type='run') - depends_on('python@2.7:', type='run') - depends_on('sabre', type='run') - depends_on('py-cutadapt', type='run') - depends_on('bwa', type='run') - depends_on('samtools', type='run') - depends_on('platypus', type='run') - depends_on('py-pyvcf', type='run') - - def install(self, spec, prefix): - mkdirp(prefix.bin) - install('fastgbs.sh', prefix.bin) - install('parameters.txt', prefix.bin) - install('makeDir.sh', prefix.bin) - install('makeBarcodeSabre.py', prefix.bin) - install('vcf2txt.py', prefix.bin) - install('txt2unix.sh', prefix.bin) diff --git a/var/spack/repos/builtin/packages/igv/package.py b/var/spack/repos/builtin/packages/igv/package.py deleted file mode 100644 index b905520629..0000000000 --- a/var/spack/repos/builtin/packages/igv/package.py +++ /dev/null @@ -1,54 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -from spack import * -import glob - - -class Igv(Package): - """The Integrative Genomics Viewer (IGV) is a high-performance - visualization tool for interactive exploration of large, - integrated genomic datasets.""" - - homepage = "http://software.broadinstitute.org/software/igv/" - - version('2.4.5', '4c45e1b281d8e3d8630aa485c5df6949', - url='http://data.broadinstitute.org/igv/projects/downloads/2.4/IGVSource_2.4.5.zip') - version('2.3.50', '7fdb903a59d556fad25e668b38e860f8', - url='http://data.broadinstitute.org/igv/projects/downloads/2.3/IGVSource_2.3.50.zip') - - depends_on('jdk@8:', type=('build', 'run'), when='@2.4:') - depends_on('jdk@7u0:7u999', type=('build', 'run'), when='@2.3:2.3.999') - depends_on('ant', type='build') - - def install(self, spec, prefix): - ant = self.spec['ant'].command - ant('all') - mkdirp(prefix.bin) - install('igv.sh', prefix.bin) - install('igv.jar', prefix.bin) - mkdirp(prefix.lib) - files = [x for x in glob.glob("lib/*jar")] - for f in files: - install(f, prefix.lib) diff --git a/var/spack/repos/builtin/packages/metasv/package.py b/var/spack/repos/builtin/packages/metasv/package.py deleted file mode 100644 index 540b2da2b9..0000000000 --- a/var/spack/repos/builtin/packages/metasv/package.py +++ /dev/null @@ -1,41 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -from spack import * - - -class Metasv(PythonPackage): - """An accurate and integrative structural-variant caller - for next generation sequencing""" - - homepage = "http://bioinform.github.io/metasv/" - url = "https://github.com/bioinform/metasv/archive/0.5.4.tar.gz" - - version('0.5.4', 'de2e21ac4f86bc4d1830bdfff95d8391') - - depends_on('py-pybedtools@0.6.9', type=('build', 'run')) - depends_on('py-pysam@0.7.7', type=('build', 'run')) - depends_on('py-pyvcf@0.6.7', type=('build', 'run')) - depends_on('py-setuptools', type=('build', 'run')) - depends_on('py-cython', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/perl-xml-libxml/package.py b/var/spack/repos/builtin/packages/perl-xml-libxml/package.py deleted file mode 100644 index 7bb689544c..0000000000 --- a/var/spack/repos/builtin/packages/perl-xml-libxml/package.py +++ /dev/null @@ -1,35 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -from spack import * - - -class PerlXmlLibxml(PerlPackage): - """This module is an interface to libxml2, providing XML and HTML parsers - with DOM, SAX and XMLReader interfaces""" - - homepage = "http://search.cpan.org/~shlomif/XML-LibXML-2.0132/LibXML.pod" - url = "http://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0132.tar.gz" - - version('2.0132', '43546fd9a3974f19323f9fb04861ece9') diff --git a/var/spack/repos/builtin/packages/py-cnvkit/package.py b/var/spack/repos/builtin/packages/py-cnvkit/package.py deleted file mode 100644 index 045c940206..0000000000 --- a/var/spack/repos/builtin/packages/py-cnvkit/package.py +++ /dev/null @@ -1,48 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -from spack import * - - -class PyCnvkit(PythonPackage): - """A command-line toolkit and Python library for detecting copy number - variants and alterations genome-wide from high-throughput sequencing.""" - - homepage = "http://cnvkit.readthedocs.io/en/stable/" - url = "https://github.com/etal/cnvkit/archive/v0.9.2.tar.gz" - - version('0.9.2', '16612c4dcc9570f6ef9fecc42caf1745') - - depends_on('py-setuptools', type='build') - depends_on('py-biopython@1.62:', type=('build', 'run')) - depends_on('py-future@0.15.2:', type=('build', 'run')) - depends_on('py-matplotlib@1.3.1:', type=('build', 'run')) - depends_on('py-numpy@1.9:', type=('build', 'run')) - depends_on('py-pandas@0.18.1:', type=('build', 'run')) - depends_on('py-pyfaidx@0.4.7:', type=('build', 'run')) - depends_on('py-pysam@0.10.0:0.13', type=('build', 'run')) - depends_on('py-reportlab@3.0:', type=('build', 'run')) - depends_on('py-scipy@0.15.0:', type=('build', 'run')) - depends_on('bcftools@1.6', type=('build', 'run')) - depends_on('samtools@1.6', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-crossmap/package.py b/var/spack/repos/builtin/packages/py-crossmap/package.py deleted file mode 100644 index ad94df9bc4..0000000000 --- a/var/spack/repos/builtin/packages/py-crossmap/package.py +++ /dev/null @@ -1,41 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -from spack import * - - -class PyCrossmap(PythonPackage): - """CrossMap is a program for convenient conversion of genome - coordinates (or annotation files) between different assemblies""" - - homepage = "http://crossmap.sourceforge.net" - url = "https://downloads.sourceforge.net/project/crossmap/CrossMap-0.2.7.tar.gz" - - version('0.2.7', '91dadec9644ee3038f20ee7a6eb8dfb7') - - depends_on('python@2.7:2.7.999', type=('build', 'run')) - depends_on('py-cython@0.17:', type='build') - depends_on('py-pysam', type=('build', 'run')) - depends_on('py-setuptools', type='build') - depends_on('py-bx-python', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pybedtools/package.py b/var/spack/repos/builtin/packages/py-pybedtools/package.py deleted file mode 100644 index 55d6d34f1f..0000000000 --- a/var/spack/repos/builtin/packages/py-pybedtools/package.py +++ /dev/null @@ -1,44 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -from spack import * - - -class PyPybedtools(PythonPackage): - """pybedtools wraps and extends BEDTools and offers - feature-level manipulations from within Python.""" - - homepage = "http://daler.github.io/pybedtools" - url = "https://pypi.io/packages/source/p/pybedtools/pybedtools-0.7.10.tar.gz" - - version('0.7.10', 'f003c67e22c48b77f070538368ece70c') - version('0.6.9', 'b7df049036422d8c6951412a90e83dca') - - depends_on('py-setuptools', type='build') - depends_on('bedtools2', type=('build', 'run')) - depends_on('py-numpy', type=('build', 'run')) - depends_on('py-pandas', type=('build', 'run')) - depends_on('py-pysam@0.8.1:', type=('build', 'run'), when='@0.7.0:') - depends_on('py-pysam@0.7.7', type=('build', 'run'), when='@0.6.9') - depends_on('py-six', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pyfaidx/package.py b/var/spack/repos/builtin/packages/py-pyfaidx/package.py deleted file mode 100644 index deee8cb745..0000000000 --- a/var/spack/repos/builtin/packages/py-pyfaidx/package.py +++ /dev/null @@ -1,37 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -from spack import * - - -class PyPyfaidx(PythonPackage): - """pyfaidx: efficient pythonic random access to fasta subsequences""" - - homepage = "https://pypi.python.org/pypi/pyfaidx" - url = "https://pypi.io/packages/source/p/pyfaidx/pyfaidx-0.5.3.1.tar.gz" - - version('0.5.3.1', '128074c48fdef23d41e47af73b45f040') - - depends_on('py-setuptools@0.7:', type='build') - depends_on('py-six', type='build') diff --git a/var/spack/repos/builtin/packages/py-pyvcf/package.py b/var/spack/repos/builtin/packages/py-pyvcf/package.py deleted file mode 100644 index 3a7cb21263..0000000000 --- a/var/spack/repos/builtin/packages/py-pyvcf/package.py +++ /dev/null @@ -1,39 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -from spack import * - - -class PyPyvcf(PythonPackage): - """PyVCF - A Variant Call Format Parser for Python""" - - homepage = "https://github.com/jamescasbon/PyVCF" - url = "https://pypi.io/packages/source/P/PyVCF/PyVCF-0.6.8.tar.gz" - - version('0.6.8', '3cc70aa59e62dab7b4a85bd5a9f2e714') - version('0.6.7', '51b57ce99e0c2f7be2a18d08d8f87734') - - depends_on('py-setuptools', type='build') - depends_on('py-cython', type='build') - depends_on('py-pysam', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-vmd-python/package.py b/var/spack/repos/builtin/packages/py-vmd-python/package.py deleted file mode 100644 index 57c15c5ffb..0000000000 --- a/var/spack/repos/builtin/packages/py-vmd-python/package.py +++ /dev/null @@ -1,41 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -from spack import * - - -class PyVmdPython(PythonPackage): - """Installable VMD as a python module""" - - homepage = "https://github.com/Eigenstate" - url = "https://github.com/Eigenstate/vmd-python/archive/v2.0.10.tar.gz" - - version('2.0.10', '8c746d961497a676053b66e3dd692794') - - depends_on('python@2.7:2.8', type=('build', 'run')) - depends_on('py-numpy', type=('build', 'run')) - depends_on('py-setuptools', type='run') - depends_on('tcl') - depends_on('netcdf') - depends_on('expat') diff --git a/var/spack/repos/builtin/packages/r-cghflasso/package.py b/var/spack/repos/builtin/packages/r-cghflasso/package.py deleted file mode 100644 index 7ef6fe07d7..0000000000 --- a/var/spack/repos/builtin/packages/r-cghflasso/package.py +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -from spack import * - - -class RCghflasso(RPackage): - """Spatial smoothing and hot spot detection using the fused - lasso regression""" - - homepage = "https://cran.r-project.org/package=cghFLasso" - url = "https://cran.r-project.org/src/contrib/cghFLasso_0.2-1.tar.gz" - list_url = "https://cran.r-project.org/src/contrib/Archive/cghFLasso" - - version('0.2-1', '9a714a6dda3de9e905d23dadfa5d37f1') diff --git a/var/spack/repos/builtin/packages/r-dismo/package.py b/var/spack/repos/builtin/packages/r-dismo/package.py deleted file mode 100644 index 01c5a70413..0000000000 --- a/var/spack/repos/builtin/packages/r-dismo/package.py +++ /dev/null @@ -1,40 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -from spack import * - - -class RDismo(RPackage): - """Functions for species distribution modeling, that is, predicting - entire geographic distributions form occurrences at a number of - sites and the environment at these sites""" - - homepage = "http://rspatial.org/sdm" - url = "https://cran.r-project.org/src/contrib/dismo_1.1-4.tar.gz" - - version('1.1-4', '0ed11729bcf4c2ffa01a3e2ac88dabfc') - - depends_on('r@3.2:', type=('build', 'run')) - depends_on('r-raster@2.5-2:', type=('build', 'run')) - depends_on('r-sp@1.2-0:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-proc/package.py b/var/spack/repos/builtin/packages/r-proc/package.py deleted file mode 100644 index d06e823000..0000000000 --- a/var/spack/repos/builtin/packages/r-proc/package.py +++ /dev/null @@ -1,44 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -from spack import * - - -class RProc(RPackage): - """Tools for visualizing, smoothing and comparing receiver operating - characteristic (ROC curves). (Partial) area under the curve (AUC) - can be compared with statistical tests based on U-statistics or - bootstrap. Confidence intervals can be computed for (p)AUC or - ROC curves.""" - - homepage = "https://web.expasy.org/pROC/" - url = "https://cran.r-project.org/src/contrib/pROC_1.12.1.tar.gz" - list_url = "https://cran.r-project.org/src/contrib/Archive/pROC" - - version('1.12.1', 'ef5fb446fd75c1a3a5e7abf9b7aa4f75') - - depends_on('r@2.14:', type=('build', 'run')) - depends_on('r-plyr', type=('build', 'run')) - depends_on('r-rcpp@0.11.1:', type=('build', 'run')) - depends_on('r-ggplot2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-spatial/package.py b/var/spack/repos/builtin/packages/r-spatial/package.py deleted file mode 100644 index 6435d70f0e..0000000000 --- a/var/spack/repos/builtin/packages/r-spatial/package.py +++ /dev/null @@ -1,37 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -from spack import * - - -class RSpatial(RPackage): - """Functions for kriging and point pattern analysis.""" - - homepage = "http://www.stats.ox.ac.uk/pub/MASS4/" - url = "https://cran.r-project.org/src/contrib/spatial_7.3-10.tar.gz" - list_url = "https://cran.r-project.org/src/contrib/Archive/spatial" - - version('7.3-10', 'e544e3e3fd92e6868f29b8da2925b214') - - depends_on('r@3.0.0:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-utf8/package.py b/var/spack/repos/builtin/packages/r-utf8/package.py deleted file mode 100644 index bd5e5fd7c6..0000000000 --- a/var/spack/repos/builtin/packages/r-utf8/package.py +++ /dev/null @@ -1,38 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -from spack import * - - -class RUtf8(RPackage): - """Process and print 'UTF-8' encoded international text (Unicode). - Input, validate, normalize, encode, format, and display.""" - - homepage = "https://github.com/patperry/r-utf8" - url = "https://cran.r-project.org/src/contrib/utf8_1.1.3.tar.gz" - list_url = "https://cran.r-project.org/src/contrib/Archive/utf8" - - version('1.1.3', '3a4d84328eb3314e8ebb84d3553f7015') - - depends_on('r@2.1.0:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 3501bc91247042dd78813094e1218ff1ac2e7d13 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Tue, 9 Oct 2018 17:20:08 -0700 Subject: relicense: remove LGPL-2.1-only farmhash package - we did not get consent for this package --- .../repos/builtin/packages/farmhash/CMakeLists.txt | 25 -------------- .../repos/builtin/packages/farmhash/package.py | 39 ---------------------- 2 files changed, 64 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/farmhash/CMakeLists.txt delete mode 100644 var/spack/repos/builtin/packages/farmhash/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/farmhash/CMakeLists.txt b/var/spack/repos/builtin/packages/farmhash/CMakeLists.txt deleted file mode 100644 index 0286f29ad0..0000000000 --- a/var/spack/repos/builtin/packages/farmhash/CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ -cmake_minimum_required(VERSION 2.8.3) - -project(farmhash) - -set(FARMHASH_SRCS - "src/farmhash.h" - "src/farmhash.cc" -) - -set(FARMHASH_INCLUDES - "src/farmhash.h" -) - -include_directories("${CMAKE_CURRENT_SOURCE_DIR}") - -add_library(farmhash ${FARMHASH_SRCS}) -add_definitions(-DFARMHASH_NO_BUILTIN_EXPECT) - -install(TARGETS farmhash - LIBRARY DESTINATION lib COMPONENT RuntimeLibraries - ARCHIVE DESTINATION lib COMPONENT Development) - -foreach(FARMHASH_INCLUDE ${FARMHASH_INCLUDES}) - install(FILES ${FARMHASH_INCLUDE} DESTINATION include COMPONENT Development) -endforeach() diff --git a/var/spack/repos/builtin/packages/farmhash/package.py b/var/spack/repos/builtin/packages/farmhash/package.py deleted file mode 100644 index a8aa8f2c9f..0000000000 --- a/var/spack/repos/builtin/packages/farmhash/package.py +++ /dev/null @@ -1,39 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -from spack import * -import os.path - - -class Farmhash(CMakePackage): - """FarmHash provides hash functions for strings and other data.""" - - homepage = "https://github.com/google/farmhash" - git = "https://github.com/google/farmhash.git" - - version('92e897', commit='92e897b282426729f4724d91a637596c7e2fe28f') - - def patch(self): - copy(join_path(os.path.dirname(__file__), "CMakeLists.txt"), - "CMakeLists.txt") -- cgit v1.2.3-70-g09d2 From eea786f4e888b30cf70d1cddab4b5e6aa1c4cc28 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Sun, 7 Oct 2018 13:52:23 -0700 Subject: relicense: replace LGPL headers with Apache-2.0/MIT SPDX headers - remove the old LGPL license headers from all files in Spack - add SPDX headers to all files - core and most packages are (Apache-2.0 OR MIT) - a very small number of remaining packages are LGPL-2.1-only --- bin/sbang | 30 +++--------- bin/spack | 26 ++--------- bin/spack-python | 30 +++--------- lib/spack/docs/basic_usage.rst | 5 ++ lib/spack/docs/binary_caches.rst | 5 ++ lib/spack/docs/build_settings.rst | 5 ++ lib/spack/docs/build_systems.rst | 5 ++ lib/spack/docs/build_systems/autotoolspackage.rst | 5 ++ lib/spack/docs/build_systems/cmakepackage.rst | 5 ++ lib/spack/docs/build_systems/cudapackage.rst | 5 ++ lib/spack/docs/build_systems/custompackage.rst | 5 ++ lib/spack/docs/build_systems/intelpackage.rst | 5 ++ lib/spack/docs/build_systems/makefilepackage.rst | 5 ++ lib/spack/docs/build_systems/mesonpackage.rst | 5 ++ lib/spack/docs/build_systems/octavepackage.rst | 5 ++ lib/spack/docs/build_systems/perlpackage.rst | 5 ++ lib/spack/docs/build_systems/pythonpackage.rst | 5 ++ lib/spack/docs/build_systems/qmakepackage.rst | 5 ++ lib/spack/docs/build_systems/rpackage.rst | 5 ++ lib/spack/docs/build_systems/rubypackage.rst | 5 ++ lib/spack/docs/build_systems/sconspackage.rst | 5 ++ lib/spack/docs/build_systems/wafpackage.rst | 5 ++ lib/spack/docs/conf.py | 29 ++---------- lib/spack/docs/config_yaml.rst | 5 ++ lib/spack/docs/configuration.rst | 5 ++ lib/spack/docs/contribution_guide.rst | 5 ++ lib/spack/docs/developer_guide.rst | 5 ++ lib/spack/docs/docker_for_developers.rst | 5 ++ lib/spack/docs/features.rst | 7 ++- lib/spack/docs/getting_started.rst | 5 ++ lib/spack/docs/index.rst | 5 ++ lib/spack/docs/known_issues.rst | 5 ++ lib/spack/docs/mirrors.rst | 5 ++ lib/spack/docs/module_file_support.rst | 5 ++ lib/spack/docs/package_list.rst | 5 ++ lib/spack/docs/packaging_guide.rst | 5 ++ lib/spack/docs/repositories.rst | 5 ++ lib/spack/docs/tutorial.rst | 5 ++ lib/spack/docs/tutorial/examples/0.package.py | 27 ++--------- lib/spack/docs/tutorial/examples/1.package.py | 27 ++--------- lib/spack/docs/tutorial/examples/2.package.py | 27 ++--------- lib/spack/docs/tutorial/examples/3.package.py | 27 ++--------- lib/spack/docs/tutorial/examples/4.package.py | 27 ++--------- lib/spack/docs/tutorial/examples/5.package.py | 27 ++--------- .../docs/tutorial/examples/Autotools/0.package.py | 27 ++--------- .../docs/tutorial/examples/Autotools/1.package.py | 27 ++--------- .../docs/tutorial/examples/Cmake/0.package.py | 27 ++--------- .../docs/tutorial/examples/Cmake/1.package.py | 27 ++--------- .../docs/tutorial/examples/Cmake/2.package.py | 27 ++--------- .../docs/tutorial/examples/Makefile/0.package.py | 27 ++--------- .../docs/tutorial/examples/Makefile/1.package.py | 27 ++--------- .../docs/tutorial/examples/Makefile/2.package.py | 27 ++--------- .../docs/tutorial/examples/Makefile/3.package.py | 27 ++--------- .../docs/tutorial/examples/PyPackage/0.package.py | 27 ++--------- .../docs/tutorial/examples/PyPackage/1.package.py | 27 ++--------- lib/spack/docs/tutorial_advanced_packaging.rst | 5 ++ lib/spack/docs/tutorial_basics.rst | 5 ++ lib/spack/docs/tutorial_buildsystems.rst | 31 +++++++------ lib/spack/docs/tutorial_configuration.rst | 5 ++ lib/spack/docs/tutorial_modules.rst | 5 ++ lib/spack/docs/tutorial_packaging.rst | 37 ++++++++------- lib/spack/docs/workflows.rst | 5 ++ lib/spack/env/cc | 26 ++--------- lib/spack/external/__init__.py | 27 ++--------- lib/spack/external/ordereddict_backport.py | 27 ++--------- lib/spack/llnl/__init__.py | 26 ++--------- lib/spack/llnl/util/__init__.py | 26 ++--------- lib/spack/llnl/util/argparsewriter.py | 27 ++--------- lib/spack/llnl/util/filesystem.py | 27 ++--------- lib/spack/llnl/util/lang.py | 27 ++--------- lib/spack/llnl/util/link_tree.py | 27 ++--------- lib/spack/llnl/util/lock.py | 27 ++--------- lib/spack/llnl/util/multiproc.py | 27 ++--------- lib/spack/llnl/util/tty/__init__.py | 27 ++--------- lib/spack/llnl/util/tty/colify.py | 27 ++--------- lib/spack/llnl/util/tty/color.py | 27 ++--------- lib/spack/llnl/util/tty/log.py | 27 ++--------- lib/spack/spack/__init__.py | 27 ++--------- lib/spack/spack/abi.py | 27 ++--------- lib/spack/spack/architecture.py | 27 ++--------- lib/spack/spack/binary_distribution.py | 27 ++--------- lib/spack/spack/build_environment.py | 27 ++--------- lib/spack/spack/build_systems/__init__.py | 26 ++--------- lib/spack/spack/build_systems/aspell_dict.py | 27 ++--------- lib/spack/spack/build_systems/autotools.py | 27 ++--------- lib/spack/spack/build_systems/cmake.py | 27 ++--------- lib/spack/spack/build_systems/cuda.py | 27 ++--------- lib/spack/spack/build_systems/intel.py | 27 ++--------- lib/spack/spack/build_systems/makefile.py | 27 ++--------- lib/spack/spack/build_systems/meson.py | 27 ++--------- lib/spack/spack/build_systems/octave.py | 27 ++--------- lib/spack/spack/build_systems/perl.py | 27 ++--------- lib/spack/spack/build_systems/python.py | 27 ++--------- lib/spack/spack/build_systems/qmake.py | 27 ++--------- lib/spack/spack/build_systems/r.py | 27 ++--------- lib/spack/spack/build_systems/scons.py | 27 ++--------- lib/spack/spack/build_systems/waf.py | 27 ++--------- lib/spack/spack/caches.py | 27 ++--------- lib/spack/spack/cmd/__init__.py | 27 ++--------- lib/spack/spack/cmd/activate.py | 27 ++--------- lib/spack/spack/cmd/arch.py | 27 ++--------- lib/spack/spack/cmd/blame.py | 27 ++--------- lib/spack/spack/cmd/bootstrap.py | 27 ++--------- lib/spack/spack/cmd/build.py | 27 ++--------- lib/spack/spack/cmd/buildcache.py | 27 ++--------- lib/spack/spack/cmd/cd.py | 27 ++--------- lib/spack/spack/cmd/checksum.py | 27 ++--------- lib/spack/spack/cmd/clean.py | 27 ++--------- lib/spack/spack/cmd/clone.py | 27 ++--------- lib/spack/spack/cmd/commands.py | 27 ++--------- lib/spack/spack/cmd/common/__init__.py | 27 ++--------- lib/spack/spack/cmd/common/arguments.py | 27 ++--------- lib/spack/spack/cmd/compiler.py | 27 ++--------- lib/spack/spack/cmd/compilers.py | 27 ++--------- lib/spack/spack/cmd/config.py | 27 ++--------- lib/spack/spack/cmd/configure.py | 27 ++--------- lib/spack/spack/cmd/create.py | 54 ++-------------------- lib/spack/spack/cmd/deactivate.py | 27 ++--------- lib/spack/spack/cmd/debug.py | 27 ++--------- lib/spack/spack/cmd/dependencies.py | 27 ++--------- lib/spack/spack/cmd/dependents.py | 27 ++--------- lib/spack/spack/cmd/diy.py | 27 ++--------- lib/spack/spack/cmd/docs.py | 27 ++--------- lib/spack/spack/cmd/edit.py | 27 ++--------- lib/spack/spack/cmd/env.py | 27 ++--------- lib/spack/spack/cmd/extensions.py | 27 ++--------- lib/spack/spack/cmd/fetch.py | 27 ++--------- lib/spack/spack/cmd/find.py | 27 ++--------- lib/spack/spack/cmd/flake8.py | 27 ++--------- lib/spack/spack/cmd/gpg.py | 27 ++--------- lib/spack/spack/cmd/graph.py | 27 ++--------- lib/spack/spack/cmd/help.py | 27 ++--------- lib/spack/spack/cmd/info.py | 27 ++--------- lib/spack/spack/cmd/install.py | 27 ++--------- lib/spack/spack/cmd/list.py | 27 ++--------- lib/spack/spack/cmd/load.py | 27 ++--------- lib/spack/spack/cmd/location.py | 27 ++--------- lib/spack/spack/cmd/log_parse.py | 27 ++--------- lib/spack/spack/cmd/mirror.py | 27 ++--------- lib/spack/spack/cmd/module.py | 27 ++--------- lib/spack/spack/cmd/modules/__init__.py | 27 ++--------- lib/spack/spack/cmd/modules/dotkit.py | 27 ++--------- lib/spack/spack/cmd/modules/lmod.py | 27 ++--------- lib/spack/spack/cmd/modules/tcl.py | 27 ++--------- lib/spack/spack/cmd/patch.py | 27 ++--------- lib/spack/spack/cmd/pkg.py | 27 ++--------- lib/spack/spack/cmd/providers.py | 27 ++--------- lib/spack/spack/cmd/pydoc.py | 27 ++--------- lib/spack/spack/cmd/python.py | 27 ++--------- lib/spack/spack/cmd/reindex.py | 27 ++--------- lib/spack/spack/cmd/repo.py | 27 ++--------- lib/spack/spack/cmd/restage.py | 27 ++--------- lib/spack/spack/cmd/setup.py | 27 ++--------- lib/spack/spack/cmd/spec.py | 27 ++--------- lib/spack/spack/cmd/stage.py | 27 ++--------- lib/spack/spack/cmd/test.py | 27 ++--------- lib/spack/spack/cmd/uninstall.py | 27 ++--------- lib/spack/spack/cmd/unload.py | 27 ++--------- lib/spack/spack/cmd/unuse.py | 27 ++--------- lib/spack/spack/cmd/url.py | 27 ++--------- lib/spack/spack/cmd/use.py | 27 ++--------- lib/spack/spack/cmd/versions.py | 27 ++--------- lib/spack/spack/cmd/view.py | 27 ++--------- lib/spack/spack/compiler.py | 27 ++--------- lib/spack/spack/compilers/__init__.py | 27 ++--------- lib/spack/spack/compilers/cce.py | 27 ++--------- lib/spack/spack/compilers/clang.py | 27 ++--------- lib/spack/spack/compilers/gcc.py | 27 ++--------- lib/spack/spack/compilers/intel.py | 27 ++--------- lib/spack/spack/compilers/nag.py | 27 ++--------- lib/spack/spack/compilers/pgi.py | 27 ++--------- lib/spack/spack/compilers/xl.py | 27 ++--------- lib/spack/spack/compilers/xl_r.py | 28 ++--------- lib/spack/spack/concretize.py | 27 ++--------- lib/spack/spack/config.py | 27 ++--------- lib/spack/spack/database.py | 27 ++--------- lib/spack/spack/dependency.py | 27 ++--------- lib/spack/spack/directives.py | 27 ++--------- lib/spack/spack/directory_layout.py | 27 ++--------- lib/spack/spack/environment.py | 27 ++--------- lib/spack/spack/error.py | 27 ++--------- lib/spack/spack/fetch_strategy.py | 27 ++--------- lib/spack/spack/filesystem_view.py | 27 ++--------- lib/spack/spack/graph.py | 27 ++--------- lib/spack/spack/hooks/__init__.py | 27 ++--------- lib/spack/spack/hooks/extensions.py | 27 ++--------- lib/spack/spack/hooks/licensing.py | 27 ++--------- lib/spack/spack/hooks/module_file_generation.py | 27 ++--------- lib/spack/spack/hooks/permissions_setters.py | 27 ++--------- lib/spack/spack/hooks/sbang.py | 27 ++--------- lib/spack/spack/hooks/yaml_version_check.py | 27 ++--------- lib/spack/spack/main.py | 27 ++--------- lib/spack/spack/mirror.py | 27 ++--------- lib/spack/spack/mixins.py | 27 ++--------- lib/spack/spack/modules/__init__.py | 27 ++--------- lib/spack/spack/modules/common.py | 27 ++--------- lib/spack/spack/modules/dotkit.py | 27 ++--------- lib/spack/spack/modules/lmod.py | 27 ++--------- lib/spack/spack/modules/tcl.py | 27 ++--------- lib/spack/spack/multimethod.py | 27 ++--------- lib/spack/spack/operating_systems/__init__.py | 26 ++--------- lib/spack/spack/operating_systems/cnk.py | 27 ++--------- lib/spack/spack/operating_systems/cnl.py | 27 ++--------- lib/spack/spack/operating_systems/cray_frontend.py | 27 ++--------- lib/spack/spack/operating_systems/linux_distro.py | 27 ++--------- lib/spack/spack/operating_systems/mac_os.py | 27 ++--------- lib/spack/spack/package.py | 27 ++--------- lib/spack/spack/package_prefs.py | 28 ++--------- lib/spack/spack/package_test.py | 27 ++--------- lib/spack/spack/parse.py | 27 ++--------- lib/spack/spack/patch.py | 27 ++--------- lib/spack/spack/paths.py | 27 ++--------- lib/spack/spack/pkgkit.py | 29 ++---------- lib/spack/spack/platforms/__init__.py | 26 ++--------- lib/spack/spack/platforms/bgq.py | 27 ++--------- lib/spack/spack/platforms/cray.py | 27 ++--------- lib/spack/spack/platforms/darwin.py | 27 ++--------- lib/spack/spack/platforms/linux.py | 27 ++--------- lib/spack/spack/platforms/test.py | 27 ++--------- lib/spack/spack/provider_index.py | 27 ++--------- lib/spack/spack/relocate.py | 27 ++--------- lib/spack/spack/repo.py | 27 ++--------- lib/spack/spack/report.py | 27 ++--------- lib/spack/spack/reporter.py | 27 ++--------- lib/spack/spack/reporters/__init__.py | 26 ++--------- lib/spack/spack/reporters/cdash.py | 27 ++--------- lib/spack/spack/reporters/junit.py | 27 ++--------- lib/spack/spack/resource.py | 27 ++--------- lib/spack/spack/schema/__init__.py | 27 ++--------- lib/spack/spack/schema/compilers.py | 29 ++---------- lib/spack/spack/schema/config.py | 29 ++---------- lib/spack/spack/schema/mirrors.py | 29 ++---------- lib/spack/spack/schema/modules.py | 29 ++---------- lib/spack/spack/schema/packages.py | 29 ++---------- lib/spack/spack/schema/repos.py | 29 ++---------- lib/spack/spack/spec.py | 27 ++--------- lib/spack/spack/stage.py | 27 ++--------- lib/spack/spack/store.py | 27 ++--------- lib/spack/spack/tengine.py | 27 ++--------- lib/spack/spack/test/__init__.py | 26 ++--------- lib/spack/spack/test/architecture.py | 27 ++--------- lib/spack/spack/test/build_environment.py | 27 ++--------- lib/spack/spack/test/build_system_guess.py | 27 ++--------- lib/spack/spack/test/build_systems.py | 27 ++--------- lib/spack/spack/test/cc.py | 27 ++--------- lib/spack/spack/test/cmd/activate.py | 27 ++--------- lib/spack/spack/test/cmd/arch.py | 27 ++--------- lib/spack/spack/test/cmd/blame.py | 27 ++--------- lib/spack/spack/test/cmd/cd.py | 27 ++--------- lib/spack/spack/test/cmd/clean.py | 27 ++--------- lib/spack/spack/test/cmd/commands.py | 27 ++--------- lib/spack/spack/test/cmd/debug.py | 27 ++--------- lib/spack/spack/test/cmd/dependencies.py | 27 ++--------- lib/spack/spack/test/cmd/dependents.py | 27 ++--------- lib/spack/spack/test/cmd/env.py | 27 ++--------- lib/spack/spack/test/cmd/find.py | 27 ++--------- lib/spack/spack/test/cmd/flake8.py | 27 ++--------- lib/spack/spack/test/cmd/gpg.py | 27 ++--------- lib/spack/spack/test/cmd/graph.py | 27 ++--------- lib/spack/spack/test/cmd/help.py | 27 ++--------- lib/spack/spack/test/cmd/info.py | 27 ++--------- lib/spack/spack/test/cmd/install.py | 27 ++--------- lib/spack/spack/test/cmd/list.py | 27 ++--------- lib/spack/spack/test/cmd/mirror.py | 27 ++--------- lib/spack/spack/test/cmd/module.py | 27 ++--------- lib/spack/spack/test/cmd/print_shell_vars.py | 27 ++--------- lib/spack/spack/test/cmd/providers.py | 27 ++--------- lib/spack/spack/test/cmd/python.py | 27 ++--------- lib/spack/spack/test/cmd/spec.py | 27 ++--------- lib/spack/spack/test/cmd/test_compiler_cmd.py | 27 ++--------- lib/spack/spack/test/cmd/uninstall.py | 27 ++--------- lib/spack/spack/test/cmd/url.py | 27 ++--------- lib/spack/spack/test/cmd/versions.py | 27 ++--------- lib/spack/spack/test/cmd/view.py | 27 ++--------- lib/spack/spack/test/compilers.py | 27 ++--------- lib/spack/spack/test/concretize.py | 27 ++--------- lib/spack/spack/test/concretize_preferences.py | 27 ++--------- lib/spack/spack/test/config.py | 27 ++--------- lib/spack/spack/test/conftest.py | 27 ++--------- lib/spack/spack/test/data/sourceme_first.sh | 28 ++--------- lib/spack/spack/test/data/sourceme_parameters.sh | 28 ++--------- lib/spack/spack/test/data/sourceme_second.sh | 28 ++--------- lib/spack/spack/test/data/sourceme_unicode.sh | 28 ++--------- lib/spack/spack/test/database.py | 27 ++--------- lib/spack/spack/test/directory_layout.py | 27 ++--------- lib/spack/spack/test/environment.py | 27 ++--------- lib/spack/spack/test/flag_handlers.py | 27 ++--------- lib/spack/spack/test/git_fetch.py | 27 ++--------- lib/spack/spack/test/graph.py | 27 ++--------- lib/spack/spack/test/hg_fetch.py | 27 ++--------- lib/spack/spack/test/install.py | 27 ++--------- lib/spack/spack/test/llnl/util/file_list.py | 27 ++--------- lib/spack/spack/test/llnl/util/filesystem.py | 27 ++--------- lib/spack/spack/test/llnl/util/lang.py | 27 ++--------- lib/spack/spack/test/llnl/util/link_tree.py | 27 ++--------- lib/spack/spack/test/llnl/util/lock.py | 27 ++--------- lib/spack/spack/test/llnl/util/log.py | 27 ++--------- lib/spack/spack/test/make_executable.py | 27 ++--------- lib/spack/spack/test/mirror.py | 27 ++--------- lib/spack/spack/test/module_parsing.py | 27 ++--------- lib/spack/spack/test/modules/common.py | 27 ++--------- lib/spack/spack/test/modules/conftest.py | 27 ++--------- lib/spack/spack/test/modules/dotkit.py | 27 ++--------- lib/spack/spack/test/modules/lmod.py | 27 ++--------- lib/spack/spack/test/modules/tcl.py | 27 ++--------- lib/spack/spack/test/multimethod.py | 27 ++--------- lib/spack/spack/test/namespace_trie.py | 27 ++--------- lib/spack/spack/test/optional_deps.py | 27 ++--------- lib/spack/spack/test/package_hash.py | 27 ++--------- lib/spack/spack/test/package_sanity.py | 27 ++--------- lib/spack/spack/test/packages.py | 27 ++--------- lib/spack/spack/test/packaging.py | 27 ++--------- lib/spack/spack/test/patch.py | 27 ++--------- lib/spack/spack/test/pattern.py | 27 ++--------- lib/spack/spack/test/provider_index.py | 27 ++--------- lib/spack/spack/test/python_version.py | 27 ++--------- lib/spack/spack/test/repo.py | 27 ++--------- lib/spack/spack/test/sbang.py | 27 ++--------- lib/spack/spack/test/spack_yaml.py | 27 ++--------- lib/spack/spack/test/spec_dag.py | 27 ++--------- lib/spack/spack/test/spec_semantics.py | 27 ++--------- lib/spack/spack/test/spec_syntax.py | 27 ++--------- lib/spack/spack/test/spec_yaml.py | 27 ++--------- lib/spack/spack/test/stage.py | 27 ++--------- lib/spack/spack/test/svn_fetch.py | 27 ++--------- lib/spack/spack/test/tengine.py | 27 ++--------- lib/spack/spack/test/test_activations.py | 27 ++--------- lib/spack/spack/test/url_fetch.py | 27 ++--------- lib/spack/spack/test/url_parse.py | 27 ++--------- lib/spack/spack/test/url_substitution.py | 27 ++--------- lib/spack/spack/test/util/file_cache.py | 27 ++--------- lib/spack/spack/test/util/log_parser.py | 27 ++--------- lib/spack/spack/test/util/prefix.py | 27 ++--------- lib/spack/spack/test/util/spack_lock_wrapper.py | 27 ++--------- lib/spack/spack/test/util/spack_yaml.py | 27 ++--------- lib/spack/spack/test/util/util_string.py | 27 ++--------- lib/spack/spack/test/variant.py | 27 ++--------- lib/spack/spack/test/versions.py | 27 ++--------- lib/spack/spack/test/views.py | 27 ++--------- lib/spack/spack/test/web.py | 27 ++--------- lib/spack/spack/url.py | 27 ++--------- lib/spack/spack/util/__init__.py | 26 ++--------- lib/spack/spack/util/compression.py | 27 ++--------- lib/spack/spack/util/crypto.py | 27 ++--------- lib/spack/spack/util/debug.py | 27 ++--------- lib/spack/spack/util/editor.py | 27 ++--------- lib/spack/spack/util/environment.py | 27 ++--------- lib/spack/spack/util/executable.py | 27 ++--------- lib/spack/spack/util/file_cache.py | 27 ++--------- lib/spack/spack/util/gpg.py | 27 ++--------- lib/spack/spack/util/imp/__init__.py | 27 ++--------- lib/spack/spack/util/imp/imp_importer.py | 27 ++--------- lib/spack/spack/util/imp/importlib_importer.py | 27 ++--------- lib/spack/spack/util/lock.py | 27 ++--------- lib/spack/spack/util/log_parse.py | 27 ++--------- lib/spack/spack/util/module_cmd.py | 27 ++--------- lib/spack/spack/util/naming.py | 27 ++--------- lib/spack/spack/util/package_hash.py | 27 ++--------- lib/spack/spack/util/path.py | 27 ++--------- lib/spack/spack/util/pattern.py | 27 ++--------- lib/spack/spack/util/prefix.py | 27 ++--------- lib/spack/spack/util/spack_json.py | 27 ++--------- lib/spack/spack/util/spack_yaml.py | 27 ++--------- lib/spack/spack/util/string.py | 26 ++--------- lib/spack/spack/util/web.py | 27 ++--------- lib/spack/spack/variant.py | 27 ++--------- lib/spack/spack/version.py | 27 ++--------- share/spack/csh/pathadd.csh | 5 ++ share/spack/csh/spack.csh | 5 ++ share/spack/docker/build/common/handle-prompt.sh | 5 ++ share/spack/docker/build/common/handle-ssh.sh | 5 ++ .../docs/docker/module-file-tutorial/spack.sh | 5 ++ share/spack/qa/run-build-tests | 6 +++ share/spack/qa/run-doc-tests | 6 +++ share/spack/qa/run-flake8-tests | 6 +++ share/spack/qa/run-unit-tests | 6 +++ share/spack/qa/setup.sh | 6 +++ share/spack/setup-env.csh | 27 ++--------- share/spack/setup-env.sh | 27 ++--------- share/spack/spack-completion.bash | 27 ++--------- var/spack/repos/builtin.mock/packages/a/package.py | 27 ++--------- .../builtin.mock/packages/archive-files/package.py | 27 ++--------- var/spack/repos/builtin.mock/packages/b/package.py | 27 ++--------- .../repos/builtin.mock/packages/boost/package.py | 27 ++--------- .../builtin.mock/packages/build-error/package.py | 27 ++--------- .../packages/build-warnings/package.py | 27 ++--------- var/spack/repos/builtin.mock/packages/c/package.py | 27 ++--------- .../builtin.mock/packages/callpath/package.py | 27 ++--------- .../repos/builtin.mock/packages/canfail/package.py | 27 ++--------- .../builtin.mock/packages/cmake-client/package.py | 27 ++--------- .../repos/builtin.mock/packages/cmake/package.py | 27 ++--------- .../packages/conflict-parent/package.py | 27 ++--------- .../builtin.mock/packages/conflict/package.py | 27 ++--------- .../packages/conflicting-dependent/package.py | 27 ++--------- .../packages/dependency-install/package.py | 27 ++--------- .../packages/dependent-install/package.py | 27 ++--------- .../builtin.mock/packages/develop-test/package.py | 27 ++--------- .../builtin.mock/packages/direct-mpich/package.py | 27 ++--------- .../packages/dt-diamond-bottom/package.py | 27 ++--------- .../packages/dt-diamond-left/package.py | 27 ++--------- .../packages/dt-diamond-right/package.py | 27 ++--------- .../builtin.mock/packages/dt-diamond/package.py | 27 ++--------- .../builtin.mock/packages/dtbuild1/package.py | 27 ++--------- .../builtin.mock/packages/dtbuild2/package.py | 27 ++--------- .../builtin.mock/packages/dtbuild3/package.py | 27 ++--------- .../repos/builtin.mock/packages/dtlink1/package.py | 27 ++--------- .../repos/builtin.mock/packages/dtlink2/package.py | 27 ++--------- .../repos/builtin.mock/packages/dtlink3/package.py | 27 ++--------- .../repos/builtin.mock/packages/dtlink4/package.py | 27 ++--------- .../repos/builtin.mock/packages/dtlink5/package.py | 27 ++--------- .../repos/builtin.mock/packages/dtrun1/package.py | 27 ++--------- .../repos/builtin.mock/packages/dtrun2/package.py | 27 ++--------- .../repos/builtin.mock/packages/dtrun3/package.py | 27 ++--------- .../repos/builtin.mock/packages/dttop/package.py | 27 ++--------- .../repos/builtin.mock/packages/dtuse/package.py | 27 ++--------- .../repos/builtin.mock/packages/dyninst/package.py | 27 ++--------- var/spack/repos/builtin.mock/packages/e/package.py | 27 ++--------- .../builtin.mock/packages/extendee/package.py | 27 ++--------- .../builtin.mock/packages/extension1/package.py | 27 ++--------- .../builtin.mock/packages/extension2/package.py | 27 ++--------- .../packages/externalmodule/package.py | 28 ++--------- .../packages/externalprereq/package.py | 27 ++--------- .../builtin.mock/packages/externaltest/package.py | 27 ++--------- .../builtin.mock/packages/externaltool/package.py | 27 ++--------- .../packages/externalvirtual/package.py | 27 ++--------- .../builtin.mock/packages/failing-build/package.py | 27 ++--------- .../repos/builtin.mock/packages/fake/package.py | 27 ++--------- .../repos/builtin.mock/packages/flake8/package.py | 27 ++--------- .../packages/git-svn-top-level/package.py | 27 ++--------- .../builtin.mock/packages/git-test/package.py | 27 ++--------- .../builtin.mock/packages/git-top-level/package.py | 27 ++--------- .../packages/git-url-svn-top-level/package.py | 27 ++--------- .../packages/git-url-top-level/package.py | 27 ++--------- .../builtin.mock/packages/hash-test1/package.py | 5 ++ .../builtin.mock/packages/hash-test2/package.py | 5 ++ .../repos/builtin.mock/packages/hg-test/package.py | 27 ++--------- .../builtin.mock/packages/hg-top-level/package.py | 27 ++--------- .../repos/builtin.mock/packages/hypre/package.py | 27 ++--------- .../packages/indirect-mpich/package.py | 27 ++--------- .../builtin.mock/packages/libdwarf/package.py | 27 ++--------- .../repos/builtin.mock/packages/libelf/package.py | 27 ++--------- .../builtin.mock/packages/mixedversions/package.py | 27 ++--------- .../packages/module-path-separator/package.py | 27 ++--------- .../repos/builtin.mock/packages/mpich/package.py | 27 ++--------- .../repos/builtin.mock/packages/mpich2/package.py | 27 ++--------- .../builtin.mock/packages/mpileaks/package.py | 27 ++--------- .../packages/multi-provider-mpi/package.py | 27 ++--------- .../packages/multimethod-base/package.py | 27 ++--------- .../builtin.mock/packages/multimethod/package.py | 27 ++--------- .../packages/multivalue_variant/package.py | 27 ++--------- .../builtin.mock/packages/netlib-blas/package.py | 27 ++--------- .../builtin.mock/packages/netlib-lapack/package.py | 27 ++--------- .../packages/openblas-with-lapack/package.py | 27 ++--------- .../builtin.mock/packages/openblas/package.py | 27 ++--------- .../packages/optional-dep-test-2/package.py | 27 ++--------- .../packages/optional-dep-test-3/package.py | 27 ++--------- .../packages/optional-dep-test/package.py | 27 ++--------- .../builtin.mock/packages/othervirtual/package.py | 27 ++--------- .../packages/override-context-templates/package.py | 27 ++--------- .../packages/override-module-templates/package.py | 27 ++--------- .../packages/patch-a-dependency/package.py | 27 ++--------- .../packages/patch-several-dependencies/package.py | 27 ++--------- .../repos/builtin.mock/packages/patch/package.py | 27 ++--------- .../builtin.mock/packages/patchelf/package.py | 27 ++--------- .../packages/printing-package/package.py | 27 ++--------- .../repos/builtin.mock/packages/python/package.py | 27 ++--------- .../repos/builtin.mock/packages/raiser/package.py | 27 ++--------- .../packages/simple-inheritance/package.py | 5 ++ .../singlevalue-variant-dependent/package.py | 27 ++--------- .../builtin.mock/packages/svn-test/package.py | 27 ++--------- .../builtin.mock/packages/svn-top-level/package.py | 27 ++--------- .../trivial-install-test-package/package.py | 27 ++--------- .../builtin.mock/packages/url-list-test/package.py | 27 ++--------- .../url-only-override-with-gaps/package.py | 27 ++--------- .../packages/url-only-override/package.py | 27 ++--------- .../builtin.mock/packages/url-test/package.py | 27 ++--------- .../builtin.mock/packages/url_override/package.py | 27 ++--------- .../repos/builtin.mock/packages/zmpi/package.py | 27 ++--------- var/spack/repos/builtin/packages/abinit/package.py | 27 ++--------- var/spack/repos/builtin/packages/abyss/package.py | 27 ++--------- var/spack/repos/builtin/packages/accfft/package.py | 27 ++--------- var/spack/repos/builtin/packages/ack/package.py | 27 ++--------- .../builtin/packages/activeharmony/package.py | 27 ++--------- .../repos/builtin/packages/adept-utils/package.py | 27 ++--------- var/spack/repos/builtin/packages/adios/package.py | 27 ++--------- var/spack/repos/builtin/packages/adios2/package.py | 27 ++--------- var/spack/repos/builtin/packages/adlbx/package.py | 27 ++--------- var/spack/repos/builtin/packages/adol-c/package.py | 27 ++--------- var/spack/repos/builtin/packages/aegean/package.py | 27 ++--------- var/spack/repos/builtin/packages/aida/package.py | 27 ++--------- var/spack/repos/builtin/packages/albany/package.py | 27 ++--------- var/spack/repos/builtin/packages/albert/package.py | 27 ++--------- var/spack/repos/builtin/packages/alglib/package.py | 27 ++--------- .../builtin/packages/allinea-forge/package.py | 27 ++--------- .../builtin/packages/allinea-reports/package.py | 27 ++--------- .../repos/builtin/packages/allpaths-lg/package.py | 27 ++--------- .../repos/builtin/packages/alquimia/package.py | 27 ++--------- .../repos/builtin/packages/alsa-lib/package.py | 27 ++--------- var/spack/repos/builtin/packages/amg/package.py | 27 ++--------- .../repos/builtin/packages/amg2013/package.py | 27 ++--------- var/spack/repos/builtin/packages/amp/package.py | 27 ++--------- .../builtin/packages/ampliconnoise/package.py | 27 ++--------- var/spack/repos/builtin/packages/amrex/package.py | 27 ++--------- var/spack/repos/builtin/packages/amrvis/package.py | 26 ++--------- var/spack/repos/builtin/packages/andi/package.py | 27 ++--------- var/spack/repos/builtin/packages/angsd/package.py | 27 ++--------- var/spack/repos/builtin/packages/ant/package.py | 27 ++--------- var/spack/repos/builtin/packages/antlr/package.py | 27 ++--------- var/spack/repos/builtin/packages/ants/package.py | 27 ++--------- var/spack/repos/builtin/packages/ape/package.py | 27 ++--------- .../packages/aperture-photometry/package.py | 27 ++--------- var/spack/repos/builtin/packages/apex/package.py | 27 ++--------- .../builtin/packages/apple-libunwind/package.py | 27 ++--------- .../repos/builtin/packages/applewmproto/package.py | 27 ++--------- var/spack/repos/builtin/packages/appres/package.py | 27 ++--------- .../repos/builtin/packages/apr-util/package.py | 27 ++--------- var/spack/repos/builtin/packages/apr/package.py | 27 ++--------- .../repos/builtin/packages/aragorn/package.py | 27 ++--------- var/spack/repos/builtin/packages/archer/package.py | 27 ++--------- .../repos/builtin/packages/argobots/package.py | 27 ++--------- .../builtin/packages/argp-standalone/package.py | 27 ++--------- .../repos/builtin/packages/argtable/package.py | 27 ++--------- .../repos/builtin/packages/arlecore/package.py | 27 ++--------- .../repos/builtin/packages/armadillo/package.py | 27 ++--------- .../repos/builtin/packages/arpack-ng/package.py | 27 ++--------- var/spack/repos/builtin/packages/arrow/package.py | 27 ++--------- var/spack/repos/builtin/packages/ascent/package.py | 27 ++--------- .../repos/builtin/packages/asciidoc/package.py | 27 ++--------- var/spack/repos/builtin/packages/aspa/package.py | 27 ++--------- var/spack/repos/builtin/packages/aspcud/package.py | 27 ++--------- var/spack/repos/builtin/packages/aspect/package.py | 27 ++--------- var/spack/repos/builtin/packages/aspell/package.py | 27 ++--------- .../repos/builtin/packages/aspell6-de/package.py | 27 ++--------- .../repos/builtin/packages/aspell6-en/package.py | 27 ++--------- .../repos/builtin/packages/aspell6-es/package.py | 27 ++--------- .../repos/builtin/packages/aspera-cli/package.py | 27 ++--------- var/spack/repos/builtin/packages/assimp/package.py | 27 ++--------- var/spack/repos/builtin/packages/astra/package.py | 27 ++--------- var/spack/repos/builtin/packages/astral/package.py | 27 ++--------- var/spack/repos/builtin/packages/astyle/package.py | 27 ++--------- .../repos/builtin/packages/at-spi2-atk/package.py | 27 ++--------- .../repos/builtin/packages/at-spi2-core/package.py | 27 ++--------- var/spack/repos/builtin/packages/atk/package.py | 27 ++--------- var/spack/repos/builtin/packages/atlas/package.py | 27 ++--------- .../repos/builtin/packages/atom-dft/package.py | 27 ++--------- .../repos/builtin/packages/atompaw/package.py | 27 ++--------- var/spack/repos/builtin/packages/atop/package.py | 27 ++--------- .../repos/builtin/packages/augustus/package.py | 27 ++--------- .../repos/builtin/packages/autoconf/package.py | 27 ++--------- .../builtin/packages/autodock-vina/package.py | 27 ++--------- .../repos/builtin/packages/autofact/package.py | 27 ++--------- .../repos/builtin/packages/autogen/package.py | 27 ++--------- .../repos/builtin/packages/automaded/package.py | 27 ++--------- .../repos/builtin/packages/automake/package.py | 27 ++--------- var/spack/repos/builtin/packages/axel/package.py | 27 ++--------- var/spack/repos/builtin/packages/axl/package.py | 27 ++--------- var/spack/repos/builtin/packages/bamdst/package.py | 27 ++--------- .../repos/builtin/packages/bamtools/package.py | 27 ++--------- .../repos/builtin/packages/bamutil/package.py | 27 ++--------- .../repos/builtin/packages/barrnap/package.py | 27 ++--------- .../builtin/packages/bash-completion/package.py | 27 ++--------- var/spack/repos/builtin/packages/bash/package.py | 27 ++--------- var/spack/repos/builtin/packages/bats/package.py | 27 ++--------- var/spack/repos/builtin/packages/bazel/package.py | 27 ++--------- var/spack/repos/builtin/packages/bbcp/package.py | 27 ++--------- var/spack/repos/builtin/packages/bbmap/package.py | 27 ++--------- var/spack/repos/builtin/packages/bc/package.py | 27 ++--------- .../repos/builtin/packages/bcftools/package.py | 27 ++--------- .../repos/builtin/packages/bcl2fastq2/package.py | 27 ++--------- .../repos/builtin/packages/bdftopcf/package.py | 27 ++--------- var/spack/repos/builtin/packages/bdw-gc/package.py | 27 ++--------- var/spack/repos/builtin/packages/bear/package.py | 27 ++--------- var/spack/repos/builtin/packages/beast1/package.py | 27 ++--------- var/spack/repos/builtin/packages/beast2/package.py | 27 ++--------- var/spack/repos/builtin/packages/bedops/package.py | 27 ++--------- .../repos/builtin/packages/bedtools2/package.py | 27 ++--------- .../repos/builtin/packages/beforelight/package.py | 27 ++--------- .../repos/builtin/packages/benchmark/package.py | 27 ++--------- .../repos/builtin/packages/berkeley-db/package.py | 27 ++--------- .../repos/builtin/packages/bertini/package.py | 27 ++--------- .../repos/builtin/packages/bib2xhtml/package.py | 27 ++--------- .../repos/builtin/packages/bigreqsproto/package.py | 27 ++--------- .../repos/builtin/packages/binutils/package.py | 27 ++--------- var/spack/repos/builtin/packages/bioawk/package.py | 27 ++--------- .../repos/builtin/packages/biopieces/package.py | 27 ++--------- .../repos/builtin/packages/bismark/package.py | 27 ++--------- var/spack/repos/builtin/packages/bison/package.py | 27 ++--------- var/spack/repos/builtin/packages/bitmap/package.py | 27 ++--------- .../repos/builtin/packages/blasr-libcpp/package.py | 27 ++--------- var/spack/repos/builtin/packages/blasr/package.py | 27 ++--------- .../repos/builtin/packages/blast-plus/package.py | 27 ++--------- var/spack/repos/builtin/packages/blat/package.py | 27 ++--------- var/spack/repos/builtin/packages/blaze/package.py | 27 ++--------- var/spack/repos/builtin/packages/blis/package.py | 27 ++--------- var/spack/repos/builtin/packages/bliss/package.py | 27 ++--------- var/spack/repos/builtin/packages/blitz/package.py | 27 ++--------- var/spack/repos/builtin/packages/bmake/package.py | 27 ++--------- var/spack/repos/builtin/packages/bml/package.py | 27 ++--------- .../repos/builtin/packages/bohrium/package.py | 27 ++--------- var/spack/repos/builtin/packages/bolt/package.py | 27 ++--------- .../repos/builtin/packages/bookleaf-cpp/package.py | 27 ++--------- var/spack/repos/builtin/packages/boost/package.py | 27 ++--------- .../packages/boostmplcartesianproduct/package.py | 27 ++--------- var/spack/repos/builtin/packages/bowtie/package.py | 27 ++--------- .../repos/builtin/packages/bowtie2/package.py | 27 ++--------- var/spack/repos/builtin/packages/boxlib/package.py | 27 ++--------- .../repos/builtin/packages/bpp-core/package.py | 27 ++--------- .../repos/builtin/packages/bpp-phyl/package.py | 27 ++--------- .../repos/builtin/packages/bpp-seq/package.py | 27 ++--------- .../repos/builtin/packages/bpp-suite/package.py | 27 ++--------- .../repos/builtin/packages/bracken/package.py | 27 ++--------- var/spack/repos/builtin/packages/braker/package.py | 27 ++--------- .../repos/builtin/packages/branson/package.py | 27 ++--------- .../repos/builtin/packages/breakdancer/package.py | 27 ++--------- var/spack/repos/builtin/packages/breseq/package.py | 27 ++--------- .../repos/builtin/packages/brigand/package.py | 27 ++--------- .../repos/builtin/packages/bsseeker2/package.py | 27 ++--------- var/spack/repos/builtin/packages/bucky/package.py | 27 ++--------- .../repos/builtin/packages/bumpversion/package.py | 27 ++--------- var/spack/repos/builtin/packages/busco/package.py | 27 ++--------- var/spack/repos/builtin/packages/butter/package.py | 27 ++--------- var/spack/repos/builtin/packages/bwa/package.py | 27 ++--------- var/spack/repos/builtin/packages/bwtool/package.py | 27 ++--------- var/spack/repos/builtin/packages/byobu/package.py | 27 ++--------- var/spack/repos/builtin/packages/bzip2/package.py | 27 ++--------- .../repos/builtin/packages/c-blosc/package.py | 27 ++--------- var/spack/repos/builtin/packages/c-lime/package.py | 27 ++--------- var/spack/repos/builtin/packages/cabana/package.py | 26 ++--------- var/spack/repos/builtin/packages/caffe/package.py | 27 ++--------- var/spack/repos/builtin/packages/cairo/package.py | 27 ++--------- .../repos/builtin/packages/cairomm/package.py | 27 ++--------- .../repos/builtin/packages/caliper/package.py | 27 ++--------- .../repos/builtin/packages/callpath/package.py | 27 ++--------- .../repos/builtin/packages/camellia/package.py | 27 ++--------- .../builtin/packages/candle-benchmarks/package.py | 27 ++--------- .../repos/builtin/packages/cantera/package.py | 27 ++--------- var/spack/repos/builtin/packages/canu/package.py | 27 ++--------- var/spack/repos/builtin/packages/cap3/package.py | 27 ++--------- var/spack/repos/builtin/packages/cares/package.py | 27 ++--------- var/spack/repos/builtin/packages/cask/package.py | 27 ++--------- var/spack/repos/builtin/packages/casper/package.py | 27 ++--------- .../repos/builtin/packages/catalyst/package.py | 30 ++---------- var/spack/repos/builtin/packages/catch/package.py | 27 ++--------- var/spack/repos/builtin/packages/cbench/package.py | 27 ++--------- var/spack/repos/builtin/packages/cblas/package.py | 27 ++--------- .../builtin/packages/cbtf-argonavis-gui/package.py | 43 ++--------------- .../builtin/packages/cbtf-argonavis/package.py | 43 ++--------------- .../repos/builtin/packages/cbtf-krell/package.py | 43 ++--------------- .../repos/builtin/packages/cbtf-lanl/package.py | 43 ++--------------- var/spack/repos/builtin/packages/cbtf/package.py | 43 ++--------------- var/spack/repos/builtin/packages/ccache/package.py | 27 ++--------- .../repos/builtin/packages/cctools/package.py | 27 ++--------- .../repos/builtin/packages/cdbfasta/package.py | 27 ++--------- var/spack/repos/builtin/packages/cdd/package.py | 27 ++--------- var/spack/repos/builtin/packages/cddlib/package.py | 27 ++--------- var/spack/repos/builtin/packages/cdhit/package.py | 27 ++--------- var/spack/repos/builtin/packages/cdo/package.py | 27 ++--------- var/spack/repos/builtin/packages/ceed/package.py | 27 ++--------- var/spack/repos/builtin/packages/cereal/package.py | 27 ++--------- .../repos/builtin/packages/ceres-solver/package.py | 26 ++--------- .../repos/builtin/packages/cfitsio/package.py | 27 ++--------- var/spack/repos/builtin/packages/cgal/package.py | 27 ++--------- var/spack/repos/builtin/packages/cgm/package.py | 27 ++--------- var/spack/repos/builtin/packages/cgns/package.py | 27 ++--------- .../repos/builtin/packages/channelflow/package.py | 27 ++--------- .../repos/builtin/packages/charliecloud/package.py | 27 ++--------- .../repos/builtin/packages/charmpp/package.py | 27 ++--------- .../repos/builtin/packages/chatterbug/package.py | 27 ++--------- var/spack/repos/builtin/packages/check/package.py | 27 ++--------- .../repos/builtin/packages/chlorop/package.py | 27 ++--------- var/spack/repos/builtin/packages/chombo/package.py | 27 ++--------- var/spack/repos/builtin/packages/cistem/package.py | 27 ++--------- .../repos/builtin/packages/cityhash/package.py | 27 ++--------- var/spack/repos/builtin/packages/clamr/package.py | 27 ++--------- .../repos/builtin/packages/clapack/package.py | 27 ++--------- var/spack/repos/builtin/packages/claw/package.py | 5 ++ .../repos/builtin/packages/cleaveland4/package.py | 27 ++--------- .../repos/builtin/packages/cleverleaf/package.py | 27 ++--------- var/spack/repos/builtin/packages/clfft/package.py | 27 ++--------- var/spack/repos/builtin/packages/clhep/package.py | 27 ++--------- var/spack/repos/builtin/packages/clingo/package.py | 27 ++--------- var/spack/repos/builtin/packages/cloc/package.py | 27 ++--------- var/spack/repos/builtin/packages/cloog/package.py | 27 ++--------- .../repos/builtin/packages/cloverleaf/package.py | 27 ++--------- .../repos/builtin/packages/cloverleaf3d/package.py | 27 ++--------- .../repos/builtin/packages/clustalo/package.py | 27 ++--------- .../repos/builtin/packages/clustalw/package.py | 27 ++--------- var/spack/repos/builtin/packages/cmake/package.py | 27 ++--------- var/spack/repos/builtin/packages/cmocka/package.py | 27 ++--------- var/spack/repos/builtin/packages/cmor/package.py | 27 ++--------- var/spack/repos/builtin/packages/cnmem/package.py | 27 ++--------- var/spack/repos/builtin/packages/cnpy/package.py | 27 ++--------- var/spack/repos/builtin/packages/cntk/package.py | 27 ++--------- .../repos/builtin/packages/cntk1bitsgd/package.py | 27 ++--------- .../builtin/packages/codar-cheetah/package.py | 27 ++--------- var/spack/repos/builtin/packages/codes/package.py | 27 ++--------- var/spack/repos/builtin/packages/coevp/package.py | 27 ++--------- var/spack/repos/builtin/packages/cohmm/package.py | 27 ++--------- .../repos/builtin/packages/coinhsl/package.py | 27 ++--------- var/spack/repos/builtin/packages/colm/package.py | 27 ++--------- .../repos/builtin/packages/colordiff/package.py | 27 ++--------- var/spack/repos/builtin/packages/comd/package.py | 27 ++--------- .../repos/builtin/packages/commons-lang/package.py | 27 ++--------- .../builtin/packages/commons-lang3/package.py | 27 ++--------- .../builtin/packages/commons-logging/package.py | 27 ++--------- var/spack/repos/builtin/packages/compiz/package.py | 27 ++--------- .../builtin/packages/compositeproto/package.py | 27 ++--------- .../repos/builtin/packages/conduit/package.py | 27 ++--------- .../repos/builtin/packages/constype/package.py | 27 ++--------- .../repos/builtin/packages/converge/package.py | 27 ++--------- .../repos/builtin/packages/coreutils/package.py | 27 ++--------- var/spack/repos/builtin/packages/corset/package.py | 27 ++--------- .../repos/builtin/packages/cosmomc/package.py | 27 ++--------- var/spack/repos/builtin/packages/cosp2/package.py | 27 ++--------- var/spack/repos/builtin/packages/cp2k/package.py | 27 ++--------- var/spack/repos/builtin/packages/cppad/package.py | 27 ++--------- .../repos/builtin/packages/cppcheck/package.py | 27 ++--------- var/spack/repos/builtin/packages/cppgsl/package.py | 27 ++--------- .../repos/builtin/packages/cpprestsdk/package.py | 27 ++--------- .../repos/builtin/packages/cppunit/package.py | 27 ++--------- var/spack/repos/builtin/packages/cppzmq/package.py | 27 ++--------- .../repos/builtin/packages/cpu-features/package.py | 27 ++--------- .../repos/builtin/packages/cpuinfo/package.py | 27 ++--------- var/spack/repos/builtin/packages/cram/package.py | 27 ++--------- .../repos/builtin/packages/cryptopp/package.py | 27 ++--------- var/spack/repos/builtin/packages/cscope/package.py | 27 ++--------- var/spack/repos/builtin/packages/csdp/package.py | 27 ++--------- .../repos/builtin/packages/ctffind/package.py | 27 ++--------- var/spack/repos/builtin/packages/cub/package.py | 27 ++--------- var/spack/repos/builtin/packages/cube/package.py | 27 ++--------- .../repos/builtin/packages/cubelib/package.py | 27 ++--------- var/spack/repos/builtin/packages/cubew/package.py | 27 ++--------- .../repos/builtin/packages/cuda-memtest/package.py | 27 ++--------- var/spack/repos/builtin/packages/cuda/package.py | 27 ++--------- var/spack/repos/builtin/packages/cudnn/package.py | 27 ++--------- .../repos/builtin/packages/cufflinks/package.py | 27 ++--------- var/spack/repos/builtin/packages/cups/package.py | 27 ++--------- var/spack/repos/builtin/packages/curl/package.py | 27 ++--------- var/spack/repos/builtin/packages/cvs/package.py | 27 ++--------- var/spack/repos/builtin/packages/czmq/package.py | 27 ++--------- var/spack/repos/builtin/packages/dakota/package.py | 27 ++--------- .../repos/builtin/packages/daligner/package.py | 27 ++--------- .../repos/builtin/packages/damageproto/package.py | 27 ++--------- .../repos/builtin/packages/damselfly/package.py | 27 ++--------- .../builtin/packages/darshan-runtime/package.py | 27 ++--------- .../repos/builtin/packages/darshan-util/package.py | 27 ++--------- var/spack/repos/builtin/packages/dash/package.py | 27 ++--------- .../repos/builtin/packages/datamash/package.py | 27 ++--------- .../repos/builtin/packages/dataspaces/package.py | 27 ++--------- var/spack/repos/builtin/packages/davix/package.py | 27 ++--------- var/spack/repos/builtin/packages/dbus/package.py | 27 ++--------- .../packages/dealii-parameter-gui/package.py | 27 ++--------- var/spack/repos/builtin/packages/dealii/package.py | 27 ++--------- .../packages/deconseq-standalone/package.py | 27 ++--------- .../repos/builtin/packages/dejagnu/package.py | 27 ++--------- var/spack/repos/builtin/packages/delly2/package.py | 27 ++--------- .../repos/builtin/packages/denovogear/package.py | 27 ++--------- var/spack/repos/builtin/packages/dia/package.py | 27 ++--------- .../repos/builtin/packages/dialign-tx/package.py | 27 ++--------- .../repos/builtin/packages/diamond/package.py | 27 ++--------- .../repos/builtin/packages/diffsplice/package.py | 27 ++--------- .../repos/builtin/packages/diffutils/package.py | 27 ++--------- var/spack/repos/builtin/packages/direnv/package.py | 27 ++--------- .../repos/builtin/packages/discovar/package.py | 27 ++--------- .../builtin/packages/discovardenovo/package.py | 27 ++--------- var/spack/repos/builtin/packages/dislin/package.py | 27 ++--------- var/spack/repos/builtin/packages/dlpack/package.py | 27 ++--------- var/spack/repos/builtin/packages/dmd/package.py | 27 ++--------- .../repos/builtin/packages/dmlc-core/package.py | 27 ++--------- var/spack/repos/builtin/packages/dmtcp/package.py | 27 ++--------- .../repos/builtin/packages/dmxproto/package.py | 27 ++--------- .../repos/builtin/packages/docbook-xml/package.py | 27 ++--------- .../repos/builtin/packages/docbook-xsl/package.py | 27 ++--------- .../repos/builtin/packages/dos2unix/package.py | 27 ++--------- .../builtin/packages/dotnet-core-sdk/package.py | 27 ++--------- .../builtin/packages/double-conversion/package.py | 27 ++--------- .../repos/builtin/packages/doxygen/package.py | 27 ++--------- .../repos/builtin/packages/dri2proto/package.py | 27 ++--------- .../repos/builtin/packages/dri3proto/package.py | 27 ++--------- var/spack/repos/builtin/packages/dsdp/package.py | 27 ++--------- var/spack/repos/builtin/packages/dsrc/package.py | 27 ++--------- var/spack/repos/builtin/packages/dtcmp/package.py | 27 ++--------- .../repos/builtin/packages/dyninst/package.py | 27 ++--------- .../repos/builtin/packages/ea-utils/package.py | 27 ++--------- .../repos/builtin/packages/easybuild/package.py | 25 ++-------- var/spack/repos/builtin/packages/ebms/package.py | 27 ++--------- .../repos/builtin/packages/eccodes/package.py | 27 ++--------- .../builtin/packages/eclipse-gcj-parser/package.py | 27 ++--------- .../builtin/packages/ecp-proxy-apps/package.py | 27 ++--------- var/spack/repos/builtin/packages/ed/package.py | 27 ++--------- .../repos/builtin/packages/editres/package.py | 27 ++--------- var/spack/repos/builtin/packages/eigen/package.py | 27 ++--------- .../builtin/packages/elasticsearch/package.py | 27 ++--------- .../repos/builtin/packages/elemental/package.py | 27 ++--------- .../repos/builtin/packages/elfutils/package.py | 27 ++--------- var/spack/repos/builtin/packages/elk/package.py | 27 ++--------- var/spack/repos/builtin/packages/elpa/package.py | 27 ++--------- var/spack/repos/builtin/packages/emacs/package.py | 27 ++--------- var/spack/repos/builtin/packages/ember/package.py | 27 ++--------- var/spack/repos/builtin/packages/emboss/package.py | 27 ++--------- .../repos/builtin/packages/encodings/package.py | 27 ++--------- .../repos/builtin/packages/energyplus/package.py | 26 ++--------- .../packages/environment-modules/package.py | 27 ++--------- var/spack/repos/builtin/packages/eospac/package.py | 27 ++--------- var/spack/repos/builtin/packages/er/package.py | 27 ++--------- var/spack/repos/builtin/packages/es/package.py | 27 ++--------- var/spack/repos/builtin/packages/esmf/package.py | 27 ++--------- var/spack/repos/builtin/packages/essl/package.py | 27 ++--------- .../repos/builtin/packages/ethminer/package.py | 27 ++--------- .../repos/builtin/packages/etsf-io/package.py | 27 ++--------- .../builtin/packages/everytrace-example/package.py | 27 ++--------- .../repos/builtin/packages/everytrace/package.py | 27 ++--------- .../repos/builtin/packages/evieext/package.py | 27 ++--------- .../repos/builtin/packages/exabayes/package.py | 27 ++--------- .../repos/builtin/packages/examinimd/package.py | 27 ++--------- var/spack/repos/builtin/packages/exampm/package.py | 27 ++--------- var/spack/repos/builtin/packages/exasp2/package.py | 27 ++--------- .../repos/builtin/packages/exmcutils/package.py | 27 ++--------- .../repos/builtin/packages/exodusii/package.py | 27 ++--------- .../repos/builtin/packages/exonerate/package.py | 27 ++--------- var/spack/repos/builtin/packages/expat/package.py | 27 ++--------- var/spack/repos/builtin/packages/expect/package.py | 27 ++--------- .../repos/builtin/packages/express/package.py | 27 ++--------- var/spack/repos/builtin/packages/extrae/package.py | 27 ++--------- .../builtin/packages/exuberant-ctags/package.py | 27 ++--------- .../repos/builtin/packages/f90cache/package.py | 27 ++--------- .../repos/builtin/packages/fabtests/package.py | 27 ++--------- var/spack/repos/builtin/packages/falcon/package.py | 27 ++--------- .../packages/fast-global-file-status/package.py | 27 ++--------- var/spack/repos/builtin/packages/fasta/package.py | 27 ++--------- .../repos/builtin/packages/fastjar/package.py | 27 ++--------- .../repos/builtin/packages/fastmath/package.py | 27 ++--------- var/spack/repos/builtin/packages/fastme/package.py | 27 ++--------- .../repos/builtin/packages/fastphase/package.py | 27 ++--------- .../repos/builtin/packages/fastq-screen/package.py | 27 ++--------- var/spack/repos/builtin/packages/fastqc/package.py | 27 ++--------- .../builtin/packages/fastqvalidator/package.py | 27 ++--------- .../repos/builtin/packages/fasttree/package.py | 27 ++--------- .../builtin/packages/fastx-toolkit/package.py | 27 ++--------- var/spack/repos/builtin/packages/fenics/package.py | 27 ++--------- var/spack/repos/builtin/packages/fermi/package.py | 27 ++--------- .../repos/builtin/packages/fermikit/package.py | 27 ++--------- .../builtin/packages/fermisciencetools/package.py | 27 ++--------- var/spack/repos/builtin/packages/ferret/package.py | 27 ++--------- var/spack/repos/builtin/packages/ffmpeg/package.py | 27 ++--------- var/spack/repos/builtin/packages/fftw/package.py | 27 ++--------- .../repos/builtin/packages/figtree/package.py | 26 ++--------- .../repos/builtin/packages/fimpute/package.py | 27 ++--------- .../repos/builtin/packages/findutils/package.py | 27 ++--------- var/spack/repos/builtin/packages/fio/package.py | 27 ++--------- var/spack/repos/builtin/packages/fish/package.py | 27 ++--------- .../repos/builtin/packages/fixesproto/package.py | 27 ++--------- var/spack/repos/builtin/packages/flac/package.py | 27 ++--------- var/spack/repos/builtin/packages/flang/package.py | 27 ++--------- var/spack/repos/builtin/packages/flann/package.py | 27 ++--------- var/spack/repos/builtin/packages/flash/package.py | 27 ++--------- .../repos/builtin/packages/flatbuffers/package.py | 27 ++--------- .../repos/builtin/packages/flecsale/package.py | 27 ++--------- var/spack/repos/builtin/packages/flecsi/package.py | 27 ++--------- var/spack/repos/builtin/packages/flex/package.py | 27 ++--------- var/spack/repos/builtin/packages/flint/package.py | 27 ++--------- var/spack/repos/builtin/packages/flit/package.py | 27 ++--------- var/spack/repos/builtin/packages/fltk/package.py | 27 ++--------- .../repos/builtin/packages/flux-core/package.py | 27 ++--------- .../repos/builtin/packages/flux-sched/package.py | 27 ++--------- .../repos/builtin/packages/fluxbox/package.py | 27 ++--------- var/spack/repos/builtin/packages/fmt/package.py | 27 ++--------- .../repos/builtin/packages/foam-extend/package.py | 29 ++---------- var/spack/repos/builtin/packages/folly/package.py | 27 ++--------- .../builtin/packages/font-adobe-100dpi/package.py | 27 ++--------- .../builtin/packages/font-adobe-75dpi/package.py | 27 ++--------- .../packages/font-adobe-utopia-100dpi/package.py | 27 ++--------- .../packages/font-adobe-utopia-75dpi/package.py | 27 ++--------- .../packages/font-adobe-utopia-type1/package.py | 27 ++--------- .../repos/builtin/packages/font-alias/package.py | 27 ++--------- .../builtin/packages/font-arabic-misc/package.py | 27 ++--------- .../builtin/packages/font-bh-100dpi/package.py | 27 ++--------- .../builtin/packages/font-bh-75dpi/package.py | 27 ++--------- .../font-bh-lucidatypewriter-100dpi/package.py | 27 ++--------- .../font-bh-lucidatypewriter-75dpi/package.py | 27 ++--------- .../repos/builtin/packages/font-bh-ttf/package.py | 27 ++--------- .../builtin/packages/font-bh-type1/package.py | 27 ++--------- .../packages/font-bitstream-100dpi/package.py | 27 ++--------- .../packages/font-bitstream-75dpi/package.py | 27 ++--------- .../packages/font-bitstream-speedo/package.py | 27 ++--------- .../packages/font-bitstream-type1/package.py | 27 ++--------- .../packages/font-cronyx-cyrillic/package.py | 27 ++--------- .../builtin/packages/font-cursor-misc/package.py | 27 ++--------- .../builtin/packages/font-daewoo-misc/package.py | 27 ++--------- .../builtin/packages/font-dec-misc/package.py | 27 ++--------- .../builtin/packages/font-ibm-type1/package.py | 27 ++--------- .../builtin/packages/font-isas-misc/package.py | 27 ++--------- .../builtin/packages/font-jis-misc/package.py | 27 ++--------- .../builtin/packages/font-micro-misc/package.py | 27 ++--------- .../builtin/packages/font-misc-cyrillic/package.py | 27 ++--------- .../builtin/packages/font-misc-ethiopic/package.py | 27 ++--------- .../builtin/packages/font-misc-meltho/package.py | 27 ++--------- .../builtin/packages/font-misc-misc/package.py | 27 ++--------- .../builtin/packages/font-mutt-misc/package.py | 27 ++--------- .../packages/font-schumacher-misc/package.py | 27 ++--------- .../packages/font-screen-cyrillic/package.py | 27 ++--------- .../builtin/packages/font-sony-misc/package.py | 27 ++--------- .../builtin/packages/font-sun-misc/package.py | 27 ++--------- .../repos/builtin/packages/font-util/package.py | 27 ++--------- .../packages/font-winitzki-cyrillic/package.py | 27 ++--------- .../builtin/packages/font-xfree86-type1/package.py | 27 ++--------- .../builtin/packages/fontcacheproto/package.py | 27 ++--------- .../repos/builtin/packages/fontconfig/package.py | 27 ++--------- .../repos/builtin/packages/fontsproto/package.py | 27 ++--------- .../repos/builtin/packages/fonttosfnt/package.py | 27 ++--------- var/spack/repos/builtin/packages/fp16/package.py | 27 ++--------- var/spack/repos/builtin/packages/fpc/package.py | 27 ++--------- var/spack/repos/builtin/packages/fr-hit/package.py | 27 ++--------- .../repos/builtin/packages/freebayes/package.py | 27 ++--------- .../repos/builtin/packages/freeglut/package.py | 27 ++--------- .../repos/builtin/packages/freetype/package.py | 27 ++--------- var/spack/repos/builtin/packages/fseq/package.py | 27 ++--------- var/spack/repos/builtin/packages/fsl/package.py | 27 ++--------- .../repos/builtin/packages/fslsfonts/package.py | 27 ++--------- .../repos/builtin/packages/fstobdf/package.py | 27 ++--------- var/spack/repos/builtin/packages/ftgl/package.py | 27 ++--------- var/spack/repos/builtin/packages/funhpc/package.py | 27 ++--------- var/spack/repos/builtin/packages/fyba/package.py | 27 ++--------- var/spack/repos/builtin/packages/gapbs/package.py | 27 ++--------- .../repos/builtin/packages/gapcloser/package.py | 27 ++--------- .../repos/builtin/packages/gapfiller/package.py | 27 ++--------- var/spack/repos/builtin/packages/gasnet/package.py | 27 ++--------- var/spack/repos/builtin/packages/gatk/package.py | 27 ++--------- .../repos/builtin/packages/gaussian/package.py | 27 ++--------- var/spack/repos/builtin/packages/gawk/package.py | 27 ++--------- .../repos/builtin/packages/gblocks/package.py | 27 ++--------- var/spack/repos/builtin/packages/gcc/package.py | 27 ++--------- .../repos/builtin/packages/gccmakedep/package.py | 27 ++--------- var/spack/repos/builtin/packages/gccxml/package.py | 24 ++-------- var/spack/repos/builtin/packages/gconf/package.py | 27 ++--------- var/spack/repos/builtin/packages/gcta/package.py | 27 ++--------- var/spack/repos/builtin/packages/gdal/package.py | 27 ++--------- var/spack/repos/builtin/packages/gdb/package.py | 27 ++--------- var/spack/repos/builtin/packages/gdbm/package.py | 27 ++--------- .../repos/builtin/packages/gdk-pixbuf/package.py | 27 ++--------- var/spack/repos/builtin/packages/gdl/package.py | 27 ++--------- var/spack/repos/builtin/packages/geant4/package.py | 27 ++--------- .../repos/builtin/packages/gearshifft/package.py | 27 ++--------- .../repos/builtin/packages/gemmlowp/package.py | 27 ++--------- .../repos/builtin/packages/genemark-et/package.py | 27 ++--------- .../builtin/packages/genomefinisher/package.py | 27 ++--------- .../repos/builtin/packages/genometools/package.py | 27 ++--------- var/spack/repos/builtin/packages/geopm/package.py | 27 ++--------- var/spack/repos/builtin/packages/geos/package.py | 27 ++--------- .../repos/builtin/packages/gettext/package.py | 27 ++--------- var/spack/repos/builtin/packages/gflags/package.py | 27 ++--------- var/spack/repos/builtin/packages/ghost/package.py | 27 ++--------- .../builtin/packages/ghostscript-fonts/package.py | 27 ++--------- .../repos/builtin/packages/ghostscript/package.py | 27 ++--------- var/spack/repos/builtin/packages/giflib/package.py | 27 ++--------- .../repos/builtin/packages/git-imerge/package.py | 27 ++--------- .../repos/builtin/packages/git-lfs/package.py | 27 ++--------- var/spack/repos/builtin/packages/git/package.py | 27 ++--------- var/spack/repos/builtin/packages/gl2ps/package.py | 27 ++--------- var/spack/repos/builtin/packages/glew/package.py | 27 ++--------- .../repos/builtin/packages/glfmultiples/package.py | 27 ++--------- var/spack/repos/builtin/packages/glib/package.py | 27 ++--------- var/spack/repos/builtin/packages/glibmm/package.py | 27 ++--------- .../repos/builtin/packages/glimmer/package.py | 27 ++--------- var/spack/repos/builtin/packages/glm/package.py | 27 ++--------- var/spack/repos/builtin/packages/global/package.py | 27 ++--------- .../repos/builtin/packages/globalarrays/package.py | 27 ++--------- .../builtin/packages/globus-toolkit/package.py | 27 ++--------- var/spack/repos/builtin/packages/glog/package.py | 27 ++--------- var/spack/repos/builtin/packages/gloo/package.py | 27 ++--------- var/spack/repos/builtin/packages/glpk/package.py | 27 ++--------- .../repos/builtin/packages/glproto/package.py | 27 ++--------- var/spack/repos/builtin/packages/glvis/package.py | 27 ++--------- var/spack/repos/builtin/packages/gmake/package.py | 27 ++--------- .../repos/builtin/packages/gmap-gsnap/package.py | 27 ++--------- var/spack/repos/builtin/packages/gmime/package.py | 27 ++--------- var/spack/repos/builtin/packages/gmodel/package.py | 27 ++--------- var/spack/repos/builtin/packages/gmp/package.py | 27 ++--------- var/spack/repos/builtin/packages/gmsh/package.py | 27 ++--------- var/spack/repos/builtin/packages/gnat/package.py | 27 ++--------- .../repos/builtin/packages/gnu-prolog/package.py | 27 ++--------- var/spack/repos/builtin/packages/gnupg/package.py | 27 ++--------- .../repos/builtin/packages/gnuplot/package.py | 27 ++--------- var/spack/repos/builtin/packages/gnutls/package.py | 27 ++--------- .../repos/builtin/packages/go-bootstrap/package.py | 27 ++--------- var/spack/repos/builtin/packages/go/package.py | 27 ++--------- .../packages/gobject-introspection/package.py | 27 ++--------- .../repos/builtin/packages/googletest/package.py | 27 ++--------- var/spack/repos/builtin/packages/gotcha/package.py | 27 ++--------- var/spack/repos/builtin/packages/gource/package.py | 27 ++--------- var/spack/repos/builtin/packages/gperf/package.py | 27 ++--------- .../repos/builtin/packages/gperftools/package.py | 27 ++--------- .../repos/builtin/packages/gplates/package.py | 27 ++--------- .../repos/builtin/packages/grackle/package.py | 27 ++--------- var/spack/repos/builtin/packages/gradle/package.py | 27 ++--------- var/spack/repos/builtin/packages/grandr/package.py | 27 ++--------- .../repos/builtin/packages/graph500/package.py | 27 ++--------- .../builtin/packages/graphicsmagick/package.py | 27 ++--------- .../repos/builtin/packages/graphlib/package.py | 27 ++--------- .../repos/builtin/packages/graphmap/package.py | 27 ++--------- .../repos/builtin/packages/graphviz/package.py | 27 ++--------- var/spack/repos/builtin/packages/grass/package.py | 27 ++--------- .../repos/builtin/packages/grib-api/package.py | 27 ++--------- .../repos/builtin/packages/grnboost/package.py | 27 ++--------- var/spack/repos/builtin/packages/groff/package.py | 27 ++--------- .../repos/builtin/packages/gromacs/package.py | 27 ++--------- var/spack/repos/builtin/packages/gsl/package.py | 27 ++--------- var/spack/repos/builtin/packages/gslib/package.py | 27 ++--------- var/spack/repos/builtin/packages/gtkmm/package.py | 27 ++--------- .../repos/builtin/packages/gtkorvo-atl/package.py | 27 ++--------- .../builtin/packages/gtkorvo-cercs-env/package.py | 27 ++--------- .../repos/builtin/packages/gtkorvo-dill/package.py | 27 ++--------- .../repos/builtin/packages/gtkorvo-enet/package.py | 27 ++--------- .../repos/builtin/packages/gtkplus/package.py | 27 ++--------- var/spack/repos/builtin/packages/gts/package.py | 27 ++--------- .../repos/builtin/packages/guidance/package.py | 27 ++--------- var/spack/repos/builtin/packages/guile/package.py | 27 ++--------- var/spack/repos/builtin/packages/gurobi/package.py | 27 ++--------- var/spack/repos/builtin/packages/h5hut/package.py | 27 ++--------- var/spack/repos/builtin/packages/h5part/package.py | 27 ++--------- .../repos/builtin/packages/h5utils/package.py | 27 ++--------- .../repos/builtin/packages/h5z-zfp/package.py | 27 ++--------- .../repos/builtin/packages/hacckernels/package.py | 27 ++--------- var/spack/repos/builtin/packages/hadoop/package.py | 27 ++--------- var/spack/repos/builtin/packages/halc/package.py | 27 ++--------- .../repos/builtin/packages/hapcut2/package.py | 27 ++--------- var/spack/repos/builtin/packages/hapdip/package.py | 27 ++--------- .../repos/builtin/packages/haploview/package.py | 27 ++--------- .../repos/builtin/packages/harfbuzz/package.py | 27 ++--------- .../repos/builtin/packages/harminv/package.py | 27 ++--------- var/spack/repos/builtin/packages/hdf/package.py | 27 ++--------- .../repos/builtin/packages/hdf5-blosc/package.py | 27 ++--------- var/spack/repos/builtin/packages/hdf5/package.py | 27 ++--------- .../repos/builtin/packages/help2man/package.py | 27 ++--------- var/spack/repos/builtin/packages/hepmc/package.py | 27 ++--------- var/spack/repos/builtin/packages/heppdt/package.py | 27 ++--------- .../repos/builtin/packages/hic-pro/package.py | 27 ++--------- .../repos/builtin/packages/highfive/package.py | 27 ++--------- .../repos/builtin/packages/highwayhash/package.py | 27 ++--------- var/spack/repos/builtin/packages/hiop/package.py | 27 ++--------- var/spack/repos/builtin/packages/hisat2/package.py | 27 ++--------- var/spack/repos/builtin/packages/hisea/package.py | 27 ++--------- var/spack/repos/builtin/packages/hmmer/package.py | 27 ++--------- .../repos/builtin/packages/hoomd-blue/package.py | 27 ++--------- var/spack/repos/builtin/packages/hpccg/package.py | 27 ++--------- .../packages/hpctoolkit-externals/package.py | 27 ++--------- .../repos/builtin/packages/hpctoolkit/package.py | 27 ++--------- var/spack/repos/builtin/packages/hpgmg/package.py | 27 ++--------- var/spack/repos/builtin/packages/hpl/package.py | 27 ++--------- var/spack/repos/builtin/packages/hpx/package.py | 27 ++--------- var/spack/repos/builtin/packages/hpx5/package.py | 27 ++--------- var/spack/repos/builtin/packages/hsakmt/package.py | 27 ++--------- var/spack/repos/builtin/packages/hstr/package.py | 27 ++--------- var/spack/repos/builtin/packages/htop/package.py | 27 ++--------- var/spack/repos/builtin/packages/htslib/package.py | 27 ++--------- var/spack/repos/builtin/packages/httpie/package.py | 27 ++--------- var/spack/repos/builtin/packages/hub/package.py | 27 ++--------- .../repos/builtin/packages/hunspell/package.py | 27 ++--------- var/spack/repos/builtin/packages/hwloc/package.py | 27 ++--------- .../repos/builtin/packages/hybpiper/package.py | 27 ++--------- var/spack/repos/builtin/packages/hydra/package.py | 27 ++--------- .../repos/builtin/packages/hydrogen/package.py | 27 ++--------- var/spack/repos/builtin/packages/hypre/package.py | 27 ++--------- var/spack/repos/builtin/packages/i3/package.py | 27 ++--------- var/spack/repos/builtin/packages/ibmisc/package.py | 27 ++--------- .../repos/builtin/packages/iceauth/package.py | 27 ++--------- .../repos/builtin/packages/icedtea/package.py | 27 ++--------- var/spack/repos/builtin/packages/icet/package.py | 27 ++--------- var/spack/repos/builtin/packages/ico/package.py | 27 ++--------- var/spack/repos/builtin/packages/icu4c/package.py | 27 ++--------- var/spack/repos/builtin/packages/id3lib/package.py | 27 ++--------- var/spack/repos/builtin/packages/idba/package.py | 27 ++--------- var/spack/repos/builtin/packages/igraph/package.py | 27 ++--------- .../repos/builtin/packages/igvtools/package.py | 27 ++--------- .../repos/builtin/packages/ilmbase/package.py | 27 ++--------- .../repos/builtin/packages/image-magick/package.py | 27 ++--------- var/spack/repos/builtin/packages/imake/package.py | 27 ++--------- var/spack/repos/builtin/packages/imp/package.py | 27 ++--------- .../repos/builtin/packages/impute2/package.py | 27 ++--------- .../repos/builtin/packages/infernal/package.py | 27 ++--------- .../repos/builtin/packages/inputproto/package.py | 27 ++--------- .../repos/builtin/packages/intel-daal/package.py | 27 ++--------- .../builtin/packages/intel-gpu-tools/package.py | 27 ++--------- .../repos/builtin/packages/intel-ipp/package.py | 27 ++--------- .../builtin/packages/intel-mkl-dnn/package.py | 27 ++--------- .../repos/builtin/packages/intel-mkl/package.py | 27 ++--------- .../repos/builtin/packages/intel-mpi/package.py | 27 ++--------- .../packages/intel-parallel-studio/package.py | 27 ++--------- .../repos/builtin/packages/intel-tbb/package.py | 27 ++--------- .../repos/builtin/packages/intel-xed/package.py | 27 ++--------- var/spack/repos/builtin/packages/intel/package.py | 27 ++--------- .../repos/builtin/packages/intltool/package.py | 27 ++--------- var/spack/repos/builtin/packages/ior/package.py | 27 ++--------- var/spack/repos/builtin/packages/iozone/package.py | 27 ++--------- var/spack/repos/builtin/packages/iperf2/package.py | 27 ++--------- var/spack/repos/builtin/packages/iperf3/package.py | 27 ++--------- var/spack/repos/builtin/packages/ipopt/package.py | 27 ++--------- .../repos/builtin/packages/isaac-server/package.py | 27 ++--------- var/spack/repos/builtin/packages/isaac/package.py | 27 ++--------- var/spack/repos/builtin/packages/isl/package.py | 27 ++--------- .../repos/builtin/packages/itstool/package.py | 27 ++--------- var/spack/repos/builtin/packages/itsx/package.py | 27 ++--------- .../repos/builtin/packages/jackcess/package.py | 27 ++--------- var/spack/repos/builtin/packages/jags/package.py | 27 ++--------- .../repos/builtin/packages/jansson/package.py | 27 ++--------- var/spack/repos/builtin/packages/jasper/package.py | 27 ++--------- .../repos/builtin/packages/jbigkit/package.py | 27 ++--------- .../repos/builtin/packages/jchronoss/package.py | 27 ++--------- var/spack/repos/builtin/packages/jdk/package.py | 27 ++--------- .../repos/builtin/packages/jellyfish/package.py | 27 ++--------- .../repos/builtin/packages/jemalloc/package.py | 27 ++--------- var/spack/repos/builtin/packages/jmol/package.py | 27 ++--------- var/spack/repos/builtin/packages/jq/package.py | 27 ++--------- var/spack/repos/builtin/packages/json-c/package.py | 27 ++--------- .../repos/builtin/packages/json-cwx/package.py | 27 ++--------- .../repos/builtin/packages/json-glib/package.py | 27 ++--------- .../repos/builtin/packages/jsoncpp/package.py | 27 ++--------- var/spack/repos/builtin/packages/judy/package.py | 27 ++--------- var/spack/repos/builtin/packages/julia/package.py | 27 ++--------- var/spack/repos/builtin/packages/k8/package.py | 27 ++--------- var/spack/repos/builtin/packages/kahip/package.py | 28 ++--------- var/spack/repos/builtin/packages/kaiju/package.py | 27 ++--------- .../builtin/packages/kaks-calculator/package.py | 27 ++--------- var/spack/repos/builtin/packages/kaldi/package.py | 27 ++--------- .../repos/builtin/packages/kallisto/package.py | 27 ++--------- .../repos/builtin/packages/kbproto/package.py | 27 ++--------- var/spack/repos/builtin/packages/kdiff3/package.py | 27 ++--------- var/spack/repos/builtin/packages/kealib/package.py | 27 ++--------- .../repos/builtin/packages/kentutils/package.py | 27 ++--------- var/spack/repos/builtin/packages/kibana/package.py | 27 ++--------- .../repos/builtin/packages/kim-api/package.py | 27 ++--------- .../repos/builtin/packages/kmergenie/package.py | 27 ++--------- var/spack/repos/builtin/packages/kokkos/package.py | 27 ++--------- var/spack/repos/builtin/packages/kraken/package.py | 27 ++--------- var/spack/repos/builtin/packages/krb5/package.py | 27 ++--------- var/spack/repos/builtin/packages/krims/package.py | 27 ++--------- var/spack/repos/builtin/packages/kripke/package.py | 27 ++--------- .../repos/builtin/packages/kvasir-mpl/package.py | 27 ++--------- var/spack/repos/builtin/packages/kvtree/package.py | 27 ++--------- var/spack/repos/builtin/packages/laghos/package.py | 27 ++--------- var/spack/repos/builtin/packages/lammps/package.py | 27 ++--------- var/spack/repos/builtin/packages/last/package.py | 27 ++--------- var/spack/repos/builtin/packages/latte/package.py | 27 ++--------- .../repos/builtin/packages/launchmon/package.py | 27 ++--------- .../repos/builtin/packages/lazyten/package.py | 27 ++--------- var/spack/repos/builtin/packages/lbann/package.py | 27 ++--------- .../repos/builtin/packages/lbxproxy/package.py | 27 ++--------- var/spack/repos/builtin/packages/lcals/package.py | 27 ++--------- var/spack/repos/builtin/packages/lcms/package.py | 27 ++--------- .../builtin/packages/ldc-bootstrap/package.py | 27 ++--------- var/spack/repos/builtin/packages/ldc/package.py | 27 ++--------- var/spack/repos/builtin/packages/legion/package.py | 27 ++--------- .../repos/builtin/packages/leveldb/package.py | 27 ++--------- var/spack/repos/builtin/packages/lftp/package.py | 27 ++--------- var/spack/repos/builtin/packages/libaec/package.py | 27 ++--------- var/spack/repos/builtin/packages/libaio/package.py | 27 ++--------- .../repos/builtin/packages/libapplewm/package.py | 27 ++--------- .../repos/builtin/packages/libarchive/package.py | 27 ++--------- .../repos/builtin/packages/libassuan/package.py | 27 ++--------- .../builtin/packages/libatomic-ops/package.py | 27 ++--------- .../repos/builtin/packages/libbeagle/package.py | 27 ++--------- .../repos/builtin/packages/libbeato/package.py | 27 ++--------- var/spack/repos/builtin/packages/libbsd/package.py | 27 ++--------- .../repos/builtin/packages/libbson/package.py | 27 ++--------- .../repos/builtin/packages/libcanberra/package.py | 27 ++--------- var/spack/repos/builtin/packages/libcap/package.py | 27 ++--------- .../repos/builtin/packages/libceed/package.py | 27 ++--------- .../repos/builtin/packages/libcerf/package.py | 27 ++--------- .../repos/builtin/packages/libcheck/package.py | 27 ++--------- .../repos/builtin/packages/libcint/package.py | 27 ++--------- .../repos/builtin/packages/libcircle/package.py | 27 ++--------- .../repos/builtin/packages/libconfig/package.py | 27 ++--------- .../repos/builtin/packages/libcroco/package.py | 27 ++--------- var/spack/repos/builtin/packages/libctl/package.py | 27 ++--------- .../builtin/packages/libdivsufsort/package.py | 27 ++--------- var/spack/repos/builtin/packages/libdmx/package.py | 27 ++--------- var/spack/repos/builtin/packages/libdrm/package.py | 27 ++--------- .../repos/builtin/packages/libdwarf/package.py | 27 ++--------- .../repos/builtin/packages/libedit/package.py | 27 ++--------- var/spack/repos/builtin/packages/libelf/package.py | 27 ++--------- .../repos/builtin/packages/libemos/package.py | 27 ++--------- .../repos/builtin/packages/libepoxy/package.py | 27 ++--------- var/spack/repos/builtin/packages/libev/package.py | 27 ++--------- .../repos/builtin/packages/libevent/package.py | 27 ++--------- .../repos/builtin/packages/libevpath/package.py | 27 ++--------- .../repos/builtin/packages/libfabric/package.py | 27 ++--------- var/spack/repos/builtin/packages/libffi/package.py | 27 ++--------- var/spack/repos/builtin/packages/libffs/package.py | 27 ++--------- .../repos/builtin/packages/libfontenc/package.py | 27 ++--------- var/spack/repos/builtin/packages/libfs/package.py | 27 ++--------- .../repos/builtin/packages/libgcrypt/package.py | 27 ++--------- var/spack/repos/builtin/packages/libgd/package.py | 27 ++--------- .../repos/builtin/packages/libgeotiff/package.py | 27 ++--------- .../repos/builtin/packages/libgit2/package.py | 27 ++--------- .../repos/builtin/packages/libgpg-error/package.py | 27 ++--------- .../repos/builtin/packages/libgpuarray/package.py | 27 ++--------- .../repos/builtin/packages/libgridxc/package.py | 27 ++--------- .../builtin/packages/libgtextutils/package.py | 27 ++--------- .../repos/builtin/packages/libharu/package.py | 27 ++--------- var/spack/repos/builtin/packages/libhio/package.py | 27 ++--------- .../repos/builtin/packages/libiberty/package.py | 27 ++--------- var/spack/repos/builtin/packages/libice/package.py | 27 ++--------- .../repos/builtin/packages/libiconv/package.py | 27 ++--------- var/spack/repos/builtin/packages/libint/package.py | 27 ++--------- .../builtin/packages/libjpeg-turbo/package.py | 27 ++--------- .../repos/builtin/packages/libjpeg/package.py | 27 ++--------- .../repos/builtin/packages/libksba/package.py | 27 ++--------- .../repos/builtin/packages/liblbxutil/package.py | 27 ++--------- .../repos/builtin/packages/liblockfile/package.py | 27 ++--------- .../repos/builtin/packages/libmatheval/package.py | 27 ++--------- .../repos/builtin/packages/libmaxminddb/package.py | 27 ++--------- .../repos/builtin/packages/libmesh/package.py | 27 ++--------- var/spack/repos/builtin/packages/libmng/package.py | 27 ++--------- .../repos/builtin/packages/libmongoc/package.py | 27 ++--------- .../repos/builtin/packages/libmonitor/package.py | 27 ++--------- var/spack/repos/builtin/packages/libnbc/package.py | 27 ++--------- var/spack/repos/builtin/packages/libnl/package.py | 27 ++--------- .../repos/builtin/packages/libnova/package.py | 27 ++--------- var/spack/repos/builtin/packages/libogg/package.py | 27 ++--------- .../repos/builtin/packages/liboldx/package.py | 27 ++--------- .../repos/builtin/packages/libpcap/package.py | 27 ++--------- .../repos/builtin/packages/libpciaccess/package.py | 27 ++--------- .../repos/builtin/packages/libpfm4/package.py | 27 ++--------- .../repos/builtin/packages/libpipeline/package.py | 27 ++--------- var/spack/repos/builtin/packages/libpng/package.py | 27 ++--------- var/spack/repos/builtin/packages/libpsl/package.py | 27 ++--------- .../builtin/packages/libpthread-stubs/package.py | 27 ++--------- var/spack/repos/builtin/packages/libquo/package.py | 27 ++--------- var/spack/repos/builtin/packages/librom/package.py | 27 ++--------- .../repos/builtin/packages/libsharp/package.py | 26 ++--------- var/spack/repos/builtin/packages/libshm/package.py | 27 ++--------- .../repos/builtin/packages/libsigcpp/package.py | 27 ++--------- .../repos/builtin/packages/libsigsegv/package.py | 27 ++--------- var/spack/repos/builtin/packages/libsm/package.py | 27 ++--------- .../repos/builtin/packages/libsodium/package.py | 27 ++--------- .../builtin/packages/libspatialindex/package.py | 27 ++--------- .../repos/builtin/packages/libsplash/package.py | 27 ++--------- var/spack/repos/builtin/packages/libssh/package.py | 27 ++--------- .../repos/builtin/packages/libssh2/package.py | 27 ++--------- var/spack/repos/builtin/packages/libsvm/package.py | 27 ++--------- .../repos/builtin/packages/libszip/package.py | 27 ++--------- .../repos/builtin/packages/libtermkey/package.py | 27 ++--------- .../repos/builtin/packages/libtiff/package.py | 27 ++--------- .../repos/builtin/packages/libtool/package.py | 27 ++--------- .../repos/builtin/packages/libunistring/package.py | 27 ++--------- .../repos/builtin/packages/libunwind/package.py | 27 ++--------- .../repos/builtin/packages/libuuid/package.py | 27 ++--------- var/spack/repos/builtin/packages/libuv/package.py | 27 ++--------- .../repos/builtin/packages/libvorbis/package.py | 27 ++--------- .../repos/builtin/packages/libvterm/package.py | 27 ++--------- .../builtin/packages/libwebsockets/package.py | 27 ++--------- .../repos/builtin/packages/libwindowswm/package.py | 27 ++--------- var/spack/repos/builtin/packages/libx11/package.py | 27 ++--------- var/spack/repos/builtin/packages/libxau/package.py | 27 ++--------- var/spack/repos/builtin/packages/libxaw/package.py | 27 ++--------- .../repos/builtin/packages/libxaw3d/package.py | 27 ++--------- var/spack/repos/builtin/packages/libxc/package.py | 27 ++--------- var/spack/repos/builtin/packages/libxcb/package.py | 27 ++--------- .../builtin/packages/libxcomposite/package.py | 27 ++--------- .../repos/builtin/packages/libxcursor/package.py | 27 ++--------- .../repos/builtin/packages/libxdamage/package.py | 27 ++--------- .../repos/builtin/packages/libxdmcp/package.py | 27 ++--------- .../repos/builtin/packages/libxevie/package.py | 27 ++--------- .../repos/builtin/packages/libxext/package.py | 27 ++--------- .../repos/builtin/packages/libxfixes/package.py | 27 ++--------- .../repos/builtin/packages/libxfont/package.py | 27 ++--------- .../repos/builtin/packages/libxfont2/package.py | 27 ++--------- .../builtin/packages/libxfontcache/package.py | 27 ++--------- var/spack/repos/builtin/packages/libxft/package.py | 27 ++--------- var/spack/repos/builtin/packages/libxi/package.py | 27 ++--------- .../repos/builtin/packages/libxinerama/package.py | 27 ++--------- .../repos/builtin/packages/libxkbcommon/package.py | 27 ++--------- .../repos/builtin/packages/libxkbfile/package.py | 27 ++--------- .../repos/builtin/packages/libxkbui/package.py | 27 ++--------- .../repos/builtin/packages/libxml2/package.py | 27 ++--------- var/spack/repos/builtin/packages/libxmu/package.py | 27 ++--------- var/spack/repos/builtin/packages/libxp/package.py | 27 ++--------- var/spack/repos/builtin/packages/libxpm/package.py | 27 ++--------- .../repos/builtin/packages/libxpresent/package.py | 27 ++--------- .../builtin/packages/libxprintapputil/package.py | 27 ++--------- .../builtin/packages/libxprintutil/package.py | 27 ++--------- .../repos/builtin/packages/libxrandr/package.py | 27 ++--------- .../repos/builtin/packages/libxrender/package.py | 27 ++--------- .../repos/builtin/packages/libxres/package.py | 27 ++--------- .../builtin/packages/libxscrnsaver/package.py | 27 ++--------- .../repos/builtin/packages/libxshmfence/package.py | 27 ++--------- .../repos/builtin/packages/libxslt/package.py | 27 ++--------- .../repos/builtin/packages/libxsmm/package.py | 27 ++--------- .../repos/builtin/packages/libxstream/package.py | 27 ++--------- var/spack/repos/builtin/packages/libxt/package.py | 27 ++--------- .../repos/builtin/packages/libxtrap/package.py | 27 ++--------- .../repos/builtin/packages/libxtst/package.py | 27 ++--------- var/spack/repos/builtin/packages/libxv/package.py | 27 ++--------- .../repos/builtin/packages/libxvmc/package.py | 27 ++--------- .../repos/builtin/packages/libxxf86dga/package.py | 27 ++--------- .../repos/builtin/packages/libxxf86misc/package.py | 27 ++--------- .../repos/builtin/packages/libxxf86vm/package.py | 27 ++--------- .../repos/builtin/packages/libyogrt/package.py | 27 ++--------- var/spack/repos/builtin/packages/libzip/package.py | 27 ++--------- .../repos/builtin/packages/lighttpd/package.py | 27 ++--------- var/spack/repos/builtin/packages/likwid/package.py | 27 ++--------- .../repos/builtin/packages/linkphase3/package.py | 27 ++--------- .../builtin/packages/linux-headers/package.py | 27 ++--------- .../repos/builtin/packages/listres/package.py | 27 ++--------- .../builtin/packages/llvm-openmp-ompt/package.py | 27 ++--------- var/spack/repos/builtin/packages/llvm/package.py | 27 ++--------- var/spack/repos/builtin/packages/lmdb/package.py | 27 ++--------- var/spack/repos/builtin/packages/lmod/package.py | 27 ++--------- var/spack/repos/builtin/packages/lndir/package.py | 27 ++--------- .../repos/builtin/packages/log4cplus/package.py | 27 ++--------- .../repos/builtin/packages/log4cxx/package.py | 27 ++--------- var/spack/repos/builtin/packages/loki/package.py | 27 ++--------- var/spack/repos/builtin/packages/lordec/package.py | 27 ++--------- var/spack/repos/builtin/packages/lrslib/package.py | 27 ++--------- var/spack/repos/builtin/packages/lrzip/package.py | 27 ++--------- var/spack/repos/builtin/packages/lsof/package.py | 27 ++--------- var/spack/repos/builtin/packages/ltrace/package.py | 27 ++--------- .../repos/builtin/packages/lua-bitlib/package.py | 27 ++--------- .../repos/builtin/packages/lua-jit/package.py | 27 ++--------- .../repos/builtin/packages/lua-lpeg/package.py | 27 ++--------- .../builtin/packages/lua-luafilesystem/package.py | 27 ++--------- .../repos/builtin/packages/lua-luaposix/package.py | 27 ++--------- .../repos/builtin/packages/lua-mpack/package.py | 27 ++--------- var/spack/repos/builtin/packages/lua/package.py | 27 ++--------- var/spack/repos/builtin/packages/luit/package.py | 27 ++--------- var/spack/repos/builtin/packages/lulesh/package.py | 27 ++--------- .../repos/builtin/packages/lumpy-sv/package.py | 27 ++--------- var/spack/repos/builtin/packages/lwgrp/package.py | 27 ++--------- var/spack/repos/builtin/packages/lwm2/package.py | 27 ++--------- var/spack/repos/builtin/packages/lz4/package.py | 27 ++--------- var/spack/repos/builtin/packages/lzma/package.py | 27 ++--------- var/spack/repos/builtin/packages/lzo/package.py | 27 ++--------- var/spack/repos/builtin/packages/m4/package.py | 27 ++--------- var/spack/repos/builtin/packages/macsio/package.py | 27 ++--------- .../repos/builtin/packages/mad-numdiff/package.py | 27 ++--------- var/spack/repos/builtin/packages/mafft/package.py | 27 ++--------- var/spack/repos/builtin/packages/magics/package.py | 27 ++--------- var/spack/repos/builtin/packages/magma/package.py | 27 ++--------- .../repos/builtin/packages/makedepend/package.py | 27 ++--------- .../repos/builtin/packages/mallocmc/package.py | 27 ++--------- var/spack/repos/builtin/packages/man-db/package.py | 27 ++--------- var/spack/repos/builtin/packages/manta/package.py | 27 ++--------- var/spack/repos/builtin/packages/maq/package.py | 27 ++--------- .../repos/builtin/packages/mariadb/package.py | 27 ++--------- var/spack/repos/builtin/packages/masa/package.py | 27 ++--------- .../repos/builtin/packages/masurca/package.py | 27 ++--------- var/spack/repos/builtin/packages/matio/package.py | 27 ++--------- var/spack/repos/builtin/packages/matlab/package.py | 27 ++--------- var/spack/repos/builtin/packages/maven/package.py | 27 ++--------- .../repos/builtin/packages/maverick/package.py | 27 ++--------- var/spack/repos/builtin/packages/mawk/package.py | 27 ++--------- .../repos/builtin/packages/mbedtls/package.py | 27 ++--------- var/spack/repos/builtin/packages/mc/package.py | 27 ++--------- var/spack/repos/builtin/packages/mcl/package.py | 27 ++--------- var/spack/repos/builtin/packages/mdtest/package.py | 27 ++--------- var/spack/repos/builtin/packages/med/package.py | 27 ++--------- var/spack/repos/builtin/packages/meep/package.py | 27 ++--------- var/spack/repos/builtin/packages/mefit/package.py | 27 ++--------- .../repos/builtin/packages/megahit/package.py | 27 ++--------- .../repos/builtin/packages/memaxes/package.py | 27 ++--------- var/spack/repos/builtin/packages/meme/package.py | 27 ++--------- .../repos/builtin/packages/memkind/package.py | 27 ++--------- .../repos/builtin/packages/meraculous/package.py | 27 ++--------- .../repos/builtin/packages/mercurial/package.py | 27 ++--------- .../repos/builtin/packages/mesa-glu/package.py | 27 ++--------- var/spack/repos/builtin/packages/mesa/package.py | 26 ++--------- .../repos/builtin/packages/meshkit/package.py | 27 ++--------- var/spack/repos/builtin/packages/meson/package.py | 27 ++--------- .../repos/builtin/packages/mesquite/package.py | 27 ++--------- .../repos/builtin/packages/metabat/package.py | 27 ++--------- .../repos/builtin/packages/metaphysicl/package.py | 27 ++--------- var/spack/repos/builtin/packages/metis/package.py | 27 ++--------- var/spack/repos/builtin/packages/mfem/package.py | 27 ++--------- .../builtin/packages/microbiomeutil/package.py | 27 ++--------- var/spack/repos/builtin/packages/minced/package.py | 27 ++--------- .../repos/builtin/packages/mindthegap/package.py | 27 ++--------- .../repos/builtin/packages/miniaero/package.py | 27 ++--------- .../repos/builtin/packages/miniamr/package.py | 27 ++--------- .../repos/builtin/packages/miniasm/package.py | 27 ++--------- .../repos/builtin/packages/miniconda2/package.py | 27 ++--------- .../repos/builtin/packages/miniconda3/package.py | 27 ++--------- var/spack/repos/builtin/packages/minife/package.py | 27 ++--------- .../repos/builtin/packages/minighost/package.py | 27 ++--------- .../repos/builtin/packages/minigmg/package.py | 27 ++--------- .../repos/builtin/packages/minimap2/package.py | 27 ++--------- var/spack/repos/builtin/packages/minimd/package.py | 27 ++--------- .../repos/builtin/packages/miniqmc/package.py | 27 ++--------- .../repos/builtin/packages/minisign/package.py | 27 ++--------- .../repos/builtin/packages/minismac2d/package.py | 27 ++--------- .../repos/builtin/packages/minitri/package.py | 27 ++--------- .../repos/builtin/packages/minivite/package.py | 27 ++--------- .../repos/builtin/packages/minixyce/package.py | 27 ++--------- var/spack/repos/builtin/packages/minuit/package.py | 27 ++--------- var/spack/repos/builtin/packages/mira/package.py | 27 ++--------- .../repos/builtin/packages/mirdeep2/package.py | 27 ++--------- .../repos/builtin/packages/mitofates/package.py | 27 ++--------- var/spack/repos/builtin/packages/mitos/package.py | 27 ++--------- .../repos/builtin/packages/mkfontdir/package.py | 27 ++--------- .../repos/builtin/packages/mkfontscale/package.py | 27 ++--------- var/spack/repos/builtin/packages/mlhka/package.py | 27 ++--------- var/spack/repos/builtin/packages/moab/package.py | 27 ++--------- .../repos/builtin/packages/modern-wheel/package.py | 27 ++--------- .../repos/builtin/packages/mofem-cephas/package.py | 24 ++-------- .../packages/mofem-fracture-module/package.py | 24 ++-------- .../mofem-minimal-surface-equation/package.py | 24 ++-------- .../packages/mofem-users-modules/package.py | 24 ++-------- var/spack/repos/builtin/packages/molcas/package.py | 27 ++--------- var/spack/repos/builtin/packages/mono/package.py | 27 ++--------- var/spack/repos/builtin/packages/mosh/package.py | 27 ++--------- var/spack/repos/builtin/packages/mothur/package.py | 27 ++--------- var/spack/repos/builtin/packages/motif/package.py | 27 ++--------- .../repos/builtin/packages/motioncor2/package.py | 27 ++--------- .../packages/mount-point-attributes/package.py | 27 ++--------- var/spack/repos/builtin/packages/mozjs/package.py | 27 ++--------- .../builtin/packages/mpark-variant/package.py | 27 ++--------- var/spack/repos/builtin/packages/mpc/package.py | 27 ++--------- var/spack/repos/builtin/packages/mpe2/package.py | 27 ++--------- var/spack/repos/builtin/packages/mpest/package.py | 27 ++--------- var/spack/repos/builtin/packages/mpfr/package.py | 27 ++--------- .../repos/builtin/packages/mpibash/package.py | 27 ++--------- .../repos/builtin/packages/mpiblast/package.py | 27 ++--------- var/spack/repos/builtin/packages/mpich/package.py | 27 ++--------- .../repos/builtin/packages/mpifileutils/package.py | 27 ++--------- .../repos/builtin/packages/mpilander/package.py | 27 ++--------- .../repos/builtin/packages/mpileaks/package.py | 27 ++--------- var/spack/repos/builtin/packages/mpip/package.py | 27 ++--------- var/spack/repos/builtin/packages/mpir/package.py | 27 ++--------- .../builtin/packages/mpix-launch-swift/package.py | 27 ++--------- .../repos/builtin/packages/mrbayes/package.py | 27 ++--------- var/spack/repos/builtin/packages/mrnet/package.py | 27 ++--------- .../repos/builtin/packages/mrtrix3/package.py | 27 ++--------- var/spack/repos/builtin/packages/mscgen/package.py | 27 ++--------- .../repos/builtin/packages/msgpack-c/package.py | 27 ++--------- .../repos/builtin/packages/mshadow/package.py | 27 ++--------- .../repos/builtin/packages/multitail/package.py | 27 ++--------- .../repos/builtin/packages/multiverso/package.py | 27 ++--------- var/spack/repos/builtin/packages/mummer/package.py | 27 ++--------- var/spack/repos/builtin/packages/mumps/package.py | 27 ++--------- var/spack/repos/builtin/packages/munge/package.py | 27 ++--------- .../repos/builtin/packages/muparser/package.py | 27 ++--------- var/spack/repos/builtin/packages/muscle/package.py | 27 ++--------- var/spack/repos/builtin/packages/muse/package.py | 27 ++--------- var/spack/repos/builtin/packages/muster/package.py | 27 ++--------- .../repos/builtin/packages/mvapich2/package.py | 27 ++--------- var/spack/repos/builtin/packages/mxml/package.py | 27 ++--------- var/spack/repos/builtin/packages/mxnet/package.py | 27 ++--------- var/spack/repos/builtin/packages/nag/package.py | 27 ++--------- .../repos/builtin/packages/nalu-wind/package.py | 26 ++--------- var/spack/repos/builtin/packages/nalu/package.py | 27 ++--------- var/spack/repos/builtin/packages/namd/package.py | 27 ++--------- var/spack/repos/builtin/packages/nano/package.py | 27 ++--------- .../repos/builtin/packages/nanoflann/package.py | 27 ++--------- var/spack/repos/builtin/packages/nanopb/package.py | 27 ++--------- var/spack/repos/builtin/packages/nasm/package.py | 27 ++--------- var/spack/repos/builtin/packages/nauty/package.py | 27 ++--------- .../builtin/packages/ncbi-magicblast/package.py | 27 ++--------- .../builtin/packages/ncbi-rmblastn/package.py | 27 ++--------- .../repos/builtin/packages/ncbi-toolkit/package.py | 27 ++--------- var/spack/repos/builtin/packages/nccl/package.py | 27 ++--------- var/spack/repos/builtin/packages/nccmp/package.py | 27 ++--------- var/spack/repos/builtin/packages/ncdu/package.py | 27 ++--------- var/spack/repos/builtin/packages/ncftp/package.py | 27 ++--------- var/spack/repos/builtin/packages/ncl/package.py | 27 ++--------- var/spack/repos/builtin/packages/nco/package.py | 27 ++--------- .../repos/builtin/packages/ncurses/package.py | 27 ++--------- var/spack/repos/builtin/packages/ncview/package.py | 27 ++--------- var/spack/repos/builtin/packages/ndiff/package.py | 27 ++--------- .../repos/builtin/packages/nek5000/package.py | 27 ++--------- .../repos/builtin/packages/nekbone/package.py | 27 ++--------- var/spack/repos/builtin/packages/nekcem/package.py | 27 ++--------- var/spack/repos/builtin/packages/nektar/package.py | 27 ++--------- var/spack/repos/builtin/packages/neovim/package.py | 27 ++--------- var/spack/repos/builtin/packages/nest/package.py | 27 ++--------- .../repos/builtin/packages/netcdf-cxx/package.py | 27 ++--------- .../repos/builtin/packages/netcdf-cxx4/package.py | 27 ++--------- .../builtin/packages/netcdf-fortran/package.py | 27 ++--------- var/spack/repos/builtin/packages/netcdf/package.py | 27 ++--------- .../repos/builtin/packages/netgauge/package.py | 27 ++--------- var/spack/repos/builtin/packages/netgen/package.py | 27 ++--------- .../builtin/packages/netlib-lapack/package.py | 27 ++--------- .../builtin/packages/netlib-scalapack/package.py | 27 ++--------- .../repos/builtin/packages/netlib-xblas/package.py | 27 ++--------- var/spack/repos/builtin/packages/nettle/package.py | 27 ++--------- var/spack/repos/builtin/packages/neuron/package.py | 27 ++--------- .../repos/builtin/packages/nextflow/package.py | 27 ++--------- var/spack/repos/builtin/packages/nfft/package.py | 27 ++--------- .../repos/builtin/packages/nghttp2/package.py | 27 ++--------- var/spack/repos/builtin/packages/nginx/package.py | 27 ++--------- var/spack/repos/builtin/packages/ngmlr/package.py | 27 ++--------- .../builtin/packages/ninja-fortran/package.py | 27 ++--------- var/spack/repos/builtin/packages/ninja/package.py | 27 ++--------- .../builtin/packages/nlohmann-json/package.py | 27 ++--------- var/spack/repos/builtin/packages/nlopt/package.py | 27 ++--------- var/spack/repos/builtin/packages/nmap/package.py | 27 ++--------- var/spack/repos/builtin/packages/nnvm/package.py | 27 ++--------- .../repos/builtin/packages/node-js/package.py | 27 ++--------- .../repos/builtin/packages/notmuch/package.py | 27 ++--------- var/spack/repos/builtin/packages/npb/package.py | 27 ++--------- var/spack/repos/builtin/packages/npm/package.py | 27 ++--------- var/spack/repos/builtin/packages/npth/package.py | 27 ++--------- var/spack/repos/builtin/packages/nspr/package.py | 27 ++--------- .../repos/builtin/packages/numactl/package.py | 27 ++--------- .../repos/builtin/packages/numdiff/package.py | 27 ++--------- var/spack/repos/builtin/packages/nut/package.py | 27 ++--------- .../repos/builtin/packages/nvptx-tools/package.py | 27 ++--------- var/spack/repos/builtin/packages/nwchem/package.py | 27 ++--------- var/spack/repos/builtin/packages/ocaml/package.py | 27 ++--------- var/spack/repos/builtin/packages/occa/package.py | 27 ++--------- var/spack/repos/builtin/packages/oce/package.py | 27 ++--------- var/spack/repos/builtin/packages/oclint/package.py | 27 ++--------- var/spack/repos/builtin/packages/oclock/package.py | 27 ++--------- .../repos/builtin/packages/octave-optim/package.py | 27 ++--------- .../builtin/packages/octave-splines/package.py | 27 ++--------- .../builtin/packages/octave-struct/package.py | 27 ++--------- var/spack/repos/builtin/packages/octave/package.py | 27 ++--------- .../repos/builtin/packages/octopus/package.py | 27 ++--------- .../builtin/packages/of-adios-write/package.py | 28 ++--------- .../repos/builtin/packages/of-precice/package.py | 26 ++--------- .../repos/builtin/packages/omega-h/package.py | 27 ++--------- var/spack/repos/builtin/packages/ompss/package.py | 27 ++--------- .../repos/builtin/packages/ompt-openmp/package.py | 27 ++--------- .../repos/builtin/packages/oniguruma/package.py | 27 ++--------- .../repos/builtin/packages/ont-albacore/package.py | 27 ++--------- .../repos/builtin/packages/opa-psm2/package.py | 27 ++--------- var/spack/repos/builtin/packages/opam/package.py | 27 ++--------- var/spack/repos/builtin/packages/opari2/package.py | 27 ++--------- .../repos/builtin/packages/openbabel/package.py | 27 ++--------- .../repos/builtin/packages/openblas/package.py | 27 ++--------- .../repos/builtin/packages/opencoarrays/package.py | 27 ++--------- var/spack/repos/builtin/packages/opencv/package.py | 27 ++--------- .../repos/builtin/packages/openexr/package.py | 27 ++--------- .../repos/builtin/packages/openfast/package.py | 27 ++--------- .../repos/builtin/packages/openfoam-com/package.py | 28 ++--------- .../repos/builtin/packages/openfoam-org/package.py | 28 ++--------- .../repos/builtin/packages/openfst/package.py | 27 ++--------- var/spack/repos/builtin/packages/opengl/package.py | 27 ++--------- .../repos/builtin/packages/openglu/package.py | 27 ++--------- .../repos/builtin/packages/openjpeg/package.py | 27 ++--------- var/spack/repos/builtin/packages/openmc/package.py | 27 ++--------- .../repos/builtin/packages/openmpi/package.py | 27 ++--------- .../repos/builtin/packages/opennurbs/package.py | 27 ++--------- .../repos/builtin/packages/openpmd-api/package.py | 27 ++--------- .../builtin/packages/openscenegraph/package.py | 27 ++--------- .../repos/builtin/packages/openslide/package.py | 27 ++--------- .../packages/openspeedshop-utils/package.py | 43 ++--------------- .../builtin/packages/openspeedshop/package.py | 43 ++--------------- .../repos/builtin/packages/openssh/package.py | 27 ++--------- .../repos/builtin/packages/openssl/package.py | 27 ++--------- var/spack/repos/builtin/packages/opium/package.py | 27 ++--------- .../builtin/packages/optional-lite/package.py | 27 ++--------- var/spack/repos/builtin/packages/opus/package.py | 27 ++--------- var/spack/repos/builtin/packages/orfm/package.py | 27 ++--------- .../repos/builtin/packages/orthofinder/package.py | 27 ++--------- .../repos/builtin/packages/orthomcl/package.py | 27 ++--------- .../packages/osu-micro-benchmarks/package.py | 27 ++--------- var/spack/repos/builtin/packages/otf/package.py | 27 ++--------- var/spack/repos/builtin/packages/otf2/package.py | 27 ++--------- var/spack/repos/builtin/packages/p4est/package.py | 27 ++--------- var/spack/repos/builtin/packages/p7zip/package.py | 27 ++--------- .../builtin/packages/pacbio-daligner/package.py | 27 ++--------- .../builtin/packages/pacbio-damasker/package.py | 27 ++--------- .../builtin/packages/pacbio-dazz-db/package.py | 27 ++--------- .../builtin/packages/pacbio-dextractor/package.py | 27 ++--------- var/spack/repos/builtin/packages/pacvim/package.py | 26 ++--------- var/spack/repos/builtin/packages/pagit/package.py | 27 ++--------- var/spack/repos/builtin/packages/pagmo/package.py | 27 ++--------- var/spack/repos/builtin/packages/paml/package.py | 27 ++--------- var/spack/repos/builtin/packages/panda/package.py | 27 ++--------- .../repos/builtin/packages/pandaseq/package.py | 27 ++--------- var/spack/repos/builtin/packages/pango/package.py | 27 ++--------- .../repos/builtin/packages/pangomm/package.py | 27 ++--------- var/spack/repos/builtin/packages/papi/package.py | 27 ++--------- .../repos/builtin/packages/papyrus/package.py | 27 ++--------- .../repos/builtin/packages/paradiseo/package.py | 27 ++--------- .../builtin/packages/parallel-netcdf/package.py | 27 ++--------- .../repos/builtin/packages/parallel/package.py | 27 ++--------- .../repos/builtin/packages/paraver/package.py | 27 ++--------- .../repos/builtin/packages/paraview/package.py | 27 ++--------- .../repos/builtin/packages/parmetis/package.py | 27 ++--------- .../repos/builtin/packages/parmgridgen/package.py | 27 ++--------- .../repos/builtin/packages/parquet/package.py | 27 ++--------- .../repos/builtin/packages/parsimonator/package.py | 27 ++--------- .../repos/builtin/packages/parsplice/package.py | 27 ++--------- .../builtin/packages/partitionfinder/package.py | 27 ++--------- var/spack/repos/builtin/packages/patch/package.py | 27 ++--------- .../repos/builtin/packages/patchelf/package.py | 27 ++--------- .../repos/builtin/packages/pathfinder/package.py | 27 ++--------- .../repos/builtin/packages/pax-utils/package.py | 27 ++--------- var/spack/repos/builtin/packages/pbbam/package.py | 27 ++--------- var/spack/repos/builtin/packages/pbmpi/package.py | 27 ++--------- var/spack/repos/builtin/packages/pcma/package.py | 27 ++--------- var/spack/repos/builtin/packages/pcre/package.py | 27 ++--------- var/spack/repos/builtin/packages/pcre2/package.py | 27 ++--------- .../repos/builtin/packages/pdf2svg/package.py | 27 ++--------- var/spack/repos/builtin/packages/pdftk/package.py | 27 ++--------- var/spack/repos/builtin/packages/pdsh/package.py | 27 ++--------- var/spack/repos/builtin/packages/pdt/package.py | 27 ++--------- var/spack/repos/builtin/packages/pegtl/package.py | 27 ++--------- .../repos/builtin/packages/pennant/package.py | 27 ++--------- .../repos/builtin/packages/percept/package.py | 27 ++--------- .../packages/perl-algorithm-diff/package.py | 27 ++--------- .../repos/builtin/packages/perl-app-cmd/package.py | 27 ++--------- .../builtin/packages/perl-array-utils/package.py | 27 ++--------- .../packages/perl-b-hooks-endofscope/package.py | 27 ++--------- .../builtin/packages/perl-bio-perl/package.py | 27 ++--------- .../builtin/packages/perl-bit-vector/package.py | 27 ++--------- .../repos/builtin/packages/perl-cairo/package.py | 27 ++--------- .../builtin/packages/perl-capture-tiny/package.py | 27 ++--------- .../builtin/packages/perl-carp-clan/package.py | 27 ++--------- .../repos/builtin/packages/perl-cgi/package.py | 27 ++--------- .../perl-class-data-inheritable/package.py | 27 ++--------- .../packages/perl-class-inspector/package.py | 27 ++--------- .../builtin/packages/perl-class-load-xs/package.py | 27 ++--------- .../builtin/packages/perl-class-load/package.py | 27 ++--------- .../packages/perl-compress-raw-bzip2/package.py | 27 ++--------- .../packages/perl-compress-raw-zlib/package.py | 27 ++--------- .../packages/perl-contextual-return/package.py | 27 ++--------- .../packages/perl-cpan-meta-check/package.py | 27 ++--------- .../builtin/packages/perl-data-optlist/package.py | 27 ++--------- .../builtin/packages/perl-data-stag/package.py | 27 ++--------- .../builtin/packages/perl-dbd-mysql/package.py | 27 ++--------- .../builtin/packages/perl-dbd-sqlite/package.py | 27 ++--------- .../repos/builtin/packages/perl-dbfile/package.py | 27 ++--------- .../repos/builtin/packages/perl-dbi/package.py | 27 ++--------- .../builtin/packages/perl-devel-cycle/package.py | 27 ++--------- .../perl-devel-globaldestruction/package.py | 27 ++--------- .../packages/perl-devel-overloadinfo/package.py | 27 ++--------- .../packages/perl-devel-stacktrace/package.py | 27 ++--------- .../builtin/packages/perl-digest-md5/package.py | 27 ++--------- .../packages/perl-dist-checkconflicts/package.py | 27 ++--------- .../builtin/packages/perl-encode-locale/package.py | 27 ++--------- .../builtin/packages/perl-eval-closure/package.py | 27 ++--------- .../packages/perl-exception-class/package.py | 27 ++--------- .../builtin/packages/perl-exporter-tiny/package.py | 27 ++--------- .../packages/perl-extutils-depends/package.py | 27 ++--------- .../packages/perl-extutils-makemaker/package.py | 27 ++--------- .../packages/perl-extutils-pkgconfig/package.py | 27 ++--------- .../packages/perl-file-copy-recursive/package.py | 27 ++--------- .../builtin/packages/perl-file-listing/package.py | 27 ++--------- .../builtin/packages/perl-file-pushd/package.py | 27 ++--------- .../packages/perl-file-sharedir-install/package.py | 27 ++--------- .../packages/perl-file-slurp-tiny/package.py | 27 ++--------- .../builtin/packages/perl-file-slurper/package.py | 27 ++--------- .../builtin/packages/perl-file-which/package.py | 27 ++--------- .../builtin/packages/perl-font-ttf/package.py | 27 ++--------- .../builtin/packages/perl-gd-graph/package.py | 27 ++--------- .../repos/builtin/packages/perl-gd-text/package.py | 27 ++--------- .../repos/builtin/packages/perl-gd/package.py | 27 ++--------- .../packages/perl-gdgraph-histogram/package.py | 27 ++--------- .../packages/perl-graph-readwrite/package.py | 27 ++--------- .../repos/builtin/packages/perl-graph/package.py | 27 ++--------- .../builtin/packages/perl-html-parser/package.py | 27 ++--------- .../builtin/packages/perl-html-tagset/package.py | 27 ++--------- .../builtin/packages/perl-http-cookies/package.py | 27 ++--------- .../builtin/packages/perl-http-daemon/package.py | 27 ++--------- .../builtin/packages/perl-http-date/package.py | 27 ++--------- .../builtin/packages/perl-http-message/package.py | 27 ++--------- .../packages/perl-http-negotiate/package.py | 27 ++--------- .../builtin/packages/perl-inline-c/package.py | 27 ++--------- .../repos/builtin/packages/perl-inline/package.py | 27 ++--------- .../builtin/packages/perl-intervaltree/package.py | 27 ++--------- .../builtin/packages/perl-io-compress/package.py | 27 ++--------- .../repos/builtin/packages/perl-io-html/package.py | 27 ++--------- .../packages/perl-io-sessiondata/package.py | 27 ++--------- .../builtin/packages/perl-io-socket-ssl/package.py | 27 ++--------- .../builtin/packages/perl-io-string/package.py | 27 ++--------- .../repos/builtin/packages/perl-json/package.py | 27 ++--------- .../builtin/packages/perl-libwww-perl/package.py | 27 ++--------- .../packages/perl-list-moreutils/package.py | 27 ++--------- .../builtin/packages/perl-log-log4perl/package.py | 27 ++--------- .../packages/perl-lwp-mediatypes/package.py | 27 ++--------- .../packages/perl-lwp-protocol-https/package.py | 27 ++--------- .../repos/builtin/packages/perl-lwp/package.py | 27 ++--------- .../builtin/packages/perl-math-cdf/package.py | 27 ++--------- .../builtin/packages/perl-math-cephes/package.py | 27 ++--------- .../packages/perl-math-matrixreal/package.py | 27 ++--------- .../builtin/packages/perl-module-build/package.py | 27 ++--------- .../packages/perl-module-implementation/package.py | 27 ++--------- .../perl-module-runtime-conflicts/package.py | 27 ++--------- .../packages/perl-module-runtime/package.py | 27 ++--------- .../repos/builtin/packages/perl-moose/package.py | 27 ++--------- .../builtin/packages/perl-mozilla-ca/package.py | 27 ++--------- .../builtin/packages/perl-mro-compat/package.py | 27 ++--------- .../packages/perl-namespace-clean/package.py | 27 ++--------- .../builtin/packages/perl-net-http/package.py | 27 ++--------- .../packages/perl-net-scp-expect/package.py | 27 ++--------- .../builtin/packages/perl-net-ssleay/package.py | 27 ++--------- .../perl-package-deprecationmanager/package.py | 27 ++--------- .../packages/perl-package-stash-xs/package.py | 27 ++--------- .../builtin/packages/perl-package-stash/package.py | 27 ++--------- .../builtin/packages/perl-padwalker/package.py | 27 ++--------- .../packages/perl-parallel-forkmanager/package.py | 27 ++--------- .../builtin/packages/perl-params-util/package.py | 27 ++--------- .../packages/perl-parse-recdescent/package.py | 27 ++--------- .../builtin/packages/perl-pdf-api2/package.py | 27 ++--------- .../repos/builtin/packages/perl-pegex/package.py | 27 ++--------- .../packages/perl-perl4-corelibs/package.py | 26 ++--------- .../builtin/packages/perl-perl6-slurp/package.py | 27 ++--------- .../builtin/packages/perl-perlio-gzip/package.py | 27 ++--------- .../packages/perl-perlio-utf8-strict/package.py | 27 ++--------- .../packages/perl-scalar-util-numeric/package.py | 27 ++--------- .../builtin/packages/perl-soap-lite/package.py | 27 ++--------- .../builtin/packages/perl-star-fusion/package.py | 27 ++--------- .../perl-statistics-descriptive/package.py | 27 ++--------- .../packages/perl-statistics-pca/package.py | 27 ++--------- .../perl-sub-exporter-progressive/package.py | 27 ++--------- .../builtin/packages/perl-sub-exporter/package.py | 27 ++--------- .../builtin/packages/perl-sub-identify/package.py | 27 ++--------- .../builtin/packages/perl-sub-install/package.py | 27 ++--------- .../builtin/packages/perl-sub-name/package.py | 27 ++--------- .../builtin/packages/perl-sub-uplevel/package.py | 27 ++--------- .../repos/builtin/packages/perl-svg/package.py | 27 ++--------- .../builtin/packages/perl-swissknife/package.py | 27 ++--------- .../builtin/packages/perl-task-weaken/package.py | 27 ++--------- .../builtin/packages/perl-term-readkey/package.py | 27 ++--------- .../packages/perl-test-cleannamespaces/package.py | 27 ++--------- .../builtin/packages/perl-test-deep/package.py | 27 ++--------- .../packages/perl-test-differences/package.py | 27 ++--------- .../packages/perl-test-exception/package.py | 27 ++--------- .../builtin/packages/perl-test-fatal/package.py | 27 ++--------- .../packages/perl-test-memory-cycle/package.py | 27 ++--------- .../builtin/packages/perl-test-most/package.py | 27 ++--------- .../builtin/packages/perl-test-needs/package.py | 27 ++--------- .../builtin/packages/perl-test-requires/package.py | 27 ++--------- .../packages/perl-test-requiresinternet/package.py | 27 ++--------- .../builtin/packages/perl-test-warn/package.py | 27 ++--------- .../builtin/packages/perl-test-warnings/package.py | 27 ++--------- .../builtin/packages/perl-text-csv/package.py | 27 ++--------- .../builtin/packages/perl-text-diff/package.py | 27 ++--------- .../packages/perl-text-simpletable/package.py | 27 ++--------- .../builtin/packages/perl-text-soundex/package.py | 27 ++--------- .../packages/perl-text-unidecode/package.py | 27 ++--------- .../builtin/packages/perl-time-hires/package.py | 27 ++--------- .../builtin/packages/perl-time-piece/package.py | 27 ++--------- .../builtin/packages/perl-try-tiny/package.py | 27 ++--------- .../builtin/packages/perl-uri-escape/package.py | 27 ++--------- .../repos/builtin/packages/perl-uri/package.py | 27 ++--------- .../repos/builtin/packages/perl-version/package.py | 27 ++--------- .../repos/builtin/packages/perl-want/package.py | 27 ++--------- .../packages/perl-www-robotrules/package.py | 27 ++--------- .../packages/perl-xml-parser-lite/package.py | 27 ++--------- .../builtin/packages/perl-xml-parser/package.py | 27 ++--------- .../builtin/packages/perl-xml-simple/package.py | 27 ++--------- .../builtin/packages/perl-yaml-libyaml/package.py | 27 ++--------- var/spack/repos/builtin/packages/perl/package.py | 27 ++--------- var/spack/repos/builtin/packages/petsc/package.py | 27 ++--------- var/spack/repos/builtin/packages/pexsi/package.py | 27 ++--------- var/spack/repos/builtin/packages/pfft/package.py | 27 ++--------- .../repos/builtin/packages/pflotran/package.py | 27 ++--------- var/spack/repos/builtin/packages/pfunit/package.py | 27 ++--------- .../repos/builtin/packages/pgdspider/package.py | 27 ++--------- var/spack/repos/builtin/packages/pgi/package.py | 27 ++--------- var/spack/repos/builtin/packages/pgmath/package.py | 27 ++--------- .../packages/phantompeakqualtools/package.py | 27 ++--------- var/spack/repos/builtin/packages/phast/package.py | 27 ++--------- var/spack/repos/builtin/packages/phasta/package.py | 27 ++--------- var/spack/repos/builtin/packages/phist/package.py | 27 ++--------- var/spack/repos/builtin/packages/phylip/package.py | 27 ++--------- var/spack/repos/builtin/packages/picard/package.py | 27 ++--------- var/spack/repos/builtin/packages/picsar/package.py | 27 ++--------- .../repos/builtin/packages/picsarlite/package.py | 27 ++--------- var/spack/repos/builtin/packages/pidx/package.py | 27 ++--------- var/spack/repos/builtin/packages/pigz/package.py | 27 ++--------- var/spack/repos/builtin/packages/pilon/package.py | 27 ++--------- var/spack/repos/builtin/packages/pindel/package.py | 27 ++--------- .../repos/builtin/packages/piranha/package.py | 27 ++--------- var/spack/repos/builtin/packages/pism/package.py | 27 ++--------- var/spack/repos/builtin/packages/pixman/package.py | 27 ++--------- .../repos/builtin/packages/pkg-config/package.py | 27 ++--------- .../repos/builtin/packages/pkgconf/package.py | 27 ++--------- .../builtin/packages/planck-likelihood/package.py | 27 ++--------- var/spack/repos/builtin/packages/plasma/package.py | 13 ++---- .../repos/builtin/packages/platypus/package.py | 27 ++--------- var/spack/repos/builtin/packages/plink/package.py | 27 ++--------- var/spack/repos/builtin/packages/plplot/package.py | 27 ++--------- var/spack/repos/builtin/packages/plumed/package.py | 27 ++--------- .../builtin/packages/pmgr-collective/package.py | 27 ++--------- var/spack/repos/builtin/packages/pmix/package.py | 27 ++--------- var/spack/repos/builtin/packages/pnfft/package.py | 27 ++--------- .../repos/builtin/packages/pngwriter/package.py | 27 ++--------- var/spack/repos/builtin/packages/pnmpi/package.py | 27 ++--------- var/spack/repos/builtin/packages/poamsa/package.py | 27 ++--------- var/spack/repos/builtin/packages/pocl/package.py | 27 ++--------- .../repos/builtin/packages/polymake/package.py | 27 ++--------- .../repos/builtin/packages/poppler-data/package.py | 27 ++--------- .../repos/builtin/packages/poppler/package.py | 27 ++--------- var/spack/repos/builtin/packages/porta/package.py | 27 ++--------- .../repos/builtin/packages/portage/package.py | 27 ++--------- .../repos/builtin/packages/portcullis/package.py | 27 ++--------- .../repos/builtin/packages/postgresql/package.py | 27 ++--------- var/spack/repos/builtin/packages/ppl/package.py | 27 ++--------- .../repos/builtin/packages/pplacer/package.py | 27 ++--------- var/spack/repos/builtin/packages/prank/package.py | 27 ++--------- .../repos/builtin/packages/precice/package.py | 26 ++--------- .../repos/builtin/packages/presentproto/package.py | 27 ++--------- var/spack/repos/builtin/packages/preseq/package.py | 27 ++--------- var/spack/repos/builtin/packages/price/package.py | 27 ++--------- .../repos/builtin/packages/primer3/package.py | 27 ++--------- .../repos/builtin/packages/prinseq-lite/package.py | 27 ++--------- .../repos/builtin/packages/printproto/package.py | 27 ++--------- var/spack/repos/builtin/packages/prng/package.py | 27 ++--------- .../repos/builtin/packages/probconsrna/package.py | 27 ++--------- .../repos/builtin/packages/prodigal/package.py | 27 ++--------- var/spack/repos/builtin/packages/proj/package.py | 27 ++--------- .../repos/builtin/packages/protobuf/package.py | 27 ++--------- .../repos/builtin/packages/proxymngr/package.py | 27 ++--------- .../builtin/packages/pruners-ninja/package.py | 27 ++--------- .../repos/builtin/packages/ps-lite/package.py | 27 ++--------- var/spack/repos/builtin/packages/psi4/package.py | 27 ++--------- var/spack/repos/builtin/packages/pslib/package.py | 27 ++--------- var/spack/repos/builtin/packages/psm/package.py | 27 ++--------- var/spack/repos/builtin/packages/psmc/package.py | 27 ++--------- .../repos/builtin/packages/pstreams/package.py | 27 ++--------- .../repos/builtin/packages/pugixml/package.py | 27 ++--------- var/spack/repos/builtin/packages/pumi/package.py | 27 ++--------- var/spack/repos/builtin/packages/pv/package.py | 27 ++--------- var/spack/repos/builtin/packages/pvm/package.py | 27 ++--------- var/spack/repos/builtin/packages/pxz/package.py | 27 ++--------- .../repos/builtin/packages/py-3to2/package.py | 27 ++--------- .../builtin/packages/py-4suite-xml/package.py | 27 ++--------- .../repos/builtin/packages/py-abipy/package.py | 27 ++--------- .../repos/builtin/packages/py-adios/package.py | 27 ++--------- .../repos/builtin/packages/py-affine/package.py | 27 ++--------- .../repos/builtin/packages/py-alabaster/package.py | 27 ++--------- .../builtin/packages/py-apache-libcloud/package.py | 27 ++--------- .../repos/builtin/packages/py-apipkg/package.py | 27 ++--------- .../repos/builtin/packages/py-appdirs/package.py | 27 ++--------- .../repos/builtin/packages/py-appnope/package.py | 27 ++--------- .../builtin/packages/py-apscheduler/package.py | 27 ++--------- .../builtin/packages/py-argcomplete/package.py | 27 ++--------- .../repos/builtin/packages/py-argparse/package.py | 27 ++--------- var/spack/repos/builtin/packages/py-ase/package.py | 27 ++--------- .../builtin/packages/py-asn1crypto/package.py | 27 ++--------- .../repos/builtin/packages/py-astroid/package.py | 27 ++--------- .../repos/builtin/packages/py-astropy/package.py | 27 ++--------- .../builtin/packages/py-atomicwrites/package.py | 27 ++--------- .../repos/builtin/packages/py-attrs/package.py | 27 ++--------- .../repos/builtin/packages/py-autopep8/package.py | 27 ++--------- .../packages/py-avro-json-serializer/package.py | 27 ++--------- .../repos/builtin/packages/py-avro/package.py | 27 ++--------- .../repos/builtin/packages/py-babel/package.py | 27 ++--------- .../repos/builtin/packages/py-backcall/package.py | 27 ++--------- .../builtin/packages/py-backports-abc/package.py | 27 ++--------- .../py-backports-functools-lru-cache/package.py | 27 ++--------- .../package.py | 27 ++--------- .../py-backports-ssl-match-hostname/package.py | 27 ++--------- .../repos/builtin/packages/py-basemap/package.py | 27 ++--------- .../repos/builtin/packages/py-bcbio-gff/package.py | 27 ++--------- .../builtin/packages/py-beautifulsoup4/package.py | 27 ++--------- .../repos/builtin/packages/py-binwalk/package.py | 27 ++--------- .../builtin/packages/py-biom-format/package.py | 27 ++--------- .../repos/builtin/packages/py-biopython/package.py | 27 ++--------- .../repos/builtin/packages/py-bitarray/package.py | 27 ++--------- .../repos/builtin/packages/py-bitstring/package.py | 27 ++--------- .../repos/builtin/packages/py-bleach/package.py | 27 ++--------- .../repos/builtin/packages/py-blessings/package.py | 27 ++--------- .../repos/builtin/packages/py-bokeh/package.py | 27 ++--------- .../repos/builtin/packages/py-boltons/package.py | 27 ++--------- .../builtin/packages/py-bottleneck/package.py | 27 ++--------- .../repos/builtin/packages/py-breakseq2/package.py | 27 ++--------- .../repos/builtin/packages/py-brian/package.py | 27 ++--------- .../repos/builtin/packages/py-brian2/package.py | 27 ++--------- .../repos/builtin/packages/py-bsddb3/package.py | 27 ++--------- .../repos/builtin/packages/py-bx-python/package.py | 27 ++--------- .../repos/builtin/packages/py-cartopy/package.py | 27 ++--------- .../repos/builtin/packages/py-cclib/package.py | 27 ++--------- .../repos/builtin/packages/py-cdat-lite/package.py | 27 ++--------- var/spack/repos/builtin/packages/py-cdo/package.py | 27 ++--------- .../repos/builtin/packages/py-certifi/package.py | 27 ++--------- .../repos/builtin/packages/py-cffi/package.py | 27 ++--------- .../repos/builtin/packages/py-chardet/package.py | 27 ++--------- .../builtin/packages/py-checkm-genome/package.py | 27 ++--------- .../repos/builtin/packages/py-cheetah/package.py | 27 ++--------- .../repos/builtin/packages/py-click/package.py | 27 ++--------- .../repos/builtin/packages/py-cligj/package.py | 27 ++--------- .../builtin/packages/py-cloudpickle/package.py | 27 ++--------- .../repos/builtin/packages/py-cogent/package.py | 27 ++--------- .../repos/builtin/packages/py-colorama/package.py | 27 ++--------- .../repos/builtin/packages/py-colormath/package.py | 27 ++--------- .../builtin/packages/py-configparser/package.py | 27 ++--------- .../repos/builtin/packages/py-counter/package.py | 27 ++--------- .../repos/builtin/packages/py-coverage/package.py | 27 ++--------- .../repos/builtin/packages/py-cpuinfo/package.py | 27 ++--------- .../builtin/packages/py-crispresso/package.py | 27 ++--------- .../builtin/packages/py-cryptography/package.py | 27 ++--------- .../repos/builtin/packages/py-csvkit/package.py | 27 ++--------- .../repos/builtin/packages/py-current/package.py | 27 ++--------- .../repos/builtin/packages/py-cutadapt/package.py | 27 ++--------- .../repos/builtin/packages/py-cvxopt/package.py | 27 ++--------- .../repos/builtin/packages/py-cycler/package.py | 27 ++--------- .../repos/builtin/packages/py-cython/package.py | 27 ++--------- .../repos/builtin/packages/py-dask/package.py | 27 ++--------- .../repos/builtin/packages/py-dateutil/package.py | 27 ++--------- var/spack/repos/builtin/packages/py-dbf/package.py | 27 ++--------- .../repos/builtin/packages/py-decorator/package.py | 27 ++--------- .../repos/builtin/packages/py-deeptools/package.py | 27 ++--------- .../repos/builtin/packages/py-dendropy/package.py | 27 ++--------- .../repos/builtin/packages/py-dill/package.py | 27 ++--------- .../repos/builtin/packages/py-discover/package.py | 27 ++--------- .../repos/builtin/packages/py-dlcpar/package.py | 27 ++--------- .../repos/builtin/packages/py-docopt/package.py | 27 ++--------- .../repos/builtin/packages/py-docutils/package.py | 27 ++--------- .../repos/builtin/packages/py-doxypy/package.py | 27 ++--------- .../repos/builtin/packages/py-doxypypy/package.py | 27 ++--------- .../repos/builtin/packages/py-dryscrape/package.py | 27 ++--------- .../repos/builtin/packages/py-dxchange/package.py | 27 ++--------- .../repos/builtin/packages/py-dxfile/package.py | 27 ++--------- .../packages/py-easybuild-easyblocks/package.py | 25 ++-------- .../packages/py-easybuild-easyconfigs/package.py | 25 ++-------- .../packages/py-easybuild-framework/package.py | 25 ++-------- .../repos/builtin/packages/py-edffile/package.py | 27 ++--------- .../builtin/packages/py-editdistance/package.py | 27 ++--------- .../builtin/packages/py-elasticsearch/package.py | 27 ++--------- .../repos/builtin/packages/py-elephant/package.py | 27 ++--------- .../repos/builtin/packages/py-emcee/package.py | 27 ++--------- .../builtin/packages/py-entrypoints/package.py | 27 ++--------- .../repos/builtin/packages/py-enum34/package.py | 27 ++--------- .../repos/builtin/packages/py-epydoc/package.py | 27 ++--------- .../repos/builtin/packages/py-espresso/package.py | 27 ++--------- .../builtin/packages/py-espressopp/package.py | 27 ++--------- .../builtin/packages/py-et-xmlfile/package.py | 27 ++--------- .../repos/builtin/packages/py-eventlet/package.py | 26 ++--------- .../repos/builtin/packages/py-execnet/package.py | 27 ++--------- .../builtin/packages/py-fastaindex/package.py | 27 ++--------- .../repos/builtin/packages/py-fasteners/package.py | 27 ++--------- .../builtin/packages/py-faststructure/package.py | 27 ++--------- .../repos/builtin/packages/py-filelock/package.py | 27 ++--------- .../builtin/packages/py-fiscalyear/package.py | 27 ++--------- .../builtin/packages/py-flake8-polyfill/package.py | 27 ++--------- .../repos/builtin/packages/py-flake8/package.py | 27 ++--------- .../builtin/packages/py-flask-compress/package.py | 27 ++--------- .../builtin/packages/py-flask-socketio/package.py | 27 ++--------- .../repos/builtin/packages/py-flask/package.py | 27 ++--------- .../repos/builtin/packages/py-flexx/package.py | 27 ++--------- var/spack/repos/builtin/packages/py-fn/package.py | 27 ++--------- .../repos/builtin/packages/py-fparser/package.py | 27 ++--------- .../repos/builtin/packages/py-funcsigs/package.py | 27 ++--------- .../builtin/packages/py-functools32/package.py | 27 ++--------- .../repos/builtin/packages/py-future/package.py | 27 ++--------- .../repos/builtin/packages/py-futures/package.py | 27 ++--------- .../repos/builtin/packages/py-gdbgui/package.py | 27 ++--------- .../repos/builtin/packages/py-genders/package.py | 27 ++--------- .../repos/builtin/packages/py-genshi/package.py | 27 ++--------- .../repos/builtin/packages/py-gevent/package.py | 27 ++--------- .../builtin/packages/py-git-review/package.py | 27 ++--------- .../repos/builtin/packages/py-git2/package.py | 27 ++--------- .../repos/builtin/packages/py-gnuplot/package.py | 27 ++--------- .../repos/builtin/packages/py-goatools/package.py | 27 ++--------- .../repos/builtin/packages/py-gpaw/package.py | 27 ++--------- .../repos/builtin/packages/py-greenlet/package.py | 26 ++--------- .../builtin/packages/py-griddataformats/package.py | 27 ++--------- .../repos/builtin/packages/py-guidata/package.py | 27 ++--------- .../repos/builtin/packages/py-guiqwt/package.py | 27 ++--------- .../repos/builtin/packages/py-h5py/package.py | 27 ++--------- .../repos/builtin/packages/py-html2text/package.py | 27 ++--------- .../repos/builtin/packages/py-html5lib/package.py | 27 ++--------- .../repos/builtin/packages/py-htseq/package.py | 27 ++--------- .../repos/builtin/packages/py-httpbin/package.py | 27 ++--------- .../builtin/packages/py-hypothesis/package.py | 27 ++--------- .../repos/builtin/packages/py-idna/package.py | 27 ++--------- .../repos/builtin/packages/py-igraph/package.py | 27 ++--------- .../builtin/packages/py-illumina-utils/package.py | 27 ++--------- .../repos/builtin/packages/py-imageio/package.py | 27 ++--------- .../repos/builtin/packages/py-imagesize/package.py | 27 ++--------- .../repos/builtin/packages/py-iminuit/package.py | 27 ++--------- .../repos/builtin/packages/py-importlib/package.py | 27 ++--------- .../repos/builtin/packages/py-ipaddress/package.py | 27 ++--------- .../repos/builtin/packages/py-ipdb/package.py | 27 ++--------- .../repos/builtin/packages/py-ipykernel/package.py | 27 ++--------- .../packages/py-ipython-genutils/package.py | 27 ++--------- .../repos/builtin/packages/py-ipython/package.py | 27 ++--------- .../builtin/packages/py-ipywidgets/package.py | 27 ++--------- .../repos/builtin/packages/py-isort/package.py | 27 ++--------- .../builtin/packages/py-itsdangerous/package.py | 27 ++--------- .../repos/builtin/packages/py-jdcal/package.py | 27 ++--------- .../repos/builtin/packages/py-jedi/package.py | 27 ++--------- .../repos/builtin/packages/py-jinja2/package.py | 27 ++--------- .../repos/builtin/packages/py-joblib/package.py | 27 ++--------- .../repos/builtin/packages/py-jprops/package.py | 27 ++--------- .../repos/builtin/packages/py-jpype/package.py | 27 ++--------- .../builtin/packages/py-jsonschema/package.py | 27 ++--------- .../repos/builtin/packages/py-junit-xml/package.py | 27 ++--------- .../builtin/packages/py-jupyter-client/package.py | 27 ++--------- .../builtin/packages/py-jupyter-console/package.py | 27 ++--------- .../builtin/packages/py-jupyter-core/package.py | 27 ++--------- .../packages/py-jupyter-notebook/package.py | 27 ++--------- .../repos/builtin/packages/py-keras/package.py | 27 ++--------- .../builtin/packages/py-kiwisolver/package.py | 27 ++--------- .../builtin/packages/py-lark-parser/package.py | 27 ++--------- .../builtin/packages/py-latexcodec/package.py | 27 ++--------- .../packages/py-lazy-object-proxy/package.py | 27 ++--------- .../builtin/packages/py-lazy-property/package.py | 27 ++--------- .../repos/builtin/packages/py-lazy/package.py | 27 ++--------- .../repos/builtin/packages/py-lazyarray/package.py | 27 ++--------- .../repos/builtin/packages/py-libconf/package.py | 27 ++--------- .../builtin/packages/py-libensemble/package.py | 27 ++--------- .../builtin/packages/py-line-profiler/package.py | 27 ++--------- .../builtin/packages/py-linecache2/package.py | 27 ++--------- var/spack/repos/builtin/packages/py-lit/package.py | 27 ++--------- .../repos/builtin/packages/py-llvmlite/package.py | 27 ++--------- .../repos/builtin/packages/py-lmfit/package.py | 27 ++--------- .../builtin/packages/py-localcider/package.py | 27 ++--------- .../repos/builtin/packages/py-locket/package.py | 27 ++--------- .../repos/builtin/packages/py-lockfile/package.py | 27 ++--------- .../builtin/packages/py-logilab-common/package.py | 27 ++--------- .../repos/builtin/packages/py-lrudict/package.py | 27 ++--------- .../repos/builtin/packages/py-lxml/package.py | 27 ++--------- .../repos/builtin/packages/py-lzstring/package.py | 27 ++--------- .../repos/builtin/packages/py-macholib/package.py | 27 ++--------- .../builtin/packages/py-machotools/package.py | 27 ++--------- .../repos/builtin/packages/py-macs2/package.py | 27 ++--------- .../repos/builtin/packages/py-maestrowf/package.py | 27 ++--------- .../repos/builtin/packages/py-mako/package.py | 27 ++--------- .../repos/builtin/packages/py-mappy/package.py | 27 ++--------- .../repos/builtin/packages/py-markdown/package.py | 27 ++--------- .../builtin/packages/py-markupsafe/package.py | 27 ++--------- .../builtin/packages/py-matplotlib/package.py | 27 ++--------- .../repos/builtin/packages/py-mccabe/package.py | 27 ++--------- .../builtin/packages/py-mdanalysis/package.py | 27 ++--------- .../repos/builtin/packages/py-meep/package.py | 27 ++--------- .../builtin/packages/py-memory-profiler/package.py | 27 ++--------- .../builtin/packages/py-methylcode/package.py | 27 ++--------- .../builtin/packages/py-mg-rast-tools/package.py | 27 ++--------- .../repos/builtin/packages/py-misopy/package.py | 27 ++--------- .../repos/builtin/packages/py-mistune/package.py | 27 ++--------- .../repos/builtin/packages/py-mock/package.py | 27 ++--------- .../builtin/packages/py-moltemplate/package.py | 27 ++--------- .../repos/builtin/packages/py-mongo/package.py | 27 ++--------- .../repos/builtin/packages/py-monotonic/package.py | 27 ++--------- .../repos/builtin/packages/py-monty/package.py | 27 ++--------- .../builtin/packages/py-more-itertools/package.py | 27 ++--------- .../repos/builtin/packages/py-mpi4py/package.py | 27 ++--------- .../repos/builtin/packages/py-mpmath/package.py | 27 ++--------- .../builtin/packages/py-multiprocess/package.py | 27 ++--------- .../repos/builtin/packages/py-multiqc/package.py | 27 ++--------- var/spack/repos/builtin/packages/py-mx/package.py | 27 ++--------- .../repos/builtin/packages/py-mxnet/package.py | 27 ++--------- .../repos/builtin/packages/py-myhdl/package.py | 27 ++--------- .../repos/builtin/packages/py-mysqldb1/package.py | 27 ++--------- .../repos/builtin/packages/py-natsort/package.py | 27 ++--------- .../repos/builtin/packages/py-nbconvert/package.py | 27 ++--------- .../repos/builtin/packages/py-nbformat/package.py | 27 ++--------- var/spack/repos/builtin/packages/py-neo/package.py | 27 ++--------- .../repos/builtin/packages/py-nestle/package.py | 27 ++--------- .../repos/builtin/packages/py-netcdf4/package.py | 27 ++--------- .../repos/builtin/packages/py-netifaces/package.py | 27 ++--------- .../repos/builtin/packages/py-networkx/package.py | 27 ++--------- .../repos/builtin/packages/py-nose/package.py | 27 ++--------- .../builtin/packages/py-nosexcover/package.py | 27 ++--------- .../repos/builtin/packages/py-numba/package.py | 27 ++--------- .../repos/builtin/packages/py-numexpr/package.py | 27 ++--------- .../repos/builtin/packages/py-numexpr3/package.py | 27 ++--------- .../repos/builtin/packages/py-numpy/package.py | 27 ++--------- .../repos/builtin/packages/py-numpydoc/package.py | 27 ++--------- .../repos/builtin/packages/py-olefile/package.py | 27 ++--------- .../builtin/packages/py-ont-fast5-api/package.py | 27 ++--------- .../packages/py-openpmd-validator/package.py | 27 ++--------- .../repos/builtin/packages/py-openpyxl/package.py | 27 ++--------- .../packages/py-openslide-python/package.py | 27 ++--------- .../repos/builtin/packages/py-opentuner/package.py | 27 ++--------- .../builtin/packages/py-ordereddict/package.py | 27 ++--------- .../repos/builtin/packages/py-oset/package.py | 27 ++--------- .../repos/builtin/packages/py-owslib/package.py | 27 ++--------- .../repos/builtin/packages/py-packaging/package.py | 27 ++--------- .../builtin/packages/py-palettable/package.py | 27 ++--------- .../repos/builtin/packages/py-pandas/package.py | 27 ++--------- .../repos/builtin/packages/py-paramiko/package.py | 27 ++--------- .../repos/builtin/packages/py-partd/package.py | 27 ++--------- .../repos/builtin/packages/py-pathlib2/package.py | 27 ++--------- .../repos/builtin/packages/py-pathos/package.py | 27 ++--------- .../repos/builtin/packages/py-pathspec/package.py | 27 ++--------- .../repos/builtin/packages/py-patsy/package.py | 27 ++--------- var/spack/repos/builtin/packages/py-pbr/package.py | 27 ++--------- .../builtin/packages/py-pep8-naming/package.py | 27 ++--------- .../repos/builtin/packages/py-perf/package.py | 27 ++--------- .../builtin/packages/py-performance/package.py | 27 ++--------- .../builtin/packages/py-periodictable/package.py | 27 ++--------- .../repos/builtin/packages/py-petsc4py/package.py | 27 ++--------- .../repos/builtin/packages/py-pexpect/package.py | 27 ++--------- .../repos/builtin/packages/py-phonopy/package.py | 27 ++--------- .../builtin/packages/py-pickleshare/package.py | 27 ++--------- .../repos/builtin/packages/py-picrust/package.py | 27 ++--------- var/spack/repos/builtin/packages/py-pil/package.py | 27 ++--------- .../repos/builtin/packages/py-pillow/package.py | 27 ++--------- var/spack/repos/builtin/packages/py-pip/package.py | 27 ++--------- .../repos/builtin/packages/py-pipits/package.py | 27 ++--------- .../repos/builtin/packages/py-pkgconfig/package.py | 27 ++--------- .../repos/builtin/packages/py-plotly/package.py | 27 ++--------- .../repos/builtin/packages/py-pluggy/package.py | 27 ++--------- var/spack/repos/builtin/packages/py-ply/package.py | 27 ++--------- var/spack/repos/builtin/packages/py-pmw/package.py | 27 ++--------- .../repos/builtin/packages/py-poster/package.py | 27 ++--------- var/spack/repos/builtin/packages/py-pox/package.py | 27 ++--------- .../repos/builtin/packages/py-ppft/package.py | 27 ++--------- .../builtin/packages/py-prettytable/package.py | 27 ++--------- .../repos/builtin/packages/py-progress/package.py | 27 ++--------- .../repos/builtin/packages/py-proj/package.py | 27 ++--------- .../repos/builtin/packages/py-projectq/package.py | 27 ++--------- .../builtin/packages/py-prompt-toolkit/package.py | 27 ++--------- .../repos/builtin/packages/py-protobuf/package.py | 27 ++--------- .../repos/builtin/packages/py-psutil/package.py | 27 ++--------- .../repos/builtin/packages/py-psyclone/package.py | 27 ++--------- .../builtin/packages/py-ptyprocess/package.py | 27 ++--------- .../repos/builtin/packages/py-pudb/package.py | 27 ++--------- var/spack/repos/builtin/packages/py-py/package.py | 27 ++--------- .../repos/builtin/packages/py-py2bit/package.py | 27 ++--------- .../repos/builtin/packages/py-py2cairo/package.py | 27 ++--------- .../repos/builtin/packages/py-py2neo/package.py | 27 ++--------- .../repos/builtin/packages/py-py4j/package.py | 27 ++--------- .../repos/builtin/packages/py-pyani/package.py | 27 ++--------- .../repos/builtin/packages/py-pyasn1/package.py | 27 ++--------- .../repos/builtin/packages/py-pybigwig/package.py | 27 ++--------- .../repos/builtin/packages/py-pybind11/package.py | 27 ++--------- .../builtin/packages/py-pybtex-docutils/package.py | 27 ++--------- .../repos/builtin/packages/py-pybtex/package.py | 27 ++--------- .../repos/builtin/packages/py-pycairo/package.py | 27 ++--------- .../repos/builtin/packages/py-pychecker/package.py | 27 ++--------- .../builtin/packages/py-pycodestyle/package.py | 27 ++--------- .../repos/builtin/packages/py-pycparser/package.py | 27 ++--------- .../repos/builtin/packages/py-pycrypto/package.py | 27 ++--------- .../repos/builtin/packages/py-pycurl/package.py | 27 ++--------- .../repos/builtin/packages/py-pydatalog/package.py | 27 ++--------- .../builtin/packages/py-pydispatcher/package.py | 27 ++--------- .../repos/builtin/packages/py-pydot/package.py | 27 ++--------- .../builtin/packages/py-pyelftools/package.py | 27 ++--------- .../repos/builtin/packages/py-pyepsg/package.py | 27 ++--------- .../repos/builtin/packages/py-pyfasta/package.py | 27 ++--------- .../repos/builtin/packages/py-pyfftw/package.py | 27 ++--------- .../repos/builtin/packages/py-pyflakes/package.py | 27 ++--------- .../repos/builtin/packages/py-pygdbmi/package.py | 27 ++--------- .../repos/builtin/packages/py-pygments/package.py | 27 ++--------- .../repos/builtin/packages/py-pygobject/package.py | 27 ++--------- .../repos/builtin/packages/py-pygpu/package.py | 27 ++--------- .../repos/builtin/packages/py-pygtk/package.py | 27 ++--------- .../repos/builtin/packages/py-pylint/package.py | 27 ++--------- .../repos/builtin/packages/py-pymatgen/package.py | 27 ++--------- .../builtin/packages/py-pyminifier/package.py | 27 ++--------- .../repos/builtin/packages/py-pymol/package.py | 27 ++--------- .../repos/builtin/packages/py-pympler/package.py | 27 ++--------- .../repos/builtin/packages/py-pymysql/package.py | 27 ++--------- .../repos/builtin/packages/py-pynn/package.py | 27 ++--------- .../repos/builtin/packages/py-pypar/package.py | 27 ++--------- .../repos/builtin/packages/py-pyparsing/package.py | 27 ++--------- .../repos/builtin/packages/py-pypeflow/package.py | 27 ++--------- .../builtin/packages/py-pyprof2html/package.py | 27 ++--------- .../repos/builtin/packages/py-pyqi/package.py | 27 ++--------- .../repos/builtin/packages/py-pyqt/package.py | 27 ++--------- .../repos/builtin/packages/py-pyrad/package.py | 27 ++--------- .../repos/builtin/packages/py-pysam/package.py | 27 ++--------- .../repos/builtin/packages/py-pyscaf/package.py | 27 ++--------- .../repos/builtin/packages/py-pyserial/package.py | 27 ++--------- .../repos/builtin/packages/py-pyshp/package.py | 27 ++--------- .../repos/builtin/packages/py-pyside/package.py | 27 ++--------- .../repos/builtin/packages/py-pysocks/package.py | 27 ++--------- .../repos/builtin/packages/py-pyspark/package.py | 27 ++--------- .../repos/builtin/packages/py-pysqlite/package.py | 27 ++--------- .../repos/builtin/packages/py-pytables/package.py | 27 ++--------- .../builtin/packages/py-pytest-cov/package.py | 27 ++--------- .../builtin/packages/py-pytest-flake8/package.py | 27 ++--------- .../builtin/packages/py-pytest-httpbin/package.py | 27 ++--------- .../builtin/packages/py-pytest-mock/package.py | 27 ++--------- .../builtin/packages/py-pytest-runner/package.py | 27 ++--------- .../builtin/packages/py-pytest-xdist/package.py | 27 ++--------- .../repos/builtin/packages/py-pytest/package.py | 27 ++--------- .../builtin/packages/py-python-daemon/package.py | 27 ++--------- .../builtin/packages/py-python-engineio/package.py | 27 ++--------- .../builtin/packages/py-python-gitlab/package.py | 27 ++--------- .../packages/py-python-levenshtein/package.py | 27 ++--------- .../builtin/packages/py-python-socketio/package.py | 27 ++--------- .../repos/builtin/packages/py-pythonqwt/package.py | 27 ++--------- .../repos/builtin/packages/py-pytorch/package.py | 27 ++--------- .../repos/builtin/packages/py-pytz/package.py | 27 ++--------- .../repos/builtin/packages/py-pyutilib/package.py | 27 ++--------- .../builtin/packages/py-pywavelets/package.py | 27 ++--------- .../repos/builtin/packages/py-pyyaml/package.py | 27 ++--------- .../repos/builtin/packages/py-qtawesome/package.py | 27 ++--------- .../repos/builtin/packages/py-qtconsole/package.py | 27 ++--------- .../repos/builtin/packages/py-qtpy/package.py | 27 ++--------- .../builtin/packages/py-quantities/package.py | 27 ++--------- .../repos/builtin/packages/py-quast/package.py | 27 ++--------- .../builtin/packages/py-radical-utils/package.py | 27 ++--------- .../repos/builtin/packages/py-ranger/package.py | 27 ++--------- .../repos/builtin/packages/py-rasterio/package.py | 27 ++--------- .../builtin/packages/py-readme-renderer/package.py | 27 ++--------- .../repos/builtin/packages/py-regex/package.py | 27 ++--------- .../repos/builtin/packages/py-reportlab/package.py | 27 ++--------- .../packages/py-requests-toolbelt/package.py | 27 ++--------- .../repos/builtin/packages/py-requests/package.py | 27 ++--------- .../repos/builtin/packages/py-restview/package.py | 27 ++--------- .../repos/builtin/packages/py-rope/package.py | 27 ++--------- .../repos/builtin/packages/py-rpy2/package.py | 27 ++--------- var/spack/repos/builtin/packages/py-rsa/package.py | 27 ++--------- .../repos/builtin/packages/py-rseqc/package.py | 27 ++--------- .../repos/builtin/packages/py-rtree/package.py | 27 ++--------- .../builtin/packages/py-saga-python/package.py | 27 ++--------- .../repos/builtin/packages/py-scandir/package.py | 27 ++--------- .../packages/py-scientificpython/package.py | 27 ++--------- .../builtin/packages/py-scikit-image/package.py | 27 ++--------- .../builtin/packages/py-scikit-learn/package.py | 27 ++--------- .../repos/builtin/packages/py-scipy/package.py | 27 ++--------- .../repos/builtin/packages/py-seaborn/package.py | 27 ++--------- .../builtin/packages/py-setuptools-git/package.py | 27 ++--------- .../builtin/packages/py-setuptools-scm/package.py | 27 ++--------- .../builtin/packages/py-setuptools/package.py | 27 ++--------- .../repos/builtin/packages/py-sfepy/package.py | 27 ++--------- var/spack/repos/builtin/packages/py-sh/package.py | 27 ++--------- .../repos/builtin/packages/py-shapely/package.py | 27 ++--------- .../repos/builtin/packages/py-shiboken/package.py | 27 ++--------- .../builtin/packages/py-simplegeneric/package.py | 27 ++--------- .../builtin/packages/py-simplejson/package.py | 27 ++--------- .../builtin/packages/py-singledispatch/package.py | 27 ++--------- var/spack/repos/builtin/packages/py-sip/package.py | 27 ++--------- var/spack/repos/builtin/packages/py-six/package.py | 27 ++--------- .../repos/builtin/packages/py-slepc4py/package.py | 27 ++--------- .../builtin/packages/py-slurm-pipeline/package.py | 27 ++--------- .../repos/builtin/packages/py-sncosmo/package.py | 27 ++--------- .../builtin/packages/py-snowballstemmer/package.py | 27 ++--------- .../repos/builtin/packages/py-snuggs/package.py | 27 ++--------- .../repos/builtin/packages/py-spectra/package.py | 27 ++--------- .../repos/builtin/packages/py-spefile/package.py | 27 ++--------- .../repos/builtin/packages/py-spglib/package.py | 27 ++--------- .../packages/py-sphinx-bootstrap-theme/package.py | 27 ++--------- .../packages/py-sphinx-rtd-theme/package.py | 27 ++--------- .../repos/builtin/packages/py-sphinx/package.py | 27 ++--------- .../packages/py-sphinxcontrib-bibtex/package.py | 27 ++--------- .../py-sphinxcontrib-programoutput/package.py | 27 ++--------- .../py-sphinxcontrib-websupport/package.py | 27 ++--------- .../repos/builtin/packages/py-spyder/package.py | 27 ++--------- .../builtin/packages/py-spykeutils/package.py | 27 ++--------- .../builtin/packages/py-sqlalchemy/package.py | 27 ++--------- .../builtin/packages/py-statsmodels/package.py | 27 ++--------- .../repos/builtin/packages/py-stevedore/package.py | 27 ++--------- .../repos/builtin/packages/py-storm/package.py | 27 ++--------- .../builtin/packages/py-subprocess32/package.py | 27 ++--------- .../repos/builtin/packages/py-symengine/package.py | 27 ++--------- .../repos/builtin/packages/py-symfit/package.py | 27 ++--------- .../repos/builtin/packages/py-sympy/package.py | 27 ++--------- .../repos/builtin/packages/py-tabulate/package.py | 27 ++--------- .../repos/builtin/packages/py-tappy/package.py | 27 ++--------- .../repos/builtin/packages/py-terminado/package.py | 27 ++--------- .../repos/builtin/packages/py-testinfra/package.py | 27 ++--------- .../repos/builtin/packages/py-tetoolkit/package.py | 27 ++--------- .../repos/builtin/packages/py-theano/package.py | 27 ++--------- .../repos/builtin/packages/py-tifffile/package.py | 27 ++--------- .../repos/builtin/packages/py-toml/package.py | 27 ++--------- .../repos/builtin/packages/py-tomopy/package.py | 27 ++--------- .../repos/builtin/packages/py-toolz/package.py | 27 ++--------- .../repos/builtin/packages/py-tornado/package.py | 27 ++--------- .../repos/builtin/packages/py-tqdm/package.py | 27 ++--------- .../builtin/packages/py-traceback2/package.py | 27 ++--------- .../repos/builtin/packages/py-traitlets/package.py | 27 ++--------- .../repos/builtin/packages/py-tuiview/package.py | 27 ++--------- .../repos/builtin/packages/py-twisted/package.py | 27 ++--------- .../repos/builtin/packages/py-typing/package.py | 27 ++--------- .../repos/builtin/packages/py-tzlocal/package.py | 27 ++--------- .../repos/builtin/packages/py-udunits/package.py | 27 ++--------- .../repos/builtin/packages/py-umi-tools/package.py | 27 ++--------- .../repos/builtin/packages/py-unittest2/package.py | 27 ++--------- .../builtin/packages/py-unittest2py3k/package.py | 27 ++--------- .../repos/builtin/packages/py-urllib3/package.py | 27 ++--------- .../repos/builtin/packages/py-urwid/package.py | 27 ++--------- .../builtin/packages/py-vcversioner/package.py | 27 ++--------- .../packages/py-virtualenv-clone/package.py | 27 ++--------- .../builtin/packages/py-virtualenv/package.py | 27 ++--------- .../packages/py-virtualenvwrapper/package.py | 27 ++--------- .../repos/builtin/packages/py-vsc-base/package.py | 26 ++--------- .../builtin/packages/py-vsc-install/package.py | 25 ++-------- .../repos/builtin/packages/py-wcsaxes/package.py | 27 ++--------- .../repos/builtin/packages/py-wcwidth/package.py | 27 ++--------- .../builtin/packages/py-webkit-server/package.py | 27 ++--------- .../repos/builtin/packages/py-weblogo/package.py | 27 ++--------- .../repos/builtin/packages/py-werkzeug/package.py | 27 ++--------- .../repos/builtin/packages/py-wheel/package.py | 27 ++--------- .../packages/py-widgetsnbextension/package.py | 27 ++--------- .../repos/builtin/packages/py-wrapt/package.py | 27 ++--------- .../repos/builtin/packages/py-xarray/package.py | 27 ++--------- .../repos/builtin/packages/py-xattr/package.py | 27 ++--------- .../repos/builtin/packages/py-xdot/package.py | 27 ++--------- .../repos/builtin/packages/py-xlrd/package.py | 27 ++--------- .../builtin/packages/py-xlsxwriter/package.py | 27 ++--------- .../repos/builtin/packages/py-xmlrunner/package.py | 27 ++--------- .../repos/builtin/packages/py-xopen/package.py | 27 ++--------- .../repos/builtin/packages/py-xpyb/package.py | 27 ++--------- .../builtin/packages/py-xvfbwrapper/package.py | 27 ++--------- .../builtin/packages/py-yamlreader/package.py | 27 ++--------- .../repos/builtin/packages/py-yapf/package.py | 27 ++--------- var/spack/repos/builtin/packages/py-yt/package.py | 27 ++--------- .../repos/builtin/packages/py-ytopt/package.py | 27 ++--------- var/spack/repos/builtin/packages/py-zmq/package.py | 27 ++--------- .../builtin/packages/py-zope-event/package.py | 27 ++--------- .../builtin/packages/py-zope-interface/package.py | 27 ++--------- .../repos/builtin/packages/pythia6/package.py | 26 ++--------- var/spack/repos/builtin/packages/python/package.py | 27 ++--------- var/spack/repos/builtin/packages/qbank/package.py | 27 ++--------- var/spack/repos/builtin/packages/qbox/package.py | 27 ++--------- var/spack/repos/builtin/packages/qhull/package.py | 27 ++--------- .../repos/builtin/packages/qmcpack/package.py | 27 ++--------- .../repos/builtin/packages/qmd-progress/package.py | 27 ++--------- var/spack/repos/builtin/packages/qorts/package.py | 27 ++--------- .../repos/builtin/packages/qrupdate/package.py | 27 ++--------- .../repos/builtin/packages/qt-creator/package.py | 27 ++--------- var/spack/repos/builtin/packages/qt/package.py | 27 ++--------- .../repos/builtin/packages/qtgraph/package.py | 44 ++---------------- .../repos/builtin/packages/qthreads/package.py | 27 ++--------- .../builtin/packages/quantum-espresso/package.py | 27 ++--------- var/spack/repos/builtin/packages/quinoa/package.py | 27 ++--------- var/spack/repos/builtin/packages/qwt/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-a4/package.py | 27 ++--------- .../repos/builtin/packages/r-a4base/package.py | 27 ++--------- .../repos/builtin/packages/r-a4classif/package.py | 27 ++--------- .../repos/builtin/packages/r-a4core/package.py | 27 ++--------- .../repos/builtin/packages/r-a4preproc/package.py | 27 ++--------- .../builtin/packages/r-a4reporting/package.py | 27 ++--------- .../repos/builtin/packages/r-abadata/package.py | 27 ++--------- .../builtin/packages/r-abaenrichment/package.py | 27 ++--------- .../repos/builtin/packages/r-abind/package.py | 27 ++--------- .../repos/builtin/packages/r-absseq/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-acde/package.py | 27 ++--------- .../repos/builtin/packages/r-acepack/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-acgh/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-acme/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-ada/package.py | 27 ++--------- .../repos/builtin/packages/r-adabag/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-ade4/package.py | 27 ++--------- .../repos/builtin/packages/r-adegenet/package.py | 27 ++--------- .../repos/builtin/packages/r-adsplit/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-aer/package.py | 27 ++--------- .../repos/builtin/packages/r-affxparser/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-affy/package.py | 27 ++--------- .../repos/builtin/packages/r-affycomp/package.py | 27 ++--------- .../builtin/packages/r-affycompatible/package.py | 27 ++--------- .../repos/builtin/packages/r-affycontam/package.py | 27 ++--------- .../builtin/packages/r-affycoretools/package.py | 27 ++--------- .../repos/builtin/packages/r-affydata/package.py | 27 ++--------- .../builtin/packages/r-affyexpress/package.py | 27 ++--------- .../repos/builtin/packages/r-affyilm/package.py | 27 ++--------- .../repos/builtin/packages/r-affyio/package.py | 27 ++--------- .../repos/builtin/packages/r-affypdnn/package.py | 27 ++--------- .../repos/builtin/packages/r-affyplm/package.py | 27 ++--------- .../builtin/packages/r-affyqcreport/package.py | 27 ++--------- .../packages/r-affyrnadegradation/package.py | 27 ++--------- .../repos/builtin/packages/r-agdex/package.py | 27 ++--------- .../repos/builtin/packages/r-agilp/package.py | 27 ++--------- .../builtin/packages/r-agimicrorna/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-aims/package.py | 27 ++--------- .../repos/builtin/packages/r-aldex2/package.py | 27 ++--------- .../builtin/packages/r-allelicimbalance/package.py | 27 ++--------- .../repos/builtin/packages/r-alpine/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-als/package.py | 27 ++--------- .../repos/builtin/packages/r-alsace/package.py | 27 ++--------- .../repos/builtin/packages/r-altcdfenvs/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-amap/package.py | 27 ++--------- .../repos/builtin/packages/r-ampliqueso/package.py | 27 ++--------- .../packages/r-analysispageserver/package.py | 27 ++--------- .../repos/builtin/packages/r-anaquin/package.py | 27 ++--------- .../repos/builtin/packages/r-aneufinder/package.py | 27 ++--------- .../builtin/packages/r-aneufinderdata/package.py | 27 ++--------- .../repos/builtin/packages/r-animation/package.py | 27 ++--------- .../repos/builtin/packages/r-annaffy/package.py | 27 ++--------- .../repos/builtin/packages/r-annotate/package.py | 27 ++--------- .../builtin/packages/r-annotationdbi/package.py | 27 ++--------- .../builtin/packages/r-annotationfilter/package.py | 27 ++--------- .../builtin/packages/r-annotationforge/package.py | 27 ++--------- .../builtin/packages/r-annotationhub/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-ape/package.py | 27 ++--------- .../repos/builtin/packages/r-argparse/package.py | 27 ++--------- .../repos/builtin/packages/r-assertthat/package.py | 27 ++--------- .../repos/builtin/packages/r-backports/package.py | 27 ++--------- .../repos/builtin/packages/r-bamsignals/package.py | 27 ++--------- .../repos/builtin/packages/r-base64/package.py | 27 ++--------- .../repos/builtin/packages/r-base64enc/package.py | 27 ++--------- .../repos/builtin/packages/r-bbmisc/package.py | 27 ++--------- .../repos/builtin/packages/r-beanplot/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-bh/package.py | 27 ++--------- .../repos/builtin/packages/r-biasedurn/package.py | 27 ++--------- .../repos/builtin/packages/r-bindr/package.py | 27 ++--------- .../repos/builtin/packages/r-bindrcpp/package.py | 27 ++--------- .../repos/builtin/packages/r-biobase/package.py | 27 ++--------- .../builtin/packages/r-biocgenerics/package.py | 27 ++--------- .../builtin/packages/r-biocinstaller/package.py | 27 ++--------- .../builtin/packages/r-biocparallel/package.py | 27 ++--------- .../repos/builtin/packages/r-biocstyle/package.py | 27 ++--------- .../repos/builtin/packages/r-biom-utils/package.py | 27 ++--------- .../repos/builtin/packages/r-biomart/package.py | 27 ++--------- .../repos/builtin/packages/r-biomformat/package.py | 27 ++--------- .../repos/builtin/packages/r-biostrings/package.py | 27 ++--------- .../repos/builtin/packages/r-biovizbase/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-bit/package.py | 27 ++--------- .../repos/builtin/packages/r-bit64/package.py | 27 ++--------- .../repos/builtin/packages/r-bitops/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-blob/package.py | 27 ++--------- .../repos/builtin/packages/r-bookdown/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-boot/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-brew/package.py | 27 ++--------- .../repos/builtin/packages/r-broom/package.py | 27 ++--------- .../repos/builtin/packages/r-bsgenome/package.py | 27 ++--------- .../repos/builtin/packages/r-bumphunter/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-c50/package.py | 27 ++--------- .../repos/builtin/packages/r-callr/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-car/package.py | 27 ++--------- .../repos/builtin/packages/r-caret/package.py | 27 ++--------- .../repos/builtin/packages/r-category/package.py | 27 ++--------- .../repos/builtin/packages/r-catools/package.py | 27 ++--------- .../repos/builtin/packages/r-cdcfluview/package.py | 27 ++--------- .../repos/builtin/packages/r-cellranger/package.py | 27 ++--------- .../repos/builtin/packages/r-checkmate/package.py | 27 ++--------- .../repos/builtin/packages/r-checkpoint/package.py | 27 ++--------- .../builtin/packages/r-chemometrics/package.py | 27 ++--------- .../repos/builtin/packages/r-chron/package.py | 27 ++--------- .../repos/builtin/packages/r-circlize/package.py | 27 ++--------- .../repos/builtin/packages/r-class/package.py | 27 ++--------- .../repos/builtin/packages/r-classint/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-cli/package.py | 27 ++--------- .../repos/builtin/packages/r-clipr/package.py | 27 ++--------- .../repos/builtin/packages/r-cluster/package.py | 27 ++--------- .../builtin/packages/r-clusterprofiler/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-cner/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-coda/package.py | 27 ++--------- .../repos/builtin/packages/r-codetools/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-coin/package.py | 27 ++--------- .../repos/builtin/packages/r-colorspace/package.py | 27 ++--------- .../builtin/packages/r-complexheatmap/package.py | 27 ++--------- .../repos/builtin/packages/r-corpcor/package.py | 27 ++--------- .../repos/builtin/packages/r-corrplot/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-covr/package.py | 27 ++--------- .../repos/builtin/packages/r-cowplot/package.py | 27 ++--------- .../repos/builtin/packages/r-crayon/package.py | 27 ++--------- .../repos/builtin/packages/r-crosstalk/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-ctc/package.py | 27 ++--------- .../repos/builtin/packages/r-cubature/package.py | 27 ++--------- .../repos/builtin/packages/r-cubist/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-curl/package.py | 27 ++--------- .../repos/builtin/packages/r-data-table/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-dbi/package.py | 27 ++--------- .../repos/builtin/packages/r-dbplyr/package.py | 27 ++--------- .../builtin/packages/r-delayedarray/package.py | 27 ++--------- .../repos/builtin/packages/r-deldir/package.py | 27 ++--------- .../repos/builtin/packages/r-dendextend/package.py | 27 ++--------- .../repos/builtin/packages/r-deoptim/package.py | 27 ++--------- .../repos/builtin/packages/r-deoptimr/package.py | 27 ++--------- .../repos/builtin/packages/r-deseq/package.py | 27 ++--------- .../repos/builtin/packages/r-deseq2/package.py | 27 ++--------- .../repos/builtin/packages/r-desolve/package.py | 27 ++--------- .../repos/builtin/packages/r-devtools/package.py | 27 ++--------- .../repos/builtin/packages/r-diagrammer/package.py | 27 ++--------- .../builtin/packages/r-dicekriging/package.py | 27 ++--------- .../repos/builtin/packages/r-dichromat/package.py | 27 ++--------- .../builtin/packages/r-diffusionmap/package.py | 27 ++--------- .../repos/builtin/packages/r-digest/package.py | 27 ++--------- .../repos/builtin/packages/r-diptest/package.py | 27 ++--------- .../packages/r-dirichletmultinomial/package.py | 27 ++--------- .../repos/builtin/packages/r-dnacopy/package.py | 27 ++--------- .../repos/builtin/packages/r-do-db/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-domc/package.py | 27 ++--------- .../repos/builtin/packages/r-doparallel/package.py | 27 ++--------- .../repos/builtin/packages/r-dorng/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-dose/package.py | 27 ++--------- .../repos/builtin/packages/r-downloader/package.py | 27 ++--------- .../repos/builtin/packages/r-dplyr/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-dt/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-dtw/package.py | 27 ++--------- .../repos/builtin/packages/r-dygraphs/package.py | 27 ++--------- .../repos/builtin/packages/r-e1071/package.py | 27 ++--------- .../repos/builtin/packages/r-edger/package.py | 27 ++--------- .../repos/builtin/packages/r-ellipse/package.py | 27 ++--------- .../repos/builtin/packages/r-ensembldb/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-ergm/package.py | 27 ++--------- .../repos/builtin/packages/r-evaluate/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-expm/package.py | 27 ++--------- .../repos/builtin/packages/r-factoextra/package.py | 27 ++--------- .../repos/builtin/packages/r-factominer/package.py | 27 ++--------- .../builtin/packages/r-fastcluster/package.py | 27 ++--------- .../repos/builtin/packages/r-fastmatch/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-ff/package.py | 27 ++--------- .../repos/builtin/packages/r-fftwtools/package.py | 27 ++--------- .../repos/builtin/packages/r-fgsea/package.py | 27 ++--------- .../repos/builtin/packages/r-filehash/package.py | 27 ++--------- .../repos/builtin/packages/r-findpython/package.py | 27 ++--------- .../repos/builtin/packages/r-fit-models/package.py | 27 ++--------- .../repos/builtin/packages/r-flashclust/package.py | 27 ++--------- .../repos/builtin/packages/r-flexclust/package.py | 27 ++--------- .../repos/builtin/packages/r-flexmix/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-fnn/package.py | 27 ++--------- .../repos/builtin/packages/r-forcats/package.py | 27 ++--------- .../repos/builtin/packages/r-foreach/package.py | 27 ++--------- .../repos/builtin/packages/r-forecast/package.py | 27 ++--------- .../repos/builtin/packages/r-foreign/package.py | 27 ++--------- .../repos/builtin/packages/r-formatr/package.py | 27 ++--------- .../repos/builtin/packages/r-formula/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-fpc/package.py | 27 ++--------- .../repos/builtin/packages/r-fracdiff/package.py | 27 ++--------- .../builtin/packages/r-futile-logger/package.py | 27 ++--------- .../builtin/packages/r-futile-options/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-gbm/package.py | 27 ++--------- .../repos/builtin/packages/r-gcrma/package.py | 27 ++--------- .../repos/builtin/packages/r-gdata/package.py | 27 ++--------- .../repos/builtin/packages/r-gdsfmt/package.py | 27 ++--------- .../repos/builtin/packages/r-geiger/package.py | 27 ++--------- .../repos/builtin/packages/r-genefilter/package.py | 27 ++--------- .../builtin/packages/r-genelendatabase/package.py | 27 ++--------- .../builtin/packages/r-geneplotter/package.py | 27 ++--------- .../repos/builtin/packages/r-genie3/package.py | 27 ++--------- .../builtin/packages/r-genomeinfodb/package.py | 27 ++--------- .../builtin/packages/r-genomeinfodbdata/package.py | 27 ++--------- .../packages/r-genomicalignments/package.py | 27 ++--------- .../builtin/packages/r-genomicfeatures/package.py | 27 ++--------- .../builtin/packages/r-genomicranges/package.py | 27 ++--------- .../repos/builtin/packages/r-geomorph/package.py | 27 ++--------- .../repos/builtin/packages/r-geoquery/package.py | 27 ++--------- .../repos/builtin/packages/r-geosphere/package.py | 27 ++--------- .../repos/builtin/packages/r-getopt/package.py | 27 ++--------- .../repos/builtin/packages/r-getoptlong/package.py | 27 ++--------- .../repos/builtin/packages/r-ggally/package.py | 27 ++--------- .../repos/builtin/packages/r-ggbio/package.py | 27 ++--------- .../repos/builtin/packages/r-ggdendro/package.py | 27 ++--------- .../repos/builtin/packages/r-ggjoy/package.py | 27 ++--------- .../repos/builtin/packages/r-ggmap/package.py | 27 ++--------- .../repos/builtin/packages/r-ggplot2/package.py | 27 ++--------- .../repos/builtin/packages/r-ggpubr/package.py | 27 ++--------- .../repos/builtin/packages/r-ggrepel/package.py | 27 ++--------- .../repos/builtin/packages/r-ggridges/package.py | 27 ++--------- .../repos/builtin/packages/r-ggsci/package.py | 27 ++--------- .../repos/builtin/packages/r-ggvis/package.py | 27 ++--------- .../repos/builtin/packages/r-gistr/package.py | 27 ++--------- .../repos/builtin/packages/r-git2r/package.py | 27 ++--------- .../repos/builtin/packages/r-glimma/package.py | 27 ++--------- .../repos/builtin/packages/r-glmnet/package.py | 27 ++--------- .../builtin/packages/r-globaloptions/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-glue/package.py | 27 ++--------- .../repos/builtin/packages/r-gmodels/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-gmp/package.py | 27 ++--------- .../repos/builtin/packages/r-go-db/package.py | 27 ++--------- .../repos/builtin/packages/r-googlevis/package.py | 27 ++--------- .../repos/builtin/packages/r-goplot/package.py | 27 ++--------- .../repos/builtin/packages/r-gosemsim/package.py | 27 ++--------- .../repos/builtin/packages/r-goseq/package.py | 27 ++--------- .../repos/builtin/packages/r-gostats/package.py | 27 ++--------- .../repos/builtin/packages/r-gplots/package.py | 27 ++--------- .../repos/builtin/packages/r-graph/package.py | 27 ++--------- .../repos/builtin/packages/r-gridbase/package.py | 27 ++--------- .../repos/builtin/packages/r-gridextra/package.py | 27 ++--------- .../repos/builtin/packages/r-gseabase/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-gss/package.py | 27 ++--------- .../repos/builtin/packages/r-gsubfn/package.py | 27 ++--------- .../repos/builtin/packages/r-gtable/package.py | 27 ++--------- .../repos/builtin/packages/r-gtools/package.py | 27 ++--------- .../repos/builtin/packages/r-gtrellis/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-gviz/package.py | 27 ++--------- .../repos/builtin/packages/r-haven/package.py | 27 ++--------- .../repos/builtin/packages/r-hexbin/package.py | 27 ++--------- .../repos/builtin/packages/r-highr/package.py | 27 ++--------- .../repos/builtin/packages/r-hmisc/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-hms/package.py | 27 ++--------- .../repos/builtin/packages/r-htmltable/package.py | 27 ++--------- .../repos/builtin/packages/r-htmltools/package.py | 27 ++--------- .../builtin/packages/r-htmlwidgets/package.py | 27 ++--------- .../repos/builtin/packages/r-httpuv/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-httr/package.py | 27 ++--------- .../repos/builtin/packages/r-hwriter/package.py | 27 ++--------- .../repos/builtin/packages/r-hypergraph/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-ica/package.py | 27 ++--------- .../repos/builtin/packages/r-igraph/package.py | 27 ++--------- .../repos/builtin/packages/r-illuminaio/package.py | 27 ++--------- .../repos/builtin/packages/r-impute/package.py | 27 ++--------- .../repos/builtin/packages/r-influencer/package.py | 27 ++--------- .../repos/builtin/packages/r-inline/package.py | 27 ++--------- .../packages/r-interactivedisplaybase/package.py | 27 ++--------- .../repos/builtin/packages/r-ipred/package.py | 27 ++--------- .../repos/builtin/packages/r-iranges/package.py | 27 ++--------- .../repos/builtin/packages/r-irdisplay/package.py | 27 ++--------- .../repos/builtin/packages/r-irkernel/package.py | 27 ++--------- .../repos/builtin/packages/r-irlba/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-iso/package.py | 27 ++--------- .../repos/builtin/packages/r-iterators/package.py | 27 ++--------- .../repos/builtin/packages/r-janitor/package.py | 27 ++--------- .../repos/builtin/packages/r-jaspar2018/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-jomo/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-jpeg/package.py | 27 ++--------- .../repos/builtin/packages/r-jsonlite/package.py | 27 ++--------- .../repos/builtin/packages/r-kegg-db/package.py | 27 ++--------- .../repos/builtin/packages/r-kegggraph/package.py | 27 ++--------- .../repos/builtin/packages/r-keggrest/package.py | 27 ++--------- .../repos/builtin/packages/r-kernlab/package.py | 27 ++--------- .../repos/builtin/packages/r-kernsmooth/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-kknn/package.py | 27 ++--------- .../repos/builtin/packages/r-knitr/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-ks/package.py | 27 ++--------- .../repos/builtin/packages/r-labeling/package.py | 27 ++--------- .../repos/builtin/packages/r-lambda-r/package.py | 27 ++--------- .../builtin/packages/r-laplacesdemon/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-lars/package.py | 27 ++--------- .../repos/builtin/packages/r-lattice/package.py | 27 ++--------- .../builtin/packages/r-latticeextra/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-lava/package.py | 27 ++--------- .../repos/builtin/packages/r-lazyeval/package.py | 27 ++--------- .../repos/builtin/packages/r-leaflet/package.py | 27 ++--------- .../repos/builtin/packages/r-leaps/package.py | 27 ++--------- .../repos/builtin/packages/r-learnbayes/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-lhs/package.py | 27 ++--------- .../repos/builtin/packages/r-limma/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-lme4/package.py | 27 ++--------- .../repos/builtin/packages/r-lmtest/package.py | 27 ++--------- .../repos/builtin/packages/r-locfit/package.py | 27 ++--------- .../repos/builtin/packages/r-log4r/package.py | 27 ++--------- .../repos/builtin/packages/r-lpsolve/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-lsei/package.py | 27 ++--------- .../repos/builtin/packages/r-lubridate/package.py | 27 ++--------- .../repos/builtin/packages/r-magic/package.py | 27 ++--------- .../repos/builtin/packages/r-magrittr/package.py | 27 ++--------- .../repos/builtin/packages/r-makecdfenv/package.py | 27 ++--------- .../repos/builtin/packages/r-maldiquant/package.py | 27 ++--------- .../repos/builtin/packages/r-mapproj/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-maps/package.py | 27 ++--------- .../repos/builtin/packages/r-maptools/package.py | 27 ++--------- .../repos/builtin/packages/r-markdown/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-mass/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-matr/package.py | 27 ++--------- .../repos/builtin/packages/r-matrix/package.py | 27 ++--------- .../builtin/packages/r-matrixmodels/package.py | 27 ++--------- .../builtin/packages/r-matrixstats/package.py | 27 ++--------- .../repos/builtin/packages/r-mclust/package.py | 27 ++--------- .../repos/builtin/packages/r-mcmcglmm/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-mco/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-mda/package.py | 27 ++--------- .../repos/builtin/packages/r-memoise/package.py | 27 ++--------- .../repos/builtin/packages/r-mergemaid/package.py | 27 ++--------- .../repos/builtin/packages/r-methodss3/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-mgcv/package.py | 27 ++--------- .../repos/builtin/packages/r-mgraster/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-mice/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-mime/package.py | 27 ++--------- .../repos/builtin/packages/r-minfi/package.py | 27 ++--------- .../repos/builtin/packages/r-minqa/package.py | 27 ++--------- .../repos/builtin/packages/r-misc3d/package.py | 27 ++--------- .../repos/builtin/packages/r-mitml/package.py | 27 ++--------- .../repos/builtin/packages/r-mixtools/package.py | 27 ++--------- .../repos/builtin/packages/r-mlbench/package.py | 27 ++--------- .../builtin/packages/r-mlinterfaces/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-mlr/package.py | 27 ++--------- .../repos/builtin/packages/r-mlrmbo/package.py | 27 ++--------- .../repos/builtin/packages/r-mmwrweek/package.py | 27 ++--------- .../repos/builtin/packages/r-mnormt/package.py | 27 ++--------- .../builtin/packages/r-modelmetrics/package.py | 27 ++--------- .../repos/builtin/packages/r-modelr/package.py | 27 ++--------- .../repos/builtin/packages/r-modeltools/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-mpm/package.py | 27 ++--------- .../repos/builtin/packages/r-msnbase/package.py | 27 ++--------- .../repos/builtin/packages/r-multcomp/package.py | 27 ++--------- .../repos/builtin/packages/r-multicool/package.py | 27 ++--------- .../repos/builtin/packages/r-multtest/package.py | 27 ++--------- .../repos/builtin/packages/r-munsell/package.py | 27 ++--------- .../repos/builtin/packages/r-mvtnorm/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-mzid/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-mzr/package.py | 27 ++--------- .../repos/builtin/packages/r-nanotime/package.py | 27 ++--------- .../repos/builtin/packages/r-ncbit/package.py | 27 ++--------- .../repos/builtin/packages/r-ncdf4/package.py | 27 ++--------- .../repos/builtin/packages/r-network/package.py | 27 ++--------- .../repos/builtin/packages/r-networkd3/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-nlme/package.py | 27 ++--------- .../repos/builtin/packages/r-nloptr/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-nmf/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-nnet/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-nnls/package.py | 27 ++--------- .../repos/builtin/packages/r-nor1mix/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-np/package.py | 27 ++--------- .../repos/builtin/packages/r-numderiv/package.py | 27 ++--------- .../builtin/packages/r-oligoclasses/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-oo/package.py | 27 ++--------- .../repos/builtin/packages/r-openssl/package.py | 27 ++--------- .../builtin/packages/r-org-hs-eg-db/package.py | 27 ++--------- .../builtin/packages/r-organismdbi/package.py | 27 ++--------- .../repos/builtin/packages/r-packrat/package.py | 27 ++--------- .../repos/builtin/packages/r-pacman/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-pamr/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-pan/package.py | 27 ++--------- .../builtin/packages/r-parallelmap/package.py | 27 ++--------- .../builtin/packages/r-paramhelpers/package.py | 27 ++--------- .../repos/builtin/packages/r-party/package.py | 27 ++--------- .../repos/builtin/packages/r-partykit/package.py | 27 ++--------- .../repos/builtin/packages/r-pathview/package.py | 27 ++--------- .../repos/builtin/packages/r-pbapply/package.py | 27 ++--------- .../repos/builtin/packages/r-pbdzmq/package.py | 27 ++--------- .../repos/builtin/packages/r-pbkrtest/package.py | 27 ++--------- .../repos/builtin/packages/r-pcamethods/package.py | 27 ++--------- .../repos/builtin/packages/r-pcapp/package.py | 27 ++--------- .../repos/builtin/packages/r-permute/package.py | 27 ++--------- .../repos/builtin/packages/r-pfam-db/package.py | 27 ++--------- .../repos/builtin/packages/r-phangorn/package.py | 27 ++--------- .../packages/r-phantompeakqualtools/package.py | 27 ++--------- .../repos/builtin/packages/r-phyloseq/package.py | 27 ++--------- .../repos/builtin/packages/r-picante/package.py | 27 ++--------- .../repos/builtin/packages/r-pkgconfig/package.py | 27 ++--------- .../repos/builtin/packages/r-pkgmaker/package.py | 27 ++--------- .../repos/builtin/packages/r-plogr/package.py | 27 ++--------- .../repos/builtin/packages/r-plot3d/package.py | 27 ++--------- .../repos/builtin/packages/r-plotly/package.py | 27 ++--------- .../repos/builtin/packages/r-plotrix/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-pls/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-plyr/package.py | 27 ++--------- .../repos/builtin/packages/r-pmcmr/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-png/package.py | 27 ++--------- .../repos/builtin/packages/r-powerlaw/package.py | 27 ++--------- .../repos/builtin/packages/r-prabclus/package.py | 27 ++--------- .../repos/builtin/packages/r-praise/package.py | 27 ++--------- .../builtin/packages/r-preprocesscore/package.py | 27 ++--------- .../builtin/packages/r-prettyunits/package.py | 27 ++--------- .../repos/builtin/packages/r-processx/package.py | 27 ++--------- .../repos/builtin/packages/r-prodlim/package.py | 27 ++--------- .../repos/builtin/packages/r-progress/package.py | 27 ++--------- .../builtin/packages/r-protgenerics/package.py | 27 ++--------- .../repos/builtin/packages/r-proto/package.py | 27 ++--------- .../repos/builtin/packages/r-proxy/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-pryr/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-ps/package.py | 27 ++--------- .../repos/builtin/packages/r-psych/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-ptw/package.py | 27 ++--------- .../repos/builtin/packages/r-purrr/package.py | 27 ++--------- .../repos/builtin/packages/r-quadprog/package.py | 27 ++--------- .../repos/builtin/packages/r-quantmod/package.py | 27 ++--------- .../repos/builtin/packages/r-quantreg/package.py | 27 ++--------- .../repos/builtin/packages/r-quantro/package.py | 27 ++--------- .../repos/builtin/packages/r-qvalue/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-r6/package.py | 27 ++--------- .../builtin/packages/r-randomforest/package.py | 27 ++--------- .../repos/builtin/packages/r-ranger/package.py | 27 ++--------- .../repos/builtin/packages/r-rappdirs/package.py | 27 ++--------- .../repos/builtin/packages/r-raster/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-rbgl/package.py | 27 ++--------- .../repos/builtin/packages/r-rbokeh/package.py | 27 ++--------- .../builtin/packages/r-rcolorbrewer/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-rcpp/package.py | 27 ++--------- .../builtin/packages/r-rcpparmadillo/package.py | 27 ++--------- .../repos/builtin/packages/r-rcppblaze/package.py | 27 ++--------- .../repos/builtin/packages/r-rcppcctz/package.py | 27 ++--------- .../repos/builtin/packages/r-rcppcnpy/package.py | 27 ++--------- .../repos/builtin/packages/r-rcppeigen/package.py | 27 ++--------- .../builtin/packages/r-rcppprogress/package.py | 27 ++--------- .../repos/builtin/packages/r-rcurl/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-rda/package.py | 27 ++--------- .../repos/builtin/packages/r-readr/package.py | 27 ++--------- .../repos/builtin/packages/r-readxl/package.py | 27 ++--------- .../repos/builtin/packages/r-registry/package.py | 27 ++--------- .../repos/builtin/packages/r-rematch/package.py | 27 ++--------- .../builtin/packages/r-reordercluster/package.py | 27 ++--------- .../builtin/packages/r-reportingtools/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-repr/package.py | 27 ++--------- .../repos/builtin/packages/r-reprex/package.py | 27 ++--------- .../repos/builtin/packages/r-reshape/package.py | 27 ++--------- .../repos/builtin/packages/r-reshape2/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-rex/package.py | 27 ++--------- .../repos/builtin/packages/r-rgdal/package.py | 27 ++--------- .../repos/builtin/packages/r-rgenoud/package.py | 27 ++--------- .../repos/builtin/packages/r-rgeos/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-rgl/package.py | 27 ++--------- .../builtin/packages/r-rgooglemaps/package.py | 27 ++--------- .../repos/builtin/packages/r-rgraphviz/package.py | 27 ++--------- .../repos/builtin/packages/r-rhdf5/package.py | 27 ++--------- .../repos/builtin/packages/r-rhtslib/package.py | 27 ++--------- .../repos/builtin/packages/r-rinside/package.py | 27 ++--------- .../repos/builtin/packages/r-rjags/package.py | 27 ++--------- .../repos/builtin/packages/r-rjava/package.py | 27 ++--------- .../repos/builtin/packages/r-rjson/package.py | 27 ++--------- .../repos/builtin/packages/r-rjsonio/package.py | 27 ++--------- .../repos/builtin/packages/r-rlang/package.py | 27 ++--------- .../repos/builtin/packages/r-rmarkdown/package.py | 27 ++--------- .../repos/builtin/packages/r-rminer/package.py | 27 ++--------- .../repos/builtin/packages/r-rmpfr/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-rmpi/package.py | 27 ++--------- .../repos/builtin/packages/r-rmysql/package.py | 27 ++--------- .../repos/builtin/packages/r-rngtools/package.py | 27 ++--------- .../repos/builtin/packages/r-robustbase/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-rocr/package.py | 27 ++--------- .../repos/builtin/packages/r-rodbc/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-rots/package.py | 27 ++--------- .../repos/builtin/packages/r-roxygen2/package.py | 27 ++--------- .../repos/builtin/packages/r-rpart-plot/package.py | 27 ++--------- .../repos/builtin/packages/r-rpart/package.py | 27 ++--------- .../builtin/packages/r-rpostgresql/package.py | 27 ++--------- .../repos/builtin/packages/r-rprojroot/package.py | 27 ++--------- .../repos/builtin/packages/r-rsamtools/package.py | 27 ++--------- .../repos/builtin/packages/r-rsnns/package.py | 27 ++--------- .../repos/builtin/packages/r-rsolnp/package.py | 27 ++--------- .../repos/builtin/packages/r-rsqlite/package.py | 27 ++--------- .../repos/builtin/packages/r-rstan/package.py | 27 ++--------- .../repos/builtin/packages/r-rstudioapi/package.py | 27 ++--------- .../builtin/packages/r-rtracklayer/package.py | 27 ++--------- .../repos/builtin/packages/r-rtsne/package.py | 27 ++--------- .../repos/builtin/packages/r-rvcheck/package.py | 27 ++--------- .../repos/builtin/packages/r-rvest/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-rzmq/package.py | 27 ++--------- .../repos/builtin/packages/r-s4vectors/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-samr/package.py | 27 ++--------- .../repos/builtin/packages/r-sandwich/package.py | 27 ++--------- .../repos/builtin/packages/r-scales/package.py | 27 ++--------- .../builtin/packages/r-scatterplot3d/package.py | 27 ++--------- .../repos/builtin/packages/r-sdmtools/package.py | 27 ++--------- .../repos/builtin/packages/r-segmented/package.py | 27 ++--------- .../repos/builtin/packages/r-selectr/package.py | 27 ++--------- .../repos/builtin/packages/r-seqinr/package.py | 27 ++--------- .../repos/builtin/packages/r-seqlogo/package.py | 27 ++--------- .../repos/builtin/packages/r-seurat/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-sf/package.py | 27 ++--------- .../repos/builtin/packages/r-sfsmisc/package.py | 27 ++--------- .../repos/builtin/packages/r-shape/package.py | 27 ++--------- .../repos/builtin/packages/r-shiny/package.py | 27 ++--------- .../builtin/packages/r-shinydashboard/package.py | 27 ++--------- .../repos/builtin/packages/r-shortread/package.py | 27 ++--------- .../repos/builtin/packages/r-siggenes/package.py | 27 ++--------- .../repos/builtin/packages/r-simpleaffy/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-sm/package.py | 27 ++--------- .../repos/builtin/packages/r-smoof/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-sn/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-snow/package.py | 27 ++--------- .../repos/builtin/packages/r-snowfall/package.py | 27 ++--------- .../repos/builtin/packages/r-snprelate/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-som/package.py | 27 ++--------- .../packages/r-somaticsignatures/package.py | 27 ++--------- .../builtin/packages/r-sourcetools/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-sp/package.py | 27 ++--------- .../repos/builtin/packages/r-sparsem/package.py | 27 ++--------- .../repos/builtin/packages/r-spdep/package.py | 27 ++--------- .../repos/builtin/packages/r-speedglm/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-spem/package.py | 27 ++--------- .../builtin/packages/r-splitstackshape/package.py | 27 ++--------- .../repos/builtin/packages/r-sqldf/package.py | 27 ++--------- .../repos/builtin/packages/r-squash/package.py | 27 ++--------- .../builtin/packages/r-stanheaders/package.py | 27 ++--------- .../repos/builtin/packages/r-statmod/package.py | 27 ++--------- .../builtin/packages/r-statnet-common/package.py | 27 ++--------- .../repos/builtin/packages/r-stringi/package.py | 27 ++--------- .../repos/builtin/packages/r-stringr/package.py | 27 ++--------- .../builtin/packages/r-strucchange/package.py | 27 ++--------- .../repos/builtin/packages/r-subplex/package.py | 27 ++--------- .../packages/r-summarizedexperiment/package.py | 27 ++--------- .../repos/builtin/packages/r-survey/package.py | 27 ++--------- .../repos/builtin/packages/r-survival/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-sva/package.py | 27 ++--------- .../repos/builtin/packages/r-tarifx/package.py | 27 ++--------- .../repos/builtin/packages/r-tclust/package.py | 27 ++--------- .../repos/builtin/packages/r-tensora/package.py | 27 ++--------- .../repos/builtin/packages/r-testit/package.py | 27 ++--------- .../repos/builtin/packages/r-testthat/package.py | 27 ++--------- .../repos/builtin/packages/r-tfbstools/package.py | 27 ++--------- .../repos/builtin/packages/r-tfmpvalue/package.py | 27 ++--------- .../repos/builtin/packages/r-th-data/package.py | 27 ++--------- .../repos/builtin/packages/r-threejs/package.py | 27 ++--------- .../repos/builtin/packages/r-tibble/package.py | 27 ++--------- .../repos/builtin/packages/r-tidycensus/package.py | 27 ++--------- .../repos/builtin/packages/r-tidyr/package.py | 27 ++--------- .../repos/builtin/packages/r-tidyselect/package.py | 27 ++--------- .../repos/builtin/packages/r-tidyverse/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-tiff/package.py | 27 ++--------- .../repos/builtin/packages/r-tigris/package.py | 27 ++--------- .../repos/builtin/packages/r-timedate/package.py | 27 ++--------- .../repos/builtin/packages/r-tmixclust/package.py | 27 ++--------- .../repos/builtin/packages/r-topgo/package.py | 27 ++--------- .../builtin/packages/r-trimcluster/package.py | 27 ++--------- .../repos/builtin/packages/r-truncnorm/package.py | 27 ++--------- .../repos/builtin/packages/r-trust/package.py | 27 ++--------- .../repos/builtin/packages/r-tseries/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-tsne/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-ttr/package.py | 27 ++--------- .../repos/builtin/packages/r-udunits2/package.py | 27 ++--------- .../repos/builtin/packages/r-units/package.py | 27 ++--------- .../repos/builtin/packages/r-utils/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-uuid/package.py | 27 ++--------- .../packages/r-variantannotation/package.py | 27 ++--------- .../repos/builtin/packages/r-varselrf/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-vcd/package.py | 27 ++--------- .../repos/builtin/packages/r-vegan/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-vgam/package.py | 27 ++--------- .../repos/builtin/packages/r-vipor/package.py | 27 ++--------- .../repos/builtin/packages/r-viridis/package.py | 27 ++--------- .../builtin/packages/r-viridislite/package.py | 27 ++--------- .../repos/builtin/packages/r-visnetwork/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-vsn/package.py | 27 ++--------- .../repos/builtin/packages/r-whisker/package.py | 27 ++--------- .../repos/builtin/packages/r-withr/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-xde/package.py | 27 ++--------- .../repos/builtin/packages/r-xgboost/package.py | 27 ++--------- .../repos/builtin/packages/r-xlconnect/package.py | 27 ++--------- .../builtin/packages/r-xlconnectjars/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-xlsx/package.py | 27 ++--------- .../repos/builtin/packages/r-xlsxjars/package.py | 27 ++--------- .../repos/builtin/packages/r-xmapbridge/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-xml/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-xml2/package.py | 27 ++--------- .../repos/builtin/packages/r-xtable/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-xts/package.py | 27 ++--------- .../repos/builtin/packages/r-xvector/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-yaml/package.py | 27 ++--------- .../repos/builtin/packages/r-yapsa/package.py | 27 ++--------- .../repos/builtin/packages/r-yaqcaffy/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-yarn/package.py | 27 ++--------- .../repos/builtin/packages/r-zlibbioc/package.py | 27 ++--------- var/spack/repos/builtin/packages/r-zoo/package.py | 27 ++--------- var/spack/repos/builtin/packages/r/package.py | 27 ++--------- var/spack/repos/builtin/packages/racon/package.py | 27 ++--------- var/spack/repos/builtin/packages/raft/package.py | 27 ++--------- var/spack/repos/builtin/packages/ragel/package.py | 27 ++--------- var/spack/repos/builtin/packages/raja/package.py | 27 ++--------- .../repos/builtin/packages/randfold/package.py | 27 ++--------- .../repos/builtin/packages/random123/package.py | 27 ++--------- .../repos/builtin/packages/randrproto/package.py | 27 ++--------- .../repos/builtin/packages/range-v3/package.py | 27 ++--------- .../repos/builtin/packages/rankstr/package.py | 27 ++--------- .../repos/builtin/packages/rapidjson/package.py | 27 ++--------- var/spack/repos/builtin/packages/ravel/package.py | 27 ++--------- var/spack/repos/builtin/packages/raxml/package.py | 27 ++--------- var/spack/repos/builtin/packages/ray/package.py | 27 ++--------- var/spack/repos/builtin/packages/rclone/package.py | 27 ++--------- .../repos/builtin/packages/rdma-core/package.py | 27 ++--------- .../builtin/packages/rdp-classifier/package.py | 27 ++--------- var/spack/repos/builtin/packages/re2c/package.py | 27 ++--------- var/spack/repos/builtin/packages/readfq/package.py | 27 ++--------- .../repos/builtin/packages/readline/package.py | 27 ++--------- .../repos/builtin/packages/recordproto/package.py | 27 ++--------- var/spack/repos/builtin/packages/redset/package.py | 27 ++--------- .../repos/builtin/packages/redundans/package.py | 27 ++--------- var/spack/repos/builtin/packages/relion/package.py | 27 ++--------- var/spack/repos/builtin/packages/rempi/package.py | 27 ++--------- var/spack/repos/builtin/packages/rename/package.py | 27 ++--------- .../repos/builtin/packages/rendercheck/package.py | 27 ++--------- .../repos/builtin/packages/renderproto/package.py | 27 ++--------- .../repos/builtin/packages/repeatmasker/package.py | 27 ++--------- .../builtin/packages/resourceproto/package.py | 27 ++--------- .../repos/builtin/packages/revbayes/package.py | 27 ++--------- var/spack/repos/builtin/packages/rgb/package.py | 27 ++--------- var/spack/repos/builtin/packages/rhash/package.py | 27 ++--------- var/spack/repos/builtin/packages/rlwrap/package.py | 27 ++--------- var/spack/repos/builtin/packages/rmats/package.py | 27 ++--------- var/spack/repos/builtin/packages/rmlab/package.py | 27 ++--------- .../repos/builtin/packages/rna-seqc/package.py | 27 ++--------- .../repos/builtin/packages/rngstreams/package.py | 27 ++--------- .../repos/builtin/packages/rockstar/package.py | 27 ++--------- var/spack/repos/builtin/packages/root/package.py | 27 ++--------- var/spack/repos/builtin/packages/rose/package.py | 27 ++--------- var/spack/repos/builtin/packages/ross/package.py | 27 ++--------- var/spack/repos/builtin/packages/rr/package.py | 27 ++--------- .../repos/builtin/packages/rsbench/package.py | 27 ++--------- var/spack/repos/builtin/packages/rsem/package.py | 27 ++--------- var/spack/repos/builtin/packages/rstart/package.py | 27 ++--------- var/spack/repos/builtin/packages/rsync/package.py | 27 ++--------- var/spack/repos/builtin/packages/rtags/package.py | 27 ++--------- var/spack/repos/builtin/packages/rtax/package.py | 27 ++--------- .../repos/builtin/packages/ruby-gnuplot/package.py | 27 ++--------- .../repos/builtin/packages/ruby-narray/package.py | 27 ++--------- .../repos/builtin/packages/ruby-ronn/package.py | 27 ++--------- .../builtin/packages/ruby-rubyinline/package.py | 27 ++--------- .../repos/builtin/packages/ruby-svn2git/package.py | 27 ++--------- .../packages/ruby-terminal-table/package.py | 27 ++--------- var/spack/repos/builtin/packages/ruby/package.py | 27 ++--------- .../repos/builtin/packages/rust-bindgen/package.py | 27 ++--------- var/spack/repos/builtin/packages/rust/package.py | 27 ++--------- var/spack/repos/builtin/packages/sabre/package.py | 27 ++--------- .../repos/builtin/packages/sailfish/package.py | 27 ++--------- var/spack/repos/builtin/packages/salmon/package.py | 27 ++--------- .../repos/builtin/packages/sambamba/package.py | 27 ++--------- .../repos/builtin/packages/samblaster/package.py | 27 ++--------- var/spack/repos/builtin/packages/samrai/package.py | 27 ++--------- .../repos/builtin/packages/samtools/package.py | 27 ++--------- .../repos/builtin/packages/sandbox/package.py | 27 ++--------- var/spack/repos/builtin/packages/sas/package.py | 27 ++--------- .../repos/builtin/packages/satsuma2/package.py | 27 ++--------- .../repos/builtin/packages/savanna/package.py | 27 ++--------- var/spack/repos/builtin/packages/saws/package.py | 27 ++--------- var/spack/repos/builtin/packages/sbt/package.py | 27 ++--------- var/spack/repos/builtin/packages/scala/package.py | 27 ++--------- .../repos/builtin/packages/scalasca/package.py | 27 ++--------- .../repos/builtin/packages/scalpel/package.py | 27 ++--------- .../builtin/packages/scan-for-matches/package.py | 27 ++--------- var/spack/repos/builtin/packages/scons/package.py | 27 ++--------- .../repos/builtin/packages/scorec-core/package.py | 27 ++--------- var/spack/repos/builtin/packages/scorep/package.py | 27 ++--------- var/spack/repos/builtin/packages/scotch/package.py | 27 ++--------- var/spack/repos/builtin/packages/scr/package.py | 27 ++--------- var/spack/repos/builtin/packages/screen/package.py | 27 ++--------- .../repos/builtin/packages/scripts/package.py | 27 ++--------- .../builtin/packages/scrnsaverproto/package.py | 27 ++--------- var/spack/repos/builtin/packages/sctk/package.py | 27 ++--------- .../repos/builtin/packages/sdl2-image/package.py | 27 ++--------- var/spack/repos/builtin/packages/sdl2/package.py | 27 ++--------- var/spack/repos/builtin/packages/sed/package.py | 27 ++--------- var/spack/repos/builtin/packages/seqan/package.py | 27 ++--------- .../repos/builtin/packages/seqprep/package.py | 27 ++--------- var/spack/repos/builtin/packages/seqtk/package.py | 27 ++--------- var/spack/repos/builtin/packages/serf/package.py | 27 ++--------- .../repos/builtin/packages/sessreg/package.py | 27 ++--------- .../repos/builtin/packages/setxkbmap/package.py | 27 ++--------- var/spack/repos/builtin/packages/sga/package.py | 27 ++--------- .../repos/builtin/packages/shapeit/package.py | 27 ++--------- .../builtin/packages/shared-mime-info/package.py | 27 ++--------- .../repos/builtin/packages/shiny-server/package.py | 27 ++--------- .../repos/builtin/packages/shocklibs/package.py | 27 ++--------- .../repos/builtin/packages/shoremap/package.py | 27 ++--------- .../repos/builtin/packages/shortbred/package.py | 27 ++--------- .../repos/builtin/packages/shortstack/package.py | 27 ++--------- .../repos/builtin/packages/showfont/package.py | 27 ++--------- .../repos/builtin/packages/shuffile/package.py | 27 ++--------- var/spack/repos/builtin/packages/sickle/package.py | 27 ++--------- var/spack/repos/builtin/packages/siesta/package.py | 27 ++--------- .../repos/builtin/packages/signalp/package.py | 27 ++--------- .../repos/builtin/packages/signify/package.py | 27 ++--------- var/spack/repos/builtin/packages/silo/package.py | 27 ++--------- .../repos/builtin/packages/simplemoc/package.py | 27 ++--------- var/spack/repos/builtin/packages/simul/package.py | 27 ++--------- .../repos/builtin/packages/simulationio/package.py | 27 ++--------- .../repos/builtin/packages/singularity/package.py | 27 ++--------- .../builtin/packages/skilion-onedrive/package.py | 27 ++--------- var/spack/repos/builtin/packages/sleef/package.py | 27 ++--------- var/spack/repos/builtin/packages/slepc/package.py | 27 ++--------- var/spack/repos/builtin/packages/slurm/package.py | 27 ++--------- var/spack/repos/builtin/packages/smalt/package.py | 27 ++--------- .../repos/builtin/packages/smproxy/package.py | 27 ++--------- .../repos/builtin/packages/snakemake/package.py | 27 ++--------- .../builtin/packages/snap-berkeley/package.py | 27 ++--------- .../repos/builtin/packages/snap-korf/package.py | 27 ++--------- var/spack/repos/builtin/packages/snap/package.py | 27 ++--------- var/spack/repos/builtin/packages/snappy/package.py | 27 ++--------- var/spack/repos/builtin/packages/snbone/package.py | 27 ++--------- .../repos/builtin/packages/sniffles/package.py | 27 ++--------- var/spack/repos/builtin/packages/snpeff/package.py | 27 ++--------- .../repos/builtin/packages/snphylo/package.py | 27 ++--------- .../repos/builtin/packages/snptest/package.py | 27 ++--------- var/spack/repos/builtin/packages/soap2/package.py | 27 ++--------- .../builtin/packages/soapdenovo-trans/package.py | 27 ++--------- .../repos/builtin/packages/soapdenovo2/package.py | 27 ++--------- .../repos/builtin/packages/soapindel/package.py | 27 ++--------- .../repos/builtin/packages/soapsnp/package.py | 27 ++--------- var/spack/repos/builtin/packages/sofa-c/package.py | 27 ++--------- .../builtin/packages/somatic-sniper/package.py | 27 ++--------- .../repos/builtin/packages/sortmerna/package.py | 27 ++--------- .../repos/builtin/packages/sosflow/package.py | 27 ++--------- var/spack/repos/builtin/packages/sowing/package.py | 27 ++--------- var/spack/repos/builtin/packages/sox/package.py | 27 ++--------- var/spack/repos/builtin/packages/spades/package.py | 27 ++--------- .../repos/builtin/packages/span-lite/package.py | 27 ++--------- var/spack/repos/builtin/packages/spark/package.py | 27 ++--------- .../repos/builtin/packages/sparsehash/package.py | 27 ++--------- var/spack/repos/builtin/packages/sparta/package.py | 27 ++--------- var/spack/repos/builtin/packages/spdlog/package.py | 27 ++--------- .../repos/builtin/packages/spectrum-mpi/package.py | 27 ++--------- var/spack/repos/builtin/packages/speex/package.py | 27 ++--------- var/spack/repos/builtin/packages/spglib/package.py | 27 ++--------- .../repos/builtin/packages/sph2pipe/package.py | 27 ++--------- .../repos/builtin/packages/spherepack/package.py | 27 ++--------- .../repos/builtin/packages/spindle/package.py | 27 ++--------- var/spack/repos/builtin/packages/spot/package.py | 27 ++--------- var/spack/repos/builtin/packages/sqlite/package.py | 27 ++--------- .../builtin/packages/sqlitebrowser/package.py | 27 ++--------- var/spack/repos/builtin/packages/squid/package.py | 27 ++--------- .../repos/builtin/packages/sra-toolkit/package.py | 27 ++--------- var/spack/repos/builtin/packages/ssht/package.py | 26 ++--------- .../builtin/packages/sspace-longread/package.py | 27 ++--------- .../builtin/packages/sspace-standard/package.py | 27 ++--------- .../repos/builtin/packages/sst-core/package.py | 27 ++--------- .../repos/builtin/packages/sst-dumpi/package.py | 27 ++--------- .../repos/builtin/packages/sst-macro/package.py | 27 ++--------- var/spack/repos/builtin/packages/stacks/package.py | 27 ++--------- .../builtin/packages/staden-io-lib/package.py | 27 ++--------- .../builtin/packages/star-ccm-plus/package.py | 27 ++--------- var/spack/repos/builtin/packages/star/package.py | 27 ++--------- .../packages/startup-notification/package.py | 27 ++--------- var/spack/repos/builtin/packages/stat/package.py | 27 ++--------- var/spack/repos/builtin/packages/stc/package.py | 27 ++--------- var/spack/repos/builtin/packages/steps/package.py | 27 ++--------- var/spack/repos/builtin/packages/stow/package.py | 27 ++--------- var/spack/repos/builtin/packages/strace/package.py | 27 ++--------- var/spack/repos/builtin/packages/stream/package.py | 27 ++--------- .../repos/builtin/packages/strelka/package.py | 27 ++--------- var/spack/repos/builtin/packages/stress/package.py | 27 ++--------- .../builtin/packages/string-view-lite/package.py | 27 ++--------- .../repos/builtin/packages/stringtie/package.py | 27 ++--------- .../repos/builtin/packages/structure/package.py | 27 ++--------- .../repos/builtin/packages/strumpack/package.py | 26 ++--------- .../repos/builtin/packages/sublime-text/package.py | 27 ++--------- .../repos/builtin/packages/subread/package.py | 27 ++--------- .../repos/builtin/packages/subversion/package.py | 27 ++--------- .../repos/builtin/packages/suite-sparse/package.py | 27 ++--------- .../repos/builtin/packages/sumaclust/package.py | 27 ++--------- .../repos/builtin/packages/sundials/package.py | 27 ++--------- .../repos/builtin/packages/superlu-dist/package.py | 27 ++--------- .../repos/builtin/packages/superlu-mt/package.py | 27 ++--------- .../repos/builtin/packages/superlu/package.py | 27 ++--------- .../repos/builtin/packages/supernova/package.py | 27 ++--------- .../repos/builtin/packages/sw4lite/package.py | 27 ++--------- .../builtin/packages/swap-assembler/package.py | 27 ++--------- var/spack/repos/builtin/packages/swarm/package.py | 27 ++--------- var/spack/repos/builtin/packages/swfft/package.py | 27 ++--------- .../repos/builtin/packages/swiftsim/package.py | 27 ++--------- var/spack/repos/builtin/packages/swig/package.py | 27 ++--------- .../repos/builtin/packages/symengine/package.py | 27 ++--------- var/spack/repos/builtin/packages/sympol/package.py | 27 ++--------- var/spack/repos/builtin/packages/sz/package.py | 27 ++--------- var/spack/repos/builtin/packages/tabix/package.py | 27 ++--------- var/spack/repos/builtin/packages/talass/package.py | 27 ++--------- var/spack/repos/builtin/packages/talloc/package.py | 27 ++--------- var/spack/repos/builtin/packages/tantan/package.py | 27 ++--------- var/spack/repos/builtin/packages/tar/package.py | 27 ++--------- .../repos/builtin/packages/targetp/package.py | 27 ++--------- var/spack/repos/builtin/packages/task/package.py | 27 ++--------- var/spack/repos/builtin/packages/taskd/package.py | 27 ++--------- .../repos/builtin/packages/tasmanian/package.py | 27 ++--------- var/spack/repos/builtin/packages/tassel/package.py | 27 ++--------- var/spack/repos/builtin/packages/tau/package.py | 27 ++--------- .../repos/builtin/packages/tcl-itcl/package.py | 27 ++--------- .../repos/builtin/packages/tcl-tcllib/package.py | 27 ++--------- .../repos/builtin/packages/tcl-tclxml/package.py | 27 ++--------- var/spack/repos/builtin/packages/tcl/package.py | 27 ++--------- var/spack/repos/builtin/packages/tclap/package.py | 27 ++--------- .../repos/builtin/packages/tcoffee/package.py | 27 ++--------- .../repos/builtin/packages/tcptrace/package.py | 27 ++--------- var/spack/repos/builtin/packages/tcsh/package.py | 27 ++--------- .../repos/builtin/packages/tealeaf/package.py | 27 ++--------- .../builtin/packages/templight-tools/package.py | 27 ++--------- .../repos/builtin/packages/templight/package.py | 27 ++--------- var/spack/repos/builtin/packages/tetgen/package.py | 27 ++--------- var/spack/repos/builtin/packages/tethex/package.py | 27 ++--------- .../repos/builtin/packages/texinfo/package.py | 27 ++--------- .../repos/builtin/packages/texlive/package.py | 27 ++--------- .../packages/the-platinum-searcher/package.py | 27 ++--------- .../packages/the-silver-searcher/package.py | 27 ++--------- .../builtin/packages/thornado-mini/package.py | 27 ++--------- var/spack/repos/builtin/packages/thrift/package.py | 27 ++--------- var/spack/repos/builtin/packages/thrust/package.py | 27 ++--------- var/spack/repos/builtin/packages/tig/package.py | 27 ++--------- .../repos/builtin/packages/tinyxml/package.py | 27 ++--------- .../repos/builtin/packages/tinyxml2/package.py | 27 ++--------- var/spack/repos/builtin/packages/tioga/package.py | 27 ++--------- var/spack/repos/builtin/packages/tk/package.py | 27 ++--------- var/spack/repos/builtin/packages/tldd/package.py | 27 ++--------- .../repos/builtin/packages/tmalign/package.py | 27 ++--------- var/spack/repos/builtin/packages/tmhmm/package.py | 27 ++--------- var/spack/repos/builtin/packages/tmux/package.py | 27 ++--------- .../repos/builtin/packages/tmuxinator/package.py | 27 ++--------- var/spack/repos/builtin/packages/tophat/package.py | 27 ++--------- var/spack/repos/builtin/packages/tppred/package.py | 27 ++--------- var/spack/repos/builtin/packages/tracer/package.py | 27 ++--------- .../repos/builtin/packages/transabyss/package.py | 27 ++--------- .../repos/builtin/packages/transdecoder/package.py | 27 ++--------- .../repos/builtin/packages/transposome/package.py | 27 ++--------- .../repos/builtin/packages/transset/package.py | 27 ++--------- .../repos/builtin/packages/trapproto/package.py | 27 ++--------- var/spack/repos/builtin/packages/tree/package.py | 27 ++--------- .../repos/builtin/packages/treesub/package.py | 26 ++--------- var/spack/repos/builtin/packages/trf/package.py | 27 ++--------- .../repos/builtin/packages/triangle/package.py | 27 ++--------- .../repos/builtin/packages/trilinos/package.py | 27 ++--------- .../repos/builtin/packages/trimgalore/package.py | 27 ++--------- .../repos/builtin/packages/trimmomatic/package.py | 27 ++--------- .../repos/builtin/packages/trinity/package.py | 27 ++--------- .../repos/builtin/packages/trnascan-se/package.py | 27 ++--------- .../repos/builtin/packages/turbine/package.py | 27 ++--------- .../repos/builtin/packages/turbomole/package.py | 27 ++--------- var/spack/repos/builtin/packages/tut/package.py | 27 ++--------- var/spack/repos/builtin/packages/twm/package.py | 27 ++--------- var/spack/repos/builtin/packages/tycho2/package.py | 27 ++--------- var/spack/repos/builtin/packages/typhon/package.py | 27 ++--------- .../repos/builtin/packages/typhonio/package.py | 27 ++--------- .../repos/builtin/packages/uberftp/package.py | 27 ++--------- var/spack/repos/builtin/packages/ucx/package.py | 27 ++--------- .../repos/builtin/packages/udunits2/package.py | 27 ++--------- .../repos/builtin/packages/ufo-core/package.py | 27 ++--------- .../repos/builtin/packages/ufo-filters/package.py | 27 ++--------- var/spack/repos/builtin/packages/umpire/package.py | 27 ++--------- var/spack/repos/builtin/packages/unblur/package.py | 27 ++--------- .../repos/builtin/packages/uncrustify/package.py | 27 ++--------- .../repos/builtin/packages/unibilium/package.py | 27 ++--------- var/spack/repos/builtin/packages/unison/package.py | 27 ++--------- var/spack/repos/builtin/packages/units/package.py | 27 ++--------- .../repos/builtin/packages/unixodbc/package.py | 27 ++--------- var/spack/repos/builtin/packages/unuran/package.py | 27 ++--------- var/spack/repos/builtin/packages/unzip/package.py | 27 ++--------- .../repos/builtin/packages/usearch/package.py | 27 ++--------- .../repos/builtin/packages/util-linux/package.py | 27 ++--------- .../repos/builtin/packages/util-macros/package.py | 27 ++--------- var/spack/repos/builtin/packages/uuid/package.py | 27 ++--------- .../repos/builtin/packages/valgrind/package.py | 27 ++--------- .../repos/builtin/packages/vampirtrace/package.py | 27 ++--------- .../repos/builtin/packages/vardictjava/package.py | 27 ++--------- .../repos/builtin/packages/varscan/package.py | 27 ++--------- var/spack/repos/builtin/packages/vc/package.py | 27 ++--------- .../repos/builtin/packages/vcftools/package.py | 27 ++--------- var/spack/repos/builtin/packages/vcsh/package.py | 27 ++--------- var/spack/repos/builtin/packages/vdt/package.py | 27 ++--------- .../repos/builtin/packages/vecgeom/package.py | 27 ++--------- .../repos/builtin/packages/veclibfort/package.py | 27 ++--------- var/spack/repos/builtin/packages/vegas2/package.py | 27 ++--------- var/spack/repos/builtin/packages/veloc/package.py | 27 ++--------- var/spack/repos/builtin/packages/velvet/package.py | 27 ++--------- .../repos/builtin/packages/verilator/package.py | 27 ++--------- var/spack/repos/builtin/packages/verrou/package.py | 27 ++--------- .../repos/builtin/packages/videoproto/package.py | 27 ++--------- .../repos/builtin/packages/viennarna/package.py | 27 ++--------- .../repos/builtin/packages/viewres/package.py | 27 ++--------- var/spack/repos/builtin/packages/vim/package.py | 27 ++--------- .../repos/builtin/packages/virtualgl/package.py | 27 ++--------- var/spack/repos/builtin/packages/visit/package.py | 27 ++--------- .../repos/builtin/packages/vizglow/package.py | 27 ++--------- var/spack/repos/builtin/packages/vmatch/package.py | 27 ++--------- var/spack/repos/builtin/packages/voropp/package.py | 27 ++--------- .../repos/builtin/packages/votca-csg/package.py | 26 ++--------- .../repos/builtin/packages/votca-ctp/package.py | 26 ++--------- .../repos/builtin/packages/votca-tools/package.py | 26 ++--------- .../repos/builtin/packages/votca-xtp/package.py | 26 ++--------- var/spack/repos/builtin/packages/vpfft/package.py | 27 ++--------- var/spack/repos/builtin/packages/vpic/package.py | 27 ++--------- .../repos/builtin/packages/vsearch/package.py | 27 ++--------- var/spack/repos/builtin/packages/vt/package.py | 27 ++--------- var/spack/repos/builtin/packages/vtk/package.py | 27 ++--------- var/spack/repos/builtin/packages/vtkh/package.py | 27 ++--------- var/spack/repos/builtin/packages/vtkm/package.py | 27 ++--------- .../repos/builtin/packages/wannier90/package.py | 27 ++--------- var/spack/repos/builtin/packages/wcslib/package.py | 27 ++--------- var/spack/repos/builtin/packages/wget/package.py | 27 ++--------- var/spack/repos/builtin/packages/wgsim/package.py | 27 ++--------- .../builtin/packages/windowswmproto/package.py | 27 ++--------- .../repos/builtin/packages/wireshark/package.py | 27 ++--------- .../repos/builtin/packages/workrave/package.py | 27 ++--------- var/spack/repos/builtin/packages/wt/package.py | 27 ++--------- var/spack/repos/builtin/packages/wx/package.py | 27 ++--------- .../repos/builtin/packages/wxpropgrid/package.py | 27 ++--------- .../repos/builtin/packages/x11perf/package.py | 27 ++--------- .../repos/builtin/packages/xapian-core/package.py | 27 ++--------- var/spack/repos/builtin/packages/xauth/package.py | 27 ++--------- .../repos/builtin/packages/xbacklight/package.py | 27 ++--------- var/spack/repos/builtin/packages/xbiff/package.py | 27 ++--------- .../repos/builtin/packages/xbitmaps/package.py | 27 ++--------- var/spack/repos/builtin/packages/xbraid/package.py | 27 ++--------- var/spack/repos/builtin/packages/xcalc/package.py | 27 ++--------- .../repos/builtin/packages/xcb-demo/package.py | 27 ++--------- .../repos/builtin/packages/xcb-proto/package.py | 27 ++--------- .../builtin/packages/xcb-util-cursor/package.py | 27 ++--------- .../builtin/packages/xcb-util-errors/package.py | 27 ++--------- .../builtin/packages/xcb-util-image/package.py | 27 ++--------- .../builtin/packages/xcb-util-keysyms/package.py | 27 ++--------- .../packages/xcb-util-renderutil/package.py | 27 ++--------- .../repos/builtin/packages/xcb-util-wm/package.py | 27 ++--------- .../repos/builtin/packages/xcb-util-xrm/package.py | 27 ++--------- .../repos/builtin/packages/xcb-util/package.py | 27 ++--------- var/spack/repos/builtin/packages/xclip/package.py | 27 ++--------- .../repos/builtin/packages/xclipboard/package.py | 27 ++--------- var/spack/repos/builtin/packages/xclock/package.py | 27 ++--------- .../repos/builtin/packages/xcmiscproto/package.py | 27 ++--------- var/spack/repos/builtin/packages/xcmsdb/package.py | 27 ++--------- .../repos/builtin/packages/xcompmgr/package.py | 27 ++--------- .../repos/builtin/packages/xconsole/package.py | 27 ++--------- .../builtin/packages/xcursor-themes/package.py | 27 ++--------- .../repos/builtin/packages/xcursorgen/package.py | 27 ++--------- .../repos/builtin/packages/xdbedizzy/package.py | 27 ++--------- .../repos/builtin/packages/xditview/package.py | 27 ++--------- var/spack/repos/builtin/packages/xdm/package.py | 27 ++--------- .../repos/builtin/packages/xdpyinfo/package.py | 27 ++--------- .../repos/builtin/packages/xdriinfo/package.py | 27 ++--------- var/spack/repos/builtin/packages/xedit/package.py | 27 ++--------- .../repos/builtin/packages/xerces-c/package.py | 27 ++--------- var/spack/repos/builtin/packages/xev/package.py | 27 ++--------- .../repos/builtin/packages/xextproto/package.py | 27 ++--------- var/spack/repos/builtin/packages/xeyes/package.py | 27 ++--------- .../builtin/packages/xf86bigfontproto/package.py | 27 ++--------- .../repos/builtin/packages/xf86dga/package.py | 27 ++--------- .../repos/builtin/packages/xf86dgaproto/package.py | 27 ++--------- .../repos/builtin/packages/xf86driproto/package.py | 27 ++--------- .../builtin/packages/xf86miscproto/package.py | 27 ++--------- .../builtin/packages/xf86rushproto/package.py | 27 ++--------- .../builtin/packages/xf86vidmodeproto/package.py | 27 ++--------- var/spack/repos/builtin/packages/xfd/package.py | 27 ++--------- .../repos/builtin/packages/xfindproxy/package.py | 27 ++--------- .../repos/builtin/packages/xfontsel/package.py | 27 ++--------- var/spack/repos/builtin/packages/xfs/package.py | 27 ++--------- .../repos/builtin/packages/xfsinfo/package.py | 27 ++--------- var/spack/repos/builtin/packages/xfwp/package.py | 27 ++--------- var/spack/repos/builtin/packages/xgamma/package.py | 27 ++--------- var/spack/repos/builtin/packages/xgc/package.py | 27 ++--------- var/spack/repos/builtin/packages/xhmm/package.py | 27 ++--------- var/spack/repos/builtin/packages/xhost/package.py | 27 ++--------- .../builtin/packages/xineramaproto/package.py | 27 ++--------- var/spack/repos/builtin/packages/xinit/package.py | 27 ++--------- var/spack/repos/builtin/packages/xinput/package.py | 27 ++--------- var/spack/repos/builtin/packages/xios/package.py | 27 ++--------- .../repos/builtin/packages/xkbcomp/package.py | 27 ++--------- .../repos/builtin/packages/xkbdata/package.py | 27 ++--------- var/spack/repos/builtin/packages/xkbevd/package.py | 27 ++--------- .../repos/builtin/packages/xkbprint/package.py | 27 ++--------- .../repos/builtin/packages/xkbutils/package.py | 27 ++--------- .../builtin/packages/xkeyboard-config/package.py | 27 ++--------- var/spack/repos/builtin/packages/xkill/package.py | 27 ++--------- var/spack/repos/builtin/packages/xload/package.py | 27 ++--------- var/spack/repos/builtin/packages/xlogo/package.py | 27 ++--------- .../repos/builtin/packages/xlsatoms/package.py | 27 ++--------- .../repos/builtin/packages/xlsclients/package.py | 27 ++--------- .../repos/builtin/packages/xlsfonts/package.py | 27 ++--------- var/spack/repos/builtin/packages/xmag/package.py | 27 ++--------- var/spack/repos/builtin/packages/xman/package.py | 27 ++--------- .../repos/builtin/packages/xmessage/package.py | 27 ++--------- var/spack/repos/builtin/packages/xmh/package.py | 27 ++--------- var/spack/repos/builtin/packages/xmlf90/package.py | 27 ++--------- var/spack/repos/builtin/packages/xmlto/package.py | 27 ++--------- .../repos/builtin/packages/xmodmap/package.py | 27 ++--------- var/spack/repos/builtin/packages/xmore/package.py | 27 ++--------- .../builtin/packages/xorg-cf-files/package.py | 27 ++--------- .../repos/builtin/packages/xorg-docs/package.py | 27 ++--------- .../repos/builtin/packages/xorg-gtest/package.py | 27 ++--------- .../repos/builtin/packages/xorg-server/package.py | 27 ++--------- .../builtin/packages/xorg-sgml-doctools/package.py | 27 ++--------- .../repos/builtin/packages/xphelloworld/package.py | 27 ++--------- .../repos/builtin/packages/xplor-nih/package.py | 27 ++--------- .../repos/builtin/packages/xplsprinters/package.py | 27 ++--------- var/spack/repos/builtin/packages/xpr/package.py | 27 ++--------- .../packages/xprehashprinterlist/package.py | 27 ++--------- var/spack/repos/builtin/packages/xprop/package.py | 27 ++--------- var/spack/repos/builtin/packages/xproto/package.py | 27 ++--------- .../packages/xproxymanagementprotocol/package.py | 27 ++--------- var/spack/repos/builtin/packages/xqilla/package.py | 27 ++--------- var/spack/repos/builtin/packages/xrandr/package.py | 27 ++--------- var/spack/repos/builtin/packages/xrdb/package.py | 27 ++--------- .../repos/builtin/packages/xrefresh/package.py | 27 ++--------- var/spack/repos/builtin/packages/xrootd/package.py | 27 ++--------- var/spack/repos/builtin/packages/xrx/package.py | 27 ++--------- .../repos/builtin/packages/xsbench/package.py | 27 ++--------- var/spack/repos/builtin/packages/xscope/package.py | 27 ++--------- var/spack/repos/builtin/packages/xsd/package.py | 27 ++--------- var/spack/repos/builtin/packages/xsdk/package.py | 27 ++--------- .../repos/builtin/packages/xsdktrilinos/package.py | 27 ++--------- var/spack/repos/builtin/packages/xset/package.py | 27 ++--------- .../repos/builtin/packages/xsetmode/package.py | 27 ++--------- .../repos/builtin/packages/xsetpointer/package.py | 27 ++--------- .../repos/builtin/packages/xsetroot/package.py | 27 ++--------- var/spack/repos/builtin/packages/xsimd/package.py | 27 ++--------- var/spack/repos/builtin/packages/xsm/package.py | 27 ++--------- .../repos/builtin/packages/xstdcmap/package.py | 27 ++--------- .../builtin/packages/xtensor-python/package.py | 27 ++--------- .../repos/builtin/packages/xtensor/package.py | 27 ++--------- var/spack/repos/builtin/packages/xterm/package.py | 27 ++--------- var/spack/repos/builtin/packages/xtl/package.py | 27 ++--------- var/spack/repos/builtin/packages/xtrans/package.py | 27 ++--------- var/spack/repos/builtin/packages/xtrap/package.py | 27 ++--------- var/spack/repos/builtin/packages/xts/package.py | 27 ++--------- .../repos/builtin/packages/xvidtune/package.py | 27 ++--------- var/spack/repos/builtin/packages/xvinfo/package.py | 27 ++--------- var/spack/repos/builtin/packages/xwd/package.py | 27 ++--------- .../repos/builtin/packages/xwininfo/package.py | 27 ++--------- var/spack/repos/builtin/packages/xwud/package.py | 27 ++--------- var/spack/repos/builtin/packages/xxhash/package.py | 27 ++--------- var/spack/repos/builtin/packages/xz/package.py | 27 ++--------- var/spack/repos/builtin/packages/yajl/package.py | 27 ++--------- var/spack/repos/builtin/packages/yambo/package.py | 27 ++--------- .../repos/builtin/packages/yaml-cpp/package.py | 27 ++--------- var/spack/repos/builtin/packages/yasm/package.py | 27 ++--------- var/spack/repos/builtin/packages/yorick/package.py | 27 ++--------- var/spack/repos/builtin/packages/z3/package.py | 27 ++--------- var/spack/repos/builtin/packages/zeromq/package.py | 27 ++--------- var/spack/repos/builtin/packages/zfp/package.py | 27 ++--------- var/spack/repos/builtin/packages/zip/package.py | 27 ++--------- var/spack/repos/builtin/packages/zlib/package.py | 27 ++--------- var/spack/repos/builtin/packages/zoltan/package.py | 27 ++--------- var/spack/repos/builtin/packages/zsh/package.py | 27 ++--------- var/spack/repos/builtin/packages/zstd/package.py | 27 ++--------- 3359 files changed, 13518 insertions(+), 76151 deletions(-) (limited to 'var') diff --git a/bin/sbang b/bin/sbang index 4ff6b1b327..b3d74ef48f 100755 --- a/bin/sbang +++ b/bin/sbang @@ -1,28 +1,10 @@ #!/bin/bash -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # # `sbang`: Run scripts with long shebang lines. # diff --git a/bin/spack b/bin/spack index 22a7032daa..c62871d6a6 100755 --- a/bin/spack +++ b/bin/spack @@ -1,28 +1,10 @@ #!/usr/bin/env python -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from __future__ import print_function import os diff --git a/bin/spack-python b/bin/spack-python index 4f6ae94904..e4487e3464 100755 --- a/bin/spack-python +++ b/bin/spack-python @@ -1,28 +1,10 @@ #!/bin/sh -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # # spack-python # diff --git a/lib/spack/docs/basic_usage.rst b/lib/spack/docs/basic_usage.rst index d61ca699ad..7eda320029 100644 --- a/lib/spack/docs/basic_usage.rst +++ b/lib/spack/docs/basic_usage.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _basic-usage: =========== diff --git a/lib/spack/docs/binary_caches.rst b/lib/spack/docs/binary_caches.rst index c7eed69a6e..844d7c194d 100644 --- a/lib/spack/docs/binary_caches.rst +++ b/lib/spack/docs/binary_caches.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _binary_caches: ============ diff --git a/lib/spack/docs/build_settings.rst b/lib/spack/docs/build_settings.rst index e46d52cc52..07e4ab13b8 100644 --- a/lib/spack/docs/build_settings.rst +++ b/lib/spack/docs/build_settings.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _build-settings: ====================================== diff --git a/lib/spack/docs/build_systems.rst b/lib/spack/docs/build_systems.rst index b84c9fe450..eb8d3f6ab2 100644 --- a/lib/spack/docs/build_systems.rst +++ b/lib/spack/docs/build_systems.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _build-systems: diff --git a/lib/spack/docs/build_systems/autotoolspackage.rst b/lib/spack/docs/build_systems/autotoolspackage.rst index 21d722664f..ce22fd832b 100644 --- a/lib/spack/docs/build_systems/autotoolspackage.rst +++ b/lib/spack/docs/build_systems/autotoolspackage.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _autotoolspackage: ---------------- diff --git a/lib/spack/docs/build_systems/cmakepackage.rst b/lib/spack/docs/build_systems/cmakepackage.rst index 763d368ca4..b627ddb84b 100644 --- a/lib/spack/docs/build_systems/cmakepackage.rst +++ b/lib/spack/docs/build_systems/cmakepackage.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _cmakepackage: ------------ diff --git a/lib/spack/docs/build_systems/cudapackage.rst b/lib/spack/docs/build_systems/cudapackage.rst index 42ed61e33f..1eed57e669 100644 --- a/lib/spack/docs/build_systems/cudapackage.rst +++ b/lib/spack/docs/build_systems/cudapackage.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _cudapackage: ----------- diff --git a/lib/spack/docs/build_systems/custompackage.rst b/lib/spack/docs/build_systems/custompackage.rst index 092310058e..d02c9c1a0a 100644 --- a/lib/spack/docs/build_systems/custompackage.rst +++ b/lib/spack/docs/build_systems/custompackage.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _custompackage: -------------------- diff --git a/lib/spack/docs/build_systems/intelpackage.rst b/lib/spack/docs/build_systems/intelpackage.rst index c03bbc30e0..6a1be0519b 100644 --- a/lib/spack/docs/build_systems/intelpackage.rst +++ b/lib/spack/docs/build_systems/intelpackage.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _intelpackage: ------------ diff --git a/lib/spack/docs/build_systems/makefilepackage.rst b/lib/spack/docs/build_systems/makefilepackage.rst index 8a0cd04dcd..dbb8686cc3 100644 --- a/lib/spack/docs/build_systems/makefilepackage.rst +++ b/lib/spack/docs/build_systems/makefilepackage.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _makefilepackage: --------------- diff --git a/lib/spack/docs/build_systems/mesonpackage.rst b/lib/spack/docs/build_systems/mesonpackage.rst index a3379d7772..4b30ac5df0 100644 --- a/lib/spack/docs/build_systems/mesonpackage.rst +++ b/lib/spack/docs/build_systems/mesonpackage.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _mesonpackage: ------------ diff --git a/lib/spack/docs/build_systems/octavepackage.rst b/lib/spack/docs/build_systems/octavepackage.rst index 4262f621ab..f63089406c 100644 --- a/lib/spack/docs/build_systems/octavepackage.rst +++ b/lib/spack/docs/build_systems/octavepackage.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _octavepackage: ------------- diff --git a/lib/spack/docs/build_systems/perlpackage.rst b/lib/spack/docs/build_systems/perlpackage.rst index c2a8543251..3f36a4eb2f 100644 --- a/lib/spack/docs/build_systems/perlpackage.rst +++ b/lib/spack/docs/build_systems/perlpackage.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _perlpackage: ----------- diff --git a/lib/spack/docs/build_systems/pythonpackage.rst b/lib/spack/docs/build_systems/pythonpackage.rst index 4b916e2c4a..61aef00c50 100644 --- a/lib/spack/docs/build_systems/pythonpackage.rst +++ b/lib/spack/docs/build_systems/pythonpackage.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _pythonpackage: ------------- diff --git a/lib/spack/docs/build_systems/qmakepackage.rst b/lib/spack/docs/build_systems/qmakepackage.rst index 98f908bdb7..f54b80f8d3 100644 --- a/lib/spack/docs/build_systems/qmakepackage.rst +++ b/lib/spack/docs/build_systems/qmakepackage.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _qmakepackage: ------------ diff --git a/lib/spack/docs/build_systems/rpackage.rst b/lib/spack/docs/build_systems/rpackage.rst index 170bc6ffdf..5e44b2135e 100644 --- a/lib/spack/docs/build_systems/rpackage.rst +++ b/lib/spack/docs/build_systems/rpackage.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _rpackage: -------- diff --git a/lib/spack/docs/build_systems/rubypackage.rst b/lib/spack/docs/build_systems/rubypackage.rst index 06a6927914..70e23f6d50 100644 --- a/lib/spack/docs/build_systems/rubypackage.rst +++ b/lib/spack/docs/build_systems/rubypackage.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _rubypackage: ----------- diff --git a/lib/spack/docs/build_systems/sconspackage.rst b/lib/spack/docs/build_systems/sconspackage.rst index 6be41ee0d8..d87702b9dc 100644 --- a/lib/spack/docs/build_systems/sconspackage.rst +++ b/lib/spack/docs/build_systems/sconspackage.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _sconspackage: ------------ diff --git a/lib/spack/docs/build_systems/wafpackage.rst b/lib/spack/docs/build_systems/wafpackage.rst index 3c65d4d39f..10a458f59e 100644 --- a/lib/spack/docs/build_systems/wafpackage.rst +++ b/lib/spack/docs/build_systems/wafpackage.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _wafpackage: ---------- diff --git a/lib/spack/docs/conf.py b/lib/spack/docs/conf.py index 97b46970bd..5212b4cc30 100644 --- a/lib/spack/docs/conf.py +++ b/lib/spack/docs/conf.py @@ -1,28 +1,9 @@ -# flake8: noqa -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +# flake8: noqa # -*- coding: utf-8 -*- # # Spack documentation build configuration file, created by diff --git a/lib/spack/docs/config_yaml.rst b/lib/spack/docs/config_yaml.rst index 1db5679278..24921efee1 100644 --- a/lib/spack/docs/config_yaml.rst +++ b/lib/spack/docs/config_yaml.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _config-yaml: ==================================== diff --git a/lib/spack/docs/configuration.rst b/lib/spack/docs/configuration.rst index 6d3744f78c..af4fd2d5a8 100644 --- a/lib/spack/docs/configuration.rst +++ b/lib/spack/docs/configuration.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _configuration: ============================== diff --git a/lib/spack/docs/contribution_guide.rst b/lib/spack/docs/contribution_guide.rst index 542ba38519..11b826da13 100644 --- a/lib/spack/docs/contribution_guide.rst +++ b/lib/spack/docs/contribution_guide.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _contribution-guide: ================== diff --git a/lib/spack/docs/developer_guide.rst b/lib/spack/docs/developer_guide.rst index 046de145d0..926d2a360d 100644 --- a/lib/spack/docs/developer_guide.rst +++ b/lib/spack/docs/developer_guide.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _developer_guide: =============== diff --git a/lib/spack/docs/docker_for_developers.rst b/lib/spack/docs/docker_for_developers.rst index cb08b7503e..70d5183011 100644 --- a/lib/spack/docs/docker_for_developers.rst +++ b/lib/spack/docs/docker_for_developers.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _docker_for_developers: ===================== diff --git a/lib/spack/docs/features.rst b/lib/spack/docs/features.rst index 8d7c1ec0cd..dce20d51d6 100644 --- a/lib/spack/docs/features.rst +++ b/lib/spack/docs/features.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + ================ Feature Overview ================ @@ -126,7 +131,7 @@ It doesn't take much python coding to get from there to a working package: .. literalinclude:: ../../../var/spack/repos/builtin/packages/libelf/package.py - :lines: 25- + :lines: 6- Spack also provides wrapper functions around common commands like ``configure``, ``make``, and ``cmake`` to make writing packages diff --git a/lib/spack/docs/getting_started.rst b/lib/spack/docs/getting_started.rst index 7fb1ad648c..8fd0840e35 100644 --- a/lib/spack/docs/getting_started.rst +++ b/lib/spack/docs/getting_started.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _getting_started: =============== diff --git a/lib/spack/docs/index.rst b/lib/spack/docs/index.rst index 16dc69de4d..c2d8a28b89 100644 --- a/lib/spack/docs/index.rst +++ b/lib/spack/docs/index.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. Spack documentation master file, created by sphinx-quickstart on Mon Dec 9 15:32:41 2013. You can adapt this file completely to your liking, but it should at least diff --git a/lib/spack/docs/known_issues.rst b/lib/spack/docs/known_issues.rst index fff2cd8d08..9e64cd63b4 100644 --- a/lib/spack/docs/known_issues.rst +++ b/lib/spack/docs/known_issues.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + ============ Known Issues ============ diff --git a/lib/spack/docs/mirrors.rst b/lib/spack/docs/mirrors.rst index 02bec81258..d273e330d0 100644 --- a/lib/spack/docs/mirrors.rst +++ b/lib/spack/docs/mirrors.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _mirrors: ======= diff --git a/lib/spack/docs/module_file_support.rst b/lib/spack/docs/module_file_support.rst index e699f4244a..37dd03547f 100644 --- a/lib/spack/docs/module_file_support.rst +++ b/lib/spack/docs/module_file_support.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _modules: ======= diff --git a/lib/spack/docs/package_list.rst b/lib/spack/docs/package_list.rst index 2deb5bfc0f..f112525d52 100644 --- a/lib/spack/docs/package_list.rst +++ b/lib/spack/docs/package_list.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _package-list: ============ diff --git a/lib/spack/docs/packaging_guide.rst b/lib/spack/docs/packaging_guide.rst index a9c8c13710..647c38b6ec 100644 --- a/lib/spack/docs/packaging_guide.rst +++ b/lib/spack/docs/packaging_guide.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _packaging-guide: =============== diff --git a/lib/spack/docs/repositories.rst b/lib/spack/docs/repositories.rst index 0502fa36f9..699fe4a7ed 100644 --- a/lib/spack/docs/repositories.rst +++ b/lib/spack/docs/repositories.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _repositories: ============================= diff --git a/lib/spack/docs/tutorial.rst b/lib/spack/docs/tutorial.rst index 3a448977a2..c3ddf98cfb 100644 --- a/lib/spack/docs/tutorial.rst +++ b/lib/spack/docs/tutorial.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _spack-101: ============================= diff --git a/lib/spack/docs/tutorial/examples/0.package.py b/lib/spack/docs/tutorial/examples/0.package.py index 147492127d..cdc8f6a6e4 100644 --- a/lib/spack/docs/tutorial/examples/0.package.py +++ b/lib/spack/docs/tutorial/examples/0.package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # # This is a template package file for Spack. We've put "FIXME" # next to all the things you'll want to change. Once you've handled diff --git a/lib/spack/docs/tutorial/examples/1.package.py b/lib/spack/docs/tutorial/examples/1.package.py index 9b7466b4ff..a6af7ed3e4 100644 --- a/lib/spack/docs/tutorial/examples/1.package.py +++ b/lib/spack/docs/tutorial/examples/1.package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/lib/spack/docs/tutorial/examples/2.package.py b/lib/spack/docs/tutorial/examples/2.package.py index bb16f5b82f..c2687a95cd 100644 --- a/lib/spack/docs/tutorial/examples/2.package.py +++ b/lib/spack/docs/tutorial/examples/2.package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/lib/spack/docs/tutorial/examples/3.package.py b/lib/spack/docs/tutorial/examples/3.package.py index 71a42cd54c..1a9d76f050 100644 --- a/lib/spack/docs/tutorial/examples/3.package.py +++ b/lib/spack/docs/tutorial/examples/3.package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/lib/spack/docs/tutorial/examples/4.package.py b/lib/spack/docs/tutorial/examples/4.package.py index c1167c61f6..c90c14b836 100644 --- a/lib/spack/docs/tutorial/examples/4.package.py +++ b/lib/spack/docs/tutorial/examples/4.package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/lib/spack/docs/tutorial/examples/5.package.py b/lib/spack/docs/tutorial/examples/5.package.py index 1147d87753..18cb846d34 100644 --- a/lib/spack/docs/tutorial/examples/5.package.py +++ b/lib/spack/docs/tutorial/examples/5.package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/lib/spack/docs/tutorial/examples/Autotools/0.package.py b/lib/spack/docs/tutorial/examples/Autotools/0.package.py index 566ec5293f..b9d2f2ca43 100644 --- a/lib/spack/docs/tutorial/examples/Autotools/0.package.py +++ b/lib/spack/docs/tutorial/examples/Autotools/0.package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/lib/spack/docs/tutorial/examples/Autotools/1.package.py b/lib/spack/docs/tutorial/examples/Autotools/1.package.py index 69542c434f..cebe14f91b 100644 --- a/lib/spack/docs/tutorial/examples/Autotools/1.package.py +++ b/lib/spack/docs/tutorial/examples/Autotools/1.package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/lib/spack/docs/tutorial/examples/Cmake/0.package.py b/lib/spack/docs/tutorial/examples/Cmake/0.package.py index 529405ab15..2cdf06fd69 100644 --- a/lib/spack/docs/tutorial/examples/Cmake/0.package.py +++ b/lib/spack/docs/tutorial/examples/Cmake/0.package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # # This is a template package file for Spack. We've put "FIXME" # next to all the things you'll want to change. Once you've handled diff --git a/lib/spack/docs/tutorial/examples/Cmake/1.package.py b/lib/spack/docs/tutorial/examples/Cmake/1.package.py index 8f11003015..4b8c35b5a3 100644 --- a/lib/spack/docs/tutorial/examples/Cmake/1.package.py +++ b/lib/spack/docs/tutorial/examples/Cmake/1.package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/lib/spack/docs/tutorial/examples/Cmake/2.package.py b/lib/spack/docs/tutorial/examples/Cmake/2.package.py index d2fc1e670c..2fbff1ce08 100644 --- a/lib/spack/docs/tutorial/examples/Cmake/2.package.py +++ b/lib/spack/docs/tutorial/examples/Cmake/2.package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/lib/spack/docs/tutorial/examples/Makefile/0.package.py b/lib/spack/docs/tutorial/examples/Makefile/0.package.py index d1b5be0c47..c6be060420 100644 --- a/lib/spack/docs/tutorial/examples/Makefile/0.package.py +++ b/lib/spack/docs/tutorial/examples/Makefile/0.package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/lib/spack/docs/tutorial/examples/Makefile/1.package.py b/lib/spack/docs/tutorial/examples/Makefile/1.package.py index cf1cdc8b50..184a8a137a 100644 --- a/lib/spack/docs/tutorial/examples/Makefile/1.package.py +++ b/lib/spack/docs/tutorial/examples/Makefile/1.package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/lib/spack/docs/tutorial/examples/Makefile/2.package.py b/lib/spack/docs/tutorial/examples/Makefile/2.package.py index 4405eea22b..fda0d8aae6 100644 --- a/lib/spack/docs/tutorial/examples/Makefile/2.package.py +++ b/lib/spack/docs/tutorial/examples/Makefile/2.package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/lib/spack/docs/tutorial/examples/Makefile/3.package.py b/lib/spack/docs/tutorial/examples/Makefile/3.package.py index 2f3222f84d..a992d03388 100644 --- a/lib/spack/docs/tutorial/examples/Makefile/3.package.py +++ b/lib/spack/docs/tutorial/examples/Makefile/3.package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/lib/spack/docs/tutorial/examples/PyPackage/0.package.py b/lib/spack/docs/tutorial/examples/PyPackage/0.package.py index fc99418da7..e06546ae9a 100644 --- a/lib/spack/docs/tutorial/examples/PyPackage/0.package.py +++ b/lib/spack/docs/tutorial/examples/PyPackage/0.package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # # This is a template package file for Spack. We've put "FIXME" # next to all the things you'll want to change. Once you've handled diff --git a/lib/spack/docs/tutorial/examples/PyPackage/1.package.py b/lib/spack/docs/tutorial/examples/PyPackage/1.package.py index d22fe6f044..40402a824e 100644 --- a/lib/spack/docs/tutorial/examples/PyPackage/1.package.py +++ b/lib/spack/docs/tutorial/examples/PyPackage/1.package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/lib/spack/docs/tutorial_advanced_packaging.rst b/lib/spack/docs/tutorial_advanced_packaging.rst index 4d075889d8..f72f483fcb 100644 --- a/lib/spack/docs/tutorial_advanced_packaging.rst +++ b/lib/spack/docs/tutorial_advanced_packaging.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _advanced-packaging-tutorial: ============================ diff --git a/lib/spack/docs/tutorial_basics.rst b/lib/spack/docs/tutorial_basics.rst index 2fdb170482..d0ca3a4eba 100644 --- a/lib/spack/docs/tutorial_basics.rst +++ b/lib/spack/docs/tutorial_basics.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _basics-tutorial: ========================================= diff --git a/lib/spack/docs/tutorial_buildsystems.rst b/lib/spack/docs/tutorial_buildsystems.rst index d92db13062..603477d296 100644 --- a/lib/spack/docs/tutorial_buildsystems.rst +++ b/lib/spack/docs/tutorial_buildsystems.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _build-systems-tutorial: ============================== @@ -105,8 +110,8 @@ This will open the :code:`AutotoolsPackage` file in your text editor. .. literalinclude:: ../../../lib/spack/spack/build_systems/autotools.py :language: python - :emphasize-lines: 42,45,62 - :lines: 40-95,259-267 + :emphasize-lines: 23,26,44 + :lines: 30-76,240-248 :linenos: @@ -151,7 +156,7 @@ build system. Although this package is acceptable let's make this into an .. literalinclude:: tutorial/examples/Autotools/0.package.py :language: python - :emphasize-lines: 28 + :emphasize-lines: 9 :linenos: We first inherit from the :code:`AutotoolsPackage` class. @@ -163,7 +168,7 @@ to be overridden is :code:`configure_args()`. .. literalinclude:: tutorial/examples/Autotools/1.package.py :language: python - :emphasize-lines: 42,43 + :emphasize-lines: 23,24 :linenos: Since Spack takes care of setting the prefix for us we can exclude that as @@ -204,7 +209,7 @@ Take note of the following: .. literalinclude:: ../../../lib/spack/spack/build_systems/makefile.py :language: python - :lines: 33-79,89-107 + :lines: 14-60,70-88 :emphasize-lines: 48,54,61 :linenos: @@ -247,7 +252,7 @@ Let's add in the rest of our details for our package: .. literalinclude:: tutorial/examples/Makefile/1.package.py :language: python - :emphasize-lines: 29,30,32,33,37,39 + :emphasize-lines: 10,11,13,14,18,20 :linenos: As we mentioned earlier, most packages using a :code:`Makefile` have hard-coded @@ -289,7 +294,7 @@ To fix this, we need to use the :code:`edit()` method to write our custom .. literalinclude:: tutorial/examples/Makefile/2.package.py :language: python - :emphasize-lines: 42,43,44 + :emphasize-lines: 23,24,25 :linenos: Here we use a :code:`FileFilter` object to edit our :code:`Makefile`. It takes @@ -302,7 +307,7 @@ Let's change the build and install phases of our package: .. literalinclude:: tutorial/examples/Makefile/3.package.py :language: python - :emphasize-lines: 46, 52 + :emphasize-lines: 27, 33 :linenos: Here demonstrate another strategy that we can use to manipulate our package @@ -482,8 +487,8 @@ And go into a bit of detail on the highlighted sections: .. literalinclude:: ../../../lib/spack/spack/build_systems/cmake.py :language: python - :lines: 37-92, 94-155, 174-211 - :emphasize-lines: 57,68,86,94,96,99,100,101,102,111,117,135,136 + :lines: 18-73, 75-136, 155-192 + :emphasize-lines: 38,49,67,75,77,80,81,82,83,92,98,116,117 :linenos: Some :code:`CMake` packages use different generators. Spack is able to support @@ -564,7 +569,7 @@ Again we fill in the details: .. literalinclude:: tutorial/examples/Cmake/1.package.py :language: python :linenos: - :emphasize-lines: 28,32,33,37,38,39,40,41,42 + :emphasize-lines: 9,13,14,18,19,20,21,22,23 As mentioned earlier, Spack will use sensible defaults to prevent repeated code and to make writing :code:`CMake` package files simpler. @@ -575,7 +580,7 @@ compiler flags. We add the following options like so: .. literalinclude:: tutorial/examples/Cmake/2.package.py :language: python :linenos: - :emphasize-lines: 45,49,50 + :emphasize-lines: 26,30,31 Now we can control our build options using :code:`cmake_args()`. If defaults are sufficient enough for the package, we can leave this method out. @@ -677,7 +682,7 @@ We see the following: .. literalinclude:: ../../../lib/spack/spack/build_systems/python.py :language: python - :lines: 35, 161-364 + :lines: 16, 142-345 :linenos: Each of these methods have sensible defaults or they can be overridden. diff --git a/lib/spack/docs/tutorial_configuration.rst b/lib/spack/docs/tutorial_configuration.rst index 2e97eab590..14c51b70ee 100644 --- a/lib/spack/docs/tutorial_configuration.rst +++ b/lib/spack/docs/tutorial_configuration.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _configs-tutorial: ====================== diff --git a/lib/spack/docs/tutorial_modules.rst b/lib/spack/docs/tutorial_modules.rst index f51f20f80c..2277763da6 100644 --- a/lib/spack/docs/tutorial_modules.rst +++ b/lib/spack/docs/tutorial_modules.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _modules-tutorial: ============ diff --git a/lib/spack/docs/tutorial_packaging.rst b/lib/spack/docs/tutorial_packaging.rst index e85be7c637..b6b4ee6cf7 100644 --- a/lib/spack/docs/tutorial_packaging.rst +++ b/lib/spack/docs/tutorial_packaging.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + .. _packaging-tutorial: ========================= @@ -55,9 +60,9 @@ we run ``spack create`` on it: $ spack create -t generic -f https://github.com/hpc/mpileaks/releases/download/v1.0/mpileaks-1.0.tar.gz ==> This looks like a URL for mpileaks ==> Found 1 version of mpileaks: - + 1.0 https://github.com/LLNL/mpileaks/releases/download/v1.0/mpileaks-1.0.tar.gz - + ==> How many would you like to checksum? (default is 1, q to abort) 1 ==> Downloading... ==> Fetching https://github.com/LLNL/mpileaks/releases/download/v1.0/mpileaks-1.0.tar.gz @@ -133,7 +138,7 @@ found in ``$SPACK_ROOT/lib/spack/docs/tutorial/examples/1.package.py`` and are below. Make these changes to your ``package.py``: .. literalinclude:: tutorial/examples/1.package.py - :lines: 25- + :lines: 6- :language: python We've filled in the comment that describes what this package does and @@ -184,7 +189,7 @@ The mpileaks packages depends on three other package: ``MPI``, ``$SPACK_ROOT/lib/spack/docs/tutorial/examples/2.package.py``): .. literalinclude:: tutorial/examples/2.package.py - :lines: 25- + :lines: 6- :language: python Now when we go to build mpileaks, Spack will fetch and build these @@ -212,15 +217,15 @@ Now when we try to install this package a lot more happens: ==> Executing phase: 'install' ==> Error: ProcessError: Command exited with status 2: 'make' '-j36' - + 1 error found in build log: 1 ==> Executing phase: 'install' 2 ==> 'make' '-j36' >> 3 make: *** No targets specified and no makefile found. Stop. - + See build log for details: SPACK_ROOT/var/spack/stage/mpileaks-1.0-lfgf53rns5mswq25rxckzgvmjc6ywam7/mpileaks-1.0/spack-build.out - + Note that this command may take a while to run and produce more output if you don't have an MPI already installed or configured in Spack. @@ -239,7 +244,7 @@ call to ``configure()`` to the top of the install routine. The resulting package.py is in ``$SPACK_ROOT/lib/spack/docs/tutorial/examples/3.package.py``: .. literalinclude:: tutorial/examples/3.package.py - :lines: 25- + :lines: 6- :language: python If we re-run we still get errors: @@ -254,7 +259,7 @@ If we re-run we still get errors: ==> Executing phase: 'install' ==> Error: ProcessError: Command exited with status 1: './configure' - + 1 error found in build log: [ ... ] 21 checking whether SPACK_ROOT/lib/spack/env/gcc/gcc and cc understand -c and -o together... yes @@ -264,10 +269,10 @@ If we re-run we still get errors: 25 checking for SPACK_ROOT/opt/spack/linux-ubuntu16.04-x86_64/gcc-5.4.0/openmpi-3.0.0-yo5qkfvumpmgmvlbalqcadu46j5bd52f/bin/mpicc... SPACK_ROOT/opt/spack/linux-ubuntu16.04-x86_64/gcc-5.4.0/openmpi-3.0.0-yo5qkfvumpmgmvlbalqcadu46j5bd52f/bin/mpicc 26 Checking whether SPACK_ROOT/opt/spack/linux-ubuntu16.04-x86_64/gcc-5.4.0/openmpi-3.0.0-yo5qkfvumpmgmvlbalqcadu46j5bd52f/bin/mpicc responds to '-showme:compile'... yes >> 27 configure: error: unable to locate adept-utils installation - + See build log for details: SPACK_ROOT/var/spack/stage/mpileaks-1.0-lfgf53rns5mswq25rxckzgvmjc6ywam7/mpileaks-1.0/spack-build.out - + Again, the problem may be obvious. But let's pretend we're not all intelligent developers and use this opportunity spend some time debugging. We have a few options that can tell us about @@ -276,7 +281,7 @@ what's going wrong: As per the error message, Spack has given us a ``spack-build.out`` debug log: .. code-block:: console - + ==> Executing phase: 'install' ==> './configure' checking metadata... no @@ -290,7 +295,7 @@ As per the error message, Spack has given us a ``spack-build.out`` debug log: checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no - checking for suffix of executables... + checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether SPACK_ROOT/lib/spack/env/gcc/gcc accepts -g... yes @@ -340,7 +345,7 @@ From here we can manually re-run the build: checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no - checking for suffix of executables... + checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether SPACK_ROOT/lib/spack/env/gcc/gcc accepts -g... yes @@ -372,7 +377,7 @@ version can be found in ``$SPACK_ROOT/lib/spack/docs/tutorial/examples/4.package.py``: .. literalinclude:: tutorial/examples/4.package.py - :lines: 25- + :lines: 6- :language: python This is all we need for working mpileaks! If we install now we'll see: @@ -423,7 +428,7 @@ To do this, we'll add a variant to our package, as per the following (see ``$SPACK_ROOT/lib/spack/docs/tutorial/examples/5.package.py``): .. literalinclude:: tutorial/examples/5.package.py - :lines: 25- + :lines: 6- :language: python We've added the variant ``stackstart``, and given it a default value of diff --git a/lib/spack/docs/workflows.rst b/lib/spack/docs/workflows.rst index 18b546aa30..b55c8bfd49 100644 --- a/lib/spack/docs/workflows.rst +++ b/lib/spack/docs/workflows.rst @@ -1,3 +1,8 @@ +.. Copyright 2013-2018 Lawrence Livermore National Security, LLC and other + Spack Project Developers. See the top-level COPYRIGHT file for details. + + SPDX-License-Identifier: (Apache-2.0 OR MIT) + ========= Workflows ========= diff --git a/lib/spack/env/cc b/lib/spack/env/cc index bf78f2d5d0..3b83291cc2 100755 --- a/lib/spack/env/cc +++ b/lib/spack/env/cc @@ -1,28 +1,10 @@ #!/bin/bash -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # # Spack compiler wrapper script. # diff --git a/lib/spack/external/__init__.py b/lib/spack/external/__init__.py index 0f81f37802..320d3a6341 100644 --- a/lib/spack/external/__init__.py +++ b/lib/spack/external/__init__.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """This module contains the following external, potentially separately licensed, packages that are included in Spack: diff --git a/lib/spack/external/ordereddict_backport.py b/lib/spack/external/ordereddict_backport.py index 02b2ea1f4b..9bb788f093 100644 --- a/lib/spack/external/ordereddict_backport.py +++ b/lib/spack/external/ordereddict_backport.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """This file dispatches to the correct implementation of OrderedDict.""" # TODO: this file, along with py26/ordereddict.py, can be removed when diff --git a/lib/spack/llnl/__init__.py b/lib/spack/llnl/__init__.py index 0e81cb3b36..4f442db458 100644 --- a/lib/spack/llnl/__init__.py +++ b/lib/spack/llnl/__init__.py @@ -1,24 +1,4 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) diff --git a/lib/spack/llnl/util/__init__.py b/lib/spack/llnl/util/__init__.py index 0e81cb3b36..4f442db458 100644 --- a/lib/spack/llnl/util/__init__.py +++ b/lib/spack/llnl/util/__init__.py @@ -1,24 +1,4 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) diff --git a/lib/spack/llnl/util/argparsewriter.py b/lib/spack/llnl/util/argparsewriter.py index 75c62f007f..7ae89b81a8 100644 --- a/lib/spack/llnl/util/argparsewriter.py +++ b/lib/spack/llnl/util/argparsewriter.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from __future__ import print_function import re import argparse diff --git a/lib/spack/llnl/util/filesystem.py b/lib/spack/llnl/util/filesystem.py index 599d0b95e1..3a43cfd582 100644 --- a/lib/spack/llnl/util/filesystem.py +++ b/lib/spack/llnl/util/filesystem.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import collections import errno import hashlib diff --git a/lib/spack/llnl/util/lang.py b/lib/spack/llnl/util/lang.py index 314dc92f2c..92a9222f27 100644 --- a/lib/spack/llnl/util/lang.py +++ b/lib/spack/llnl/util/lang.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from __future__ import division import os diff --git a/lib/spack/llnl/util/link_tree.py b/lib/spack/llnl/util/link_tree.py index 6deadf8109..e675523015 100644 --- a/lib/spack/llnl/util/link_tree.py +++ b/lib/spack/llnl/util/link_tree.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """LinkTree class for setting up trees of symbolic links.""" import os diff --git a/lib/spack/llnl/util/lock.py b/lib/spack/llnl/util/lock.py index 9a2044992b..3beb219bd9 100644 --- a/lib/spack/llnl/util/lock.py +++ b/lib/spack/llnl/util/lock.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import fcntl import errno diff --git a/lib/spack/llnl/util/multiproc.py b/lib/spack/llnl/util/multiproc.py index 26902d02ee..9c555112ec 100644 --- a/lib/spack/llnl/util/multiproc.py +++ b/lib/spack/llnl/util/multiproc.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """ This implements a parallel map operation but it can accept more values than multiprocessing.Pool.apply() can. For example, apply() will fail diff --git a/lib/spack/llnl/util/tty/__init__.py b/lib/spack/llnl/util/tty/__init__.py index 5bf4e0f8ba..49a2187ad3 100644 --- a/lib/spack/llnl/util/tty/__init__.py +++ b/lib/spack/llnl/util/tty/__init__.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import fcntl import os import struct diff --git a/lib/spack/llnl/util/tty/colify.py b/lib/spack/llnl/util/tty/colify.py index bc3aed3a92..c329193fba 100644 --- a/lib/spack/llnl/util/tty/colify.py +++ b/lib/spack/llnl/util/tty/colify.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """ Routines for printing columnar output. See ``colify()`` for more information. """ diff --git a/lib/spack/llnl/util/tty/color.py b/lib/spack/llnl/util/tty/color.py index 3e40443a40..53a1150ada 100644 --- a/lib/spack/llnl/util/tty/color.py +++ b/lib/spack/llnl/util/tty/color.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """ This file implements an expression syntax, similar to ``printf``, for adding ANSI colors to text. diff --git a/lib/spack/llnl/util/tty/log.py b/lib/spack/llnl/util/tty/log.py index 64238f3ba0..df2d56cab2 100644 --- a/lib/spack/llnl/util/tty/log.py +++ b/lib/spack/llnl/util/tty/log.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Utility classes for logging the output of blocks of code. """ import multiprocessing diff --git a/lib/spack/spack/__init__.py b/lib/spack/spack/__init__.py index 515b36cf26..338e4c67ec 100644 --- a/lib/spack/spack/__init__.py +++ b/lib/spack/spack/__init__.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + #: major, minor, patch version for Spack, in a tuple spack_version_info = (0, 11, 2) diff --git a/lib/spack/spack/abi.py b/lib/spack/spack/abi.py index ce31ebecbb..490c688911 100644 --- a/lib/spack/spack/abi.py +++ b/lib/spack/spack/abi.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os from llnl.util.lang import memoized diff --git a/lib/spack/spack/architecture.py b/lib/spack/spack/architecture.py index ca0a647121..1b7b602121 100644 --- a/lib/spack/spack/architecture.py +++ b/lib/spack/spack/architecture.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """ This module contains all the elements that are required to create an architecture object. These include, the target processor, the operating system, diff --git a/lib/spack/spack/binary_distribution.py b/lib/spack/spack/binary_distribution.py index 669cdb78aa..7df8016f18 100644 --- a/lib/spack/spack/binary_distribution.py +++ b/lib/spack/spack/binary_distribution.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import re import tarfile diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py index b6288993dd..71edc65ce7 100644 --- a/lib/spack/spack/build_environment.py +++ b/lib/spack/spack/build_environment.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """ This module contains all routines related to setting up the package build environment. All of this is set up by package.py just before diff --git a/lib/spack/spack/build_systems/__init__.py b/lib/spack/spack/build_systems/__init__.py index 0e81cb3b36..4f442db458 100644 --- a/lib/spack/spack/build_systems/__init__.py +++ b/lib/spack/spack/build_systems/__init__.py @@ -1,24 +1,4 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) diff --git a/lib/spack/spack/build_systems/aspell_dict.py b/lib/spack/spack/build_systems/aspell_dict.py index 76b6d8ebc5..437983e8a7 100644 --- a/lib/spack/spack/build_systems/aspell_dict.py +++ b/lib/spack/spack/build_systems/aspell_dict.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # Why doesn't this work for me? # from spack import * from llnl.util.filesystem import filter_file diff --git a/lib/spack/spack/build_systems/autotools.py b/lib/spack/spack/build_systems/autotools.py index 21fe7c4c5b..a26c7f56bb 100644 --- a/lib/spack/spack/build_systems/autotools.py +++ b/lib/spack/spack/build_systems/autotools.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import inspect import os diff --git a/lib/spack/spack/build_systems/cmake.py b/lib/spack/spack/build_systems/cmake.py index 6da901e473..6f46643f83 100644 --- a/lib/spack/spack/build_systems/cmake.py +++ b/lib/spack/spack/build_systems/cmake.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import inspect import os diff --git a/lib/spack/spack/build_systems/cuda.py b/lib/spack/spack/build_systems/cuda.py index 4fad073d71..2e395fe9dd 100644 --- a/lib/spack/spack/build_systems/cuda.py +++ b/lib/spack/spack/build_systems/cuda.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack.package import PackageBase from spack.directives import depends_on, variant, conflicts import platform diff --git a/lib/spack/spack/build_systems/intel.py b/lib/spack/spack/build_systems/intel.py index 0c5707a8ef..d82bd41688 100644 --- a/lib/spack/spack/build_systems/intel.py +++ b/lib/spack/spack/build_systems/intel.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import sys diff --git a/lib/spack/spack/build_systems/makefile.py b/lib/spack/spack/build_systems/makefile.py index 5e7fe121f3..1dd25bbd08 100644 --- a/lib/spack/spack/build_systems/makefile.py +++ b/lib/spack/spack/build_systems/makefile.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import inspect diff --git a/lib/spack/spack/build_systems/meson.py b/lib/spack/spack/build_systems/meson.py index 46161b001b..929248d7f9 100644 --- a/lib/spack/spack/build_systems/meson.py +++ b/lib/spack/spack/build_systems/meson.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import inspect import os diff --git a/lib/spack/spack/build_systems/octave.py b/lib/spack/spack/build_systems/octave.py index 67f3f2432f..ffcbb98c2a 100644 --- a/lib/spack/spack/build_systems/octave.py +++ b/lib/spack/spack/build_systems/octave.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import inspect from spack.directives import depends_on, extends diff --git a/lib/spack/spack/build_systems/perl.py b/lib/spack/spack/build_systems/perl.py index eb6d2f05a4..f2b088f25d 100644 --- a/lib/spack/spack/build_systems/perl.py +++ b/lib/spack/spack/build_systems/perl.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import inspect import os diff --git a/lib/spack/spack/build_systems/python.py b/lib/spack/spack/build_systems/python.py index aadb4e24a2..bf469cee23 100644 --- a/lib/spack/spack/build_systems/python.py +++ b/lib/spack/spack/build_systems/python.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import inspect import os diff --git a/lib/spack/spack/build_systems/qmake.py b/lib/spack/spack/build_systems/qmake.py index 4c59085d26..054d84f4b8 100644 --- a/lib/spack/spack/build_systems/qmake.py +++ b/lib/spack/spack/build_systems/qmake.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import inspect diff --git a/lib/spack/spack/build_systems/r.py b/lib/spack/spack/build_systems/r.py index 0c4cf4d8f4..32bad7bac6 100644 --- a/lib/spack/spack/build_systems/r.py +++ b/lib/spack/spack/build_systems/r.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import inspect diff --git a/lib/spack/spack/build_systems/scons.py b/lib/spack/spack/build_systems/scons.py index 205f3c73fb..a7bc5c6374 100644 --- a/lib/spack/spack/build_systems/scons.py +++ b/lib/spack/spack/build_systems/scons.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import inspect diff --git a/lib/spack/spack/build_systems/waf.py b/lib/spack/spack/build_systems/waf.py index 77c73f3619..ee00d175b0 100644 --- a/lib/spack/spack/build_systems/waf.py +++ b/lib/spack/spack/build_systems/waf.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import inspect diff --git a/lib/spack/spack/caches.py b/lib/spack/spack/caches.py index 5f3d7406de..1d74e9dc3b 100644 --- a/lib/spack/spack/caches.py +++ b/lib/spack/spack/caches.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Caches used by Spack to store data""" import os diff --git a/lib/spack/spack/cmd/__init__.py b/lib/spack/spack/cmd/__init__.py index ede2296881..39a5bcd234 100644 --- a/lib/spack/spack/cmd/__init__.py +++ b/lib/spack/spack/cmd/__init__.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from __future__ import print_function import os diff --git a/lib/spack/spack/cmd/activate.py b/lib/spack/spack/cmd/activate.py index 73c4c63bce..de6bbc3ecc 100644 --- a/lib/spack/spack/cmd/activate.py +++ b/lib/spack/spack/cmd/activate.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import argparse import llnl.util.tty as tty diff --git a/lib/spack/spack/cmd/arch.py b/lib/spack/spack/cmd/arch.py index da76968cd8..46a2306ed5 100644 --- a/lib/spack/spack/cmd/arch.py +++ b/lib/spack/spack/cmd/arch.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from __future__ import print_function import spack.architecture as architecture diff --git a/lib/spack/spack/cmd/blame.py b/lib/spack/spack/cmd/blame.py index 54a1469cbc..a385817f9f 100644 --- a/lib/spack/spack/cmd/blame.py +++ b/lib/spack/spack/cmd/blame.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import re diff --git a/lib/spack/spack/cmd/bootstrap.py b/lib/spack/spack/cmd/bootstrap.py index 2648a221e9..ee09298cb2 100644 --- a/lib/spack/spack/cmd/bootstrap.py +++ b/lib/spack/spack/cmd/bootstrap.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import llnl.util.tty as tty import spack.repo diff --git a/lib/spack/spack/cmd/build.py b/lib/spack/spack/cmd/build.py index d544d1c43e..13b5621cd4 100644 --- a/lib/spack/spack/cmd/build.py +++ b/lib/spack/spack/cmd/build.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import spack.cmd.configure as cfg from spack.build_systems.autotools import AutotoolsPackage diff --git a/lib/spack/spack/cmd/buildcache.py b/lib/spack/spack/cmd/buildcache.py index da2c35ec2f..6ff8acddcb 100644 --- a/lib/spack/spack/cmd/buildcache.py +++ b/lib/spack/spack/cmd/buildcache.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License (as published by -# the Free Software Foundation) version 2.1 dated February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import argparse import llnl.util.tty as tty diff --git a/lib/spack/spack/cmd/cd.py b/lib/spack/spack/cmd/cd.py index a649eccb59..6a10f6f8aa 100644 --- a/lib/spack/spack/cmd/cd.py +++ b/lib/spack/spack/cmd/cd.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack.cmd.common import print_module_placeholder_help import spack.cmd.location diff --git a/lib/spack/spack/cmd/checksum.py b/lib/spack/spack/cmd/checksum.py index 7cf1aa42be..19bfde49bd 100644 --- a/lib/spack/spack/cmd/checksum.py +++ b/lib/spack/spack/cmd/checksum.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from __future__ import print_function import argparse diff --git a/lib/spack/spack/cmd/clean.py b/lib/spack/spack/cmd/clean.py index 185a2c406a..5d3d39997f 100644 --- a/lib/spack/spack/cmd/clean.py +++ b/lib/spack/spack/cmd/clean.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import argparse import os import shutil diff --git a/lib/spack/spack/cmd/clone.py b/lib/spack/spack/cmd/clone.py index c523f26eb6..9926bf016e 100644 --- a/lib/spack/spack/cmd/clone.py +++ b/lib/spack/spack/cmd/clone.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import llnl.util.tty as tty diff --git a/lib/spack/spack/cmd/commands.py b/lib/spack/spack/cmd/commands.py index 59607de4a4..bf29b3f096 100644 --- a/lib/spack/spack/cmd/commands.py +++ b/lib/spack/spack/cmd/commands.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from __future__ import print_function import sys diff --git a/lib/spack/spack/cmd/common/__init__.py b/lib/spack/spack/cmd/common/__init__.py index 25cfdf4398..e1dccda0dc 100644 --- a/lib/spack/spack/cmd/common/__init__.py +++ b/lib/spack/spack/cmd/common/__init__.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import spack.paths from llnl.util import tty diff --git a/lib/spack/spack/cmd/common/arguments.py b/lib/spack/spack/cmd/common/arguments.py index 4a3ddc6326..3b03d146f0 100644 --- a/lib/spack/spack/cmd/common/arguments.py +++ b/lib/spack/spack/cmd/common/arguments.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import argparse diff --git a/lib/spack/spack/cmd/compiler.py b/lib/spack/spack/cmd/compiler.py index 687c62e86d..bf2e1687f8 100644 --- a/lib/spack/spack/cmd/compiler.py +++ b/lib/spack/spack/cmd/compiler.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from __future__ import print_function import argparse diff --git a/lib/spack/spack/cmd/compilers.py b/lib/spack/spack/cmd/compilers.py index 77e20119a2..7510e24b7e 100644 --- a/lib/spack/spack/cmd/compilers.py +++ b/lib/spack/spack/cmd/compilers.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import spack.config from spack.cmd.compiler import compiler_list diff --git a/lib/spack/spack/cmd/config.py b/lib/spack/spack/cmd/config.py index 78d45e22f1..754b1e8336 100644 --- a/lib/spack/spack/cmd/config.py +++ b/lib/spack/spack/cmd/config.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import spack.config from spack.util.editor import editor diff --git a/lib/spack/spack/cmd/configure.py b/lib/spack/spack/cmd/configure.py index 8135bfb994..668d16dafd 100644 --- a/lib/spack/spack/cmd/configure.py +++ b/lib/spack/spack/cmd/configure.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import argparse import llnl.util.tty as tty diff --git a/lib/spack/spack/cmd/create.py b/lib/spack/spack/cmd/create.py index a9d0a8e999..3fc8703c0e 100644 --- a/lib/spack/spack/cmd/create.py +++ b/lib/spack/spack/cmd/create.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from __future__ import print_function import os @@ -46,32 +27,7 @@ section = "packaging" level = "short" -package_template = '''\ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -# +package_template = '''\# # This is a template package file for Spack. We've put "FIXME" # next to all the things you'll want to change. Once you've handled # them, you can save this file and test your package like this: diff --git a/lib/spack/spack/cmd/deactivate.py b/lib/spack/spack/cmd/deactivate.py index fdf64ee0b7..ef450b1c94 100644 --- a/lib/spack/spack/cmd/deactivate.py +++ b/lib/spack/spack/cmd/deactivate.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import argparse import llnl.util.tty as tty diff --git a/lib/spack/spack/cmd/debug.py b/lib/spack/spack/cmd/debug.py index 7fcbfa4212..e1fa227371 100644 --- a/lib/spack/spack/cmd/debug.py +++ b/lib/spack/spack/cmd/debug.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import re from datetime import datetime diff --git a/lib/spack/spack/cmd/dependencies.py b/lib/spack/spack/cmd/dependencies.py index d36b1c5f71..fe66bef1df 100644 --- a/lib/spack/spack/cmd/dependencies.py +++ b/lib/spack/spack/cmd/dependencies.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import argparse import llnl.util.tty as tty diff --git a/lib/spack/spack/cmd/dependents.py b/lib/spack/spack/cmd/dependents.py index 89d2f42dfa..46397ed5f0 100644 --- a/lib/spack/spack/cmd/dependents.py +++ b/lib/spack/spack/cmd/dependents.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import argparse import llnl.util.tty as tty diff --git a/lib/spack/spack/cmd/diy.py b/lib/spack/spack/cmd/diy.py index b6d3bfdfd3..39282b3b2d 100644 --- a/lib/spack/spack/cmd/diy.py +++ b/lib/spack/spack/cmd/diy.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import sys import os import argparse diff --git a/lib/spack/spack/cmd/docs.py b/lib/spack/spack/cmd/docs.py index 4aeaded7e8..9af6a37d7c 100644 --- a/lib/spack/spack/cmd/docs.py +++ b/lib/spack/spack/cmd/docs.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import webbrowser description = 'open spack documentation in a web browser' diff --git a/lib/spack/spack/cmd/edit.py b/lib/spack/spack/cmd/edit.py index 4031e5549a..ddc49753af 100644 --- a/lib/spack/spack/cmd/edit.py +++ b/lib/spack/spack/cmd/edit.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import glob diff --git a/lib/spack/spack/cmd/env.py b/lib/spack/spack/cmd/env.py index 29b00e12f2..94be7f03fb 100644 --- a/lib/spack/spack/cmd/env.py +++ b/lib/spack/spack/cmd/env.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from __future__ import print_function import argparse diff --git a/lib/spack/spack/cmd/extensions.py b/lib/spack/spack/cmd/extensions.py index 9e17dbb81a..a564248d63 100644 --- a/lib/spack/spack/cmd/extensions.py +++ b/lib/spack/spack/cmd/extensions.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import argparse import llnl.util.tty as tty diff --git a/lib/spack/spack/cmd/fetch.py b/lib/spack/spack/cmd/fetch.py index 973b45fbbd..6682cfaaa8 100644 --- a/lib/spack/spack/cmd/fetch.py +++ b/lib/spack/spack/cmd/fetch.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import argparse import llnl.util.tty as tty diff --git a/lib/spack/spack/cmd/find.py b/lib/spack/spack/cmd/find.py index 63e1fe0475..0e8e2ef5f0 100644 --- a/lib/spack/spack/cmd/find.py +++ b/lib/spack/spack/cmd/find.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import sys import llnl.util.tty as tty diff --git a/lib/spack/spack/cmd/flake8.py b/lib/spack/spack/cmd/flake8.py index c6fe19f30c..7049d622f2 100644 --- a/lib/spack/spack/cmd/flake8.py +++ b/lib/spack/spack/cmd/flake8.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from __future__ import print_function import re diff --git a/lib/spack/spack/cmd/gpg.py b/lib/spack/spack/cmd/gpg.py index e6ff1510a2..6b81ce885d 100644 --- a/lib/spack/spack/cmd/gpg.py +++ b/lib/spack/spack/cmd/gpg.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import argparse diff --git a/lib/spack/spack/cmd/graph.py b/lib/spack/spack/cmd/graph.py index 305835ff34..6830c90bae 100644 --- a/lib/spack/spack/cmd/graph.py +++ b/lib/spack/spack/cmd/graph.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from __future__ import print_function import argparse diff --git a/lib/spack/spack/cmd/help.py b/lib/spack/spack/cmd/help.py index 15830bc322..ab1a5b5c45 100644 --- a/lib/spack/spack/cmd/help.py +++ b/lib/spack/spack/cmd/help.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import sys from llnl.util.tty.color import colorize diff --git a/lib/spack/spack/cmd/info.py b/lib/spack/spack/cmd/info.py index 008863b0a2..d4e1f9e5d3 100644 --- a/lib/spack/spack/cmd/info.py +++ b/lib/spack/spack/cmd/info.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from __future__ import print_function import textwrap diff --git a/lib/spack/spack/cmd/install.py b/lib/spack/spack/cmd/install.py index 6404ca81a3..b0165c8c30 100644 --- a/lib/spack/spack/cmd/install.py +++ b/lib/spack/spack/cmd/install.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import argparse import os import shutil diff --git a/lib/spack/spack/cmd/list.py b/lib/spack/spack/cmd/list.py index c32f3556c2..f486f46a4f 100644 --- a/lib/spack/spack/cmd/list.py +++ b/lib/spack/spack/cmd/list.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from __future__ import print_function from __future__ import division diff --git a/lib/spack/spack/cmd/load.py b/lib/spack/spack/cmd/load.py index 115c50dc98..b606af3694 100644 --- a/lib/spack/spack/cmd/load.py +++ b/lib/spack/spack/cmd/load.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import argparse from spack.cmd.common import print_module_placeholder_help, arguments diff --git a/lib/spack/spack/cmd/location.py b/lib/spack/spack/cmd/location.py index 308047c40f..396128f089 100644 --- a/lib/spack/spack/cmd/location.py +++ b/lib/spack/spack/cmd/location.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from __future__ import print_function import argparse diff --git a/lib/spack/spack/cmd/log_parse.py b/lib/spack/spack/cmd/log_parse.py index 0d54159912..ac7db768bf 100644 --- a/lib/spack/spack/cmd/log_parse.py +++ b/lib/spack/spack/cmd/log_parse.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import sys import llnl.util.tty as tty diff --git a/lib/spack/spack/cmd/mirror.py b/lib/spack/spack/cmd/mirror.py index f42e990329..5ef153b314 100644 --- a/lib/spack/spack/cmd/mirror.py +++ b/lib/spack/spack/cmd/mirror.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os from datetime import datetime diff --git a/lib/spack/spack/cmd/module.py b/lib/spack/spack/cmd/module.py index f9f0586d62..f100293cc0 100644 --- a/lib/spack/spack/cmd/module.py +++ b/lib/spack/spack/cmd/module.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import argparse import llnl.util.tty as tty diff --git a/lib/spack/spack/cmd/modules/__init__.py b/lib/spack/spack/cmd/modules/__init__.py index 2460618312..4972acfe0e 100644 --- a/lib/spack/spack/cmd/modules/__init__.py +++ b/lib/spack/spack/cmd/modules/__init__.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Implementation details of the ``spack module`` command.""" import collections diff --git a/lib/spack/spack/cmd/modules/dotkit.py b/lib/spack/spack/cmd/modules/dotkit.py index 9c50dfa777..159defe3a6 100644 --- a/lib/spack/spack/cmd/modules/dotkit.py +++ b/lib/spack/spack/cmd/modules/dotkit.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import functools import spack.cmd.modules diff --git a/lib/spack/spack/cmd/modules/lmod.py b/lib/spack/spack/cmd/modules/lmod.py index b40024b114..33be5bc85b 100644 --- a/lib/spack/spack/cmd/modules/lmod.py +++ b/lib/spack/spack/cmd/modules/lmod.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import functools import os diff --git a/lib/spack/spack/cmd/modules/tcl.py b/lib/spack/spack/cmd/modules/tcl.py index f0cf2ed13c..c300584505 100644 --- a/lib/spack/spack/cmd/modules/tcl.py +++ b/lib/spack/spack/cmd/modules/tcl.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import functools import spack.cmd.modules diff --git a/lib/spack/spack/cmd/patch.py b/lib/spack/spack/cmd/patch.py index 49edf6634a..6de45cccb5 100644 --- a/lib/spack/spack/cmd/patch.py +++ b/lib/spack/spack/cmd/patch.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import argparse import llnl.util.tty as tty diff --git a/lib/spack/spack/cmd/pkg.py b/lib/spack/spack/cmd/pkg.py index 0d64e9900d..e73c1ec61e 100644 --- a/lib/spack/spack/cmd/pkg.py +++ b/lib/spack/spack/cmd/pkg.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from __future__ import print_function import os diff --git a/lib/spack/spack/cmd/providers.py b/lib/spack/spack/cmd/providers.py index c18cac10c5..f20966c4d3 100644 --- a/lib/spack/spack/cmd/providers.py +++ b/lib/spack/spack/cmd/providers.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import six import sys diff --git a/lib/spack/spack/cmd/pydoc.py b/lib/spack/spack/cmd/pydoc.py index 3a9e870f68..e17d548475 100644 --- a/lib/spack/spack/cmd/pydoc.py +++ b/lib/spack/spack/cmd/pydoc.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + description = "run pydoc from within spack" section = "developer" diff --git a/lib/spack/spack/cmd/python.py b/lib/spack/spack/cmd/python.py index e5aa6b6220..fbd5c788fe 100644 --- a/lib/spack/spack/cmd/python.py +++ b/lib/spack/spack/cmd/python.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import sys import code diff --git a/lib/spack/spack/cmd/reindex.py b/lib/spack/spack/cmd/reindex.py index 91c8205fa8..4dcae1c678 100644 --- a/lib/spack/spack/cmd/reindex.py +++ b/lib/spack/spack/cmd/reindex.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import spack.store description = "rebuild Spack's package database" diff --git a/lib/spack/spack/cmd/repo.py b/lib/spack/spack/cmd/repo.py index 6a25e03e91..8ce9ea9351 100644 --- a/lib/spack/spack/cmd/repo.py +++ b/lib/spack/spack/cmd/repo.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from __future__ import print_function import os diff --git a/lib/spack/spack/cmd/restage.py b/lib/spack/spack/cmd/restage.py index 9107fdd138..e2b77167b1 100644 --- a/lib/spack/spack/cmd/restage.py +++ b/lib/spack/spack/cmd/restage.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import argparse import llnl.util.tty as tty diff --git a/lib/spack/spack/cmd/setup.py b/lib/spack/spack/cmd/setup.py index dcace5a668..5620f8904c 100644 --- a/lib/spack/spack/cmd/setup.py +++ b/lib/spack/spack/cmd/setup.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import argparse import copy import os diff --git a/lib/spack/spack/cmd/spec.py b/lib/spack/spack/cmd/spec.py index bac8dd4727..3280d0b356 100644 --- a/lib/spack/spack/cmd/spec.py +++ b/lib/spack/spack/cmd/spec.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from __future__ import print_function import argparse diff --git a/lib/spack/spack/cmd/stage.py b/lib/spack/spack/cmd/stage.py index 47e3eb303a..b44331cadc 100644 --- a/lib/spack/spack/cmd/stage.py +++ b/lib/spack/spack/cmd/stage.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import argparse import llnl.util.tty as tty diff --git a/lib/spack/spack/cmd/test.py b/lib/spack/spack/cmd/test.py index 8b3a924b0c..40f2d6f8b2 100644 --- a/lib/spack/spack/cmd/test.py +++ b/lib/spack/spack/cmd/test.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from __future__ import print_function import sys diff --git a/lib/spack/spack/cmd/uninstall.py b/lib/spack/spack/cmd/uninstall.py index ec05a23137..2e2810b984 100644 --- a/lib/spack/spack/cmd/uninstall.py +++ b/lib/spack/spack/cmd/uninstall.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from __future__ import print_function import argparse diff --git a/lib/spack/spack/cmd/unload.py b/lib/spack/spack/cmd/unload.py index 8907e477d4..60f72bb989 100644 --- a/lib/spack/spack/cmd/unload.py +++ b/lib/spack/spack/cmd/unload.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import argparse from spack.cmd.common import print_module_placeholder_help diff --git a/lib/spack/spack/cmd/unuse.py b/lib/spack/spack/cmd/unuse.py index 0546fa12a4..346fb285ee 100644 --- a/lib/spack/spack/cmd/unuse.py +++ b/lib/spack/spack/cmd/unuse.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import argparse from spack.cmd.common import print_module_placeholder_help diff --git a/lib/spack/spack/cmd/url.py b/lib/spack/spack/cmd/url.py index b787cfc7b0..8168ffe45f 100644 --- a/lib/spack/spack/cmd/url.py +++ b/lib/spack/spack/cmd/url.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from __future__ import division, print_function from collections import defaultdict try: diff --git a/lib/spack/spack/cmd/use.py b/lib/spack/spack/cmd/use.py index 11dc11b7b9..20072c3ef9 100644 --- a/lib/spack/spack/cmd/use.py +++ b/lib/spack/spack/cmd/use.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import argparse from spack.cmd.common import print_module_placeholder_help, arguments diff --git a/lib/spack/spack/cmd/versions.py b/lib/spack/spack/cmd/versions.py index abb64f3747..007e86c164 100644 --- a/lib/spack/spack/cmd/versions.py +++ b/lib/spack/spack/cmd/versions.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from __future__ import print_function from llnl.util.tty.colify import colify diff --git a/lib/spack/spack/cmd/view.py b/lib/spack/spack/cmd/view.py index 153168cf71..0d1f8e20cb 100644 --- a/lib/spack/spack/cmd/view.py +++ b/lib/spack/spack/cmd/view.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + '''Produce a "view" of a Spack DAG. A "view" is file hierarchy representing the union of a number of diff --git a/lib/spack/spack/compiler.py b/lib/spack/spack/compiler.py index afb18ddcac..3bca4d1eae 100644 --- a/lib/spack/spack/compiler.py +++ b/lib/spack/spack/compiler.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import re import itertools diff --git a/lib/spack/spack/compilers/__init__.py b/lib/spack/spack/compilers/__init__.py index e5d03c990a..188b7fd329 100644 --- a/lib/spack/spack/compilers/__init__.py +++ b/lib/spack/spack/compilers/__init__.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """This module contains functions related to finding compilers on the system and configuring Spack to use multiple compilers. """ diff --git a/lib/spack/spack/compilers/cce.py b/lib/spack/spack/compilers/cce.py index e8f48242ee..879f6432ef 100644 --- a/lib/spack/spack/compilers/cce.py +++ b/lib/spack/spack/compilers/cce.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack.compiler import Compiler, get_compiler_version diff --git a/lib/spack/spack/compilers/clang.py b/lib/spack/spack/compilers/clang.py index 52763dff25..7386ceb173 100644 --- a/lib/spack/spack/compilers/clang.py +++ b/lib/spack/spack/compilers/clang.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import re import os import sys diff --git a/lib/spack/spack/compilers/gcc.py b/lib/spack/spack/compilers/gcc.py index 06d89f78be..241a8d97e6 100644 --- a/lib/spack/spack/compilers/gcc.py +++ b/lib/spack/spack/compilers/gcc.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import spack.compilers.clang from spack.compiler import \ Compiler, get_compiler_version, UnsupportedCompilerFlag diff --git a/lib/spack/spack/compilers/intel.py b/lib/spack/spack/compilers/intel.py index 962120362e..53d78d09a1 100644 --- a/lib/spack/spack/compilers/intel.py +++ b/lib/spack/spack/compilers/intel.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack.compiler import \ Compiler, get_compiler_version, UnsupportedCompilerFlag from spack.version import ver diff --git a/lib/spack/spack/compilers/nag.py b/lib/spack/spack/compilers/nag.py index a279384a74..18e5634bfd 100644 --- a/lib/spack/spack/compilers/nag.py +++ b/lib/spack/spack/compilers/nag.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack.compiler import Compiler, get_compiler_version diff --git a/lib/spack/spack/compilers/pgi.py b/lib/spack/spack/compilers/pgi.py index 3693b3a4a6..a224e3ea6f 100644 --- a/lib/spack/spack/compilers/pgi.py +++ b/lib/spack/spack/compilers/pgi.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack.compiler import Compiler, get_compiler_version diff --git a/lib/spack/spack/compilers/xl.py b/lib/spack/spack/compilers/xl.py index 4448efbb98..2f7085fca5 100644 --- a/lib/spack/spack/compilers/xl.py +++ b/lib/spack/spack/compilers/xl.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack.compiler import \ Compiler, get_compiler_version, UnsupportedCompilerFlag from spack.version import ver diff --git a/lib/spack/spack/compilers/xl_r.py b/lib/spack/spack/compilers/xl_r.py index d926c1d782..18ffe0631d 100644 --- a/lib/spack/spack/compilers/xl_r.py +++ b/lib/spack/spack/compilers/xl_r.py @@ -1,28 +1,8 @@ -############################################################################## -# Copyright (c) 2016, International Business Machines Corporation +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Serban Maerean, serban@us.ibm.com based on a similar file, -# spack/lib/spack/spack/compilers/xl.py, produced by Todd Gamblin, -# tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack.compiler import \ Compiler, get_compiler_version, UnsupportedCompilerFlag from spack.version import ver diff --git a/lib/spack/spack/concretize.py b/lib/spack/spack/concretize.py index 58aca31a1f..4b12588c56 100644 --- a/lib/spack/spack/concretize.py +++ b/lib/spack/spack/concretize.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """ Functions here are used to take abstract specs and make them concrete. For example, if a spec asks for a version between 1.8 and 1.9, these diff --git a/lib/spack/spack/config.py b/lib/spack/spack/config.py index f1f9e8da95..b432d5019d 100644 --- a/lib/spack/spack/config.py +++ b/lib/spack/spack/config.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from __future__ import print_function """This module implements Spack's configuration file handling. diff --git a/lib/spack/spack/database.py b/lib/spack/spack/database.py index c7a5e21881..ae643ae72c 100644 --- a/lib/spack/spack/database.py +++ b/lib/spack/spack/database.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Spack's installation tracking database. The database serves two purposes: diff --git a/lib/spack/spack/dependency.py b/lib/spack/spack/dependency.py index 91136a5c2f..34b9a85537 100644 --- a/lib/spack/spack/dependency.py +++ b/lib/spack/spack/dependency.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Data structures that represent Spack's dependency relationships. """ from six import string_types diff --git a/lib/spack/spack/directives.py b/lib/spack/spack/directives.py index bd843ee8d6..9125d55e9a 100644 --- a/lib/spack/spack/directives.py +++ b/lib/spack/spack/directives.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """This package contains directives that can be used within a package. Directives are functions that can be called inside a package diff --git a/lib/spack/spack/directory_layout.py b/lib/spack/spack/directory_layout.py index b8da44ca2a..9fc0c08d22 100644 --- a/lib/spack/spack/directory_layout.py +++ b/lib/spack/spack/directory_layout.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import shutil import glob diff --git a/lib/spack/spack/environment.py b/lib/spack/spack/environment.py index fa67cb658b..9fb1c39af0 100644 --- a/lib/spack/spack/environment.py +++ b/lib/spack/spack/environment.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import collections import contextlib import inspect diff --git a/lib/spack/spack/error.py b/lib/spack/spack/error.py index ac6a81035a..e53536d819 100644 --- a/lib/spack/spack/error.py +++ b/lib/spack/spack/error.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from __future__ import print_function import sys diff --git a/lib/spack/spack/fetch_strategy.py b/lib/spack/spack/fetch_strategy.py index 5fdbaa9695..8cabfa10ac 100644 --- a/lib/spack/spack/fetch_strategy.py +++ b/lib/spack/spack/fetch_strategy.py @@ -1,27 +1,8 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """ Fetch strategies are used to download source code into a staging area in order to build it. They need to define the following methods: diff --git a/lib/spack/spack/filesystem_view.py b/lib/spack/spack/filesystem_view.py index 0f8c8c4282..d3e9878b32 100644 --- a/lib/spack/spack/filesystem_view.py +++ b/lib/spack/spack/filesystem_view.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import filecmp import functools as ft import os diff --git a/lib/spack/spack/graph.py b/lib/spack/spack/graph.py index 3cfaa91c12..6b65932e7d 100644 --- a/lib/spack/spack/graph.py +++ b/lib/spack/spack/graph.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Functions for graphing DAGs of dependencies. This file contains code for graphing DAGs of software packages diff --git a/lib/spack/spack/hooks/__init__.py b/lib/spack/spack/hooks/__init__.py index b23b641b77..b25dfeade2 100644 --- a/lib/spack/spack/hooks/__init__.py +++ b/lib/spack/spack/hooks/__init__.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """This package contains modules with hooks for various stages in the Spack install process. You can add modules here and they'll be executed by package at various times during the package lifecycle. diff --git a/lib/spack/spack/hooks/extensions.py b/lib/spack/spack/hooks/extensions.py index 109a23ab1b..271e01ab2e 100644 --- a/lib/spack/spack/hooks/extensions.py +++ b/lib/spack/spack/hooks/extensions.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import spack from spack.filesystem_view import YamlFilesystemView diff --git a/lib/spack/spack/hooks/licensing.py b/lib/spack/spack/hooks/licensing.py index 2b4f78091c..bc4d0c2ee2 100644 --- a/lib/spack/spack/hooks/licensing.py +++ b/lib/spack/spack/hooks/licensing.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import llnl.util.tty as tty diff --git a/lib/spack/spack/hooks/module_file_generation.py b/lib/spack/spack/hooks/module_file_generation.py index ce7df4c717..5581b20b64 100644 --- a/lib/spack/spack/hooks/module_file_generation.py +++ b/lib/spack/spack/hooks/module_file_generation.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import spack.modules import spack.modules.common import llnl.util.tty as tty diff --git a/lib/spack/spack/hooks/permissions_setters.py b/lib/spack/spack/hooks/permissions_setters.py index c5084652de..ceb6105c16 100644 --- a/lib/spack/spack/hooks/permissions_setters.py +++ b/lib/spack/spack/hooks/permissions_setters.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os from llnl.util.filesystem import chmod_x, chgrp diff --git a/lib/spack/spack/hooks/sbang.py b/lib/spack/spack/hooks/sbang.py index 0fdb77e1a9..e03c397d6f 100644 --- a/lib/spack/spack/hooks/sbang.py +++ b/lib/spack/spack/hooks/sbang.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import stat import re diff --git a/lib/spack/spack/hooks/yaml_version_check.py b/lib/spack/spack/hooks/yaml_version_check.py index 0471712332..57a8fac999 100644 --- a/lib/spack/spack/hooks/yaml_version_check.py +++ b/lib/spack/spack/hooks/yaml_version_check.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Yaml Version Check is a module for ensuring that config file formats are compatible with the current version of Spack.""" import os.path diff --git a/lib/spack/spack/main.py b/lib/spack/spack/main.py index 00084cfcf2..9bcbd776a5 100644 --- a/lib/spack/spack/main.py +++ b/lib/spack/spack/main.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """This is the implementation of the Spack command line executable. In a normal Spack installation, this is invoked from the bin/spack script diff --git a/lib/spack/spack/mirror.py b/lib/spack/spack/mirror.py index c04a769ba4..3310bc53fb 100644 --- a/lib/spack/spack/mirror.py +++ b/lib/spack/spack/mirror.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """ This file contains code for creating spack mirror directories. A mirror is an organized hierarchy containing specially named archive diff --git a/lib/spack/spack/mixins.py b/lib/spack/spack/mixins.py index edc67723a1..bae8ec7494 100644 --- a/lib/spack/spack/mixins.py +++ b/lib/spack/spack/mixins.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """This module contains additional behavior that can be attached to any given package. """ diff --git a/lib/spack/spack/modules/__init__.py b/lib/spack/spack/modules/__init__.py index 4954b8ed86..edafb2e57b 100644 --- a/lib/spack/spack/modules/__init__.py +++ b/lib/spack/spack/modules/__init__.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """This package contains code for creating environment modules, which can include dotkits, TCL non-hierarchical modules, LUA hierarchical modules, and others. diff --git a/lib/spack/spack/modules/common.py b/lib/spack/spack/modules/common.py index bf0188a716..1ed826a844 100644 --- a/lib/spack/spack/modules/common.py +++ b/lib/spack/spack/modules/common.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Here we consolidate the logic for creating an abstract description of the information that module systems need. diff --git a/lib/spack/spack/modules/dotkit.py b/lib/spack/spack/modules/dotkit.py index 42cfe24f9f..156a267b4f 100644 --- a/lib/spack/spack/modules/dotkit.py +++ b/lib/spack/spack/modules/dotkit.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """This module implements the classes necessary to generate dotkit modules.""" import os.path diff --git a/lib/spack/spack/modules/lmod.py b/lib/spack/spack/modules/lmod.py index 858b01a395..ffea55184f 100644 --- a/lib/spack/spack/modules/lmod.py +++ b/lib/spack/spack/modules/lmod.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os.path import llnl.util.lang as lang diff --git a/lib/spack/spack/modules/tcl.py b/lib/spack/spack/modules/tcl.py index 05cb393b65..bec4e27d4a 100644 --- a/lib/spack/spack/modules/tcl.py +++ b/lib/spack/spack/modules/tcl.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """This module implements the classes necessary to generate TCL non-hierarchical modules. """ diff --git a/lib/spack/spack/multimethod.py b/lib/spack/spack/multimethod.py index 6ced487d14..a66abe7bf7 100644 --- a/lib/spack/spack/multimethod.py +++ b/lib/spack/spack/multimethod.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """This module contains utilities for using multi-methods in spack. You can think of multi-methods like overloaded methods -- they're methods with the same name, and we need to select a version diff --git a/lib/spack/spack/operating_systems/__init__.py b/lib/spack/spack/operating_systems/__init__.py index 0e81cb3b36..4f442db458 100644 --- a/lib/spack/spack/operating_systems/__init__.py +++ b/lib/spack/spack/operating_systems/__init__.py @@ -1,24 +1,4 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) diff --git a/lib/spack/spack/operating_systems/cnk.py b/lib/spack/spack/operating_systems/cnk.py index 34cf73e472..aca4e869f4 100644 --- a/lib/spack/spack/operating_systems/cnk.py +++ b/lib/spack/spack/operating_systems/cnk.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack.architecture import OperatingSystem diff --git a/lib/spack/spack/operating_systems/cnl.py b/lib/spack/spack/operating_systems/cnl.py index 9be7fe641a..d0d4e037be 100644 --- a/lib/spack/spack/operating_systems/cnl.py +++ b/lib/spack/spack/operating_systems/cnl.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import re import llnl.util.tty as tty diff --git a/lib/spack/spack/operating_systems/cray_frontend.py b/lib/spack/spack/operating_systems/cray_frontend.py index 7aa38272a6..116a4ec802 100644 --- a/lib/spack/spack/operating_systems/cray_frontend.py +++ b/lib/spack/spack/operating_systems/cray_frontend.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os from spack.operating_systems.linux_distro import LinuxDistro diff --git a/lib/spack/spack/operating_systems/linux_distro.py b/lib/spack/spack/operating_systems/linux_distro.py index a54743f258..a12e08671e 100644 --- a/lib/spack/spack/operating_systems/linux_distro.py +++ b/lib/spack/spack/operating_systems/linux_distro.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import re from spack.architecture import OperatingSystem diff --git a/lib/spack/spack/operating_systems/mac_os.py b/lib/spack/spack/operating_systems/mac_os.py index 6c93544779..d50cbf32be 100644 --- a/lib/spack/spack/operating_systems/mac_os.py +++ b/lib/spack/spack/operating_systems/mac_os.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import platform as py_platform from spack.architecture import OperatingSystem diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py index 77c69cbdab..d164f9e010 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """This is where most of the action happens in Spack. The spack package class structure is based strongly on Homebrew diff --git a/lib/spack/spack/package_prefs.py b/lib/spack/spack/package_prefs.py index 5768c5700c..bd400b1eb8 100644 --- a/lib/spack/spack/package_prefs.py +++ b/lib/spack/spack/package_prefs.py @@ -1,28 +1,10 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import stat + from six import string_types from six import iteritems diff --git a/lib/spack/spack/package_test.py b/lib/spack/spack/package_test.py index c3afd9a434..29edfc6d38 100644 --- a/lib/spack/spack/package_test.py +++ b/lib/spack/spack/package_test.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os from spack.util.executable import which, Executable diff --git a/lib/spack/spack/parse.py b/lib/spack/spack/parse.py index 153040434d..0b3d81d5a1 100644 --- a/lib/spack/spack/parse.py +++ b/lib/spack/spack/parse.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import re import shlex import sys diff --git a/lib/spack/spack/patch.py b/lib/spack/spack/patch.py index f1b6b1a88c..a865d429a4 100644 --- a/lib/spack/spack/patch.py +++ b/lib/spack/spack/patch.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import os.path import inspect diff --git a/lib/spack/spack/paths.py b/lib/spack/spack/paths.py index f1954cda74..d1d1d27136 100644 --- a/lib/spack/spack/paths.py +++ b/lib/spack/spack/paths.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Defines paths that are part of Spack's directory structure. Do not import other ``spack`` modules here. This module is used diff --git a/lib/spack/spack/pkgkit.py b/lib/spack/spack/pkgkit.py index a9251335af..39d1855a01 100644 --- a/lib/spack/spack/pkgkit.py +++ b/lib/spack/spack/pkgkit.py @@ -1,28 +1,9 @@ -# flake8: noqa: F401 -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +# flake8: noqa: F401 """pkgkit is a set of useful build tools and directives for packages. Everything in this module is automatically imported into Spack package files. diff --git a/lib/spack/spack/platforms/__init__.py b/lib/spack/spack/platforms/__init__.py index 0e81cb3b36..4f442db458 100644 --- a/lib/spack/spack/platforms/__init__.py +++ b/lib/spack/spack/platforms/__init__.py @@ -1,24 +1,4 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) diff --git a/lib/spack/spack/platforms/bgq.py b/lib/spack/spack/platforms/bgq.py index 18004d8880..9763dfadb3 100644 --- a/lib/spack/spack/platforms/bgq.py +++ b/lib/spack/spack/platforms/bgq.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os from spack.architecture import Platform, Target from spack.operating_systems.linux_distro import LinuxDistro diff --git a/lib/spack/spack/platforms/cray.py b/lib/spack/spack/platforms/cray.py index 80bf023ab2..2190552e2b 100644 --- a/lib/spack/spack/platforms/cray.py +++ b/lib/spack/spack/platforms/cray.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import re import llnl.util.tty as tty diff --git a/lib/spack/spack/platforms/darwin.py b/lib/spack/spack/platforms/darwin.py index fba3de7fe9..1a793e4ed2 100644 --- a/lib/spack/spack/platforms/darwin.py +++ b/lib/spack/spack/platforms/darwin.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import platform from spack.architecture import Platform, Target from spack.operating_systems.mac_os import MacOs diff --git a/lib/spack/spack/platforms/linux.py b/lib/spack/spack/platforms/linux.py index 0cf906e355..2c36c24ebc 100644 --- a/lib/spack/spack/platforms/linux.py +++ b/lib/spack/spack/platforms/linux.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import platform from spack.architecture import Platform, Target from spack.operating_systems.linux_distro import LinuxDistro diff --git a/lib/spack/spack/platforms/test.py b/lib/spack/spack/platforms/test.py index fa1c86effa..18d283347f 100644 --- a/lib/spack/spack/platforms/test.py +++ b/lib/spack/spack/platforms/test.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack.architecture import Platform, Target from spack.architecture import OperatingSystem diff --git a/lib/spack/spack/provider_index.py b/lib/spack/spack/provider_index.py index c0265e3810..222f98c0d9 100644 --- a/lib/spack/spack/provider_index.py +++ b/lib/spack/spack/provider_index.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """ The ``virtual`` module contains utility classes for virtual dependencies. """ diff --git a/lib/spack/spack/relocate.py b/lib/spack/spack/relocate.py index 6996cc1d5c..664551740a 100644 --- a/lib/spack/spack/relocate.py +++ b/lib/spack/spack/relocate.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import platform diff --git a/lib/spack/spack/repo.py b/lib/spack/spack/repo.py index adde47da4c..7f799193ef 100644 --- a/lib/spack/spack/repo.py +++ b/lib/spack/spack/repo.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import collections import os import stat diff --git a/lib/spack/spack/report.py b/lib/spack/spack/report.py index fca15b126a..0c54e75a46 100644 --- a/lib/spack/spack/report.py +++ b/lib/spack/spack/report.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Tools to produce reports of spec installations""" import codecs import collections diff --git a/lib/spack/spack/reporter.py b/lib/spack/spack/reporter.py index 36efc44e6a..17efe23637 100644 --- a/lib/spack/spack/reporter.py +++ b/lib/spack/spack/reporter.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + __all__ = ['Reporter'] diff --git a/lib/spack/spack/reporters/__init__.py b/lib/spack/spack/reporters/__init__.py index 0e81cb3b36..4f442db458 100644 --- a/lib/spack/spack/reporters/__init__.py +++ b/lib/spack/spack/reporters/__init__.py @@ -1,24 +1,4 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) diff --git a/lib/spack/spack/reporters/cdash.py b/lib/spack/spack/reporters/cdash.py index 9d00e60b20..16251ce7c7 100644 --- a/lib/spack/spack/reporters/cdash.py +++ b/lib/spack/spack/reporters/cdash.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import codecs import hashlib diff --git a/lib/spack/spack/reporters/junit.py b/lib/spack/spack/reporters/junit.py index 2072cf7576..264da413f0 100644 --- a/lib/spack/spack/reporters/junit.py +++ b/lib/spack/spack/reporters/junit.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import os.path diff --git a/lib/spack/spack/resource.py b/lib/spack/spack/resource.py index 5d60adfb69..da697d4b2f 100644 --- a/lib/spack/spack/resource.py +++ b/lib/spack/spack/resource.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Describes an optional resource needed for a build. Typically a bunch of sources that can be built in-tree within another diff --git a/lib/spack/spack/schema/__init__.py b/lib/spack/spack/schema/__init__.py index df8ecb3ffc..f2533f2cc2 100644 --- a/lib/spack/spack/schema/__init__.py +++ b/lib/spack/spack/schema/__init__.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """This module contains jsonschema files for all of Spack's YAML formats. """ from llnl.util.lang import list_modules diff --git a/lib/spack/spack/schema/compilers.py b/lib/spack/spack/schema/compilers.py index fb145b35f3..ab09767221 100644 --- a/lib/spack/spack/schema/compilers.py +++ b/lib/spack/spack/schema/compilers.py @@ -1,31 +1,12 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Schema for compilers.yaml configuration file. .. literalinclude:: ../spack/schema/compilers.py - :lines: 32- + :lines: 13- """ diff --git a/lib/spack/spack/schema/config.py b/lib/spack/spack/schema/config.py index ca77a8105b..0ebcd74ade 100644 --- a/lib/spack/spack/schema/config.py +++ b/lib/spack/spack/schema/config.py @@ -1,31 +1,12 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Schema for config.yaml configuration file. .. literalinclude:: ../spack/schema/config.py - :lines: 32- + :lines: 13- """ diff --git a/lib/spack/spack/schema/mirrors.py b/lib/spack/spack/schema/mirrors.py index c4f13ababd..8832552660 100644 --- a/lib/spack/spack/schema/mirrors.py +++ b/lib/spack/spack/schema/mirrors.py @@ -1,31 +1,12 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Schema for mirrors.yaml configuration file. .. literalinclude:: ../spack/schema/mirrors.py - :lines: 32- + :lines: 13- """ diff --git a/lib/spack/spack/schema/modules.py b/lib/spack/spack/schema/modules.py index 458b40b81d..d1dc9c7605 100644 --- a/lib/spack/spack/schema/modules.py +++ b/lib/spack/spack/schema/modules.py @@ -1,31 +1,12 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Schema for modules.yaml configuration file. .. literalinclude:: ../spack/schema/modules.py - :lines: 32- + :lines: 13- """ diff --git a/lib/spack/spack/schema/packages.py b/lib/spack/spack/schema/packages.py index f9153a837f..a8782fc23b 100644 --- a/lib/spack/spack/schema/packages.py +++ b/lib/spack/spack/schema/packages.py @@ -1,31 +1,12 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Schema for packages.yaml configuration files. .. literalinclude:: ../spack/schema/packages.py - :lines: 32- + :lines: 13- """ diff --git a/lib/spack/spack/schema/repos.py b/lib/spack/spack/schema/repos.py index 8d5b10946a..fc5e5a4276 100644 --- a/lib/spack/spack/schema/repos.py +++ b/lib/spack/spack/schema/repos.py @@ -1,31 +1,12 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Schema for repos.yaml configuration file. .. literalinclude:: ../spack/schema/repos.py - :lines: 32- + :lines: 13- """ diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py index d3bff22583..eb2e817736 100644 --- a/lib/spack/spack/spec.py +++ b/lib/spack/spack/spec.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """ Spack allows very fine-grained control over how packages are installed and over how they are built and configured. To make this easy, it has its own diff --git a/lib/spack/spack/stage.py b/lib/spack/spack/stage.py index 807a83e5aa..32cdaa0090 100644 --- a/lib/spack/spack/stage.py +++ b/lib/spack/spack/stage.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import stat import sys diff --git a/lib/spack/spack/store.py b/lib/spack/spack/store.py index 189bef4bd9..9deb208956 100644 --- a/lib/spack/spack/store.py +++ b/lib/spack/spack/store.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Components that manage Spack's installation tree. An install tree, or "build store" consists of two parts: diff --git a/lib/spack/spack/tengine.py b/lib/spack/spack/tengine.py index c3ce16ac04..fa8e8f283f 100644 --- a/lib/spack/spack/tengine.py +++ b/lib/spack/spack/tengine.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import textwrap import jinja2 diff --git a/lib/spack/spack/test/__init__.py b/lib/spack/spack/test/__init__.py index 0e81cb3b36..4f442db458 100644 --- a/lib/spack/spack/test/__init__.py +++ b/lib/spack/spack/test/__init__.py @@ -1,24 +1,4 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) diff --git a/lib/spack/spack/test/architecture.py b/lib/spack/spack/test/architecture.py index bc5bca5761..33a002faad 100644 --- a/lib/spack/spack/test/architecture.py +++ b/lib/spack/spack/test/architecture.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """ Test checks if the architecture class is created correctly and also that the functions are looking for the correct architecture name """ diff --git a/lib/spack/spack/test/build_environment.py b/lib/spack/spack/test/build_environment.py index df88904b4f..e055bbf99c 100644 --- a/lib/spack/spack/test/build_environment.py +++ b/lib/spack/spack/test/build_environment.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import pytest diff --git a/lib/spack/spack/test/build_system_guess.py b/lib/spack/spack/test/build_system_guess.py index 53bfa4ffb6..1e11543823 100644 --- a/lib/spack/spack/test/build_system_guess.py +++ b/lib/spack/spack/test/build_system_guess.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import pytest import spack.cmd.create diff --git a/lib/spack/spack/test/build_systems.py b/lib/spack/spack/test/build_systems.py index adf40ca316..3bf2390139 100644 --- a/lib/spack/spack/test/build_systems.py +++ b/lib/spack/spack/test/build_systems.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import glob import os import pytest diff --git a/lib/spack/spack/test/cc.py b/lib/spack/spack/test/cc.py index c0a4cd1eed..eb51021eac 100644 --- a/lib/spack/spack/test/cc.py +++ b/lib/spack/spack/test/cc.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """ This test checks that the Spack cc compiler wrapper is parsing arguments correctly. diff --git a/lib/spack/spack/test/cmd/activate.py b/lib/spack/spack/test/cmd/activate.py index 59a25ff51d..86abd80342 100644 --- a/lib/spack/spack/test/cmd/activate.py +++ b/lib/spack/spack/test/cmd/activate.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack.main import SpackCommand activate = SpackCommand('activate') diff --git a/lib/spack/spack/test/cmd/arch.py b/lib/spack/spack/test/cmd/arch.py index ce104f7182..1f3c14f059 100644 --- a/lib/spack/spack/test/cmd/arch.py +++ b/lib/spack/spack/test/cmd/arch.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack.main import SpackCommand diff --git a/lib/spack/spack/test/cmd/blame.py b/lib/spack/spack/test/cmd/blame.py index 3639e2563e..244fd14a6a 100644 --- a/lib/spack/spack/test/cmd/blame.py +++ b/lib/spack/spack/test/cmd/blame.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import pytest from llnl.util.filesystem import working_dir diff --git a/lib/spack/spack/test/cmd/cd.py b/lib/spack/spack/test/cmd/cd.py index e62432a0e7..a566bb57e4 100644 --- a/lib/spack/spack/test/cmd/cd.py +++ b/lib/spack/spack/test/cmd/cd.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack.main import SpackCommand diff --git a/lib/spack/spack/test/cmd/clean.py b/lib/spack/spack/test/cmd/clean.py index cb4339c333..edc2c111f6 100644 --- a/lib/spack/spack/test/cmd/clean.py +++ b/lib/spack/spack/test/cmd/clean.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import pytest import spack.stage import spack.caches diff --git a/lib/spack/spack/test/cmd/commands.py b/lib/spack/spack/test/cmd/commands.py index 2d236666ca..0b693a1bab 100644 --- a/lib/spack/spack/test/cmd/commands.py +++ b/lib/spack/spack/test/cmd/commands.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import re from llnl.util.argparsewriter import ArgparseWriter diff --git a/lib/spack/spack/test/cmd/debug.py b/lib/spack/spack/test/cmd/debug.py index fe9d57a9c5..5189487265 100644 --- a/lib/spack/spack/test/cmd/debug.py +++ b/lib/spack/spack/test/cmd/debug.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import os.path diff --git a/lib/spack/spack/test/cmd/dependencies.py b/lib/spack/spack/test/cmd/dependencies.py index 2dc8d2e8f2..0583050812 100644 --- a/lib/spack/spack/test/cmd/dependencies.py +++ b/lib/spack/spack/test/cmd/dependencies.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import re import pytest diff --git a/lib/spack/spack/test/cmd/dependents.py b/lib/spack/spack/test/cmd/dependents.py index 7857161882..70019aa476 100644 --- a/lib/spack/spack/test/cmd/dependents.py +++ b/lib/spack/spack/test/cmd/dependents.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import re import pytest diff --git a/lib/spack/spack/test/cmd/env.py b/lib/spack/spack/test/cmd/env.py index da489c8c82..0a1b1714dd 100644 --- a/lib/spack/spack/test/cmd/env.py +++ b/lib/spack/spack/test/cmd/env.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import pytest from spack.main import SpackCommand, SpackCommandError diff --git a/lib/spack/spack/test/cmd/find.py b/lib/spack/spack/test/cmd/find.py index c807ce6b6d..6beaaa9b7e 100644 --- a/lib/spack/spack/test/cmd/find.py +++ b/lib/spack/spack/test/cmd/find.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import argparse import pytest diff --git a/lib/spack/spack/test/cmd/flake8.py b/lib/spack/spack/test/cmd/flake8.py index c6e19f4a3f..295b1c544b 100644 --- a/lib/spack/spack/test/cmd/flake8.py +++ b/lib/spack/spack/test/cmd/flake8.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import argparse import os import pytest diff --git a/lib/spack/spack/test/cmd/gpg.py b/lib/spack/spack/test/cmd/gpg.py index f4e4fc4ec6..e962b24c3f 100644 --- a/lib/spack/spack/test/cmd/gpg.py +++ b/lib/spack/spack/test/cmd/gpg.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import pytest diff --git a/lib/spack/spack/test/cmd/graph.py b/lib/spack/spack/test/cmd/graph.py index a5776e4ce2..1601f24f92 100644 --- a/lib/spack/spack/test/cmd/graph.py +++ b/lib/spack/spack/test/cmd/graph.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack.main import SpackCommand, SpackCommandError import pytest diff --git a/lib/spack/spack/test/cmd/help.py b/lib/spack/spack/test/cmd/help.py index 89cfaa3acc..9747314403 100644 --- a/lib/spack/spack/test/cmd/help.py +++ b/lib/spack/spack/test/cmd/help.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import pytest from spack.main import SpackCommand diff --git a/lib/spack/spack/test/cmd/info.py b/lib/spack/spack/test/cmd/info.py index 88919a9b06..404c11befd 100644 --- a/lib/spack/spack/test/cmd/info.py +++ b/lib/spack/spack/test/cmd/info.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import argparse import pytest diff --git a/lib/spack/spack/test/cmd/install.py b/lib/spack/spack/test/cmd/install.py index 56049271c1..3a3280ce4b 100644 --- a/lib/spack/spack/test/cmd/install.py +++ b/lib/spack/spack/test/cmd/install.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import argparse import os import filecmp diff --git a/lib/spack/spack/test/cmd/list.py b/lib/spack/spack/test/cmd/list.py index dba6c12350..a05ac8f04f 100644 --- a/lib/spack/spack/test/cmd/list.py +++ b/lib/spack/spack/test/cmd/list.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import pytest from spack.main import SpackCommand diff --git a/lib/spack/spack/test/cmd/mirror.py b/lib/spack/spack/test/cmd/mirror.py index 1a2e1154de..5122bf69b8 100644 --- a/lib/spack/spack/test/cmd/mirror.py +++ b/lib/spack/spack/test/cmd/mirror.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import pytest from spack.main import SpackCommand diff --git a/lib/spack/spack/test/cmd/module.py b/lib/spack/spack/test/cmd/module.py index 49e327115a..3151594ea3 100644 --- a/lib/spack/spack/test/cmd/module.py +++ b/lib/spack/spack/test/cmd/module.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os.path import pytest diff --git a/lib/spack/spack/test/cmd/print_shell_vars.py b/lib/spack/spack/test/cmd/print_shell_vars.py index cc02543791..3630c86a71 100644 --- a/lib/spack/spack/test/cmd/print_shell_vars.py +++ b/lib/spack/spack/test/cmd/print_shell_vars.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack.main import print_setup_info diff --git a/lib/spack/spack/test/cmd/providers.py b/lib/spack/spack/test/cmd/providers.py index 20a4192573..f547607315 100644 --- a/lib/spack/spack/test/cmd/providers.py +++ b/lib/spack/spack/test/cmd/providers.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import pytest diff --git a/lib/spack/spack/test/cmd/python.py b/lib/spack/spack/test/cmd/python.py index 380d7838ce..edfffb879c 100644 --- a/lib/spack/spack/test/cmd/python.py +++ b/lib/spack/spack/test/cmd/python.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import spack from spack.main import SpackCommand diff --git a/lib/spack/spack/test/cmd/spec.py b/lib/spack/spack/test/cmd/spec.py index 2c7404d28f..b67d2fd4d8 100644 --- a/lib/spack/spack/test/cmd/spec.py +++ b/lib/spack/spack/test/cmd/spec.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import re import pytest diff --git a/lib/spack/spack/test/cmd/test_compiler_cmd.py b/lib/spack/spack/test/cmd/test_compiler_cmd.py index 622342bdb0..3ef12769f4 100644 --- a/lib/spack/spack/test/cmd/test_compiler_cmd.py +++ b/lib/spack/spack/test/cmd/test_compiler_cmd.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import pytest import llnl.util.filesystem diff --git a/lib/spack/spack/test/cmd/uninstall.py b/lib/spack/spack/test/cmd/uninstall.py index 1c187431d1..1acf1ff20b 100644 --- a/lib/spack/spack/test/cmd/uninstall.py +++ b/lib/spack/spack/test/cmd/uninstall.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import pytest import spack.store from spack.main import SpackCommand, SpackCommandError diff --git a/lib/spack/spack/test/cmd/url.py b/lib/spack/spack/test/cmd/url.py index f96177d2e5..53f53a1b78 100644 --- a/lib/spack/spack/test/cmd/url.py +++ b/lib/spack/spack/test/cmd/url.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import re import pytest diff --git a/lib/spack/spack/test/cmd/versions.py b/lib/spack/spack/test/cmd/versions.py index e1816ff230..45b62a14d6 100644 --- a/lib/spack/spack/test/cmd/versions.py +++ b/lib/spack/spack/test/cmd/versions.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import pytest from spack.main import SpackCommand diff --git a/lib/spack/spack/test/cmd/view.py b/lib/spack/spack/test/cmd/view.py index 515e717363..df6d7b92cc 100644 --- a/lib/spack/spack/test/cmd/view.py +++ b/lib/spack/spack/test/cmd/view.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack.main import SpackCommand import os.path import pytest diff --git a/lib/spack/spack/test/compilers.py b/lib/spack/spack/test/compilers.py index 4e14641b63..d7a1fa6743 100644 --- a/lib/spack/spack/test/compilers.py +++ b/lib/spack/spack/test/compilers.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from copy import copy from six import iteritems diff --git a/lib/spack/spack/test/concretize.py b/lib/spack/spack/test/concretize.py index a90b355d84..d0574794b2 100644 --- a/lib/spack/spack/test/concretize.py +++ b/lib/spack/spack/test/concretize.py @@ -1,27 +1,8 @@ -############################################################################# -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import pytest import llnl.util.lang diff --git a/lib/spack/spack/test/concretize_preferences.py b/lib/spack/spack/test/concretize_preferences.py index bcb1f0cc21..dbf2b828ce 100644 --- a/lib/spack/spack/test/concretize_preferences.py +++ b/lib/spack/spack/test/concretize_preferences.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import pytest import stat diff --git a/lib/spack/spack/test/config.py b/lib/spack/spack/test/config.py index 796224853d..ea725473cb 100644 --- a/lib/spack/spack/test/config.py +++ b/lib/spack/spack/test/config.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import collections import getpass diff --git a/lib/spack/spack/test/conftest.py b/lib/spack/spack/test/conftest.py index 419cbec196..f87c84d942 100644 --- a/lib/spack/spack/test/conftest.py +++ b/lib/spack/spack/test/conftest.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import collections import copy import inspect diff --git a/lib/spack/spack/test/data/sourceme_first.sh b/lib/spack/spack/test/data/sourceme_first.sh index 94fb68dfdf..c9c8103816 100644 --- a/lib/spack/spack/test/data/sourceme_first.sh +++ b/lib/spack/spack/test/data/sourceme_first.sh @@ -1,29 +1,11 @@ #!/usr/bin/env bash - -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + + export NEW_VAR='new' export UNSET_ME='overridden' diff --git a/lib/spack/spack/test/data/sourceme_parameters.sh b/lib/spack/spack/test/data/sourceme_parameters.sh index d6703f983b..1c63e06cd0 100644 --- a/lib/spack/spack/test/data/sourceme_parameters.sh +++ b/lib/spack/spack/test/data/sourceme_parameters.sh @@ -1,29 +1,11 @@ #!/usr/bin/env bash - -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + + if [[ "$1" == "intel64" ]] ; then export FOO='intel64' diff --git a/lib/spack/spack/test/data/sourceme_second.sh b/lib/spack/spack/test/data/sourceme_second.sh index 37182ef7e7..bec2619e0d 100644 --- a/lib/spack/spack/test/data/sourceme_second.sh +++ b/lib/spack/spack/test/data/sourceme_second.sh @@ -1,29 +1,11 @@ #!/usr/bin/env bash - -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + + export PATH_LIST='/path/first:/path/second:/path/fourth' unset EMPTY_PATH_LIST diff --git a/lib/spack/spack/test/data/sourceme_unicode.sh b/lib/spack/spack/test/data/sourceme_unicode.sh index b4f5ddb733..61bfa19b90 100644 --- a/lib/spack/spack/test/data/sourceme_unicode.sh +++ b/lib/spack/spack/test/data/sourceme_unicode.sh @@ -1,29 +1,11 @@ #!/usr/bin/env bash - -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + + # Set an environment variable with some unicode in it to ensure that # Spack can decode it. diff --git a/lib/spack/spack/test/database.py b/lib/spack/spack/test/database.py index 4c5db3089b..cc469301a8 100644 --- a/lib/spack/spack/test/database.py +++ b/lib/spack/spack/test/database.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """ These tests check the database is functioning properly, both in memory and in its file diff --git a/lib/spack/spack/test/directory_layout.py b/lib/spack/spack/test/directory_layout.py index 2277196a05..6584c3c636 100644 --- a/lib/spack/spack/test/directory_layout.py +++ b/lib/spack/spack/test/directory_layout.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """ This test verifies that the Spack directory layout works properly. """ diff --git a/lib/spack/spack/test/environment.py b/lib/spack/spack/test/environment.py index f3272d0e78..0451f00b5d 100644 --- a/lib/spack/spack/test/environment.py +++ b/lib/spack/spack/test/environment.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import pytest diff --git a/lib/spack/spack/test/flag_handlers.py b/lib/spack/spack/test/flag_handlers.py index 441f3fcbae..de84a19008 100644 --- a/lib/spack/spack/test/flag_handlers.py +++ b/lib/spack/spack/test/flag_handlers.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import pytest import os diff --git a/lib/spack/spack/test/git_fetch.py b/lib/spack/spack/test/git_fetch.py index dc925286ba..8171538756 100644 --- a/lib/spack/spack/test/git_fetch.py +++ b/lib/spack/spack/test/git_fetch.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import pytest diff --git a/lib/spack/spack/test/graph.py b/lib/spack/spack/test/graph.py index 1eeb9fd826..d1de8db8cb 100644 --- a/lib/spack/spack/test/graph.py +++ b/lib/spack/spack/test/graph.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from six import StringIO from spack.spec import Spec diff --git a/lib/spack/spack/test/hg_fetch.py b/lib/spack/spack/test/hg_fetch.py index e36f1ebb84..b9fa6a1e6d 100644 --- a/lib/spack/spack/test/hg_fetch.py +++ b/lib/spack/spack/test/hg_fetch.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import pytest diff --git a/lib/spack/spack/test/install.py b/lib/spack/spack/test/install.py index 739f9cbc75..a63c149d3d 100644 --- a/lib/spack/spack/test/install.py +++ b/lib/spack/spack/test/install.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import pytest diff --git a/lib/spack/spack/test/llnl/util/file_list.py b/lib/spack/spack/test/llnl/util/file_list.py index 6499befd3c..e54e479e14 100644 --- a/lib/spack/spack/test/llnl/util/file_list.py +++ b/lib/spack/spack/test/llnl/util/file_list.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import fnmatch diff --git a/lib/spack/spack/test/llnl/util/filesystem.py b/lib/spack/spack/test/llnl/util/filesystem.py index 24ab02a613..33857854fe 100644 --- a/lib/spack/spack/test/llnl/util/filesystem.py +++ b/lib/spack/spack/test/llnl/util/filesystem.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Tests for ``llnl/util/filesystem.py``""" import llnl.util.filesystem as fs diff --git a/lib/spack/spack/test/llnl/util/lang.py b/lib/spack/spack/test/llnl/util/lang.py index 7d39a796f0..eec75f036f 100644 --- a/lib/spack/spack/test/llnl/util/lang.py +++ b/lib/spack/spack/test/llnl/util/lang.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import pytest from datetime import datetime, timedelta diff --git a/lib/spack/spack/test/llnl/util/link_tree.py b/lib/spack/spack/test/llnl/util/link_tree.py index b4808ce0f7..0c526512f9 100644 --- a/lib/spack/spack/test/llnl/util/link_tree.py +++ b/lib/spack/spack/test/llnl/util/link_tree.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import pytest diff --git a/lib/spack/spack/test/llnl/util/lock.py b/lib/spack/spack/test/llnl/util/lock.py index c1e6de018e..1991c9640b 100644 --- a/lib/spack/spack/test/llnl/util/lock.py +++ b/lib/spack/spack/test/llnl/util/lock.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """These tests ensure that our lock works correctly. This can be run in two ways. diff --git a/lib/spack/spack/test/llnl/util/log.py b/lib/spack/spack/test/llnl/util/log.py index f0343e271f..530c4b8be6 100644 --- a/lib/spack/spack/test/llnl/util/log.py +++ b/lib/spack/spack/test/llnl/util/log.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from __future__ import print_function import pytest diff --git a/lib/spack/spack/test/make_executable.py b/lib/spack/spack/test/make_executable.py index 16947861ab..08dbe4edf7 100644 --- a/lib/spack/spack/test/make_executable.py +++ b/lib/spack/spack/test/make_executable.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """ Tests for Spack's built-in parallel make support. diff --git a/lib/spack/spack/test/mirror.py b/lib/spack/spack/test/mirror.py index 998f4e2053..d59f958481 100644 --- a/lib/spack/spack/test/mirror.py +++ b/lib/spack/spack/test/mirror.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import filecmp import os import pytest diff --git a/lib/spack/spack/test/module_parsing.py b/lib/spack/spack/test/module_parsing.py index f1cea356b5..3ff7e764a9 100644 --- a/lib/spack/spack/test/module_parsing.py +++ b/lib/spack/spack/test/module_parsing.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import pytest import subprocess import os diff --git a/lib/spack/spack/test/modules/common.py b/lib/spack/spack/test/modules/common.py index b73e5aa975..63d3f562fd 100644 --- a/lib/spack/spack/test/modules/common.py +++ b/lib/spack/spack/test/modules/common.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import spack.modules.common diff --git a/lib/spack/spack/test/modules/conftest.py b/lib/spack/spack/test/modules/conftest.py index 1acf5d7e75..5e5133ec9c 100644 --- a/lib/spack/spack/test/modules/conftest.py +++ b/lib/spack/spack/test/modules/conftest.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os.path import collections import contextlib diff --git a/lib/spack/spack/test/modules/dotkit.py b/lib/spack/spack/test/modules/dotkit.py index 7885df91e4..f97bc14216 100644 --- a/lib/spack/spack/test/modules/dotkit.py +++ b/lib/spack/spack/test/modules/dotkit.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import pytest import spack.modules.dotkit diff --git a/lib/spack/spack/test/modules/lmod.py b/lib/spack/spack/test/modules/lmod.py index b262ab7b5b..fe97ae9910 100644 --- a/lib/spack/spack/test/modules/lmod.py +++ b/lib/spack/spack/test/modules/lmod.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import re import pytest diff --git a/lib/spack/spack/test/modules/tcl.py b/lib/spack/spack/test/modules/tcl.py index 21e9ae0209..9846b20482 100644 --- a/lib/spack/spack/test/modules/tcl.py +++ b/lib/spack/spack/test/modules/tcl.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import pytest import spack.modules.common diff --git a/lib/spack/spack/test/multimethod.py b/lib/spack/spack/test/multimethod.py index e9262f1c0a..de694c1498 100644 --- a/lib/spack/spack/test/multimethod.py +++ b/lib/spack/spack/test/multimethod.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Test for multi_method dispatch.""" import pytest diff --git a/lib/spack/spack/test/namespace_trie.py b/lib/spack/spack/test/namespace_trie.py index 48791bd20d..6c64c71f00 100644 --- a/lib/spack/spack/test/namespace_trie.py +++ b/lib/spack/spack/test/namespace_trie.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import pytest import spack.util.naming diff --git a/lib/spack/spack/test/optional_deps.py b/lib/spack/spack/test/optional_deps.py index 0c54fe8d77..bac942618b 100644 --- a/lib/spack/spack/test/optional_deps.py +++ b/lib/spack/spack/test/optional_deps.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import pytest from spack.spec import Spec diff --git a/lib/spack/spack/test/package_hash.py b/lib/spack/spack/test/package_hash.py index 9651805022..89fe8e9294 100644 --- a/lib/spack/spack/test/package_hash.py +++ b/lib/spack/spack/test/package_hash.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2016, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://software.llnl.gov/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License (as published by -# the Free Software Foundation) version 2.1 dated February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack.util.package_hash import package_hash, package_content from spack.spec import Spec diff --git a/lib/spack/spack/test/package_sanity.py b/lib/spack/spack/test/package_sanity.py index 74890664a6..4e22ee29ad 100644 --- a/lib/spack/spack/test/package_sanity.py +++ b/lib/spack/spack/test/package_sanity.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """This test does sanity checks on Spack's builtin package database.""" import re diff --git a/lib/spack/spack/test/packages.py b/lib/spack/spack/test/packages.py index 296a263479..1206d274ce 100644 --- a/lib/spack/spack/test/packages.py +++ b/lib/spack/spack/test/packages.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os.path import pytest diff --git a/lib/spack/spack/test/packaging.py b/lib/spack/spack/test/packaging.py index 2bc37cdd86..2b673f217e 100644 --- a/lib/spack/spack/test/packaging.py +++ b/lib/spack/spack/test/packaging.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """ This test checks the binary packaging infrastructure """ diff --git a/lib/spack/spack/test/patch.py b/lib/spack/spack/test/patch.py index 0b16a3f5be..e606c9113a 100644 --- a/lib/spack/spack/test/patch.py +++ b/lib/spack/spack/test/patch.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import sys import filecmp diff --git a/lib/spack/spack/test/pattern.py b/lib/spack/spack/test/pattern.py index 7553b70fac..fc2c85735d 100644 --- a/lib/spack/spack/test/pattern.py +++ b/lib/spack/spack/test/pattern.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import pytest import spack.util.pattern as pattern diff --git a/lib/spack/spack/test/provider_index.py b/lib/spack/spack/test/provider_index.py index 3cf6d7b30d..dfa9ef37fc 100644 --- a/lib/spack/spack/test/provider_index.py +++ b/lib/spack/spack/test/provider_index.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Tests for provider index cache files. Tests assume that mock packages provide this:: diff --git a/lib/spack/spack/test/python_version.py b/lib/spack/spack/test/python_version.py index 312e6ce37a..4e2a4b41f1 100644 --- a/lib/spack/spack/test/python_version.py +++ b/lib/spack/spack/test/python_version.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Check that Spack complies with minimum supported python versions. We ensure that all Spack files work with Python2 >= 2.6 and Python3 >= 3.0. diff --git a/lib/spack/spack/test/repo.py b/lib/spack/spack/test/repo.py index 789f0c2dec..3dcb9eaf9f 100644 --- a/lib/spack/spack/test/repo.py +++ b/lib/spack/spack/test/repo.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import pytest import spack.repo diff --git a/lib/spack/spack/test/sbang.py b/lib/spack/spack/test/sbang.py index 71212afabd..6e22483608 100644 --- a/lib/spack/spack/test/sbang.py +++ b/lib/spack/spack/test/sbang.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """\ Test that Spack's shebang filtering works correctly. """ diff --git a/lib/spack/spack/test/spack_yaml.py b/lib/spack/spack/test/spack_yaml.py index e84e356e8a..b05aacf4b2 100644 --- a/lib/spack/spack/test/spack_yaml.py +++ b/lib/spack/spack/test/spack_yaml.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Test Spack's custom YAML format.""" import pytest diff --git a/lib/spack/spack/test/spec_dag.py b/lib/spack/spack/test/spec_dag.py index a9abe278a3..7d29e5da34 100644 --- a/lib/spack/spack/test/spec_dag.py +++ b/lib/spack/spack/test/spec_dag.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """ These tests check Spec DAG operations using dummy packages. """ diff --git a/lib/spack/spack/test/spec_semantics.py b/lib/spack/spack/test/spec_semantics.py index 199f94e50d..d24c38fafc 100644 --- a/lib/spack/spack/test/spec_semantics.py +++ b/lib/spack/spack/test/spec_semantics.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import spack.architecture import pytest diff --git a/lib/spack/spack/test/spec_syntax.py b/lib/spack/spack/test/spec_syntax.py index 98f0c31df5..fc8cec097a 100644 --- a/lib/spack/spack/test/spec_syntax.py +++ b/lib/spack/spack/test/spec_syntax.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import pytest import shlex diff --git a/lib/spack/spack/test/spec_yaml.py b/lib/spack/spack/test/spec_yaml.py index fe118fea49..5e5ac37904 100644 --- a/lib/spack/spack/test/spec_yaml.py +++ b/lib/spack/spack/test/spec_yaml.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Test YAML serialization for specs. YAML format preserves DAG information in the spec. diff --git a/lib/spack/spack/test/stage.py b/lib/spack/spack/test/stage.py index 077a4b0a10..971033472a 100644 --- a/lib/spack/spack/test/stage.py +++ b/lib/spack/spack/test/stage.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Test that the Stage class works correctly.""" import os import collections diff --git a/lib/spack/spack/test/svn_fetch.py b/lib/spack/spack/test/svn_fetch.py index fc86c0ae0d..129c38587a 100644 --- a/lib/spack/spack/test/svn_fetch.py +++ b/lib/spack/spack/test/svn_fetch.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import pytest diff --git a/lib/spack/spack/test/tengine.py b/lib/spack/spack/test/tengine.py index 5cfcb6d3df..c9cfbc59d0 100644 --- a/lib/spack/spack/test/tengine.py +++ b/lib/spack/spack/test/tengine.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import pytest import spack.tengine as tengine diff --git a/lib/spack/spack/test/test_activations.py b/lib/spack/spack/test/test_activations.py index d9b69446a9..35f1d0c87d 100644 --- a/lib/spack/spack/test/test_activations.py +++ b/lib/spack/spack/test/test_activations.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import pytest import sys diff --git a/lib/spack/spack/test/url_fetch.py b/lib/spack/spack/test/url_fetch.py index fb4165f4b2..f81521c2b0 100644 --- a/lib/spack/spack/test/url_fetch.py +++ b/lib/spack/spack/test/url_fetch.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import pytest diff --git a/lib/spack/spack/test/url_parse.py b/lib/spack/spack/test/url_parse.py index 9603a91213..7dcdb36424 100644 --- a/lib/spack/spack/test/url_parse.py +++ b/lib/spack/spack/test/url_parse.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Tests Spack's ability to parse the name and version of a package based on its URL. """ diff --git a/lib/spack/spack/test/url_substitution.py b/lib/spack/spack/test/url_substitution.py index 39c314e517..a07a9bf6f0 100644 --- a/lib/spack/spack/test/url_substitution.py +++ b/lib/spack/spack/test/url_substitution.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Tests Spack's ability to substitute a different version into a URL.""" import os diff --git a/lib/spack/spack/test/util/file_cache.py b/lib/spack/spack/test/util/file_cache.py index 4079a8d160..fc1391c8e6 100644 --- a/lib/spack/spack/test/util/file_cache.py +++ b/lib/spack/spack/test/util/file_cache.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Test Spack's FileCache.""" import os diff --git a/lib/spack/spack/test/util/log_parser.py b/lib/spack/spack/test/util/log_parser.py index a3c6ed0f81..976b720fa8 100644 --- a/lib/spack/spack/test/util/log_parser.py +++ b/lib/spack/spack/test/util/log_parser.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from ctest_log_parser import CTestLogParser diff --git a/lib/spack/spack/test/util/prefix.py b/lib/spack/spack/test/util/prefix.py index c21f5bf190..f312afbc29 100644 --- a/lib/spack/spack/test/util/prefix.py +++ b/lib/spack/spack/test/util/prefix.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Tests various features of :py:class:`spack.util.prefix.Prefix`""" from spack.util.prefix import Prefix diff --git a/lib/spack/spack/test/util/spack_lock_wrapper.py b/lib/spack/spack/test/util/spack_lock_wrapper.py index 03fbb7d791..fd06d6b386 100644 --- a/lib/spack/spack/test/util/spack_lock_wrapper.py +++ b/lib/spack/spack/test/util/spack_lock_wrapper.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Tests for Spack's wrapper module around llnl.util.lock.""" import os diff --git a/lib/spack/spack/test/util/spack_yaml.py b/lib/spack/spack/test/util/spack_yaml.py index 7790b74c1c..d14e2de3a1 100644 --- a/lib/spack/spack/test/util/spack_yaml.py +++ b/lib/spack/spack/test/util/spack_yaml.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import re import spack.config diff --git a/lib/spack/spack/test/util/util_string.py b/lib/spack/spack/test/util/util_string.py index 48a6c60c45..205fd1105f 100644 --- a/lib/spack/spack/test/util/util_string.py +++ b/lib/spack/spack/test/util/util_string.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack.util.string import plural diff --git a/lib/spack/spack/test/variant.py b/lib/spack/spack/test/variant.py index 65516a5123..0bbab46efa 100644 --- a/lib/spack/spack/test/variant.py +++ b/lib/spack/spack/test/variant.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import pytest import numbers diff --git a/lib/spack/spack/test/versions.py b/lib/spack/spack/test/versions.py index 50c1dcb83a..1a56b921b3 100644 --- a/lib/spack/spack/test/versions.py +++ b/lib/spack/spack/test/versions.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """These version tests were taken from the RPM source code. We try to maintain compatibility with RPM's version semantics where it makes sense. diff --git a/lib/spack/spack/test/views.py b/lib/spack/spack/test/views.py index 0981d05015..827c9f0a3f 100644 --- a/lib/spack/spack/test/views.py +++ b/lib/spack/spack/test/views.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os from spack.spec import Spec diff --git a/lib/spack/spack/test/web.py b/lib/spack/spack/test/web.py index 82f9b9bbdc..07e1f656fa 100644 --- a/lib/spack/spack/test/web.py +++ b/lib/spack/spack/test/web.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Tests for web.py.""" import os diff --git a/lib/spack/spack/url.py b/lib/spack/spack/url.py index ddcfe9c17e..644ff53bbf 100644 --- a/lib/spack/spack/url.py +++ b/lib/spack/spack/url.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """ This module has methods for parsing names and versions of packages from URLs. The idea is to allow package creators to supply nothing more than the diff --git a/lib/spack/spack/util/__init__.py b/lib/spack/spack/util/__init__.py index 0e81cb3b36..4f442db458 100644 --- a/lib/spack/spack/util/__init__.py +++ b/lib/spack/spack/util/__init__.py @@ -1,24 +1,4 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) diff --git a/lib/spack/spack/util/compression.py b/lib/spack/spack/util/compression.py index 7c530929ad..93c91dc49c 100644 --- a/lib/spack/spack/util/compression.py +++ b/lib/spack/spack/util/compression.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import re import os from itertools import product diff --git a/lib/spack/spack/util/crypto.py b/lib/spack/spack/util/crypto.py index c2b536d50b..34e62e218a 100644 --- a/lib/spack/spack/util/crypto.py +++ b/lib/spack/spack/util/crypto.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import sys import hashlib diff --git a/lib/spack/spack/util/debug.py b/lib/spack/spack/util/debug.py index 3f3eb51fbf..99c9770aa2 100644 --- a/lib/spack/spack/util/debug.py +++ b/lib/spack/spack/util/debug.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Debug signal handler: prints a stack trace and enters interpreter. ``register_interrupt_handler()`` enables a ctrl-C handler that prints diff --git a/lib/spack/spack/util/editor.py b/lib/spack/spack/util/editor.py index f0f05fc345..730eb9fa3a 100644 --- a/lib/spack/spack/util/editor.py +++ b/lib/spack/spack/util/editor.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Module for finding the user's preferred text editor. Defines one variable: ``editor``, which is a diff --git a/lib/spack/spack/util/environment.py b/lib/spack/spack/util/environment.py index 751010a835..f8f5e23144 100644 --- a/lib/spack/spack/util/environment.py +++ b/lib/spack/spack/util/environment.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import contextlib import os diff --git a/lib/spack/spack/util/executable.py b/lib/spack/spack/util/executable.py index e64845f0ef..e1d7b49016 100644 --- a/lib/spack/spack/util/executable.py +++ b/lib/spack/spack/util/executable.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import re import subprocess diff --git a/lib/spack/spack/util/file_cache.py b/lib/spack/spack/util/file_cache.py index dd590c646e..6e6ef3037f 100644 --- a/lib/spack/spack/util/file_cache.py +++ b/lib/spack/spack/util/file_cache.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import shutil diff --git a/lib/spack/spack/util/gpg.py b/lib/spack/spack/util/gpg.py index 62f9bd76ef..77979047b0 100644 --- a/lib/spack/spack/util/gpg.py +++ b/lib/spack/spack/util/gpg.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import spack.paths diff --git a/lib/spack/spack/util/imp/__init__.py b/lib/spack/spack/util/imp/__init__.py index 86392c3f30..4d6ef756ca 100644 --- a/lib/spack/spack/util/imp/__init__.py +++ b/lib/spack/spack/util/imp/__init__.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Consolidated module for all imports done by Spack. Many parts of Spack have to import Python code. This utility package diff --git a/lib/spack/spack/util/imp/imp_importer.py b/lib/spack/spack/util/imp/imp_importer.py index b023517c4c..2949ef3b3e 100644 --- a/lib/spack/spack/util/imp/imp_importer.py +++ b/lib/spack/spack/util/imp/imp_importer.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Implementation of Spack imports that uses imp underneath. ``imp`` is deprecated in newer versions of Python, but is the only option diff --git a/lib/spack/spack/util/imp/importlib_importer.py b/lib/spack/spack/util/imp/importlib_importer.py index cacf959817..a36d13e67b 100644 --- a/lib/spack/spack/util/imp/importlib_importer.py +++ b/lib/spack/spack/util/imp/importlib_importer.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Implementation of Spack imports that uses importlib underneath. ``importlib`` is only fully implemented in Python 3. diff --git a/lib/spack/spack/util/lock.py b/lib/spack/spack/util/lock.py index b01a0951ee..05efe14d8d 100644 --- a/lib/spack/spack/util/lock.py +++ b/lib/spack/spack/util/lock.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Wrapper for ``llnl.util.lock`` allows locking to be enabled/disabled.""" import os import stat diff --git a/lib/spack/spack/util/log_parse.py b/lib/spack/spack/util/log_parse.py index a5a3dbb7f4..36b3312ec8 100644 --- a/lib/spack/spack/util/log_parse.py +++ b/lib/spack/spack/util/log_parse.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from __future__ import print_function import sys diff --git a/lib/spack/spack/util/module_cmd.py b/lib/spack/spack/util/module_cmd.py index 8b268b9848..69a48306af 100644 --- a/lib/spack/spack/util/module_cmd.py +++ b/lib/spack/spack/util/module_cmd.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """ This module contains routines related to the module command for accessing and parsing environment modules. diff --git a/lib/spack/spack/util/naming.py b/lib/spack/spack/util/naming.py index 98d4081868..949189a3ca 100644 --- a/lib/spack/spack/util/naming.py +++ b/lib/spack/spack/util/naming.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # Need this because of spack.util.string from __future__ import absolute_import import string diff --git a/lib/spack/spack/util/package_hash.py b/lib/spack/spack/util/package_hash.py index 904234baf3..c7354e97cf 100644 --- a/lib/spack/spack/util/package_hash.py +++ b/lib/spack/spack/util/package_hash.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2016, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://software.llnl.gov/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License (as published by -# the Free Software Foundation) version 2.1 dated February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import ast import hashlib diff --git a/lib/spack/spack/util/path.py b/lib/spack/spack/util/path.py index 91126e5d31..dc866984d6 100644 --- a/lib/spack/spack/util/path.py +++ b/lib/spack/spack/util/path.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Utilities for managing paths in Spack. TODO: this is really part of spack.config. Consolidate it. diff --git a/lib/spack/spack/util/pattern.py b/lib/spack/spack/util/pattern.py index 5ced4d8cfd..32ee342135 100644 --- a/lib/spack/spack/util/pattern.py +++ b/lib/spack/spack/util/pattern.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import inspect import collections import functools diff --git a/lib/spack/spack/util/prefix.py b/lib/spack/spack/util/prefix.py index ce6f86985e..60f8408b5a 100644 --- a/lib/spack/spack/util/prefix.py +++ b/lib/spack/spack/util/prefix.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """ This file contains utilities for managing the installation prefix of a package. """ diff --git a/lib/spack/spack/util/spack_json.py b/lib/spack/spack/util/spack_json.py index cc758f134a..a56b6283d3 100644 --- a/lib/spack/spack/util/spack_json.py +++ b/lib/spack/spack/util/spack_json.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Simple wrapper around JSON to guarantee consistent use of load/dump. """ import sys import json diff --git a/lib/spack/spack/util/spack_yaml.py b/lib/spack/spack/util/spack_yaml.py index 5492ebe26e..ee4b37388c 100644 --- a/lib/spack/spack/util/spack_yaml.py +++ b/lib/spack/spack/util/spack_yaml.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """Enhanced YAML parsing for Spack. - ``load()`` preserves YAML Marks on returned objects -- this allows diff --git a/lib/spack/spack/util/string.py b/lib/spack/spack/util/string.py index a6a5342f1f..10f932b986 100644 --- a/lib/spack/spack/util/string.py +++ b/lib/spack/spack/util/string.py @@ -1,27 +1,7 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) def comma_list(sequence, article=''): diff --git a/lib/spack/spack/util/web.py b/lib/spack/spack/util/web.py index 9777859fa8..f04507dae7 100644 --- a/lib/spack/spack/util/web.py +++ b/lib/spack/spack/util/web.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from __future__ import print_function import re diff --git a/lib/spack/spack/variant.py b/lib/spack/spack/variant.py index 9e6583af42..8f154139c5 100644 --- a/lib/spack/spack/variant.py +++ b/lib/spack/spack/variant.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """The variant module contains data structures that are needed to manage variants both in packages and in specs. """ diff --git a/lib/spack/spack/version.py b/lib/spack/spack/version.py index 09dce77c88..82d3927b64 100644 --- a/lib/spack/spack/version.py +++ b/lib/spack/spack/version.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + """ This module implements Version and version-ish objects. These are: diff --git a/share/spack/csh/pathadd.csh b/share/spack/csh/pathadd.csh index 1e0800c5f3..5e94d4a4c0 100644 --- a/share/spack/csh/pathadd.csh +++ b/share/spack/csh/pathadd.csh @@ -1,3 +1,8 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + ######################################################################## # Prepends directories to path, if they exist. # pathadd /path/to/dir # add to PATH diff --git a/share/spack/csh/spack.csh b/share/spack/csh/spack.csh index bf23ab9ff3..a78665beb3 100644 --- a/share/spack/csh/spack.csh +++ b/share/spack/csh/spack.csh @@ -1,3 +1,8 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + ######################################################################## # This is a wrapper around the spack command that forwards calls to # 'spack use' and 'spack unuse' to shell functions. This in turn diff --git a/share/spack/docker/build/common/handle-prompt.sh b/share/spack/docker/build/common/handle-prompt.sh index 2faf38d627..5a4910e3fa 100644 --- a/share/spack/docker/build/common/handle-prompt.sh +++ b/share/spack/docker/build/common/handle-prompt.sh @@ -1,3 +1,8 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + __tmp="`mktemp -d`" __trylock() { diff --git a/share/spack/docker/build/common/handle-ssh.sh b/share/spack/docker/build/common/handle-ssh.sh index f13c10e212..f2139897cb 100644 --- a/share/spack/docker/build/common/handle-ssh.sh +++ b/share/spack/docker/build/common/handle-ssh.sh @@ -1,3 +1,8 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + uid="`id -u`" if [ "$uid" '=' '0' ] ; then for key_type in dsa ecdsa ed25519 rsa ; do diff --git a/share/spack/docs/docker/module-file-tutorial/spack.sh b/share/spack/docs/docker/module-file-tutorial/spack.sh index 54d095c717..a59bc7575f 100644 --- a/share/spack/docs/docker/module-file-tutorial/spack.sh +++ b/share/spack/docs/docker/module-file-tutorial/spack.sh @@ -1,3 +1,8 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + source $SPACK_ROOT/share/spack/setup-env.sh LMOD_DIR=$(spack location -i lmod) diff --git a/share/spack/qa/run-build-tests b/share/spack/qa/run-build-tests index 5772632234..315c0b8e99 100755 --- a/share/spack/qa/run-build-tests +++ b/share/spack/qa/run-build-tests @@ -1,4 +1,10 @@ #!/bin/bash -e +# +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # # Description: # Runs Spack build smoke tests. This installs a few packages that diff --git a/share/spack/qa/run-doc-tests b/share/spack/qa/run-doc-tests index c43779fcaf..6129243676 100755 --- a/share/spack/qa/run-doc-tests +++ b/share/spack/qa/run-doc-tests @@ -1,4 +1,10 @@ #!/bin/bash -e +# +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # # Description: # Builds Spack documentation and checks for diff --git a/share/spack/qa/run-flake8-tests b/share/spack/qa/run-flake8-tests index 29fc15f9d7..1b9beb4d16 100755 --- a/share/spack/qa/run-flake8-tests +++ b/share/spack/qa/run-flake8-tests @@ -1,4 +1,10 @@ #!/bin/bash -e +# +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # # Description: # Runs source code style checks on Spack. diff --git a/share/spack/qa/run-unit-tests b/share/spack/qa/run-unit-tests index d96144f28a..7aae551f03 100755 --- a/share/spack/qa/run-unit-tests +++ b/share/spack/qa/run-unit-tests @@ -1,4 +1,10 @@ #!/bin/bash -e +# +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # # Description: # Runs Spack unit tests. diff --git a/share/spack/qa/setup.sh b/share/spack/qa/setup.sh index 029743f681..4f40904433 100755 --- a/share/spack/qa/setup.sh +++ b/share/spack/qa/setup.sh @@ -1,4 +1,10 @@ #!/bin/bash -e +# +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # # Description: # Common setup code to be sourced by Spack's test scripts. diff --git a/share/spack/setup-env.csh b/share/spack/setup-env.csh index cf1059a28f..cb45f8f74c 100755 --- a/share/spack/setup-env.csh +++ b/share/spack/setup-env.csh @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # # This file is part of Spack and sets up the spack environment for diff --git a/share/spack/setup-env.sh b/share/spack/setup-env.sh index daa0000977..97de19e4c9 100755 --- a/share/spack/setup-env.sh +++ b/share/spack/setup-env.sh @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + ######################################################################## # diff --git a/share/spack/spack-completion.bash b/share/spack/spack-completion.bash index 40a13dfbca..c157d836a4 100755 --- a/share/spack/spack-completion.bash +++ b/share/spack/spack-completion.bash @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # The following global variables are used/set by Bash programmable completion # COMP_CWORD: An index into ${COMP_WORDS} of the word containing the diff --git a/var/spack/repos/builtin.mock/packages/a/package.py b/var/spack/repos/builtin.mock/packages/a/package.py index 1b3badcd9a..a9197c94b0 100644 --- a/var/spack/repos/builtin.mock/packages/a/package.py +++ b/var/spack/repos/builtin.mock/packages/a/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/archive-files/package.py b/var/spack/repos/builtin.mock/packages/archive-files/package.py index aef08454d8..5025d70d6b 100644 --- a/var/spack/repos/builtin.mock/packages/archive-files/package.py +++ b/var/spack/repos/builtin.mock/packages/archive-files/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/b/package.py b/var/spack/repos/builtin.mock/packages/b/package.py index d234d4ee43..776240a31c 100644 --- a/var/spack/repos/builtin.mock/packages/b/package.py +++ b/var/spack/repos/builtin.mock/packages/b/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/boost/package.py b/var/spack/repos/builtin.mock/packages/boost/package.py index cec52e5f7a..4398d445df 100644 --- a/var/spack/repos/builtin.mock/packages/boost/package.py +++ b/var/spack/repos/builtin.mock/packages/boost/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/build-error/package.py b/var/spack/repos/builtin.mock/packages/build-error/package.py index 7cfc59905c..191cfe3b14 100644 --- a/var/spack/repos/builtin.mock/packages/build-error/package.py +++ b/var/spack/repos/builtin.mock/packages/build-error/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/build-warnings/package.py b/var/spack/repos/builtin.mock/packages/build-warnings/package.py index 9160c03f31..1ea58a2a1a 100644 --- a/var/spack/repos/builtin.mock/packages/build-warnings/package.py +++ b/var/spack/repos/builtin.mock/packages/build-warnings/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/c/package.py b/var/spack/repos/builtin.mock/packages/c/package.py index 3d0de89dd2..5687635f7c 100644 --- a/var/spack/repos/builtin.mock/packages/c/package.py +++ b/var/spack/repos/builtin.mock/packages/c/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/callpath/package.py b/var/spack/repos/builtin.mock/packages/callpath/package.py index 2105c41b6f..27214741b7 100644 --- a/var/spack/repos/builtin.mock/packages/callpath/package.py +++ b/var/spack/repos/builtin.mock/packages/callpath/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/canfail/package.py b/var/spack/repos/builtin.mock/packages/canfail/package.py index bf0ee03a5b..777a9bd023 100644 --- a/var/spack/repos/builtin.mock/packages/canfail/package.py +++ b/var/spack/repos/builtin.mock/packages/canfail/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/cmake-client/package.py b/var/spack/repos/builtin.mock/packages/cmake-client/package.py index c775bdcbff..4082d77055 100644 --- a/var/spack/repos/builtin.mock/packages/cmake-client/package.py +++ b/var/spack/repos/builtin.mock/packages/cmake-client/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os from spack import * diff --git a/var/spack/repos/builtin.mock/packages/cmake/package.py b/var/spack/repos/builtin.mock/packages/cmake/package.py index 1418aefd31..a589797d69 100644 --- a/var/spack/repos/builtin.mock/packages/cmake/package.py +++ b/var/spack/repos/builtin.mock/packages/cmake/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin.mock/packages/conflict-parent/package.py b/var/spack/repos/builtin.mock/packages/conflict-parent/package.py index a8be93a22f..8f27d59ff5 100644 --- a/var/spack/repos/builtin.mock/packages/conflict-parent/package.py +++ b/var/spack/repos/builtin.mock/packages/conflict-parent/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/conflict/package.py b/var/spack/repos/builtin.mock/packages/conflict/package.py index bc3a4100a1..08d8c5df4b 100644 --- a/var/spack/repos/builtin.mock/packages/conflict/package.py +++ b/var/spack/repos/builtin.mock/packages/conflict/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/conflicting-dependent/package.py b/var/spack/repos/builtin.mock/packages/conflicting-dependent/package.py index dd9cd46655..efa8ae9596 100644 --- a/var/spack/repos/builtin.mock/packages/conflicting-dependent/package.py +++ b/var/spack/repos/builtin.mock/packages/conflicting-dependent/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/dependency-install/package.py b/var/spack/repos/builtin.mock/packages/dependency-install/package.py index b45d60a538..2e40b8dc8d 100644 --- a/var/spack/repos/builtin.mock/packages/dependency-install/package.py +++ b/var/spack/repos/builtin.mock/packages/dependency-install/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/dependent-install/package.py b/var/spack/repos/builtin.mock/packages/dependent-install/package.py index 865caa1f19..01a955d744 100644 --- a/var/spack/repos/builtin.mock/packages/dependent-install/package.py +++ b/var/spack/repos/builtin.mock/packages/dependent-install/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/develop-test/package.py b/var/spack/repos/builtin.mock/packages/develop-test/package.py index f32ffeec16..7a28cc25be 100644 --- a/var/spack/repos/builtin.mock/packages/develop-test/package.py +++ b/var/spack/repos/builtin.mock/packages/develop-test/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/direct-mpich/package.py b/var/spack/repos/builtin.mock/packages/direct-mpich/package.py index 5a2ec12181..44bd7d16b1 100644 --- a/var/spack/repos/builtin.mock/packages/direct-mpich/package.py +++ b/var/spack/repos/builtin.mock/packages/direct-mpich/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/dt-diamond-bottom/package.py b/var/spack/repos/builtin.mock/packages/dt-diamond-bottom/package.py index 356c1d3e04..1c6b8d624d 100644 --- a/var/spack/repos/builtin.mock/packages/dt-diamond-bottom/package.py +++ b/var/spack/repos/builtin.mock/packages/dt-diamond-bottom/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/dt-diamond-left/package.py b/var/spack/repos/builtin.mock/packages/dt-diamond-left/package.py index 45602eb817..f54086e8b3 100644 --- a/var/spack/repos/builtin.mock/packages/dt-diamond-left/package.py +++ b/var/spack/repos/builtin.mock/packages/dt-diamond-left/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/dt-diamond-right/package.py b/var/spack/repos/builtin.mock/packages/dt-diamond-right/package.py index 3fea7ba879..2a915a1f10 100644 --- a/var/spack/repos/builtin.mock/packages/dt-diamond-right/package.py +++ b/var/spack/repos/builtin.mock/packages/dt-diamond-right/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/dt-diamond/package.py b/var/spack/repos/builtin.mock/packages/dt-diamond/package.py index c186b9f456..a4dcdfd04b 100644 --- a/var/spack/repos/builtin.mock/packages/dt-diamond/package.py +++ b/var/spack/repos/builtin.mock/packages/dt-diamond/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/dtbuild1/package.py b/var/spack/repos/builtin.mock/packages/dtbuild1/package.py index 46186f9311..dfc71d5f89 100644 --- a/var/spack/repos/builtin.mock/packages/dtbuild1/package.py +++ b/var/spack/repos/builtin.mock/packages/dtbuild1/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/dtbuild2/package.py b/var/spack/repos/builtin.mock/packages/dtbuild2/package.py index ffafb17e20..b91aa8bba3 100644 --- a/var/spack/repos/builtin.mock/packages/dtbuild2/package.py +++ b/var/spack/repos/builtin.mock/packages/dtbuild2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/dtbuild3/package.py b/var/spack/repos/builtin.mock/packages/dtbuild3/package.py index bd40976322..8102ca80f0 100644 --- a/var/spack/repos/builtin.mock/packages/dtbuild3/package.py +++ b/var/spack/repos/builtin.mock/packages/dtbuild3/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/dtlink1/package.py b/var/spack/repos/builtin.mock/packages/dtlink1/package.py index 5b721ef4ad..05885a00e0 100644 --- a/var/spack/repos/builtin.mock/packages/dtlink1/package.py +++ b/var/spack/repos/builtin.mock/packages/dtlink1/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/dtlink2/package.py b/var/spack/repos/builtin.mock/packages/dtlink2/package.py index 4ea715c45a..06bcb7bda7 100644 --- a/var/spack/repos/builtin.mock/packages/dtlink2/package.py +++ b/var/spack/repos/builtin.mock/packages/dtlink2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/dtlink3/package.py b/var/spack/repos/builtin.mock/packages/dtlink3/package.py index cd45f960d7..58a9e9f995 100644 --- a/var/spack/repos/builtin.mock/packages/dtlink3/package.py +++ b/var/spack/repos/builtin.mock/packages/dtlink3/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/dtlink4/package.py b/var/spack/repos/builtin.mock/packages/dtlink4/package.py index 16faf53882..10fbf0b033 100644 --- a/var/spack/repos/builtin.mock/packages/dtlink4/package.py +++ b/var/spack/repos/builtin.mock/packages/dtlink4/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/dtlink5/package.py b/var/spack/repos/builtin.mock/packages/dtlink5/package.py index ba86dcb100..a573555274 100644 --- a/var/spack/repos/builtin.mock/packages/dtlink5/package.py +++ b/var/spack/repos/builtin.mock/packages/dtlink5/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/dtrun1/package.py b/var/spack/repos/builtin.mock/packages/dtrun1/package.py index 114d8bb87f..865d8ee633 100644 --- a/var/spack/repos/builtin.mock/packages/dtrun1/package.py +++ b/var/spack/repos/builtin.mock/packages/dtrun1/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/dtrun2/package.py b/var/spack/repos/builtin.mock/packages/dtrun2/package.py index 60c1f1ea97..6e207ba5ae 100644 --- a/var/spack/repos/builtin.mock/packages/dtrun2/package.py +++ b/var/spack/repos/builtin.mock/packages/dtrun2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/dtrun3/package.py b/var/spack/repos/builtin.mock/packages/dtrun3/package.py index 8b64d05824..3d834c2749 100644 --- a/var/spack/repos/builtin.mock/packages/dtrun3/package.py +++ b/var/spack/repos/builtin.mock/packages/dtrun3/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/dttop/package.py b/var/spack/repos/builtin.mock/packages/dttop/package.py index 5c9839545c..b68c3e1cd4 100644 --- a/var/spack/repos/builtin.mock/packages/dttop/package.py +++ b/var/spack/repos/builtin.mock/packages/dttop/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/dtuse/package.py b/var/spack/repos/builtin.mock/packages/dtuse/package.py index 8b0596d5f6..c87d9e145d 100644 --- a/var/spack/repos/builtin.mock/packages/dtuse/package.py +++ b/var/spack/repos/builtin.mock/packages/dtuse/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/dyninst/package.py b/var/spack/repos/builtin.mock/packages/dyninst/package.py index 6827005bbd..f6fdc5a432 100644 --- a/var/spack/repos/builtin.mock/packages/dyninst/package.py +++ b/var/spack/repos/builtin.mock/packages/dyninst/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/e/package.py b/var/spack/repos/builtin.mock/packages/e/package.py index 02c06e4fc5..12fc145e17 100644 --- a/var/spack/repos/builtin.mock/packages/e/package.py +++ b/var/spack/repos/builtin.mock/packages/e/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/extendee/package.py b/var/spack/repos/builtin.mock/packages/extendee/package.py index 0ce4a44857..ead0d8c9ec 100644 --- a/var/spack/repos/builtin.mock/packages/extendee/package.py +++ b/var/spack/repos/builtin.mock/packages/extendee/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/extension1/package.py b/var/spack/repos/builtin.mock/packages/extension1/package.py index 1b713bcbd9..abb526459e 100644 --- a/var/spack/repos/builtin.mock/packages/extension1/package.py +++ b/var/spack/repos/builtin.mock/packages/extension1/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os.path diff --git a/var/spack/repos/builtin.mock/packages/extension2/package.py b/var/spack/repos/builtin.mock/packages/extension2/package.py index 474974c619..0d4ce8b374 100644 --- a/var/spack/repos/builtin.mock/packages/extension2/package.py +++ b/var/spack/repos/builtin.mock/packages/extension2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os.path diff --git a/var/spack/repos/builtin.mock/packages/externalmodule/package.py b/var/spack/repos/builtin.mock/packages/externalmodule/package.py index 094dcdd6bc..84b152a93b 100644 --- a/var/spack/repos/builtin.mock/packages/externalmodule/package.py +++ b/var/spack/repos/builtin.mock/packages/externalmodule/package.py @@ -1,28 +1,8 @@ - -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/externalprereq/package.py b/var/spack/repos/builtin.mock/packages/externalprereq/package.py index 5e1442479d..b14045afd2 100644 --- a/var/spack/repos/builtin.mock/packages/externalprereq/package.py +++ b/var/spack/repos/builtin.mock/packages/externalprereq/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/externaltest/package.py b/var/spack/repos/builtin.mock/packages/externaltest/package.py index 4baccfb9d7..69484f5d54 100644 --- a/var/spack/repos/builtin.mock/packages/externaltest/package.py +++ b/var/spack/repos/builtin.mock/packages/externaltest/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/externaltool/package.py b/var/spack/repos/builtin.mock/packages/externaltool/package.py index 9f0e3f6f73..6e8cb30f09 100644 --- a/var/spack/repos/builtin.mock/packages/externaltool/package.py +++ b/var/spack/repos/builtin.mock/packages/externaltool/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/externalvirtual/package.py b/var/spack/repos/builtin.mock/packages/externalvirtual/package.py index 825608d7fa..a23743ca66 100644 --- a/var/spack/repos/builtin.mock/packages/externalvirtual/package.py +++ b/var/spack/repos/builtin.mock/packages/externalvirtual/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/failing-build/package.py b/var/spack/repos/builtin.mock/packages/failing-build/package.py index 3350913f4b..f332b86323 100644 --- a/var/spack/repos/builtin.mock/packages/failing-build/package.py +++ b/var/spack/repos/builtin.mock/packages/failing-build/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/fake/package.py b/var/spack/repos/builtin.mock/packages/fake/package.py index 64ac0221ab..6d6e133cb5 100644 --- a/var/spack/repos/builtin.mock/packages/fake/package.py +++ b/var/spack/repos/builtin.mock/packages/fake/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/flake8/package.py b/var/spack/repos/builtin.mock/packages/flake8/package.py index f9bfc74e8a..a38ede73f9 100644 --- a/var/spack/repos/builtin.mock/packages/flake8/package.py +++ b/var/spack/repos/builtin.mock/packages/flake8/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/git-svn-top-level/package.py b/var/spack/repos/builtin.mock/packages/git-svn-top-level/package.py index 0bff4402e2..9864269a21 100644 --- a/var/spack/repos/builtin.mock/packages/git-svn-top-level/package.py +++ b/var/spack/repos/builtin.mock/packages/git-svn-top-level/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/git-test/package.py b/var/spack/repos/builtin.mock/packages/git-test/package.py index f3caae0cd2..544168d53b 100644 --- a/var/spack/repos/builtin.mock/packages/git-test/package.py +++ b/var/spack/repos/builtin.mock/packages/git-test/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/git-top-level/package.py b/var/spack/repos/builtin.mock/packages/git-top-level/package.py index 5c0be81101..36a2852f32 100644 --- a/var/spack/repos/builtin.mock/packages/git-top-level/package.py +++ b/var/spack/repos/builtin.mock/packages/git-top-level/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/git-url-svn-top-level/package.py b/var/spack/repos/builtin.mock/packages/git-url-svn-top-level/package.py index d4897b228f..c737284fff 100644 --- a/var/spack/repos/builtin.mock/packages/git-url-svn-top-level/package.py +++ b/var/spack/repos/builtin.mock/packages/git-url-svn-top-level/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py b/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py index 74f2aa69e5..8b41eda0eb 100644 --- a/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py +++ b/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/hash-test1/package.py b/var/spack/repos/builtin.mock/packages/hash-test1/package.py index 60c7fbe32b..2fd44f07e4 100644 --- a/var/spack/repos/builtin.mock/packages/hash-test1/package.py +++ b/var/spack/repos/builtin.mock/packages/hash-test1/package.py @@ -1,3 +1,8 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin.mock/packages/hash-test2/package.py b/var/spack/repos/builtin.mock/packages/hash-test2/package.py index 3c4c2addf2..de08125bf6 100644 --- a/var/spack/repos/builtin.mock/packages/hash-test2/package.py +++ b/var/spack/repos/builtin.mock/packages/hash-test2/package.py @@ -1,3 +1,8 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin.mock/packages/hg-test/package.py b/var/spack/repos/builtin.mock/packages/hg-test/package.py index a0a1cad515..89a3286bea 100644 --- a/var/spack/repos/builtin.mock/packages/hg-test/package.py +++ b/var/spack/repos/builtin.mock/packages/hg-test/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/hg-top-level/package.py b/var/spack/repos/builtin.mock/packages/hg-top-level/package.py index 94a06cd38e..225a2e852c 100644 --- a/var/spack/repos/builtin.mock/packages/hg-top-level/package.py +++ b/var/spack/repos/builtin.mock/packages/hg-top-level/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/hypre/package.py b/var/spack/repos/builtin.mock/packages/hypre/package.py index 3b2ed62990..62133f48ac 100644 --- a/var/spack/repos/builtin.mock/packages/hypre/package.py +++ b/var/spack/repos/builtin.mock/packages/hypre/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/indirect-mpich/package.py b/var/spack/repos/builtin.mock/packages/indirect-mpich/package.py index 878a8500b0..902a8f7345 100644 --- a/var/spack/repos/builtin.mock/packages/indirect-mpich/package.py +++ b/var/spack/repos/builtin.mock/packages/indirect-mpich/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/libdwarf/package.py b/var/spack/repos/builtin.mock/packages/libdwarf/package.py index bf0984b924..302e7f1eeb 100644 --- a/var/spack/repos/builtin.mock/packages/libdwarf/package.py +++ b/var/spack/repos/builtin.mock/packages/libdwarf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * # Only build certain parts of dwarf because the other ones break. diff --git a/var/spack/repos/builtin.mock/packages/libelf/package.py b/var/spack/repos/builtin.mock/packages/libelf/package.py index 6e597a0717..4fdd90e935 100644 --- a/var/spack/repos/builtin.mock/packages/libelf/package.py +++ b/var/spack/repos/builtin.mock/packages/libelf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/mixedversions/package.py b/var/spack/repos/builtin.mock/packages/mixedversions/package.py index 8e6183a345..ff564d5cb9 100644 --- a/var/spack/repos/builtin.mock/packages/mixedversions/package.py +++ b/var/spack/repos/builtin.mock/packages/mixedversions/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/module-path-separator/package.py b/var/spack/repos/builtin.mock/packages/module-path-separator/package.py index c29a538588..a7a4baabb7 100644 --- a/var/spack/repos/builtin.mock/packages/module-path-separator/package.py +++ b/var/spack/repos/builtin.mock/packages/module-path-separator/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/mpich/package.py b/var/spack/repos/builtin.mock/packages/mpich/package.py index 9c14024c4d..1ba68925d5 100644 --- a/var/spack/repos/builtin.mock/packages/mpich/package.py +++ b/var/spack/repos/builtin.mock/packages/mpich/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/mpich2/package.py b/var/spack/repos/builtin.mock/packages/mpich2/package.py index c0c8ee3b05..9f7df9696f 100644 --- a/var/spack/repos/builtin.mock/packages/mpich2/package.py +++ b/var/spack/repos/builtin.mock/packages/mpich2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/mpileaks/package.py b/var/spack/repos/builtin.mock/packages/mpileaks/package.py index 405c069e54..478da9f9b9 100644 --- a/var/spack/repos/builtin.mock/packages/mpileaks/package.py +++ b/var/spack/repos/builtin.mock/packages/mpileaks/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/multi-provider-mpi/package.py b/var/spack/repos/builtin.mock/packages/multi-provider-mpi/package.py index 8ebebccf56..1b3e044f22 100644 --- a/var/spack/repos/builtin.mock/packages/multi-provider-mpi/package.py +++ b/var/spack/repos/builtin.mock/packages/multi-provider-mpi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/multimethod-base/package.py b/var/spack/repos/builtin.mock/packages/multimethod-base/package.py index 27499b4865..7b7d00b43b 100644 --- a/var/spack/repos/builtin.mock/packages/multimethod-base/package.py +++ b/var/spack/repos/builtin.mock/packages/multimethod-base/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/multimethod/package.py b/var/spack/repos/builtin.mock/packages/multimethod/package.py index 6f01888e59..3224d73fe9 100644 --- a/var/spack/repos/builtin.mock/packages/multimethod/package.py +++ b/var/spack/repos/builtin.mock/packages/multimethod/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from six import string_types from spack import * diff --git a/var/spack/repos/builtin.mock/packages/multivalue_variant/package.py b/var/spack/repos/builtin.mock/packages/multivalue_variant/package.py index 6122d04718..1077f5f978 100644 --- a/var/spack/repos/builtin.mock/packages/multivalue_variant/package.py +++ b/var/spack/repos/builtin.mock/packages/multivalue_variant/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/netlib-blas/package.py b/var/spack/repos/builtin.mock/packages/netlib-blas/package.py index 952a6dd0d7..07bdbcb801 100644 --- a/var/spack/repos/builtin.mock/packages/netlib-blas/package.py +++ b/var/spack/repos/builtin.mock/packages/netlib-blas/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/netlib-lapack/package.py b/var/spack/repos/builtin.mock/packages/netlib-lapack/package.py index fade988cdd..2b12ee77ce 100644 --- a/var/spack/repos/builtin.mock/packages/netlib-lapack/package.py +++ b/var/spack/repos/builtin.mock/packages/netlib-lapack/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/openblas-with-lapack/package.py b/var/spack/repos/builtin.mock/packages/openblas-with-lapack/package.py index a3cb7d3bd9..5480507e1b 100644 --- a/var/spack/repos/builtin.mock/packages/openblas-with-lapack/package.py +++ b/var/spack/repos/builtin.mock/packages/openblas-with-lapack/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/openblas/package.py b/var/spack/repos/builtin.mock/packages/openblas/package.py index 4ff749fa38..d10b423626 100644 --- a/var/spack/repos/builtin.mock/packages/openblas/package.py +++ b/var/spack/repos/builtin.mock/packages/openblas/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/optional-dep-test-2/package.py b/var/spack/repos/builtin.mock/packages/optional-dep-test-2/package.py index 2d87fe25da..6f988410fa 100644 --- a/var/spack/repos/builtin.mock/packages/optional-dep-test-2/package.py +++ b/var/spack/repos/builtin.mock/packages/optional-dep-test-2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/optional-dep-test-3/package.py b/var/spack/repos/builtin.mock/packages/optional-dep-test-3/package.py index cd7c0f17af..d1bf81a7fa 100644 --- a/var/spack/repos/builtin.mock/packages/optional-dep-test-3/package.py +++ b/var/spack/repos/builtin.mock/packages/optional-dep-test-3/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/optional-dep-test/package.py b/var/spack/repos/builtin.mock/packages/optional-dep-test/package.py index ffff5e7dfb..af30815bc7 100644 --- a/var/spack/repos/builtin.mock/packages/optional-dep-test/package.py +++ b/var/spack/repos/builtin.mock/packages/optional-dep-test/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/othervirtual/package.py b/var/spack/repos/builtin.mock/packages/othervirtual/package.py index 6c0e66cf31..db9a218767 100644 --- a/var/spack/repos/builtin.mock/packages/othervirtual/package.py +++ b/var/spack/repos/builtin.mock/packages/othervirtual/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/override-context-templates/package.py b/var/spack/repos/builtin.mock/packages/override-context-templates/package.py index a5cfb383b8..6ec1b26dfa 100644 --- a/var/spack/repos/builtin.mock/packages/override-context-templates/package.py +++ b/var/spack/repos/builtin.mock/packages/override-context-templates/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/override-module-templates/package.py b/var/spack/repos/builtin.mock/packages/override-module-templates/package.py index 50fb201fe4..090a889448 100644 --- a/var/spack/repos/builtin.mock/packages/override-module-templates/package.py +++ b/var/spack/repos/builtin.mock/packages/override-module-templates/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py b/var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py index 01f13a98a2..4b4f044504 100644 --- a/var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py +++ b/var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/patch-several-dependencies/package.py b/var/spack/repos/builtin.mock/packages/patch-several-dependencies/package.py index db902ebf4c..fdd5cc30e7 100644 --- a/var/spack/repos/builtin.mock/packages/patch-several-dependencies/package.py +++ b/var/spack/repos/builtin.mock/packages/patch-several-dependencies/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/patch/package.py b/var/spack/repos/builtin.mock/packages/patch/package.py index f4722e22e4..cf0d2f1c63 100644 --- a/var/spack/repos/builtin.mock/packages/patch/package.py +++ b/var/spack/repos/builtin.mock/packages/patch/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/patchelf/package.py b/var/spack/repos/builtin.mock/packages/patchelf/package.py index 5bf76d3e20..6b7205cb9a 100644 --- a/var/spack/repos/builtin.mock/packages/patchelf/package.py +++ b/var/spack/repos/builtin.mock/packages/patchelf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/printing-package/package.py b/var/spack/repos/builtin.mock/packages/printing-package/package.py index 74d6157138..580e9727f1 100644 --- a/var/spack/repos/builtin.mock/packages/printing-package/package.py +++ b/var/spack/repos/builtin.mock/packages/printing-package/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/python/package.py b/var/spack/repos/builtin.mock/packages/python/package.py index 1c67350e97..053c6d24f1 100644 --- a/var/spack/repos/builtin.mock/packages/python/package.py +++ b/var/spack/repos/builtin.mock/packages/python/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/raiser/package.py b/var/spack/repos/builtin.mock/packages/raiser/package.py index 02cd491f17..bbd4cb329b 100644 --- a/var/spack/repos/builtin.mock/packages/raiser/package.py +++ b/var/spack/repos/builtin.mock/packages/raiser/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from six.moves import builtins from spack import * diff --git a/var/spack/repos/builtin.mock/packages/simple-inheritance/package.py b/var/spack/repos/builtin.mock/packages/simple-inheritance/package.py index 3f135b002e..cd43575a01 100644 --- a/var/spack/repos/builtin.mock/packages/simple-inheritance/package.py +++ b/var/spack/repos/builtin.mock/packages/simple-inheritance/package.py @@ -1,3 +1,8 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent/package.py b/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent/package.py index 788c6b02a2..c9cc385b6a 100644 --- a/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent/package.py +++ b/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/svn-test/package.py b/var/spack/repos/builtin.mock/packages/svn-test/package.py index ca60fbe6b1..b0ad42542b 100644 --- a/var/spack/repos/builtin.mock/packages/svn-test/package.py +++ b/var/spack/repos/builtin.mock/packages/svn-test/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/svn-top-level/package.py b/var/spack/repos/builtin.mock/packages/svn-top-level/package.py index 3198b16435..8acd54b66a 100644 --- a/var/spack/repos/builtin.mock/packages/svn-top-level/package.py +++ b/var/spack/repos/builtin.mock/packages/svn-top-level/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/trivial-install-test-package/package.py b/var/spack/repos/builtin.mock/packages/trivial-install-test-package/package.py index 8ab5ad6560..aad58f08e3 100644 --- a/var/spack/repos/builtin.mock/packages/trivial-install-test-package/package.py +++ b/var/spack/repos/builtin.mock/packages/trivial-install-test-package/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/url-list-test/package.py b/var/spack/repos/builtin.mock/packages/url-list-test/package.py index 2adb06272a..98d7af8425 100644 --- a/var/spack/repos/builtin.mock/packages/url-list-test/package.py +++ b/var/spack/repos/builtin.mock/packages/url-list-test/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin.mock/packages/url-only-override-with-gaps/package.py b/var/spack/repos/builtin.mock/packages/url-only-override-with-gaps/package.py index 8bcbb386bd..bee39c0c72 100644 --- a/var/spack/repos/builtin.mock/packages/url-only-override-with-gaps/package.py +++ b/var/spack/repos/builtin.mock/packages/url-only-override-with-gaps/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/url-only-override/package.py b/var/spack/repos/builtin.mock/packages/url-only-override/package.py index 76999fb21e..e145285985 100644 --- a/var/spack/repos/builtin.mock/packages/url-only-override/package.py +++ b/var/spack/repos/builtin.mock/packages/url-only-override/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/url-test/package.py b/var/spack/repos/builtin.mock/packages/url-test/package.py index f0b686ab8b..c16f345980 100644 --- a/var/spack/repos/builtin.mock/packages/url-test/package.py +++ b/var/spack/repos/builtin.mock/packages/url-test/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/url_override/package.py b/var/spack/repos/builtin.mock/packages/url_override/package.py index 6173ea94eb..803afe5e33 100644 --- a/var/spack/repos/builtin.mock/packages/url_override/package.py +++ b/var/spack/repos/builtin.mock/packages/url_override/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin.mock/packages/zmpi/package.py b/var/spack/repos/builtin.mock/packages/zmpi/package.py index 52f6d11272..4546ed7335 100644 --- a/var/spack/repos/builtin.mock/packages/zmpi/package.py +++ b/var/spack/repos/builtin.mock/packages/zmpi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/abinit/package.py b/var/spack/repos/builtin/packages/abinit/package.py index b93fe175f1..4902509d4e 100644 --- a/var/spack/repos/builtin/packages/abinit/package.py +++ b/var/spack/repos/builtin/packages/abinit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # # Author: Matteo Giantomassi # Date: October 11, 2016 diff --git a/var/spack/repos/builtin/packages/abyss/package.py b/var/spack/repos/builtin/packages/abyss/package.py index f6fac09463..aabaf94400 100644 --- a/var/spack/repos/builtin/packages/abyss/package.py +++ b/var/spack/repos/builtin/packages/abyss/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/accfft/package.py b/var/spack/repos/builtin/packages/accfft/package.py index 29dd02bb6c..3a59f11f27 100644 --- a/var/spack/repos/builtin/packages/accfft/package.py +++ b/var/spack/repos/builtin/packages/accfft/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ack/package.py b/var/spack/repos/builtin/packages/ack/package.py index e07cd0da73..c889d1f31e 100644 --- a/var/spack/repos/builtin/packages/ack/package.py +++ b/var/spack/repos/builtin/packages/ack/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/activeharmony/package.py b/var/spack/repos/builtin/packages/activeharmony/package.py index 3867810b2c..7c90f24a0d 100644 --- a/var/spack/repos/builtin/packages/activeharmony/package.py +++ b/var/spack/repos/builtin/packages/activeharmony/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/adept-utils/package.py b/var/spack/repos/builtin/packages/adept-utils/package.py index 4aa1197c1f..fcac87759a 100644 --- a/var/spack/repos/builtin/packages/adept-utils/package.py +++ b/var/spack/repos/builtin/packages/adept-utils/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/adios/package.py b/var/spack/repos/builtin/packages/adios/package.py index 69d4ca0671..2b93379129 100644 --- a/var/spack/repos/builtin/packages/adios/package.py +++ b/var/spack/repos/builtin/packages/adios/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/adios2/package.py b/var/spack/repos/builtin/packages/adios2/package.py index f838996e20..a7ba1eec0b 100644 --- a/var/spack/repos/builtin/packages/adios2/package.py +++ b/var/spack/repos/builtin/packages/adios2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/adlbx/package.py b/var/spack/repos/builtin/packages/adlbx/package.py index 0b0d3cd3bb..4f7e06d2c9 100644 --- a/var/spack/repos/builtin/packages/adlbx/package.py +++ b/var/spack/repos/builtin/packages/adlbx/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/adol-c/package.py b/var/spack/repos/builtin/packages/adol-c/package.py index 5597c1ec7e..7769dc13b7 100644 --- a/var/spack/repos/builtin/packages/adol-c/package.py +++ b/var/spack/repos/builtin/packages/adol-c/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/aegean/package.py b/var/spack/repos/builtin/packages/aegean/package.py index 8ec71982e5..a66c4d1e72 100644 --- a/var/spack/repos/builtin/packages/aegean/package.py +++ b/var/spack/repos/builtin/packages/aegean/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/aida/package.py b/var/spack/repos/builtin/packages/aida/package.py index 76e9c9b241..d2b2a22d72 100644 --- a/var/spack/repos/builtin/packages/aida/package.py +++ b/var/spack/repos/builtin/packages/aida/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/albany/package.py b/var/spack/repos/builtin/packages/albany/package.py index eccbe67ce1..ae8613d361 100644 --- a/var/spack/repos/builtin/packages/albany/package.py +++ b/var/spack/repos/builtin/packages/albany/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/albert/package.py b/var/spack/repos/builtin/packages/albert/package.py index 7b80ea0561..c2d432fd36 100644 --- a/var/spack/repos/builtin/packages/albert/package.py +++ b/var/spack/repos/builtin/packages/albert/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/alglib/package.py b/var/spack/repos/builtin/packages/alglib/package.py index ff280fc747..6842cbd8ad 100644 --- a/var/spack/repos/builtin/packages/alglib/package.py +++ b/var/spack/repos/builtin/packages/alglib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob import os diff --git a/var/spack/repos/builtin/packages/allinea-forge/package.py b/var/spack/repos/builtin/packages/allinea-forge/package.py index 715795bec0..c0519014a8 100644 --- a/var/spack/repos/builtin/packages/allinea-forge/package.py +++ b/var/spack/repos/builtin/packages/allinea-forge/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/allinea-reports/package.py b/var/spack/repos/builtin/packages/allinea-reports/package.py index 4a0c266411..a1da29ba47 100644 --- a/var/spack/repos/builtin/packages/allinea-reports/package.py +++ b/var/spack/repos/builtin/packages/allinea-reports/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/allpaths-lg/package.py b/var/spack/repos/builtin/packages/allpaths-lg/package.py index a0824698c0..3ec1e99418 100644 --- a/var/spack/repos/builtin/packages/allpaths-lg/package.py +++ b/var/spack/repos/builtin/packages/allpaths-lg/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/alquimia/package.py b/var/spack/repos/builtin/packages/alquimia/package.py index 467f5740be..2b42e89db2 100644 --- a/var/spack/repos/builtin/packages/alquimia/package.py +++ b/var/spack/repos/builtin/packages/alquimia/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/alsa-lib/package.py b/var/spack/repos/builtin/packages/alsa-lib/package.py index bb67b893bc..48cf792548 100644 --- a/var/spack/repos/builtin/packages/alsa-lib/package.py +++ b/var/spack/repos/builtin/packages/alsa-lib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/amg/package.py b/var/spack/repos/builtin/packages/amg/package.py index 9bd75a906f..5a16aac3e0 100644 --- a/var/spack/repos/builtin/packages/amg/package.py +++ b/var/spack/repos/builtin/packages/amg/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 0s2111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/amg2013/package.py b/var/spack/repos/builtin/packages/amg2013/package.py index 15d20eb7ca..78a3ac71c9 100644 --- a/var/spack/repos/builtin/packages/amg2013/package.py +++ b/var/spack/repos/builtin/packages/amg2013/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 0s2111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/amp/package.py b/var/spack/repos/builtin/packages/amp/package.py index e80b924b11..c56d101a3a 100644 --- a/var/spack/repos/builtin/packages/amp/package.py +++ b/var/spack/repos/builtin/packages/amp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ampliconnoise/package.py b/var/spack/repos/builtin/packages/ampliconnoise/package.py index cbdf8ea419..e70328fa1e 100644 --- a/var/spack/repos/builtin/packages/ampliconnoise/package.py +++ b/var/spack/repos/builtin/packages/ampliconnoise/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/amrex/package.py b/var/spack/repos/builtin/packages/amrex/package.py index 771ba8d98e..abf1e54968 100644 --- a/var/spack/repos/builtin/packages/amrex/package.py +++ b/var/spack/repos/builtin/packages/amrex/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/amrvis/package.py b/var/spack/repos/builtin/packages/amrvis/package.py index a655038138..b9e69466d7 100644 --- a/var/spack/repos/builtin/packages/amrvis/package.py +++ b/var/spack/repos/builtin/packages/amrvis/package.py @@ -1,26 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. # -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob diff --git a/var/spack/repos/builtin/packages/andi/package.py b/var/spack/repos/builtin/packages/andi/package.py index 58b4bdea4c..091cdc80ef 100644 --- a/var/spack/repos/builtin/packages/andi/package.py +++ b/var/spack/repos/builtin/packages/andi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/angsd/package.py b/var/spack/repos/builtin/packages/angsd/package.py index dcb518d97f..e39cc5e5a9 100644 --- a/var/spack/repos/builtin/packages/angsd/package.py +++ b/var/spack/repos/builtin/packages/angsd/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ant/package.py b/var/spack/repos/builtin/packages/ant/package.py index 50df09f563..302ba94699 100644 --- a/var/spack/repos/builtin/packages/ant/package.py +++ b/var/spack/repos/builtin/packages/ant/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/antlr/package.py b/var/spack/repos/builtin/packages/antlr/package.py index 0455a257b6..70a21cd0f9 100644 --- a/var/spack/repos/builtin/packages/antlr/package.py +++ b/var/spack/repos/builtin/packages/antlr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ants/package.py b/var/spack/repos/builtin/packages/ants/package.py index 45207f4acb..866301c1e7 100644 --- a/var/spack/repos/builtin/packages/ants/package.py +++ b/var/spack/repos/builtin/packages/ants/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ape/package.py b/var/spack/repos/builtin/packages/ape/package.py index 5a76fb4434..c054c06106 100644 --- a/var/spack/repos/builtin/packages/ape/package.py +++ b/var/spack/repos/builtin/packages/ape/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/aperture-photometry/package.py b/var/spack/repos/builtin/packages/aperture-photometry/package.py index f750856e31..82d4af33b0 100644 --- a/var/spack/repos/builtin/packages/aperture-photometry/package.py +++ b/var/spack/repos/builtin/packages/aperture-photometry/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os.path diff --git a/var/spack/repos/builtin/packages/apex/package.py b/var/spack/repos/builtin/packages/apex/package.py index 77d6c28f7f..b78b183021 100644 --- a/var/spack/repos/builtin/packages/apex/package.py +++ b/var/spack/repos/builtin/packages/apex/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/apple-libunwind/package.py b/var/spack/repos/builtin/packages/apple-libunwind/package.py index b77301359a..ced31d20e8 100644 --- a/var/spack/repos/builtin/packages/apple-libunwind/package.py +++ b/var/spack/repos/builtin/packages/apple-libunwind/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/applewmproto/package.py b/var/spack/repos/builtin/packages/applewmproto/package.py index 63d40e1fff..231becb6b2 100644 --- a/var/spack/repos/builtin/packages/applewmproto/package.py +++ b/var/spack/repos/builtin/packages/applewmproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/appres/package.py b/var/spack/repos/builtin/packages/appres/package.py index 72ebd30028..ab798eb4c2 100644 --- a/var/spack/repos/builtin/packages/appres/package.py +++ b/var/spack/repos/builtin/packages/appres/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/apr-util/package.py b/var/spack/repos/builtin/packages/apr-util/package.py index 7808ad2e20..0f237e8e6f 100644 --- a/var/spack/repos/builtin/packages/apr-util/package.py +++ b/var/spack/repos/builtin/packages/apr-util/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/apr/package.py b/var/spack/repos/builtin/packages/apr/package.py index 033c3c8155..a0e2e9f52e 100644 --- a/var/spack/repos/builtin/packages/apr/package.py +++ b/var/spack/repos/builtin/packages/apr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/aragorn/package.py b/var/spack/repos/builtin/packages/aragorn/package.py index d9e992db26..3bd4878770 100644 --- a/var/spack/repos/builtin/packages/aragorn/package.py +++ b/var/spack/repos/builtin/packages/aragorn/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/archer/package.py b/var/spack/repos/builtin/packages/archer/package.py index 7a4675adf5..fa326d13c7 100644 --- a/var/spack/repos/builtin/packages/archer/package.py +++ b/var/spack/repos/builtin/packages/archer/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/argobots/package.py b/var/spack/repos/builtin/packages/argobots/package.py index 2f36bd22ee..3df5a2039e 100644 --- a/var/spack/repos/builtin/packages/argobots/package.py +++ b/var/spack/repos/builtin/packages/argobots/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/argp-standalone/package.py b/var/spack/repos/builtin/packages/argp-standalone/package.py index cb115e8569..1f82edbf87 100644 --- a/var/spack/repos/builtin/packages/argp-standalone/package.py +++ b/var/spack/repos/builtin/packages/argp-standalone/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/argtable/package.py b/var/spack/repos/builtin/packages/argtable/package.py index 655b48346a..cc280a1f7c 100644 --- a/var/spack/repos/builtin/packages/argtable/package.py +++ b/var/spack/repos/builtin/packages/argtable/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/arlecore/package.py b/var/spack/repos/builtin/packages/arlecore/package.py index 31daa17f85..e873aa8ffb 100644 --- a/var/spack/repos/builtin/packages/arlecore/package.py +++ b/var/spack/repos/builtin/packages/arlecore/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/armadillo/package.py b/var/spack/repos/builtin/packages/armadillo/package.py index 76fa2a9dbc..f538b2a6ce 100644 --- a/var/spack/repos/builtin/packages/armadillo/package.py +++ b/var/spack/repos/builtin/packages/armadillo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/arpack-ng/package.py b/var/spack/repos/builtin/packages/arpack-ng/package.py index 50a36156ba..b6b87f58fe 100644 --- a/var/spack/repos/builtin/packages/arpack-ng/package.py +++ b/var/spack/repos/builtin/packages/arpack-ng/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/arrow/package.py b/var/spack/repos/builtin/packages/arrow/package.py index 9fcc344a32..63d3709f15 100644 --- a/var/spack/repos/builtin/packages/arrow/package.py +++ b/var/spack/repos/builtin/packages/arrow/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ascent/package.py b/var/spack/repos/builtin/packages/ascent/package.py index 018221fe6c..22dd639c1a 100644 --- a/var/spack/repos/builtin/packages/ascent/package.py +++ b/var/spack/repos/builtin/packages/ascent/package.py @@ -1,28 +1,7 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## - +# SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * diff --git a/var/spack/repos/builtin/packages/asciidoc/package.py b/var/spack/repos/builtin/packages/asciidoc/package.py index c923c77001..f186961cc1 100644 --- a/var/spack/repos/builtin/packages/asciidoc/package.py +++ b/var/spack/repos/builtin/packages/asciidoc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/aspa/package.py b/var/spack/repos/builtin/packages/aspa/package.py index e58c8ade24..2081ed73e1 100644 --- a/var/spack/repos/builtin/packages/aspa/package.py +++ b/var/spack/repos/builtin/packages/aspa/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob diff --git a/var/spack/repos/builtin/packages/aspcud/package.py b/var/spack/repos/builtin/packages/aspcud/package.py index 54ab326c9f..ca4ec49350 100644 --- a/var/spack/repos/builtin/packages/aspcud/package.py +++ b/var/spack/repos/builtin/packages/aspcud/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/aspect/package.py b/var/spack/repos/builtin/packages/aspect/package.py index 61a9efa3a8..a4ab96e8cc 100644 --- a/var/spack/repos/builtin/packages/aspect/package.py +++ b/var/spack/repos/builtin/packages/aspect/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/aspell/package.py b/var/spack/repos/builtin/packages/aspell/package.py index 30cd8b9a23..5dbe7ed301 100644 --- a/var/spack/repos/builtin/packages/aspell/package.py +++ b/var/spack/repos/builtin/packages/aspell/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/aspell6-de/package.py b/var/spack/repos/builtin/packages/aspell6-de/package.py index 18db0a16ea..5468829058 100644 --- a/var/spack/repos/builtin/packages/aspell6-de/package.py +++ b/var/spack/repos/builtin/packages/aspell6-de/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/aspell6-en/package.py b/var/spack/repos/builtin/packages/aspell6-en/package.py index dc74dc7c51..d49cb61188 100644 --- a/var/spack/repos/builtin/packages/aspell6-en/package.py +++ b/var/spack/repos/builtin/packages/aspell6-en/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/aspell6-es/package.py b/var/spack/repos/builtin/packages/aspell6-es/package.py index 7b513aae12..3e11115e9a 100644 --- a/var/spack/repos/builtin/packages/aspell6-es/package.py +++ b/var/spack/repos/builtin/packages/aspell6-es/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/aspera-cli/package.py b/var/spack/repos/builtin/packages/aspera-cli/package.py index 530234f239..3a903208f1 100644 --- a/var/spack/repos/builtin/packages/aspera-cli/package.py +++ b/var/spack/repos/builtin/packages/aspera-cli/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from glob import glob diff --git a/var/spack/repos/builtin/packages/assimp/package.py b/var/spack/repos/builtin/packages/assimp/package.py index 01b20b7da9..3852df5bc4 100644 --- a/var/spack/repos/builtin/packages/assimp/package.py +++ b/var/spack/repos/builtin/packages/assimp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/astra/package.py b/var/spack/repos/builtin/packages/astra/package.py index 155199174e..267fedddf6 100644 --- a/var/spack/repos/builtin/packages/astra/package.py +++ b/var/spack/repos/builtin/packages/astra/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/astral/package.py b/var/spack/repos/builtin/packages/astral/package.py index 47d8667f9e..8c9e25d1e9 100644 --- a/var/spack/repos/builtin/packages/astral/package.py +++ b/var/spack/repos/builtin/packages/astral/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os.path diff --git a/var/spack/repos/builtin/packages/astyle/package.py b/var/spack/repos/builtin/packages/astyle/package.py index 8558b73dac..862f6d8691 100644 --- a/var/spack/repos/builtin/packages/astyle/package.py +++ b/var/spack/repos/builtin/packages/astyle/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/at-spi2-atk/package.py b/var/spack/repos/builtin/packages/at-spi2-atk/package.py index ab77a5c27f..dc6bf63b6c 100644 --- a/var/spack/repos/builtin/packages/at-spi2-atk/package.py +++ b/var/spack/repos/builtin/packages/at-spi2-atk/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/at-spi2-core/package.py b/var/spack/repos/builtin/packages/at-spi2-core/package.py index 1d7be5b7c2..868fae2270 100644 --- a/var/spack/repos/builtin/packages/at-spi2-core/package.py +++ b/var/spack/repos/builtin/packages/at-spi2-core/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/atk/package.py b/var/spack/repos/builtin/packages/atk/package.py index 9e641f65d0..7463dcc420 100644 --- a/var/spack/repos/builtin/packages/atk/package.py +++ b/var/spack/repos/builtin/packages/atk/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/atlas/package.py b/var/spack/repos/builtin/packages/atlas/package.py index 2db36f8304..0f624ae839 100644 --- a/var/spack/repos/builtin/packages/atlas/package.py +++ b/var/spack/repos/builtin/packages/atlas/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os from spack import * diff --git a/var/spack/repos/builtin/packages/atom-dft/package.py b/var/spack/repos/builtin/packages/atom-dft/package.py index 644b064fb7..1c42382591 100644 --- a/var/spack/repos/builtin/packages/atom-dft/package.py +++ b/var/spack/repos/builtin/packages/atom-dft/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/atompaw/package.py b/var/spack/repos/builtin/packages/atompaw/package.py index e20dacd5cc..430f3a4248 100644 --- a/var/spack/repos/builtin/packages/atompaw/package.py +++ b/var/spack/repos/builtin/packages/atompaw/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/atop/package.py b/var/spack/repos/builtin/packages/atop/package.py index a40ec1da5d..9c8d73b693 100644 --- a/var/spack/repos/builtin/packages/atop/package.py +++ b/var/spack/repos/builtin/packages/atop/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/augustus/package.py b/var/spack/repos/builtin/packages/augustus/package.py index 6343832462..86cffa20f7 100644 --- a/var/spack/repos/builtin/packages/augustus/package.py +++ b/var/spack/repos/builtin/packages/augustus/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/autoconf/package.py b/var/spack/repos/builtin/packages/autoconf/package.py index fb202bbce3..87d24bc680 100644 --- a/var/spack/repos/builtin/packages/autoconf/package.py +++ b/var/spack/repos/builtin/packages/autoconf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/autodock-vina/package.py b/var/spack/repos/builtin/packages/autodock-vina/package.py index 4907854a73..5efacf02a5 100644 --- a/var/spack/repos/builtin/packages/autodock-vina/package.py +++ b/var/spack/repos/builtin/packages/autodock-vina/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/autofact/package.py b/var/spack/repos/builtin/packages/autofact/package.py index 47038685c4..0ad36c82dd 100644 --- a/var/spack/repos/builtin/packages/autofact/package.py +++ b/var/spack/repos/builtin/packages/autofact/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob diff --git a/var/spack/repos/builtin/packages/autogen/package.py b/var/spack/repos/builtin/packages/autogen/package.py index fa74a7aa4f..5f4c893e45 100644 --- a/var/spack/repos/builtin/packages/autogen/package.py +++ b/var/spack/repos/builtin/packages/autogen/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/automaded/package.py b/var/spack/repos/builtin/packages/automaded/package.py index 774122de2c..30ca8684cd 100644 --- a/var/spack/repos/builtin/packages/automaded/package.py +++ b/var/spack/repos/builtin/packages/automaded/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/automake/package.py b/var/spack/repos/builtin/packages/automake/package.py index 77d6cf2e9d..94bd569614 100644 --- a/var/spack/repos/builtin/packages/automake/package.py +++ b/var/spack/repos/builtin/packages/automake/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/axel/package.py b/var/spack/repos/builtin/packages/axel/package.py index e40c1e4535..bd736b2db5 100644 --- a/var/spack/repos/builtin/packages/axel/package.py +++ b/var/spack/repos/builtin/packages/axel/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/axl/package.py b/var/spack/repos/builtin/packages/axl/package.py index 32bbac6914..c4118b58f7 100644 --- a/var/spack/repos/builtin/packages/axl/package.py +++ b/var/spack/repos/builtin/packages/axl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from spack.error import SpackError diff --git a/var/spack/repos/builtin/packages/bamdst/package.py b/var/spack/repos/builtin/packages/bamdst/package.py index 230c8edb57..5f8c2b2b04 100644 --- a/var/spack/repos/builtin/packages/bamdst/package.py +++ b/var/spack/repos/builtin/packages/bamdst/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bamtools/package.py b/var/spack/repos/builtin/packages/bamtools/package.py index 5e025af911..4ad73eb78e 100644 --- a/var/spack/repos/builtin/packages/bamtools/package.py +++ b/var/spack/repos/builtin/packages/bamtools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/bamutil/package.py b/var/spack/repos/builtin/packages/bamutil/package.py index f85b3a47d8..73a2d322ca 100644 --- a/var/spack/repos/builtin/packages/bamutil/package.py +++ b/var/spack/repos/builtin/packages/bamutil/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/barrnap/package.py b/var/spack/repos/builtin/packages/barrnap/package.py index c35d6065e2..3332b120a8 100644 --- a/var/spack/repos/builtin/packages/barrnap/package.py +++ b/var/spack/repos/builtin/packages/barrnap/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bash-completion/package.py b/var/spack/repos/builtin/packages/bash-completion/package.py index 1c8126b0fd..668bbc237e 100644 --- a/var/spack/repos/builtin/packages/bash-completion/package.py +++ b/var/spack/repos/builtin/packages/bash-completion/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bash/package.py b/var/spack/repos/builtin/packages/bash/package.py index 606d992bc9..9903e1517d 100644 --- a/var/spack/repos/builtin/packages/bash/package.py +++ b/var/spack/repos/builtin/packages/bash/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bats/package.py b/var/spack/repos/builtin/packages/bats/package.py index a16f3cae31..d7ef4088ce 100644 --- a/var/spack/repos/builtin/packages/bats/package.py +++ b/var/spack/repos/builtin/packages/bats/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bazel/package.py b/var/spack/repos/builtin/packages/bazel/package.py index 69024cad14..9f34d3d52b 100644 --- a/var/spack/repos/builtin/packages/bazel/package.py +++ b/var/spack/repos/builtin/packages/bazel/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from multiprocessing import cpu_count from spack.util.environment import env_flag diff --git a/var/spack/repos/builtin/packages/bbcp/package.py b/var/spack/repos/builtin/packages/bbcp/package.py index 7144e468d2..bd597decea 100644 --- a/var/spack/repos/builtin/packages/bbcp/package.py +++ b/var/spack/repos/builtin/packages/bbcp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bbmap/package.py b/var/spack/repos/builtin/packages/bbmap/package.py index f32cd0606d..d73b72cc2f 100644 --- a/var/spack/repos/builtin/packages/bbmap/package.py +++ b/var/spack/repos/builtin/packages/bbmap/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bc/package.py b/var/spack/repos/builtin/packages/bc/package.py index d2acb24752..6f149e6fa9 100644 --- a/var/spack/repos/builtin/packages/bc/package.py +++ b/var/spack/repos/builtin/packages/bc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bcftools/package.py b/var/spack/repos/builtin/packages/bcftools/package.py index 2e2a33f9aa..7b75fc647a 100644 --- a/var/spack/repos/builtin/packages/bcftools/package.py +++ b/var/spack/repos/builtin/packages/bcftools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bcl2fastq2/package.py b/var/spack/repos/builtin/packages/bcl2fastq2/package.py index eb86367fb0..f3eb3175ac 100644 --- a/var/spack/repos/builtin/packages/bcl2fastq2/package.py +++ b/var/spack/repos/builtin/packages/bcl2fastq2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os import glob diff --git a/var/spack/repos/builtin/packages/bdftopcf/package.py b/var/spack/repos/builtin/packages/bdftopcf/package.py index 382da41b04..7140818204 100644 --- a/var/spack/repos/builtin/packages/bdftopcf/package.py +++ b/var/spack/repos/builtin/packages/bdftopcf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bdw-gc/package.py b/var/spack/repos/builtin/packages/bdw-gc/package.py index d33dd46509..4246867f22 100644 --- a/var/spack/repos/builtin/packages/bdw-gc/package.py +++ b/var/spack/repos/builtin/packages/bdw-gc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bear/package.py b/var/spack/repos/builtin/packages/bear/package.py index e5ad5fd739..1117ef5aac 100644 --- a/var/spack/repos/builtin/packages/bear/package.py +++ b/var/spack/repos/builtin/packages/bear/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/beast1/package.py b/var/spack/repos/builtin/packages/beast1/package.py index 2d559f5ae0..f9c94650e4 100644 --- a/var/spack/repos/builtin/packages/beast1/package.py +++ b/var/spack/repos/builtin/packages/beast1/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/beast2/package.py b/var/spack/repos/builtin/packages/beast2/package.py index 3590547092..a5b8182e74 100644 --- a/var/spack/repos/builtin/packages/beast2/package.py +++ b/var/spack/repos/builtin/packages/beast2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bedops/package.py b/var/spack/repos/builtin/packages/bedops/package.py index 15c3f53bcc..9e22dbbe10 100644 --- a/var/spack/repos/builtin/packages/bedops/package.py +++ b/var/spack/repos/builtin/packages/bedops/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bedtools2/package.py b/var/spack/repos/builtin/packages/bedtools2/package.py index 17cecd699d..55d06175bb 100644 --- a/var/spack/repos/builtin/packages/bedtools2/package.py +++ b/var/spack/repos/builtin/packages/bedtools2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/beforelight/package.py b/var/spack/repos/builtin/packages/beforelight/package.py index eb652c3245..fcde1adb4c 100644 --- a/var/spack/repos/builtin/packages/beforelight/package.py +++ b/var/spack/repos/builtin/packages/beforelight/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/benchmark/package.py b/var/spack/repos/builtin/packages/benchmark/package.py index 24546d01d3..83abbde812 100644 --- a/var/spack/repos/builtin/packages/benchmark/package.py +++ b/var/spack/repos/builtin/packages/benchmark/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/berkeley-db/package.py b/var/spack/repos/builtin/packages/berkeley-db/package.py index 3962ef3472..bd47c239af 100644 --- a/var/spack/repos/builtin/packages/berkeley-db/package.py +++ b/var/spack/repos/builtin/packages/berkeley-db/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bertini/package.py b/var/spack/repos/builtin/packages/bertini/package.py index 09886c7bb3..3b9f9efd34 100644 --- a/var/spack/repos/builtin/packages/bertini/package.py +++ b/var/spack/repos/builtin/packages/bertini/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bib2xhtml/package.py b/var/spack/repos/builtin/packages/bib2xhtml/package.py index d3f0498f82..0a50a18004 100644 --- a/var/spack/repos/builtin/packages/bib2xhtml/package.py +++ b/var/spack/repos/builtin/packages/bib2xhtml/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from glob import glob diff --git a/var/spack/repos/builtin/packages/bigreqsproto/package.py b/var/spack/repos/builtin/packages/bigreqsproto/package.py index 3cfe9a13e5..323ea99d6c 100644 --- a/var/spack/repos/builtin/packages/bigreqsproto/package.py +++ b/var/spack/repos/builtin/packages/bigreqsproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/binutils/package.py b/var/spack/repos/builtin/packages/binutils/package.py index 9d2e72f3ad..97b5c54aa6 100644 --- a/var/spack/repos/builtin/packages/binutils/package.py +++ b/var/spack/repos/builtin/packages/binutils/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bioawk/package.py b/var/spack/repos/builtin/packages/bioawk/package.py index 8ea38bf293..3a5318bc70 100644 --- a/var/spack/repos/builtin/packages/bioawk/package.py +++ b/var/spack/repos/builtin/packages/bioawk/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/biopieces/package.py b/var/spack/repos/builtin/packages/biopieces/package.py index c72eba1b68..c237fdf564 100644 --- a/var/spack/repos/builtin/packages/biopieces/package.py +++ b/var/spack/repos/builtin/packages/biopieces/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bismark/package.py b/var/spack/repos/builtin/packages/bismark/package.py index 62cb5a0ce9..4326c63fc6 100644 --- a/var/spack/repos/builtin/packages/bismark/package.py +++ b/var/spack/repos/builtin/packages/bismark/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bison/package.py b/var/spack/repos/builtin/packages/bison/package.py index 7474950b7b..bd2b66d53d 100644 --- a/var/spack/repos/builtin/packages/bison/package.py +++ b/var/spack/repos/builtin/packages/bison/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from spack.operating_systems.mac_os import macos_version import sys diff --git a/var/spack/repos/builtin/packages/bitmap/package.py b/var/spack/repos/builtin/packages/bitmap/package.py index 46d64b2fed..cc0c49aade 100644 --- a/var/spack/repos/builtin/packages/bitmap/package.py +++ b/var/spack/repos/builtin/packages/bitmap/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/blasr-libcpp/package.py b/var/spack/repos/builtin/packages/blasr-libcpp/package.py index c597fae507..ceb7d642ff 100644 --- a/var/spack/repos/builtin/packages/blasr-libcpp/package.py +++ b/var/spack/repos/builtin/packages/blasr-libcpp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/blasr/package.py b/var/spack/repos/builtin/packages/blasr/package.py index b7f100b642..b7bbd3790f 100644 --- a/var/spack/repos/builtin/packages/blasr/package.py +++ b/var/spack/repos/builtin/packages/blasr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -## -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/blast-plus/package.py b/var/spack/repos/builtin/packages/blast-plus/package.py index f4c7c696cc..3cc075f578 100644 --- a/var/spack/repos/builtin/packages/blast-plus/package.py +++ b/var/spack/repos/builtin/packages/blast-plus/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # # This is a based largely on the Homebrew science formula: # https://github.com/Homebrew/homebrew-science/blob/master/blast.rb diff --git a/var/spack/repos/builtin/packages/blat/package.py b/var/spack/repos/builtin/packages/blat/package.py index 46d40d75a4..8e0abb249f 100644 --- a/var/spack/repos/builtin/packages/blat/package.py +++ b/var/spack/repos/builtin/packages/blat/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/blaze/package.py b/var/spack/repos/builtin/packages/blaze/package.py index d43f0523d6..5bfea7cc71 100644 --- a/var/spack/repos/builtin/packages/blaze/package.py +++ b/var/spack/repos/builtin/packages/blaze/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/blis/package.py b/var/spack/repos/builtin/packages/blis/package.py index cf9ed62d28..771797d4b2 100644 --- a/var/spack/repos/builtin/packages/blis/package.py +++ b/var/spack/repos/builtin/packages/blis/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * # Although this looks like an Autotools package, it's not one. Refer to: diff --git a/var/spack/repos/builtin/packages/bliss/package.py b/var/spack/repos/builtin/packages/bliss/package.py index 7e9091aacd..42aef78a91 100644 --- a/var/spack/repos/builtin/packages/bliss/package.py +++ b/var/spack/repos/builtin/packages/bliss/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/blitz/package.py b/var/spack/repos/builtin/packages/blitz/package.py index 184262fa25..cda7309b3e 100644 --- a/var/spack/repos/builtin/packages/blitz/package.py +++ b/var/spack/repos/builtin/packages/blitz/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bmake/package.py b/var/spack/repos/builtin/packages/bmake/package.py index 8dd5950de6..463a6e7134 100644 --- a/var/spack/repos/builtin/packages/bmake/package.py +++ b/var/spack/repos/builtin/packages/bmake/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bml/package.py b/var/spack/repos/builtin/packages/bml/package.py index fe9b04d26b..ca00cf4a3d 100644 --- a/var/spack/repos/builtin/packages/bml/package.py +++ b/var/spack/repos/builtin/packages/bml/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bohrium/package.py b/var/spack/repos/builtin/packages/bohrium/package.py index 097b9d9194..9df2ace777 100644 --- a/var/spack/repos/builtin/packages/bohrium/package.py +++ b/var/spack/repos/builtin/packages/bohrium/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from spack.package_test import compare_output from spack.util.executable import Executable diff --git a/var/spack/repos/builtin/packages/bolt/package.py b/var/spack/repos/builtin/packages/bolt/package.py index 7af61eb9f4..5d24e1fa15 100644 --- a/var/spack/repos/builtin/packages/bolt/package.py +++ b/var/spack/repos/builtin/packages/bolt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bookleaf-cpp/package.py b/var/spack/repos/builtin/packages/bookleaf-cpp/package.py index eb2b0c100b..c2c23b55fc 100644 --- a/var/spack/repos/builtin/packages/bookleaf-cpp/package.py +++ b/var/spack/repos/builtin/packages/bookleaf-cpp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index e625591813..5b51187fea 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys import os diff --git a/var/spack/repos/builtin/packages/boostmplcartesianproduct/package.py b/var/spack/repos/builtin/packages/boostmplcartesianproduct/package.py index 7ddc65b439..d38609235c 100644 --- a/var/spack/repos/builtin/packages/boostmplcartesianproduct/package.py +++ b/var/spack/repos/builtin/packages/boostmplcartesianproduct/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bowtie/package.py b/var/spack/repos/builtin/packages/bowtie/package.py index 1b47a2372c..50f4c3e1cd 100644 --- a/var/spack/repos/builtin/packages/bowtie/package.py +++ b/var/spack/repos/builtin/packages/bowtie/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bowtie2/package.py b/var/spack/repos/builtin/packages/bowtie2/package.py index ab5be0ce79..7b016710ed 100644 --- a/var/spack/repos/builtin/packages/bowtie2/package.py +++ b/var/spack/repos/builtin/packages/bowtie2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from glob import glob diff --git a/var/spack/repos/builtin/packages/boxlib/package.py b/var/spack/repos/builtin/packages/boxlib/package.py index 9546d28f53..c5f88f4896 100644 --- a/var/spack/repos/builtin/packages/boxlib/package.py +++ b/var/spack/repos/builtin/packages/boxlib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bpp-core/package.py b/var/spack/repos/builtin/packages/bpp-core/package.py index 3ab12d493d..d52e51519d 100644 --- a/var/spack/repos/builtin/packages/bpp-core/package.py +++ b/var/spack/repos/builtin/packages/bpp-core/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bpp-phyl/package.py b/var/spack/repos/builtin/packages/bpp-phyl/package.py index bd177f12d5..9564468e3d 100644 --- a/var/spack/repos/builtin/packages/bpp-phyl/package.py +++ b/var/spack/repos/builtin/packages/bpp-phyl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bpp-seq/package.py b/var/spack/repos/builtin/packages/bpp-seq/package.py index 2dda0afc61..bd16f0828d 100644 --- a/var/spack/repos/builtin/packages/bpp-seq/package.py +++ b/var/spack/repos/builtin/packages/bpp-seq/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bpp-suite/package.py b/var/spack/repos/builtin/packages/bpp-suite/package.py index 38edcb4a6b..acf0fadf2f 100644 --- a/var/spack/repos/builtin/packages/bpp-suite/package.py +++ b/var/spack/repos/builtin/packages/bpp-suite/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bracken/package.py b/var/spack/repos/builtin/packages/bracken/package.py index 4dc82b4737..ed48722a59 100644 --- a/var/spack/repos/builtin/packages/bracken/package.py +++ b/var/spack/repos/builtin/packages/bracken/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/braker/package.py b/var/spack/repos/builtin/packages/braker/package.py index 5aba032e58..a295a4943a 100644 --- a/var/spack/repos/builtin/packages/braker/package.py +++ b/var/spack/repos/builtin/packages/braker/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/branson/package.py b/var/spack/repos/builtin/packages/branson/package.py index a5bf0d4f7f..b87e91f08a 100644 --- a/var/spack/repos/builtin/packages/branson/package.py +++ b/var/spack/repos/builtin/packages/branson/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/breakdancer/package.py b/var/spack/repos/builtin/packages/breakdancer/package.py index d9d1236ea5..c068094d6a 100644 --- a/var/spack/repos/builtin/packages/breakdancer/package.py +++ b/var/spack/repos/builtin/packages/breakdancer/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/breseq/package.py b/var/spack/repos/builtin/packages/breseq/package.py index a0ddfd3038..6e406fba6a 100644 --- a/var/spack/repos/builtin/packages/breseq/package.py +++ b/var/spack/repos/builtin/packages/breseq/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/brigand/package.py b/var/spack/repos/builtin/packages/brigand/package.py index dddff731c0..f92b2814b3 100644 --- a/var/spack/repos/builtin/packages/brigand/package.py +++ b/var/spack/repos/builtin/packages/brigand/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bsseeker2/package.py b/var/spack/repos/builtin/packages/bsseeker2/package.py index bbf24b9676..f066a3e7ea 100644 --- a/var/spack/repos/builtin/packages/bsseeker2/package.py +++ b/var/spack/repos/builtin/packages/bsseeker2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bucky/package.py b/var/spack/repos/builtin/packages/bucky/package.py index fba78ff942..98b71eb8ec 100644 --- a/var/spack/repos/builtin/packages/bucky/package.py +++ b/var/spack/repos/builtin/packages/bucky/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bumpversion/package.py b/var/spack/repos/builtin/packages/bumpversion/package.py index 2be81abb25..66dff78fc9 100644 --- a/var/spack/repos/builtin/packages/bumpversion/package.py +++ b/var/spack/repos/builtin/packages/bumpversion/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/busco/package.py b/var/spack/repos/builtin/packages/busco/package.py index a6b97da35d..e0d56e6d81 100644 --- a/var/spack/repos/builtin/packages/busco/package.py +++ b/var/spack/repos/builtin/packages/busco/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/butter/package.py b/var/spack/repos/builtin/packages/butter/package.py index a989538d93..787a4aa759 100644 --- a/var/spack/repos/builtin/packages/butter/package.py +++ b/var/spack/repos/builtin/packages/butter/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bwa/package.py b/var/spack/repos/builtin/packages/bwa/package.py index f070d12611..c32dbaa72a 100644 --- a/var/spack/repos/builtin/packages/bwa/package.py +++ b/var/spack/repos/builtin/packages/bwa/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bwtool/package.py b/var/spack/repos/builtin/packages/bwtool/package.py index 2cb2c2277b..d1505bc50f 100644 --- a/var/spack/repos/builtin/packages/bwtool/package.py +++ b/var/spack/repos/builtin/packages/bwtool/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/byobu/package.py b/var/spack/repos/builtin/packages/byobu/package.py index 30f2c37ce8..f6cd346aed 100644 --- a/var/spack/repos/builtin/packages/byobu/package.py +++ b/var/spack/repos/builtin/packages/byobu/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/bzip2/package.py b/var/spack/repos/builtin/packages/bzip2/package.py index 6ba1c5ded6..2f89b73b8e 100644 --- a/var/spack/repos/builtin/packages/bzip2/package.py +++ b/var/spack/repos/builtin/packages/bzip2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/c-blosc/package.py b/var/spack/repos/builtin/packages/c-blosc/package.py index e852a125c8..fd2ecc70cb 100644 --- a/var/spack/repos/builtin/packages/c-blosc/package.py +++ b/var/spack/repos/builtin/packages/c-blosc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import sys diff --git a/var/spack/repos/builtin/packages/c-lime/package.py b/var/spack/repos/builtin/packages/c-lime/package.py index e6cd3a660f..916f95ffd6 100644 --- a/var/spack/repos/builtin/packages/c-lime/package.py +++ b/var/spack/repos/builtin/packages/c-lime/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cabana/package.py b/var/spack/repos/builtin/packages/cabana/package.py index 2aca80b12f..0dcc74f21e 100644 --- a/var/spack/repos/builtin/packages/cabana/package.py +++ b/var/spack/repos/builtin/packages/cabana/package.py @@ -1,27 +1,7 @@ -############################################################################## -# Copyright (c) 2018, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * diff --git a/var/spack/repos/builtin/packages/caffe/package.py b/var/spack/repos/builtin/packages/caffe/package.py index 489bc537cb..97e3e643cc 100644 --- a/var/spack/repos/builtin/packages/caffe/package.py +++ b/var/spack/repos/builtin/packages/caffe/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cairo/package.py b/var/spack/repos/builtin/packages/cairo/package.py index 2c4411f0b0..b6c9deabe6 100644 --- a/var/spack/repos/builtin/packages/cairo/package.py +++ b/var/spack/repos/builtin/packages/cairo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cairomm/package.py b/var/spack/repos/builtin/packages/cairomm/package.py index 37408d50c5..323288ea5a 100644 --- a/var/spack/repos/builtin/packages/cairomm/package.py +++ b/var/spack/repos/builtin/packages/cairomm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/caliper/package.py b/var/spack/repos/builtin/packages/caliper/package.py index ddbe538362..4288000410 100644 --- a/var/spack/repos/builtin/packages/caliper/package.py +++ b/var/spack/repos/builtin/packages/caliper/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/callpath/package.py b/var/spack/repos/builtin/packages/callpath/package.py index d5aa47fdea..479a2d0abc 100644 --- a/var/spack/repos/builtin/packages/callpath/package.py +++ b/var/spack/repos/builtin/packages/callpath/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/camellia/package.py b/var/spack/repos/builtin/packages/camellia/package.py index 715c19f041..c97a74a0d3 100644 --- a/var/spack/repos/builtin/packages/camellia/package.py +++ b/var/spack/repos/builtin/packages/camellia/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/candle-benchmarks/package.py b/var/spack/repos/builtin/packages/candle-benchmarks/package.py index 6806b24a35..6b15e5ebec 100644 --- a/var/spack/repos/builtin/packages/candle-benchmarks/package.py +++ b/var/spack/repos/builtin/packages/candle-benchmarks/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cantera/package.py b/var/spack/repos/builtin/packages/cantera/package.py index f3d6047893..b710163870 100644 --- a/var/spack/repos/builtin/packages/cantera/package.py +++ b/var/spack/repos/builtin/packages/cantera/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/canu/package.py b/var/spack/repos/builtin/packages/canu/package.py index 43f6e8459a..2b99fe63fc 100644 --- a/var/spack/repos/builtin/packages/canu/package.py +++ b/var/spack/repos/builtin/packages/canu/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cap3/package.py b/var/spack/repos/builtin/packages/cap3/package.py index 37c0aad378..e0d760ccbd 100644 --- a/var/spack/repos/builtin/packages/cap3/package.py +++ b/var/spack/repos/builtin/packages/cap3/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cares/package.py b/var/spack/repos/builtin/packages/cares/package.py index 894f646c00..36c155a95e 100644 --- a/var/spack/repos/builtin/packages/cares/package.py +++ b/var/spack/repos/builtin/packages/cares/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cask/package.py b/var/spack/repos/builtin/packages/cask/package.py index 96d601d39c..ba4d29d845 100644 --- a/var/spack/repos/builtin/packages/cask/package.py +++ b/var/spack/repos/builtin/packages/cask/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # # Based on Homebrew's formula: # https://github.com/Homebrew/homebrew-core/blob/master/Formula/cask.rb diff --git a/var/spack/repos/builtin/packages/casper/package.py b/var/spack/repos/builtin/packages/casper/package.py index 1469ec68df..39754fe3b1 100644 --- a/var/spack/repos/builtin/packages/casper/package.py +++ b/var/spack/repos/builtin/packages/casper/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/catalyst/package.py b/var/spack/repos/builtin/packages/catalyst/package.py index 91f9622873..40f72a125c 100644 --- a/var/spack/repos/builtin/packages/catalyst/package.py +++ b/var/spack/repos/builtin/packages/catalyst/package.py @@ -1,30 +1,8 @@ -############################################################################## -# Copyright (c) 2018 Simone Bna, CINECA. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file was authored by Simone Bna -# and is released as part of spack under the LGPL license. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for the LLNL notice and LGPL. -# -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os import subprocess diff --git a/var/spack/repos/builtin/packages/catch/package.py b/var/spack/repos/builtin/packages/catch/package.py index 261b3952e5..0db27a853d 100644 --- a/var/spack/repos/builtin/packages/catch/package.py +++ b/var/spack/repos/builtin/packages/catch/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cbench/package.py b/var/spack/repos/builtin/packages/cbench/package.py index 21482a2541..d7bd1a7eb7 100644 --- a/var/spack/repos/builtin/packages/cbench/package.py +++ b/var/spack/repos/builtin/packages/cbench/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cblas/package.py b/var/spack/repos/builtin/packages/cblas/package.py index 0917dd70f2..3a36664103 100644 --- a/var/spack/repos/builtin/packages/cblas/package.py +++ b/var/spack/repos/builtin/packages/cblas/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py index 7e2b1db644..514a6eb61e 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py @@ -1,44 +1,7 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -########################################################################## -# Copyright (c) 2015-2018 Krell Institute. All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -# details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place, Suite 330, Boston, MA 02111-1307 USA -########################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * import os diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py index 7f837e88a3..5342daf8a6 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py @@ -1,44 +1,7 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -########################################################################## -# Copyright (c) 2015-2018 Krell Institute. All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -# details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place, Suite 330, Boston, MA 02111-1307 USA -########################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py index e5658c778a..52ed029502 100644 --- a/var/spack/repos/builtin/packages/cbtf-krell/package.py +++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py @@ -1,44 +1,7 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -########################################################################## -# Copyright (c) 2015-2018 Krell Institute. All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -# details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place, Suite 330, Boston, MA 02111-1307 USA -########################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * import spack diff --git a/var/spack/repos/builtin/packages/cbtf-lanl/package.py b/var/spack/repos/builtin/packages/cbtf-lanl/package.py index dfbe7c4709..6c44638b73 100644 --- a/var/spack/repos/builtin/packages/cbtf-lanl/package.py +++ b/var/spack/repos/builtin/packages/cbtf-lanl/package.py @@ -1,44 +1,7 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -########################################################################## -# Copyright (c) 2015-2018 Krell Institute. All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -# details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place, Suite 330, Boston, MA 02111-1307 USA -########################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * diff --git a/var/spack/repos/builtin/packages/cbtf/package.py b/var/spack/repos/builtin/packages/cbtf/package.py index 1d588ade93..0ab4703dc6 100644 --- a/var/spack/repos/builtin/packages/cbtf/package.py +++ b/var/spack/repos/builtin/packages/cbtf/package.py @@ -1,44 +1,7 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -########################################################################## -# Copyright (c) 2015-2018 Krell Institute. All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -# details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place, Suite 330, Boston, MA 02111-1307 USA -########################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * diff --git a/var/spack/repos/builtin/packages/ccache/package.py b/var/spack/repos/builtin/packages/ccache/package.py index 508ea1f7db..6446768e4f 100644 --- a/var/spack/repos/builtin/packages/ccache/package.py +++ b/var/spack/repos/builtin/packages/ccache/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cctools/package.py b/var/spack/repos/builtin/packages/cctools/package.py index f97c410d6c..63cc6a83b0 100644 --- a/var/spack/repos/builtin/packages/cctools/package.py +++ b/var/spack/repos/builtin/packages/cctools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cdbfasta/package.py b/var/spack/repos/builtin/packages/cdbfasta/package.py index c1e2b519cb..11bccc8f9d 100644 --- a/var/spack/repos/builtin/packages/cdbfasta/package.py +++ b/var/spack/repos/builtin/packages/cdbfasta/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cdd/package.py b/var/spack/repos/builtin/packages/cdd/package.py index ec693a19e1..706ee1876d 100644 --- a/var/spack/repos/builtin/packages/cdd/package.py +++ b/var/spack/repos/builtin/packages/cdd/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cddlib/package.py b/var/spack/repos/builtin/packages/cddlib/package.py index aeccc16179..328f76bd61 100644 --- a/var/spack/repos/builtin/packages/cddlib/package.py +++ b/var/spack/repos/builtin/packages/cddlib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cdhit/package.py b/var/spack/repos/builtin/packages/cdhit/package.py index e785f736be..14857581bf 100644 --- a/var/spack/repos/builtin/packages/cdhit/package.py +++ b/var/spack/repos/builtin/packages/cdhit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cdo/package.py b/var/spack/repos/builtin/packages/cdo/package.py index 807992f830..68a23730ea 100644 --- a/var/spack/repos/builtin/packages/cdo/package.py +++ b/var/spack/repos/builtin/packages/cdo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ceed/package.py b/var/spack/repos/builtin/packages/ceed/package.py index a5e2c73da3..94d4d98545 100644 --- a/var/spack/repos/builtin/packages/ceed/package.py +++ b/var/spack/repos/builtin/packages/ceed/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/cereal/package.py b/var/spack/repos/builtin/packages/cereal/package.py index dadfb10260..4317303d48 100644 --- a/var/spack/repos/builtin/packages/cereal/package.py +++ b/var/spack/repos/builtin/packages/cereal/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ceres-solver/package.py b/var/spack/repos/builtin/packages/ceres-solver/package.py index c3fbda2f3c..a30e6468cd 100644 --- a/var/spack/repos/builtin/packages/ceres-solver/package.py +++ b/var/spack/repos/builtin/packages/ceres-solver/package.py @@ -1,26 +1,8 @@ -############################################################################## -# Copyright (c) 2018, The VOTCA Development Team (http://www.votca.org) +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cfitsio/package.py b/var/spack/repos/builtin/packages/cfitsio/package.py index 6bc3a58afd..2fb871cce2 100644 --- a/var/spack/repos/builtin/packages/cfitsio/package.py +++ b/var/spack/repos/builtin/packages/cfitsio/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cgal/package.py b/var/spack/repos/builtin/packages/cgal/package.py index b99e5cf575..785402b5e8 100644 --- a/var/spack/repos/builtin/packages/cgal/package.py +++ b/var/spack/repos/builtin/packages/cgal/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cgm/package.py b/var/spack/repos/builtin/packages/cgm/package.py index e5284d323f..11de8aa7df 100644 --- a/var/spack/repos/builtin/packages/cgm/package.py +++ b/var/spack/repos/builtin/packages/cgm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cgns/package.py b/var/spack/repos/builtin/packages/cgns/package.py index e27717e94e..e101f84c27 100644 --- a/var/spack/repos/builtin/packages/cgns/package.py +++ b/var/spack/repos/builtin/packages/cgns/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/channelflow/package.py b/var/spack/repos/builtin/packages/channelflow/package.py index 90eba2e908..1a396f0600 100644 --- a/var/spack/repos/builtin/packages/channelflow/package.py +++ b/var/spack/repos/builtin/packages/channelflow/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/charliecloud/package.py b/var/spack/repos/builtin/packages/charliecloud/package.py index f9cb229143..c9e59fd5ec 100644 --- a/var/spack/repos/builtin/packages/charliecloud/package.py +++ b/var/spack/repos/builtin/packages/charliecloud/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2018, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/charmpp/package.py b/var/spack/repos/builtin/packages/charmpp/package.py index d713a61f5b..d192f3e156 100644 --- a/var/spack/repos/builtin/packages/charmpp/package.py +++ b/var/spack/repos/builtin/packages/charmpp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import platform diff --git a/var/spack/repos/builtin/packages/chatterbug/package.py b/var/spack/repos/builtin/packages/chatterbug/package.py index 9e27dcc28d..abaf8e9bd9 100644 --- a/var/spack/repos/builtin/packages/chatterbug/package.py +++ b/var/spack/repos/builtin/packages/chatterbug/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/check/package.py b/var/spack/repos/builtin/packages/check/package.py index e7ba13f772..d28c428137 100644 --- a/var/spack/repos/builtin/packages/check/package.py +++ b/var/spack/repos/builtin/packages/check/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/chlorop/package.py b/var/spack/repos/builtin/packages/chlorop/package.py index 96b348c840..c6a9fd6514 100644 --- a/var/spack/repos/builtin/packages/chlorop/package.py +++ b/var/spack/repos/builtin/packages/chlorop/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/chombo/package.py b/var/spack/repos/builtin/packages/chombo/package.py index 7136680c4b..29b113b782 100644 --- a/var/spack/repos/builtin/packages/chombo/package.py +++ b/var/spack/repos/builtin/packages/chombo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob diff --git a/var/spack/repos/builtin/packages/cistem/package.py b/var/spack/repos/builtin/packages/cistem/package.py index b7e6e31bfa..52b7dad557 100644 --- a/var/spack/repos/builtin/packages/cistem/package.py +++ b/var/spack/repos/builtin/packages/cistem/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cityhash/package.py b/var/spack/repos/builtin/packages/cityhash/package.py index 02200ace49..4712e309dc 100644 --- a/var/spack/repos/builtin/packages/cityhash/package.py +++ b/var/spack/repos/builtin/packages/cityhash/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/clamr/package.py b/var/spack/repos/builtin/packages/clamr/package.py index e6165b63de..ce3f9b236d 100644 --- a/var/spack/repos/builtin/packages/clamr/package.py +++ b/var/spack/repos/builtin/packages/clamr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/clapack/package.py b/var/spack/repos/builtin/packages/clapack/package.py index e7832ef4ec..70d159b336 100644 --- a/var/spack/repos/builtin/packages/clapack/package.py +++ b/var/spack/repos/builtin/packages/clapack/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/claw/package.py b/var/spack/repos/builtin/packages/claw/package.py index 28cef928b1..1f14ee88a4 100644 --- a/var/spack/repos/builtin/packages/claw/package.py +++ b/var/spack/repos/builtin/packages/claw/package.py @@ -1,3 +1,8 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cleaveland4/package.py b/var/spack/repos/builtin/packages/cleaveland4/package.py index 848a4be0e8..c2b7fb0272 100644 --- a/var/spack/repos/builtin/packages/cleaveland4/package.py +++ b/var/spack/repos/builtin/packages/cleaveland4/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cleverleaf/package.py b/var/spack/repos/builtin/packages/cleverleaf/package.py index ec5e5ecdaa..65e6ec5f43 100644 --- a/var/spack/repos/builtin/packages/cleverleaf/package.py +++ b/var/spack/repos/builtin/packages/cleverleaf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/clfft/package.py b/var/spack/repos/builtin/packages/clfft/package.py index 9bfffa34b5..9851439a09 100644 --- a/var/spack/repos/builtin/packages/clfft/package.py +++ b/var/spack/repos/builtin/packages/clfft/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/clhep/package.py b/var/spack/repos/builtin/packages/clhep/package.py index d41cdf25bf..8db6263539 100644 --- a/var/spack/repos/builtin/packages/clhep/package.py +++ b/var/spack/repos/builtin/packages/clhep/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/clingo/package.py b/var/spack/repos/builtin/packages/clingo/package.py index c014e14cf2..942d502c52 100644 --- a/var/spack/repos/builtin/packages/clingo/package.py +++ b/var/spack/repos/builtin/packages/clingo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cloc/package.py b/var/spack/repos/builtin/packages/cloc/package.py index ff68d0e8df..4b5c81b5a8 100644 --- a/var/spack/repos/builtin/packages/cloc/package.py +++ b/var/spack/repos/builtin/packages/cloc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cloog/package.py b/var/spack/repos/builtin/packages/cloog/package.py index b01c68e89d..48322a3b22 100644 --- a/var/spack/repos/builtin/packages/cloog/package.py +++ b/var/spack/repos/builtin/packages/cloog/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cloverleaf/package.py b/var/spack/repos/builtin/packages/cloverleaf/package.py index a0fd9c2c0c..27b6403b56 100644 --- a/var/spack/repos/builtin/packages/cloverleaf/package.py +++ b/var/spack/repos/builtin/packages/cloverleaf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import glob diff --git a/var/spack/repos/builtin/packages/cloverleaf3d/package.py b/var/spack/repos/builtin/packages/cloverleaf3d/package.py index 77163d35e2..4879b33473 100644 --- a/var/spack/repos/builtin/packages/cloverleaf3d/package.py +++ b/var/spack/repos/builtin/packages/cloverleaf3d/package.py @@ -1,27 +1,8 @@ -############################################################################# -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import glob diff --git a/var/spack/repos/builtin/packages/clustalo/package.py b/var/spack/repos/builtin/packages/clustalo/package.py index ddba34c33a..ebf6daab9a 100644 --- a/var/spack/repos/builtin/packages/clustalo/package.py +++ b/var/spack/repos/builtin/packages/clustalo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/clustalw/package.py b/var/spack/repos/builtin/packages/clustalw/package.py index e643764709..0ebd8986c9 100644 --- a/var/spack/repos/builtin/packages/clustalw/package.py +++ b/var/spack/repos/builtin/packages/clustalw/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index d20b23f2b0..a43c9b7ffb 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cmocka/package.py b/var/spack/repos/builtin/packages/cmocka/package.py index a280436ae9..3a09ae9100 100644 --- a/var/spack/repos/builtin/packages/cmocka/package.py +++ b/var/spack/repos/builtin/packages/cmocka/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cmor/package.py b/var/spack/repos/builtin/packages/cmor/package.py index 9b9189643e..54aa1ae7c6 100644 --- a/var/spack/repos/builtin/packages/cmor/package.py +++ b/var/spack/repos/builtin/packages/cmor/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cnmem/package.py b/var/spack/repos/builtin/packages/cnmem/package.py index 555db814f0..cda66b37e2 100644 --- a/var/spack/repos/builtin/packages/cnmem/package.py +++ b/var/spack/repos/builtin/packages/cnmem/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cnpy/package.py b/var/spack/repos/builtin/packages/cnpy/package.py index 52c7e16abe..15bd3da174 100644 --- a/var/spack/repos/builtin/packages/cnpy/package.py +++ b/var/spack/repos/builtin/packages/cnpy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/cntk/package.py b/var/spack/repos/builtin/packages/cntk/package.py index b78e1ed8b3..efb8cb7ca3 100644 --- a/var/spack/repos/builtin/packages/cntk/package.py +++ b/var/spack/repos/builtin/packages/cntk/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cntk1bitsgd/package.py b/var/spack/repos/builtin/packages/cntk1bitsgd/package.py index 6969424e8c..c046bc34e4 100644 --- a/var/spack/repos/builtin/packages/cntk1bitsgd/package.py +++ b/var/spack/repos/builtin/packages/cntk1bitsgd/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from os import listdir diff --git a/var/spack/repos/builtin/packages/codar-cheetah/package.py b/var/spack/repos/builtin/packages/codar-cheetah/package.py index de9a12eb6e..ba559342ba 100644 --- a/var/spack/repos/builtin/packages/codar-cheetah/package.py +++ b/var/spack/repos/builtin/packages/codar-cheetah/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/codes/package.py b/var/spack/repos/builtin/packages/codes/package.py index 3a29fc1052..e3c5053e9a 100644 --- a/var/spack/repos/builtin/packages/codes/package.py +++ b/var/spack/repos/builtin/packages/codes/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/coevp/package.py b/var/spack/repos/builtin/packages/coevp/package.py index a6a8214fb5..300e441fe0 100644 --- a/var/spack/repos/builtin/packages/coevp/package.py +++ b/var/spack/repos/builtin/packages/coevp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cohmm/package.py b/var/spack/repos/builtin/packages/cohmm/package.py index c098dae60d..a68e3a58e5 100644 --- a/var/spack/repos/builtin/packages/cohmm/package.py +++ b/var/spack/repos/builtin/packages/cohmm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob diff --git a/var/spack/repos/builtin/packages/coinhsl/package.py b/var/spack/repos/builtin/packages/coinhsl/package.py index 8b4ab7d613..55c695dbc9 100644 --- a/var/spack/repos/builtin/packages/coinhsl/package.py +++ b/var/spack/repos/builtin/packages/coinhsl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/colm/package.py b/var/spack/repos/builtin/packages/colm/package.py index 795fcc43d2..bf27dabd39 100644 --- a/var/spack/repos/builtin/packages/colm/package.py +++ b/var/spack/repos/builtin/packages/colm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/colordiff/package.py b/var/spack/repos/builtin/packages/colordiff/package.py index cbfbc1c4fb..cd62f2347f 100644 --- a/var/spack/repos/builtin/packages/colordiff/package.py +++ b/var/spack/repos/builtin/packages/colordiff/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/comd/package.py b/var/spack/repos/builtin/packages/comd/package.py index 8cdad9087b..3c6d762473 100644 --- a/var/spack/repos/builtin/packages/comd/package.py +++ b/var/spack/repos/builtin/packages/comd/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/commons-lang/package.py b/var/spack/repos/builtin/packages/commons-lang/package.py index cdb1316c44..dcb40f8869 100644 --- a/var/spack/repos/builtin/packages/commons-lang/package.py +++ b/var/spack/repos/builtin/packages/commons-lang/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/commons-lang3/package.py b/var/spack/repos/builtin/packages/commons-lang3/package.py index 21959b3a61..543b20d9f7 100644 --- a/var/spack/repos/builtin/packages/commons-lang3/package.py +++ b/var/spack/repos/builtin/packages/commons-lang3/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/commons-logging/package.py b/var/spack/repos/builtin/packages/commons-logging/package.py index f634a98773..41483f8c61 100644 --- a/var/spack/repos/builtin/packages/commons-logging/package.py +++ b/var/spack/repos/builtin/packages/commons-logging/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/compiz/package.py b/var/spack/repos/builtin/packages/compiz/package.py index 233d507907..9ce3526b89 100644 --- a/var/spack/repos/builtin/packages/compiz/package.py +++ b/var/spack/repos/builtin/packages/compiz/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/compositeproto/package.py b/var/spack/repos/builtin/packages/compositeproto/package.py index 4d6ba758fe..b160bbd5a5 100644 --- a/var/spack/repos/builtin/packages/compositeproto/package.py +++ b/var/spack/repos/builtin/packages/compositeproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/conduit/package.py b/var/spack/repos/builtin/packages/conduit/package.py index fac04a1751..0e0c623ba4 100644 --- a/var/spack/repos/builtin/packages/conduit/package.py +++ b/var/spack/repos/builtin/packages/conduit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import socket diff --git a/var/spack/repos/builtin/packages/constype/package.py b/var/spack/repos/builtin/packages/constype/package.py index 7778faeb06..5996386854 100644 --- a/var/spack/repos/builtin/packages/constype/package.py +++ b/var/spack/repos/builtin/packages/constype/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/converge/package.py b/var/spack/repos/builtin/packages/converge/package.py index 744cc27267..3d0cf54808 100644 --- a/var/spack/repos/builtin/packages/converge/package.py +++ b/var/spack/repos/builtin/packages/converge/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import glob import os diff --git a/var/spack/repos/builtin/packages/coreutils/package.py b/var/spack/repos/builtin/packages/coreutils/package.py index 5d41e715f7..312f6f7375 100644 --- a/var/spack/repos/builtin/packages/coreutils/package.py +++ b/var/spack/repos/builtin/packages/coreutils/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/corset/package.py b/var/spack/repos/builtin/packages/corset/package.py index 65177bd77a..aa9c036090 100644 --- a/var/spack/repos/builtin/packages/corset/package.py +++ b/var/spack/repos/builtin/packages/corset/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cosmomc/package.py b/var/spack/repos/builtin/packages/cosmomc/package.py index c7fbdf3525..e1bb2ee9bc 100644 --- a/var/spack/repos/builtin/packages/cosmomc/package.py +++ b/var/spack/repos/builtin/packages/cosmomc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import fnmatch diff --git a/var/spack/repos/builtin/packages/cosp2/package.py b/var/spack/repos/builtin/packages/cosp2/package.py index 5eb59d53e6..a702a48c5f 100644 --- a/var/spack/repos/builtin/packages/cosp2/package.py +++ b/var/spack/repos/builtin/packages/cosp2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cp2k/package.py b/var/spack/repos/builtin/packages/cp2k/package.py index 52eecc61ed..e810c84eb3 100644 --- a/var/spack/repos/builtin/packages/cp2k/package.py +++ b/var/spack/repos/builtin/packages/cp2k/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import copy diff --git a/var/spack/repos/builtin/packages/cppad/package.py b/var/spack/repos/builtin/packages/cppad/package.py index 4130c1d253..aec3cc629b 100644 --- a/var/spack/repos/builtin/packages/cppad/package.py +++ b/var/spack/repos/builtin/packages/cppad/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cppcheck/package.py b/var/spack/repos/builtin/packages/cppcheck/package.py index dfd2adb4eb..ae13240537 100644 --- a/var/spack/repos/builtin/packages/cppcheck/package.py +++ b/var/spack/repos/builtin/packages/cppcheck/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cppgsl/package.py b/var/spack/repos/builtin/packages/cppgsl/package.py index 06cd2570c0..73fdb70590 100644 --- a/var/spack/repos/builtin/packages/cppgsl/package.py +++ b/var/spack/repos/builtin/packages/cppgsl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cpprestsdk/package.py b/var/spack/repos/builtin/packages/cpprestsdk/package.py index f6896b78cb..7b98c59b43 100644 --- a/var/spack/repos/builtin/packages/cpprestsdk/package.py +++ b/var/spack/repos/builtin/packages/cpprestsdk/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cppunit/package.py b/var/spack/repos/builtin/packages/cppunit/package.py index ebcbd57a70..c109076986 100644 --- a/var/spack/repos/builtin/packages/cppunit/package.py +++ b/var/spack/repos/builtin/packages/cppunit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cppzmq/package.py b/var/spack/repos/builtin/packages/cppzmq/package.py index ec6da2769f..22950599d1 100644 --- a/var/spack/repos/builtin/packages/cppzmq/package.py +++ b/var/spack/repos/builtin/packages/cppzmq/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cpu-features/package.py b/var/spack/repos/builtin/packages/cpu-features/package.py index 8cc013acd8..f54b964a20 100644 --- a/var/spack/repos/builtin/packages/cpu-features/package.py +++ b/var/spack/repos/builtin/packages/cpu-features/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cpuinfo/package.py b/var/spack/repos/builtin/packages/cpuinfo/package.py index 02c0587d84..e3bc736415 100644 --- a/var/spack/repos/builtin/packages/cpuinfo/package.py +++ b/var/spack/repos/builtin/packages/cpuinfo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cram/package.py b/var/spack/repos/builtin/packages/cram/package.py index 7ea9cde8a6..3f213d3118 100644 --- a/var/spack/repos/builtin/packages/cram/package.py +++ b/var/spack/repos/builtin/packages/cram/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cryptopp/package.py b/var/spack/repos/builtin/packages/cryptopp/package.py index 8e8eaafdc8..0f7764ab84 100644 --- a/var/spack/repos/builtin/packages/cryptopp/package.py +++ b/var/spack/repos/builtin/packages/cryptopp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cscope/package.py b/var/spack/repos/builtin/packages/cscope/package.py index b4769fed05..96f7ed1d67 100644 --- a/var/spack/repos/builtin/packages/cscope/package.py +++ b/var/spack/repos/builtin/packages/cscope/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/csdp/package.py b/var/spack/repos/builtin/packages/csdp/package.py index afed537f29..2735b14a41 100644 --- a/var/spack/repos/builtin/packages/csdp/package.py +++ b/var/spack/repos/builtin/packages/csdp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ctffind/package.py b/var/spack/repos/builtin/packages/ctffind/package.py index 549e7f8598..3f8fb844bd 100644 --- a/var/spack/repos/builtin/packages/ctffind/package.py +++ b/var/spack/repos/builtin/packages/ctffind/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cub/package.py b/var/spack/repos/builtin/packages/cub/package.py index 9ea398d379..3db6d76eed 100644 --- a/var/spack/repos/builtin/packages/cub/package.py +++ b/var/spack/repos/builtin/packages/cub/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cube/package.py b/var/spack/repos/builtin/packages/cube/package.py index ad528e6806..d9da5ad7e4 100644 --- a/var/spack/repos/builtin/packages/cube/package.py +++ b/var/spack/repos/builtin/packages/cube/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cubelib/package.py b/var/spack/repos/builtin/packages/cubelib/package.py index de1769e7dc..8ccd9f1bcd 100644 --- a/var/spack/repos/builtin/packages/cubelib/package.py +++ b/var/spack/repos/builtin/packages/cubelib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cubew/package.py b/var/spack/repos/builtin/packages/cubew/package.py index 3fcc101ace..79c8464c62 100644 --- a/var/spack/repos/builtin/packages/cubew/package.py +++ b/var/spack/repos/builtin/packages/cubew/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cuda-memtest/package.py b/var/spack/repos/builtin/packages/cuda-memtest/package.py index cdafb9296d..53a7204950 100644 --- a/var/spack/repos/builtin/packages/cuda-memtest/package.py +++ b/var/spack/repos/builtin/packages/cuda-memtest/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cuda/package.py b/var/spack/repos/builtin/packages/cuda/package.py index 56b51282f6..b807ddd966 100644 --- a/var/spack/repos/builtin/packages/cuda/package.py +++ b/var/spack/repos/builtin/packages/cuda/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from glob import glob diff --git a/var/spack/repos/builtin/packages/cudnn/package.py b/var/spack/repos/builtin/packages/cudnn/package.py index 9abc66eb93..2524749ca2 100644 --- a/var/spack/repos/builtin/packages/cudnn/package.py +++ b/var/spack/repos/builtin/packages/cudnn/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cufflinks/package.py b/var/spack/repos/builtin/packages/cufflinks/package.py index 8ff26bf39c..a0c039ff1f 100644 --- a/var/spack/repos/builtin/packages/cufflinks/package.py +++ b/var/spack/repos/builtin/packages/cufflinks/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/cups/package.py b/var/spack/repos/builtin/packages/cups/package.py index 99fc772d0e..f9f60f70e0 100644 --- a/var/spack/repos/builtin/packages/cups/package.py +++ b/var/spack/repos/builtin/packages/cups/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/curl/package.py b/var/spack/repos/builtin/packages/curl/package.py index 77dcc12744..5dabe83f80 100644 --- a/var/spack/repos/builtin/packages/curl/package.py +++ b/var/spack/repos/builtin/packages/curl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/cvs/package.py b/var/spack/repos/builtin/packages/cvs/package.py index 9f6f12590c..be5c0baeda 100644 --- a/var/spack/repos/builtin/packages/cvs/package.py +++ b/var/spack/repos/builtin/packages/cvs/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/czmq/package.py b/var/spack/repos/builtin/packages/czmq/package.py index ba4a2983ff..f567637a78 100644 --- a/var/spack/repos/builtin/packages/czmq/package.py +++ b/var/spack/repos/builtin/packages/czmq/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/dakota/package.py b/var/spack/repos/builtin/packages/dakota/package.py index ea008dfdc5..09b34fc1b2 100644 --- a/var/spack/repos/builtin/packages/dakota/package.py +++ b/var/spack/repos/builtin/packages/dakota/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/daligner/package.py b/var/spack/repos/builtin/packages/daligner/package.py index befdd60bd2..fd7fe30dd8 100644 --- a/var/spack/repos/builtin/packages/daligner/package.py +++ b/var/spack/repos/builtin/packages/daligner/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/damageproto/package.py b/var/spack/repos/builtin/packages/damageproto/package.py index 8f8ebe8e5e..d439814375 100644 --- a/var/spack/repos/builtin/packages/damageproto/package.py +++ b/var/spack/repos/builtin/packages/damageproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/damselfly/package.py b/var/spack/repos/builtin/packages/damselfly/package.py index f8c96be243..6e7ecaf3de 100644 --- a/var/spack/repos/builtin/packages/damselfly/package.py +++ b/var/spack/repos/builtin/packages/damselfly/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/darshan-runtime/package.py b/var/spack/repos/builtin/packages/darshan-runtime/package.py index 24e96e2817..5aff9a0a1b 100644 --- a/var/spack/repos/builtin/packages/darshan-runtime/package.py +++ b/var/spack/repos/builtin/packages/darshan-runtime/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/darshan-util/package.py b/var/spack/repos/builtin/packages/darshan-util/package.py index 261aca8f6b..af2d56be81 100644 --- a/var/spack/repos/builtin/packages/darshan-util/package.py +++ b/var/spack/repos/builtin/packages/darshan-util/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/dash/package.py b/var/spack/repos/builtin/packages/dash/package.py index 4fcad8095b..06adb572d0 100644 --- a/var/spack/repos/builtin/packages/dash/package.py +++ b/var/spack/repos/builtin/packages/dash/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/datamash/package.py b/var/spack/repos/builtin/packages/datamash/package.py index 309ad5a01f..ce80da9add 100644 --- a/var/spack/repos/builtin/packages/datamash/package.py +++ b/var/spack/repos/builtin/packages/datamash/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/dataspaces/package.py b/var/spack/repos/builtin/packages/dataspaces/package.py index 396ba83b0d..552d0a0219 100644 --- a/var/spack/repos/builtin/packages/dataspaces/package.py +++ b/var/spack/repos/builtin/packages/dataspaces/package.py @@ -1,28 +1,11 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + ############################################################################## # Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## from spack import * import six diff --git a/var/spack/repos/builtin/packages/davix/package.py b/var/spack/repos/builtin/packages/davix/package.py index 935d9669df..3338cad733 100644 --- a/var/spack/repos/builtin/packages/davix/package.py +++ b/var/spack/repos/builtin/packages/davix/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/dbus/package.py b/var/spack/repos/builtin/packages/dbus/package.py index 938a7bf2c8..2b70ecab40 100644 --- a/var/spack/repos/builtin/packages/dbus/package.py +++ b/var/spack/repos/builtin/packages/dbus/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/dealii-parameter-gui/package.py b/var/spack/repos/builtin/packages/dealii-parameter-gui/package.py index 24e3a8a37d..86f4527197 100644 --- a/var/spack/repos/builtin/packages/dealii-parameter-gui/package.py +++ b/var/spack/repos/builtin/packages/dealii-parameter-gui/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 230bfb9c0b..74f6ff2baf 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/deconseq-standalone/package.py b/var/spack/repos/builtin/packages/deconseq-standalone/package.py index 86c5ad7ed7..ab6d2c3099 100644 --- a/var/spack/repos/builtin/packages/deconseq-standalone/package.py +++ b/var/spack/repos/builtin/packages/deconseq-standalone/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/dejagnu/package.py b/var/spack/repos/builtin/packages/dejagnu/package.py index 62e972c3a2..f659f3174b 100644 --- a/var/spack/repos/builtin/packages/dejagnu/package.py +++ b/var/spack/repos/builtin/packages/dejagnu/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/delly2/package.py b/var/spack/repos/builtin/packages/delly2/package.py index e219955144..d7dffea4a7 100644 --- a/var/spack/repos/builtin/packages/delly2/package.py +++ b/var/spack/repos/builtin/packages/delly2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/denovogear/package.py b/var/spack/repos/builtin/packages/denovogear/package.py index 69194488db..cd7cd87813 100644 --- a/var/spack/repos/builtin/packages/denovogear/package.py +++ b/var/spack/repos/builtin/packages/denovogear/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/dia/package.py b/var/spack/repos/builtin/packages/dia/package.py index 3c6bed82f7..b0459d5faa 100644 --- a/var/spack/repos/builtin/packages/dia/package.py +++ b/var/spack/repos/builtin/packages/dia/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/dialign-tx/package.py b/var/spack/repos/builtin/packages/dialign-tx/package.py index a5ba5ceedc..a5daf8f088 100644 --- a/var/spack/repos/builtin/packages/dialign-tx/package.py +++ b/var/spack/repos/builtin/packages/dialign-tx/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/diamond/package.py b/var/spack/repos/builtin/packages/diamond/package.py index 936e4b0acc..bf51e174ea 100644 --- a/var/spack/repos/builtin/packages/diamond/package.py +++ b/var/spack/repos/builtin/packages/diamond/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/diffsplice/package.py b/var/spack/repos/builtin/packages/diffsplice/package.py index f7f1dbd4ac..fa6c4f2907 100644 --- a/var/spack/repos/builtin/packages/diffsplice/package.py +++ b/var/spack/repos/builtin/packages/diffsplice/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/diffutils/package.py b/var/spack/repos/builtin/packages/diffutils/package.py index bcc61fea4d..b37ca50e15 100644 --- a/var/spack/repos/builtin/packages/diffutils/package.py +++ b/var/spack/repos/builtin/packages/diffutils/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/direnv/package.py b/var/spack/repos/builtin/packages/direnv/package.py index d5ae99a549..82272e472d 100644 --- a/var/spack/repos/builtin/packages/direnv/package.py +++ b/var/spack/repos/builtin/packages/direnv/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/discovar/package.py b/var/spack/repos/builtin/packages/discovar/package.py index 2b4068cba0..48e3509a17 100644 --- a/var/spack/repos/builtin/packages/discovar/package.py +++ b/var/spack/repos/builtin/packages/discovar/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/discovardenovo/package.py b/var/spack/repos/builtin/packages/discovardenovo/package.py index 88c6dfcf5b..e3c86e314e 100644 --- a/var/spack/repos/builtin/packages/discovardenovo/package.py +++ b/var/spack/repos/builtin/packages/discovardenovo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/dislin/package.py b/var/spack/repos/builtin/packages/dislin/package.py index f7b2cfa024..ebf82b6394 100644 --- a/var/spack/repos/builtin/packages/dislin/package.py +++ b/var/spack/repos/builtin/packages/dislin/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/dlpack/package.py b/var/spack/repos/builtin/packages/dlpack/package.py index 5121b6ed84..80db27a27b 100644 --- a/var/spack/repos/builtin/packages/dlpack/package.py +++ b/var/spack/repos/builtin/packages/dlpack/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/dmd/package.py b/var/spack/repos/builtin/packages/dmd/package.py index dcbae9f869..a84d65987b 100644 --- a/var/spack/repos/builtin/packages/dmd/package.py +++ b/var/spack/repos/builtin/packages/dmd/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/dmlc-core/package.py b/var/spack/repos/builtin/packages/dmlc-core/package.py index da63a3404c..93da95f932 100644 --- a/var/spack/repos/builtin/packages/dmlc-core/package.py +++ b/var/spack/repos/builtin/packages/dmlc-core/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/dmtcp/package.py b/var/spack/repos/builtin/packages/dmtcp/package.py index 9ec0932f0e..41665ef3f4 100644 --- a/var/spack/repos/builtin/packages/dmtcp/package.py +++ b/var/spack/repos/builtin/packages/dmtcp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/dmxproto/package.py b/var/spack/repos/builtin/packages/dmxproto/package.py index f07367c3d3..ee1eb91be6 100644 --- a/var/spack/repos/builtin/packages/dmxproto/package.py +++ b/var/spack/repos/builtin/packages/dmxproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/docbook-xml/package.py b/var/spack/repos/builtin/packages/docbook-xml/package.py index 8cf4f0fc49..62f87a6ae1 100644 --- a/var/spack/repos/builtin/packages/docbook-xml/package.py +++ b/var/spack/repos/builtin/packages/docbook-xml/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os from spack import * diff --git a/var/spack/repos/builtin/packages/docbook-xsl/package.py b/var/spack/repos/builtin/packages/docbook-xsl/package.py index d5829e8085..1cd1c3ae3d 100644 --- a/var/spack/repos/builtin/packages/docbook-xsl/package.py +++ b/var/spack/repos/builtin/packages/docbook-xsl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os from spack import * diff --git a/var/spack/repos/builtin/packages/dos2unix/package.py b/var/spack/repos/builtin/packages/dos2unix/package.py index 95f4c65009..c73f53614f 100644 --- a/var/spack/repos/builtin/packages/dos2unix/package.py +++ b/var/spack/repos/builtin/packages/dos2unix/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/dotnet-core-sdk/package.py b/var/spack/repos/builtin/packages/dotnet-core-sdk/package.py index d89f451f33..8b1f1ad9b6 100644 --- a/var/spack/repos/builtin/packages/dotnet-core-sdk/package.py +++ b/var/spack/repos/builtin/packages/dotnet-core-sdk/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from os import symlink from spack import * diff --git a/var/spack/repos/builtin/packages/double-conversion/package.py b/var/spack/repos/builtin/packages/double-conversion/package.py index 44d50790f2..ca132f8b03 100644 --- a/var/spack/repos/builtin/packages/double-conversion/package.py +++ b/var/spack/repos/builtin/packages/double-conversion/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/doxygen/package.py b/var/spack/repos/builtin/packages/doxygen/package.py index 8746a3f139..d40af90b6d 100644 --- a/var/spack/repos/builtin/packages/doxygen/package.py +++ b/var/spack/repos/builtin/packages/doxygen/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/dri2proto/package.py b/var/spack/repos/builtin/packages/dri2proto/package.py index 9e146bb7c7..86ee95a00f 100644 --- a/var/spack/repos/builtin/packages/dri2proto/package.py +++ b/var/spack/repos/builtin/packages/dri2proto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/dri3proto/package.py b/var/spack/repos/builtin/packages/dri3proto/package.py index 629302b911..6568e10f71 100644 --- a/var/spack/repos/builtin/packages/dri3proto/package.py +++ b/var/spack/repos/builtin/packages/dri3proto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/dsdp/package.py b/var/spack/repos/builtin/packages/dsdp/package.py index 877299073a..d10325c664 100644 --- a/var/spack/repos/builtin/packages/dsdp/package.py +++ b/var/spack/repos/builtin/packages/dsdp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/dsrc/package.py b/var/spack/repos/builtin/packages/dsrc/package.py index 6bdf4faf55..9846bc2b34 100644 --- a/var/spack/repos/builtin/packages/dsrc/package.py +++ b/var/spack/repos/builtin/packages/dsrc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/dtcmp/package.py b/var/spack/repos/builtin/packages/dtcmp/package.py index 130a79e6dd..2b93cf1ce2 100644 --- a/var/spack/repos/builtin/packages/dtcmp/package.py +++ b/var/spack/repos/builtin/packages/dtcmp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/dyninst/package.py b/var/spack/repos/builtin/packages/dyninst/package.py index 59f1d91dc1..5b0aea454e 100644 --- a/var/spack/repos/builtin/packages/dyninst/package.py +++ b/var/spack/repos/builtin/packages/dyninst/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ea-utils/package.py b/var/spack/repos/builtin/packages/ea-utils/package.py index c924a08279..acbdd641ef 100644 --- a/var/spack/repos/builtin/packages/ea-utils/package.py +++ b/var/spack/repos/builtin/packages/ea-utils/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/easybuild/package.py b/var/spack/repos/builtin/packages/easybuild/package.py index 4fa7eb99fb..333e308bb8 100644 --- a/var/spack/repos/builtin/packages/easybuild/package.py +++ b/var/spack/repos/builtin/packages/easybuild/package.py @@ -1,25 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Kenneth Hoste +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Kenneth Hoste, kenneth.hoste@gmail.com -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ebms/package.py b/var/spack/repos/builtin/packages/ebms/package.py index 8a700abb0d..3bef478c94 100644 --- a/var/spack/repos/builtin/packages/ebms/package.py +++ b/var/spack/repos/builtin/packages/ebms/package.py @@ -1,27 +1,8 @@ -############################################################################# -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/eccodes/package.py b/var/spack/repos/builtin/packages/eccodes/package.py index cd93b156f5..55303d4ed2 100644 --- a/var/spack/repos/builtin/packages/eccodes/package.py +++ b/var/spack/repos/builtin/packages/eccodes/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # from spack import * diff --git a/var/spack/repos/builtin/packages/eclipse-gcj-parser/package.py b/var/spack/repos/builtin/packages/eclipse-gcj-parser/package.py index e265cff96c..52937c57d0 100644 --- a/var/spack/repos/builtin/packages/eclipse-gcj-parser/package.py +++ b/var/spack/repos/builtin/packages/eclipse-gcj-parser/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py b/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py index b792ae3f77..62b618db3d 100644 --- a/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py +++ b/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os from spack import * diff --git a/var/spack/repos/builtin/packages/ed/package.py b/var/spack/repos/builtin/packages/ed/package.py index fdb111fcf9..c9b8b872b5 100644 --- a/var/spack/repos/builtin/packages/ed/package.py +++ b/var/spack/repos/builtin/packages/ed/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/editres/package.py b/var/spack/repos/builtin/packages/editres/package.py index 9e44ed5210..9501f00637 100644 --- a/var/spack/repos/builtin/packages/editres/package.py +++ b/var/spack/repos/builtin/packages/editres/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/eigen/package.py b/var/spack/repos/builtin/packages/eigen/package.py index ee2c20d9e4..6e5582d233 100644 --- a/var/spack/repos/builtin/packages/eigen/package.py +++ b/var/spack/repos/builtin/packages/eigen/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/elasticsearch/package.py b/var/spack/repos/builtin/packages/elasticsearch/package.py index c3e722ff2b..3492774c35 100644 --- a/var/spack/repos/builtin/packages/elasticsearch/package.py +++ b/var/spack/repos/builtin/packages/elasticsearch/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/elemental/package.py b/var/spack/repos/builtin/packages/elemental/package.py index a1ac76b889..43a34fcc40 100644 --- a/var/spack/repos/builtin/packages/elemental/package.py +++ b/var/spack/repos/builtin/packages/elemental/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os from spack import * from spack.spec import UnsupportedCompilerError diff --git a/var/spack/repos/builtin/packages/elfutils/package.py b/var/spack/repos/builtin/packages/elfutils/package.py index 9c93b187e5..1234f5007a 100644 --- a/var/spack/repos/builtin/packages/elfutils/package.py +++ b/var/spack/repos/builtin/packages/elfutils/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/elk/package.py b/var/spack/repos/builtin/packages/elk/package.py index 4b4086c10b..fad0153014 100644 --- a/var/spack/repos/builtin/packages/elk/package.py +++ b/var/spack/repos/builtin/packages/elk/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/elpa/package.py b/var/spack/repos/builtin/packages/elpa/package.py index 1795f51e7e..13c31a26b3 100644 --- a/var/spack/repos/builtin/packages/elpa/package.py +++ b/var/spack/repos/builtin/packages/elpa/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/emacs/package.py b/var/spack/repos/builtin/packages/emacs/package.py index 2377d747fb..1599782d50 100644 --- a/var/spack/repos/builtin/packages/emacs/package.py +++ b/var/spack/repos/builtin/packages/emacs/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/ember/package.py b/var/spack/repos/builtin/packages/ember/package.py index 6b47305e86..261dc27ba7 100644 --- a/var/spack/repos/builtin/packages/ember/package.py +++ b/var/spack/repos/builtin/packages/ember/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2018, Los Alamos National Security, LLC. -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/emboss/package.py b/var/spack/repos/builtin/packages/emboss/package.py index a871db1636..bc36c8938b 100644 --- a/var/spack/repos/builtin/packages/emboss/package.py +++ b/var/spack/repos/builtin/packages/emboss/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/encodings/package.py b/var/spack/repos/builtin/packages/encodings/package.py index 249980e3ff..0ea51bf7da 100644 --- a/var/spack/repos/builtin/packages/encodings/package.py +++ b/var/spack/repos/builtin/packages/encodings/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/energyplus/package.py b/var/spack/repos/builtin/packages/energyplus/package.py index 2b7d3bea9d..48cc19cf41 100644 --- a/var/spack/repos/builtin/packages/energyplus/package.py +++ b/var/spack/repos/builtin/packages/energyplus/package.py @@ -1,27 +1,7 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * import glob diff --git a/var/spack/repos/builtin/packages/environment-modules/package.py b/var/spack/repos/builtin/packages/environment-modules/package.py index 16eafcda1c..60307d3865 100644 --- a/var/spack/repos/builtin/packages/environment-modules/package.py +++ b/var/spack/repos/builtin/packages/environment-modules/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/eospac/package.py b/var/spack/repos/builtin/packages/eospac/package.py index 0ed4487b0d..54000d6b5f 100644 --- a/var/spack/repos/builtin/packages/eospac/package.py +++ b/var/spack/repos/builtin/packages/eospac/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2018, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/er/package.py b/var/spack/repos/builtin/packages/er/package.py index ea1773204d..0638b792fb 100644 --- a/var/spack/repos/builtin/packages/er/package.py +++ b/var/spack/repos/builtin/packages/er/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/es/package.py b/var/spack/repos/builtin/packages/es/package.py index e77797acac..8b918919bb 100644 --- a/var/spack/repos/builtin/packages/es/package.py +++ b/var/spack/repos/builtin/packages/es/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/esmf/package.py b/var/spack/repos/builtin/packages/esmf/package.py index 99c7bce2c6..107aaffaa2 100644 --- a/var/spack/repos/builtin/packages/esmf/package.py +++ b/var/spack/repos/builtin/packages/esmf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/essl/package.py b/var/spack/repos/builtin/packages/essl/package.py index ba3db4cb3e..565b0ec6e5 100644 --- a/var/spack/repos/builtin/packages/essl/package.py +++ b/var/spack/repos/builtin/packages/essl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ethminer/package.py b/var/spack/repos/builtin/packages/ethminer/package.py index d3d3684787..0689d6faed 100644 --- a/var/spack/repos/builtin/packages/ethminer/package.py +++ b/var/spack/repos/builtin/packages/ethminer/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/etsf-io/package.py b/var/spack/repos/builtin/packages/etsf-io/package.py index 62f51c9dcd..cade69c89c 100644 --- a/var/spack/repos/builtin/packages/etsf-io/package.py +++ b/var/spack/repos/builtin/packages/etsf-io/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/everytrace-example/package.py b/var/spack/repos/builtin/packages/everytrace-example/package.py index f3f95d850b..1eff5f6451 100644 --- a/var/spack/repos/builtin/packages/everytrace-example/package.py +++ b/var/spack/repos/builtin/packages/everytrace-example/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/everytrace/package.py b/var/spack/repos/builtin/packages/everytrace/package.py index 0ce78ac2d4..8aaf928add 100644 --- a/var/spack/repos/builtin/packages/everytrace/package.py +++ b/var/spack/repos/builtin/packages/everytrace/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/evieext/package.py b/var/spack/repos/builtin/packages/evieext/package.py index 1ec12e4156..e857c0d5d5 100644 --- a/var/spack/repos/builtin/packages/evieext/package.py +++ b/var/spack/repos/builtin/packages/evieext/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/exabayes/package.py b/var/spack/repos/builtin/packages/exabayes/package.py index e3164dc1b1..2e951f6d75 100644 --- a/var/spack/repos/builtin/packages/exabayes/package.py +++ b/var/spack/repos/builtin/packages/exabayes/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/examinimd/package.py b/var/spack/repos/builtin/packages/examinimd/package.py index 2bf30715b4..ffb31a8ff8 100644 --- a/var/spack/repos/builtin/packages/examinimd/package.py +++ b/var/spack/repos/builtin/packages/examinimd/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2018, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/exampm/package.py b/var/spack/repos/builtin/packages/exampm/package.py index eb808203a2..8ea259daae 100644 --- a/var/spack/repos/builtin/packages/exampm/package.py +++ b/var/spack/repos/builtin/packages/exampm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/exasp2/package.py b/var/spack/repos/builtin/packages/exasp2/package.py index f796827317..511ff984a7 100644 --- a/var/spack/repos/builtin/packages/exasp2/package.py +++ b/var/spack/repos/builtin/packages/exasp2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob diff --git a/var/spack/repos/builtin/packages/exmcutils/package.py b/var/spack/repos/builtin/packages/exmcutils/package.py index 48d3d8afef..33b1827f00 100644 --- a/var/spack/repos/builtin/packages/exmcutils/package.py +++ b/var/spack/repos/builtin/packages/exmcutils/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/exodusii/package.py b/var/spack/repos/builtin/packages/exodusii/package.py index 4b504c3153..669929abce 100644 --- a/var/spack/repos/builtin/packages/exodusii/package.py +++ b/var/spack/repos/builtin/packages/exodusii/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * # TODO: Add support for a C++11 enabled installation that filters out the diff --git a/var/spack/repos/builtin/packages/exonerate/package.py b/var/spack/repos/builtin/packages/exonerate/package.py index d2690bbcf3..27b1c557c3 100644 --- a/var/spack/repos/builtin/packages/exonerate/package.py +++ b/var/spack/repos/builtin/packages/exonerate/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/expat/package.py b/var/spack/repos/builtin/packages/expat/package.py index 7ba3faf8b0..2068401160 100644 --- a/var/spack/repos/builtin/packages/expat/package.py +++ b/var/spack/repos/builtin/packages/expat/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/expect/package.py b/var/spack/repos/builtin/packages/expect/package.py index 3a14a013e5..8e17b3d5d9 100644 --- a/var/spack/repos/builtin/packages/expect/package.py +++ b/var/spack/repos/builtin/packages/expect/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob import os diff --git a/var/spack/repos/builtin/packages/express/package.py b/var/spack/repos/builtin/packages/express/package.py index f4ca8e9641..cfb262d313 100644 --- a/var/spack/repos/builtin/packages/express/package.py +++ b/var/spack/repos/builtin/packages/express/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os.path import glob diff --git a/var/spack/repos/builtin/packages/extrae/package.py b/var/spack/repos/builtin/packages/extrae/package.py index 2c06ee5e16..c79573424d 100644 --- a/var/spack/repos/builtin/packages/extrae/package.py +++ b/var/spack/repos/builtin/packages/extrae/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * # typical working line with extrae 3.0.1 diff --git a/var/spack/repos/builtin/packages/exuberant-ctags/package.py b/var/spack/repos/builtin/packages/exuberant-ctags/package.py index f0a3c632ed..f77678b397 100644 --- a/var/spack/repos/builtin/packages/exuberant-ctags/package.py +++ b/var/spack/repos/builtin/packages/exuberant-ctags/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/f90cache/package.py b/var/spack/repos/builtin/packages/f90cache/package.py index ff18433912..02f37540e8 100644 --- a/var/spack/repos/builtin/packages/f90cache/package.py +++ b/var/spack/repos/builtin/packages/f90cache/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fabtests/package.py b/var/spack/repos/builtin/packages/fabtests/package.py index 4e85d91e35..77d11e68a7 100644 --- a/var/spack/repos/builtin/packages/fabtests/package.py +++ b/var/spack/repos/builtin/packages/fabtests/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/falcon/package.py b/var/spack/repos/builtin/packages/falcon/package.py index f0a565cf35..85d130a1d2 100644 --- a/var/spack/repos/builtin/packages/falcon/package.py +++ b/var/spack/repos/builtin/packages/falcon/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * 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 186f7a8e98..79b35b54ee 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 @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fasta/package.py b/var/spack/repos/builtin/packages/fasta/package.py index 55e30ece73..6a70762320 100644 --- a/var/spack/repos/builtin/packages/fasta/package.py +++ b/var/spack/repos/builtin/packages/fasta/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fastjar/package.py b/var/spack/repos/builtin/packages/fastjar/package.py index 6d154e1a64..15c98729aa 100644 --- a/var/spack/repos/builtin/packages/fastjar/package.py +++ b/var/spack/repos/builtin/packages/fastjar/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fastmath/package.py b/var/spack/repos/builtin/packages/fastmath/package.py index 57bfa16549..35e245e1fd 100644 --- a/var/spack/repos/builtin/packages/fastmath/package.py +++ b/var/spack/repos/builtin/packages/fastmath/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fastme/package.py b/var/spack/repos/builtin/packages/fastme/package.py index bf8af1dec4..2aae0380f7 100644 --- a/var/spack/repos/builtin/packages/fastme/package.py +++ b/var/spack/repos/builtin/packages/fastme/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fastphase/package.py b/var/spack/repos/builtin/packages/fastphase/package.py index 54797287fd..80faa0d504 100644 --- a/var/spack/repos/builtin/packages/fastphase/package.py +++ b/var/spack/repos/builtin/packages/fastphase/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fastq-screen/package.py b/var/spack/repos/builtin/packages/fastq-screen/package.py index 1e6aa16ad6..c798fdb5a8 100644 --- a/var/spack/repos/builtin/packages/fastq-screen/package.py +++ b/var/spack/repos/builtin/packages/fastq-screen/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fastqc/package.py b/var/spack/repos/builtin/packages/fastqc/package.py index c793713618..bcebd2b4cf 100644 --- a/var/spack/repos/builtin/packages/fastqc/package.py +++ b/var/spack/repos/builtin/packages/fastqc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fastqvalidator/package.py b/var/spack/repos/builtin/packages/fastqvalidator/package.py index fca9a5bd95..38ccafa069 100644 --- a/var/spack/repos/builtin/packages/fastqvalidator/package.py +++ b/var/spack/repos/builtin/packages/fastqvalidator/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fasttree/package.py b/var/spack/repos/builtin/packages/fasttree/package.py index 6835dc96cc..813b5eb0d6 100644 --- a/var/spack/repos/builtin/packages/fasttree/package.py +++ b/var/spack/repos/builtin/packages/fasttree/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fastx-toolkit/package.py b/var/spack/repos/builtin/packages/fastx-toolkit/package.py index 648fa2bb70..c1e74163d0 100644 --- a/var/spack/repos/builtin/packages/fastx-toolkit/package.py +++ b/var/spack/repos/builtin/packages/fastx-toolkit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fenics/package.py b/var/spack/repos/builtin/packages/fenics/package.py index f89f2da2c8..f9707895fc 100644 --- a/var/spack/repos/builtin/packages/fenics/package.py +++ b/var/spack/repos/builtin/packages/fenics/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fermi/package.py b/var/spack/repos/builtin/packages/fermi/package.py index 03aea8a716..2c4693107d 100644 --- a/var/spack/repos/builtin/packages/fermi/package.py +++ b/var/spack/repos/builtin/packages/fermi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fermikit/package.py b/var/spack/repos/builtin/packages/fermikit/package.py index 061e39b247..0f44174fda 100644 --- a/var/spack/repos/builtin/packages/fermikit/package.py +++ b/var/spack/repos/builtin/packages/fermikit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fermisciencetools/package.py b/var/spack/repos/builtin/packages/fermisciencetools/package.py index 556123dd09..b2e67e7c27 100644 --- a/var/spack/repos/builtin/packages/fermisciencetools/package.py +++ b/var/spack/repos/builtin/packages/fermisciencetools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ferret/package.py b/var/spack/repos/builtin/packages/ferret/package.py index 746739e27b..7ecffc3429 100644 --- a/var/spack/repos/builtin/packages/ferret/package.py +++ b/var/spack/repos/builtin/packages/ferret/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/ffmpeg/package.py b/var/spack/repos/builtin/packages/ffmpeg/package.py index abc367aedf..e5f8aab78f 100644 --- a/var/spack/repos/builtin/packages/ffmpeg/package.py +++ b/var/spack/repos/builtin/packages/ffmpeg/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fftw/package.py b/var/spack/repos/builtin/packages/fftw/package.py index 8c1d2ed1fb..0d424ce029 100644 --- a/var/spack/repos/builtin/packages/fftw/package.py +++ b/var/spack/repos/builtin/packages/fftw/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import llnl.util.lang diff --git a/var/spack/repos/builtin/packages/figtree/package.py b/var/spack/repos/builtin/packages/figtree/package.py index 2bb63f3368..bb4cd8258a 100644 --- a/var/spack/repos/builtin/packages/figtree/package.py +++ b/var/spack/repos/builtin/packages/figtree/package.py @@ -1,27 +1,7 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * import os diff --git a/var/spack/repos/builtin/packages/fimpute/package.py b/var/spack/repos/builtin/packages/fimpute/package.py index f8c89f89d4..10e93d2a54 100644 --- a/var/spack/repos/builtin/packages/fimpute/package.py +++ b/var/spack/repos/builtin/packages/fimpute/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/findutils/package.py b/var/spack/repos/builtin/packages/findutils/package.py index 1660268b66..2f301d42ee 100644 --- a/var/spack/repos/builtin/packages/findutils/package.py +++ b/var/spack/repos/builtin/packages/findutils/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fio/package.py b/var/spack/repos/builtin/packages/fio/package.py index b20c5d5a35..59372e0a0c 100644 --- a/var/spack/repos/builtin/packages/fio/package.py +++ b/var/spack/repos/builtin/packages/fio/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fish/package.py b/var/spack/repos/builtin/packages/fish/package.py index 1ec75174ee..0f7c0eb2e9 100644 --- a/var/spack/repos/builtin/packages/fish/package.py +++ b/var/spack/repos/builtin/packages/fish/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fixesproto/package.py b/var/spack/repos/builtin/packages/fixesproto/package.py index 0c2ecc76c2..ed062c1a08 100644 --- a/var/spack/repos/builtin/packages/fixesproto/package.py +++ b/var/spack/repos/builtin/packages/fixesproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/flac/package.py b/var/spack/repos/builtin/packages/flac/package.py index af4c819df1..5c41641855 100644 --- a/var/spack/repos/builtin/packages/flac/package.py +++ b/var/spack/repos/builtin/packages/flac/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/flang/package.py b/var/spack/repos/builtin/packages/flang/package.py index 782216427f..b058febe86 100644 --- a/var/spack/repos/builtin/packages/flang/package.py +++ b/var/spack/repos/builtin/packages/flang/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/flann/package.py b/var/spack/repos/builtin/packages/flann/package.py index 52441401fc..7aee67b66c 100644 --- a/var/spack/repos/builtin/packages/flann/package.py +++ b/var/spack/repos/builtin/packages/flann/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/flash/package.py b/var/spack/repos/builtin/packages/flash/package.py index bbd1132e84..4b464bfb11 100644 --- a/var/spack/repos/builtin/packages/flash/package.py +++ b/var/spack/repos/builtin/packages/flash/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/flatbuffers/package.py b/var/spack/repos/builtin/packages/flatbuffers/package.py index 0f8eecbf60..0f90221c06 100644 --- a/var/spack/repos/builtin/packages/flatbuffers/package.py +++ b/var/spack/repos/builtin/packages/flatbuffers/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/flecsale/package.py b/var/spack/repos/builtin/packages/flecsale/package.py index 78bd88e96d..803624acd0 100644 --- a/var/spack/repos/builtin/packages/flecsale/package.py +++ b/var/spack/repos/builtin/packages/flecsale/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/flecsi/package.py b/var/spack/repos/builtin/packages/flecsi/package.py index 9903c59990..ac10a63e49 100644 --- a/var/spack/repos/builtin/packages/flecsi/package.py +++ b/var/spack/repos/builtin/packages/flecsi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/flex/package.py b/var/spack/repos/builtin/packages/flex/package.py index b847de22d0..2bbef402a6 100644 --- a/var/spack/repos/builtin/packages/flex/package.py +++ b/var/spack/repos/builtin/packages/flex/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/flint/package.py b/var/spack/repos/builtin/packages/flint/package.py index 47134b5e74..193f071013 100644 --- a/var/spack/repos/builtin/packages/flint/package.py +++ b/var/spack/repos/builtin/packages/flint/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/flit/package.py b/var/spack/repos/builtin/packages/flit/package.py index 95f1f88788..44ab5cbbcf 100644 --- a/var/spack/repos/builtin/packages/flit/package.py +++ b/var/spack/repos/builtin/packages/flit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fltk/package.py b/var/spack/repos/builtin/packages/fltk/package.py index 4e73955ee7..7f240b37eb 100644 --- a/var/spack/repos/builtin/packages/fltk/package.py +++ b/var/spack/repos/builtin/packages/fltk/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/flux-core/package.py b/var/spack/repos/builtin/packages/flux-core/package.py index 7de8903af1..2c71cbe5aa 100644 --- a/var/spack/repos/builtin/packages/flux-core/package.py +++ b/var/spack/repos/builtin/packages/flux-core/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/flux-sched/package.py b/var/spack/repos/builtin/packages/flux-sched/package.py index 6170f6b19e..388ea0a0b6 100644 --- a/var/spack/repos/builtin/packages/flux-sched/package.py +++ b/var/spack/repos/builtin/packages/flux-sched/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/fluxbox/package.py b/var/spack/repos/builtin/packages/fluxbox/package.py index f6474e576f..9d4600fe1c 100644 --- a/var/spack/repos/builtin/packages/fluxbox/package.py +++ b/var/spack/repos/builtin/packages/fluxbox/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # from spack import * diff --git a/var/spack/repos/builtin/packages/fmt/package.py b/var/spack/repos/builtin/packages/fmt/package.py index 46aec784f0..ecebada931 100644 --- a/var/spack/repos/builtin/packages/fmt/package.py +++ b/var/spack/repos/builtin/packages/fmt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/foam-extend/package.py b/var/spack/repos/builtin/packages/foam-extend/package.py index 2821c58eb9..4bd1aaaa04 100644 --- a/var/spack/repos/builtin/packages/foam-extend/package.py +++ b/var/spack/repos/builtin/packages/foam-extend/package.py @@ -1,29 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# License -# ------- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # Legal Notice # ------------ # OPENFOAM is a trademark owned by OpenCFD Ltd diff --git a/var/spack/repos/builtin/packages/folly/package.py b/var/spack/repos/builtin/packages/folly/package.py index bb1dd4fcb7..0a2d1f36a4 100644 --- a/var/spack/repos/builtin/packages/folly/package.py +++ b/var/spack/repos/builtin/packages/folly/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-adobe-100dpi/package.py b/var/spack/repos/builtin/packages/font-adobe-100dpi/package.py index d28efecf18..bf1817238f 100644 --- a/var/spack/repos/builtin/packages/font-adobe-100dpi/package.py +++ b/var/spack/repos/builtin/packages/font-adobe-100dpi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-adobe-75dpi/package.py b/var/spack/repos/builtin/packages/font-adobe-75dpi/package.py index 96018b183d..6e1f8402ca 100644 --- a/var/spack/repos/builtin/packages/font-adobe-75dpi/package.py +++ b/var/spack/repos/builtin/packages/font-adobe-75dpi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-adobe-utopia-100dpi/package.py b/var/spack/repos/builtin/packages/font-adobe-utopia-100dpi/package.py index 0b6f87cb83..fe4f5eb862 100644 --- a/var/spack/repos/builtin/packages/font-adobe-utopia-100dpi/package.py +++ b/var/spack/repos/builtin/packages/font-adobe-utopia-100dpi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-adobe-utopia-75dpi/package.py b/var/spack/repos/builtin/packages/font-adobe-utopia-75dpi/package.py index 4e52704522..9fa00f29a3 100644 --- a/var/spack/repos/builtin/packages/font-adobe-utopia-75dpi/package.py +++ b/var/spack/repos/builtin/packages/font-adobe-utopia-75dpi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-adobe-utopia-type1/package.py b/var/spack/repos/builtin/packages/font-adobe-utopia-type1/package.py index 32acd3d0da..c5e832cb29 100644 --- a/var/spack/repos/builtin/packages/font-adobe-utopia-type1/package.py +++ b/var/spack/repos/builtin/packages/font-adobe-utopia-type1/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-alias/package.py b/var/spack/repos/builtin/packages/font-alias/package.py index 86b4261394..2819678e71 100644 --- a/var/spack/repos/builtin/packages/font-alias/package.py +++ b/var/spack/repos/builtin/packages/font-alias/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-arabic-misc/package.py b/var/spack/repos/builtin/packages/font-arabic-misc/package.py index 6aa5abe87d..910ff1af57 100644 --- a/var/spack/repos/builtin/packages/font-arabic-misc/package.py +++ b/var/spack/repos/builtin/packages/font-arabic-misc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-bh-100dpi/package.py b/var/spack/repos/builtin/packages/font-bh-100dpi/package.py index faac468107..48ca9aa37a 100644 --- a/var/spack/repos/builtin/packages/font-bh-100dpi/package.py +++ b/var/spack/repos/builtin/packages/font-bh-100dpi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-bh-75dpi/package.py b/var/spack/repos/builtin/packages/font-bh-75dpi/package.py index 893dfb7a07..0af3c8e1d1 100644 --- a/var/spack/repos/builtin/packages/font-bh-75dpi/package.py +++ b/var/spack/repos/builtin/packages/font-bh-75dpi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-100dpi/package.py b/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-100dpi/package.py index 8a17a95857..7b001c32e3 100644 --- a/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-100dpi/package.py +++ b/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-100dpi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-75dpi/package.py b/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-75dpi/package.py index 65a6cedb24..ce0677144f 100644 --- a/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-75dpi/package.py +++ b/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-75dpi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-bh-ttf/package.py b/var/spack/repos/builtin/packages/font-bh-ttf/package.py index 2212c23592..ae662cd40c 100644 --- a/var/spack/repos/builtin/packages/font-bh-ttf/package.py +++ b/var/spack/repos/builtin/packages/font-bh-ttf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-bh-type1/package.py b/var/spack/repos/builtin/packages/font-bh-type1/package.py index d47640adb2..d75bb953f3 100644 --- a/var/spack/repos/builtin/packages/font-bh-type1/package.py +++ b/var/spack/repos/builtin/packages/font-bh-type1/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-bitstream-100dpi/package.py b/var/spack/repos/builtin/packages/font-bitstream-100dpi/package.py index f10630755f..286a2dec5b 100644 --- a/var/spack/repos/builtin/packages/font-bitstream-100dpi/package.py +++ b/var/spack/repos/builtin/packages/font-bitstream-100dpi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-bitstream-75dpi/package.py b/var/spack/repos/builtin/packages/font-bitstream-75dpi/package.py index 33f82f8b12..028121c2a9 100644 --- a/var/spack/repos/builtin/packages/font-bitstream-75dpi/package.py +++ b/var/spack/repos/builtin/packages/font-bitstream-75dpi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-bitstream-speedo/package.py b/var/spack/repos/builtin/packages/font-bitstream-speedo/package.py index cabb00883b..ca3b5a2e48 100644 --- a/var/spack/repos/builtin/packages/font-bitstream-speedo/package.py +++ b/var/spack/repos/builtin/packages/font-bitstream-speedo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-bitstream-type1/package.py b/var/spack/repos/builtin/packages/font-bitstream-type1/package.py index a6b38e7c63..efb427de3a 100644 --- a/var/spack/repos/builtin/packages/font-bitstream-type1/package.py +++ b/var/spack/repos/builtin/packages/font-bitstream-type1/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-cronyx-cyrillic/package.py b/var/spack/repos/builtin/packages/font-cronyx-cyrillic/package.py index a95ad065d0..0ac07e9669 100644 --- a/var/spack/repos/builtin/packages/font-cronyx-cyrillic/package.py +++ b/var/spack/repos/builtin/packages/font-cronyx-cyrillic/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-cursor-misc/package.py b/var/spack/repos/builtin/packages/font-cursor-misc/package.py index d05cbb523f..321bd01b13 100644 --- a/var/spack/repos/builtin/packages/font-cursor-misc/package.py +++ b/var/spack/repos/builtin/packages/font-cursor-misc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-daewoo-misc/package.py b/var/spack/repos/builtin/packages/font-daewoo-misc/package.py index 58e733e42c..737d3dfac9 100644 --- a/var/spack/repos/builtin/packages/font-daewoo-misc/package.py +++ b/var/spack/repos/builtin/packages/font-daewoo-misc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-dec-misc/package.py b/var/spack/repos/builtin/packages/font-dec-misc/package.py index d139d5095a..e4cc9cbab8 100644 --- a/var/spack/repos/builtin/packages/font-dec-misc/package.py +++ b/var/spack/repos/builtin/packages/font-dec-misc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-ibm-type1/package.py b/var/spack/repos/builtin/packages/font-ibm-type1/package.py index 4cab224e3f..213be77570 100644 --- a/var/spack/repos/builtin/packages/font-ibm-type1/package.py +++ b/var/spack/repos/builtin/packages/font-ibm-type1/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-isas-misc/package.py b/var/spack/repos/builtin/packages/font-isas-misc/package.py index c98dac2bf7..d51f7daf62 100644 --- a/var/spack/repos/builtin/packages/font-isas-misc/package.py +++ b/var/spack/repos/builtin/packages/font-isas-misc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-jis-misc/package.py b/var/spack/repos/builtin/packages/font-jis-misc/package.py index b7fd329f51..5165a97c8a 100644 --- a/var/spack/repos/builtin/packages/font-jis-misc/package.py +++ b/var/spack/repos/builtin/packages/font-jis-misc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-micro-misc/package.py b/var/spack/repos/builtin/packages/font-micro-misc/package.py index 24d1b4ecdb..4212aac2b6 100644 --- a/var/spack/repos/builtin/packages/font-micro-misc/package.py +++ b/var/spack/repos/builtin/packages/font-micro-misc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-misc-cyrillic/package.py b/var/spack/repos/builtin/packages/font-misc-cyrillic/package.py index 23d9eaf978..24085afdee 100644 --- a/var/spack/repos/builtin/packages/font-misc-cyrillic/package.py +++ b/var/spack/repos/builtin/packages/font-misc-cyrillic/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-misc-ethiopic/package.py b/var/spack/repos/builtin/packages/font-misc-ethiopic/package.py index 2b768cd66f..5fcc5a50d1 100644 --- a/var/spack/repos/builtin/packages/font-misc-ethiopic/package.py +++ b/var/spack/repos/builtin/packages/font-misc-ethiopic/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-misc-meltho/package.py b/var/spack/repos/builtin/packages/font-misc-meltho/package.py index 1ebaa7973c..29be9bfebd 100644 --- a/var/spack/repos/builtin/packages/font-misc-meltho/package.py +++ b/var/spack/repos/builtin/packages/font-misc-meltho/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-misc-misc/package.py b/var/spack/repos/builtin/packages/font-misc-misc/package.py index 633992b5de..d29384eaa5 100644 --- a/var/spack/repos/builtin/packages/font-misc-misc/package.py +++ b/var/spack/repos/builtin/packages/font-misc-misc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-mutt-misc/package.py b/var/spack/repos/builtin/packages/font-mutt-misc/package.py index 9f345f6c1b..376f6d3f22 100644 --- a/var/spack/repos/builtin/packages/font-mutt-misc/package.py +++ b/var/spack/repos/builtin/packages/font-mutt-misc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-schumacher-misc/package.py b/var/spack/repos/builtin/packages/font-schumacher-misc/package.py index b726e9f0e2..fefe1e1c61 100644 --- a/var/spack/repos/builtin/packages/font-schumacher-misc/package.py +++ b/var/spack/repos/builtin/packages/font-schumacher-misc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-screen-cyrillic/package.py b/var/spack/repos/builtin/packages/font-screen-cyrillic/package.py index fc22bbf063..0eec73060d 100644 --- a/var/spack/repos/builtin/packages/font-screen-cyrillic/package.py +++ b/var/spack/repos/builtin/packages/font-screen-cyrillic/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-sony-misc/package.py b/var/spack/repos/builtin/packages/font-sony-misc/package.py index 7a8d39bb27..912957ab12 100644 --- a/var/spack/repos/builtin/packages/font-sony-misc/package.py +++ b/var/spack/repos/builtin/packages/font-sony-misc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-sun-misc/package.py b/var/spack/repos/builtin/packages/font-sun-misc/package.py index cc69341af6..8555fdb428 100644 --- a/var/spack/repos/builtin/packages/font-sun-misc/package.py +++ b/var/spack/repos/builtin/packages/font-sun-misc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-util/package.py b/var/spack/repos/builtin/packages/font-util/package.py index 9a71df8e3b..7a5e163482 100644 --- a/var/spack/repos/builtin/packages/font-util/package.py +++ b/var/spack/repos/builtin/packages/font-util/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-winitzki-cyrillic/package.py b/var/spack/repos/builtin/packages/font-winitzki-cyrillic/package.py index c6c8d01e83..e15236a20f 100644 --- a/var/spack/repos/builtin/packages/font-winitzki-cyrillic/package.py +++ b/var/spack/repos/builtin/packages/font-winitzki-cyrillic/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/font-xfree86-type1/package.py b/var/spack/repos/builtin/packages/font-xfree86-type1/package.py index 9dda381cbe..5cb5de7eb8 100644 --- a/var/spack/repos/builtin/packages/font-xfree86-type1/package.py +++ b/var/spack/repos/builtin/packages/font-xfree86-type1/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fontcacheproto/package.py b/var/spack/repos/builtin/packages/fontcacheproto/package.py index 2c5b0374fe..77c8e4a38a 100644 --- a/var/spack/repos/builtin/packages/fontcacheproto/package.py +++ b/var/spack/repos/builtin/packages/fontcacheproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fontconfig/package.py b/var/spack/repos/builtin/packages/fontconfig/package.py index 358e383785..0ef1a3ebc9 100644 --- a/var/spack/repos/builtin/packages/fontconfig/package.py +++ b/var/spack/repos/builtin/packages/fontconfig/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fontsproto/package.py b/var/spack/repos/builtin/packages/fontsproto/package.py index bd114069b3..22ea479567 100644 --- a/var/spack/repos/builtin/packages/fontsproto/package.py +++ b/var/spack/repos/builtin/packages/fontsproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fonttosfnt/package.py b/var/spack/repos/builtin/packages/fonttosfnt/package.py index af7cbb07ed..02928b26b8 100644 --- a/var/spack/repos/builtin/packages/fonttosfnt/package.py +++ b/var/spack/repos/builtin/packages/fonttosfnt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fp16/package.py b/var/spack/repos/builtin/packages/fp16/package.py index 7cdc8293a4..e20b215ce1 100644 --- a/var/spack/repos/builtin/packages/fp16/package.py +++ b/var/spack/repos/builtin/packages/fp16/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fpc/package.py b/var/spack/repos/builtin/packages/fpc/package.py index 6e3f9d4353..ec0fca7b68 100644 --- a/var/spack/repos/builtin/packages/fpc/package.py +++ b/var/spack/repos/builtin/packages/fpc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fr-hit/package.py b/var/spack/repos/builtin/packages/fr-hit/package.py index 2c1a61e4f4..a6dc337882 100644 --- a/var/spack/repos/builtin/packages/fr-hit/package.py +++ b/var/spack/repos/builtin/packages/fr-hit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/freebayes/package.py b/var/spack/repos/builtin/packages/freebayes/package.py index 4d1ab6f773..a50362d453 100644 --- a/var/spack/repos/builtin/packages/freebayes/package.py +++ b/var/spack/repos/builtin/packages/freebayes/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/freeglut/package.py b/var/spack/repos/builtin/packages/freeglut/package.py index eabe21949a..6327a20839 100644 --- a/var/spack/repos/builtin/packages/freeglut/package.py +++ b/var/spack/repos/builtin/packages/freeglut/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/freetype/package.py b/var/spack/repos/builtin/packages/freetype/package.py index 0791568e32..ef2500c778 100644 --- a/var/spack/repos/builtin/packages/freetype/package.py +++ b/var/spack/repos/builtin/packages/freetype/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fseq/package.py b/var/spack/repos/builtin/packages/fseq/package.py index 41dcab6804..5397c64d1f 100644 --- a/var/spack/repos/builtin/packages/fseq/package.py +++ b/var/spack/repos/builtin/packages/fseq/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fsl/package.py b/var/spack/repos/builtin/packages/fsl/package.py index 00d00db220..1a0b3e054e 100644 --- a/var/spack/repos/builtin/packages/fsl/package.py +++ b/var/spack/repos/builtin/packages/fsl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from spack.environment import EnvironmentModifications import os diff --git a/var/spack/repos/builtin/packages/fslsfonts/package.py b/var/spack/repos/builtin/packages/fslsfonts/package.py index 3153d556af..1f540a5509 100644 --- a/var/spack/repos/builtin/packages/fslsfonts/package.py +++ b/var/spack/repos/builtin/packages/fslsfonts/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fstobdf/package.py b/var/spack/repos/builtin/packages/fstobdf/package.py index a8abd4917f..1605edddc3 100644 --- a/var/spack/repos/builtin/packages/fstobdf/package.py +++ b/var/spack/repos/builtin/packages/fstobdf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ftgl/package.py b/var/spack/repos/builtin/packages/ftgl/package.py index a2fcb7c702..030fa441ac 100644 --- a/var/spack/repos/builtin/packages/ftgl/package.py +++ b/var/spack/repos/builtin/packages/ftgl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys import os diff --git a/var/spack/repos/builtin/packages/funhpc/package.py b/var/spack/repos/builtin/packages/funhpc/package.py index c31f10dc30..8082be7b24 100644 --- a/var/spack/repos/builtin/packages/funhpc/package.py +++ b/var/spack/repos/builtin/packages/funhpc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/fyba/package.py b/var/spack/repos/builtin/packages/fyba/package.py index bdaece0cf5..e0cfc046cd 100644 --- a/var/spack/repos/builtin/packages/fyba/package.py +++ b/var/spack/repos/builtin/packages/fyba/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gapbs/package.py b/var/spack/repos/builtin/packages/gapbs/package.py index 2dfd34b7f0..f62cbb790f 100644 --- a/var/spack/repos/builtin/packages/gapbs/package.py +++ b/var/spack/repos/builtin/packages/gapbs/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gapcloser/package.py b/var/spack/repos/builtin/packages/gapcloser/package.py index cc7478dcc4..d4ff137816 100644 --- a/var/spack/repos/builtin/packages/gapcloser/package.py +++ b/var/spack/repos/builtin/packages/gapcloser/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gapfiller/package.py b/var/spack/repos/builtin/packages/gapfiller/package.py index 35f8b106c8..883874007b 100644 --- a/var/spack/repos/builtin/packages/gapfiller/package.py +++ b/var/spack/repos/builtin/packages/gapfiller/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os import glob diff --git a/var/spack/repos/builtin/packages/gasnet/package.py b/var/spack/repos/builtin/packages/gasnet/package.py index d7e3021c7a..7681af2d21 100644 --- a/var/spack/repos/builtin/packages/gasnet/package.py +++ b/var/spack/repos/builtin/packages/gasnet/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gatk/package.py b/var/spack/repos/builtin/packages/gatk/package.py index e2462ea4e6..32bb771530 100644 --- a/var/spack/repos/builtin/packages/gatk/package.py +++ b/var/spack/repos/builtin/packages/gatk/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob import os.path diff --git a/var/spack/repos/builtin/packages/gaussian/package.py b/var/spack/repos/builtin/packages/gaussian/package.py index c14c830b0e..a9088d11e6 100644 --- a/var/spack/repos/builtin/packages/gaussian/package.py +++ b/var/spack/repos/builtin/packages/gaussian/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/gawk/package.py b/var/spack/repos/builtin/packages/gawk/package.py index 271e40902d..61e08f3158 100644 --- a/var/spack/repos/builtin/packages/gawk/package.py +++ b/var/spack/repos/builtin/packages/gawk/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gblocks/package.py b/var/spack/repos/builtin/packages/gblocks/package.py index 5ca22e44d0..38fc44b86a 100644 --- a/var/spack/repos/builtin/packages/gblocks/package.py +++ b/var/spack/repos/builtin/packages/gblocks/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py index 2003bdfcd8..e6f9ad5d09 100644 --- a/var/spack/repos/builtin/packages/gcc/package.py +++ b/var/spack/repos/builtin/packages/gcc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from spack.operating_systems.mac_os import macos_version from llnl.util import tty diff --git a/var/spack/repos/builtin/packages/gccmakedep/package.py b/var/spack/repos/builtin/packages/gccmakedep/package.py index 8588cde8fe..ae0bade1fd 100644 --- a/var/spack/repos/builtin/packages/gccmakedep/package.py +++ b/var/spack/repos/builtin/packages/gccmakedep/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gccxml/package.py b/var/spack/repos/builtin/packages/gccxml/package.py index 995a63bd0c..99ebf75a5f 100644 --- a/var/spack/repos/builtin/packages/gccxml/package.py +++ b/var/spack/repos/builtin/packages/gccxml/package.py @@ -1,24 +1,8 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gconf/package.py b/var/spack/repos/builtin/packages/gconf/package.py index 7449f550cf..abafae9c36 100644 --- a/var/spack/repos/builtin/packages/gconf/package.py +++ b/var/spack/repos/builtin/packages/gconf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gcta/package.py b/var/spack/repos/builtin/packages/gcta/package.py index 5cbc05a1cf..8ff01ebe05 100644 --- a/var/spack/repos/builtin/packages/gcta/package.py +++ b/var/spack/repos/builtin/packages/gcta/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gdal/package.py b/var/spack/repos/builtin/packages/gdal/package.py index 250a3b9941..2ca0df636f 100644 --- a/var/spack/repos/builtin/packages/gdal/package.py +++ b/var/spack/repos/builtin/packages/gdal/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/gdb/package.py b/var/spack/repos/builtin/packages/gdb/package.py index 5dcb307331..5d6b265961 100644 --- a/var/spack/repos/builtin/packages/gdb/package.py +++ b/var/spack/repos/builtin/packages/gdb/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gdbm/package.py b/var/spack/repos/builtin/packages/gdbm/package.py index a4abc46f58..d041c283bf 100644 --- a/var/spack/repos/builtin/packages/gdbm/package.py +++ b/var/spack/repos/builtin/packages/gdbm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # from spack import * diff --git a/var/spack/repos/builtin/packages/gdk-pixbuf/package.py b/var/spack/repos/builtin/packages/gdk-pixbuf/package.py index 7423cd5a31..9aaa91b2dd 100644 --- a/var/spack/repos/builtin/packages/gdk-pixbuf/package.py +++ b/var/spack/repos/builtin/packages/gdk-pixbuf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gdl/package.py b/var/spack/repos/builtin/packages/gdl/package.py index 3de689948e..ac49f17236 100644 --- a/var/spack/repos/builtin/packages/gdl/package.py +++ b/var/spack/repos/builtin/packages/gdl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/geant4/package.py b/var/spack/repos/builtin/packages/geant4/package.py index b40fd27d5d..0685de3cd9 100644 --- a/var/spack/repos/builtin/packages/geant4/package.py +++ b/var/spack/repos/builtin/packages/geant4/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import platform diff --git a/var/spack/repos/builtin/packages/gearshifft/package.py b/var/spack/repos/builtin/packages/gearshifft/package.py index f2a4d015a6..7b71f2e2ee 100644 --- a/var/spack/repos/builtin/packages/gearshifft/package.py +++ b/var/spack/repos/builtin/packages/gearshifft/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gemmlowp/package.py b/var/spack/repos/builtin/packages/gemmlowp/package.py index 9ff88511e6..d293a9b254 100644 --- a/var/spack/repos/builtin/packages/gemmlowp/package.py +++ b/var/spack/repos/builtin/packages/gemmlowp/package.py @@ -1,27 +1,8 @@ -############################################################################# -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/genemark-et/package.py b/var/spack/repos/builtin/packages/genemark-et/package.py index 34350a3c5a..d38a84522a 100644 --- a/var/spack/repos/builtin/packages/genemark-et/package.py +++ b/var/spack/repos/builtin/packages/genemark-et/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os import glob diff --git a/var/spack/repos/builtin/packages/genomefinisher/package.py b/var/spack/repos/builtin/packages/genomefinisher/package.py index 2083c3b22b..d9030c2a19 100644 --- a/var/spack/repos/builtin/packages/genomefinisher/package.py +++ b/var/spack/repos/builtin/packages/genomefinisher/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/genometools/package.py b/var/spack/repos/builtin/packages/genometools/package.py index 86e092e7b0..5d88fa0416 100644 --- a/var/spack/repos/builtin/packages/genometools/package.py +++ b/var/spack/repos/builtin/packages/genometools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/geopm/package.py b/var/spack/repos/builtin/packages/geopm/package.py index 634b0e79a8..37047ab1b0 100644 --- a/var/spack/repos/builtin/packages/geopm/package.py +++ b/var/spack/repos/builtin/packages/geopm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/geos/package.py b/var/spack/repos/builtin/packages/geos/package.py index 4589a05e30..3bd4a8f7e4 100644 --- a/var/spack/repos/builtin/packages/geos/package.py +++ b/var/spack/repos/builtin/packages/geos/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gettext/package.py b/var/spack/repos/builtin/packages/gettext/package.py index c7f2d396a1..7676bb8cfb 100644 --- a/var/spack/repos/builtin/packages/gettext/package.py +++ b/var/spack/repos/builtin/packages/gettext/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gflags/package.py b/var/spack/repos/builtin/packages/gflags/package.py index 68b91bcb74..4984af3406 100644 --- a/var/spack/repos/builtin/packages/gflags/package.py +++ b/var/spack/repos/builtin/packages/gflags/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ghost/package.py b/var/spack/repos/builtin/packages/ghost/package.py index deadd8338b..246f990133 100644 --- a/var/spack/repos/builtin/packages/ghost/package.py +++ b/var/spack/repos/builtin/packages/ghost/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ghostscript-fonts/package.py b/var/spack/repos/builtin/packages/ghostscript-fonts/package.py index 69aa6851a2..198108fd4e 100644 --- a/var/spack/repos/builtin/packages/ghostscript-fonts/package.py +++ b/var/spack/repos/builtin/packages/ghostscript-fonts/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob diff --git a/var/spack/repos/builtin/packages/ghostscript/package.py b/var/spack/repos/builtin/packages/ghostscript/package.py index 15c0190964..d5d478bf90 100644 --- a/var/spack/repos/builtin/packages/ghostscript/package.py +++ b/var/spack/repos/builtin/packages/ghostscript/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import shutil diff --git a/var/spack/repos/builtin/packages/giflib/package.py b/var/spack/repos/builtin/packages/giflib/package.py index e5dba22ff7..a951143a12 100644 --- a/var/spack/repos/builtin/packages/giflib/package.py +++ b/var/spack/repos/builtin/packages/giflib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/git-imerge/package.py b/var/spack/repos/builtin/packages/git-imerge/package.py index 1c87833e69..524a8b28ee 100644 --- a/var/spack/repos/builtin/packages/git-imerge/package.py +++ b/var/spack/repos/builtin/packages/git-imerge/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/git-lfs/package.py b/var/spack/repos/builtin/packages/git-lfs/package.py index 99b02c99f3..902540a603 100644 --- a/var/spack/repos/builtin/packages/git-lfs/package.py +++ b/var/spack/repos/builtin/packages/git-lfs/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index 3e8a11d69e..3578447736 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import sys from spack import * diff --git a/var/spack/repos/builtin/packages/gl2ps/package.py b/var/spack/repos/builtin/packages/gl2ps/package.py index d1dd9060ca..16e4453bfd 100644 --- a/var/spack/repos/builtin/packages/gl2ps/package.py +++ b/var/spack/repos/builtin/packages/gl2ps/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/glew/package.py b/var/spack/repos/builtin/packages/glew/package.py index 7901fd5e67..58c5ef686e 100644 --- a/var/spack/repos/builtin/packages/glew/package.py +++ b/var/spack/repos/builtin/packages/glew/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/glfmultiples/package.py b/var/spack/repos/builtin/packages/glfmultiples/package.py index be48f3a3ed..deb5789e24 100644 --- a/var/spack/repos/builtin/packages/glfmultiples/package.py +++ b/var/spack/repos/builtin/packages/glfmultiples/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/glib/package.py b/var/spack/repos/builtin/packages/glib/package.py index cf4a6ce371..ab554165a1 100644 --- a/var/spack/repos/builtin/packages/glib/package.py +++ b/var/spack/repos/builtin/packages/glib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os.path diff --git a/var/spack/repos/builtin/packages/glibmm/package.py b/var/spack/repos/builtin/packages/glibmm/package.py index 810a8674b1..5fcf28ed83 100644 --- a/var/spack/repos/builtin/packages/glibmm/package.py +++ b/var/spack/repos/builtin/packages/glibmm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/glimmer/package.py b/var/spack/repos/builtin/packages/glimmer/package.py index 2831b0b4b1..b93aefc08f 100644 --- a/var/spack/repos/builtin/packages/glimmer/package.py +++ b/var/spack/repos/builtin/packages/glimmer/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/glm/package.py b/var/spack/repos/builtin/packages/glm/package.py index aa103d5ee5..c628872feb 100644 --- a/var/spack/repos/builtin/packages/glm/package.py +++ b/var/spack/repos/builtin/packages/glm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/global/package.py b/var/spack/repos/builtin/packages/global/package.py index 401638e46a..66be9777c1 100644 --- a/var/spack/repos/builtin/packages/global/package.py +++ b/var/spack/repos/builtin/packages/global/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/globalarrays/package.py b/var/spack/repos/builtin/packages/globalarrays/package.py index bd6f92168f..a3074bccbf 100644 --- a/var/spack/repos/builtin/packages/globalarrays/package.py +++ b/var/spack/repos/builtin/packages/globalarrays/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/globus-toolkit/package.py b/var/spack/repos/builtin/packages/globus-toolkit/package.py index ce3ad3a299..537bcb3a3b 100644 --- a/var/spack/repos/builtin/packages/globus-toolkit/package.py +++ b/var/spack/repos/builtin/packages/globus-toolkit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/glog/package.py b/var/spack/repos/builtin/packages/glog/package.py index 3f65de6727..78c59c3b14 100644 --- a/var/spack/repos/builtin/packages/glog/package.py +++ b/var/spack/repos/builtin/packages/glog/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gloo/package.py b/var/spack/repos/builtin/packages/gloo/package.py index 66961d5656..3fdfa1c295 100644 --- a/var/spack/repos/builtin/packages/gloo/package.py +++ b/var/spack/repos/builtin/packages/gloo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/glpk/package.py b/var/spack/repos/builtin/packages/glpk/package.py index f449edd9a6..eab6df6d1f 100644 --- a/var/spack/repos/builtin/packages/glpk/package.py +++ b/var/spack/repos/builtin/packages/glpk/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/glproto/package.py b/var/spack/repos/builtin/packages/glproto/package.py index 1a585bf49e..78dc23b645 100644 --- a/var/spack/repos/builtin/packages/glproto/package.py +++ b/var/spack/repos/builtin/packages/glproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/glvis/package.py b/var/spack/repos/builtin/packages/glvis/package.py index 3330656439..dca29403ea 100644 --- a/var/spack/repos/builtin/packages/glvis/package.py +++ b/var/spack/repos/builtin/packages/glvis/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gmake/package.py b/var/spack/repos/builtin/packages/gmake/package.py index d0133ea33f..c40b476568 100644 --- a/var/spack/repos/builtin/packages/gmake/package.py +++ b/var/spack/repos/builtin/packages/gmake/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gmap-gsnap/package.py b/var/spack/repos/builtin/packages/gmap-gsnap/package.py index e9d6ab2841..bfa53525f2 100644 --- a/var/spack/repos/builtin/packages/gmap-gsnap/package.py +++ b/var/spack/repos/builtin/packages/gmap-gsnap/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gmime/package.py b/var/spack/repos/builtin/packages/gmime/package.py index 1df5b22939..888732ee48 100644 --- a/var/spack/repos/builtin/packages/gmime/package.py +++ b/var/spack/repos/builtin/packages/gmime/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gmodel/package.py b/var/spack/repos/builtin/packages/gmodel/package.py index 62b22811b5..65ab123158 100644 --- a/var/spack/repos/builtin/packages/gmodel/package.py +++ b/var/spack/repos/builtin/packages/gmodel/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gmp/package.py b/var/spack/repos/builtin/packages/gmp/package.py index 19bc4f8bbb..c49be8f485 100644 --- a/var/spack/repos/builtin/packages/gmp/package.py +++ b/var/spack/repos/builtin/packages/gmp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gmsh/package.py b/var/spack/repos/builtin/packages/gmsh/package.py index cb4bed7ef0..c56c2d415a 100644 --- a/var/spack/repos/builtin/packages/gmsh/package.py +++ b/var/spack/repos/builtin/packages/gmsh/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gnat/package.py b/var/spack/repos/builtin/packages/gnat/package.py index c02c475586..1c3ef8d5d2 100644 --- a/var/spack/repos/builtin/packages/gnat/package.py +++ b/var/spack/repos/builtin/packages/gnat/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gnu-prolog/package.py b/var/spack/repos/builtin/packages/gnu-prolog/package.py index fa6d3b9d8e..b96e026e87 100644 --- a/var/spack/repos/builtin/packages/gnu-prolog/package.py +++ b/var/spack/repos/builtin/packages/gnu-prolog/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gnupg/package.py b/var/spack/repos/builtin/packages/gnupg/package.py index 4079351b91..d1d3efd014 100644 --- a/var/spack/repos/builtin/packages/gnupg/package.py +++ b/var/spack/repos/builtin/packages/gnupg/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gnuplot/package.py b/var/spack/repos/builtin/packages/gnuplot/package.py index e71bef0758..39654df830 100644 --- a/var/spack/repos/builtin/packages/gnuplot/package.py +++ b/var/spack/repos/builtin/packages/gnuplot/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/gnutls/package.py b/var/spack/repos/builtin/packages/gnutls/package.py index 247d2d485e..9f81cfda9a 100644 --- a/var/spack/repos/builtin/packages/gnutls/package.py +++ b/var/spack/repos/builtin/packages/gnutls/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/go-bootstrap/package.py b/var/spack/repos/builtin/packages/go-bootstrap/package.py index 730f423d55..b1f94fc594 100644 --- a/var/spack/repos/builtin/packages/go-bootstrap/package.py +++ b/var/spack/repos/builtin/packages/go-bootstrap/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * # THIS PACKAGE SHOULD NOT EXIST diff --git a/var/spack/repos/builtin/packages/go/package.py b/var/spack/repos/builtin/packages/go/package.py index d71d1fc5aa..5fcdc57a5d 100644 --- a/var/spack/repos/builtin/packages/go/package.py +++ b/var/spack/repos/builtin/packages/go/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import llnl.util.tty as tty from spack import * diff --git a/var/spack/repos/builtin/packages/gobject-introspection/package.py b/var/spack/repos/builtin/packages/gobject-introspection/package.py index 436949290c..7466458cd7 100644 --- a/var/spack/repos/builtin/packages/gobject-introspection/package.py +++ b/var/spack/repos/builtin/packages/gobject-introspection/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from spack.paths import spack_root diff --git a/var/spack/repos/builtin/packages/googletest/package.py b/var/spack/repos/builtin/packages/googletest/package.py index 67edb2dc2e..95bdff7473 100644 --- a/var/spack/repos/builtin/packages/googletest/package.py +++ b/var/spack/repos/builtin/packages/googletest/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gotcha/package.py b/var/spack/repos/builtin/packages/gotcha/package.py index 419d276653..e1677a4711 100644 --- a/var/spack/repos/builtin/packages/gotcha/package.py +++ b/var/spack/repos/builtin/packages/gotcha/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gource/package.py b/var/spack/repos/builtin/packages/gource/package.py index 44267c1805..3d9fe00c80 100644 --- a/var/spack/repos/builtin/packages/gource/package.py +++ b/var/spack/repos/builtin/packages/gource/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gperf/package.py b/var/spack/repos/builtin/packages/gperf/package.py index 3565ab3629..d3c5863c6b 100644 --- a/var/spack/repos/builtin/packages/gperf/package.py +++ b/var/spack/repos/builtin/packages/gperf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gperftools/package.py b/var/spack/repos/builtin/packages/gperftools/package.py index a60c86cfec..df26272a71 100644 --- a/var/spack/repos/builtin/packages/gperftools/package.py +++ b/var/spack/repos/builtin/packages/gperftools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gplates/package.py b/var/spack/repos/builtin/packages/gplates/package.py index a0a1036153..6d54c80822 100644 --- a/var/spack/repos/builtin/packages/gplates/package.py +++ b/var/spack/repos/builtin/packages/gplates/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/grackle/package.py b/var/spack/repos/builtin/packages/grackle/package.py index 0df3f3bf81..6163f72bbc 100644 --- a/var/spack/repos/builtin/packages/grackle/package.py +++ b/var/spack/repos/builtin/packages/grackle/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os.path import inspect diff --git a/var/spack/repos/builtin/packages/gradle/package.py b/var/spack/repos/builtin/packages/gradle/package.py index f7ad851e9f..54f288e500 100644 --- a/var/spack/repos/builtin/packages/gradle/package.py +++ b/var/spack/repos/builtin/packages/gradle/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/grandr/package.py b/var/spack/repos/builtin/packages/grandr/package.py index da42ad807d..233b97b9b9 100644 --- a/var/spack/repos/builtin/packages/grandr/package.py +++ b/var/spack/repos/builtin/packages/grandr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/graph500/package.py b/var/spack/repos/builtin/packages/graph500/package.py index 652138d6c2..c689cba2ad 100644 --- a/var/spack/repos/builtin/packages/graph500/package.py +++ b/var/spack/repos/builtin/packages/graph500/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/graphicsmagick/package.py b/var/spack/repos/builtin/packages/graphicsmagick/package.py index 5240153df4..295ba9034b 100644 --- a/var/spack/repos/builtin/packages/graphicsmagick/package.py +++ b/var/spack/repos/builtin/packages/graphicsmagick/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/graphlib/package.py b/var/spack/repos/builtin/packages/graphlib/package.py index e2ba37d9f2..d5b50acfe1 100644 --- a/var/spack/repos/builtin/packages/graphlib/package.py +++ b/var/spack/repos/builtin/packages/graphlib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/graphmap/package.py b/var/spack/repos/builtin/packages/graphmap/package.py index 21a461e663..25af904306 100644 --- a/var/spack/repos/builtin/packages/graphmap/package.py +++ b/var/spack/repos/builtin/packages/graphmap/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/graphviz/package.py b/var/spack/repos/builtin/packages/graphviz/package.py index 5ff3aabc77..efb32328fa 100644 --- a/var/spack/repos/builtin/packages/graphviz/package.py +++ b/var/spack/repos/builtin/packages/graphviz/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os import sys diff --git a/var/spack/repos/builtin/packages/grass/package.py b/var/spack/repos/builtin/packages/grass/package.py index d2b952ff01..a703c09327 100644 --- a/var/spack/repos/builtin/packages/grass/package.py +++ b/var/spack/repos/builtin/packages/grass/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/grib-api/package.py b/var/spack/repos/builtin/packages/grib-api/package.py index f38bdeb057..dd782a97d1 100644 --- a/var/spack/repos/builtin/packages/grib-api/package.py +++ b/var/spack/repos/builtin/packages/grib-api/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/grnboost/package.py b/var/spack/repos/builtin/packages/grnboost/package.py index b1aedc05ba..e2e8fcaae0 100644 --- a/var/spack/repos/builtin/packages/grnboost/package.py +++ b/var/spack/repos/builtin/packages/grnboost/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/groff/package.py b/var/spack/repos/builtin/packages/groff/package.py index 365be697e4..d8854c71c6 100644 --- a/var/spack/repos/builtin/packages/groff/package.py +++ b/var/spack/repos/builtin/packages/groff/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gromacs/package.py b/var/spack/repos/builtin/packages/gromacs/package.py index b934b5bb47..f51aa9d7d7 100644 --- a/var/spack/repos/builtin/packages/gromacs/package.py +++ b/var/spack/repos/builtin/packages/gromacs/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gsl/package.py b/var/spack/repos/builtin/packages/gsl/package.py index 0eb95c4576..691c02b7e9 100644 --- a/var/spack/repos/builtin/packages/gsl/package.py +++ b/var/spack/repos/builtin/packages/gsl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gslib/package.py b/var/spack/repos/builtin/packages/gslib/package.py index aca4d55256..f11ed17a56 100644 --- a/var/spack/repos/builtin/packages/gslib/package.py +++ b/var/spack/repos/builtin/packages/gslib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gtkmm/package.py b/var/spack/repos/builtin/packages/gtkmm/package.py index 6d06bd14a1..911d1e7ebf 100644 --- a/var/spack/repos/builtin/packages/gtkmm/package.py +++ b/var/spack/repos/builtin/packages/gtkmm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gtkorvo-atl/package.py b/var/spack/repos/builtin/packages/gtkorvo-atl/package.py index 7dcac0ccf9..1dad459cb3 100644 --- a/var/spack/repos/builtin/packages/gtkorvo-atl/package.py +++ b/var/spack/repos/builtin/packages/gtkorvo-atl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gtkorvo-cercs-env/package.py b/var/spack/repos/builtin/packages/gtkorvo-cercs-env/package.py index e6a741bb4f..a042dd154b 100644 --- a/var/spack/repos/builtin/packages/gtkorvo-cercs-env/package.py +++ b/var/spack/repos/builtin/packages/gtkorvo-cercs-env/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gtkorvo-dill/package.py b/var/spack/repos/builtin/packages/gtkorvo-dill/package.py index a39c88ba25..6af9ebc9ab 100644 --- a/var/spack/repos/builtin/packages/gtkorvo-dill/package.py +++ b/var/spack/repos/builtin/packages/gtkorvo-dill/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gtkorvo-enet/package.py b/var/spack/repos/builtin/packages/gtkorvo-enet/package.py index bf9a7c6c50..5c9148d471 100644 --- a/var/spack/repos/builtin/packages/gtkorvo-enet/package.py +++ b/var/spack/repos/builtin/packages/gtkorvo-enet/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gtkplus/package.py b/var/spack/repos/builtin/packages/gtkplus/package.py index 844a2e1749..d7ce1c57d6 100644 --- a/var/spack/repos/builtin/packages/gtkplus/package.py +++ b/var/spack/repos/builtin/packages/gtkplus/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gts/package.py b/var/spack/repos/builtin/packages/gts/package.py index ce9f3d15fe..d19c539f7e 100644 --- a/var/spack/repos/builtin/packages/gts/package.py +++ b/var/spack/repos/builtin/packages/gts/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/guidance/package.py b/var/spack/repos/builtin/packages/guidance/package.py index 3059c871ee..4246b2b49e 100644 --- a/var/spack/repos/builtin/packages/guidance/package.py +++ b/var/spack/repos/builtin/packages/guidance/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob diff --git a/var/spack/repos/builtin/packages/guile/package.py b/var/spack/repos/builtin/packages/guile/package.py index 69fe8f1bf4..6c02e3f1aa 100644 --- a/var/spack/repos/builtin/packages/guile/package.py +++ b/var/spack/repos/builtin/packages/guile/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/gurobi/package.py b/var/spack/repos/builtin/packages/gurobi/package.py index 9720313b7e..3c9747aef4 100644 --- a/var/spack/repos/builtin/packages/gurobi/package.py +++ b/var/spack/repos/builtin/packages/gurobi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/h5hut/package.py b/var/spack/repos/builtin/packages/h5hut/package.py index c476a6535a..9b34183bff 100644 --- a/var/spack/repos/builtin/packages/h5hut/package.py +++ b/var/spack/repos/builtin/packages/h5hut/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/h5part/package.py b/var/spack/repos/builtin/packages/h5part/package.py index f105a26831..957e9dcf89 100644 --- a/var/spack/repos/builtin/packages/h5part/package.py +++ b/var/spack/repos/builtin/packages/h5part/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/h5utils/package.py b/var/spack/repos/builtin/packages/h5utils/package.py index 5aff73e267..946a494cbb 100644 --- a/var/spack/repos/builtin/packages/h5utils/package.py +++ b/var/spack/repos/builtin/packages/h5utils/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/h5z-zfp/package.py b/var/spack/repos/builtin/packages/h5z-zfp/package.py index 07c200e523..943c874e4b 100644 --- a/var/spack/repos/builtin/packages/h5z-zfp/package.py +++ b/var/spack/repos/builtin/packages/h5z-zfp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/hacckernels/package.py b/var/spack/repos/builtin/packages/hacckernels/package.py index a8d60c4e37..d93dc42e7d 100644 --- a/var/spack/repos/builtin/packages/hacckernels/package.py +++ b/var/spack/repos/builtin/packages/hacckernels/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/hadoop/package.py b/var/spack/repos/builtin/packages/hadoop/package.py index 59dbded641..e581deb868 100644 --- a/var/spack/repos/builtin/packages/hadoop/package.py +++ b/var/spack/repos/builtin/packages/hadoop/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/halc/package.py b/var/spack/repos/builtin/packages/halc/package.py index 2e9b50779a..7d2e76be75 100644 --- a/var/spack/repos/builtin/packages/halc/package.py +++ b/var/spack/repos/builtin/packages/halc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/hapcut2/package.py b/var/spack/repos/builtin/packages/hapcut2/package.py index 35580bfe15..60596b4185 100644 --- a/var/spack/repos/builtin/packages/hapcut2/package.py +++ b/var/spack/repos/builtin/packages/hapcut2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/hapdip/package.py b/var/spack/repos/builtin/packages/hapdip/package.py index 15a5615822..92673b2b34 100644 --- a/var/spack/repos/builtin/packages/hapdip/package.py +++ b/var/spack/repos/builtin/packages/hapdip/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/haploview/package.py b/var/spack/repos/builtin/packages/haploview/package.py index faa0c8976a..dd6acefad7 100644 --- a/var/spack/repos/builtin/packages/haploview/package.py +++ b/var/spack/repos/builtin/packages/haploview/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os.path diff --git a/var/spack/repos/builtin/packages/harfbuzz/package.py b/var/spack/repos/builtin/packages/harfbuzz/package.py index 3624bc57b2..5a6ded2e77 100644 --- a/var/spack/repos/builtin/packages/harfbuzz/package.py +++ b/var/spack/repos/builtin/packages/harfbuzz/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/harminv/package.py b/var/spack/repos/builtin/packages/harminv/package.py index ef38a4d9b8..f3aaf33bdd 100644 --- a/var/spack/repos/builtin/packages/harminv/package.py +++ b/var/spack/repos/builtin/packages/harminv/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/hdf/package.py b/var/spack/repos/builtin/packages/hdf/package.py index 41d327deed..3f5be4b95f 100644 --- a/var/spack/repos/builtin/packages/hdf/package.py +++ b/var/spack/repos/builtin/packages/hdf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/hdf5-blosc/package.py b/var/spack/repos/builtin/packages/hdf5-blosc/package.py index 0e0d6dd352..c79ed76c1b 100644 --- a/var/spack/repos/builtin/packages/hdf5-blosc/package.py +++ b/var/spack/repos/builtin/packages/hdf5-blosc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import shutil import sys diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index ce747eee86..4f2b9e24d1 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import shutil import sys diff --git a/var/spack/repos/builtin/packages/help2man/package.py b/var/spack/repos/builtin/packages/help2man/package.py index 977f0394ee..39ad9037f0 100644 --- a/var/spack/repos/builtin/packages/help2man/package.py +++ b/var/spack/repos/builtin/packages/help2man/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/hepmc/package.py b/var/spack/repos/builtin/packages/hepmc/package.py index 7b06eb81b5..16b4c707f5 100644 --- a/var/spack/repos/builtin/packages/hepmc/package.py +++ b/var/spack/repos/builtin/packages/hepmc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/heppdt/package.py b/var/spack/repos/builtin/packages/heppdt/package.py index fdeaaa8997..5933317c50 100644 --- a/var/spack/repos/builtin/packages/heppdt/package.py +++ b/var/spack/repos/builtin/packages/heppdt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/hic-pro/package.py b/var/spack/repos/builtin/packages/hic-pro/package.py index e96243912d..6cb89d8839 100644 --- a/var/spack/repos/builtin/packages/hic-pro/package.py +++ b/var/spack/repos/builtin/packages/hic-pro/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/highfive/package.py b/var/spack/repos/builtin/packages/highfive/package.py index adef78cab7..cbd57f98fc 100644 --- a/var/spack/repos/builtin/packages/highfive/package.py +++ b/var/spack/repos/builtin/packages/highfive/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/highwayhash/package.py b/var/spack/repos/builtin/packages/highwayhash/package.py index 7ab78df158..240faadf13 100644 --- a/var/spack/repos/builtin/packages/highwayhash/package.py +++ b/var/spack/repos/builtin/packages/highwayhash/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from glob import glob import os diff --git a/var/spack/repos/builtin/packages/hiop/package.py b/var/spack/repos/builtin/packages/hiop/package.py index 3cb55747fc..cc2b07a822 100644 --- a/var/spack/repos/builtin/packages/hiop/package.py +++ b/var/spack/repos/builtin/packages/hiop/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/hisat2/package.py b/var/spack/repos/builtin/packages/hisat2/package.py index ea123a6b85..34fbf6e910 100644 --- a/var/spack/repos/builtin/packages/hisat2/package.py +++ b/var/spack/repos/builtin/packages/hisat2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob import os.path diff --git a/var/spack/repos/builtin/packages/hisea/package.py b/var/spack/repos/builtin/packages/hisea/package.py index 5910b91f8b..f2d215242b 100644 --- a/var/spack/repos/builtin/packages/hisea/package.py +++ b/var/spack/repos/builtin/packages/hisea/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/hmmer/package.py b/var/spack/repos/builtin/packages/hmmer/package.py index 1eea95c75f..2b9b045a00 100644 --- a/var/spack/repos/builtin/packages/hmmer/package.py +++ b/var/spack/repos/builtin/packages/hmmer/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/hoomd-blue/package.py b/var/spack/repos/builtin/packages/hoomd-blue/package.py index c8808549dc..b00843bcc0 100644 --- a/var/spack/repos/builtin/packages/hoomd-blue/package.py +++ b/var/spack/repos/builtin/packages/hoomd-blue/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/hpccg/package.py b/var/spack/repos/builtin/packages/hpccg/package.py index 47cbb3cbe0..1a6256fe7c 100644 --- a/var/spack/repos/builtin/packages/hpccg/package.py +++ b/var/spack/repos/builtin/packages/hpccg/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/hpctoolkit-externals/package.py b/var/spack/repos/builtin/packages/hpctoolkit-externals/package.py index 6b836eb838..1c7c7c4622 100644 --- a/var/spack/repos/builtin/packages/hpctoolkit-externals/package.py +++ b/var/spack/repos/builtin/packages/hpctoolkit-externals/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/hpctoolkit/package.py b/var/spack/repos/builtin/packages/hpctoolkit/package.py index 5943b7f2d2..0f4d188d4f 100644 --- a/var/spack/repos/builtin/packages/hpctoolkit/package.py +++ b/var/spack/repos/builtin/packages/hpctoolkit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/hpgmg/package.py b/var/spack/repos/builtin/packages/hpgmg/package.py index 5f6a6e37dd..e4a533a024 100644 --- a/var/spack/repos/builtin/packages/hpgmg/package.py +++ b/var/spack/repos/builtin/packages/hpgmg/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/hpl/package.py b/var/spack/repos/builtin/packages/hpl/package.py index 71b07c638d..94fc2d5fb9 100644 --- a/var/spack/repos/builtin/packages/hpl/package.py +++ b/var/spack/repos/builtin/packages/hpl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os import platform diff --git a/var/spack/repos/builtin/packages/hpx/package.py b/var/spack/repos/builtin/packages/hpx/package.py index 2c5e0c1402..9f4b3c6113 100644 --- a/var/spack/repos/builtin/packages/hpx/package.py +++ b/var/spack/repos/builtin/packages/hpx/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/hpx5/package.py b/var/spack/repos/builtin/packages/hpx5/package.py index 0b2270dad0..d292f2c360 100644 --- a/var/spack/repos/builtin/packages/hpx5/package.py +++ b/var/spack/repos/builtin/packages/hpx5/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/hsakmt/package.py b/var/spack/repos/builtin/packages/hsakmt/package.py index ea6726d424..d599dc13f5 100644 --- a/var/spack/repos/builtin/packages/hsakmt/package.py +++ b/var/spack/repos/builtin/packages/hsakmt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/hstr/package.py b/var/spack/repos/builtin/packages/hstr/package.py index b726e94442..e8ab7fadb6 100644 --- a/var/spack/repos/builtin/packages/hstr/package.py +++ b/var/spack/repos/builtin/packages/hstr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/htop/package.py b/var/spack/repos/builtin/packages/htop/package.py index e9ea8ed9d1..f6ae2c04b2 100644 --- a/var/spack/repos/builtin/packages/htop/package.py +++ b/var/spack/repos/builtin/packages/htop/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/htslib/package.py b/var/spack/repos/builtin/packages/htslib/package.py index d2318b6e0f..c223ffc359 100644 --- a/var/spack/repos/builtin/packages/htslib/package.py +++ b/var/spack/repos/builtin/packages/htslib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/httpie/package.py b/var/spack/repos/builtin/packages/httpie/package.py index 9cee69fd38..8ac07a61e9 100644 --- a/var/spack/repos/builtin/packages/httpie/package.py +++ b/var/spack/repos/builtin/packages/httpie/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/hub/package.py b/var/spack/repos/builtin/packages/hub/package.py index 1aa13f270d..3595ac6c2e 100644 --- a/var/spack/repos/builtin/packages/hub/package.py +++ b/var/spack/repos/builtin/packages/hub/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/hunspell/package.py b/var/spack/repos/builtin/packages/hunspell/package.py index 67450b6cbf..ed400f3a4d 100644 --- a/var/spack/repos/builtin/packages/hunspell/package.py +++ b/var/spack/repos/builtin/packages/hunspell/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/hwloc/package.py b/var/spack/repos/builtin/packages/hwloc/package.py index 6b3be96a2f..3214496a0e 100644 --- a/var/spack/repos/builtin/packages/hwloc/package.py +++ b/var/spack/repos/builtin/packages/hwloc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/hybpiper/package.py b/var/spack/repos/builtin/packages/hybpiper/package.py index 102d9ed289..fba2f13a2a 100644 --- a/var/spack/repos/builtin/packages/hybpiper/package.py +++ b/var/spack/repos/builtin/packages/hybpiper/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob import os diff --git a/var/spack/repos/builtin/packages/hydra/package.py b/var/spack/repos/builtin/packages/hydra/package.py index 58f94261c6..bcf4665c5d 100644 --- a/var/spack/repos/builtin/packages/hydra/package.py +++ b/var/spack/repos/builtin/packages/hydra/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/hydrogen/package.py b/var/spack/repos/builtin/packages/hydrogen/package.py index cb804e4275..ce2621f34c 100644 --- a/var/spack/repos/builtin/packages/hydrogen/package.py +++ b/var/spack/repos/builtin/packages/hydrogen/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import sys from spack import * diff --git a/var/spack/repos/builtin/packages/hypre/package.py b/var/spack/repos/builtin/packages/hypre/package.py index 1aef3a244c..40ec88ce0e 100644 --- a/var/spack/repos/builtin/packages/hypre/package.py +++ b/var/spack/repos/builtin/packages/hypre/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os import sys diff --git a/var/spack/repos/builtin/packages/i3/package.py b/var/spack/repos/builtin/packages/i3/package.py index 44757b9e29..123fdbb212 100644 --- a/var/spack/repos/builtin/packages/i3/package.py +++ b/var/spack/repos/builtin/packages/i3/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ibmisc/package.py b/var/spack/repos/builtin/packages/ibmisc/package.py index ec8072e461..6a78788ad5 100644 --- a/var/spack/repos/builtin/packages/ibmisc/package.py +++ b/var/spack/repos/builtin/packages/ibmisc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/iceauth/package.py b/var/spack/repos/builtin/packages/iceauth/package.py index 665f0d74d5..41f8f669a6 100644 --- a/var/spack/repos/builtin/packages/iceauth/package.py +++ b/var/spack/repos/builtin/packages/iceauth/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/icedtea/package.py b/var/spack/repos/builtin/packages/icedtea/package.py index 366606cf44..c8a5916c7b 100644 --- a/var/spack/repos/builtin/packages/icedtea/package.py +++ b/var/spack/repos/builtin/packages/icedtea/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/icet/package.py b/var/spack/repos/builtin/packages/icet/package.py index 87e831ea2e..bf1f311d0a 100644 --- a/var/spack/repos/builtin/packages/icet/package.py +++ b/var/spack/repos/builtin/packages/icet/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ico/package.py b/var/spack/repos/builtin/packages/ico/package.py index 47bfce296f..1d7442ddc5 100644 --- a/var/spack/repos/builtin/packages/ico/package.py +++ b/var/spack/repos/builtin/packages/ico/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/icu4c/package.py b/var/spack/repos/builtin/packages/icu4c/package.py index e6a3df465d..78d63b8c3b 100644 --- a/var/spack/repos/builtin/packages/icu4c/package.py +++ b/var/spack/repos/builtin/packages/icu4c/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/id3lib/package.py b/var/spack/repos/builtin/packages/id3lib/package.py index a9315a4df1..23bbc99aef 100644 --- a/var/spack/repos/builtin/packages/id3lib/package.py +++ b/var/spack/repos/builtin/packages/id3lib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/idba/package.py b/var/spack/repos/builtin/packages/idba/package.py index 47b10bf6d8..a7b2a455f7 100644 --- a/var/spack/repos/builtin/packages/idba/package.py +++ b/var/spack/repos/builtin/packages/idba/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/igraph/package.py b/var/spack/repos/builtin/packages/igraph/package.py index ef88274200..35bcb1c87e 100644 --- a/var/spack/repos/builtin/packages/igraph/package.py +++ b/var/spack/repos/builtin/packages/igraph/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/igvtools/package.py b/var/spack/repos/builtin/packages/igvtools/package.py index 410a409d63..8e57a57fb3 100644 --- a/var/spack/repos/builtin/packages/igvtools/package.py +++ b/var/spack/repos/builtin/packages/igvtools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/ilmbase/package.py b/var/spack/repos/builtin/packages/ilmbase/package.py index 4f4a9189a2..996e6bd104 100644 --- a/var/spack/repos/builtin/packages/ilmbase/package.py +++ b/var/spack/repos/builtin/packages/ilmbase/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/image-magick/package.py b/var/spack/repos/builtin/packages/image-magick/package.py index ac3e8cb09d..354a7fd63a 100644 --- a/var/spack/repos/builtin/packages/image-magick/package.py +++ b/var/spack/repos/builtin/packages/image-magick/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/imake/package.py b/var/spack/repos/builtin/packages/imake/package.py index 2439828ae3..47dcefa4e9 100644 --- a/var/spack/repos/builtin/packages/imake/package.py +++ b/var/spack/repos/builtin/packages/imake/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/imp/package.py b/var/spack/repos/builtin/packages/imp/package.py index 28ddc388bc..656e07e7e1 100644 --- a/var/spack/repos/builtin/packages/imp/package.py +++ b/var/spack/repos/builtin/packages/imp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/impute2/package.py b/var/spack/repos/builtin/packages/impute2/package.py index 0563957e6a..41c51a796d 100644 --- a/var/spack/repos/builtin/packages/impute2/package.py +++ b/var/spack/repos/builtin/packages/impute2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/infernal/package.py b/var/spack/repos/builtin/packages/infernal/package.py index 6dbd7c329c..59c2d7ce61 100644 --- a/var/spack/repos/builtin/packages/infernal/package.py +++ b/var/spack/repos/builtin/packages/infernal/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/inputproto/package.py b/var/spack/repos/builtin/packages/inputproto/package.py index 9f3d0a98cf..31d0732aca 100644 --- a/var/spack/repos/builtin/packages/inputproto/package.py +++ b/var/spack/repos/builtin/packages/inputproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/intel-daal/package.py b/var/spack/repos/builtin/packages/intel-daal/package.py index 407f8a7a90..acf84f5021 100644 --- a/var/spack/repos/builtin/packages/intel-daal/package.py +++ b/var/spack/repos/builtin/packages/intel-daal/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/intel-gpu-tools/package.py b/var/spack/repos/builtin/packages/intel-gpu-tools/package.py index ca40f456c1..24b01fb0c6 100644 --- a/var/spack/repos/builtin/packages/intel-gpu-tools/package.py +++ b/var/spack/repos/builtin/packages/intel-gpu-tools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/intel-ipp/package.py b/var/spack/repos/builtin/packages/intel-ipp/package.py index a1b9d440ed..b9bc862882 100644 --- a/var/spack/repos/builtin/packages/intel-ipp/package.py +++ b/var/spack/repos/builtin/packages/intel-ipp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/intel-mkl-dnn/package.py b/var/spack/repos/builtin/packages/intel-mkl-dnn/package.py index 5ca16b7460..72dafd7572 100644 --- a/var/spack/repos/builtin/packages/intel-mkl-dnn/package.py +++ b/var/spack/repos/builtin/packages/intel-mkl-dnn/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/intel-mkl/package.py b/var/spack/repos/builtin/packages/intel-mkl/package.py index 764d6bacef..e11b4c8e47 100644 --- a/var/spack/repos/builtin/packages/intel-mkl/package.py +++ b/var/spack/repos/builtin/packages/intel-mkl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import sys from spack import * diff --git a/var/spack/repos/builtin/packages/intel-mpi/package.py b/var/spack/repos/builtin/packages/intel-mpi/package.py index ff6ed1ac9e..c3ac5b68be 100644 --- a/var/spack/repos/builtin/packages/intel-mpi/package.py +++ b/var/spack/repos/builtin/packages/intel-mpi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py index 1e493d6b19..666623f154 100644 --- a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py +++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/intel-tbb/package.py b/var/spack/repos/builtin/packages/intel-tbb/package.py index c3a813f782..a6a127ece2 100644 --- a/var/spack/repos/builtin/packages/intel-tbb/package.py +++ b/var/spack/repos/builtin/packages/intel-tbb/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob import inspect diff --git a/var/spack/repos/builtin/packages/intel-xed/package.py b/var/spack/repos/builtin/packages/intel-xed/package.py index 3fe66b9f6f..3469a531fd 100644 --- a/var/spack/repos/builtin/packages/intel-xed/package.py +++ b/var/spack/repos/builtin/packages/intel-xed/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob import os diff --git a/var/spack/repos/builtin/packages/intel/package.py b/var/spack/repos/builtin/packages/intel/package.py index edb4526462..69db3e21a6 100644 --- a/var/spack/repos/builtin/packages/intel/package.py +++ b/var/spack/repos/builtin/packages/intel/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/intltool/package.py b/var/spack/repos/builtin/packages/intltool/package.py index 963843ca5e..dea21ab25a 100644 --- a/var/spack/repos/builtin/packages/intltool/package.py +++ b/var/spack/repos/builtin/packages/intltool/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ior/package.py b/var/spack/repos/builtin/packages/ior/package.py index b909d43471..eee53a9911 100644 --- a/var/spack/repos/builtin/packages/ior/package.py +++ b/var/spack/repos/builtin/packages/ior/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/iozone/package.py b/var/spack/repos/builtin/packages/iozone/package.py index 5a6727aec3..09124c2196 100644 --- a/var/spack/repos/builtin/packages/iozone/package.py +++ b/var/spack/repos/builtin/packages/iozone/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/iperf2/package.py b/var/spack/repos/builtin/packages/iperf2/package.py index a4bd33765d..3e9498ddf1 100644 --- a/var/spack/repos/builtin/packages/iperf2/package.py +++ b/var/spack/repos/builtin/packages/iperf2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/iperf3/package.py b/var/spack/repos/builtin/packages/iperf3/package.py index d2715c05f3..16cf48f157 100644 --- a/var/spack/repos/builtin/packages/iperf3/package.py +++ b/var/spack/repos/builtin/packages/iperf3/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ipopt/package.py b/var/spack/repos/builtin/packages/ipopt/package.py index 200992e82a..64930c5ca7 100644 --- a/var/spack/repos/builtin/packages/ipopt/package.py +++ b/var/spack/repos/builtin/packages/ipopt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/isaac-server/package.py b/var/spack/repos/builtin/packages/isaac-server/package.py index 59e8b8734a..f8451ad443 100644 --- a/var/spack/repos/builtin/packages/isaac-server/package.py +++ b/var/spack/repos/builtin/packages/isaac-server/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/isaac/package.py b/var/spack/repos/builtin/packages/isaac/package.py index 4c853e67cf..c8f3793fc6 100644 --- a/var/spack/repos/builtin/packages/isaac/package.py +++ b/var/spack/repos/builtin/packages/isaac/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/isl/package.py b/var/spack/repos/builtin/packages/isl/package.py index 5ea9881820..3efe4ad051 100644 --- a/var/spack/repos/builtin/packages/isl/package.py +++ b/var/spack/repos/builtin/packages/isl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/itstool/package.py b/var/spack/repos/builtin/packages/itstool/package.py index b46d24e953..b0858df2b9 100644 --- a/var/spack/repos/builtin/packages/itstool/package.py +++ b/var/spack/repos/builtin/packages/itstool/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/itsx/package.py b/var/spack/repos/builtin/packages/itsx/package.py index c1a54db3b6..6d4414db12 100644 --- a/var/spack/repos/builtin/packages/itsx/package.py +++ b/var/spack/repos/builtin/packages/itsx/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/jackcess/package.py b/var/spack/repos/builtin/packages/jackcess/package.py index 62b7279c11..d55357bccf 100644 --- a/var/spack/repos/builtin/packages/jackcess/package.py +++ b/var/spack/repos/builtin/packages/jackcess/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/jags/package.py b/var/spack/repos/builtin/packages/jags/package.py index 1c73025463..0916d85f72 100644 --- a/var/spack/repos/builtin/packages/jags/package.py +++ b/var/spack/repos/builtin/packages/jags/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/jansson/package.py b/var/spack/repos/builtin/packages/jansson/package.py index e9052f83aa..c929eaa865 100644 --- a/var/spack/repos/builtin/packages/jansson/package.py +++ b/var/spack/repos/builtin/packages/jansson/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/jasper/package.py b/var/spack/repos/builtin/packages/jasper/package.py index 3e4bbeb8a5..6b0fc9c866 100644 --- a/var/spack/repos/builtin/packages/jasper/package.py +++ b/var/spack/repos/builtin/packages/jasper/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/jbigkit/package.py b/var/spack/repos/builtin/packages/jbigkit/package.py index 8c3e792507..66dd1b202c 100644 --- a/var/spack/repos/builtin/packages/jbigkit/package.py +++ b/var/spack/repos/builtin/packages/jbigkit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/jchronoss/package.py b/var/spack/repos/builtin/packages/jchronoss/package.py index 1039ed25f6..dc8763b064 100644 --- a/var/spack/repos/builtin/packages/jchronoss/package.py +++ b/var/spack/repos/builtin/packages/jchronoss/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/jdk/package.py b/var/spack/repos/builtin/packages/jdk/package.py index 95e4ce169c..35bd0f7cdc 100644 --- a/var/spack/repos/builtin/packages/jdk/package.py +++ b/var/spack/repos/builtin/packages/jdk/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack.util.prefix import Prefix from spack import * diff --git a/var/spack/repos/builtin/packages/jellyfish/package.py b/var/spack/repos/builtin/packages/jellyfish/package.py index e3c31566c1..a90438d633 100644 --- a/var/spack/repos/builtin/packages/jellyfish/package.py +++ b/var/spack/repos/builtin/packages/jellyfish/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/jemalloc/package.py b/var/spack/repos/builtin/packages/jemalloc/package.py index 5d984e06f5..25d75d5541 100644 --- a/var/spack/repos/builtin/packages/jemalloc/package.py +++ b/var/spack/repos/builtin/packages/jemalloc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/jmol/package.py b/var/spack/repos/builtin/packages/jmol/package.py index cd9cbf1c83..3ea84eb7bc 100644 --- a/var/spack/repos/builtin/packages/jmol/package.py +++ b/var/spack/repos/builtin/packages/jmol/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/jq/package.py b/var/spack/repos/builtin/packages/jq/package.py index be5a31d19d..87db91d292 100644 --- a/var/spack/repos/builtin/packages/jq/package.py +++ b/var/spack/repos/builtin/packages/jq/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/json-c/package.py b/var/spack/repos/builtin/packages/json-c/package.py index ad9b6b6f19..420fe695e2 100644 --- a/var/spack/repos/builtin/packages/json-c/package.py +++ b/var/spack/repos/builtin/packages/json-c/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/json-cwx/package.py b/var/spack/repos/builtin/packages/json-cwx/package.py index 3eefca9b71..2f3d928bbf 100644 --- a/var/spack/repos/builtin/packages/json-cwx/package.py +++ b/var/spack/repos/builtin/packages/json-cwx/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/json-glib/package.py b/var/spack/repos/builtin/packages/json-glib/package.py index 243f77cb19..f69aa247fc 100644 --- a/var/spack/repos/builtin/packages/json-glib/package.py +++ b/var/spack/repos/builtin/packages/json-glib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/jsoncpp/package.py b/var/spack/repos/builtin/packages/jsoncpp/package.py index 3f0fccf47e..f8bf532e53 100644 --- a/var/spack/repos/builtin/packages/jsoncpp/package.py +++ b/var/spack/repos/builtin/packages/jsoncpp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/judy/package.py b/var/spack/repos/builtin/packages/judy/package.py index 1fb81c0ad7..7b17e2e163 100644 --- a/var/spack/repos/builtin/packages/judy/package.py +++ b/var/spack/repos/builtin/packages/judy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/julia/package.py b/var/spack/repos/builtin/packages/julia/package.py index 0d4f5e883c..c9e3a23cb2 100644 --- a/var/spack/repos/builtin/packages/julia/package.py +++ b/var/spack/repos/builtin/packages/julia/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/k8/package.py b/var/spack/repos/builtin/packages/k8/package.py index 801323229d..efdcb06af9 100644 --- a/var/spack/repos/builtin/packages/k8/package.py +++ b/var/spack/repos/builtin/packages/k8/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import sys import os from spack import * diff --git a/var/spack/repos/builtin/packages/kahip/package.py b/var/spack/repos/builtin/packages/kahip/package.py index 6b3d8c4441..29c6adae77 100644 --- a/var/spack/repos/builtin/packages/kahip/package.py +++ b/var/spack/repos/builtin/packages/kahip/package.py @@ -1,28 +1,8 @@ -############################################################################## -# Copyright (c) 2017 Christian Schulz -# Karlsruhe Institute of Technology (KIT), Karlsruhe, Germany +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is released as part of Spack under the LGPL license -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE file for the LLNL notice and LGPL. -# -# License -# ------- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/kaiju/package.py b/var/spack/repos/builtin/packages/kaiju/package.py index e77e3f529d..621c81969c 100644 --- a/var/spack/repos/builtin/packages/kaiju/package.py +++ b/var/spack/repos/builtin/packages/kaiju/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/kaks-calculator/package.py b/var/spack/repos/builtin/packages/kaks-calculator/package.py index 44f6e7bb53..f9244acc3b 100644 --- a/var/spack/repos/builtin/packages/kaks-calculator/package.py +++ b/var/spack/repos/builtin/packages/kaks-calculator/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/kaldi/package.py b/var/spack/repos/builtin/packages/kaldi/package.py index 7dbe7d9a3b..6b3457f12a 100644 --- a/var/spack/repos/builtin/packages/kaldi/package.py +++ b/var/spack/repos/builtin/packages/kaldi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from os.path import join from fnmatch import fnmatch diff --git a/var/spack/repos/builtin/packages/kallisto/package.py b/var/spack/repos/builtin/packages/kallisto/package.py index 60266b7217..c537ca6ad4 100644 --- a/var/spack/repos/builtin/packages/kallisto/package.py +++ b/var/spack/repos/builtin/packages/kallisto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/kbproto/package.py b/var/spack/repos/builtin/packages/kbproto/package.py index a820c28b75..05b6f5e665 100644 --- a/var/spack/repos/builtin/packages/kbproto/package.py +++ b/var/spack/repos/builtin/packages/kbproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/kdiff3/package.py b/var/spack/repos/builtin/packages/kdiff3/package.py index 39f384641b..93f1e097fd 100644 --- a/var/spack/repos/builtin/packages/kdiff3/package.py +++ b/var/spack/repos/builtin/packages/kdiff3/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/kealib/package.py b/var/spack/repos/builtin/packages/kealib/package.py index 79a61c2e62..92ca45f5ba 100644 --- a/var/spack/repos/builtin/packages/kealib/package.py +++ b/var/spack/repos/builtin/packages/kealib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/kentutils/package.py b/var/spack/repos/builtin/packages/kentutils/package.py index c66925a088..11680cecec 100644 --- a/var/spack/repos/builtin/packages/kentutils/package.py +++ b/var/spack/repos/builtin/packages/kentutils/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/kibana/package.py b/var/spack/repos/builtin/packages/kibana/package.py index f483940fbd..c47e75bd5b 100644 --- a/var/spack/repos/builtin/packages/kibana/package.py +++ b/var/spack/repos/builtin/packages/kibana/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/kim-api/package.py b/var/spack/repos/builtin/packages/kim-api/package.py index b24e46bf3b..f8141813f1 100644 --- a/var/spack/repos/builtin/packages/kim-api/package.py +++ b/var/spack/repos/builtin/packages/kim-api/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/kmergenie/package.py b/var/spack/repos/builtin/packages/kmergenie/package.py index 031eb15964..e3c122bdad 100644 --- a/var/spack/repos/builtin/packages/kmergenie/package.py +++ b/var/spack/repos/builtin/packages/kmergenie/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/kokkos/package.py b/var/spack/repos/builtin/packages/kokkos/package.py index 848be225c5..06c408d730 100644 --- a/var/spack/repos/builtin/packages/kokkos/package.py +++ b/var/spack/repos/builtin/packages/kokkos/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/kraken/package.py b/var/spack/repos/builtin/packages/kraken/package.py index 4039c426b8..4c32e153da 100644 --- a/var/spack/repos/builtin/packages/kraken/package.py +++ b/var/spack/repos/builtin/packages/kraken/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob import os diff --git a/var/spack/repos/builtin/packages/krb5/package.py b/var/spack/repos/builtin/packages/krb5/package.py index 3930adf7d8..70c7b4aac4 100644 --- a/var/spack/repos/builtin/packages/krb5/package.py +++ b/var/spack/repos/builtin/packages/krb5/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/krims/package.py b/var/spack/repos/builtin/packages/krims/package.py index 1c6258f0f0..fe40186d21 100644 --- a/var/spack/repos/builtin/packages/krims/package.py +++ b/var/spack/repos/builtin/packages/krims/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/kripke/package.py b/var/spack/repos/builtin/packages/kripke/package.py index ec2a9af1ac..c8614d933c 100644 --- a/var/spack/repos/builtin/packages/kripke/package.py +++ b/var/spack/repos/builtin/packages/kripke/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/kvasir-mpl/package.py b/var/spack/repos/builtin/packages/kvasir-mpl/package.py index 2a67665fd8..7561fc17cc 100644 --- a/var/spack/repos/builtin/packages/kvasir-mpl/package.py +++ b/var/spack/repos/builtin/packages/kvasir-mpl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/kvtree/package.py b/var/spack/repos/builtin/packages/kvtree/package.py index 1e027b498f..8f1c64607d 100644 --- a/var/spack/repos/builtin/packages/kvtree/package.py +++ b/var/spack/repos/builtin/packages/kvtree/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/laghos/package.py b/var/spack/repos/builtin/packages/laghos/package.py index b9ca01689a..deab6d8f0b 100644 --- a/var/spack/repos/builtin/packages/laghos/package.py +++ b/var/spack/repos/builtin/packages/laghos/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/lammps/package.py b/var/spack/repos/builtin/packages/lammps/package.py index 0573317ade..5743d39189 100644 --- a/var/spack/repos/builtin/packages/lammps/package.py +++ b/var/spack/repos/builtin/packages/lammps/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import datetime as dt diff --git a/var/spack/repos/builtin/packages/last/package.py b/var/spack/repos/builtin/packages/last/package.py index d131433947..9e0ac55850 100644 --- a/var/spack/repos/builtin/packages/last/package.py +++ b/var/spack/repos/builtin/packages/last/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/latte/package.py b/var/spack/repos/builtin/packages/latte/package.py index badc09fbb1..fe7b75b8a8 100644 --- a/var/spack/repos/builtin/packages/latte/package.py +++ b/var/spack/repos/builtin/packages/latte/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/launchmon/package.py b/var/spack/repos/builtin/packages/launchmon/package.py index 233c49d5a3..2042d0bb27 100644 --- a/var/spack/repos/builtin/packages/launchmon/package.py +++ b/var/spack/repos/builtin/packages/launchmon/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/lazyten/package.py b/var/spack/repos/builtin/packages/lazyten/package.py index d564732848..20099f549a 100644 --- a/var/spack/repos/builtin/packages/lazyten/package.py +++ b/var/spack/repos/builtin/packages/lazyten/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index ff8d8a3047..112b89e815 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import sys from spack import * diff --git a/var/spack/repos/builtin/packages/lbxproxy/package.py b/var/spack/repos/builtin/packages/lbxproxy/package.py index 970f422c0b..6548807b1a 100644 --- a/var/spack/repos/builtin/packages/lbxproxy/package.py +++ b/var/spack/repos/builtin/packages/lbxproxy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/lcals/package.py b/var/spack/repos/builtin/packages/lcals/package.py index 0659b1710f..e697be8989 100644 --- a/var/spack/repos/builtin/packages/lcals/package.py +++ b/var/spack/repos/builtin/packages/lcals/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import platform diff --git a/var/spack/repos/builtin/packages/lcms/package.py b/var/spack/repos/builtin/packages/lcms/package.py index 8ae900aaa0..e68e96bdc9 100644 --- a/var/spack/repos/builtin/packages/lcms/package.py +++ b/var/spack/repos/builtin/packages/lcms/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ldc-bootstrap/package.py b/var/spack/repos/builtin/packages/ldc-bootstrap/package.py index 43e4b52477..5cff31e35d 100644 --- a/var/spack/repos/builtin/packages/ldc-bootstrap/package.py +++ b/var/spack/repos/builtin/packages/ldc-bootstrap/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ldc/package.py b/var/spack/repos/builtin/packages/ldc/package.py index 04b2639192..26a9d61ccd 100644 --- a/var/spack/repos/builtin/packages/ldc/package.py +++ b/var/spack/repos/builtin/packages/ldc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/legion/package.py b/var/spack/repos/builtin/packages/legion/package.py index 82235a8f86..4ae0cf533c 100644 --- a/var/spack/repos/builtin/packages/legion/package.py +++ b/var/spack/repos/builtin/packages/legion/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/leveldb/package.py b/var/spack/repos/builtin/packages/leveldb/package.py index 2f649f4969..e06f347e23 100644 --- a/var/spack/repos/builtin/packages/leveldb/package.py +++ b/var/spack/repos/builtin/packages/leveldb/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import glob from spack import * diff --git a/var/spack/repos/builtin/packages/lftp/package.py b/var/spack/repos/builtin/packages/lftp/package.py index 8a9ff9e789..1525298538 100644 --- a/var/spack/repos/builtin/packages/lftp/package.py +++ b/var/spack/repos/builtin/packages/lftp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libaec/package.py b/var/spack/repos/builtin/packages/libaec/package.py index b89723131f..2a40d3f602 100644 --- a/var/spack/repos/builtin/packages/libaec/package.py +++ b/var/spack/repos/builtin/packages/libaec/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libaio/package.py b/var/spack/repos/builtin/packages/libaio/package.py index 8165f0c073..56872455cd 100644 --- a/var/spack/repos/builtin/packages/libaio/package.py +++ b/var/spack/repos/builtin/packages/libaio/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libapplewm/package.py b/var/spack/repos/builtin/packages/libapplewm/package.py index 2107a3d27d..373b373487 100644 --- a/var/spack/repos/builtin/packages/libapplewm/package.py +++ b/var/spack/repos/builtin/packages/libapplewm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libarchive/package.py b/var/spack/repos/builtin/packages/libarchive/package.py index 197141eaf6..08c743e724 100644 --- a/var/spack/repos/builtin/packages/libarchive/package.py +++ b/var/spack/repos/builtin/packages/libarchive/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libassuan/package.py b/var/spack/repos/builtin/packages/libassuan/package.py index dedc312102..7f28942a53 100644 --- a/var/spack/repos/builtin/packages/libassuan/package.py +++ b/var/spack/repos/builtin/packages/libassuan/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libatomic-ops/package.py b/var/spack/repos/builtin/packages/libatomic-ops/package.py index d312d2306c..a629eab02d 100644 --- a/var/spack/repos/builtin/packages/libatomic-ops/package.py +++ b/var/spack/repos/builtin/packages/libatomic-ops/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libbeagle/package.py b/var/spack/repos/builtin/packages/libbeagle/package.py index 1678e01939..a4f9352e72 100644 --- a/var/spack/repos/builtin/packages/libbeagle/package.py +++ b/var/spack/repos/builtin/packages/libbeagle/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libbeato/package.py b/var/spack/repos/builtin/packages/libbeato/package.py index b553794c50..0cc0a19a13 100644 --- a/var/spack/repos/builtin/packages/libbeato/package.py +++ b/var/spack/repos/builtin/packages/libbeato/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libbsd/package.py b/var/spack/repos/builtin/packages/libbsd/package.py index f1c8d9d0d7..4587d29e1f 100644 --- a/var/spack/repos/builtin/packages/libbsd/package.py +++ b/var/spack/repos/builtin/packages/libbsd/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libbson/package.py b/var/spack/repos/builtin/packages/libbson/package.py index 6876d1c7f7..92f5a26f14 100644 --- a/var/spack/repos/builtin/packages/libbson/package.py +++ b/var/spack/repos/builtin/packages/libbson/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libcanberra/package.py b/var/spack/repos/builtin/packages/libcanberra/package.py index b8779b077c..6c6fd99ae1 100644 --- a/var/spack/repos/builtin/packages/libcanberra/package.py +++ b/var/spack/repos/builtin/packages/libcanberra/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libcap/package.py b/var/spack/repos/builtin/packages/libcap/package.py index 63c36bf6a6..234c1846b4 100644 --- a/var/spack/repos/builtin/packages/libcap/package.py +++ b/var/spack/repos/builtin/packages/libcap/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libceed/package.py b/var/spack/repos/builtin/packages/libceed/package.py index c2a3e3676d..54bb7b495f 100644 --- a/var/spack/repos/builtin/packages/libceed/package.py +++ b/var/spack/repos/builtin/packages/libceed/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libcerf/package.py b/var/spack/repos/builtin/packages/libcerf/package.py index c40a125de9..ecf35f87f4 100644 --- a/var/spack/repos/builtin/packages/libcerf/package.py +++ b/var/spack/repos/builtin/packages/libcerf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libcheck/package.py b/var/spack/repos/builtin/packages/libcheck/package.py index 0cedfd42c0..19553b8b6a 100644 --- a/var/spack/repos/builtin/packages/libcheck/package.py +++ b/var/spack/repos/builtin/packages/libcheck/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libcint/package.py b/var/spack/repos/builtin/packages/libcint/package.py index e24614876c..1698dbb3ce 100644 --- a/var/spack/repos/builtin/packages/libcint/package.py +++ b/var/spack/repos/builtin/packages/libcint/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libcircle/package.py b/var/spack/repos/builtin/packages/libcircle/package.py index 2170a2668a..5bd6bf719f 100644 --- a/var/spack/repos/builtin/packages/libcircle/package.py +++ b/var/spack/repos/builtin/packages/libcircle/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libconfig/package.py b/var/spack/repos/builtin/packages/libconfig/package.py index b4a4927d61..9dea0cd4c8 100644 --- a/var/spack/repos/builtin/packages/libconfig/package.py +++ b/var/spack/repos/builtin/packages/libconfig/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libcroco/package.py b/var/spack/repos/builtin/packages/libcroco/package.py index 5ad2135f36..eefc188457 100644 --- a/var/spack/repos/builtin/packages/libcroco/package.py +++ b/var/spack/repos/builtin/packages/libcroco/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libctl/package.py b/var/spack/repos/builtin/packages/libctl/package.py index 4c46eac1df..ae68dc5bef 100644 --- a/var/spack/repos/builtin/packages/libctl/package.py +++ b/var/spack/repos/builtin/packages/libctl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libdivsufsort/package.py b/var/spack/repos/builtin/packages/libdivsufsort/package.py index a9d49743be..2ac8d6f65e 100644 --- a/var/spack/repos/builtin/packages/libdivsufsort/package.py +++ b/var/spack/repos/builtin/packages/libdivsufsort/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libdmx/package.py b/var/spack/repos/builtin/packages/libdmx/package.py index 47c1cd64af..9514dc9f00 100644 --- a/var/spack/repos/builtin/packages/libdmx/package.py +++ b/var/spack/repos/builtin/packages/libdmx/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libdrm/package.py b/var/spack/repos/builtin/packages/libdrm/package.py index e022e7acd6..ca4e26577c 100644 --- a/var/spack/repos/builtin/packages/libdrm/package.py +++ b/var/spack/repos/builtin/packages/libdrm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/libdwarf/package.py b/var/spack/repos/builtin/packages/libdwarf/package.py index 7fa23300cf..a473b2c83a 100644 --- a/var/spack/repos/builtin/packages/libdwarf/package.py +++ b/var/spack/repos/builtin/packages/libdwarf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys import os diff --git a/var/spack/repos/builtin/packages/libedit/package.py b/var/spack/repos/builtin/packages/libedit/package.py index 0f6664a728..b253397ee4 100644 --- a/var/spack/repos/builtin/packages/libedit/package.py +++ b/var/spack/repos/builtin/packages/libedit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libelf/package.py b/var/spack/repos/builtin/packages/libelf/package.py index 06901d3bfe..b843966310 100644 --- a/var/spack/repos/builtin/packages/libelf/package.py +++ b/var/spack/repos/builtin/packages/libelf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libemos/package.py b/var/spack/repos/builtin/packages/libemos/package.py index 0e9c337e29..02d953c4ab 100644 --- a/var/spack/repos/builtin/packages/libemos/package.py +++ b/var/spack/repos/builtin/packages/libemos/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libepoxy/package.py b/var/spack/repos/builtin/packages/libepoxy/package.py index afb9677f69..a8fcb945b1 100644 --- a/var/spack/repos/builtin/packages/libepoxy/package.py +++ b/var/spack/repos/builtin/packages/libepoxy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libev/package.py b/var/spack/repos/builtin/packages/libev/package.py index d824719780..26eec70d3e 100644 --- a/var/spack/repos/builtin/packages/libev/package.py +++ b/var/spack/repos/builtin/packages/libev/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libevent/package.py b/var/spack/repos/builtin/packages/libevent/package.py index ce3302dce0..49cda592fb 100644 --- a/var/spack/repos/builtin/packages/libevent/package.py +++ b/var/spack/repos/builtin/packages/libevent/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libevpath/package.py b/var/spack/repos/builtin/packages/libevpath/package.py index b8ae807afa..b27b8c6b70 100644 --- a/var/spack/repos/builtin/packages/libevpath/package.py +++ b/var/spack/repos/builtin/packages/libevpath/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libfabric/package.py b/var/spack/repos/builtin/packages/libfabric/package.py index 404b1826ee..3644b6205c 100644 --- a/var/spack/repos/builtin/packages/libfabric/package.py +++ b/var/spack/repos/builtin/packages/libfabric/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libffi/package.py b/var/spack/repos/builtin/packages/libffi/package.py index 5ff694dd74..b43eb91619 100644 --- a/var/spack/repos/builtin/packages/libffi/package.py +++ b/var/spack/repos/builtin/packages/libffi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libffs/package.py b/var/spack/repos/builtin/packages/libffs/package.py index 68638251d6..1500777652 100644 --- a/var/spack/repos/builtin/packages/libffs/package.py +++ b/var/spack/repos/builtin/packages/libffs/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libfontenc/package.py b/var/spack/repos/builtin/packages/libfontenc/package.py index e46bedcb9c..579cbf3f9d 100644 --- a/var/spack/repos/builtin/packages/libfontenc/package.py +++ b/var/spack/repos/builtin/packages/libfontenc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libfs/package.py b/var/spack/repos/builtin/packages/libfs/package.py index 97d8295830..ace282f7fb 100644 --- a/var/spack/repos/builtin/packages/libfs/package.py +++ b/var/spack/repos/builtin/packages/libfs/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libgcrypt/package.py b/var/spack/repos/builtin/packages/libgcrypt/package.py index 2a6dc91a46..dbc4bf5022 100644 --- a/var/spack/repos/builtin/packages/libgcrypt/package.py +++ b/var/spack/repos/builtin/packages/libgcrypt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libgd/package.py b/var/spack/repos/builtin/packages/libgd/package.py index 10fb969006..89178e649a 100644 --- a/var/spack/repos/builtin/packages/libgd/package.py +++ b/var/spack/repos/builtin/packages/libgd/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libgeotiff/package.py b/var/spack/repos/builtin/packages/libgeotiff/package.py index e56737ca26..e7a76d2eec 100644 --- a/var/spack/repos/builtin/packages/libgeotiff/package.py +++ b/var/spack/repos/builtin/packages/libgeotiff/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libgit2/package.py b/var/spack/repos/builtin/packages/libgit2/package.py index 6a47db9e06..dfeecb1918 100644 --- a/var/spack/repos/builtin/packages/libgit2/package.py +++ b/var/spack/repos/builtin/packages/libgit2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libgpg-error/package.py b/var/spack/repos/builtin/packages/libgpg-error/package.py index 260154cb31..e094fbf4dc 100644 --- a/var/spack/repos/builtin/packages/libgpg-error/package.py +++ b/var/spack/repos/builtin/packages/libgpg-error/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libgpuarray/package.py b/var/spack/repos/builtin/packages/libgpuarray/package.py index fb5627311f..a9a40b8312 100644 --- a/var/spack/repos/builtin/packages/libgpuarray/package.py +++ b/var/spack/repos/builtin/packages/libgpuarray/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libgridxc/package.py b/var/spack/repos/builtin/packages/libgridxc/package.py index f2db4ab13f..a4d7d3ccdf 100644 --- a/var/spack/repos/builtin/packages/libgridxc/package.py +++ b/var/spack/repos/builtin/packages/libgridxc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libgtextutils/package.py b/var/spack/repos/builtin/packages/libgtextutils/package.py index 1ea3fe3f71..535bb7694e 100644 --- a/var/spack/repos/builtin/packages/libgtextutils/package.py +++ b/var/spack/repos/builtin/packages/libgtextutils/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libharu/package.py b/var/spack/repos/builtin/packages/libharu/package.py index 4c5aeada97..9193de7e96 100644 --- a/var/spack/repos/builtin/packages/libharu/package.py +++ b/var/spack/repos/builtin/packages/libharu/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/libhio/package.py b/var/spack/repos/builtin/packages/libhio/package.py index fec5242d5c..64224b6528 100644 --- a/var/spack/repos/builtin/packages/libhio/package.py +++ b/var/spack/repos/builtin/packages/libhio/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libiberty/package.py b/var/spack/repos/builtin/packages/libiberty/package.py index 3d4fbe66b7..166979d30c 100644 --- a/var/spack/repos/builtin/packages/libiberty/package.py +++ b/var/spack/repos/builtin/packages/libiberty/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libice/package.py b/var/spack/repos/builtin/packages/libice/package.py index fb6f6515d4..501fe81677 100644 --- a/var/spack/repos/builtin/packages/libice/package.py +++ b/var/spack/repos/builtin/packages/libice/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libiconv/package.py b/var/spack/repos/builtin/packages/libiconv/package.py index af3f0bbc1f..b435f19f1e 100644 --- a/var/spack/repos/builtin/packages/libiconv/package.py +++ b/var/spack/repos/builtin/packages/libiconv/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libint/package.py b/var/spack/repos/builtin/packages/libint/package.py index 0b37d0267f..1ea8031dec 100644 --- a/var/spack/repos/builtin/packages/libint/package.py +++ b/var/spack/repos/builtin/packages/libint/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libjpeg-turbo/package.py b/var/spack/repos/builtin/packages/libjpeg-turbo/package.py index a8dfb64d47..e57b8b84d2 100644 --- a/var/spack/repos/builtin/packages/libjpeg-turbo/package.py +++ b/var/spack/repos/builtin/packages/libjpeg-turbo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libjpeg/package.py b/var/spack/repos/builtin/packages/libjpeg/package.py index c3386c5ee1..908b6f6bea 100644 --- a/var/spack/repos/builtin/packages/libjpeg/package.py +++ b/var/spack/repos/builtin/packages/libjpeg/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libksba/package.py b/var/spack/repos/builtin/packages/libksba/package.py index e0c4c9c1f3..48be52968f 100644 --- a/var/spack/repos/builtin/packages/libksba/package.py +++ b/var/spack/repos/builtin/packages/libksba/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/liblbxutil/package.py b/var/spack/repos/builtin/packages/liblbxutil/package.py index ab26a1a9ed..32c49195d3 100644 --- a/var/spack/repos/builtin/packages/liblbxutil/package.py +++ b/var/spack/repos/builtin/packages/liblbxutil/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/liblockfile/package.py b/var/spack/repos/builtin/packages/liblockfile/package.py index 6e6f092edc..1598a026a2 100644 --- a/var/spack/repos/builtin/packages/liblockfile/package.py +++ b/var/spack/repos/builtin/packages/liblockfile/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libmatheval/package.py b/var/spack/repos/builtin/packages/libmatheval/package.py index a37c15e10f..c52a4f7a30 100644 --- a/var/spack/repos/builtin/packages/libmatheval/package.py +++ b/var/spack/repos/builtin/packages/libmatheval/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libmaxminddb/package.py b/var/spack/repos/builtin/packages/libmaxminddb/package.py index 9006bb8f8c..abe154bb01 100644 --- a/var/spack/repos/builtin/packages/libmaxminddb/package.py +++ b/var/spack/repos/builtin/packages/libmaxminddb/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libmesh/package.py b/var/spack/repos/builtin/packages/libmesh/package.py index 40ef632071..2f7eb2c713 100644 --- a/var/spack/repos/builtin/packages/libmesh/package.py +++ b/var/spack/repos/builtin/packages/libmesh/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libmng/package.py b/var/spack/repos/builtin/packages/libmng/package.py index c182a496d7..e4e11c9594 100644 --- a/var/spack/repos/builtin/packages/libmng/package.py +++ b/var/spack/repos/builtin/packages/libmng/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libmongoc/package.py b/var/spack/repos/builtin/packages/libmongoc/package.py index a0455b4ce7..2f1dc4d7f7 100644 --- a/var/spack/repos/builtin/packages/libmongoc/package.py +++ b/var/spack/repos/builtin/packages/libmongoc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libmonitor/package.py b/var/spack/repos/builtin/packages/libmonitor/package.py index db6c755778..314f195af9 100644 --- a/var/spack/repos/builtin/packages/libmonitor/package.py +++ b/var/spack/repos/builtin/packages/libmonitor/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libnbc/package.py b/var/spack/repos/builtin/packages/libnbc/package.py index 17b6a51334..daf7b95c57 100644 --- a/var/spack/repos/builtin/packages/libnbc/package.py +++ b/var/spack/repos/builtin/packages/libnbc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libnl/package.py b/var/spack/repos/builtin/packages/libnl/package.py index 40e82de161..1eabb45108 100644 --- a/var/spack/repos/builtin/packages/libnl/package.py +++ b/var/spack/repos/builtin/packages/libnl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libnova/package.py b/var/spack/repos/builtin/packages/libnova/package.py index 6a5c88aa85..63745e8dd4 100644 --- a/var/spack/repos/builtin/packages/libnova/package.py +++ b/var/spack/repos/builtin/packages/libnova/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libogg/package.py b/var/spack/repos/builtin/packages/libogg/package.py index cced1a39b8..bdb5700cc9 100644 --- a/var/spack/repos/builtin/packages/libogg/package.py +++ b/var/spack/repos/builtin/packages/libogg/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/liboldx/package.py b/var/spack/repos/builtin/packages/liboldx/package.py index 5d11d395fd..210f12a1af 100644 --- a/var/spack/repos/builtin/packages/liboldx/package.py +++ b/var/spack/repos/builtin/packages/liboldx/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libpcap/package.py b/var/spack/repos/builtin/packages/libpcap/package.py index 4be601ebeb..5956353568 100644 --- a/var/spack/repos/builtin/packages/libpcap/package.py +++ b/var/spack/repos/builtin/packages/libpcap/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libpciaccess/package.py b/var/spack/repos/builtin/packages/libpciaccess/package.py index 25616f8e55..ad30ebd082 100644 --- a/var/spack/repos/builtin/packages/libpciaccess/package.py +++ b/var/spack/repos/builtin/packages/libpciaccess/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libpfm4/package.py b/var/spack/repos/builtin/packages/libpfm4/package.py index 44f710003d..32d72371b9 100644 --- a/var/spack/repos/builtin/packages/libpfm4/package.py +++ b/var/spack/repos/builtin/packages/libpfm4/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libpipeline/package.py b/var/spack/repos/builtin/packages/libpipeline/package.py index 5128162998..b5528d7dc3 100644 --- a/var/spack/repos/builtin/packages/libpipeline/package.py +++ b/var/spack/repos/builtin/packages/libpipeline/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libpng/package.py b/var/spack/repos/builtin/packages/libpng/package.py index c5178f1b4a..e9e9d9e56f 100644 --- a/var/spack/repos/builtin/packages/libpng/package.py +++ b/var/spack/repos/builtin/packages/libpng/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libpsl/package.py b/var/spack/repos/builtin/packages/libpsl/package.py index 61aff957c2..88d843bb1e 100644 --- a/var/spack/repos/builtin/packages/libpsl/package.py +++ b/var/spack/repos/builtin/packages/libpsl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libpthread-stubs/package.py b/var/spack/repos/builtin/packages/libpthread-stubs/package.py index 5f4b8ba30f..1cc977316b 100644 --- a/var/spack/repos/builtin/packages/libpthread-stubs/package.py +++ b/var/spack/repos/builtin/packages/libpthread-stubs/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libquo/package.py b/var/spack/repos/builtin/packages/libquo/package.py index c25bdf56a6..4677798391 100644 --- a/var/spack/repos/builtin/packages/libquo/package.py +++ b/var/spack/repos/builtin/packages/libquo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/librom/package.py b/var/spack/repos/builtin/packages/librom/package.py index 9994184557..e00792e777 100644 --- a/var/spack/repos/builtin/packages/librom/package.py +++ b/var/spack/repos/builtin/packages/librom/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob diff --git a/var/spack/repos/builtin/packages/libsharp/package.py b/var/spack/repos/builtin/packages/libsharp/package.py index 54d7296400..a80eb7f58f 100644 --- a/var/spack/repos/builtin/packages/libsharp/package.py +++ b/var/spack/repos/builtin/packages/libsharp/package.py @@ -1,27 +1,7 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * diff --git a/var/spack/repos/builtin/packages/libshm/package.py b/var/spack/repos/builtin/packages/libshm/package.py index 7ac2fcea03..3e52739131 100644 --- a/var/spack/repos/builtin/packages/libshm/package.py +++ b/var/spack/repos/builtin/packages/libshm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libsigcpp/package.py b/var/spack/repos/builtin/packages/libsigcpp/package.py index 9669b1e491..32a3674fd6 100644 --- a/var/spack/repos/builtin/packages/libsigcpp/package.py +++ b/var/spack/repos/builtin/packages/libsigcpp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libsigsegv/package.py b/var/spack/repos/builtin/packages/libsigsegv/package.py index 70bf343458..68c88a11aa 100644 --- a/var/spack/repos/builtin/packages/libsigsegv/package.py +++ b/var/spack/repos/builtin/packages/libsigsegv/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libsm/package.py b/var/spack/repos/builtin/packages/libsm/package.py index 35c4456399..50e0fb3fca 100644 --- a/var/spack/repos/builtin/packages/libsm/package.py +++ b/var/spack/repos/builtin/packages/libsm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libsodium/package.py b/var/spack/repos/builtin/packages/libsodium/package.py index 0cdf742491..c7c1a2191a 100644 --- a/var/spack/repos/builtin/packages/libsodium/package.py +++ b/var/spack/repos/builtin/packages/libsodium/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libspatialindex/package.py b/var/spack/repos/builtin/packages/libspatialindex/package.py index 9d8555aa04..9f1a27c60d 100644 --- a/var/spack/repos/builtin/packages/libspatialindex/package.py +++ b/var/spack/repos/builtin/packages/libspatialindex/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libsplash/package.py b/var/spack/repos/builtin/packages/libsplash/package.py index 672a0268d2..37a7c09b0e 100644 --- a/var/spack/repos/builtin/packages/libsplash/package.py +++ b/var/spack/repos/builtin/packages/libsplash/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libssh/package.py b/var/spack/repos/builtin/packages/libssh/package.py index 7a99ebbd65..511e2779a0 100644 --- a/var/spack/repos/builtin/packages/libssh/package.py +++ b/var/spack/repos/builtin/packages/libssh/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libssh2/package.py b/var/spack/repos/builtin/packages/libssh2/package.py index ea30224aa5..bf56dc36b1 100644 --- a/var/spack/repos/builtin/packages/libssh2/package.py +++ b/var/spack/repos/builtin/packages/libssh2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libsvm/package.py b/var/spack/repos/builtin/packages/libsvm/package.py index 72f5144bd0..2c35ef7dce 100644 --- a/var/spack/repos/builtin/packages/libsvm/package.py +++ b/var/spack/repos/builtin/packages/libsvm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libszip/package.py b/var/spack/repos/builtin/packages/libszip/package.py index d98b4cad96..feef66a655 100644 --- a/var/spack/repos/builtin/packages/libszip/package.py +++ b/var/spack/repos/builtin/packages/libszip/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libtermkey/package.py b/var/spack/repos/builtin/packages/libtermkey/package.py index aa672ea950..28a6aa5552 100644 --- a/var/spack/repos/builtin/packages/libtermkey/package.py +++ b/var/spack/repos/builtin/packages/libtermkey/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libtiff/package.py b/var/spack/repos/builtin/packages/libtiff/package.py index 0876b0fc23..3a2efbfb5c 100644 --- a/var/spack/repos/builtin/packages/libtiff/package.py +++ b/var/spack/repos/builtin/packages/libtiff/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libtool/package.py b/var/spack/repos/builtin/packages/libtool/package.py index b2490cc941..37c6f2a876 100644 --- a/var/spack/repos/builtin/packages/libtool/package.py +++ b/var/spack/repos/builtin/packages/libtool/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libunistring/package.py b/var/spack/repos/builtin/packages/libunistring/package.py index ff69c02247..5653a0eba5 100644 --- a/var/spack/repos/builtin/packages/libunistring/package.py +++ b/var/spack/repos/builtin/packages/libunistring/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libunwind/package.py b/var/spack/repos/builtin/packages/libunwind/package.py index c44f902284..201c31af52 100644 --- a/var/spack/repos/builtin/packages/libunwind/package.py +++ b/var/spack/repos/builtin/packages/libunwind/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libuuid/package.py b/var/spack/repos/builtin/packages/libuuid/package.py index 4560621238..e50030468b 100644 --- a/var/spack/repos/builtin/packages/libuuid/package.py +++ b/var/spack/repos/builtin/packages/libuuid/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libuv/package.py b/var/spack/repos/builtin/packages/libuv/package.py index c57cf2592a..5fd2121580 100644 --- a/var/spack/repos/builtin/packages/libuv/package.py +++ b/var/spack/repos/builtin/packages/libuv/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libvorbis/package.py b/var/spack/repos/builtin/packages/libvorbis/package.py index 8a0aab410f..9c526dba0f 100644 --- a/var/spack/repos/builtin/packages/libvorbis/package.py +++ b/var/spack/repos/builtin/packages/libvorbis/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libvterm/package.py b/var/spack/repos/builtin/packages/libvterm/package.py index 586898b8b1..aef6d23d27 100644 --- a/var/spack/repos/builtin/packages/libvterm/package.py +++ b/var/spack/repos/builtin/packages/libvterm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libwebsockets/package.py b/var/spack/repos/builtin/packages/libwebsockets/package.py index 7e0cc05cde..94f0982ba1 100644 --- a/var/spack/repos/builtin/packages/libwebsockets/package.py +++ b/var/spack/repos/builtin/packages/libwebsockets/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libwindowswm/package.py b/var/spack/repos/builtin/packages/libwindowswm/package.py index ce573bd86d..26a5bdb066 100644 --- a/var/spack/repos/builtin/packages/libwindowswm/package.py +++ b/var/spack/repos/builtin/packages/libwindowswm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libx11/package.py b/var/spack/repos/builtin/packages/libx11/package.py index 9a526f394d..8f49422985 100644 --- a/var/spack/repos/builtin/packages/libx11/package.py +++ b/var/spack/repos/builtin/packages/libx11/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxau/package.py b/var/spack/repos/builtin/packages/libxau/package.py index a17da9eb49..4c5acaf985 100644 --- a/var/spack/repos/builtin/packages/libxau/package.py +++ b/var/spack/repos/builtin/packages/libxau/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxaw/package.py b/var/spack/repos/builtin/packages/libxaw/package.py index fed4ab1d9a..327c8c6088 100644 --- a/var/spack/repos/builtin/packages/libxaw/package.py +++ b/var/spack/repos/builtin/packages/libxaw/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxaw3d/package.py b/var/spack/repos/builtin/packages/libxaw3d/package.py index e10e5fa834..85b53d2bfc 100644 --- a/var/spack/repos/builtin/packages/libxaw3d/package.py +++ b/var/spack/repos/builtin/packages/libxaw3d/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxc/package.py b/var/spack/repos/builtin/packages/libxc/package.py index 228ff4c034..bdb5fcabd2 100644 --- a/var/spack/repos/builtin/packages/libxc/package.py +++ b/var/spack/repos/builtin/packages/libxc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxcb/package.py b/var/spack/repos/builtin/packages/libxcb/package.py index 61f92d4f00..91f6d3f648 100644 --- a/var/spack/repos/builtin/packages/libxcb/package.py +++ b/var/spack/repos/builtin/packages/libxcb/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxcomposite/package.py b/var/spack/repos/builtin/packages/libxcomposite/package.py index 1061277ef4..d0a9a2f971 100644 --- a/var/spack/repos/builtin/packages/libxcomposite/package.py +++ b/var/spack/repos/builtin/packages/libxcomposite/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxcursor/package.py b/var/spack/repos/builtin/packages/libxcursor/package.py index 0785e849a8..1160708781 100644 --- a/var/spack/repos/builtin/packages/libxcursor/package.py +++ b/var/spack/repos/builtin/packages/libxcursor/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxdamage/package.py b/var/spack/repos/builtin/packages/libxdamage/package.py index cc6e188e90..bb1684c364 100644 --- a/var/spack/repos/builtin/packages/libxdamage/package.py +++ b/var/spack/repos/builtin/packages/libxdamage/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxdmcp/package.py b/var/spack/repos/builtin/packages/libxdmcp/package.py index 11ac742890..f3fbc87ef4 100644 --- a/var/spack/repos/builtin/packages/libxdmcp/package.py +++ b/var/spack/repos/builtin/packages/libxdmcp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxevie/package.py b/var/spack/repos/builtin/packages/libxevie/package.py index a8d5c9bb42..a1ceb23dbb 100644 --- a/var/spack/repos/builtin/packages/libxevie/package.py +++ b/var/spack/repos/builtin/packages/libxevie/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxext/package.py b/var/spack/repos/builtin/packages/libxext/package.py index 757ff2829f..a4e7b9234c 100644 --- a/var/spack/repos/builtin/packages/libxext/package.py +++ b/var/spack/repos/builtin/packages/libxext/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxfixes/package.py b/var/spack/repos/builtin/packages/libxfixes/package.py index cfea96a067..cfcaa5f466 100644 --- a/var/spack/repos/builtin/packages/libxfixes/package.py +++ b/var/spack/repos/builtin/packages/libxfixes/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxfont/package.py b/var/spack/repos/builtin/packages/libxfont/package.py index c8266bb934..1fef06a9bb 100644 --- a/var/spack/repos/builtin/packages/libxfont/package.py +++ b/var/spack/repos/builtin/packages/libxfont/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxfont2/package.py b/var/spack/repos/builtin/packages/libxfont2/package.py index 2dd4b91762..ee3f0ac054 100644 --- a/var/spack/repos/builtin/packages/libxfont2/package.py +++ b/var/spack/repos/builtin/packages/libxfont2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxfontcache/package.py b/var/spack/repos/builtin/packages/libxfontcache/package.py index 19b16e1c79..a48a671dc1 100644 --- a/var/spack/repos/builtin/packages/libxfontcache/package.py +++ b/var/spack/repos/builtin/packages/libxfontcache/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxft/package.py b/var/spack/repos/builtin/packages/libxft/package.py index d1c44299e4..baa61ba7f0 100644 --- a/var/spack/repos/builtin/packages/libxft/package.py +++ b/var/spack/repos/builtin/packages/libxft/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxi/package.py b/var/spack/repos/builtin/packages/libxi/package.py index f2fc1b7930..3c474aaf4b 100644 --- a/var/spack/repos/builtin/packages/libxi/package.py +++ b/var/spack/repos/builtin/packages/libxi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxinerama/package.py b/var/spack/repos/builtin/packages/libxinerama/package.py index 3d66fbf526..151d74eb79 100644 --- a/var/spack/repos/builtin/packages/libxinerama/package.py +++ b/var/spack/repos/builtin/packages/libxinerama/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxkbcommon/package.py b/var/spack/repos/builtin/packages/libxkbcommon/package.py index 630e8e6303..d864c4b786 100644 --- a/var/spack/repos/builtin/packages/libxkbcommon/package.py +++ b/var/spack/repos/builtin/packages/libxkbcommon/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxkbfile/package.py b/var/spack/repos/builtin/packages/libxkbfile/package.py index e8b42ea30e..e1730005f9 100644 --- a/var/spack/repos/builtin/packages/libxkbfile/package.py +++ b/var/spack/repos/builtin/packages/libxkbfile/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxkbui/package.py b/var/spack/repos/builtin/packages/libxkbui/package.py index f31eb53d73..168fb2fa3d 100644 --- a/var/spack/repos/builtin/packages/libxkbui/package.py +++ b/var/spack/repos/builtin/packages/libxkbui/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxml2/package.py b/var/spack/repos/builtin/packages/libxml2/package.py index 1faffe1351..eb2409ebf2 100644 --- a/var/spack/repos/builtin/packages/libxml2/package.py +++ b/var/spack/repos/builtin/packages/libxml2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxmu/package.py b/var/spack/repos/builtin/packages/libxmu/package.py index 6150697471..854946016b 100644 --- a/var/spack/repos/builtin/packages/libxmu/package.py +++ b/var/spack/repos/builtin/packages/libxmu/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxp/package.py b/var/spack/repos/builtin/packages/libxp/package.py index d0bd0d0462..d5260e0039 100644 --- a/var/spack/repos/builtin/packages/libxp/package.py +++ b/var/spack/repos/builtin/packages/libxp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxpm/package.py b/var/spack/repos/builtin/packages/libxpm/package.py index c49594f5c7..6eb7b81af7 100644 --- a/var/spack/repos/builtin/packages/libxpm/package.py +++ b/var/spack/repos/builtin/packages/libxpm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxpresent/package.py b/var/spack/repos/builtin/packages/libxpresent/package.py index daea00bcf9..3dbc97145e 100644 --- a/var/spack/repos/builtin/packages/libxpresent/package.py +++ b/var/spack/repos/builtin/packages/libxpresent/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxprintapputil/package.py b/var/spack/repos/builtin/packages/libxprintapputil/package.py index 579233bb1c..a1207a4323 100644 --- a/var/spack/repos/builtin/packages/libxprintapputil/package.py +++ b/var/spack/repos/builtin/packages/libxprintapputil/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxprintutil/package.py b/var/spack/repos/builtin/packages/libxprintutil/package.py index 3385e7cd5e..0bbb53d62f 100644 --- a/var/spack/repos/builtin/packages/libxprintutil/package.py +++ b/var/spack/repos/builtin/packages/libxprintutil/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxrandr/package.py b/var/spack/repos/builtin/packages/libxrandr/package.py index 331d213b30..29167ef0a1 100644 --- a/var/spack/repos/builtin/packages/libxrandr/package.py +++ b/var/spack/repos/builtin/packages/libxrandr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxrender/package.py b/var/spack/repos/builtin/packages/libxrender/package.py index 91c2ab76e5..ac46c46ce8 100644 --- a/var/spack/repos/builtin/packages/libxrender/package.py +++ b/var/spack/repos/builtin/packages/libxrender/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxres/package.py b/var/spack/repos/builtin/packages/libxres/package.py index 1ab962e5c8..f5a8758d3d 100644 --- a/var/spack/repos/builtin/packages/libxres/package.py +++ b/var/spack/repos/builtin/packages/libxres/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxscrnsaver/package.py b/var/spack/repos/builtin/packages/libxscrnsaver/package.py index 9062c660bf..242ddbd50f 100644 --- a/var/spack/repos/builtin/packages/libxscrnsaver/package.py +++ b/var/spack/repos/builtin/packages/libxscrnsaver/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxshmfence/package.py b/var/spack/repos/builtin/packages/libxshmfence/package.py index b5ce7cfffd..c0206fa598 100644 --- a/var/spack/repos/builtin/packages/libxshmfence/package.py +++ b/var/spack/repos/builtin/packages/libxshmfence/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxslt/package.py b/var/spack/repos/builtin/packages/libxslt/package.py index c688fa8b87..cdd361928f 100644 --- a/var/spack/repos/builtin/packages/libxslt/package.py +++ b/var/spack/repos/builtin/packages/libxslt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxsmm/package.py b/var/spack/repos/builtin/packages/libxsmm/package.py index 724718cd37..0786ec051c 100644 --- a/var/spack/repos/builtin/packages/libxsmm/package.py +++ b/var/spack/repos/builtin/packages/libxsmm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from glob import glob diff --git a/var/spack/repos/builtin/packages/libxstream/package.py b/var/spack/repos/builtin/packages/libxstream/package.py index 9a9171da59..df27052dbc 100644 --- a/var/spack/repos/builtin/packages/libxstream/package.py +++ b/var/spack/repos/builtin/packages/libxstream/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxt/package.py b/var/spack/repos/builtin/packages/libxt/package.py index 2b09c57de4..65746869a0 100644 --- a/var/spack/repos/builtin/packages/libxt/package.py +++ b/var/spack/repos/builtin/packages/libxt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxtrap/package.py b/var/spack/repos/builtin/packages/libxtrap/package.py index 2d1786b349..9a7f3ac1ff 100644 --- a/var/spack/repos/builtin/packages/libxtrap/package.py +++ b/var/spack/repos/builtin/packages/libxtrap/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxtst/package.py b/var/spack/repos/builtin/packages/libxtst/package.py index 5f773a85f1..2bd5d8cefd 100644 --- a/var/spack/repos/builtin/packages/libxtst/package.py +++ b/var/spack/repos/builtin/packages/libxtst/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxv/package.py b/var/spack/repos/builtin/packages/libxv/package.py index 96f9d7ee0b..773f6eee2a 100644 --- a/var/spack/repos/builtin/packages/libxv/package.py +++ b/var/spack/repos/builtin/packages/libxv/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxvmc/package.py b/var/spack/repos/builtin/packages/libxvmc/package.py index fd565e2550..a3ca179a86 100644 --- a/var/spack/repos/builtin/packages/libxvmc/package.py +++ b/var/spack/repos/builtin/packages/libxvmc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxxf86dga/package.py b/var/spack/repos/builtin/packages/libxxf86dga/package.py index 40c0e39fbb..45ad7a1540 100644 --- a/var/spack/repos/builtin/packages/libxxf86dga/package.py +++ b/var/spack/repos/builtin/packages/libxxf86dga/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxxf86misc/package.py b/var/spack/repos/builtin/packages/libxxf86misc/package.py index 80aef4b137..a8abde1e66 100644 --- a/var/spack/repos/builtin/packages/libxxf86misc/package.py +++ b/var/spack/repos/builtin/packages/libxxf86misc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libxxf86vm/package.py b/var/spack/repos/builtin/packages/libxxf86vm/package.py index 9477058377..4ec5eae3e0 100644 --- a/var/spack/repos/builtin/packages/libxxf86vm/package.py +++ b/var/spack/repos/builtin/packages/libxxf86vm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libyogrt/package.py b/var/spack/repos/builtin/packages/libyogrt/package.py index 1542edde60..5d63913911 100644 --- a/var/spack/repos/builtin/packages/libyogrt/package.py +++ b/var/spack/repos/builtin/packages/libyogrt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/libzip/package.py b/var/spack/repos/builtin/packages/libzip/package.py index 884d990ca0..c40bc283e1 100644 --- a/var/spack/repos/builtin/packages/libzip/package.py +++ b/var/spack/repos/builtin/packages/libzip/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/lighttpd/package.py b/var/spack/repos/builtin/packages/lighttpd/package.py index 92ddc4e007..7824d9392b 100644 --- a/var/spack/repos/builtin/packages/lighttpd/package.py +++ b/var/spack/repos/builtin/packages/lighttpd/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/likwid/package.py b/var/spack/repos/builtin/packages/likwid/package.py index 913886c5eb..c7f8403f47 100644 --- a/var/spack/repos/builtin/packages/likwid/package.py +++ b/var/spack/repos/builtin/packages/likwid/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob import os diff --git a/var/spack/repos/builtin/packages/linkphase3/package.py b/var/spack/repos/builtin/packages/linkphase3/package.py index 25bc77dec3..2aed38c49c 100644 --- a/var/spack/repos/builtin/packages/linkphase3/package.py +++ b/var/spack/repos/builtin/packages/linkphase3/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/linux-headers/package.py b/var/spack/repos/builtin/packages/linux-headers/package.py index 81d1c2f733..1ad8e9687a 100644 --- a/var/spack/repos/builtin/packages/linux-headers/package.py +++ b/var/spack/repos/builtin/packages/linux-headers/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/listres/package.py b/var/spack/repos/builtin/packages/listres/package.py index a41bf06430..62a953fb61 100644 --- a/var/spack/repos/builtin/packages/listres/package.py +++ b/var/spack/repos/builtin/packages/listres/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py b/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py index 1b29312f7e..bc274649f6 100644 --- a/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py +++ b/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index 9999b79136..7e4fba6662 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/lmdb/package.py b/var/spack/repos/builtin/packages/lmdb/package.py index 3553f06369..2900dc6bd6 100644 --- a/var/spack/repos/builtin/packages/lmdb/package.py +++ b/var/spack/repos/builtin/packages/lmdb/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/lmod/package.py b/var/spack/repos/builtin/packages/lmod/package.py index 94a32593b0..f9ba114cf7 100644 --- a/var/spack/repos/builtin/packages/lmod/package.py +++ b/var/spack/repos/builtin/packages/lmod/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from glob import glob diff --git a/var/spack/repos/builtin/packages/lndir/package.py b/var/spack/repos/builtin/packages/lndir/package.py index e9b708496e..35a2517af0 100644 --- a/var/spack/repos/builtin/packages/lndir/package.py +++ b/var/spack/repos/builtin/packages/lndir/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/log4cplus/package.py b/var/spack/repos/builtin/packages/log4cplus/package.py index d401d8eee0..d759f2f6d3 100644 --- a/var/spack/repos/builtin/packages/log4cplus/package.py +++ b/var/spack/repos/builtin/packages/log4cplus/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/log4cxx/package.py b/var/spack/repos/builtin/packages/log4cxx/package.py index f3372b3542..a88e9cccbb 100644 --- a/var/spack/repos/builtin/packages/log4cxx/package.py +++ b/var/spack/repos/builtin/packages/log4cxx/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/loki/package.py b/var/spack/repos/builtin/packages/loki/package.py index 77f3e31f58..1f4cac66f0 100644 --- a/var/spack/repos/builtin/packages/loki/package.py +++ b/var/spack/repos/builtin/packages/loki/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/lordec/package.py b/var/spack/repos/builtin/packages/lordec/package.py index ba20910c05..f02ec371b2 100644 --- a/var/spack/repos/builtin/packages/lordec/package.py +++ b/var/spack/repos/builtin/packages/lordec/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/lrslib/package.py b/var/spack/repos/builtin/packages/lrslib/package.py index aa795f726b..05b7941fd9 100644 --- a/var/spack/repos/builtin/packages/lrslib/package.py +++ b/var/spack/repos/builtin/packages/lrslib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/lrzip/package.py b/var/spack/repos/builtin/packages/lrzip/package.py index 30aa0c40cc..bacc3a2f01 100644 --- a/var/spack/repos/builtin/packages/lrzip/package.py +++ b/var/spack/repos/builtin/packages/lrzip/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/lsof/package.py b/var/spack/repos/builtin/packages/lsof/package.py index 8d63cc1b97..b03afeb004 100644 --- a/var/spack/repos/builtin/packages/lsof/package.py +++ b/var/spack/repos/builtin/packages/lsof/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ltrace/package.py b/var/spack/repos/builtin/packages/ltrace/package.py index e2bec7e38f..3e18f659ee 100644 --- a/var/spack/repos/builtin/packages/ltrace/package.py +++ b/var/spack/repos/builtin/packages/ltrace/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/lua-bitlib/package.py b/var/spack/repos/builtin/packages/lua-bitlib/package.py index 7d1bca3d35..55a04311c2 100644 --- a/var/spack/repos/builtin/packages/lua-bitlib/package.py +++ b/var/spack/repos/builtin/packages/lua-bitlib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/lua-jit/package.py b/var/spack/repos/builtin/packages/lua-jit/package.py index c8b5179b0c..be3d28e4c8 100644 --- a/var/spack/repos/builtin/packages/lua-jit/package.py +++ b/var/spack/repos/builtin/packages/lua-jit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os from spack import * diff --git a/var/spack/repos/builtin/packages/lua-lpeg/package.py b/var/spack/repos/builtin/packages/lua-lpeg/package.py index c62e70af38..1d57d0bc9c 100644 --- a/var/spack/repos/builtin/packages/lua-lpeg/package.py +++ b/var/spack/repos/builtin/packages/lua-lpeg/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/lua-luafilesystem/package.py b/var/spack/repos/builtin/packages/lua-luafilesystem/package.py index 125c4e2890..1611a64b3a 100644 --- a/var/spack/repos/builtin/packages/lua-luafilesystem/package.py +++ b/var/spack/repos/builtin/packages/lua-luafilesystem/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/lua-luaposix/package.py b/var/spack/repos/builtin/packages/lua-luaposix/package.py index 4db3f84546..8d9ad7f832 100644 --- a/var/spack/repos/builtin/packages/lua-luaposix/package.py +++ b/var/spack/repos/builtin/packages/lua-luaposix/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob diff --git a/var/spack/repos/builtin/packages/lua-mpack/package.py b/var/spack/repos/builtin/packages/lua-mpack/package.py index b22d066a4d..f6cca90e0d 100644 --- a/var/spack/repos/builtin/packages/lua-mpack/package.py +++ b/var/spack/repos/builtin/packages/lua-mpack/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/lua/package.py b/var/spack/repos/builtin/packages/lua/package.py index b0f559db50..ceb816a5d7 100644 --- a/var/spack/repos/builtin/packages/lua/package.py +++ b/var/spack/repos/builtin/packages/lua/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/luit/package.py b/var/spack/repos/builtin/packages/luit/package.py index 0c71a370ed..4969375a19 100644 --- a/var/spack/repos/builtin/packages/luit/package.py +++ b/var/spack/repos/builtin/packages/luit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/lulesh/package.py b/var/spack/repos/builtin/packages/lulesh/package.py index 1bf51282d5..614d8cf933 100644 --- a/var/spack/repos/builtin/packages/lulesh/package.py +++ b/var/spack/repos/builtin/packages/lulesh/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/lumpy-sv/package.py b/var/spack/repos/builtin/packages/lumpy-sv/package.py index f7a29f36fe..709f7d0f4c 100644 --- a/var/spack/repos/builtin/packages/lumpy-sv/package.py +++ b/var/spack/repos/builtin/packages/lumpy-sv/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/lwgrp/package.py b/var/spack/repos/builtin/packages/lwgrp/package.py index cc19174db3..76926714d1 100644 --- a/var/spack/repos/builtin/packages/lwgrp/package.py +++ b/var/spack/repos/builtin/packages/lwgrp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/lwm2/package.py b/var/spack/repos/builtin/packages/lwm2/package.py index 2190529f8c..58c6d73f94 100644 --- a/var/spack/repos/builtin/packages/lwm2/package.py +++ b/var/spack/repos/builtin/packages/lwm2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/lz4/package.py b/var/spack/repos/builtin/packages/lz4/package.py index d5e915a05b..2a64a3cdf2 100644 --- a/var/spack/repos/builtin/packages/lz4/package.py +++ b/var/spack/repos/builtin/packages/lz4/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/lzma/package.py b/var/spack/repos/builtin/packages/lzma/package.py index 1f0996897c..a5abb82ff7 100644 --- a/var/spack/repos/builtin/packages/lzma/package.py +++ b/var/spack/repos/builtin/packages/lzma/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/lzo/package.py b/var/spack/repos/builtin/packages/lzo/package.py index c67846b54e..f5b4fe8060 100644 --- a/var/spack/repos/builtin/packages/lzo/package.py +++ b/var/spack/repos/builtin/packages/lzo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/m4/package.py b/var/spack/repos/builtin/packages/m4/package.py index ac716cf622..926758a766 100644 --- a/var/spack/repos/builtin/packages/m4/package.py +++ b/var/spack/repos/builtin/packages/m4/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/macsio/package.py b/var/spack/repos/builtin/packages/macsio/package.py index 7539f6341a..09d4f50c50 100644 --- a/var/spack/repos/builtin/packages/macsio/package.py +++ b/var/spack/repos/builtin/packages/macsio/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mad-numdiff/package.py b/var/spack/repos/builtin/packages/mad-numdiff/package.py index 6003072b2b..660fe03203 100644 --- a/var/spack/repos/builtin/packages/mad-numdiff/package.py +++ b/var/spack/repos/builtin/packages/mad-numdiff/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mafft/package.py b/var/spack/repos/builtin/packages/mafft/package.py index 7436922331..f2b75416bf 100644 --- a/var/spack/repos/builtin/packages/mafft/package.py +++ b/var/spack/repos/builtin/packages/mafft/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/magics/package.py b/var/spack/repos/builtin/packages/magics/package.py index 661de3dc84..bd35327480 100644 --- a/var/spack/repos/builtin/packages/magics/package.py +++ b/var/spack/repos/builtin/packages/magics/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob diff --git a/var/spack/repos/builtin/packages/magma/package.py b/var/spack/repos/builtin/packages/magma/package.py index 7c866a90c6..7a28a3bd85 100644 --- a/var/spack/repos/builtin/packages/magma/package.py +++ b/var/spack/repos/builtin/packages/magma/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Serban Maerean, serban@us.ibm.com, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/makedepend/package.py b/var/spack/repos/builtin/packages/makedepend/package.py index 7f941fca30..9dd5ea50f5 100644 --- a/var/spack/repos/builtin/packages/makedepend/package.py +++ b/var/spack/repos/builtin/packages/makedepend/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mallocmc/package.py b/var/spack/repos/builtin/packages/mallocmc/package.py index 5ecde73967..d5d4faa21c 100644 --- a/var/spack/repos/builtin/packages/mallocmc/package.py +++ b/var/spack/repos/builtin/packages/mallocmc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/man-db/package.py b/var/spack/repos/builtin/packages/man-db/package.py index 98af02397f..634815260d 100644 --- a/var/spack/repos/builtin/packages/man-db/package.py +++ b/var/spack/repos/builtin/packages/man-db/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/manta/package.py b/var/spack/repos/builtin/packages/manta/package.py index 5a0afd9c32..74f717920a 100644 --- a/var/spack/repos/builtin/packages/manta/package.py +++ b/var/spack/repos/builtin/packages/manta/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/maq/package.py b/var/spack/repos/builtin/packages/maq/package.py index 3acf74a7ce..222b56827d 100644 --- a/var/spack/repos/builtin/packages/maq/package.py +++ b/var/spack/repos/builtin/packages/maq/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mariadb/package.py b/var/spack/repos/builtin/packages/mariadb/package.py index 931449375f..c2ec90f299 100644 --- a/var/spack/repos/builtin/packages/mariadb/package.py +++ b/var/spack/repos/builtin/packages/mariadb/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/masa/package.py b/var/spack/repos/builtin/packages/masa/package.py index 622626d519..a269d0362c 100644 --- a/var/spack/repos/builtin/packages/masa/package.py +++ b/var/spack/repos/builtin/packages/masa/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/masurca/package.py b/var/spack/repos/builtin/packages/masurca/package.py index a1786cd7f3..4aeb00e0dd 100644 --- a/var/spack/repos/builtin/packages/masurca/package.py +++ b/var/spack/repos/builtin/packages/masurca/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/matio/package.py b/var/spack/repos/builtin/packages/matio/package.py index 6483d21be5..89be615244 100644 --- a/var/spack/repos/builtin/packages/matio/package.py +++ b/var/spack/repos/builtin/packages/matio/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/matlab/package.py b/var/spack/repos/builtin/packages/matlab/package.py index 652a583e35..d9f3a9476c 100644 --- a/var/spack/repos/builtin/packages/matlab/package.py +++ b/var/spack/repos/builtin/packages/matlab/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os import subprocess diff --git a/var/spack/repos/builtin/packages/maven/package.py b/var/spack/repos/builtin/packages/maven/package.py index abd4cca16c..58cfe004d7 100644 --- a/var/spack/repos/builtin/packages/maven/package.py +++ b/var/spack/repos/builtin/packages/maven/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/maverick/package.py b/var/spack/repos/builtin/packages/maverick/package.py index ee80594b67..047540cce1 100644 --- a/var/spack/repos/builtin/packages/maverick/package.py +++ b/var/spack/repos/builtin/packages/maverick/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mawk/package.py b/var/spack/repos/builtin/packages/mawk/package.py index 572089b66c..864e76b8f3 100644 --- a/var/spack/repos/builtin/packages/mawk/package.py +++ b/var/spack/repos/builtin/packages/mawk/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mbedtls/package.py b/var/spack/repos/builtin/packages/mbedtls/package.py index 6fd7e66a2f..f6ea6c5dbe 100644 --- a/var/spack/repos/builtin/packages/mbedtls/package.py +++ b/var/spack/repos/builtin/packages/mbedtls/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mc/package.py b/var/spack/repos/builtin/packages/mc/package.py index f5cc3249ff..38037f1707 100644 --- a/var/spack/repos/builtin/packages/mc/package.py +++ b/var/spack/repos/builtin/packages/mc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mcl/package.py b/var/spack/repos/builtin/packages/mcl/package.py index 224539bdf1..91352caac2 100644 --- a/var/spack/repos/builtin/packages/mcl/package.py +++ b/var/spack/repos/builtin/packages/mcl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mdtest/package.py b/var/spack/repos/builtin/packages/mdtest/package.py index 25068478e5..56bede2f87 100644 --- a/var/spack/repos/builtin/packages/mdtest/package.py +++ b/var/spack/repos/builtin/packages/mdtest/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/med/package.py b/var/spack/repos/builtin/packages/med/package.py index 353ed091aa..95d3794ced 100644 --- a/var/spack/repos/builtin/packages/med/package.py +++ b/var/spack/repos/builtin/packages/med/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/meep/package.py b/var/spack/repos/builtin/packages/meep/package.py index 8af280f2a2..3a125c8bb9 100644 --- a/var/spack/repos/builtin/packages/meep/package.py +++ b/var/spack/repos/builtin/packages/meep/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mefit/package.py b/var/spack/repos/builtin/packages/mefit/package.py index 61e74dfbbe..ce21fc9261 100644 --- a/var/spack/repos/builtin/packages/mefit/package.py +++ b/var/spack/repos/builtin/packages/mefit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/megahit/package.py b/var/spack/repos/builtin/packages/megahit/package.py index 3ffcdfb86e..d753c611ab 100644 --- a/var/spack/repos/builtin/packages/megahit/package.py +++ b/var/spack/repos/builtin/packages/megahit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/memaxes/package.py b/var/spack/repos/builtin/packages/memaxes/package.py index f3c4e10ebf..3b5e7f8733 100644 --- a/var/spack/repos/builtin/packages/memaxes/package.py +++ b/var/spack/repos/builtin/packages/memaxes/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/meme/package.py b/var/spack/repos/builtin/packages/meme/package.py index 5bd954dd9e..b7b66f3b04 100644 --- a/var/spack/repos/builtin/packages/meme/package.py +++ b/var/spack/repos/builtin/packages/meme/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/memkind/package.py b/var/spack/repos/builtin/packages/memkind/package.py index 6c27e62a03..097a642f13 100644 --- a/var/spack/repos/builtin/packages/memkind/package.py +++ b/var/spack/repos/builtin/packages/memkind/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/meraculous/package.py b/var/spack/repos/builtin/packages/meraculous/package.py index 0fe382d9eb..cb9c96eff7 100644 --- a/var/spack/repos/builtin/packages/meraculous/package.py +++ b/var/spack/repos/builtin/packages/meraculous/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mercurial/package.py b/var/spack/repos/builtin/packages/mercurial/package.py index aca0d9af6e..aaabdd6c01 100644 --- a/var/spack/repos/builtin/packages/mercurial/package.py +++ b/var/spack/repos/builtin/packages/mercurial/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from llnl.util import tty diff --git a/var/spack/repos/builtin/packages/mesa-glu/package.py b/var/spack/repos/builtin/packages/mesa-glu/package.py index 39b56a37e9..efd45dfa39 100644 --- a/var/spack/repos/builtin/packages/mesa-glu/package.py +++ b/var/spack/repos/builtin/packages/mesa-glu/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py index 884d80857a..9dfe46cd3b 100644 --- a/var/spack/repos/builtin/packages/mesa/package.py +++ b/var/spack/repos/builtin/packages/mesa/package.py @@ -1,26 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is released as part of spack under the LGPL license. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import sys from spack import * diff --git a/var/spack/repos/builtin/packages/meshkit/package.py b/var/spack/repos/builtin/packages/meshkit/package.py index 3225bd1133..9ed67edc96 100644 --- a/var/spack/repos/builtin/packages/meshkit/package.py +++ b/var/spack/repos/builtin/packages/meshkit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # from spack import * diff --git a/var/spack/repos/builtin/packages/meson/package.py b/var/spack/repos/builtin/packages/meson/package.py index 37be41030a..7ede3c996d 100644 --- a/var/spack/repos/builtin/packages/meson/package.py +++ b/var/spack/repos/builtin/packages/meson/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mesquite/package.py b/var/spack/repos/builtin/packages/mesquite/package.py index 8db96cb6a9..2abaa589b9 100644 --- a/var/spack/repos/builtin/packages/mesquite/package.py +++ b/var/spack/repos/builtin/packages/mesquite/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/metabat/package.py b/var/spack/repos/builtin/packages/metabat/package.py index 3d00c2dbe6..d8be2b90ec 100644 --- a/var/spack/repos/builtin/packages/metabat/package.py +++ b/var/spack/repos/builtin/packages/metabat/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/metaphysicl/package.py b/var/spack/repos/builtin/packages/metaphysicl/package.py index 98e28ce5a2..bfa0157cad 100644 --- a/var/spack/repos/builtin/packages/metaphysicl/package.py +++ b/var/spack/repos/builtin/packages/metaphysicl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/metis/package.py b/var/spack/repos/builtin/packages/metis/package.py index 65a32662bc..ad03293d29 100644 --- a/var/spack/repos/builtin/packages/metis/package.py +++ b/var/spack/repos/builtin/packages/metis/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob diff --git a/var/spack/repos/builtin/packages/mfem/package.py b/var/spack/repos/builtin/packages/mfem/package.py index 7d76ee8db9..d6f55b6566 100644 --- a/var/spack/repos/builtin/packages/mfem/package.py +++ b/var/spack/repos/builtin/packages/mfem/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os import shutil diff --git a/var/spack/repos/builtin/packages/microbiomeutil/package.py b/var/spack/repos/builtin/packages/microbiomeutil/package.py index e46498eb76..64952c6165 100644 --- a/var/spack/repos/builtin/packages/microbiomeutil/package.py +++ b/var/spack/repos/builtin/packages/microbiomeutil/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/minced/package.py b/var/spack/repos/builtin/packages/minced/package.py index fa4eba232d..c237ad2737 100644 --- a/var/spack/repos/builtin/packages/minced/package.py +++ b/var/spack/repos/builtin/packages/minced/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mindthegap/package.py b/var/spack/repos/builtin/packages/mindthegap/package.py index 9bc8e5a1a7..11dbdb8ac5 100644 --- a/var/spack/repos/builtin/packages/mindthegap/package.py +++ b/var/spack/repos/builtin/packages/mindthegap/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/miniaero/package.py b/var/spack/repos/builtin/packages/miniaero/package.py index cc7ec4e4b2..46907a0fc8 100644 --- a/var/spack/repos/builtin/packages/miniaero/package.py +++ b/var/spack/repos/builtin/packages/miniaero/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/miniamr/package.py b/var/spack/repos/builtin/packages/miniamr/package.py index cc97e0e3e5..0a0147e50e 100644 --- a/var/spack/repos/builtin/packages/miniamr/package.py +++ b/var/spack/repos/builtin/packages/miniamr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/miniasm/package.py b/var/spack/repos/builtin/packages/miniasm/package.py index 5f6444f741..8c32b90555 100644 --- a/var/spack/repos/builtin/packages/miniasm/package.py +++ b/var/spack/repos/builtin/packages/miniasm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/miniconda2/package.py b/var/spack/repos/builtin/packages/miniconda2/package.py index a111b1c150..2ac86588c9 100644 --- a/var/spack/repos/builtin/packages/miniconda2/package.py +++ b/var/spack/repos/builtin/packages/miniconda2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from six.moves.urllib.parse import urlparse from os.path import split diff --git a/var/spack/repos/builtin/packages/miniconda3/package.py b/var/spack/repos/builtin/packages/miniconda3/package.py index 24f610889b..c7c210f0ca 100644 --- a/var/spack/repos/builtin/packages/miniconda3/package.py +++ b/var/spack/repos/builtin/packages/miniconda3/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from six.moves.urllib.parse import urlparse from os.path import split diff --git a/var/spack/repos/builtin/packages/minife/package.py b/var/spack/repos/builtin/packages/minife/package.py index bce74edf57..00279455d3 100644 --- a/var/spack/repos/builtin/packages/minife/package.py +++ b/var/spack/repos/builtin/packages/minife/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/minighost/package.py b/var/spack/repos/builtin/packages/minighost/package.py index 764a15012a..c4cf78f5a9 100644 --- a/var/spack/repos/builtin/packages/minighost/package.py +++ b/var/spack/repos/builtin/packages/minighost/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import tarfile diff --git a/var/spack/repos/builtin/packages/minigmg/package.py b/var/spack/repos/builtin/packages/minigmg/package.py index 6dc9295078..730ae4df5c 100644 --- a/var/spack/repos/builtin/packages/minigmg/package.py +++ b/var/spack/repos/builtin/packages/minigmg/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob diff --git a/var/spack/repos/builtin/packages/minimap2/package.py b/var/spack/repos/builtin/packages/minimap2/package.py index c212826a2d..92da1ac170 100644 --- a/var/spack/repos/builtin/packages/minimap2/package.py +++ b/var/spack/repos/builtin/packages/minimap2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/minimd/package.py b/var/spack/repos/builtin/packages/minimd/package.py index 2cc7c1c96d..34192f64d2 100644 --- a/var/spack/repos/builtin/packages/minimd/package.py +++ b/var/spack/repos/builtin/packages/minimd/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import glob import tarfile diff --git a/var/spack/repos/builtin/packages/miniqmc/package.py b/var/spack/repos/builtin/packages/miniqmc/package.py index 974b1f9b86..f243b6a8fb 100644 --- a/var/spack/repos/builtin/packages/miniqmc/package.py +++ b/var/spack/repos/builtin/packages/miniqmc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2018, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/minisign/package.py b/var/spack/repos/builtin/packages/minisign/package.py index 816139a1f9..a380fedd15 100755 --- a/var/spack/repos/builtin/packages/minisign/package.py +++ b/var/spack/repos/builtin/packages/minisign/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/minismac2d/package.py b/var/spack/repos/builtin/packages/minismac2d/package.py index bffed59227..e793337868 100644 --- a/var/spack/repos/builtin/packages/minismac2d/package.py +++ b/var/spack/repos/builtin/packages/minismac2d/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/minitri/package.py b/var/spack/repos/builtin/packages/minitri/package.py index b985b39b74..570d4b44a4 100644 --- a/var/spack/repos/builtin/packages/minitri/package.py +++ b/var/spack/repos/builtin/packages/minitri/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/minivite/package.py b/var/spack/repos/builtin/packages/minivite/package.py index ca613929b2..f39a6f4f5e 100644 --- a/var/spack/repos/builtin/packages/minivite/package.py +++ b/var/spack/repos/builtin/packages/minivite/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 0s2111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/minixyce/package.py b/var/spack/repos/builtin/packages/minixyce/package.py index 0108fbaaa0..b014203cc5 100644 --- a/var/spack/repos/builtin/packages/minixyce/package.py +++ b/var/spack/repos/builtin/packages/minixyce/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/minuit/package.py b/var/spack/repos/builtin/packages/minuit/package.py index 9b14aee8a1..54b4644866 100644 --- a/var/spack/repos/builtin/packages/minuit/package.py +++ b/var/spack/repos/builtin/packages/minuit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mira/package.py b/var/spack/repos/builtin/packages/mira/package.py index bbcebf9154..f842ed8860 100644 --- a/var/spack/repos/builtin/packages/mira/package.py +++ b/var/spack/repos/builtin/packages/mira/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mirdeep2/package.py b/var/spack/repos/builtin/packages/mirdeep2/package.py index 02218c4da4..cf85705750 100644 --- a/var/spack/repos/builtin/packages/mirdeep2/package.py +++ b/var/spack/repos/builtin/packages/mirdeep2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob diff --git a/var/spack/repos/builtin/packages/mitofates/package.py b/var/spack/repos/builtin/packages/mitofates/package.py index 4dff8ff5c0..beefab38e1 100644 --- a/var/spack/repos/builtin/packages/mitofates/package.py +++ b/var/spack/repos/builtin/packages/mitofates/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob diff --git a/var/spack/repos/builtin/packages/mitos/package.py b/var/spack/repos/builtin/packages/mitos/package.py index 4c998f5541..bfefd762e9 100644 --- a/var/spack/repos/builtin/packages/mitos/package.py +++ b/var/spack/repos/builtin/packages/mitos/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mkfontdir/package.py b/var/spack/repos/builtin/packages/mkfontdir/package.py index 404a1cecc7..1a907d79ce 100644 --- a/var/spack/repos/builtin/packages/mkfontdir/package.py +++ b/var/spack/repos/builtin/packages/mkfontdir/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mkfontscale/package.py b/var/spack/repos/builtin/packages/mkfontscale/package.py index ca8d77ef36..b1ad4f492c 100644 --- a/var/spack/repos/builtin/packages/mkfontscale/package.py +++ b/var/spack/repos/builtin/packages/mkfontscale/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mlhka/package.py b/var/spack/repos/builtin/packages/mlhka/package.py index 9d76b3df79..303c868ba3 100644 --- a/var/spack/repos/builtin/packages/mlhka/package.py +++ b/var/spack/repos/builtin/packages/mlhka/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/moab/package.py b/var/spack/repos/builtin/packages/moab/package.py index d0b1761fcd..0f7bad2143 100644 --- a/var/spack/repos/builtin/packages/moab/package.py +++ b/var/spack/repos/builtin/packages/moab/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/modern-wheel/package.py b/var/spack/repos/builtin/packages/modern-wheel/package.py index 2ebd06bcc9..4e3b9b8322 100644 --- a/var/spack/repos/builtin/packages/modern-wheel/package.py +++ b/var/spack/repos/builtin/packages/modern-wheel/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/mofem-cephas/package.py b/var/spack/repos/builtin/packages/mofem-cephas/package.py index 01b2d36fb9..7ddacfb780 100644 --- a/var/spack/repos/builtin/packages/mofem-cephas/package.py +++ b/var/spack/repos/builtin/packages/mofem-cephas/package.py @@ -1,24 +1,8 @@ -############################################################################## -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mofem-fracture-module/package.py b/var/spack/repos/builtin/packages/mofem-fracture-module/package.py index fde8de5b94..f573d7def1 100644 --- a/var/spack/repos/builtin/packages/mofem-fracture-module/package.py +++ b/var/spack/repos/builtin/packages/mofem-fracture-module/package.py @@ -1,24 +1,8 @@ -############################################################################## -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mofem-minimal-surface-equation/package.py b/var/spack/repos/builtin/packages/mofem-minimal-surface-equation/package.py index 7a7457d61c..b967a45e7f 100644 --- a/var/spack/repos/builtin/packages/mofem-minimal-surface-equation/package.py +++ b/var/spack/repos/builtin/packages/mofem-minimal-surface-equation/package.py @@ -1,24 +1,8 @@ -############################################################################## -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mofem-users-modules/package.py b/var/spack/repos/builtin/packages/mofem-users-modules/package.py index acab4417d8..8ddec392d0 100644 --- a/var/spack/repos/builtin/packages/mofem-users-modules/package.py +++ b/var/spack/repos/builtin/packages/mofem-users-modules/package.py @@ -1,24 +1,8 @@ -############################################################################## -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/molcas/package.py b/var/spack/repos/builtin/packages/molcas/package.py index 80b27f3715..38d7c1be2d 100644 --- a/var/spack/repos/builtin/packages/molcas/package.py +++ b/var/spack/repos/builtin/packages/molcas/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/mono/package.py b/var/spack/repos/builtin/packages/mono/package.py index 182a3cf96b..b3a7161b4d 100644 --- a/var/spack/repos/builtin/packages/mono/package.py +++ b/var/spack/repos/builtin/packages/mono/package.py @@ -1,27 +1,8 @@ -############################################################################### -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mosh/package.py b/var/spack/repos/builtin/packages/mosh/package.py index df091b1ad8..23d9cd0f1c 100644 --- a/var/spack/repos/builtin/packages/mosh/package.py +++ b/var/spack/repos/builtin/packages/mosh/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mothur/package.py b/var/spack/repos/builtin/packages/mothur/package.py index f3873b05f8..ad66649025 100644 --- a/var/spack/repos/builtin/packages/mothur/package.py +++ b/var/spack/repos/builtin/packages/mothur/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/motif/package.py b/var/spack/repos/builtin/packages/motif/package.py index efbd767273..fdafcc065a 100644 --- a/var/spack/repos/builtin/packages/motif/package.py +++ b/var/spack/repos/builtin/packages/motif/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/motioncor2/package.py b/var/spack/repos/builtin/packages/motioncor2/package.py index 08351e0838..91f1a493ce 100644 --- a/var/spack/repos/builtin/packages/motioncor2/package.py +++ b/var/spack/repos/builtin/packages/motioncor2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from glob import glob 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 c2ac3c8ee2..1a82e18b6c 100644 --- a/var/spack/repos/builtin/packages/mount-point-attributes/package.py +++ b/var/spack/repos/builtin/packages/mount-point-attributes/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mozjs/package.py b/var/spack/repos/builtin/packages/mozjs/package.py index d3fbae2c84..08c467b763 100644 --- a/var/spack/repos/builtin/packages/mozjs/package.py +++ b/var/spack/repos/builtin/packages/mozjs/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mpark-variant/package.py b/var/spack/repos/builtin/packages/mpark-variant/package.py index 2cab0222be..ad1704d6f7 100644 --- a/var/spack/repos/builtin/packages/mpark-variant/package.py +++ b/var/spack/repos/builtin/packages/mpark-variant/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mpc/package.py b/var/spack/repos/builtin/packages/mpc/package.py index e7b591c0fe..1e1763d0df 100644 --- a/var/spack/repos/builtin/packages/mpc/package.py +++ b/var/spack/repos/builtin/packages/mpc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mpe2/package.py b/var/spack/repos/builtin/packages/mpe2/package.py index 43d2275ae1..470a29d8b2 100644 --- a/var/spack/repos/builtin/packages/mpe2/package.py +++ b/var/spack/repos/builtin/packages/mpe2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mpest/package.py b/var/spack/repos/builtin/packages/mpest/package.py index 56d9c4a1b8..25e7e4f156 100644 --- a/var/spack/repos/builtin/packages/mpest/package.py +++ b/var/spack/repos/builtin/packages/mpest/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mpfr/package.py b/var/spack/repos/builtin/packages/mpfr/package.py index 3b385aabe5..3ddf429f52 100644 --- a/var/spack/repos/builtin/packages/mpfr/package.py +++ b/var/spack/repos/builtin/packages/mpfr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mpibash/package.py b/var/spack/repos/builtin/packages/mpibash/package.py index fe586925d8..f4157ca66f 100644 --- a/var/spack/repos/builtin/packages/mpibash/package.py +++ b/var/spack/repos/builtin/packages/mpibash/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mpiblast/package.py b/var/spack/repos/builtin/packages/mpiblast/package.py index b531af8c57..c358075f1e 100644 --- a/var/spack/repos/builtin/packages/mpiblast/package.py +++ b/var/spack/repos/builtin/packages/mpiblast/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mpich/package.py b/var/spack/repos/builtin/packages/mpich/package.py index 28b083b332..aea92872f0 100644 --- a/var/spack/repos/builtin/packages/mpich/package.py +++ b/var/spack/repos/builtin/packages/mpich/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/mpifileutils/package.py b/var/spack/repos/builtin/packages/mpifileutils/package.py index 9d0132e93e..8257587f1b 100644 --- a/var/spack/repos/builtin/packages/mpifileutils/package.py +++ b/var/spack/repos/builtin/packages/mpifileutils/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mpilander/package.py b/var/spack/repos/builtin/packages/mpilander/package.py index b0dbee3ea9..6f53f4d59a 100644 --- a/var/spack/repos/builtin/packages/mpilander/package.py +++ b/var/spack/repos/builtin/packages/mpilander/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mpileaks/package.py b/var/spack/repos/builtin/packages/mpileaks/package.py index 33c6172051..291df5da34 100644 --- a/var/spack/repos/builtin/packages/mpileaks/package.py +++ b/var/spack/repos/builtin/packages/mpileaks/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mpip/package.py b/var/spack/repos/builtin/packages/mpip/package.py index b8f14ec580..172207885c 100644 --- a/var/spack/repos/builtin/packages/mpip/package.py +++ b/var/spack/repos/builtin/packages/mpip/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/mpir/package.py b/var/spack/repos/builtin/packages/mpir/package.py index c7fd5aff54..6e79df36e1 100644 --- a/var/spack/repos/builtin/packages/mpir/package.py +++ b/var/spack/repos/builtin/packages/mpir/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mpix-launch-swift/package.py b/var/spack/repos/builtin/packages/mpix-launch-swift/package.py index 57cb59eb20..83d3d28799 100644 --- a/var/spack/repos/builtin/packages/mpix-launch-swift/package.py +++ b/var/spack/repos/builtin/packages/mpix-launch-swift/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mrbayes/package.py b/var/spack/repos/builtin/packages/mrbayes/package.py index 69fb15de5d..79701d2a03 100644 --- a/var/spack/repos/builtin/packages/mrbayes/package.py +++ b/var/spack/repos/builtin/packages/mrbayes/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mrnet/package.py b/var/spack/repos/builtin/packages/mrnet/package.py index 5e68f7b847..14e2fc8200 100644 --- a/var/spack/repos/builtin/packages/mrnet/package.py +++ b/var/spack/repos/builtin/packages/mrnet/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mrtrix3/package.py b/var/spack/repos/builtin/packages/mrtrix3/package.py index 26b083daf5..fc99abfc9a 100644 --- a/var/spack/repos/builtin/packages/mrtrix3/package.py +++ b/var/spack/repos/builtin/packages/mrtrix3/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mscgen/package.py b/var/spack/repos/builtin/packages/mscgen/package.py index 2dcf5c2293..f926b539af 100644 --- a/var/spack/repos/builtin/packages/mscgen/package.py +++ b/var/spack/repos/builtin/packages/mscgen/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/msgpack-c/package.py b/var/spack/repos/builtin/packages/msgpack-c/package.py index d8104555bb..49cd4f765d 100644 --- a/var/spack/repos/builtin/packages/msgpack-c/package.py +++ b/var/spack/repos/builtin/packages/msgpack-c/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mshadow/package.py b/var/spack/repos/builtin/packages/mshadow/package.py index a8bc977303..3dde91770c 100644 --- a/var/spack/repos/builtin/packages/mshadow/package.py +++ b/var/spack/repos/builtin/packages/mshadow/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/multitail/package.py b/var/spack/repos/builtin/packages/multitail/package.py index a293298f37..5857fbd751 100644 --- a/var/spack/repos/builtin/packages/multitail/package.py +++ b/var/spack/repos/builtin/packages/multitail/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/multiverso/package.py b/var/spack/repos/builtin/packages/multiverso/package.py index ed803a4be8..5d1a27e153 100644 --- a/var/spack/repos/builtin/packages/multiverso/package.py +++ b/var/spack/repos/builtin/packages/multiverso/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mummer/package.py b/var/spack/repos/builtin/packages/mummer/package.py index c2fa3c141a..a698f27463 100644 --- a/var/spack/repos/builtin/packages/mummer/package.py +++ b/var/spack/repos/builtin/packages/mummer/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mumps/package.py b/var/spack/repos/builtin/packages/mumps/package.py index 98e669ed29..5ddd6606b4 100644 --- a/var/spack/repos/builtin/packages/mumps/package.py +++ b/var/spack/repos/builtin/packages/mumps/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os import sys diff --git a/var/spack/repos/builtin/packages/munge/package.py b/var/spack/repos/builtin/packages/munge/package.py index 545ed9a9be..cca523acb0 100644 --- a/var/spack/repos/builtin/packages/munge/package.py +++ b/var/spack/repos/builtin/packages/munge/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/muparser/package.py b/var/spack/repos/builtin/packages/muparser/package.py index 964f47b0cf..81ad5c3a82 100644 --- a/var/spack/repos/builtin/packages/muparser/package.py +++ b/var/spack/repos/builtin/packages/muparser/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/muscle/package.py b/var/spack/repos/builtin/packages/muscle/package.py index 5f2f768210..71c835613f 100644 --- a/var/spack/repos/builtin/packages/muscle/package.py +++ b/var/spack/repos/builtin/packages/muscle/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/muse/package.py b/var/spack/repos/builtin/packages/muse/package.py index 3f488a2ec0..89a3402e9f 100644 --- a/var/spack/repos/builtin/packages/muse/package.py +++ b/var/spack/repos/builtin/packages/muse/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/muster/package.py b/var/spack/repos/builtin/packages/muster/package.py index 2bb704162f..88a7d06560 100644 --- a/var/spack/repos/builtin/packages/muster/package.py +++ b/var/spack/repos/builtin/packages/muster/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mvapich2/package.py b/var/spack/repos/builtin/packages/mvapich2/package.py index 7671e95a3a..44b064d256 100644 --- a/var/spack/repos/builtin/packages/mvapich2/package.py +++ b/var/spack/repos/builtin/packages/mvapich2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import sys from spack import * diff --git a/var/spack/repos/builtin/packages/mxml/package.py b/var/spack/repos/builtin/packages/mxml/package.py index 0a10c6dafc..05a27c20e3 100644 --- a/var/spack/repos/builtin/packages/mxml/package.py +++ b/var/spack/repos/builtin/packages/mxml/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/mxnet/package.py b/var/spack/repos/builtin/packages/mxnet/package.py index e7ef2d4ce2..cc1e5861ba 100644 --- a/var/spack/repos/builtin/packages/mxnet/package.py +++ b/var/spack/repos/builtin/packages/mxnet/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/nag/package.py b/var/spack/repos/builtin/packages/nag/package.py index 0d26330826..d7c6ead714 100644 --- a/var/spack/repos/builtin/packages/nag/package.py +++ b/var/spack/repos/builtin/packages/nag/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/nalu-wind/package.py b/var/spack/repos/builtin/packages/nalu-wind/package.py index 2c5c4679f4..6a8f4d78de 100644 --- a/var/spack/repos/builtin/packages/nalu-wind/package.py +++ b/var/spack/repos/builtin/packages/nalu-wind/package.py @@ -1,26 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/nalu/package.py b/var/spack/repos/builtin/packages/nalu/package.py index f7e566e73f..225ed2ee66 100644 --- a/var/spack/repos/builtin/packages/nalu/package.py +++ b/var/spack/repos/builtin/packages/nalu/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/namd/package.py b/var/spack/repos/builtin/packages/namd/package.py index 96e3f3ad4b..a7e82fd1d0 100644 --- a/var/spack/repos/builtin/packages/namd/package.py +++ b/var/spack/repos/builtin/packages/namd/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import platform import sys import os diff --git a/var/spack/repos/builtin/packages/nano/package.py b/var/spack/repos/builtin/packages/nano/package.py index 0a5b646a4d..bbb2523d5a 100644 --- a/var/spack/repos/builtin/packages/nano/package.py +++ b/var/spack/repos/builtin/packages/nano/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/nanoflann/package.py b/var/spack/repos/builtin/packages/nanoflann/package.py index 962c888933..f042e8e4b9 100644 --- a/var/spack/repos/builtin/packages/nanoflann/package.py +++ b/var/spack/repos/builtin/packages/nanoflann/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/nanopb/package.py b/var/spack/repos/builtin/packages/nanopb/package.py index c5cfc9c135..1b8472f3d7 100644 --- a/var/spack/repos/builtin/packages/nanopb/package.py +++ b/var/spack/repos/builtin/packages/nanopb/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/nasm/package.py b/var/spack/repos/builtin/packages/nasm/package.py index a8ac7bf940..3604b1ec28 100644 --- a/var/spack/repos/builtin/packages/nasm/package.py +++ b/var/spack/repos/builtin/packages/nasm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/nauty/package.py b/var/spack/repos/builtin/packages/nauty/package.py index fece01cced..a350ff207d 100644 --- a/var/spack/repos/builtin/packages/nauty/package.py +++ b/var/spack/repos/builtin/packages/nauty/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os from spack import * diff --git a/var/spack/repos/builtin/packages/ncbi-magicblast/package.py b/var/spack/repos/builtin/packages/ncbi-magicblast/package.py index 328d53fb44..b0e9c3434a 100644 --- a/var/spack/repos/builtin/packages/ncbi-magicblast/package.py +++ b/var/spack/repos/builtin/packages/ncbi-magicblast/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ncbi-rmblastn/package.py b/var/spack/repos/builtin/packages/ncbi-rmblastn/package.py index c561423b97..8dd04b5586 100644 --- a/var/spack/repos/builtin/packages/ncbi-rmblastn/package.py +++ b/var/spack/repos/builtin/packages/ncbi-rmblastn/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ncbi-toolkit/package.py b/var/spack/repos/builtin/packages/ncbi-toolkit/package.py index b6bdefdbf8..3f1bc0d543 100644 --- a/var/spack/repos/builtin/packages/ncbi-toolkit/package.py +++ b/var/spack/repos/builtin/packages/ncbi-toolkit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/nccl/package.py b/var/spack/repos/builtin/packages/nccl/package.py index be85aea43f..f180e7c3af 100644 --- a/var/spack/repos/builtin/packages/nccl/package.py +++ b/var/spack/repos/builtin/packages/nccl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/nccmp/package.py b/var/spack/repos/builtin/packages/nccmp/package.py index f54f9c8631..69736cc34b 100644 --- a/var/spack/repos/builtin/packages/nccmp/package.py +++ b/var/spack/repos/builtin/packages/nccmp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ncdu/package.py b/var/spack/repos/builtin/packages/ncdu/package.py index 5be7d93ace..d77478c618 100644 --- a/var/spack/repos/builtin/packages/ncdu/package.py +++ b/var/spack/repos/builtin/packages/ncdu/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ncftp/package.py b/var/spack/repos/builtin/packages/ncftp/package.py index 8911e6763f..2b9e417aa8 100644 --- a/var/spack/repos/builtin/packages/ncftp/package.py +++ b/var/spack/repos/builtin/packages/ncftp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ncl/package.py b/var/spack/repos/builtin/packages/ncl/package.py index 218fc31eb9..4656e9cfb8 100644 --- a/var/spack/repos/builtin/packages/ncl/package.py +++ b/var/spack/repos/builtin/packages/ncl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob import os diff --git a/var/spack/repos/builtin/packages/nco/package.py b/var/spack/repos/builtin/packages/nco/package.py index b1b6d116d0..6b46596b6e 100644 --- a/var/spack/repos/builtin/packages/nco/package.py +++ b/var/spack/repos/builtin/packages/nco/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ncurses/package.py b/var/spack/repos/builtin/packages/ncurses/package.py index a8ff84755b..56218a9306 100644 --- a/var/spack/repos/builtin/packages/ncurses/package.py +++ b/var/spack/repos/builtin/packages/ncurses/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from glob import glob from os.path import exists, join diff --git a/var/spack/repos/builtin/packages/ncview/package.py b/var/spack/repos/builtin/packages/ncview/package.py index eaf981b325..f37115fe96 100644 --- a/var/spack/repos/builtin/packages/ncview/package.py +++ b/var/spack/repos/builtin/packages/ncview/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ndiff/package.py b/var/spack/repos/builtin/packages/ndiff/package.py index 23bfceb03b..ab997d1daa 100644 --- a/var/spack/repos/builtin/packages/ndiff/package.py +++ b/var/spack/repos/builtin/packages/ndiff/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/nek5000/package.py b/var/spack/repos/builtin/packages/nek5000/package.py index 34ee6cdb63..a952029a86 100644 --- a/var/spack/repos/builtin/packages/nek5000/package.py +++ b/var/spack/repos/builtin/packages/nek5000/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import numbers diff --git a/var/spack/repos/builtin/packages/nekbone/package.py b/var/spack/repos/builtin/packages/nekbone/package.py index cad14fa177..ff34fc25ac 100644 --- a/var/spack/repos/builtin/packages/nekbone/package.py +++ b/var/spack/repos/builtin/packages/nekbone/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/nekcem/package.py b/var/spack/repos/builtin/packages/nekcem/package.py index 6aedcdf9fd..c1b981e0c1 100644 --- a/var/spack/repos/builtin/packages/nekcem/package.py +++ b/var/spack/repos/builtin/packages/nekcem/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os import json diff --git a/var/spack/repos/builtin/packages/nektar/package.py b/var/spack/repos/builtin/packages/nektar/package.py index 1c09397883..3e04b1c2b1 100644 --- a/var/spack/repos/builtin/packages/nektar/package.py +++ b/var/spack/repos/builtin/packages/nektar/package.py @@ -1,27 +1,8 @@ -############################################################################# -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/neovim/package.py b/var/spack/repos/builtin/packages/neovim/package.py index 9497fd1991..b626f34984 100644 --- a/var/spack/repos/builtin/packages/neovim/package.py +++ b/var/spack/repos/builtin/packages/neovim/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/nest/package.py b/var/spack/repos/builtin/packages/nest/package.py index dcc06d7917..a62838dc7d 100644 --- a/var/spack/repos/builtin/packages/nest/package.py +++ b/var/spack/repos/builtin/packages/nest/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/netcdf-cxx/package.py b/var/spack/repos/builtin/packages/netcdf-cxx/package.py index 600033b2b5..07ecd2f22a 100644 --- a/var/spack/repos/builtin/packages/netcdf-cxx/package.py +++ b/var/spack/repos/builtin/packages/netcdf-cxx/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/netcdf-cxx4/package.py b/var/spack/repos/builtin/packages/netcdf-cxx4/package.py index 4b586d9a14..8d228cc3c0 100644 --- a/var/spack/repos/builtin/packages/netcdf-cxx4/package.py +++ b/var/spack/repos/builtin/packages/netcdf-cxx4/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/netcdf-fortran/package.py b/var/spack/repos/builtin/packages/netcdf-fortran/package.py index 725804d22c..64d4eca2a0 100644 --- a/var/spack/repos/builtin/packages/netcdf-fortran/package.py +++ b/var/spack/repos/builtin/packages/netcdf-fortran/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/netcdf/package.py b/var/spack/repos/builtin/packages/netcdf/package.py index 8c1748e5d6..8a806dbf95 100644 --- a/var/spack/repos/builtin/packages/netcdf/package.py +++ b/var/spack/repos/builtin/packages/netcdf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import numbers diff --git a/var/spack/repos/builtin/packages/netgauge/package.py b/var/spack/repos/builtin/packages/netgauge/package.py index 2c9a2b5379..69557c8cb9 100644 --- a/var/spack/repos/builtin/packages/netgauge/package.py +++ b/var/spack/repos/builtin/packages/netgauge/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/netgen/package.py b/var/spack/repos/builtin/packages/netgen/package.py index a5595c4c69..c67ed8cced 100644 --- a/var/spack/repos/builtin/packages/netgen/package.py +++ b/var/spack/repos/builtin/packages/netgen/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/netlib-lapack/package.py b/var/spack/repos/builtin/packages/netlib-lapack/package.py index 7b0cb7cd6c..b5080d0ba8 100644 --- a/var/spack/repos/builtin/packages/netlib-lapack/package.py +++ b/var/spack/repos/builtin/packages/netlib-lapack/package.py @@ -1,27 +1,8 @@ -############################################################################# -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/netlib-scalapack/package.py b/var/spack/repos/builtin/packages/netlib-scalapack/package.py index cffb4a27d0..0bc2025ba6 100644 --- a/var/spack/repos/builtin/packages/netlib-scalapack/package.py +++ b/var/spack/repos/builtin/packages/netlib-scalapack/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/netlib-xblas/package.py b/var/spack/repos/builtin/packages/netlib-xblas/package.py index a1c269a20a..6c837f0da8 100644 --- a/var/spack/repos/builtin/packages/netlib-xblas/package.py +++ b/var/spack/repos/builtin/packages/netlib-xblas/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/nettle/package.py b/var/spack/repos/builtin/packages/nettle/package.py index 5c1855c523..c371327901 100644 --- a/var/spack/repos/builtin/packages/nettle/package.py +++ b/var/spack/repos/builtin/packages/nettle/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/neuron/package.py b/var/spack/repos/builtin/packages/neuron/package.py index faae212806..ade0552c60 100644 --- a/var/spack/repos/builtin/packages/neuron/package.py +++ b/var/spack/repos/builtin/packages/neuron/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os from spack import * diff --git a/var/spack/repos/builtin/packages/nextflow/package.py b/var/spack/repos/builtin/packages/nextflow/package.py index b98cbe0355..f1d2718010 100644 --- a/var/spack/repos/builtin/packages/nextflow/package.py +++ b/var/spack/repos/builtin/packages/nextflow/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/nfft/package.py b/var/spack/repos/builtin/packages/nfft/package.py index b373584d51..3e40732f39 100644 --- a/var/spack/repos/builtin/packages/nfft/package.py +++ b/var/spack/repos/builtin/packages/nfft/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/nghttp2/package.py b/var/spack/repos/builtin/packages/nghttp2/package.py index 0cb9683bfb..53d3c6b67f 100644 --- a/var/spack/repos/builtin/packages/nghttp2/package.py +++ b/var/spack/repos/builtin/packages/nghttp2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/nginx/package.py b/var/spack/repos/builtin/packages/nginx/package.py index 83550ca08d..0db0e581c8 100644 --- a/var/spack/repos/builtin/packages/nginx/package.py +++ b/var/spack/repos/builtin/packages/nginx/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ngmlr/package.py b/var/spack/repos/builtin/packages/ngmlr/package.py index 0d27f2913a..1c38c9cd1a 100644 --- a/var/spack/repos/builtin/packages/ngmlr/package.py +++ b/var/spack/repos/builtin/packages/ngmlr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ninja-fortran/package.py b/var/spack/repos/builtin/packages/ninja-fortran/package.py index 15ff5a11bc..5aaa5039ed 100644 --- a/var/spack/repos/builtin/packages/ninja-fortran/package.py +++ b/var/spack/repos/builtin/packages/ninja-fortran/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ninja/package.py b/var/spack/repos/builtin/packages/ninja/package.py index 471b2b7da9..e6283fbff3 100644 --- a/var/spack/repos/builtin/packages/ninja/package.py +++ b/var/spack/repos/builtin/packages/ninja/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/nlohmann-json/package.py b/var/spack/repos/builtin/packages/nlohmann-json/package.py index dd37a9a8f0..110e535e44 100644 --- a/var/spack/repos/builtin/packages/nlohmann-json/package.py +++ b/var/spack/repos/builtin/packages/nlohmann-json/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/nlopt/package.py b/var/spack/repos/builtin/packages/nlopt/package.py index d7343231c9..c1c69cba01 100644 --- a/var/spack/repos/builtin/packages/nlopt/package.py +++ b/var/spack/repos/builtin/packages/nlopt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/nmap/package.py b/var/spack/repos/builtin/packages/nmap/package.py index 7c0f0dc12b..43b3aeefac 100644 --- a/var/spack/repos/builtin/packages/nmap/package.py +++ b/var/spack/repos/builtin/packages/nmap/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/nnvm/package.py b/var/spack/repos/builtin/packages/nnvm/package.py index b520b014e8..542daa50af 100644 --- a/var/spack/repos/builtin/packages/nnvm/package.py +++ b/var/spack/repos/builtin/packages/nnvm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/node-js/package.py b/var/spack/repos/builtin/packages/node-js/package.py index 4fa1099023..ad19340c53 100644 --- a/var/spack/repos/builtin/packages/node-js/package.py +++ b/var/spack/repos/builtin/packages/node-js/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys import subprocess diff --git a/var/spack/repos/builtin/packages/notmuch/package.py b/var/spack/repos/builtin/packages/notmuch/package.py index 9052d5c8af..9245c76d12 100644 --- a/var/spack/repos/builtin/packages/notmuch/package.py +++ b/var/spack/repos/builtin/packages/notmuch/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/npb/package.py b/var/spack/repos/builtin/packages/npb/package.py index d216ddc566..0840be9b8c 100644 --- a/var/spack/repos/builtin/packages/npb/package.py +++ b/var/spack/repos/builtin/packages/npb/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import numbers from spack import * diff --git a/var/spack/repos/builtin/packages/npm/package.py b/var/spack/repos/builtin/packages/npm/package.py index 7dd0488f79..5f797165c3 100644 --- a/var/spack/repos/builtin/packages/npm/package.py +++ b/var/spack/repos/builtin/packages/npm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os from spack import * diff --git a/var/spack/repos/builtin/packages/npth/package.py b/var/spack/repos/builtin/packages/npth/package.py index 0933691a6d..d99da26799 100644 --- a/var/spack/repos/builtin/packages/npth/package.py +++ b/var/spack/repos/builtin/packages/npth/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/nspr/package.py b/var/spack/repos/builtin/packages/nspr/package.py index 9d69d08577..5ad1d51973 100644 --- a/var/spack/repos/builtin/packages/nspr/package.py +++ b/var/spack/repos/builtin/packages/nspr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/numactl/package.py b/var/spack/repos/builtin/packages/numactl/package.py index 18123ec27e..e17a279d21 100644 --- a/var/spack/repos/builtin/packages/numactl/package.py +++ b/var/spack/repos/builtin/packages/numactl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/numdiff/package.py b/var/spack/repos/builtin/packages/numdiff/package.py index 1103f04589..8c7490482a 100644 --- a/var/spack/repos/builtin/packages/numdiff/package.py +++ b/var/spack/repos/builtin/packages/numdiff/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/nut/package.py b/var/spack/repos/builtin/packages/nut/package.py index c53cb188ab..6450d72adf 100644 --- a/var/spack/repos/builtin/packages/nut/package.py +++ b/var/spack/repos/builtin/packages/nut/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/nvptx-tools/package.py b/var/spack/repos/builtin/packages/nvptx-tools/package.py index 4f3f40fb14..244cd6936c 100644 --- a/var/spack/repos/builtin/packages/nvptx-tools/package.py +++ b/var/spack/repos/builtin/packages/nvptx-tools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/nwchem/package.py b/var/spack/repos/builtin/packages/nwchem/package.py index 4cedd0943d..908740ba4d 100644 --- a/var/spack/repos/builtin/packages/nwchem/package.py +++ b/var/spack/repos/builtin/packages/nwchem/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys import os diff --git a/var/spack/repos/builtin/packages/ocaml/package.py b/var/spack/repos/builtin/packages/ocaml/package.py index e1c5220098..cd88782775 100644 --- a/var/spack/repos/builtin/packages/ocaml/package.py +++ b/var/spack/repos/builtin/packages/ocaml/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/occa/package.py b/var/spack/repos/builtin/packages/occa/package.py index ff9285518e..f9276fede9 100644 --- a/var/spack/repos/builtin/packages/occa/package.py +++ b/var/spack/repos/builtin/packages/occa/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/oce/package.py b/var/spack/repos/builtin/packages/oce/package.py index 6b7b3349bd..04af4466e4 100644 --- a/var/spack/repos/builtin/packages/oce/package.py +++ b/var/spack/repos/builtin/packages/oce/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from spack.operating_systems.mac_os import macos_version import platform diff --git a/var/spack/repos/builtin/packages/oclint/package.py b/var/spack/repos/builtin/packages/oclint/package.py index 5095ce8c6e..a0810739be 100644 --- a/var/spack/repos/builtin/packages/oclint/package.py +++ b/var/spack/repos/builtin/packages/oclint/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/oclock/package.py b/var/spack/repos/builtin/packages/oclock/package.py index 20e0025f7a..0108623080 100644 --- a/var/spack/repos/builtin/packages/oclock/package.py +++ b/var/spack/repos/builtin/packages/oclock/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/octave-optim/package.py b/var/spack/repos/builtin/packages/octave-optim/package.py index be8016b438..5bcb323bbe 100644 --- a/var/spack/repos/builtin/packages/octave-optim/package.py +++ b/var/spack/repos/builtin/packages/octave-optim/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/octave-splines/package.py b/var/spack/repos/builtin/packages/octave-splines/package.py index 5b106c88f7..857fc48d9c 100644 --- a/var/spack/repos/builtin/packages/octave-splines/package.py +++ b/var/spack/repos/builtin/packages/octave-splines/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/octave-struct/package.py b/var/spack/repos/builtin/packages/octave-struct/package.py index 1b1bd1da0c..2f08729106 100644 --- a/var/spack/repos/builtin/packages/octave-struct/package.py +++ b/var/spack/repos/builtin/packages/octave-struct/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/octave/package.py b/var/spack/repos/builtin/packages/octave/package.py index 4a89992dac..5b6dc25f94 100644 --- a/var/spack/repos/builtin/packages/octave/package.py +++ b/var/spack/repos/builtin/packages/octave/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/octopus/package.py b/var/spack/repos/builtin/packages/octopus/package.py index bca0900399..315beb57b5 100644 --- a/var/spack/repos/builtin/packages/octopus/package.py +++ b/var/spack/repos/builtin/packages/octopus/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/of-adios-write/package.py b/var/spack/repos/builtin/packages/of-adios-write/package.py index ba2be2f601..98a293c1d9 100644 --- a/var/spack/repos/builtin/packages/of-adios-write/package.py +++ b/var/spack/repos/builtin/packages/of-adios-write/package.py @@ -1,28 +1,8 @@ -############################################################################## -# Copyright (c) 2017 Mark Olesen, OpenCFD Ltd. -# -# This file was authored by Mark Olesen -# and is released as part of spack under the LGPL license. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for the LLNL notice and LGPL. -# -# License -# ------- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # Legal Notice # ------------ # OPENFOAM is a trademark owned by OpenCFD Ltd diff --git a/var/spack/repos/builtin/packages/of-precice/package.py b/var/spack/repos/builtin/packages/of-precice/package.py index 88180f6c57..31cd530002 100644 --- a/var/spack/repos/builtin/packages/of-precice/package.py +++ b/var/spack/repos/builtin/packages/of-precice/package.py @@ -1,26 +1,8 @@ -############################################################################## -# Copyright (c) 2018 Mark Olesen, OpenCFD Ltd. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file was authored by Mark Olesen -# and is released as part of spack under the LGPL license. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for the LLNL notice and LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import llnl.util.tty as tty diff --git a/var/spack/repos/builtin/packages/omega-h/package.py b/var/spack/repos/builtin/packages/omega-h/package.py index 6cf3db52a0..18f5563cb4 100644 --- a/var/spack/repos/builtin/packages/omega-h/package.py +++ b/var/spack/repos/builtin/packages/omega-h/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ompss/package.py b/var/spack/repos/builtin/packages/ompss/package.py index ebff0e64d9..e9f4f4a757 100644 --- a/var/spack/repos/builtin/packages/ompss/package.py +++ b/var/spack/repos/builtin/packages/ompss/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os import glob diff --git a/var/spack/repos/builtin/packages/ompt-openmp/package.py b/var/spack/repos/builtin/packages/ompt-openmp/package.py index 9495982b89..50641146c1 100644 --- a/var/spack/repos/builtin/packages/ompt-openmp/package.py +++ b/var/spack/repos/builtin/packages/ompt-openmp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/oniguruma/package.py b/var/spack/repos/builtin/packages/oniguruma/package.py index 3faf733822..7dda866f16 100644 --- a/var/spack/repos/builtin/packages/oniguruma/package.py +++ b/var/spack/repos/builtin/packages/oniguruma/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ont-albacore/package.py b/var/spack/repos/builtin/packages/ont-albacore/package.py index a29deb96c3..79da108daf 100644 --- a/var/spack/repos/builtin/packages/ont-albacore/package.py +++ b/var/spack/repos/builtin/packages/ont-albacore/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/opa-psm2/package.py b/var/spack/repos/builtin/packages/opa-psm2/package.py index 68f01dcf55..c10130ba55 100644 --- a/var/spack/repos/builtin/packages/opa-psm2/package.py +++ b/var/spack/repos/builtin/packages/opa-psm2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/opam/package.py b/var/spack/repos/builtin/packages/opam/package.py index 0b889092fc..0ff0af9157 100644 --- a/var/spack/repos/builtin/packages/opam/package.py +++ b/var/spack/repos/builtin/packages/opam/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/opari2/package.py b/var/spack/repos/builtin/packages/opari2/package.py index cd3f5acd79..e48d64be5e 100644 --- a/var/spack/repos/builtin/packages/opari2/package.py +++ b/var/spack/repos/builtin/packages/opari2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/openbabel/package.py b/var/spack/repos/builtin/packages/openbabel/package.py index 2201c9555a..c7d6a68ec3 100644 --- a/var/spack/repos/builtin/packages/openbabel/package.py +++ b/var/spack/repos/builtin/packages/openbabel/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/openblas/package.py b/var/spack/repos/builtin/packages/openblas/package.py index 6ac55cc507..ffa02c23e6 100644 --- a/var/spack/repos/builtin/packages/openblas/package.py +++ b/var/spack/repos/builtin/packages/openblas/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os from spack import * diff --git a/var/spack/repos/builtin/packages/opencoarrays/package.py b/var/spack/repos/builtin/packages/opencoarrays/package.py index f63c56d84b..e3da9753ae 100644 --- a/var/spack/repos/builtin/packages/opencoarrays/package.py +++ b/var/spack/repos/builtin/packages/opencoarrays/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index edbfcc2d13..96a643f3a4 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/openexr/package.py b/var/spack/repos/builtin/packages/openexr/package.py index 07b29fcfaa..6cb17ee9ce 100644 --- a/var/spack/repos/builtin/packages/openexr/package.py +++ b/var/spack/repos/builtin/packages/openexr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/openfast/package.py b/var/spack/repos/builtin/packages/openfast/package.py index 6ade9fcba5..710b4f3bfc 100644 --- a/var/spack/repos/builtin/packages/openfast/package.py +++ b/var/spack/repos/builtin/packages/openfast/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/openfoam-com/package.py b/var/spack/repos/builtin/packages/openfoam-com/package.py index 27e9de86b5..098d11e79d 100644 --- a/var/spack/repos/builtin/packages/openfoam-com/package.py +++ b/var/spack/repos/builtin/packages/openfoam-com/package.py @@ -1,28 +1,8 @@ -############################################################################## -# Copyright (c) 2017-2018 Mark Olesen, OpenCFD Ltd. -# -# This file was authored by Mark Olesen -# and is released as part of spack under the LGPL license. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for the LLNL notice and LGPL. -# -# License -# ------- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # Legal Notice # ------------ # OPENFOAM is a trademark owned by OpenCFD Ltd diff --git a/var/spack/repos/builtin/packages/openfoam-org/package.py b/var/spack/repos/builtin/packages/openfoam-org/package.py index 9db7597c49..8857257878 100644 --- a/var/spack/repos/builtin/packages/openfoam-org/package.py +++ b/var/spack/repos/builtin/packages/openfoam-org/package.py @@ -1,28 +1,8 @@ -############################################################################## -# Copyright (c) 2017 Mark Olesen, OpenCFD Ltd. -# -# This file was authored by Mark Olesen -# and is released as part of spack under the LGPL license. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for the LLNL notice and LGPL. -# -# License -# ------- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # Legal Notice # ------------ # OPENFOAM is a trademark owned by OpenCFD Ltd diff --git a/var/spack/repos/builtin/packages/openfst/package.py b/var/spack/repos/builtin/packages/openfst/package.py index e98fa4f785..4187ddd258 100644 --- a/var/spack/repos/builtin/packages/openfst/package.py +++ b/var/spack/repos/builtin/packages/openfst/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/opengl/package.py b/var/spack/repos/builtin/packages/opengl/package.py index 31be247dad..577e22dbf1 100644 --- a/var/spack/repos/builtin/packages/opengl/package.py +++ b/var/spack/repos/builtin/packages/opengl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/openglu/package.py b/var/spack/repos/builtin/packages/openglu/package.py index 125c3e4da5..c6468c95b4 100644 --- a/var/spack/repos/builtin/packages/openglu/package.py +++ b/var/spack/repos/builtin/packages/openglu/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/openjpeg/package.py b/var/spack/repos/builtin/packages/openjpeg/package.py index 0164039087..34b300371b 100644 --- a/var/spack/repos/builtin/packages/openjpeg/package.py +++ b/var/spack/repos/builtin/packages/openjpeg/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/openmc/package.py b/var/spack/repos/builtin/packages/openmc/package.py index 20580b1623..8d3175c029 100644 --- a/var/spack/repos/builtin/packages/openmc/package.py +++ b/var/spack/repos/builtin/packages/openmc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 01314a6600..0367c887a6 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import sys diff --git a/var/spack/repos/builtin/packages/opennurbs/package.py b/var/spack/repos/builtin/packages/opennurbs/package.py index 6603f46af3..388633f841 100644 --- a/var/spack/repos/builtin/packages/opennurbs/package.py +++ b/var/spack/repos/builtin/packages/opennurbs/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob diff --git a/var/spack/repos/builtin/packages/openpmd-api/package.py b/var/spack/repos/builtin/packages/openpmd-api/package.py index 45fb7cbf26..93082d3b85 100644 --- a/var/spack/repos/builtin/packages/openpmd-api/package.py +++ b/var/spack/repos/builtin/packages/openpmd-api/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/openscenegraph/package.py b/var/spack/repos/builtin/packages/openscenegraph/package.py index 96a2b9edea..d8adf24bf7 100644 --- a/var/spack/repos/builtin/packages/openscenegraph/package.py +++ b/var/spack/repos/builtin/packages/openscenegraph/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/openslide/package.py b/var/spack/repos/builtin/packages/openslide/package.py index 4e463d4051..2018a7e33b 100644 --- a/var/spack/repos/builtin/packages/openslide/package.py +++ b/var/spack/repos/builtin/packages/openslide/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py index 74dfeb8ffa..fd994eb304 100644 --- a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py @@ -1,44 +1,7 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -############################################################################## -# Copyright (c) 2015-2018 Krell Institute. All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation; either version 2 of the License, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py index 721466a2fe..d0764e54dc 100644 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop/package.py @@ -1,44 +1,7 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -############################################################################## -# Copyright (c) 2015-2018 Krell Institute. All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation; either version 2 of the License, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * diff --git a/var/spack/repos/builtin/packages/openssh/package.py b/var/spack/repos/builtin/packages/openssh/package.py index 4e1b690d73..45540989b7 100644 --- a/var/spack/repos/builtin/packages/openssh/package.py +++ b/var/spack/repos/builtin/packages/openssh/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/openssl/package.py b/var/spack/repos/builtin/packages/openssl/package.py index f6fca1d19c..41f73d3d53 100644 --- a/var/spack/repos/builtin/packages/openssl/package.py +++ b/var/spack/repos/builtin/packages/openssl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import llnl.util.tty as tty from spack import * diff --git a/var/spack/repos/builtin/packages/opium/package.py b/var/spack/repos/builtin/packages/opium/package.py index ae60656f59..c0f907c80a 100644 --- a/var/spack/repos/builtin/packages/opium/package.py +++ b/var/spack/repos/builtin/packages/opium/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/optional-lite/package.py b/var/spack/repos/builtin/packages/optional-lite/package.py index 84d67936ba..bddb490354 100644 --- a/var/spack/repos/builtin/packages/optional-lite/package.py +++ b/var/spack/repos/builtin/packages/optional-lite/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from shutil import copytree diff --git a/var/spack/repos/builtin/packages/opus/package.py b/var/spack/repos/builtin/packages/opus/package.py index d3699c1549..0300847923 100644 --- a/var/spack/repos/builtin/packages/opus/package.py +++ b/var/spack/repos/builtin/packages/opus/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/orfm/package.py b/var/spack/repos/builtin/packages/orfm/package.py index 7a6a442c2d..092a0cb319 100644 --- a/var/spack/repos/builtin/packages/orfm/package.py +++ b/var/spack/repos/builtin/packages/orfm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/orthofinder/package.py b/var/spack/repos/builtin/packages/orthofinder/package.py index 351d0c12f0..f89eddf6c8 100644 --- a/var/spack/repos/builtin/packages/orthofinder/package.py +++ b/var/spack/repos/builtin/packages/orthofinder/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/orthomcl/package.py b/var/spack/repos/builtin/packages/orthomcl/package.py index 83ca00b848..41badd0f3b 100644 --- a/var/spack/repos/builtin/packages/orthomcl/package.py +++ b/var/spack/repos/builtin/packages/orthomcl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/osu-micro-benchmarks/package.py b/var/spack/repos/builtin/packages/osu-micro-benchmarks/package.py index 8ca6fb01a9..0797824c3b 100644 --- a/var/spack/repos/builtin/packages/osu-micro-benchmarks/package.py +++ b/var/spack/repos/builtin/packages/osu-micro-benchmarks/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/otf/package.py b/var/spack/repos/builtin/packages/otf/package.py index fc858f031d..ee94aa20c4 100644 --- a/var/spack/repos/builtin/packages/otf/package.py +++ b/var/spack/repos/builtin/packages/otf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/otf2/package.py b/var/spack/repos/builtin/packages/otf2/package.py index 5868214afe..5999a816fa 100644 --- a/var/spack/repos/builtin/packages/otf2/package.py +++ b/var/spack/repos/builtin/packages/otf2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/p4est/package.py b/var/spack/repos/builtin/packages/p4est/package.py index e0b3478edb..ea26ee54f9 100644 --- a/var/spack/repos/builtin/packages/p4est/package.py +++ b/var/spack/repos/builtin/packages/p4est/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/p7zip/package.py b/var/spack/repos/builtin/packages/p7zip/package.py index 35c71193b6..72665ddc4b 100644 --- a/var/spack/repos/builtin/packages/p7zip/package.py +++ b/var/spack/repos/builtin/packages/p7zip/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pacbio-daligner/package.py b/var/spack/repos/builtin/packages/pacbio-daligner/package.py index 10b7297810..9703eedc93 100644 --- a/var/spack/repos/builtin/packages/pacbio-daligner/package.py +++ b/var/spack/repos/builtin/packages/pacbio-daligner/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pacbio-damasker/package.py b/var/spack/repos/builtin/packages/pacbio-damasker/package.py index 326a543a5f..92ed8fad12 100644 --- a/var/spack/repos/builtin/packages/pacbio-damasker/package.py +++ b/var/spack/repos/builtin/packages/pacbio-damasker/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pacbio-dazz-db/package.py b/var/spack/repos/builtin/packages/pacbio-dazz-db/package.py index 5f8eb9f3a6..8d79eb9e3c 100644 --- a/var/spack/repos/builtin/packages/pacbio-dazz-db/package.py +++ b/var/spack/repos/builtin/packages/pacbio-dazz-db/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pacbio-dextractor/package.py b/var/spack/repos/builtin/packages/pacbio-dextractor/package.py index a1c70fea09..43630ecc5e 100644 --- a/var/spack/repos/builtin/packages/pacbio-dextractor/package.py +++ b/var/spack/repos/builtin/packages/pacbio-dextractor/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pacvim/package.py b/var/spack/repos/builtin/packages/pacvim/package.py index 84634470f4..1a2fa45637 100644 --- a/var/spack/repos/builtin/packages/pacvim/package.py +++ b/var/spack/repos/builtin/packages/pacvim/package.py @@ -1,27 +1,7 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * diff --git a/var/spack/repos/builtin/packages/pagit/package.py b/var/spack/repos/builtin/packages/pagit/package.py index d276bbf3a9..b45154befd 100644 --- a/var/spack/repos/builtin/packages/pagit/package.py +++ b/var/spack/repos/builtin/packages/pagit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pagmo/package.py b/var/spack/repos/builtin/packages/pagmo/package.py index b9ad411882..4367500442 100644 --- a/var/spack/repos/builtin/packages/pagmo/package.py +++ b/var/spack/repos/builtin/packages/pagmo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/paml/package.py b/var/spack/repos/builtin/packages/paml/package.py index b09fbcdf65..9805e6bccd 100644 --- a/var/spack/repos/builtin/packages/paml/package.py +++ b/var/spack/repos/builtin/packages/paml/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/panda/package.py b/var/spack/repos/builtin/packages/panda/package.py index 09d1eb7ccd..72bac89f33 100644 --- a/var/spack/repos/builtin/packages/panda/package.py +++ b/var/spack/repos/builtin/packages/panda/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pandaseq/package.py b/var/spack/repos/builtin/packages/pandaseq/package.py index 2d269293c2..877a55dd6b 100644 --- a/var/spack/repos/builtin/packages/pandaseq/package.py +++ b/var/spack/repos/builtin/packages/pandaseq/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pango/package.py b/var/spack/repos/builtin/packages/pango/package.py index b56751f531..ced2c63065 100644 --- a/var/spack/repos/builtin/packages/pango/package.py +++ b/var/spack/repos/builtin/packages/pango/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pangomm/package.py b/var/spack/repos/builtin/packages/pangomm/package.py index bb287596da..e4275eef8d 100644 --- a/var/spack/repos/builtin/packages/pangomm/package.py +++ b/var/spack/repos/builtin/packages/pangomm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/papi/package.py b/var/spack/repos/builtin/packages/papi/package.py index 0e9edca7f6..57de47f4d9 100644 --- a/var/spack/repos/builtin/packages/papi/package.py +++ b/var/spack/repos/builtin/packages/papi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob import os diff --git a/var/spack/repos/builtin/packages/papyrus/package.py b/var/spack/repos/builtin/packages/papyrus/package.py index a8bab0ed46..c3a1f8e52c 100644 --- a/var/spack/repos/builtin/packages/papyrus/package.py +++ b/var/spack/repos/builtin/packages/papyrus/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/paradiseo/package.py b/var/spack/repos/builtin/packages/paradiseo/package.py index a571533e34..c559f6cf59 100644 --- a/var/spack/repos/builtin/packages/paradiseo/package.py +++ b/var/spack/repos/builtin/packages/paradiseo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/parallel-netcdf/package.py b/var/spack/repos/builtin/packages/parallel-netcdf/package.py index 599bf925da..c1bde21108 100644 --- a/var/spack/repos/builtin/packages/parallel-netcdf/package.py +++ b/var/spack/repos/builtin/packages/parallel-netcdf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/parallel/package.py b/var/spack/repos/builtin/packages/parallel/package.py index eab85c166b..dbc7c8085e 100644 --- a/var/spack/repos/builtin/packages/parallel/package.py +++ b/var/spack/repos/builtin/packages/parallel/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/paraver/package.py b/var/spack/repos/builtin/packages/paraver/package.py index 7556114e31..5945e06d69 100644 --- a/var/spack/repos/builtin/packages/paraver/package.py +++ b/var/spack/repos/builtin/packages/paraver/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index fa60f97bff..32fdf3746a 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/parmetis/package.py b/var/spack/repos/builtin/packages/parmetis/package.py index fca741888a..dad8a7cb1e 100644 --- a/var/spack/repos/builtin/packages/parmetis/package.py +++ b/var/spack/repos/builtin/packages/parmetis/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/parmgridgen/package.py b/var/spack/repos/builtin/packages/parmgridgen/package.py index 6b9ec6e99d..58960caaf2 100644 --- a/var/spack/repos/builtin/packages/parmgridgen/package.py +++ b/var/spack/repos/builtin/packages/parmgridgen/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/parquet/package.py b/var/spack/repos/builtin/packages/parquet/package.py index 91e74a97a4..cca8b8eab1 100644 --- a/var/spack/repos/builtin/packages/parquet/package.py +++ b/var/spack/repos/builtin/packages/parquet/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/parsimonator/package.py b/var/spack/repos/builtin/packages/parsimonator/package.py index b0a2e63a91..70ac718ae9 100644 --- a/var/spack/repos/builtin/packages/parsimonator/package.py +++ b/var/spack/repos/builtin/packages/parsimonator/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/parsplice/package.py b/var/spack/repos/builtin/packages/parsplice/package.py index 0b89600541..e07a704eb8 100644 --- a/var/spack/repos/builtin/packages/parsplice/package.py +++ b/var/spack/repos/builtin/packages/parsplice/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/partitionfinder/package.py b/var/spack/repos/builtin/packages/partitionfinder/package.py index 3cc10a6df6..6c36c33c5c 100644 --- a/var/spack/repos/builtin/packages/partitionfinder/package.py +++ b/var/spack/repos/builtin/packages/partitionfinder/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/patch/package.py b/var/spack/repos/builtin/packages/patch/package.py index 7b7ed2b19f..78868feacf 100644 --- a/var/spack/repos/builtin/packages/patch/package.py +++ b/var/spack/repos/builtin/packages/patch/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/patchelf/package.py b/var/spack/repos/builtin/packages/patchelf/package.py index db52c1616d..793991cb3e 100644 --- a/var/spack/repos/builtin/packages/patchelf/package.py +++ b/var/spack/repos/builtin/packages/patchelf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pathfinder/package.py b/var/spack/repos/builtin/packages/pathfinder/package.py index fb44486797..ec17859780 100644 --- a/var/spack/repos/builtin/packages/pathfinder/package.py +++ b/var/spack/repos/builtin/packages/pathfinder/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pax-utils/package.py b/var/spack/repos/builtin/packages/pax-utils/package.py index 0230419ac0..58a77568b7 100644 --- a/var/spack/repos/builtin/packages/pax-utils/package.py +++ b/var/spack/repos/builtin/packages/pax-utils/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pbbam/package.py b/var/spack/repos/builtin/packages/pbbam/package.py index f9b1ccc727..67e2e8c585 100644 --- a/var/spack/repos/builtin/packages/pbbam/package.py +++ b/var/spack/repos/builtin/packages/pbbam/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pbmpi/package.py b/var/spack/repos/builtin/packages/pbmpi/package.py index ba7099d711..f0432453ed 100644 --- a/var/spack/repos/builtin/packages/pbmpi/package.py +++ b/var/spack/repos/builtin/packages/pbmpi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pcma/package.py b/var/spack/repos/builtin/packages/pcma/package.py index d60d76b5ea..7d4f084402 100644 --- a/var/spack/repos/builtin/packages/pcma/package.py +++ b/var/spack/repos/builtin/packages/pcma/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pcre/package.py b/var/spack/repos/builtin/packages/pcre/package.py index 410beedea2..32d61f10af 100644 --- a/var/spack/repos/builtin/packages/pcre/package.py +++ b/var/spack/repos/builtin/packages/pcre/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pcre2/package.py b/var/spack/repos/builtin/packages/pcre2/package.py index 3a624db048..855696dbf3 100644 --- a/var/spack/repos/builtin/packages/pcre2/package.py +++ b/var/spack/repos/builtin/packages/pcre2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pdf2svg/package.py b/var/spack/repos/builtin/packages/pdf2svg/package.py index 40626e2700..7253d498c2 100644 --- a/var/spack/repos/builtin/packages/pdf2svg/package.py +++ b/var/spack/repos/builtin/packages/pdf2svg/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pdftk/package.py b/var/spack/repos/builtin/packages/pdftk/package.py index cbce63f039..10179873c7 100644 --- a/var/spack/repos/builtin/packages/pdftk/package.py +++ b/var/spack/repos/builtin/packages/pdftk/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/pdsh/package.py b/var/spack/repos/builtin/packages/pdsh/package.py index 4d9778eb64..353ea081a1 100644 --- a/var/spack/repos/builtin/packages/pdsh/package.py +++ b/var/spack/repos/builtin/packages/pdsh/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pdt/package.py b/var/spack/repos/builtin/packages/pdt/package.py index 660e3e2ee2..503957a6c7 100644 --- a/var/spack/repos/builtin/packages/pdt/package.py +++ b/var/spack/repos/builtin/packages/pdt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os from spack import * diff --git a/var/spack/repos/builtin/packages/pegtl/package.py b/var/spack/repos/builtin/packages/pegtl/package.py index 60fde4896f..b04d65fba2 100644 --- a/var/spack/repos/builtin/packages/pegtl/package.py +++ b/var/spack/repos/builtin/packages/pegtl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pennant/package.py b/var/spack/repos/builtin/packages/pennant/package.py index 3f3fa6a6e2..f8b6c22815 100644 --- a/var/spack/repos/builtin/packages/pennant/package.py +++ b/var/spack/repos/builtin/packages/pennant/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/percept/package.py b/var/spack/repos/builtin/packages/percept/package.py index f3e62dc9f8..40a1d04fc9 100644 --- a/var/spack/repos/builtin/packages/percept/package.py +++ b/var/spack/repos/builtin/packages/percept/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-algorithm-diff/package.py b/var/spack/repos/builtin/packages/perl-algorithm-diff/package.py index 5561f5a512..707651baea 100644 --- a/var/spack/repos/builtin/packages/perl-algorithm-diff/package.py +++ b/var/spack/repos/builtin/packages/perl-algorithm-diff/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-app-cmd/package.py b/var/spack/repos/builtin/packages/perl-app-cmd/package.py index 9bc09ab9f6..3240f053c0 100644 --- a/var/spack/repos/builtin/packages/perl-app-cmd/package.py +++ b/var/spack/repos/builtin/packages/perl-app-cmd/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-array-utils/package.py b/var/spack/repos/builtin/packages/perl-array-utils/package.py index cffaede22a..157cf5c77e 100644 --- a/var/spack/repos/builtin/packages/perl-array-utils/package.py +++ b/var/spack/repos/builtin/packages/perl-array-utils/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-b-hooks-endofscope/package.py b/var/spack/repos/builtin/packages/perl-b-hooks-endofscope/package.py index cefd4ca618..39a48c4ea9 100644 --- a/var/spack/repos/builtin/packages/perl-b-hooks-endofscope/package.py +++ b/var/spack/repos/builtin/packages/perl-b-hooks-endofscope/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-bio-perl/package.py b/var/spack/repos/builtin/packages/perl-bio-perl/package.py index 7b52604988..6f16117b40 100644 --- a/var/spack/repos/builtin/packages/perl-bio-perl/package.py +++ b/var/spack/repos/builtin/packages/perl-bio-perl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import inspect diff --git a/var/spack/repos/builtin/packages/perl-bit-vector/package.py b/var/spack/repos/builtin/packages/perl-bit-vector/package.py index d6b399780b..1e4360a6c7 100644 --- a/var/spack/repos/builtin/packages/perl-bit-vector/package.py +++ b/var/spack/repos/builtin/packages/perl-bit-vector/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-cairo/package.py b/var/spack/repos/builtin/packages/perl-cairo/package.py index 883b27aa83..bda7297118 100644 --- a/var/spack/repos/builtin/packages/perl-cairo/package.py +++ b/var/spack/repos/builtin/packages/perl-cairo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-capture-tiny/package.py b/var/spack/repos/builtin/packages/perl-capture-tiny/package.py index 05f79140cb..6b60946ca5 100644 --- a/var/spack/repos/builtin/packages/perl-capture-tiny/package.py +++ b/var/spack/repos/builtin/packages/perl-capture-tiny/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-carp-clan/package.py b/var/spack/repos/builtin/packages/perl-carp-clan/package.py index c2643de918..d55ac04be5 100644 --- a/var/spack/repos/builtin/packages/perl-carp-clan/package.py +++ b/var/spack/repos/builtin/packages/perl-carp-clan/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-cgi/package.py b/var/spack/repos/builtin/packages/perl-cgi/package.py index 39d0126f71..4d0294293f 100644 --- a/var/spack/repos/builtin/packages/perl-cgi/package.py +++ b/var/spack/repos/builtin/packages/perl-cgi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-class-data-inheritable/package.py b/var/spack/repos/builtin/packages/perl-class-data-inheritable/package.py index dc87c5b56f..951d254395 100644 --- a/var/spack/repos/builtin/packages/perl-class-data-inheritable/package.py +++ b/var/spack/repos/builtin/packages/perl-class-data-inheritable/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-class-inspector/package.py b/var/spack/repos/builtin/packages/perl-class-inspector/package.py index 6fbce7adf6..7bbd3cbbe3 100644 --- a/var/spack/repos/builtin/packages/perl-class-inspector/package.py +++ b/var/spack/repos/builtin/packages/perl-class-inspector/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-class-load-xs/package.py b/var/spack/repos/builtin/packages/perl-class-load-xs/package.py index 278eaf457a..a6a21821e8 100644 --- a/var/spack/repos/builtin/packages/perl-class-load-xs/package.py +++ b/var/spack/repos/builtin/packages/perl-class-load-xs/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-class-load/package.py b/var/spack/repos/builtin/packages/perl-class-load/package.py index 9f21cfe6f6..2c5b91ebf9 100644 --- a/var/spack/repos/builtin/packages/perl-class-load/package.py +++ b/var/spack/repos/builtin/packages/perl-class-load/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-compress-raw-bzip2/package.py b/var/spack/repos/builtin/packages/perl-compress-raw-bzip2/package.py index 1d836ce93f..fe7e47f2f4 100644 --- a/var/spack/repos/builtin/packages/perl-compress-raw-bzip2/package.py +++ b/var/spack/repos/builtin/packages/perl-compress-raw-bzip2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-compress-raw-zlib/package.py b/var/spack/repos/builtin/packages/perl-compress-raw-zlib/package.py index 35784f7c3d..215554ef97 100644 --- a/var/spack/repos/builtin/packages/perl-compress-raw-zlib/package.py +++ b/var/spack/repos/builtin/packages/perl-compress-raw-zlib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-contextual-return/package.py b/var/spack/repos/builtin/packages/perl-contextual-return/package.py index fe8e271f8a..752e807eab 100644 --- a/var/spack/repos/builtin/packages/perl-contextual-return/package.py +++ b/var/spack/repos/builtin/packages/perl-contextual-return/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-cpan-meta-check/package.py b/var/spack/repos/builtin/packages/perl-cpan-meta-check/package.py index 1012c29e5f..b1743bcd2a 100644 --- a/var/spack/repos/builtin/packages/perl-cpan-meta-check/package.py +++ b/var/spack/repos/builtin/packages/perl-cpan-meta-check/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-data-optlist/package.py b/var/spack/repos/builtin/packages/perl-data-optlist/package.py index 1503866488..acc3b0cc94 100644 --- a/var/spack/repos/builtin/packages/perl-data-optlist/package.py +++ b/var/spack/repos/builtin/packages/perl-data-optlist/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-data-stag/package.py b/var/spack/repos/builtin/packages/perl-data-stag/package.py index b93888dddc..0af9e0f25f 100644 --- a/var/spack/repos/builtin/packages/perl-data-stag/package.py +++ b/var/spack/repos/builtin/packages/perl-data-stag/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-dbd-mysql/package.py b/var/spack/repos/builtin/packages/perl-dbd-mysql/package.py index 24402d5426..81f6134814 100644 --- a/var/spack/repos/builtin/packages/perl-dbd-mysql/package.py +++ b/var/spack/repos/builtin/packages/perl-dbd-mysql/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-dbd-sqlite/package.py b/var/spack/repos/builtin/packages/perl-dbd-sqlite/package.py index 20935c1158..6c8bd95ad7 100644 --- a/var/spack/repos/builtin/packages/perl-dbd-sqlite/package.py +++ b/var/spack/repos/builtin/packages/perl-dbd-sqlite/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-dbfile/package.py b/var/spack/repos/builtin/packages/perl-dbfile/package.py index 0f6d894a4f..e1c5ba0df7 100644 --- a/var/spack/repos/builtin/packages/perl-dbfile/package.py +++ b/var/spack/repos/builtin/packages/perl-dbfile/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-dbi/package.py b/var/spack/repos/builtin/packages/perl-dbi/package.py index d96edd5072..694aee138a 100644 --- a/var/spack/repos/builtin/packages/perl-dbi/package.py +++ b/var/spack/repos/builtin/packages/perl-dbi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-devel-cycle/package.py b/var/spack/repos/builtin/packages/perl-devel-cycle/package.py index b8f6354513..061b71350c 100644 --- a/var/spack/repos/builtin/packages/perl-devel-cycle/package.py +++ b/var/spack/repos/builtin/packages/perl-devel-cycle/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-devel-globaldestruction/package.py b/var/spack/repos/builtin/packages/perl-devel-globaldestruction/package.py index ed65d5641e..297a770dd1 100644 --- a/var/spack/repos/builtin/packages/perl-devel-globaldestruction/package.py +++ b/var/spack/repos/builtin/packages/perl-devel-globaldestruction/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-devel-overloadinfo/package.py b/var/spack/repos/builtin/packages/perl-devel-overloadinfo/package.py index eac454c8bc..3499660c94 100644 --- a/var/spack/repos/builtin/packages/perl-devel-overloadinfo/package.py +++ b/var/spack/repos/builtin/packages/perl-devel-overloadinfo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-devel-stacktrace/package.py b/var/spack/repos/builtin/packages/perl-devel-stacktrace/package.py index ac3d8176d8..2e366a2c1a 100644 --- a/var/spack/repos/builtin/packages/perl-devel-stacktrace/package.py +++ b/var/spack/repos/builtin/packages/perl-devel-stacktrace/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-digest-md5/package.py b/var/spack/repos/builtin/packages/perl-digest-md5/package.py index 496f1be080..5466bd2078 100644 --- a/var/spack/repos/builtin/packages/perl-digest-md5/package.py +++ b/var/spack/repos/builtin/packages/perl-digest-md5/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-dist-checkconflicts/package.py b/var/spack/repos/builtin/packages/perl-dist-checkconflicts/package.py index 319159172d..f545b9845e 100644 --- a/var/spack/repos/builtin/packages/perl-dist-checkconflicts/package.py +++ b/var/spack/repos/builtin/packages/perl-dist-checkconflicts/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-encode-locale/package.py b/var/spack/repos/builtin/packages/perl-encode-locale/package.py index 785194fe04..f052970435 100644 --- a/var/spack/repos/builtin/packages/perl-encode-locale/package.py +++ b/var/spack/repos/builtin/packages/perl-encode-locale/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-eval-closure/package.py b/var/spack/repos/builtin/packages/perl-eval-closure/package.py index 7e20a6e08d..5134ddaea6 100644 --- a/var/spack/repos/builtin/packages/perl-eval-closure/package.py +++ b/var/spack/repos/builtin/packages/perl-eval-closure/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-exception-class/package.py b/var/spack/repos/builtin/packages/perl-exception-class/package.py index d3bba5b06c..2877352b3e 100644 --- a/var/spack/repos/builtin/packages/perl-exception-class/package.py +++ b/var/spack/repos/builtin/packages/perl-exception-class/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-exporter-tiny/package.py b/var/spack/repos/builtin/packages/perl-exporter-tiny/package.py index 3a1eac1680..cea49dbba3 100644 --- a/var/spack/repos/builtin/packages/perl-exporter-tiny/package.py +++ b/var/spack/repos/builtin/packages/perl-exporter-tiny/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-extutils-depends/package.py b/var/spack/repos/builtin/packages/perl-extutils-depends/package.py index 265996a798..d837ca9386 100644 --- a/var/spack/repos/builtin/packages/perl-extutils-depends/package.py +++ b/var/spack/repos/builtin/packages/perl-extutils-depends/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-extutils-makemaker/package.py b/var/spack/repos/builtin/packages/perl-extutils-makemaker/package.py index 5245ddb69b..248056bc18 100644 --- a/var/spack/repos/builtin/packages/perl-extutils-makemaker/package.py +++ b/var/spack/repos/builtin/packages/perl-extutils-makemaker/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py b/var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py index a1496dbd0b..1d1e4427cc 100644 --- a/var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py +++ b/var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-file-copy-recursive/package.py b/var/spack/repos/builtin/packages/perl-file-copy-recursive/package.py index 75b2df580d..4a39f17318 100644 --- a/var/spack/repos/builtin/packages/perl-file-copy-recursive/package.py +++ b/var/spack/repos/builtin/packages/perl-file-copy-recursive/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-file-listing/package.py b/var/spack/repos/builtin/packages/perl-file-listing/package.py index 963a1f628c..7907b8df1f 100644 --- a/var/spack/repos/builtin/packages/perl-file-listing/package.py +++ b/var/spack/repos/builtin/packages/perl-file-listing/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-file-pushd/package.py b/var/spack/repos/builtin/packages/perl-file-pushd/package.py index 9e06788f67..5cea0aed7b 100644 --- a/var/spack/repos/builtin/packages/perl-file-pushd/package.py +++ b/var/spack/repos/builtin/packages/perl-file-pushd/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-file-sharedir-install/package.py b/var/spack/repos/builtin/packages/perl-file-sharedir-install/package.py index f7077eff78..294342c1ec 100644 --- a/var/spack/repos/builtin/packages/perl-file-sharedir-install/package.py +++ b/var/spack/repos/builtin/packages/perl-file-sharedir-install/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-file-slurp-tiny/package.py b/var/spack/repos/builtin/packages/perl-file-slurp-tiny/package.py index d8ec968e47..dd37eb5cb8 100644 --- a/var/spack/repos/builtin/packages/perl-file-slurp-tiny/package.py +++ b/var/spack/repos/builtin/packages/perl-file-slurp-tiny/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-file-slurper/package.py b/var/spack/repos/builtin/packages/perl-file-slurper/package.py index 8128c2487f..45a5fac76a 100644 --- a/var/spack/repos/builtin/packages/perl-file-slurper/package.py +++ b/var/spack/repos/builtin/packages/perl-file-slurper/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-file-which/package.py b/var/spack/repos/builtin/packages/perl-file-which/package.py index ab86a1dbb4..bda5f58262 100644 --- a/var/spack/repos/builtin/packages/perl-file-which/package.py +++ b/var/spack/repos/builtin/packages/perl-file-which/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-font-ttf/package.py b/var/spack/repos/builtin/packages/perl-font-ttf/package.py index 64d29c3602..aa40f10abf 100644 --- a/var/spack/repos/builtin/packages/perl-font-ttf/package.py +++ b/var/spack/repos/builtin/packages/perl-font-ttf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-gd-graph/package.py b/var/spack/repos/builtin/packages/perl-gd-graph/package.py index c745c6f75e..15b8a765ce 100644 --- a/var/spack/repos/builtin/packages/perl-gd-graph/package.py +++ b/var/spack/repos/builtin/packages/perl-gd-graph/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-gd-text/package.py b/var/spack/repos/builtin/packages/perl-gd-text/package.py index 2b7e5cc924..71c4d053e0 100644 --- a/var/spack/repos/builtin/packages/perl-gd-text/package.py +++ b/var/spack/repos/builtin/packages/perl-gd-text/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-gd/package.py b/var/spack/repos/builtin/packages/perl-gd/package.py index 8fe869dc09..8b2367d439 100644 --- a/var/spack/repos/builtin/packages/perl-gd/package.py +++ b/var/spack/repos/builtin/packages/perl-gd/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-gdgraph-histogram/package.py b/var/spack/repos/builtin/packages/perl-gdgraph-histogram/package.py index 134c1994bb..ec632bceb9 100644 --- a/var/spack/repos/builtin/packages/perl-gdgraph-histogram/package.py +++ b/var/spack/repos/builtin/packages/perl-gdgraph-histogram/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-graph-readwrite/package.py b/var/spack/repos/builtin/packages/perl-graph-readwrite/package.py index 2392c8ef62..cb4ffe7251 100644 --- a/var/spack/repos/builtin/packages/perl-graph-readwrite/package.py +++ b/var/spack/repos/builtin/packages/perl-graph-readwrite/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-graph/package.py b/var/spack/repos/builtin/packages/perl-graph/package.py index 0417ac03fa..0bb59195c7 100644 --- a/var/spack/repos/builtin/packages/perl-graph/package.py +++ b/var/spack/repos/builtin/packages/perl-graph/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-html-parser/package.py b/var/spack/repos/builtin/packages/perl-html-parser/package.py index a5b44b99c6..bdf2418437 100644 --- a/var/spack/repos/builtin/packages/perl-html-parser/package.py +++ b/var/spack/repos/builtin/packages/perl-html-parser/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-html-tagset/package.py b/var/spack/repos/builtin/packages/perl-html-tagset/package.py index 674d17df0d..ef838d9369 100644 --- a/var/spack/repos/builtin/packages/perl-html-tagset/package.py +++ b/var/spack/repos/builtin/packages/perl-html-tagset/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-http-cookies/package.py b/var/spack/repos/builtin/packages/perl-http-cookies/package.py index 61dd019cfc..41d5857f6b 100644 --- a/var/spack/repos/builtin/packages/perl-http-cookies/package.py +++ b/var/spack/repos/builtin/packages/perl-http-cookies/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-http-daemon/package.py b/var/spack/repos/builtin/packages/perl-http-daemon/package.py index b3ef7d17c4..7d07ad3637 100644 --- a/var/spack/repos/builtin/packages/perl-http-daemon/package.py +++ b/var/spack/repos/builtin/packages/perl-http-daemon/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-http-date/package.py b/var/spack/repos/builtin/packages/perl-http-date/package.py index a4326753ea..a8a0f53b8a 100644 --- a/var/spack/repos/builtin/packages/perl-http-date/package.py +++ b/var/spack/repos/builtin/packages/perl-http-date/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-http-message/package.py b/var/spack/repos/builtin/packages/perl-http-message/package.py index 49ed80fdf3..4068241c75 100644 --- a/var/spack/repos/builtin/packages/perl-http-message/package.py +++ b/var/spack/repos/builtin/packages/perl-http-message/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-http-negotiate/package.py b/var/spack/repos/builtin/packages/perl-http-negotiate/package.py index f03dd25988..cca1ddc47a 100644 --- a/var/spack/repos/builtin/packages/perl-http-negotiate/package.py +++ b/var/spack/repos/builtin/packages/perl-http-negotiate/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-inline-c/package.py b/var/spack/repos/builtin/packages/perl-inline-c/package.py index 8231150495..c5af6af4b7 100644 --- a/var/spack/repos/builtin/packages/perl-inline-c/package.py +++ b/var/spack/repos/builtin/packages/perl-inline-c/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-inline/package.py b/var/spack/repos/builtin/packages/perl-inline/package.py index 38803b87ed..00ee8c3d9c 100644 --- a/var/spack/repos/builtin/packages/perl-inline/package.py +++ b/var/spack/repos/builtin/packages/perl-inline/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-intervaltree/package.py b/var/spack/repos/builtin/packages/perl-intervaltree/package.py index 33fe2a82db..76b7c4b469 100644 --- a/var/spack/repos/builtin/packages/perl-intervaltree/package.py +++ b/var/spack/repos/builtin/packages/perl-intervaltree/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-io-compress/package.py b/var/spack/repos/builtin/packages/perl-io-compress/package.py index c0eaac5aa4..ed8af2cbbf 100644 --- a/var/spack/repos/builtin/packages/perl-io-compress/package.py +++ b/var/spack/repos/builtin/packages/perl-io-compress/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-io-html/package.py b/var/spack/repos/builtin/packages/perl-io-html/package.py index 00c0f49479..4fed8539bb 100644 --- a/var/spack/repos/builtin/packages/perl-io-html/package.py +++ b/var/spack/repos/builtin/packages/perl-io-html/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-io-sessiondata/package.py b/var/spack/repos/builtin/packages/perl-io-sessiondata/package.py index 53f52eb3bb..426a0afed5 100644 --- a/var/spack/repos/builtin/packages/perl-io-sessiondata/package.py +++ b/var/spack/repos/builtin/packages/perl-io-sessiondata/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-io-socket-ssl/package.py b/var/spack/repos/builtin/packages/perl-io-socket-ssl/package.py index 02364a939f..25df82bf0d 100644 --- a/var/spack/repos/builtin/packages/perl-io-socket-ssl/package.py +++ b/var/spack/repos/builtin/packages/perl-io-socket-ssl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import inspect diff --git a/var/spack/repos/builtin/packages/perl-io-string/package.py b/var/spack/repos/builtin/packages/perl-io-string/package.py index 134ae2711f..2ce98e7627 100644 --- a/var/spack/repos/builtin/packages/perl-io-string/package.py +++ b/var/spack/repos/builtin/packages/perl-io-string/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-json/package.py b/var/spack/repos/builtin/packages/perl-json/package.py index e901799bce..2c0b41dcad 100644 --- a/var/spack/repos/builtin/packages/perl-json/package.py +++ b/var/spack/repos/builtin/packages/perl-json/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-libwww-perl/package.py b/var/spack/repos/builtin/packages/perl-libwww-perl/package.py index bf6a277bb6..93344cc710 100644 --- a/var/spack/repos/builtin/packages/perl-libwww-perl/package.py +++ b/var/spack/repos/builtin/packages/perl-libwww-perl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-list-moreutils/package.py b/var/spack/repos/builtin/packages/perl-list-moreutils/package.py index 051010a50c..6a23032fd1 100644 --- a/var/spack/repos/builtin/packages/perl-list-moreutils/package.py +++ b/var/spack/repos/builtin/packages/perl-list-moreutils/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-log-log4perl/package.py b/var/spack/repos/builtin/packages/perl-log-log4perl/package.py index 5307cd18fd..dabb293e13 100644 --- a/var/spack/repos/builtin/packages/perl-log-log4perl/package.py +++ b/var/spack/repos/builtin/packages/perl-log-log4perl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-lwp-mediatypes/package.py b/var/spack/repos/builtin/packages/perl-lwp-mediatypes/package.py index ce946ba2aa..6955add7fe 100644 --- a/var/spack/repos/builtin/packages/perl-lwp-mediatypes/package.py +++ b/var/spack/repos/builtin/packages/perl-lwp-mediatypes/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-lwp-protocol-https/package.py b/var/spack/repos/builtin/packages/perl-lwp-protocol-https/package.py index 40d38e3cb2..200bd7700c 100644 --- a/var/spack/repos/builtin/packages/perl-lwp-protocol-https/package.py +++ b/var/spack/repos/builtin/packages/perl-lwp-protocol-https/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-lwp/package.py b/var/spack/repos/builtin/packages/perl-lwp/package.py index ba12bc5ec3..7d00186250 100644 --- a/var/spack/repos/builtin/packages/perl-lwp/package.py +++ b/var/spack/repos/builtin/packages/perl-lwp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-math-cdf/package.py b/var/spack/repos/builtin/packages/perl-math-cdf/package.py index b08737c046..509b916868 100644 --- a/var/spack/repos/builtin/packages/perl-math-cdf/package.py +++ b/var/spack/repos/builtin/packages/perl-math-cdf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-math-cephes/package.py b/var/spack/repos/builtin/packages/perl-math-cephes/package.py index d4baa23e3f..4b5899271e 100644 --- a/var/spack/repos/builtin/packages/perl-math-cephes/package.py +++ b/var/spack/repos/builtin/packages/perl-math-cephes/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-math-matrixreal/package.py b/var/spack/repos/builtin/packages/perl-math-matrixreal/package.py index 860351bc5e..54d57d564e 100644 --- a/var/spack/repos/builtin/packages/perl-math-matrixreal/package.py +++ b/var/spack/repos/builtin/packages/perl-math-matrixreal/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-module-build/package.py b/var/spack/repos/builtin/packages/perl-module-build/package.py index bed9815ddf..cfe492c9e0 100644 --- a/var/spack/repos/builtin/packages/perl-module-build/package.py +++ b/var/spack/repos/builtin/packages/perl-module-build/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # from spack import * diff --git a/var/spack/repos/builtin/packages/perl-module-implementation/package.py b/var/spack/repos/builtin/packages/perl-module-implementation/package.py index e0facbf2e4..ca8c2be284 100644 --- a/var/spack/repos/builtin/packages/perl-module-implementation/package.py +++ b/var/spack/repos/builtin/packages/perl-module-implementation/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-module-runtime-conflicts/package.py b/var/spack/repos/builtin/packages/perl-module-runtime-conflicts/package.py index cd2d5c9a82..d3e8c6757f 100644 --- a/var/spack/repos/builtin/packages/perl-module-runtime-conflicts/package.py +++ b/var/spack/repos/builtin/packages/perl-module-runtime-conflicts/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-module-runtime/package.py b/var/spack/repos/builtin/packages/perl-module-runtime/package.py index 9fad6c1d00..b694f2eeed 100644 --- a/var/spack/repos/builtin/packages/perl-module-runtime/package.py +++ b/var/spack/repos/builtin/packages/perl-module-runtime/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-moose/package.py b/var/spack/repos/builtin/packages/perl-moose/package.py index 7854e834de..25c5402691 100644 --- a/var/spack/repos/builtin/packages/perl-moose/package.py +++ b/var/spack/repos/builtin/packages/perl-moose/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-mozilla-ca/package.py b/var/spack/repos/builtin/packages/perl-mozilla-ca/package.py index 9334a77e14..6ab7f85ade 100644 --- a/var/spack/repos/builtin/packages/perl-mozilla-ca/package.py +++ b/var/spack/repos/builtin/packages/perl-mozilla-ca/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-mro-compat/package.py b/var/spack/repos/builtin/packages/perl-mro-compat/package.py index ae982a2eb9..be1b7ec3a5 100644 --- a/var/spack/repos/builtin/packages/perl-mro-compat/package.py +++ b/var/spack/repos/builtin/packages/perl-mro-compat/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-namespace-clean/package.py b/var/spack/repos/builtin/packages/perl-namespace-clean/package.py index cff5b92800..fec8be732e 100644 --- a/var/spack/repos/builtin/packages/perl-namespace-clean/package.py +++ b/var/spack/repos/builtin/packages/perl-namespace-clean/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-net-http/package.py b/var/spack/repos/builtin/packages/perl-net-http/package.py index dd3bd2b640..272ce07bb0 100644 --- a/var/spack/repos/builtin/packages/perl-net-http/package.py +++ b/var/spack/repos/builtin/packages/perl-net-http/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-net-scp-expect/package.py b/var/spack/repos/builtin/packages/perl-net-scp-expect/package.py index 5e07199158..5969f63a4b 100644 --- a/var/spack/repos/builtin/packages/perl-net-scp-expect/package.py +++ b/var/spack/repos/builtin/packages/perl-net-scp-expect/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-net-ssleay/package.py b/var/spack/repos/builtin/packages/perl-net-ssleay/package.py index 390439bc3f..5f84ceebfb 100644 --- a/var/spack/repos/builtin/packages/perl-net-ssleay/package.py +++ b/var/spack/repos/builtin/packages/perl-net-ssleay/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import inspect diff --git a/var/spack/repos/builtin/packages/perl-package-deprecationmanager/package.py b/var/spack/repos/builtin/packages/perl-package-deprecationmanager/package.py index dc6d8da1b9..ba07697509 100644 --- a/var/spack/repos/builtin/packages/perl-package-deprecationmanager/package.py +++ b/var/spack/repos/builtin/packages/perl-package-deprecationmanager/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-package-stash-xs/package.py b/var/spack/repos/builtin/packages/perl-package-stash-xs/package.py index e57058547e..9dd65c9fb3 100644 --- a/var/spack/repos/builtin/packages/perl-package-stash-xs/package.py +++ b/var/spack/repos/builtin/packages/perl-package-stash-xs/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-package-stash/package.py b/var/spack/repos/builtin/packages/perl-package-stash/package.py index cc4a2d6fd9..9f772e5196 100644 --- a/var/spack/repos/builtin/packages/perl-package-stash/package.py +++ b/var/spack/repos/builtin/packages/perl-package-stash/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-padwalker/package.py b/var/spack/repos/builtin/packages/perl-padwalker/package.py index 7ca73bdf74..f9e028e35d 100644 --- a/var/spack/repos/builtin/packages/perl-padwalker/package.py +++ b/var/spack/repos/builtin/packages/perl-padwalker/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-parallel-forkmanager/package.py b/var/spack/repos/builtin/packages/perl-parallel-forkmanager/package.py index 38e54e1d1b..46cb34f99f 100644 --- a/var/spack/repos/builtin/packages/perl-parallel-forkmanager/package.py +++ b/var/spack/repos/builtin/packages/perl-parallel-forkmanager/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-params-util/package.py b/var/spack/repos/builtin/packages/perl-params-util/package.py index ca58b78418..503b276a6c 100644 --- a/var/spack/repos/builtin/packages/perl-params-util/package.py +++ b/var/spack/repos/builtin/packages/perl-params-util/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-parse-recdescent/package.py b/var/spack/repos/builtin/packages/perl-parse-recdescent/package.py index 55a77f6980..a9623c453a 100644 --- a/var/spack/repos/builtin/packages/perl-parse-recdescent/package.py +++ b/var/spack/repos/builtin/packages/perl-parse-recdescent/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-pdf-api2/package.py b/var/spack/repos/builtin/packages/perl-pdf-api2/package.py index 0cf9e9b25f..6322e13558 100644 --- a/var/spack/repos/builtin/packages/perl-pdf-api2/package.py +++ b/var/spack/repos/builtin/packages/perl-pdf-api2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-pegex/package.py b/var/spack/repos/builtin/packages/perl-pegex/package.py index a9aca782d8..62015d2682 100644 --- a/var/spack/repos/builtin/packages/perl-pegex/package.py +++ b/var/spack/repos/builtin/packages/perl-pegex/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-perl4-corelibs/package.py b/var/spack/repos/builtin/packages/perl-perl4-corelibs/package.py index d7d0c9cc18..cd4f4d1d4e 100644 --- a/var/spack/repos/builtin/packages/perl-perl4-corelibs/package.py +++ b/var/spack/repos/builtin/packages/perl-perl4-corelibs/package.py @@ -1,27 +1,7 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * diff --git a/var/spack/repos/builtin/packages/perl-perl6-slurp/package.py b/var/spack/repos/builtin/packages/perl-perl6-slurp/package.py index 6256affb4e..69721a7d04 100644 --- a/var/spack/repos/builtin/packages/perl-perl6-slurp/package.py +++ b/var/spack/repos/builtin/packages/perl-perl6-slurp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-perlio-gzip/package.py b/var/spack/repos/builtin/packages/perl-perlio-gzip/package.py index 9790f6e909..44996865bc 100644 --- a/var/spack/repos/builtin/packages/perl-perlio-gzip/package.py +++ b/var/spack/repos/builtin/packages/perl-perlio-gzip/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-perlio-utf8-strict/package.py b/var/spack/repos/builtin/packages/perl-perlio-utf8-strict/package.py index 67c76973ca..5bd83c8fdc 100644 --- a/var/spack/repos/builtin/packages/perl-perlio-utf8-strict/package.py +++ b/var/spack/repos/builtin/packages/perl-perlio-utf8-strict/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-scalar-util-numeric/package.py b/var/spack/repos/builtin/packages/perl-scalar-util-numeric/package.py index 1b4ecea11e..dbc3e96388 100644 --- a/var/spack/repos/builtin/packages/perl-scalar-util-numeric/package.py +++ b/var/spack/repos/builtin/packages/perl-scalar-util-numeric/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-soap-lite/package.py b/var/spack/repos/builtin/packages/perl-soap-lite/package.py index a2c4e94e38..f6e357a65b 100644 --- a/var/spack/repos/builtin/packages/perl-soap-lite/package.py +++ b/var/spack/repos/builtin/packages/perl-soap-lite/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-star-fusion/package.py b/var/spack/repos/builtin/packages/perl-star-fusion/package.py index 7de2950da2..4c137739d5 100644 --- a/var/spack/repos/builtin/packages/perl-star-fusion/package.py +++ b/var/spack/repos/builtin/packages/perl-star-fusion/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from glob import glob diff --git a/var/spack/repos/builtin/packages/perl-statistics-descriptive/package.py b/var/spack/repos/builtin/packages/perl-statistics-descriptive/package.py index 9cceaf6c39..e35bca37c0 100644 --- a/var/spack/repos/builtin/packages/perl-statistics-descriptive/package.py +++ b/var/spack/repos/builtin/packages/perl-statistics-descriptive/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-statistics-pca/package.py b/var/spack/repos/builtin/packages/perl-statistics-pca/package.py index 7ef7ca5eb6..cd2e6844a6 100644 --- a/var/spack/repos/builtin/packages/perl-statistics-pca/package.py +++ b/var/spack/repos/builtin/packages/perl-statistics-pca/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-sub-exporter-progressive/package.py b/var/spack/repos/builtin/packages/perl-sub-exporter-progressive/package.py index 175b912328..88930215ef 100644 --- a/var/spack/repos/builtin/packages/perl-sub-exporter-progressive/package.py +++ b/var/spack/repos/builtin/packages/perl-sub-exporter-progressive/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-sub-exporter/package.py b/var/spack/repos/builtin/packages/perl-sub-exporter/package.py index e0aecf359c..184af5ccda 100644 --- a/var/spack/repos/builtin/packages/perl-sub-exporter/package.py +++ b/var/spack/repos/builtin/packages/perl-sub-exporter/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-sub-identify/package.py b/var/spack/repos/builtin/packages/perl-sub-identify/package.py index c985ee4d69..6970774946 100644 --- a/var/spack/repos/builtin/packages/perl-sub-identify/package.py +++ b/var/spack/repos/builtin/packages/perl-sub-identify/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-sub-install/package.py b/var/spack/repos/builtin/packages/perl-sub-install/package.py index 2e552d5c37..ee0088d3c0 100644 --- a/var/spack/repos/builtin/packages/perl-sub-install/package.py +++ b/var/spack/repos/builtin/packages/perl-sub-install/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-sub-name/package.py b/var/spack/repos/builtin/packages/perl-sub-name/package.py index 2022fb5dca..82d4606fff 100644 --- a/var/spack/repos/builtin/packages/perl-sub-name/package.py +++ b/var/spack/repos/builtin/packages/perl-sub-name/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-sub-uplevel/package.py b/var/spack/repos/builtin/packages/perl-sub-uplevel/package.py index 7a71db1267..46f4b4f68b 100644 --- a/var/spack/repos/builtin/packages/perl-sub-uplevel/package.py +++ b/var/spack/repos/builtin/packages/perl-sub-uplevel/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-svg/package.py b/var/spack/repos/builtin/packages/perl-svg/package.py index 0d5fa2f121..6152c8395e 100644 --- a/var/spack/repos/builtin/packages/perl-svg/package.py +++ b/var/spack/repos/builtin/packages/perl-svg/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-swissknife/package.py b/var/spack/repos/builtin/packages/perl-swissknife/package.py index 29ee522456..6f0a105b4c 100644 --- a/var/spack/repos/builtin/packages/perl-swissknife/package.py +++ b/var/spack/repos/builtin/packages/perl-swissknife/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-task-weaken/package.py b/var/spack/repos/builtin/packages/perl-task-weaken/package.py index 7dca9cbf35..810ce1dae8 100644 --- a/var/spack/repos/builtin/packages/perl-task-weaken/package.py +++ b/var/spack/repos/builtin/packages/perl-task-weaken/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-term-readkey/package.py b/var/spack/repos/builtin/packages/perl-term-readkey/package.py index be61e12973..fa812f1bf5 100644 --- a/var/spack/repos/builtin/packages/perl-term-readkey/package.py +++ b/var/spack/repos/builtin/packages/perl-term-readkey/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-test-cleannamespaces/package.py b/var/spack/repos/builtin/packages/perl-test-cleannamespaces/package.py index 262da14fed..a80ec687ab 100644 --- a/var/spack/repos/builtin/packages/perl-test-cleannamespaces/package.py +++ b/var/spack/repos/builtin/packages/perl-test-cleannamespaces/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-test-deep/package.py b/var/spack/repos/builtin/packages/perl-test-deep/package.py index 3099b8ec66..94b6edc5cb 100644 --- a/var/spack/repos/builtin/packages/perl-test-deep/package.py +++ b/var/spack/repos/builtin/packages/perl-test-deep/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-test-differences/package.py b/var/spack/repos/builtin/packages/perl-test-differences/package.py index f387875900..10a738737c 100644 --- a/var/spack/repos/builtin/packages/perl-test-differences/package.py +++ b/var/spack/repos/builtin/packages/perl-test-differences/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-test-exception/package.py b/var/spack/repos/builtin/packages/perl-test-exception/package.py index b9546f0128..05ffa21c9e 100644 --- a/var/spack/repos/builtin/packages/perl-test-exception/package.py +++ b/var/spack/repos/builtin/packages/perl-test-exception/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-test-fatal/package.py b/var/spack/repos/builtin/packages/perl-test-fatal/package.py index f3867e4c62..6e7833f291 100644 --- a/var/spack/repos/builtin/packages/perl-test-fatal/package.py +++ b/var/spack/repos/builtin/packages/perl-test-fatal/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-test-memory-cycle/package.py b/var/spack/repos/builtin/packages/perl-test-memory-cycle/package.py index 9cc73c86cc..e8c42e3839 100644 --- a/var/spack/repos/builtin/packages/perl-test-memory-cycle/package.py +++ b/var/spack/repos/builtin/packages/perl-test-memory-cycle/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-test-most/package.py b/var/spack/repos/builtin/packages/perl-test-most/package.py index 1b66f75c65..90aa5cf79c 100644 --- a/var/spack/repos/builtin/packages/perl-test-most/package.py +++ b/var/spack/repos/builtin/packages/perl-test-most/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-test-needs/package.py b/var/spack/repos/builtin/packages/perl-test-needs/package.py index dbea54df32..8d07133156 100644 --- a/var/spack/repos/builtin/packages/perl-test-needs/package.py +++ b/var/spack/repos/builtin/packages/perl-test-needs/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-test-requires/package.py b/var/spack/repos/builtin/packages/perl-test-requires/package.py index 81dc2603cd..bd4c395c68 100644 --- a/var/spack/repos/builtin/packages/perl-test-requires/package.py +++ b/var/spack/repos/builtin/packages/perl-test-requires/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-test-requiresinternet/package.py b/var/spack/repos/builtin/packages/perl-test-requiresinternet/package.py index bbc461fadf..e8f412a74f 100644 --- a/var/spack/repos/builtin/packages/perl-test-requiresinternet/package.py +++ b/var/spack/repos/builtin/packages/perl-test-requiresinternet/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-test-warn/package.py b/var/spack/repos/builtin/packages/perl-test-warn/package.py index 951b108d01..d72aea1349 100644 --- a/var/spack/repos/builtin/packages/perl-test-warn/package.py +++ b/var/spack/repos/builtin/packages/perl-test-warn/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-test-warnings/package.py b/var/spack/repos/builtin/packages/perl-test-warnings/package.py index ba8d921ef2..5d36d5d20f 100644 --- a/var/spack/repos/builtin/packages/perl-test-warnings/package.py +++ b/var/spack/repos/builtin/packages/perl-test-warnings/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-text-csv/package.py b/var/spack/repos/builtin/packages/perl-text-csv/package.py index b032256fed..4f57470fb4 100644 --- a/var/spack/repos/builtin/packages/perl-text-csv/package.py +++ b/var/spack/repos/builtin/packages/perl-text-csv/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-text-diff/package.py b/var/spack/repos/builtin/packages/perl-text-diff/package.py index 26985419fd..2213365571 100644 --- a/var/spack/repos/builtin/packages/perl-text-diff/package.py +++ b/var/spack/repos/builtin/packages/perl-text-diff/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-text-simpletable/package.py b/var/spack/repos/builtin/packages/perl-text-simpletable/package.py index 3c02252354..175d707fc8 100644 --- a/var/spack/repos/builtin/packages/perl-text-simpletable/package.py +++ b/var/spack/repos/builtin/packages/perl-text-simpletable/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-text-soundex/package.py b/var/spack/repos/builtin/packages/perl-text-soundex/package.py index 33de11f788..69ca76f262 100644 --- a/var/spack/repos/builtin/packages/perl-text-soundex/package.py +++ b/var/spack/repos/builtin/packages/perl-text-soundex/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-text-unidecode/package.py b/var/spack/repos/builtin/packages/perl-text-unidecode/package.py index ad04670441..792f8e8e74 100644 --- a/var/spack/repos/builtin/packages/perl-text-unidecode/package.py +++ b/var/spack/repos/builtin/packages/perl-text-unidecode/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-time-hires/package.py b/var/spack/repos/builtin/packages/perl-time-hires/package.py index b2db1d330d..5250614010 100644 --- a/var/spack/repos/builtin/packages/perl-time-hires/package.py +++ b/var/spack/repos/builtin/packages/perl-time-hires/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-time-piece/package.py b/var/spack/repos/builtin/packages/perl-time-piece/package.py index 2e2984a608..fe24c198ac 100644 --- a/var/spack/repos/builtin/packages/perl-time-piece/package.py +++ b/var/spack/repos/builtin/packages/perl-time-piece/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-try-tiny/package.py b/var/spack/repos/builtin/packages/perl-try-tiny/package.py index da604864ab..a985b7e7fb 100644 --- a/var/spack/repos/builtin/packages/perl-try-tiny/package.py +++ b/var/spack/repos/builtin/packages/perl-try-tiny/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-uri-escape/package.py b/var/spack/repos/builtin/packages/perl-uri-escape/package.py index d6cd70d968..64d7ba40fc 100644 --- a/var/spack/repos/builtin/packages/perl-uri-escape/package.py +++ b/var/spack/repos/builtin/packages/perl-uri-escape/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-uri/package.py b/var/spack/repos/builtin/packages/perl-uri/package.py index fa8dfd1e9a..af5fb9a980 100644 --- a/var/spack/repos/builtin/packages/perl-uri/package.py +++ b/var/spack/repos/builtin/packages/perl-uri/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-version/package.py b/var/spack/repos/builtin/packages/perl-version/package.py index 8cbdc2bde0..e9a40018c8 100644 --- a/var/spack/repos/builtin/packages/perl-version/package.py +++ b/var/spack/repos/builtin/packages/perl-version/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-want/package.py b/var/spack/repos/builtin/packages/perl-want/package.py index d61fc68241..acd9e31da2 100644 --- a/var/spack/repos/builtin/packages/perl-want/package.py +++ b/var/spack/repos/builtin/packages/perl-want/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-www-robotrules/package.py b/var/spack/repos/builtin/packages/perl-www-robotrules/package.py index 05006d807d..5f54470821 100644 --- a/var/spack/repos/builtin/packages/perl-www-robotrules/package.py +++ b/var/spack/repos/builtin/packages/perl-www-robotrules/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-xml-parser-lite/package.py b/var/spack/repos/builtin/packages/perl-xml-parser-lite/package.py index cd2bd78c56..f4b7773e21 100644 --- a/var/spack/repos/builtin/packages/perl-xml-parser-lite/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-parser-lite/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-xml-parser/package.py b/var/spack/repos/builtin/packages/perl-xml-parser/package.py index 7544ddf41b..9b04cdd1b3 100644 --- a/var/spack/repos/builtin/packages/perl-xml-parser/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-parser/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # from spack import * diff --git a/var/spack/repos/builtin/packages/perl-xml-simple/package.py b/var/spack/repos/builtin/packages/perl-xml-simple/package.py index dd14ef466e..fa7aed9723 100644 --- a/var/spack/repos/builtin/packages/perl-xml-simple/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-simple/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl-yaml-libyaml/package.py b/var/spack/repos/builtin/packages/perl-yaml-libyaml/package.py index 39c9090dd8..6893e7ac81 100644 --- a/var/spack/repos/builtin/packages/perl-yaml-libyaml/package.py +++ b/var/spack/repos/builtin/packages/perl-yaml-libyaml/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/perl/package.py b/var/spack/repos/builtin/packages/perl/package.py index b2c662cc4f..fd0c4aef17 100644 --- a/var/spack/repos/builtin/packages/perl/package.py +++ b/var/spack/repos/builtin/packages/perl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # # Author: Milton Woods # Date: March 22, 2017 diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index 7823afdcd0..8be5d8cce5 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import sys diff --git a/var/spack/repos/builtin/packages/pexsi/package.py b/var/spack/repos/builtin/packages/pexsi/package.py index 931f951a09..fa93fac715 100644 --- a/var/spack/repos/builtin/packages/pexsi/package.py +++ b/var/spack/repos/builtin/packages/pexsi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import inspect import os.path diff --git a/var/spack/repos/builtin/packages/pfft/package.py b/var/spack/repos/builtin/packages/pfft/package.py index 4dd2cdb0ef..4121d90caa 100644 --- a/var/spack/repos/builtin/packages/pfft/package.py +++ b/var/spack/repos/builtin/packages/pfft/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pflotran/package.py b/var/spack/repos/builtin/packages/pflotran/package.py index e81139d59c..73f95f75f7 100644 --- a/var/spack/repos/builtin/packages/pflotran/package.py +++ b/var/spack/repos/builtin/packages/pflotran/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pfunit/package.py b/var/spack/repos/builtin/packages/pfunit/package.py index e24b1c27d9..e9faaaebbf 100644 --- a/var/spack/repos/builtin/packages/pfunit/package.py +++ b/var/spack/repos/builtin/packages/pfunit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # from spack import * import glob diff --git a/var/spack/repos/builtin/packages/pgdspider/package.py b/var/spack/repos/builtin/packages/pgdspider/package.py index cf7081f531..5a4dab9516 100644 --- a/var/spack/repos/builtin/packages/pgdspider/package.py +++ b/var/spack/repos/builtin/packages/pgdspider/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os.path diff --git a/var/spack/repos/builtin/packages/pgi/package.py b/var/spack/repos/builtin/packages/pgi/package.py index 5c4f023b0a..47242e4ecd 100644 --- a/var/spack/repos/builtin/packages/pgi/package.py +++ b/var/spack/repos/builtin/packages/pgi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from spack.util.prefix import Prefix import os diff --git a/var/spack/repos/builtin/packages/pgmath/package.py b/var/spack/repos/builtin/packages/pgmath/package.py index b17bfb7c05..7b4f98be5e 100644 --- a/var/spack/repos/builtin/packages/pgmath/package.py +++ b/var/spack/repos/builtin/packages/pgmath/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2018, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/phantompeakqualtools/package.py b/var/spack/repos/builtin/packages/phantompeakqualtools/package.py index 9396941624..118d7032c9 100644 --- a/var/spack/repos/builtin/packages/phantompeakqualtools/package.py +++ b/var/spack/repos/builtin/packages/phantompeakqualtools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/phast/package.py b/var/spack/repos/builtin/packages/phast/package.py index 2973c8720c..503246614c 100644 --- a/var/spack/repos/builtin/packages/phast/package.py +++ b/var/spack/repos/builtin/packages/phast/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/phasta/package.py b/var/spack/repos/builtin/packages/phasta/package.py index 24f97c5c66..2243281b5a 100644 --- a/var/spack/repos/builtin/packages/phasta/package.py +++ b/var/spack/repos/builtin/packages/phasta/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/phist/package.py b/var/spack/repos/builtin/packages/phist/package.py index 692bf8ae32..f70fca2a46 100644 --- a/var/spack/repos/builtin/packages/phist/package.py +++ b/var/spack/repos/builtin/packages/phist/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/phylip/package.py b/var/spack/repos/builtin/packages/phylip/package.py index 1a1a92cb35..8869f75390 100644 --- a/var/spack/repos/builtin/packages/phylip/package.py +++ b/var/spack/repos/builtin/packages/phylip/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/picard/package.py b/var/spack/repos/builtin/packages/picard/package.py index 6cab04e592..86c6cd6e90 100644 --- a/var/spack/repos/builtin/packages/picard/package.py +++ b/var/spack/repos/builtin/packages/picard/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob import os.path diff --git a/var/spack/repos/builtin/packages/picsar/package.py b/var/spack/repos/builtin/packages/picsar/package.py index eb15a6ae8b..234b5ee856 100644 --- a/var/spack/repos/builtin/packages/picsar/package.py +++ b/var/spack/repos/builtin/packages/picsar/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/picsarlite/package.py b/var/spack/repos/builtin/packages/picsarlite/package.py index 9a3280001e..5a5b5b58b2 100644 --- a/var/spack/repos/builtin/packages/picsarlite/package.py +++ b/var/spack/repos/builtin/packages/picsarlite/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2018, Los Alamos National Security, LLC. -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pidx/package.py b/var/spack/repos/builtin/packages/pidx/package.py index c8d130c1ad..9aaf021de5 100644 --- a/var/spack/repos/builtin/packages/pidx/package.py +++ b/var/spack/repos/builtin/packages/pidx/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pigz/package.py b/var/spack/repos/builtin/packages/pigz/package.py index 993ae37dd2..4b8eae6936 100644 --- a/var/spack/repos/builtin/packages/pigz/package.py +++ b/var/spack/repos/builtin/packages/pigz/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pilon/package.py b/var/spack/repos/builtin/packages/pilon/package.py index 0fec636fba..afcdfd4a44 100644 --- a/var/spack/repos/builtin/packages/pilon/package.py +++ b/var/spack/repos/builtin/packages/pilon/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os.path diff --git a/var/spack/repos/builtin/packages/pindel/package.py b/var/spack/repos/builtin/packages/pindel/package.py index d0acc28472..7755fdd8aa 100644 --- a/var/spack/repos/builtin/packages/pindel/package.py +++ b/var/spack/repos/builtin/packages/pindel/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/piranha/package.py b/var/spack/repos/builtin/packages/piranha/package.py index aaf4102dbb..8488e826a4 100644 --- a/var/spack/repos/builtin/packages/piranha/package.py +++ b/var/spack/repos/builtin/packages/piranha/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pism/package.py b/var/spack/repos/builtin/packages/pism/package.py index 33e76e1aa5..6eedcbced3 100644 --- a/var/spack/repos/builtin/packages/pism/package.py +++ b/var/spack/repos/builtin/packages/pism/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pixman/package.py b/var/spack/repos/builtin/packages/pixman/package.py index 7714120049..d3e8661dd2 100644 --- a/var/spack/repos/builtin/packages/pixman/package.py +++ b/var/spack/repos/builtin/packages/pixman/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/pkg-config/package.py b/var/spack/repos/builtin/packages/pkg-config/package.py index d89c32c47c..a27df03b40 100644 --- a/var/spack/repos/builtin/packages/pkg-config/package.py +++ b/var/spack/repos/builtin/packages/pkg-config/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pkgconf/package.py b/var/spack/repos/builtin/packages/pkgconf/package.py index e6961d5424..742713c0ff 100644 --- a/var/spack/repos/builtin/packages/pkgconf/package.py +++ b/var/spack/repos/builtin/packages/pkgconf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/planck-likelihood/package.py b/var/spack/repos/builtin/packages/planck-likelihood/package.py index 1a17bf917a..0b04aec89f 100644 --- a/var/spack/repos/builtin/packages/planck-likelihood/package.py +++ b/var/spack/repos/builtin/packages/planck-likelihood/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/plasma/package.py b/var/spack/repos/builtin/packages/plasma/package.py index 907857aace..6fb436bc48 100644 --- a/var/spack/repos/builtin/packages/plasma/package.py +++ b/var/spack/repos/builtin/packages/plasma/package.py @@ -1,13 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Innovative Computing Laboratory -# Produced at the Innovative Computing Laboratory. -# -# Created by Piotr Luszczek, luszczek@icl.utk.edu, All rights reserved. -# -# For details, see https://github.com/spack/spack -# -############################################################################## +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/platypus/package.py b/var/spack/repos/builtin/packages/platypus/package.py index c0812851c0..7ef22abc74 100644 --- a/var/spack/repos/builtin/packages/platypus/package.py +++ b/var/spack/repos/builtin/packages/platypus/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/plink/package.py b/var/spack/repos/builtin/packages/plink/package.py index 7a6c47d47c..2f571e25e4 100644 --- a/var/spack/repos/builtin/packages/plink/package.py +++ b/var/spack/repos/builtin/packages/plink/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/plplot/package.py b/var/spack/repos/builtin/packages/plplot/package.py index e6aabc1ce5..5e0d23b930 100644 --- a/var/spack/repos/builtin/packages/plplot/package.py +++ b/var/spack/repos/builtin/packages/plplot/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/plumed/package.py b/var/spack/repos/builtin/packages/plumed/package.py index ff5b1cf151..9c438f25a9 100644 --- a/var/spack/repos/builtin/packages/plumed/package.py +++ b/var/spack/repos/builtin/packages/plumed/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import collections from spack import * diff --git a/var/spack/repos/builtin/packages/pmgr-collective/package.py b/var/spack/repos/builtin/packages/pmgr-collective/package.py index 0a88e5bf24..ff08d784b1 100644 --- a/var/spack/repos/builtin/packages/pmgr-collective/package.py +++ b/var/spack/repos/builtin/packages/pmgr-collective/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pmix/package.py b/var/spack/repos/builtin/packages/pmix/package.py index 5d29d27cb4..cbedf7a2a6 100644 --- a/var/spack/repos/builtin/packages/pmix/package.py +++ b/var/spack/repos/builtin/packages/pmix/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import spack.architecture diff --git a/var/spack/repos/builtin/packages/pnfft/package.py b/var/spack/repos/builtin/packages/pnfft/package.py index 7212a2c1af..d34104669d 100644 --- a/var/spack/repos/builtin/packages/pnfft/package.py +++ b/var/spack/repos/builtin/packages/pnfft/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pngwriter/package.py b/var/spack/repos/builtin/packages/pngwriter/package.py index f65b0d8cd3..76f4553826 100644 --- a/var/spack/repos/builtin/packages/pngwriter/package.py +++ b/var/spack/repos/builtin/packages/pngwriter/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pnmpi/package.py b/var/spack/repos/builtin/packages/pnmpi/package.py index 392181ef1d..0d483724ba 100644 --- a/var/spack/repos/builtin/packages/pnmpi/package.py +++ b/var/spack/repos/builtin/packages/pnmpi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/poamsa/package.py b/var/spack/repos/builtin/packages/poamsa/package.py index f313c14b06..e109e39423 100644 --- a/var/spack/repos/builtin/packages/poamsa/package.py +++ b/var/spack/repos/builtin/packages/poamsa/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pocl/package.py b/var/spack/repos/builtin/packages/pocl/package.py index 4726d5809a..c020dd9cf6 100644 --- a/var/spack/repos/builtin/packages/pocl/package.py +++ b/var/spack/repos/builtin/packages/pocl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os from spack import * diff --git a/var/spack/repos/builtin/packages/polymake/package.py b/var/spack/repos/builtin/packages/polymake/package.py index a66db97459..62e7013e5a 100644 --- a/var/spack/repos/builtin/packages/polymake/package.py +++ b/var/spack/repos/builtin/packages/polymake/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/poppler-data/package.py b/var/spack/repos/builtin/packages/poppler-data/package.py index 76052bc530..3bb5ba3e34 100644 --- a/var/spack/repos/builtin/packages/poppler-data/package.py +++ b/var/spack/repos/builtin/packages/poppler-data/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/poppler/package.py b/var/spack/repos/builtin/packages/poppler/package.py index 03ad826327..653dd2e96d 100644 --- a/var/spack/repos/builtin/packages/poppler/package.py +++ b/var/spack/repos/builtin/packages/poppler/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/porta/package.py b/var/spack/repos/builtin/packages/porta/package.py index 9f469a8529..e43374933d 100644 --- a/var/spack/repos/builtin/packages/porta/package.py +++ b/var/spack/repos/builtin/packages/porta/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/portage/package.py b/var/spack/repos/builtin/packages/portage/package.py index ed7667f308..f423551243 100644 --- a/var/spack/repos/builtin/packages/portage/package.py +++ b/var/spack/repos/builtin/packages/portage/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/portcullis/package.py b/var/spack/repos/builtin/packages/portcullis/package.py index 24ec56fdc3..6a3c334ce5 100644 --- a/var/spack/repos/builtin/packages/portcullis/package.py +++ b/var/spack/repos/builtin/packages/portcullis/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/postgresql/package.py b/var/spack/repos/builtin/packages/postgresql/package.py index 319bcd29b9..ee33e5c55f 100644 --- a/var/spack/repos/builtin/packages/postgresql/package.py +++ b/var/spack/repos/builtin/packages/postgresql/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ppl/package.py b/var/spack/repos/builtin/packages/ppl/package.py index 48231210a0..d2f4eafb7b 100644 --- a/var/spack/repos/builtin/packages/ppl/package.py +++ b/var/spack/repos/builtin/packages/ppl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pplacer/package.py b/var/spack/repos/builtin/packages/pplacer/package.py index bc67736d03..bfcd2f2d7f 100644 --- a/var/spack/repos/builtin/packages/pplacer/package.py +++ b/var/spack/repos/builtin/packages/pplacer/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/prank/package.py b/var/spack/repos/builtin/packages/prank/package.py index 7d34baf695..1dc78db621 100644 --- a/var/spack/repos/builtin/packages/prank/package.py +++ b/var/spack/repos/builtin/packages/prank/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/precice/package.py b/var/spack/repos/builtin/packages/precice/package.py index ef106a74a8..74f78d67aa 100644 --- a/var/spack/repos/builtin/packages/precice/package.py +++ b/var/spack/repos/builtin/packages/precice/package.py @@ -1,26 +1,8 @@ -############################################################################## -# Copyright (c) 2018 Mark Olesen, OpenCFD Ltd. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file was authored by Mark Olesen -# and is released as part of spack under the LGPL license. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for the LLNL notice and LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/presentproto/package.py b/var/spack/repos/builtin/packages/presentproto/package.py index e2cfe6acc3..991db65217 100644 --- a/var/spack/repos/builtin/packages/presentproto/package.py +++ b/var/spack/repos/builtin/packages/presentproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/preseq/package.py b/var/spack/repos/builtin/packages/preseq/package.py index d2992a1230..cbd72ce317 100644 --- a/var/spack/repos/builtin/packages/preseq/package.py +++ b/var/spack/repos/builtin/packages/preseq/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/price/package.py b/var/spack/repos/builtin/packages/price/package.py index 60239ff4c0..8f6f1a1ef6 100644 --- a/var/spack/repos/builtin/packages/price/package.py +++ b/var/spack/repos/builtin/packages/price/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/primer3/package.py b/var/spack/repos/builtin/packages/primer3/package.py index 714610c0f4..cdf17a5677 100644 --- a/var/spack/repos/builtin/packages/primer3/package.py +++ b/var/spack/repos/builtin/packages/primer3/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/prinseq-lite/package.py b/var/spack/repos/builtin/packages/prinseq-lite/package.py index 164044ec96..764a390343 100644 --- a/var/spack/repos/builtin/packages/prinseq-lite/package.py +++ b/var/spack/repos/builtin/packages/prinseq-lite/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/printproto/package.py b/var/spack/repos/builtin/packages/printproto/package.py index 40dca284e4..8eb55fabeb 100644 --- a/var/spack/repos/builtin/packages/printproto/package.py +++ b/var/spack/repos/builtin/packages/printproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/prng/package.py b/var/spack/repos/builtin/packages/prng/package.py index 2b1cde5ce2..3db827fd03 100644 --- a/var/spack/repos/builtin/packages/prng/package.py +++ b/var/spack/repos/builtin/packages/prng/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/probconsrna/package.py b/var/spack/repos/builtin/packages/probconsrna/package.py index 1c2d74c185..31ef7e8b28 100644 --- a/var/spack/repos/builtin/packages/probconsrna/package.py +++ b/var/spack/repos/builtin/packages/probconsrna/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/prodigal/package.py b/var/spack/repos/builtin/packages/prodigal/package.py index 8c619338c7..75ce486f50 100644 --- a/var/spack/repos/builtin/packages/prodigal/package.py +++ b/var/spack/repos/builtin/packages/prodigal/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/proj/package.py b/var/spack/repos/builtin/packages/proj/package.py index 5c017daafe..fe20f4e58a 100644 --- a/var/spack/repos/builtin/packages/proj/package.py +++ b/var/spack/repos/builtin/packages/proj/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/protobuf/package.py b/var/spack/repos/builtin/packages/protobuf/package.py index a430ff2f11..62486aeb58 100644 --- a/var/spack/repos/builtin/packages/protobuf/package.py +++ b/var/spack/repos/builtin/packages/protobuf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import sys from spack import * import spack.util.web diff --git a/var/spack/repos/builtin/packages/proxymngr/package.py b/var/spack/repos/builtin/packages/proxymngr/package.py index 7a35270ce3..6f6e118e22 100644 --- a/var/spack/repos/builtin/packages/proxymngr/package.py +++ b/var/spack/repos/builtin/packages/proxymngr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pruners-ninja/package.py b/var/spack/repos/builtin/packages/pruners-ninja/package.py index 0c7a301c28..0c86c9e2bc 100644 --- a/var/spack/repos/builtin/packages/pruners-ninja/package.py +++ b/var/spack/repos/builtin/packages/pruners-ninja/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ps-lite/package.py b/var/spack/repos/builtin/packages/ps-lite/package.py index e11831eef1..887e126814 100644 --- a/var/spack/repos/builtin/packages/ps-lite/package.py +++ b/var/spack/repos/builtin/packages/ps-lite/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/psi4/package.py b/var/spack/repos/builtin/packages/psi4/package.py index 3358b3bb9f..eb3e7863fe 100644 --- a/var/spack/repos/builtin/packages/psi4/package.py +++ b/var/spack/repos/builtin/packages/psi4/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/pslib/package.py b/var/spack/repos/builtin/packages/pslib/package.py index bb49f9cddf..c15a7f8b83 100644 --- a/var/spack/repos/builtin/packages/pslib/package.py +++ b/var/spack/repos/builtin/packages/pslib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/psm/package.py b/var/spack/repos/builtin/packages/psm/package.py index 7fee9318e1..ba661394f1 100644 --- a/var/spack/repos/builtin/packages/psm/package.py +++ b/var/spack/repos/builtin/packages/psm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/psmc/package.py b/var/spack/repos/builtin/packages/psmc/package.py index bd1f27aa4b..019d664e39 100644 --- a/var/spack/repos/builtin/packages/psmc/package.py +++ b/var/spack/repos/builtin/packages/psmc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pstreams/package.py b/var/spack/repos/builtin/packages/pstreams/package.py index 2bf7fa63c9..8c4ebc5377 100644 --- a/var/spack/repos/builtin/packages/pstreams/package.py +++ b/var/spack/repos/builtin/packages/pstreams/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pugixml/package.py b/var/spack/repos/builtin/packages/pugixml/package.py index 5cab25c3b3..9418cae3e2 100644 --- a/var/spack/repos/builtin/packages/pugixml/package.py +++ b/var/spack/repos/builtin/packages/pugixml/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pumi/package.py b/var/spack/repos/builtin/packages/pumi/package.py index 0e23420c8a..8380564253 100644 --- a/var/spack/repos/builtin/packages/pumi/package.py +++ b/var/spack/repos/builtin/packages/pumi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pv/package.py b/var/spack/repos/builtin/packages/pv/package.py index e241dca24c..8a1e63a735 100644 --- a/var/spack/repos/builtin/packages/pv/package.py +++ b/var/spack/repos/builtin/packages/pv/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2018, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pvm/package.py b/var/spack/repos/builtin/packages/pvm/package.py index ff6677182f..4cb797f52d 100644 --- a/var/spack/repos/builtin/packages/pvm/package.py +++ b/var/spack/repos/builtin/packages/pvm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import subprocess diff --git a/var/spack/repos/builtin/packages/pxz/package.py b/var/spack/repos/builtin/packages/pxz/package.py index 38ebffa629..8cfced300b 100644 --- a/var/spack/repos/builtin/packages/pxz/package.py +++ b/var/spack/repos/builtin/packages/pxz/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-3to2/package.py b/var/spack/repos/builtin/packages/py-3to2/package.py index 103c250b8d..12a3a9fef3 100644 --- a/var/spack/repos/builtin/packages/py-3to2/package.py +++ b/var/spack/repos/builtin/packages/py-3to2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-4suite-xml/package.py b/var/spack/repos/builtin/packages/py-4suite-xml/package.py index 503538c412..872d5e75d0 100644 --- a/var/spack/repos/builtin/packages/py-4suite-xml/package.py +++ b/var/spack/repos/builtin/packages/py-4suite-xml/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-abipy/package.py b/var/spack/repos/builtin/packages/py-abipy/package.py index d141cd774b..1ab1b316ef 100644 --- a/var/spack/repos/builtin/packages/py-abipy/package.py +++ b/var/spack/repos/builtin/packages/py-abipy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-adios/package.py b/var/spack/repos/builtin/packages/py-adios/package.py index 70b9daff32..ff59a71afb 100644 --- a/var/spack/repos/builtin/packages/py-adios/package.py +++ b/var/spack/repos/builtin/packages/py-adios/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-affine/package.py b/var/spack/repos/builtin/packages/py-affine/package.py index 07107fee58..f421d60ae5 100644 --- a/var/spack/repos/builtin/packages/py-affine/package.py +++ b/var/spack/repos/builtin/packages/py-affine/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-alabaster/package.py b/var/spack/repos/builtin/packages/py-alabaster/package.py index edd9c52435..f4268171b6 100644 --- a/var/spack/repos/builtin/packages/py-alabaster/package.py +++ b/var/spack/repos/builtin/packages/py-alabaster/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-apache-libcloud/package.py b/var/spack/repos/builtin/packages/py-apache-libcloud/package.py index a118eca3c5..157c15d592 100644 --- a/var/spack/repos/builtin/packages/py-apache-libcloud/package.py +++ b/var/spack/repos/builtin/packages/py-apache-libcloud/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-apipkg/package.py b/var/spack/repos/builtin/packages/py-apipkg/package.py index 38f1031c50..c2425c334e 100644 --- a/var/spack/repos/builtin/packages/py-apipkg/package.py +++ b/var/spack/repos/builtin/packages/py-apipkg/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-appdirs/package.py b/var/spack/repos/builtin/packages/py-appdirs/package.py index e7a51a3f9c..998b71d6ba 100644 --- a/var/spack/repos/builtin/packages/py-appdirs/package.py +++ b/var/spack/repos/builtin/packages/py-appdirs/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-appnope/package.py b/var/spack/repos/builtin/packages/py-appnope/package.py index 1281bd1b8e..e17db899f8 100644 --- a/var/spack/repos/builtin/packages/py-appnope/package.py +++ b/var/spack/repos/builtin/packages/py-appnope/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-apscheduler/package.py b/var/spack/repos/builtin/packages/py-apscheduler/package.py index a36b392cd9..ae5424f81c 100644 --- a/var/spack/repos/builtin/packages/py-apscheduler/package.py +++ b/var/spack/repos/builtin/packages/py-apscheduler/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-argcomplete/package.py b/var/spack/repos/builtin/packages/py-argcomplete/package.py index 4bf8af61b4..057ee6c16c 100644 --- a/var/spack/repos/builtin/packages/py-argcomplete/package.py +++ b/var/spack/repos/builtin/packages/py-argcomplete/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-argparse/package.py b/var/spack/repos/builtin/packages/py-argparse/package.py index 47db38bf3e..14071cc026 100644 --- a/var/spack/repos/builtin/packages/py-argparse/package.py +++ b/var/spack/repos/builtin/packages/py-argparse/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-ase/package.py b/var/spack/repos/builtin/packages/py-ase/package.py index 40f8e9253d..2a58740045 100644 --- a/var/spack/repos/builtin/packages/py-ase/package.py +++ b/var/spack/repos/builtin/packages/py-ase/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-asn1crypto/package.py b/var/spack/repos/builtin/packages/py-asn1crypto/package.py index fe8b59c576..ed12054d7e 100644 --- a/var/spack/repos/builtin/packages/py-asn1crypto/package.py +++ b/var/spack/repos/builtin/packages/py-asn1crypto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-astroid/package.py b/var/spack/repos/builtin/packages/py-astroid/package.py index b656fb09c5..ea55f30939 100644 --- a/var/spack/repos/builtin/packages/py-astroid/package.py +++ b/var/spack/repos/builtin/packages/py-astroid/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-astropy/package.py b/var/spack/repos/builtin/packages/py-astropy/package.py index 7c5b9132f0..1009b2e15b 100644 --- a/var/spack/repos/builtin/packages/py-astropy/package.py +++ b/var/spack/repos/builtin/packages/py-astropy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-atomicwrites/package.py b/var/spack/repos/builtin/packages/py-atomicwrites/package.py index 6bef606dd7..6cd224087e 100644 --- a/var/spack/repos/builtin/packages/py-atomicwrites/package.py +++ b/var/spack/repos/builtin/packages/py-atomicwrites/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-attrs/package.py b/var/spack/repos/builtin/packages/py-attrs/package.py index 074b7fc29e..eb63525b86 100644 --- a/var/spack/repos/builtin/packages/py-attrs/package.py +++ b/var/spack/repos/builtin/packages/py-attrs/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-autopep8/package.py b/var/spack/repos/builtin/packages/py-autopep8/package.py index da8760d649..c882e2506f 100644 --- a/var/spack/repos/builtin/packages/py-autopep8/package.py +++ b/var/spack/repos/builtin/packages/py-autopep8/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-avro-json-serializer/package.py b/var/spack/repos/builtin/packages/py-avro-json-serializer/package.py index dd26863719..52f98286e5 100644 --- a/var/spack/repos/builtin/packages/py-avro-json-serializer/package.py +++ b/var/spack/repos/builtin/packages/py-avro-json-serializer/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-avro/package.py b/var/spack/repos/builtin/packages/py-avro/package.py index 82cbfa213c..13e8670b56 100644 --- a/var/spack/repos/builtin/packages/py-avro/package.py +++ b/var/spack/repos/builtin/packages/py-avro/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-babel/package.py b/var/spack/repos/builtin/packages/py-babel/package.py index 6be78342d7..e502b2e7c2 100644 --- a/var/spack/repos/builtin/packages/py-babel/package.py +++ b/var/spack/repos/builtin/packages/py-babel/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-backcall/package.py b/var/spack/repos/builtin/packages/py-backcall/package.py index f72a95a36c..f255945211 100644 --- a/var/spack/repos/builtin/packages/py-backcall/package.py +++ b/var/spack/repos/builtin/packages/py-backcall/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-backports-abc/package.py b/var/spack/repos/builtin/packages/py-backports-abc/package.py index aa3d6f48bc..a287daaa83 100644 --- a/var/spack/repos/builtin/packages/py-backports-abc/package.py +++ b/var/spack/repos/builtin/packages/py-backports-abc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py b/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py index 8fd37a7400..bc830ada0e 100644 --- a/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py +++ b/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-backports-shutil-get-terminal-size/package.py b/var/spack/repos/builtin/packages/py-backports-shutil-get-terminal-size/package.py index 350eb793e6..40c9d88c26 100644 --- a/var/spack/repos/builtin/packages/py-backports-shutil-get-terminal-size/package.py +++ b/var/spack/repos/builtin/packages/py-backports-shutil-get-terminal-size/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-backports-ssl-match-hostname/package.py b/var/spack/repos/builtin/packages/py-backports-ssl-match-hostname/package.py index df7c2dc84b..a1e3871b54 100644 --- a/var/spack/repos/builtin/packages/py-backports-ssl-match-hostname/package.py +++ b/var/spack/repos/builtin/packages/py-backports-ssl-match-hostname/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-basemap/package.py b/var/spack/repos/builtin/packages/py-basemap/package.py index 4a86ac4fd0..1b531c1cf3 100644 --- a/var/spack/repos/builtin/packages/py-basemap/package.py +++ b/var/spack/repos/builtin/packages/py-basemap/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-bcbio-gff/package.py b/var/spack/repos/builtin/packages/py-bcbio-gff/package.py index ef1f94bf85..4bdd1a27a5 100644 --- a/var/spack/repos/builtin/packages/py-bcbio-gff/package.py +++ b/var/spack/repos/builtin/packages/py-bcbio-gff/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-beautifulsoup4/package.py b/var/spack/repos/builtin/packages/py-beautifulsoup4/package.py index c3f2ac036c..8fd8ea3d0c 100644 --- a/var/spack/repos/builtin/packages/py-beautifulsoup4/package.py +++ b/var/spack/repos/builtin/packages/py-beautifulsoup4/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-binwalk/package.py b/var/spack/repos/builtin/packages/py-binwalk/package.py index 980126ef30..01bc360580 100644 --- a/var/spack/repos/builtin/packages/py-binwalk/package.py +++ b/var/spack/repos/builtin/packages/py-binwalk/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-biom-format/package.py b/var/spack/repos/builtin/packages/py-biom-format/package.py index 4863450037..cc317aeb96 100644 --- a/var/spack/repos/builtin/packages/py-biom-format/package.py +++ b/var/spack/repos/builtin/packages/py-biom-format/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-biopython/package.py b/var/spack/repos/builtin/packages/py-biopython/package.py index c7d046c25e..a833fd8b66 100644 --- a/var/spack/repos/builtin/packages/py-biopython/package.py +++ b/var/spack/repos/builtin/packages/py-biopython/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-bitarray/package.py b/var/spack/repos/builtin/packages/py-bitarray/package.py index db7a9ec23d..3f653892a3 100644 --- a/var/spack/repos/builtin/packages/py-bitarray/package.py +++ b/var/spack/repos/builtin/packages/py-bitarray/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-bitstring/package.py b/var/spack/repos/builtin/packages/py-bitstring/package.py index e3b786e3d4..ac8e8da41b 100644 --- a/var/spack/repos/builtin/packages/py-bitstring/package.py +++ b/var/spack/repos/builtin/packages/py-bitstring/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-bleach/package.py b/var/spack/repos/builtin/packages/py-bleach/package.py index b6c2d13c65..728ac4ff9e 100644 --- a/var/spack/repos/builtin/packages/py-bleach/package.py +++ b/var/spack/repos/builtin/packages/py-bleach/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-blessings/package.py b/var/spack/repos/builtin/packages/py-blessings/package.py index c9829fa76b..932426cf0b 100644 --- a/var/spack/repos/builtin/packages/py-blessings/package.py +++ b/var/spack/repos/builtin/packages/py-blessings/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-bokeh/package.py b/var/spack/repos/builtin/packages/py-bokeh/package.py index 072fa13024..c06ad86625 100644 --- a/var/spack/repos/builtin/packages/py-bokeh/package.py +++ b/var/spack/repos/builtin/packages/py-bokeh/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-boltons/package.py b/var/spack/repos/builtin/packages/py-boltons/package.py index ac25f9f181..be60d629a9 100644 --- a/var/spack/repos/builtin/packages/py-boltons/package.py +++ b/var/spack/repos/builtin/packages/py-boltons/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-bottleneck/package.py b/var/spack/repos/builtin/packages/py-bottleneck/package.py index b002ffd6cf..1a4ccddc3e 100644 --- a/var/spack/repos/builtin/packages/py-bottleneck/package.py +++ b/var/spack/repos/builtin/packages/py-bottleneck/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-breakseq2/package.py b/var/spack/repos/builtin/packages/py-breakseq2/package.py index 2c5a5fb693..91d519e795 100644 --- a/var/spack/repos/builtin/packages/py-breakseq2/package.py +++ b/var/spack/repos/builtin/packages/py-breakseq2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-brian/package.py b/var/spack/repos/builtin/packages/py-brian/package.py index 79568083b0..49b5d9ed1d 100644 --- a/var/spack/repos/builtin/packages/py-brian/package.py +++ b/var/spack/repos/builtin/packages/py-brian/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-brian2/package.py b/var/spack/repos/builtin/packages/py-brian2/package.py index 2f6bafa0e1..9e374e293a 100644 --- a/var/spack/repos/builtin/packages/py-brian2/package.py +++ b/var/spack/repos/builtin/packages/py-brian2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-bsddb3/package.py b/var/spack/repos/builtin/packages/py-bsddb3/package.py index ff2db9aeba..81d9d2e203 100644 --- a/var/spack/repos/builtin/packages/py-bsddb3/package.py +++ b/var/spack/repos/builtin/packages/py-bsddb3/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-bx-python/package.py b/var/spack/repos/builtin/packages/py-bx-python/package.py index 50a5f0a659..b562ad0308 100644 --- a/var/spack/repos/builtin/packages/py-bx-python/package.py +++ b/var/spack/repos/builtin/packages/py-bx-python/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-cartopy/package.py b/var/spack/repos/builtin/packages/py-cartopy/package.py index 7e5da81848..f347652f26 100644 --- a/var/spack/repos/builtin/packages/py-cartopy/package.py +++ b/var/spack/repos/builtin/packages/py-cartopy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-cclib/package.py b/var/spack/repos/builtin/packages/py-cclib/package.py index 14f0f305ee..32d55b0269 100644 --- a/var/spack/repos/builtin/packages/py-cclib/package.py +++ b/var/spack/repos/builtin/packages/py-cclib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-cdat-lite/package.py b/var/spack/repos/builtin/packages/py-cdat-lite/package.py index 4dc978c397..33ce8dce3e 100644 --- a/var/spack/repos/builtin/packages/py-cdat-lite/package.py +++ b/var/spack/repos/builtin/packages/py-cdat-lite/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # from spack import * diff --git a/var/spack/repos/builtin/packages/py-cdo/package.py b/var/spack/repos/builtin/packages/py-cdo/package.py index e1b4943c7f..f2628d5e7f 100644 --- a/var/spack/repos/builtin/packages/py-cdo/package.py +++ b/var/spack/repos/builtin/packages/py-cdo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-certifi/package.py b/var/spack/repos/builtin/packages/py-certifi/package.py index be476d7d03..c13112d182 100644 --- a/var/spack/repos/builtin/packages/py-certifi/package.py +++ b/var/spack/repos/builtin/packages/py-certifi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-cffi/package.py b/var/spack/repos/builtin/packages/py-cffi/package.py index d3e6eecd00..2b32e8d60f 100644 --- a/var/spack/repos/builtin/packages/py-cffi/package.py +++ b/var/spack/repos/builtin/packages/py-cffi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/py-chardet/package.py b/var/spack/repos/builtin/packages/py-chardet/package.py index eb3392fa89..ab4b79982d 100644 --- a/var/spack/repos/builtin/packages/py-chardet/package.py +++ b/var/spack/repos/builtin/packages/py-chardet/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-checkm-genome/package.py b/var/spack/repos/builtin/packages/py-checkm-genome/package.py index 8c96b8c0e1..fa4fe7c3f0 100644 --- a/var/spack/repos/builtin/packages/py-checkm-genome/package.py +++ b/var/spack/repos/builtin/packages/py-checkm-genome/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-cheetah/package.py b/var/spack/repos/builtin/packages/py-cheetah/package.py index b27d848630..da75917d12 100644 --- a/var/spack/repos/builtin/packages/py-cheetah/package.py +++ b/var/spack/repos/builtin/packages/py-cheetah/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-click/package.py b/var/spack/repos/builtin/packages/py-click/package.py index a6e9ae31d0..5bebd2d2ae 100644 --- a/var/spack/repos/builtin/packages/py-click/package.py +++ b/var/spack/repos/builtin/packages/py-click/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-cligj/package.py b/var/spack/repos/builtin/packages/py-cligj/package.py index 830dc59b02..fed854065c 100644 --- a/var/spack/repos/builtin/packages/py-cligj/package.py +++ b/var/spack/repos/builtin/packages/py-cligj/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-cloudpickle/package.py b/var/spack/repos/builtin/packages/py-cloudpickle/package.py index f4a22c0f7c..de87e1c8bf 100644 --- a/var/spack/repos/builtin/packages/py-cloudpickle/package.py +++ b/var/spack/repos/builtin/packages/py-cloudpickle/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-cogent/package.py b/var/spack/repos/builtin/packages/py-cogent/package.py index cf910ae6d1..00111650a3 100644 --- a/var/spack/repos/builtin/packages/py-cogent/package.py +++ b/var/spack/repos/builtin/packages/py-cogent/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-colorama/package.py b/var/spack/repos/builtin/packages/py-colorama/package.py index 01df3e8201..154ff3f449 100644 --- a/var/spack/repos/builtin/packages/py-colorama/package.py +++ b/var/spack/repos/builtin/packages/py-colorama/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-colormath/package.py b/var/spack/repos/builtin/packages/py-colormath/package.py index 712bc526eb..234b60abbd 100644 --- a/var/spack/repos/builtin/packages/py-colormath/package.py +++ b/var/spack/repos/builtin/packages/py-colormath/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-configparser/package.py b/var/spack/repos/builtin/packages/py-configparser/package.py index 4388e2e5cb..6652dc449e 100644 --- a/var/spack/repos/builtin/packages/py-configparser/package.py +++ b/var/spack/repos/builtin/packages/py-configparser/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-counter/package.py b/var/spack/repos/builtin/packages/py-counter/package.py index 3a95ea708c..8bea3d5f9d 100644 --- a/var/spack/repos/builtin/packages/py-counter/package.py +++ b/var/spack/repos/builtin/packages/py-counter/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-coverage/package.py b/var/spack/repos/builtin/packages/py-coverage/package.py index 0275cc2b14..fe95770ccf 100644 --- a/var/spack/repos/builtin/packages/py-coverage/package.py +++ b/var/spack/repos/builtin/packages/py-coverage/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-cpuinfo/package.py b/var/spack/repos/builtin/packages/py-cpuinfo/package.py index 513e91fac7..8cc74a09b9 100644 --- a/var/spack/repos/builtin/packages/py-cpuinfo/package.py +++ b/var/spack/repos/builtin/packages/py-cpuinfo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-crispresso/package.py b/var/spack/repos/builtin/packages/py-crispresso/package.py index 78ff71f921..c2b0ec85ae 100644 --- a/var/spack/repos/builtin/packages/py-crispresso/package.py +++ b/var/spack/repos/builtin/packages/py-crispresso/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-cryptography/package.py b/var/spack/repos/builtin/packages/py-cryptography/package.py index d6e72e1cc8..d03bf4fb43 100644 --- a/var/spack/repos/builtin/packages/py-cryptography/package.py +++ b/var/spack/repos/builtin/packages/py-cryptography/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # from spack import * diff --git a/var/spack/repos/builtin/packages/py-csvkit/package.py b/var/spack/repos/builtin/packages/py-csvkit/package.py index 654fa9e6e6..93248613b1 100644 --- a/var/spack/repos/builtin/packages/py-csvkit/package.py +++ b/var/spack/repos/builtin/packages/py-csvkit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-current/package.py b/var/spack/repos/builtin/packages/py-current/package.py index 44a43544fa..08093894e0 100644 --- a/var/spack/repos/builtin/packages/py-current/package.py +++ b/var/spack/repos/builtin/packages/py-current/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-cutadapt/package.py b/var/spack/repos/builtin/packages/py-cutadapt/package.py index 7f6aedda2f..84bca9c3ad 100644 --- a/var/spack/repos/builtin/packages/py-cutadapt/package.py +++ b/var/spack/repos/builtin/packages/py-cutadapt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-cvxopt/package.py b/var/spack/repos/builtin/packages/py-cvxopt/package.py index 704b421c30..7da5f6bed6 100644 --- a/var/spack/repos/builtin/packages/py-cvxopt/package.py +++ b/var/spack/repos/builtin/packages/py-cvxopt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-cycler/package.py b/var/spack/repos/builtin/packages/py-cycler/package.py index 47f827ce2f..2e2c52811e 100644 --- a/var/spack/repos/builtin/packages/py-cycler/package.py +++ b/var/spack/repos/builtin/packages/py-cycler/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-cython/package.py b/var/spack/repos/builtin/packages/py-cython/package.py index bc14fbf179..610a6aa3b7 100644 --- a/var/spack/repos/builtin/packages/py-cython/package.py +++ b/var/spack/repos/builtin/packages/py-cython/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-dask/package.py b/var/spack/repos/builtin/packages/py-dask/package.py index f956efcc6c..72f4667b61 100644 --- a/var/spack/repos/builtin/packages/py-dask/package.py +++ b/var/spack/repos/builtin/packages/py-dask/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-dateutil/package.py b/var/spack/repos/builtin/packages/py-dateutil/package.py index 5054105d3a..34922f3c40 100644 --- a/var/spack/repos/builtin/packages/py-dateutil/package.py +++ b/var/spack/repos/builtin/packages/py-dateutil/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-dbf/package.py b/var/spack/repos/builtin/packages/py-dbf/package.py index e746c3a16b..071472321d 100644 --- a/var/spack/repos/builtin/packages/py-dbf/package.py +++ b/var/spack/repos/builtin/packages/py-dbf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-decorator/package.py b/var/spack/repos/builtin/packages/py-decorator/package.py index 6827e045f3..0ebe02a893 100644 --- a/var/spack/repos/builtin/packages/py-decorator/package.py +++ b/var/spack/repos/builtin/packages/py-decorator/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-deeptools/package.py b/var/spack/repos/builtin/packages/py-deeptools/package.py index ae595c7f1f..270da83b93 100644 --- a/var/spack/repos/builtin/packages/py-deeptools/package.py +++ b/var/spack/repos/builtin/packages/py-deeptools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-dendropy/package.py b/var/spack/repos/builtin/packages/py-dendropy/package.py index 50f7f2a619..4434d1eb40 100644 --- a/var/spack/repos/builtin/packages/py-dendropy/package.py +++ b/var/spack/repos/builtin/packages/py-dendropy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-dill/package.py b/var/spack/repos/builtin/packages/py-dill/package.py index f1be05e7ac..c2980db0f4 100644 --- a/var/spack/repos/builtin/packages/py-dill/package.py +++ b/var/spack/repos/builtin/packages/py-dill/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-discover/package.py b/var/spack/repos/builtin/packages/py-discover/package.py index ae26c934b3..ee9231c23d 100644 --- a/var/spack/repos/builtin/packages/py-discover/package.py +++ b/var/spack/repos/builtin/packages/py-discover/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-dlcpar/package.py b/var/spack/repos/builtin/packages/py-dlcpar/package.py index 8afe4fe6fe..d71c0e7bc8 100644 --- a/var/spack/repos/builtin/packages/py-dlcpar/package.py +++ b/var/spack/repos/builtin/packages/py-dlcpar/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-docopt/package.py b/var/spack/repos/builtin/packages/py-docopt/package.py index 40c83b9916..25b4c85653 100644 --- a/var/spack/repos/builtin/packages/py-docopt/package.py +++ b/var/spack/repos/builtin/packages/py-docopt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-docutils/package.py b/var/spack/repos/builtin/packages/py-docutils/package.py index a4c8326939..732440a2a6 100644 --- a/var/spack/repos/builtin/packages/py-docutils/package.py +++ b/var/spack/repos/builtin/packages/py-docutils/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-doxypy/package.py b/var/spack/repos/builtin/packages/py-doxypy/package.py index ef40d0f679..d1530b40fa 100644 --- a/var/spack/repos/builtin/packages/py-doxypy/package.py +++ b/var/spack/repos/builtin/packages/py-doxypy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-doxypypy/package.py b/var/spack/repos/builtin/packages/py-doxypypy/package.py index 595c788777..55f4e846f9 100644 --- a/var/spack/repos/builtin/packages/py-doxypypy/package.py +++ b/var/spack/repos/builtin/packages/py-doxypypy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-dryscrape/package.py b/var/spack/repos/builtin/packages/py-dryscrape/package.py index 8382b9ad72..2036804d88 100644 --- a/var/spack/repos/builtin/packages/py-dryscrape/package.py +++ b/var/spack/repos/builtin/packages/py-dryscrape/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-dxchange/package.py b/var/spack/repos/builtin/packages/py-dxchange/package.py index 1988760b15..d70bbd3ec3 100644 --- a/var/spack/repos/builtin/packages/py-dxchange/package.py +++ b/var/spack/repos/builtin/packages/py-dxchange/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-dxfile/package.py b/var/spack/repos/builtin/packages/py-dxfile/package.py index 6ca00ab6c6..f5ca0d5764 100644 --- a/var/spack/repos/builtin/packages/py-dxfile/package.py +++ b/var/spack/repos/builtin/packages/py-dxfile/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-easybuild-easyblocks/package.py b/var/spack/repos/builtin/packages/py-easybuild-easyblocks/package.py index 1a116c5a15..7e8d92ae4c 100644 --- a/var/spack/repos/builtin/packages/py-easybuild-easyblocks/package.py +++ b/var/spack/repos/builtin/packages/py-easybuild-easyblocks/package.py @@ -1,25 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Kenneth Hoste +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Kenneth Hoste, kenneth.hoste@gmail.com -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-easybuild-easyconfigs/package.py b/var/spack/repos/builtin/packages/py-easybuild-easyconfigs/package.py index 2acb09213b..6ab9fa9409 100644 --- a/var/spack/repos/builtin/packages/py-easybuild-easyconfigs/package.py +++ b/var/spack/repos/builtin/packages/py-easybuild-easyconfigs/package.py @@ -1,25 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Kenneth Hoste +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Kenneth Hoste, kenneth.hoste@gmail.com -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-easybuild-framework/package.py b/var/spack/repos/builtin/packages/py-easybuild-framework/package.py index 61e4ee1c70..04dbe5e068 100644 --- a/var/spack/repos/builtin/packages/py-easybuild-framework/package.py +++ b/var/spack/repos/builtin/packages/py-easybuild-framework/package.py @@ -1,25 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Kenneth Hoste +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Kenneth Hoste, kenneth.hoste@gmail.com -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-edffile/package.py b/var/spack/repos/builtin/packages/py-edffile/package.py index a6159d5760..69e2927e6b 100644 --- a/var/spack/repos/builtin/packages/py-edffile/package.py +++ b/var/spack/repos/builtin/packages/py-edffile/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-editdistance/package.py b/var/spack/repos/builtin/packages/py-editdistance/package.py index a62c6e49c5..c3f79c1782 100644 --- a/var/spack/repos/builtin/packages/py-editdistance/package.py +++ b/var/spack/repos/builtin/packages/py-editdistance/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-elasticsearch/package.py b/var/spack/repos/builtin/packages/py-elasticsearch/package.py index abbefbeb3e..287d2b84a1 100644 --- a/var/spack/repos/builtin/packages/py-elasticsearch/package.py +++ b/var/spack/repos/builtin/packages/py-elasticsearch/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-elephant/package.py b/var/spack/repos/builtin/packages/py-elephant/package.py index 80612ba4ff..c54797b073 100644 --- a/var/spack/repos/builtin/packages/py-elephant/package.py +++ b/var/spack/repos/builtin/packages/py-elephant/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-emcee/package.py b/var/spack/repos/builtin/packages/py-emcee/package.py index 1cb2149fe9..6077af7b01 100644 --- a/var/spack/repos/builtin/packages/py-emcee/package.py +++ b/var/spack/repos/builtin/packages/py-emcee/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-entrypoints/package.py b/var/spack/repos/builtin/packages/py-entrypoints/package.py index 6414243a52..6e43570832 100644 --- a/var/spack/repos/builtin/packages/py-entrypoints/package.py +++ b/var/spack/repos/builtin/packages/py-entrypoints/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-enum34/package.py b/var/spack/repos/builtin/packages/py-enum34/package.py index 318ef3f02e..eb28715f24 100644 --- a/var/spack/repos/builtin/packages/py-enum34/package.py +++ b/var/spack/repos/builtin/packages/py-enum34/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-epydoc/package.py b/var/spack/repos/builtin/packages/py-epydoc/package.py index 2c778e58be..03fabe3d49 100644 --- a/var/spack/repos/builtin/packages/py-epydoc/package.py +++ b/var/spack/repos/builtin/packages/py-epydoc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-espresso/package.py b/var/spack/repos/builtin/packages/py-espresso/package.py index a0559f2cff..235b622cac 100644 --- a/var/spack/repos/builtin/packages/py-espresso/package.py +++ b/var/spack/repos/builtin/packages/py-espresso/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-espressopp/package.py b/var/spack/repos/builtin/packages/py-espressopp/package.py index 4b43bc9fe6..c9ffea486b 100644 --- a/var/spack/repos/builtin/packages/py-espressopp/package.py +++ b/var/spack/repos/builtin/packages/py-espressopp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-et-xmlfile/package.py b/var/spack/repos/builtin/packages/py-et-xmlfile/package.py index 50470c4e1a..ffd88933fa 100644 --- a/var/spack/repos/builtin/packages/py-et-xmlfile/package.py +++ b/var/spack/repos/builtin/packages/py-et-xmlfile/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-eventlet/package.py b/var/spack/repos/builtin/packages/py-eventlet/package.py index 2617891b87..af69911130 100644 --- a/var/spack/repos/builtin/packages/py-eventlet/package.py +++ b/var/spack/repos/builtin/packages/py-eventlet/package.py @@ -1,26 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-execnet/package.py b/var/spack/repos/builtin/packages/py-execnet/package.py index 2d0945e019..c14e8823a0 100644 --- a/var/spack/repos/builtin/packages/py-execnet/package.py +++ b/var/spack/repos/builtin/packages/py-execnet/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-fastaindex/package.py b/var/spack/repos/builtin/packages/py-fastaindex/package.py index aab0fb282c..1ddd16d4e8 100644 --- a/var/spack/repos/builtin/packages/py-fastaindex/package.py +++ b/var/spack/repos/builtin/packages/py-fastaindex/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-fasteners/package.py b/var/spack/repos/builtin/packages/py-fasteners/package.py index 3daf2ed86a..557e3505bc 100644 --- a/var/spack/repos/builtin/packages/py-fasteners/package.py +++ b/var/spack/repos/builtin/packages/py-fasteners/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-faststructure/package.py b/var/spack/repos/builtin/packages/py-faststructure/package.py index 4f9823b9ec..8d0d7833be 100644 --- a/var/spack/repos/builtin/packages/py-faststructure/package.py +++ b/var/spack/repos/builtin/packages/py-faststructure/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-filelock/package.py b/var/spack/repos/builtin/packages/py-filelock/package.py index 757cfb8006..a67d1d7be8 100644 --- a/var/spack/repos/builtin/packages/py-filelock/package.py +++ b/var/spack/repos/builtin/packages/py-filelock/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-fiscalyear/package.py b/var/spack/repos/builtin/packages/py-fiscalyear/package.py index 45f44261ed..0f3081653c 100644 --- a/var/spack/repos/builtin/packages/py-fiscalyear/package.py +++ b/var/spack/repos/builtin/packages/py-fiscalyear/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-flake8-polyfill/package.py b/var/spack/repos/builtin/packages/py-flake8-polyfill/package.py index 38c593acce..2a23489694 100644 --- a/var/spack/repos/builtin/packages/py-flake8-polyfill/package.py +++ b/var/spack/repos/builtin/packages/py-flake8-polyfill/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-flake8/package.py b/var/spack/repos/builtin/packages/py-flake8/package.py index 7de8251b3a..75a8e999f4 100644 --- a/var/spack/repos/builtin/packages/py-flake8/package.py +++ b/var/spack/repos/builtin/packages/py-flake8/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-flask-compress/package.py b/var/spack/repos/builtin/packages/py-flask-compress/package.py index eef67368f1..56565a20e7 100644 --- a/var/spack/repos/builtin/packages/py-flask-compress/package.py +++ b/var/spack/repos/builtin/packages/py-flask-compress/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-flask-socketio/package.py b/var/spack/repos/builtin/packages/py-flask-socketio/package.py index cf78678ad4..5b016f1d5f 100644 --- a/var/spack/repos/builtin/packages/py-flask-socketio/package.py +++ b/var/spack/repos/builtin/packages/py-flask-socketio/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-flask/package.py b/var/spack/repos/builtin/packages/py-flask/package.py index 310f589e77..50f45b2788 100644 --- a/var/spack/repos/builtin/packages/py-flask/package.py +++ b/var/spack/repos/builtin/packages/py-flask/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-flexx/package.py b/var/spack/repos/builtin/packages/py-flexx/package.py index 6f7ef5e06d..bf949e62bd 100644 --- a/var/spack/repos/builtin/packages/py-flexx/package.py +++ b/var/spack/repos/builtin/packages/py-flexx/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-fn/package.py b/var/spack/repos/builtin/packages/py-fn/package.py index 3076acc064..adf6a474dc 100644 --- a/var/spack/repos/builtin/packages/py-fn/package.py +++ b/var/spack/repos/builtin/packages/py-fn/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-fparser/package.py b/var/spack/repos/builtin/packages/py-fparser/package.py index 0b6a9c7da6..a1eccda121 100644 --- a/var/spack/repos/builtin/packages/py-fparser/package.py +++ b/var/spack/repos/builtin/packages/py-fparser/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # from spack import * diff --git a/var/spack/repos/builtin/packages/py-funcsigs/package.py b/var/spack/repos/builtin/packages/py-funcsigs/package.py index e51e760942..c39c95ac8b 100644 --- a/var/spack/repos/builtin/packages/py-funcsigs/package.py +++ b/var/spack/repos/builtin/packages/py-funcsigs/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-functools32/package.py b/var/spack/repos/builtin/packages/py-functools32/package.py index 1c3b125f20..e33afafdfe 100644 --- a/var/spack/repos/builtin/packages/py-functools32/package.py +++ b/var/spack/repos/builtin/packages/py-functools32/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-future/package.py b/var/spack/repos/builtin/packages/py-future/package.py index b6c6a123ce..862abd8e64 100644 --- a/var/spack/repos/builtin/packages/py-future/package.py +++ b/var/spack/repos/builtin/packages/py-future/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-futures/package.py b/var/spack/repos/builtin/packages/py-futures/package.py index 94a7c64631..8db11089f5 100644 --- a/var/spack/repos/builtin/packages/py-futures/package.py +++ b/var/spack/repos/builtin/packages/py-futures/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-gdbgui/package.py b/var/spack/repos/builtin/packages/py-gdbgui/package.py index 2e35909900..3f32218ef4 100644 --- a/var/spack/repos/builtin/packages/py-gdbgui/package.py +++ b/var/spack/repos/builtin/packages/py-gdbgui/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-genders/package.py b/var/spack/repos/builtin/packages/py-genders/package.py index 9d5b0b6e11..c3a210361d 100644 --- a/var/spack/repos/builtin/packages/py-genders/package.py +++ b/var/spack/repos/builtin/packages/py-genders/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-genshi/package.py b/var/spack/repos/builtin/packages/py-genshi/package.py index fcb304a7e1..0b2405d6e4 100644 --- a/var/spack/repos/builtin/packages/py-genshi/package.py +++ b/var/spack/repos/builtin/packages/py-genshi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-gevent/package.py b/var/spack/repos/builtin/packages/py-gevent/package.py index 4143a46559..a69a3e5bf8 100644 --- a/var/spack/repos/builtin/packages/py-gevent/package.py +++ b/var/spack/repos/builtin/packages/py-gevent/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-git-review/package.py b/var/spack/repos/builtin/packages/py-git-review/package.py index 0ce3a852d9..60291f5b1a 100644 --- a/var/spack/repos/builtin/packages/py-git-review/package.py +++ b/var/spack/repos/builtin/packages/py-git-review/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-git2/package.py b/var/spack/repos/builtin/packages/py-git2/package.py index 6f42e2523e..ce6be1164e 100644 --- a/var/spack/repos/builtin/packages/py-git2/package.py +++ b/var/spack/repos/builtin/packages/py-git2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-gnuplot/package.py b/var/spack/repos/builtin/packages/py-gnuplot/package.py index 59a0809bea..782c3cbe32 100644 --- a/var/spack/repos/builtin/packages/py-gnuplot/package.py +++ b/var/spack/repos/builtin/packages/py-gnuplot/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-goatools/package.py b/var/spack/repos/builtin/packages/py-goatools/package.py index 3a0ac15c44..4e97681f78 100644 --- a/var/spack/repos/builtin/packages/py-goatools/package.py +++ b/var/spack/repos/builtin/packages/py-goatools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-gpaw/package.py b/var/spack/repos/builtin/packages/py-gpaw/package.py index 6e2fa62f76..6761ca97e2 100644 --- a/var/spack/repos/builtin/packages/py-gpaw/package.py +++ b/var/spack/repos/builtin/packages/py-gpaw/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-greenlet/package.py b/var/spack/repos/builtin/packages/py-greenlet/package.py index ff9589824f..7e62859eea 100644 --- a/var/spack/repos/builtin/packages/py-greenlet/package.py +++ b/var/spack/repos/builtin/packages/py-greenlet/package.py @@ -1,26 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-griddataformats/package.py b/var/spack/repos/builtin/packages/py-griddataformats/package.py index 56916d0e27..70b71323b2 100644 --- a/var/spack/repos/builtin/packages/py-griddataformats/package.py +++ b/var/spack/repos/builtin/packages/py-griddataformats/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-guidata/package.py b/var/spack/repos/builtin/packages/py-guidata/package.py index b8737bcfa5..328e8d36a7 100644 --- a/var/spack/repos/builtin/packages/py-guidata/package.py +++ b/var/spack/repos/builtin/packages/py-guidata/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-guiqwt/package.py b/var/spack/repos/builtin/packages/py-guiqwt/package.py index dfe0610cbd..98716625cd 100644 --- a/var/spack/repos/builtin/packages/py-guiqwt/package.py +++ b/var/spack/repos/builtin/packages/py-guiqwt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-h5py/package.py b/var/spack/repos/builtin/packages/py-h5py/package.py index 566e1a50a8..7a6b61c269 100644 --- a/var/spack/repos/builtin/packages/py-h5py/package.py +++ b/var/spack/repos/builtin/packages/py-h5py/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-html2text/package.py b/var/spack/repos/builtin/packages/py-html2text/package.py index ce31799049..b7509e6e72 100644 --- a/var/spack/repos/builtin/packages/py-html2text/package.py +++ b/var/spack/repos/builtin/packages/py-html2text/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-html5lib/package.py b/var/spack/repos/builtin/packages/py-html5lib/package.py index fd94b04f83..f80d0bea34 100644 --- a/var/spack/repos/builtin/packages/py-html5lib/package.py +++ b/var/spack/repos/builtin/packages/py-html5lib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-htseq/package.py b/var/spack/repos/builtin/packages/py-htseq/package.py index 57460638ce..0e24981d1a 100644 --- a/var/spack/repos/builtin/packages/py-htseq/package.py +++ b/var/spack/repos/builtin/packages/py-htseq/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-httpbin/package.py b/var/spack/repos/builtin/packages/py-httpbin/package.py index ecf7af91ae..f4a2048b4e 100644 --- a/var/spack/repos/builtin/packages/py-httpbin/package.py +++ b/var/spack/repos/builtin/packages/py-httpbin/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-hypothesis/package.py b/var/spack/repos/builtin/packages/py-hypothesis/package.py index bf420e50c1..3c9abda75c 100644 --- a/var/spack/repos/builtin/packages/py-hypothesis/package.py +++ b/var/spack/repos/builtin/packages/py-hypothesis/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-idna/package.py b/var/spack/repos/builtin/packages/py-idna/package.py index 25796a00a2..7e37aa6441 100644 --- a/var/spack/repos/builtin/packages/py-idna/package.py +++ b/var/spack/repos/builtin/packages/py-idna/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # from spack import * diff --git a/var/spack/repos/builtin/packages/py-igraph/package.py b/var/spack/repos/builtin/packages/py-igraph/package.py index ad12c2f7d4..03fe3a8a8a 100644 --- a/var/spack/repos/builtin/packages/py-igraph/package.py +++ b/var/spack/repos/builtin/packages/py-igraph/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-illumina-utils/package.py b/var/spack/repos/builtin/packages/py-illumina-utils/package.py index 1fec2f5ae7..b970e69797 100644 --- a/var/spack/repos/builtin/packages/py-illumina-utils/package.py +++ b/var/spack/repos/builtin/packages/py-illumina-utils/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-imageio/package.py b/var/spack/repos/builtin/packages/py-imageio/package.py index 55122f1d34..bff47aa4ee 100644 --- a/var/spack/repos/builtin/packages/py-imageio/package.py +++ b/var/spack/repos/builtin/packages/py-imageio/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-imagesize/package.py b/var/spack/repos/builtin/packages/py-imagesize/package.py index b3bbbe5024..c1fc830a60 100644 --- a/var/spack/repos/builtin/packages/py-imagesize/package.py +++ b/var/spack/repos/builtin/packages/py-imagesize/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-iminuit/package.py b/var/spack/repos/builtin/packages/py-iminuit/package.py index fc4537d5ba..01dcd9f37d 100644 --- a/var/spack/repos/builtin/packages/py-iminuit/package.py +++ b/var/spack/repos/builtin/packages/py-iminuit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-importlib/package.py b/var/spack/repos/builtin/packages/py-importlib/package.py index d1996aa680..90bd1dd9df 100644 --- a/var/spack/repos/builtin/packages/py-importlib/package.py +++ b/var/spack/repos/builtin/packages/py-importlib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-ipaddress/package.py b/var/spack/repos/builtin/packages/py-ipaddress/package.py index 2f8b09717f..287a4850ba 100644 --- a/var/spack/repos/builtin/packages/py-ipaddress/package.py +++ b/var/spack/repos/builtin/packages/py-ipaddress/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # from spack import * diff --git a/var/spack/repos/builtin/packages/py-ipdb/package.py b/var/spack/repos/builtin/packages/py-ipdb/package.py index 3c2d786a1c..f60e3b58af 100644 --- a/var/spack/repos/builtin/packages/py-ipdb/package.py +++ b/var/spack/repos/builtin/packages/py-ipdb/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-ipykernel/package.py b/var/spack/repos/builtin/packages/py-ipykernel/package.py index 30e021a254..804bfe88d4 100644 --- a/var/spack/repos/builtin/packages/py-ipykernel/package.py +++ b/var/spack/repos/builtin/packages/py-ipykernel/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-ipython-genutils/package.py b/var/spack/repos/builtin/packages/py-ipython-genutils/package.py index 29d87e0186..e09aca3606 100644 --- a/var/spack/repos/builtin/packages/py-ipython-genutils/package.py +++ b/var/spack/repos/builtin/packages/py-ipython-genutils/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-ipython/package.py b/var/spack/repos/builtin/packages/py-ipython/package.py index e1e7410306..d6373ab393 100644 --- a/var/spack/repos/builtin/packages/py-ipython/package.py +++ b/var/spack/repos/builtin/packages/py-ipython/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys import platform diff --git a/var/spack/repos/builtin/packages/py-ipywidgets/package.py b/var/spack/repos/builtin/packages/py-ipywidgets/package.py index a8477dc452..58ce772216 100644 --- a/var/spack/repos/builtin/packages/py-ipywidgets/package.py +++ b/var/spack/repos/builtin/packages/py-ipywidgets/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-isort/package.py b/var/spack/repos/builtin/packages/py-isort/package.py index cfa2b711d1..b3b9dfdd6d 100644 --- a/var/spack/repos/builtin/packages/py-isort/package.py +++ b/var/spack/repos/builtin/packages/py-isort/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-itsdangerous/package.py b/var/spack/repos/builtin/packages/py-itsdangerous/package.py index 74912a055d..9ee5505f93 100644 --- a/var/spack/repos/builtin/packages/py-itsdangerous/package.py +++ b/var/spack/repos/builtin/packages/py-itsdangerous/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-jdcal/package.py b/var/spack/repos/builtin/packages/py-jdcal/package.py index 5592c42175..7274df377f 100644 --- a/var/spack/repos/builtin/packages/py-jdcal/package.py +++ b/var/spack/repos/builtin/packages/py-jdcal/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-jedi/package.py b/var/spack/repos/builtin/packages/py-jedi/package.py index dfe528f9d6..3bb5b51ed9 100644 --- a/var/spack/repos/builtin/packages/py-jedi/package.py +++ b/var/spack/repos/builtin/packages/py-jedi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-jinja2/package.py b/var/spack/repos/builtin/packages/py-jinja2/package.py index 4ea32128be..454ec2691c 100644 --- a/var/spack/repos/builtin/packages/py-jinja2/package.py +++ b/var/spack/repos/builtin/packages/py-jinja2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-joblib/package.py b/var/spack/repos/builtin/packages/py-joblib/package.py index 5ad8efefd8..3f0e8c86af 100644 --- a/var/spack/repos/builtin/packages/py-joblib/package.py +++ b/var/spack/repos/builtin/packages/py-joblib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-jprops/package.py b/var/spack/repos/builtin/packages/py-jprops/package.py index b268a5016a..ed0cafdc2d 100644 --- a/var/spack/repos/builtin/packages/py-jprops/package.py +++ b/var/spack/repos/builtin/packages/py-jprops/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-jpype/package.py b/var/spack/repos/builtin/packages/py-jpype/package.py index f4c817cdf2..ba72b9ac91 100644 --- a/var/spack/repos/builtin/packages/py-jpype/package.py +++ b/var/spack/repos/builtin/packages/py-jpype/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-jsonschema/package.py b/var/spack/repos/builtin/packages/py-jsonschema/package.py index d6cdae0b6f..dacd9cad01 100644 --- a/var/spack/repos/builtin/packages/py-jsonschema/package.py +++ b/var/spack/repos/builtin/packages/py-jsonschema/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-junit-xml/package.py b/var/spack/repos/builtin/packages/py-junit-xml/package.py index 06062d5a4f..f1e76c409e 100644 --- a/var/spack/repos/builtin/packages/py-junit-xml/package.py +++ b/var/spack/repos/builtin/packages/py-junit-xml/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-jupyter-client/package.py b/var/spack/repos/builtin/packages/py-jupyter-client/package.py index dc1d7279cd..23d22e2e00 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-client/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-client/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-jupyter-console/package.py b/var/spack/repos/builtin/packages/py-jupyter-console/package.py index 224072d9cf..6b041bf996 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-console/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-console/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-jupyter-core/package.py b/var/spack/repos/builtin/packages/py-jupyter-core/package.py index 0887a64ae0..f9e7af9a70 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-core/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-core/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-jupyter-notebook/package.py b/var/spack/repos/builtin/packages/py-jupyter-notebook/package.py index 16e460b4f7..c3cc182200 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-notebook/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-notebook/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-keras/package.py b/var/spack/repos/builtin/packages/py-keras/package.py index cc0a4de1f2..24ee491907 100644 --- a/var/spack/repos/builtin/packages/py-keras/package.py +++ b/var/spack/repos/builtin/packages/py-keras/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-kiwisolver/package.py b/var/spack/repos/builtin/packages/py-kiwisolver/package.py index aa4f5637fa..09acd58afc 100644 --- a/var/spack/repos/builtin/packages/py-kiwisolver/package.py +++ b/var/spack/repos/builtin/packages/py-kiwisolver/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-lark-parser/package.py b/var/spack/repos/builtin/packages/py-lark-parser/package.py index da31bb7b77..08dce8163c 100644 --- a/var/spack/repos/builtin/packages/py-lark-parser/package.py +++ b/var/spack/repos/builtin/packages/py-lark-parser/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-latexcodec/package.py b/var/spack/repos/builtin/packages/py-latexcodec/package.py index 1ae6670d91..6870a4c686 100644 --- a/var/spack/repos/builtin/packages/py-latexcodec/package.py +++ b/var/spack/repos/builtin/packages/py-latexcodec/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-lazy-object-proxy/package.py b/var/spack/repos/builtin/packages/py-lazy-object-proxy/package.py index 7bb87f2673..c2b420d70f 100644 --- a/var/spack/repos/builtin/packages/py-lazy-object-proxy/package.py +++ b/var/spack/repos/builtin/packages/py-lazy-object-proxy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-lazy-property/package.py b/var/spack/repos/builtin/packages/py-lazy-property/package.py index 51b6edefec..8e6b0d13c9 100644 --- a/var/spack/repos/builtin/packages/py-lazy-property/package.py +++ b/var/spack/repos/builtin/packages/py-lazy-property/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-lazy/package.py b/var/spack/repos/builtin/packages/py-lazy/package.py index 4b7658078e..a58bc887df 100644 --- a/var/spack/repos/builtin/packages/py-lazy/package.py +++ b/var/spack/repos/builtin/packages/py-lazy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-lazyarray/package.py b/var/spack/repos/builtin/packages/py-lazyarray/package.py index 1af8eff53e..0b60b82154 100644 --- a/var/spack/repos/builtin/packages/py-lazyarray/package.py +++ b/var/spack/repos/builtin/packages/py-lazyarray/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-libconf/package.py b/var/spack/repos/builtin/packages/py-libconf/package.py index a6aebfbe94..bd7db99d99 100644 --- a/var/spack/repos/builtin/packages/py-libconf/package.py +++ b/var/spack/repos/builtin/packages/py-libconf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-libensemble/package.py b/var/spack/repos/builtin/packages/py-libensemble/package.py index c6237c588d..bb06ab3b3b 100644 --- a/var/spack/repos/builtin/packages/py-libensemble/package.py +++ b/var/spack/repos/builtin/packages/py-libensemble/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-line-profiler/package.py b/var/spack/repos/builtin/packages/py-line-profiler/package.py index 9d3ee5822d..2079945405 100644 --- a/var/spack/repos/builtin/packages/py-line-profiler/package.py +++ b/var/spack/repos/builtin/packages/py-line-profiler/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-linecache2/package.py b/var/spack/repos/builtin/packages/py-linecache2/package.py index c29c0c2e39..1d0595d464 100644 --- a/var/spack/repos/builtin/packages/py-linecache2/package.py +++ b/var/spack/repos/builtin/packages/py-linecache2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-lit/package.py b/var/spack/repos/builtin/packages/py-lit/package.py index 552c619c32..0712ccc1c2 100644 --- a/var/spack/repos/builtin/packages/py-lit/package.py +++ b/var/spack/repos/builtin/packages/py-lit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-llvmlite/package.py b/var/spack/repos/builtin/packages/py-llvmlite/package.py index b5248d496f..e3ee1b04a0 100644 --- a/var/spack/repos/builtin/packages/py-llvmlite/package.py +++ b/var/spack/repos/builtin/packages/py-llvmlite/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-lmfit/package.py b/var/spack/repos/builtin/packages/py-lmfit/package.py index 4602776bed..7247c55cdb 100644 --- a/var/spack/repos/builtin/packages/py-lmfit/package.py +++ b/var/spack/repos/builtin/packages/py-lmfit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-localcider/package.py b/var/spack/repos/builtin/packages/py-localcider/package.py index fcd65d283b..51fc5c50e0 100644 --- a/var/spack/repos/builtin/packages/py-localcider/package.py +++ b/var/spack/repos/builtin/packages/py-localcider/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-locket/package.py b/var/spack/repos/builtin/packages/py-locket/package.py index dfe683a4b0..addc225fbb 100644 --- a/var/spack/repos/builtin/packages/py-locket/package.py +++ b/var/spack/repos/builtin/packages/py-locket/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-lockfile/package.py b/var/spack/repos/builtin/packages/py-lockfile/package.py index c18da87dd9..deb8c08e0d 100644 --- a/var/spack/repos/builtin/packages/py-lockfile/package.py +++ b/var/spack/repos/builtin/packages/py-lockfile/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-logilab-common/package.py b/var/spack/repos/builtin/packages/py-logilab-common/package.py index 105f1079d2..20c1649c7a 100644 --- a/var/spack/repos/builtin/packages/py-logilab-common/package.py +++ b/var/spack/repos/builtin/packages/py-logilab-common/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-lrudict/package.py b/var/spack/repos/builtin/packages/py-lrudict/package.py index fb458bb3e2..48a94c04e4 100644 --- a/var/spack/repos/builtin/packages/py-lrudict/package.py +++ b/var/spack/repos/builtin/packages/py-lrudict/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-lxml/package.py b/var/spack/repos/builtin/packages/py-lxml/package.py index 82a782037b..63d2024e24 100644 --- a/var/spack/repos/builtin/packages/py-lxml/package.py +++ b/var/spack/repos/builtin/packages/py-lxml/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-lzstring/package.py b/var/spack/repos/builtin/packages/py-lzstring/package.py index 48645203f6..0302eab94d 100644 --- a/var/spack/repos/builtin/packages/py-lzstring/package.py +++ b/var/spack/repos/builtin/packages/py-lzstring/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-macholib/package.py b/var/spack/repos/builtin/packages/py-macholib/package.py index 33d1a3b96f..5a82411b16 100644 --- a/var/spack/repos/builtin/packages/py-macholib/package.py +++ b/var/spack/repos/builtin/packages/py-macholib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-machotools/package.py b/var/spack/repos/builtin/packages/py-machotools/package.py index 8a2e42e824..3ad4ca45e5 100644 --- a/var/spack/repos/builtin/packages/py-machotools/package.py +++ b/var/spack/repos/builtin/packages/py-machotools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-macs2/package.py b/var/spack/repos/builtin/packages/py-macs2/package.py index 70cf69d2f7..6f0d78e33b 100644 --- a/var/spack/repos/builtin/packages/py-macs2/package.py +++ b/var/spack/repos/builtin/packages/py-macs2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-maestrowf/package.py b/var/spack/repos/builtin/packages/py-maestrowf/package.py index 7a5ab5f975..06857ed21d 100644 --- a/var/spack/repos/builtin/packages/py-maestrowf/package.py +++ b/var/spack/repos/builtin/packages/py-maestrowf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-mako/package.py b/var/spack/repos/builtin/packages/py-mako/package.py index 7e7b5d07d8..7bb89b2d39 100644 --- a/var/spack/repos/builtin/packages/py-mako/package.py +++ b/var/spack/repos/builtin/packages/py-mako/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-mappy/package.py b/var/spack/repos/builtin/packages/py-mappy/package.py index d0ac64f26c..23f975dd8a 100644 --- a/var/spack/repos/builtin/packages/py-mappy/package.py +++ b/var/spack/repos/builtin/packages/py-mappy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-markdown/package.py b/var/spack/repos/builtin/packages/py-markdown/package.py index 79d867898d..80f395dbc8 100644 --- a/var/spack/repos/builtin/packages/py-markdown/package.py +++ b/var/spack/repos/builtin/packages/py-markdown/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-markupsafe/package.py b/var/spack/repos/builtin/packages/py-markupsafe/package.py index c2d5950915..1d681f2987 100644 --- a/var/spack/repos/builtin/packages/py-markupsafe/package.py +++ b/var/spack/repos/builtin/packages/py-markupsafe/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-matplotlib/package.py b/var/spack/repos/builtin/packages/py-matplotlib/package.py index a199a55a81..b63a52d9ba 100644 --- a/var/spack/repos/builtin/packages/py-matplotlib/package.py +++ b/var/spack/repos/builtin/packages/py-matplotlib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/py-mccabe/package.py b/var/spack/repos/builtin/packages/py-mccabe/package.py index 487320a755..13dfddc0c4 100644 --- a/var/spack/repos/builtin/packages/py-mccabe/package.py +++ b/var/spack/repos/builtin/packages/py-mccabe/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-mdanalysis/package.py b/var/spack/repos/builtin/packages/py-mdanalysis/package.py index ce60ebff49..15f40f1861 100644 --- a/var/spack/repos/builtin/packages/py-mdanalysis/package.py +++ b/var/spack/repos/builtin/packages/py-mdanalysis/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-meep/package.py b/var/spack/repos/builtin/packages/py-meep/package.py index 719b7fa489..0b257a64c6 100644 --- a/var/spack/repos/builtin/packages/py-meep/package.py +++ b/var/spack/repos/builtin/packages/py-meep/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-memory-profiler/package.py b/var/spack/repos/builtin/packages/py-memory-profiler/package.py index 26872baf5c..92ccc763dc 100644 --- a/var/spack/repos/builtin/packages/py-memory-profiler/package.py +++ b/var/spack/repos/builtin/packages/py-memory-profiler/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-methylcode/package.py b/var/spack/repos/builtin/packages/py-methylcode/package.py index b49dcb30d9..b416b27f62 100644 --- a/var/spack/repos/builtin/packages/py-methylcode/package.py +++ b/var/spack/repos/builtin/packages/py-methylcode/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-mg-rast-tools/package.py b/var/spack/repos/builtin/packages/py-mg-rast-tools/package.py index a01cc62b6a..0d2c084142 100644 --- a/var/spack/repos/builtin/packages/py-mg-rast-tools/package.py +++ b/var/spack/repos/builtin/packages/py-mg-rast-tools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-misopy/package.py b/var/spack/repos/builtin/packages/py-misopy/package.py index ce0a8ac46c..832c8ca605 100644 --- a/var/spack/repos/builtin/packages/py-misopy/package.py +++ b/var/spack/repos/builtin/packages/py-misopy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-mistune/package.py b/var/spack/repos/builtin/packages/py-mistune/package.py index 46097726f8..71378fb539 100644 --- a/var/spack/repos/builtin/packages/py-mistune/package.py +++ b/var/spack/repos/builtin/packages/py-mistune/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-mock/package.py b/var/spack/repos/builtin/packages/py-mock/package.py index 154bc1191d..861ca10f9c 100644 --- a/var/spack/repos/builtin/packages/py-mock/package.py +++ b/var/spack/repos/builtin/packages/py-mock/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-moltemplate/package.py b/var/spack/repos/builtin/packages/py-moltemplate/package.py index 6b7a6d4bf8..00993fb4de 100644 --- a/var/spack/repos/builtin/packages/py-moltemplate/package.py +++ b/var/spack/repos/builtin/packages/py-moltemplate/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-mongo/package.py b/var/spack/repos/builtin/packages/py-mongo/package.py index a774579f55..ae364c1a3f 100644 --- a/var/spack/repos/builtin/packages/py-mongo/package.py +++ b/var/spack/repos/builtin/packages/py-mongo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-monotonic/package.py b/var/spack/repos/builtin/packages/py-monotonic/package.py index f51da8fda0..1d32f68c53 100644 --- a/var/spack/repos/builtin/packages/py-monotonic/package.py +++ b/var/spack/repos/builtin/packages/py-monotonic/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-monty/package.py b/var/spack/repos/builtin/packages/py-monty/package.py index acbe68b540..abe10c6ee7 100644 --- a/var/spack/repos/builtin/packages/py-monty/package.py +++ b/var/spack/repos/builtin/packages/py-monty/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-more-itertools/package.py b/var/spack/repos/builtin/packages/py-more-itertools/package.py index 707bb2f06c..eda31ded25 100644 --- a/var/spack/repos/builtin/packages/py-more-itertools/package.py +++ b/var/spack/repos/builtin/packages/py-more-itertools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-mpi4py/package.py b/var/spack/repos/builtin/packages/py-mpi4py/package.py index ccd850795a..aad9998201 100644 --- a/var/spack/repos/builtin/packages/py-mpi4py/package.py +++ b/var/spack/repos/builtin/packages/py-mpi4py/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-mpmath/package.py b/var/spack/repos/builtin/packages/py-mpmath/package.py index 1076c63d63..b7bb79b0b1 100644 --- a/var/spack/repos/builtin/packages/py-mpmath/package.py +++ b/var/spack/repos/builtin/packages/py-mpmath/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-multiprocess/package.py b/var/spack/repos/builtin/packages/py-multiprocess/package.py index e247f0cbe8..e9c6bbc0b5 100644 --- a/var/spack/repos/builtin/packages/py-multiprocess/package.py +++ b/var/spack/repos/builtin/packages/py-multiprocess/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-multiqc/package.py b/var/spack/repos/builtin/packages/py-multiqc/package.py index 044b76d336..62547b8873 100644 --- a/var/spack/repos/builtin/packages/py-multiqc/package.py +++ b/var/spack/repos/builtin/packages/py-multiqc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-mx/package.py b/var/spack/repos/builtin/packages/py-mx/package.py index 1306e663cf..fe4ff8fff1 100644 --- a/var/spack/repos/builtin/packages/py-mx/package.py +++ b/var/spack/repos/builtin/packages/py-mx/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-mxnet/package.py b/var/spack/repos/builtin/packages/py-mxnet/package.py index eeae66da56..9d11ce9e20 100644 --- a/var/spack/repos/builtin/packages/py-mxnet/package.py +++ b/var/spack/repos/builtin/packages/py-mxnet/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-myhdl/package.py b/var/spack/repos/builtin/packages/py-myhdl/package.py index e64b7346df..38f03691e0 100644 --- a/var/spack/repos/builtin/packages/py-myhdl/package.py +++ b/var/spack/repos/builtin/packages/py-myhdl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-mysqldb1/package.py b/var/spack/repos/builtin/packages/py-mysqldb1/package.py index 7033a6f3f2..989ddc6679 100644 --- a/var/spack/repos/builtin/packages/py-mysqldb1/package.py +++ b/var/spack/repos/builtin/packages/py-mysqldb1/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-natsort/package.py b/var/spack/repos/builtin/packages/py-natsort/package.py index bc7303d3ac..958f0c1d5f 100644 --- a/var/spack/repos/builtin/packages/py-natsort/package.py +++ b/var/spack/repos/builtin/packages/py-natsort/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-nbconvert/package.py b/var/spack/repos/builtin/packages/py-nbconvert/package.py index ccb9434014..e6dc35441f 100644 --- a/var/spack/repos/builtin/packages/py-nbconvert/package.py +++ b/var/spack/repos/builtin/packages/py-nbconvert/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os from spack import * diff --git a/var/spack/repos/builtin/packages/py-nbformat/package.py b/var/spack/repos/builtin/packages/py-nbformat/package.py index 6f34a45dbc..48f20262f2 100644 --- a/var/spack/repos/builtin/packages/py-nbformat/package.py +++ b/var/spack/repos/builtin/packages/py-nbformat/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-neo/package.py b/var/spack/repos/builtin/packages/py-neo/package.py index 7c58c8bb19..b1ea797753 100644 --- a/var/spack/repos/builtin/packages/py-neo/package.py +++ b/var/spack/repos/builtin/packages/py-neo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-nestle/package.py b/var/spack/repos/builtin/packages/py-nestle/package.py index 8a560d1e4c..2796de3333 100644 --- a/var/spack/repos/builtin/packages/py-nestle/package.py +++ b/var/spack/repos/builtin/packages/py-nestle/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-netcdf4/package.py b/var/spack/repos/builtin/packages/py-netcdf4/package.py index 842c988f77..5099183816 100644 --- a/var/spack/repos/builtin/packages/py-netcdf4/package.py +++ b/var/spack/repos/builtin/packages/py-netcdf4/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-netifaces/package.py b/var/spack/repos/builtin/packages/py-netifaces/package.py index 5831f4ccc2..3120e2b13f 100644 --- a/var/spack/repos/builtin/packages/py-netifaces/package.py +++ b/var/spack/repos/builtin/packages/py-netifaces/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-networkx/package.py b/var/spack/repos/builtin/packages/py-networkx/package.py index 6ae530e8e0..b499ca9c4e 100644 --- a/var/spack/repos/builtin/packages/py-networkx/package.py +++ b/var/spack/repos/builtin/packages/py-networkx/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-nose/package.py b/var/spack/repos/builtin/packages/py-nose/package.py index dcc0471f61..636d1d2195 100644 --- a/var/spack/repos/builtin/packages/py-nose/package.py +++ b/var/spack/repos/builtin/packages/py-nose/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-nosexcover/package.py b/var/spack/repos/builtin/packages/py-nosexcover/package.py index ebbf5cad8f..45da661a20 100644 --- a/var/spack/repos/builtin/packages/py-nosexcover/package.py +++ b/var/spack/repos/builtin/packages/py-nosexcover/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-numba/package.py b/var/spack/repos/builtin/packages/py-numba/package.py index 7b10e3aa25..550ac571a8 100644 --- a/var/spack/repos/builtin/packages/py-numba/package.py +++ b/var/spack/repos/builtin/packages/py-numba/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-numexpr/package.py b/var/spack/repos/builtin/packages/py-numexpr/package.py index 29416d8cb1..9695afb50c 100644 --- a/var/spack/repos/builtin/packages/py-numexpr/package.py +++ b/var/spack/repos/builtin/packages/py-numexpr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-numexpr3/package.py b/var/spack/repos/builtin/packages/py-numexpr3/package.py index 3b27238ef1..9b5f1e7dd5 100644 --- a/var/spack/repos/builtin/packages/py-numexpr3/package.py +++ b/var/spack/repos/builtin/packages/py-numexpr3/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-numpy/package.py b/var/spack/repos/builtin/packages/py-numpy/package.py index 7c0dcafbef..e4408a430e 100644 --- a/var/spack/repos/builtin/packages/py-numpy/package.py +++ b/var/spack/repos/builtin/packages/py-numpy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import platform diff --git a/var/spack/repos/builtin/packages/py-numpydoc/package.py b/var/spack/repos/builtin/packages/py-numpydoc/package.py index 22dbb24bbc..48512b1943 100644 --- a/var/spack/repos/builtin/packages/py-numpydoc/package.py +++ b/var/spack/repos/builtin/packages/py-numpydoc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-olefile/package.py b/var/spack/repos/builtin/packages/py-olefile/package.py index 4b8c0b6247..3430f4360a 100644 --- a/var/spack/repos/builtin/packages/py-olefile/package.py +++ b/var/spack/repos/builtin/packages/py-olefile/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-ont-fast5-api/package.py b/var/spack/repos/builtin/packages/py-ont-fast5-api/package.py index edb7b0c632..e31eeccefc 100644 --- a/var/spack/repos/builtin/packages/py-ont-fast5-api/package.py +++ b/var/spack/repos/builtin/packages/py-ont-fast5-api/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-openpmd-validator/package.py b/var/spack/repos/builtin/packages/py-openpmd-validator/package.py index e6827ee61c..64c33b8614 100644 --- a/var/spack/repos/builtin/packages/py-openpmd-validator/package.py +++ b/var/spack/repos/builtin/packages/py-openpmd-validator/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-openpyxl/package.py b/var/spack/repos/builtin/packages/py-openpyxl/package.py index 6b0bd0811d..b61118426e 100644 --- a/var/spack/repos/builtin/packages/py-openpyxl/package.py +++ b/var/spack/repos/builtin/packages/py-openpyxl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-openslide-python/package.py b/var/spack/repos/builtin/packages/py-openslide-python/package.py index 22ee356fe5..5fcefccc7d 100644 --- a/var/spack/repos/builtin/packages/py-openslide-python/package.py +++ b/var/spack/repos/builtin/packages/py-openslide-python/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-opentuner/package.py b/var/spack/repos/builtin/packages/py-opentuner/package.py index 141fa1243a..77071a7c0d 100644 --- a/var/spack/repos/builtin/packages/py-opentuner/package.py +++ b/var/spack/repos/builtin/packages/py-opentuner/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-ordereddict/package.py b/var/spack/repos/builtin/packages/py-ordereddict/package.py index eecfc93301..6167607cc7 100644 --- a/var/spack/repos/builtin/packages/py-ordereddict/package.py +++ b/var/spack/repos/builtin/packages/py-ordereddict/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-oset/package.py b/var/spack/repos/builtin/packages/py-oset/package.py index 0b14bd3427..808f785eb4 100644 --- a/var/spack/repos/builtin/packages/py-oset/package.py +++ b/var/spack/repos/builtin/packages/py-oset/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-owslib/package.py b/var/spack/repos/builtin/packages/py-owslib/package.py index d4e70e1444..dfb2372d8f 100644 --- a/var/spack/repos/builtin/packages/py-owslib/package.py +++ b/var/spack/repos/builtin/packages/py-owslib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-packaging/package.py b/var/spack/repos/builtin/packages/py-packaging/package.py index 46fbd13e71..71253f1689 100644 --- a/var/spack/repos/builtin/packages/py-packaging/package.py +++ b/var/spack/repos/builtin/packages/py-packaging/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-palettable/package.py b/var/spack/repos/builtin/packages/py-palettable/package.py index d20c83f78d..9bef932156 100644 --- a/var/spack/repos/builtin/packages/py-palettable/package.py +++ b/var/spack/repos/builtin/packages/py-palettable/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pandas/package.py b/var/spack/repos/builtin/packages/py-pandas/package.py index ff7cc2eeca..3267ec1cd6 100644 --- a/var/spack/repos/builtin/packages/py-pandas/package.py +++ b/var/spack/repos/builtin/packages/py-pandas/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-paramiko/package.py b/var/spack/repos/builtin/packages/py-paramiko/package.py index 227b4037fe..e0650560f0 100644 --- a/var/spack/repos/builtin/packages/py-paramiko/package.py +++ b/var/spack/repos/builtin/packages/py-paramiko/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # from spack import * diff --git a/var/spack/repos/builtin/packages/py-partd/package.py b/var/spack/repos/builtin/packages/py-partd/package.py index f80537c7fa..425b5566d7 100644 --- a/var/spack/repos/builtin/packages/py-partd/package.py +++ b/var/spack/repos/builtin/packages/py-partd/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pathlib2/package.py b/var/spack/repos/builtin/packages/py-pathlib2/package.py index 0e3975c140..e8dfd995aa 100644 --- a/var/spack/repos/builtin/packages/py-pathlib2/package.py +++ b/var/spack/repos/builtin/packages/py-pathlib2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pathos/package.py b/var/spack/repos/builtin/packages/py-pathos/package.py index 2905e7f904..5c713c3e0b 100644 --- a/var/spack/repos/builtin/packages/py-pathos/package.py +++ b/var/spack/repos/builtin/packages/py-pathos/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pathspec/package.py b/var/spack/repos/builtin/packages/py-pathspec/package.py index e43323b5ac..8320b653f0 100644 --- a/var/spack/repos/builtin/packages/py-pathspec/package.py +++ b/var/spack/repos/builtin/packages/py-pathspec/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-patsy/package.py b/var/spack/repos/builtin/packages/py-patsy/package.py index c760fdb40b..44882fed93 100644 --- a/var/spack/repos/builtin/packages/py-patsy/package.py +++ b/var/spack/repos/builtin/packages/py-patsy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pbr/package.py b/var/spack/repos/builtin/packages/py-pbr/package.py index 583c23a955..edb79072c3 100644 --- a/var/spack/repos/builtin/packages/py-pbr/package.py +++ b/var/spack/repos/builtin/packages/py-pbr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pep8-naming/package.py b/var/spack/repos/builtin/packages/py-pep8-naming/package.py index 6f6e16f909..796e18a18f 100644 --- a/var/spack/repos/builtin/packages/py-pep8-naming/package.py +++ b/var/spack/repos/builtin/packages/py-pep8-naming/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-perf/package.py b/var/spack/repos/builtin/packages/py-perf/package.py index 749bde1c94..4925611f02 100644 --- a/var/spack/repos/builtin/packages/py-perf/package.py +++ b/var/spack/repos/builtin/packages/py-perf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-performance/package.py b/var/spack/repos/builtin/packages/py-performance/package.py index 1cdd2dde65..445c365025 100644 --- a/var/spack/repos/builtin/packages/py-performance/package.py +++ b/var/spack/repos/builtin/packages/py-performance/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-periodictable/package.py b/var/spack/repos/builtin/packages/py-periodictable/package.py index ffc51128a5..0d51387392 100644 --- a/var/spack/repos/builtin/packages/py-periodictable/package.py +++ b/var/spack/repos/builtin/packages/py-periodictable/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-petsc4py/package.py b/var/spack/repos/builtin/packages/py-petsc4py/package.py index 53bf5fc3b0..4e4d00f139 100644 --- a/var/spack/repos/builtin/packages/py-petsc4py/package.py +++ b/var/spack/repos/builtin/packages/py-petsc4py/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pexpect/package.py b/var/spack/repos/builtin/packages/py-pexpect/package.py index 9019be44ea..85ed20ac81 100644 --- a/var/spack/repos/builtin/packages/py-pexpect/package.py +++ b/var/spack/repos/builtin/packages/py-pexpect/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-phonopy/package.py b/var/spack/repos/builtin/packages/py-phonopy/package.py index be91d8f9f0..0e939406a6 100644 --- a/var/spack/repos/builtin/packages/py-phonopy/package.py +++ b/var/spack/repos/builtin/packages/py-phonopy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pickleshare/package.py b/var/spack/repos/builtin/packages/py-pickleshare/package.py index 58baa004e8..c2b61fb28d 100644 --- a/var/spack/repos/builtin/packages/py-pickleshare/package.py +++ b/var/spack/repos/builtin/packages/py-pickleshare/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-picrust/package.py b/var/spack/repos/builtin/packages/py-picrust/package.py index 05c17edafe..347f199441 100644 --- a/var/spack/repos/builtin/packages/py-picrust/package.py +++ b/var/spack/repos/builtin/packages/py-picrust/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pil/package.py b/var/spack/repos/builtin/packages/py-pil/package.py index 23f24c4883..4bbecf9a47 100644 --- a/var/spack/repos/builtin/packages/py-pil/package.py +++ b/var/spack/repos/builtin/packages/py-pil/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pillow/package.py b/var/spack/repos/builtin/packages/py-pillow/package.py index 71c8989918..2bce199940 100644 --- a/var/spack/repos/builtin/packages/py-pillow/package.py +++ b/var/spack/repos/builtin/packages/py-pillow/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/py-pip/package.py b/var/spack/repos/builtin/packages/py-pip/package.py index 1f41badf75..def321c229 100644 --- a/var/spack/repos/builtin/packages/py-pip/package.py +++ b/var/spack/repos/builtin/packages/py-pip/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pipits/package.py b/var/spack/repos/builtin/packages/py-pipits/package.py index 651521a399..beef939772 100644 --- a/var/spack/repos/builtin/packages/py-pipits/package.py +++ b/var/spack/repos/builtin/packages/py-pipits/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pkgconfig/package.py b/var/spack/repos/builtin/packages/py-pkgconfig/package.py index 6250006f6a..ccab4d8cad 100644 --- a/var/spack/repos/builtin/packages/py-pkgconfig/package.py +++ b/var/spack/repos/builtin/packages/py-pkgconfig/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-plotly/package.py b/var/spack/repos/builtin/packages/py-plotly/package.py index 0bdb43fb59..6ad7a68a7e 100644 --- a/var/spack/repos/builtin/packages/py-plotly/package.py +++ b/var/spack/repos/builtin/packages/py-plotly/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pluggy/package.py b/var/spack/repos/builtin/packages/py-pluggy/package.py index 5a51db0f50..62e50a6710 100644 --- a/var/spack/repos/builtin/packages/py-pluggy/package.py +++ b/var/spack/repos/builtin/packages/py-pluggy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-ply/package.py b/var/spack/repos/builtin/packages/py-ply/package.py index 6486dc7af4..38d81ee10d 100644 --- a/var/spack/repos/builtin/packages/py-ply/package.py +++ b/var/spack/repos/builtin/packages/py-ply/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pmw/package.py b/var/spack/repos/builtin/packages/py-pmw/package.py index 7043de71eb..f2f775ced7 100644 --- a/var/spack/repos/builtin/packages/py-pmw/package.py +++ b/var/spack/repos/builtin/packages/py-pmw/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-poster/package.py b/var/spack/repos/builtin/packages/py-poster/package.py index 100f11fe33..dc1a569dc6 100644 --- a/var/spack/repos/builtin/packages/py-poster/package.py +++ b/var/spack/repos/builtin/packages/py-poster/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pox/package.py b/var/spack/repos/builtin/packages/py-pox/package.py index 9c7ef8496e..cf4471c461 100644 --- a/var/spack/repos/builtin/packages/py-pox/package.py +++ b/var/spack/repos/builtin/packages/py-pox/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-ppft/package.py b/var/spack/repos/builtin/packages/py-ppft/package.py index b6f65bbdee..eff3559e35 100644 --- a/var/spack/repos/builtin/packages/py-ppft/package.py +++ b/var/spack/repos/builtin/packages/py-ppft/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-prettytable/package.py b/var/spack/repos/builtin/packages/py-prettytable/package.py index 9b7b44663e..1ebc32887d 100644 --- a/var/spack/repos/builtin/packages/py-prettytable/package.py +++ b/var/spack/repos/builtin/packages/py-prettytable/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-progress/package.py b/var/spack/repos/builtin/packages/py-progress/package.py index 9a5da81545..bf5697e4d9 100644 --- a/var/spack/repos/builtin/packages/py-progress/package.py +++ b/var/spack/repos/builtin/packages/py-progress/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-proj/package.py b/var/spack/repos/builtin/packages/py-proj/package.py index 60a09f3af0..554b404742 100644 --- a/var/spack/repos/builtin/packages/py-proj/package.py +++ b/var/spack/repos/builtin/packages/py-proj/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-projectq/package.py b/var/spack/repos/builtin/packages/py-projectq/package.py index 690b8d958e..d322bbb4e1 100644 --- a/var/spack/repos/builtin/packages/py-projectq/package.py +++ b/var/spack/repos/builtin/packages/py-projectq/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py b/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py index 6f4432f386..99e32ed782 100644 --- a/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py +++ b/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-protobuf/package.py b/var/spack/repos/builtin/packages/py-protobuf/package.py index 9353cc5925..1b8e99ddfd 100644 --- a/var/spack/repos/builtin/packages/py-protobuf/package.py +++ b/var/spack/repos/builtin/packages/py-protobuf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-psutil/package.py b/var/spack/repos/builtin/packages/py-psutil/package.py index d6cc11ae4b..2888c109bd 100644 --- a/var/spack/repos/builtin/packages/py-psutil/package.py +++ b/var/spack/repos/builtin/packages/py-psutil/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-psyclone/package.py b/var/spack/repos/builtin/packages/py-psyclone/package.py index e991296bd7..218dedf9bf 100644 --- a/var/spack/repos/builtin/packages/py-psyclone/package.py +++ b/var/spack/repos/builtin/packages/py-psyclone/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # from spack import * diff --git a/var/spack/repos/builtin/packages/py-ptyprocess/package.py b/var/spack/repos/builtin/packages/py-ptyprocess/package.py index 352cfddb8c..cef35e3115 100644 --- a/var/spack/repos/builtin/packages/py-ptyprocess/package.py +++ b/var/spack/repos/builtin/packages/py-ptyprocess/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pudb/package.py b/var/spack/repos/builtin/packages/py-pudb/package.py index b14e15d75b..f37904194f 100644 --- a/var/spack/repos/builtin/packages/py-pudb/package.py +++ b/var/spack/repos/builtin/packages/py-pudb/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-py/package.py b/var/spack/repos/builtin/packages/py-py/package.py index ad6f253649..51efc6ceae 100644 --- a/var/spack/repos/builtin/packages/py-py/package.py +++ b/var/spack/repos/builtin/packages/py-py/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-py2bit/package.py b/var/spack/repos/builtin/packages/py-py2bit/package.py index 706c6c911f..2bb90a37a7 100644 --- a/var/spack/repos/builtin/packages/py-py2bit/package.py +++ b/var/spack/repos/builtin/packages/py-py2bit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-py2cairo/package.py b/var/spack/repos/builtin/packages/py-py2cairo/package.py index a990bbaeb5..13975addd2 100644 --- a/var/spack/repos/builtin/packages/py-py2cairo/package.py +++ b/var/spack/repos/builtin/packages/py-py2cairo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-py2neo/package.py b/var/spack/repos/builtin/packages/py-py2neo/package.py index 51a86f12a8..9ecc72d3ce 100644 --- a/var/spack/repos/builtin/packages/py-py2neo/package.py +++ b/var/spack/repos/builtin/packages/py-py2neo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-py4j/package.py b/var/spack/repos/builtin/packages/py-py4j/package.py index c8303af72d..c369fd3d98 100644 --- a/var/spack/repos/builtin/packages/py-py4j/package.py +++ b/var/spack/repos/builtin/packages/py-py4j/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pyani/package.py b/var/spack/repos/builtin/packages/py-pyani/package.py index c1aca44c31..b17125eddb 100644 --- a/var/spack/repos/builtin/packages/py-pyani/package.py +++ b/var/spack/repos/builtin/packages/py-pyani/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pyasn1/package.py b/var/spack/repos/builtin/packages/py-pyasn1/package.py index adc8aa19f5..e2bdf80d26 100644 --- a/var/spack/repos/builtin/packages/py-pyasn1/package.py +++ b/var/spack/repos/builtin/packages/py-pyasn1/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # from spack import * diff --git a/var/spack/repos/builtin/packages/py-pybigwig/package.py b/var/spack/repos/builtin/packages/py-pybigwig/package.py index b3fe30bfb9..b0b33b76d4 100644 --- a/var/spack/repos/builtin/packages/py-pybigwig/package.py +++ b/var/spack/repos/builtin/packages/py-pybigwig/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pybind11/package.py b/var/spack/repos/builtin/packages/py-pybind11/package.py index 7d50bba051..b6e3118118 100644 --- a/var/spack/repos/builtin/packages/py-pybind11/package.py +++ b/var/spack/repos/builtin/packages/py-pybind11/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pybtex-docutils/package.py b/var/spack/repos/builtin/packages/py-pybtex-docutils/package.py index 3656dfc0af..fa46889631 100644 --- a/var/spack/repos/builtin/packages/py-pybtex-docutils/package.py +++ b/var/spack/repos/builtin/packages/py-pybtex-docutils/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pybtex/package.py b/var/spack/repos/builtin/packages/py-pybtex/package.py index 02c6d49222..fd0bac735a 100644 --- a/var/spack/repos/builtin/packages/py-pybtex/package.py +++ b/var/spack/repos/builtin/packages/py-pybtex/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pycairo/package.py b/var/spack/repos/builtin/packages/py-pycairo/package.py index 1a0885b6e3..607981a060 100644 --- a/var/spack/repos/builtin/packages/py-pycairo/package.py +++ b/var/spack/repos/builtin/packages/py-pycairo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/py-pychecker/package.py b/var/spack/repos/builtin/packages/py-pychecker/package.py index 5d691d8a38..49f4b39f86 100644 --- a/var/spack/repos/builtin/packages/py-pychecker/package.py +++ b/var/spack/repos/builtin/packages/py-pychecker/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pycodestyle/package.py b/var/spack/repos/builtin/packages/py-pycodestyle/package.py index 273c6c50cc..10f97547c5 100644 --- a/var/spack/repos/builtin/packages/py-pycodestyle/package.py +++ b/var/spack/repos/builtin/packages/py-pycodestyle/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pycparser/package.py b/var/spack/repos/builtin/packages/py-pycparser/package.py index ca4aa82788..3fa5a0acb3 100644 --- a/var/spack/repos/builtin/packages/py-pycparser/package.py +++ b/var/spack/repos/builtin/packages/py-pycparser/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pycrypto/package.py b/var/spack/repos/builtin/packages/py-pycrypto/package.py index 4a25de8e8e..9bacd5b4ba 100644 --- a/var/spack/repos/builtin/packages/py-pycrypto/package.py +++ b/var/spack/repos/builtin/packages/py-pycrypto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # from spack import * diff --git a/var/spack/repos/builtin/packages/py-pycurl/package.py b/var/spack/repos/builtin/packages/py-pycurl/package.py index 05912b7aab..85074d6341 100644 --- a/var/spack/repos/builtin/packages/py-pycurl/package.py +++ b/var/spack/repos/builtin/packages/py-pycurl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pydatalog/package.py b/var/spack/repos/builtin/packages/py-pydatalog/package.py index eaee1c1b9a..cbcedc385f 100644 --- a/var/spack/repos/builtin/packages/py-pydatalog/package.py +++ b/var/spack/repos/builtin/packages/py-pydatalog/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pydispatcher/package.py b/var/spack/repos/builtin/packages/py-pydispatcher/package.py index 1f389630af..89efd4f463 100644 --- a/var/spack/repos/builtin/packages/py-pydispatcher/package.py +++ b/var/spack/repos/builtin/packages/py-pydispatcher/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pydot/package.py b/var/spack/repos/builtin/packages/py-pydot/package.py index 416b761a90..ed941e9513 100644 --- a/var/spack/repos/builtin/packages/py-pydot/package.py +++ b/var/spack/repos/builtin/packages/py-pydot/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pyelftools/package.py b/var/spack/repos/builtin/packages/py-pyelftools/package.py index e941b6756f..632ee37917 100644 --- a/var/spack/repos/builtin/packages/py-pyelftools/package.py +++ b/var/spack/repos/builtin/packages/py-pyelftools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pyepsg/package.py b/var/spack/repos/builtin/packages/py-pyepsg/package.py index b91f1671ce..4771e56d4b 100644 --- a/var/spack/repos/builtin/packages/py-pyepsg/package.py +++ b/var/spack/repos/builtin/packages/py-pyepsg/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pyfasta/package.py b/var/spack/repos/builtin/packages/py-pyfasta/package.py index 32e9067d04..ba0a69838a 100644 --- a/var/spack/repos/builtin/packages/py-pyfasta/package.py +++ b/var/spack/repos/builtin/packages/py-pyfasta/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pyfftw/package.py b/var/spack/repos/builtin/packages/py-pyfftw/package.py index 2894d482fc..78a76f9a5d 100644 --- a/var/spack/repos/builtin/packages/py-pyfftw/package.py +++ b/var/spack/repos/builtin/packages/py-pyfftw/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pyflakes/package.py b/var/spack/repos/builtin/packages/py-pyflakes/package.py index 6ccf38b29a..08c1229b7e 100644 --- a/var/spack/repos/builtin/packages/py-pyflakes/package.py +++ b/var/spack/repos/builtin/packages/py-pyflakes/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pygdbmi/package.py b/var/spack/repos/builtin/packages/py-pygdbmi/package.py index 059554974c..f8198015f8 100644 --- a/var/spack/repos/builtin/packages/py-pygdbmi/package.py +++ b/var/spack/repos/builtin/packages/py-pygdbmi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pygments/package.py b/var/spack/repos/builtin/packages/py-pygments/package.py index b3e3d2e681..1909a2da11 100644 --- a/var/spack/repos/builtin/packages/py-pygments/package.py +++ b/var/spack/repos/builtin/packages/py-pygments/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pygobject/package.py b/var/spack/repos/builtin/packages/py-pygobject/package.py index 192a215bdb..1dd08a30d0 100644 --- a/var/spack/repos/builtin/packages/py-pygobject/package.py +++ b/var/spack/repos/builtin/packages/py-pygobject/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pygpu/package.py b/var/spack/repos/builtin/packages/py-pygpu/package.py index b3ef4c59da..f5838c740b 100644 --- a/var/spack/repos/builtin/packages/py-pygpu/package.py +++ b/var/spack/repos/builtin/packages/py-pygpu/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pygtk/package.py b/var/spack/repos/builtin/packages/py-pygtk/package.py index 4315c03e5f..28b2cacd27 100644 --- a/var/spack/repos/builtin/packages/py-pygtk/package.py +++ b/var/spack/repos/builtin/packages/py-pygtk/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pylint/package.py b/var/spack/repos/builtin/packages/py-pylint/package.py index 0a5ab5b676..404767e909 100644 --- a/var/spack/repos/builtin/packages/py-pylint/package.py +++ b/var/spack/repos/builtin/packages/py-pylint/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pymatgen/package.py b/var/spack/repos/builtin/packages/py-pymatgen/package.py index 142482fb1d..65c4337083 100644 --- a/var/spack/repos/builtin/packages/py-pymatgen/package.py +++ b/var/spack/repos/builtin/packages/py-pymatgen/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pyminifier/package.py b/var/spack/repos/builtin/packages/py-pyminifier/package.py index 50ae1cc062..4da150f949 100644 --- a/var/spack/repos/builtin/packages/py-pyminifier/package.py +++ b/var/spack/repos/builtin/packages/py-pyminifier/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pymol/package.py b/var/spack/repos/builtin/packages/py-pymol/package.py index 5ba09f1bc9..1a23247499 100644 --- a/var/spack/repos/builtin/packages/py-pymol/package.py +++ b/var/spack/repos/builtin/packages/py-pymol/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pympler/package.py b/var/spack/repos/builtin/packages/py-pympler/package.py index 555b974095..7498f9e32e 100644 --- a/var/spack/repos/builtin/packages/py-pympler/package.py +++ b/var/spack/repos/builtin/packages/py-pympler/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pymysql/package.py b/var/spack/repos/builtin/packages/py-pymysql/package.py index 6e47c1eb35..22346c4dd0 100644 --- a/var/spack/repos/builtin/packages/py-pymysql/package.py +++ b/var/spack/repos/builtin/packages/py-pymysql/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pynn/package.py b/var/spack/repos/builtin/packages/py-pynn/package.py index 51947b8e50..a91adb259c 100644 --- a/var/spack/repos/builtin/packages/py-pynn/package.py +++ b/var/spack/repos/builtin/packages/py-pynn/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pypar/package.py b/var/spack/repos/builtin/packages/py-pypar/package.py index 1fba9e0dfe..28fcada1fc 100644 --- a/var/spack/repos/builtin/packages/py-pypar/package.py +++ b/var/spack/repos/builtin/packages/py-pypar/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pyparsing/package.py b/var/spack/repos/builtin/packages/py-pyparsing/package.py index 90c3fc05a1..48626a37e4 100644 --- a/var/spack/repos/builtin/packages/py-pyparsing/package.py +++ b/var/spack/repos/builtin/packages/py-pyparsing/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pypeflow/package.py b/var/spack/repos/builtin/packages/py-pypeflow/package.py index 6788e502f1..d4abb9f330 100644 --- a/var/spack/repos/builtin/packages/py-pypeflow/package.py +++ b/var/spack/repos/builtin/packages/py-pypeflow/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pyprof2html/package.py b/var/spack/repos/builtin/packages/py-pyprof2html/package.py index a840d1dd96..275b52aa07 100644 --- a/var/spack/repos/builtin/packages/py-pyprof2html/package.py +++ b/var/spack/repos/builtin/packages/py-pyprof2html/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pyqi/package.py b/var/spack/repos/builtin/packages/py-pyqi/package.py index 43b4c791d3..21fecdec19 100644 --- a/var/spack/repos/builtin/packages/py-pyqi/package.py +++ b/var/spack/repos/builtin/packages/py-pyqi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pyqt/package.py b/var/spack/repos/builtin/packages/py-pyqt/package.py index fc790f9296..ce700d18bd 100644 --- a/var/spack/repos/builtin/packages/py-pyqt/package.py +++ b/var/spack/repos/builtin/packages/py-pyqt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pyrad/package.py b/var/spack/repos/builtin/packages/py-pyrad/package.py index 8a40a34454..de0a082930 100644 --- a/var/spack/repos/builtin/packages/py-pyrad/package.py +++ b/var/spack/repos/builtin/packages/py-pyrad/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pysam/package.py b/var/spack/repos/builtin/packages/py-pysam/package.py index 945855947b..513a41f778 100644 --- a/var/spack/repos/builtin/packages/py-pysam/package.py +++ b/var/spack/repos/builtin/packages/py-pysam/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pyscaf/package.py b/var/spack/repos/builtin/packages/py-pyscaf/package.py index b79e992e8b..508de86ad9 100644 --- a/var/spack/repos/builtin/packages/py-pyscaf/package.py +++ b/var/spack/repos/builtin/packages/py-pyscaf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pyserial/package.py b/var/spack/repos/builtin/packages/py-pyserial/package.py index 289e87712b..cb747c2e27 100644 --- a/var/spack/repos/builtin/packages/py-pyserial/package.py +++ b/var/spack/repos/builtin/packages/py-pyserial/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pyshp/package.py b/var/spack/repos/builtin/packages/py-pyshp/package.py index 7c4b7b5ada..f416310fba 100644 --- a/var/spack/repos/builtin/packages/py-pyshp/package.py +++ b/var/spack/repos/builtin/packages/py-pyshp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pyside/package.py b/var/spack/repos/builtin/packages/py-pyside/package.py index 0d7fae8271..dc728bff77 100644 --- a/var/spack/repos/builtin/packages/py-pyside/package.py +++ b/var/spack/repos/builtin/packages/py-pyside/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/py-pysocks/package.py b/var/spack/repos/builtin/packages/py-pysocks/package.py index 38bd439dea..83661d93b0 100644 --- a/var/spack/repos/builtin/packages/py-pysocks/package.py +++ b/var/spack/repos/builtin/packages/py-pysocks/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pyspark/package.py b/var/spack/repos/builtin/packages/py-pyspark/package.py index 1107877a98..126de2af41 100644 --- a/var/spack/repos/builtin/packages/py-pyspark/package.py +++ b/var/spack/repos/builtin/packages/py-pyspark/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pysqlite/package.py b/var/spack/repos/builtin/packages/py-pysqlite/package.py index c12b378a2f..0f69acc3bf 100644 --- a/var/spack/repos/builtin/packages/py-pysqlite/package.py +++ b/var/spack/repos/builtin/packages/py-pysqlite/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pytables/package.py b/var/spack/repos/builtin/packages/py-pytables/package.py index cbef3ec8f5..96033237b0 100644 --- a/var/spack/repos/builtin/packages/py-pytables/package.py +++ b/var/spack/repos/builtin/packages/py-pytables/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pytest-cov/package.py b/var/spack/repos/builtin/packages/py-pytest-cov/package.py index f22c6ffc9a..949696d3f4 100644 --- a/var/spack/repos/builtin/packages/py-pytest-cov/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-cov/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pytest-flake8/package.py b/var/spack/repos/builtin/packages/py-pytest-flake8/package.py index f5e60de76f..06066572ec 100644 --- a/var/spack/repos/builtin/packages/py-pytest-flake8/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-flake8/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pytest-httpbin/package.py b/var/spack/repos/builtin/packages/py-pytest-httpbin/package.py index 84a1be226c..0782f761d4 100644 --- a/var/spack/repos/builtin/packages/py-pytest-httpbin/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-httpbin/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pytest-mock/package.py b/var/spack/repos/builtin/packages/py-pytest-mock/package.py index cae573c184..d574f6ae84 100644 --- a/var/spack/repos/builtin/packages/py-pytest-mock/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-mock/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pytest-runner/package.py b/var/spack/repos/builtin/packages/py-pytest-runner/package.py index 2bd23df50d..037ec724ae 100644 --- a/var/spack/repos/builtin/packages/py-pytest-runner/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-runner/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pytest-xdist/package.py b/var/spack/repos/builtin/packages/py-pytest-xdist/package.py index e91952899b..ad3c77c7ef 100644 --- a/var/spack/repos/builtin/packages/py-pytest-xdist/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-xdist/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pytest/package.py b/var/spack/repos/builtin/packages/py-pytest/package.py index 90eab3738b..7e6c6f555c 100644 --- a/var/spack/repos/builtin/packages/py-pytest/package.py +++ b/var/spack/repos/builtin/packages/py-pytest/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-python-daemon/package.py b/var/spack/repos/builtin/packages/py-python-daemon/package.py index 3ef87e72fb..8fd6e38464 100644 --- a/var/spack/repos/builtin/packages/py-python-daemon/package.py +++ b/var/spack/repos/builtin/packages/py-python-daemon/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-python-engineio/package.py b/var/spack/repos/builtin/packages/py-python-engineio/package.py index 85c1d8eafc..27735cb1ad 100644 --- a/var/spack/repos/builtin/packages/py-python-engineio/package.py +++ b/var/spack/repos/builtin/packages/py-python-engineio/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-python-gitlab/package.py b/var/spack/repos/builtin/packages/py-python-gitlab/package.py index 8804279f7a..d27d250d99 100644 --- a/var/spack/repos/builtin/packages/py-python-gitlab/package.py +++ b/var/spack/repos/builtin/packages/py-python-gitlab/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-python-levenshtein/package.py b/var/spack/repos/builtin/packages/py-python-levenshtein/package.py index 8acec3f08c..a19247c6fe 100644 --- a/var/spack/repos/builtin/packages/py-python-levenshtein/package.py +++ b/var/spack/repos/builtin/packages/py-python-levenshtein/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-python-socketio/package.py b/var/spack/repos/builtin/packages/py-python-socketio/package.py index f44c535e3e..169c960f9c 100644 --- a/var/spack/repos/builtin/packages/py-python-socketio/package.py +++ b/var/spack/repos/builtin/packages/py-python-socketio/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pythonqwt/package.py b/var/spack/repos/builtin/packages/py-pythonqwt/package.py index 8fafd49a74..62551cfc9c 100644 --- a/var/spack/repos/builtin/packages/py-pythonqwt/package.py +++ b/var/spack/repos/builtin/packages/py-pythonqwt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pytorch/package.py b/var/spack/repos/builtin/packages/py-pytorch/package.py index 22c52e8aad..d5df52c16f 100644 --- a/var/spack/repos/builtin/packages/py-pytorch/package.py +++ b/var/spack/repos/builtin/packages/py-pytorch/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pytz/package.py b/var/spack/repos/builtin/packages/py-pytz/package.py index e0c36eec15..de453868ae 100644 --- a/var/spack/repos/builtin/packages/py-pytz/package.py +++ b/var/spack/repos/builtin/packages/py-pytz/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pyutilib/package.py b/var/spack/repos/builtin/packages/py-pyutilib/package.py index 1064856eae..62024068f1 100644 --- a/var/spack/repos/builtin/packages/py-pyutilib/package.py +++ b/var/spack/repos/builtin/packages/py-pyutilib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pywavelets/package.py b/var/spack/repos/builtin/packages/py-pywavelets/package.py index 41de891f9a..dd561b17f4 100644 --- a/var/spack/repos/builtin/packages/py-pywavelets/package.py +++ b/var/spack/repos/builtin/packages/py-pywavelets/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-pyyaml/package.py b/var/spack/repos/builtin/packages/py-pyyaml/package.py index d3c7614519..3651c6820d 100644 --- a/var/spack/repos/builtin/packages/py-pyyaml/package.py +++ b/var/spack/repos/builtin/packages/py-pyyaml/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-qtawesome/package.py b/var/spack/repos/builtin/packages/py-qtawesome/package.py index a3cd6645a3..3d9cd5f77c 100644 --- a/var/spack/repos/builtin/packages/py-qtawesome/package.py +++ b/var/spack/repos/builtin/packages/py-qtawesome/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-qtconsole/package.py b/var/spack/repos/builtin/packages/py-qtconsole/package.py index f4b818be17..37b05f9a1b 100644 --- a/var/spack/repos/builtin/packages/py-qtconsole/package.py +++ b/var/spack/repos/builtin/packages/py-qtconsole/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-qtpy/package.py b/var/spack/repos/builtin/packages/py-qtpy/package.py index f90bcb566d..aef6a1deb1 100644 --- a/var/spack/repos/builtin/packages/py-qtpy/package.py +++ b/var/spack/repos/builtin/packages/py-qtpy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-quantities/package.py b/var/spack/repos/builtin/packages/py-quantities/package.py index f7136e27bb..c0afca77a7 100644 --- a/var/spack/repos/builtin/packages/py-quantities/package.py +++ b/var/spack/repos/builtin/packages/py-quantities/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-quast/package.py b/var/spack/repos/builtin/packages/py-quast/package.py index 03e96a8263..41e966b24b 100644 --- a/var/spack/repos/builtin/packages/py-quast/package.py +++ b/var/spack/repos/builtin/packages/py-quast/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-radical-utils/package.py b/var/spack/repos/builtin/packages/py-radical-utils/package.py index df1abb1f1a..1a04087ea0 100644 --- a/var/spack/repos/builtin/packages/py-radical-utils/package.py +++ b/var/spack/repos/builtin/packages/py-radical-utils/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-ranger/package.py b/var/spack/repos/builtin/packages/py-ranger/package.py index 2c297e91d2..7a923fc638 100644 --- a/var/spack/repos/builtin/packages/py-ranger/package.py +++ b/var/spack/repos/builtin/packages/py-ranger/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # from spack import * diff --git a/var/spack/repos/builtin/packages/py-rasterio/package.py b/var/spack/repos/builtin/packages/py-rasterio/package.py index c7df3bb153..567befd2a0 100644 --- a/var/spack/repos/builtin/packages/py-rasterio/package.py +++ b/var/spack/repos/builtin/packages/py-rasterio/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-readme-renderer/package.py b/var/spack/repos/builtin/packages/py-readme-renderer/package.py index e6bf6ed2f4..becbc0e1d4 100644 --- a/var/spack/repos/builtin/packages/py-readme-renderer/package.py +++ b/var/spack/repos/builtin/packages/py-readme-renderer/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-regex/package.py b/var/spack/repos/builtin/packages/py-regex/package.py index b475995948..e2aeb296bf 100644 --- a/var/spack/repos/builtin/packages/py-regex/package.py +++ b/var/spack/repos/builtin/packages/py-regex/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-reportlab/package.py b/var/spack/repos/builtin/packages/py-reportlab/package.py index bb14dd5f9f..e8a1867947 100644 --- a/var/spack/repos/builtin/packages/py-reportlab/package.py +++ b/var/spack/repos/builtin/packages/py-reportlab/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-requests-toolbelt/package.py b/var/spack/repos/builtin/packages/py-requests-toolbelt/package.py index 8d46e8d544..f19e9fe1d1 100644 --- a/var/spack/repos/builtin/packages/py-requests-toolbelt/package.py +++ b/var/spack/repos/builtin/packages/py-requests-toolbelt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-requests/package.py b/var/spack/repos/builtin/packages/py-requests/package.py index db710fcb0e..b5ba4b0d37 100644 --- a/var/spack/repos/builtin/packages/py-requests/package.py +++ b/var/spack/repos/builtin/packages/py-requests/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-restview/package.py b/var/spack/repos/builtin/packages/py-restview/package.py index c3e8c87f85..2f9c735bab 100644 --- a/var/spack/repos/builtin/packages/py-restview/package.py +++ b/var/spack/repos/builtin/packages/py-restview/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-rope/package.py b/var/spack/repos/builtin/packages/py-rope/package.py index fe1fa8ce37..879264707f 100644 --- a/var/spack/repos/builtin/packages/py-rope/package.py +++ b/var/spack/repos/builtin/packages/py-rope/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-rpy2/package.py b/var/spack/repos/builtin/packages/py-rpy2/package.py index 79deaed32f..9ae4464ea1 100644 --- a/var/spack/repos/builtin/packages/py-rpy2/package.py +++ b/var/spack/repos/builtin/packages/py-rpy2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-rsa/package.py b/var/spack/repos/builtin/packages/py-rsa/package.py index e0642fb528..287d39279a 100644 --- a/var/spack/repos/builtin/packages/py-rsa/package.py +++ b/var/spack/repos/builtin/packages/py-rsa/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-rseqc/package.py b/var/spack/repos/builtin/packages/py-rseqc/package.py index 2d5410c455..15563be2a0 100644 --- a/var/spack/repos/builtin/packages/py-rseqc/package.py +++ b/var/spack/repos/builtin/packages/py-rseqc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-rtree/package.py b/var/spack/repos/builtin/packages/py-rtree/package.py index 637afc9ce5..e1be4c6aee 100644 --- a/var/spack/repos/builtin/packages/py-rtree/package.py +++ b/var/spack/repos/builtin/packages/py-rtree/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-saga-python/package.py b/var/spack/repos/builtin/packages/py-saga-python/package.py index 9b202497f5..2890c16889 100644 --- a/var/spack/repos/builtin/packages/py-saga-python/package.py +++ b/var/spack/repos/builtin/packages/py-saga-python/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-scandir/package.py b/var/spack/repos/builtin/packages/py-scandir/package.py index 0bc069e198..09aa29a662 100644 --- a/var/spack/repos/builtin/packages/py-scandir/package.py +++ b/var/spack/repos/builtin/packages/py-scandir/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-scientificpython/package.py b/var/spack/repos/builtin/packages/py-scientificpython/package.py index 241214a032..4926de0054 100644 --- a/var/spack/repos/builtin/packages/py-scientificpython/package.py +++ b/var/spack/repos/builtin/packages/py-scientificpython/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-scikit-image/package.py b/var/spack/repos/builtin/packages/py-scikit-image/package.py index 4aa8525d45..f9a270f96d 100644 --- a/var/spack/repos/builtin/packages/py-scikit-image/package.py +++ b/var/spack/repos/builtin/packages/py-scikit-image/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-scikit-learn/package.py b/var/spack/repos/builtin/packages/py-scikit-learn/package.py index 46024fdfd4..9a5df494f2 100644 --- a/var/spack/repos/builtin/packages/py-scikit-learn/package.py +++ b/var/spack/repos/builtin/packages/py-scikit-learn/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-scipy/package.py b/var/spack/repos/builtin/packages/py-scipy/package.py index acf93a6f25..8b04bda75d 100644 --- a/var/spack/repos/builtin/packages/py-scipy/package.py +++ b/var/spack/repos/builtin/packages/py-scipy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-seaborn/package.py b/var/spack/repos/builtin/packages/py-seaborn/package.py index 6783e79a9f..f10302a5b6 100644 --- a/var/spack/repos/builtin/packages/py-seaborn/package.py +++ b/var/spack/repos/builtin/packages/py-seaborn/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-setuptools-git/package.py b/var/spack/repos/builtin/packages/py-setuptools-git/package.py index a072d02f47..23569c4534 100644 --- a/var/spack/repos/builtin/packages/py-setuptools-git/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools-git/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-setuptools-scm/package.py b/var/spack/repos/builtin/packages/py-setuptools-scm/package.py index bda8a527b9..dd2321fbd0 100644 --- a/var/spack/repos/builtin/packages/py-setuptools-scm/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools-scm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-setuptools/package.py b/var/spack/repos/builtin/packages/py-setuptools/package.py index 8f7a61e733..c37d62414b 100644 --- a/var/spack/repos/builtin/packages/py-setuptools/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-sfepy/package.py b/var/spack/repos/builtin/packages/py-sfepy/package.py index 48b9dd891d..efd3305bf4 100644 --- a/var/spack/repos/builtin/packages/py-sfepy/package.py +++ b/var/spack/repos/builtin/packages/py-sfepy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-sh/package.py b/var/spack/repos/builtin/packages/py-sh/package.py index 71a9d9fe64..4fd4ecb8bf 100644 --- a/var/spack/repos/builtin/packages/py-sh/package.py +++ b/var/spack/repos/builtin/packages/py-sh/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-shapely/package.py b/var/spack/repos/builtin/packages/py-shapely/package.py index 0f14934738..ba82ef2229 100644 --- a/var/spack/repos/builtin/packages/py-shapely/package.py +++ b/var/spack/repos/builtin/packages/py-shapely/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-shiboken/package.py b/var/spack/repos/builtin/packages/py-shiboken/package.py index f6d0630fb5..02197e7571 100644 --- a/var/spack/repos/builtin/packages/py-shiboken/package.py +++ b/var/spack/repos/builtin/packages/py-shiboken/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/py-simplegeneric/package.py b/var/spack/repos/builtin/packages/py-simplegeneric/package.py index 9ad021845a..5fc961ccc0 100644 --- a/var/spack/repos/builtin/packages/py-simplegeneric/package.py +++ b/var/spack/repos/builtin/packages/py-simplegeneric/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-simplejson/package.py b/var/spack/repos/builtin/packages/py-simplejson/package.py index 95a73d6e94..1b7ad7e071 100644 --- a/var/spack/repos/builtin/packages/py-simplejson/package.py +++ b/var/spack/repos/builtin/packages/py-simplejson/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-singledispatch/package.py b/var/spack/repos/builtin/packages/py-singledispatch/package.py index bdbbc56525..ca9ed4513c 100644 --- a/var/spack/repos/builtin/packages/py-singledispatch/package.py +++ b/var/spack/repos/builtin/packages/py-singledispatch/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-sip/package.py b/var/spack/repos/builtin/packages/py-sip/package.py index 643168cf2f..afa4aeee9b 100644 --- a/var/spack/repos/builtin/packages/py-sip/package.py +++ b/var/spack/repos/builtin/packages/py-sip/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/py-six/package.py b/var/spack/repos/builtin/packages/py-six/package.py index 349ea5f4b5..acbc674d7b 100644 --- a/var/spack/repos/builtin/packages/py-six/package.py +++ b/var/spack/repos/builtin/packages/py-six/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-slepc4py/package.py b/var/spack/repos/builtin/packages/py-slepc4py/package.py index 0ad7085eef..279f805052 100644 --- a/var/spack/repos/builtin/packages/py-slepc4py/package.py +++ b/var/spack/repos/builtin/packages/py-slepc4py/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-slurm-pipeline/package.py b/var/spack/repos/builtin/packages/py-slurm-pipeline/package.py index c12092d9dc..ffece8a2ac 100644 --- a/var/spack/repos/builtin/packages/py-slurm-pipeline/package.py +++ b/var/spack/repos/builtin/packages/py-slurm-pipeline/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-sncosmo/package.py b/var/spack/repos/builtin/packages/py-sncosmo/package.py index 061ee3cdbf..d44724d41c 100644 --- a/var/spack/repos/builtin/packages/py-sncosmo/package.py +++ b/var/spack/repos/builtin/packages/py-sncosmo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-snowballstemmer/package.py b/var/spack/repos/builtin/packages/py-snowballstemmer/package.py index 79f8355702..19e3d99afe 100644 --- a/var/spack/repos/builtin/packages/py-snowballstemmer/package.py +++ b/var/spack/repos/builtin/packages/py-snowballstemmer/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-snuggs/package.py b/var/spack/repos/builtin/packages/py-snuggs/package.py index 975fdfbe03..7224d9e7bf 100644 --- a/var/spack/repos/builtin/packages/py-snuggs/package.py +++ b/var/spack/repos/builtin/packages/py-snuggs/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-spectra/package.py b/var/spack/repos/builtin/packages/py-spectra/package.py index cbc87041ec..37891536d9 100644 --- a/var/spack/repos/builtin/packages/py-spectra/package.py +++ b/var/spack/repos/builtin/packages/py-spectra/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-spefile/package.py b/var/spack/repos/builtin/packages/py-spefile/package.py index db82492efe..c6b4adba1f 100644 --- a/var/spack/repos/builtin/packages/py-spefile/package.py +++ b/var/spack/repos/builtin/packages/py-spefile/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-spglib/package.py b/var/spack/repos/builtin/packages/py-spglib/package.py index 7ea44c9b43..271ca68e82 100644 --- a/var/spack/repos/builtin/packages/py-spglib/package.py +++ b/var/spack/repos/builtin/packages/py-spglib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-sphinx-bootstrap-theme/package.py b/var/spack/repos/builtin/packages/py-sphinx-bootstrap-theme/package.py index 5a1c0fc748..878b18195c 100644 --- a/var/spack/repos/builtin/packages/py-sphinx-bootstrap-theme/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx-bootstrap-theme/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-sphinx-rtd-theme/package.py b/var/spack/repos/builtin/packages/py-sphinx-rtd-theme/package.py index e0bdf96d32..bb799915aa 100644 --- a/var/spack/repos/builtin/packages/py-sphinx-rtd-theme/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx-rtd-theme/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-sphinx/package.py b/var/spack/repos/builtin/packages/py-sphinx/package.py index e63605efc6..3f0268732f 100644 --- a/var/spack/repos/builtin/packages/py-sphinx/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-bibtex/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-bibtex/package.py index 91f242a24c..b0dc62142b 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-bibtex/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-bibtex/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-programoutput/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-programoutput/package.py index 23ffd12ebc..bc8cd15609 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-programoutput/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-programoutput/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-websupport/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-websupport/package.py index 0c98d435c7..f823a0fadb 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-websupport/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-websupport/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-spyder/package.py b/var/spack/repos/builtin/packages/py-spyder/package.py index db7af50224..57ce28a28a 100644 --- a/var/spack/repos/builtin/packages/py-spyder/package.py +++ b/var/spack/repos/builtin/packages/py-spyder/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-spykeutils/package.py b/var/spack/repos/builtin/packages/py-spykeutils/package.py index 830d84e0a6..466ec83895 100644 --- a/var/spack/repos/builtin/packages/py-spykeutils/package.py +++ b/var/spack/repos/builtin/packages/py-spykeutils/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-sqlalchemy/package.py b/var/spack/repos/builtin/packages/py-sqlalchemy/package.py index ed70309a1a..16ce8b76c9 100644 --- a/var/spack/repos/builtin/packages/py-sqlalchemy/package.py +++ b/var/spack/repos/builtin/packages/py-sqlalchemy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-statsmodels/package.py b/var/spack/repos/builtin/packages/py-statsmodels/package.py index c4d73ad91d..b206410d39 100644 --- a/var/spack/repos/builtin/packages/py-statsmodels/package.py +++ b/var/spack/repos/builtin/packages/py-statsmodels/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-stevedore/package.py b/var/spack/repos/builtin/packages/py-stevedore/package.py index 05640c31f8..5cd8c5ec43 100644 --- a/var/spack/repos/builtin/packages/py-stevedore/package.py +++ b/var/spack/repos/builtin/packages/py-stevedore/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-storm/package.py b/var/spack/repos/builtin/packages/py-storm/package.py index a893b4efdc..2274a5d3ea 100644 --- a/var/spack/repos/builtin/packages/py-storm/package.py +++ b/var/spack/repos/builtin/packages/py-storm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-subprocess32/package.py b/var/spack/repos/builtin/packages/py-subprocess32/package.py index 22ff245f73..831f0ae428 100644 --- a/var/spack/repos/builtin/packages/py-subprocess32/package.py +++ b/var/spack/repos/builtin/packages/py-subprocess32/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-symengine/package.py b/var/spack/repos/builtin/packages/py-symengine/package.py index b3efc57390..021604a88b 100644 --- a/var/spack/repos/builtin/packages/py-symengine/package.py +++ b/var/spack/repos/builtin/packages/py-symengine/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-symfit/package.py b/var/spack/repos/builtin/packages/py-symfit/package.py index df39927ccc..a876ef689d 100644 --- a/var/spack/repos/builtin/packages/py-symfit/package.py +++ b/var/spack/repos/builtin/packages/py-symfit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-sympy/package.py b/var/spack/repos/builtin/packages/py-sympy/package.py index 1d16331284..f9289f9b0f 100644 --- a/var/spack/repos/builtin/packages/py-sympy/package.py +++ b/var/spack/repos/builtin/packages/py-sympy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-tabulate/package.py b/var/spack/repos/builtin/packages/py-tabulate/package.py index fe3466d7b6..6a3058a769 100644 --- a/var/spack/repos/builtin/packages/py-tabulate/package.py +++ b/var/spack/repos/builtin/packages/py-tabulate/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-tappy/package.py b/var/spack/repos/builtin/packages/py-tappy/package.py index ee495cc78f..ae2c5b360b 100644 --- a/var/spack/repos/builtin/packages/py-tappy/package.py +++ b/var/spack/repos/builtin/packages/py-tappy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-terminado/package.py b/var/spack/repos/builtin/packages/py-terminado/package.py index 9962f4190b..f77097c4d8 100644 --- a/var/spack/repos/builtin/packages/py-terminado/package.py +++ b/var/spack/repos/builtin/packages/py-terminado/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-testinfra/package.py b/var/spack/repos/builtin/packages/py-testinfra/package.py index 50e098bb7e..e866245794 100644 --- a/var/spack/repos/builtin/packages/py-testinfra/package.py +++ b/var/spack/repos/builtin/packages/py-testinfra/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-tetoolkit/package.py b/var/spack/repos/builtin/packages/py-tetoolkit/package.py index e242ae52df..c43950c518 100644 --- a/var/spack/repos/builtin/packages/py-tetoolkit/package.py +++ b/var/spack/repos/builtin/packages/py-tetoolkit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-theano/package.py b/var/spack/repos/builtin/packages/py-theano/package.py index e5f77a1e9a..a808fa896b 100644 --- a/var/spack/repos/builtin/packages/py-theano/package.py +++ b/var/spack/repos/builtin/packages/py-theano/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-tifffile/package.py b/var/spack/repos/builtin/packages/py-tifffile/package.py index 740f94170e..d8f863ef15 100644 --- a/var/spack/repos/builtin/packages/py-tifffile/package.py +++ b/var/spack/repos/builtin/packages/py-tifffile/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-toml/package.py b/var/spack/repos/builtin/packages/py-toml/package.py index e006681bd5..22c8c3065a 100644 --- a/var/spack/repos/builtin/packages/py-toml/package.py +++ b/var/spack/repos/builtin/packages/py-toml/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-tomopy/package.py b/var/spack/repos/builtin/packages/py-tomopy/package.py index bafa041a8d..1b5d8f2e79 100644 --- a/var/spack/repos/builtin/packages/py-tomopy/package.py +++ b/var/spack/repos/builtin/packages/py-tomopy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-toolz/package.py b/var/spack/repos/builtin/packages/py-toolz/package.py index 45305af961..671a5dbfee 100644 --- a/var/spack/repos/builtin/packages/py-toolz/package.py +++ b/var/spack/repos/builtin/packages/py-toolz/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-tornado/package.py b/var/spack/repos/builtin/packages/py-tornado/package.py index 5d11e28877..c480b27470 100644 --- a/var/spack/repos/builtin/packages/py-tornado/package.py +++ b/var/spack/repos/builtin/packages/py-tornado/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-tqdm/package.py b/var/spack/repos/builtin/packages/py-tqdm/package.py index 00ec4c4946..b9c3d69562 100644 --- a/var/spack/repos/builtin/packages/py-tqdm/package.py +++ b/var/spack/repos/builtin/packages/py-tqdm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-traceback2/package.py b/var/spack/repos/builtin/packages/py-traceback2/package.py index 1b8394614c..86f61b17c5 100644 --- a/var/spack/repos/builtin/packages/py-traceback2/package.py +++ b/var/spack/repos/builtin/packages/py-traceback2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-traitlets/package.py b/var/spack/repos/builtin/packages/py-traitlets/package.py index be45542a25..b8d7b418e1 100644 --- a/var/spack/repos/builtin/packages/py-traitlets/package.py +++ b/var/spack/repos/builtin/packages/py-traitlets/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-tuiview/package.py b/var/spack/repos/builtin/packages/py-tuiview/package.py index 76cfc9bd8d..f9baeef8b8 100644 --- a/var/spack/repos/builtin/packages/py-tuiview/package.py +++ b/var/spack/repos/builtin/packages/py-tuiview/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-twisted/package.py b/var/spack/repos/builtin/packages/py-twisted/package.py index 91a66c5a43..7b03f54f8f 100644 --- a/var/spack/repos/builtin/packages/py-twisted/package.py +++ b/var/spack/repos/builtin/packages/py-twisted/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-typing/package.py b/var/spack/repos/builtin/packages/py-typing/package.py index 35a6f44216..c1f593f07a 100644 --- a/var/spack/repos/builtin/packages/py-typing/package.py +++ b/var/spack/repos/builtin/packages/py-typing/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-tzlocal/package.py b/var/spack/repos/builtin/packages/py-tzlocal/package.py index 758a0573e3..90f31cb205 100644 --- a/var/spack/repos/builtin/packages/py-tzlocal/package.py +++ b/var/spack/repos/builtin/packages/py-tzlocal/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-udunits/package.py b/var/spack/repos/builtin/packages/py-udunits/package.py index b585fcbfd9..eddfd4cc08 100644 --- a/var/spack/repos/builtin/packages/py-udunits/package.py +++ b/var/spack/repos/builtin/packages/py-udunits/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/py-umi-tools/package.py b/var/spack/repos/builtin/packages/py-umi-tools/package.py index 3c896cf261..d837ba6be6 100644 --- a/var/spack/repos/builtin/packages/py-umi-tools/package.py +++ b/var/spack/repos/builtin/packages/py-umi-tools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-unittest2/package.py b/var/spack/repos/builtin/packages/py-unittest2/package.py index 0f0cc89512..635ba1ceda 100644 --- a/var/spack/repos/builtin/packages/py-unittest2/package.py +++ b/var/spack/repos/builtin/packages/py-unittest2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-unittest2py3k/package.py b/var/spack/repos/builtin/packages/py-unittest2py3k/package.py index 6b114a7e85..932d665b2f 100644 --- a/var/spack/repos/builtin/packages/py-unittest2py3k/package.py +++ b/var/spack/repos/builtin/packages/py-unittest2py3k/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-urllib3/package.py b/var/spack/repos/builtin/packages/py-urllib3/package.py index f43510c492..224ee6197d 100644 --- a/var/spack/repos/builtin/packages/py-urllib3/package.py +++ b/var/spack/repos/builtin/packages/py-urllib3/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-urwid/package.py b/var/spack/repos/builtin/packages/py-urwid/package.py index 70021a68c8..c5f106809a 100644 --- a/var/spack/repos/builtin/packages/py-urwid/package.py +++ b/var/spack/repos/builtin/packages/py-urwid/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-vcversioner/package.py b/var/spack/repos/builtin/packages/py-vcversioner/package.py index b77108a52b..8c863ae58f 100644 --- a/var/spack/repos/builtin/packages/py-vcversioner/package.py +++ b/var/spack/repos/builtin/packages/py-vcversioner/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-virtualenv-clone/package.py b/var/spack/repos/builtin/packages/py-virtualenv-clone/package.py index 9bdd320701..ecc7abfe4f 100644 --- a/var/spack/repos/builtin/packages/py-virtualenv-clone/package.py +++ b/var/spack/repos/builtin/packages/py-virtualenv-clone/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-virtualenv/package.py b/var/spack/repos/builtin/packages/py-virtualenv/package.py index be8906340c..a4108b51ee 100644 --- a/var/spack/repos/builtin/packages/py-virtualenv/package.py +++ b/var/spack/repos/builtin/packages/py-virtualenv/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-virtualenvwrapper/package.py b/var/spack/repos/builtin/packages/py-virtualenvwrapper/package.py index ada01af35f..009358344a 100644 --- a/var/spack/repos/builtin/packages/py-virtualenvwrapper/package.py +++ b/var/spack/repos/builtin/packages/py-virtualenvwrapper/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-vsc-base/package.py b/var/spack/repos/builtin/packages/py-vsc-base/package.py index 2cd0ff4b46..f2ca078d60 100644 --- a/var/spack/repos/builtin/packages/py-vsc-base/package.py +++ b/var/spack/repos/builtin/packages/py-vsc-base/package.py @@ -1,26 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Kenneth Hoste +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-vsc-install/package.py b/var/spack/repos/builtin/packages/py-vsc-install/package.py index 09e9c885cf..9b74392146 100644 --- a/var/spack/repos/builtin/packages/py-vsc-install/package.py +++ b/var/spack/repos/builtin/packages/py-vsc-install/package.py @@ -1,25 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Kenneth Hoste +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Kenneth Hoste, kenneth.hoste@gmail.com -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-wcsaxes/package.py b/var/spack/repos/builtin/packages/py-wcsaxes/package.py index ed8c0c3f99..c3109c498a 100644 --- a/var/spack/repos/builtin/packages/py-wcsaxes/package.py +++ b/var/spack/repos/builtin/packages/py-wcsaxes/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-wcwidth/package.py b/var/spack/repos/builtin/packages/py-wcwidth/package.py index a3d9ba980b..4bb68362a7 100644 --- a/var/spack/repos/builtin/packages/py-wcwidth/package.py +++ b/var/spack/repos/builtin/packages/py-wcwidth/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-webkit-server/package.py b/var/spack/repos/builtin/packages/py-webkit-server/package.py index fa42d1b5e8..db1e45e088 100644 --- a/var/spack/repos/builtin/packages/py-webkit-server/package.py +++ b/var/spack/repos/builtin/packages/py-webkit-server/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-weblogo/package.py b/var/spack/repos/builtin/packages/py-weblogo/package.py index fd01da070c..1b27ac5686 100644 --- a/var/spack/repos/builtin/packages/py-weblogo/package.py +++ b/var/spack/repos/builtin/packages/py-weblogo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-werkzeug/package.py b/var/spack/repos/builtin/packages/py-werkzeug/package.py index 4ca81b762c..f2941f80fc 100644 --- a/var/spack/repos/builtin/packages/py-werkzeug/package.py +++ b/var/spack/repos/builtin/packages/py-werkzeug/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-wheel/package.py b/var/spack/repos/builtin/packages/py-wheel/package.py index e3464971eb..03e91849ad 100644 --- a/var/spack/repos/builtin/packages/py-wheel/package.py +++ b/var/spack/repos/builtin/packages/py-wheel/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-widgetsnbextension/package.py b/var/spack/repos/builtin/packages/py-widgetsnbextension/package.py index fbfc971abc..32cfc4581a 100644 --- a/var/spack/repos/builtin/packages/py-widgetsnbextension/package.py +++ b/var/spack/repos/builtin/packages/py-widgetsnbextension/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-wrapt/package.py b/var/spack/repos/builtin/packages/py-wrapt/package.py index 44d1f19e3d..a73a0ee70a 100644 --- a/var/spack/repos/builtin/packages/py-wrapt/package.py +++ b/var/spack/repos/builtin/packages/py-wrapt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-xarray/package.py b/var/spack/repos/builtin/packages/py-xarray/package.py index a2a42c4dcd..ade407dbb9 100644 --- a/var/spack/repos/builtin/packages/py-xarray/package.py +++ b/var/spack/repos/builtin/packages/py-xarray/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-xattr/package.py b/var/spack/repos/builtin/packages/py-xattr/package.py index 15f4aeffd4..c6ee55760f 100644 --- a/var/spack/repos/builtin/packages/py-xattr/package.py +++ b/var/spack/repos/builtin/packages/py-xattr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-xdot/package.py b/var/spack/repos/builtin/packages/py-xdot/package.py index 86a2d3a9b5..6ab03ba54d 100644 --- a/var/spack/repos/builtin/packages/py-xdot/package.py +++ b/var/spack/repos/builtin/packages/py-xdot/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-xlrd/package.py b/var/spack/repos/builtin/packages/py-xlrd/package.py index 1a915d084e..9117728b98 100644 --- a/var/spack/repos/builtin/packages/py-xlrd/package.py +++ b/var/spack/repos/builtin/packages/py-xlrd/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-xlsxwriter/package.py b/var/spack/repos/builtin/packages/py-xlsxwriter/package.py index 0922950951..af6dd10d7c 100644 --- a/var/spack/repos/builtin/packages/py-xlsxwriter/package.py +++ b/var/spack/repos/builtin/packages/py-xlsxwriter/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-xmlrunner/package.py b/var/spack/repos/builtin/packages/py-xmlrunner/package.py index 274962748f..aa469b6b40 100644 --- a/var/spack/repos/builtin/packages/py-xmlrunner/package.py +++ b/var/spack/repos/builtin/packages/py-xmlrunner/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-xopen/package.py b/var/spack/repos/builtin/packages/py-xopen/package.py index b380244f6c..0d2121e855 100644 --- a/var/spack/repos/builtin/packages/py-xopen/package.py +++ b/var/spack/repos/builtin/packages/py-xopen/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-xpyb/package.py b/var/spack/repos/builtin/packages/py-xpyb/package.py index 6d59a2a084..11e73d24b0 100644 --- a/var/spack/repos/builtin/packages/py-xpyb/package.py +++ b/var/spack/repos/builtin/packages/py-xpyb/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-xvfbwrapper/package.py b/var/spack/repos/builtin/packages/py-xvfbwrapper/package.py index c4c93410cc..18b08b266f 100644 --- a/var/spack/repos/builtin/packages/py-xvfbwrapper/package.py +++ b/var/spack/repos/builtin/packages/py-xvfbwrapper/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-yamlreader/package.py b/var/spack/repos/builtin/packages/py-yamlreader/package.py index 1ec242856b..66c7be55ed 100644 --- a/var/spack/repos/builtin/packages/py-yamlreader/package.py +++ b/var/spack/repos/builtin/packages/py-yamlreader/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-yapf/package.py b/var/spack/repos/builtin/packages/py-yapf/package.py index 0ae6a0a424..1b71fbe2ba 100644 --- a/var/spack/repos/builtin/packages/py-yapf/package.py +++ b/var/spack/repos/builtin/packages/py-yapf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-yt/package.py b/var/spack/repos/builtin/packages/py-yt/package.py index 94b7583b8a..9344fe7463 100644 --- a/var/spack/repos/builtin/packages/py-yt/package.py +++ b/var/spack/repos/builtin/packages/py-yt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-ytopt/package.py b/var/spack/repos/builtin/packages/py-ytopt/package.py index 77b65d75dd..ec70d6c06d 100644 --- a/var/spack/repos/builtin/packages/py-ytopt/package.py +++ b/var/spack/repos/builtin/packages/py-ytopt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-zmq/package.py b/var/spack/repos/builtin/packages/py-zmq/package.py index b6a7c7cd0c..51a13ddaf2 100644 --- a/var/spack/repos/builtin/packages/py-zmq/package.py +++ b/var/spack/repos/builtin/packages/py-zmq/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-zope-event/package.py b/var/spack/repos/builtin/packages/py-zope-event/package.py index ab017b3d02..a2f0e6ecc1 100644 --- a/var/spack/repos/builtin/packages/py-zope-event/package.py +++ b/var/spack/repos/builtin/packages/py-zope-event/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/py-zope-interface/package.py b/var/spack/repos/builtin/packages/py-zope-interface/package.py index 001ba23f3d..0fd1b3bee5 100644 --- a/var/spack/repos/builtin/packages/py-zope-interface/package.py +++ b/var/spack/repos/builtin/packages/py-zope-interface/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/pythia6/package.py b/var/spack/repos/builtin/packages/pythia6/package.py index 7967092934..800073bf41 100644 --- a/var/spack/repos/builtin/packages/pythia6/package.py +++ b/var/spack/repos/builtin/packages/pythia6/package.py @@ -1,26 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import numbers import os diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 8342be482f..6d8823cc64 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import ast import os import platform diff --git a/var/spack/repos/builtin/packages/qbank/package.py b/var/spack/repos/builtin/packages/qbank/package.py index 09357ad76c..30133052b4 100644 --- a/var/spack/repos/builtin/packages/qbank/package.py +++ b/var/spack/repos/builtin/packages/qbank/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/qbox/package.py b/var/spack/repos/builtin/packages/qbox/package.py index 805a567e55..0bd70f4445 100644 --- a/var/spack/repos/builtin/packages/qbox/package.py +++ b/var/spack/repos/builtin/packages/qbox/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/qhull/package.py b/var/spack/repos/builtin/packages/qhull/package.py index 006b3284af..9bdfcab341 100644 --- a/var/spack/repos/builtin/packages/qhull/package.py +++ b/var/spack/repos/builtin/packages/qhull/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/qmcpack/package.py b/var/spack/repos/builtin/packages/qmcpack/package.py index 7d364baa31..0e9169a481 100644 --- a/var/spack/repos/builtin/packages/qmcpack/package.py +++ b/var/spack/repos/builtin/packages/qmcpack/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import llnl.util.tty as tty diff --git a/var/spack/repos/builtin/packages/qmd-progress/package.py b/var/spack/repos/builtin/packages/qmd-progress/package.py index e4c05030ea..ea87217689 100644 --- a/var/spack/repos/builtin/packages/qmd-progress/package.py +++ b/var/spack/repos/builtin/packages/qmd-progress/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/qorts/package.py b/var/spack/repos/builtin/packages/qorts/package.py index 7e745dc304..5b1c811e5f 100644 --- a/var/spack/repos/builtin/packages/qorts/package.py +++ b/var/spack/repos/builtin/packages/qorts/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os.path diff --git a/var/spack/repos/builtin/packages/qrupdate/package.py b/var/spack/repos/builtin/packages/qrupdate/package.py index aaeb5565e1..915f6615e8 100644 --- a/var/spack/repos/builtin/packages/qrupdate/package.py +++ b/var/spack/repos/builtin/packages/qrupdate/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import sys from spack import * diff --git a/var/spack/repos/builtin/packages/qt-creator/package.py b/var/spack/repos/builtin/packages/qt-creator/package.py index 2f1d15b219..05581edae4 100644 --- a/var/spack/repos/builtin/packages/qt-creator/package.py +++ b/var/spack/repos/builtin/packages/qt-creator/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 18fe4c16ae..443e40be9d 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import platform import os diff --git a/var/spack/repos/builtin/packages/qtgraph/package.py b/var/spack/repos/builtin/packages/qtgraph/package.py index 57d374d902..012bce84f2 100644 --- a/var/spack/repos/builtin/packages/qtgraph/package.py +++ b/var/spack/repos/builtin/packages/qtgraph/package.py @@ -1,44 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -############################################################################## -# Copyright (c) 2015-2017 Krell Institute. All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation; either version 2 of the License, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/qthreads/package.py b/var/spack/repos/builtin/packages/qthreads/package.py index e089f5546c..f1796099aa 100644 --- a/var/spack/repos/builtin/packages/qthreads/package.py +++ b/var/spack/repos/builtin/packages/qthreads/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/quantum-espresso/package.py b/var/spack/repos/builtin/packages/quantum-espresso/package.py index 989dba3147..7c1310ec31 100644 --- a/var/spack/repos/builtin/packages/quantum-espresso/package.py +++ b/var/spack/repos/builtin/packages/quantum-espresso/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import glob import os.path diff --git a/var/spack/repos/builtin/packages/quinoa/package.py b/var/spack/repos/builtin/packages/quinoa/package.py index 2f9f91a866..61a933b378 100644 --- a/var/spack/repos/builtin/packages/quinoa/package.py +++ b/var/spack/repos/builtin/packages/quinoa/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/qwt/package.py b/var/spack/repos/builtin/packages/qwt/package.py index 3c30e26461..1d996a6246 100644 --- a/var/spack/repos/builtin/packages/qwt/package.py +++ b/var/spack/repos/builtin/packages/qwt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-a4/package.py b/var/spack/repos/builtin/packages/r-a4/package.py index b32540f771..18b13c506e 100644 --- a/var/spack/repos/builtin/packages/r-a4/package.py +++ b/var/spack/repos/builtin/packages/r-a4/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-a4base/package.py b/var/spack/repos/builtin/packages/r-a4base/package.py index 7bc66f0db6..0e76c245f3 100644 --- a/var/spack/repos/builtin/packages/r-a4base/package.py +++ b/var/spack/repos/builtin/packages/r-a4base/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-a4classif/package.py b/var/spack/repos/builtin/packages/r-a4classif/package.py index 75d87a3b0b..8a2a5c40f5 100644 --- a/var/spack/repos/builtin/packages/r-a4classif/package.py +++ b/var/spack/repos/builtin/packages/r-a4classif/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-a4core/package.py b/var/spack/repos/builtin/packages/r-a4core/package.py index 8079871158..df2142be36 100644 --- a/var/spack/repos/builtin/packages/r-a4core/package.py +++ b/var/spack/repos/builtin/packages/r-a4core/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-a4preproc/package.py b/var/spack/repos/builtin/packages/r-a4preproc/package.py index 8517e776a5..08530cf7b4 100644 --- a/var/spack/repos/builtin/packages/r-a4preproc/package.py +++ b/var/spack/repos/builtin/packages/r-a4preproc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-a4reporting/package.py b/var/spack/repos/builtin/packages/r-a4reporting/package.py index 7a02e9a800..f0f9f32065 100644 --- a/var/spack/repos/builtin/packages/r-a4reporting/package.py +++ b/var/spack/repos/builtin/packages/r-a4reporting/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-abadata/package.py b/var/spack/repos/builtin/packages/r-abadata/package.py index c44c7110c8..aa9796e383 100644 --- a/var/spack/repos/builtin/packages/r-abadata/package.py +++ b/var/spack/repos/builtin/packages/r-abadata/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-abaenrichment/package.py b/var/spack/repos/builtin/packages/r-abaenrichment/package.py index 7be6dbb13f..c43a85c214 100644 --- a/var/spack/repos/builtin/packages/r-abaenrichment/package.py +++ b/var/spack/repos/builtin/packages/r-abaenrichment/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-abind/package.py b/var/spack/repos/builtin/packages/r-abind/package.py index 92859458bc..d9e7b2d821 100644 --- a/var/spack/repos/builtin/packages/r-abind/package.py +++ b/var/spack/repos/builtin/packages/r-abind/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-absseq/package.py b/var/spack/repos/builtin/packages/r-absseq/package.py index 39cf5800d1..46bcf022f0 100644 --- a/var/spack/repos/builtin/packages/r-absseq/package.py +++ b/var/spack/repos/builtin/packages/r-absseq/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-acde/package.py b/var/spack/repos/builtin/packages/r-acde/package.py index 22342d9790..6abcd589ae 100644 --- a/var/spack/repos/builtin/packages/r-acde/package.py +++ b/var/spack/repos/builtin/packages/r-acde/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-acepack/package.py b/var/spack/repos/builtin/packages/r-acepack/package.py index 787cfc3bc1..29a91b8a11 100644 --- a/var/spack/repos/builtin/packages/r-acepack/package.py +++ b/var/spack/repos/builtin/packages/r-acepack/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-acgh/package.py b/var/spack/repos/builtin/packages/r-acgh/package.py index a929fe6781..54db729af3 100644 --- a/var/spack/repos/builtin/packages/r-acgh/package.py +++ b/var/spack/repos/builtin/packages/r-acgh/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-acme/package.py b/var/spack/repos/builtin/packages/r-acme/package.py index ef04920ff0..d4263bfcc8 100644 --- a/var/spack/repos/builtin/packages/r-acme/package.py +++ b/var/spack/repos/builtin/packages/r-acme/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-ada/package.py b/var/spack/repos/builtin/packages/r-ada/package.py index c17af7f7e5..eecb780fb0 100644 --- a/var/spack/repos/builtin/packages/r-ada/package.py +++ b/var/spack/repos/builtin/packages/r-ada/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-adabag/package.py b/var/spack/repos/builtin/packages/r-adabag/package.py index 265a2e835c..1e07829d5c 100644 --- a/var/spack/repos/builtin/packages/r-adabag/package.py +++ b/var/spack/repos/builtin/packages/r-adabag/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-ade4/package.py b/var/spack/repos/builtin/packages/r-ade4/package.py index 60bae43832..b3acb086e9 100644 --- a/var/spack/repos/builtin/packages/r-ade4/package.py +++ b/var/spack/repos/builtin/packages/r-ade4/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-adegenet/package.py b/var/spack/repos/builtin/packages/r-adegenet/package.py index de4b358cfb..754fb4ac22 100644 --- a/var/spack/repos/builtin/packages/r-adegenet/package.py +++ b/var/spack/repos/builtin/packages/r-adegenet/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-adsplit/package.py b/var/spack/repos/builtin/packages/r-adsplit/package.py index 0839856872..d2a9f44352 100644 --- a/var/spack/repos/builtin/packages/r-adsplit/package.py +++ b/var/spack/repos/builtin/packages/r-adsplit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-aer/package.py b/var/spack/repos/builtin/packages/r-aer/package.py index 58dcc60eab..830d4d74c6 100644 --- a/var/spack/repos/builtin/packages/r-aer/package.py +++ b/var/spack/repos/builtin/packages/r-aer/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-affxparser/package.py b/var/spack/repos/builtin/packages/r-affxparser/package.py index 1440802f23..79522cac96 100644 --- a/var/spack/repos/builtin/packages/r-affxparser/package.py +++ b/var/spack/repos/builtin/packages/r-affxparser/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-affy/package.py b/var/spack/repos/builtin/packages/r-affy/package.py index 2d1637673a..eb361b1b95 100644 --- a/var/spack/repos/builtin/packages/r-affy/package.py +++ b/var/spack/repos/builtin/packages/r-affy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-affycomp/package.py b/var/spack/repos/builtin/packages/r-affycomp/package.py index d153ad2052..329ffe1ed2 100644 --- a/var/spack/repos/builtin/packages/r-affycomp/package.py +++ b/var/spack/repos/builtin/packages/r-affycomp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-affycompatible/package.py b/var/spack/repos/builtin/packages/r-affycompatible/package.py index 9499c20ab0..de43dc9f9b 100644 --- a/var/spack/repos/builtin/packages/r-affycompatible/package.py +++ b/var/spack/repos/builtin/packages/r-affycompatible/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-affycontam/package.py b/var/spack/repos/builtin/packages/r-affycontam/package.py index 994684e1c7..f44105ce13 100644 --- a/var/spack/repos/builtin/packages/r-affycontam/package.py +++ b/var/spack/repos/builtin/packages/r-affycontam/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-affycoretools/package.py b/var/spack/repos/builtin/packages/r-affycoretools/package.py index 4156c9d460..b2023e7084 100644 --- a/var/spack/repos/builtin/packages/r-affycoretools/package.py +++ b/var/spack/repos/builtin/packages/r-affycoretools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-affydata/package.py b/var/spack/repos/builtin/packages/r-affydata/package.py index 194f90cd08..ac720a1793 100644 --- a/var/spack/repos/builtin/packages/r-affydata/package.py +++ b/var/spack/repos/builtin/packages/r-affydata/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-affyexpress/package.py b/var/spack/repos/builtin/packages/r-affyexpress/package.py index 2077f01377..ec99f7bdce 100644 --- a/var/spack/repos/builtin/packages/r-affyexpress/package.py +++ b/var/spack/repos/builtin/packages/r-affyexpress/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-affyilm/package.py b/var/spack/repos/builtin/packages/r-affyilm/package.py index 5be8e7e95d..baa61ac6e0 100644 --- a/var/spack/repos/builtin/packages/r-affyilm/package.py +++ b/var/spack/repos/builtin/packages/r-affyilm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-affyio/package.py b/var/spack/repos/builtin/packages/r-affyio/package.py index 2950776157..973fdd757c 100644 --- a/var/spack/repos/builtin/packages/r-affyio/package.py +++ b/var/spack/repos/builtin/packages/r-affyio/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-affypdnn/package.py b/var/spack/repos/builtin/packages/r-affypdnn/package.py index e08b6a5bad..f7cfaa20a6 100644 --- a/var/spack/repos/builtin/packages/r-affypdnn/package.py +++ b/var/spack/repos/builtin/packages/r-affypdnn/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-affyplm/package.py b/var/spack/repos/builtin/packages/r-affyplm/package.py index ac52e2fba3..1690ce430b 100644 --- a/var/spack/repos/builtin/packages/r-affyplm/package.py +++ b/var/spack/repos/builtin/packages/r-affyplm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-affyqcreport/package.py b/var/spack/repos/builtin/packages/r-affyqcreport/package.py index d983861890..cb78a3d887 100644 --- a/var/spack/repos/builtin/packages/r-affyqcreport/package.py +++ b/var/spack/repos/builtin/packages/r-affyqcreport/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-affyrnadegradation/package.py b/var/spack/repos/builtin/packages/r-affyrnadegradation/package.py index 0201cb6324..b3cbabcc12 100644 --- a/var/spack/repos/builtin/packages/r-affyrnadegradation/package.py +++ b/var/spack/repos/builtin/packages/r-affyrnadegradation/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-agdex/package.py b/var/spack/repos/builtin/packages/r-agdex/package.py index 6872f56642..85275712fb 100644 --- a/var/spack/repos/builtin/packages/r-agdex/package.py +++ b/var/spack/repos/builtin/packages/r-agdex/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-agilp/package.py b/var/spack/repos/builtin/packages/r-agilp/package.py index a89ef223d4..9b90fca17a 100644 --- a/var/spack/repos/builtin/packages/r-agilp/package.py +++ b/var/spack/repos/builtin/packages/r-agilp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-agimicrorna/package.py b/var/spack/repos/builtin/packages/r-agimicrorna/package.py index e311c4a32e..c509634f77 100644 --- a/var/spack/repos/builtin/packages/r-agimicrorna/package.py +++ b/var/spack/repos/builtin/packages/r-agimicrorna/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-aims/package.py b/var/spack/repos/builtin/packages/r-aims/package.py index e0b132f85d..9d87e99052 100644 --- a/var/spack/repos/builtin/packages/r-aims/package.py +++ b/var/spack/repos/builtin/packages/r-aims/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-aldex2/package.py b/var/spack/repos/builtin/packages/r-aldex2/package.py index 6305c13b49..1a1912a32e 100644 --- a/var/spack/repos/builtin/packages/r-aldex2/package.py +++ b/var/spack/repos/builtin/packages/r-aldex2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-allelicimbalance/package.py b/var/spack/repos/builtin/packages/r-allelicimbalance/package.py index b3440cd6fd..6e5b2a4088 100644 --- a/var/spack/repos/builtin/packages/r-allelicimbalance/package.py +++ b/var/spack/repos/builtin/packages/r-allelicimbalance/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-alpine/package.py b/var/spack/repos/builtin/packages/r-alpine/package.py index 9f7e5dc9b6..2d3666642e 100644 --- a/var/spack/repos/builtin/packages/r-alpine/package.py +++ b/var/spack/repos/builtin/packages/r-alpine/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-als/package.py b/var/spack/repos/builtin/packages/r-als/package.py index 3198ebc44f..9102e21b32 100644 --- a/var/spack/repos/builtin/packages/r-als/package.py +++ b/var/spack/repos/builtin/packages/r-als/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-alsace/package.py b/var/spack/repos/builtin/packages/r-alsace/package.py index 401e2ce380..cc6eb65902 100644 --- a/var/spack/repos/builtin/packages/r-alsace/package.py +++ b/var/spack/repos/builtin/packages/r-alsace/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-altcdfenvs/package.py b/var/spack/repos/builtin/packages/r-altcdfenvs/package.py index e994ee1949..9853b0cda8 100644 --- a/var/spack/repos/builtin/packages/r-altcdfenvs/package.py +++ b/var/spack/repos/builtin/packages/r-altcdfenvs/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-amap/package.py b/var/spack/repos/builtin/packages/r-amap/package.py index b83cd017b5..d783a8220a 100644 --- a/var/spack/repos/builtin/packages/r-amap/package.py +++ b/var/spack/repos/builtin/packages/r-amap/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-ampliqueso/package.py b/var/spack/repos/builtin/packages/r-ampliqueso/package.py index 47239e3cef..ec0ec337e1 100644 --- a/var/spack/repos/builtin/packages/r-ampliqueso/package.py +++ b/var/spack/repos/builtin/packages/r-ampliqueso/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-analysispageserver/package.py b/var/spack/repos/builtin/packages/r-analysispageserver/package.py index 59f3d906e4..f37f3b0daa 100644 --- a/var/spack/repos/builtin/packages/r-analysispageserver/package.py +++ b/var/spack/repos/builtin/packages/r-analysispageserver/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-anaquin/package.py b/var/spack/repos/builtin/packages/r-anaquin/package.py index 2436acfd51..2cf761c2b0 100644 --- a/var/spack/repos/builtin/packages/r-anaquin/package.py +++ b/var/spack/repos/builtin/packages/r-anaquin/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-aneufinder/package.py b/var/spack/repos/builtin/packages/r-aneufinder/package.py index d01f13f333..4123db13c5 100644 --- a/var/spack/repos/builtin/packages/r-aneufinder/package.py +++ b/var/spack/repos/builtin/packages/r-aneufinder/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-aneufinderdata/package.py b/var/spack/repos/builtin/packages/r-aneufinderdata/package.py index f6c6279ad5..dde20609af 100644 --- a/var/spack/repos/builtin/packages/r-aneufinderdata/package.py +++ b/var/spack/repos/builtin/packages/r-aneufinderdata/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-animation/package.py b/var/spack/repos/builtin/packages/r-animation/package.py index 29d865668e..298a38b121 100644 --- a/var/spack/repos/builtin/packages/r-animation/package.py +++ b/var/spack/repos/builtin/packages/r-animation/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-annaffy/package.py b/var/spack/repos/builtin/packages/r-annaffy/package.py index 9968fcea04..af47b5f193 100644 --- a/var/spack/repos/builtin/packages/r-annaffy/package.py +++ b/var/spack/repos/builtin/packages/r-annaffy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # # from spack import * diff --git a/var/spack/repos/builtin/packages/r-annotate/package.py b/var/spack/repos/builtin/packages/r-annotate/package.py index dfe682f1c1..09e367cb35 100644 --- a/var/spack/repos/builtin/packages/r-annotate/package.py +++ b/var/spack/repos/builtin/packages/r-annotate/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-annotationdbi/package.py b/var/spack/repos/builtin/packages/r-annotationdbi/package.py index 4f5b3fc4d2..d6a66236ce 100644 --- a/var/spack/repos/builtin/packages/r-annotationdbi/package.py +++ b/var/spack/repos/builtin/packages/r-annotationdbi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-annotationfilter/package.py b/var/spack/repos/builtin/packages/r-annotationfilter/package.py index 3337589be8..b6c39cac1e 100644 --- a/var/spack/repos/builtin/packages/r-annotationfilter/package.py +++ b/var/spack/repos/builtin/packages/r-annotationfilter/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-annotationforge/package.py b/var/spack/repos/builtin/packages/r-annotationforge/package.py index bb1f91a579..41dfa85c25 100644 --- a/var/spack/repos/builtin/packages/r-annotationforge/package.py +++ b/var/spack/repos/builtin/packages/r-annotationforge/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-annotationhub/package.py b/var/spack/repos/builtin/packages/r-annotationhub/package.py index 5d93003cce..92fe597a94 100644 --- a/var/spack/repos/builtin/packages/r-annotationhub/package.py +++ b/var/spack/repos/builtin/packages/r-annotationhub/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-ape/package.py b/var/spack/repos/builtin/packages/r-ape/package.py index dc9664c9f9..63f1dfed6b 100644 --- a/var/spack/repos/builtin/packages/r-ape/package.py +++ b/var/spack/repos/builtin/packages/r-ape/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-argparse/package.py b/var/spack/repos/builtin/packages/r-argparse/package.py index 95b16e39e7..25c8c5379a 100644 --- a/var/spack/repos/builtin/packages/r-argparse/package.py +++ b/var/spack/repos/builtin/packages/r-argparse/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-assertthat/package.py b/var/spack/repos/builtin/packages/r-assertthat/package.py index 61655cf630..331e13d887 100644 --- a/var/spack/repos/builtin/packages/r-assertthat/package.py +++ b/var/spack/repos/builtin/packages/r-assertthat/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-backports/package.py b/var/spack/repos/builtin/packages/r-backports/package.py index 8eee7cdbbc..97303b92da 100644 --- a/var/spack/repos/builtin/packages/r-backports/package.py +++ b/var/spack/repos/builtin/packages/r-backports/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-bamsignals/package.py b/var/spack/repos/builtin/packages/r-bamsignals/package.py index 3c354bc342..78310f5f4c 100644 --- a/var/spack/repos/builtin/packages/r-bamsignals/package.py +++ b/var/spack/repos/builtin/packages/r-bamsignals/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-base64/package.py b/var/spack/repos/builtin/packages/r-base64/package.py index 8b889fa427..6a599a62f0 100644 --- a/var/spack/repos/builtin/packages/r-base64/package.py +++ b/var/spack/repos/builtin/packages/r-base64/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-base64enc/package.py b/var/spack/repos/builtin/packages/r-base64enc/package.py index 4b895fc1e5..7424fefe8f 100644 --- a/var/spack/repos/builtin/packages/r-base64enc/package.py +++ b/var/spack/repos/builtin/packages/r-base64enc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-bbmisc/package.py b/var/spack/repos/builtin/packages/r-bbmisc/package.py index 2b29dcfcc7..f8cee5cec6 100644 --- a/var/spack/repos/builtin/packages/r-bbmisc/package.py +++ b/var/spack/repos/builtin/packages/r-bbmisc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-beanplot/package.py b/var/spack/repos/builtin/packages/r-beanplot/package.py index 99f2a26062..34760038fb 100644 --- a/var/spack/repos/builtin/packages/r-beanplot/package.py +++ b/var/spack/repos/builtin/packages/r-beanplot/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-bh/package.py b/var/spack/repos/builtin/packages/r-bh/package.py index cb1192d7e4..54ed774931 100644 --- a/var/spack/repos/builtin/packages/r-bh/package.py +++ b/var/spack/repos/builtin/packages/r-bh/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-biasedurn/package.py b/var/spack/repos/builtin/packages/r-biasedurn/package.py index eb8329cd1e..258788ebdd 100644 --- a/var/spack/repos/builtin/packages/r-biasedurn/package.py +++ b/var/spack/repos/builtin/packages/r-biasedurn/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-bindr/package.py b/var/spack/repos/builtin/packages/r-bindr/package.py index 36dc37655c..e874ac264f 100644 --- a/var/spack/repos/builtin/packages/r-bindr/package.py +++ b/var/spack/repos/builtin/packages/r-bindr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-bindrcpp/package.py b/var/spack/repos/builtin/packages/r-bindrcpp/package.py index 8406c4915b..78d50af84e 100644 --- a/var/spack/repos/builtin/packages/r-bindrcpp/package.py +++ b/var/spack/repos/builtin/packages/r-bindrcpp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-biobase/package.py b/var/spack/repos/builtin/packages/r-biobase/package.py index 02ea888446..015522735c 100644 --- a/var/spack/repos/builtin/packages/r-biobase/package.py +++ b/var/spack/repos/builtin/packages/r-biobase/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # from spack import * diff --git a/var/spack/repos/builtin/packages/r-biocgenerics/package.py b/var/spack/repos/builtin/packages/r-biocgenerics/package.py index c28eb8e803..b6758db358 100644 --- a/var/spack/repos/builtin/packages/r-biocgenerics/package.py +++ b/var/spack/repos/builtin/packages/r-biocgenerics/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-biocinstaller/package.py b/var/spack/repos/builtin/packages/r-biocinstaller/package.py index 3cf25e679e..a3cc8e471e 100644 --- a/var/spack/repos/builtin/packages/r-biocinstaller/package.py +++ b/var/spack/repos/builtin/packages/r-biocinstaller/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-biocparallel/package.py b/var/spack/repos/builtin/packages/r-biocparallel/package.py index 0f6c2d82b1..37d0b93375 100644 --- a/var/spack/repos/builtin/packages/r-biocparallel/package.py +++ b/var/spack/repos/builtin/packages/r-biocparallel/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-biocstyle/package.py b/var/spack/repos/builtin/packages/r-biocstyle/package.py index 630f7ddab7..411b2549fa 100644 --- a/var/spack/repos/builtin/packages/r-biocstyle/package.py +++ b/var/spack/repos/builtin/packages/r-biocstyle/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-biom-utils/package.py b/var/spack/repos/builtin/packages/r-biom-utils/package.py index fb27071d49..0848aec70a 100644 --- a/var/spack/repos/builtin/packages/r-biom-utils/package.py +++ b/var/spack/repos/builtin/packages/r-biom-utils/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-biomart/package.py b/var/spack/repos/builtin/packages/r-biomart/package.py index fd5a83d0c4..b74a6794ba 100644 --- a/var/spack/repos/builtin/packages/r-biomart/package.py +++ b/var/spack/repos/builtin/packages/r-biomart/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-biomformat/package.py b/var/spack/repos/builtin/packages/r-biomformat/package.py index f428f41a5a..29c1d4e75c 100644 --- a/var/spack/repos/builtin/packages/r-biomformat/package.py +++ b/var/spack/repos/builtin/packages/r-biomformat/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-biostrings/package.py b/var/spack/repos/builtin/packages/r-biostrings/package.py index 3658c53107..b6337f29b8 100644 --- a/var/spack/repos/builtin/packages/r-biostrings/package.py +++ b/var/spack/repos/builtin/packages/r-biostrings/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-biovizbase/package.py b/var/spack/repos/builtin/packages/r-biovizbase/package.py index ed61008d26..0535c052d9 100644 --- a/var/spack/repos/builtin/packages/r-biovizbase/package.py +++ b/var/spack/repos/builtin/packages/r-biovizbase/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-bit/package.py b/var/spack/repos/builtin/packages/r-bit/package.py index e4e85cdfeb..0d178c10f8 100644 --- a/var/spack/repos/builtin/packages/r-bit/package.py +++ b/var/spack/repos/builtin/packages/r-bit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-bit64/package.py b/var/spack/repos/builtin/packages/r-bit64/package.py index 0b2e1ed795..a8e8501f2f 100644 --- a/var/spack/repos/builtin/packages/r-bit64/package.py +++ b/var/spack/repos/builtin/packages/r-bit64/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-bitops/package.py b/var/spack/repos/builtin/packages/r-bitops/package.py index a64a0a9f8b..2d61f87d17 100644 --- a/var/spack/repos/builtin/packages/r-bitops/package.py +++ b/var/spack/repos/builtin/packages/r-bitops/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-blob/package.py b/var/spack/repos/builtin/packages/r-blob/package.py index 80fc377322..85e33a1ac4 100644 --- a/var/spack/repos/builtin/packages/r-blob/package.py +++ b/var/spack/repos/builtin/packages/r-blob/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-bookdown/package.py b/var/spack/repos/builtin/packages/r-bookdown/package.py index 146b4dbfc8..94d2ed08fa 100644 --- a/var/spack/repos/builtin/packages/r-bookdown/package.py +++ b/var/spack/repos/builtin/packages/r-bookdown/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-boot/package.py b/var/spack/repos/builtin/packages/r-boot/package.py index 127c5ba7e4..52df4caee5 100644 --- a/var/spack/repos/builtin/packages/r-boot/package.py +++ b/var/spack/repos/builtin/packages/r-boot/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-brew/package.py b/var/spack/repos/builtin/packages/r-brew/package.py index 881ebafe7b..bf765a6627 100644 --- a/var/spack/repos/builtin/packages/r-brew/package.py +++ b/var/spack/repos/builtin/packages/r-brew/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-broom/package.py b/var/spack/repos/builtin/packages/r-broom/package.py index f9ab50902f..2daad5e49e 100644 --- a/var/spack/repos/builtin/packages/r-broom/package.py +++ b/var/spack/repos/builtin/packages/r-broom/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-bsgenome/package.py b/var/spack/repos/builtin/packages/r-bsgenome/package.py index 84f458d37e..3b2de6aeb7 100644 --- a/var/spack/repos/builtin/packages/r-bsgenome/package.py +++ b/var/spack/repos/builtin/packages/r-bsgenome/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-bumphunter/package.py b/var/spack/repos/builtin/packages/r-bumphunter/package.py index 825be998e3..8b952a7d97 100644 --- a/var/spack/repos/builtin/packages/r-bumphunter/package.py +++ b/var/spack/repos/builtin/packages/r-bumphunter/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-c50/package.py b/var/spack/repos/builtin/packages/r-c50/package.py index 5f01837e98..6e4a6f6b77 100644 --- a/var/spack/repos/builtin/packages/r-c50/package.py +++ b/var/spack/repos/builtin/packages/r-c50/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-callr/package.py b/var/spack/repos/builtin/packages/r-callr/package.py index 6c406c9872..b6f28cbe3f 100644 --- a/var/spack/repos/builtin/packages/r-callr/package.py +++ b/var/spack/repos/builtin/packages/r-callr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-car/package.py b/var/spack/repos/builtin/packages/r-car/package.py index effeeb6a91..e02a46e45e 100644 --- a/var/spack/repos/builtin/packages/r-car/package.py +++ b/var/spack/repos/builtin/packages/r-car/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-caret/package.py b/var/spack/repos/builtin/packages/r-caret/package.py index af332cde36..95bcf03130 100644 --- a/var/spack/repos/builtin/packages/r-caret/package.py +++ b/var/spack/repos/builtin/packages/r-caret/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-category/package.py b/var/spack/repos/builtin/packages/r-category/package.py index a262a4e91f..0b2949ef25 100644 --- a/var/spack/repos/builtin/packages/r-category/package.py +++ b/var/spack/repos/builtin/packages/r-category/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-catools/package.py b/var/spack/repos/builtin/packages/r-catools/package.py index 6573e2d41b..2c19850222 100644 --- a/var/spack/repos/builtin/packages/r-catools/package.py +++ b/var/spack/repos/builtin/packages/r-catools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-cdcfluview/package.py b/var/spack/repos/builtin/packages/r-cdcfluview/package.py index ccb914dacf..541441c38a 100644 --- a/var/spack/repos/builtin/packages/r-cdcfluview/package.py +++ b/var/spack/repos/builtin/packages/r-cdcfluview/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-cellranger/package.py b/var/spack/repos/builtin/packages/r-cellranger/package.py index c726715269..ca5e60048d 100644 --- a/var/spack/repos/builtin/packages/r-cellranger/package.py +++ b/var/spack/repos/builtin/packages/r-cellranger/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-checkmate/package.py b/var/spack/repos/builtin/packages/r-checkmate/package.py index d90b411189..0aff1514d4 100644 --- a/var/spack/repos/builtin/packages/r-checkmate/package.py +++ b/var/spack/repos/builtin/packages/r-checkmate/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-checkpoint/package.py b/var/spack/repos/builtin/packages/r-checkpoint/package.py index b9a175a358..517eed195a 100644 --- a/var/spack/repos/builtin/packages/r-checkpoint/package.py +++ b/var/spack/repos/builtin/packages/r-checkpoint/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-chemometrics/package.py b/var/spack/repos/builtin/packages/r-chemometrics/package.py index 739bab2c36..4bf7932e2b 100644 --- a/var/spack/repos/builtin/packages/r-chemometrics/package.py +++ b/var/spack/repos/builtin/packages/r-chemometrics/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-chron/package.py b/var/spack/repos/builtin/packages/r-chron/package.py index 5324a4492a..b7fcc3777f 100644 --- a/var/spack/repos/builtin/packages/r-chron/package.py +++ b/var/spack/repos/builtin/packages/r-chron/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-circlize/package.py b/var/spack/repos/builtin/packages/r-circlize/package.py index b326c2226d..5740e14d2b 100644 --- a/var/spack/repos/builtin/packages/r-circlize/package.py +++ b/var/spack/repos/builtin/packages/r-circlize/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-class/package.py b/var/spack/repos/builtin/packages/r-class/package.py index 97816493a6..a0cc01075c 100644 --- a/var/spack/repos/builtin/packages/r-class/package.py +++ b/var/spack/repos/builtin/packages/r-class/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-classint/package.py b/var/spack/repos/builtin/packages/r-classint/package.py index 5eaa652928..7009519294 100644 --- a/var/spack/repos/builtin/packages/r-classint/package.py +++ b/var/spack/repos/builtin/packages/r-classint/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-cli/package.py b/var/spack/repos/builtin/packages/r-cli/package.py index 2a4f61af92..2b48e5fdb4 100644 --- a/var/spack/repos/builtin/packages/r-cli/package.py +++ b/var/spack/repos/builtin/packages/r-cli/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-clipr/package.py b/var/spack/repos/builtin/packages/r-clipr/package.py index 6689f8b31b..c87ffa1f3c 100644 --- a/var/spack/repos/builtin/packages/r-clipr/package.py +++ b/var/spack/repos/builtin/packages/r-clipr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-cluster/package.py b/var/spack/repos/builtin/packages/r-cluster/package.py index e1ff7957fc..cdde5da74f 100644 --- a/var/spack/repos/builtin/packages/r-cluster/package.py +++ b/var/spack/repos/builtin/packages/r-cluster/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-clusterprofiler/package.py b/var/spack/repos/builtin/packages/r-clusterprofiler/package.py index 8df5fccb70..5a1f51dc95 100644 --- a/var/spack/repos/builtin/packages/r-clusterprofiler/package.py +++ b/var/spack/repos/builtin/packages/r-clusterprofiler/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-cner/package.py b/var/spack/repos/builtin/packages/r-cner/package.py index 77fd5f0274..8a96c0b086 100644 --- a/var/spack/repos/builtin/packages/r-cner/package.py +++ b/var/spack/repos/builtin/packages/r-cner/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-coda/package.py b/var/spack/repos/builtin/packages/r-coda/package.py index 7727074e46..de5e8e112f 100644 --- a/var/spack/repos/builtin/packages/r-coda/package.py +++ b/var/spack/repos/builtin/packages/r-coda/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-codetools/package.py b/var/spack/repos/builtin/packages/r-codetools/package.py index 24dad4250d..a32e9ddc77 100644 --- a/var/spack/repos/builtin/packages/r-codetools/package.py +++ b/var/spack/repos/builtin/packages/r-codetools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-coin/package.py b/var/spack/repos/builtin/packages/r-coin/package.py index 2852e4970d..f9688bbb86 100644 --- a/var/spack/repos/builtin/packages/r-coin/package.py +++ b/var/spack/repos/builtin/packages/r-coin/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-colorspace/package.py b/var/spack/repos/builtin/packages/r-colorspace/package.py index dba4ffee5d..137f0441d2 100644 --- a/var/spack/repos/builtin/packages/r-colorspace/package.py +++ b/var/spack/repos/builtin/packages/r-colorspace/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-complexheatmap/package.py b/var/spack/repos/builtin/packages/r-complexheatmap/package.py index 1897595a28..e4c0025f58 100644 --- a/var/spack/repos/builtin/packages/r-complexheatmap/package.py +++ b/var/spack/repos/builtin/packages/r-complexheatmap/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-corpcor/package.py b/var/spack/repos/builtin/packages/r-corpcor/package.py index a216cec782..2be6972de0 100644 --- a/var/spack/repos/builtin/packages/r-corpcor/package.py +++ b/var/spack/repos/builtin/packages/r-corpcor/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-corrplot/package.py b/var/spack/repos/builtin/packages/r-corrplot/package.py index fc7ffad316..cf053e7733 100644 --- a/var/spack/repos/builtin/packages/r-corrplot/package.py +++ b/var/spack/repos/builtin/packages/r-corrplot/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-covr/package.py b/var/spack/repos/builtin/packages/r-covr/package.py index 6e9e4c9f6e..dc6430bafd 100644 --- a/var/spack/repos/builtin/packages/r-covr/package.py +++ b/var/spack/repos/builtin/packages/r-covr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-cowplot/package.py b/var/spack/repos/builtin/packages/r-cowplot/package.py index 55f2e84010..17a7d8f80e 100644 --- a/var/spack/repos/builtin/packages/r-cowplot/package.py +++ b/var/spack/repos/builtin/packages/r-cowplot/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-crayon/package.py b/var/spack/repos/builtin/packages/r-crayon/package.py index 7e48720ab1..d74f993f3e 100644 --- a/var/spack/repos/builtin/packages/r-crayon/package.py +++ b/var/spack/repos/builtin/packages/r-crayon/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-crosstalk/package.py b/var/spack/repos/builtin/packages/r-crosstalk/package.py index 773fab9df3..aa92cb027c 100644 --- a/var/spack/repos/builtin/packages/r-crosstalk/package.py +++ b/var/spack/repos/builtin/packages/r-crosstalk/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-ctc/package.py b/var/spack/repos/builtin/packages/r-ctc/package.py index d9471a9749..c4ceb4d471 100644 --- a/var/spack/repos/builtin/packages/r-ctc/package.py +++ b/var/spack/repos/builtin/packages/r-ctc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-cubature/package.py b/var/spack/repos/builtin/packages/r-cubature/package.py index f01bd659a9..2701f470e4 100644 --- a/var/spack/repos/builtin/packages/r-cubature/package.py +++ b/var/spack/repos/builtin/packages/r-cubature/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-cubist/package.py b/var/spack/repos/builtin/packages/r-cubist/package.py index b6fe075b4c..a5472f2965 100644 --- a/var/spack/repos/builtin/packages/r-cubist/package.py +++ b/var/spack/repos/builtin/packages/r-cubist/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-curl/package.py b/var/spack/repos/builtin/packages/r-curl/package.py index b67383c2aa..3951059736 100644 --- a/var/spack/repos/builtin/packages/r-curl/package.py +++ b/var/spack/repos/builtin/packages/r-curl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-data-table/package.py b/var/spack/repos/builtin/packages/r-data-table/package.py index 6080989f79..9726785a54 100644 --- a/var/spack/repos/builtin/packages/r-data-table/package.py +++ b/var/spack/repos/builtin/packages/r-data-table/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-dbi/package.py b/var/spack/repos/builtin/packages/r-dbi/package.py index 07dbd989df..5c4c8493ab 100644 --- a/var/spack/repos/builtin/packages/r-dbi/package.py +++ b/var/spack/repos/builtin/packages/r-dbi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-dbplyr/package.py b/var/spack/repos/builtin/packages/r-dbplyr/package.py index fe3444def7..7f0dcf7577 100644 --- a/var/spack/repos/builtin/packages/r-dbplyr/package.py +++ b/var/spack/repos/builtin/packages/r-dbplyr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-delayedarray/package.py b/var/spack/repos/builtin/packages/r-delayedarray/package.py index 8eb378a0b1..b1aa8e1975 100644 --- a/var/spack/repos/builtin/packages/r-delayedarray/package.py +++ b/var/spack/repos/builtin/packages/r-delayedarray/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-deldir/package.py b/var/spack/repos/builtin/packages/r-deldir/package.py index 65e899605b..7a2a5c6de0 100644 --- a/var/spack/repos/builtin/packages/r-deldir/package.py +++ b/var/spack/repos/builtin/packages/r-deldir/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-dendextend/package.py b/var/spack/repos/builtin/packages/r-dendextend/package.py index ec34416a43..73f085b7b7 100644 --- a/var/spack/repos/builtin/packages/r-dendextend/package.py +++ b/var/spack/repos/builtin/packages/r-dendextend/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-deoptim/package.py b/var/spack/repos/builtin/packages/r-deoptim/package.py index 36c0194e07..7a4daac46b 100644 --- a/var/spack/repos/builtin/packages/r-deoptim/package.py +++ b/var/spack/repos/builtin/packages/r-deoptim/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-deoptimr/package.py b/var/spack/repos/builtin/packages/r-deoptimr/package.py index 1a05bd9355..e2ec25a988 100644 --- a/var/spack/repos/builtin/packages/r-deoptimr/package.py +++ b/var/spack/repos/builtin/packages/r-deoptimr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-deseq/package.py b/var/spack/repos/builtin/packages/r-deseq/package.py index a9c378d294..78886d4f03 100644 --- a/var/spack/repos/builtin/packages/r-deseq/package.py +++ b/var/spack/repos/builtin/packages/r-deseq/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-deseq2/package.py b/var/spack/repos/builtin/packages/r-deseq2/package.py index 3ec8ea50db..2a470b808d 100644 --- a/var/spack/repos/builtin/packages/r-deseq2/package.py +++ b/var/spack/repos/builtin/packages/r-deseq2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-desolve/package.py b/var/spack/repos/builtin/packages/r-desolve/package.py index efcf8d9791..11642809e1 100644 --- a/var/spack/repos/builtin/packages/r-desolve/package.py +++ b/var/spack/repos/builtin/packages/r-desolve/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-devtools/package.py b/var/spack/repos/builtin/packages/r-devtools/package.py index 9cf97ab550..68bb13ed76 100644 --- a/var/spack/repos/builtin/packages/r-devtools/package.py +++ b/var/spack/repos/builtin/packages/r-devtools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-diagrammer/package.py b/var/spack/repos/builtin/packages/r-diagrammer/package.py index 6450f9a3b5..a5c7c58787 100644 --- a/var/spack/repos/builtin/packages/r-diagrammer/package.py +++ b/var/spack/repos/builtin/packages/r-diagrammer/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-dicekriging/package.py b/var/spack/repos/builtin/packages/r-dicekriging/package.py index 4a192efbc9..6dcfddda69 100644 --- a/var/spack/repos/builtin/packages/r-dicekriging/package.py +++ b/var/spack/repos/builtin/packages/r-dicekriging/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-dichromat/package.py b/var/spack/repos/builtin/packages/r-dichromat/package.py index 6908cfeb7c..1364e90113 100644 --- a/var/spack/repos/builtin/packages/r-dichromat/package.py +++ b/var/spack/repos/builtin/packages/r-dichromat/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-diffusionmap/package.py b/var/spack/repos/builtin/packages/r-diffusionmap/package.py index e92b170f49..c4011ff844 100644 --- a/var/spack/repos/builtin/packages/r-diffusionmap/package.py +++ b/var/spack/repos/builtin/packages/r-diffusionmap/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-digest/package.py b/var/spack/repos/builtin/packages/r-digest/package.py index 6a08371197..db1678ed1e 100644 --- a/var/spack/repos/builtin/packages/r-digest/package.py +++ b/var/spack/repos/builtin/packages/r-digest/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-diptest/package.py b/var/spack/repos/builtin/packages/r-diptest/package.py index 998373a71f..1afe05803b 100644 --- a/var/spack/repos/builtin/packages/r-diptest/package.py +++ b/var/spack/repos/builtin/packages/r-diptest/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-dirichletmultinomial/package.py b/var/spack/repos/builtin/packages/r-dirichletmultinomial/package.py index 2452277912..ce634abf12 100644 --- a/var/spack/repos/builtin/packages/r-dirichletmultinomial/package.py +++ b/var/spack/repos/builtin/packages/r-dirichletmultinomial/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-dnacopy/package.py b/var/spack/repos/builtin/packages/r-dnacopy/package.py index b3428cd993..2f1900f361 100644 --- a/var/spack/repos/builtin/packages/r-dnacopy/package.py +++ b/var/spack/repos/builtin/packages/r-dnacopy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-do-db/package.py b/var/spack/repos/builtin/packages/r-do-db/package.py index b96fec441d..3dd7c8b258 100644 --- a/var/spack/repos/builtin/packages/r-do-db/package.py +++ b/var/spack/repos/builtin/packages/r-do-db/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-domc/package.py b/var/spack/repos/builtin/packages/r-domc/package.py index bad12fadb6..2fd58884d5 100644 --- a/var/spack/repos/builtin/packages/r-domc/package.py +++ b/var/spack/repos/builtin/packages/r-domc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-doparallel/package.py b/var/spack/repos/builtin/packages/r-doparallel/package.py index 0a5d73b4cd..06bc2bf0a7 100644 --- a/var/spack/repos/builtin/packages/r-doparallel/package.py +++ b/var/spack/repos/builtin/packages/r-doparallel/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-dorng/package.py b/var/spack/repos/builtin/packages/r-dorng/package.py index 75add98509..ba094688ad 100644 --- a/var/spack/repos/builtin/packages/r-dorng/package.py +++ b/var/spack/repos/builtin/packages/r-dorng/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-dose/package.py b/var/spack/repos/builtin/packages/r-dose/package.py index aaeb05d532..96bbf34451 100644 --- a/var/spack/repos/builtin/packages/r-dose/package.py +++ b/var/spack/repos/builtin/packages/r-dose/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-downloader/package.py b/var/spack/repos/builtin/packages/r-downloader/package.py index d43c9a2e36..6a0293b8c6 100644 --- a/var/spack/repos/builtin/packages/r-downloader/package.py +++ b/var/spack/repos/builtin/packages/r-downloader/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-dplyr/package.py b/var/spack/repos/builtin/packages/r-dplyr/package.py index 6daee1b182..72a34222cb 100644 --- a/var/spack/repos/builtin/packages/r-dplyr/package.py +++ b/var/spack/repos/builtin/packages/r-dplyr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-dt/package.py b/var/spack/repos/builtin/packages/r-dt/package.py index 6725a5ec02..3a68487f43 100644 --- a/var/spack/repos/builtin/packages/r-dt/package.py +++ b/var/spack/repos/builtin/packages/r-dt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-dtw/package.py b/var/spack/repos/builtin/packages/r-dtw/package.py index 29c8896811..a752f202d6 100644 --- a/var/spack/repos/builtin/packages/r-dtw/package.py +++ b/var/spack/repos/builtin/packages/r-dtw/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-dygraphs/package.py b/var/spack/repos/builtin/packages/r-dygraphs/package.py index 0b22c96d88..eeb0f08481 100644 --- a/var/spack/repos/builtin/packages/r-dygraphs/package.py +++ b/var/spack/repos/builtin/packages/r-dygraphs/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-e1071/package.py b/var/spack/repos/builtin/packages/r-e1071/package.py index 9790148914..94b6a60ef9 100644 --- a/var/spack/repos/builtin/packages/r-e1071/package.py +++ b/var/spack/repos/builtin/packages/r-e1071/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-edger/package.py b/var/spack/repos/builtin/packages/r-edger/package.py index 6d77487ef3..cc94490e97 100644 --- a/var/spack/repos/builtin/packages/r-edger/package.py +++ b/var/spack/repos/builtin/packages/r-edger/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-ellipse/package.py b/var/spack/repos/builtin/packages/r-ellipse/package.py index c6e6a7eabe..555e5cd985 100644 --- a/var/spack/repos/builtin/packages/r-ellipse/package.py +++ b/var/spack/repos/builtin/packages/r-ellipse/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-ensembldb/package.py b/var/spack/repos/builtin/packages/r-ensembldb/package.py index 3f02413dbc..c1e5b219ef 100644 --- a/var/spack/repos/builtin/packages/r-ensembldb/package.py +++ b/var/spack/repos/builtin/packages/r-ensembldb/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-ergm/package.py b/var/spack/repos/builtin/packages/r-ergm/package.py index da3b90760b..cea98327f7 100644 --- a/var/spack/repos/builtin/packages/r-ergm/package.py +++ b/var/spack/repos/builtin/packages/r-ergm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-evaluate/package.py b/var/spack/repos/builtin/packages/r-evaluate/package.py index 13bdb5a721..8edc12743e 100644 --- a/var/spack/repos/builtin/packages/r-evaluate/package.py +++ b/var/spack/repos/builtin/packages/r-evaluate/package.py @@ -1,28 +1,7 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## - +# SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * diff --git a/var/spack/repos/builtin/packages/r-expm/package.py b/var/spack/repos/builtin/packages/r-expm/package.py index 8ea19ec870..2f68a851ab 100644 --- a/var/spack/repos/builtin/packages/r-expm/package.py +++ b/var/spack/repos/builtin/packages/r-expm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-factoextra/package.py b/var/spack/repos/builtin/packages/r-factoextra/package.py index 3b386dbed8..8bffeafbc9 100644 --- a/var/spack/repos/builtin/packages/r-factoextra/package.py +++ b/var/spack/repos/builtin/packages/r-factoextra/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-factominer/package.py b/var/spack/repos/builtin/packages/r-factominer/package.py index 1a819494b1..f9aa8a7d77 100644 --- a/var/spack/repos/builtin/packages/r-factominer/package.py +++ b/var/spack/repos/builtin/packages/r-factominer/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-fastcluster/package.py b/var/spack/repos/builtin/packages/r-fastcluster/package.py index 7a1e20f00c..303219e630 100644 --- a/var/spack/repos/builtin/packages/r-fastcluster/package.py +++ b/var/spack/repos/builtin/packages/r-fastcluster/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-fastmatch/package.py b/var/spack/repos/builtin/packages/r-fastmatch/package.py index bbea5a81f4..73f849db91 100644 --- a/var/spack/repos/builtin/packages/r-fastmatch/package.py +++ b/var/spack/repos/builtin/packages/r-fastmatch/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-ff/package.py b/var/spack/repos/builtin/packages/r-ff/package.py index cbb95a1633..aa68be9562 100644 --- a/var/spack/repos/builtin/packages/r-ff/package.py +++ b/var/spack/repos/builtin/packages/r-ff/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-fftwtools/package.py b/var/spack/repos/builtin/packages/r-fftwtools/package.py index 08d0060935..237d40035e 100644 --- a/var/spack/repos/builtin/packages/r-fftwtools/package.py +++ b/var/spack/repos/builtin/packages/r-fftwtools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-fgsea/package.py b/var/spack/repos/builtin/packages/r-fgsea/package.py index da00f4b172..938a15bf6f 100644 --- a/var/spack/repos/builtin/packages/r-fgsea/package.py +++ b/var/spack/repos/builtin/packages/r-fgsea/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-filehash/package.py b/var/spack/repos/builtin/packages/r-filehash/package.py index 68f3fbe320..0220fbc6bb 100644 --- a/var/spack/repos/builtin/packages/r-filehash/package.py +++ b/var/spack/repos/builtin/packages/r-filehash/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-findpython/package.py b/var/spack/repos/builtin/packages/r-findpython/package.py index 0d2dc7ee6d..e5a298b09a 100644 --- a/var/spack/repos/builtin/packages/r-findpython/package.py +++ b/var/spack/repos/builtin/packages/r-findpython/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-fit-models/package.py b/var/spack/repos/builtin/packages/r-fit-models/package.py index 4627fab93e..32c2b96f9e 100644 --- a/var/spack/repos/builtin/packages/r-fit-models/package.py +++ b/var/spack/repos/builtin/packages/r-fit-models/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-flashclust/package.py b/var/spack/repos/builtin/packages/r-flashclust/package.py index a4318fc682..c36ad50cf8 100644 --- a/var/spack/repos/builtin/packages/r-flashclust/package.py +++ b/var/spack/repos/builtin/packages/r-flashclust/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-flexclust/package.py b/var/spack/repos/builtin/packages/r-flexclust/package.py index 9d89e3c1fb..338bfd4d07 100644 --- a/var/spack/repos/builtin/packages/r-flexclust/package.py +++ b/var/spack/repos/builtin/packages/r-flexclust/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-flexmix/package.py b/var/spack/repos/builtin/packages/r-flexmix/package.py index 4c68840efa..f41e959b7c 100644 --- a/var/spack/repos/builtin/packages/r-flexmix/package.py +++ b/var/spack/repos/builtin/packages/r-flexmix/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-fnn/package.py b/var/spack/repos/builtin/packages/r-fnn/package.py index 6511e0d081..984024a5d0 100644 --- a/var/spack/repos/builtin/packages/r-fnn/package.py +++ b/var/spack/repos/builtin/packages/r-fnn/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-forcats/package.py b/var/spack/repos/builtin/packages/r-forcats/package.py index 8ef3e805e0..3497da1f8b 100644 --- a/var/spack/repos/builtin/packages/r-forcats/package.py +++ b/var/spack/repos/builtin/packages/r-forcats/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-foreach/package.py b/var/spack/repos/builtin/packages/r-foreach/package.py index 6e981b5630..b7ffbcc256 100644 --- a/var/spack/repos/builtin/packages/r-foreach/package.py +++ b/var/spack/repos/builtin/packages/r-foreach/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-forecast/package.py b/var/spack/repos/builtin/packages/r-forecast/package.py index 105d30a727..d491a3bc20 100644 --- a/var/spack/repos/builtin/packages/r-forecast/package.py +++ b/var/spack/repos/builtin/packages/r-forecast/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-foreign/package.py b/var/spack/repos/builtin/packages/r-foreign/package.py index 294eba97f5..4974ec76d7 100644 --- a/var/spack/repos/builtin/packages/r-foreign/package.py +++ b/var/spack/repos/builtin/packages/r-foreign/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-formatr/package.py b/var/spack/repos/builtin/packages/r-formatr/package.py index 705562dbee..7e495ca821 100644 --- a/var/spack/repos/builtin/packages/r-formatr/package.py +++ b/var/spack/repos/builtin/packages/r-formatr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-formula/package.py b/var/spack/repos/builtin/packages/r-formula/package.py index 4438485786..9f756f8917 100644 --- a/var/spack/repos/builtin/packages/r-formula/package.py +++ b/var/spack/repos/builtin/packages/r-formula/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-fpc/package.py b/var/spack/repos/builtin/packages/r-fpc/package.py index 271176b8ba..26901c8035 100644 --- a/var/spack/repos/builtin/packages/r-fpc/package.py +++ b/var/spack/repos/builtin/packages/r-fpc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-fracdiff/package.py b/var/spack/repos/builtin/packages/r-fracdiff/package.py index 089f1d3ee5..4666832c17 100644 --- a/var/spack/repos/builtin/packages/r-fracdiff/package.py +++ b/var/spack/repos/builtin/packages/r-fracdiff/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-futile-logger/package.py b/var/spack/repos/builtin/packages/r-futile-logger/package.py index b2149b427f..e2e3cf2667 100644 --- a/var/spack/repos/builtin/packages/r-futile-logger/package.py +++ b/var/spack/repos/builtin/packages/r-futile-logger/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-futile-options/package.py b/var/spack/repos/builtin/packages/r-futile-options/package.py index e254610bc6..881d6f8ad1 100644 --- a/var/spack/repos/builtin/packages/r-futile-options/package.py +++ b/var/spack/repos/builtin/packages/r-futile-options/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-gbm/package.py b/var/spack/repos/builtin/packages/r-gbm/package.py index 7726fbac37..5309583922 100644 --- a/var/spack/repos/builtin/packages/r-gbm/package.py +++ b/var/spack/repos/builtin/packages/r-gbm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-gcrma/package.py b/var/spack/repos/builtin/packages/r-gcrma/package.py index 66a2e1f2e2..8f9fe9ff1f 100644 --- a/var/spack/repos/builtin/packages/r-gcrma/package.py +++ b/var/spack/repos/builtin/packages/r-gcrma/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-gdata/package.py b/var/spack/repos/builtin/packages/r-gdata/package.py index 6ddb29bd04..a093ae4485 100644 --- a/var/spack/repos/builtin/packages/r-gdata/package.py +++ b/var/spack/repos/builtin/packages/r-gdata/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-gdsfmt/package.py b/var/spack/repos/builtin/packages/r-gdsfmt/package.py index 3df7379e38..b2a98aa726 100644 --- a/var/spack/repos/builtin/packages/r-gdsfmt/package.py +++ b/var/spack/repos/builtin/packages/r-gdsfmt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-geiger/package.py b/var/spack/repos/builtin/packages/r-geiger/package.py index 3c236ac3a0..8bb6f8a3c7 100644 --- a/var/spack/repos/builtin/packages/r-geiger/package.py +++ b/var/spack/repos/builtin/packages/r-geiger/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-genefilter/package.py b/var/spack/repos/builtin/packages/r-genefilter/package.py index 904b9c73e4..afe1e1edf6 100644 --- a/var/spack/repos/builtin/packages/r-genefilter/package.py +++ b/var/spack/repos/builtin/packages/r-genefilter/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-genelendatabase/package.py b/var/spack/repos/builtin/packages/r-genelendatabase/package.py index 6d0ac4b3fd..003bc11e9d 100644 --- a/var/spack/repos/builtin/packages/r-genelendatabase/package.py +++ b/var/spack/repos/builtin/packages/r-genelendatabase/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-geneplotter/package.py b/var/spack/repos/builtin/packages/r-geneplotter/package.py index 149378dcf0..46918c492a 100644 --- a/var/spack/repos/builtin/packages/r-geneplotter/package.py +++ b/var/spack/repos/builtin/packages/r-geneplotter/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-genie3/package.py b/var/spack/repos/builtin/packages/r-genie3/package.py index cd61d010b7..b2942ffc89 100644 --- a/var/spack/repos/builtin/packages/r-genie3/package.py +++ b/var/spack/repos/builtin/packages/r-genie3/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-genomeinfodb/package.py b/var/spack/repos/builtin/packages/r-genomeinfodb/package.py index 222dfcf679..a13b969c73 100644 --- a/var/spack/repos/builtin/packages/r-genomeinfodb/package.py +++ b/var/spack/repos/builtin/packages/r-genomeinfodb/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-genomeinfodbdata/package.py b/var/spack/repos/builtin/packages/r-genomeinfodbdata/package.py index 339f1eb4ab..cf74104950 100644 --- a/var/spack/repos/builtin/packages/r-genomeinfodbdata/package.py +++ b/var/spack/repos/builtin/packages/r-genomeinfodbdata/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-genomicalignments/package.py b/var/spack/repos/builtin/packages/r-genomicalignments/package.py index f70717e52c..9f66a1aba8 100644 --- a/var/spack/repos/builtin/packages/r-genomicalignments/package.py +++ b/var/spack/repos/builtin/packages/r-genomicalignments/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-genomicfeatures/package.py b/var/spack/repos/builtin/packages/r-genomicfeatures/package.py index cb5605d2bb..9531e36ccd 100644 --- a/var/spack/repos/builtin/packages/r-genomicfeatures/package.py +++ b/var/spack/repos/builtin/packages/r-genomicfeatures/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-genomicranges/package.py b/var/spack/repos/builtin/packages/r-genomicranges/package.py index 9e5baff6c7..d362b57909 100644 --- a/var/spack/repos/builtin/packages/r-genomicranges/package.py +++ b/var/spack/repos/builtin/packages/r-genomicranges/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-geomorph/package.py b/var/spack/repos/builtin/packages/r-geomorph/package.py index 33ac0317c0..cb9e3605de 100644 --- a/var/spack/repos/builtin/packages/r-geomorph/package.py +++ b/var/spack/repos/builtin/packages/r-geomorph/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-geoquery/package.py b/var/spack/repos/builtin/packages/r-geoquery/package.py index 1e5cd8469c..af3629e5ed 100644 --- a/var/spack/repos/builtin/packages/r-geoquery/package.py +++ b/var/spack/repos/builtin/packages/r-geoquery/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-geosphere/package.py b/var/spack/repos/builtin/packages/r-geosphere/package.py index a797fdef6f..f6a3f233a1 100644 --- a/var/spack/repos/builtin/packages/r-geosphere/package.py +++ b/var/spack/repos/builtin/packages/r-geosphere/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-getopt/package.py b/var/spack/repos/builtin/packages/r-getopt/package.py index a4ea28ea13..a1e1286b6c 100644 --- a/var/spack/repos/builtin/packages/r-getopt/package.py +++ b/var/spack/repos/builtin/packages/r-getopt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-getoptlong/package.py b/var/spack/repos/builtin/packages/r-getoptlong/package.py index 822486255d..61d6cb7977 100644 --- a/var/spack/repos/builtin/packages/r-getoptlong/package.py +++ b/var/spack/repos/builtin/packages/r-getoptlong/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-ggally/package.py b/var/spack/repos/builtin/packages/r-ggally/package.py index e5bf46fdc2..26dacf1378 100644 --- a/var/spack/repos/builtin/packages/r-ggally/package.py +++ b/var/spack/repos/builtin/packages/r-ggally/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-ggbio/package.py b/var/spack/repos/builtin/packages/r-ggbio/package.py index 9401e34441..30ebcf23d8 100644 --- a/var/spack/repos/builtin/packages/r-ggbio/package.py +++ b/var/spack/repos/builtin/packages/r-ggbio/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-ggdendro/package.py b/var/spack/repos/builtin/packages/r-ggdendro/package.py index 8741d3152a..d0b0562f39 100644 --- a/var/spack/repos/builtin/packages/r-ggdendro/package.py +++ b/var/spack/repos/builtin/packages/r-ggdendro/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-ggjoy/package.py b/var/spack/repos/builtin/packages/r-ggjoy/package.py index 3650852ee9..aa3ca2477b 100644 --- a/var/spack/repos/builtin/packages/r-ggjoy/package.py +++ b/var/spack/repos/builtin/packages/r-ggjoy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-ggmap/package.py b/var/spack/repos/builtin/packages/r-ggmap/package.py index 75d338ae7a..4fe5a9e583 100644 --- a/var/spack/repos/builtin/packages/r-ggmap/package.py +++ b/var/spack/repos/builtin/packages/r-ggmap/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-ggplot2/package.py b/var/spack/repos/builtin/packages/r-ggplot2/package.py index 23755aa03a..0836103e41 100644 --- a/var/spack/repos/builtin/packages/r-ggplot2/package.py +++ b/var/spack/repos/builtin/packages/r-ggplot2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-ggpubr/package.py b/var/spack/repos/builtin/packages/r-ggpubr/package.py index 0451575333..66f10d03f9 100644 --- a/var/spack/repos/builtin/packages/r-ggpubr/package.py +++ b/var/spack/repos/builtin/packages/r-ggpubr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-ggrepel/package.py b/var/spack/repos/builtin/packages/r-ggrepel/package.py index 40f52c4604..075b081535 100644 --- a/var/spack/repos/builtin/packages/r-ggrepel/package.py +++ b/var/spack/repos/builtin/packages/r-ggrepel/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-ggridges/package.py b/var/spack/repos/builtin/packages/r-ggridges/package.py index 180d984b14..c5f686282d 100644 --- a/var/spack/repos/builtin/packages/r-ggridges/package.py +++ b/var/spack/repos/builtin/packages/r-ggridges/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-ggsci/package.py b/var/spack/repos/builtin/packages/r-ggsci/package.py index e21abc8328..2cec0a6496 100644 --- a/var/spack/repos/builtin/packages/r-ggsci/package.py +++ b/var/spack/repos/builtin/packages/r-ggsci/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-ggvis/package.py b/var/spack/repos/builtin/packages/r-ggvis/package.py index 74f6a96330..6c2dffcc42 100644 --- a/var/spack/repos/builtin/packages/r-ggvis/package.py +++ b/var/spack/repos/builtin/packages/r-ggvis/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-gistr/package.py b/var/spack/repos/builtin/packages/r-gistr/package.py index ea3f5b3ab7..500d9cb0de 100644 --- a/var/spack/repos/builtin/packages/r-gistr/package.py +++ b/var/spack/repos/builtin/packages/r-gistr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-git2r/package.py b/var/spack/repos/builtin/packages/r-git2r/package.py index 2f427b05b2..ad9545b6a2 100644 --- a/var/spack/repos/builtin/packages/r-git2r/package.py +++ b/var/spack/repos/builtin/packages/r-git2r/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-glimma/package.py b/var/spack/repos/builtin/packages/r-glimma/package.py index 768d94bbe1..5fe40e6594 100644 --- a/var/spack/repos/builtin/packages/r-glimma/package.py +++ b/var/spack/repos/builtin/packages/r-glimma/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-glmnet/package.py b/var/spack/repos/builtin/packages/r-glmnet/package.py index 30c4e4d67e..7f79e5f023 100644 --- a/var/spack/repos/builtin/packages/r-glmnet/package.py +++ b/var/spack/repos/builtin/packages/r-glmnet/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-globaloptions/package.py b/var/spack/repos/builtin/packages/r-globaloptions/package.py index 8125125d2e..3aef7c1f65 100644 --- a/var/spack/repos/builtin/packages/r-globaloptions/package.py +++ b/var/spack/repos/builtin/packages/r-globaloptions/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-glue/package.py b/var/spack/repos/builtin/packages/r-glue/package.py index 515c9f77c7..bfd92fcdbd 100644 --- a/var/spack/repos/builtin/packages/r-glue/package.py +++ b/var/spack/repos/builtin/packages/r-glue/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-gmodels/package.py b/var/spack/repos/builtin/packages/r-gmodels/package.py index 0a7ebc80d1..a9fd5541c0 100644 --- a/var/spack/repos/builtin/packages/r-gmodels/package.py +++ b/var/spack/repos/builtin/packages/r-gmodels/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-gmp/package.py b/var/spack/repos/builtin/packages/r-gmp/package.py index 05bb2f584e..6aaa8d683c 100644 --- a/var/spack/repos/builtin/packages/r-gmp/package.py +++ b/var/spack/repos/builtin/packages/r-gmp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-go-db/package.py b/var/spack/repos/builtin/packages/r-go-db/package.py index b57a164b4e..61cd6d35dc 100644 --- a/var/spack/repos/builtin/packages/r-go-db/package.py +++ b/var/spack/repos/builtin/packages/r-go-db/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-googlevis/package.py b/var/spack/repos/builtin/packages/r-googlevis/package.py index 0568ee554e..ac12962998 100644 --- a/var/spack/repos/builtin/packages/r-googlevis/package.py +++ b/var/spack/repos/builtin/packages/r-googlevis/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-goplot/package.py b/var/spack/repos/builtin/packages/r-goplot/package.py index 13ce8a1bc5..3d8e351cb6 100644 --- a/var/spack/repos/builtin/packages/r-goplot/package.py +++ b/var/spack/repos/builtin/packages/r-goplot/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-gosemsim/package.py b/var/spack/repos/builtin/packages/r-gosemsim/package.py index c8861e4614..b425445b0c 100644 --- a/var/spack/repos/builtin/packages/r-gosemsim/package.py +++ b/var/spack/repos/builtin/packages/r-gosemsim/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-goseq/package.py b/var/spack/repos/builtin/packages/r-goseq/package.py index b296d8a5db..5801169f1f 100644 --- a/var/spack/repos/builtin/packages/r-goseq/package.py +++ b/var/spack/repos/builtin/packages/r-goseq/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-gostats/package.py b/var/spack/repos/builtin/packages/r-gostats/package.py index b8ee160598..36ca8a63d0 100644 --- a/var/spack/repos/builtin/packages/r-gostats/package.py +++ b/var/spack/repos/builtin/packages/r-gostats/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-gplots/package.py b/var/spack/repos/builtin/packages/r-gplots/package.py index 67b70a9062..ff81686ba3 100644 --- a/var/spack/repos/builtin/packages/r-gplots/package.py +++ b/var/spack/repos/builtin/packages/r-gplots/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # # from spack import * diff --git a/var/spack/repos/builtin/packages/r-graph/package.py b/var/spack/repos/builtin/packages/r-graph/package.py index 0dbd4c25b6..88760e05bc 100644 --- a/var/spack/repos/builtin/packages/r-graph/package.py +++ b/var/spack/repos/builtin/packages/r-graph/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-gridbase/package.py b/var/spack/repos/builtin/packages/r-gridbase/package.py index cc9ab5ffd6..ed8e0b0267 100644 --- a/var/spack/repos/builtin/packages/r-gridbase/package.py +++ b/var/spack/repos/builtin/packages/r-gridbase/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-gridextra/package.py b/var/spack/repos/builtin/packages/r-gridextra/package.py index fea484e57f..27c66a10ba 100644 --- a/var/spack/repos/builtin/packages/r-gridextra/package.py +++ b/var/spack/repos/builtin/packages/r-gridextra/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-gseabase/package.py b/var/spack/repos/builtin/packages/r-gseabase/package.py index 082d4ef382..6dbe982b5d 100644 --- a/var/spack/repos/builtin/packages/r-gseabase/package.py +++ b/var/spack/repos/builtin/packages/r-gseabase/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-gss/package.py b/var/spack/repos/builtin/packages/r-gss/package.py index a6d3dff37f..9d65dd1d32 100644 --- a/var/spack/repos/builtin/packages/r-gss/package.py +++ b/var/spack/repos/builtin/packages/r-gss/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-gsubfn/package.py b/var/spack/repos/builtin/packages/r-gsubfn/package.py index e477fcb859..ffe55f94a7 100644 --- a/var/spack/repos/builtin/packages/r-gsubfn/package.py +++ b/var/spack/repos/builtin/packages/r-gsubfn/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-gtable/package.py b/var/spack/repos/builtin/packages/r-gtable/package.py index 50ad7ddd09..e3400d641b 100644 --- a/var/spack/repos/builtin/packages/r-gtable/package.py +++ b/var/spack/repos/builtin/packages/r-gtable/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-gtools/package.py b/var/spack/repos/builtin/packages/r-gtools/package.py index c7f947fb63..e42aae0220 100644 --- a/var/spack/repos/builtin/packages/r-gtools/package.py +++ b/var/spack/repos/builtin/packages/r-gtools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-gtrellis/package.py b/var/spack/repos/builtin/packages/r-gtrellis/package.py index 9fdc67a21e..a1558c9cbd 100644 --- a/var/spack/repos/builtin/packages/r-gtrellis/package.py +++ b/var/spack/repos/builtin/packages/r-gtrellis/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-gviz/package.py b/var/spack/repos/builtin/packages/r-gviz/package.py index 2ec7adc275..23b886a34b 100644 --- a/var/spack/repos/builtin/packages/r-gviz/package.py +++ b/var/spack/repos/builtin/packages/r-gviz/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-haven/package.py b/var/spack/repos/builtin/packages/r-haven/package.py index 6bd122e5cb..dab9e486b5 100644 --- a/var/spack/repos/builtin/packages/r-haven/package.py +++ b/var/spack/repos/builtin/packages/r-haven/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-hexbin/package.py b/var/spack/repos/builtin/packages/r-hexbin/package.py index 22669cfa23..8f71d729d4 100644 --- a/var/spack/repos/builtin/packages/r-hexbin/package.py +++ b/var/spack/repos/builtin/packages/r-hexbin/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-highr/package.py b/var/spack/repos/builtin/packages/r-highr/package.py index 0d04a78fe9..fe8606ca59 100644 --- a/var/spack/repos/builtin/packages/r-highr/package.py +++ b/var/spack/repos/builtin/packages/r-highr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-hmisc/package.py b/var/spack/repos/builtin/packages/r-hmisc/package.py index a3824c3789..11cc890764 100644 --- a/var/spack/repos/builtin/packages/r-hmisc/package.py +++ b/var/spack/repos/builtin/packages/r-hmisc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-hms/package.py b/var/spack/repos/builtin/packages/r-hms/package.py index 876c6300b0..caf95888d5 100644 --- a/var/spack/repos/builtin/packages/r-hms/package.py +++ b/var/spack/repos/builtin/packages/r-hms/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-htmltable/package.py b/var/spack/repos/builtin/packages/r-htmltable/package.py index f13f8dd488..d2b832d151 100644 --- a/var/spack/repos/builtin/packages/r-htmltable/package.py +++ b/var/spack/repos/builtin/packages/r-htmltable/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-htmltools/package.py b/var/spack/repos/builtin/packages/r-htmltools/package.py index c2740f7b1c..4bedff2115 100644 --- a/var/spack/repos/builtin/packages/r-htmltools/package.py +++ b/var/spack/repos/builtin/packages/r-htmltools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-htmlwidgets/package.py b/var/spack/repos/builtin/packages/r-htmlwidgets/package.py index 95f6c4db21..4416678974 100644 --- a/var/spack/repos/builtin/packages/r-htmlwidgets/package.py +++ b/var/spack/repos/builtin/packages/r-htmlwidgets/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-httpuv/package.py b/var/spack/repos/builtin/packages/r-httpuv/package.py index 316eff27e2..ac2967c491 100644 --- a/var/spack/repos/builtin/packages/r-httpuv/package.py +++ b/var/spack/repos/builtin/packages/r-httpuv/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-httr/package.py b/var/spack/repos/builtin/packages/r-httr/package.py index c742e99c7e..f3f5426fdd 100644 --- a/var/spack/repos/builtin/packages/r-httr/package.py +++ b/var/spack/repos/builtin/packages/r-httr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-hwriter/package.py b/var/spack/repos/builtin/packages/r-hwriter/package.py index bd2a072840..348dec8b56 100644 --- a/var/spack/repos/builtin/packages/r-hwriter/package.py +++ b/var/spack/repos/builtin/packages/r-hwriter/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-hypergraph/package.py b/var/spack/repos/builtin/packages/r-hypergraph/package.py index 579c32f1cb..8da1131197 100644 --- a/var/spack/repos/builtin/packages/r-hypergraph/package.py +++ b/var/spack/repos/builtin/packages/r-hypergraph/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-ica/package.py b/var/spack/repos/builtin/packages/r-ica/package.py index 5bc0897cc4..10e46c971e 100644 --- a/var/spack/repos/builtin/packages/r-ica/package.py +++ b/var/spack/repos/builtin/packages/r-ica/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-igraph/package.py b/var/spack/repos/builtin/packages/r-igraph/package.py index 865e6121b2..9d14815389 100644 --- a/var/spack/repos/builtin/packages/r-igraph/package.py +++ b/var/spack/repos/builtin/packages/r-igraph/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-illuminaio/package.py b/var/spack/repos/builtin/packages/r-illuminaio/package.py index abcd2713d3..8e578421c6 100644 --- a/var/spack/repos/builtin/packages/r-illuminaio/package.py +++ b/var/spack/repos/builtin/packages/r-illuminaio/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-impute/package.py b/var/spack/repos/builtin/packages/r-impute/package.py index 233ce1b3f7..76cfb9be9b 100644 --- a/var/spack/repos/builtin/packages/r-impute/package.py +++ b/var/spack/repos/builtin/packages/r-impute/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-influencer/package.py b/var/spack/repos/builtin/packages/r-influencer/package.py index 3b60842ce9..ded5558e98 100644 --- a/var/spack/repos/builtin/packages/r-influencer/package.py +++ b/var/spack/repos/builtin/packages/r-influencer/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-inline/package.py b/var/spack/repos/builtin/packages/r-inline/package.py index 66f283f50e..54e32607b3 100644 --- a/var/spack/repos/builtin/packages/r-inline/package.py +++ b/var/spack/repos/builtin/packages/r-inline/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-interactivedisplaybase/package.py b/var/spack/repos/builtin/packages/r-interactivedisplaybase/package.py index 74aff4a11f..8a5a6a038d 100644 --- a/var/spack/repos/builtin/packages/r-interactivedisplaybase/package.py +++ b/var/spack/repos/builtin/packages/r-interactivedisplaybase/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-ipred/package.py b/var/spack/repos/builtin/packages/r-ipred/package.py index b5a30b999e..825046560f 100644 --- a/var/spack/repos/builtin/packages/r-ipred/package.py +++ b/var/spack/repos/builtin/packages/r-ipred/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-iranges/package.py b/var/spack/repos/builtin/packages/r-iranges/package.py index aeff9561e4..5a79d0973b 100644 --- a/var/spack/repos/builtin/packages/r-iranges/package.py +++ b/var/spack/repos/builtin/packages/r-iranges/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-irdisplay/package.py b/var/spack/repos/builtin/packages/r-irdisplay/package.py index 42f4a23957..293c0bc7c0 100644 --- a/var/spack/repos/builtin/packages/r-irdisplay/package.py +++ b/var/spack/repos/builtin/packages/r-irdisplay/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-irkernel/package.py b/var/spack/repos/builtin/packages/r-irkernel/package.py index cfda326326..2ab4c2d01e 100644 --- a/var/spack/repos/builtin/packages/r-irkernel/package.py +++ b/var/spack/repos/builtin/packages/r-irkernel/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-irlba/package.py b/var/spack/repos/builtin/packages/r-irlba/package.py index 821fcc8d60..3062b2411d 100644 --- a/var/spack/repos/builtin/packages/r-irlba/package.py +++ b/var/spack/repos/builtin/packages/r-irlba/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-iso/package.py b/var/spack/repos/builtin/packages/r-iso/package.py index 20316ee995..bf9e428eb3 100644 --- a/var/spack/repos/builtin/packages/r-iso/package.py +++ b/var/spack/repos/builtin/packages/r-iso/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-iterators/package.py b/var/spack/repos/builtin/packages/r-iterators/package.py index 99ed47a8fa..3b337cfa29 100644 --- a/var/spack/repos/builtin/packages/r-iterators/package.py +++ b/var/spack/repos/builtin/packages/r-iterators/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-janitor/package.py b/var/spack/repos/builtin/packages/r-janitor/package.py index c555fc2dea..eeb66b3c41 100644 --- a/var/spack/repos/builtin/packages/r-janitor/package.py +++ b/var/spack/repos/builtin/packages/r-janitor/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-jaspar2018/package.py b/var/spack/repos/builtin/packages/r-jaspar2018/package.py index a82aa89e8a..a2bd68de81 100644 --- a/var/spack/repos/builtin/packages/r-jaspar2018/package.py +++ b/var/spack/repos/builtin/packages/r-jaspar2018/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-jomo/package.py b/var/spack/repos/builtin/packages/r-jomo/package.py index f63a88be6b..adc88c4ed5 100644 --- a/var/spack/repos/builtin/packages/r-jomo/package.py +++ b/var/spack/repos/builtin/packages/r-jomo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-jpeg/package.py b/var/spack/repos/builtin/packages/r-jpeg/package.py index a97bd30c15..e8c379ce8d 100644 --- a/var/spack/repos/builtin/packages/r-jpeg/package.py +++ b/var/spack/repos/builtin/packages/r-jpeg/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-jsonlite/package.py b/var/spack/repos/builtin/packages/r-jsonlite/package.py index aeede2effb..2403ec762a 100644 --- a/var/spack/repos/builtin/packages/r-jsonlite/package.py +++ b/var/spack/repos/builtin/packages/r-jsonlite/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-kegg-db/package.py b/var/spack/repos/builtin/packages/r-kegg-db/package.py index 523c9a6808..db4f1ff9e7 100644 --- a/var/spack/repos/builtin/packages/r-kegg-db/package.py +++ b/var/spack/repos/builtin/packages/r-kegg-db/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-kegggraph/package.py b/var/spack/repos/builtin/packages/r-kegggraph/package.py index 579ce11f52..424ceca845 100644 --- a/var/spack/repos/builtin/packages/r-kegggraph/package.py +++ b/var/spack/repos/builtin/packages/r-kegggraph/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-keggrest/package.py b/var/spack/repos/builtin/packages/r-keggrest/package.py index 573ca54a64..d19446e9a2 100644 --- a/var/spack/repos/builtin/packages/r-keggrest/package.py +++ b/var/spack/repos/builtin/packages/r-keggrest/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-kernlab/package.py b/var/spack/repos/builtin/packages/r-kernlab/package.py index c179f08efd..a2191441b0 100644 --- a/var/spack/repos/builtin/packages/r-kernlab/package.py +++ b/var/spack/repos/builtin/packages/r-kernlab/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-kernsmooth/package.py b/var/spack/repos/builtin/packages/r-kernsmooth/package.py index c95a5fdff1..c1ad34ec21 100644 --- a/var/spack/repos/builtin/packages/r-kernsmooth/package.py +++ b/var/spack/repos/builtin/packages/r-kernsmooth/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-kknn/package.py b/var/spack/repos/builtin/packages/r-kknn/package.py index 84fd604fd5..8d07faf285 100644 --- a/var/spack/repos/builtin/packages/r-kknn/package.py +++ b/var/spack/repos/builtin/packages/r-kknn/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-knitr/package.py b/var/spack/repos/builtin/packages/r-knitr/package.py index 9375b53ac1..8b92234ce0 100644 --- a/var/spack/repos/builtin/packages/r-knitr/package.py +++ b/var/spack/repos/builtin/packages/r-knitr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-ks/package.py b/var/spack/repos/builtin/packages/r-ks/package.py index 7ca72bdcb7..dca118bdf5 100644 --- a/var/spack/repos/builtin/packages/r-ks/package.py +++ b/var/spack/repos/builtin/packages/r-ks/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-labeling/package.py b/var/spack/repos/builtin/packages/r-labeling/package.py index 8c24656a8e..49c8c640dc 100644 --- a/var/spack/repos/builtin/packages/r-labeling/package.py +++ b/var/spack/repos/builtin/packages/r-labeling/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-lambda-r/package.py b/var/spack/repos/builtin/packages/r-lambda-r/package.py index 79dc5e1bc6..d6a2b56c1e 100644 --- a/var/spack/repos/builtin/packages/r-lambda-r/package.py +++ b/var/spack/repos/builtin/packages/r-lambda-r/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-laplacesdemon/package.py b/var/spack/repos/builtin/packages/r-laplacesdemon/package.py index 547465b1ba..e255cb1e49 100644 --- a/var/spack/repos/builtin/packages/r-laplacesdemon/package.py +++ b/var/spack/repos/builtin/packages/r-laplacesdemon/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-lars/package.py b/var/spack/repos/builtin/packages/r-lars/package.py index 53a733cb7b..8788aa715f 100644 --- a/var/spack/repos/builtin/packages/r-lars/package.py +++ b/var/spack/repos/builtin/packages/r-lars/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-lattice/package.py b/var/spack/repos/builtin/packages/r-lattice/package.py index bd89e3a571..80450bee59 100644 --- a/var/spack/repos/builtin/packages/r-lattice/package.py +++ b/var/spack/repos/builtin/packages/r-lattice/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-latticeextra/package.py b/var/spack/repos/builtin/packages/r-latticeextra/package.py index 9b9562703d..a337e26ed5 100644 --- a/var/spack/repos/builtin/packages/r-latticeextra/package.py +++ b/var/spack/repos/builtin/packages/r-latticeextra/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-lava/package.py b/var/spack/repos/builtin/packages/r-lava/package.py index 1c01bc4002..deb37f9da7 100644 --- a/var/spack/repos/builtin/packages/r-lava/package.py +++ b/var/spack/repos/builtin/packages/r-lava/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-lazyeval/package.py b/var/spack/repos/builtin/packages/r-lazyeval/package.py index eafa835229..035661c0cc 100644 --- a/var/spack/repos/builtin/packages/r-lazyeval/package.py +++ b/var/spack/repos/builtin/packages/r-lazyeval/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-leaflet/package.py b/var/spack/repos/builtin/packages/r-leaflet/package.py index 5a179be965..fd418c4dc8 100644 --- a/var/spack/repos/builtin/packages/r-leaflet/package.py +++ b/var/spack/repos/builtin/packages/r-leaflet/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-leaps/package.py b/var/spack/repos/builtin/packages/r-leaps/package.py index 2176bbabcc..056c84fea1 100644 --- a/var/spack/repos/builtin/packages/r-leaps/package.py +++ b/var/spack/repos/builtin/packages/r-leaps/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-learnbayes/package.py b/var/spack/repos/builtin/packages/r-learnbayes/package.py index 69ee46ab8d..731f6488d1 100644 --- a/var/spack/repos/builtin/packages/r-learnbayes/package.py +++ b/var/spack/repos/builtin/packages/r-learnbayes/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-lhs/package.py b/var/spack/repos/builtin/packages/r-lhs/package.py index ac464e734b..c607d68124 100644 --- a/var/spack/repos/builtin/packages/r-lhs/package.py +++ b/var/spack/repos/builtin/packages/r-lhs/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-limma/package.py b/var/spack/repos/builtin/packages/r-limma/package.py index 772f8ae430..7de1463b5f 100644 --- a/var/spack/repos/builtin/packages/r-limma/package.py +++ b/var/spack/repos/builtin/packages/r-limma/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-lme4/package.py b/var/spack/repos/builtin/packages/r-lme4/package.py index 90958cc9f3..8ba8e92a12 100644 --- a/var/spack/repos/builtin/packages/r-lme4/package.py +++ b/var/spack/repos/builtin/packages/r-lme4/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-lmtest/package.py b/var/spack/repos/builtin/packages/r-lmtest/package.py index 8b1f0ab910..ad8dbaf468 100644 --- a/var/spack/repos/builtin/packages/r-lmtest/package.py +++ b/var/spack/repos/builtin/packages/r-lmtest/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-locfit/package.py b/var/spack/repos/builtin/packages/r-locfit/package.py index f531526661..f08811d14b 100644 --- a/var/spack/repos/builtin/packages/r-locfit/package.py +++ b/var/spack/repos/builtin/packages/r-locfit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-log4r/package.py b/var/spack/repos/builtin/packages/r-log4r/package.py index 5c537cd606..28cd6314e7 100644 --- a/var/spack/repos/builtin/packages/r-log4r/package.py +++ b/var/spack/repos/builtin/packages/r-log4r/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-lpsolve/package.py b/var/spack/repos/builtin/packages/r-lpsolve/package.py index e3c225335f..e3690b86f9 100644 --- a/var/spack/repos/builtin/packages/r-lpsolve/package.py +++ b/var/spack/repos/builtin/packages/r-lpsolve/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-lsei/package.py b/var/spack/repos/builtin/packages/r-lsei/package.py index 378512a21e..5d23d10991 100644 --- a/var/spack/repos/builtin/packages/r-lsei/package.py +++ b/var/spack/repos/builtin/packages/r-lsei/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-lubridate/package.py b/var/spack/repos/builtin/packages/r-lubridate/package.py index 2e8aab8e00..d156d2c776 100644 --- a/var/spack/repos/builtin/packages/r-lubridate/package.py +++ b/var/spack/repos/builtin/packages/r-lubridate/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-magic/package.py b/var/spack/repos/builtin/packages/r-magic/package.py index aabc238a69..7365cfc3dd 100644 --- a/var/spack/repos/builtin/packages/r-magic/package.py +++ b/var/spack/repos/builtin/packages/r-magic/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-magrittr/package.py b/var/spack/repos/builtin/packages/r-magrittr/package.py index 8d50112795..a52960890b 100644 --- a/var/spack/repos/builtin/packages/r-magrittr/package.py +++ b/var/spack/repos/builtin/packages/r-magrittr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-makecdfenv/package.py b/var/spack/repos/builtin/packages/r-makecdfenv/package.py index e78c88d9ee..fe307b5220 100644 --- a/var/spack/repos/builtin/packages/r-makecdfenv/package.py +++ b/var/spack/repos/builtin/packages/r-makecdfenv/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-maldiquant/package.py b/var/spack/repos/builtin/packages/r-maldiquant/package.py index eed50fcd65..69ad9033b5 100644 --- a/var/spack/repos/builtin/packages/r-maldiquant/package.py +++ b/var/spack/repos/builtin/packages/r-maldiquant/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-mapproj/package.py b/var/spack/repos/builtin/packages/r-mapproj/package.py index f17700ed60..689e175d67 100644 --- a/var/spack/repos/builtin/packages/r-mapproj/package.py +++ b/var/spack/repos/builtin/packages/r-mapproj/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-maps/package.py b/var/spack/repos/builtin/packages/r-maps/package.py index e9245a0bc3..4895599fa0 100644 --- a/var/spack/repos/builtin/packages/r-maps/package.py +++ b/var/spack/repos/builtin/packages/r-maps/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-maptools/package.py b/var/spack/repos/builtin/packages/r-maptools/package.py index c46991273b..6a7487cc94 100644 --- a/var/spack/repos/builtin/packages/r-maptools/package.py +++ b/var/spack/repos/builtin/packages/r-maptools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-markdown/package.py b/var/spack/repos/builtin/packages/r-markdown/package.py index 8955fea269..ff9175ae97 100644 --- a/var/spack/repos/builtin/packages/r-markdown/package.py +++ b/var/spack/repos/builtin/packages/r-markdown/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-mass/package.py b/var/spack/repos/builtin/packages/r-mass/package.py index d4fd3a2c2f..9bcd7bf70b 100644 --- a/var/spack/repos/builtin/packages/r-mass/package.py +++ b/var/spack/repos/builtin/packages/r-mass/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-matr/package.py b/var/spack/repos/builtin/packages/r-matr/package.py index b7a146c324..646dba9e89 100644 --- a/var/spack/repos/builtin/packages/r-matr/package.py +++ b/var/spack/repos/builtin/packages/r-matr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-matrix/package.py b/var/spack/repos/builtin/packages/r-matrix/package.py index bd6b5dfd4a..533cece9ff 100644 --- a/var/spack/repos/builtin/packages/r-matrix/package.py +++ b/var/spack/repos/builtin/packages/r-matrix/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-matrixmodels/package.py b/var/spack/repos/builtin/packages/r-matrixmodels/package.py index 01830f4512..02fc848414 100644 --- a/var/spack/repos/builtin/packages/r-matrixmodels/package.py +++ b/var/spack/repos/builtin/packages/r-matrixmodels/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-matrixstats/package.py b/var/spack/repos/builtin/packages/r-matrixstats/package.py index c7fa047e7f..79001b6802 100644 --- a/var/spack/repos/builtin/packages/r-matrixstats/package.py +++ b/var/spack/repos/builtin/packages/r-matrixstats/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-mclust/package.py b/var/spack/repos/builtin/packages/r-mclust/package.py index 42a74a0a38..c198d9905c 100644 --- a/var/spack/repos/builtin/packages/r-mclust/package.py +++ b/var/spack/repos/builtin/packages/r-mclust/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-mcmcglmm/package.py b/var/spack/repos/builtin/packages/r-mcmcglmm/package.py index b50fa81767..edf11d4c55 100644 --- a/var/spack/repos/builtin/packages/r-mcmcglmm/package.py +++ b/var/spack/repos/builtin/packages/r-mcmcglmm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-mco/package.py b/var/spack/repos/builtin/packages/r-mco/package.py index d35103d9dc..eae3fe7a99 100644 --- a/var/spack/repos/builtin/packages/r-mco/package.py +++ b/var/spack/repos/builtin/packages/r-mco/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-mda/package.py b/var/spack/repos/builtin/packages/r-mda/package.py index 65762ad37b..f59f09844e 100644 --- a/var/spack/repos/builtin/packages/r-mda/package.py +++ b/var/spack/repos/builtin/packages/r-mda/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-memoise/package.py b/var/spack/repos/builtin/packages/r-memoise/package.py index b970c92e69..e8a8b32e1b 100644 --- a/var/spack/repos/builtin/packages/r-memoise/package.py +++ b/var/spack/repos/builtin/packages/r-memoise/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-mergemaid/package.py b/var/spack/repos/builtin/packages/r-mergemaid/package.py index 8a4dd4dcbf..ff4ae551f3 100644 --- a/var/spack/repos/builtin/packages/r-mergemaid/package.py +++ b/var/spack/repos/builtin/packages/r-mergemaid/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-methodss3/package.py b/var/spack/repos/builtin/packages/r-methodss3/package.py index 10c387b7ac..d5793a73a0 100644 --- a/var/spack/repos/builtin/packages/r-methodss3/package.py +++ b/var/spack/repos/builtin/packages/r-methodss3/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-mgcv/package.py b/var/spack/repos/builtin/packages/r-mgcv/package.py index 43327aae55..22296ac36d 100644 --- a/var/spack/repos/builtin/packages/r-mgcv/package.py +++ b/var/spack/repos/builtin/packages/r-mgcv/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-mgraster/package.py b/var/spack/repos/builtin/packages/r-mgraster/package.py index bca66dc250..f3e3978860 100644 --- a/var/spack/repos/builtin/packages/r-mgraster/package.py +++ b/var/spack/repos/builtin/packages/r-mgraster/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-mice/package.py b/var/spack/repos/builtin/packages/r-mice/package.py index 43bf35dbdd..e18a83c9a4 100644 --- a/var/spack/repos/builtin/packages/r-mice/package.py +++ b/var/spack/repos/builtin/packages/r-mice/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-mime/package.py b/var/spack/repos/builtin/packages/r-mime/package.py index 7f7ee713d2..4d0dd95015 100644 --- a/var/spack/repos/builtin/packages/r-mime/package.py +++ b/var/spack/repos/builtin/packages/r-mime/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-minfi/package.py b/var/spack/repos/builtin/packages/r-minfi/package.py index bb5d305752..06cfff4cef 100644 --- a/var/spack/repos/builtin/packages/r-minfi/package.py +++ b/var/spack/repos/builtin/packages/r-minfi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-minqa/package.py b/var/spack/repos/builtin/packages/r-minqa/package.py index 360c579670..4b52bef0aa 100644 --- a/var/spack/repos/builtin/packages/r-minqa/package.py +++ b/var/spack/repos/builtin/packages/r-minqa/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-misc3d/package.py b/var/spack/repos/builtin/packages/r-misc3d/package.py index 8041858ef4..838b8bf738 100644 --- a/var/spack/repos/builtin/packages/r-misc3d/package.py +++ b/var/spack/repos/builtin/packages/r-misc3d/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-mitml/package.py b/var/spack/repos/builtin/packages/r-mitml/package.py index 08d506e8ce..4a0f91d65c 100644 --- a/var/spack/repos/builtin/packages/r-mitml/package.py +++ b/var/spack/repos/builtin/packages/r-mitml/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-mixtools/package.py b/var/spack/repos/builtin/packages/r-mixtools/package.py index 309b13dd6f..3538113eb8 100644 --- a/var/spack/repos/builtin/packages/r-mixtools/package.py +++ b/var/spack/repos/builtin/packages/r-mixtools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-mlbench/package.py b/var/spack/repos/builtin/packages/r-mlbench/package.py index bedf7354c1..c2eec7e418 100644 --- a/var/spack/repos/builtin/packages/r-mlbench/package.py +++ b/var/spack/repos/builtin/packages/r-mlbench/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-mlinterfaces/package.py b/var/spack/repos/builtin/packages/r-mlinterfaces/package.py index 709a3754b7..79ea6ba809 100644 --- a/var/spack/repos/builtin/packages/r-mlinterfaces/package.py +++ b/var/spack/repos/builtin/packages/r-mlinterfaces/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-mlr/package.py b/var/spack/repos/builtin/packages/r-mlr/package.py index 029a5e07cd..120c7adaa9 100644 --- a/var/spack/repos/builtin/packages/r-mlr/package.py +++ b/var/spack/repos/builtin/packages/r-mlr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-mlrmbo/package.py b/var/spack/repos/builtin/packages/r-mlrmbo/package.py index 41cdb96ff9..3f789a869c 100644 --- a/var/spack/repos/builtin/packages/r-mlrmbo/package.py +++ b/var/spack/repos/builtin/packages/r-mlrmbo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-mmwrweek/package.py b/var/spack/repos/builtin/packages/r-mmwrweek/package.py index 4a5f3e7cdf..f62bd6275c 100644 --- a/var/spack/repos/builtin/packages/r-mmwrweek/package.py +++ b/var/spack/repos/builtin/packages/r-mmwrweek/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-mnormt/package.py b/var/spack/repos/builtin/packages/r-mnormt/package.py index 7c7fea4750..34c88cf85a 100644 --- a/var/spack/repos/builtin/packages/r-mnormt/package.py +++ b/var/spack/repos/builtin/packages/r-mnormt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-modelmetrics/package.py b/var/spack/repos/builtin/packages/r-modelmetrics/package.py index 41dbb4f635..fd4648abd9 100644 --- a/var/spack/repos/builtin/packages/r-modelmetrics/package.py +++ b/var/spack/repos/builtin/packages/r-modelmetrics/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-modelr/package.py b/var/spack/repos/builtin/packages/r-modelr/package.py index eb8a0d0a6c..2d9bf982ef 100644 --- a/var/spack/repos/builtin/packages/r-modelr/package.py +++ b/var/spack/repos/builtin/packages/r-modelr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-modeltools/package.py b/var/spack/repos/builtin/packages/r-modeltools/package.py index 931cf25714..5f8b660029 100644 --- a/var/spack/repos/builtin/packages/r-modeltools/package.py +++ b/var/spack/repos/builtin/packages/r-modeltools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-mpm/package.py b/var/spack/repos/builtin/packages/r-mpm/package.py index bc3e850806..7bf560cc8c 100644 --- a/var/spack/repos/builtin/packages/r-mpm/package.py +++ b/var/spack/repos/builtin/packages/r-mpm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-msnbase/package.py b/var/spack/repos/builtin/packages/r-msnbase/package.py index d59737a8a9..78f882ec53 100644 --- a/var/spack/repos/builtin/packages/r-msnbase/package.py +++ b/var/spack/repos/builtin/packages/r-msnbase/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-multcomp/package.py b/var/spack/repos/builtin/packages/r-multcomp/package.py index 116c69aded..d8eb6b6d5c 100644 --- a/var/spack/repos/builtin/packages/r-multcomp/package.py +++ b/var/spack/repos/builtin/packages/r-multcomp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-multicool/package.py b/var/spack/repos/builtin/packages/r-multicool/package.py index 4d112f45c6..3bb41ac560 100644 --- a/var/spack/repos/builtin/packages/r-multicool/package.py +++ b/var/spack/repos/builtin/packages/r-multicool/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-multtest/package.py b/var/spack/repos/builtin/packages/r-multtest/package.py index 89739c78b7..aa5e5a34a0 100644 --- a/var/spack/repos/builtin/packages/r-multtest/package.py +++ b/var/spack/repos/builtin/packages/r-multtest/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-munsell/package.py b/var/spack/repos/builtin/packages/r-munsell/package.py index 423c430511..353e9ecd2c 100644 --- a/var/spack/repos/builtin/packages/r-munsell/package.py +++ b/var/spack/repos/builtin/packages/r-munsell/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-mvtnorm/package.py b/var/spack/repos/builtin/packages/r-mvtnorm/package.py index ac49784055..e341a2e76e 100644 --- a/var/spack/repos/builtin/packages/r-mvtnorm/package.py +++ b/var/spack/repos/builtin/packages/r-mvtnorm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-mzid/package.py b/var/spack/repos/builtin/packages/r-mzid/package.py index 9abc4465c9..ea9778ffcb 100644 --- a/var/spack/repos/builtin/packages/r-mzid/package.py +++ b/var/spack/repos/builtin/packages/r-mzid/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-mzr/package.py b/var/spack/repos/builtin/packages/r-mzr/package.py index 18c65bb1e3..19b5080037 100644 --- a/var/spack/repos/builtin/packages/r-mzr/package.py +++ b/var/spack/repos/builtin/packages/r-mzr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-nanotime/package.py b/var/spack/repos/builtin/packages/r-nanotime/package.py index a5b6bfeaf0..07c3d8830a 100644 --- a/var/spack/repos/builtin/packages/r-nanotime/package.py +++ b/var/spack/repos/builtin/packages/r-nanotime/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-ncbit/package.py b/var/spack/repos/builtin/packages/r-ncbit/package.py index f1e90ac464..3d66e92009 100644 --- a/var/spack/repos/builtin/packages/r-ncbit/package.py +++ b/var/spack/repos/builtin/packages/r-ncbit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-ncdf4/package.py b/var/spack/repos/builtin/packages/r-ncdf4/package.py index fd85c91cd5..d38ba6d5b9 100644 --- a/var/spack/repos/builtin/packages/r-ncdf4/package.py +++ b/var/spack/repos/builtin/packages/r-ncdf4/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-network/package.py b/var/spack/repos/builtin/packages/r-network/package.py index 40d6492396..e586c6d030 100644 --- a/var/spack/repos/builtin/packages/r-network/package.py +++ b/var/spack/repos/builtin/packages/r-network/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-networkd3/package.py b/var/spack/repos/builtin/packages/r-networkd3/package.py index ad2f1e91ae..45eada135f 100644 --- a/var/spack/repos/builtin/packages/r-networkd3/package.py +++ b/var/spack/repos/builtin/packages/r-networkd3/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-nlme/package.py b/var/spack/repos/builtin/packages/r-nlme/package.py index 01d4cced45..fac6a7c7f6 100644 --- a/var/spack/repos/builtin/packages/r-nlme/package.py +++ b/var/spack/repos/builtin/packages/r-nlme/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-nloptr/package.py b/var/spack/repos/builtin/packages/r-nloptr/package.py index f1fd3eaa83..d77d18f17f 100644 --- a/var/spack/repos/builtin/packages/r-nloptr/package.py +++ b/var/spack/repos/builtin/packages/r-nloptr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-nmf/package.py b/var/spack/repos/builtin/packages/r-nmf/package.py index b17152e3e0..8be0914277 100644 --- a/var/spack/repos/builtin/packages/r-nmf/package.py +++ b/var/spack/repos/builtin/packages/r-nmf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-nnet/package.py b/var/spack/repos/builtin/packages/r-nnet/package.py index 44312314eb..1326221ceb 100644 --- a/var/spack/repos/builtin/packages/r-nnet/package.py +++ b/var/spack/repos/builtin/packages/r-nnet/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-nnls/package.py b/var/spack/repos/builtin/packages/r-nnls/package.py index 691dff4267..3da3e20b63 100644 --- a/var/spack/repos/builtin/packages/r-nnls/package.py +++ b/var/spack/repos/builtin/packages/r-nnls/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-nor1mix/package.py b/var/spack/repos/builtin/packages/r-nor1mix/package.py index 005cde22fe..9e4f27007b 100644 --- a/var/spack/repos/builtin/packages/r-nor1mix/package.py +++ b/var/spack/repos/builtin/packages/r-nor1mix/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-np/package.py b/var/spack/repos/builtin/packages/r-np/package.py index b3cbb0e5a1..1a32b6f71d 100644 --- a/var/spack/repos/builtin/packages/r-np/package.py +++ b/var/spack/repos/builtin/packages/r-np/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-numderiv/package.py b/var/spack/repos/builtin/packages/r-numderiv/package.py index a5160ef864..8e145d572f 100644 --- a/var/spack/repos/builtin/packages/r-numderiv/package.py +++ b/var/spack/repos/builtin/packages/r-numderiv/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-oligoclasses/package.py b/var/spack/repos/builtin/packages/r-oligoclasses/package.py index aee2afeb96..86d72876fe 100644 --- a/var/spack/repos/builtin/packages/r-oligoclasses/package.py +++ b/var/spack/repos/builtin/packages/r-oligoclasses/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-oo/package.py b/var/spack/repos/builtin/packages/r-oo/package.py index 8fe36a7422..6cba9eb491 100644 --- a/var/spack/repos/builtin/packages/r-oo/package.py +++ b/var/spack/repos/builtin/packages/r-oo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-openssl/package.py b/var/spack/repos/builtin/packages/r-openssl/package.py index edcff2f362..4b228646ac 100644 --- a/var/spack/repos/builtin/packages/r-openssl/package.py +++ b/var/spack/repos/builtin/packages/r-openssl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-org-hs-eg-db/package.py b/var/spack/repos/builtin/packages/r-org-hs-eg-db/package.py index a781deb8d0..893c6618f7 100644 --- a/var/spack/repos/builtin/packages/r-org-hs-eg-db/package.py +++ b/var/spack/repos/builtin/packages/r-org-hs-eg-db/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-organismdbi/package.py b/var/spack/repos/builtin/packages/r-organismdbi/package.py index 35a83281b2..e9cd3d499b 100644 --- a/var/spack/repos/builtin/packages/r-organismdbi/package.py +++ b/var/spack/repos/builtin/packages/r-organismdbi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-packrat/package.py b/var/spack/repos/builtin/packages/r-packrat/package.py index f7ea56475c..7a8b002786 100644 --- a/var/spack/repos/builtin/packages/r-packrat/package.py +++ b/var/spack/repos/builtin/packages/r-packrat/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-pacman/package.py b/var/spack/repos/builtin/packages/r-pacman/package.py index 09dba376a7..a419b520da 100644 --- a/var/spack/repos/builtin/packages/r-pacman/package.py +++ b/var/spack/repos/builtin/packages/r-pacman/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-pamr/package.py b/var/spack/repos/builtin/packages/r-pamr/package.py index d14f717869..3be3f2e4c3 100644 --- a/var/spack/repos/builtin/packages/r-pamr/package.py +++ b/var/spack/repos/builtin/packages/r-pamr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-pan/package.py b/var/spack/repos/builtin/packages/r-pan/package.py index 00db43e28d..db9bc7988d 100644 --- a/var/spack/repos/builtin/packages/r-pan/package.py +++ b/var/spack/repos/builtin/packages/r-pan/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-parallelmap/package.py b/var/spack/repos/builtin/packages/r-parallelmap/package.py index 92e1dd7d97..cb7c10a028 100644 --- a/var/spack/repos/builtin/packages/r-parallelmap/package.py +++ b/var/spack/repos/builtin/packages/r-parallelmap/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-paramhelpers/package.py b/var/spack/repos/builtin/packages/r-paramhelpers/package.py index af48d808ef..2fabb7954a 100644 --- a/var/spack/repos/builtin/packages/r-paramhelpers/package.py +++ b/var/spack/repos/builtin/packages/r-paramhelpers/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-party/package.py b/var/spack/repos/builtin/packages/r-party/package.py index 60ab4bdf80..f0d5065d68 100644 --- a/var/spack/repos/builtin/packages/r-party/package.py +++ b/var/spack/repos/builtin/packages/r-party/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-partykit/package.py b/var/spack/repos/builtin/packages/r-partykit/package.py index 326edafa70..680891ae0d 100644 --- a/var/spack/repos/builtin/packages/r-partykit/package.py +++ b/var/spack/repos/builtin/packages/r-partykit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-pathview/package.py b/var/spack/repos/builtin/packages/r-pathview/package.py index d8539ccf7e..bedd4571f7 100644 --- a/var/spack/repos/builtin/packages/r-pathview/package.py +++ b/var/spack/repos/builtin/packages/r-pathview/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-pbapply/package.py b/var/spack/repos/builtin/packages/r-pbapply/package.py index f3e71a13be..14d5d9a178 100644 --- a/var/spack/repos/builtin/packages/r-pbapply/package.py +++ b/var/spack/repos/builtin/packages/r-pbapply/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-pbdzmq/package.py b/var/spack/repos/builtin/packages/r-pbdzmq/package.py index 1cca47f6c1..5ff32c0487 100644 --- a/var/spack/repos/builtin/packages/r-pbdzmq/package.py +++ b/var/spack/repos/builtin/packages/r-pbdzmq/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-pbkrtest/package.py b/var/spack/repos/builtin/packages/r-pbkrtest/package.py index 8a4af9cd80..1bb9f75f0b 100644 --- a/var/spack/repos/builtin/packages/r-pbkrtest/package.py +++ b/var/spack/repos/builtin/packages/r-pbkrtest/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-pcamethods/package.py b/var/spack/repos/builtin/packages/r-pcamethods/package.py index 7578de6421..a0e9721e9d 100644 --- a/var/spack/repos/builtin/packages/r-pcamethods/package.py +++ b/var/spack/repos/builtin/packages/r-pcamethods/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-pcapp/package.py b/var/spack/repos/builtin/packages/r-pcapp/package.py index 0ad4a5f94b..3fe6f2d745 100644 --- a/var/spack/repos/builtin/packages/r-pcapp/package.py +++ b/var/spack/repos/builtin/packages/r-pcapp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-permute/package.py b/var/spack/repos/builtin/packages/r-permute/package.py index 3920ec25f1..48f4197e5f 100644 --- a/var/spack/repos/builtin/packages/r-permute/package.py +++ b/var/spack/repos/builtin/packages/r-permute/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-pfam-db/package.py b/var/spack/repos/builtin/packages/r-pfam-db/package.py index 2a3e9e43f6..c29bdad99c 100644 --- a/var/spack/repos/builtin/packages/r-pfam-db/package.py +++ b/var/spack/repos/builtin/packages/r-pfam-db/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-phangorn/package.py b/var/spack/repos/builtin/packages/r-phangorn/package.py index b43c9ce825..c20fd50fe4 100644 --- a/var/spack/repos/builtin/packages/r-phangorn/package.py +++ b/var/spack/repos/builtin/packages/r-phangorn/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-phantompeakqualtools/package.py b/var/spack/repos/builtin/packages/r-phantompeakqualtools/package.py index f71129c578..a40df310b9 100644 --- a/var/spack/repos/builtin/packages/r-phantompeakqualtools/package.py +++ b/var/spack/repos/builtin/packages/r-phantompeakqualtools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-phyloseq/package.py b/var/spack/repos/builtin/packages/r-phyloseq/package.py index b71670dc87..c2323c4209 100644 --- a/var/spack/repos/builtin/packages/r-phyloseq/package.py +++ b/var/spack/repos/builtin/packages/r-phyloseq/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-picante/package.py b/var/spack/repos/builtin/packages/r-picante/package.py index d213bfea8e..f967e5b19b 100644 --- a/var/spack/repos/builtin/packages/r-picante/package.py +++ b/var/spack/repos/builtin/packages/r-picante/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-pkgconfig/package.py b/var/spack/repos/builtin/packages/r-pkgconfig/package.py index 5af625de8d..b35d0e1383 100644 --- a/var/spack/repos/builtin/packages/r-pkgconfig/package.py +++ b/var/spack/repos/builtin/packages/r-pkgconfig/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-pkgmaker/package.py b/var/spack/repos/builtin/packages/r-pkgmaker/package.py index c66afec4be..8b0b1b7e1c 100644 --- a/var/spack/repos/builtin/packages/r-pkgmaker/package.py +++ b/var/spack/repos/builtin/packages/r-pkgmaker/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-plogr/package.py b/var/spack/repos/builtin/packages/r-plogr/package.py index 54ab9e00e1..e959c294a2 100644 --- a/var/spack/repos/builtin/packages/r-plogr/package.py +++ b/var/spack/repos/builtin/packages/r-plogr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-plot3d/package.py b/var/spack/repos/builtin/packages/r-plot3d/package.py index cae7579574..74883c1f2f 100644 --- a/var/spack/repos/builtin/packages/r-plot3d/package.py +++ b/var/spack/repos/builtin/packages/r-plot3d/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-plotly/package.py b/var/spack/repos/builtin/packages/r-plotly/package.py index b6eac472e9..414155d75b 100644 --- a/var/spack/repos/builtin/packages/r-plotly/package.py +++ b/var/spack/repos/builtin/packages/r-plotly/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-plotrix/package.py b/var/spack/repos/builtin/packages/r-plotrix/package.py index dbf19cea0e..0ab72642af 100644 --- a/var/spack/repos/builtin/packages/r-plotrix/package.py +++ b/var/spack/repos/builtin/packages/r-plotrix/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-pls/package.py b/var/spack/repos/builtin/packages/r-pls/package.py index 05299f98b3..51c83e32a3 100644 --- a/var/spack/repos/builtin/packages/r-pls/package.py +++ b/var/spack/repos/builtin/packages/r-pls/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-plyr/package.py b/var/spack/repos/builtin/packages/r-plyr/package.py index 8fc68b142f..bd2dc01429 100644 --- a/var/spack/repos/builtin/packages/r-plyr/package.py +++ b/var/spack/repos/builtin/packages/r-plyr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-pmcmr/package.py b/var/spack/repos/builtin/packages/r-pmcmr/package.py index 207361c195..5a2c5593ce 100644 --- a/var/spack/repos/builtin/packages/r-pmcmr/package.py +++ b/var/spack/repos/builtin/packages/r-pmcmr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-png/package.py b/var/spack/repos/builtin/packages/r-png/package.py index 13bccf037b..d0cc9c24db 100644 --- a/var/spack/repos/builtin/packages/r-png/package.py +++ b/var/spack/repos/builtin/packages/r-png/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-powerlaw/package.py b/var/spack/repos/builtin/packages/r-powerlaw/package.py index 7c3c5fac76..9666f8fd09 100644 --- a/var/spack/repos/builtin/packages/r-powerlaw/package.py +++ b/var/spack/repos/builtin/packages/r-powerlaw/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-prabclus/package.py b/var/spack/repos/builtin/packages/r-prabclus/package.py index a32cd4fb83..688cd683cd 100644 --- a/var/spack/repos/builtin/packages/r-prabclus/package.py +++ b/var/spack/repos/builtin/packages/r-prabclus/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-praise/package.py b/var/spack/repos/builtin/packages/r-praise/package.py index 5b9eaa2926..06ae033e60 100644 --- a/var/spack/repos/builtin/packages/r-praise/package.py +++ b/var/spack/repos/builtin/packages/r-praise/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-preprocesscore/package.py b/var/spack/repos/builtin/packages/r-preprocesscore/package.py index 3200115cc6..d07e164a6d 100644 --- a/var/spack/repos/builtin/packages/r-preprocesscore/package.py +++ b/var/spack/repos/builtin/packages/r-preprocesscore/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-prettyunits/package.py b/var/spack/repos/builtin/packages/r-prettyunits/package.py index c18e83eddf..fc5de8b0e1 100644 --- a/var/spack/repos/builtin/packages/r-prettyunits/package.py +++ b/var/spack/repos/builtin/packages/r-prettyunits/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-processx/package.py b/var/spack/repos/builtin/packages/r-processx/package.py index 442a846e12..fec9bba0b1 100644 --- a/var/spack/repos/builtin/packages/r-processx/package.py +++ b/var/spack/repos/builtin/packages/r-processx/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-prodlim/package.py b/var/spack/repos/builtin/packages/r-prodlim/package.py index 89727f9849..8cb3523f6d 100644 --- a/var/spack/repos/builtin/packages/r-prodlim/package.py +++ b/var/spack/repos/builtin/packages/r-prodlim/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-progress/package.py b/var/spack/repos/builtin/packages/r-progress/package.py index dd155d5c85..756b8cecff 100644 --- a/var/spack/repos/builtin/packages/r-progress/package.py +++ b/var/spack/repos/builtin/packages/r-progress/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-protgenerics/package.py b/var/spack/repos/builtin/packages/r-protgenerics/package.py index c6f0c92322..2b14314b29 100644 --- a/var/spack/repos/builtin/packages/r-protgenerics/package.py +++ b/var/spack/repos/builtin/packages/r-protgenerics/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-proto/package.py b/var/spack/repos/builtin/packages/r-proto/package.py index e0b389f35f..5fe325b834 100644 --- a/var/spack/repos/builtin/packages/r-proto/package.py +++ b/var/spack/repos/builtin/packages/r-proto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-proxy/package.py b/var/spack/repos/builtin/packages/r-proxy/package.py index f60e602c5c..963568491c 100644 --- a/var/spack/repos/builtin/packages/r-proxy/package.py +++ b/var/spack/repos/builtin/packages/r-proxy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-pryr/package.py b/var/spack/repos/builtin/packages/r-pryr/package.py index 2c16ede1dc..89142810ba 100644 --- a/var/spack/repos/builtin/packages/r-pryr/package.py +++ b/var/spack/repos/builtin/packages/r-pryr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-ps/package.py b/var/spack/repos/builtin/packages/r-ps/package.py index 045b6b8ce7..0973376a04 100644 --- a/var/spack/repos/builtin/packages/r-ps/package.py +++ b/var/spack/repos/builtin/packages/r-ps/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-psych/package.py b/var/spack/repos/builtin/packages/r-psych/package.py index dc14656bd0..d000222e7a 100644 --- a/var/spack/repos/builtin/packages/r-psych/package.py +++ b/var/spack/repos/builtin/packages/r-psych/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-ptw/package.py b/var/spack/repos/builtin/packages/r-ptw/package.py index eae09c4840..dcb5fdedc0 100644 --- a/var/spack/repos/builtin/packages/r-ptw/package.py +++ b/var/spack/repos/builtin/packages/r-ptw/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-purrr/package.py b/var/spack/repos/builtin/packages/r-purrr/package.py index 06d1e69773..73a422c0cb 100644 --- a/var/spack/repos/builtin/packages/r-purrr/package.py +++ b/var/spack/repos/builtin/packages/r-purrr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-quadprog/package.py b/var/spack/repos/builtin/packages/r-quadprog/package.py index 5442156396..ad68a31a0d 100644 --- a/var/spack/repos/builtin/packages/r-quadprog/package.py +++ b/var/spack/repos/builtin/packages/r-quadprog/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-quantmod/package.py b/var/spack/repos/builtin/packages/r-quantmod/package.py index 026eaa40d0..b9f0e063e8 100644 --- a/var/spack/repos/builtin/packages/r-quantmod/package.py +++ b/var/spack/repos/builtin/packages/r-quantmod/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-quantreg/package.py b/var/spack/repos/builtin/packages/r-quantreg/package.py index bd81e8967c..e882ece170 100644 --- a/var/spack/repos/builtin/packages/r-quantreg/package.py +++ b/var/spack/repos/builtin/packages/r-quantreg/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-quantro/package.py b/var/spack/repos/builtin/packages/r-quantro/package.py index d8cbf0e8b2..796685c40a 100644 --- a/var/spack/repos/builtin/packages/r-quantro/package.py +++ b/var/spack/repos/builtin/packages/r-quantro/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-qvalue/package.py b/var/spack/repos/builtin/packages/r-qvalue/package.py index f718f3a42a..5deb42a748 100644 --- a/var/spack/repos/builtin/packages/r-qvalue/package.py +++ b/var/spack/repos/builtin/packages/r-qvalue/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-r6/package.py b/var/spack/repos/builtin/packages/r-r6/package.py index 56e9735713..fad58e9517 100644 --- a/var/spack/repos/builtin/packages/r-r6/package.py +++ b/var/spack/repos/builtin/packages/r-r6/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-randomforest/package.py b/var/spack/repos/builtin/packages/r-randomforest/package.py index 527274251c..1125e26d22 100644 --- a/var/spack/repos/builtin/packages/r-randomforest/package.py +++ b/var/spack/repos/builtin/packages/r-randomforest/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-ranger/package.py b/var/spack/repos/builtin/packages/r-ranger/package.py index 686ff137cb..0693fc0023 100644 --- a/var/spack/repos/builtin/packages/r-ranger/package.py +++ b/var/spack/repos/builtin/packages/r-ranger/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rappdirs/package.py b/var/spack/repos/builtin/packages/r-rappdirs/package.py index e8de39f448..b39a699690 100644 --- a/var/spack/repos/builtin/packages/r-rappdirs/package.py +++ b/var/spack/repos/builtin/packages/r-rappdirs/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-raster/package.py b/var/spack/repos/builtin/packages/r-raster/package.py index 71d1e69cf1..0bcb424ea6 100644 --- a/var/spack/repos/builtin/packages/r-raster/package.py +++ b/var/spack/repos/builtin/packages/r-raster/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rbgl/package.py b/var/spack/repos/builtin/packages/r-rbgl/package.py index c6c48d6973..87216adc55 100644 --- a/var/spack/repos/builtin/packages/r-rbgl/package.py +++ b/var/spack/repos/builtin/packages/r-rbgl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rbokeh/package.py b/var/spack/repos/builtin/packages/r-rbokeh/package.py index 90417e8835..22c421b16b 100644 --- a/var/spack/repos/builtin/packages/r-rbokeh/package.py +++ b/var/spack/repos/builtin/packages/r-rbokeh/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rcolorbrewer/package.py b/var/spack/repos/builtin/packages/r-rcolorbrewer/package.py index c94b052126..7115d8b2b4 100644 --- a/var/spack/repos/builtin/packages/r-rcolorbrewer/package.py +++ b/var/spack/repos/builtin/packages/r-rcolorbrewer/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rcpp/package.py b/var/spack/repos/builtin/packages/r-rcpp/package.py index 4edc6e8709..933cd294fb 100644 --- a/var/spack/repos/builtin/packages/r-rcpp/package.py +++ b/var/spack/repos/builtin/packages/r-rcpp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rcpparmadillo/package.py b/var/spack/repos/builtin/packages/r-rcpparmadillo/package.py index eae404490a..250e12ec2f 100644 --- a/var/spack/repos/builtin/packages/r-rcpparmadillo/package.py +++ b/var/spack/repos/builtin/packages/r-rcpparmadillo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rcppblaze/package.py b/var/spack/repos/builtin/packages/r-rcppblaze/package.py index 8c57651b5f..dfdcefa2b1 100644 --- a/var/spack/repos/builtin/packages/r-rcppblaze/package.py +++ b/var/spack/repos/builtin/packages/r-rcppblaze/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rcppcctz/package.py b/var/spack/repos/builtin/packages/r-rcppcctz/package.py index e8bde9f76b..5e454dd6dc 100644 --- a/var/spack/repos/builtin/packages/r-rcppcctz/package.py +++ b/var/spack/repos/builtin/packages/r-rcppcctz/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rcppcnpy/package.py b/var/spack/repos/builtin/packages/r-rcppcnpy/package.py index 8bdb452242..ace5876f48 100644 --- a/var/spack/repos/builtin/packages/r-rcppcnpy/package.py +++ b/var/spack/repos/builtin/packages/r-rcppcnpy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rcppeigen/package.py b/var/spack/repos/builtin/packages/r-rcppeigen/package.py index 69e2a86d48..14d4e250ef 100644 --- a/var/spack/repos/builtin/packages/r-rcppeigen/package.py +++ b/var/spack/repos/builtin/packages/r-rcppeigen/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rcppprogress/package.py b/var/spack/repos/builtin/packages/r-rcppprogress/package.py index 53d3c6d084..d56b33f757 100644 --- a/var/spack/repos/builtin/packages/r-rcppprogress/package.py +++ b/var/spack/repos/builtin/packages/r-rcppprogress/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rcurl/package.py b/var/spack/repos/builtin/packages/r-rcurl/package.py index e7deb60f6a..031c69e842 100644 --- a/var/spack/repos/builtin/packages/r-rcurl/package.py +++ b/var/spack/repos/builtin/packages/r-rcurl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rda/package.py b/var/spack/repos/builtin/packages/r-rda/package.py index b0f46b3e5b..e8d455050a 100644 --- a/var/spack/repos/builtin/packages/r-rda/package.py +++ b/var/spack/repos/builtin/packages/r-rda/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-readr/package.py b/var/spack/repos/builtin/packages/r-readr/package.py index 97f0df97c9..bb9b862ac9 100644 --- a/var/spack/repos/builtin/packages/r-readr/package.py +++ b/var/spack/repos/builtin/packages/r-readr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-readxl/package.py b/var/spack/repos/builtin/packages/r-readxl/package.py index b1b5b51578..3d19f6808e 100644 --- a/var/spack/repos/builtin/packages/r-readxl/package.py +++ b/var/spack/repos/builtin/packages/r-readxl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-registry/package.py b/var/spack/repos/builtin/packages/r-registry/package.py index 54ae92a648..f83c78f0e0 100644 --- a/var/spack/repos/builtin/packages/r-registry/package.py +++ b/var/spack/repos/builtin/packages/r-registry/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rematch/package.py b/var/spack/repos/builtin/packages/r-rematch/package.py index 3cb7c6b5eb..b4232fa1da 100644 --- a/var/spack/repos/builtin/packages/r-rematch/package.py +++ b/var/spack/repos/builtin/packages/r-rematch/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-reordercluster/package.py b/var/spack/repos/builtin/packages/r-reordercluster/package.py index 9be4334ead..cc4af49952 100644 --- a/var/spack/repos/builtin/packages/r-reordercluster/package.py +++ b/var/spack/repos/builtin/packages/r-reordercluster/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-reportingtools/package.py b/var/spack/repos/builtin/packages/r-reportingtools/package.py index e5b7962e5b..e093b019be 100644 --- a/var/spack/repos/builtin/packages/r-reportingtools/package.py +++ b/var/spack/repos/builtin/packages/r-reportingtools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-repr/package.py b/var/spack/repos/builtin/packages/r-repr/package.py index 69c378d66a..0396cd79bb 100644 --- a/var/spack/repos/builtin/packages/r-repr/package.py +++ b/var/spack/repos/builtin/packages/r-repr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-reprex/package.py b/var/spack/repos/builtin/packages/r-reprex/package.py index 7aeb1938e5..e87e70367b 100644 --- a/var/spack/repos/builtin/packages/r-reprex/package.py +++ b/var/spack/repos/builtin/packages/r-reprex/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-reshape/package.py b/var/spack/repos/builtin/packages/r-reshape/package.py index 1e3dabf10a..8364397fa2 100644 --- a/var/spack/repos/builtin/packages/r-reshape/package.py +++ b/var/spack/repos/builtin/packages/r-reshape/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-reshape2/package.py b/var/spack/repos/builtin/packages/r-reshape2/package.py index 07f0538da6..ac424cd4f3 100644 --- a/var/spack/repos/builtin/packages/r-reshape2/package.py +++ b/var/spack/repos/builtin/packages/r-reshape2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rex/package.py b/var/spack/repos/builtin/packages/r-rex/package.py index be2435c74c..d8bb5841c2 100644 --- a/var/spack/repos/builtin/packages/r-rex/package.py +++ b/var/spack/repos/builtin/packages/r-rex/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rgdal/package.py b/var/spack/repos/builtin/packages/r-rgdal/package.py index 648e509580..b2fbfee9dc 100644 --- a/var/spack/repos/builtin/packages/r-rgdal/package.py +++ b/var/spack/repos/builtin/packages/r-rgdal/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rgenoud/package.py b/var/spack/repos/builtin/packages/r-rgenoud/package.py index 03a5554ce6..c2d7c517d4 100644 --- a/var/spack/repos/builtin/packages/r-rgenoud/package.py +++ b/var/spack/repos/builtin/packages/r-rgenoud/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rgeos/package.py b/var/spack/repos/builtin/packages/r-rgeos/package.py index a2a667d33b..2f55d523f6 100644 --- a/var/spack/repos/builtin/packages/r-rgeos/package.py +++ b/var/spack/repos/builtin/packages/r-rgeos/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rgl/package.py b/var/spack/repos/builtin/packages/r-rgl/package.py index a68dca84a9..261fbffa98 100644 --- a/var/spack/repos/builtin/packages/r-rgl/package.py +++ b/var/spack/repos/builtin/packages/r-rgl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rgooglemaps/package.py b/var/spack/repos/builtin/packages/r-rgooglemaps/package.py index be27501def..b246f8f63f 100644 --- a/var/spack/repos/builtin/packages/r-rgooglemaps/package.py +++ b/var/spack/repos/builtin/packages/r-rgooglemaps/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rgraphviz/package.py b/var/spack/repos/builtin/packages/r-rgraphviz/package.py index 1e9dd09edb..1f341b24b9 100644 --- a/var/spack/repos/builtin/packages/r-rgraphviz/package.py +++ b/var/spack/repos/builtin/packages/r-rgraphviz/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rhdf5/package.py b/var/spack/repos/builtin/packages/r-rhdf5/package.py index 1fac7872d8..7c4a3a9987 100644 --- a/var/spack/repos/builtin/packages/r-rhdf5/package.py +++ b/var/spack/repos/builtin/packages/r-rhdf5/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rhtslib/package.py b/var/spack/repos/builtin/packages/r-rhtslib/package.py index c6568fca67..e87164b5aa 100644 --- a/var/spack/repos/builtin/packages/r-rhtslib/package.py +++ b/var/spack/repos/builtin/packages/r-rhtslib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rinside/package.py b/var/spack/repos/builtin/packages/r-rinside/package.py index deff9d8144..bc7d48745a 100644 --- a/var/spack/repos/builtin/packages/r-rinside/package.py +++ b/var/spack/repos/builtin/packages/r-rinside/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rjags/package.py b/var/spack/repos/builtin/packages/r-rjags/package.py index de2b3b6b24..d0061d1a58 100644 --- a/var/spack/repos/builtin/packages/r-rjags/package.py +++ b/var/spack/repos/builtin/packages/r-rjags/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rjava/package.py b/var/spack/repos/builtin/packages/r-rjava/package.py index 9bcc16f3da..fc8c3850aa 100644 --- a/var/spack/repos/builtin/packages/r-rjava/package.py +++ b/var/spack/repos/builtin/packages/r-rjava/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rjson/package.py b/var/spack/repos/builtin/packages/r-rjson/package.py index fa45822603..250c5171a8 100644 --- a/var/spack/repos/builtin/packages/r-rjson/package.py +++ b/var/spack/repos/builtin/packages/r-rjson/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rjsonio/package.py b/var/spack/repos/builtin/packages/r-rjsonio/package.py index d91ccf2415..a8134aa6d6 100644 --- a/var/spack/repos/builtin/packages/r-rjsonio/package.py +++ b/var/spack/repos/builtin/packages/r-rjsonio/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rlang/package.py b/var/spack/repos/builtin/packages/r-rlang/package.py index b04c49a310..cd179fcf57 100644 --- a/var/spack/repos/builtin/packages/r-rlang/package.py +++ b/var/spack/repos/builtin/packages/r-rlang/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rmarkdown/package.py b/var/spack/repos/builtin/packages/r-rmarkdown/package.py index a308ab264f..13e5651dbc 100644 --- a/var/spack/repos/builtin/packages/r-rmarkdown/package.py +++ b/var/spack/repos/builtin/packages/r-rmarkdown/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rminer/package.py b/var/spack/repos/builtin/packages/r-rminer/package.py index 2a480ba384..758ac03fbe 100644 --- a/var/spack/repos/builtin/packages/r-rminer/package.py +++ b/var/spack/repos/builtin/packages/r-rminer/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rmpfr/package.py b/var/spack/repos/builtin/packages/r-rmpfr/package.py index 3de225cb11..eb6eb23e18 100644 --- a/var/spack/repos/builtin/packages/r-rmpfr/package.py +++ b/var/spack/repos/builtin/packages/r-rmpfr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rmpi/package.py b/var/spack/repos/builtin/packages/r-rmpi/package.py index 3e2f499516..c81e101f91 100644 --- a/var/spack/repos/builtin/packages/r-rmpi/package.py +++ b/var/spack/repos/builtin/packages/r-rmpi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rmysql/package.py b/var/spack/repos/builtin/packages/r-rmysql/package.py index b75cf81bc0..dc14ddde16 100644 --- a/var/spack/repos/builtin/packages/r-rmysql/package.py +++ b/var/spack/repos/builtin/packages/r-rmysql/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rngtools/package.py b/var/spack/repos/builtin/packages/r-rngtools/package.py index 3e637f327c..6112485e4e 100644 --- a/var/spack/repos/builtin/packages/r-rngtools/package.py +++ b/var/spack/repos/builtin/packages/r-rngtools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-robustbase/package.py b/var/spack/repos/builtin/packages/r-robustbase/package.py index e8ba4e5501..719a0045c1 100644 --- a/var/spack/repos/builtin/packages/r-robustbase/package.py +++ b/var/spack/repos/builtin/packages/r-robustbase/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rocr/package.py b/var/spack/repos/builtin/packages/r-rocr/package.py index b70e48dfc0..1f2ca35c44 100644 --- a/var/spack/repos/builtin/packages/r-rocr/package.py +++ b/var/spack/repos/builtin/packages/r-rocr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rodbc/package.py b/var/spack/repos/builtin/packages/r-rodbc/package.py index a3321ccc5b..4f70634b62 100644 --- a/var/spack/repos/builtin/packages/r-rodbc/package.py +++ b/var/spack/repos/builtin/packages/r-rodbc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rots/package.py b/var/spack/repos/builtin/packages/r-rots/package.py index d61efcf9c7..3c19b4d325 100644 --- a/var/spack/repos/builtin/packages/r-rots/package.py +++ b/var/spack/repos/builtin/packages/r-rots/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-roxygen2/package.py b/var/spack/repos/builtin/packages/r-roxygen2/package.py index ab88940199..60fd47687d 100644 --- a/var/spack/repos/builtin/packages/r-roxygen2/package.py +++ b/var/spack/repos/builtin/packages/r-roxygen2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rpart-plot/package.py b/var/spack/repos/builtin/packages/r-rpart-plot/package.py index 93bc34241c..b531df7e3d 100644 --- a/var/spack/repos/builtin/packages/r-rpart-plot/package.py +++ b/var/spack/repos/builtin/packages/r-rpart-plot/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rpart/package.py b/var/spack/repos/builtin/packages/r-rpart/package.py index 22186ed510..2c2f926d55 100644 --- a/var/spack/repos/builtin/packages/r-rpart/package.py +++ b/var/spack/repos/builtin/packages/r-rpart/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rpostgresql/package.py b/var/spack/repos/builtin/packages/r-rpostgresql/package.py index 0c71fb2a6a..9061ba3c1d 100644 --- a/var/spack/repos/builtin/packages/r-rpostgresql/package.py +++ b/var/spack/repos/builtin/packages/r-rpostgresql/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rprojroot/package.py b/var/spack/repos/builtin/packages/r-rprojroot/package.py index ae3014ddbb..617646350c 100644 --- a/var/spack/repos/builtin/packages/r-rprojroot/package.py +++ b/var/spack/repos/builtin/packages/r-rprojroot/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rsamtools/package.py b/var/spack/repos/builtin/packages/r-rsamtools/package.py index aa1ed4b00b..d8062cc89b 100644 --- a/var/spack/repos/builtin/packages/r-rsamtools/package.py +++ b/var/spack/repos/builtin/packages/r-rsamtools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rsnns/package.py b/var/spack/repos/builtin/packages/r-rsnns/package.py index 7062e43242..8de7a9b7a1 100644 --- a/var/spack/repos/builtin/packages/r-rsnns/package.py +++ b/var/spack/repos/builtin/packages/r-rsnns/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rsolnp/package.py b/var/spack/repos/builtin/packages/r-rsolnp/package.py index 0fa1caa755..db4ab24959 100644 --- a/var/spack/repos/builtin/packages/r-rsolnp/package.py +++ b/var/spack/repos/builtin/packages/r-rsolnp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rsqlite/package.py b/var/spack/repos/builtin/packages/r-rsqlite/package.py index 91ba461a51..61ba90e83c 100644 --- a/var/spack/repos/builtin/packages/r-rsqlite/package.py +++ b/var/spack/repos/builtin/packages/r-rsqlite/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rstan/package.py b/var/spack/repos/builtin/packages/r-rstan/package.py index 875fa1f203..30b4166091 100644 --- a/var/spack/repos/builtin/packages/r-rstan/package.py +++ b/var/spack/repos/builtin/packages/r-rstan/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rstudioapi/package.py b/var/spack/repos/builtin/packages/r-rstudioapi/package.py index 37558bbe96..5b51a050d8 100644 --- a/var/spack/repos/builtin/packages/r-rstudioapi/package.py +++ b/var/spack/repos/builtin/packages/r-rstudioapi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rtracklayer/package.py b/var/spack/repos/builtin/packages/r-rtracklayer/package.py index eacb7ff1e3..69a2d37c43 100644 --- a/var/spack/repos/builtin/packages/r-rtracklayer/package.py +++ b/var/spack/repos/builtin/packages/r-rtracklayer/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rtsne/package.py b/var/spack/repos/builtin/packages/r-rtsne/package.py index 1c1014474a..2ec641f5eb 100644 --- a/var/spack/repos/builtin/packages/r-rtsne/package.py +++ b/var/spack/repos/builtin/packages/r-rtsne/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rvcheck/package.py b/var/spack/repos/builtin/packages/r-rvcheck/package.py index 273fb3e4ee..25ba893d4f 100644 --- a/var/spack/repos/builtin/packages/r-rvcheck/package.py +++ b/var/spack/repos/builtin/packages/r-rvcheck/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rvest/package.py b/var/spack/repos/builtin/packages/r-rvest/package.py index 5865b622f6..837dd81a05 100644 --- a/var/spack/repos/builtin/packages/r-rvest/package.py +++ b/var/spack/repos/builtin/packages/r-rvest/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-rzmq/package.py b/var/spack/repos/builtin/packages/r-rzmq/package.py index ea153d920c..77f1420d04 100644 --- a/var/spack/repos/builtin/packages/r-rzmq/package.py +++ b/var/spack/repos/builtin/packages/r-rzmq/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-s4vectors/package.py b/var/spack/repos/builtin/packages/r-s4vectors/package.py index cf3d39fde4..71eb0a588b 100644 --- a/var/spack/repos/builtin/packages/r-s4vectors/package.py +++ b/var/spack/repos/builtin/packages/r-s4vectors/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-samr/package.py b/var/spack/repos/builtin/packages/r-samr/package.py index a3069a6202..f24a731bfc 100644 --- a/var/spack/repos/builtin/packages/r-samr/package.py +++ b/var/spack/repos/builtin/packages/r-samr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-sandwich/package.py b/var/spack/repos/builtin/packages/r-sandwich/package.py index 8a84e2dea8..5be31684c1 100644 --- a/var/spack/repos/builtin/packages/r-sandwich/package.py +++ b/var/spack/repos/builtin/packages/r-sandwich/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-scales/package.py b/var/spack/repos/builtin/packages/r-scales/package.py index 6d359d47db..eb1d75e7f4 100644 --- a/var/spack/repos/builtin/packages/r-scales/package.py +++ b/var/spack/repos/builtin/packages/r-scales/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-scatterplot3d/package.py b/var/spack/repos/builtin/packages/r-scatterplot3d/package.py index c6bfd97ba8..a4c5a41ca1 100644 --- a/var/spack/repos/builtin/packages/r-scatterplot3d/package.py +++ b/var/spack/repos/builtin/packages/r-scatterplot3d/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-sdmtools/package.py b/var/spack/repos/builtin/packages/r-sdmtools/package.py index 5a891722e3..584a935eb4 100644 --- a/var/spack/repos/builtin/packages/r-sdmtools/package.py +++ b/var/spack/repos/builtin/packages/r-sdmtools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-segmented/package.py b/var/spack/repos/builtin/packages/r-segmented/package.py index df4fbe4a18..bea89c1a27 100644 --- a/var/spack/repos/builtin/packages/r-segmented/package.py +++ b/var/spack/repos/builtin/packages/r-segmented/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-selectr/package.py b/var/spack/repos/builtin/packages/r-selectr/package.py index 889ff9f824..601812dc19 100644 --- a/var/spack/repos/builtin/packages/r-selectr/package.py +++ b/var/spack/repos/builtin/packages/r-selectr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-seqinr/package.py b/var/spack/repos/builtin/packages/r-seqinr/package.py index ebbc254ec3..8b7c566b87 100644 --- a/var/spack/repos/builtin/packages/r-seqinr/package.py +++ b/var/spack/repos/builtin/packages/r-seqinr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-seqlogo/package.py b/var/spack/repos/builtin/packages/r-seqlogo/package.py index 88d30f4e73..b7864868c9 100644 --- a/var/spack/repos/builtin/packages/r-seqlogo/package.py +++ b/var/spack/repos/builtin/packages/r-seqlogo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-seurat/package.py b/var/spack/repos/builtin/packages/r-seurat/package.py index cd94464bfd..8d9b06758a 100644 --- a/var/spack/repos/builtin/packages/r-seurat/package.py +++ b/var/spack/repos/builtin/packages/r-seurat/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-sf/package.py b/var/spack/repos/builtin/packages/r-sf/package.py index 26a46e1242..019feb1b18 100644 --- a/var/spack/repos/builtin/packages/r-sf/package.py +++ b/var/spack/repos/builtin/packages/r-sf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-sfsmisc/package.py b/var/spack/repos/builtin/packages/r-sfsmisc/package.py index a57616e249..c2bf1e540f 100644 --- a/var/spack/repos/builtin/packages/r-sfsmisc/package.py +++ b/var/spack/repos/builtin/packages/r-sfsmisc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-shape/package.py b/var/spack/repos/builtin/packages/r-shape/package.py index dd322c402c..18ab11de62 100644 --- a/var/spack/repos/builtin/packages/r-shape/package.py +++ b/var/spack/repos/builtin/packages/r-shape/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-shiny/package.py b/var/spack/repos/builtin/packages/r-shiny/package.py index 9b84320d8c..7165cd7af6 100644 --- a/var/spack/repos/builtin/packages/r-shiny/package.py +++ b/var/spack/repos/builtin/packages/r-shiny/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-shinydashboard/package.py b/var/spack/repos/builtin/packages/r-shinydashboard/package.py index 9ac12623ea..b9b6406f9c 100644 --- a/var/spack/repos/builtin/packages/r-shinydashboard/package.py +++ b/var/spack/repos/builtin/packages/r-shinydashboard/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-shortread/package.py b/var/spack/repos/builtin/packages/r-shortread/package.py index db5dcc2877..81ed95b0b5 100644 --- a/var/spack/repos/builtin/packages/r-shortread/package.py +++ b/var/spack/repos/builtin/packages/r-shortread/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-siggenes/package.py b/var/spack/repos/builtin/packages/r-siggenes/package.py index 8dec8aac97..ec425f54bc 100644 --- a/var/spack/repos/builtin/packages/r-siggenes/package.py +++ b/var/spack/repos/builtin/packages/r-siggenes/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-simpleaffy/package.py b/var/spack/repos/builtin/packages/r-simpleaffy/package.py index 04e13e1913..c977569d5e 100644 --- a/var/spack/repos/builtin/packages/r-simpleaffy/package.py +++ b/var/spack/repos/builtin/packages/r-simpleaffy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-sm/package.py b/var/spack/repos/builtin/packages/r-sm/package.py index b5dd5e8157..e57ad8584b 100644 --- a/var/spack/repos/builtin/packages/r-sm/package.py +++ b/var/spack/repos/builtin/packages/r-sm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-smoof/package.py b/var/spack/repos/builtin/packages/r-smoof/package.py index ac3209ff16..c980683109 100644 --- a/var/spack/repos/builtin/packages/r-smoof/package.py +++ b/var/spack/repos/builtin/packages/r-smoof/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-sn/package.py b/var/spack/repos/builtin/packages/r-sn/package.py index be58d569cc..9dbfced26a 100644 --- a/var/spack/repos/builtin/packages/r-sn/package.py +++ b/var/spack/repos/builtin/packages/r-sn/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-snow/package.py b/var/spack/repos/builtin/packages/r-snow/package.py index 74c731c10c..73bdd4bcf5 100644 --- a/var/spack/repos/builtin/packages/r-snow/package.py +++ b/var/spack/repos/builtin/packages/r-snow/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-snowfall/package.py b/var/spack/repos/builtin/packages/r-snowfall/package.py index 355595c9bf..4ed0f934a6 100644 --- a/var/spack/repos/builtin/packages/r-snowfall/package.py +++ b/var/spack/repos/builtin/packages/r-snowfall/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-snprelate/package.py b/var/spack/repos/builtin/packages/r-snprelate/package.py index 5c5126b14e..f7a0d04fa9 100644 --- a/var/spack/repos/builtin/packages/r-snprelate/package.py +++ b/var/spack/repos/builtin/packages/r-snprelate/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-som/package.py b/var/spack/repos/builtin/packages/r-som/package.py index 992f4def3b..7a79e31f62 100644 --- a/var/spack/repos/builtin/packages/r-som/package.py +++ b/var/spack/repos/builtin/packages/r-som/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-somaticsignatures/package.py b/var/spack/repos/builtin/packages/r-somaticsignatures/package.py index cebb1f70e5..36fdd5e78e 100644 --- a/var/spack/repos/builtin/packages/r-somaticsignatures/package.py +++ b/var/spack/repos/builtin/packages/r-somaticsignatures/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-sourcetools/package.py b/var/spack/repos/builtin/packages/r-sourcetools/package.py index fc529c4342..f0b08a0eef 100644 --- a/var/spack/repos/builtin/packages/r-sourcetools/package.py +++ b/var/spack/repos/builtin/packages/r-sourcetools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-sp/package.py b/var/spack/repos/builtin/packages/r-sp/package.py index 11632a23d5..0212bb028e 100644 --- a/var/spack/repos/builtin/packages/r-sp/package.py +++ b/var/spack/repos/builtin/packages/r-sp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-sparsem/package.py b/var/spack/repos/builtin/packages/r-sparsem/package.py index eebd751a82..d5641178da 100644 --- a/var/spack/repos/builtin/packages/r-sparsem/package.py +++ b/var/spack/repos/builtin/packages/r-sparsem/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-spdep/package.py b/var/spack/repos/builtin/packages/r-spdep/package.py index 66095c6623..6fdd2e953b 100644 --- a/var/spack/repos/builtin/packages/r-spdep/package.py +++ b/var/spack/repos/builtin/packages/r-spdep/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-speedglm/package.py b/var/spack/repos/builtin/packages/r-speedglm/package.py index a8509ca5d9..c653323f27 100644 --- a/var/spack/repos/builtin/packages/r-speedglm/package.py +++ b/var/spack/repos/builtin/packages/r-speedglm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-spem/package.py b/var/spack/repos/builtin/packages/r-spem/package.py index b2c9761c95..ee4a1a794c 100644 --- a/var/spack/repos/builtin/packages/r-spem/package.py +++ b/var/spack/repos/builtin/packages/r-spem/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-splitstackshape/package.py b/var/spack/repos/builtin/packages/r-splitstackshape/package.py index cc69acf81d..3bff263624 100644 --- a/var/spack/repos/builtin/packages/r-splitstackshape/package.py +++ b/var/spack/repos/builtin/packages/r-splitstackshape/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-sqldf/package.py b/var/spack/repos/builtin/packages/r-sqldf/package.py index 7d4160ed74..d0c90d4a14 100644 --- a/var/spack/repos/builtin/packages/r-sqldf/package.py +++ b/var/spack/repos/builtin/packages/r-sqldf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-squash/package.py b/var/spack/repos/builtin/packages/r-squash/package.py index 053b59c82e..e939b870e5 100644 --- a/var/spack/repos/builtin/packages/r-squash/package.py +++ b/var/spack/repos/builtin/packages/r-squash/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-stanheaders/package.py b/var/spack/repos/builtin/packages/r-stanheaders/package.py index 898c15f297..62e787197f 100644 --- a/var/spack/repos/builtin/packages/r-stanheaders/package.py +++ b/var/spack/repos/builtin/packages/r-stanheaders/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-statmod/package.py b/var/spack/repos/builtin/packages/r-statmod/package.py index 366765d5b6..df2fbc70a5 100644 --- a/var/spack/repos/builtin/packages/r-statmod/package.py +++ b/var/spack/repos/builtin/packages/r-statmod/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-statnet-common/package.py b/var/spack/repos/builtin/packages/r-statnet-common/package.py index ccd25ea08b..d8f8413200 100644 --- a/var/spack/repos/builtin/packages/r-statnet-common/package.py +++ b/var/spack/repos/builtin/packages/r-statnet-common/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-stringi/package.py b/var/spack/repos/builtin/packages/r-stringi/package.py index 65d6bf274d..af49c8aca2 100644 --- a/var/spack/repos/builtin/packages/r-stringi/package.py +++ b/var/spack/repos/builtin/packages/r-stringi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-stringr/package.py b/var/spack/repos/builtin/packages/r-stringr/package.py index 174c352552..28497c97d8 100644 --- a/var/spack/repos/builtin/packages/r-stringr/package.py +++ b/var/spack/repos/builtin/packages/r-stringr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-strucchange/package.py b/var/spack/repos/builtin/packages/r-strucchange/package.py index ca1252cf47..1b0ae07613 100644 --- a/var/spack/repos/builtin/packages/r-strucchange/package.py +++ b/var/spack/repos/builtin/packages/r-strucchange/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-subplex/package.py b/var/spack/repos/builtin/packages/r-subplex/package.py index 43e0b66985..3adb487f9d 100644 --- a/var/spack/repos/builtin/packages/r-subplex/package.py +++ b/var/spack/repos/builtin/packages/r-subplex/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-summarizedexperiment/package.py b/var/spack/repos/builtin/packages/r-summarizedexperiment/package.py index 70eb55a7aa..781db8fedc 100644 --- a/var/spack/repos/builtin/packages/r-summarizedexperiment/package.py +++ b/var/spack/repos/builtin/packages/r-summarizedexperiment/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-survey/package.py b/var/spack/repos/builtin/packages/r-survey/package.py index 2d5f5d3b75..cf0c11d4b0 100644 --- a/var/spack/repos/builtin/packages/r-survey/package.py +++ b/var/spack/repos/builtin/packages/r-survey/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-survival/package.py b/var/spack/repos/builtin/packages/r-survival/package.py index 6da03e884e..f4f8b4eed3 100644 --- a/var/spack/repos/builtin/packages/r-survival/package.py +++ b/var/spack/repos/builtin/packages/r-survival/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-sva/package.py b/var/spack/repos/builtin/packages/r-sva/package.py index 60f4add8a2..3510a46b2a 100644 --- a/var/spack/repos/builtin/packages/r-sva/package.py +++ b/var/spack/repos/builtin/packages/r-sva/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-tarifx/package.py b/var/spack/repos/builtin/packages/r-tarifx/package.py index 3d2bfaaf2e..2fa7653d73 100644 --- a/var/spack/repos/builtin/packages/r-tarifx/package.py +++ b/var/spack/repos/builtin/packages/r-tarifx/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-tclust/package.py b/var/spack/repos/builtin/packages/r-tclust/package.py index 0f453b65cc..0c07d18a56 100644 --- a/var/spack/repos/builtin/packages/r-tclust/package.py +++ b/var/spack/repos/builtin/packages/r-tclust/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-tensora/package.py b/var/spack/repos/builtin/packages/r-tensora/package.py index e3281e679b..c999e3c759 100644 --- a/var/spack/repos/builtin/packages/r-tensora/package.py +++ b/var/spack/repos/builtin/packages/r-tensora/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-testit/package.py b/var/spack/repos/builtin/packages/r-testit/package.py index 0a84af16d4..c349351975 100644 --- a/var/spack/repos/builtin/packages/r-testit/package.py +++ b/var/spack/repos/builtin/packages/r-testit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-testthat/package.py b/var/spack/repos/builtin/packages/r-testthat/package.py index a2b679148f..49d31da8c6 100644 --- a/var/spack/repos/builtin/packages/r-testthat/package.py +++ b/var/spack/repos/builtin/packages/r-testthat/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-tfbstools/package.py b/var/spack/repos/builtin/packages/r-tfbstools/package.py index 0f65c3baef..1e4b224444 100644 --- a/var/spack/repos/builtin/packages/r-tfbstools/package.py +++ b/var/spack/repos/builtin/packages/r-tfbstools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-tfmpvalue/package.py b/var/spack/repos/builtin/packages/r-tfmpvalue/package.py index 31bd237b67..d3304686b2 100644 --- a/var/spack/repos/builtin/packages/r-tfmpvalue/package.py +++ b/var/spack/repos/builtin/packages/r-tfmpvalue/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-th-data/package.py b/var/spack/repos/builtin/packages/r-th-data/package.py index 30f23ff34e..ccbac55279 100644 --- a/var/spack/repos/builtin/packages/r-th-data/package.py +++ b/var/spack/repos/builtin/packages/r-th-data/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-threejs/package.py b/var/spack/repos/builtin/packages/r-threejs/package.py index 6dce878582..908cf9a283 100644 --- a/var/spack/repos/builtin/packages/r-threejs/package.py +++ b/var/spack/repos/builtin/packages/r-threejs/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-tibble/package.py b/var/spack/repos/builtin/packages/r-tibble/package.py index ddd2de0125..af08f9b037 100644 --- a/var/spack/repos/builtin/packages/r-tibble/package.py +++ b/var/spack/repos/builtin/packages/r-tibble/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-tidycensus/package.py b/var/spack/repos/builtin/packages/r-tidycensus/package.py index c6f9988a7b..70c180eac0 100644 --- a/var/spack/repos/builtin/packages/r-tidycensus/package.py +++ b/var/spack/repos/builtin/packages/r-tidycensus/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-tidyr/package.py b/var/spack/repos/builtin/packages/r-tidyr/package.py index 743a3ac917..1897495eb2 100644 --- a/var/spack/repos/builtin/packages/r-tidyr/package.py +++ b/var/spack/repos/builtin/packages/r-tidyr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-tidyselect/package.py b/var/spack/repos/builtin/packages/r-tidyselect/package.py index f1378c63b1..96ae53a11c 100644 --- a/var/spack/repos/builtin/packages/r-tidyselect/package.py +++ b/var/spack/repos/builtin/packages/r-tidyselect/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-tidyverse/package.py b/var/spack/repos/builtin/packages/r-tidyverse/package.py index 586ba8e41e..f12e708308 100644 --- a/var/spack/repos/builtin/packages/r-tidyverse/package.py +++ b/var/spack/repos/builtin/packages/r-tidyverse/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-tiff/package.py b/var/spack/repos/builtin/packages/r-tiff/package.py index 27e532ec32..8dafca0a35 100644 --- a/var/spack/repos/builtin/packages/r-tiff/package.py +++ b/var/spack/repos/builtin/packages/r-tiff/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-tigris/package.py b/var/spack/repos/builtin/packages/r-tigris/package.py index 19d2760295..a87409ac1e 100644 --- a/var/spack/repos/builtin/packages/r-tigris/package.py +++ b/var/spack/repos/builtin/packages/r-tigris/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-timedate/package.py b/var/spack/repos/builtin/packages/r-timedate/package.py index d8cfe70878..b55d61b881 100644 --- a/var/spack/repos/builtin/packages/r-timedate/package.py +++ b/var/spack/repos/builtin/packages/r-timedate/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-tmixclust/package.py b/var/spack/repos/builtin/packages/r-tmixclust/package.py index cef3ccd5f3..cbd49587b7 100644 --- a/var/spack/repos/builtin/packages/r-tmixclust/package.py +++ b/var/spack/repos/builtin/packages/r-tmixclust/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-topgo/package.py b/var/spack/repos/builtin/packages/r-topgo/package.py index c03a557806..1997f407c2 100644 --- a/var/spack/repos/builtin/packages/r-topgo/package.py +++ b/var/spack/repos/builtin/packages/r-topgo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-trimcluster/package.py b/var/spack/repos/builtin/packages/r-trimcluster/package.py index ea8ee0bc29..e1ea58534d 100644 --- a/var/spack/repos/builtin/packages/r-trimcluster/package.py +++ b/var/spack/repos/builtin/packages/r-trimcluster/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-truncnorm/package.py b/var/spack/repos/builtin/packages/r-truncnorm/package.py index 579ee65130..07cfb8716e 100644 --- a/var/spack/repos/builtin/packages/r-truncnorm/package.py +++ b/var/spack/repos/builtin/packages/r-truncnorm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-trust/package.py b/var/spack/repos/builtin/packages/r-trust/package.py index 2c1c72d3af..e076cf5cfd 100644 --- a/var/spack/repos/builtin/packages/r-trust/package.py +++ b/var/spack/repos/builtin/packages/r-trust/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-tseries/package.py b/var/spack/repos/builtin/packages/r-tseries/package.py index 8e4757aca9..8509b84944 100644 --- a/var/spack/repos/builtin/packages/r-tseries/package.py +++ b/var/spack/repos/builtin/packages/r-tseries/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-tsne/package.py b/var/spack/repos/builtin/packages/r-tsne/package.py index 5733a66116..89dd259886 100644 --- a/var/spack/repos/builtin/packages/r-tsne/package.py +++ b/var/spack/repos/builtin/packages/r-tsne/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-ttr/package.py b/var/spack/repos/builtin/packages/r-ttr/package.py index 2021765041..8c30fe566b 100644 --- a/var/spack/repos/builtin/packages/r-ttr/package.py +++ b/var/spack/repos/builtin/packages/r-ttr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-udunits2/package.py b/var/spack/repos/builtin/packages/r-udunits2/package.py index 97a45706be..23dd7d86a0 100644 --- a/var/spack/repos/builtin/packages/r-udunits2/package.py +++ b/var/spack/repos/builtin/packages/r-udunits2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-units/package.py b/var/spack/repos/builtin/packages/r-units/package.py index 3edf5068be..9d3f41d0d8 100644 --- a/var/spack/repos/builtin/packages/r-units/package.py +++ b/var/spack/repos/builtin/packages/r-units/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-utils/package.py b/var/spack/repos/builtin/packages/r-utils/package.py index 0345fe1a77..5ea5e2d63c 100644 --- a/var/spack/repos/builtin/packages/r-utils/package.py +++ b/var/spack/repos/builtin/packages/r-utils/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-uuid/package.py b/var/spack/repos/builtin/packages/r-uuid/package.py index 1a83583d5f..461a11ff84 100644 --- a/var/spack/repos/builtin/packages/r-uuid/package.py +++ b/var/spack/repos/builtin/packages/r-uuid/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-variantannotation/package.py b/var/spack/repos/builtin/packages/r-variantannotation/package.py index e4fd563f54..3063836f5a 100644 --- a/var/spack/repos/builtin/packages/r-variantannotation/package.py +++ b/var/spack/repos/builtin/packages/r-variantannotation/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-varselrf/package.py b/var/spack/repos/builtin/packages/r-varselrf/package.py index 4158c2b835..05a11ee0b9 100644 --- a/var/spack/repos/builtin/packages/r-varselrf/package.py +++ b/var/spack/repos/builtin/packages/r-varselrf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-vcd/package.py b/var/spack/repos/builtin/packages/r-vcd/package.py index aa361a6dc8..07d7104686 100644 --- a/var/spack/repos/builtin/packages/r-vcd/package.py +++ b/var/spack/repos/builtin/packages/r-vcd/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-vegan/package.py b/var/spack/repos/builtin/packages/r-vegan/package.py index e974902e0c..c571615d92 100644 --- a/var/spack/repos/builtin/packages/r-vegan/package.py +++ b/var/spack/repos/builtin/packages/r-vegan/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-vgam/package.py b/var/spack/repos/builtin/packages/r-vgam/package.py index 06f6e61ceb..f148239434 100644 --- a/var/spack/repos/builtin/packages/r-vgam/package.py +++ b/var/spack/repos/builtin/packages/r-vgam/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-vipor/package.py b/var/spack/repos/builtin/packages/r-vipor/package.py index a0423eb251..79c1d0cfba 100644 --- a/var/spack/repos/builtin/packages/r-vipor/package.py +++ b/var/spack/repos/builtin/packages/r-vipor/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-viridis/package.py b/var/spack/repos/builtin/packages/r-viridis/package.py index b1cfe05044..d71d0654b0 100644 --- a/var/spack/repos/builtin/packages/r-viridis/package.py +++ b/var/spack/repos/builtin/packages/r-viridis/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-viridislite/package.py b/var/spack/repos/builtin/packages/r-viridislite/package.py index 969148dbbd..d83c606dca 100644 --- a/var/spack/repos/builtin/packages/r-viridislite/package.py +++ b/var/spack/repos/builtin/packages/r-viridislite/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-visnetwork/package.py b/var/spack/repos/builtin/packages/r-visnetwork/package.py index 8d8935414c..decbaa0f7d 100644 --- a/var/spack/repos/builtin/packages/r-visnetwork/package.py +++ b/var/spack/repos/builtin/packages/r-visnetwork/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-vsn/package.py b/var/spack/repos/builtin/packages/r-vsn/package.py index b98a9db1bb..27e7026b65 100644 --- a/var/spack/repos/builtin/packages/r-vsn/package.py +++ b/var/spack/repos/builtin/packages/r-vsn/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-whisker/package.py b/var/spack/repos/builtin/packages/r-whisker/package.py index 5386eae32e..f54c9b4529 100644 --- a/var/spack/repos/builtin/packages/r-whisker/package.py +++ b/var/spack/repos/builtin/packages/r-whisker/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-withr/package.py b/var/spack/repos/builtin/packages/r-withr/package.py index 0795c2f8ad..cd9888c431 100644 --- a/var/spack/repos/builtin/packages/r-withr/package.py +++ b/var/spack/repos/builtin/packages/r-withr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-xde/package.py b/var/spack/repos/builtin/packages/r-xde/package.py index f48b174e25..25598b44dc 100644 --- a/var/spack/repos/builtin/packages/r-xde/package.py +++ b/var/spack/repos/builtin/packages/r-xde/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-xgboost/package.py b/var/spack/repos/builtin/packages/r-xgboost/package.py index fd5a5ea39e..ad7aac9f0e 100644 --- a/var/spack/repos/builtin/packages/r-xgboost/package.py +++ b/var/spack/repos/builtin/packages/r-xgboost/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-xlconnect/package.py b/var/spack/repos/builtin/packages/r-xlconnect/package.py index 2b56f83c9a..49d468f539 100644 --- a/var/spack/repos/builtin/packages/r-xlconnect/package.py +++ b/var/spack/repos/builtin/packages/r-xlconnect/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-xlconnectjars/package.py b/var/spack/repos/builtin/packages/r-xlconnectjars/package.py index fa6fcbb996..a8f128cda1 100644 --- a/var/spack/repos/builtin/packages/r-xlconnectjars/package.py +++ b/var/spack/repos/builtin/packages/r-xlconnectjars/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-xlsx/package.py b/var/spack/repos/builtin/packages/r-xlsx/package.py index e8cbb88d11..82d36970be 100644 --- a/var/spack/repos/builtin/packages/r-xlsx/package.py +++ b/var/spack/repos/builtin/packages/r-xlsx/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-xlsxjars/package.py b/var/spack/repos/builtin/packages/r-xlsxjars/package.py index c79c922f60..bb49a81b70 100644 --- a/var/spack/repos/builtin/packages/r-xlsxjars/package.py +++ b/var/spack/repos/builtin/packages/r-xlsxjars/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-xmapbridge/package.py b/var/spack/repos/builtin/packages/r-xmapbridge/package.py index c098824fb4..07b410fc7f 100644 --- a/var/spack/repos/builtin/packages/r-xmapbridge/package.py +++ b/var/spack/repos/builtin/packages/r-xmapbridge/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-xml/package.py b/var/spack/repos/builtin/packages/r-xml/package.py index d9d8afd54b..9ce222a351 100644 --- a/var/spack/repos/builtin/packages/r-xml/package.py +++ b/var/spack/repos/builtin/packages/r-xml/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-xml2/package.py b/var/spack/repos/builtin/packages/r-xml2/package.py index b43c3627ac..9d5cc6f56d 100644 --- a/var/spack/repos/builtin/packages/r-xml2/package.py +++ b/var/spack/repos/builtin/packages/r-xml2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-xtable/package.py b/var/spack/repos/builtin/packages/r-xtable/package.py index 05aea7033b..78a5833949 100644 --- a/var/spack/repos/builtin/packages/r-xtable/package.py +++ b/var/spack/repos/builtin/packages/r-xtable/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-xts/package.py b/var/spack/repos/builtin/packages/r-xts/package.py index 13fc6c35e1..1efa347f1c 100644 --- a/var/spack/repos/builtin/packages/r-xts/package.py +++ b/var/spack/repos/builtin/packages/r-xts/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-xvector/package.py b/var/spack/repos/builtin/packages/r-xvector/package.py index b56c8653ea..bd9c8a7672 100644 --- a/var/spack/repos/builtin/packages/r-xvector/package.py +++ b/var/spack/repos/builtin/packages/r-xvector/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-yaml/package.py b/var/spack/repos/builtin/packages/r-yaml/package.py index 1cb316475f..4c582bee8f 100644 --- a/var/spack/repos/builtin/packages/r-yaml/package.py +++ b/var/spack/repos/builtin/packages/r-yaml/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-yapsa/package.py b/var/spack/repos/builtin/packages/r-yapsa/package.py index 99df404e06..4e771bd199 100644 --- a/var/spack/repos/builtin/packages/r-yapsa/package.py +++ b/var/spack/repos/builtin/packages/r-yapsa/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-yaqcaffy/package.py b/var/spack/repos/builtin/packages/r-yaqcaffy/package.py index f645ef4d4c..9ead0a9110 100644 --- a/var/spack/repos/builtin/packages/r-yaqcaffy/package.py +++ b/var/spack/repos/builtin/packages/r-yaqcaffy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-yarn/package.py b/var/spack/repos/builtin/packages/r-yarn/package.py index 16208137de..bf181f5886 100644 --- a/var/spack/repos/builtin/packages/r-yarn/package.py +++ b/var/spack/repos/builtin/packages/r-yarn/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-zlibbioc/package.py b/var/spack/repos/builtin/packages/r-zlibbioc/package.py index 9092694bba..b493b2a66f 100644 --- a/var/spack/repos/builtin/packages/r-zlibbioc/package.py +++ b/var/spack/repos/builtin/packages/r-zlibbioc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r-zoo/package.py b/var/spack/repos/builtin/packages/r-zoo/package.py index 0d9c706192..c746c297b6 100644 --- a/var/spack/repos/builtin/packages/r-zoo/package.py +++ b/var/spack/repos/builtin/packages/r-zoo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py index 52d11f5bbb..6430e5b33f 100644 --- a/var/spack/repos/builtin/packages/r/package.py +++ b/var/spack/repos/builtin/packages/r/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os from spack import * diff --git a/var/spack/repos/builtin/packages/racon/package.py b/var/spack/repos/builtin/packages/racon/package.py index 2ea3730087..706d1f68c2 100644 --- a/var/spack/repos/builtin/packages/racon/package.py +++ b/var/spack/repos/builtin/packages/racon/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/raft/package.py b/var/spack/repos/builtin/packages/raft/package.py index 37a49e69c5..44d4828b97 100644 --- a/var/spack/repos/builtin/packages/raft/package.py +++ b/var/spack/repos/builtin/packages/raft/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ragel/package.py b/var/spack/repos/builtin/packages/ragel/package.py index 92497082c3..90056223e4 100644 --- a/var/spack/repos/builtin/packages/ragel/package.py +++ b/var/spack/repos/builtin/packages/ragel/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/raja/package.py b/var/spack/repos/builtin/packages/raja/package.py index 660d9d6547..eceaf277fc 100644 --- a/var/spack/repos/builtin/packages/raja/package.py +++ b/var/spack/repos/builtin/packages/raja/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/randfold/package.py b/var/spack/repos/builtin/packages/randfold/package.py index adfb70e0bf..12f6b0e2fa 100644 --- a/var/spack/repos/builtin/packages/randfold/package.py +++ b/var/spack/repos/builtin/packages/randfold/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/random123/package.py b/var/spack/repos/builtin/packages/random123/package.py index ea5160929d..0274adcc5d 100644 --- a/var/spack/repos/builtin/packages/random123/package.py +++ b/var/spack/repos/builtin/packages/random123/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/randrproto/package.py b/var/spack/repos/builtin/packages/randrproto/package.py index f7b95f53d3..151ada479e 100644 --- a/var/spack/repos/builtin/packages/randrproto/package.py +++ b/var/spack/repos/builtin/packages/randrproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/range-v3/package.py b/var/spack/repos/builtin/packages/range-v3/package.py index 93e2b857f3..e3d226a741 100644 --- a/var/spack/repos/builtin/packages/range-v3/package.py +++ b/var/spack/repos/builtin/packages/range-v3/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/rankstr/package.py b/var/spack/repos/builtin/packages/rankstr/package.py index f976744fc0..3334b8deeb 100644 --- a/var/spack/repos/builtin/packages/rankstr/package.py +++ b/var/spack/repos/builtin/packages/rankstr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/rapidjson/package.py b/var/spack/repos/builtin/packages/rapidjson/package.py index 428464a855..33d616cb2a 100644 --- a/var/spack/repos/builtin/packages/rapidjson/package.py +++ b/var/spack/repos/builtin/packages/rapidjson/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ravel/package.py b/var/spack/repos/builtin/packages/ravel/package.py index 9e37d7dae9..7a2f53ea4d 100644 --- a/var/spack/repos/builtin/packages/ravel/package.py +++ b/var/spack/repos/builtin/packages/ravel/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/raxml/package.py b/var/spack/repos/builtin/packages/raxml/package.py index 4dea6f72d0..edb781eb80 100644 --- a/var/spack/repos/builtin/packages/raxml/package.py +++ b/var/spack/repos/builtin/packages/raxml/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob diff --git a/var/spack/repos/builtin/packages/ray/package.py b/var/spack/repos/builtin/packages/ray/package.py index 37ba9a5a44..f8d3c0f1b1 100644 --- a/var/spack/repos/builtin/packages/ray/package.py +++ b/var/spack/repos/builtin/packages/ray/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/rclone/package.py b/var/spack/repos/builtin/packages/rclone/package.py index 8ae8c91d4e..ae8a1d2c26 100644 --- a/var/spack/repos/builtin/packages/rclone/package.py +++ b/var/spack/repos/builtin/packages/rclone/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/rdma-core/package.py b/var/spack/repos/builtin/packages/rdma-core/package.py index 51559512a3..37138e9203 100644 --- a/var/spack/repos/builtin/packages/rdma-core/package.py +++ b/var/spack/repos/builtin/packages/rdma-core/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/rdp-classifier/package.py b/var/spack/repos/builtin/packages/rdp-classifier/package.py index 524259fd7a..b17e926066 100644 --- a/var/spack/repos/builtin/packages/rdp-classifier/package.py +++ b/var/spack/repos/builtin/packages/rdp-classifier/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/re2c/package.py b/var/spack/repos/builtin/packages/re2c/package.py index ca6d343b4a..596c03cc29 100644 --- a/var/spack/repos/builtin/packages/re2c/package.py +++ b/var/spack/repos/builtin/packages/re2c/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # from spack import * diff --git a/var/spack/repos/builtin/packages/readfq/package.py b/var/spack/repos/builtin/packages/readfq/package.py index 6fad0215c1..28ee9225aa 100644 --- a/var/spack/repos/builtin/packages/readfq/package.py +++ b/var/spack/repos/builtin/packages/readfq/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/readline/package.py b/var/spack/repos/builtin/packages/readline/package.py index 2e83fc4e82..156a7d429b 100644 --- a/var/spack/repos/builtin/packages/readline/package.py +++ b/var/spack/repos/builtin/packages/readline/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/recordproto/package.py b/var/spack/repos/builtin/packages/recordproto/package.py index 27dead7ea6..737d6e3ffb 100644 --- a/var/spack/repos/builtin/packages/recordproto/package.py +++ b/var/spack/repos/builtin/packages/recordproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/redset/package.py b/var/spack/repos/builtin/packages/redset/package.py index 971be198b4..3514a9bbf1 100644 --- a/var/spack/repos/builtin/packages/redset/package.py +++ b/var/spack/repos/builtin/packages/redset/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/redundans/package.py b/var/spack/repos/builtin/packages/redundans/package.py index 2364ce082b..17aed51ee1 100644 --- a/var/spack/repos/builtin/packages/redundans/package.py +++ b/var/spack/repos/builtin/packages/redundans/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/relion/package.py b/var/spack/repos/builtin/packages/relion/package.py index 62a0b2c0a0..eb092b6fa1 100644 --- a/var/spack/repos/builtin/packages/relion/package.py +++ b/var/spack/repos/builtin/packages/relion/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/rempi/package.py b/var/spack/repos/builtin/packages/rempi/package.py index 26304c1f03..d3559fe6a0 100644 --- a/var/spack/repos/builtin/packages/rempi/package.py +++ b/var/spack/repos/builtin/packages/rempi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/rename/package.py b/var/spack/repos/builtin/packages/rename/package.py index 7581d6f847..dfdaa31027 100644 --- a/var/spack/repos/builtin/packages/rename/package.py +++ b/var/spack/repos/builtin/packages/rename/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/rendercheck/package.py b/var/spack/repos/builtin/packages/rendercheck/package.py index 33d8f0fcdf..ea66f66c0b 100644 --- a/var/spack/repos/builtin/packages/rendercheck/package.py +++ b/var/spack/repos/builtin/packages/rendercheck/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/renderproto/package.py b/var/spack/repos/builtin/packages/renderproto/package.py index e1d3c8acd0..ded178b5bb 100644 --- a/var/spack/repos/builtin/packages/renderproto/package.py +++ b/var/spack/repos/builtin/packages/renderproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/repeatmasker/package.py b/var/spack/repos/builtin/packages/repeatmasker/package.py index 6177bb5710..63d680c2e1 100644 --- a/var/spack/repos/builtin/packages/repeatmasker/package.py +++ b/var/spack/repos/builtin/packages/repeatmasker/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import inspect diff --git a/var/spack/repos/builtin/packages/resourceproto/package.py b/var/spack/repos/builtin/packages/resourceproto/package.py index cc112247b4..98f126f5d9 100644 --- a/var/spack/repos/builtin/packages/resourceproto/package.py +++ b/var/spack/repos/builtin/packages/resourceproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/revbayes/package.py b/var/spack/repos/builtin/packages/revbayes/package.py index 06bdaaa4c1..9eb3674b39 100644 --- a/var/spack/repos/builtin/packages/revbayes/package.py +++ b/var/spack/repos/builtin/packages/revbayes/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/rgb/package.py b/var/spack/repos/builtin/packages/rgb/package.py index 1bfef10a3c..f0aa44b75c 100644 --- a/var/spack/repos/builtin/packages/rgb/package.py +++ b/var/spack/repos/builtin/packages/rgb/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/rhash/package.py b/var/spack/repos/builtin/packages/rhash/package.py index dc769071c4..6ea3a56a0b 100644 --- a/var/spack/repos/builtin/packages/rhash/package.py +++ b/var/spack/repos/builtin/packages/rhash/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import glob from spack import * diff --git a/var/spack/repos/builtin/packages/rlwrap/package.py b/var/spack/repos/builtin/packages/rlwrap/package.py index 521dd9d969..6378e6b45d 100644 --- a/var/spack/repos/builtin/packages/rlwrap/package.py +++ b/var/spack/repos/builtin/packages/rlwrap/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/rmats/package.py b/var/spack/repos/builtin/packages/rmats/package.py index 3f969b4b1c..990d5a8f77 100644 --- a/var/spack/repos/builtin/packages/rmats/package.py +++ b/var/spack/repos/builtin/packages/rmats/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from os import symlink diff --git a/var/spack/repos/builtin/packages/rmlab/package.py b/var/spack/repos/builtin/packages/rmlab/package.py index 900ceb6b5e..5304bf0d09 100644 --- a/var/spack/repos/builtin/packages/rmlab/package.py +++ b/var/spack/repos/builtin/packages/rmlab/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/rna-seqc/package.py b/var/spack/repos/builtin/packages/rna-seqc/package.py index cc58cb7e0e..38fbf7c474 100644 --- a/var/spack/repos/builtin/packages/rna-seqc/package.py +++ b/var/spack/repos/builtin/packages/rna-seqc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os.path diff --git a/var/spack/repos/builtin/packages/rngstreams/package.py b/var/spack/repos/builtin/packages/rngstreams/package.py index b6a60acae0..7168d0c400 100644 --- a/var/spack/repos/builtin/packages/rngstreams/package.py +++ b/var/spack/repos/builtin/packages/rngstreams/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/rockstar/package.py b/var/spack/repos/builtin/packages/rockstar/package.py index ba4134f731..fc9a0fa76d 100644 --- a/var/spack/repos/builtin/packages/rockstar/package.py +++ b/var/spack/repos/builtin/packages/rockstar/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os from spack import * diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index cf8e442799..91da3fc582 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/rose/package.py b/var/spack/repos/builtin/packages/rose/package.py index 12c1f4223d..537c30f2d4 100644 --- a/var/spack/repos/builtin/packages/rose/package.py +++ b/var/spack/repos/builtin/packages/rose/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # ----------------------------------------------------------------------------- # Author: Justin Too # ----------------------------------------------------------------------------- diff --git a/var/spack/repos/builtin/packages/ross/package.py b/var/spack/repos/builtin/packages/ross/package.py index e43422caba..95b2f6a571 100644 --- a/var/spack/repos/builtin/packages/ross/package.py +++ b/var/spack/repos/builtin/packages/ross/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/rr/package.py b/var/spack/repos/builtin/packages/rr/package.py index baf79aca6b..2c5ed168a0 100644 --- a/var/spack/repos/builtin/packages/rr/package.py +++ b/var/spack/repos/builtin/packages/rr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/rsbench/package.py b/var/spack/repos/builtin/packages/rsbench/package.py index 1215dd486d..6f1595c02b 100644 --- a/var/spack/repos/builtin/packages/rsbench/package.py +++ b/var/spack/repos/builtin/packages/rsbench/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/rsem/package.py b/var/spack/repos/builtin/packages/rsem/package.py index 7cffb30cf2..8212c11427 100644 --- a/var/spack/repos/builtin/packages/rsem/package.py +++ b/var/spack/repos/builtin/packages/rsem/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/rstart/package.py b/var/spack/repos/builtin/packages/rstart/package.py index 1c56f3a9df..d819274a9c 100644 --- a/var/spack/repos/builtin/packages/rstart/package.py +++ b/var/spack/repos/builtin/packages/rstart/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/rsync/package.py b/var/spack/repos/builtin/packages/rsync/package.py index 660d1bcb76..d1f4384b6a 100644 --- a/var/spack/repos/builtin/packages/rsync/package.py +++ b/var/spack/repos/builtin/packages/rsync/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/rtags/package.py b/var/spack/repos/builtin/packages/rtags/package.py index fcd9cca302..d7d9b313dd 100644 --- a/var/spack/repos/builtin/packages/rtags/package.py +++ b/var/spack/repos/builtin/packages/rtags/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/rtax/package.py b/var/spack/repos/builtin/packages/rtax/package.py index 5c471c0f74..ead8371499 100644 --- a/var/spack/repos/builtin/packages/rtax/package.py +++ b/var/spack/repos/builtin/packages/rtax/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ruby-gnuplot/package.py b/var/spack/repos/builtin/packages/ruby-gnuplot/package.py index f8bf2b04aa..a947c001aa 100644 --- a/var/spack/repos/builtin/packages/ruby-gnuplot/package.py +++ b/var/spack/repos/builtin/packages/ruby-gnuplot/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ruby-narray/package.py b/var/spack/repos/builtin/packages/ruby-narray/package.py index 1f9922cf01..52f1db091f 100644 --- a/var/spack/repos/builtin/packages/ruby-narray/package.py +++ b/var/spack/repos/builtin/packages/ruby-narray/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ruby-ronn/package.py b/var/spack/repos/builtin/packages/ruby-ronn/package.py index af3776a5a3..2637bcfc6a 100644 --- a/var/spack/repos/builtin/packages/ruby-ronn/package.py +++ b/var/spack/repos/builtin/packages/ruby-ronn/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ruby-rubyinline/package.py b/var/spack/repos/builtin/packages/ruby-rubyinline/package.py index cd91004bec..f3ab0cd49b 100644 --- a/var/spack/repos/builtin/packages/ruby-rubyinline/package.py +++ b/var/spack/repos/builtin/packages/ruby-rubyinline/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ruby-svn2git/package.py b/var/spack/repos/builtin/packages/ruby-svn2git/package.py index 292c736a30..6373247051 100644 --- a/var/spack/repos/builtin/packages/ruby-svn2git/package.py +++ b/var/spack/repos/builtin/packages/ruby-svn2git/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ruby-terminal-table/package.py b/var/spack/repos/builtin/packages/ruby-terminal-table/package.py index 62900b9851..083e20bb5c 100644 --- a/var/spack/repos/builtin/packages/ruby-terminal-table/package.py +++ b/var/spack/repos/builtin/packages/ruby-terminal-table/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ruby/package.py b/var/spack/repos/builtin/packages/ruby/package.py index 77e7d80abf..f1ae31f177 100644 --- a/var/spack/repos/builtin/packages/ruby/package.py +++ b/var/spack/repos/builtin/packages/ruby/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/rust-bindgen/package.py b/var/spack/repos/builtin/packages/rust-bindgen/package.py index d33a188dd1..de0eda3fee 100644 --- a/var/spack/repos/builtin/packages/rust-bindgen/package.py +++ b/var/spack/repos/builtin/packages/rust-bindgen/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/rust/package.py b/var/spack/repos/builtin/packages/rust/package.py index 4b098c34ac..8c86ae4696 100644 --- a/var/spack/repos/builtin/packages/rust/package.py +++ b/var/spack/repos/builtin/packages/rust/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/sabre/package.py b/var/spack/repos/builtin/packages/sabre/package.py index 5d65806e48..b1c7c8b81d 100644 --- a/var/spack/repos/builtin/packages/sabre/package.py +++ b/var/spack/repos/builtin/packages/sabre/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/sailfish/package.py b/var/spack/repos/builtin/packages/sailfish/package.py index 132cc55770..1db70a05f5 100644 --- a/var/spack/repos/builtin/packages/sailfish/package.py +++ b/var/spack/repos/builtin/packages/sailfish/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/salmon/package.py b/var/spack/repos/builtin/packages/salmon/package.py index f9c561ed29..06bfd70324 100644 --- a/var/spack/repos/builtin/packages/salmon/package.py +++ b/var/spack/repos/builtin/packages/salmon/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/sambamba/package.py b/var/spack/repos/builtin/packages/sambamba/package.py index 3b8631a0ca..69ed5fd676 100644 --- a/var/spack/repos/builtin/packages/sambamba/package.py +++ b/var/spack/repos/builtin/packages/sambamba/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/samblaster/package.py b/var/spack/repos/builtin/packages/samblaster/package.py index 1c28260359..d463fbea55 100644 --- a/var/spack/repos/builtin/packages/samblaster/package.py +++ b/var/spack/repos/builtin/packages/samblaster/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/samrai/package.py b/var/spack/repos/builtin/packages/samrai/package.py index f1c8f78332..69c840b490 100644 --- a/var/spack/repos/builtin/packages/samrai/package.py +++ b/var/spack/repos/builtin/packages/samrai/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/samtools/package.py b/var/spack/repos/builtin/packages/samtools/package.py index dd59b78d36..95949a86c6 100644 --- a/var/spack/repos/builtin/packages/samtools/package.py +++ b/var/spack/repos/builtin/packages/samtools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/sandbox/package.py b/var/spack/repos/builtin/packages/sandbox/package.py index 58c6696243..d86222b0d9 100644 --- a/var/spack/repos/builtin/packages/sandbox/package.py +++ b/var/spack/repos/builtin/packages/sandbox/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/sas/package.py b/var/spack/repos/builtin/packages/sas/package.py index ad85f83e97..d2d07bff0a 100644 --- a/var/spack/repos/builtin/packages/sas/package.py +++ b/var/spack/repos/builtin/packages/sas/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/satsuma2/package.py b/var/spack/repos/builtin/packages/satsuma2/package.py index e171ed316b..82dae616e4 100644 --- a/var/spack/repos/builtin/packages/satsuma2/package.py +++ b/var/spack/repos/builtin/packages/satsuma2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/savanna/package.py b/var/spack/repos/builtin/packages/savanna/package.py index 126c79a5ba..5e49428f0c 100644 --- a/var/spack/repos/builtin/packages/savanna/package.py +++ b/var/spack/repos/builtin/packages/savanna/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/saws/package.py b/var/spack/repos/builtin/packages/saws/package.py index 53aa4c11e2..359258a1dd 100644 --- a/var/spack/repos/builtin/packages/saws/package.py +++ b/var/spack/repos/builtin/packages/saws/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/sbt/package.py b/var/spack/repos/builtin/packages/sbt/package.py index 5ad2bd2745..791d316ef2 100644 --- a/var/spack/repos/builtin/packages/sbt/package.py +++ b/var/spack/repos/builtin/packages/sbt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/scala/package.py b/var/spack/repos/builtin/packages/scala/package.py index 3a036d99f8..263a62b956 100644 --- a/var/spack/repos/builtin/packages/scala/package.py +++ b/var/spack/repos/builtin/packages/scala/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/scalasca/package.py b/var/spack/repos/builtin/packages/scalasca/package.py index 813ef81d13..3616008878 100644 --- a/var/spack/repos/builtin/packages/scalasca/package.py +++ b/var/spack/repos/builtin/packages/scalasca/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/scalpel/package.py b/var/spack/repos/builtin/packages/scalpel/package.py index cdbbab4181..a44106cb68 100644 --- a/var/spack/repos/builtin/packages/scalpel/package.py +++ b/var/spack/repos/builtin/packages/scalpel/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/scan-for-matches/package.py b/var/spack/repos/builtin/packages/scan-for-matches/package.py index b50c2b6d92..54d5e285ec 100644 --- a/var/spack/repos/builtin/packages/scan-for-matches/package.py +++ b/var/spack/repos/builtin/packages/scan-for-matches/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/scons/package.py b/var/spack/repos/builtin/packages/scons/package.py index 6ebdeaf09f..7dcae8c960 100644 --- a/var/spack/repos/builtin/packages/scons/package.py +++ b/var/spack/repos/builtin/packages/scons/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/scorec-core/package.py b/var/spack/repos/builtin/packages/scorec-core/package.py index 329d7c8a01..ad6b5c1876 100644 --- a/var/spack/repos/builtin/packages/scorec-core/package.py +++ b/var/spack/repos/builtin/packages/scorec-core/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/scorep/package.py b/var/spack/repos/builtin/packages/scorep/package.py index b794f83f7a..b5a1fa73cd 100644 --- a/var/spack/repos/builtin/packages/scorep/package.py +++ b/var/spack/repos/builtin/packages/scorep/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/scotch/package.py b/var/spack/repos/builtin/packages/scotch/package.py index c2ceb679ef..e15696b54b 100644 --- a/var/spack/repos/builtin/packages/scotch/package.py +++ b/var/spack/repos/builtin/packages/scotch/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/scr/package.py b/var/spack/repos/builtin/packages/scr/package.py index 8fc0ecd489..cffbcd8a12 100644 --- a/var/spack/repos/builtin/packages/scr/package.py +++ b/var/spack/repos/builtin/packages/scr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/screen/package.py b/var/spack/repos/builtin/packages/screen/package.py index cb1daf4da7..5094b34971 100644 --- a/var/spack/repos/builtin/packages/screen/package.py +++ b/var/spack/repos/builtin/packages/screen/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/scripts/package.py b/var/spack/repos/builtin/packages/scripts/package.py index bc648178ea..5589169cc8 100644 --- a/var/spack/repos/builtin/packages/scripts/package.py +++ b/var/spack/repos/builtin/packages/scripts/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/scrnsaverproto/package.py b/var/spack/repos/builtin/packages/scrnsaverproto/package.py index e2938c389e..6647763b6a 100644 --- a/var/spack/repos/builtin/packages/scrnsaverproto/package.py +++ b/var/spack/repos/builtin/packages/scrnsaverproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/sctk/package.py b/var/spack/repos/builtin/packages/sctk/package.py index 97326572ff..33fbb76d70 100644 --- a/var/spack/repos/builtin/packages/sctk/package.py +++ b/var/spack/repos/builtin/packages/sctk/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/sdl2-image/package.py b/var/spack/repos/builtin/packages/sdl2-image/package.py index 30ec04d6a6..6a28c37d40 100644 --- a/var/spack/repos/builtin/packages/sdl2-image/package.py +++ b/var/spack/repos/builtin/packages/sdl2-image/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/sdl2/package.py b/var/spack/repos/builtin/packages/sdl2/package.py index 6dcea62d54..5e831ebba3 100644 --- a/var/spack/repos/builtin/packages/sdl2/package.py +++ b/var/spack/repos/builtin/packages/sdl2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/sed/package.py b/var/spack/repos/builtin/packages/sed/package.py index 90ad6729ee..19fd8b7c59 100644 --- a/var/spack/repos/builtin/packages/sed/package.py +++ b/var/spack/repos/builtin/packages/sed/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/seqan/package.py b/var/spack/repos/builtin/packages/seqan/package.py index cbdba07504..a13ed6d3b2 100644 --- a/var/spack/repos/builtin/packages/seqan/package.py +++ b/var/spack/repos/builtin/packages/seqan/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/seqprep/package.py b/var/spack/repos/builtin/packages/seqprep/package.py index fc4196514f..793c8e5985 100644 --- a/var/spack/repos/builtin/packages/seqprep/package.py +++ b/var/spack/repos/builtin/packages/seqprep/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/seqtk/package.py b/var/spack/repos/builtin/packages/seqtk/package.py index 1c65757489..addaee78a3 100644 --- a/var/spack/repos/builtin/packages/seqtk/package.py +++ b/var/spack/repos/builtin/packages/seqtk/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/serf/package.py b/var/spack/repos/builtin/packages/serf/package.py index a0a10fedf1..6135a4ecfa 100644 --- a/var/spack/repos/builtin/packages/serf/package.py +++ b/var/spack/repos/builtin/packages/serf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/sessreg/package.py b/var/spack/repos/builtin/packages/sessreg/package.py index 6791aee067..a93604ef09 100644 --- a/var/spack/repos/builtin/packages/sessreg/package.py +++ b/var/spack/repos/builtin/packages/sessreg/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/setxkbmap/package.py b/var/spack/repos/builtin/packages/setxkbmap/package.py index bffc94c848..1ed7903c8e 100644 --- a/var/spack/repos/builtin/packages/setxkbmap/package.py +++ b/var/spack/repos/builtin/packages/setxkbmap/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/sga/package.py b/var/spack/repos/builtin/packages/sga/package.py index bda253d368..0349d86c13 100644 --- a/var/spack/repos/builtin/packages/sga/package.py +++ b/var/spack/repos/builtin/packages/sga/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/shapeit/package.py b/var/spack/repos/builtin/packages/shapeit/package.py index 0eaa9aef9b..0cb36d4cf6 100644 --- a/var/spack/repos/builtin/packages/shapeit/package.py +++ b/var/spack/repos/builtin/packages/shapeit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/shared-mime-info/package.py b/var/spack/repos/builtin/packages/shared-mime-info/package.py index 15cc97a0e6..e63f7b048b 100644 --- a/var/spack/repos/builtin/packages/shared-mime-info/package.py +++ b/var/spack/repos/builtin/packages/shared-mime-info/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # from spack import * diff --git a/var/spack/repos/builtin/packages/shiny-server/package.py b/var/spack/repos/builtin/packages/shiny-server/package.py index 532fa9132e..af306b0d98 100644 --- a/var/spack/repos/builtin/packages/shiny-server/package.py +++ b/var/spack/repos/builtin/packages/shiny-server/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/shocklibs/package.py b/var/spack/repos/builtin/packages/shocklibs/package.py index 7f399de02c..7cd90918cf 100644 --- a/var/spack/repos/builtin/packages/shocklibs/package.py +++ b/var/spack/repos/builtin/packages/shocklibs/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of99c6c1b375f7f3 Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/shoremap/package.py b/var/spack/repos/builtin/packages/shoremap/package.py index 663c2d48f4..cd4623ecaf 100644 --- a/var/spack/repos/builtin/packages/shoremap/package.py +++ b/var/spack/repos/builtin/packages/shoremap/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/shortbred/package.py b/var/spack/repos/builtin/packages/shortbred/package.py index 39ddae571b..6105e4e8f0 100644 --- a/var/spack/repos/builtin/packages/shortbred/package.py +++ b/var/spack/repos/builtin/packages/shortbred/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/shortstack/package.py b/var/spack/repos/builtin/packages/shortstack/package.py index 77fcc7df13..5f55022ec6 100644 --- a/var/spack/repos/builtin/packages/shortstack/package.py +++ b/var/spack/repos/builtin/packages/shortstack/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/showfont/package.py b/var/spack/repos/builtin/packages/showfont/package.py index a5b18888e8..71c8b138d3 100644 --- a/var/spack/repos/builtin/packages/showfont/package.py +++ b/var/spack/repos/builtin/packages/showfont/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/shuffile/package.py b/var/spack/repos/builtin/packages/shuffile/package.py index 817f5c70b5..2bc1c28ca5 100644 --- a/var/spack/repos/builtin/packages/shuffile/package.py +++ b/var/spack/repos/builtin/packages/shuffile/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/sickle/package.py b/var/spack/repos/builtin/packages/sickle/package.py index 0a0b02f343..9b0a14ba3f 100644 --- a/var/spack/repos/builtin/packages/sickle/package.py +++ b/var/spack/repos/builtin/packages/sickle/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/siesta/package.py b/var/spack/repos/builtin/packages/siesta/package.py index 46cf92a106..ec35aa9160 100644 --- a/var/spack/repos/builtin/packages/siesta/package.py +++ b/var/spack/repos/builtin/packages/siesta/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/signalp/package.py b/var/spack/repos/builtin/packages/signalp/package.py index a59ac2311e..cbb5126884 100644 --- a/var/spack/repos/builtin/packages/signalp/package.py +++ b/var/spack/repos/builtin/packages/signalp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/signify/package.py b/var/spack/repos/builtin/packages/signify/package.py index e429b2bf60..7c98977c88 100755 --- a/var/spack/repos/builtin/packages/signify/package.py +++ b/var/spack/repos/builtin/packages/signify/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/silo/package.py b/var/spack/repos/builtin/packages/silo/package.py index 86c19e77f9..fed4ea223e 100644 --- a/var/spack/repos/builtin/packages/silo/package.py +++ b/var/spack/repos/builtin/packages/silo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/simplemoc/package.py b/var/spack/repos/builtin/packages/simplemoc/package.py index b6e35abd95..49f91dc605 100644 --- a/var/spack/repos/builtin/packages/simplemoc/package.py +++ b/var/spack/repos/builtin/packages/simplemoc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/simul/package.py b/var/spack/repos/builtin/packages/simul/package.py index 5b78ec2fc4..e01f2d81da 100644 --- a/var/spack/repos/builtin/packages/simul/package.py +++ b/var/spack/repos/builtin/packages/simul/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/simulationio/package.py b/var/spack/repos/builtin/packages/simulationio/package.py index 568e8e4eed..42d945dac0 100644 --- a/var/spack/repos/builtin/packages/simulationio/package.py +++ b/var/spack/repos/builtin/packages/simulationio/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/singularity/package.py b/var/spack/repos/builtin/packages/singularity/package.py index d26a905fa7..838cfe6f3e 100644 --- a/var/spack/repos/builtin/packages/singularity/package.py +++ b/var/spack/repos/builtin/packages/singularity/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/skilion-onedrive/package.py b/var/spack/repos/builtin/packages/skilion-onedrive/package.py index 978c3bef72..a78d2c8ce5 100644 --- a/var/spack/repos/builtin/packages/skilion-onedrive/package.py +++ b/var/spack/repos/builtin/packages/skilion-onedrive/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/sleef/package.py b/var/spack/repos/builtin/packages/sleef/package.py index 769e43c29b..2375766582 100644 --- a/var/spack/repos/builtin/packages/sleef/package.py +++ b/var/spack/repos/builtin/packages/sleef/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/slepc/package.py b/var/spack/repos/builtin/packages/slepc/package.py index 587850bbdb..e9a1113d72 100644 --- a/var/spack/repos/builtin/packages/slepc/package.py +++ b/var/spack/repos/builtin/packages/slepc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import sys from spack import * diff --git a/var/spack/repos/builtin/packages/slurm/package.py b/var/spack/repos/builtin/packages/slurm/package.py index 8dccb67def..afa3fc27db 100644 --- a/var/spack/repos/builtin/packages/slurm/package.py +++ b/var/spack/repos/builtin/packages/slurm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/smalt/package.py b/var/spack/repos/builtin/packages/smalt/package.py index 5bd90c2c0c..23466e0fd1 100644 --- a/var/spack/repos/builtin/packages/smalt/package.py +++ b/var/spack/repos/builtin/packages/smalt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/smproxy/package.py b/var/spack/repos/builtin/packages/smproxy/package.py index dd5a4a860d..bc4f943244 100644 --- a/var/spack/repos/builtin/packages/smproxy/package.py +++ b/var/spack/repos/builtin/packages/smproxy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/snakemake/package.py b/var/spack/repos/builtin/packages/snakemake/package.py index f8687c0907..3c55b55ec6 100644 --- a/var/spack/repos/builtin/packages/snakemake/package.py +++ b/var/spack/repos/builtin/packages/snakemake/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/snap-berkeley/package.py b/var/spack/repos/builtin/packages/snap-berkeley/package.py index d431bbdf8c..4f7865ceca 100644 --- a/var/spack/repos/builtin/packages/snap-berkeley/package.py +++ b/var/spack/repos/builtin/packages/snap-berkeley/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/snap-korf/package.py b/var/spack/repos/builtin/packages/snap-korf/package.py index 37d61cd770..840d2ccefb 100644 --- a/var/spack/repos/builtin/packages/snap-korf/package.py +++ b/var/spack/repos/builtin/packages/snap-korf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob diff --git a/var/spack/repos/builtin/packages/snap/package.py b/var/spack/repos/builtin/packages/snap/package.py index 7ed808a8e4..8695a9efbf 100644 --- a/var/spack/repos/builtin/packages/snap/package.py +++ b/var/spack/repos/builtin/packages/snap/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/snappy/package.py b/var/spack/repos/builtin/packages/snappy/package.py index 5a689a05d0..23845a4079 100644 --- a/var/spack/repos/builtin/packages/snappy/package.py +++ b/var/spack/repos/builtin/packages/snappy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/snbone/package.py b/var/spack/repos/builtin/packages/snbone/package.py index 93421d429b..8e112ebdba 100644 --- a/var/spack/repos/builtin/packages/snbone/package.py +++ b/var/spack/repos/builtin/packages/snbone/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/sniffles/package.py b/var/spack/repos/builtin/packages/sniffles/package.py index 93cc71f075..0d498be646 100644 --- a/var/spack/repos/builtin/packages/sniffles/package.py +++ b/var/spack/repos/builtin/packages/sniffles/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/snpeff/package.py b/var/spack/repos/builtin/packages/snpeff/package.py index 2d8c7900ce..046ad49e52 100644 --- a/var/spack/repos/builtin/packages/snpeff/package.py +++ b/var/spack/repos/builtin/packages/snpeff/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os.path diff --git a/var/spack/repos/builtin/packages/snphylo/package.py b/var/spack/repos/builtin/packages/snphylo/package.py index 5066b41e28..d249af2e65 100644 --- a/var/spack/repos/builtin/packages/snphylo/package.py +++ b/var/spack/repos/builtin/packages/snphylo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/snptest/package.py b/var/spack/repos/builtin/packages/snptest/package.py index 313e6fb398..a348c9fefd 100644 --- a/var/spack/repos/builtin/packages/snptest/package.py +++ b/var/spack/repos/builtin/packages/snptest/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/soap2/package.py b/var/spack/repos/builtin/packages/soap2/package.py index 3b330b5988..20b71eb57e 100644 --- a/var/spack/repos/builtin/packages/soap2/package.py +++ b/var/spack/repos/builtin/packages/soap2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/soapdenovo-trans/package.py b/var/spack/repos/builtin/packages/soapdenovo-trans/package.py index 7b2ffd4185..f837ce94ea 100644 --- a/var/spack/repos/builtin/packages/soapdenovo-trans/package.py +++ b/var/spack/repos/builtin/packages/soapdenovo-trans/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/soapdenovo2/package.py b/var/spack/repos/builtin/packages/soapdenovo2/package.py index d88a22846e..d64116e359 100644 --- a/var/spack/repos/builtin/packages/soapdenovo2/package.py +++ b/var/spack/repos/builtin/packages/soapdenovo2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/soapindel/package.py b/var/spack/repos/builtin/packages/soapindel/package.py index c676e02e24..56dafc5c12 100644 --- a/var/spack/repos/builtin/packages/soapindel/package.py +++ b/var/spack/repos/builtin/packages/soapindel/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/soapsnp/package.py b/var/spack/repos/builtin/packages/soapsnp/package.py index 57f928c3aa..6908ba491a 100644 --- a/var/spack/repos/builtin/packages/soapsnp/package.py +++ b/var/spack/repos/builtin/packages/soapsnp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/sofa-c/package.py b/var/spack/repos/builtin/packages/sofa-c/package.py index 65f23e1def..ec5d52c29b 100644 --- a/var/spack/repos/builtin/packages/sofa-c/package.py +++ b/var/spack/repos/builtin/packages/sofa-c/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/somatic-sniper/package.py b/var/spack/repos/builtin/packages/somatic-sniper/package.py index d33e8c8878..23c542bc52 100644 --- a/var/spack/repos/builtin/packages/somatic-sniper/package.py +++ b/var/spack/repos/builtin/packages/somatic-sniper/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/sortmerna/package.py b/var/spack/repos/builtin/packages/sortmerna/package.py index cb91cbe516..a24d92eba8 100644 --- a/var/spack/repos/builtin/packages/sortmerna/package.py +++ b/var/spack/repos/builtin/packages/sortmerna/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/sosflow/package.py b/var/spack/repos/builtin/packages/sosflow/package.py index 45dc004569..1100794493 100644 --- a/var/spack/repos/builtin/packages/sosflow/package.py +++ b/var/spack/repos/builtin/packages/sosflow/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/sowing/package.py b/var/spack/repos/builtin/packages/sowing/package.py index 3c310a30ee..59ae89b841 100644 --- a/var/spack/repos/builtin/packages/sowing/package.py +++ b/var/spack/repos/builtin/packages/sowing/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/sox/package.py b/var/spack/repos/builtin/packages/sox/package.py index e9f65294d1..d36222e23c 100644 --- a/var/spack/repos/builtin/packages/sox/package.py +++ b/var/spack/repos/builtin/packages/sox/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/spades/package.py b/var/spack/repos/builtin/packages/spades/package.py index a286f6d174..0e7cf05a7f 100644 --- a/var/spack/repos/builtin/packages/spades/package.py +++ b/var/spack/repos/builtin/packages/spades/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/span-lite/package.py b/var/spack/repos/builtin/packages/span-lite/package.py index 116ed64cf1..2ec1ede756 100644 --- a/var/spack/repos/builtin/packages/span-lite/package.py +++ b/var/spack/repos/builtin/packages/span-lite/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from shutil import copytree diff --git a/var/spack/repos/builtin/packages/spark/package.py b/var/spack/repos/builtin/packages/spark/package.py index 9dce9b81f0..2c685ead63 100644 --- a/var/spack/repos/builtin/packages/spark/package.py +++ b/var/spack/repos/builtin/packages/spark/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import re from spack import * diff --git a/var/spack/repos/builtin/packages/sparsehash/package.py b/var/spack/repos/builtin/packages/sparsehash/package.py index 9e8831abb3..6093db83b7 100644 --- a/var/spack/repos/builtin/packages/sparsehash/package.py +++ b/var/spack/repos/builtin/packages/sparsehash/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/sparta/package.py b/var/spack/repos/builtin/packages/sparta/package.py index 83261f3bf2..1b3bbfe55b 100644 --- a/var/spack/repos/builtin/packages/sparta/package.py +++ b/var/spack/repos/builtin/packages/sparta/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/spdlog/package.py b/var/spack/repos/builtin/packages/spdlog/package.py index bcd369c9d0..f65516d329 100644 --- a/var/spack/repos/builtin/packages/spdlog/package.py +++ b/var/spack/repos/builtin/packages/spdlog/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/spectrum-mpi/package.py b/var/spack/repos/builtin/packages/spectrum-mpi/package.py index cbbd65a5f3..c700f67285 100644 --- a/var/spack/repos/builtin/packages/spectrum-mpi/package.py +++ b/var/spack/repos/builtin/packages/spectrum-mpi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at International Business Machines Corporation +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Serban Maerean, serban@us.ibm.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/speex/package.py b/var/spack/repos/builtin/packages/speex/package.py index 24b618ab3d..51816e337a 100644 --- a/var/spack/repos/builtin/packages/speex/package.py +++ b/var/spack/repos/builtin/packages/speex/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/spglib/package.py b/var/spack/repos/builtin/packages/spglib/package.py index e17a42ecd6..d68243c4b7 100644 --- a/var/spack/repos/builtin/packages/spglib/package.py +++ b/var/spack/repos/builtin/packages/spglib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/sph2pipe/package.py b/var/spack/repos/builtin/packages/sph2pipe/package.py index 8f894f17e8..f3e2e991e3 100644 --- a/var/spack/repos/builtin/packages/sph2pipe/package.py +++ b/var/spack/repos/builtin/packages/sph2pipe/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/spherepack/package.py b/var/spack/repos/builtin/packages/spherepack/package.py index 520b42d60f..eabd1731ef 100644 --- a/var/spack/repos/builtin/packages/spherepack/package.py +++ b/var/spack/repos/builtin/packages/spherepack/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/spindle/package.py b/var/spack/repos/builtin/packages/spindle/package.py index 6050e3ffa7..905ef33cf2 100644 --- a/var/spack/repos/builtin/packages/spindle/package.py +++ b/var/spack/repos/builtin/packages/spindle/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/spot/package.py b/var/spack/repos/builtin/packages/spot/package.py index 1fdb08b44c..1e74a0b2da 100644 --- a/var/spack/repos/builtin/packages/spot/package.py +++ b/var/spack/repos/builtin/packages/spot/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/sqlite/package.py b/var/spack/repos/builtin/packages/sqlite/package.py index b7010965dc..dc14a7b088 100644 --- a/var/spack/repos/builtin/packages/sqlite/package.py +++ b/var/spack/repos/builtin/packages/sqlite/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from spack import architecture diff --git a/var/spack/repos/builtin/packages/sqlitebrowser/package.py b/var/spack/repos/builtin/packages/sqlitebrowser/package.py index 71278d84b9..5ec2d47707 100644 --- a/var/spack/repos/builtin/packages/sqlitebrowser/package.py +++ b/var/spack/repos/builtin/packages/sqlitebrowser/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/squid/package.py b/var/spack/repos/builtin/packages/squid/package.py index 2f9c9c85b9..13a6bd32f4 100644 --- a/var/spack/repos/builtin/packages/squid/package.py +++ b/var/spack/repos/builtin/packages/squid/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/sra-toolkit/package.py b/var/spack/repos/builtin/packages/sra-toolkit/package.py index 10a81db23f..0726883afd 100644 --- a/var/spack/repos/builtin/packages/sra-toolkit/package.py +++ b/var/spack/repos/builtin/packages/sra-toolkit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ssht/package.py b/var/spack/repos/builtin/packages/ssht/package.py index 55ee33c15a..54d1d9684d 100644 --- a/var/spack/repos/builtin/packages/ssht/package.py +++ b/var/spack/repos/builtin/packages/ssht/package.py @@ -1,27 +1,7 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * diff --git a/var/spack/repos/builtin/packages/sspace-longread/package.py b/var/spack/repos/builtin/packages/sspace-longread/package.py index 1646efc68d..bb6c05b112 100644 --- a/var/spack/repos/builtin/packages/sspace-longread/package.py +++ b/var/spack/repos/builtin/packages/sspace-longread/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/sspace-standard/package.py b/var/spack/repos/builtin/packages/sspace-standard/package.py index 74e97d8a47..9275b200ea 100644 --- a/var/spack/repos/builtin/packages/sspace-standard/package.py +++ b/var/spack/repos/builtin/packages/sspace-standard/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os import glob diff --git a/var/spack/repos/builtin/packages/sst-core/package.py b/var/spack/repos/builtin/packages/sst-core/package.py index b05cade162..a64bc40753 100644 --- a/var/spack/repos/builtin/packages/sst-core/package.py +++ b/var/spack/repos/builtin/packages/sst-core/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/sst-dumpi/package.py b/var/spack/repos/builtin/packages/sst-dumpi/package.py index b372109235..96bbd6e3c7 100644 --- a/var/spack/repos/builtin/packages/sst-dumpi/package.py +++ b/var/spack/repos/builtin/packages/sst-dumpi/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # # Author: Samuel Knight # Date: Feb 3, 2017 diff --git a/var/spack/repos/builtin/packages/sst-macro/package.py b/var/spack/repos/builtin/packages/sst-macro/package.py index 5cd80275a3..65c0e613e0 100644 --- a/var/spack/repos/builtin/packages/sst-macro/package.py +++ b/var/spack/repos/builtin/packages/sst-macro/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/stacks/package.py b/var/spack/repos/builtin/packages/stacks/package.py index 62a768fe43..d156ec9f30 100644 --- a/var/spack/repos/builtin/packages/stacks/package.py +++ b/var/spack/repos/builtin/packages/stacks/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/staden-io-lib/package.py b/var/spack/repos/builtin/packages/staden-io-lib/package.py index 1b3801ce0a..9ecb46fbbe 100644 --- a/var/spack/repos/builtin/packages/staden-io-lib/package.py +++ b/var/spack/repos/builtin/packages/staden-io-lib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/star-ccm-plus/package.py b/var/spack/repos/builtin/packages/star-ccm-plus/package.py index 9c8c6a2ce9..59d043fe65 100644 --- a/var/spack/repos/builtin/packages/star-ccm-plus/package.py +++ b/var/spack/repos/builtin/packages/star-ccm-plus/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob import os diff --git a/var/spack/repos/builtin/packages/star/package.py b/var/spack/repos/builtin/packages/star/package.py index 270be180a0..9f6d51c219 100644 --- a/var/spack/repos/builtin/packages/star/package.py +++ b/var/spack/repos/builtin/packages/star/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/startup-notification/package.py b/var/spack/repos/builtin/packages/startup-notification/package.py index ae85c3ca69..e10736253b 100644 --- a/var/spack/repos/builtin/packages/startup-notification/package.py +++ b/var/spack/repos/builtin/packages/startup-notification/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/stat/package.py b/var/spack/repos/builtin/packages/stat/package.py index 6455acee3f..bf2cbe8466 100644 --- a/var/spack/repos/builtin/packages/stat/package.py +++ b/var/spack/repos/builtin/packages/stat/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/stc/package.py b/var/spack/repos/builtin/packages/stc/package.py index 0f32f04d63..7332d4843d 100644 --- a/var/spack/repos/builtin/packages/stc/package.py +++ b/var/spack/repos/builtin/packages/stc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/steps/package.py b/var/spack/repos/builtin/packages/steps/package.py index d857ccdf15..0831852f3c 100644 --- a/var/spack/repos/builtin/packages/steps/package.py +++ b/var/spack/repos/builtin/packages/steps/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/stow/package.py b/var/spack/repos/builtin/packages/stow/package.py index efea5991ad..5861351441 100644 --- a/var/spack/repos/builtin/packages/stow/package.py +++ b/var/spack/repos/builtin/packages/stow/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/strace/package.py b/var/spack/repos/builtin/packages/strace/package.py index 5cc1cc82b4..b43e2c4ef4 100644 --- a/var/spack/repos/builtin/packages/strace/package.py +++ b/var/spack/repos/builtin/packages/strace/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/stream/package.py b/var/spack/repos/builtin/packages/stream/package.py index c4020f4312..45aad6da05 100644 --- a/var/spack/repos/builtin/packages/stream/package.py +++ b/var/spack/repos/builtin/packages/stream/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/strelka/package.py b/var/spack/repos/builtin/packages/strelka/package.py index 49176d5144..fdd4b67434 100644 --- a/var/spack/repos/builtin/packages/strelka/package.py +++ b/var/spack/repos/builtin/packages/strelka/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/stress/package.py b/var/spack/repos/builtin/packages/stress/package.py index 034a6b117f..0588cc36a2 100644 --- a/var/spack/repos/builtin/packages/stress/package.py +++ b/var/spack/repos/builtin/packages/stress/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/string-view-lite/package.py b/var/spack/repos/builtin/packages/string-view-lite/package.py index efaf1b6e16..ab564b4880 100644 --- a/var/spack/repos/builtin/packages/string-view-lite/package.py +++ b/var/spack/repos/builtin/packages/string-view-lite/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from shutil import copytree diff --git a/var/spack/repos/builtin/packages/stringtie/package.py b/var/spack/repos/builtin/packages/stringtie/package.py index d0747398a0..cb01647651 100644 --- a/var/spack/repos/builtin/packages/stringtie/package.py +++ b/var/spack/repos/builtin/packages/stringtie/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/structure/package.py b/var/spack/repos/builtin/packages/structure/package.py index e92fc626cb..f0d04676be 100644 --- a/var/spack/repos/builtin/packages/structure/package.py +++ b/var/spack/repos/builtin/packages/structure/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/strumpack/package.py b/var/spack/repos/builtin/packages/strumpack/package.py index cc3b4556a0..b332b7fa90 100644 --- a/var/spack/repos/builtin/packages/strumpack/package.py +++ b/var/spack/repos/builtin/packages/strumpack/package.py @@ -1,27 +1,7 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * diff --git a/var/spack/repos/builtin/packages/sublime-text/package.py b/var/spack/repos/builtin/packages/sublime-text/package.py index 83dd2f380b..403d5c42a8 100644 --- a/var/spack/repos/builtin/packages/sublime-text/package.py +++ b/var/spack/repos/builtin/packages/sublime-text/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/subread/package.py b/var/spack/repos/builtin/packages/subread/package.py index 1bc36ddb13..b6af49d745 100644 --- a/var/spack/repos/builtin/packages/subread/package.py +++ b/var/spack/repos/builtin/packages/subread/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/subversion/package.py b/var/spack/repos/builtin/packages/subversion/package.py index 97cacd493e..8a041451b2 100644 --- a/var/spack/repos/builtin/packages/subversion/package.py +++ b/var/spack/repos/builtin/packages/subversion/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/suite-sparse/package.py b/var/spack/repos/builtin/packages/suite-sparse/package.py index 865ac4a84f..2bdaf70c18 100644 --- a/var/spack/repos/builtin/packages/suite-sparse/package.py +++ b/var/spack/repos/builtin/packages/suite-sparse/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/sumaclust/package.py b/var/spack/repos/builtin/packages/sumaclust/package.py index cc75b8eb4b..66f7820d59 100644 --- a/var/spack/repos/builtin/packages/sumaclust/package.py +++ b/var/spack/repos/builtin/packages/sumaclust/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/sundials/package.py b/var/spack/repos/builtin/packages/sundials/package.py index ba0e99d0a1..43cfd3118a 100644 --- a/var/spack/repos/builtin/packages/sundials/package.py +++ b/var/spack/repos/builtin/packages/sundials/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os import sys diff --git a/var/spack/repos/builtin/packages/superlu-dist/package.py b/var/spack/repos/builtin/packages/superlu-dist/package.py index 4846d042a5..122b706b42 100644 --- a/var/spack/repos/builtin/packages/superlu-dist/package.py +++ b/var/spack/repos/builtin/packages/superlu-dist/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/superlu-mt/package.py b/var/spack/repos/builtin/packages/superlu-mt/package.py index 41b1265bb6..fa663b9395 100644 --- a/var/spack/repos/builtin/packages/superlu-mt/package.py +++ b/var/spack/repos/builtin/packages/superlu-mt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob import os diff --git a/var/spack/repos/builtin/packages/superlu/package.py b/var/spack/repos/builtin/packages/superlu/package.py index 3032e038a7..bb657b780f 100644 --- a/var/spack/repos/builtin/packages/superlu/package.py +++ b/var/spack/repos/builtin/packages/superlu/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob import os diff --git a/var/spack/repos/builtin/packages/supernova/package.py b/var/spack/repos/builtin/packages/supernova/package.py index f358dd4939..ed7b85405d 100644 --- a/var/spack/repos/builtin/packages/supernova/package.py +++ b/var/spack/repos/builtin/packages/supernova/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/sw4lite/package.py b/var/spack/repos/builtin/packages/sw4lite/package.py index c3622e2c90..379eedd6bf 100644 --- a/var/spack/repos/builtin/packages/sw4lite/package.py +++ b/var/spack/repos/builtin/packages/sw4lite/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob diff --git a/var/spack/repos/builtin/packages/swap-assembler/package.py b/var/spack/repos/builtin/packages/swap-assembler/package.py index a96fb949ea..938bb4c71d 100644 --- a/var/spack/repos/builtin/packages/swap-assembler/package.py +++ b/var/spack/repos/builtin/packages/swap-assembler/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/swarm/package.py b/var/spack/repos/builtin/packages/swarm/package.py index 3eb196f33f..277a10974f 100644 --- a/var/spack/repos/builtin/packages/swarm/package.py +++ b/var/spack/repos/builtin/packages/swarm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/swfft/package.py b/var/spack/repos/builtin/packages/swfft/package.py index 21ccabfb46..4297933639 100644 --- a/var/spack/repos/builtin/packages/swfft/package.py +++ b/var/spack/repos/builtin/packages/swfft/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/swiftsim/package.py b/var/spack/repos/builtin/packages/swiftsim/package.py index 81b0aced07..494d92c1d7 100644 --- a/var/spack/repos/builtin/packages/swiftsim/package.py +++ b/var/spack/repos/builtin/packages/swiftsim/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import llnl.util.tty as tty diff --git a/var/spack/repos/builtin/packages/swig/package.py b/var/spack/repos/builtin/packages/swig/package.py index e3e427b602..0d4c97a58f 100644 --- a/var/spack/repos/builtin/packages/swig/package.py +++ b/var/spack/repos/builtin/packages/swig/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os diff --git a/var/spack/repos/builtin/packages/symengine/package.py b/var/spack/repos/builtin/packages/symengine/package.py index 8518ac66bf..b0bbd61e37 100644 --- a/var/spack/repos/builtin/packages/symengine/package.py +++ b/var/spack/repos/builtin/packages/symengine/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/sympol/package.py b/var/spack/repos/builtin/packages/sympol/package.py index 801878185e..ca69920323 100644 --- a/var/spack/repos/builtin/packages/sympol/package.py +++ b/var/spack/repos/builtin/packages/sympol/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/sz/package.py b/var/spack/repos/builtin/packages/sz/package.py index c6f97e91ea..f9d1c0f2a6 100644 --- a/var/spack/repos/builtin/packages/sz/package.py +++ b/var/spack/repos/builtin/packages/sz/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/tabix/package.py b/var/spack/repos/builtin/packages/tabix/package.py index b192112003..c35d15c1e8 100644 --- a/var/spack/repos/builtin/packages/tabix/package.py +++ b/var/spack/repos/builtin/packages/tabix/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/talass/package.py b/var/spack/repos/builtin/packages/talass/package.py index 2b9131ba67..94e0a10b28 100644 --- a/var/spack/repos/builtin/packages/talass/package.py +++ b/var/spack/repos/builtin/packages/talass/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/talloc/package.py b/var/spack/repos/builtin/packages/talloc/package.py index 68465ee93b..2fec8da46b 100644 --- a/var/spack/repos/builtin/packages/talloc/package.py +++ b/var/spack/repos/builtin/packages/talloc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/tantan/package.py b/var/spack/repos/builtin/packages/tantan/package.py index 162777d3bb..df183d07d9 100644 --- a/var/spack/repos/builtin/packages/tantan/package.py +++ b/var/spack/repos/builtin/packages/tantan/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/tar/package.py b/var/spack/repos/builtin/packages/tar/package.py index 92674de7f8..3f491a5cfc 100644 --- a/var/spack/repos/builtin/packages/tar/package.py +++ b/var/spack/repos/builtin/packages/tar/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/targetp/package.py b/var/spack/repos/builtin/packages/targetp/package.py index 7e41b821ae..8fa33e7b9d 100644 --- a/var/spack/repos/builtin/packages/targetp/package.py +++ b/var/spack/repos/builtin/packages/targetp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/task/package.py b/var/spack/repos/builtin/packages/task/package.py index a92dccd203..93c58bc6eb 100644 --- a/var/spack/repos/builtin/packages/task/package.py +++ b/var/spack/repos/builtin/packages/task/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/taskd/package.py b/var/spack/repos/builtin/packages/taskd/package.py index 7405f1f01c..43f6a8b7df 100644 --- a/var/spack/repos/builtin/packages/taskd/package.py +++ b/var/spack/repos/builtin/packages/taskd/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/tasmanian/package.py b/var/spack/repos/builtin/packages/tasmanian/package.py index cae7108b04..908841bce9 100644 --- a/var/spack/repos/builtin/packages/tasmanian/package.py +++ b/var/spack/repos/builtin/packages/tasmanian/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/tassel/package.py b/var/spack/repos/builtin/packages/tassel/package.py index d2c803997e..5a568cc0f4 100644 --- a/var/spack/repos/builtin/packages/tassel/package.py +++ b/var/spack/repos/builtin/packages/tassel/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/tau/package.py b/var/spack/repos/builtin/packages/tau/package.py index 11ba76e751..9aa29297e4 100644 --- a/var/spack/repos/builtin/packages/tau/package.py +++ b/var/spack/repos/builtin/packages/tau/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os import glob diff --git a/var/spack/repos/builtin/packages/tcl-itcl/package.py b/var/spack/repos/builtin/packages/tcl-itcl/package.py index 56762ea01e..0b0d842fe3 100644 --- a/var/spack/repos/builtin/packages/tcl-itcl/package.py +++ b/var/spack/repos/builtin/packages/tcl-itcl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/tcl-tcllib/package.py b/var/spack/repos/builtin/packages/tcl-tcllib/package.py index c6e2c9692d..46ec7b6d46 100644 --- a/var/spack/repos/builtin/packages/tcl-tcllib/package.py +++ b/var/spack/repos/builtin/packages/tcl-tcllib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/tcl-tclxml/package.py b/var/spack/repos/builtin/packages/tcl-tclxml/package.py index 45ed50411c..4f50a86809 100644 --- a/var/spack/repos/builtin/packages/tcl-tclxml/package.py +++ b/var/spack/repos/builtin/packages/tcl-tclxml/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/tcl/package.py b/var/spack/repos/builtin/packages/tcl/package.py index bdbc8c397b..7e2d57c764 100644 --- a/var/spack/repos/builtin/packages/tcl/package.py +++ b/var/spack/repos/builtin/packages/tcl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os from spack.util.environment import is_system_path diff --git a/var/spack/repos/builtin/packages/tclap/package.py b/var/spack/repos/builtin/packages/tclap/package.py index a402b542a5..ab067f4e3e 100644 --- a/var/spack/repos/builtin/packages/tclap/package.py +++ b/var/spack/repos/builtin/packages/tclap/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/tcoffee/package.py b/var/spack/repos/builtin/packages/tcoffee/package.py index 2aac10efdd..2b2ed2d95e 100644 --- a/var/spack/repos/builtin/packages/tcoffee/package.py +++ b/var/spack/repos/builtin/packages/tcoffee/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/tcptrace/package.py b/var/spack/repos/builtin/packages/tcptrace/package.py index dea8b81680..dcb7dcd7f4 100644 --- a/var/spack/repos/builtin/packages/tcptrace/package.py +++ b/var/spack/repos/builtin/packages/tcptrace/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * from os.path import join diff --git a/var/spack/repos/builtin/packages/tcsh/package.py b/var/spack/repos/builtin/packages/tcsh/package.py index c5b681c9bb..876957b150 100644 --- a/var/spack/repos/builtin/packages/tcsh/package.py +++ b/var/spack/repos/builtin/packages/tcsh/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/tealeaf/package.py b/var/spack/repos/builtin/packages/tealeaf/package.py index 17ea4f4667..208d11ccc7 100644 --- a/var/spack/repos/builtin/packages/tealeaf/package.py +++ b/var/spack/repos/builtin/packages/tealeaf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import glob diff --git a/var/spack/repos/builtin/packages/templight-tools/package.py b/var/spack/repos/builtin/packages/templight-tools/package.py index 810b43d8b8..d15db66459 100644 --- a/var/spack/repos/builtin/packages/templight-tools/package.py +++ b/var/spack/repos/builtin/packages/templight-tools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/templight/package.py b/var/spack/repos/builtin/packages/templight/package.py index dd03b217e9..15264e6d22 100644 --- a/var/spack/repos/builtin/packages/templight/package.py +++ b/var/spack/repos/builtin/packages/templight/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/tetgen/package.py b/var/spack/repos/builtin/packages/tetgen/package.py index f75c08c886..3a23ec2902 100644 --- a/var/spack/repos/builtin/packages/tetgen/package.py +++ b/var/spack/repos/builtin/packages/tetgen/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob diff --git a/var/spack/repos/builtin/packages/tethex/package.py b/var/spack/repos/builtin/packages/tethex/package.py index d3e6f4ae93..75994e27e6 100644 --- a/var/spack/repos/builtin/packages/tethex/package.py +++ b/var/spack/repos/builtin/packages/tethex/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/texinfo/package.py b/var/spack/repos/builtin/packages/texinfo/package.py index af811b1f28..b78f1e0b35 100644 --- a/var/spack/repos/builtin/packages/texinfo/package.py +++ b/var/spack/repos/builtin/packages/texinfo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/texlive/package.py b/var/spack/repos/builtin/packages/texlive/package.py index 1fdc41cc5f..4216be091e 100644 --- a/var/spack/repos/builtin/packages/texlive/package.py +++ b/var/spack/repos/builtin/packages/texlive/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os import platform diff --git a/var/spack/repos/builtin/packages/the-platinum-searcher/package.py b/var/spack/repos/builtin/packages/the-platinum-searcher/package.py index 858a0d5eba..e10c899600 100644 --- a/var/spack/repos/builtin/packages/the-platinum-searcher/package.py +++ b/var/spack/repos/builtin/packages/the-platinum-searcher/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/the-silver-searcher/package.py b/var/spack/repos/builtin/packages/the-silver-searcher/package.py index e436694946..e3ed85d41f 100644 --- a/var/spack/repos/builtin/packages/the-silver-searcher/package.py +++ b/var/spack/repos/builtin/packages/the-silver-searcher/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/thornado-mini/package.py b/var/spack/repos/builtin/packages/thornado-mini/package.py index 68a385c2b9..dc96f2a4b2 100644 --- a/var/spack/repos/builtin/packages/thornado-mini/package.py +++ b/var/spack/repos/builtin/packages/thornado-mini/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2018, Los Alamos National Security, LLC. -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/thrift/package.py b/var/spack/repos/builtin/packages/thrift/package.py index 8ae67b6ec2..35d3a897e9 100644 --- a/var/spack/repos/builtin/packages/thrift/package.py +++ b/var/spack/repos/builtin/packages/thrift/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/thrust/package.py b/var/spack/repos/builtin/packages/thrust/package.py index a1a93278cd..4870f828be 100644 --- a/var/spack/repos/builtin/packages/thrust/package.py +++ b/var/spack/repos/builtin/packages/thrust/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/tig/package.py b/var/spack/repos/builtin/packages/tig/package.py index 00b2f9eb16..58f07a011f 100644 --- a/var/spack/repos/builtin/packages/tig/package.py +++ b/var/spack/repos/builtin/packages/tig/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/tinyxml/package.py b/var/spack/repos/builtin/packages/tinyxml/package.py index afd3c7f6b5..a7962a1253 100644 --- a/var/spack/repos/builtin/packages/tinyxml/package.py +++ b/var/spack/repos/builtin/packages/tinyxml/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os.path diff --git a/var/spack/repos/builtin/packages/tinyxml2/package.py b/var/spack/repos/builtin/packages/tinyxml2/package.py index cc5bd35996..06f2e7b673 100644 --- a/var/spack/repos/builtin/packages/tinyxml2/package.py +++ b/var/spack/repos/builtin/packages/tinyxml2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/tioga/package.py b/var/spack/repos/builtin/packages/tioga/package.py index f3cfb139ad..8828c6b86e 100644 --- a/var/spack/repos/builtin/packages/tioga/package.py +++ b/var/spack/repos/builtin/packages/tioga/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/tk/package.py b/var/spack/repos/builtin/packages/tk/package.py index 5a12831453..6b5c2cfbc1 100644 --- a/var/spack/repos/builtin/packages/tk/package.py +++ b/var/spack/repos/builtin/packages/tk/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/tldd/package.py b/var/spack/repos/builtin/packages/tldd/package.py index 8473df4c55..7db26422e7 100644 --- a/var/spack/repos/builtin/packages/tldd/package.py +++ b/var/spack/repos/builtin/packages/tldd/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/tmalign/package.py b/var/spack/repos/builtin/packages/tmalign/package.py index c5c761912d..877caa929f 100644 --- a/var/spack/repos/builtin/packages/tmalign/package.py +++ b/var/spack/repos/builtin/packages/tmalign/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/tmhmm/package.py b/var/spack/repos/builtin/packages/tmhmm/package.py index e1462ab373..32a34ec0e8 100644 --- a/var/spack/repos/builtin/packages/tmhmm/package.py +++ b/var/spack/repos/builtin/packages/tmhmm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/tmux/package.py b/var/spack/repos/builtin/packages/tmux/package.py index 324705e810..d2a39eab0e 100644 --- a/var/spack/repos/builtin/packages/tmux/package.py +++ b/var/spack/repos/builtin/packages/tmux/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/tmuxinator/package.py b/var/spack/repos/builtin/packages/tmuxinator/package.py index 3f472fe785..358d90965e 100644 --- a/var/spack/repos/builtin/packages/tmuxinator/package.py +++ b/var/spack/repos/builtin/packages/tmuxinator/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/tophat/package.py b/var/spack/repos/builtin/packages/tophat/package.py index 2234e9c0a0..3dcf571f87 100644 --- a/var/spack/repos/builtin/packages/tophat/package.py +++ b/var/spack/repos/builtin/packages/tophat/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/tppred/package.py b/var/spack/repos/builtin/packages/tppred/package.py index 1b19461636..75f5209c9f 100644 --- a/var/spack/repos/builtin/packages/tppred/package.py +++ b/var/spack/repos/builtin/packages/tppred/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/tracer/package.py b/var/spack/repos/builtin/packages/tracer/package.py index 9ebeebe11e..9fc7777596 100644 --- a/var/spack/repos/builtin/packages/tracer/package.py +++ b/var/spack/repos/builtin/packages/tracer/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/transabyss/package.py b/var/spack/repos/builtin/packages/transabyss/package.py index fd82270654..c14bff0de7 100644 --- a/var/spack/repos/builtin/packages/transabyss/package.py +++ b/var/spack/repos/builtin/packages/transabyss/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/transdecoder/package.py b/var/spack/repos/builtin/packages/transdecoder/package.py index 8bf3c0f04f..76fa35a0f3 100644 --- a/var/spack/repos/builtin/packages/transdecoder/package.py +++ b/var/spack/repos/builtin/packages/transdecoder/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/transposome/package.py b/var/spack/repos/builtin/packages/transposome/package.py index 459cfd1380..ad7e83d536 100644 --- a/var/spack/repos/builtin/packages/transposome/package.py +++ b/var/spack/repos/builtin/packages/transposome/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/transset/package.py b/var/spack/repos/builtin/packages/transset/package.py index 6e07bd4d27..9b5693ed56 100644 --- a/var/spack/repos/builtin/packages/transset/package.py +++ b/var/spack/repos/builtin/packages/transset/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/trapproto/package.py b/var/spack/repos/builtin/packages/trapproto/package.py index cb578eb11b..8718e15b28 100644 --- a/var/spack/repos/builtin/packages/trapproto/package.py +++ b/var/spack/repos/builtin/packages/trapproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/tree/package.py b/var/spack/repos/builtin/packages/tree/package.py index e39ad7ba7d..978b3b5ae6 100644 --- a/var/spack/repos/builtin/packages/tree/package.py +++ b/var/spack/repos/builtin/packages/tree/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/treesub/package.py b/var/spack/repos/builtin/packages/treesub/package.py index 6cec60fa22..99feceddf8 100644 --- a/var/spack/repos/builtin/packages/treesub/package.py +++ b/var/spack/repos/builtin/packages/treesub/package.py @@ -1,27 +1,7 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * import os diff --git a/var/spack/repos/builtin/packages/trf/package.py b/var/spack/repos/builtin/packages/trf/package.py index ef453c8b1a..c429ccc33d 100644 --- a/var/spack/repos/builtin/packages/trf/package.py +++ b/var/spack/repos/builtin/packages/trf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/triangle/package.py b/var/spack/repos/builtin/packages/triangle/package.py index e77539a264..ad6a775116 100644 --- a/var/spack/repos/builtin/packages/triangle/package.py +++ b/var/spack/repos/builtin/packages/triangle/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index ffa836734f..2170bc4d6d 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os import sys from spack import * diff --git a/var/spack/repos/builtin/packages/trimgalore/package.py b/var/spack/repos/builtin/packages/trimgalore/package.py index 6374c9c6e4..81cee833be 100644 --- a/var/spack/repos/builtin/packages/trimgalore/package.py +++ b/var/spack/repos/builtin/packages/trimgalore/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/trimmomatic/package.py b/var/spack/repos/builtin/packages/trimmomatic/package.py index 41459502ae..0f04596cf8 100644 --- a/var/spack/repos/builtin/packages/trimmomatic/package.py +++ b/var/spack/repos/builtin/packages/trimmomatic/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os.path diff --git a/var/spack/repos/builtin/packages/trinity/package.py b/var/spack/repos/builtin/packages/trinity/package.py index 635e07290f..8e198113d7 100644 --- a/var/spack/repos/builtin/packages/trinity/package.py +++ b/var/spack/repos/builtin/packages/trinity/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/trnascan-se/package.py b/var/spack/repos/builtin/packages/trnascan-se/package.py index 73a2bd5b54..fcd2a3affd 100644 --- a/var/spack/repos/builtin/packages/trnascan-se/package.py +++ b/var/spack/repos/builtin/packages/trnascan-se/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/turbine/package.py b/var/spack/repos/builtin/packages/turbine/package.py index b5abaf337c..7c4a2d7172 100644 --- a/var/spack/repos/builtin/packages/turbine/package.py +++ b/var/spack/repos/builtin/packages/turbine/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/turbomole/package.py b/var/spack/repos/builtin/packages/turbomole/package.py index 1bcae3684a..dfa424055f 100644 --- a/var/spack/repos/builtin/packages/turbomole/package.py +++ b/var/spack/repos/builtin/packages/turbomole/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os import subprocess diff --git a/var/spack/repos/builtin/packages/tut/package.py b/var/spack/repos/builtin/packages/tut/package.py index 02773c8ffa..f39d83807e 100644 --- a/var/spack/repos/builtin/packages/tut/package.py +++ b/var/spack/repos/builtin/packages/tut/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/twm/package.py b/var/spack/repos/builtin/packages/twm/package.py index fd772c6fc2..34facb6666 100644 --- a/var/spack/repos/builtin/packages/twm/package.py +++ b/var/spack/repos/builtin/packages/twm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/tycho2/package.py b/var/spack/repos/builtin/packages/tycho2/package.py index 0eed0746cb..5ac7bc3bb7 100644 --- a/var/spack/repos/builtin/packages/tycho2/package.py +++ b/var/spack/repos/builtin/packages/tycho2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/typhon/package.py b/var/spack/repos/builtin/packages/typhon/package.py index 2fbedf36a8..35cc710b3f 100644 --- a/var/spack/repos/builtin/packages/typhon/package.py +++ b/var/spack/repos/builtin/packages/typhon/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/typhonio/package.py b/var/spack/repos/builtin/packages/typhonio/package.py index 02f87f7746..7b7285106f 100644 --- a/var/spack/repos/builtin/packages/typhonio/package.py +++ b/var/spack/repos/builtin/packages/typhonio/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/uberftp/package.py b/var/spack/repos/builtin/packages/uberftp/package.py index 6ecfefbbdc..85a908c1df 100644 --- a/var/spack/repos/builtin/packages/uberftp/package.py +++ b/var/spack/repos/builtin/packages/uberftp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ucx/package.py b/var/spack/repos/builtin/packages/ucx/package.py index a3dc92a4af..7e85b65194 100644 --- a/var/spack/repos/builtin/packages/ucx/package.py +++ b/var/spack/repos/builtin/packages/ucx/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/udunits2/package.py b/var/spack/repos/builtin/packages/udunits2/package.py index bfd4707490..0b71b5f76c 100644 --- a/var/spack/repos/builtin/packages/udunits2/package.py +++ b/var/spack/repos/builtin/packages/udunits2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ufo-core/package.py b/var/spack/repos/builtin/packages/ufo-core/package.py index 87c561b380..eeaf19c473 100644 --- a/var/spack/repos/builtin/packages/ufo-core/package.py +++ b/var/spack/repos/builtin/packages/ufo-core/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/ufo-filters/package.py b/var/spack/repos/builtin/packages/ufo-filters/package.py index 817ffe32b9..4cfd0c7527 100644 --- a/var/spack/repos/builtin/packages/ufo-filters/package.py +++ b/var/spack/repos/builtin/packages/ufo-filters/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/umpire/package.py b/var/spack/repos/builtin/packages/umpire/package.py index df3628e2da..d3d31f6cd6 100644 --- a/var/spack/repos/builtin/packages/umpire/package.py +++ b/var/spack/repos/builtin/packages/umpire/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/unblur/package.py b/var/spack/repos/builtin/packages/unblur/package.py index eed88307af..2ca644f658 100644 --- a/var/spack/repos/builtin/packages/unblur/package.py +++ b/var/spack/repos/builtin/packages/unblur/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/uncrustify/package.py b/var/spack/repos/builtin/packages/uncrustify/package.py index a30a7b0ae3..6222951641 100644 --- a/var/spack/repos/builtin/packages/uncrustify/package.py +++ b/var/spack/repos/builtin/packages/uncrustify/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/unibilium/package.py b/var/spack/repos/builtin/packages/unibilium/package.py index c9476ff612..dd1d1514ed 100644 --- a/var/spack/repos/builtin/packages/unibilium/package.py +++ b/var/spack/repos/builtin/packages/unibilium/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/unison/package.py b/var/spack/repos/builtin/packages/unison/package.py index cf779e7e9d..55977a23c6 100644 --- a/var/spack/repos/builtin/packages/unison/package.py +++ b/var/spack/repos/builtin/packages/unison/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/units/package.py b/var/spack/repos/builtin/packages/units/package.py index a855969fac..f9e85f98a7 100644 --- a/var/spack/repos/builtin/packages/units/package.py +++ b/var/spack/repos/builtin/packages/units/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/unixodbc/package.py b/var/spack/repos/builtin/packages/unixodbc/package.py index acab343b5c..488c91b553 100644 --- a/var/spack/repos/builtin/packages/unixodbc/package.py +++ b/var/spack/repos/builtin/packages/unixodbc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/unuran/package.py b/var/spack/repos/builtin/packages/unuran/package.py index f3f60644c6..2708882c6e 100644 --- a/var/spack/repos/builtin/packages/unuran/package.py +++ b/var/spack/repos/builtin/packages/unuran/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/unzip/package.py b/var/spack/repos/builtin/packages/unzip/package.py index 5ca5f5d00f..de9cc39c2e 100644 --- a/var/spack/repos/builtin/packages/unzip/package.py +++ b/var/spack/repos/builtin/packages/unzip/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/usearch/package.py b/var/spack/repos/builtin/packages/usearch/package.py index 74f579e5c5..9ff833b907 100644 --- a/var/spack/repos/builtin/packages/usearch/package.py +++ b/var/spack/repos/builtin/packages/usearch/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/util-linux/package.py b/var/spack/repos/builtin/packages/util-linux/package.py index 4ac9d653e9..58b26abd5e 100644 --- a/var/spack/repos/builtin/packages/util-linux/package.py +++ b/var/spack/repos/builtin/packages/util-linux/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/util-macros/package.py b/var/spack/repos/builtin/packages/util-macros/package.py index 18341a3637..2ab1899ce1 100644 --- a/var/spack/repos/builtin/packages/util-macros/package.py +++ b/var/spack/repos/builtin/packages/util-macros/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/uuid/package.py b/var/spack/repos/builtin/packages/uuid/package.py index cd6f54ce71..0c6757e6c1 100644 --- a/var/spack/repos/builtin/packages/uuid/package.py +++ b/var/spack/repos/builtin/packages/uuid/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/valgrind/package.py b/var/spack/repos/builtin/packages/valgrind/package.py index a6009a1cff..04b560165c 100644 --- a/var/spack/repos/builtin/packages/valgrind/package.py +++ b/var/spack/repos/builtin/packages/valgrind/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/vampirtrace/package.py b/var/spack/repos/builtin/packages/vampirtrace/package.py index e999889ffb..19d37118fd 100644 --- a/var/spack/repos/builtin/packages/vampirtrace/package.py +++ b/var/spack/repos/builtin/packages/vampirtrace/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/vardictjava/package.py b/var/spack/repos/builtin/packages/vardictjava/package.py index 0b03a94165..0168e7921c 100644 --- a/var/spack/repos/builtin/packages/vardictjava/package.py +++ b/var/spack/repos/builtin/packages/vardictjava/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob diff --git a/var/spack/repos/builtin/packages/varscan/package.py b/var/spack/repos/builtin/packages/varscan/package.py index 0a67338c39..4793c15fe3 100644 --- a/var/spack/repos/builtin/packages/varscan/package.py +++ b/var/spack/repos/builtin/packages/varscan/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os.path diff --git a/var/spack/repos/builtin/packages/vc/package.py b/var/spack/repos/builtin/packages/vc/package.py index 5190ebaa76..49b4add8e2 100644 --- a/var/spack/repos/builtin/packages/vc/package.py +++ b/var/spack/repos/builtin/packages/vc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/vcftools/package.py b/var/spack/repos/builtin/packages/vcftools/package.py index 1ad9836963..09ac1cb37b 100644 --- a/var/spack/repos/builtin/packages/vcftools/package.py +++ b/var/spack/repos/builtin/packages/vcftools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/vcsh/package.py b/var/spack/repos/builtin/packages/vcsh/package.py index 2223887426..bcc21caa66 100644 --- a/var/spack/repos/builtin/packages/vcsh/package.py +++ b/var/spack/repos/builtin/packages/vcsh/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/vdt/package.py b/var/spack/repos/builtin/packages/vdt/package.py index d8dd0ed24c..7c2fc4eebd 100644 --- a/var/spack/repos/builtin/packages/vdt/package.py +++ b/var/spack/repos/builtin/packages/vdt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/vecgeom/package.py b/var/spack/repos/builtin/packages/vecgeom/package.py index c8b589e6da..c4ba864f8b 100644 --- a/var/spack/repos/builtin/packages/vecgeom/package.py +++ b/var/spack/repos/builtin/packages/vecgeom/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import platform diff --git a/var/spack/repos/builtin/packages/veclibfort/package.py b/var/spack/repos/builtin/packages/veclibfort/package.py index 5297d2d7d9..988e59adf3 100644 --- a/var/spack/repos/builtin/packages/veclibfort/package.py +++ b/var/spack/repos/builtin/packages/veclibfort/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/vegas2/package.py b/var/spack/repos/builtin/packages/vegas2/package.py index 80264b235e..d6d4e7f6cf 100644 --- a/var/spack/repos/builtin/packages/vegas2/package.py +++ b/var/spack/repos/builtin/packages/vegas2/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/veloc/package.py b/var/spack/repos/builtin/packages/veloc/package.py index 18ba133f04..72b1ff746e 100644 --- a/var/spack/repos/builtin/packages/veloc/package.py +++ b/var/spack/repos/builtin/packages/veloc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/velvet/package.py b/var/spack/repos/builtin/packages/velvet/package.py index 26066a4e78..8813cfe16c 100644 --- a/var/spack/repos/builtin/packages/velvet/package.py +++ b/var/spack/repos/builtin/packages/velvet/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/verilator/package.py b/var/spack/repos/builtin/packages/verilator/package.py index 3b6b08da1e..b993071266 100644 --- a/var/spack/repos/builtin/packages/verilator/package.py +++ b/var/spack/repos/builtin/packages/verilator/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/verrou/package.py b/var/spack/repos/builtin/packages/verrou/package.py index 6ff2cf642f..d0cde05339 100644 --- a/var/spack/repos/builtin/packages/verrou/package.py +++ b/var/spack/repos/builtin/packages/verrou/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob import os diff --git a/var/spack/repos/builtin/packages/videoproto/package.py b/var/spack/repos/builtin/packages/videoproto/package.py index 859729c17f..4f093034b5 100644 --- a/var/spack/repos/builtin/packages/videoproto/package.py +++ b/var/spack/repos/builtin/packages/videoproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/viennarna/package.py b/var/spack/repos/builtin/packages/viennarna/package.py index b1773d9b3b..d96d32ec64 100644 --- a/var/spack/repos/builtin/packages/viennarna/package.py +++ b/var/spack/repos/builtin/packages/viennarna/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/viewres/package.py b/var/spack/repos/builtin/packages/viewres/package.py index 2f2051c271..06108c46ca 100644 --- a/var/spack/repos/builtin/packages/viewres/package.py +++ b/var/spack/repos/builtin/packages/viewres/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/vim/package.py b/var/spack/repos/builtin/packages/vim/package.py index e1c6d8bc55..84c6372ab9 100644 --- a/var/spack/repos/builtin/packages/vim/package.py +++ b/var/spack/repos/builtin/packages/vim/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/virtualgl/package.py b/var/spack/repos/builtin/packages/virtualgl/package.py index 6ee61a312e..9ccef35acb 100644 --- a/var/spack/repos/builtin/packages/virtualgl/package.py +++ b/var/spack/repos/builtin/packages/virtualgl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # from spack import * diff --git a/var/spack/repos/builtin/packages/visit/package.py b/var/spack/repos/builtin/packages/visit/package.py index f4d8ee082f..96c7b1dfe1 100644 --- a/var/spack/repos/builtin/packages/visit/package.py +++ b/var/spack/repos/builtin/packages/visit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/vizglow/package.py b/var/spack/repos/builtin/packages/vizglow/package.py index 835c0250d7..4a8db820e6 100644 --- a/var/spack/repos/builtin/packages/vizglow/package.py +++ b/var/spack/repos/builtin/packages/vizglow/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob import os diff --git a/var/spack/repos/builtin/packages/vmatch/package.py b/var/spack/repos/builtin/packages/vmatch/package.py index 40fc0f5753..62b38a8667 100644 --- a/var/spack/repos/builtin/packages/vmatch/package.py +++ b/var/spack/repos/builtin/packages/vmatch/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/voropp/package.py b/var/spack/repos/builtin/packages/voropp/package.py index ae952990b2..e0a63f6f8e 100644 --- a/var/spack/repos/builtin/packages/voropp/package.py +++ b/var/spack/repos/builtin/packages/voropp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/votca-csg/package.py b/var/spack/repos/builtin/packages/votca-csg/package.py index 011137cc37..ca2f1b39b3 100644 --- a/var/spack/repos/builtin/packages/votca-csg/package.py +++ b/var/spack/repos/builtin/packages/votca-csg/package.py @@ -1,26 +1,8 @@ -############################################################################## -# Copyright (c) 2017, The VOTCA Development Team (http://www.votca.org) +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/votca-ctp/package.py b/var/spack/repos/builtin/packages/votca-ctp/package.py index a1a95a7048..3cbd2e0c9f 100644 --- a/var/spack/repos/builtin/packages/votca-ctp/package.py +++ b/var/spack/repos/builtin/packages/votca-ctp/package.py @@ -1,26 +1,8 @@ -############################################################################## -# Copyright (c) 2017-2018, The VOTCA Development Team (http://www.votca.org) +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/votca-tools/package.py b/var/spack/repos/builtin/packages/votca-tools/package.py index 5c43d13b51..1f0a67ee3e 100644 --- a/var/spack/repos/builtin/packages/votca-tools/package.py +++ b/var/spack/repos/builtin/packages/votca-tools/package.py @@ -1,26 +1,8 @@ -############################################################################## -# Copyright (c) 2017-2018, The VOTCA Development Team (http://www.votca.org) +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/votca-xtp/package.py b/var/spack/repos/builtin/packages/votca-xtp/package.py index 2d0408cb87..14a323de71 100644 --- a/var/spack/repos/builtin/packages/votca-xtp/package.py +++ b/var/spack/repos/builtin/packages/votca-xtp/package.py @@ -1,26 +1,8 @@ -############################################################################## -# Copyright (c) 2017-2018, The VOTCA Development Team (http://www.votca.org) +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/vpfft/package.py b/var/spack/repos/builtin/packages/vpfft/package.py index 5035021823..0d58430d7d 100644 --- a/var/spack/repos/builtin/packages/vpfft/package.py +++ b/var/spack/repos/builtin/packages/vpfft/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/vpic/package.py b/var/spack/repos/builtin/packages/vpic/package.py index db229fe0ea..5be359be28 100644 --- a/var/spack/repos/builtin/packages/vpic/package.py +++ b/var/spack/repos/builtin/packages/vpic/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/vsearch/package.py b/var/spack/repos/builtin/packages/vsearch/package.py index d41d5724f4..892dcfb9ec 100644 --- a/var/spack/repos/builtin/packages/vsearch/package.py +++ b/var/spack/repos/builtin/packages/vsearch/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/vt/package.py b/var/spack/repos/builtin/packages/vt/package.py index 33077d900e..b3b8305a9c 100644 --- a/var/spack/repos/builtin/packages/vt/package.py +++ b/var/spack/repos/builtin/packages/vt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py index 5d9650c16a..110ff01457 100644 --- a/var/spack/repos/builtin/packages/vtk/package.py +++ b/var/spack/repos/builtin/packages/vtk/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os from spack import * diff --git a/var/spack/repos/builtin/packages/vtkh/package.py b/var/spack/repos/builtin/packages/vtkh/package.py index 2f16afa901..f42322332a 100644 --- a/var/spack/repos/builtin/packages/vtkh/package.py +++ b/var/spack/repos/builtin/packages/vtkh/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/vtkm/package.py b/var/spack/repos/builtin/packages/vtkm/package.py index a9c76cd5ee..ded4a551ac 100644 --- a/var/spack/repos/builtin/packages/vtkm/package.py +++ b/var/spack/repos/builtin/packages/vtkm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/wannier90/package.py b/var/spack/repos/builtin/packages/wannier90/package.py index f8b7b9adfc..ec8a47620c 100644 --- a/var/spack/repos/builtin/packages/wannier90/package.py +++ b/var/spack/repos/builtin/packages/wannier90/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import inspect import os.path diff --git a/var/spack/repos/builtin/packages/wcslib/package.py b/var/spack/repos/builtin/packages/wcslib/package.py index 95196736cf..a3b5a56a68 100644 --- a/var/spack/repos/builtin/packages/wcslib/package.py +++ b/var/spack/repos/builtin/packages/wcslib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/wget/package.py b/var/spack/repos/builtin/packages/wget/package.py index 85c750252a..2ee6ea4171 100644 --- a/var/spack/repos/builtin/packages/wget/package.py +++ b/var/spack/repos/builtin/packages/wget/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/wgsim/package.py b/var/spack/repos/builtin/packages/wgsim/package.py index cf825ec5da..7caa098346 100644 --- a/var/spack/repos/builtin/packages/wgsim/package.py +++ b/var/spack/repos/builtin/packages/wgsim/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/windowswmproto/package.py b/var/spack/repos/builtin/packages/windowswmproto/package.py index 4f58f1a75c..d893604996 100644 --- a/var/spack/repos/builtin/packages/windowswmproto/package.py +++ b/var/spack/repos/builtin/packages/windowswmproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/wireshark/package.py b/var/spack/repos/builtin/packages/wireshark/package.py index 27b049a31f..73640dc246 100644 --- a/var/spack/repos/builtin/packages/wireshark/package.py +++ b/var/spack/repos/builtin/packages/wireshark/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob diff --git a/var/spack/repos/builtin/packages/workrave/package.py b/var/spack/repos/builtin/packages/workrave/package.py index a11fd9523e..fdbc2607c1 100644 --- a/var/spack/repos/builtin/packages/workrave/package.py +++ b/var/spack/repos/builtin/packages/workrave/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/wt/package.py b/var/spack/repos/builtin/packages/wt/package.py index e116ca6c0a..991a3fdc9f 100644 --- a/var/spack/repos/builtin/packages/wt/package.py +++ b/var/spack/repos/builtin/packages/wt/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/wx/package.py b/var/spack/repos/builtin/packages/wx/package.py index a3a119185e..284dab072c 100644 --- a/var/spack/repos/builtin/packages/wx/package.py +++ b/var/spack/repos/builtin/packages/wx/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/wxpropgrid/package.py b/var/spack/repos/builtin/packages/wxpropgrid/package.py index caabec4ca7..090655f67a 100644 --- a/var/spack/repos/builtin/packages/wxpropgrid/package.py +++ b/var/spack/repos/builtin/packages/wxpropgrid/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/x11perf/package.py b/var/spack/repos/builtin/packages/x11perf/package.py index 21bedfe824..a52dcfc90b 100644 --- a/var/spack/repos/builtin/packages/x11perf/package.py +++ b/var/spack/repos/builtin/packages/x11perf/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xapian-core/package.py b/var/spack/repos/builtin/packages/xapian-core/package.py index 8e9cc9de67..c36e4e61fc 100644 --- a/var/spack/repos/builtin/packages/xapian-core/package.py +++ b/var/spack/repos/builtin/packages/xapian-core/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xauth/package.py b/var/spack/repos/builtin/packages/xauth/package.py index ff1394f0e7..d247edc968 100644 --- a/var/spack/repos/builtin/packages/xauth/package.py +++ b/var/spack/repos/builtin/packages/xauth/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xbacklight/package.py b/var/spack/repos/builtin/packages/xbacklight/package.py index 1a2f4c2681..e2cc57cb17 100644 --- a/var/spack/repos/builtin/packages/xbacklight/package.py +++ b/var/spack/repos/builtin/packages/xbacklight/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xbiff/package.py b/var/spack/repos/builtin/packages/xbiff/package.py index c1d2c1d754..19315e792b 100644 --- a/var/spack/repos/builtin/packages/xbiff/package.py +++ b/var/spack/repos/builtin/packages/xbiff/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xbitmaps/package.py b/var/spack/repos/builtin/packages/xbitmaps/package.py index 2237f3105f..86823338b7 100644 --- a/var/spack/repos/builtin/packages/xbitmaps/package.py +++ b/var/spack/repos/builtin/packages/xbitmaps/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xbraid/package.py b/var/spack/repos/builtin/packages/xbraid/package.py index 548750282c..81d85c401a 100644 --- a/var/spack/repos/builtin/packages/xbraid/package.py +++ b/var/spack/repos/builtin/packages/xbraid/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import glob import os.path diff --git a/var/spack/repos/builtin/packages/xcalc/package.py b/var/spack/repos/builtin/packages/xcalc/package.py index fff485b33b..2ee66d7b98 100644 --- a/var/spack/repos/builtin/packages/xcalc/package.py +++ b/var/spack/repos/builtin/packages/xcalc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xcb-demo/package.py b/var/spack/repos/builtin/packages/xcb-demo/package.py index 0ae8df30d3..421d97dbb7 100644 --- a/var/spack/repos/builtin/packages/xcb-demo/package.py +++ b/var/spack/repos/builtin/packages/xcb-demo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xcb-proto/package.py b/var/spack/repos/builtin/packages/xcb-proto/package.py index b9f042452e..ed9667f7c1 100644 --- a/var/spack/repos/builtin/packages/xcb-proto/package.py +++ b/var/spack/repos/builtin/packages/xcb-proto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xcb-util-cursor/package.py b/var/spack/repos/builtin/packages/xcb-util-cursor/package.py index cd80ce7ee5..2e79d358ac 100644 --- a/var/spack/repos/builtin/packages/xcb-util-cursor/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-cursor/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xcb-util-errors/package.py b/var/spack/repos/builtin/packages/xcb-util-errors/package.py index 258b325524..ca2b68af00 100644 --- a/var/spack/repos/builtin/packages/xcb-util-errors/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-errors/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xcb-util-image/package.py b/var/spack/repos/builtin/packages/xcb-util-image/package.py index 605526b8cb..99eaea5d9b 100644 --- a/var/spack/repos/builtin/packages/xcb-util-image/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-image/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xcb-util-keysyms/package.py b/var/spack/repos/builtin/packages/xcb-util-keysyms/package.py index 22e1d3c776..11becf0611 100644 --- a/var/spack/repos/builtin/packages/xcb-util-keysyms/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-keysyms/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xcb-util-renderutil/package.py b/var/spack/repos/builtin/packages/xcb-util-renderutil/package.py index 5625a3a48d..66500d4e6a 100644 --- a/var/spack/repos/builtin/packages/xcb-util-renderutil/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-renderutil/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xcb-util-wm/package.py b/var/spack/repos/builtin/packages/xcb-util-wm/package.py index 6d7d168676..65e7a1de8a 100644 --- a/var/spack/repos/builtin/packages/xcb-util-wm/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-wm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xcb-util-xrm/package.py b/var/spack/repos/builtin/packages/xcb-util-xrm/package.py index f1d53071dd..ceb6aec837 100644 --- a/var/spack/repos/builtin/packages/xcb-util-xrm/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-xrm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xcb-util/package.py b/var/spack/repos/builtin/packages/xcb-util/package.py index 81710b7dde..e8526b962f 100644 --- a/var/spack/repos/builtin/packages/xcb-util/package.py +++ b/var/spack/repos/builtin/packages/xcb-util/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xclip/package.py b/var/spack/repos/builtin/packages/xclip/package.py index 43b1b79081..a18a8bf7ae 100644 --- a/var/spack/repos/builtin/packages/xclip/package.py +++ b/var/spack/repos/builtin/packages/xclip/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xclipboard/package.py b/var/spack/repos/builtin/packages/xclipboard/package.py index f3c32714c8..a4917f3055 100644 --- a/var/spack/repos/builtin/packages/xclipboard/package.py +++ b/var/spack/repos/builtin/packages/xclipboard/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xclock/package.py b/var/spack/repos/builtin/packages/xclock/package.py index c8d21885f1..15cbcc2ba4 100644 --- a/var/spack/repos/builtin/packages/xclock/package.py +++ b/var/spack/repos/builtin/packages/xclock/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xcmiscproto/package.py b/var/spack/repos/builtin/packages/xcmiscproto/package.py index e658883758..f478a2fe9f 100644 --- a/var/spack/repos/builtin/packages/xcmiscproto/package.py +++ b/var/spack/repos/builtin/packages/xcmiscproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xcmsdb/package.py b/var/spack/repos/builtin/packages/xcmsdb/package.py index 9c73581eb9..0be4808cd8 100644 --- a/var/spack/repos/builtin/packages/xcmsdb/package.py +++ b/var/spack/repos/builtin/packages/xcmsdb/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xcompmgr/package.py b/var/spack/repos/builtin/packages/xcompmgr/package.py index 05ab4e3b53..3af77c565a 100644 --- a/var/spack/repos/builtin/packages/xcompmgr/package.py +++ b/var/spack/repos/builtin/packages/xcompmgr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xconsole/package.py b/var/spack/repos/builtin/packages/xconsole/package.py index 7fd8bf810f..519d7447b5 100644 --- a/var/spack/repos/builtin/packages/xconsole/package.py +++ b/var/spack/repos/builtin/packages/xconsole/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xcursor-themes/package.py b/var/spack/repos/builtin/packages/xcursor-themes/package.py index 82d8f37c2d..4b0eaa7234 100644 --- a/var/spack/repos/builtin/packages/xcursor-themes/package.py +++ b/var/spack/repos/builtin/packages/xcursor-themes/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xcursorgen/package.py b/var/spack/repos/builtin/packages/xcursorgen/package.py index 45f2e0af6f..5751365007 100644 --- a/var/spack/repos/builtin/packages/xcursorgen/package.py +++ b/var/spack/repos/builtin/packages/xcursorgen/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xdbedizzy/package.py b/var/spack/repos/builtin/packages/xdbedizzy/package.py index 4fdccba817..053c7e9954 100644 --- a/var/spack/repos/builtin/packages/xdbedizzy/package.py +++ b/var/spack/repos/builtin/packages/xdbedizzy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xditview/package.py b/var/spack/repos/builtin/packages/xditview/package.py index f4cfd71704..c8c5294df1 100644 --- a/var/spack/repos/builtin/packages/xditview/package.py +++ b/var/spack/repos/builtin/packages/xditview/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xdm/package.py b/var/spack/repos/builtin/packages/xdm/package.py index 8fade37f50..90cdaeb0a6 100644 --- a/var/spack/repos/builtin/packages/xdm/package.py +++ b/var/spack/repos/builtin/packages/xdm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xdpyinfo/package.py b/var/spack/repos/builtin/packages/xdpyinfo/package.py index cc71968b29..bc4259a1ba 100644 --- a/var/spack/repos/builtin/packages/xdpyinfo/package.py +++ b/var/spack/repos/builtin/packages/xdpyinfo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xdriinfo/package.py b/var/spack/repos/builtin/packages/xdriinfo/package.py index ce844ed9cc..ed58cdb505 100644 --- a/var/spack/repos/builtin/packages/xdriinfo/package.py +++ b/var/spack/repos/builtin/packages/xdriinfo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xedit/package.py b/var/spack/repos/builtin/packages/xedit/package.py index fe0f021146..de2a345cfb 100644 --- a/var/spack/repos/builtin/packages/xedit/package.py +++ b/var/spack/repos/builtin/packages/xedit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xerces-c/package.py b/var/spack/repos/builtin/packages/xerces-c/package.py index 7b321f61bd..a316e14d30 100644 --- a/var/spack/repos/builtin/packages/xerces-c/package.py +++ b/var/spack/repos/builtin/packages/xerces-c/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys diff --git a/var/spack/repos/builtin/packages/xev/package.py b/var/spack/repos/builtin/packages/xev/package.py index 3e7b3d06f1..94b7802885 100644 --- a/var/spack/repos/builtin/packages/xev/package.py +++ b/var/spack/repos/builtin/packages/xev/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xextproto/package.py b/var/spack/repos/builtin/packages/xextproto/package.py index 7d12b3cdf6..dbb83e13dc 100644 --- a/var/spack/repos/builtin/packages/xextproto/package.py +++ b/var/spack/repos/builtin/packages/xextproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xeyes/package.py b/var/spack/repos/builtin/packages/xeyes/package.py index 10a15460b8..2487ecf8df 100644 --- a/var/spack/repos/builtin/packages/xeyes/package.py +++ b/var/spack/repos/builtin/packages/xeyes/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xf86bigfontproto/package.py b/var/spack/repos/builtin/packages/xf86bigfontproto/package.py index ca52eb31d5..212c8a9072 100644 --- a/var/spack/repos/builtin/packages/xf86bigfontproto/package.py +++ b/var/spack/repos/builtin/packages/xf86bigfontproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xf86dga/package.py b/var/spack/repos/builtin/packages/xf86dga/package.py index e6be26ee5b..ec4ff65565 100644 --- a/var/spack/repos/builtin/packages/xf86dga/package.py +++ b/var/spack/repos/builtin/packages/xf86dga/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xf86dgaproto/package.py b/var/spack/repos/builtin/packages/xf86dgaproto/package.py index c7d77f497b..b42c3bdb8d 100644 --- a/var/spack/repos/builtin/packages/xf86dgaproto/package.py +++ b/var/spack/repos/builtin/packages/xf86dgaproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xf86driproto/package.py b/var/spack/repos/builtin/packages/xf86driproto/package.py index 1d321f7f54..16403e2b93 100644 --- a/var/spack/repos/builtin/packages/xf86driproto/package.py +++ b/var/spack/repos/builtin/packages/xf86driproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xf86miscproto/package.py b/var/spack/repos/builtin/packages/xf86miscproto/package.py index d3fa371a00..67c46f15f3 100644 --- a/var/spack/repos/builtin/packages/xf86miscproto/package.py +++ b/var/spack/repos/builtin/packages/xf86miscproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xf86rushproto/package.py b/var/spack/repos/builtin/packages/xf86rushproto/package.py index aaf0c31bcb..3c9b0cf66c 100644 --- a/var/spack/repos/builtin/packages/xf86rushproto/package.py +++ b/var/spack/repos/builtin/packages/xf86rushproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xf86vidmodeproto/package.py b/var/spack/repos/builtin/packages/xf86vidmodeproto/package.py index 4ee977fb27..993d203ecc 100644 --- a/var/spack/repos/builtin/packages/xf86vidmodeproto/package.py +++ b/var/spack/repos/builtin/packages/xf86vidmodeproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xfd/package.py b/var/spack/repos/builtin/packages/xfd/package.py index 57fa903e47..ddec96e7a7 100644 --- a/var/spack/repos/builtin/packages/xfd/package.py +++ b/var/spack/repos/builtin/packages/xfd/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xfindproxy/package.py b/var/spack/repos/builtin/packages/xfindproxy/package.py index 9428af5036..d01aaf633b 100644 --- a/var/spack/repos/builtin/packages/xfindproxy/package.py +++ b/var/spack/repos/builtin/packages/xfindproxy/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xfontsel/package.py b/var/spack/repos/builtin/packages/xfontsel/package.py index 3f3b0ef1af..babdee0cf7 100644 --- a/var/spack/repos/builtin/packages/xfontsel/package.py +++ b/var/spack/repos/builtin/packages/xfontsel/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xfs/package.py b/var/spack/repos/builtin/packages/xfs/package.py index 918a18e471..f831cdf2b4 100644 --- a/var/spack/repos/builtin/packages/xfs/package.py +++ b/var/spack/repos/builtin/packages/xfs/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xfsinfo/package.py b/var/spack/repos/builtin/packages/xfsinfo/package.py index a9e6a8fdce..cf318828c2 100644 --- a/var/spack/repos/builtin/packages/xfsinfo/package.py +++ b/var/spack/repos/builtin/packages/xfsinfo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xfwp/package.py b/var/spack/repos/builtin/packages/xfwp/package.py index 9e2e6b351b..da418e6396 100644 --- a/var/spack/repos/builtin/packages/xfwp/package.py +++ b/var/spack/repos/builtin/packages/xfwp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xgamma/package.py b/var/spack/repos/builtin/packages/xgamma/package.py index a9b41f9885..bb0bf65211 100644 --- a/var/spack/repos/builtin/packages/xgamma/package.py +++ b/var/spack/repos/builtin/packages/xgamma/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xgc/package.py b/var/spack/repos/builtin/packages/xgc/package.py index 9e4cbfcf7c..8c9dbdc084 100644 --- a/var/spack/repos/builtin/packages/xgc/package.py +++ b/var/spack/repos/builtin/packages/xgc/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xhmm/package.py b/var/spack/repos/builtin/packages/xhmm/package.py index 7e5d16b12a..3538641da6 100644 --- a/var/spack/repos/builtin/packages/xhmm/package.py +++ b/var/spack/repos/builtin/packages/xhmm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xhost/package.py b/var/spack/repos/builtin/packages/xhost/package.py index 9f7bcf1234..5affa15df6 100644 --- a/var/spack/repos/builtin/packages/xhost/package.py +++ b/var/spack/repos/builtin/packages/xhost/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xineramaproto/package.py b/var/spack/repos/builtin/packages/xineramaproto/package.py index 03b6b7949b..7a6e341bdd 100644 --- a/var/spack/repos/builtin/packages/xineramaproto/package.py +++ b/var/spack/repos/builtin/packages/xineramaproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xinit/package.py b/var/spack/repos/builtin/packages/xinit/package.py index 4d170cf319..66a61f33e0 100644 --- a/var/spack/repos/builtin/packages/xinit/package.py +++ b/var/spack/repos/builtin/packages/xinit/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xinput/package.py b/var/spack/repos/builtin/packages/xinput/package.py index 0a3f7a9f25..88adddf090 100644 --- a/var/spack/repos/builtin/packages/xinput/package.py +++ b/var/spack/repos/builtin/packages/xinput/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xios/package.py b/var/spack/repos/builtin/packages/xios/package.py index 665aee5e99..90ea16b10e 100644 --- a/var/spack/repos/builtin/packages/xios/package.py +++ b/var/spack/repos/builtin/packages/xios/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + # from spack import * import os diff --git a/var/spack/repos/builtin/packages/xkbcomp/package.py b/var/spack/repos/builtin/packages/xkbcomp/package.py index e19d004ee0..ee858b4427 100644 --- a/var/spack/repos/builtin/packages/xkbcomp/package.py +++ b/var/spack/repos/builtin/packages/xkbcomp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xkbdata/package.py b/var/spack/repos/builtin/packages/xkbdata/package.py index d07c6cbc12..d937e91815 100644 --- a/var/spack/repos/builtin/packages/xkbdata/package.py +++ b/var/spack/repos/builtin/packages/xkbdata/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xkbevd/package.py b/var/spack/repos/builtin/packages/xkbevd/package.py index ddd3dee54c..a0bef99bad 100644 --- a/var/spack/repos/builtin/packages/xkbevd/package.py +++ b/var/spack/repos/builtin/packages/xkbevd/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xkbprint/package.py b/var/spack/repos/builtin/packages/xkbprint/package.py index e369739878..3af59469a2 100644 --- a/var/spack/repos/builtin/packages/xkbprint/package.py +++ b/var/spack/repos/builtin/packages/xkbprint/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xkbutils/package.py b/var/spack/repos/builtin/packages/xkbutils/package.py index fd0f1c02af..ccf31b1512 100644 --- a/var/spack/repos/builtin/packages/xkbutils/package.py +++ b/var/spack/repos/builtin/packages/xkbutils/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xkeyboard-config/package.py b/var/spack/repos/builtin/packages/xkeyboard-config/package.py index 49bc63daaf..3e572148d5 100644 --- a/var/spack/repos/builtin/packages/xkeyboard-config/package.py +++ b/var/spack/repos/builtin/packages/xkeyboard-config/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xkill/package.py b/var/spack/repos/builtin/packages/xkill/package.py index ef2b3bf490..562f88f578 100644 --- a/var/spack/repos/builtin/packages/xkill/package.py +++ b/var/spack/repos/builtin/packages/xkill/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xload/package.py b/var/spack/repos/builtin/packages/xload/package.py index ea6b6886a3..5326b9bd57 100644 --- a/var/spack/repos/builtin/packages/xload/package.py +++ b/var/spack/repos/builtin/packages/xload/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xlogo/package.py b/var/spack/repos/builtin/packages/xlogo/package.py index 4134a676cf..5b5401fcf1 100644 --- a/var/spack/repos/builtin/packages/xlogo/package.py +++ b/var/spack/repos/builtin/packages/xlogo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xlsatoms/package.py b/var/spack/repos/builtin/packages/xlsatoms/package.py index e16d61d27f..d27bc3e574 100644 --- a/var/spack/repos/builtin/packages/xlsatoms/package.py +++ b/var/spack/repos/builtin/packages/xlsatoms/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xlsclients/package.py b/var/spack/repos/builtin/packages/xlsclients/package.py index 96f5a9798d..bc99dc1352 100644 --- a/var/spack/repos/builtin/packages/xlsclients/package.py +++ b/var/spack/repos/builtin/packages/xlsclients/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xlsfonts/package.py b/var/spack/repos/builtin/packages/xlsfonts/package.py index d32ba86cff..177b434604 100644 --- a/var/spack/repos/builtin/packages/xlsfonts/package.py +++ b/var/spack/repos/builtin/packages/xlsfonts/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xmag/package.py b/var/spack/repos/builtin/packages/xmag/package.py index 2e09582662..bdbf014494 100644 --- a/var/spack/repos/builtin/packages/xmag/package.py +++ b/var/spack/repos/builtin/packages/xmag/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xman/package.py b/var/spack/repos/builtin/packages/xman/package.py index f941885aca..484f3b75ae 100644 --- a/var/spack/repos/builtin/packages/xman/package.py +++ b/var/spack/repos/builtin/packages/xman/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xmessage/package.py b/var/spack/repos/builtin/packages/xmessage/package.py index 3c86cf0d77..48b1ce61c8 100644 --- a/var/spack/repos/builtin/packages/xmessage/package.py +++ b/var/spack/repos/builtin/packages/xmessage/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xmh/package.py b/var/spack/repos/builtin/packages/xmh/package.py index 167c888d32..096c0b7cc8 100644 --- a/var/spack/repos/builtin/packages/xmh/package.py +++ b/var/spack/repos/builtin/packages/xmh/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xmlf90/package.py b/var/spack/repos/builtin/packages/xmlf90/package.py index 005a844e9d..09091adcfb 100644 --- a/var/spack/repos/builtin/packages/xmlf90/package.py +++ b/var/spack/repos/builtin/packages/xmlf90/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xmlto/package.py b/var/spack/repos/builtin/packages/xmlto/package.py index 3d2af2af40..af70c2f70d 100644 --- a/var/spack/repos/builtin/packages/xmlto/package.py +++ b/var/spack/repos/builtin/packages/xmlto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xmodmap/package.py b/var/spack/repos/builtin/packages/xmodmap/package.py index 9d660188d2..13a8527bb8 100644 --- a/var/spack/repos/builtin/packages/xmodmap/package.py +++ b/var/spack/repos/builtin/packages/xmodmap/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xmore/package.py b/var/spack/repos/builtin/packages/xmore/package.py index 39e926c52b..597d7c0e8b 100644 --- a/var/spack/repos/builtin/packages/xmore/package.py +++ b/var/spack/repos/builtin/packages/xmore/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xorg-cf-files/package.py b/var/spack/repos/builtin/packages/xorg-cf-files/package.py index 6e93885cae..ef1befcb4b 100644 --- a/var/spack/repos/builtin/packages/xorg-cf-files/package.py +++ b/var/spack/repos/builtin/packages/xorg-cf-files/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xorg-docs/package.py b/var/spack/repos/builtin/packages/xorg-docs/package.py index b1541effce..0a0b94fc90 100644 --- a/var/spack/repos/builtin/packages/xorg-docs/package.py +++ b/var/spack/repos/builtin/packages/xorg-docs/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xorg-gtest/package.py b/var/spack/repos/builtin/packages/xorg-gtest/package.py index 8da1b945b7..49953792b6 100644 --- a/var/spack/repos/builtin/packages/xorg-gtest/package.py +++ b/var/spack/repos/builtin/packages/xorg-gtest/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xorg-server/package.py b/var/spack/repos/builtin/packages/xorg-server/package.py index bb1e1a26a1..14d885a997 100644 --- a/var/spack/repos/builtin/packages/xorg-server/package.py +++ b/var/spack/repos/builtin/packages/xorg-server/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xorg-sgml-doctools/package.py b/var/spack/repos/builtin/packages/xorg-sgml-doctools/package.py index 6c20c0fea1..53f2425dc5 100644 --- a/var/spack/repos/builtin/packages/xorg-sgml-doctools/package.py +++ b/var/spack/repos/builtin/packages/xorg-sgml-doctools/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xphelloworld/package.py b/var/spack/repos/builtin/packages/xphelloworld/package.py index 7316295c24..c6ac5d62ee 100644 --- a/var/spack/repos/builtin/packages/xphelloworld/package.py +++ b/var/spack/repos/builtin/packages/xphelloworld/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xplor-nih/package.py b/var/spack/repos/builtin/packages/xplor-nih/package.py index 76277142b5..bdfd68b1b2 100644 --- a/var/spack/repos/builtin/packages/xplor-nih/package.py +++ b/var/spack/repos/builtin/packages/xplor-nih/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/xplsprinters/package.py b/var/spack/repos/builtin/packages/xplsprinters/package.py index ef58f60752..5347c9a9e9 100644 --- a/var/spack/repos/builtin/packages/xplsprinters/package.py +++ b/var/spack/repos/builtin/packages/xplsprinters/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xpr/package.py b/var/spack/repos/builtin/packages/xpr/package.py index 6ed5cda7f3..a5de719915 100644 --- a/var/spack/repos/builtin/packages/xpr/package.py +++ b/var/spack/repos/builtin/packages/xpr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xprehashprinterlist/package.py b/var/spack/repos/builtin/packages/xprehashprinterlist/package.py index d73ac5a531..bc934a7391 100644 --- a/var/spack/repos/builtin/packages/xprehashprinterlist/package.py +++ b/var/spack/repos/builtin/packages/xprehashprinterlist/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xprop/package.py b/var/spack/repos/builtin/packages/xprop/package.py index f873e108dc..6414b9784c 100644 --- a/var/spack/repos/builtin/packages/xprop/package.py +++ b/var/spack/repos/builtin/packages/xprop/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xproto/package.py b/var/spack/repos/builtin/packages/xproto/package.py index 24fcf72d55..bd45c4cf8a 100644 --- a/var/spack/repos/builtin/packages/xproto/package.py +++ b/var/spack/repos/builtin/packages/xproto/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xproxymanagementprotocol/package.py b/var/spack/repos/builtin/packages/xproxymanagementprotocol/package.py index 15e037913d..4a35b33993 100644 --- a/var/spack/repos/builtin/packages/xproxymanagementprotocol/package.py +++ b/var/spack/repos/builtin/packages/xproxymanagementprotocol/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xqilla/package.py b/var/spack/repos/builtin/packages/xqilla/package.py index 4f4fdd154e..2949dcda73 100644 --- a/var/spack/repos/builtin/packages/xqilla/package.py +++ b/var/spack/repos/builtin/packages/xqilla/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xrandr/package.py b/var/spack/repos/builtin/packages/xrandr/package.py index 92af005ca7..2a5544df8d 100644 --- a/var/spack/repos/builtin/packages/xrandr/package.py +++ b/var/spack/repos/builtin/packages/xrandr/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xrdb/package.py b/var/spack/repos/builtin/packages/xrdb/package.py index cbb48bbca4..a3ae50cc95 100644 --- a/var/spack/repos/builtin/packages/xrdb/package.py +++ b/var/spack/repos/builtin/packages/xrdb/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xrefresh/package.py b/var/spack/repos/builtin/packages/xrefresh/package.py index 1bc54c44a6..c4a97f718f 100644 --- a/var/spack/repos/builtin/packages/xrefresh/package.py +++ b/var/spack/repos/builtin/packages/xrefresh/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xrootd/package.py b/var/spack/repos/builtin/packages/xrootd/package.py index 24c6c513ff..8a14be9905 100644 --- a/var/spack/repos/builtin/packages/xrootd/package.py +++ b/var/spack/repos/builtin/packages/xrootd/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xrx/package.py b/var/spack/repos/builtin/packages/xrx/package.py index 5020f181a8..3b1a3f6a4f 100644 --- a/var/spack/repos/builtin/packages/xrx/package.py +++ b/var/spack/repos/builtin/packages/xrx/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xsbench/package.py b/var/spack/repos/builtin/packages/xsbench/package.py index ebad0f683e..e8010c135e 100644 --- a/var/spack/repos/builtin/packages/xsbench/package.py +++ b/var/spack/repos/builtin/packages/xsbench/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xscope/package.py b/var/spack/repos/builtin/packages/xscope/package.py index c9b2736387..bea4a1d73f 100644 --- a/var/spack/repos/builtin/packages/xscope/package.py +++ b/var/spack/repos/builtin/packages/xscope/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xsd/package.py b/var/spack/repos/builtin/packages/xsd/package.py index a93d2ec19b..3fb1a74dcd 100644 --- a/var/spack/repos/builtin/packages/xsd/package.py +++ b/var/spack/repos/builtin/packages/xsd/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py index 41a2c8bcd5..187b3e7744 100644 --- a/var/spack/repos/builtin/packages/xsdk/package.py +++ b/var/spack/repos/builtin/packages/xsdk/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + import os from spack import * diff --git a/var/spack/repos/builtin/packages/xsdktrilinos/package.py b/var/spack/repos/builtin/packages/xsdktrilinos/package.py index 6aecbf3368..66de6cef0c 100644 --- a/var/spack/repos/builtin/packages/xsdktrilinos/package.py +++ b/var/spack/repos/builtin/packages/xsdktrilinos/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/xset/package.py b/var/spack/repos/builtin/packages/xset/package.py index 5bc09386f0..93260d65ec 100644 --- a/var/spack/repos/builtin/packages/xset/package.py +++ b/var/spack/repos/builtin/packages/xset/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xsetmode/package.py b/var/spack/repos/builtin/packages/xsetmode/package.py index 7913318785..e1eb7dc33d 100644 --- a/var/spack/repos/builtin/packages/xsetmode/package.py +++ b/var/spack/repos/builtin/packages/xsetmode/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xsetpointer/package.py b/var/spack/repos/builtin/packages/xsetpointer/package.py index 4e182369bc..66d91bbc04 100644 --- a/var/spack/repos/builtin/packages/xsetpointer/package.py +++ b/var/spack/repos/builtin/packages/xsetpointer/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xsetroot/package.py b/var/spack/repos/builtin/packages/xsetroot/package.py index 2267f5da73..43b61bd41c 100644 --- a/var/spack/repos/builtin/packages/xsetroot/package.py +++ b/var/spack/repos/builtin/packages/xsetroot/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xsimd/package.py b/var/spack/repos/builtin/packages/xsimd/package.py index 46913d671f..a7d1f8474a 100644 --- a/var/spack/repos/builtin/packages/xsimd/package.py +++ b/var/spack/repos/builtin/packages/xsimd/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xsm/package.py b/var/spack/repos/builtin/packages/xsm/package.py index 6262458128..eb1a3417dc 100644 --- a/var/spack/repos/builtin/packages/xsm/package.py +++ b/var/spack/repos/builtin/packages/xsm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xstdcmap/package.py b/var/spack/repos/builtin/packages/xstdcmap/package.py index 3ed79db269..3f9ae0960b 100644 --- a/var/spack/repos/builtin/packages/xstdcmap/package.py +++ b/var/spack/repos/builtin/packages/xstdcmap/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xtensor-python/package.py b/var/spack/repos/builtin/packages/xtensor-python/package.py index a189334324..5bf808ff5e 100644 --- a/var/spack/repos/builtin/packages/xtensor-python/package.py +++ b/var/spack/repos/builtin/packages/xtensor-python/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xtensor/package.py b/var/spack/repos/builtin/packages/xtensor/package.py index b27094085a..9ba3dcda16 100644 --- a/var/spack/repos/builtin/packages/xtensor/package.py +++ b/var/spack/repos/builtin/packages/xtensor/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xterm/package.py b/var/spack/repos/builtin/packages/xterm/package.py index cfc2bd99dc..8ecd6eb64f 100644 --- a/var/spack/repos/builtin/packages/xterm/package.py +++ b/var/spack/repos/builtin/packages/xterm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xtl/package.py b/var/spack/repos/builtin/packages/xtl/package.py index 33b7a500a2..b73ec8fa10 100644 --- a/var/spack/repos/builtin/packages/xtl/package.py +++ b/var/spack/repos/builtin/packages/xtl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xtrans/package.py b/var/spack/repos/builtin/packages/xtrans/package.py index bf8c68cecc..508483c358 100644 --- a/var/spack/repos/builtin/packages/xtrans/package.py +++ b/var/spack/repos/builtin/packages/xtrans/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xtrap/package.py b/var/spack/repos/builtin/packages/xtrap/package.py index 85df34a4ab..e78aab7b66 100644 --- a/var/spack/repos/builtin/packages/xtrap/package.py +++ b/var/spack/repos/builtin/packages/xtrap/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xts/package.py b/var/spack/repos/builtin/packages/xts/package.py index b583dfc8e7..f8e6038d50 100644 --- a/var/spack/repos/builtin/packages/xts/package.py +++ b/var/spack/repos/builtin/packages/xts/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xvidtune/package.py b/var/spack/repos/builtin/packages/xvidtune/package.py index cab1869798..37cbc8a1d5 100644 --- a/var/spack/repos/builtin/packages/xvidtune/package.py +++ b/var/spack/repos/builtin/packages/xvidtune/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xvinfo/package.py b/var/spack/repos/builtin/packages/xvinfo/package.py index be6337b30d..7dd8670ce5 100644 --- a/var/spack/repos/builtin/packages/xvinfo/package.py +++ b/var/spack/repos/builtin/packages/xvinfo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xwd/package.py b/var/spack/repos/builtin/packages/xwd/package.py index d4071ad26e..ba5b693fbf 100644 --- a/var/spack/repos/builtin/packages/xwd/package.py +++ b/var/spack/repos/builtin/packages/xwd/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xwininfo/package.py b/var/spack/repos/builtin/packages/xwininfo/package.py index e291b68f2a..86473d401c 100644 --- a/var/spack/repos/builtin/packages/xwininfo/package.py +++ b/var/spack/repos/builtin/packages/xwininfo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xwud/package.py b/var/spack/repos/builtin/packages/xwud/package.py index 9afa00a1cc..dd13f44ced 100644 --- a/var/spack/repos/builtin/packages/xwud/package.py +++ b/var/spack/repos/builtin/packages/xwud/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xxhash/package.py b/var/spack/repos/builtin/packages/xxhash/package.py index 1185203c47..990e6ed3e3 100644 --- a/var/spack/repos/builtin/packages/xxhash/package.py +++ b/var/spack/repos/builtin/packages/xxhash/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/xz/package.py b/var/spack/repos/builtin/packages/xz/package.py index a3ff4be7e7..9f2f9f9d83 100644 --- a/var/spack/repos/builtin/packages/xz/package.py +++ b/var/spack/repos/builtin/packages/xz/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/yajl/package.py b/var/spack/repos/builtin/packages/yajl/package.py index c42ead6a2d..e26616bb05 100644 --- a/var/spack/repos/builtin/packages/yajl/package.py +++ b/var/spack/repos/builtin/packages/yajl/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2017, Los Alamos National Security, LLC -# Produced at the Los Alamos National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/yambo/package.py b/var/spack/repos/builtin/packages/yambo/package.py index 5fc66fe2d4..ddb5964233 100644 --- a/var/spack/repos/builtin/packages/yambo/package.py +++ b/var/spack/repos/builtin/packages/yambo/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/yaml-cpp/package.py b/var/spack/repos/builtin/packages/yaml-cpp/package.py index a11277ad81..95df4da774 100644 --- a/var/spack/repos/builtin/packages/yaml-cpp/package.py +++ b/var/spack/repos/builtin/packages/yaml-cpp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/yasm/package.py b/var/spack/repos/builtin/packages/yasm/package.py index 0581bf6b45..0f6bb70744 100644 --- a/var/spack/repos/builtin/packages/yasm/package.py +++ b/var/spack/repos/builtin/packages/yasm/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/yorick/package.py b/var/spack/repos/builtin/packages/yorick/package.py index 63ba54761e..45f767a7ba 100644 --- a/var/spack/repos/builtin/packages/yorick/package.py +++ b/var/spack/repos/builtin/packages/yorick/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import os diff --git a/var/spack/repos/builtin/packages/z3/package.py b/var/spack/repos/builtin/packages/z3/package.py index d42c81dc9c..131ebba39a 100644 --- a/var/spack/repos/builtin/packages/z3/package.py +++ b/var/spack/repos/builtin/packages/z3/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/zeromq/package.py b/var/spack/repos/builtin/packages/zeromq/package.py index 68504675e1..08a5e4ec73 100644 --- a/var/spack/repos/builtin/packages/zeromq/package.py +++ b/var/spack/repos/builtin/packages/zeromq/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/zfp/package.py b/var/spack/repos/builtin/packages/zfp/package.py index 5940706ccf..447bbf4d2a 100644 --- a/var/spack/repos/builtin/packages/zfp/package.py +++ b/var/spack/repos/builtin/packages/zfp/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/zip/package.py b/var/spack/repos/builtin/packages/zip/package.py index 5473b0af0f..139e503c87 100644 --- a/var/spack/repos/builtin/packages/zip/package.py +++ b/var/spack/repos/builtin/packages/zip/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/zlib/package.py b/var/spack/repos/builtin/packages/zlib/package.py index 7ff6a9ac4b..eb34730906 100644 --- a/var/spack/repos/builtin/packages/zlib/package.py +++ b/var/spack/repos/builtin/packages/zlib/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/zoltan/package.py b/var/spack/repos/builtin/packages/zoltan/package.py index 3dc2806bf9..3fd29e17c3 100644 --- a/var/spack/repos/builtin/packages/zoltan/package.py +++ b/var/spack/repos/builtin/packages/zoltan/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import re diff --git a/var/spack/repos/builtin/packages/zsh/package.py b/var/spack/repos/builtin/packages/zsh/package.py index 6b0041573c..b03eb1f74e 100644 --- a/var/spack/repos/builtin/packages/zsh/package.py +++ b/var/spack/repos/builtin/packages/zsh/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * diff --git a/var/spack/repos/builtin/packages/zstd/package.py b/var/spack/repos/builtin/packages/zstd/package.py index dea374f931..1382aebb72 100644 --- a/var/spack/repos/builtin/packages/zstd/package.py +++ b/var/spack/repos/builtin/packages/zstd/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * -- cgit v1.2.3-70-g09d2 From 5a7d0c458b1034de22a7055276b2398167f5e3da Mon Sep 17 00:00:00 2001 From: Matthias Wolf Date: Thu, 18 Oct 2018 01:10:20 +0200 Subject: py-hdfs: new package (#9421) --- .../repos/builtin/packages/py-hdfs/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-hdfs/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-hdfs/package.py b/var/spack/repos/builtin/packages/py-hdfs/package.py new file mode 100644 index 0000000000..59687f57bd --- /dev/null +++ b/var/spack/repos/builtin/packages/py-hdfs/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/spack/spack +# Please also see the NOTICE and LICENSE files for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +class PyHdfs(PythonPackage): + """API and command line interface for HDFS""" + homepage = "https://hdfscli.readthedocs.io/en/latest/" + url = "https://pypi.org/packages/source/h/hdfs/hdfs-2.1.0.tar.gz" + + version('2.1.0', sha256='a40fe99ccb03b5c3247b33a4110eb21b57405dd7c3f1b775e362e66c19b44bc6') + + depends_on('py-setuptools', type='build') + depends_on('py-docopt', type=('build', 'run')) + depends_on('py-requests@2.7.0:', type=('build', 'run')) + depends_on('py-six@1.9.0:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From e0e54c00734e59bfdaae7ffd74243048036c1f73 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Thu, 18 Oct 2018 01:27:08 +0200 Subject: scalasca: add 2.4 (#9556) scalasca actually requires cubew, not the full cube bundle. However, cubew@4.4 causes the build of previous versions to fail because there is no cube-config script anymore. --- var/spack/repos/builtin/packages/scalasca/package.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/scalasca/package.py b/var/spack/repos/builtin/packages/scalasca/package.py index 3616008878..b2f68c5b81 100644 --- a/var/spack/repos/builtin/packages/scalasca/package.py +++ b/var/spack/repos/builtin/packages/scalasca/package.py @@ -19,14 +19,18 @@ class Scalasca(AutotoolsPackage): homepage = "http://www.scalasca.org" url = "http://apps.fz-juelich.de/scalasca/releases/scalasca/2.1/dist/scalasca-2.1.tar.gz" + version('2.4', '4a895868258030f700a635eac93d36764f60c8c63673c7db419ea4bcc6b0b760') version('2.3.1', 'a83ced912b9d2330004cb6b9cefa7585') version('2.2.2', '2bafce988b0522d18072f7771e491ab9') version('2.1', 'bab9c2b021e51e2ba187feec442b96e6') depends_on("mpi") + # version 2.4 + depends_on('cubew@4.4:', when='@2.4:') + # version 2.3 - depends_on('cube@4.3:', when='@2.3:') + depends_on('cube@4.3', when='@2.3:2.3.99') depends_on('otf2@2:', when='@2.3:') # version 2.1+ @@ -41,7 +45,11 @@ class Scalasca(AutotoolsPackage): config_args = ["--enable-shared"] - config_args.append("--with-cube=%s" % spec['cube'].prefix.bin) + if spec.satisfies('@2.4:'): + config_args.append("--with-cube=%s" % spec['cubew'].prefix.bin) + else: + config_args.append("--with-cube=%s" % spec['cube'].prefix.bin) + config_args.append("--with-otf2=%s" % spec['otf2'].prefix.bin) if self.spec['mpi'].name == 'openmpi': -- cgit v1.2.3-70-g09d2 From ea033d4b71af520052e92657d348d41c87768f90 Mon Sep 17 00:00:00 2001 From: Leonhard Reichenbach Date: Thu, 18 Oct 2018 01:30:04 +0200 Subject: py-numpy: update to version 1.15.2 (#9535) --- var/spack/repos/builtin/packages/py-numpy/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-numpy/package.py b/var/spack/repos/builtin/packages/py-numpy/package.py index e4408a430e..39fb4f0c4c 100644 --- a/var/spack/repos/builtin/packages/py-numpy/package.py +++ b/var/spack/repos/builtin/packages/py-numpy/package.py @@ -26,6 +26,7 @@ class PyNumpy(PythonPackage): 'numpy.distutils.command', 'numpy.distutils.fcompiler' ] + version('1.15.2', sha256='27a0d018f608a3fe34ac5e2b876f4c23c47e38295c47dd0775cc294cd2614bc1') version('1.15.1', '898004d5be091fde59ae353e3008fe9b') version('1.14.3', '97416212c0a172db4bc6b905e9c4634b') version('1.14.2', '080f01a19707cf467393e426382c7619') -- cgit v1.2.3-70-g09d2 From 286f0c8236e923e3d7dcd537c9324d2bae560fc2 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 17 Oct 2018 19:26:59 -0500 Subject: Revert "py-hdfs: new package (#9421)" (#9572) This reverts commit 5a7d0c458b1034de22a7055276b2398167f5e3da. --- .../repos/builtin/packages/py-hdfs/package.py | 38 ---------------------- 1 file changed, 38 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/py-hdfs/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-hdfs/package.py b/var/spack/repos/builtin/packages/py-hdfs/package.py deleted file mode 100644 index 59687f57bd..0000000000 --- a/var/spack/repos/builtin/packages/py-hdfs/package.py +++ /dev/null @@ -1,38 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -from spack import * - - -class PyHdfs(PythonPackage): - """API and command line interface for HDFS""" - homepage = "https://hdfscli.readthedocs.io/en/latest/" - url = "https://pypi.org/packages/source/h/hdfs/hdfs-2.1.0.tar.gz" - - version('2.1.0', sha256='a40fe99ccb03b5c3247b33a4110eb21b57405dd7c3f1b775e362e66c19b44bc6') - - depends_on('py-setuptools', type='build') - depends_on('py-docopt', type=('build', 'run')) - depends_on('py-requests@2.7.0:', type=('build', 'run')) - depends_on('py-six@1.9.0:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 3d32e8add2db3d7b72776af5e41a1e08bf7b2695 Mon Sep 17 00:00:00 2001 From: Javier Cervantes Date: Thu, 18 Oct 2018 12:53:44 +0200 Subject: Add new python package: hepdata-validator (#9547) * Add new python package: hepdata-validator * Update to new license header --- .../packages/py-hepdata-validator/package.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-hepdata-validator/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-hepdata-validator/package.py b/var/spack/repos/builtin/packages/py-hepdata-validator/package.py new file mode 100644 index 0000000000..71b79c5dc2 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-hepdata-validator/package.py @@ -0,0 +1,22 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class PyHepdataValidator(PythonPackage): + """Validation schema and code for HEPdata submissions.""" + + homepage = "https://github.com/hepdata/hepdata-validator" + url = "https://pypi.io/packages/source/h/hepdata_validator/hepdata_validator-0.1.16.tar.gz" + + version('0.1.16', '62e80db7425a4a48050af29e05295e0d') + version('0.1.15', 'e29aa75780b9963997e79f572ca0209f') + version('0.1.14', '386a2440f23fda7d877764d120bf61fb') + version('0.1.8', '5bf388a507a857afbe0deba0857125c7') + + depends_on('py-setuptools', type='build') + depends_on('py-jsonschema', type=('build', 'run')) + depends_on('py-pyyaml', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From d1db12e15347567ad23fc6bd6d27b0a415e08691 Mon Sep 17 00:00:00 2001 From: Ruben Di Battista Date: Thu, 18 Oct 2018 19:18:05 +0200 Subject: vtk: add support for Xdmf IO. (#9510) * vtk: add variants for Xdmf IO support, ffmpeg support, and MPI * vtk: depends on boost when Xdmf support is enabled * vtk: add backported patch for python3.7 * vtk: New policy only for cmake >= 3.12 * mesa: add py-argparse dependency (for build) * lz4: use MOREFLAGS instead of LIBS to add -lrt --- var/spack/repos/builtin/packages/lz4/package.py | 2 +- var/spack/repos/builtin/packages/mesa/package.py | 1 + var/spack/repos/builtin/packages/vtk/package.py | 65 +++++++++++++++++++--- .../packages/vtk/python3.7-const-char.patch | 27 +++++++++ 4 files changed, 87 insertions(+), 8 deletions(-) create mode 100644 var/spack/repos/builtin/packages/vtk/python3.7-const-char.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lz4/package.py b/var/spack/repos/builtin/packages/lz4/package.py index 2a64a3cdf2..fed8c3bfe2 100644 --- a/var/spack/repos/builtin/packages/lz4/package.py +++ b/var/spack/repos/builtin/packages/lz4/package.py @@ -32,7 +32,7 @@ class Lz4(Package): def install(self, spec, prefix): if sys.platform != "darwin": - make('LIBS=-lrt') # fixes make error on CentOS6 + make('MOREFLAGS=-lrt') # fixes make error on CentOS6 else: make() if self.run_tests: diff --git a/var/spack/repos/builtin/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py index 9dfe46cd3b..2823a98260 100644 --- a/var/spack/repos/builtin/packages/mesa/package.py +++ b/var/spack/repos/builtin/packages/mesa/package.py @@ -47,6 +47,7 @@ class Mesa(AutotoolsPackage): depends_on('binutils', type='build', when=(sys.platform != 'darwin')) depends_on('python@2.6.4:', type='build') depends_on('py-mako@0.3.4:', type='build') + depends_on('py-argparse', type='build') depends_on('gettext') depends_on('icu4c') depends_on('expat') diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py index 110ff01457..e8f345670c 100644 --- a/var/spack/repos/builtin/packages/vtk/package.py +++ b/var/spack/repos/builtin/packages/vtk/package.py @@ -29,6 +29,8 @@ class Vtk(CMakePackage): variant('osmesa', default=False, description='Enable OSMesa support') variant('python', default=False, description='Enable Python support') variant('qt', default=False, description='Build with support for Qt') + variant('xdmf', default=False, description='Build XDMF file support') + variant('ffmpeg', default=False, description='Build with FFMPEG support') variant('mpi', default=True, description='Enable MPI support') # Haru causes trouble on Fedora and Ubuntu in v8.1.1 @@ -41,6 +43,13 @@ class Vtk(CMakePackage): # VTK 8.1, that should change conflicts('+osmesa', when='+qt') + depends_on('python', when='+python') + depends_on('py-mpi4py', when='+mpi +python', type='run') + extends('python', when='+python') + # python3.7 compatibility patch backported from upstream + # https://gitlab.kitware.com/vtk/vtk/commit/706f1b397df09a27ab8981ab9464547028d0c322 + patch('python3.7-const-char.patch', when='@:8.1.1 ^python@3.7:') + # The use of the OpenGL2 backend requires at least OpenGL Core Profile # version 3.2 or higher. depends_on('gl@3.2:', when='+opengl2') @@ -60,6 +69,13 @@ class Vtk(CMakePackage): depends_on('libharu', when='+haru') + depends_on('boost', when='+xdmf') + depends_on('boost+mpi', when='+xdmf +mpi') + + depends_on('mpi', when='+mpi') + + depends_on('ffmpeg', when='+ffmpeg') + depends_on('expat') depends_on('freetype') depends_on('glew') @@ -74,8 +90,6 @@ class Vtk(CMakePackage): depends_on('libtiff') depends_on('zlib') - extends('python', when='+python') - def url_for_version(self, version): url = "http://www.vtk.org/files/release/{0}/VTK-{1}.tar.gz" return url.format(version.up_to(2), version) @@ -99,12 +113,12 @@ class Vtk(CMakePackage): # In general, we disable use of VTK "ThirdParty" libs, preferring # spack-built versions whenever possible - '-DVTK_USE_SYSTEM_LIBRARIES=ON', + '-DVTK_USE_SYSTEM_LIBRARIES:BOOL=ON', # However, in a few cases we can't do without them yet - '-DVTK_USE_SYSTEM_GL2PS=OFF', - '-DVTK_USE_SYSTEM_LIBPROJ4=OFF', - '-DVTK_USE_SYSTEM_OGGTHEORA=OFF', + '-DVTK_USE_SYSTEM_GL2PS:BOOL=OFF', + '-DVTK_USE_SYSTEM_LIBPROJ4:BOOL=OFF', + '-DVTK_USE_SYSTEM_OGGTHEORA:BOOL=OFF', '-DNETCDF_DIR={0}'.format(spec['netcdf'].prefix), '-DNETCDF_C_ROOT={0}'.format(spec['netcdf'].prefix), @@ -115,11 +129,21 @@ class Vtk(CMakePackage): '-DVTK_WRAP_TCL=OFF', ] + if '+mpi' in spec: + cmake_args.extend([ + '-DVTK_Group_MPI:BOOL=ON', + '-DVTK_USE_SYSTEM_DIY2:BOOL=OFF', + ]) + + if '+ffmpeg' in spec: + cmake_args.extend(['-DModule_vtkIOFFMPEG:BOOL=ON']) + # Enable/Disable wrappers for Python. if '+python' in spec: cmake_args.extend([ '-DVTK_WRAP_PYTHON=ON', - '-DPYTHON_EXECUTABLE={0}'.format(spec['python'].command.path) + '-DPYTHON_EXECUTABLE={0}'.format(spec['python'].command.path), + '-DVTK_USE_SYSTEM_MPI4PY:BOOL=ON' ]) else: cmake_args.append('-DVTK_WRAP_PYTHON=OFF') @@ -157,6 +181,33 @@ class Vtk(CMakePackage): '-DVTK_USE_SYSTEM_DIY2=OFF' ]) + if '+xdmf' in spec: + if spec.satisfies('^cmake@3.12:'): + # This policy exists only for CMake >= 3.12 + cmake_args.extend(["-DCMAKE_POLICY_DEFAULT_CMP0074=NEW"]) + + cmake_args.extend([ + # Enable XDMF Support here + "-DModule_vtkIOXdmf2:BOOL=ON", + "-DModule_vtkIOXdmf3:BOOL=ON", + "-DModule_vtkIOParallelXdmf3:BOOL=ON", + "-DBOOST_ROOT={0}".format(spec['boost'].prefix), + "-DBOOST_LIBRARY_DIR={0}".format(spec['boost'].prefix.lib), + "-DBOOST_INCLUDE_DIR={0}".format(spec['boost'].prefix.include), + "-DBOOST_NO_SYSTEM_PATHS:BOOL=ON", + # This is needed because VTK has multiple FindBoost + # and they stick to system boost if there's a system boost + # installed with CMake + "-DBoost_NO_BOOST_CMAKE:BOOL=ON", + "-DHDF5_ROOT={0}".format(spec['hdf5'].prefix), + # The xdmf project does not export any CMake file... + "-DVTK_USE_SYSTEM_XDMF3:BOOL=OFF", + "-DVTK_USE_SYSTEM_XDMF2:BOOL=OFF" + ]) + + if '+mpi' in spec: + cmake_args.extend(["-DModule_vtkIOParallelXdmf3:BOOL=ON"]) + if '+osmesa' in spec: prefix = spec['mesa'].prefix osmesa_include_dir = prefix.include diff --git a/var/spack/repos/builtin/packages/vtk/python3.7-const-char.patch b/var/spack/repos/builtin/packages/vtk/python3.7-const-char.patch new file mode 100644 index 0000000000..80dbc78530 --- /dev/null +++ b/var/spack/repos/builtin/packages/vtk/python3.7-const-char.patch @@ -0,0 +1,27 @@ +diff --git a/Wrapping/PythonCore/vtkPythonArgs.cxx b/Wrapping/PythonCore/vtkPythonArgs.cxx +index 1a82af0802..b733458975 100644 +--- a/Wrapping/PythonCore/vtkPythonArgs.cxx ++++ b/Wrapping/PythonCore/vtkPythonArgs.cxx +@@ -95,13 +95,21 @@ bool vtkPythonGetStringValue(PyObject *o, T *&a, const char *exctext) + { + if (PyBytes_Check(o)) + { ++#if PY_VERSION_HEX >= 0x03070000 ++ a = const_cast(PyBytes_AS_STRING(o)); ++ return true; ++#else + a = PyBytes_AS_STRING(o); + return true; ++#endif + } + #ifdef Py_USING_UNICODE + else if (PyUnicode_Check(o)) + { +-#if PY_VERSION_HEX >= 0x03030000 ++#if PY_VERSION_HEX >= 0x03070000 ++ a = const_cast(PyUnicode_AsUTF8(o)); ++ return true; ++#elif PY_VERSION_HEX >= 0x03030000 + a = PyUnicode_AsUTF8(o); + return true; + #else -- cgit v1.2.3-70-g09d2 From 659d84518597983f884428af100df4a400a202a1 Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Thu, 18 Oct 2018 11:22:17 -0700 Subject: lbann: add aluminum dependency (#9523) * Added support for the Aluminum library to LBANN and Hydrogen. Also fixed several bugs in the grouping of dependencies of both packages. * Updated the conduit package to have the proper dependency on the python variant. * Added new versions for NCCL * Fixed a bug in how Hydrogen set the path for OpenBLAS. * Added support for conduit in LBANN. --- .../repos/builtin/packages/aluminum/package.py | 43 ++++++++++++++++++ .../repos/builtin/packages/conduit/package.py | 2 +- .../repos/builtin/packages/hydrogen/package.py | 22 ++++++++- var/spack/repos/builtin/packages/lbann/package.py | 53 ++++++++++++++++------ var/spack/repos/builtin/packages/nccl/package.py | 3 ++ 5 files changed, 107 insertions(+), 16 deletions(-) create mode 100644 var/spack/repos/builtin/packages/aluminum/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/aluminum/package.py b/var/spack/repos/builtin/packages/aluminum/package.py new file mode 100644 index 0000000000..9700988217 --- /dev/null +++ b/var/spack/repos/builtin/packages/aluminum/package.py @@ -0,0 +1,43 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class Aluminum(CMakePackage): + """Aluminum provides a generic interface to high-performance + communication libraries, with a focus on allreduce + algorithms. Blocking and non-blocking algorithms and GPU-aware + algorithms are supported. Aluminum also contains custom + implementations of select algorithms to optimize for certain + situations.""" + + homepage = "https://github.com/LLNL/Aluminum" + url = "https://github.com/LLNL/Aluminum/archive/v0.1.tar.gz" + git = "https://github.com/LLNL/Aluminum.git" + + version('master', branch='master') + version('0.1', sha256='3880b736866e439dd94e6a61eeeb5bb2abccebbac82b82d52033bc6c94950bdb') + + variant('gpu', default=False, description='Builds with support for GPUs via CUDA and cuDNN') + variant('nccl', default=False, description='Builds with support for NCCL communication lib') + variant('mpi_cuda', default=False, description='Builds with support for MPI-CUDA enabled library') + + depends_on('cmake@3.9.0:', type='build') + depends_on('cuda', when='+gpu') + depends_on('cudnn', when='+gpu') + depends_on('cub', when='+gpu') + depends_on('mpi', when='~mpi_cuda') + depends_on('mpi +cuda', when='+mpi_cuda') + depends_on('nccl', when='+nccl') + depends_on('hwloc') + + def cmake_args(self): + spec = self.spec + args = [ + '-DALUMINUM_ENABLE_CUDA:BOOL=%s' % ('+gpu' in spec), + '-DALUMINUM_ENABLE_MPI_CUDA:BOOL=%s' % ('+mpi_cuda' in spec), + '-DALUMINUM_ENABLE_NCCL:BOOL=%s' % ('+nccl' in spec)] + return args diff --git a/var/spack/repos/builtin/packages/conduit/package.py b/var/spack/repos/builtin/packages/conduit/package.py index 0e0c623ba4..d2820b92ec 100644 --- a/var/spack/repos/builtin/packages/conduit/package.py +++ b/var/spack/repos/builtin/packages/conduit/package.py @@ -77,7 +77,7 @@ class Conduit(Package): ####################### # we need a shared version of python b/c linking with static python lib # causes duplicate state issues when running compiled python modules. - depends_on("python+shared") + depends_on("python+shared", when="+python") extends("python", when="+python") depends_on("py-numpy", when="+python", type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/hydrogen/package.py b/var/spack/repos/builtin/packages/hydrogen/package.py index ce2621f34c..9a65ea4fe3 100644 --- a/var/spack/repos/builtin/packages/hydrogen/package.py +++ b/var/spack/repos/builtin/packages/hydrogen/package.py @@ -17,6 +17,7 @@ class Hydrogen(CMakePackage): git = "https://github.com/LLNL/Elemental.git" version('develop', branch='hydrogen') + version('1.0', sha256='d8a97de3133f2c6b6bb4b80d32b4a4cc25eb25e0df4f0cec0f8cb19bf34ece98') version('0.99', 'b678433ab1d498da47acf3dc5e056c23') variant('shared', default=True, @@ -45,6 +46,10 @@ class Hydrogen(CMakePackage): description='Builds with support for GPUs via CUDA and cuDNN') variant('test', default=False, description='Builds test suite') + variant('al', default=False, + description='Builds with Aluminum communication library') + variant('omp_taskloops', default=False, + description='Use OpenMP taskloops instead of parallel for loops.') # Note that #1712 forces us to enumerate the different blas variants depends_on('openblas', when='blas=openblas ~openmp_blas ~int64_blas') @@ -66,6 +71,10 @@ class Hydrogen(CMakePackage): depends_on('essl threads=openmp +ilp64', when='blas=essl +openmp_blas +int64_blas') depends_on('netlib-lapack +external-blas', when='blas=essl') + depends_on('aluminum@master', when='+al ~cuda') + depends_on('aluminum@master +gpu +mpi-cuda', when='+al +cuda ~nccl') + depends_on('aluminum@master +gpu +nccl +mpi_cuda', when='+al +cuda +nccl') + # Note that this forces us to use OpenBLAS until #1712 is fixed depends_on('lapack', when='blas=openblas ~openmp_blas') @@ -123,7 +132,7 @@ class Hydrogen(CMakePackage): args.extend([ '-DHydrogen_USE_OpenBLAS:BOOL=%s' % ('blas=openblas' in spec), '-DOpenBLAS_DIR:STRING={0}'.format( - spec['hydrogen'].prefix)]) + spec['openblas'].prefix)]) elif 'blas=mkl' in spec: args.extend([ '-DHydrogen_USE_MKL:BOOL=%s' % ('blas=mkl' in spec)]) @@ -133,4 +142,15 @@ class Hydrogen(CMakePackage): args.extend([ '-DHydrogen_USE_ESSL:BOOL=%s' % ('blas=essl' in spec)]) + if '+omp_taskloops' in spec: + args.extend([ + '-DHydrogen_ENABLE_OMP_TASKLOOP:BOOL=%s' % + ('+omp_taskloops' in spec)]) + + if '+al' in spec: + args.extend([ + '-DHydrogen_ENABLE_ALUMINUM:BOOL=%s' % ('+al' in spec), + '-DHYDROGEN_Aluminum_DIR={0}'.format( + spec['aluminum'].prefix)]) + return args diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index 112b89e815..148b097051 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -18,6 +18,8 @@ class Lbann(CMakePackage): git = "https://github.com/LLNL/lbann.git" version('develop', branch='develop') + version('0.95', sha256='d310b986948b5ee2bedec36383a7fe79403721c8dc2663a280676b4e431f83c2') + version('0.94', sha256='567e99b488ebe6294933c98a212281bffd5220fc13a0a5cd8441f9a3761ceccf') version('0.93', '1913a25a53d4025fa04c16f14afdaa55') version('0.92', 'c0eb1595a7c74640e96f280beb497564') version('0.91', '83b0ec9cd0b7625d41dfb06d2abd4134') @@ -32,32 +34,44 @@ class Lbann(CMakePackage): variant('build_type', default='Release', description='The build type to build', values=('Debug', 'Release')) + variant('al', default=True, description='Builds with support for Aluminum Library') + variant('conduit', default=False, description='Builds with support for Conduit Library') # It seems that there is a need for one statement per version bounds - depends_on('hydrogen +openmp_blas +shared +int64', when='@0.95:') - depends_on('hydrogen +openmp_blas +shared +int64', when='@:0.90') - depends_on('hydrogen +openmp_blas +shared +int64 build_type=Debug', - when=('build_type=Debug' '@0.95:')) + depends_on('hydrogen +openmp_blas +shared +int64', when='@:0.90,0.95: ~al') + depends_on('hydrogen +openmp_blas +shared +int64 +al', when='@:0.90,0.95: +al') + depends_on('hydrogen +openmp_blas +shared +int64 build_type=Debug', - when=('build_type=Debug' '@:0.90')) - depends_on('hydrogen +openmp_blas +shared +int64 +cuda', - when=('+gpu' '@0.95:')) + when='build_type=Debug @:0.90,0.95: ~al') + depends_on('hydrogen +openmp_blas +shared +int64 build_type=Debug +al', + when='build_type=Debug @:0.90,0.95: +al') + depends_on('hydrogen +openmp_blas +shared +int64 +cuda', - when=('+gpu' '@:0.90')) - depends_on('hydrogen +openmp_blas +shared +int64 +cuda build_type=Debug', - when=('build_type=Debug' '@0.95:' '+gpu')) + when='+gpu @:0.90,0.95: ~al') + depends_on('hydrogen +openmp_blas +shared +int64 +cuda +al', + when='+gpu @:0.90,0.95: +al') + depends_on('hydrogen +openmp_blas +shared +int64 +cuda build_type=Debug', - when=('build_type=Debug' '@:0.90' '+gpu')) - depends_on('elemental +openmp_blas +shared +int64', when=('@0.91:0.94')) + when='build_type=Debug @:0.90,0.95: +gpu') + depends_on('hydrogen +openmp_blas +shared +int64 +cuda build_type=Debug +al', + when='build_type=Debug @:0.90,0.95: +gpu +al') + + # Older versions depended on Elemental not Hydrogen + depends_on('elemental +openmp_blas +shared +int64', when='@0.91:0.94') depends_on('elemental +openmp_blas +shared +int64 build_type=Debug', - when=('build_type=Debug' '@0.91:0.94')) + when='build_type=Debug @0.91:0.94') + + depends_on('aluminum@master', when='@:0.90,0.95: +al ~gpu') + depends_on('aluminum@master +gpu +mpi-cuda', when='@:0.90,0.95: +al +gpu ~nccl') + depends_on('aluminum@master +gpu +nccl +mpi_cuda', when='@:0.90,0.95: +al +gpu +nccl') depends_on('cuda', when='+gpu') depends_on('cudnn', when='+gpu') depends_on('cub', when='+gpu') depends_on('mpi', when='~gpu') depends_on('mpi +cuda', when='+gpu') - depends_on('hwloc ~pci ~libxml2') + depends_on('hwloc') + # LBANN wraps OpenCV calls in OpenMP parallel loops, build without OpenMP # Additionally disable video related options, they incorrectly link in a # bad OpenMP library when building with clang or Intel compilers @@ -72,6 +86,8 @@ class Lbann(CMakePackage): depends_on('cnpy') depends_on('nccl', when='+gpu +nccl') + depends_on('conduit@master +hdf5', when='+conduit') + @property def common_config_args(self): spec = self.spec @@ -110,6 +126,15 @@ class Lbann(CMakePackage): '-DElemental_DIR={0}/CMake/elemental'.format( spec['elemental'].prefix)]) + if '+al' in spec: + args.extend(['-DLBANN_WITH_ALUMINUM:BOOL=%s' % ('+al' in spec), + '-DAluminum_DIR={0}'.format(spec['aluminum'].prefix)]) + + if '+conduit' in spec: + args.extend(['-DLBANN_CONDUIT_DIR:BOOL=%s' % ('+conduit' in spec), + '-DLBANN_CONDUIT_DIR={0}'.format( + spec['conduit'].prefix)]) + # Add support for OpenMP if (self.spec.satisfies('%clang')): if (sys.platform == 'darwin'): diff --git a/var/spack/repos/builtin/packages/nccl/package.py b/var/spack/repos/builtin/packages/nccl/package.py index f180e7c3af..d13d22596f 100644 --- a/var/spack/repos/builtin/packages/nccl/package.py +++ b/var/spack/repos/builtin/packages/nccl/package.py @@ -12,6 +12,9 @@ class Nccl(MakefilePackage): homepage = "https://github.com/NVIDIA/nccl" url = "https://github.com/NVIDIA/nccl/archive/v1.3.4-1.tar.gz" + version('2.3.5-5', + sha256='bac9950b4d3980c25baa8e3e4541d2dfb4d21edf32ad3b89022d04920357142f') + version('2.2', '5b9ce7fbdce0fde68e0f66318e6ff422') version('1.3.4-1', '5b9ce7fbdce0fde68e0f66318e6ff422') version('1.3.0-1', 'f6fb1d56913a7d212ca0c300e76f01fb') -- cgit v1.2.3-70-g09d2 From 8738268e0a74d734e99affe6baa7104fe9c77da4 Mon Sep 17 00:00:00 2001 From: Matthias Wolf Date: Thu, 18 Oct 2018 20:39:54 +0200 Subject: py-hdfs: new package (#9575) --- var/spack/repos/builtin/packages/py-hdfs/package.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-hdfs/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-hdfs/package.py b/var/spack/repos/builtin/packages/py-hdfs/package.py new file mode 100644 index 0000000000..f983ec48a2 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-hdfs/package.py @@ -0,0 +1,19 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class PyHdfs(PythonPackage): + """API and command line interface for HDFS""" + homepage = "https://hdfscli.readthedocs.io/en/latest/" + url = "https://pypi.org/packages/source/h/hdfs/hdfs-2.1.0.tar.gz" + + version('2.1.0', sha256='a40fe99ccb03b5c3247b33a4110eb21b57405dd7c3f1b775e362e66c19b44bc6') + + depends_on('py-setuptools', type='build') + depends_on('py-docopt', type=('build', 'run')) + depends_on('py-requests@2.7.0:', type=('build', 'run')) + depends_on('py-six@1.9.0:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 572bbfda6db48d03d1f0fdd3a53c79c3c4a1d2c2 Mon Sep 17 00:00:00 2001 From: Matthias Wolf Date: Thu, 18 Oct 2018 20:40:58 +0200 Subject: py-seaborn: add version 0.9.0 (#9553) --- var/spack/repos/builtin/packages/py-seaborn/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-seaborn/package.py b/var/spack/repos/builtin/packages/py-seaborn/package.py index f10302a5b6..129de71574 100644 --- a/var/spack/repos/builtin/packages/py-seaborn/package.py +++ b/var/spack/repos/builtin/packages/py-seaborn/package.py @@ -17,6 +17,7 @@ class PySeaborn(PythonPackage): homepage = "http://seaborn.pydata.org/" url = "https://pypi.io/packages/source/s/seaborn/seaborn-0.7.1.tar.gz" + version('0.9.0', '76c83f794ca320fb6b23a7c6192d5e185a5fcf4758966a0c0a54baee46d41e2f') version('0.7.1', 'ef07e29e0f8a1f2726abe506c1a36e93') depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From fbbe4968f035410f03814ba3ccf5930c07429b5c Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Thu, 18 Oct 2018 14:42:25 -0400 Subject: add pumi version docstring (#9577) --- var/spack/repos/builtin/packages/pumi/package.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pumi/package.py b/var/spack/repos/builtin/packages/pumi/package.py index 8380564253..12e1b5f35a 100644 --- a/var/spack/repos/builtin/packages/pumi/package.py +++ b/var/spack/repos/builtin/packages/pumi/package.py @@ -19,6 +19,12 @@ class Pumi(CMakePackage): homepage = "https://www.scorec.rpi.edu/pumi" git = "https://github.com/SCOREC/core.git" + # We will use the scorec/core master branch as the 'nightly' version + # of pumi in spack. The master branch is more stable than the + # scorec/core develop branch and we perfer not to expose spack users + # to the added instability. The spack version string is 'develop' since + # it compares greater than a numbered version (e.g., 2.1.0). The spack + # version string 'master' compares less than a numbered version. version('develop', branch='master') version('2.1.0', commit='840fbf6ec49a63aeaa3945f11ddb224f6055ac9f') -- cgit v1.2.3-70-g09d2 From 6f21c7f87cf70d2c1fb39d27891ee230396cd420 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Thu, 18 Oct 2018 20:44:16 +0200 Subject: freetype: Add version 2.9.1 (#9551) --- var/spack/repos/builtin/packages/freetype/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/freetype/package.py b/var/spack/repos/builtin/packages/freetype/package.py index ef2500c778..5b00a73a89 100644 --- a/var/spack/repos/builtin/packages/freetype/package.py +++ b/var/spack/repos/builtin/packages/freetype/package.py @@ -15,6 +15,7 @@ class Freetype(AutotoolsPackage): homepage = "https://www.freetype.org/index.html" url = "http://download.savannah.gnu.org/releases/freetype/freetype-2.7.1.tar.gz" + version('2.9.1', 'ec391504e55498adceb30baceebd147a6e963f636eb617424bcfc47a169898ce') version('2.7.1', '78701bee8d249578d83bb9a2f3aa3616') version('2.7', '337139e5c7c5bd645fe130608e0fa8b5') version('2.5.3', 'cafe9f210e45360279c730d27bf071e9') -- cgit v1.2.3-70-g09d2 From aecdcaad346914581b321148a32c588a51a10916 Mon Sep 17 00:00:00 2001 From: Dan Han Date: Thu, 18 Oct 2018 13:44:47 -0500 Subject: ranimation: added list_url (#9538) --- var/spack/repos/builtin/packages/r-animation/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-animation/package.py b/var/spack/repos/builtin/packages/r-animation/package.py index 298a38b121..c0d592c518 100644 --- a/var/spack/repos/builtin/packages/r-animation/package.py +++ b/var/spack/repos/builtin/packages/r-animation/package.py @@ -15,6 +15,7 @@ class RAnimation(RPackage): homepage = "https://cran.r-project.org/package=animation" url = "https://cran.r-project.org/src/contrib/animation_2.5.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/animation" version('2.5', sha256='b232fef1b318c79710e5e1923d87baba4c85ffe2c77ddb188130e0911d8cb55f') -- cgit v1.2.3-70-g09d2 From 3228f0af57e0a29c091257590eadce835fcc8d89 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Thu, 18 Oct 2018 13:45:01 -0500 Subject: byobu: add new version 5.127 (#9529) --- var/spack/repos/builtin/packages/byobu/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/byobu/package.py b/var/spack/repos/builtin/packages/byobu/package.py index f6cd346aed..d81b641490 100644 --- a/var/spack/repos/builtin/packages/byobu/package.py +++ b/var/spack/repos/builtin/packages/byobu/package.py @@ -13,6 +13,7 @@ class Byobu(AutotoolsPackage): homepage = "http://www.byobu.co" url = "https://launchpad.net/byobu/trunk/5.123/+download/byobu_5.123.orig.tar.gz" + version('5.127', '4bafc7cb69ff5b0ab6998816d58cd1ef7175e5de75abc1dd7ffd6d5288a4f63b') version('5.125', 'f90f15771325e8be9360f301b52182d2') version('5.123', '961e0072c01c78c9ce4c20d1aa1b0dc4') -- cgit v1.2.3-70-g09d2 From a2dc958248961cde445bac237ece5e047a25be5f Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Thu, 18 Oct 2018 13:47:46 -0500 Subject: new package: trinotate (starting at 3.1.1) (#9471) --- .../repos/builtin/packages/trinotate/package.py | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 var/spack/repos/builtin/packages/trinotate/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trinotate/package.py b/var/spack/repos/builtin/packages/trinotate/package.py new file mode 100644 index 0000000000..718a061ba8 --- /dev/null +++ b/var/spack/repos/builtin/packages/trinotate/package.py @@ -0,0 +1,42 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * +import os + + +class Trinotate(Package): + """Trinotate is a comprehensive annotation suite designed for + automatic functional annotation of transcriptomes, particularly + de novo assembled transcriptomes, from model or non-model organisms""" + + homepage = "https://trinotate.github.io/" + url = "https://github.com/Trinotate/Trinotate/archive/Trinotate-v3.1.1.tar.gz" + + version('3.1.1', sha256='f8af0fa5dbeaaf5a085132cd4ac4f4206b05cc4630f0a17a672c586691f03843') + + depends_on('trinity', type='run') + depends_on('transdecoder', type='run') + depends_on('sqlite', type='run') + depends_on('ncbi-rmblastn', type='run') + depends_on('hmmer', type='run') + depends_on('perl', type='run') + depends_on('lighttpd', type='run') + depends_on('perl-dbi', type='run') + depends_on('perl-dbd-mysql', type='run') + depends_on('perl-cgi', type='run') + + def install(self, spec, prefix): + # most of the perl modules have local deps, install the whole tree + mkdirp(prefix.lib) + install_tree('.', join_path(prefix.lib, 'trinotate')) + + mkdirp(prefix.bin) + os.symlink(join_path(prefix.lib, 'trinotate/Trinotate'), + join_path(prefix.bin, 'Trinotate')) + + os.symlink(join_path(prefix.lib, + 'trinotate/run_TrinotateWebserver.pl'), + join_path(prefix.bin, 'run_TrinotateWebserver.pl')) -- cgit v1.2.3-70-g09d2 From 0f5f49f7518a463d65d7105156789aa96ce87d2e Mon Sep 17 00:00:00 2001 From: Matt Belhorn Date: Thu, 18 Oct 2018 15:45:11 -0400 Subject: spark: set JAVA_HOME for hadoop CLASSPATH fetching (#9439) Sets the `JAVA_HOME` in the `hadoop` subprocess called during `spark.setup_environment`. --- var/spack/repos/builtin/packages/spark/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/spark/package.py b/var/spack/repos/builtin/packages/spark/package.py index 2c685ead63..4ccfbbf4cb 100644 --- a/var/spack/repos/builtin/packages/spark/package.py +++ b/var/spack/repos/builtin/packages/spark/package.py @@ -49,6 +49,7 @@ class Spark(Package): @when('+hadoop') def setup_environment(self, spack_env, run_env): hadoop = self.spec['hadoop'].command + hadoop.add_default_env('JAVA_HOME', self.spec['java'].home) hadoop_classpath = hadoop('classpath', output=str) # Remove whitespaces, as they can compromise syntax in -- cgit v1.2.3-70-g09d2 From 48c7ee37c17eb5a7f4fede3b687d7074e8685fb0 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Thu, 18 Oct 2018 22:02:32 +0200 Subject: qt: addversion 5.11.2 (#9555) --- var/spack/repos/builtin/packages/qt/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 443e40be9d..e122c1d3b8 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -17,6 +17,7 @@ class Qt(Package): list_url = 'http://download.qt.io/archive/qt/' list_depth = 3 + version('5.11.2', 'c6104b840b6caee596fa9a35bc5f57f67ed5a99d6a36497b6fe66f990a53ca81') version('5.10.0', 'c5e275ab0ed7ee61d0f4b82cd471770d') version('5.9.1', '77b4af61c49a09833d4df824c806acaf') version('5.9.0', '9c8bc8b828c2b56721980368266df9d9') -- cgit v1.2.3-70-g09d2 From b1849f9c8be941f4016dd51f07786e19fdb7a979 Mon Sep 17 00:00:00 2001 From: Matthias Wolf Date: Thu, 18 Oct 2018 22:12:56 +0200 Subject: parquet: add -fPIC option (#9367) This adds a pic variant and also exports all compiler flags as CMake arguments --- var/spack/repos/builtin/packages/parquet/package.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/parquet/package.py b/var/spack/repos/builtin/packages/parquet/package.py index cca8b8eab1..ce683895f6 100644 --- a/var/spack/repos/builtin/packages/parquet/package.py +++ b/var/spack/repos/builtin/packages/parquet/package.py @@ -21,6 +21,8 @@ class Parquet(CMakePackage): depends_on('pkgconfig', type='build') depends_on('thrift+pic') + variant('pic', default=True, + description='Build position independent code') variant('build_type', default='Release', description='CMake build type', values=('Debug', 'FastDebug', 'Release')) @@ -31,3 +33,9 @@ class Parquet(CMakePackage): args.append("-D{0}_HOME={1}".format(dep.upper(), self.spec[dep].prefix)) return args + + def flag_handler(self, name, flags): + flags = list(flags) + if '+pic' in self.spec and name in ('cflags', 'cxxflags'): + flags.append(self.compiler.pic_flag) + return (None, None, flags) -- cgit v1.2.3-70-g09d2 From 37056edb560a0d7bb159828bc6af317b431acf7b Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Thu, 18 Oct 2018 15:15:01 -0500 Subject: r-rmarkdown: add r-catools dependency (#9470) --- var/spack/repos/builtin/packages/r-rmarkdown/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-rmarkdown/package.py b/var/spack/repos/builtin/packages/r-rmarkdown/package.py index 13e5651dbc..6258b03a6e 100644 --- a/var/spack/repos/builtin/packages/r-rmarkdown/package.py +++ b/var/spack/repos/builtin/packages/r-rmarkdown/package.py @@ -26,4 +26,5 @@ class RRmarkdown(RPackage): depends_on('r-rprojroot', type=('build', 'run')) depends_on('r-mime', type=('build', 'run')) depends_on('r-stringr@1.2.0:', type=('build', 'run')) + depends_on('r-catools', type=('build', 'run')) depends_on('r@3.0:') -- cgit v1.2.3-70-g09d2 From caab0d53a247f8f68be93980ab32b7c2284fc65c Mon Sep 17 00:00:00 2001 From: David Wells Date: Thu, 18 Oct 2018 16:20:07 -0400 Subject: Update samrai 2.4.4 (#9311) * Add support for samrai+silo. * Add patch for SAMRAI 2.4.4 --- var/spack/repos/builtin/packages/samrai/package.py | 38 +++++++++++++--------- 1 file changed, 22 insertions(+), 16 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/samrai/package.py b/var/spack/repos/builtin/packages/samrai/package.py index 69c840b490..468531da1b 100644 --- a/var/spack/repos/builtin/packages/samrai/package.py +++ b/var/spack/repos/builtin/packages/samrai/package.py @@ -41,19 +41,23 @@ class Samrai(AutotoolsPackage): # and more print statements variant('debug', default=False, description='Compile with reduced optimization and debugging on') + variant('silo', default=False, + description='Compile with support for silo') depends_on('mpi') depends_on('zlib') depends_on('hdf5+mpi') depends_on('m4', type='build') + depends_on('boost@:1.64.0', when='@3.0.0:3.11.99', type='build') + depends_on('silo+mpi', when='+silo') - # Starting with 3.12.0, samrai no longer depends on boost. - # version 3.11.5 or earlier can only work with boost version - # 1.64.0 or earlier. - depends_on('boost@:1.64.0', when='@0:3.11.99', type='build') + # don't build SAMRAI 3+ with tools with gcc + patch('no-tool-build.patch', when='@3.0.0:%gcc') - # don't build tools with gcc - patch('no-tool-build.patch', when='%gcc') + # 2.4.4 needs a lot of patches to fix ADL and performance problems + patch('https://github.com/IBAMR/IBAMR/releases/download/v0.3.0/ibamr-samrai-fixes.patch', + sha256='1d088b6cca41377747fa0ae8970440c20cb68988bbc34f9032d5a4e6aceede47', + when='@2.4.4') def configure_args(self): options = [] @@ -70,6 +74,10 @@ class Samrai(AutotoolsPackage): '--with-hypre=no', '--with-petsc=no']) + # SAMRAI 2 used templates; enable implicit instantiation + if self.spec.satisfies('@:3'): + options.append('--enable-implicit-template-instantiation') + if '+debug' in self.spec: options.extend([ '--disable-opt', @@ -79,16 +87,14 @@ class Samrai(AutotoolsPackage): '--enable-opt', '--disable-debug']) - if self.version >= Version('3.12.0'): - # only version 3.12.0 and above, samrai does not use - # boost, but needs c++11. Without c++11 flags, samrai - # cannot build with either gcc or intel compilers. - if 'CXXFLAGS' in env and env['CXXFLAGS']: - env['CXXFLAGS'] += ' ' + self.compiler.cxx11_flag - else: - env['CXXFLAGS'] = self.compiler.cxx11_flag - else: - # boost 1.64.0 or earlier works with samrai 2.4.4~3.11.5 + if '+silo' in self.spec: + options.append('--with-silo=%s' % self.spec['silo'].prefix) + + if self.spec.satisfies('@3.0:3.11.99'): options.append('--with-boost=%s' % self.spec['boost'].prefix) return options + + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): + if self.spec.satisfies('@3.12:'): + spack_env.append_flags('CXXFLAGS', self.compiler.cxx11_flag) -- cgit v1.2.3-70-g09d2 From 38111dc68ecbe8052b61f04e5dd591488bdfacbd Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Thu, 18 Oct 2018 13:22:56 -0700 Subject: llvm: rename "trunk" version to "develop" (#9320) --- var/spack/repos/builtin/packages/llvm/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index 7e4fba6662..a146a44110 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -148,7 +148,7 @@ class Llvm(CMakePackage): } releases = [ { - 'version': 'trunk', + 'version': 'develop', 'repo': 'http://llvm.org/svn/llvm-project/llvm/trunk', 'resources': { 'compiler-rt': 'http://llvm.org/svn/llvm-project/compiler-rt/trunk', @@ -443,7 +443,7 @@ class Llvm(CMakePackage): ] for release in releases: - if release['version'] == 'trunk': + if release['version'] == 'develop': version(release['version'], svn=release['repo']) for name, repo in release['resources'].items(): -- cgit v1.2.3-70-g09d2 From b5815e2629d9e331f84e7fec0211dfd4fc8dc1c5 Mon Sep 17 00:00:00 2001 From: Neil Flood Date: Fri, 19 Oct 2018 06:28:53 +1000 Subject: qt4: Patch configure to allow webkit with recent gcc (#9264) --- var/spack/repos/builtin/packages/qt/package.py | 6 ++++++ .../builtin/packages/qt/qt4-gcc-and-webkit.patch | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 var/spack/repos/builtin/packages/qt/qt4-gcc-and-webkit.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index e122c1d3b8..f956d77219 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -72,6 +72,12 @@ class Qt(Package): patch('qt4-pcre-include-conflict.patch', when='@4') patch('qt4-el-capitan.patch', when='@4') + # Allow Qt's configure script to build the webkit option with more + # recent versions of gcc. + # https://github.com/spack/spack/issues/9205 + # https://github.com/spack/spack/issues/9209 + patch('qt4-gcc-and-webkit.patch', when='@4') + # Use system openssl for security. depends_on("openssl") depends_on("glib", when='@4:') diff --git a/var/spack/repos/builtin/packages/qt/qt4-gcc-and-webkit.patch b/var/spack/repos/builtin/packages/qt/qt4-gcc-and-webkit.patch new file mode 100644 index 0000000000..38a1c350f3 --- /dev/null +++ b/var/spack/repos/builtin/packages/qt/qt4-gcc-and-webkit.patch @@ -0,0 +1,20 @@ +--- a/configure.orig 2018-09-18 07:02:33.866633000 +1000 ++++ b/configure 2018-09-18 07:05:21.935194000 +1000 +@@ -7708,7 +7708,7 @@ + + # Check gcc's version + case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in +- 4*) ++ [4-8]*) + ;; + 3.4*) + canBuildQtXmlPatterns="no" +@@ -7729,7 +7729,7 @@ + *-g++*) + # Check gcc's version + case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in +- 4*|3.4*) ++ [4-8]*|3.4*) + ;; + 3.3*) + canBuildWebKit="no" -- cgit v1.2.3-70-g09d2 From 92df7b002050bd4ec7d0eadcbd07584d469270f7 Mon Sep 17 00:00:00 2001 From: Dan Han Date: Thu, 18 Oct 2018 15:40:38 -0500 Subject: r-matr and r-callr: add new versions, list_urls (#9562) --- var/spack/repos/builtin/packages/r-callr/package.py | 2 ++ var/spack/repos/builtin/packages/r-matr/package.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-callr/package.py b/var/spack/repos/builtin/packages/r-callr/package.py index b6f28cbe3f..2cee5cd308 100644 --- a/var/spack/repos/builtin/packages/r-callr/package.py +++ b/var/spack/repos/builtin/packages/r-callr/package.py @@ -13,5 +13,7 @@ class RCallr(RPackage): homepage = "https://github.com/MangoTheCat/callr" url = "https://cran.r-project.org/src/contrib/callr_1.0.0.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/callr/" + version('3.0.0', sha256='e36361086c65660a6ecbbc09b5ecfcddee6b59caf75e983e48b21d3b8defabe7') version('1.0.0', 'd9af99bb95696310fa1e5d1cb7166c91') diff --git a/var/spack/repos/builtin/packages/r-matr/package.py b/var/spack/repos/builtin/packages/r-matr/package.py index 646dba9e89..4f2c03d546 100644 --- a/var/spack/repos/builtin/packages/r-matr/package.py +++ b/var/spack/repos/builtin/packages/r-matr/package.py @@ -15,8 +15,10 @@ class RMatr(RPackage): environment for statistical computing.""" homepage = "https://github.com/MG-RAST/matR" - url = "https://cran.r-project.org/src/contrib/Archive/matR/matR_0.9.tar.gz" + url = "https://cran.r-project.org/src/contrib/matR_0.9.1.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/matR/matR_0.9.tar.gz" + version('0.9.1', sha256='554aeff37b27d0f17ddeb62b2e1004aa1f29190300e4946b1bec1d7c2bde82e3') version('0.9', 'e2be8734009f5c5b9c1f6b677a77220a') depends_on('r-mgraster', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 7d06d446f0011c9e1d2447b0eeab83b68bc7b7e7 Mon Sep 17 00:00:00 2001 From: Jordan Moxon <32072858+moxcodes@users.noreply.github.com> Date: Thu, 18 Oct 2018 13:41:21 -0700 Subject: blaze package: add versions 3.3 and 3.4 (#9546) --- var/spack/repos/builtin/packages/blaze/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/blaze/package.py b/var/spack/repos/builtin/packages/blaze/package.py index 5bfea7cc71..ffe65b85e2 100644 --- a/var/spack/repos/builtin/packages/blaze/package.py +++ b/var/spack/repos/builtin/packages/blaze/package.py @@ -16,8 +16,10 @@ class Blaze(Package): """ homepage = "https://bitbucket.org/blaze-lib/blaze/overview" - url = "https://bitbucket.org/blaze-lib/blaze/downloads/blaze-3.1.tar.gz" + url = "https://bitbucket.org/blaze-lib/blaze/downloads/blaze-3.4.tar.gz" + version('3.4', sha256='fd474ab479e81d31edf27d4a529706b418f874caa7b046c67489128c20dda66f') + version('3.3', sha256='138cbb7b95775c10bf56a5ab3596a32205751299b19699984b6ed55b1bf989d0') version('3.2', '47bd4a4f1b6292f5a6f71ed9d5287480') version('3.1', '2938e015f0d274e8d62ee5c4c0c1e9f3') version('3.0', '0c4cefb0be7b5a27ed8a377941be1ab1') -- cgit v1.2.3-70-g09d2 From df7c9c2e7bf99cefa6c1add9eada886487d412f8 Mon Sep 17 00:00:00 2001 From: sknigh Date: Thu, 18 Oct 2018 13:42:32 -0700 Subject: binutils: add older version 2.25.1 (#9579) Added version available in RHEL/Centos 7 --- var/spack/repos/builtin/packages/binutils/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/binutils/package.py b/var/spack/repos/builtin/packages/binutils/package.py index 97b5c54aa6..59620e1cb2 100644 --- a/var/spack/repos/builtin/packages/binutils/package.py +++ b/var/spack/repos/builtin/packages/binutils/package.py @@ -17,6 +17,7 @@ class Binutils(AutotoolsPackage): version('2.28', '9e8340c96626b469a603c15c9d843727') version('2.27', '2869c9bf3e60ee97c74ac2a6bf4e9d68') version('2.26', '64146a0faa3b411ba774f47d41de239f') + version('2.25.1', sha256='b5b14added7d78a8d1ca70b5cb75fef57ce2197264f4f5835326b0df22ac9f22') version('2.25', 'd9f3303f802a5b6b0bb73a335ab89d66') version('2.24', 'e0f71a7b2ddab0f8612336ac81d9636b') version('2.23.2', '4f8fa651e35ef262edc01d60fb45702e') -- cgit v1.2.3-70-g09d2 From 5f482b3c141427332877a7c7e14661ea624b8a38 Mon Sep 17 00:00:00 2001 From: Dan Han Date: Thu, 18 Oct 2018 20:27:24 -0500 Subject: r-biom-utils: changed MD5 to SHA, added list_url (#9539) --- var/spack/repos/builtin/packages/r-biom-utils/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-biom-utils/package.py b/var/spack/repos/builtin/packages/r-biom-utils/package.py index 0848aec70a..7bd3d2471d 100644 --- a/var/spack/repos/builtin/packages/r-biom-utils/package.py +++ b/var/spack/repos/builtin/packages/r-biom-utils/package.py @@ -13,7 +13,8 @@ class RBiomUtils(RPackage): homepage = "https://github.com/braithwaite/BIOM.utils/" url = "https://cran.r-project.org/src/contrib/BIOM.utils_0.9.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/biom/" - version('0.9', '980f08fd9848242007753cd27a998060') + version('0.9', sha256='e7024469fb38e275aa78fbfcce15b9a7661317f632a7e9b8124695e076839375') depends_on('r@3:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 343ad17383561e57381573275f54bd4180ff19e1 Mon Sep 17 00:00:00 2001 From: Dave Date: Fri, 19 Oct 2018 04:31:22 -0700 Subject: warpx: new package (#9584) --- var/spack/repos/builtin/packages/warpx/package.py | 78 +++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 var/spack/repos/builtin/packages/warpx/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/warpx/package.py b/var/spack/repos/builtin/packages/warpx/package.py new file mode 100644 index 0000000000..7be45eb37c --- /dev/null +++ b/var/spack/repos/builtin/packages/warpx/package.py @@ -0,0 +1,78 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class Warpx(MakefilePackage): + """WarpX is an advanced electromagnetic Particle-In-Cell code. It supports + many features including Perfectly-Matched Layers (PML) and mesh refinement. + In addition, WarpX is a highly-parallel and highly-optimized code and + features hybrid OpenMP/MPI parallelization, advanced vectorization + techniques and load balancing capabilities. + """ + + homepage = "https://ecp-warpx.github.io/index.html" + url = "https://github.com/ECP-WarpX/WarpX" + + version('master', git='https://github.com/ECP-WarpX/WarpX.git', tag='master') + version('dev', git='https://github.com/ECP-WarpX/WarpX.git', tag='dev') + + depends_on('mpi', when='+mpi') + + variant('dims', + default='3', + values=('1', '2', '3'), + multi=False, + description='Number of spatial dimensions') + + variant('psatd', default=False, description='Enable PSATD solver') + variant('do_electrostatic', default=False, description='Include electrostatic solver') + variant('debug', default=False, description='Enable debugging features') + variant('tprof', default=False, description='Enable tiny profiling features') + variant('openmp', default=True, description='Enable OpenMP features') + + resource(name='amrex', + git='https://github.com/AMReX-Codes/amrex.git', + tag='development', + destination='.') + + resource(name='picsar', + git='https://bitbucket.org/berkeleylab/picsar.git', + tag='master', + destination='.') + + def edit(self, spec, prefix): + + comp = 'gcc' + vendors = {'%gcc': 'gcc', '%intel': 'intel'} + for key, value in vendors.items(): + if self.spec.satisfies(key): + comp = value + + def torf(s): + "Returns the string TRUE or FALSE" + return repr(s in spec).upper() + + makefile = FileFilter('GNUmakefile') + makefile.filter('AMREX_HOME .*', 'AMREX_HOME = amrex') + makefile.filter('PICSAR_HOME .*', 'PICSAR_HOME = picsar') + makefile.filter('COMP .*', 'COMP = {0}'.format(comp)) + makefile.filter('DIM .*', + 'DIM = {0}'.format(int(spec.variants['dims'].value))) + makefile.filter('USE_PSATD .*', + 'USE_PSATD = {0}'.format(torf('+psatd'))) + makefile.filter('DO_ELECTROSTATIC .*', + 'DO_ELECTROSTATIC = %s' % torf('+do_electrostatic')) + makefile.filter('USE_OMP .*', + 'USE_OMP = {0}'.format(torf('+openmp'))) + makefile.filter('DEBUG .*', + 'DEBUG = {0}'.format(torf('+debug'))) + makefile.filter('TINY_PROFILE .*', + 'TINY_PROFILE = {0}'.format(torf('+tprof'))) + makefile.filter('EBASE .*', 'EBASE = warpx') + + def install(self, spec, prefix): + make('WarpxBinDir = {0}'.format(prefix.bin), 'all') -- cgit v1.2.3-70-g09d2 From e219bc39dcad6ee4611d8da6ed0401b3c2131da3 Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Fri, 19 Oct 2018 12:51:38 -0500 Subject: jdk: added version 11.0.1 (#9583) --- var/spack/repos/builtin/packages/jdk/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/jdk/package.py b/var/spack/repos/builtin/packages/jdk/package.py index 35bd0f7cdc..0204572f25 100644 --- a/var/spack/repos/builtin/packages/jdk/package.py +++ b/var/spack/repos/builtin/packages/jdk/package.py @@ -36,6 +36,8 @@ class Jdk(Package): # found in a link above. The build number can be deciphered from the URL. # Alternatively, run `bin/java -version` after extracting. Replace '+' # symbol in version with '_', otherwise it will be interpreted as a variant + version('11.0.1', sha256='e7fd856bacad04b6dbf3606094b6a81fa9930d6dbb044bbd787be7ea93abc885', curl_options=curl_options, + url='http://download.oracle.com/otn-pub/java/jdk/11.0.1+13/90cf5d8f270a4347a95050320eef3fb7/jdk-11.0.1_linux-x64_bin.tar.gz') version('10.0.2_13', sha256='6633c20d53c50c20835364d0f3e172e0cbbce78fff81867488f22a6298fa372b', curl_options=curl_options, url='http://download.oracle.com/otn-pub/java/jdk/10.0.2+13/19aef61b38124481863b1413dce1855f/jdk-10.0.2_linux-x64_bin.tar.gz') version('10.0.1_10', 'ae8ed645e6af38432a56a847597ac61d4283b7536688dbab44ab536199d1e5a4', curl_options=curl_options, @@ -54,6 +56,7 @@ class Jdk(Package): version('1.7.0_80-b0', '6152f8a7561acf795ca4701daa10a965', curl_options=curl_options) provides('java') + provides('java@11', when='@11.0:11.999') provides('java@10', when='@10.0:10.999') provides('java@9', when='@9.0:9.999') provides('java@8', when='@1.8.0:1.8.999') -- cgit v1.2.3-70-g09d2 From 20d830f8df5829839d2cc1aa91ed76a710b02f63 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Fri, 19 Oct 2018 23:59:46 +0200 Subject: new package: dbcsr (#9491) Also add its dependency, py-fypp --- var/spack/repos/builtin/packages/dbcsr/package.py | 40 ++++++++++++++++++++++ .../repos/builtin/packages/py-fypp/package.py | 15 ++++++++ 2 files changed, 55 insertions(+) create mode 100644 var/spack/repos/builtin/packages/dbcsr/package.py create mode 100644 var/spack/repos/builtin/packages/py-fypp/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dbcsr/package.py b/var/spack/repos/builtin/packages/dbcsr/package.py new file mode 100644 index 0000000000..af1ba5f749 --- /dev/null +++ b/var/spack/repos/builtin/packages/dbcsr/package.py @@ -0,0 +1,40 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class Dbcsr(CMakePackage): + """Distributed Block Compressed Sparse Row matrix library.""" + + homepage = "https://github.com/cp2k/dbcsr" + url = "https://github.com/cp2k/dbcsr/archive/v1.0.0-rc.0.tar.gz" + + version('develop', git='https://github.com/cp2k/dbcsr.git', branch='develop') + + variant('mpi', default=True, description='Compile with MPI') + variant('openmp', default=False, description='Build with OpenMP support') + + depends_on('blas') + depends_on('lapack') + depends_on('mpi', when='+mpi') + depends_on('py-fypp') + + def cmake_args(self): + spec = self.spec + args = [ + '-DUSE_MPI=%s' % ('ON' if '+mpi' in spec else 'OFF'), + '-DUSE_OPENMP=%s' % ( + 'ON' if '+openmp' in spec else 'OFF'), + '-DWITH_C_API=ON', + '-DLAPACK_FOUND=true', + '-DLAPACK_LIBRARIES=%s' % spec['lapack'].libs.joined(';'), + '-DBLAS_FOUND=true', + '-DBLAS_LIBRARIES=%s' % spec['blas'].libs.joined(';'), + '-DWITH_EXAMPLES=OFF', + '-DBUILD_SHARED_LIBS=ON' + ] + + return args diff --git a/var/spack/repos/builtin/packages/py-fypp/package.py b/var/spack/repos/builtin/packages/py-fypp/package.py new file mode 100644 index 0000000000..2f6aaa9fe3 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-fypp/package.py @@ -0,0 +1,15 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class PyFypp(PythonPackage): + """Python powered Fortran preprocessor.""" + + homepage = "https://github.com/aradi/fypp" + url = "https://github.com/aradi/fypp/archive/2.1.1.zip" + + version('2.1.1', sha256='3744ad17045e91466bbb75a33ce0cab0f65bc2c377127067a932cdf15655e049') -- cgit v1.2.3-70-g09d2 From 53678d4f2f4f2a1a188ce018c9c388c2efea1f15 Mon Sep 17 00:00:00 2001 From: Ricardo Silva Date: Sat, 20 Oct 2018 00:04:15 +0200 Subject: New package: DFT-FE (#9197) --- var/spack/repos/builtin/packages/dftfe/package.py | 65 +++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 var/spack/repos/builtin/packages/dftfe/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dftfe/package.py b/var/spack/repos/builtin/packages/dftfe/package.py new file mode 100644 index 0000000000..bac67b1fbe --- /dev/null +++ b/var/spack/repos/builtin/packages/dftfe/package.py @@ -0,0 +1,65 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack import * + + +class Dftfe(CMakePackage): + """Real-space DFT calculations using Finite Elements""" + + homepage = "https://sites.google.com/umich.edu/dftfe/" + url = "https://github.com/dftfeDevelopers/dftfe/archive/0.5.1.tar.gz" + + maintainers = ['rmsds'] + + version('0.6.0', sha256='66b633a3aae2f557f241ee45b2faa41aa179e4a0bdf39c4ae2e679a2970845a1') + version('0.5.2', sha256='9dc4fa9f16b00be6fb1890d8af4a1cd3e4a2f06a2539df999671a09f3d26ec64') + version('0.5.1', sha256='e47272d3783cf675dcd8bc31da07765695164110bfebbbab29f5815531f148c1') + version('0.5.0', sha256='9aadb9a9b059f98f88c7756b417423dc67d02f1cdd2ed7472ba395fcfafc6dcb') + + variant('scalapack', default=True, description='Use ScaLAPACK, strongly recommended for problem sizes >5000 electrons') + variant('build_type', default='Release', + description='The build type to build', + values=('Debug', 'Release')) + + depends_on('mpi') + depends_on('dealii+p4est+petsc+slepc+int64+scalapack+mpi') + depends_on('dealii+p4est+petsc+slepc+int64+scalapack+mpi@9.0.0:', when='@0.5.1:') + depends_on('scalapack', when='+scalapack') + depends_on('alglib') + depends_on('libxc') + depends_on('spglib') + depends_on('libxml2') + + def cmake_args(self): + spec = self.spec + args = [ + '-DCMAKE_C_COMPILER={0}'.format(spec['mpi'].mpicc), + '-DCMAKE_CXX_COMPILER={0}'.format(spec['mpi'].mpicxx), + '-DALGLIB_DIR={0}'.format(spec['alglib'].prefix), + '-DLIBXC_DIR={0}'.format(spec['libxc'].prefix), + '-DXML_LIB_DIR={0}/lib'.format(spec['libxml2'].prefix), + '-DXML_INCLUDE_DIR={0}/include'.format(spec['libxml2'].prefix), + '-DSPGLIB_DIR={0}'.format(spec['spglib'].prefix), + ] + + if spec.satisfies('^intel-mkl'): + args.append('-DWITH_INTEL_MKL=ON') + else: + args.append('-DWITH_INTEL_MKL=OFF') + + if spec.satisfies('%gcc'): + args.append('-DCMAKE_C_FLAGS=-fpermissive') + args.append('-DCMAKE_CXX_FLAGS=-fpermissive') + + return args + + @when('@:0.5.2') + def install(self, spec, prefix): + mkdirp(prefix.bin) + mkdirp(prefix.lib64) + install(join_path(self.build_directory, 'main'), + join_path(prefix.bin, 'dftfe')) + install(join_path(self.build_directory, 'libdftfe.so'), + prefix.lib64) -- cgit v1.2.3-70-g09d2 From d048bbb7ee2d02c68496393a3ebf247412d8eb01 Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Fri, 19 Oct 2018 19:30:52 -0500 Subject: bcftools: add version 1.9 (#9595) --- var/spack/repos/builtin/packages/bcftools/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bcftools/package.py b/var/spack/repos/builtin/packages/bcftools/package.py index 7b75fc647a..e49c7c4bd2 100644 --- a/var/spack/repos/builtin/packages/bcftools/package.py +++ b/var/spack/repos/builtin/packages/bcftools/package.py @@ -15,6 +15,7 @@ class Bcftools(AutotoolsPackage): homepage = "http://samtools.github.io/bcftools/" url = "https://github.com/samtools/bcftools/releases/download/1.3.1/bcftools-1.3.1.tar.bz2" + version('1.9', sha256='6f36d0e6f16ec4acf88649fb1565d443acf0ba40f25a9afd87f14d14d13070c8') version('1.8', 'ba6c2fb7eb6dcb208f00ab8b22df475c') version('1.7', 'c972db68d17af9da3a18963f4e5aeca8') version('1.6', 'c4dba1e8cb55db0f94b4c47724b4f9fa') @@ -24,6 +25,7 @@ class Bcftools(AutotoolsPackage): depends_on('libzip', when='@1.8:') + depends_on('htslib@1.9', when='@1.9') depends_on('htslib@1.8', when='@1.8') depends_on('htslib@1.7', when='@1.7') depends_on('htslib@1.6', when='@1.6') -- cgit v1.2.3-70-g09d2 From 29cb82c9881d6eaecff3461f384172aa92513943 Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Fri, 19 Oct 2018 19:57:46 -0500 Subject: new package: lastz (starting at 1.04.00) (#9593) --- var/spack/repos/builtin/packages/lastz/package.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 var/spack/repos/builtin/packages/lastz/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lastz/package.py b/var/spack/repos/builtin/packages/lastz/package.py new file mode 100644 index 0000000000..1b438c81b6 --- /dev/null +++ b/var/spack/repos/builtin/packages/lastz/package.py @@ -0,0 +1,18 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class Lastz(MakefilePackage): + """LASTZ is a program for aligning DNA sequences, a pairwise aligner.""" + + homepage = "https://lastz.github.io/lastz" + url = "https://github.com/lastz/lastz/archive/1.04.00.tar.gz" + + version('1.04.00', sha256='a4c2c7a77430387e96dbc9f5bdc75874334c672be90f5720956c0f211abf9f5a') + + def install(self, spec, prefix): + make('install', 'LASTZ_INSTALL={0}'.format(prefix.bin)) -- cgit v1.2.3-70-g09d2 From 187dfb61a376172b6d7adb2e2df3884041a4413c Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Fri, 19 Oct 2018 20:01:55 -0500 Subject: new package: trimal (starting at 1.4.1) (#9592) --- var/spack/repos/builtin/packages/trimal/package.py | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 var/spack/repos/builtin/packages/trimal/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trimal/package.py b/var/spack/repos/builtin/packages/trimal/package.py new file mode 100644 index 0000000000..68d9efc6af --- /dev/null +++ b/var/spack/repos/builtin/packages/trimal/package.py @@ -0,0 +1,25 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class Trimal(MakefilePackage): + """A tool for automated alignment trimming in large-scale + phylogenetic analyses""" + + homepage = "https://github.com/scapella/trimal" + url = "https://github.com/scapella/trimal/archive/v1.4.1.tar.gz" + + version('1.4.1', sha256='cb8110ca24433f85c33797b930fa10fe833fa677825103d6e7f81dd7551b9b4e') + + build_directory = 'source' + + def install(self, sinstall_treepec, prefix): + mkdirp(prefix.bin) + binaries = ['trimal', 'readal', 'statal'] + with working_dir(self.build_directory): + for b in binaries: + install(b, prefix.bin) -- cgit v1.2.3-70-g09d2 From d0c38f04739bcf5a71a7a6ce86f1736b97fe9d86 Mon Sep 17 00:00:00 2001 From: Ricardo Silva Date: Sat, 20 Oct 2018 03:18:56 +0200 Subject: plumed: libmatheval support (#9586) * plumed: add libmatheval dependency (used by the 'function' module) * guile: add variant to build with threads interface * libmatheval: add flex dependency --- var/spack/repos/builtin/packages/guile/package.py | 6 +++++- var/spack/repos/builtin/packages/libmatheval/package.py | 2 ++ var/spack/repos/builtin/packages/plumed/package.py | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/guile/package.py b/var/spack/repos/builtin/packages/guile/package.py index 6c02e3f1aa..1861f7da5a 100644 --- a/var/spack/repos/builtin/packages/guile/package.py +++ b/var/spack/repos/builtin/packages/guile/package.py @@ -18,6 +18,7 @@ class Guile(AutotoolsPackage): version('2.0.11', 'e532c68c6f17822561e3001136635ddd') variant('readline', default=True, description='Use the readline library') + variant('threads', default=True, description='Use the thread interface') depends_on('gmp@4.2:') depends_on('gettext') @@ -30,6 +31,8 @@ class Guile(AutotoolsPackage): build_directory = 'spack-build' + conflicts('+threads', when='%intel') + def configure_args(self): spec = self.spec @@ -38,8 +41,9 @@ class Guile(AutotoolsPackage): spec['libunistring'].prefix), '--with-libltdl-prefix={0}'.format(spec['libtool'].prefix), '--with-libgmp-prefix={0}'.format(spec['gmp'].prefix), - '--with-libintl-prefix={0}'.format(spec['gettext'].prefix) + '--with-libintl-prefix={0}'.format(spec['gettext'].prefix), ] + config_args += self.with_or_without('threads') if '+readline' in spec: config_args.append('--with-libreadline-prefix={0}'.format( diff --git a/var/spack/repos/builtin/packages/libmatheval/package.py b/var/spack/repos/builtin/packages/libmatheval/package.py index c52a4f7a30..da39d24515 100644 --- a/var/spack/repos/builtin/packages/libmatheval/package.py +++ b/var/spack/repos/builtin/packages/libmatheval/package.py @@ -22,6 +22,8 @@ class Libmatheval(AutotoolsPackage): # Only needed for unit tests, but configure crashes without it depends_on('guile', type='build') + depends_on('flex') + # guile 2.0 provides a deprecated interface for the unit test using guile patch('guile-2.0.patch', when='^guile@2.0') diff --git a/var/spack/repos/builtin/packages/plumed/package.py b/var/spack/repos/builtin/packages/plumed/package.py index 9c438f25a9..35cad3d0b7 100644 --- a/var/spack/repos/builtin/packages/plumed/package.py +++ b/var/spack/repos/builtin/packages/plumed/package.py @@ -50,6 +50,9 @@ class Plumed(AutotoolsPackage): depends_on('zlib') depends_on('blas') depends_on('lapack') + # For libmatheval support through the 'function' module + # which is enabled by default (or when optional_modules=all) + depends_on('libmatheval') depends_on('mpi', when='+mpi') depends_on('gsl', when='+gsl') -- cgit v1.2.3-70-g09d2 From 531c29bd8b09964a41b65cd0576380c7694ed888 Mon Sep 17 00:00:00 2001 From: Daniel Topa Date: Fri, 19 Oct 2018 19:28:19 -0600 Subject: PMIX: replace md5 hash with sha256 for recent versions (#9585) --- var/spack/repos/builtin/packages/pmix/package.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pmix/package.py b/var/spack/repos/builtin/packages/pmix/package.py index cbedf7a2a6..0f09c4df66 100644 --- a/var/spack/repos/builtin/packages/pmix/package.py +++ b/var/spack/repos/builtin/packages/pmix/package.py @@ -30,16 +30,12 @@ class Pmix(AutotoolsPackage): homepage = "https://pmix.github.io/pmix" url = "https://github.com/pmix/pmix/releases/download/v2.0.1/pmix-2.0.1.tar.bz2" - version('3.0.2', 'dc2e501605dde93ab459a5e060e01500') - version('3.0.1', 'ffe6bc08ab600173ea6e7d4509777629') - version('3.0.0', '396969979a36d45bd292908e4bcec5c8') - version('2.1.4', 'edcfd7d1e2c2bcbb3e9852b66b57120e') - version('2.1.3', '9320a4f3aef305fab4f7ac3520153160') - version('2.1.2', '9f99fd893be49c2cb0cd8926cf6fcc78') - version('2.1.1', 'f9f109421661b757245d5e0bd44a38b3') - version('2.1.0', 'fc97513b601d78fe7c6bb20c6a21df3c') - version('2.0.3', 'fae199c9fa1d1f1bc20c336f1292f950') - version('2.0.2', 'e3ed1deed87c84f9b43da2621c6ad689') + version('3.0.2', sha256='df68f35a3ed9517eeade80b13855cebad8fde2772b36a3f6be87559b6d430670') + version('3.0.1', sha256='b81055d2c0d61ef5a451b63debc39c820bcd530490e2e4dcb4cdbacb618c157c') + version('3.0.0', sha256='ee8f68107c24b706237a53333d832445315ae37de6773c5413d7fda415a6e2ee') + version('2.1.4', sha256='eb72d292e76e200f02cf162a477eecea2559ef3ac2edf50ee95b3fe3983d033e') + version('2.1.3', sha256='281283133498e7e5999ed5c6557542c22408bc9eb51ecbcf7696160616782a41') + version('2.1.2', sha256='94bb9c801c51a6caa1b8cef2b85ecf67703a5dfa4d79262e6668c37c744bb643') version('2.0.1', 'ba3193b485843516e6b4e8641e443b1e') version('2.0.0', '3e047c2ea0ba8ee9925ed92b205fd92e') version('1.2.5', 'c3d20cd9d365a813dc367afdf0f41c37') -- cgit v1.2.3-70-g09d2 From c50fdbc05841b8a0012b12568b2832e9f1a46917 Mon Sep 17 00:00:00 2001 From: Peter Scheibel Date: Mon, 22 Oct 2018 10:08:17 -0700 Subject: py-gtk needs to build with python@2.7 and also requires atk, so the atk python dependency cannot be unconditionally constrained to @3: (#9596) --- var/spack/repos/builtin/packages/atk/package.py | 5 ----- 1 file changed, 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/atk/package.py b/var/spack/repos/builtin/packages/atk/package.py index 7463dcc420..ba6a872a69 100644 --- a/var/spack/repos/builtin/packages/atk/package.py +++ b/var/spack/repos/builtin/packages/atk/package.py @@ -22,11 +22,6 @@ class Atk(Package): depends_on('meson', type='build', when='@2.28.0:') depends_on('glib') - # FIXME: this constraint exists because of the meson dependency. - # It should not be required to specify it here, but "spack spec atk" will - # fail without it. - # See: #2632 - depends_on('python@3:') depends_on('gettext') depends_on('pkgconfig', type='build') depends_on('gobject-introspection') -- cgit v1.2.3-70-g09d2 From db98418fef75dc36b1fa562903f244ced05234ec Mon Sep 17 00:00:00 2001 From: Pieter Ghysels Date: Mon, 22 Oct 2018 11:05:14 -0700 Subject: Update STRUMPACK package: (#9580) * add new version 3.1.0 * add conflict for parmetis without mpi * strumpack >= 3.1.0 uses -DTPL_ENABLE_ instead of -DSTRUMPACK_USE_ * require cmake at least 3.2 --- .../repos/builtin/packages/strumpack/package.py | 66 +++++++++------------- 1 file changed, 26 insertions(+), 40 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/strumpack/package.py b/var/spack/repos/builtin/packages/strumpack/package.py index b332b7fa90..cb0108e91a 100644 --- a/var/spack/repos/builtin/packages/strumpack/package.py +++ b/var/spack/repos/builtin/packages/strumpack/package.py @@ -22,6 +22,7 @@ class Strumpack(CMakePackage): git = "https://github.com/pghysels/STRUMPACK.git" version('master', branch='master') + version('3.1.0', sha256='b4f91b7d433955518b04538be1c726afc5de4bffb163e982ef8844d391b26fa7') version('3.0.3', sha256='2bd2a40d9585b769ae4ba461de02c6e36433bf2b21827f824a50f2fdf73389f7') version('3.0.2', sha256='828e5ec59019b2c74e008745b04ceebbb7ef1313fb4e3ac01fa8ff350799df38') version('3.0.1', sha256='b4a4d870c589937e22e77a6c4b52a96fd808f0b564e363f826ae5ffc94b9d000') @@ -46,19 +47,24 @@ class Strumpack(CMakePackage): variant('build_tests', default=False, description='Build test routines') - depends_on('cmake', type='build') + depends_on('cmake@3.2:', type='build') depends_on('mpi', when='+mpi') depends_on('blas') depends_on('lapack') depends_on('scalapack', when='+mpi') depends_on('metis') - depends_on('parmetis', when='+parmetis+mpi') + depends_on('parmetis', when='+parmetis') depends_on('scotch~metis', when='+scotch') depends_on('scotch~metis+mpi', when='+scotch+mpi') + conflicts('+parmetis', when='~mpi') + def cmake_args(self): spec = self.spec + def on_off(varstr): + return 'ON' if varstr in spec else 'OFF' + if '+mpi' in spec: args = ['-DCMAKE_C_COMPILER=%s' % spec['mpi'].mpicc, '-DCMAKE_CXX_COMPILER=%s' % spec['mpi'].mpicxx, @@ -67,43 +73,23 @@ class Strumpack(CMakePackage): else: args = ['-DSTRUMPACK_USE_MPI=OFF'] - if '+openmp' in spec: - args.append('-DSTRUMPACK_USE_OPENMP=ON') - else: - args.append('-DSTRUMPACK_USE_OPENMP=OFF') - - if spec.satisfies('+parmetis+mpi'): - args.append('-DSTRUMPACK_USE_PARMETIS=ON') - else: - args.append('-DSTRUMPACK_USE_PARMETIS=OFF') - - if '+scotch' in spec: - args.append('-DSTRUMPACK_USE_SCOTCH=ON') - else: - args.append('-DSTRUMPACK_USE_SCOTCH=OFF') - - if '+c_interface' in spec: - args.append('-DSTRUMPACK_C_INTERFACE=ON') - else: - args.append('-DSTRUMPACK_C_INTERFACE=OFF') - - if '+count_flops' in spec: - args.append('-DSTRUMPACK_COUNT_FLOPS=ON') - else: - args.append('-DSTRUMPACK_COUNT_FLOPS=OFF') - - if '+task_timers' in spec: - args.append('-DSTRUMPACK_TASK_TIMERS=ON') - else: - args.append('-DSTRUMPACK_TASK_TIMERS=OFF') - - if '+build_dev_tests' in spec: - args.append('-DSTRUMPACK_DEV_TESTING=ON') - else: - args.append('-DSTRUMPACK_DEV_TESTING=OFF') - - if '+build_tests' in spec: - args.append('-DSTRUMPACK_BUILD_TESTS=ON') + args.extend([ + '-DSTRUMPACK_USE_OPENMP=%s' % on_off('+openmp'), + '-DSTRUMPACK_C_INTERFACE=%s' % on_off('+c_interface'), + '-DSTRUMPACK_COUNT_FLOPS=%s' % on_off('+count_flops'), + '-DSTRUMPACK_TASK_TIMERS=%s' % on_off('+task_timers'), + '-DSTRUMPACK_DEV_TESTING=%s' % on_off('+build_dev_tests'), + '-DSTRUMPACK_BUILD_TESTS=%s' % on_off('+build_tests') + ]) + + if spec.satisfies('@3.0.4:'): + args.extend([ + '-DTPL_ENABLE_PARMETIS=%s' % on_off('+parmetis'), + '-DTPL_ENABLE_SCOTCH=%s' % on_off('+scotch') + ]) else: - args.append('-DSTRUMPACK_BUILD_TESTS=OFF') + args.extend([ + '-DSTRUMPACK_USE_PARMETIS=%s' % on_off('+parmetis'), + '-DSTRUMPACK_USE_SCOTCH=%s' % on_off('+scotch') + ]) return args -- cgit v1.2.3-70-g09d2 From 01913fb34db4f7568286b89d48dadf6a56be4d33 Mon Sep 17 00:00:00 2001 From: Piotr Luszczek Date: Mon, 22 Oct 2018 14:26:23 -0400 Subject: PLASMA: add version 18.9.0 (w/CMake) (#9489) * Add version 18.9.0 (w/CMake) * Add version dependent install methods to handle transition from Make-based package (17.1) to CMake-based package, using the NEST package as an example * Remove unnecessary build_targets method for older Make-based version * Don't retrieve just the C/Fortran interfaces for netlib-lapack - blas/lapack libs are now handled the same for all implementations * Remove netlib-lapack detection patch --- .../plasma/add_netlib_lapacke_detection.patch | 11 --- var/spack/repos/builtin/packages/plasma/package.py | 93 ++++++++++++---------- 2 files changed, 49 insertions(+), 55 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/plasma/add_netlib_lapacke_detection.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/plasma/add_netlib_lapacke_detection.patch b/var/spack/repos/builtin/packages/plasma/add_netlib_lapacke_detection.patch deleted file mode 100644 index 403dc8d40b..0000000000 --- a/var/spack/repos/builtin/packages/plasma/add_netlib_lapacke_detection.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/include/core_lapack.h 2017-01-13 13:59:46.000000000 -0500 -+++ b/include/core_lapack.h 2017-10-30 16:37:54.481966195 -0400 -@@ -27,7 +27,7 @@ - // Netlib cblas.h does: enum CBLAS_ORDER {...}; - // OpenBLAS cblas.h does: typedef enum CBLAS_ORDER {...} CBLAS_ORDER; - // We use (CBLAS_ORDER), so add these typedefs for Netlib. -- #ifndef OPENBLAS_VERSION -+ #if ! defined(OPENBLAS_VERSION) && ! defined(F77_HEADER_INCLUDED) - typedef enum CBLAS_ORDER CBLAS_ORDER; - typedef enum CBLAS_TRANSPOSE CBLAS_TRANSPOSE; - typedef enum CBLAS_UPLO CBLAS_UPLO; diff --git a/var/spack/repos/builtin/packages/plasma/package.py b/var/spack/repos/builtin/packages/plasma/package.py index 6fb436bc48..dc40658789 100644 --- a/var/spack/repos/builtin/packages/plasma/package.py +++ b/var/spack/repos/builtin/packages/plasma/package.py @@ -6,7 +6,7 @@ from spack import * -class Plasma(MakefilePackage): +class Plasma(CMakePackage): """Parallel Linear Algebra Software for Multicore Architectures, PLASMA is a software package for solving problems in dense linear algebra using multicore processors and Xeon Phi coprocessors. PLASMA provides @@ -16,17 +16,20 @@ class Plasma(MakefilePackage): problems, and singular value problems.""" homepage = "https://bitbucket.org/icl/plasma/" - url = "https://bitbucket.org/icl/plasma/downloads/plasma-17.1.tar.gz" - hg = "https://luszczek@bitbucket.org/icl/plasma" + url = "https://bitbucket.org/icl/plasma/downloads/plasma18.9.0.tar.gz" + hg = "https://luszczek@bitbucket.org/icl/plasma" version("develop", hg=hg) - version("17.1", "64b410b76023a41b3f07a5f0dca554e1") + version("18.9.0", sha256="753eae28ea48986a2cc7b8204d6eef646584541e59d42c3c94fa9879116b0774") + version("17.1", + sha256="d4b89f7c3d240a69dfe986284a14471eec4830b9e352ae902ea8861f15573dee", + url="https://bitbucket.org/icl/plasma/downloads/plasma-17.1.tar.gz") - variant('shared', default=True, description="Build shared library (disables static library)") + variant("shared", default=True, + description="Build shared library (disables static library)") depends_on("blas") depends_on("lapack") - depends_on("readline", when='@17.2:') conflicts("atlas") # does not have LAPACKE interface @@ -53,36 +56,60 @@ class Plasma(MakefilePackage): conflicts("%xl_r") patch("remove_absolute_mkl_include.patch", when="@17.1") - patch("add_netlib_lapacke_detection.patch", when="@17.1") - - def getblaslapacklibs(self): - if '^netlib-lapack' in self.spec: - bl_attr = ':c,fortran' - else: - bl_attr = '' - return self.spec['lapack' + bl_attr].libs + \ - self.spec['blas' + bl_attr].libs + \ - find_system_libraries(['libm']) + @when("@18.9.0:") + def cmake_args(self): + options = list() + + options.extend([ + "-DCMAKE_INSTALL_PREFIX=%s" % prefix, + "-DCMAKE_INSTALL_NAME_DIR:PATH=%s/lib" % prefix, + "-DBLAS_LIBRARIES=%s" % self.spec["blas"].libs.joined(";"), + "-DLAPACK_LIBRARIES=%s" % self.spec["lapack"].libs.joined(";") + ]) + + options += [ + "-DBUILD_SHARED_LIBS=%s" % + ('ON' if ('+shared' in self.spec) else 'OFF') + ] + + return options + + # Before 18.9.0 it was an Makefile package + @when("@:17.1") + def cmake(self, spec, prefix): + pass + + # Before 18.9.0 it was an Makefile package + @when("@:17.1") + def build(self, spec, prefix): + pass + + # Before 18.9.0 it was an Makefile package + @when("@:17.1") + def install(self, spec, prefix): + self.edit(spec, prefix) + make() + make("install") + + @when("@:17.1") def edit(self, spec, prefix): # copy "make.inc.mkl-gcc" provided by default into "make.inc" open("make.inc", "w").write(open("make.inc.mkl-gcc").read()) make_inc = FileFilter("make.inc") - if '~shared' in self.spec: - make_inc.filter("-fPIC", "") # not using fPIC - - if "^mkl" not in spec: + if not spec.satisfies("^intel-mkl"): make_inc.filter("-DPLASMA_WITH_MKL", "") # not using MKL - make_inc.filter("-DHAVE_MKL", "") # not using MKL + make_inc.filter("LIBS *= *.*", "LIBS = " + + self.spec["blas"].libs.ld_flags + " -lm") header_flags = "" # accumulate CPP flags for headers: and for dep in ("blas", "lapack"): try: # in case the dependency does not provide header flags header_flags += " " + spec[dep].headers.cpp_flags - except Exception: + except AttributeError: pass make_inc.filter("CFLAGS +[+]=", "CFLAGS += " + header_flags + " ") @@ -92,25 +119,3 @@ class Plasma(MakefilePackage): # make sure CC variable comes from build environment make_inc.filter("CC *[?]*= * .*cc", "") - - libs = self.getblaslapacklibs().ld_flags - if 'readline' in self.spec: - libs += ' ' + self.spec['readline'].libs.ld_flags - libs += ' ' + find_system_libraries(['libdl']).ld_flags - make_inc.filter("LIBS *[?]*= * .*", "LIBS = " + libs) - - @property - def build_targets(self): - targets = list() - - # use $CC set by Spack - targets.append("CC = {0}".format(self.compiler.cc)) - - if "^mkl" in self.spec: - targets.append("MKLROOT = {0}".format(env["MKLROOT"])) - - targets.append("LIBS = {0} {1} {2}".format( - self.getblaslapacklibs().ld_flags, - self.spec['readline'].libs.ld_flags, - find_system_libraries(['libdl']).ld_flags)) - return targets -- cgit v1.2.3-70-g09d2 From 408c156544875209e305068b790c9ac9949126b9 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Mon, 22 Oct 2018 18:04:53 -0500 Subject: sundials: update to version 3.2.1 (#9603) --- var/spack/repos/builtin/packages/sundials/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sundials/package.py b/var/spack/repos/builtin/packages/sundials/package.py index 43cfd3118a..0002b3e376 100644 --- a/var/spack/repos/builtin/packages/sundials/package.py +++ b/var/spack/repos/builtin/packages/sundials/package.py @@ -22,7 +22,8 @@ class Sundials(CMakePackage): version('4.0.0-dev.2', sha256='124fc12f2a68d32210c20f5005510607e0833764afaef2a70b741bc922519984') version('4.0.0-dev.1', sha256='6354e1d266b60c23766137b4ffa9bbde8bca97a562ccd94cab756b597ed753c1') version('4.0.0-dev', sha256='50e526327461aebe463accf6ef56f9c6773df65025f3020b9ce68b83bbf5dd27') - version('3.2.0', sha256='d2b690afecadf8b5a048bb27ab341de591d714605b98d3518985dfc2250e93f9', preferred=True) + version('3.2.1', sha256='47d94d977ab2382cdcdd02f72a25ebd4ba8ca2634bbb2f191fe1636e71c86808', preferred=True) + version('3.2.0', sha256='d2b690afecadf8b5a048bb27ab341de591d714605b98d3518985dfc2250e93f9') version('3.1.2', sha256='a8985bb1e851d90e24260450667b134bc13d71f5c6effc9e1d7183bd874fe116') version('3.1.1', sha256='a24d643d31ed1f31a25b102a1e1759508ce84b1e4739425ad0e18106ab471a24') version('3.1.0', sha256='18d52f8f329626f77b99b8bf91e05b7d16b49fde2483d3a0ea55496ce4cdd43a') -- cgit v1.2.3-70-g09d2 From 1a69bb474fd7f57bb7e7f50f33d7e8f062a53b3f Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Mon, 22 Oct 2018 18:05:23 -0500 Subject: hypre: update to version 2.15.1 (#9602) --- var/spack/repos/builtin/packages/hypre/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hypre/package.py b/var/spack/repos/builtin/packages/hypre/package.py index 40ec88ce0e..c78cd16071 100644 --- a/var/spack/repos/builtin/packages/hypre/package.py +++ b/var/spack/repos/builtin/packages/hypre/package.py @@ -18,6 +18,7 @@ class Hypre(Package): git = "https://github.com/LLNL/hypre.git" version('develop', branch='master') + version('2.15.1', '877002d49f38b6a1434955baf79eff35') version('2.15.0', '4645acc49141069cae1d53de96107a08') version('2.14.0', 'ecde5cc807ec45bfb647e9f28d2eaea1') version('2.13.0', '4b688a5c15b6b5e3de5e045ae081b89b') -- cgit v1.2.3-70-g09d2 From 31bed8f8f2ddfb77a8fba98c965aff8dd4442505 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Mon, 22 Oct 2018 20:00:39 -0500 Subject: plasma: add 18.10.0 and fix URL (#9608) --- var/spack/repos/builtin/packages/plasma/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/plasma/package.py b/var/spack/repos/builtin/packages/plasma/package.py index dc40658789..54ef75c207 100644 --- a/var/spack/repos/builtin/packages/plasma/package.py +++ b/var/spack/repos/builtin/packages/plasma/package.py @@ -16,10 +16,11 @@ class Plasma(CMakePackage): problems, and singular value problems.""" homepage = "https://bitbucket.org/icl/plasma/" - url = "https://bitbucket.org/icl/plasma/downloads/plasma18.9.0.tar.gz" + url = "https://bitbucket.org/icl/plasma/downloads/plasma-18.10.0.tar.gz" hg = "https://luszczek@bitbucket.org/icl/plasma" version("develop", hg=hg) + version("18.10.0", sha256="93dceae93f57a2fbd79b85d2fbf7907d1d32e158b8d1d93892d9ff3df9963210") version("18.9.0", sha256="753eae28ea48986a2cc7b8204d6eef646584541e59d42c3c94fa9879116b0774") version("17.1", sha256="d4b89f7c3d240a69dfe986284a14471eec4830b9e352ae902ea8861f15573dee", -- cgit v1.2.3-70-g09d2 From e4a24c3fbc96245e0712557aa9f0b1dc92297b72 Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Mon, 22 Oct 2018 18:59:45 -0700 Subject: added stat version 4.0.1 (#9607) * Add stat version 4.0.1 * stat 4.0.1: requires py-xdot * stat versions at or above 4.0.0 dont require python 2 (it still requires python but can build with 2 or 3) * stat versions at or above 4.0.0 dont require py-pygtk and py-enum34 * Replace py-xdot version 0.9.1 with 1.0 * py-xdot: use lib directory vs. lib64 for atk dependency --- var/spack/repos/builtin/packages/py-xdot/package.py | 6 +++--- var/spack/repos/builtin/packages/stat/package.py | 9 ++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-xdot/package.py b/var/spack/repos/builtin/packages/py-xdot/package.py index 6ab03ba54d..f840919294 100644 --- a/var/spack/repos/builtin/packages/py-xdot/package.py +++ b/var/spack/repos/builtin/packages/py-xdot/package.py @@ -15,7 +15,7 @@ class PyXdot(PythonPackage): git = "https://github.com/jrfonseca/xdot.py.git" version('master', branch="master") - version('0.9.1', commit="0fa629166989576b05d509c7ef0329c0f7655190") + version('1.0', '4e60c42d009a8802db6c1b4dab519863') version('0.9', '19c78311d73b0f9ea059a6febf42eeea') # setuptools is required at runtime to avoid: @@ -34,7 +34,7 @@ class PyXdot(PythonPackage): spec = self.spec repo_paths = '%s:%s:%s:%s' % ( join_path(spec['pango'].prefix.lib, 'girepository-1.0'), - join_path(spec['atk'].prefix.lib64, 'girepository-1.0'), + join_path(spec['atk'].prefix.lib, 'girepository-1.0'), join_path(spec['gdk-pixbuf'].prefix.lib, 'girepository-1.0'), join_path(spec['gtkplus'].prefix.lib, 'girepository-1.0')) dst = join_path(spec.prefix, spec['python'].package.site_packages_dir, @@ -52,7 +52,7 @@ class PyXdot(PythonPackage): join_path(spec['pango'].prefix.lib, 'girepository-1.0')) run_env.prepend_path('GI_TYPELIB_PATH', - join_path(spec['atk'].prefix.lib64, + join_path(spec['atk'].prefix.lib, 'girepository-1.0')) run_env.prepend_path('GI_TYPELIB_PATH', join_path(spec['gdk-pixbuf'].prefix.lib, diff --git a/var/spack/repos/builtin/packages/stat/package.py b/var/spack/repos/builtin/packages/stat/package.py index bf2cbe8466..3df3d04a61 100644 --- a/var/spack/repos/builtin/packages/stat/package.py +++ b/var/spack/repos/builtin/packages/stat/package.py @@ -14,6 +14,8 @@ class Stat(AutotoolsPackage): git = "https://github.com/llnl/stat.git" version('develop', branch='develop') + version('4.0.1', '3e21b48e7932d9a4a9efb300f0b97fa2', + url='https://github.com/LLNL/STAT/files/2489327/stat-4.0.1.tar.gz') version('4.0.0', 'b357160662ced251bc55cb1b884c3407', url='https://github.com/LLNL/STAT/releases/download/v4.0.0/stat-4.0.0.tar.gz') version('3.0.1', 'dac6f23c3639a0b21f923dc6219ba385', @@ -40,9 +42,10 @@ class Stat(AutotoolsPackage): depends_on('graphviz', type=('build', 'link', 'run')) depends_on('launchmon') depends_on('mrnet') - depends_on('python@:2.8') - depends_on('py-pygtk', type=('build', 'run')) - depends_on('py-enum34', type=('run')) + 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('swig') depends_on('mpi', when='+examples') -- cgit v1.2.3-70-g09d2 From 19207549ad83d4c9c95f4482f0dd635f6f5c0ce1 Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Mon, 22 Oct 2018 23:21:50 -0400 Subject: pumi: add version 2.2.0 (#9606) --- var/spack/repos/builtin/packages/pumi/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pumi/package.py b/var/spack/repos/builtin/packages/pumi/package.py index 12e1b5f35a..02cef568e4 100644 --- a/var/spack/repos/builtin/packages/pumi/package.py +++ b/var/spack/repos/builtin/packages/pumi/package.py @@ -26,6 +26,7 @@ class Pumi(CMakePackage): # it compares greater than a numbered version (e.g., 2.1.0). The spack # version string 'master' compares less than a numbered version. version('develop', branch='master') + version('2.2.0', commit='8c7e6f13943893b2bc1ece15003e4869a0e9634f') # tag 2.2.0 version('2.1.0', commit='840fbf6ec49a63aeaa3945f11ddb224f6055ac9f') variant('zoltan', default=False, description='Enable Zoltan Features') -- cgit v1.2.3-70-g09d2 From 49c705aebe92c651afeafa4c3d33d19dccfa22dd Mon Sep 17 00:00:00 2001 From: Stephen Herbein Date: Wed, 24 Oct 2018 01:06:34 -0700 Subject: flux-core & flux-sched: update versions and dependencies, fix git tags (#9610) * flux: ensure git tags are always available previous `--unshallow` would only run when `--depth 0` was used. If 1--single-branch` was used, then the `.git/shallow` file would not exist and `--unshallow` would not work. add v0.6.0 and update dependencies accordingly update dependencies to match latest flux versions adds support for python 3 increases precision of czmq version required for older flux versions adds new lz4 dependency --- var/spack/repos/builtin/packages/flux-core/package.py | 16 ++++++++++++---- var/spack/repos/builtin/packages/flux-sched/package.py | 9 +++++++-- 2 files changed, 19 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/flux-core/package.py b/var/spack/repos/builtin/packages/flux-core/package.py index 2c71cbe5aa..4dea197de2 100644 --- a/var/spack/repos/builtin/packages/flux-core/package.py +++ b/var/spack/repos/builtin/packages/flux-core/package.py @@ -23,11 +23,13 @@ class FluxCore(AutotoolsPackage): # This workaround is documented in PR #3543 build_directory = 'spack-build' - variant('doc', default=False, description='Build flux manpages') + variant('docs', default=False, description='Build flux manpages') variant('cuda', default=False, description='Build dependencies with support for CUDA') depends_on("zeromq@4.0.4:") - depends_on("czmq@2.2:") + depends_on("czmq") + depends_on("czmq@2.2:3.99", when="@0.1:0.6.99") + depends_on("czmq@3.0.1:", when="@0.7:,master") depends_on("hwloc@1.11.1:1.99") depends_on("hwloc +cuda", when='+cuda') depends_on("lua", type=('build', 'run', 'link')) @@ -37,9 +39,13 @@ class FluxCore(AutotoolsPackage): depends_on("munge") depends_on("libuuid") 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:", when="@0.11.0:,master") depends_on("py-cffi", type=('build', 'run')) + depends_on("py-six", type=('build', 'run'), when="@0.11.0:,master") depends_on("jansson") depends_on("yaml-cpp") + depends_on("lz4", when="@0.11.0:,master") # 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 @@ -57,11 +63,13 @@ class FluxCore(AutotoolsPackage): @when('@master') def setup(self): - # Check in case we are running `spack diy` from an "unshallow" clone - if os.path.exists('.git/shallow'): + with working_dir(self.stage.source_path): # Allow git-describe to get last tag so flux-version works: git = which('git') git('fetch', '--unshallow') + git("config", "remote.origin.fetch", + "+refs/heads/*:refs/remotes/origin/*") + git('fetch', 'origin') def autoreconf(self, spec, prefix): self.setup() diff --git a/var/spack/repos/builtin/packages/flux-sched/package.py b/var/spack/repos/builtin/packages/flux-sched/package.py index 388ea0a0b6..d3c424f716 100644 --- a/var/spack/repos/builtin/packages/flux-sched/package.py +++ b/var/spack/repos/builtin/packages/flux-sched/package.py @@ -15,12 +15,15 @@ class FluxSched(AutotoolsPackage): git = "https://github.com/flux-framework/flux-sched.git" version('master', branch='master') + version('0.6.0', '8aad185949038c7fb6b277e6a8282947917084ebbec5c5bf0ee3a81a0dcdbe41ba18b1df837c669ae7b48ca5f1e492a5172bffa6b9feb4dda1c6a7a85abed4e8') version('0.5.0', 'a9835c9c478aa41123a4e12672500052228aaf1ea770f74cb0901dbf4a049bd7d329e99d8d3484e39cfed1f911705030b2775dcfede39bc8bea59c6afe2549b1') version('0.4.0', '82732641ac4594ffe9b94ca442a99e92bf5f91bc14745af92203a887a40610dd44edda3ae07f9b6c8d63799b2968d87c8da28f1488edef1310d0d12be9bd6319') variant('cuda', default=False, description='Build dependencies with support for CUDA') depends_on("boost+graph", when='@0.5.0:,master') + depends_on("py-pyyaml", when="@0.7.0:,master") + depends_on("libxml2@2.9.1:", when="@0.6.0,master") depends_on("flux-core", type=('build', 'link', 'run')) depends_on("flux-core+cuda", when='+cuda') @@ -39,11 +42,13 @@ class FluxSched(AutotoolsPackage): @when('@master') def setup(self): - # Check in case we are running `spack diy` from an "unshallow" clone - if os.path.exists('.git/shallow'): + with working_dir(self.stage.source_path): # Allow git-describe to get last tag so flux-version works: git = which('git') git('fetch', '--unshallow') + git("config", "remote.origin.fetch", + "+refs/heads/*:refs/remotes/origin/*") + git('fetch', 'origin') def autoreconf(self, spec, prefix): self.setup() -- cgit v1.2.3-70-g09d2 From d33c1a14d79b05fe3bfe632ca414219477460f62 Mon Sep 17 00:00:00 2001 From: dorier Date: Wed, 24 Oct 2018 09:28:39 +0100 Subject: New package: Damaris (#9601) --- .../repos/builtin/packages/damaris/package.py | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 var/spack/repos/builtin/packages/damaris/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/damaris/package.py b/var/spack/repos/builtin/packages/damaris/package.py new file mode 100644 index 0000000000..950a98fd5f --- /dev/null +++ b/var/spack/repos/builtin/packages/damaris/package.py @@ -0,0 +1,52 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + + +from spack import * + + +class Damaris(CMakePackage): + """Damaris is a middleware for I/O and in situ analytics + targeting large-scale, MPI-based HPC simulations.""" + + homepage = "https://project.inria.fr/damaris/" + url = "https://gitlab.inria.fr/Damaris/damaris" + + version('master', git='https://gitlab.inria.fr/Damaris/damaris.git') + version('1.3.1', git='https://gitlab.inria.fr/Damaris/damaris.git', + commit='98c27e99458c10b834c4e59753f4ce5a42337c6f', preferred=True) + + variant('fortran', default=True, description='Enable Fortran support') + variant('hdf5', default=False, description='Enable the HDF5 storage plugin') + variant('static', default=False, description='Builds a static version of the library') + + depends_on('mpi') + depends_on('cmake@3.12.0:', type=('build')) + depends_on('boost +thread+log+filesystem+date_time @1.67:') + depends_on('xsd') + depends_on('xerces-c') + depends_on('hdf5@1.8.20:', when='+hdf5') + + def cmake_args(self): + + args = [] + if(not self.spec.variants['static'].value): + args.extend(['-DBUILD_SHARED_LIBS=ON']) + + args.extend(['-DCMAKE_CXX_COMPILER=%s' % self.spec['mpi'].mpicxx]) + args.extend(['-DCMAKE_C_COMPILER=%s' % self.spec['mpi'].mpicc]) + args.extend(['-DBOOST_ROOT=%s' % self.spec['boost'].prefix]) + args.extend(['-DXercesC_ROOT=%s' % self.spec['xerces-c'].prefix]) + args.extend(['-DXSD_ROOT=%s' % self.spec['xsd'].prefix]) + + if (self.spec.variants['fortran'].value): + args.extend(['-DCMAKE_Fortran_COMPILER=%s' + % self.spec['mpi'].mpifc]) + args.extend(['-DENABLE_FORTRAN:BOOL=ON']) + + if (self.spec.variants['hdf5'].value): + args.extend(['-DENABLE_HDF5:BOOL=ON']) + args.extend(['-DHDF5_ROOT:PATH=%s' % self.spec['hdf5'].prefix]) + return args -- cgit v1.2.3-70-g09d2 From 67383527009eada6cff250ea3572a81ffe501169 Mon Sep 17 00:00:00 2001 From: Dave Date: Wed, 24 Oct 2018 03:44:28 -0700 Subject: Warpx: non-conditional dependency on MPI (#9587) --- var/spack/repos/builtin/packages/warpx/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/warpx/package.py b/var/spack/repos/builtin/packages/warpx/package.py index 7be45eb37c..9af8cb79ac 100644 --- a/var/spack/repos/builtin/packages/warpx/package.py +++ b/var/spack/repos/builtin/packages/warpx/package.py @@ -20,7 +20,7 @@ class Warpx(MakefilePackage): version('master', git='https://github.com/ECP-WarpX/WarpX.git', tag='master') version('dev', git='https://github.com/ECP-WarpX/WarpX.git', tag='dev') - depends_on('mpi', when='+mpi') + depends_on('mpi') variant('dims', default='3', -- cgit v1.2.3-70-g09d2 From 8767167c79b506af4f72e13b6dfdf49f0fb178b4 Mon Sep 17 00:00:00 2001 From: Matthias Wolf Date: Wed, 24 Oct 2018 12:53:32 +0200 Subject: py-pyarrow: new package (#9416) arrow: add missing dependency for python build The Parquet library moved into the Arrow organisation, hence add a parquet flavor and adapt dependencies. --- var/spack/repos/builtin/packages/arrow/package.py | 9 ++++++ .../repos/builtin/packages/py-pyarrow/package.py | 37 ++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 var/spack/repos/builtin/packages/py-pyarrow/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/arrow/package.py b/var/spack/repos/builtin/packages/arrow/package.py index 63d3709f15..7610d1fae0 100644 --- a/var/spack/repos/builtin/packages/arrow/package.py +++ b/var/spack/repos/builtin/packages/arrow/package.py @@ -15,12 +15,15 @@ class Arrow(CMakePackage): homepage = "http://arrow.apache.org" url = "https://github.com/apache/arrow/archive/apache-arrow-0.9.0.tar.gz" + version('0.11.0', '0ac629a7775d86108e403eb66d9f1a3d3bdd6b3a497a86228aa4e8143364b7cc') version('0.9.0', 'ebbd36c362b9e1d398ca612f6d2531ec') version('0.8.0', '56436f6f61ccc68686b7e0ea30bf4d09') depends_on('boost@1.60:') depends_on('cmake@3.2.0:', type='build') depends_on('flatbuffers@1.8.0 build_type=Release') # only Release contains flatc + depends_on('python', when='+python') + depends_on('py-numpy', when='+python') depends_on('rapidjson') depends_on('snappy~shared') depends_on('zlib+pic') @@ -29,6 +32,8 @@ class Arrow(CMakePackage): variant('build_type', default='Release', description='CMake build type', values=('Debug', 'FastDebug', 'Release')) + variant('python', default=False, description='Build Python interface') + variant('parquet', default=False, description='Build Parquet interface') root_cmakelists_dir = 'cpp' @@ -48,6 +53,10 @@ class Arrow(CMakePackage): "-DARROW_WITH_BROTLI=OFF", "-DARROW_WITH_LZ4=OFF", ] + if self.spec.satisfies('+python'): + args.append("-DARROW_PYTHON:BOOL=ON") + if self.spec.satisfies('+parquet'): + args.append("-DARROW_PARQUET:BOOL=ON") for dep in ('flatbuffers', 'rapidjson', 'snappy', 'zlib', 'zstd'): args.append("-D{0}_HOME={1}".format(dep.upper(), self.spec[dep].prefix)) diff --git a/var/spack/repos/builtin/packages/py-pyarrow/package.py b/var/spack/repos/builtin/packages/py-pyarrow/package.py new file mode 100644 index 0000000000..650e209034 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pyarrow/package.py @@ -0,0 +1,37 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class PyPyarrow(PythonPackage): + """A cross-language development platform for in-memory data. + + This package contains the Python bindings. + """ + + homepage = "http://arrow.apache.org" + url = "https://pypi.org/packages/source/p/pyarrow/pyarrow-0.9.0.tar.gz" + + version('0.11.0', sha256='07a6fd71c5d7440f2c42383dd2c5daa12d7f0a012f1e88288ed08a247032aead') + version('0.9.0', sha256='7db8ce2f0eff5a00d6da918ce9f9cfec265e13f8a119b4adb1595e5b19fd6242') + + variant('parquet', default=False, description="Build with Parquet support") + + depends_on('cmake@3.0.0:', type='build') + depends_on('pkg-config', type='build') + depends_on('py-setuptools', type='build') + depends_on('py-cython', type='build') + + depends_on('arrow+python') + depends_on('arrow+parquet+python', when='+parquet') + + phases = ['build_ext', 'install'] + + def build_ext_args(self, spec, prefix): + args = [] + if spec.satisfies('+parquet'): + args.append('--with-parquet') + return args -- cgit v1.2.3-70-g09d2 From a0fb2838ea60f020179f480a2db1438da9d2e2ab Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Wed, 24 Oct 2018 06:39:12 -0600 Subject: Add pic variants to tioga, openfast, nalu-wind, and nalu. (#9560) --- var/spack/repos/builtin/packages/nalu-wind/package.py | 6 +++++- var/spack/repos/builtin/packages/nalu/package.py | 6 +++++- var/spack/repos/builtin/packages/openfast/package.py | 6 +++++- var/spack/repos/builtin/packages/tioga/package.py | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nalu-wind/package.py b/var/spack/repos/builtin/packages/nalu-wind/package.py index 6a8f4d78de..0b3414ad85 100644 --- a/var/spack/repos/builtin/packages/nalu-wind/package.py +++ b/var/spack/repos/builtin/packages/nalu-wind/package.py @@ -27,6 +27,8 @@ class NaluWind(CMakePackage): description='Compile with Hypre support') variant('shared', default=(sys.platform != 'darwin'), description='Build Trilinos as shared library') + variant('pic', default=True, + description='Position independent code') depends_on('mpi') depends_on('yaml-cpp@0.5.3:') @@ -50,7 +52,9 @@ class NaluWind(CMakePackage): '-DCMAKE_Fortran_COMPILER=%s' % spec['mpi'].mpifc, '-DMPI_C_COMPILER=%s' % spec['mpi'].mpicc, '-DMPI_CXX_COMPILER=%s' % spec['mpi'].mpicxx, - '-DMPI_Fortran_COMPILER=%s' % spec['mpi'].mpifc + '-DMPI_Fortran_COMPILER=%s' % spec['mpi'].mpifc, + '-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=%s' % ( + 'ON' if '+pic' in spec else 'OFF'), ]) if '+openfast' in spec: diff --git a/var/spack/repos/builtin/packages/nalu/package.py b/var/spack/repos/builtin/packages/nalu/package.py index 225ed2ee66..5e009d7e01 100644 --- a/var/spack/repos/builtin/packages/nalu/package.py +++ b/var/spack/repos/builtin/packages/nalu/package.py @@ -26,6 +26,8 @@ class Nalu(CMakePackage): description='Compile with Hypre support') variant('shared', default=(sys.platform != 'darwin'), description='Build Trilinos as shared library') + variant('pic', default=True, + description='Position independent code') depends_on('mpi') depends_on('yaml-cpp@0.5.3:') @@ -43,7 +45,9 @@ class Nalu(CMakePackage): options.extend([ '-DTrilinos_DIR:PATH=%s' % spec['trilinos'].prefix, - '-DYAML_DIR:PATH=%s' % spec['yaml-cpp'].prefix + '-DYAML_DIR:PATH=%s' % spec['yaml-cpp'].prefix, + '-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=%s' % ( + 'ON' if '+pic' in spec else 'OFF'), ]) if '+openfast' in spec: diff --git a/var/spack/repos/builtin/packages/openfast/package.py b/var/spack/repos/builtin/packages/openfast/package.py index 710b4f3bfc..14824588db 100644 --- a/var/spack/repos/builtin/packages/openfast/package.py +++ b/var/spack/repos/builtin/packages/openfast/package.py @@ -17,7 +17,7 @@ class Openfast(CMakePackage): version('develop', branch='dev') version('master', branch='master') - variant('shared', default=False, + variant('shared', default=True, description="Build shared libraries") variant('double-precision', default=True, description="Treat REAL as double precision") @@ -25,6 +25,8 @@ class Openfast(CMakePackage): description="Enable dynamic library loading interface") variant('cxx', default=False, description="Enable C++ bindings") + variant('pic', default=True, + description="Position independent code") # Dependencies for OpenFAST Fortran depends_on('blas') @@ -54,6 +56,8 @@ class Openfast(CMakePackage): 'ON' if '+dll-interface' in spec else 'OFF'), '-DBUILD_FAST_CPP_API:BOOL=%s' % ( 'ON' if '+cxx' in spec else 'OFF'), + '-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=%s' % ( + 'ON' if '+pic' in spec else 'OFF'), ]) # Make sure we use Spack's blas/lapack: diff --git a/var/spack/repos/builtin/packages/tioga/package.py b/var/spack/repos/builtin/packages/tioga/package.py index 8828c6b86e..89ea1923e6 100644 --- a/var/spack/repos/builtin/packages/tioga/package.py +++ b/var/spack/repos/builtin/packages/tioga/package.py @@ -15,8 +15,10 @@ class Tioga(CMakePackage): # The master branch doesn't support CMake version('develop', branch='nalu-api') - variant('shared', default=False, + variant('shared', default=True, description="Enable building shared libraries") + variant('pic', default=True, + description="Position independent code") depends_on('mpi') @@ -29,6 +31,8 @@ class Tioga(CMakePackage): options = [ '-DBUILD_SHARED_LIBS:BOOL=%s' % ( 'ON' if '+shared' in spec else 'OFF'), + '-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=%s' % ( + 'ON' if '+pic' in spec else 'OFF'), '-DMPI_CXX_COMPILER:PATH=%s' % spec['mpi'].mpicxx, '-DMPI_C_COMPILER:PATH=%s' % spec['mpi'].mpicc, '-DMPI_Fortran_COMPILER:PATH=%s' % spec['mpi'].mpifc -- cgit v1.2.3-70-g09d2 From 0fdd47b9474d9836dbd3ecda7cf309b8528e9cfe Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Thu, 25 Oct 2018 05:43:22 -0500 Subject: git: add new version 2.19.1 (#9637) --- var/spack/repos/builtin/packages/git/package.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index 3578447736..ba0e717fac 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -24,6 +24,11 @@ class Git(AutotoolsPackage): # You can find the source here: https://mirrors.edge.kernel.org/pub/software/scm/git/sha256sums.asc releases = [ + { + 'version': '2.19.1', + 'sha256': 'ec4dc96456612c65bf6d944cee9ac640145ec7245376832b781cb03e97cbb796', + 'sha256_manpages': 'bd27f58dc90a661e3080b97365eb7322bfa185de95634fc59d98311925a7d894' + }, { 'version': '2.18.0', 'sha256': '94faf2c0b02a7920b0b46f4961d8e9cad08e81418614102898a55f980fa3e7e4', -- cgit v1.2.3-70-g09d2 From 8d27c1fea1379077cfb05c6f4af220ec801e2be9 Mon Sep 17 00:00:00 2001 From: Federico Ficarelli Date: Thu, 25 Oct 2018 12:45:09 +0200 Subject: spdlog: add new versions (#9636) --- var/spack/repos/builtin/packages/spdlog/package.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/spdlog/package.py b/var/spack/repos/builtin/packages/spdlog/package.py index f65516d329..c669d99257 100644 --- a/var/spack/repos/builtin/packages/spdlog/package.py +++ b/var/spack/repos/builtin/packages/spdlog/package.py @@ -12,6 +12,8 @@ class Spdlog(CMakePackage): homepage = "https://github.com/gabime/spdlog" url = "https://github.com/gabime/spdlog/archive/v0.9.0.tar.gz" + version('1.2.1', sha256='867a4b7cedf9805e6f76d3ca41889679054f7e5a3b67722fe6d0eae41852a767') + version('1.2.0', sha256='0ba31b9e7f8e43a7be328ab0236d57810e5d4fc8a1a7842df665ae22d5cbd128') version('1.1.0', sha256='3dbcbfd8c07e25f5e0d662b194d3a7772ef214358c49ada23c044c4747ce8b19') version('1.0.0', sha256='90d5365121bcd2c41ce94dfe6a460e89507a2dfef6133fe5fad5bb35ac4ef0a1') version('0.17.0', sha256='94f74fd1b3344733d1db3de2ec22e6cbeb769f93a8baa0d4a22b1f62dc7369f8') @@ -25,3 +27,5 @@ class Spdlog(CMakePackage): version('0.11.0', '08232203f18a6f9ff47e083cc7a141a050805d3b') version('0.10.0', '57b471ef97a23cc29c38b62e00e89a411a87ea7f') version('0.9.0', 'dda741ef8e12d57d91f778d85e95a27d84a82ac4') + + depends_on('cmake@3.1:', type='build') -- cgit v1.2.3-70-g09d2 From 534b71bdf10ce5331a08ed70a00e86a21b56df19 Mon Sep 17 00:00:00 2001 From: dorier Date: Thu, 25 Oct 2018 22:53:29 +0100 Subject: Package VisIt: updated visit package (#9433) * updated visit package * make hdf5 and silo conflict with ~gui variant * Changed parallel => mpi and quotes in description * Corrected +mpi variant in VisIt package The previous commit introduced a bug (+parallel variant wasn't renamed +mpi), and the +mpi variant wasn't True by default. This is corrected. --- var/spack/repos/builtin/packages/visit/package.py | 60 +++++++++++++++++------ 1 file changed, 46 insertions(+), 14 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/visit/package.py b/var/spack/repos/builtin/packages/visit/package.py index 96c7b1dfe1..4de0294f43 100644 --- a/var/spack/repos/builtin/packages/visit/package.py +++ b/var/spack/repos/builtin/packages/visit/package.py @@ -19,33 +19,65 @@ class Visit(CMakePackage): version('2.10.2', '253de0837a9d69fb689befc98ea4d068') version('2.10.1', '3cbca162fdb0249f17c4456605c4211e') + variant('gui', default=True, description='Enable VisIt\'s GUI') + variant('hdf5', default=True, description='Enable HDF5 file format') + variant('silo', default=True, description='Enable Silo file format') + variant('python', default=True, description='Enable Python support') + variant('mpi', default=True, description='Enable parallel engine') + depends_on('cmake@3.0:', type='build') depends_on('vtk@6.1.0~opengl2') - depends_on('qt@4.8.6') - depends_on('qwt') - depends_on('python') - depends_on('silo+shared') - depends_on('hdf5') + depends_on('qt@4.8.6', when='+gui') + depends_on('qwt', when='+gui') + depends_on('python', when='+python') + depends_on('silo+shared', when='+silo') + depends_on('hdf5', when='+hdf5') + depends_on('mpi', when='+mpi') + + conflicts('+hdf5', when='~gui') + conflicts('+silo', when='~gui') root_cmakelists_dir = 'src' def cmake_args(self): spec = self.spec - qt_bin = spec['qt'].prefix.bin + args = [ '-DVTK_MAJOR_VERSION={0}'.format(spec['vtk'].version[0]), '-DVTK_MINOR_VERSION={0}'.format(spec['vtk'].version[1]), '-DVISIT_VTK_DIR:PATH={0}'.format(spec['vtk'].prefix), '-DVISIT_USE_GLEW=OFF', - '-DVISIT_LOC_QMAKE_EXE:FILEPATH={0}/qmake-qt4'.format(qt_bin), - '-DPYTHON_DIR:PATH={0}'.format(spec['python'].home), - '-DVISIT_SILO_DIR:PATH={0}'.format(spec['silo'].prefix), - '-DVISIT_HDF5_DIR:PATH={0}'.format(spec['hdf5'].prefix), - '-DVISIT_QWT_DIR:PATH={0}'.format(spec['qwt'].prefix) + '-DCMAKE_CXX_FLAGS=-fPIC', + '-DCMAKE_C_FLAGS=-fPIC' ] - if spec.satisfies('^hdf5+mpi', strict=True): - args.append('-DVISIT_HDF5_MPI_DIR:PATH={0}'.format( - spec['hdf5'].prefix)) + if(spec.variants['python'].value): + args.append('-DPYTHON_DIR:PATH={0}'.format(spec['python'].home)) + + if(spec.variants['gui'].value): + qt_bin = spec['qt'].prefix.bin + args.append( + '-DVISIT_LOC_QMAKE_EXE:FILEPATH={0}/qmake-qt4'.format(qt_bin)) + args.append('-DVISIT_QWT_DIR:PATH={0}'.format(spec['qwt'].prefix)) + else: + args.append('-DVISIT_SERVER_COMPONENTS_ONLY=ON') + args.append('-DVISIT_ENGINE_ONLY=ON') + + if(spec.variants['hdf5'].value): + args.append( + '-DVISIT_HDF5_DIR:PATH={0}'.format(spec['hdf5'].prefix)) + if spec.satisfies('^hdf5+mpi', strict=True): + args.append('-DVISIT_HDF5_MPI_DIR:PATH={0}'.format( + spec['hdf5'].prefix)) + + if(spec.variants['silo'].value): + args.append( + '-DVISIT_SILO_DIR:PATH={0}'.format(spec['silo'].prefix)) + + if(spec.variants['mpi'].value): + args.append('-DVISIT_PARALLEL=ON') + args.append('-DVISIT_C_COMPILER={0}'.format(spec['mpi'].mpicc)) + args.append('-DVISIT_CXX_COMPILER={0}'.format(spec['mpi'].mpicxx)) + args.append('-DVISIT_MPI_COMPILER={0}'.format(spec['mpi'].mpicxx)) return args -- cgit v1.2.3-70-g09d2 From fb86598b35fba4b80a6efab17432408ea64834a7 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Fri, 26 Oct 2018 02:20:25 +0200 Subject: suite-sparse: add GCC version constraint (#9622) Move suite-sparse gcc version constraint from dealii to suite-sparse package and update it (gcc 4.9 is required as of version 5.2.0 rather than 5.1.0). The constraint is now expressed as a conflict rather than a dependency. --- var/spack/repos/builtin/packages/dealii/package.py | 1 - var/spack/repos/builtin/packages/suite-sparse/package.py | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 74f6ff2baf..753c9be1fb 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -105,7 +105,6 @@ class Dealii(CMakePackage, CudaPackage): depends_on('lapack') depends_on('muparser') depends_on('suite-sparse') - depends_on('suite-sparse@:5.1.0', when='%gcc@:4.8.99') depends_on('tbb') depends_on('zlib') diff --git a/var/spack/repos/builtin/packages/suite-sparse/package.py b/var/spack/repos/builtin/packages/suite-sparse/package.py index 2bdaf70c18..3ab4f06068 100644 --- a/var/spack/repos/builtin/packages/suite-sparse/package.py +++ b/var/spack/repos/builtin/packages/suite-sparse/package.py @@ -46,6 +46,8 @@ class SuiteSparse(Package): # Fixes 'libgraphblas.so.2.0.1: undefined reference to `__fpclassify'' patch('graphblas_libm_dep.patch', when='@5.2.0:5.2.99%clang') + conflicts('%gcc@:4.8', when='@5.2.0:', msg='gcc version must be at least 4.9 for suite-sparse@5.2.0:') + def install(self, spec, prefix): # The build system of SuiteSparse is quite old-fashioned. # It's basically a plain Makefile which include an header -- cgit v1.2.3-70-g09d2 From df7cd00c472754b3bf0d0d0750f856025510b914 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Thu, 25 Oct 2018 19:22:45 -0500 Subject: hdf5: add version 1.10.4 (#9625) --- var/spack/repos/builtin/packages/hdf5/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index 4f2b9e24d1..00fd80dc54 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -20,6 +20,7 @@ class Hdf5(AutotoolsPackage): list_url = "https://support.hdfgroup.org/ftp/HDF5/releases" list_depth = 3 + version('1.10.4', '8f60dc4dd6ab5fcd23c750d1dc5bca3d0453bdce5c8cdaf0a4a61a9d1122adb2') version('1.10.3', 'b600d7c914cfa80ae127cd1a1539981213fee9994ac22ebec9e3845e951d9b39') version('1.10.2', '8d4eae84e533efa57496638fd0dca8c3') version('1.10.1', '43a2f9466702fb1db31df98ae6677f15') @@ -277,8 +278,8 @@ HDF5 version {version} {version} else: cc = Executable(self.compiler.cc) cc(*(['-c', "check.c"] + spec['hdf5'].headers.cpp_flags.split())) - cc(*(['-o', "check", "check.o"] + - spec['hdf5'].libs.ld_flags.split())) + cc(*(['-o', "check", + "check.o"] + spec['hdf5'].libs.ld_flags.split())) try: check = Executable('./check') output = check(output=str) -- cgit v1.2.3-70-g09d2 From e91f8f5f82b0b923fde922df75091f6ce1af4466 Mon Sep 17 00:00:00 2001 From: Cameron Stanavige Date: Thu, 25 Oct 2018 17:50:45 -0700 Subject: unifycr: new package (#9594) --- .../repos/builtin/packages/unifycr/package.py | 95 ++++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 var/spack/repos/builtin/packages/unifycr/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/unifycr/package.py b/var/spack/repos/builtin/packages/unifycr/package.py new file mode 100644 index 0000000000..17feb65e7a --- /dev/null +++ b/var/spack/repos/builtin/packages/unifycr/package.py @@ -0,0 +1,95 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack import * + + +class Unifycr(AutotoolsPackage): + """User level file system that enables applications to use node-local + storage as burst buffers for shared files. Supports scalable and efficient + aggregation of I/O bandwidth from burst buffers while having the same life + cycle as a batch-submitted job. + UnifyCR is designed to support common I/O workloads, including + checkpoint/restart. While primarily designed for N-N write/read, UnifyCR + compliments its functionality with the support for N-1 write/read.""" + + homepage = "https://github.com/LLNL/UnifyCR" + git = "https://github.com/LLNL/UnifyCR.git" + + version('develop', branch='dev', preferred=True) + version('0.1.1', tag='v0.1.1') + + variant('debug', default='False', description='Enable debug build options') + variant('hdf5', default='False', description='Build with parallel HDF5 (install with `^hdf5~mpi` for serial)') + variant('numa', default='False', description='Build with NUMA') + + depends_on('autoconf', type='build') + depends_on('automake', type='build') + depends_on('libtool', type='build') + depends_on('m4', type='build') + + # Required dependencies + # Latest version of GOTCHA has API changes that break UnifyCR. + # Updates to UnifyCR are coming in order to fix this. + depends_on('gotcha@0.0.2') + depends_on('leveldb') + depends_on('mpi') + depends_on('pkg-config@0.9.0:') + + # Optional dependencies + + # UnifyCR's integration with HDF5 is still a WIP and is currently + # configured for serial only. HDF5 is parallel by default. + # + # To build with serial HDF5, use `spack install unifycr+hdf5 ^hdf5~mpi` + # + # Once UnifyCR is compatible with parallel HDF5, excluding `^hdf5~mpi` from + # the install line will build UnifyCR with parallel HDF5. + + # v0.1.1 not HDF5 compatible; can change when v0.1.1 is no longer supported + depends_on('hdf5', when='@0.1.2: +hdf5') + depends_on('numactl', when='+numa') + + # we depend on numactl, which does't currently build on darwin + conflicts('platform=darwin', when='+numa') + conflicts('+hdf5', when='@:0.1.1') + + # Parallel disabled to prevent tests from being run out-of-order when + # installed with the --test={root, all} option. Can potentially change if + # we add a +test configure option and variant. + parallel = False + build_directory = 'spack-build' + + def configure_args(self): + spec = self.spec + args = [] + + if spec.satisfies('@0.1.1'): + env['CC'] = spec['mpi'].mpicc + + # UnifyCR's configure requires the exact path for HDF5 + def hdf5_compiler_path(name): + if '~mpi' in spec[name]: # serial HDF5 + return spec[name].prefix.bin.h5cc + else: # parallel HDF5 + return spec[name].prefix.bin.h5pcc + + args.extend(self.with_or_without('numa', + lambda x: spec['numactl'].prefix)) + args.extend(self.with_or_without('hdf5', hdf5_compiler_path)) + + if '+debug' in spec: + args.append('--enable-debug') + + if spack.config.get('config:debug'): + args.append('--disable-silent-rules') + else: + args.append('--enable-silent-rules') + + return args + +# @when('@develop') TODO: uncomment when we `make dist` a stable release + def autoreconf(self, spec, prefix): + bash = which('bash') + bash('./autogen.sh') -- cgit v1.2.3-70-g09d2 From 837dc22a0b4a6480900034bfd44ffcbd93ee6b42 Mon Sep 17 00:00:00 2001 From: Miles Perry <37849532+Miles-Perry@users.noreply.github.com> Date: Thu, 25 Oct 2018 19:53:22 -0500 Subject: new package: karma (#9571) --- var/spack/repos/builtin/packages/karma/package.py | 39 +++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/karma/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/karma/package.py b/var/spack/repos/builtin/packages/karma/package.py new file mode 100644 index 0000000000..b1a45f6919 --- /dev/null +++ b/var/spack/repos/builtin/packages/karma/package.py @@ -0,0 +1,39 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class Karma(Package): + """Karma is a toolkit for interprocess communications, authentication, + encryption, graphics display, user interface and manipulating the Karma + network data structure. It contains KarmaLib (the structured libraries + and API) and a large number of modules (applications) + to perform many standard tasks. """ + + homepage = "https://www.atnf.csiro.au/computing/software/karma/" + url = "ftp://ftp.atnf.csiro.au/pub/software/karma/karma-1.7.25-common.tar.bz2" + + version('1.7.25-common', sha256='afda682d79c0923df5a6c447a32b09294da1582933abae3205c008104da54fbd') + + depends_on('libx11', type=('build', 'run')) + depends_on('libxaw', type=('build', 'run')) + + phases = ['install'] + + resource( + name='karma-linux', + url='ftp://ftp.atnf.csiro.au/pub/software/karma/karma-1.7.25-amd64_Linux_libc6.3.tar.bz2', + sha256='effc3ed61c28b966b357147d90357d03c22d743c6af6edb49a863c6eb625a441', + destination='./' + ) + + def setup_environment(self, spack_env, run_env): + run_env.prepend_path('LIBRARY_PATH', self.prefix.lib) + run_env.prepend_path('LD_LIBRARY_PATH', self.prefix.lib) + + def install(self, spec, prefix): + install_tree('./karma-1.7.25/amd64_Linux_libc6.3/bin', prefix.bin) + install_tree('./karma-1.7.25/amd64_Linux_libc6.3/lib', prefix.lib) -- cgit v1.2.3-70-g09d2 From b7973d01efaf18dd4b3b0ed2e1372752c89bfe6d Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Thu, 25 Oct 2018 19:54:27 -0500 Subject: spades: add conflict with older gcc (#9640) --- var/spack/repos/builtin/packages/spades/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/spades/package.py b/var/spack/repos/builtin/packages/spades/package.py index 0e7cf05a7f..ee96794523 100644 --- a/var/spack/repos/builtin/packages/spades/package.py +++ b/var/spack/repos/builtin/packages/spades/package.py @@ -21,6 +21,9 @@ class Spades(CMakePackage): depends_on('zlib') depends_on('bzip2') + # SPAdes will explicitly not compile with gcc < 5.3.0 + conflicts('%gcc@:5.2.9') + conflicts('%gcc@7.1.0:', when='@:3.10.1') root_cmakelists_dir = 'src' -- cgit v1.2.3-70-g09d2 From b1e84d4cdcde846eccf8d615cfc74aebe766e60a Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Thu, 25 Oct 2018 19:55:22 -0500 Subject: r-argparse: remove unnecessary r-getopt version (#9638) There is no checksum for r-getopt@1.19 and this package is compatible with the latest version anyway. --- var/spack/repos/builtin/packages/r-argparse/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-argparse/package.py b/var/spack/repos/builtin/packages/r-argparse/package.py index 25c8c5379a..c722eae792 100644 --- a/var/spack/repos/builtin/packages/r-argparse/package.py +++ b/var/spack/repos/builtin/packages/r-argparse/package.py @@ -19,5 +19,5 @@ class RArgparse(RPackage): depends_on('r-proto@1:', type=('build', 'run')) depends_on('r-findpython', type=('build', 'run')) - depends_on('r-getopt@1.19', type=('build', 'run')) + depends_on('r-getopt', type=('build', 'run')) depends_on('r-jsonlite', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 84e6fb3a64b7e25bb98af15e5b51ec40a5ee8365 Mon Sep 17 00:00:00 2001 From: jkelling Date: Fri, 26 Oct 2018 02:57:41 +0200 Subject: package nccl: Fix install_targets for verison 2.3.5-5: (#9623) --- var/spack/repos/builtin/packages/nccl/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nccl/package.py b/var/spack/repos/builtin/packages/nccl/package.py index d13d22596f..5ea2b9689c 100644 --- a/var/spack/repos/builtin/packages/nccl/package.py +++ b/var/spack/repos/builtin/packages/nccl/package.py @@ -26,4 +26,7 @@ class Nccl(MakefilePackage): @property def install_targets(self): - return ['PREFIX={0}'.format(self.prefix), 'install'] + if self.version >= Version('2.3.5-5'): + return ['PREFIX={0}'.format(self.prefix), 'src.install'] + else: + return ['PREFIX={0}'.format(self.prefix), 'install'] -- cgit v1.2.3-70-g09d2 From 58b98738e1fc47925f098f1793d39a15941c71c2 Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Thu, 25 Oct 2018 19:58:07 -0500 Subject: r-goplot: fix r-rcolorbrewer version format (#9631) --- var/spack/repos/builtin/packages/r-goplot/package.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-goplot/package.py b/var/spack/repos/builtin/packages/r-goplot/package.py index 3d8e351cb6..f9b86de5bd 100644 --- a/var/spack/repos/builtin/packages/r-goplot/package.py +++ b/var/spack/repos/builtin/packages/r-goplot/package.py @@ -2,7 +2,6 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) - from spack import * @@ -27,4 +26,4 @@ class RGoplot(RPackage): depends_on('r-ggplot2@2.0.0:', type=('build', 'run')) depends_on('r-ggdendro@0.1-17:', type=('build', 'run')) depends_on('r-gridextra@2.0.0:', type=('build', 'run')) - depends_on('r-rcolorbrewer@1.1.2:', type=('build', 'run')) + depends_on('r-rcolorbrewer@1.1-2:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 3fc7dd160d91d54b60a688dc35102a109290ff01 Mon Sep 17 00:00:00 2001 From: dorier Date: Fri, 26 Oct 2018 02:03:56 +0100 Subject: updated URL format for Catalyst package when version is greater or equal to 5.6 (#9611) --- var/spack/repos/builtin/packages/catalyst/package.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/catalyst/package.py b/var/spack/repos/builtin/packages/catalyst/package.py index 40f72a125c..d9be7b17dd 100644 --- a/var/spack/repos/builtin/packages/catalyst/package.py +++ b/var/spack/repos/builtin/packages/catalyst/package.py @@ -16,7 +16,8 @@ class Catalyst(CMakePackage): homepage = 'http://www.paraview.org' url = "http://www.paraview.org/files/v5.5/ParaView-v5.5.2.tar.gz" - _urlfmt = 'http://www.paraview.org/files/v{0}/ParaView-v{1}{2}.tar.gz' + _urlfmt_gz = 'http://www.paraview.org/files/v{0}/ParaView-v{1}{2}.tar.gz' + _urlfmt_xz = 'http://www.paraview.org/files/v{0}/ParaView-v{1}{2}.tar.xz' version('5.5.2', '7eb93c31a1e5deb7098c3b4275e53a4a') version('5.5.1', 'a7d92a45837b67c3371006cc45163277') @@ -46,9 +47,11 @@ class Catalyst(CMakePackage): def url_for_version(self, version): """Handle ParaView version-based custom URLs.""" if version < Version('5.1.0'): - return self._urlfmt.format(version.up_to(2), version, '-source') + return self._urlfmt_gz.format(version.up_to(2), version, '-source') + elif version < Version('5.6.0'): + return self._urlfmt_gz.format(version.up_to(2), version, '') else: - return self._urlfmt.format(version.up_to(2), version, '') + return self._urlfmt_xz.format(version.up_to(2), version, '') def do_stage(self, mirror_only=False): """Unpacks and expands the fetched tarball. -- cgit v1.2.3-70-g09d2 From a7bb03c7a3209a6dacdf8bb7370e35fb05894b22 Mon Sep 17 00:00:00 2001 From: sknigh Date: Thu, 25 Oct 2018 18:05:26 -0700 Subject: LLVM: add older version and gcc constraint (#9614) - Added v 5.0.2 - Added conflict with gcc 8 for versions that do not build --- var/spack/repos/builtin/packages/llvm/package.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index a146a44110..8ec8d7fc37 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -211,6 +211,22 @@ class Llvm(CMakePackage): 'libunwind': '022a4ee2c3bf7b6d151e0444f66aca64' } }, + { + 'version': '5.0.2', + 'md5': 'c5e980edf7f22d66f0f7561b35c1e195', + 'resources': { + 'compiler-rt': '22728d702a64ffc6d073d1dda25a1eb9', + 'openmp': 'ad214f7f46d671f9b73d75e9d54e4594', + 'polly': '5777f1248633ebc2b81ffe6ecb8cf4b1', + 'libcxx': '93e7942c01cdd5bce5378bc3926f97ea', + 'libcxxabi': '855ada029899c95cd6a852f13ed0ea71', + 'cfe': '1cd6ee1b74331fb37c27b4a2a1802c97', + 'clang-tools-extra': 'd4d0d9637fa1e47daf3f51e743d8f138', + 'lldb': '9d0addd1a28a4c155b8f69919e7bbff7', + 'lld': '7b7e2371cd250aec54879ae13b441382', + 'libunwind': '5b2a11e475fe8e7f3725792ba66da086', + } + }, { 'version': '5.0.1', 'md5': '3a4ec6dcbc71579eeaec7cb157fe2168', @@ -493,6 +509,9 @@ class Llvm(CMakePackage): conflicts('+clang_extra', when='~clang') conflicts('+lldb', when='~clang') + # LLVM 4 and 5 does not build with GCC 8 + conflicts('%gcc@8:', when='@:5') + # Github issue #4986 patch('llvm_gcc7.patch', when='@4.0.0:4.0.1+lldb %gcc@7.0:') -- cgit v1.2.3-70-g09d2 From 6e261b41869e259095309ff651bc39176a9b5880 Mon Sep 17 00:00:00 2001 From: Will Furnass Date: Fri, 26 Oct 2018 02:14:30 +0100 Subject: nag: fix NAG Fortran Compiler MD5 checksum for 6.1; add 6.2 checksum (#9617) --- var/spack/repos/builtin/packages/nag/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/nag/package.py b/var/spack/repos/builtin/packages/nag/package.py index d7c6ead714..8c72d36a40 100644 --- a/var/spack/repos/builtin/packages/nag/package.py +++ b/var/spack/repos/builtin/packages/nag/package.py @@ -11,7 +11,8 @@ class Nag(Package): """The NAG Fortran Compiler.""" homepage = "http://www.nag.com/nagware/np.asp" - version('6.1', '0040d2254258223c78a6a4ab4829d7e0') + version('6.2', '8b119cc3296969bbd68b781f625de272') + version('6.1', '9b3cc0f8703c79f6231ae12359535119') version('6.0', '3fa1e7f7b51ef8a23e6c687cdcad9f96') # Licensing -- cgit v1.2.3-70-g09d2 From 49b652780d4168cde28fe3bdb4f3e884844027f0 Mon Sep 17 00:00:00 2001 From: Ross Miller Date: Thu, 25 Oct 2018 21:16:23 -0400 Subject: Fix issue with miniconda attempting to install the incorrect version (#9589) The install() function in the miniconda2 & 3 package.py files referenced self.url, which is hard-coded to 4.3.11. That's not necessary the version that the user requested, though. Changed the install() function to reference self.stage.archive_file. Also added a version string for 4.5.11. --- var/spack/repos/builtin/packages/miniconda2/package.py | 8 ++++---- var/spack/repos/builtin/packages/miniconda3/package.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/miniconda2/package.py b/var/spack/repos/builtin/packages/miniconda2/package.py index 2ac86588c9..c5c5fb3f40 100644 --- a/var/spack/repos/builtin/packages/miniconda2/package.py +++ b/var/spack/repos/builtin/packages/miniconda2/package.py @@ -4,7 +4,6 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * -from six.moves.urllib.parse import urlparse from os.path import split @@ -14,14 +13,15 @@ class Miniconda2(Package): homepage = "https://conda.io/miniconda.html" url = "https://repo.continuum.io/miniconda/Miniconda2-4.3.11-Linux-x86_64.sh" + version('4.5.11', sha256='0e23e8d0a1a14445f78960a66b363b464b889ee3b0e3f275b7ffb836df1cb0c6', expand=False) version('4.5.4', '8a1c02f6941d8778f8afad7328265cf5', expand=False) version('4.3.30', 'bd1655b4b313f7b2a1f2e15b7b925d03', expand=False) version('4.3.14', '8cb075cf5462480980ef2373ad9fad38', expand=False) version('4.3.11', 'd573980fe3b5cdf80485add2466463f5', expand=False) def install(self, spec, prefix): - # peel the name of the script out of the url - result = urlparse(self.url) - dir, script = split(result.path) + # peel the name of the script out of the pathname of the + # downloaded file + dir, script = split(self.stage.archive_file) bash = which('bash') bash(script, '-b', '-f', '-p', self.prefix) diff --git a/var/spack/repos/builtin/packages/miniconda3/package.py b/var/spack/repos/builtin/packages/miniconda3/package.py index c7c210f0ca..cf47b424c5 100644 --- a/var/spack/repos/builtin/packages/miniconda3/package.py +++ b/var/spack/repos/builtin/packages/miniconda3/package.py @@ -4,7 +4,6 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * -from six.moves.urllib.parse import urlparse from os.path import split @@ -14,14 +13,15 @@ class Miniconda3(Package): homepage = "https://conda.io/miniconda.html" url = "https://repo.continuum.io/miniconda/Miniconda3-4.3.11-Linux-x86_64.sh" + version('4.5.11', sha256='ea4594241e13a2671c5b158b3b813f0794fe58d514795fbf72a1aad24db918cf', expand=False) version('4.5.4', 'a946ea1d0c4a642ddf0c3a26a18bb16d', expand=False) version('4.3.30', '0b80a152332a4ce5250f3c09589c7a81', expand=False) version('4.3.14', 'fc6fc37479e3e3fcf3f9ba52cae98991', expand=False) version('4.3.11', '1924c8d9ec0abf09005aa03425e9ab1a', expand=False) def install(self, spec, prefix): - # peel the name of the script out of the url - result = urlparse(self.url) - dir, script = split(result.path) + # peel the name of the script out of the pathname of the + # downloaded file + dir, script = split(self.stage.archive_file) bash = which('bash') bash(script, '-b', '-f', '-p', self.prefix) -- cgit v1.2.3-70-g09d2 From 734d903b0313e70f5d22959fdc34432643120d46 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Fri, 26 Oct 2018 03:18:42 -0600 Subject: cabana: added v0.1.0 (#9644) --- var/spack/repos/builtin/packages/cabana/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cabana/package.py b/var/spack/repos/builtin/packages/cabana/package.py index 0dcc74f21e..115bdf6a2b 100644 --- a/var/spack/repos/builtin/packages/cabana/package.py +++ b/var/spack/repos/builtin/packages/cabana/package.py @@ -13,7 +13,8 @@ class Cabana(CMakePackage): git = "https://github.com/ECP-copa/Cabana.git" url = "https://github.com/ECP-copa/Cabana/archive/0.1.0.tar.gz" - version('develop', branch='master', submodules=True) + version('develop', branch='master') + version('0.1.0', sha256='3280712facf6932b9d1aff375b24c932abb9f60a8addb0c0a1950afd0cb9b9cf') version('0.1.0-rc0', sha256='73754d38aaa0c2a1e012be6959787108fec142294774c23f70292f59c1bdc6c5') variant('serial', default=True, description="enable Serial backend (default)") -- cgit v1.2.3-70-g09d2 From 8d288cd8eb923dc205500cf4c377219c5a855b05 Mon Sep 17 00:00:00 2001 From: Federico Ficarelli Date: Sat, 27 Oct 2018 03:08:56 +0200 Subject: fmt: add new versions and update constraints (#9634) Update versions and constraints on cmake and supported toolchains (as stated by the documentation). --- var/spack/repos/builtin/packages/fmt/package.py | 37 +++++++++++++++++-------- 1 file changed, 26 insertions(+), 11 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fmt/package.py b/var/spack/repos/builtin/packages/fmt/package.py index ecebada931..e969fc29ee 100644 --- a/var/spack/repos/builtin/packages/fmt/package.py +++ b/var/spack/repos/builtin/packages/fmt/package.py @@ -12,18 +12,33 @@ class Fmt(CMakePackage): to C++ IOStreams.""" homepage = "http://fmtlib.net/latest/index.html" - url = "https://github.com/fmtlib/fmt/releases/download/4.0.0/fmt-4.0.0.zip" + url = "https://github.com/fmtlib/fmt/releases/download/5.2.1/fmt-5.2.1.zip" - version('4.1.0', 'ded3074a9405a07604d6355fdb592484') - version('4.0.0', '605b5abee11b83195191234f4f414cf1') - version('3.0.2', 'b190a7b8f2a5e522ee70cf339a53d3b2') - version('3.0.1', '14505463b838befe1513b09cae112715') - version('3.0.0', 'c099561e70fa194bb03b3fd5de2d3fd0') + version('5.2.1', sha256='43894ab8fe561fc9e523a8024efc23018431fa86b95d45b06dbe6ddb29ffb6cd') + version('5.2.0', sha256='c016db7f825bce487a7929e1edb747b9902a2935057af6512cad3df3a080a027') + version('5.1.0', sha256='77ef9fea638dc846e484409fbc1ea710bb9bcea042e7b35b8805041bf7655ad5') + version('5.0.0', sha256='8dd58daf13e7e8adca99f8725ef3ae598f9c97efda7d6d8d4c49db5047879097') + version('4.1.0', sha256='9d49bf02ceb9d0eec51144b203b63b77e69d3798bb402fb82e7d0bdb06c79eeb') + version('4.0.0', sha256='10a9f184d4d66f135093a08396d3b0a0ebe8d97b79f8b3ddb8559f75fe4fcbc3') + version('3.0.2', sha256='51407b62a202b29d1a9c0eb5ecd4095d30031aea65407c42c25cb10cb5c59ad4') + version('3.0.1', sha256='4c9af0dc919a8ae7022b44e1a03c435e42d65c866f44667d8d920d342b098550') + version('3.0.0', sha256='1b050b66fa31b74f1d75a14f15e99e728ab79572f176a53b2f8ad7c201c30ceb') - depends_on('cmake@2.8.12:', type='build') + depends_on('cmake@3.1.0:', type='build') + + # Supported compilers are detailed here: + # http://fmtlib.net/latest/index.html#portability + conflicts('%gcc@:4.3.999', when='@5:') + conflicts('%llvm@:2.8.999', when='@5:') + + variant('pic', default=True, description='Enable generation of position-independent code') def cmake_args(self): - return [ - '-DCMAKE_C_FLAGS={0}'.format(self.compiler.pic_flag), - '-DCMAKE_CXX_FLAGS={0}'.format(self.compiler.pic_flag), - ] + spec = self.spec + args = [] + if '+pic' in spec: + args.append([ + '-DCMAKE_C_FLAGS={0}'.format(self.compiler.pic_flag), + '-DCMAKE_CXX_FLAGS={0}'.format(self.compiler.pic_flag) + ]) + return args -- cgit v1.2.3-70-g09d2 From 70bdcd703add93ae8d647ce1e60a22fa7c765ab1 Mon Sep 17 00:00:00 2001 From: Jonas Lippuner Date: Fri, 26 Oct 2018 19:13:48 -0600 Subject: kokkos: add pic option (#9643) Since kokkos only compiles a static library, the -fPIC compiler flag is required to link kokkos into a Fortran executable --- var/spack/repos/builtin/packages/kokkos/package.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/kokkos/package.py b/var/spack/repos/builtin/packages/kokkos/package.py index 06c408d730..6de38510c4 100644 --- a/var/spack/repos/builtin/packages/kokkos/package.py +++ b/var/spack/repos/builtin/packages/kokkos/package.py @@ -31,6 +31,10 @@ class Kokkos(Package): variant('cuda', default=False, description="enable Cuda backend") variant('openmp', default=False, description="enable OpenMP backend") + # Compilation options + variant('pic', default=False, + description="enable position independent code (-fPIC flag)") + # Kokkos options variant('aggressive_vectorization', default=False, description="set aggressive_vectorization Kokkos option") @@ -138,6 +142,10 @@ class Kokkos(Package): kokkos_options_args = [] cuda_options_args = [] + # PIC + if '+pic' in spec: + g_args.append('--cxxflags=-fPIC') + # Backends if '+serial' in spec: g_args.append('--with-serial') -- cgit v1.2.3-70-g09d2 From 718ceb5e852f84ff80bdf599b0bf47026ac22421 Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Fri, 26 Oct 2018 20:23:45 -0500 Subject: new package: msmc (starting at 1.1.0) (#9654) --- var/spack/repos/builtin/packages/msmc/package.py | 34 ++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 var/spack/repos/builtin/packages/msmc/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/msmc/package.py b/var/spack/repos/builtin/packages/msmc/package.py new file mode 100644 index 0000000000..7acde0f400 --- /dev/null +++ b/var/spack/repos/builtin/packages/msmc/package.py @@ -0,0 +1,34 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class Msmc(MakefilePackage): + """This software implements MSMC, a method to infer population size + and gene flow from multiple genome sequences""" + + homepage = "https://github.com/stschiff/msmc" + url = "https://github.com/stschiff/msmc/archive/v1.1.0.tar.gz" + + version('1.1.0', sha256='989064400fe392ca3d2ac1a253ce7edf1801b6a7eeb77bbf2ff7bf67910216c4') + + depends_on('gsl', type=('build', 'run')) + depends_on('dmd', type='build') + + def edit(self, spec, prefix): + filter_file('dmd', + join_path(self.spec['dmd'].prefix.linux.bin64, 'dmd'), + 'Makefile', string=True) + + def build(self, spec, prefix): + gsllibdir = self.spec['gsl'].prefix.lib + libgsl = join_path(gsllibdir, 'libgsl.a') + libgslcblas = join_path(gsllibdir, 'libgslcblas.a') + make('GSL={0} {1}'.format(libgsl, libgslcblas)) + + def install(self, spec, prefix): + mkdirp(prefix.bin) + install_tree('build', prefix.bin) -- cgit v1.2.3-70-g09d2 From c3ffd4e1cf4504d193e1e7eec5fed65a95cda611 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Sat, 27 Oct 2018 03:59:16 +0200 Subject: valgrind: add 3.14.0 (#9648) --- var/spack/repos/builtin/packages/valgrind/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/valgrind/package.py b/var/spack/repos/builtin/packages/valgrind/package.py index 04b560165c..3f9b7f39eb 100644 --- a/var/spack/repos/builtin/packages/valgrind/package.py +++ b/var/spack/repos/builtin/packages/valgrind/package.py @@ -22,6 +22,7 @@ class Valgrind(AutotoolsPackage): git = "git://sourceware.org/git/valgrind.git" version('develop', branch='master') + version('3.14.0', '74175426afa280184b62591b58c671b3') version('3.13.0', '817dd08f1e8a66336b9ff206400a5369') version('3.12.0', '6eb03c0c10ea917013a7622e483d61bb') version('3.11.0', '4ea62074da73ae82e0162d6550d3f129') -- cgit v1.2.3-70-g09d2 From 13e5c3fbe23e3f57503064bf2c3d7c0a3713101a Mon Sep 17 00:00:00 2001 From: dorier Date: Sat, 27 Oct 2018 03:01:39 +0100 Subject: VisIt: build vtk without mpi support (#9649) VisIt cannot use VTK built with mpi support (which was enabled by default starting in #9494) --- var/spack/repos/builtin/packages/visit/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/visit/package.py b/var/spack/repos/builtin/packages/visit/package.py index 4de0294f43..47d93c3a7b 100644 --- a/var/spack/repos/builtin/packages/visit/package.py +++ b/var/spack/repos/builtin/packages/visit/package.py @@ -26,7 +26,7 @@ class Visit(CMakePackage): variant('mpi', default=True, description='Enable parallel engine') depends_on('cmake@3.0:', type='build') - depends_on('vtk@6.1.0~opengl2') + depends_on('vtk@6.1.0~opengl2~mpi') depends_on('qt@4.8.6', when='+gui') depends_on('qwt', when='+gui') depends_on('python', when='+python') -- cgit v1.2.3-70-g09d2 From 91aed716f98fc71a03a17ba796e8993c35559aaa Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Fri, 26 Oct 2018 21:33:32 -0500 Subject: new package: phyluce (starting at 1.6.7) (#9633) --- .../repos/builtin/packages/phyluce/package.py | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 var/spack/repos/builtin/packages/phyluce/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/phyluce/package.py b/var/spack/repos/builtin/packages/phyluce/package.py new file mode 100644 index 0000000000..3a28108ace --- /dev/null +++ b/var/spack/repos/builtin/packages/phyluce/package.py @@ -0,0 +1,44 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class Phyluce(PythonPackage): + """phyluce (phy-loo-chee) is a software package that was initially + developed for analyzing data collected from ultraconserved + elements in organismal genomes""" + + homepage = "https://github.com/faircloth-lab/phyluce" + url = "https://github.com/faircloth-lab/phyluce/archive/v1.6.7.tar.gz" + + version('1.6.7', sha256='98c213ab1610506722ad1440ffc93f9cbc78d8b3aaf3d9a47837e1231452cdb6') + + extends('python') + depends_on('python@2.7:', type=('build', 'run')) + depends_on('py-setuptools', type=('build', 'run')) + depends_on('py-biopython', type='run') + + # runtime binary dependencies + depends_on('abyss', type='run') + depends_on('bcftools', type='run') + depends_on('bwa', type='run') + depends_on('gatk', type='run') + depends_on('gblocks', type='run') + depends_on('lastz', type='run') + depends_on('mafft', type='run') + depends_on('muscle', type='run') + depends_on('picard', type='run') + depends_on('raxml+pthreads+sse', type='run') + depends_on('samtools', type='run') + depends_on('seqtk', type='run') + depends_on('spades', type='run') + depends_on('trimal', type='run') + depends_on('trinity', type='run') + depends_on('velvet', type='run') + + def install(self, spec, prefix): + python = which('python') + python('setup.py', 'install', '--prefix={0}'.format(prefix)) -- cgit v1.2.3-70-g09d2 From c8092b3ab759e71fcaa63704b6247447f6d89eed Mon Sep 17 00:00:00 2001 From: dorier Date: Sat, 27 Oct 2018 03:40:25 +0100 Subject: damaris: add support for VisIt and Catalyst (#9651) --- .../repos/builtin/packages/damaris/package.py | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/damaris/package.py b/var/spack/repos/builtin/packages/damaris/package.py index 950a98fd5f..8bc0f7497f 100644 --- a/var/spack/repos/builtin/packages/damaris/package.py +++ b/var/spack/repos/builtin/packages/damaris/package.py @@ -15,12 +15,13 @@ class Damaris(CMakePackage): url = "https://gitlab.inria.fr/Damaris/damaris" version('master', git='https://gitlab.inria.fr/Damaris/damaris.git') - version('1.3.1', git='https://gitlab.inria.fr/Damaris/damaris.git', - commit='98c27e99458c10b834c4e59753f4ce5a42337c6f', preferred=True) + version('1.3.1', git='https://gitlab.inria.fr/Damaris/damaris.git', tag='v1.3.1', preferred=True) - variant('fortran', default=True, description='Enable Fortran support') - variant('hdf5', default=False, description='Enable the HDF5 storage plugin') - variant('static', default=False, description='Builds a static version of the library') + variant('fortran', default=True, description='Enables Fortran support') + variant('hdf5', default=False, description='Enables the HDF5 storage plugin') + variant('static', default=False, description='Builds a static version of the library') + variant('catalyst', default=False, description='Enables the Catalyst visualization plugin') + variant('visit', default=False, description='Enables the VisIt visualization plugin') depends_on('mpi') depends_on('cmake@3.12.0:', type=('build')) @@ -28,6 +29,8 @@ class Damaris(CMakePackage): depends_on('xsd') depends_on('xerces-c') depends_on('hdf5@1.8.20:', when='+hdf5') + depends_on('catalyst+python', when='+catalyst') + depends_on('visit+mpi', when='+visit') def cmake_args(self): @@ -49,4 +52,13 @@ class Damaris(CMakePackage): if (self.spec.variants['hdf5'].value): args.extend(['-DENABLE_HDF5:BOOL=ON']) args.extend(['-DHDF5_ROOT:PATH=%s' % self.spec['hdf5'].prefix]) + + if (self.spec.variants['catalyst'].value): + args.extend(['-DENABLE_CATALYST:BOOL=ON']) + args.extend(['-DParaView_ROOT:PATH=%s' + % self.spec['catalyst'].prefix]) + + if (self.spec.variants['visit'].value): + args.extend(['-DENABLE_VISIT:BOOL=ON']) + args.extend(['-DVisIt_ROOT:PATH=%s' % self.spec['visit'].prefix]) return args -- cgit v1.2.3-70-g09d2 From d191cb01026ae728bfcde72b9accc532b54f6e90 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Sat, 27 Oct 2018 04:41:10 +0200 Subject: pyfypp: add setuptools build dependency (#9650) --- var/spack/repos/builtin/packages/py-fypp/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-fypp/package.py b/var/spack/repos/builtin/packages/py-fypp/package.py index 2f6aaa9fe3..e2a92453d9 100644 --- a/var/spack/repos/builtin/packages/py-fypp/package.py +++ b/var/spack/repos/builtin/packages/py-fypp/package.py @@ -13,3 +13,5 @@ class PyFypp(PythonPackage): url = "https://github.com/aradi/fypp/archive/2.1.1.zip" version('2.1.1', sha256='3744ad17045e91466bbb75a33ce0cab0f65bc2c377127067a932cdf15655e049') + + depends_on('py-setuptools', type='build') -- cgit v1.2.3-70-g09d2 From 23726617ba1350ab9fc33ac7d0fc124479d226c6 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Mon, 29 Oct 2018 09:32:30 +0100 Subject: Updated octave and gnuplot versions (#9660) * octave: add 4.2.2, 4.4.0 and 4.4.1 * gnuplot: add 5.2.5 --- var/spack/repos/builtin/packages/gnuplot/package.py | 1 + var/spack/repos/builtin/packages/octave/package.py | 3 +++ 2 files changed, 4 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gnuplot/package.py b/var/spack/repos/builtin/packages/gnuplot/package.py index 39654df830..374d6cd234 100644 --- a/var/spack/repos/builtin/packages/gnuplot/package.py +++ b/var/spack/repos/builtin/packages/gnuplot/package.py @@ -26,6 +26,7 @@ class Gnuplot(AutotoolsPackage): # dependency of readline. Fix it with a small patch patch('term_include.patch') + version('5.2.5', '039db2cce62ddcfd31a6696fe576f4224b3bc3f919e66191dfe2cdb058475caa') version('5.2.2', '60aedd08998160593199459dea8467fe') version('5.2.0', '0bd8f9af84c0ad2fa9de16772c366416') version('5.0.7', '8eaafddb0b12795f82ed6dd2a6ebbe80') diff --git a/var/spack/repos/builtin/packages/octave/package.py b/var/spack/repos/builtin/packages/octave/package.py index 5b6dc25f94..62f8ea7783 100644 --- a/var/spack/repos/builtin/packages/octave/package.py +++ b/var/spack/repos/builtin/packages/octave/package.py @@ -19,6 +19,9 @@ class Octave(AutotoolsPackage): extendable = True + version('4.4.1', '09fbd0f212f4ef21e53f1d9c41cf30ce3d7f9450fb44911601e21ed64c67ae97') + version('4.4.0', '72f846379fcec7e813d46adcbacd069d72c4f4d8f6003bcd92c3513aafcd6e96') + version('4.2.2', '77b84395d8e7728a1ab223058fe5e92dc38c03bc13f7358e6533aab36f76726e') version('4.2.1', '80c28f6398576b50faca0e602defb9598d6f7308b0903724442c2a35a605333b') version('4.2.0', '443ba73782f3531c94bcf016f2f0362a58e186ddb8269af7dcce973562795567') version('4.0.2', 'c2a5cacc6e4c52f924739cdf22c2c687') -- cgit v1.2.3-70-g09d2 From be5c92f7cd4eb6f246b32f9f9e8893904fd18142 Mon Sep 17 00:00:00 2001 From: Dmitriy Date: Mon, 29 Oct 2018 04:20:46 -0500 Subject: diy: new package (#9628) --- var/spack/repos/builtin/packages/diy/package.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 var/spack/repos/builtin/packages/diy/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/diy/package.py b/var/spack/repos/builtin/packages/diy/package.py new file mode 100644 index 0000000000..c05419682c --- /dev/null +++ b/var/spack/repos/builtin/packages/diy/package.py @@ -0,0 +1,21 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class Diy(CMakePackage): + """Data-parallel out-of-core library""" + + homepage = "https://github.com/diatomic/diy" + url = "https://github.com/diatomic/diy/archive/3.5.0.tar.gz" + git = "https://github.com/diatomic/diy.git" + + version('3.5.0', sha256='b3b5490441d521b6e9b33471c782948194bf95c7c3df3eb97bc5cf4530b91576') + version('master', branch='master') + + def cmake_args(self): + args = ['-Dbuild_examples=off', '-Dbuild_tests=off'] + return args -- cgit v1.2.3-70-g09d2 From c96c38a08fce651bedf612e7b95257e09616726c Mon Sep 17 00:00:00 2001 From: David Wells Date: Mon, 29 Oct 2018 14:50:43 -0400 Subject: Expand the libMesh dependency list (#9642) This commit overhauls the libMesh package script in a number of ways: * We now inherit from AutotoolsPackage. * libMesh contains about a dozen third-party dependencies that can only be provided by the copy bundled with libMesh. This patch enumerates all such bundled dependencies and disables all of them by default. * libMesh supports compilation with external installations of boost, eigen, hdf5, slepc, and tbb; this patch adds all of them to package.py. * libMesh will look for a few system executables (xz, bzip, gdb) by default. This is now disabled. * libMesh will now used a copy of perl installed by spack instead of trying to find the system copy. * Compilation with non-system MPI installations requires an additional flag (--with-mpi=); this has been added. --- .../repos/builtin/packages/libmesh/package.py | 199 +++++++++++++++++++-- 1 file changed, 182 insertions(+), 17 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libmesh/package.py b/var/spack/repos/builtin/packages/libmesh/package.py index 2f7eb2c713..d21e056b33 100644 --- a/var/spack/repos/builtin/packages/libmesh/package.py +++ b/var/spack/repos/builtin/packages/libmesh/package.py @@ -6,7 +6,7 @@ from spack import * -class Libmesh(Package): +class Libmesh(AutotoolsPackage): """The libMesh library provides a framework for the numerical simulation of partial differential equations using arbitrary unstructured discretizations on serial and parallel platforms.""" @@ -19,29 +19,194 @@ class Libmesh(Package): version('1.2.1', sha256='11c22c7d96874a17de6b8c74caa45d6745d40bf3610e88b2bd28fd3381f5ba70') version('1.0.0', 'cb464fc63ea0b71b1e69fa3f5d4f93a4') + # support for libraries that are only available through the bundled copies: + # TODO libMesh 1.2.1 gained the ability to specify a path to capnproto + variant('capnproto', default=False, description='Compile with the bundled capnproto serialization library') + variant('exodusii', default=False, description='Compile with the bundled ExodusII output library') + variant('fparser', default=False, description='Compile with the bundled fparser function parser library') + variant('gmv', default=False, description='Compile with the bundled gmv format IO library') + variant('laspack', default=False, description='Compile with the bundled laspack interative solver library') + variant('libhilbert', default=False, description='Compile with the bundled libHilbert partitioning library') + variant('metaphysicl', default=False, description='Compile with the bundled metaphysicl AD library') + variant('metis', default=False, description='Compile with the bundled METIS graph partitioning library') + variant('nanoflann', default=False, description='Compile with the bundled nanoflann graph library') + variant('nemesis', default=False, description='Compile with the bundled nemesis IO library') + variant('netcdf', default=False, description='Compile with the bundled NETCDF IO library') + # TODO the copy of parmetis bundled with libMesh assumes that we use the + # bundled copy of metis, but previous versions of this build script use an + # external metis installation. Be conservative and completely disable + # parmetis support to preserve the old behavior (and to prevent compiling + # with two different copies of metis). + # + # variant('parmetis', default=False, + # description='Compile with the bundled PARMETIS graph library') + variant('qhull', default=False, description='Compile with the bundled qhull mesh generation library') + variant('sfc', default=False, description='Compile with the bundled sfcurves partitioning library') + variant('tetgen', default=False, description='Compile with the bundled tetgen mesh generation library') + variant('triangle', default=False, description='Compile with the bundled Triangle mesh generation library') + + # support for libraries that may be externally installed: + variant('boost', default=False, description='Compile with components dependent on boost') + variant('eigen', default=False, description='support for dense linear algebra with Eigen') + variant('hdf5', default=False, description='Compile with support for HDF5 files') + variant('slepc', default=False, description='Compile with support for the SLEPc eigensolver') + + # other features: + variant('debug', default=False, description='Compile with support for debugging') variant('mpi', default=True, description='Enables MPI parallelism') - variant('slepc', default=False, description='SLEPc eigensolver') + # While it is possible to configure libMesh to use openMP with neither + # pthreads nor TBB, no openMP code can actually be reached without enabling + # pthreads as well. Hence, since enabling openMP while disabling pthreads + # is not useful, we include openMP in the same variant to make it clear + # which scheduler is ultimately used. + variant('threads', default='none', + description='Enable threading support (with a particular ' + 'scheduler, in the case of openmp and tbb)', + values=('none', 'pthreads', 'tbb', 'openmp'), multi=False) + + conflicts('+metaphysicl', when='@:1.2.999', + msg='The interface to metaphysicl is not available in libMesh ' + 'versions older than 1.3.0. Please explicitly disable this ' + 'variant.') - # Parallel version of libMesh needs MPI & parallel solvers + depends_on('boost', when='+boost') + # The Scotch dependency of Eigen is not used by libMesh. Since Scotch can + # only be used with certain versions of flex it conflicts with several + # versions of GCC, so explicitly disable it. + depends_on('eigen~scotch', when='+eigen') + depends_on('hdf5+mpi', when='+hdf5+mpi') depends_on('mpi', when='+mpi') + depends_on('mpi', when='+slepc') + # compilation dependencies depend on perl + depends_on('perl') depends_on('petsc+mpi', when='+mpi') - - # SLEPc version needs SLEPc and requires MPI + depends_on('petsc+metis', when='+metis') depends_on('slepc', when='+slepc') - conflicts('~mpi', when='+slepc') + depends_on('tbb', when='threads=tbb') + + def configure_args(self): + options = [] + + # GLIBCXX debugging is not, by default, supported by other libraries, + # so unconditionally disable it for libmesh + options.append('--enable-glibcxx-debugging=no') + + # All bundled dependencies are explicitly disabled, so we do not need + # to perform this check: + options.append('--disable-strict-lgpl') + + # The Hinnant unique pointer implementation is incompatible with boost + # (and not necessary with C++11 support), so unconditionally disable + # it: + options.append('--disable-hinnant-unique-ptr') + # libMesh does not allow for us to specify an installation location for + # zlib, an undocumented dependency of gzstreams: hence we must + # unconditionally disable gzstreams. + options.append('--enable-gzstreams=no') + # Similarly, since we cannot specify a location for bzip2 or xz, so + # disable them to avoid picking up system installations: + options.append('--disable-bzip2') + options.append('--disable-xz') + # TODO enable GDB backtracing. Disable for now to avoid picking up the + # system gdb installation: + options.append('--without-gdb-command') + + # TODO add X11 as a dependency to get tecplot working + options.append('--enable-tecio=no') + options.append('--enable-tecplot=no') + + # handle the bundled libraries that are not themselves dependencies of + # other bundled libaries: + for bundled_library in ['capnproto', 'exodusii', 'fparser', 'gmv', + 'laspack', 'libHilbert', 'metaphysicl', + 'nanoflann', 'nemesis', 'parmetis', 'qhull', + 'sfc', 'tetgen', 'triangle']: + if '+' + bundled_library.lower() in self.spec: + options.append('--enable-' + bundled_library + "=yes") + else: + options.append('--enable-' + bundled_library + "=no") + + # and the ones which are dependencies of other bundled libraries: + if '+exodusii' in self.spec or '+netcdf' in self.spec: + options.append('--enable-netcdf=yes') + else: + options.append('--enable-netcdf=no') + + # handle external library dependencies: + if '+boost' in self.spec: + options.append('--with-boost=%s' % self.spec['boost'].prefix) + else: + options.append('--enable-boost=no') + + if '+eigen' in self.spec: + options.append('--with-eigen=%s' % self.spec['eigen'].prefix) + else: + options.append('--enable-eigen=no') + + if '+hdf5' in self.spec: + options.append('--with-hdf5=%s' % self.spec['hdf5'].prefix) + else: + options.append('--enable-hdf5=no') + # This is necessary with libMesh 1.2.1 to prevent a configure + # error: + if '+netcdf' not in self.spec: + options.append('--disable-netcdf-4') + + if '+metis' in self.spec: + options.append('--with-metis=PETSc') + + if '+petsc' in self.spec: + options.append('--enable-petsc=yes') + options.append('PETSC_DIR=%s' % self.spec['petsc'].prefix) + else: + options.append('--enable-petsc=no') + + if '+slepc' in self.spec: + options.append('SLEPC_DIR=%s' % self.spec['slepc'].prefix) + else: + options.append('--enable-slepc=no') + + # and, finally, other things: + if '+debug' in self.spec: + options.append('--with-methods=dbg') + else: + options.append('--with-methods=opt') + + if '+mpi' in self.spec: + options.append('CC=%s' % self.spec['mpi'].mpicc) + options.append('CXX=%s' % self.spec['mpi'].mpicxx) + options.append('--with-mpi=%s' % self.spec['mpi'].prefix) + else: + options.append('--disable-mpi') + # libMesh will try to link with the system MPI library unless we + # provide explicit overrides + options.append('CC=%s' % self.compiler.cc) + options.append('CXX=%s' % self.compiler.cxx) - def install(self, spec, prefix): - config_args = ["--prefix=%s" % prefix] + if 'threads=openmp' in self.spec: + # OpenMP cannot be used if pthreads is not available: see + # parallel/threads_pthread.h and parallel/threads.h + options.append('--enable-openmp=yes') + options.append('--with-thread-model=pthread') + options.append('--enable-pthreads=yes') + else: + options.append('--enable-openmp=no') - if '+mpi' in spec: - config_args.append('CC=%s' % spec['mpi'].mpicc) - config_args.append('CXX=%s' % spec['mpi'].mpicxx) - config_args.append('PETSC_DIR=%s' % spec['petsc'].prefix) + if 'threads=pthreads' in self.spec: + options.append('--with-thread-model=pthread') + options.append('--enable-pthreads=yes') + else: + if 'threads=openmp' not in self.spec: + options.append('--enable-pthreads=no') - if '+slepc' in spec: - config_args.append('SLEPC_DIR=%s' % spec['slepc'].prefix) + if 'threads=tbb' in self.spec: + options.append('--with-thread-model=tbb') + options.append('--enable-tbb=yes') + options.append('--with-tbb=%s' % self.spec['tbb'].prefix) + else: + options.append('--enable-tbb=no') - configure(*config_args) + return options - make() - make('install') + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): + spack_env.append_flags('PERL', self.spec['perl'].command.path) -- cgit v1.2.3-70-g09d2 From c46a39179b57c5393c265ecb4eec12ef7d6f4e8d Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Mon, 29 Oct 2018 14:49:58 -0500 Subject: orca: new package starting at 4.0.1.2 (#9297) * orca: new package starting at 4.0.1.2 * orca: fix typo * orca: fix boilerplate * orca: reorder deps, add openmpi runtime dependency * orca: license update --- var/spack/repos/builtin/packages/orca/package.py | 46 ++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 var/spack/repos/builtin/packages/orca/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/orca/package.py b/var/spack/repos/builtin/packages/orca/package.py new file mode 100644 index 0000000000..c137589e42 --- /dev/null +++ b/var/spack/repos/builtin/packages/orca/package.py @@ -0,0 +1,46 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * +import os + + +class Orca(Package): + """An ab initio, DFT and semiempirical SCF-MO package + + Note: Orca is licensed software. You will need to create an account + on the Orca homepage and download Orca yourself. Spack will search + your current directory for the download file. Alternatively, add this + file to a mirror so that Spack can find it. For instructions on how to + set up a mirror, see http://spack.readthedocs.io/en/latest/mirrors.html""" + + homepage = "https://cec.mpg.de" + url = "file://{0}/orca_4_0_1_2_linux_x86-64_openmpi202.tar.zst".format(os.getcwd()) + + version('4.0.1.2', sha256='cea442aa99ec0d7ffde65014932196b62343f7a6191b4bfc438bfb38c03942f7', + expand=False) + + depends_on('zstd', type='build') + depends_on('openmpi@2.0.0:2.1.5', type='run') + + def url_for_version(self, version): + out = "file://{0}/orca_{1}_linux_x86-64_openmpi202.tar.zst" + return out.format(os.getcwd(), version.underscored) + + def install(self, spec, prefix): + # we have to extract the archive ourself + # fortunately it's just full of a bunch of binaries + + vername = os.path.basename(self.stage.archive_file).split('.')[0] + + zstd = which('zstd') + zstd('-d', self.stage.archive_file, '-o', vername + '.tar') + + tar = which('tar') + tar('-xvf', vername + '.tar') + + # there are READMEs in there but they don't hurt anyone + mkdirp(prefix.bin) + install_tree(vername, prefix.bin) -- cgit v1.2.3-70-g09d2 From 2bd453c4a7402f24cd43b49e73d0b95e371e6654 Mon Sep 17 00:00:00 2001 From: Miles Perry <37849532+Miles-Perry@users.noreply.github.com> Date: Mon, 29 Oct 2018 15:02:27 -0500 Subject: add package Feature/sentieon (#9557) * added package sentieon * change file location * updated spack header license and added license_vars * fixed flake8 error * fixed license header * fix license header * license * added import os.path * edits * flake8 edits --- .../builtin/packages/sentieon-genomics/package.py | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 var/spack/repos/builtin/packages/sentieon-genomics/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sentieon-genomics/package.py b/var/spack/repos/builtin/packages/sentieon-genomics/package.py new file mode 100644 index 0000000000..e860a76bef --- /dev/null +++ b/var/spack/repos/builtin/packages/sentieon-genomics/package.py @@ -0,0 +1,39 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +import os.path +from spack import * + + +class SentieonGenomics(Package): + """Sentieon provides complete solutions for secondary DNA analysis. + Our software improves upon BWA, GATK, Mutect, and Mutect2 based pipelines. + The Sentieon tools are deployable on any CPU-based computing system. + Please set the path to the sentieon license server with: + + export SENTIEON_LICENSE=[FQDN]:[PORT] + + Note: A manual download is required. + Spack will search your current directory for the download file. + Alternatively, add this file to a mirror so that Spack can find it. + For instructions on how to set up a mirror, see + http://spack.readthedocs.io/en/latest/mirrors.html""" + + homepage = "https://www.sentieon.com/" + url = "file://{0}/sentieon-genomics-201808.01.tar.gz".format(os.getcwd()) + + version('201808.01', sha256='6d77bcd5a35539549b28eccae07b19a3b353d027720536e68f46dcf4b980d5f7') + + # Licensing. + license_require = True + license_vars = ['SENTIEON_LICENSE'] + + def install(self, spec, prefix): + install_tree('bin', prefix.bin) + install_tree('doc', prefix.doc) + install_tree('etc', prefix.etc) + install_tree('lib', prefix.lib) + install_tree('libexec', prefix.libexec) + install_tree('share', prefix.share) -- cgit v1.2.3-70-g09d2 From 6eef6a1d778835a91b99d0c1f278e7e4f2169f1b Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Mon, 29 Oct 2018 15:33:50 -0500 Subject: slepc: update to version 3.10.1 (#9665) --- var/spack/repos/builtin/packages/slepc/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/slepc/package.py b/var/spack/repos/builtin/packages/slepc/package.py index e9a1113d72..cb79b37acf 100644 --- a/var/spack/repos/builtin/packages/slepc/package.py +++ b/var/spack/repos/builtin/packages/slepc/package.py @@ -16,6 +16,7 @@ class Slepc(Package): git = "https://bitbucket.org/slepc/slepc.git" version('develop', branch='master') + version('3.10.1', 'f64787c8c2ab3d2f6db3c67d2bfe6ee84f741ce3dfde1d2f8221e131820a12a1') version('3.10.0', '069d7a579995e0be1567c5bc869251e29c00044369a786933ca3040149d0412a') version('3.9.2', '247585b3f8c10bf50b9464cb8ef7b5f22bead6f96524384897a37ec4146eb03e') version('3.9.1', 'e174ea7c127d9161eef976b0288f0c56d443a58d6ab2dc8af1e8bd66f156ce17') -- cgit v1.2.3-70-g09d2 From 8d4c15e0bd30fe2eaaecdc722bcd7beb17fed81a Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Mon, 29 Oct 2018 15:34:14 -0500 Subject: strumpack: update to version 3.1.1 (#9666) --- var/spack/repos/builtin/packages/strumpack/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/strumpack/package.py b/var/spack/repos/builtin/packages/strumpack/package.py index cb0108e91a..4bd4dac459 100644 --- a/var/spack/repos/builtin/packages/strumpack/package.py +++ b/var/spack/repos/builtin/packages/strumpack/package.py @@ -22,6 +22,7 @@ class Strumpack(CMakePackage): git = "https://github.com/pghysels/STRUMPACK.git" version('master', branch='master') + version('3.1.1', sha256='c1c3446ee023f7b24baa97b24907735e89ce4ae9f5ef516645dfe390165d1778') version('3.1.0', sha256='b4f91b7d433955518b04538be1c726afc5de4bffb163e982ef8844d391b26fa7') version('3.0.3', sha256='2bd2a40d9585b769ae4ba461de02c6e36433bf2b21827f824a50f2fdf73389f7') version('3.0.2', sha256='828e5ec59019b2c74e008745b04ceebbb7ef1313fb4e3ac01fa8ff350799df38') -- cgit v1.2.3-70-g09d2 From 1e54a42cc977b6889a1e0e1a4e768e851aa6a7d6 Mon Sep 17 00:00:00 2001 From: snehring Date: Mon, 29 Oct 2018 15:46:35 -0500 Subject: hoomd-blue: fixing issue during build with newer cmakes (#9543) * Constrain to build with CMake <= 3.9.6 * Specify installation prefix to match install prefix format of other Spack python libraries --- var/spack/repos/builtin/packages/hoomd-blue/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hoomd-blue/package.py b/var/spack/repos/builtin/packages/hoomd-blue/package.py index b00843bcc0..4120e03410 100644 --- a/var/spack/repos/builtin/packages/hoomd-blue/package.py +++ b/var/spack/repos/builtin/packages/hoomd-blue/package.py @@ -51,7 +51,7 @@ class HoomdBlue(CMakePackage): extends('python') depends_on('python@2.7:') depends_on('py-numpy@1.7:', type=('build', 'run')) - depends_on('cmake@2.8.0:', type='build') + depends_on('cmake@2.8.0:3.9.6', type='build') depends_on('pkgconfig', type='build') depends_on('mpi', when='+mpi') depends_on('cuda@7.0:', when='+cuda') @@ -59,9 +59,12 @@ class HoomdBlue(CMakePackage): def cmake_args(self): spec = self.spec + install_dir = spec['python'].package.site_packages_dir + install_path = os.path.join(spec.prefix, install_dir) cmake_args = [ '-DPYTHON_EXECUTABLE={0}'.format(spec['python'].command.path), + '-DCMAKE_INSTALL_PREFIX={0}'.format(install_path) ] # MPI support -- cgit v1.2.3-70-g09d2 From 2209d571ea7873c2b62cacf869d8418590813f28 Mon Sep 17 00:00:00 2001 From: Dan Han Date: Mon, 29 Oct 2018 16:12:20 -0500 Subject: R rjags - new version (#9568) * REMOVED: -callr: updated to newest version, added sha256, added listurl * r-rjags: updated * r-rjags: fix new version --- var/spack/repos/builtin/packages/r-rjags/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-rjags/package.py b/var/spack/repos/builtin/packages/r-rjags/package.py index d0061d1a58..1dae43af36 100644 --- a/var/spack/repos/builtin/packages/r-rjags/package.py +++ b/var/spack/repos/builtin/packages/r-rjags/package.py @@ -12,8 +12,10 @@ class RRjags(RPackage): Usage: $ spack load r-rjags """ homepage = "https://cran.r-project.org/web/packages/rjags/index.html" - url = "https://cran.r-project.org/src/contrib/rjags_4-6.tar.gz" + url = "https://cran.r-project.org/src/contrib/rjags_4-8.tar.gz" + list_url = "https://cran.r-project.org/src/contrib/Archive/rjags/" + version('4-8', sha256='1529827ab11493fb5f05552e239d700ae2f818995d86d3c9e4c92523f594b59f') version('4-6', 'c26b7cc8e8ddcdb55e14cba28df39f4c') depends_on('jags', type=('link')) -- cgit v1.2.3-70-g09d2 From 930d6af815b3b87de31d1d704c63e5e59dc5d73f Mon Sep 17 00:00:00 2001 From: jthies Date: Tue, 30 Oct 2018 11:13:11 +0100 Subject: packages/phist: new version 1.7.3 (#9672) --- var/spack/repos/builtin/packages/phist/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/phist/package.py b/var/spack/repos/builtin/packages/phist/package.py index f70fca2a46..50aa96640c 100644 --- a/var/spack/repos/builtin/packages/phist/package.py +++ b/var/spack/repos/builtin/packages/phist/package.py @@ -24,6 +24,7 @@ class Phist(CMakePackage): version('develop', branch='devel') version('master', branch='master') + version('1.7.3', sha256='ab2d853c9ba13bcd3069fcc61c359cb412466a2e4b22ebbd2f5263cffa685126') version('1.7.2', sha256='29b504d78b5efd57b87d2ca6e20bc8a32b1ba55b40f5a5b7189cc0d28e43bcc0') version('1.6.1', sha256='4ed4869f24f920a494aeae0f7d1d94fe9efce55ebe0d298a5948c9603e07994d') version('1.6.0', '751f855230d6227b972b5ab7bce2c65f') -- cgit v1.2.3-70-g09d2 From 38a1732c5a8f85203747c96c5414b2ed5fd9696b Mon Sep 17 00:00:00 2001 From: jthies Date: Tue, 30 Oct 2018 14:12:15 +0100 Subject: Jthies/xsdk add phist (#8980) * packages/phist: add variant 'fortran' to enable/disable building the Fortran bindings * xsdk: add phist * packages/xsdk: add a comment reg. updating phist dependency * packages/phist: +fortran variant is only for versions 1.7: * packages/phist: update comments * xsdk: forgot to specify kernel library for phist (picked tpetra, assuming trilinos+tpetra will be installed) * packages/phist: add variant 'openmp' to allow disabling OpenMP * phist: fix compile error due to missing -lm * flake8: fix warnings * packages/phist: fix cmake flag: XSDK_ENABLE_Fortran (rather than XSDK_BUILD_Fortran) * packages/phist: allow disabling building the scamac matrix generator (which causes trouble on some systems) * packages/xsdk: disable scamac within phist because it caused problems for @balay and is not essential for now * packages/phist: actually disable scamac via cmake if ~scamac * phist: disable openmp from xsdk --- var/spack/repos/builtin/packages/phist/package.py | 33 ++++++++++++++++++++--- var/spack/repos/builtin/packages/xsdk/package.py | 7 +++++ 2 files changed, 37 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/phist/package.py b/var/spack/repos/builtin/packages/phist/package.py index 50aa96640c..aa593157b5 100644 --- a/var/spack/repos/builtin/packages/phist/package.py +++ b/var/spack/repos/builtin/packages/phist/package.py @@ -38,6 +38,7 @@ class Phist(CMakePackage): 'petsc', 'eigen', 'ghost']) + variant(name='outlev', default='2', values=['0', '1', '2', '3', '4', '5'], description='verbosity. 0: errors 1: +warnings 2: +info ' '3: +verbose 4: +extreme 5; +debug') @@ -48,9 +49,18 @@ class Phist(CMakePackage): variant('mpi', default=True, description='enable/disable MPI (note that the kernel library may ' 'not support this choice)') + + variant('openmp', default=True, + description='enable/disable OpenMP') + variant('parmetis', default=False, description='enable/disable ParMETIS partitioning (only actually ' 'used with kernel_lib=builtin)') + + variant('scamac', default=True, + description='enable/disable building the "SCAlable MAtrix ' + 'Collection" matrix generators.') + variant('trilinos', default=False, description='enable/disable Trilinos third-party libraries. ' 'For all kernel_libs, we can use Belos and Anasazi ' @@ -58,12 +68,19 @@ class Phist(CMakePackage): '(kernel_lib=epetra|tpetra) we can use preconditioner ' 'packages such as Ifpack, Ifpack2 and ML.') + variant('fortran', default=True, + description='generate Fortran 2003 bindings (requires Python3 and ' + 'a Fortran compiler)') + # ###################### Dependencies ########################## depends_on('cmake@3.8:', type='build') depends_on('blas') depends_on('lapack') - depends_on('python@3:', when='@1.7:', type='build') + # Python 3 or later is required for generating the Fortran 2003 bindings + # since version 1.7, you can get rid of the dependency by switching off + # the feature (e.g. use the '~fortran' variant) + depends_on('python@3:', when='@1.7: +fortran', type='build') depends_on('mpi', when='+mpi') depends_on('trilinos+anasazi+belos+teuchos', when='+trilinos') depends_on('trilinos@12:+tpetra', when='kernel_lib=tpetra') @@ -76,14 +93,18 @@ class Phist(CMakePackage): depends_on('trilinos', when='+trilinos') depends_on('parmetis ^metis+int64', when='+parmetis') + # Fortran 2003 bindings were included in version 1.7, previously they + # required a separate package + conflicts('+fortran', when='@:1.6.99') + def cmake_args(self): spec = self.spec kernel_lib = spec.variants['kernel_lib'].value outlev = spec.variants['outlev'].value - lapacke_libs = \ - (spec['lapack:c'].libs + spec['blas:c'].libs).joined(';') + lapacke_libs = (spec['lapack:c'].libs + spec['blas:c'].libs + + find_system_libraries(['libm'])).joined(';') lapacke_include_dir = spec['lapack:c'].headers.directories[0] args = ['-DPHIST_KERNEL_LIB=%s' % kernel_lib, @@ -92,14 +113,20 @@ class Phist(CMakePackage): '-DTPL_LAPACKE_INCLUDE_DIRS=%s' % lapacke_include_dir, '-DPHIST_ENABLE_MPI:BOOL=%s' % ('ON' if '+mpi' in spec else 'OFF'), + '-DPHIST_ENABLE_OPENMP=%s' + % ('ON' if '+openmp' in spec else 'OFF'), '-DBUILD_SHARED_LIBS:BOOL=%s' % ('ON' if '+shared' in spec else 'OFF'), + '-DPHIST_ENABLE_SCAMAC:BOOL=%s' + % ('ON' if '+scamac' in spec else 'OFF'), '-DPHIST_USE_TRILINOS_TPLS:BOOL=%s' % ('ON' if '+trilinos' in spec else 'OFF'), '-DPHIST_USE_SOLVER_TPLS:BOOL=%s' % ('ON' if '+trilinos' in spec else 'OFF'), '-DPHIST_USE_PRECON_TPLS:BOOL=%s' % ('ON' if '+trilinos' in spec else 'OFF'), + '-DXSDK_ENABLE_Fortran:BOOL=%s' + % ('ON' if '+fortran' in spec else 'OFF'), ] return args diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py index 187b3e7744..21f71b9abd 100644 --- a/var/spack/repos/builtin/packages/xsdk/package.py +++ b/var/spack/repos/builtin/packages/xsdk/package.py @@ -75,6 +75,13 @@ class Xsdk(Package): depends_on('slepc@develop', when='@develop') + # the Fortran 2003 bindings of phist require python@3:, but this + # creates a conflict with other packages like petsc@develop. Actually + # these are type='build' dependencies, but spack reports a conflict anyway. + # This will be fixed once the new concretizer becomes available + # (says @adamjsteward) + depends_on('phist@develop kernel_lib=tpetra ~fortran ~scamac ~openmp', when='@develop') + # xSDKTrilinos depends on the version of Trilinos built with # +tpetra which is turned off for faster xSDK # depends_on('xsdktrilinos@xsdk-0.2.0', when='@xsdk-0.2.0') -- cgit v1.2.3-70-g09d2 From be48d41ab1729cce0de084037c689668c0774b55 Mon Sep 17 00:00:00 2001 From: Dave Date: Tue, 30 Oct 2018 10:25:32 -0700 Subject: warpx: Fixes for building on NERSC (#9671) --- var/spack/repos/builtin/packages/warpx/package.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/warpx/package.py b/var/spack/repos/builtin/packages/warpx/package.py index 9af8cb79ac..bfbcd7fa3a 100644 --- a/var/spack/repos/builtin/packages/warpx/package.py +++ b/var/spack/repos/builtin/packages/warpx/package.py @@ -74,5 +74,11 @@ class Warpx(MakefilePackage): 'TINY_PROFILE = {0}'.format(torf('+tprof'))) makefile.filter('EBASE .*', 'EBASE = warpx') + def setup_environment(self, spack_env, run_env): + # --- Fool the compiler into using the "unknown" configuration. + # --- With this, it will use the spack provided mpi. + spack_env.set('HOSTNAME', 'unknown') + spack_env.set('NERSC_HOST', 'unknown') + def install(self, spec, prefix): make('WarpxBinDir = {0}'.format(prefix.bin), 'all') -- cgit v1.2.3-70-g09d2 From 26bacbcb8c8ae1a6c29a7191da9d5084e5b1fe5a Mon Sep 17 00:00:00 2001 From: Abhinav Bhatele Date: Tue, 30 Oct 2018 10:37:44 -0700 Subject: caliper: specify path to libunwind (#9670) --- var/spack/repos/builtin/packages/caliper/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/caliper/package.py b/var/spack/repos/builtin/packages/caliper/package.py index 4288000410..5896cfb420 100644 --- a/var/spack/repos/builtin/packages/caliper/package.py +++ b/var/spack/repos/builtin/packages/caliper/package.py @@ -82,6 +82,8 @@ class Caliper(CMakePackage): args.append('-DLIBPFM_INSTALL=%s' % spec['libpfm4'].prefix) if '+sosflow' in spec: args.append('-DSOS_PREFIX=%s' % spec['sosflow'].prefix) + if '+callpath' in spec: + args.append('-DLIBUNWIND_PREFIX=%s' % spec['libunwind'].prefix) if '+mpi' in spec: args.append('-DMPI_C_COMPILER=%s' % spec['mpi'].mpicc) -- cgit v1.2.3-70-g09d2 From 3c387bfa39ac39ccc3535a6990b67d4d7cdf330e Mon Sep 17 00:00:00 2001 From: Ruben Di Battista Date: Tue, 30 Oct 2018 20:47:48 +0100 Subject: vtk: remove redundant option setting (#9597) This eliminates duplicates for a couple options which are set multiple times. --- var/spack/repos/builtin/packages/vtk/package.py | 7 ------- 1 file changed, 7 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py index e8f345670c..9cc75f3a8b 100644 --- a/var/spack/repos/builtin/packages/vtk/package.py +++ b/var/spack/repos/builtin/packages/vtk/package.py @@ -175,12 +175,6 @@ class Vtk(CMakePackage): '-DModule_vtkGUISupportQtOpenGL:BOOL=ON', ]) - if '+mpi' in spec: - cmake_args.extend([ - '-DVTK_Group_MPI:BOOL=ON', - '-DVTK_USE_SYSTEM_DIY2=OFF' - ]) - if '+xdmf' in spec: if spec.satisfies('^cmake@3.12:'): # This policy exists only for CMake >= 3.12 @@ -190,7 +184,6 @@ class Vtk(CMakePackage): # Enable XDMF Support here "-DModule_vtkIOXdmf2:BOOL=ON", "-DModule_vtkIOXdmf3:BOOL=ON", - "-DModule_vtkIOParallelXdmf3:BOOL=ON", "-DBOOST_ROOT={0}".format(spec['boost'].prefix), "-DBOOST_LIBRARY_DIR={0}".format(spec['boost'].prefix.lib), "-DBOOST_INCLUDE_DIR={0}".format(spec['boost'].prefix.include), -- cgit v1.2.3-70-g09d2 From 33b65ecca08cfccebb0c8208b3c2fcf0da35cad8 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Tue, 30 Oct 2018 21:26:41 +0100 Subject: GCC: ISL and mpfr upper bounds (#9513) * GCC: constrain version 6, 7, and 8 to build with ISL version at most 0.18 * GCC version 9 (not yet released) will be compatible with ISL version 0.20 so future GCC releases are constrained to build with ISL version at most 0.20 * ISL: Add v0.15, replace all md5 sums with sha256 sums for ISL versions * GCC versions before 6 were constrained to build with ISL 0.14 but have been confirmed to work with ISL 0.15 * GCC: Place an upper bound on GCC's mpfr dependency --- var/spack/repos/builtin/packages/gcc/package.py | 13 ++++++++++--- var/spack/repos/builtin/packages/isl/package.py | 7 ++++--- 2 files changed, 14 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py index e6f9ad5d09..a029a9e0c5 100644 --- a/var/spack/repos/builtin/packages/gcc/package.py +++ b/var/spack/repos/builtin/packages/gcc/package.py @@ -71,10 +71,17 @@ class Gcc(AutotoolsPackage): # https://gcc.gnu.org/install/prerequisites.html depends_on('gmp@4.3.2:') - depends_on('mpfr@2.4.2:') + # GCC 7.3 does not compile with newer releases on some platforms, see + # https://github.com/spack/spack/issues/6902#issuecomment-433030376 + depends_on('mpfr@2.4.2:3.1.6') depends_on('mpc@0.8.1:', when='@4.5:') - depends_on('isl@0.14', when='@5:5.9') - depends_on('isl@0.15:', when='@6:') + # Already released GCC versions do not support any newer version of ISL + # GCC 5.4 https://github.com/spack/spack/issues/6902#issuecomment-433072097 + # GCC 7.3 https://github.com/spack/spack/issues/6902#issuecomment-433030376 + # GCC 9+ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86724 + depends_on('isl@0.15', when='@5:5.9') + depends_on('isl@0.15:0.18', when='@6:8.9') + depends_on('isl@0.15:0.20', when='@9:') depends_on('zlib', when='@6:') depends_on('gnat', when='languages=ada') depends_on('binutils~libiberty', when='+binutils') diff --git a/var/spack/repos/builtin/packages/isl/package.py b/var/spack/repos/builtin/packages/isl/package.py index 3efe4ad051..cca2ba21f3 100644 --- a/var/spack/repos/builtin/packages/isl/package.py +++ b/var/spack/repos/builtin/packages/isl/package.py @@ -13,9 +13,10 @@ class Isl(AutotoolsPackage): homepage = "http://isl.gforge.inria.fr" url = "http://isl.gforge.inria.fr/isl-0.19.tar.bz2" - version('0.19', '7850d46a96e5ea31e34913190895e154') - version('0.18', '11436d6b205e516635b666090b94ab32') - version('0.14', 'acd347243fca5609e3df37dba47fd0bb') + version('0.19', sha256='d59726f34f7852a081fbd3defd1ab2136f174110fc2e0c8d10bb122173fa9ed8') + version('0.18', sha256='6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b') + version('0.15', sha256='8ceebbf4d9a81afa2b4449113cee4b7cb14a687d7a549a963deb5e2a41458b6b') + version('0.14', sha256='7e3c02ff52f8540f6a85534f54158968417fd676001651c8289c705bd0228f36') depends_on('gmp') -- cgit v1.2.3-70-g09d2 From f602fd8ea4ee5f4e759e15627a67468294cc11e5 Mon Sep 17 00:00:00 2001 From: Alberto Chiusole Date: Tue, 30 Oct 2018 21:32:59 +0100 Subject: New package: RegCM, regional climate model. (#9655) --- var/spack/repos/builtin/packages/regcm/package.py | 73 +++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 var/spack/repos/builtin/packages/regcm/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/regcm/package.py b/var/spack/repos/builtin/packages/regcm/package.py new file mode 100644 index 0000000000..32fde4885b --- /dev/null +++ b/var/spack/repos/builtin/packages/regcm/package.py @@ -0,0 +1,73 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class Regcm(AutotoolsPackage): + """RegCM ICTP Regional Climate Model.""" + + homepage = 'https://gforge.ictp.it/gf/project/regcm/' + + version('4.7.0', sha256='456631c10dcb83d70e51c3babda2f7a1aa41ed9e60cb4209deb3764655267519', + url='https://gforge.ictp.it/gf/download/frsrelease/259/1845/RegCM-4.7.0.tar.gz') + + variant('debug', default=False, + description='Build RegCM using debug options.') + variant('profile', default=False, + description='Build RegCM using profiling options.') + variant('singleprecision', default=False, + description='Build RegCM using single precision float type.') + + # On Intel and PGI compilers, multiple archs can be built at the same time, + # producing a so-called fat binary. Unfortunately, gcc builds only the last + # architecture provided (in the configure), so we allow a single arch. + extensions = ('knl', 'skl', 'bdw', 'nhl') + variant('extension', default=None, values=extensions, multi=True, + description='Build extensions for a specific Intel architecture.') + + depends_on('netcdf') + depends_on('netcdf-fortran') + depends_on('hdf5') + depends_on('mpi') + + # 'make' sometimes crashes when compiling with more than 10-12 cores. + # Moreover, parallel compile time is ~ 1m 30s, while serial is ~ 50s. + parallel = False + + def flag_handler(self, name, flags): + if name == 'fflags' and self.compiler.fc.endswith('gfortran'): + flags.extend(['-Wall', '-Wextra', '-Warray-temporaries', + '-Wconversion', '-fimplicit-none', '-fbacktrace', + '-ffree-line-length-0', '-finit-real=nan', + '-ffpe-trap=zero,overflow,underflow', '-fcheck=all']) + + elif name == 'ldlibs': + flags.extend(['-lnetcdff', '-lnetcdf']) + if self.compiler.fc.endswith('gfortran'): + flags.extend(['-lm', '-ldl']) + else: + flags.extend(['-lhdf5_hl', '-lhdf5', '-lz']) + + return (None, None, flags) + + def configure_args(self): + args = ['--enable-shared'] + + for opt in ('debug', 'profile', 'singleprecision'): + if '+{0}'.format(opt) in self.spec: + args.append('--enable-' + opt) + + for ext in self.extensions: + if 'extension={0}'.format(ext) in self.spec: + args.append('--enable-' + ext) + break + + # RegCM complains when compiled with gfortran, and unfortunately FFLAGS + # is ignored by the configure, so we need to set the option in FCFLAGS. + if self.compiler.fc.endswith('gfortran'): + args.append('FCFLAGS=-fno-range-check') + + return args -- cgit v1.2.3-70-g09d2 From 718be8a645ea82d3c71b677eccd41c2771e2c32d Mon Sep 17 00:00:00 2001 From: Ross Miller Date: Tue, 30 Oct 2018 16:33:43 -0400 Subject: Update dependencies for py-llvmlite (#9668) Change dependency on llvm from >=6.0 to 6.0:6.99. Refs #9667 --- var/spack/repos/builtin/packages/py-llvmlite/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-llvmlite/package.py b/var/spack/repos/builtin/packages/py-llvmlite/package.py index e3ee1b04a0..9a597f7a29 100644 --- a/var/spack/repos/builtin/packages/py-llvmlite/package.py +++ b/var/spack/repos/builtin/packages/py-llvmlite/package.py @@ -18,6 +18,6 @@ class PyLlvmlite(PythonPackage): depends_on('py-setuptools', type='build') depends_on('python@2.6:2.8,3.4:', type=('build', 'run')) depends_on('py-enum34', type=('build', 'run'), when='^python@:3.3.99') - depends_on('llvm@6.0:', when='@0.23.0:') + depends_on('llvm@6.0:6.99', when='@0.23.0:') depends_on('llvm@4.0:4.99', when='@0.17.0:0.20.99') depends_on('binutils', type='build') -- cgit v1.2.3-70-g09d2 From c10d432a2e8d3dbb417c85e18d516e99f9805bdf Mon Sep 17 00:00:00 2001 From: Jim Galarowicz Date: Tue, 30 Oct 2018 20:41:08 -0500 Subject: Update openspeedshop and cbtf-krell module creation code (#9234) * Add the setting of CBTF_MPI_IMPLEMENTATION to the cbtf-krell and openspeeedshop package files, so that the mpi implementation can be found by the tool. This allows users to not have to set this manually if only one mpi implementation is specified in the build. * Update version ranges for dependencies of cbtf packages --- .../builtin/packages/cbtf-argonavis-gui/package.py | 6 +- .../builtin/packages/cbtf-argonavis/package.py | 7 +- .../repos/builtin/packages/cbtf-krell/package.py | 72 +++++++++++----- .../repos/builtin/packages/cbtf-lanl/package.py | 4 +- var/spack/repos/builtin/packages/cbtf/package.py | 7 +- .../packages/openspeedshop-utils/package.py | 66 +++++++-------- .../builtin/packages/openspeedshop/package.py | 98 ++++++++++++---------- 7 files changed, 148 insertions(+), 112 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py index 514a6eb61e..3d4f039371 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py @@ -22,8 +22,7 @@ class CbtfArgonavisGui(QMakePackage): depends_on('qt@5.10.0:', when='@develop') depends_on('qt@5.10.0', when='@1.3.0.0:9999') - depends_on("boost@1.50.0:", when='@develop') - depends_on("boost@1.66.0", when='@1.3.0.0:9999') + depends_on("boost@1.66.0:") # For MRNet depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop') @@ -45,8 +44,7 @@ class CbtfArgonavisGui(QMakePackage): depends_on("openspeedshop-utils@2.3.1.3:+cuda", when='@1.3.0.0:9999') # For Xerces-C - depends_on("xerces-c@3.1.1:", when='@develop') - depends_on("xerces-c@3.1.4", when='@1.3.0.0:9999') + depends_on("xerces-c") depends_on("graphviz@2.40.1:", when='@develop') depends_on("graphviz@2.40.1", when='@1.3.0.0:9999') diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py index 5342daf8a6..f56e01e46f 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py @@ -14,6 +14,7 @@ class CbtfArgonavis(CMakePackage): git = "https://github.com/OpenSpeedShop/cbtf-argonavis.git" version('develop', branch='master') + version('1.9.2', branch='1.9.2') version('1.9.1.2', branch='1.9.1.2') version('1.9.1.1', branch='1.9.1.1') version('1.9.1.0', branch='1.9.1.0') @@ -36,8 +37,7 @@ class CbtfArgonavis(CMakePackage): depends_on("elf", type="link") # For boost - depends_on("boost@1.50.0:", when='@develop') - depends_on("boost@1.66.0", when='@1.9.1.0:9999') + depends_on("boost@1.66.0:") # For MRNet depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti') @@ -61,8 +61,7 @@ class CbtfArgonavis(CMakePackage): depends_on("libmonitor@2013.02.18+krellpatch") # For PAPI - depends_on("papi", when='@develop') - depends_on("papi@5.5.1", when='@1.9.1.0:9999') + depends_on("papi@5.4.1:") # For CBTF-KRELL depends_on("cbtf-krell@develop", when='@develop') diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py index 52ed029502..d800df4bfa 100644 --- a/var/spack/repos/builtin/packages/cbtf-krell/package.py +++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py @@ -18,6 +18,7 @@ class CbtfKrell(CMakePackage): git = "https://github.com/OpenSpeedShop/cbtf-krell.git" version('develop', branch='master') + version('1.9.2', branch='1.9.2') version('1.9.1.2', branch='1.9.1.2') version('1.9.1.1', branch='1.9.1.1') version('1.9.1.0', branch='1.9.1.0') @@ -49,12 +50,10 @@ class CbtfKrell(CMakePackage): depends_on("cmake@3.0.2:", type='build') # For binutils - depends_on("binutils", when='@develop') - depends_on("binutils@2.29.1", when='@1.9.1.0:9999') + depends_on("binutils") # For boost - depends_on("boost@1.50.0:", when='@develop') - depends_on("boost@1.66.0", when='@1.9.1.0:9999') + depends_on("boost@1.66.0:") # For Dyninst depends_on("dyninst@develop", when='@develop') @@ -62,36 +61,34 @@ class CbtfKrell(CMakePackage): depends_on("dyninst@develop", when='@1.9.1.0:9999') # For MRNet - depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti') - depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop') + depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti', type=('build', 'link', 'run')) + depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop', type=('build', 'link', 'run')) - depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0:9999+cti') - depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0:9999') + depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0:9999+cti', type=('build', 'link', 'run')) + depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0:9999', type=('build', 'link', 'run')) # For Xerces-C - depends_on("xerces-c@3.1.1:", when='@develop') - depends_on("xerces-c@3.1.4", when='@1.9.1.0:9999') + depends_on("xerces-c") # For CBTF - depends_on("cbtf@develop", when='@develop') - depends_on("cbtf@1.9.1.0:9999", when='@1.9.1.0:9999') + depends_on("cbtf@develop", when='@develop', type=('build', 'link', 'run')) + depends_on("cbtf@1.9.1.0:9999", when='@1.9.1.0:9999', type=('build', 'link', 'run')) # For CBTF with cti - depends_on("cbtf@develop+cti", when='@develop+cti') - depends_on("cbtf@1.9.1.0:9999+cti", when='@1.9.1.0:9999+cti') + depends_on("cbtf@develop+cti", when='@develop+cti', type=('build', 'link', 'run')) + depends_on("cbtf@1.9.1.0:9999+cti", when='@1.9.1.0:9999+cti', type=('build', 'link', 'run')) # For CBTF with runtime - depends_on("cbtf@develop+runtime", when='@develop+runtime') - depends_on("cbtf@1.9.1.0:9999+runtime", when='@1.9.1.0:9999+runtime') + depends_on("cbtf@develop+runtime", when='@develop+runtime', type=('build', 'link', 'run')) + depends_on("cbtf@1.9.1.0:9999+runtime", when='@1.9.1.0:9999+runtime', type=('build', 'link', 'run')) # for services and collectors depends_on("libmonitor@2013.02.18+krellpatch") depends_on("libunwind", when='@develop') - depends_on("libunwind@1.1", when='@1.9.1.0:9999') + depends_on("libunwind@1.2.1", when='@1.9.1.0:9999') - depends_on("papi", when='@develop') - depends_on("papi@5.5.1", when='@1.9.1.0:9999') + depends_on("papi@5.4.1:") depends_on("llvm-openmp-ompt@tr6_forwards+standalone") @@ -103,6 +100,9 @@ class CbtfKrell(CMakePackage): depends_on("mvapich", when='+mvapich') depends_on("mpt", when='+mpt') + depends_on("python", when='@develop', type=('build', 'run')) + depends_on("python@2.7.14:2.7.15", when='@2.3.1.3:9999', type=('build', 'run')) + depends_on("gotcha") parallel = False @@ -226,3 +226,37 @@ class CbtfKrell(CMakePackage): self.set_cray_login_node_cmake_options(spec, cmake_args) return cmake_args + + def setup_environment(self, spack_env, run_env): + """Set up the compile and runtime environments for a package.""" + + # Environment settings for cbtf-krell, bin is automatically + # added to the path in the module file + run_env.prepend_path('PATH', self.prefix.sbin) + + run_env.set('XPLAT_RSH', 'ssh') + run_env.set('MRNET_COMM_PATH', self.prefix.sbin.cbtf_mrnet_commnode) + + # Set CBTF_MPI_IMPLEMENTATON to the appropriate mpi implementation + # This is needed by CBTF tools to deploy the correct + # mpi runtimes for cbtfsummary + # Users may have to set the CBTF_MPI_IMPLEMENTATION variable + # manually if multiple mpi's are specified in the build + + if self.spec.satisfies('+mpich'): + run_env.set('CBTF_MPI_IMPLEMENTATION', "mpich") + + if self.spec.satisfies('+mvapich'): + run_env.set('CBTF_MPI_IMPLEMENTATION', "mvapich") + + if self.spec.satisfies('+mvapich2'): + run_env.set('CBTF_MPI_IMPLEMENTATION', "mvapich2") + + if self.spec.satisfies('+mpt'): + run_env.set('CBTF_MPI_IMPLEMENTATION', "mpt") + + if self.spec.satisfies('+openmpi'): + run_env.set('CBTF_MPI_IMPLEMENTATION', "openmpi") + + run_env.set('CBTF_MRNET_BACKEND_PATH', + self.prefix.sbin.cbtf_libcbtf_mrnet_backend) diff --git a/var/spack/repos/builtin/packages/cbtf-lanl/package.py b/var/spack/repos/builtin/packages/cbtf-lanl/package.py index 6c44638b73..460c845552 100644 --- a/var/spack/repos/builtin/packages/cbtf-lanl/package.py +++ b/var/spack/repos/builtin/packages/cbtf-lanl/package.py @@ -14,6 +14,7 @@ class CbtfLanl(CMakePackage): git = "https://github.com/OpenSpeedShop/cbtf-lanl.git" version('develop', branch='master') + version('1.9.2', branch='1.9.2') version('1.9.1.2', branch='1.9.1.2') version('1.9.1.1', branch='1.9.1.1') version('1.9.1.0', branch='1.9.1.0') @@ -36,8 +37,7 @@ class CbtfLanl(CMakePackage): depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0:9999') # For Xerces-C - depends_on("xerces-c@3.1.1:", when='@develop') - depends_on("xerces-c@3.1.4", when='@1.9.1.0:9999') + depends_on("xerces-c") # For CBTF depends_on("cbtf@develop", when='@develop') diff --git a/var/spack/repos/builtin/packages/cbtf/package.py b/var/spack/repos/builtin/packages/cbtf/package.py index 0ab4703dc6..ba6cbd7477 100644 --- a/var/spack/repos/builtin/packages/cbtf/package.py +++ b/var/spack/repos/builtin/packages/cbtf/package.py @@ -17,6 +17,7 @@ class Cbtf(CMakePackage): git = "https://github.com/OpenSpeedShop/cbtf.git" version('develop', branch='master') + version('1.9.2', branch='1.9.2') version('1.9.1.2', branch='1.9.1.2') version('1.9.1.1', branch='1.9.1.1') version('1.9.1.0', branch='1.9.1.0') @@ -32,8 +33,7 @@ class Cbtf(CMakePackage): depends_on("cmake@3.0.2:", type='build') - depends_on("boost@1.66.0", when='@1.9.1.0:9999') - depends_on("boost@1.50.0:", when='@develop') + depends_on("boost@1.66.0:") # For MRNet depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti') @@ -42,8 +42,7 @@ class Cbtf(CMakePackage): depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0:9999') # For Xerces-C - depends_on("xerces-c@3.1.1:", when='@develop') - depends_on("xerces-c@3.1.4:", when='@1.9.1.0:9999') + depends_on("xerces-c") # For XML2 depends_on("libxml2") diff --git a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py index fd994eb304..afa480a8f3 100644 --- a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py @@ -35,6 +35,8 @@ class OpenspeedshopUtils(CMakePackage): git = "https://github.com/OpenSpeedShop/openspeedshop.git" version('develop', branch='master') + version('2.4.0', branch='2.4.0') + version('2.3.1.5', branch='2.3.1.5') version('2.3.1.4', branch='2.3.1.4') version('2.3.1.3', branch='2.3.1.3') @@ -80,8 +82,7 @@ class OpenspeedshopUtils(CMakePackage): depends_on("flex@2.6.1", type='build') # For binutils - depends_on("binutils", when='@develop', type='build') - depends_on("binutils@2.29.1", when='@2.3.1.3:9999', type='build') + depends_on("binutils", type='build') depends_on("elf", type="link") depends_on("libdwarf") @@ -89,58 +90,57 @@ class OpenspeedshopUtils(CMakePackage): depends_on("sqlite") # For boost - depends_on("boost@1.50.0:", when='@develop') - depends_on("boost@1.66.0", when='@2.3.1.3:9999') + depends_on("boost@1.66.0:") depends_on("dyninst@develop", when='@develop') - # This will change to dyninst@10.0 when it is released + # This will change to version dyninst@10.0 when it is released depends_on("dyninst@develop", when='@2.3.1.3:9999') - depends_on("python", when='@develop') - depends_on("python@2.7.14:2.7.15", when='@2.3.1.3:9999') + depends_on("python", when='@develop', type=('build', 'run')) + depends_on("python@2.7.14:2.7.15", when='@2.3.1.3:9999', type=('build', 'run')) depends_on("libxml2") # Dependencies for the openspeedshop cbtf packages. - depends_on("cbtf@develop", when='@develop') - depends_on("cbtf@1.9.1.0:9999", when='@2.3.1.3:9999') + depends_on("cbtf@develop", when='@develop', type=('build', 'link', 'run')) + depends_on("cbtf@1.9.1.0:9999", when='@2.3.1.3:9999', type=('build', 'link', 'run')) - depends_on("cbtf-krell@develop", when='@develop') - depends_on("cbtf-krell@1.9.1.0:9999", when='@2.3.1.3:9999') + depends_on("cbtf-krell@develop", when='@develop', type=('build', 'link', 'run')) + depends_on("cbtf-krell@1.9.1.0:9999", when='@2.3.1.3:9999', type=('build', 'link', 'run')) - depends_on('cbtf-krell@develop+crayfe', when='@develop+crayfe') - depends_on('cbtf-krell@1.9.1.0:9999+crayfe', when='@2.3.1.3:9999+crayfe') + depends_on('cbtf-krell@develop+crayfe', when='@develop+crayfe', type=('build', 'link', 'run')) + depends_on('cbtf-krell@1.9.1.0:9999+crayfe', when='@2.3.1.3:9999+crayfe', type=('build', 'link', 'run')) - depends_on('cbtf-krell@develop+cti', when='@develop+cti') - depends_on('cbtf-krell@1.9.1.0:9999+cti', when='@2.3.1.3:9999+cti') + depends_on('cbtf-krell@develop+cti', when='@develop+cti', type=('build', 'link', 'run')) + depends_on('cbtf-krell@1.9.1.0:9999+cti', when='@2.3.1.3:9999+cti', type=('build', 'link', 'run')) - depends_on('cbtf-krell@develop+mpich', when='@develop+mpich') - depends_on('cbtf-krell@1.9.1.0:9999+mpich', when='@2.3.1.3:9999+mpich') + depends_on('cbtf-krell@develop+mpich', when='@develop+mpich', type=('build', 'link', 'run')) + depends_on('cbtf-krell@1.9.1.0:9999+mpich', when='@2.3.1.3:9999+mpich', type=('build', 'link', 'run')) - depends_on('cbtf-krell@develop+mpich2', when='@develop+mpich2') - depends_on('cbtf-krell@1.9.1.0:9999+mpich2', when='@2.3.1.3:9999+mpich2') + depends_on('cbtf-krell@develop+mpich2', when='@develop+mpich2', type=('build', 'link', 'run')) + depends_on('cbtf-krell@1.9.1.0:9999+mpich2', when='@2.3.1.3:9999+mpich2', type=('build', 'link', 'run')) - depends_on('cbtf-krell@develop+mpt', when='@develop+mpt') - depends_on('cbtf-krell@1.9.1.0:9999+mpt', when='@2.3.1.3:9999+mpt') + depends_on('cbtf-krell@develop+mpt', when='@develop+mpt', type=('build', 'link', 'run')) + depends_on('cbtf-krell@1.9.1.0:9999+mpt', when='@2.3.1.3:9999+mpt', type=('build', 'link', 'run')) - depends_on('cbtf-krell@develop+mvapich', when='@develop+mvapich') - depends_on('cbtf-krell@1.9.1.0:9999+mvapich', when='@2.3.1.3:9999+mvapich') + depends_on('cbtf-krell@develop+mvapich', when='@develop+mvapich', type=('build', 'link', 'run')) + depends_on('cbtf-krell@1.9.1.0:9999+mvapich', when='@2.3.1.3:9999+mvapich', type=('build', 'link', 'run')) - depends_on('cbtf-krell@develop+mvapich2', when='@develop+mvapich2') - depends_on('cbtf-krell@1.9.1.0:9999+mvapich2', when='@2.3.1.3:9999+mvapich2') + depends_on('cbtf-krell@develop+mvapich2', when='@develop+mvapich2', type=('build', 'link', 'run')) + depends_on('cbtf-krell@1.9.1.0:9999+mvapich2', when='@2.3.1.3:9999+mvapich2', type=('build', 'link', 'run')) - depends_on('cbtf-krell@develop+openmpi', when='@develop+openmpi') - depends_on('cbtf-krell@1.9.1.0:9999+openmpi', when='@2.3.1.3:9999+openmpi') + depends_on('cbtf-krell@develop+openmpi', when='@develop+openmpi', type=('build', 'link', 'run')) + depends_on('cbtf-krell@1.9.1.0:9999+openmpi', when='@2.3.1.3:9999+openmpi', type=('build', 'link', 'run')) - depends_on("cbtf-argonavis@develop", when='@develop+cuda') - depends_on("cbtf-argonavis@1.9.1.0:9999", when='@2.3.1.3:9999+cuda') + depends_on("cbtf-argonavis@develop", when='@develop+cuda', type=('build', 'link', 'run')) + depends_on("cbtf-argonavis@1.9.1.0:9999", when='@2.3.1.3:9999+cuda', type=('build', 'link', 'run')) # For MRNet - depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti') - depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop') + depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti', type=('build', 'link', 'run')) + depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop', type=('build', 'link', 'run')) - depends_on("mrnet@5.0.1-3:+cti", when='@2.3.1.3:9999+cti') - depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.3.1.3:9999') + depends_on("mrnet@5.0.1-3:+cti", when='@2.3.1.3:9999+cti', type=('build', 'link', 'run')) + depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.3.1.3:9999', type=('build', 'link', 'run')) parallel = False diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py index d0764e54dc..90d55b168a 100644 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop/package.py @@ -7,9 +7,6 @@ from spack import * import spack.store -import os -import os.path - class Openspeedshop(CMakePackage): """OpenSpeedShop is a community effort by The Krell Institute with @@ -29,6 +26,7 @@ class Openspeedshop(CMakePackage): git = "https://github.com/OpenSpeedShop/openspeedshop.git" version('develop', branch='master') + version('2.4.0', branch='2.4.0') version('2.3.1.5', branch='2.3.1.5') version('2.3.1.4', branch='2.3.1.4') version('2.3.1.3', branch='2.3.1.3') @@ -79,8 +77,7 @@ class Openspeedshop(CMakePackage): depends_on("flex@2.6.1", type='build') # For binutils - depends_on("binutils", when='@develop', type='build') - depends_on("binutils@2.29.1", when='@2.3.1.3:9999', type='build') + depends_on("binutils") depends_on("elf", type="link") depends_on("libdwarf") @@ -88,60 +85,59 @@ class Openspeedshop(CMakePackage): depends_on("sqlite") # For boost - depends_on("boost@1.50.0:", when='@develop') - depends_on("boost@1.66.0", when='@2.3.1.3:9999') + depends_on("boost@1.66.0:") depends_on("dyninst@develop", when='@develop') # This will change to version dyninst@10.0 when it is released depends_on("dyninst@develop", when='@2.3.1.3:9999') - depends_on("python", when='@develop') - depends_on("python@2.7.14:2.7.15", when='@2.3.1.3:9999') + depends_on("python", when='@develop', type=('build', 'run')) + depends_on("python@2.7.14:2.7.15", when='@2.3.1.3:9999', type=('build', 'run')) depends_on("libxml2") depends_on("qt@3.3.8b+krellpatch", when='gui=qt3') # Dependencies for the openspeedshop cbtf packages. - depends_on("cbtf@develop", when='@develop') - depends_on("cbtf@1.9.1.0:9999", when='@2.3.1.3:9999') + depends_on("cbtf@develop", when='@develop', type=('build', 'link', 'run')) + depends_on("cbtf@1.9.1.0:9999", when='@2.3.1.3:9999', type=('build', 'link', 'run')) - depends_on("cbtf-krell@develop", when='@develop') - depends_on("cbtf-krell@1.9.1.0:9999", when='@2.3.1.3:9999') + depends_on("cbtf-krell@develop", when='@develop', type=('build', 'link', 'run')) + depends_on("cbtf-krell@1.9.1.0:9999", when='@2.3.1.3:9999', type=('build', 'link', 'run')) - depends_on('cbtf-krell@develop+crayfe', when='@develop+crayfe') - depends_on('cbtf-krell@1.9.1.0:9999+crayfe', when='@2.3.1.3:9999+crayfe') + depends_on('cbtf-krell@develop+crayfe', when='@develop+crayfe', type=('build', 'link', 'run')) + depends_on('cbtf-krell@1.9.1.0:9999+crayfe', when='@2.3.1.3:9999+crayfe', type=('build', 'link', 'run')) - depends_on('cbtf-krell@develop+cti', when='@develop+cti') - depends_on('cbtf-krell@1.9.1.0:9999+cti', when='@2.3.1.3:9999+cti') + depends_on('cbtf-krell@develop+cti', when='@develop+cti', type=('build', 'link', 'run')) + depends_on('cbtf-krell@1.9.1.0:9999+cti', when='@2.3.1.3:9999+cti', type=('build', 'link', 'run')) - depends_on('cbtf-krell@develop+mpich', when='@develop+mpich') - depends_on('cbtf-krell@1.9.1.0:9999+mpich', when='@2.3.1.3:9999+mpich') + depends_on('cbtf-krell@develop+mpich', when='@develop+mpich', type=('build', 'link', 'run')) + depends_on('cbtf-krell@1.9.1.0:9999+mpich', when='@2.3.1.3:9999+mpich', type=('build', 'link', 'run')) - depends_on('cbtf-krell@develop+mpich2', when='@develop+mpich2') - depends_on('cbtf-krell@1.9.1.0:9999+mpich2', when='@2.3.1.3:9999+mpich2') + depends_on('cbtf-krell@develop+mpich2', when='@develop+mpich2', type=('build', 'link', 'run')) + depends_on('cbtf-krell@1.9.1.0:9999+mpich2', when='@2.3.1.3:9999+mpich2', type=('build', 'link', 'run')) - depends_on('cbtf-krell@develop+mpt', when='@develop+mpt') - depends_on('cbtf-krell@1.9.1.0:9999+mpt', when='@2.3.1.3:9999+mpt') + depends_on('cbtf-krell@develop+mpt', when='@develop+mpt', type=('build', 'link', 'run')) + depends_on('cbtf-krell@1.9.1.0:9999+mpt', when='@2.3.1.3:9999+mpt', type=('build', 'link', 'run')) - depends_on('cbtf-krell@develop+mvapich', when='@develop+mvapich') - depends_on('cbtf-krell@1.9.1.0:9999+mvapich', when='@2.3.1.3:9999+mvapich') + depends_on('cbtf-krell@develop+mvapich', when='@develop+mvapich', type=('build', 'link', 'run')) + depends_on('cbtf-krell@1.9.1.0:9999+mvapich', when='@2.3.1.3:9999+mvapich', type=('build', 'link', 'run')) - depends_on('cbtf-krell@develop+mvapich2', when='@develop+mvapich2') - depends_on('cbtf-krell@1.9.1.0:9999+mvapich2', when='@2.3.1.3:9999+mvapich2') + depends_on('cbtf-krell@develop+mvapich2', when='@develop+mvapich2', type=('build', 'link', 'run')) + depends_on('cbtf-krell@1.9.1.0:9999+mvapich2', when='@2.3.1.3:9999+mvapich2', type=('build', 'link', 'run')) - depends_on('cbtf-krell@develop+openmpi', when='@develop+openmpi') - depends_on('cbtf-krell@1.9.1.0:9999+openmpi', when='@2.3.1.3:9999+openmpi') + depends_on('cbtf-krell@develop+openmpi', when='@develop+openmpi', type=('build', 'link', 'run')) + depends_on('cbtf-krell@1.9.1.0:9999+openmpi', when='@2.3.1.3:9999+openmpi', type=('build', 'link', 'run')) - depends_on("cbtf-argonavis@develop", when='@develop+cuda') - depends_on("cbtf-argonavis@1.9.1.0:9999", when='@2.3.1.3:9999+cuda') + depends_on("cbtf-argonavis@develop", when='@develop+cuda', type=('build', 'link', 'run')) + depends_on("cbtf-argonavis@1.9.1.0:9999", when='@2.3.1.3:9999+cuda', type=('build', 'link', 'run')) # For MRNet - depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti') - depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop') + depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti', type=('build', 'link', 'run')) + depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop', type=('build', 'link', 'run')) - depends_on("mrnet@5.0.1-3:+cti", when='@2.3.1.3:9999+cti') - depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.3.1.3:9999') + depends_on("mrnet@5.0.1-3:+cti", when='@2.3.1.3:9999+cti', type=('build', 'link', 'run')) + depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.3.1.3:9999', type=('build', 'link', 'run')) parallel = False @@ -283,10 +279,6 @@ class Openspeedshop(CMakePackage): def setup_environment(self, spack_env, run_env): """Set up the compile and runtime environments for a package.""" - # Common settings to both offline and cbtf versions - # of OpenSpeedShop - run_env.prepend_path('PATH', self.prefix.bin) - # Find Dyninst library path, this is needed to # set the DYNINSTAPI_RT_LIB library which is # required for OpenSpeedShop to find loop level @@ -298,19 +290,33 @@ class Openspeedshop(CMakePackage): # Set Dyninst RT library path to support OSS loop resolution code run_env.set('DYNINSTAPI_RT_LIB', dyninst_libdir) - # Find openspeedshop library path - oss_libdir = find_libraries('libopenss-framework', - root=self.spec['openspeedshop'].prefix, - shared=True, recursive=True) - run_env.prepend_path('LD_LIBRARY_PATH', - os.path.dirname(oss_libdir.joined())) - run_env.set('OPENSS_RAWDATA_DIR', '.') cbtf_mc = '/sbin/cbtf_mrnet_commnode' cbtf_lmb = '/sbin/cbtf_libcbtf_mrnet_backend' run_env.set('XPLAT_RSH', 'ssh') run_env.set('MRNET_COMM_PATH', join_path(self.spec['cbtf-krell'].prefix + cbtf_mc)) + + # Set CBTF_MPI_IMPLEMENTATON to the appropriate mpi implementation + # This is needed by O|SS and CBTF tools to deploy the correct + # mpi runtimes for ossmpi, ossmpit, ossmpip, and cbtfsummary + # Users may have to set the CBTF_MPI_IMPLEMENTATION variable + # manually if multiple mpi's are specified in the build + if self.spec.satisfies('+mpich'): + run_env.set('CBTF_MPI_IMPLEMENTATION', "mpich") + + if self.spec.satisfies('+mvapich'): + run_env.set('CBTF_MPI_IMPLEMENTATION', "mvapich") + + if self.spec.satisfies('+mvapich2'): + run_env.set('CBTF_MPI_IMPLEMENTATION', "mvapich2") + + if self.spec.satisfies('+mpt'): + run_env.set('CBTF_MPI_IMPLEMENTATION', "mpt") + + if self.spec.satisfies('+openmpi'): + run_env.set('CBTF_MPI_IMPLEMENTATION', "openmpi") + run_env.set('CBTF_MRNET_BACKEND_PATH', join_path(self.spec['cbtf-krell'].prefix + cbtf_lmb)) run_env.prepend_path('PATH', self.spec['mrnet'].prefix.bin) -- cgit v1.2.3-70-g09d2 From abad2c97437c7cac365b2faeed8631f3b1d8c928 Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Wed, 31 Oct 2018 05:28:09 -0500 Subject: r-dismo: new package starting at 1.1-4 (#9675) --- var/spack/repos/builtin/packages/r-dismo/package.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 var/spack/repos/builtin/packages/r-dismo/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-dismo/package.py b/var/spack/repos/builtin/packages/r-dismo/package.py new file mode 100644 index 0000000000..db2db94130 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-dismo/package.py @@ -0,0 +1,21 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class RDismo(RPackage): + """Functions for species distribution modeling, that is, predicting + entire geographic distributions form occurrences at a number of sites + and the environment at these sites.""" + + homepage = "https://cran.r-project.org/package=dismo" + url = "https://cran.r-project.org/src/contrib/dismo_1.1-4.tar.gz" + + version('1.1-4', sha256='f2110f716cd9e4cca5fd2b22130c6954658aaf61361d2fe688ba22bbfdfa97c8') + + depends_on('r@3.2.0:', type=('build', 'run')) + depends_on('r-raster@2.5-2:', type=('build', 'run')) + depends_on('r-sp@1.2-0:', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From 79e70afed49cd0a23f8f38bfbfa66fa46b9ef0a1 Mon Sep 17 00:00:00 2001 From: 健美猞猁 Date: Thu, 1 Nov 2018 00:32:09 +0800 Subject: Packmol: a new package. (#9687) --- var/spack/repos/builtin/packages/packmol/package.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 var/spack/repos/builtin/packages/packmol/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/packmol/package.py b/var/spack/repos/builtin/packages/packmol/package.py new file mode 100644 index 0000000000..873e354f13 --- /dev/null +++ b/var/spack/repos/builtin/packages/packmol/package.py @@ -0,0 +1,16 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class Packmol(CMakePackage): + """Packmol creates an initial point for molecular dynamics simulations + by packing molecules in defined regions of space.""" + + homepage = "http://m3g.iqm.unicamp.br/packmol/home.shtml" + url = "https://github.com/mcubeg/packmol/archive/18.169.tar.gz" + + version('18.169', sha256='8acf2cbc742a609e763eb00cae55aecd09af2edb4cc4e931706e2f06ac380de9') -- cgit v1.2.3-70-g09d2 From a3ff21eb2ba1b7a3565d736c0da72f0c9a135407 Mon Sep 17 00:00:00 2001 From: "Kelly (KT) Thompson" Date: Wed, 31 Oct 2018 11:03:13 -0600 Subject: Provide a newer doxygen version. (#9681) * Provide a newer doxygen version. + Also provide a patch that allows collaboration diagrams to work properly with C++ std::shared_ptr. Ref: https://github.com/Sleepyowl/doxygen/commit/6c380ba91ae41c6d5c409a5163119318932ae2a3?diff=unified --- .../repos/builtin/packages/doxygen/package.py | 6 +++++ .../builtin/packages/doxygen/shared_ptr.patch | 26 ++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 var/spack/repos/builtin/packages/doxygen/shared_ptr.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/doxygen/package.py b/var/spack/repos/builtin/packages/doxygen/package.py index d40af90b6d..3fa767f50d 100644 --- a/var/spack/repos/builtin/packages/doxygen/package.py +++ b/var/spack/repos/builtin/packages/doxygen/package.py @@ -16,6 +16,7 @@ class Doxygen(CMakePackage): homepage = "http://www.stack.nl/~dimitri/doxygen/" url = "http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.10.src.tar.gz" + version('1.8.14', '41d8821133e8d8104280030553e2b42b') version('1.8.12', '08e0f7850c4d22cb5188da226b209a96') version('1.8.11', 'f4697a444feaed739cfa2f0644abc19b') version('1.8.10', '79767ccd986f12a0f949015efb5f058f') @@ -30,3 +31,8 @@ class Doxygen(CMakePackage): # optional dependencies depends_on("graphviz", when="+graphviz", type='run') + + # Support C++14's std::shared_ptr. For details about this patch, see + # https://github.com/Sleepyowl/doxygen/commit/6c380ba91ae41c6d5c409a5163119318932ae2a3?diff=unified + # Also - https://github.com/doxygen/doxygen/pull/6588 + patch('shared_ptr.patch', when='@1.8.14') diff --git a/var/spack/repos/builtin/packages/doxygen/shared_ptr.patch b/var/spack/repos/builtin/packages/doxygen/shared_ptr.patch new file mode 100644 index 0000000000..87581b5152 --- /dev/null +++ b/var/spack/repos/builtin/packages/doxygen/shared_ptr.patch @@ -0,0 +1,26 @@ +diff --git a/src/doxygen.cpp b/src/doxygen.cpp +index 00826d6..a474129 100644 +--- a/src/doxygen.cpp ++++ b/src/doxygen.cpp +@@ -342,6 +342,7 @@ static STLInfo g_stlinfo[] = + { "auto_ptr", 0, 0, "T", "ptr", 0, 0, FALSE, FALSE }, // deprecated + { "smart_ptr", 0, 0, "T", "ptr", 0, 0, FALSE, FALSE }, // C++11 + { "unique_ptr", 0, 0, "T", "ptr", 0, 0, FALSE, FALSE }, // C++11 ++ { "shared_ptr", 0, 0, "T", "ptr", 0, 0, FALSE, FALSE }, // C++14 + { "weak_ptr", 0, 0, "T", "ptr", 0, 0, FALSE, FALSE }, // C++11 + { "ios_base", 0, 0, 0, 0, 0, 0, FALSE, FALSE }, // C++11 + { "error_code", 0, 0, 0, 0, 0, 0, FALSE, FALSE }, // C++11 +@@ -515,7 +516,7 @@ static void addSTLClasses(EntryNav *rootNav) + { + addSTLMember(classEntryNav,info->templType2,info->templName2); + } +- if (fullName=="std::auto_ptr" || fullName=="std::smart_ptr" || ++ if (fullName=="std::auto_ptr" || fullName=="std::smart_ptr" || fullName=="std::shared_ptr" || + fullName=="std::unique_ptr" || fullName=="std::weak_ptr") + { + Entry *memEntry = new Entry; +@@ -11770,4 +11771,3 @@ void generateOutput() + delete Doxygen::symbolStorage; + g_successfulRun=TRUE; + } +- -- cgit v1.2.3-70-g09d2 From 383cda2c9094cb39c02d497ca4c966faea6f2d30 Mon Sep 17 00:00:00 2001 From: Federico Ficarelli Date: Wed, 31 Oct 2018 18:08:00 +0100 Subject: lbzip2: add new package (#9688) --- var/spack/repos/builtin/packages/lbzip2/package.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 var/spack/repos/builtin/packages/lbzip2/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lbzip2/package.py b/var/spack/repos/builtin/packages/lbzip2/package.py new file mode 100644 index 0000000000..6103ce00e3 --- /dev/null +++ b/var/spack/repos/builtin/packages/lbzip2/package.py @@ -0,0 +1,16 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class Lbzip2(AutotoolsPackage): + """Multi-threaded compression utility with support for bzip2 + compressed file format""" + + homepage = "http://lbzip2.org/" + url = "http://archive.lbzip2.org/lbzip2-2.5.tar.gz" + + version('2.5', sha256='46c75ee93cc95eedc6005625442b2b8e59a2bef3ba80987d0491f055185650e9') -- cgit v1.2.3-70-g09d2 From 939ce40032e339cc7311a370c3bbef1e68f7733b Mon Sep 17 00:00:00 2001 From: Abhinav Bhatele Date: Wed, 31 Oct 2018 11:50:37 -0700 Subject: ecp-proxy-apps: disable building CANDLE Benchmarks by default (#9691) add as a variant --- var/spack/repos/builtin/packages/ecp-proxy-apps/package.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py b/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py index 62b618db3d..bd2117cd99 100644 --- a/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py +++ b/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py @@ -25,6 +25,9 @@ class EcpProxyApps(Package): version('1.1', '15825c318acd3726fd8e72803b1c1090') version('1.0', '8b3f00f05e6cde88d8d913da4293ee62') + variant('candle', default=False, + description='Also build CANDLE Benchmarks') + # Added with release 2.0 depends_on('ember@1.0.0', when='@2.0:') depends_on('miniqmc@0.4.0', when='@2.0:') @@ -33,7 +36,7 @@ class EcpProxyApps(Package): depends_on('thornado-mini@1.0', when='@2.0:') depends_on('amg@1.1', when='@2.0:') - depends_on('candle-benchmarks@0.1', when='@2.0:') + depends_on('candle-benchmarks@0.1', when='+candle @2.0:') depends_on('laghos@1.1', when='@2.0:') depends_on('macsio@1.1', when='@2.0:') depends_on('miniamr@1.4.1', when='@2.0:') @@ -48,7 +51,7 @@ class EcpProxyApps(Package): # Dependencies for versions 1.0:1.1 depends_on('amg@1.0', when='@1.0:1.1') - depends_on('candle-benchmarks@0.0', when='@1.0:1.1') + depends_on('candle-benchmarks@0.0', when='+candle @1.0:1.1') depends_on('laghos@1.0', when='@1.0:1.1') depends_on('macsio@1.0', when='@1.0:1.1') depends_on('miniamr@1.4.0', when='@1.0:1.1') -- cgit v1.2.3-70-g09d2 From 6a3552274f6c67439a7da58832fbb3535bf4d966 Mon Sep 17 00:00:00 2001 From: Thomas Stitt Date: Wed, 31 Oct 2018 20:23:44 -0700 Subject: xeus: new package (#9682) * xeus: new package cppzmq: add version 4.3.0 zeromq: make libsodium optional, on by default * xeus: add patch so it builds, add new version nlohmann-json: add more versions cryptopp: add more versions * xeus: flake8 * xeus: fix license --- var/spack/repos/builtin/packages/cppzmq/package.py | 4 +- .../repos/builtin/packages/cryptopp/package.py | 4 ++ .../builtin/packages/nlohmann-json/package.py | 4 +- ...find_cryptopp_and_check_cxx_compatibility.patch | 52 ++++++++++++++++++++++ var/spack/repos/builtin/packages/xeus/package.py | 44 ++++++++++++++++++ var/spack/repos/builtin/packages/zeromq/package.py | 10 +++-- 6 files changed, 113 insertions(+), 5 deletions(-) create mode 100644 var/spack/repos/builtin/packages/xeus/cmake_find_cryptopp_and_check_cxx_compatibility.patch create mode 100644 var/spack/repos/builtin/packages/xeus/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cppzmq/package.py b/var/spack/repos/builtin/packages/cppzmq/package.py index 22950599d1..aa038509be 100644 --- a/var/spack/repos/builtin/packages/cppzmq/package.py +++ b/var/spack/repos/builtin/packages/cppzmq/package.py @@ -14,7 +14,9 @@ class Cppzmq(CMakePackage): git = "https://github.com/zeromq/cppzmq.git" version('develop', branch='master') + version('4.3.0', sha256='27d1f56406ba94ee779e639203218820975cf68174f92fbeae0f645df0fcada4') version('4.2.2', 'bd809b47296e77fe9f192bd9dafd5cc3') depends_on('cmake@3.0.0:', type='build') - depends_on('zeromq@4.2.2') + depends_on('zeromq@4.2.5', when='@4.3.0') + depends_on('zeromq@4.2.2', when='@4.2.2') diff --git a/var/spack/repos/builtin/packages/cryptopp/package.py b/var/spack/repos/builtin/packages/cryptopp/package.py index 0f7764ab84..9ca8cf98d4 100644 --- a/var/spack/repos/builtin/packages/cryptopp/package.py +++ b/var/spack/repos/builtin/packages/cryptopp/package.py @@ -17,6 +17,10 @@ class Cryptopp(MakefilePackage): url = "http://www.cryptopp.com/cryptopp700.zip" version('7.0.0', '8f34884b572901b6ede89bd18f1c7ef6') + version('6.1.0', sha256='21289d2511101a9350c87c8eb1f4982d4a266e8037b19dab79a32cc13ea108c7') + version('6.0.0', sha256='64ac2db96b3f1b7a23675e2be95d16c96055edffa2d5e2de6245fdb6baa92dda') + version('5.6.5', sha256='a75ef486fe3128008bbb201efee3dcdcffbe791120952910883b26337ec32c34') + version('5.6.4', sha256='be430377b05c15971d5ccb6e44b4d95470f561024ed6d701fe3da3a188c84ad7') version('5.6.3', '3c5b70e2ec98b7a24988734446242d07') version('5.6.2', '7ed022585698df48e65ce9218f6c6a67') version('5.6.1', '96cbeba0907562b077e26bcffb483828') diff --git a/var/spack/repos/builtin/packages/nlohmann-json/package.py b/var/spack/repos/builtin/packages/nlohmann-json/package.py index 110e535e44..3cfcd936a9 100644 --- a/var/spack/repos/builtin/packages/nlohmann-json/package.py +++ b/var/spack/repos/builtin/packages/nlohmann-json/package.py @@ -14,7 +14,9 @@ class NlohmannJson(CMakePackage): maintainers = ['ax3l'] version('3.3.0', sha256='2fd1d207b4669a7843296c41d3b6ac5b23d00dec48dba507ba051d14564aa801') - version('3.1.2', '557651b017c36ad596ba3b577ba1b539') + version('3.2.0', sha256='2de558ff3b3b32eebfb51cf2ceb835a0fa5170e6b8712b02be9c2c07fcfe52a1') + version('3.1.2', sha256='e8fffa6cbdb3c15ecdff32eebf958b6c686bc188da8ad5c6489462d16f83ae54') + version('3.1.1', sha256='9f3549824af3ca7e9707a2503959886362801fb4926b869789d6929098a79e47') variant('single_header', default=True, description='Use amalgamated single-header') diff --git a/var/spack/repos/builtin/packages/xeus/cmake_find_cryptopp_and_check_cxx_compatibility.patch b/var/spack/repos/builtin/packages/xeus/cmake_find_cryptopp_and_check_cxx_compatibility.patch new file mode 100644 index 0000000000..da19f84134 --- /dev/null +++ b/var/spack/repos/builtin/packages/xeus/cmake_find_cryptopp_and_check_cxx_compatibility.patch @@ -0,0 +1,52 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 810d5d1..d6ba3e9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -49,7 +49,33 @@ message(STATUS "xeus binary version: v${XEUS_BINARY_VERSION}") + find_package(nlohmann_json 3.2.0 REQUIRED) + find_package(xtl 0.4 REQUIRED) + find_package(cppzmq 4.3.0 REQUIRED) +-find_package(cryptopp REQUIRED) ++ ++# cryptopp isn't built with cmake, find it manually ++find_path(cryptopp_ROOT_DIR ++ NAMES include/cryptopp/cryptlib.h ++ PATHS ENV cryptopp_ROOT) ++ ++find_path(cryptopp_INCLUDE_DIR ++ NAMES cryptopp/cryptlib.h ++ HINTS ${cryptopp_ROOT_DIR} ++ PATH_SUFFIXES include) ++ ++find_library(cryptopp_STATIC_LIB ++ NAMES libcryptopp.a ++ HINTS ${cryptopp_ROOT_DIR} ++ PATH_SUFFIXES lib) ++ ++if (NOT cryptopp_INCLUDE_DIR OR NOT cryptopp_STATIC_LIB) ++ message(FATAL_ERROR "cannot find cryptopp, missing include dir or static lib") ++else() ++ message("Found cryptopp: ${cryptopp_ROOT_DIR}") ++endif() ++ ++add_library(cryptopp-static STATIC IMPORTED) ++set_target_properties(cryptopp-static ++ PROPERTIES ++ IMPORTED_LOCATION ${cryptopp_STATIC_LIB} ++ INTERFACE_INCLUDE_DIRECTORIES ${cryptopp_INCLUDE_DIR}) + + # On Unix platforms, ZeroMQ is built with autotools and pkg-config is + # required to locate it. +@@ -157,10 +183,11 @@ get_target_property(cryptopp_INCLUDE_DIR cryptopp-static INTERFACE_INCLUDE_DIREC + get_target_property(cryptopp_LIBRARY cryptopp-static LOCATION) + set(CMAKE_REQUIRED_LIBRARIES ${cryptopp_LIBRARY}) + set(CMAKE_REQUIRED_INCLUDES ${cryptopp_INCLUDE_DIR}) ++set(CMAKE_REQUIRED_FLAGS "--std=c++11") + check_cxx_source_compiles(" + #include \"cryptopp/config.h\" + int main(){ +- [[maybe_unused]] CryptoPP::byte b = CryptoPP::byte{0x36}; ++ CryptoPP::byte b = CryptoPP::byte{0x36}; + }" HAVE_CRYPTOPP_BYTE_T) + + cmake_pop_check_state() diff --git a/var/spack/repos/builtin/packages/xeus/package.py b/var/spack/repos/builtin/packages/xeus/package.py new file mode 100644 index 0000000000..1b1286666c --- /dev/null +++ b/var/spack/repos/builtin/packages/xeus/package.py @@ -0,0 +1,44 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class Xeus(CMakePackage): + """QuantStack C++ implementation of Jupyter kernel protocol""" + + homepage = "https://xeus.readthedocs.io/en/latest/" + url = "https://github.com/QuantStack/xeus/archive/0.14.1.tar.gz" + git = "https://github.com/QuantStack/xeus.git" + + version('develop', branch='master') + version('0.15.0', sha256='bc99235b24d5757dc129f3ed531501fb0d0667913927ed39ee24281952649183') + version('0.14.1', sha256='a6815845d4522ec279f142d3b4e92ef52cd80847b512146a65f256a77e058cfe') + + variant('examples', default=False, description="Build examples") + + conflicts('%gcc@:4.8') + conflicts('%clang@:3.6') + conflicts('%intel@:17') + + depends_on('zeromq@4.2.5:-libsodium') + depends_on('cppzmq@4.3.0:') + depends_on('cryptopp@7.0.0:') + depends_on('xtl@0.4.0:') + depends_on('nlohmann-json@3.2.0', when='@develop@0.15.0:') + depends_on('nlohmann-json@3.1.1', when='@0.14.1') + depends_on('libuuid') + + # finds cryptopp not built with cmake, removes c++17 attribute + # in check_cxx_source_compiles + patch('cmake_find_cryptopp_and_check_cxx_compatibility.patch') + + def cmake_args(self): + args = [ + '-DBUILD_EXAMPLES:BOOL=%s' % ( + 'ON' if '+examples' in self.spec else 'OFF') + ] + + return args diff --git a/var/spack/repos/builtin/packages/zeromq/package.py b/var/spack/repos/builtin/packages/zeromq/package.py index 08a5e4ec73..57ed8fd1fc 100644 --- a/var/spack/repos/builtin/packages/zeromq/package.py +++ b/var/spack/repos/builtin/packages/zeromq/package.py @@ -24,8 +24,10 @@ class Zeromq(AutotoolsPackage): version('4.0.6', 'd47dd09ed7ae6e7fd6f9a816d7f5fdf6') version('4.0.5', '73c39f5eb01b9d7eaf74a5d899f1d03d') - depends_on("libsodium") - depends_on("libsodium@:1.0.3", when='@:4.1.2') + variant("libsodium", default=True, description="Build with libsodium support") + + depends_on("libsodium", when='+libsodium') + depends_on("libsodium@:1.0.3", when='+libsodium@:4.1.2') depends_on('autoconf', type='build', when='@develop') depends_on('automake', type='build', when='@develop') @@ -40,7 +42,9 @@ class Zeromq(AutotoolsPackage): bash('./autogen.sh') def configure_args(self): - config_args = ['--with-libsodium'] + config_args = [] + if '+libsodium' in self.spec: + config_args.append('--with-libsodium') if 'clang' in self.compiler.cc: config_args.append("CFLAGS=-Wno-gnu") config_args.append("CXXFLAGS=-Wno-gnu") -- cgit v1.2.3-70-g09d2 From 36ddcc2e9763af6a479627d0f1344153db8b946a Mon Sep 17 00:00:00 2001 From: Dmitriy Date: Thu, 1 Nov 2018 10:15:12 -0700 Subject: henson: new package (#9657) * henson: new package * henson: change github path to henson-insitu * henson: make mpi-wrappers=off by default * henson: remove unsued variable and spaces to make linter happy * henson: rename version master to develop --- var/spack/repos/builtin/packages/henson/package.py | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 var/spack/repos/builtin/packages/henson/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/henson/package.py b/var/spack/repos/builtin/packages/henson/package.py new file mode 100644 index 0000000000..b41fb080fe --- /dev/null +++ b/var/spack/repos/builtin/packages/henson/package.py @@ -0,0 +1,38 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class Henson(CMakePackage): + """Cooperative multitasking for in situ processing.""" + + homepage = "https://github.com/henson-insitu/henson" + url = "https://github.com/henson-insitu/henson" + git = "https://github.com/henson-insitu/henson.git" + + version('develop', branch='master') + + depends_on('mpi') + + variant('python', default=False, description='Build Python bindings') + extends('python', when='+python') + variant('mpi-wrappers', default=False, description='Build MPI wrappers (PMPI)') + + conflicts('^openmpi', when='+mpi-wrappers') + + def cmake_args(self): + args = [] + if '+python' in self.spec: + args += ['-Dpython=on'] + else: + args += ['-Dpython=off'] + + if '+mpi-wrappers' in self.spec: + args += ['-Dmpi-wrappers=on'] + else: + args += ['-Dmpi-wrappers=off'] + + return args -- cgit v1.2.3-70-g09d2 From a33d123e2eb3f3f4ab8f8c1a692a76b9f600d0aa Mon Sep 17 00:00:00 2001 From: Tim Law Date: Fri, 2 Nov 2018 20:30:52 +0000 Subject: Add version 2.0.2 of BookLeaf_Cpp and version 3.0.2 of Typhon. (#9662) --- var/spack/repos/builtin/packages/bookleaf-cpp/package.py | 2 ++ var/spack/repos/builtin/packages/typhon/package.py | 1 + 2 files changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/bookleaf-cpp/package.py b/var/spack/repos/builtin/packages/bookleaf-cpp/package.py index c2c23b55fc..394a79fab7 100644 --- a/var/spack/repos/builtin/packages/bookleaf-cpp/package.py +++ b/var/spack/repos/builtin/packages/bookleaf-cpp/package.py @@ -14,6 +14,8 @@ class BookleafCpp(CMakePackage): git = "https://github.com/UK-MAC/BookLeaf_Cpp.git" version('develop', branch='develop') + + version('2.0.2', sha256='787ade5045415d71d9bad55fe9f93598f3a0548d13e2ff80e752cc99f62fe6d3') version('2.0.1', '34a5a9e7b2b5ffc98562656a4406ba5b') version('2.0', '69819ebcbae5eaa63d1a4de2c77cac85') diff --git a/var/spack/repos/builtin/packages/typhon/package.py b/var/spack/repos/builtin/packages/typhon/package.py index 35cc710b3f..3de1bf4344 100644 --- a/var/spack/repos/builtin/packages/typhon/package.py +++ b/var/spack/repos/builtin/packages/typhon/package.py @@ -18,6 +18,7 @@ class Typhon(CMakePackage): version('develop', branch='develop') + version('3.0.2', sha256='28087eb07bf91d23792900214728b5eea61b5e81aa33df28c032dadd6d89b76e') version('3.0.1', '89045decfba5fd468ef05ad4c924df8c') version('3.0', 'ec67cd1aa585ce2410d4fa50514a916f') -- cgit v1.2.3-70-g09d2 From b471a3626ec06f07eadc5f89767a5ad034113b4f Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 2 Nov 2018 20:06:40 -0500 Subject: freetype: enable-freetype-config build option for 2.9.1 (#9653) This builds the 'freetype-config' binary which can be used to get configuration information about the freetype install, used by some dependents. --- var/spack/repos/builtin/packages/freetype/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/freetype/package.py b/var/spack/repos/builtin/packages/freetype/package.py index 5b00a73a89..acecc649ad 100644 --- a/var/spack/repos/builtin/packages/freetype/package.py +++ b/var/spack/repos/builtin/packages/freetype/package.py @@ -25,7 +25,10 @@ class Freetype(AutotoolsPackage): depends_on('pkgconfig', type='build') def configure_args(self): - return ['--with-harfbuzz=no'] + args = ['--with-harfbuzz=no'] + if self.spec.satisfies('@2.9.1:'): + args.append('--enable-freetype-config') + return args def setup_dependent_environment(self, spack_env, run_env, dependent_spec): spack_env.prepend_path('CPATH', self.prefix.include.freetype2) -- cgit v1.2.3-70-g09d2 From d7c9128875f679ba72e39a3b2b8ff7f31e3bee94 Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Fri, 2 Nov 2018 20:18:05 -0500 Subject: new package: homer (starting at 4.9.1) (#9669) --- var/spack/repos/builtin/packages/homer/package.py | 48 +++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 var/spack/repos/builtin/packages/homer/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/homer/package.py b/var/spack/repos/builtin/packages/homer/package.py new file mode 100644 index 0000000000..14293169dc --- /dev/null +++ b/var/spack/repos/builtin/packages/homer/package.py @@ -0,0 +1,48 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * +from os import symlink + + +class Homer(Package): + """Software for motif discovery and next generation sequencing analysis""" + + homepage = "http://homer.ucsd.edu/homer" + url = "http://homer.ucsd.edu/homer/data/software/homer.v4.9.zip" + + version('4.9.1', sha256='ad1303b0b0400dc8a88dbeae1ee03a94631977b751a3d335326c4febf0eec3a9') + + depends_on('perl', type=('build', 'run')) + depends_on('r-biocgenerics', type='run') + depends_on('r-biocparallel', type='run') + depends_on('r-edger', type='run') + depends_on('r-deseq2', type='run') + + variant('data', default=False, + description='Download genome data packages') + + def install(self, spec, prefix): + # initialize homer directories + basedir = join_path(prefix.lib, 'homer') + mkdirp(basedir) + + install_tree('.', basedir) + + # symlink bin so it is included in the PATH + symlink(join_path(basedir, 'bin'), prefix.bin) + + # override homer base directory in configure script + filter_file('my $homeDir = $1;', + 'my $homeDir = \"{0}\";'.format(basedir), + 'configureHomer.pl', string=True) + + # compile/prepare binaries and perl scripts with the correct paths + perl = which('perl') + perl('configureHomer.pl', '-local') + + # download extra data if requested + if '+data' in spec: + perl('configureHomer.pl', '-install', '-all') -- cgit v1.2.3-70-g09d2 From e6eb2b960e5582d6e5ffeb16ec2c5a6b4b3e1847 Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Mon, 5 Nov 2018 16:01:03 -0800 Subject: py-backports-functools-lru-cache: add to 'backports' namespace (#9720) --- .../repos/builtin/packages/py-backports-functools-lru-cache/package.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py b/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py index bc830ada0e..f573a05594 100644 --- a/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py +++ b/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py @@ -12,6 +12,8 @@ class PyBackportsFunctoolsLruCache(PythonPackage): homepage = "https://github.com/jaraco/backports.functools_lru_cache" url = "https://pypi.io/packages/source/b/backports.functools_lru_cache/backports.functools_lru_cache-1.4.tar.gz" + py_namespace = 'backports' + version('1.5', '20f53f54cd3f04b3346ce75a54959754') version('1.4', 'b954e7d5e2ca0f0f66ad2ed12ba800e5') version('1.0.1', 'c789ef439d189330b99872746a6d9e85', -- cgit v1.2.3-70-g09d2 From d5327d8d4bfa0fd1094dacbdc07a83ed41e4a50e Mon Sep 17 00:00:00 2001 From: sknigh Date: Tue, 6 Nov 2018 00:12:48 -0800 Subject: Add OpenMPI 3.1.3 and a bug patch (#9680) --- .../repos/builtin/packages/openmpi/btl_vader.patch | 24 ++++++++++++++++++++++ .../repos/builtin/packages/openmpi/package.py | 9 ++++++++ 2 files changed, 33 insertions(+) create mode 100644 var/spack/repos/builtin/packages/openmpi/btl_vader.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/openmpi/btl_vader.patch b/var/spack/repos/builtin/packages/openmpi/btl_vader.patch new file mode 100644 index 0000000000..005537d732 --- /dev/null +++ b/var/spack/repos/builtin/packages/openmpi/btl_vader.patch @@ -0,0 +1,24 @@ +diff --git a/opal/mca/btl/vader/btl_vader_fbox.h b/opal/mca/btl/vader/btl_vader_fbox.h +index 17239ce8ef..ee5c913551 100644 +--- a/opal/mca/btl/vader/btl_vader_fbox.h ++++ b/opal/mca/btl/vader/btl_vader_fbox.h +@@ -138,9 +138,6 @@ static inline bool mca_btl_vader_fbox_sendi (mca_btl_base_endpoint_t *ep, unsign + memcpy (data + header_size, payload, payload_size); + } + +- /* write out part of the header now. the tag will be written when the data is available */ +- mca_btl_vader_fbox_set_header (MCA_BTL_VADER_FBOX_HDR(dst), tag, ep->fbox_out.seq++, data_size); +- + end += size; + + if (OPAL_UNLIKELY(fbox_size == end)) { +@@ -152,6 +149,9 @@ static inline bool mca_btl_vader_fbox_sendi (mca_btl_base_endpoint_t *ep, unsign + MCA_BTL_VADER_FBOX_HDR(ep->fbox_out.buffer + end)->ival = 0; + } + ++ /* write out part of the header now. the tag will be written when the data is available */ ++ mca_btl_vader_fbox_set_header (MCA_BTL_VADER_FBOX_HDR(dst), tag, ep->fbox_out.seq++, data_size); ++ + /* align the buffer */ + ep->fbox_out.end = ((uint32_t) hbs << 31) | end; + opal_atomic_wmb (); diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 0367c887a6..40ac79a2e8 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -64,6 +64,7 @@ class Openmpi(AutotoolsPackage): list_url = "http://www.open-mpi.org/software/ompi/" # Current + version('3.1.3', sha256='8be04307c00f51401d3fb9d837321781ea7c79f2a5a4a2e5d4eaedc874087ab6') version('3.1.2', '210df69fafd964158527e7f37e333239') # libmpi.so.40.10.2 version('3.1.1', '493f1db2f75afaab1c8ecba78d2f5aab') # libmpi.so.40.10.1 version('3.1.0', '0895e268ca27735d7654bf64cee6c256') # libmpi.so.40.10.0 @@ -166,6 +167,14 @@ class Openmpi(AutotoolsPackage): patch('configure.patch', when="@1.10.1") patch('fix_multidef_pmi_class.patch', when="@2.0.0:2.0.1") + # Vader Bug: https://github.com/open-mpi/ompi/issues/5375 + # Haven't release fix for 2.1.x + patch('btl_vader.patch', when='@2.1.3:2.1.5') + + # Fixed in 3.0.3 and 3.1.3 + patch('btl_vader.patch', when='@3.0.1:3.0.2') + patch('btl_vader.patch', when='@3.1.0:3.1.2') + fabrics = ('psm', 'psm2', 'verbs', 'mxm', 'ucx', 'libfabric') variant( -- cgit v1.2.3-70-g09d2 From 4ba3c81bc84a7cacbd3a8d159b22eacc031baca9 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Tue, 6 Nov 2018 08:36:47 -0600 Subject: snpeff: add wrapper for SnpSift.jar (#9674) --- var/spack/repos/builtin/packages/snpeff/SnpSift.sh | 3 ++ var/spack/repos/builtin/packages/snpeff/package.py | 32 ++++++++++++---------- 2 files changed, 21 insertions(+), 14 deletions(-) create mode 100644 var/spack/repos/builtin/packages/snpeff/SnpSift.sh (limited to 'var') diff --git a/var/spack/repos/builtin/packages/snpeff/SnpSift.sh b/var/spack/repos/builtin/packages/snpeff/SnpSift.sh new file mode 100644 index 0000000000..3422a77914 --- /dev/null +++ b/var/spack/repos/builtin/packages/snpeff/SnpSift.sh @@ -0,0 +1,3 @@ +#!/bin/sh +# convenience wrapper for the SnpSift jar file +java -jar SnpSift.jar "$@" diff --git a/var/spack/repos/builtin/packages/snpeff/package.py b/var/spack/repos/builtin/packages/snpeff/package.py index 046ad49e52..81e7147d20 100644 --- a/var/spack/repos/builtin/packages/snpeff/package.py +++ b/var/spack/repos/builtin/packages/snpeff/package.py @@ -22,17 +22,21 @@ class Snpeff(Package): def install(self, spec, prefix): install_tree('snpEff', prefix.bin) - # Set up a helper script to call java on the jar file, - # explicitly codes the path for java and the jar file. - script_sh = join_path(os.path.dirname(__file__), "snpEff.sh") - script = prefix.bin.snpEff - install(script_sh, script) - set_executable(script) - - # Munge the helper script to explicitly point to java and the - # jar file. - java = self.spec['java'].prefix.bin.java - kwargs = {'backup': False} - filter_file('^java', java, script, **kwargs) - filter_file('snpEff.jar', join_path(prefix.bin, 'snpEff.jar'), - script, **kwargs) + # Set up a helper script to call java on the jar files, + # explicitly codes the path for java and the jar files. + scripts = ['snpEff', 'SnpSift'] + + for script in scripts: + script_sh = join_path(os.path.dirname(__file__), script + ".sh") + script_path = join_path(prefix.bin, script) + install(script_sh, script_path) + set_executable(script_path) + + # Munge the helper script to explicitly point to java and the + # jar file. + java = self.spec['java'].prefix.bin.java + kwargs = {'backup': False} + filter_file('^java', java, script_path, **kwargs) + filter_file(script + '.jar', + join_path(prefix.bin, script + '.jar'), + script_path, **kwargs) -- cgit v1.2.3-70-g09d2 From 7d97e8b0679d50f272c2a131482c352aa63adcf7 Mon Sep 17 00:00:00 2001 From: Peter Scheibel Date: Tue, 6 Nov 2018 19:57:32 -0800 Subject: New repo for advanced packaging tutorial (#9711) * modified tutorial packages * update hint in hdf5 tutorial file (typo for suggested argument) * add repo.yaml to tutorial repository * update tutorial docs to refer user to tutorial package repository * flake edits * recommend site scope vs. defaults * you don't specify the repo's name when adding a repo, just the path --- lib/spack/docs/tutorial_advanced_packaging.rst | 46 +-- .../repos/tutorial/packages/armadillo/package.py | 62 +++++ .../tutorial/packages/armadillo/undef_linux.patch | 4 + var/spack/repos/tutorial/packages/elpa/package.py | 78 ++++++ ...lt-obj-same-equivalence-same-common-block.patch | 16 ++ var/spack/repos/tutorial/packages/hdf5/package.py | 307 +++++++++++++++++++++ .../tutorial/packages/hdf5/pre-c99-comments.patch | 43 +++ .../tutorial/packages/mpich/mpich32_clang.patch | 13 + var/spack/repos/tutorial/packages/mpich/package.py | 155 +++++++++++ .../tutorial/packages/netlib-lapack/ibm-xl.patch | 42 +++ .../tutorial/packages/netlib-lapack/package.py | 186 +++++++++++++ .../tutorial/packages/netlib-lapack/testing.patch | 13 + .../netlib-lapack/undefined_declarations.patch | 26 ++ var/spack/repos/tutorial/repo.yaml | 2 + 14 files changed, 958 insertions(+), 35 deletions(-) create mode 100644 var/spack/repos/tutorial/packages/armadillo/package.py create mode 100644 var/spack/repos/tutorial/packages/armadillo/undef_linux.patch create mode 100644 var/spack/repos/tutorial/packages/elpa/package.py create mode 100644 var/spack/repos/tutorial/packages/hdf5/h5f90global-mult-obj-same-equivalence-same-common-block.patch create mode 100644 var/spack/repos/tutorial/packages/hdf5/package.py create mode 100644 var/spack/repos/tutorial/packages/hdf5/pre-c99-comments.patch create mode 100644 var/spack/repos/tutorial/packages/mpich/mpich32_clang.patch create mode 100644 var/spack/repos/tutorial/packages/mpich/package.py create mode 100644 var/spack/repos/tutorial/packages/netlib-lapack/ibm-xl.patch create mode 100644 var/spack/repos/tutorial/packages/netlib-lapack/package.py create mode 100644 var/spack/repos/tutorial/packages/netlib-lapack/testing.patch create mode 100644 var/spack/repos/tutorial/packages/netlib-lapack/undefined_declarations.patch create mode 100644 var/spack/repos/tutorial/repo.yaml (limited to 'var') diff --git a/lib/spack/docs/tutorial_advanced_packaging.rst b/lib/spack/docs/tutorial_advanced_packaging.rst index f72f483fcb..9b41980a69 100644 --- a/lib/spack/docs/tutorial_advanced_packaging.rst +++ b/lib/spack/docs/tutorial_advanced_packaging.rst @@ -25,46 +25,22 @@ dependents in your package. Setup for the tutorial ---------------------- -The simplest way to follow along with this tutorial is to use our Docker image, -which comes with Spack and various packages pre-installed: +.. note:: -.. code-block:: console - - $ docker pull alalazo/spack:advanced_packaging_tutorial - $ docker run --rm -h advanced-packaging-tutorial -it alalazo/spack:advanced_packaging_tutorial - root@advanced-packaging-tutorial:/# - root@advanced-packaging-tutorial:/# spack find - ==> 20 installed packages. - -- linux-ubuntu16.04-x86_64 / gcc@5.4.0 ------------------------- - arpack-ng@3.5.0 hdf5@1.10.1 libpciaccess@0.13.5 libtool@2.4.6 m4@1.4.18 ncurses@6.0 openblas@0.2.20 openssl@1.0.2k superlu@5.2.1 xz@5.2.3 - cmake@3.9.4 hwloc@1.11.8 libsigsegv@2.11 libxml2@2.9.4 mpich@3.2 netlib-lapack@3.6.1 openmpi@3.0.0 pkg-config@0.29.2 util-macros@1.19.1 zlib@1.2.11 + If you are not using the tutorial docker image, it is recommended that you + do this section of the tutorial in a fresh clone of Spack -If you already started the image, you can set the ``EDITOR`` environment -variable to your preferred editor (``vi``, ``emacs``, and ``nano`` are included in the image) -and move directly to :ref:`adv_pkg_tutorial_start`. - -If you choose not to use the Docker image, you can clone the Spack repository -and build the necessary bits yourself: +The tutorial uses custom package definitions with missing sections that +will be filled in during the tutorial. These package definitions are stored +in a separate package repository, which can be enabled with: .. code-block:: console - $ git clone https://github.com/spack/spack.git - Cloning into 'spack'... - remote: Counting objects: 92731, done. - remote: Compressing objects: 100% (1108/1108), done. - remote: Total 92731 (delta 1964), reused 4186 (delta 1637), pack-reused 87932 - Receiving objects: 100% (92731/92731), 33.31 MiB | 64.00 KiB/s, done. - Resolving deltas: 100% (43557/43557), done. - Checking connectivity... done. - - $ cd spack - $ git checkout tutorials/advanced_packaging - Branch tutorials/advanced_packaging set up to track remote branch tutorials/advanced_packaging from origin. - Switched to a new branch 'tutorials/advanced_packaging' - -At this point you can install the software that will be used -during the rest of the tutorial (the output of the commands is omitted -for the sake of brevity): + $ spack repo add --scope=site var/spack/repos/tutorial + +If you are using the tutorial docker image, all dependency packages +will have been installed. Otherwise, to install these packages you can use +the following commands: .. code-block:: console diff --git a/var/spack/repos/tutorial/packages/armadillo/package.py b/var/spack/repos/tutorial/packages/armadillo/package.py new file mode 100644 index 0000000000..d95a61f67d --- /dev/null +++ b/var/spack/repos/tutorial/packages/armadillo/package.py @@ -0,0 +1,62 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class Armadillo(CMakePackage): + """Armadillo is a high quality linear algebra library (matrix maths) + for the C++ language, aiming towards a good balance between speed and + ease of use. + """ + + homepage = "http://arma.sourceforge.net/" + url = "http://sourceforge.net/projects/arma/files/armadillo-7.200.1.tar.xz" + + version('8.100.1', 'd9762d6f097e0451d0cfadfbda295e7c') + version('7.950.1', 'c06eb38b12cae49cab0ce05f96147147') + version('7.900.1', '5ef71763bd429a3d481499878351f3be') + version('7.500.0', '7d316fdf3c3c7ea92b64704180ae315d') + version('7.200.2', 'b21585372d67a8876117fd515d8cf0a2') + version('7.200.1', 'ed86d6df0058979e107502e1fe3e469e') + + variant('hdf5', default=False, description='Include HDF5 support') + + depends_on('cmake@2.8.12:', type='build') + depends_on('arpack-ng') # old arpack causes undefined symbols + depends_on('blas') + depends_on('lapack') + depends_on('superlu@5.2:') + depends_on('hdf5', when='+hdf5') + + patch('undef_linux.patch', when='platform=linux') + + def cmake_args(self): + spec = self.spec + + # TUTORIAL: fix the lines below by adding the appropriate query to + # the right dependency. To ask a dependency, e.g. `blas`, for the + # list of libraries it provides it suffices to access its `libs` + # attribute: + # + # blas_libs = spec['blas'].libs + # + # The CMake variables below require a semicolon separated list: + # + # blas_libs.joined(';') + + return [ + # ARPACK support + '-DARPACK_LIBRARY={0}'.format('FIXME: arpack-ng'), + # BLAS support + '-DBLAS_LIBRARY={0}'.format('FIXME: blas'), + # LAPACK support + '-DLAPACK_LIBRARY={0}'.format('FIXME: lapack'), + # SuperLU support + '-DSuperLU_INCLUDE_DIR={0}'.format(spec['superlu'].prefix.include), + '-DSuperLU_LIBRARY={0}'.format('FIXME: superlu'), + # HDF5 support + '-DDETECT_HDF5={0}'.format('ON' if '+hdf5' in spec else 'OFF') + ] diff --git a/var/spack/repos/tutorial/packages/armadillo/undef_linux.patch b/var/spack/repos/tutorial/packages/armadillo/undef_linux.patch new file mode 100644 index 0000000000..68b434dca8 --- /dev/null +++ b/var/spack/repos/tutorial/packages/armadillo/undef_linux.patch @@ -0,0 +1,4 @@ +--- a/include/armadillo_bits/compiler_setup.hpp ++++ b/include/armadillo_bits/compiler_setup.hpp +@@ -0,0 +1 @@ ++#undef linux diff --git a/var/spack/repos/tutorial/packages/elpa/package.py b/var/spack/repos/tutorial/packages/elpa/package.py new file mode 100644 index 0000000000..386295eea9 --- /dev/null +++ b/var/spack/repos/tutorial/packages/elpa/package.py @@ -0,0 +1,78 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class Elpa(AutotoolsPackage): + """Eigenvalue solvers for Petaflop-Applications (ELPA)""" + + homepage = 'http://elpa.mpcdf.mpg.de/' + url = 'http://elpa.mpcdf.mpg.de/elpa-2015.11.001.tar.gz' + + version('2018.05.001.rc1', 'ccd77bd8036988ee624f43c04992bcdd') + version('2017.11.001', '4a437be40cc966efb07aaab84c20cd6e', preferred=True) + version('2017.05.003', '7c8e5e58cafab212badaf4216695700f') + version('2017.05.002', 'd0abc1ac1f493f93bf5e30ec8ab155dc') + version('2016.11.001.pre', '5656fd066cf0dcd071dbcaf20a639b37') + version('2016.05.004', 'c0dd3a53055536fc3a2a221e78d8b376') + version('2016.05.003', '88a9f3f3bfb63e16509dd1be089dcf2c') + version('2015.11.001', 'de0f35b7ee7c971fd0dca35c900b87e6') + + variant('openmp', default=False, description='Activates OpenMP support') + variant('optflags', default=True, description='Build with optimization flags') + + depends_on('mpi') + depends_on('blas') + depends_on('lapack') + depends_on('scalapack') + + def url_for_version(self, version): + t = 'http://elpa.mpcdf.mpg.de/html/Releases/{0}/elpa-{0}.tar.gz' + if version < Version('2016.05.003'): + t = 'http://elpa.mpcdf.mpg.de/elpa-{0}.tar.gz' + return t.format(str(version)) + + @property + def libs(self): + libname = 'libelpa_openmp' if '+openmp' in self.spec else 'libelpa' + return find_libraries( + libname, root=self.prefix, shared=True, recursive=True + ) + + build_directory = 'spack-build' + + def setup_environment(self, spack_env, run_env): + # TUTORIAL: set the following environment variables: + # + # CC=spec['mpi'].mpicc + # FC=spec['mpi'].mpifc + # CXX=spec['mpi'].mpicxx + # SCALAPACK_LDFLAGS=spec['scalapack'].libs.joined() + # + # and append the following flags: + # + # LDFLAGS -> spec['lapack'].libs.search_flags + # LIBS -> spec['lapack'].libs.link_flags + pass + + def configure_args(self): + # TODO: set optimum flags for platform+compiler combo, see + # https://github.com/hfp/xconfigure/tree/master/elpa + # also see: + # https://src.fedoraproject.org/cgit/rpms/elpa.git/ + # https://packages.qa.debian.org/e/elpa.html + options = [] + # without -march=native there is configure error for 2017.05.02 + # Could not compile test program, try with --disable-sse, or + # adjust the C compiler or CFLAGS + if '+optflags' in self.spec: + options.extend([ + 'FCFLAGS=-O2 -march=native -ffree-line-length-none', + 'CFLAGS=-O2 -march=native' + ]) + if '+openmp' in self.spec: + options.append('--enable-openmp') + return options diff --git a/var/spack/repos/tutorial/packages/hdf5/h5f90global-mult-obj-same-equivalence-same-common-block.patch b/var/spack/repos/tutorial/packages/hdf5/h5f90global-mult-obj-same-equivalence-same-common-block.patch new file mode 100644 index 0000000000..8bf5c142e9 --- /dev/null +++ b/var/spack/repos/tutorial/packages/hdf5/h5f90global-mult-obj-same-equivalence-same-common-block.patch @@ -0,0 +1,16 @@ +diff --git a/fortran/src/H5f90global.F90 b/fortran/src/H5f90global.F90 +index dd2b171..629418a 100644 +--- a/fortran/src/H5f90global.F90 ++++ b/fortran/src/H5f90global.F90 +@@ -142,10 +142,7 @@ MODULE H5GLOBAL + + INTEGER(HID_T), DIMENSION(PREDEF_TYPES_LEN) :: predef_types + EQUIVALENCE (predef_types(1), H5T_NATIVE_INTEGER_KIND(1)) +- EQUIVALENCE (predef_types(2), H5T_NATIVE_INTEGER_KIND(2)) +- EQUIVALENCE (predef_types(3), H5T_NATIVE_INTEGER_KIND(3)) +- EQUIVALENCE (predef_types(4), H5T_NATIVE_INTEGER_KIND(4)) +- EQUIVALENCE (predef_types(5), H5T_NATIVE_INTEGER_KIND(5)) ++ ! EQUIVALENCE predef_types(2:5) are unnecessary and violate the standard + EQUIVALENCE (predef_types(6), H5T_NATIVE_INTEGER) + EQUIVALENCE (predef_types(7), H5T_NATIVE_REAL) + EQUIVALENCE (predef_types(8), H5T_NATIVE_DOUBLE) diff --git a/var/spack/repos/tutorial/packages/hdf5/package.py b/var/spack/repos/tutorial/packages/hdf5/package.py new file mode 100644 index 0000000000..b879d81f1c --- /dev/null +++ b/var/spack/repos/tutorial/packages/hdf5/package.py @@ -0,0 +1,307 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +import shutil +import sys + +from spack import * + + +class Hdf5(AutotoolsPackage): + """HDF5 is a data model, library, and file format for storing and managing + data. It supports an unlimited variety of datatypes, and is designed for + flexible and efficient I/O and for high volume and complex data. + """ + + homepage = "https://support.hdfgroup.org/HDF5/" + url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.1/src/hdf5-1.10.1.tar.gz" + list_url = "https://support.hdfgroup.org/ftp/HDF5/releases" + list_depth = 3 + + version('1.10.4', '8f60dc4dd6ab5fcd23c750d1dc5bca3d0453bdce5c8cdaf0a4a61a9d1122adb2') + version('1.10.3', 'b600d7c914cfa80ae127cd1a1539981213fee9994ac22ebec9e3845e951d9b39') + version('1.10.2', '8d4eae84e533efa57496638fd0dca8c3') + version('1.10.1', '43a2f9466702fb1db31df98ae6677f15') + version('1.10.0-patch1', '9180ff0ef8dc2ef3f61bd37a7404f295') + version('1.10.0', 'bdc935337ee8282579cd6bc4270ad199') + version('1.8.19', '7f568e2464d4ab0a74d16b23956d900b') + version('1.8.18', 'dd2148b740713ca0295442ec683d7b1c') + version('1.8.17', '7d572f8f3b798a628b8245af0391a0ca') + version('1.8.16', 'b8ed9a36ae142317f88b0c7ef4b9c618') + version('1.8.15', '03cccb5b33dbe975fdcd8ae9dc021f24') + version('1.8.14', 'a482686e733514a51cde12d6fe5c5d95') + version('1.8.13', 'c03426e9e77d7766944654280b467289') + version('1.8.12', 'd804802feb99b87fc668a90e6fa34411') + version('1.8.10', '710aa9fb61a51d61a7e2c09bf0052157') + + variant('debug', default=False, + description='Builds a debug version of the library') + variant('shared', default=True, + description='Builds a shared version of the library') + + variant('hl', default=False, description='Enable the high-level library') + variant('cxx', default=False, description='Enable C++ support') + variant('fortran', default=False, description='Enable Fortran support') + variant('threadsafe', default=False, + description='Enable thread-safe capabilities') + + variant('mpi', default=True, description='Enable MPI support') + variant('szip', default=False, description='Enable szip support') + variant('pic', default=True, + description='Produce position-independent code (for shared libs)') + + depends_on('mpi', when='+mpi') + # numactl does not currently build on darwin + if sys.platform != 'darwin': + depends_on('numactl', when='+mpi+fortran') + depends_on('szip', when='+szip') + depends_on('zlib@1.1.2:') + + # There are several officially unsupported combinations of the features: + # 1. Thread safety is not guaranteed via high-level C-API but in some cases + # it works. + # conflicts('+threadsafe+hl') + + # 2. Thread safety is not guaranteed via Fortran (CXX) API, but it's + # possible for a dependency tree to contain a package that uses Fortran + # (CXX) API in a single thread and another one that uses low-level C-API + # in multiple threads. To allow for such scenarios, we don't specify the + # following conflicts. + # conflicts('+threadsafe+cxx') + # conflicts('+threadsafe+fortran') + + # 3. Parallel features are not supported via CXX API, but for the reasons + # described in #2 we allow for such combination. + # conflicts('+mpi+cxx') + + # There are known build failures with intel@18.0.1. This issue is + # discussed and patch is provided at + # https://software.intel.com/en-us/forums/intel-fortran-compiler-for-linux-and-mac-os-x/topic/747951. + patch('h5f90global-mult-obj-same-equivalence-same-common-block.patch', + when='@1.10.1%intel@18') + + # Turn line comments into block comments to conform with pre-C99 language + # standards. Versions of hdf5 after 1.8.10 don't require this patch, + # either because they conform to pre-C99 or neglect to ask for pre-C99 + # language standards from their compiler. The hdf5 build system adds + # the -ansi cflag (run 'man gcc' for info on -ansi) for some versions + # of some compilers (see hdf5-1.8.10/config/gnu-flags). The hdf5 build + # system does not provide an option to disable -ansi, but since the + # pre-C99 code is restricted to just five lines of line comments in + # three src files, this patch accomplishes the simple task of patching the + # three src files and leaves the hdf5 build system alone. + patch('pre-c99-comments.patch', when='@1.8.10') + + # There are build errors with GCC 8, see + # https://forum.hdfgroup.org/t/1-10-2-h5detect-compile-error-gcc-8-1-0-on-centos-7-2-solved/4441 + patch('https://salsa.debian.org/debian-gis-team/hdf5/raw/bf94804af5f80f662cad80a5527535b3c6537df6/debian/patches/gcc-8.patch', sha256='57cee5ff1992b4098eda079815c36fc2da9b10e00a9056df054f2384c4fc7523', when='@1.10.2%gcc@8:') + + filter_compiler_wrappers('h5cc', 'h5c++', 'h5fc', relative_root='bin') + + def url_for_version(self, version): + url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-{0}/hdf5-{1}/src/hdf5-{1}.tar.gz" + return url.format(version.up_to(2), version) + + @property + def libs(self): + """HDF5 can be queried for the following parameters: + + - "hl": high-level interface + - "cxx": C++ APIs + - "fortran": Fortran APIs + + :return: list of matching libraries + """ + # This map contains a translation from query_parameters + # to the libraries needed + query2libraries = { # noqa: F841 + tuple(): ['libhdf5'], + ('cxx', 'fortran', 'hl'): [ + 'libhdf5hl_fortran', + 'libhdf5_hl_cpp', + 'libhdf5_hl', + 'libhdf5_fortran', + 'libhdf5', + ], + ('cxx', 'hl'): [ + 'libhdf5_hl_cpp', + 'libhdf5_hl', + 'libhdf5', + ], + ('fortran', 'hl'): [ + 'libhdf5hl_fortran', + 'libhdf5_hl', + 'libhdf5_fortran', + 'libhdf5', + ], + ('hl',): [ + 'libhdf5_hl', + 'libhdf5', + ], + ('cxx', 'fortran'): [ + 'libhdf5_fortran', + 'libhdf5_cpp', + 'libhdf5', + ], + ('cxx',): [ + 'libhdf5_cpp', + 'libhdf5', + ], + ('fortran',): [ + 'libhdf5_fortran', + 'libhdf5', + ] + } + + # TUTORIAL: you need to fix the implementation below, and + # return the correct list of libraries according to the + # query parameters your dependency has used. + # + # You can retrieve the query parameters by doing + # + # query_parameters = self.spec.last_query.extra_parameters + # + # and use the map above to query the list of libraries you need + # to search. + # + # Finally uncomment the lines below to return a LibraryList + # + # shared = '+shared' in self.spec + # return find_libraries( + # libraries, root=self.prefix, shared=shared, recursive=True + # ) + return [] + + @run_before('configure') + def fortran_check(self): + if '+fortran' in self.spec and not self.compiler.fc: + msg = 'cannot build a Fortran variant without a Fortran compiler' + raise RuntimeError(msg) + + def configure_args(self): + # Always enable this option. This does not actually enable any + # features: it only *allows* the user to specify certain + # combinations of other arguments. Enabling it just skips a + # sanity check in configure, so this doesn't merit a variant. + extra_args = ['--enable-unsupported'] + extra_args += self.enable_or_disable('threadsafe') + extra_args += self.enable_or_disable('cxx') + extra_args += self.enable_or_disable('hl') + extra_args += self.enable_or_disable('fortran') + + if '+szip' in self.spec: + extra_args.append('--with-szlib=%s' % self.spec['szip'].prefix) + else: + extra_args.append('--without-szlib') + + if self.spec.satisfies('@1.10:'): + if '+debug' in self.spec: + extra_args.append('--enable-build-mode=debug') + else: + extra_args.append('--enable-build-mode=production') + else: + if '+debug' in self.spec: + extra_args.append('--enable-debug=all') + else: + extra_args.append('--enable-production') + + # '--enable-fortran2003' no longer exists as of version 1.10.0 + if '+fortran' in self.spec: + extra_args.append('--enable-fortran2003') + else: + extra_args.append('--disable-fortran2003') + + if '+shared' in self.spec: + extra_args.append('--enable-shared') + else: + extra_args.append('--disable-shared') + extra_args.append('--enable-static-exec') + + if '+pic' in self.spec: + extra_args += ['%s=%s' % (f, self.compiler.pic_flag) + for f in ['CFLAGS', 'CXXFLAGS', 'FCFLAGS']] + + if '+mpi' in self.spec: + # The HDF5 configure script warns if cxx and mpi are enabled + # together. There doesn't seem to be a real reason for this, except + # that parts of the MPI interface are not accessible via the C++ + # interface. Since they are still accessible via the C interface, + # this is not actually a problem. + extra_args += ['--enable-parallel', + 'CC=%s' % self.spec['mpi'].mpicc] + + if '+cxx' in self.spec: + extra_args.append('CXX=%s' % self.spec['mpi'].mpicxx) + + if '+fortran' in self.spec: + extra_args.append('FC=%s' % self.spec['mpi'].mpifc) + + extra_args.append('--with-zlib=%s' % self.spec['zlib'].prefix) + + return extra_args + + @run_after('configure') + def patch_postdeps(self): + if '@:1.8.14' in self.spec: + # On Ubuntu14, HDF5 1.8.12 (and maybe other versions) + # mysteriously end up with "-l -l" in the postdeps in the + # libtool script. Patch this by removing the spurious -l's. + filter_file( + r'postdeps="([^"]*)"', + lambda m: 'postdeps="%s"' % ' '.join( + arg for arg in m.group(1).split(' ') if arg != '-l'), + 'libtool') + + @run_after('install') + @on_package_attributes(run_tests=True) + def check_install(self): + # Build and run a small program to test the installed HDF5 library + spec = self.spec + print("Checking HDF5 installation...") + checkdir = "spack-check" + with working_dir(checkdir, create=True): + source = r""" +#include +#include +#include +int main(int argc, char **argv) { + unsigned majnum, minnum, relnum; + herr_t herr = H5get_libversion(&majnum, &minnum, &relnum); + assert(!herr); + printf("HDF5 version %d.%d.%d %u.%u.%u\n", H5_VERS_MAJOR, H5_VERS_MINOR, + H5_VERS_RELEASE, majnum, minnum, relnum); + return 0; +} +""" + expected = """\ +HDF5 version {version} {version} +""".format(version=str(spec.version.up_to(3))) + with open("check.c", 'w') as f: + f.write(source) + if '+mpi' in spec: + cc = Executable(spec['mpi'].mpicc) + else: + cc = Executable(self.compiler.cc) + cc(*(['-c', "check.c"] + spec['hdf5'].headers.cpp_flags.split())) + cc(*(['-o', "check", + "check.o"] + spec['hdf5'].libs.ld_flags.split())) + try: + check = Executable('./check') + output = check(output=str) + except ProcessError: + output = "" + success = output == expected + if not success: + print("Produced output does not match expected output.") + print("Expected output:") + print('-' * 80) + print(expected) + print('-' * 80) + print("Produced output:") + print('-' * 80) + print(output) + print('-' * 80) + raise RuntimeError("HDF5 install check failed") + shutil.rmtree(checkdir) diff --git a/var/spack/repos/tutorial/packages/hdf5/pre-c99-comments.patch b/var/spack/repos/tutorial/packages/hdf5/pre-c99-comments.patch new file mode 100644 index 0000000000..97743e8fa5 --- /dev/null +++ b/var/spack/repos/tutorial/packages/hdf5/pre-c99-comments.patch @@ -0,0 +1,43 @@ +diff --git a/test/th5s.c b/test/th5s.c +index 462bc36..8e18fad 100644 +--- a/test/th5s.c ++++ b/test/th5s.c +@@ -730,8 +730,8 @@ test_h5s_zero_dim(void) + ret = H5Pset_chunk(plist_id, SPACE1_RANK, chunk_dims); + CHECK(ret, FAIL, "H5Pset_chunk"); + +- // ret = H5Pset_alloc_time(plist_id, alloc_time); +- // CHECK(ret, FAIL, "H5Pset_alloc_time"); ++ /* ret = H5Pset_alloc_time(plist_id, alloc_time); */ ++ /* CHECK(ret, FAIL, "H5Pset_alloc_time"); */ + + dset1 = H5Dcreate2(fid1, BASICDATASET1, H5T_NATIVE_INT, sid_chunk, H5P_DEFAULT, plist_id, H5P_DEFAULT); + CHECK(dset1, FAIL, "H5Dcreate2"); +diff --git a/tools/h5dump/h5dump_ddl.c b/tools/h5dump/h5dump_ddl.c +index ee6de5e..3ed6045 100644 +--- a/tools/h5dump/h5dump_ddl.c ++++ b/tools/h5dump/h5dump_ddl.c +@@ -1341,8 +1341,8 @@ handle_attributes(hid_t fid, const char *attr, void UNUSED * data, int UNUSED pe + string_dataformat.do_escape = display_escape; + outputformat = &string_dataformat; + +- //attr_name = attr + j + 1; +- // need to replace escape characters ++ /* attr_name = attr + j + 1; */ ++ /* need to replace escape characters */ + attr_name = h5tools_str_replace(attr + j + 1, "\\/", "/"); + + +diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c +index 9ce3524..3b4e5e7 100644 +--- a/tools/lib/h5tools_str.c ++++ b/tools/lib/h5tools_str.c +@@ -632,7 +632,7 @@ h5tools_str_indent(h5tools_str_t *str, const h5tool_format_t *info, + h5tools_str_append(str, "%s", OPT(info->line_indent, "")); + } + +-// ctx->need_prefix = 0; ++/* ctx->need_prefix = 0; */ + } + + /*------------------------------------------------------------------------- diff --git a/var/spack/repos/tutorial/packages/mpich/mpich32_clang.patch b/var/spack/repos/tutorial/packages/mpich/mpich32_clang.patch new file mode 100644 index 0000000000..01243072f7 --- /dev/null +++ b/var/spack/repos/tutorial/packages/mpich/mpich32_clang.patch @@ -0,0 +1,13 @@ +diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h +index e705e5d..3bfcbee 100644 +--- a/src/include/mpiimpl.h ++++ b/src/include/mpiimpl.h +@@ -1528,7 +1528,7 @@ typedef struct MPID_Request { + #ifdef MPID_DEV_REQUEST_DECL + MPID_DEV_REQUEST_DECL + #endif +-} MPID_Request ATTRIBUTE((__aligned__(32))); ++} ATTRIBUTE((__aligned__(32))) MPID_Request; + + extern MPIU_Object_alloc_t MPID_Request_mem; + /* Preallocated request objects */ diff --git a/var/spack/repos/tutorial/packages/mpich/package.py b/var/spack/repos/tutorial/packages/mpich/package.py new file mode 100644 index 0000000000..c3e0b8a54b --- /dev/null +++ b/var/spack/repos/tutorial/packages/mpich/package.py @@ -0,0 +1,155 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * +import os + + +class Mpich(AutotoolsPackage): + """MPICH is a high performance and widely portable implementation of + the Message Passing Interface (MPI) standard.""" + + homepage = "http://www.mpich.org" + url = "http://www.mpich.org/static/downloads/3.0.4/mpich-3.0.4.tar.gz" + git = "https://github.com/pmodels/mpich.git" + list_url = "http://www.mpich.org/static/downloads/" + list_depth = 1 + + version('develop', submodules=True) + version('3.2.1', 'e175452f4d61646a52c73031683fc375') + version('3.2', 'f414cfa77099cd1fa1a5ae4e22db508a') + version('3.1.4', '2ab544607986486562e076b83937bba2') + version('3.1.3', '93cb17f91ac758cbf9174ecb03563778') + version('3.1.2', '7fbf4b81dcb74b07ae85939d1ceee7f1') + version('3.1.1', '40dc408b1e03cc36d80209baaa2d32b7') + version('3.1', '5643dd176499bfb7d25079aaff25f2ec') + version('3.0.4', '9c5d5d4fe1e17dd12153f40bc5b6dbc0') + + variant('hydra', default=True, description='Build the hydra process manager') + variant('pmi', default=True, description='Build with PMI support') + variant('romio', default=True, description='Enable ROMIO MPI I/O implementation') + variant('verbs', default=False, description='Build support for OpenFabrics verbs.') + variant( + 'device', + default='ch3', + description='''Abstract Device Interface (ADI) +implementation. The ch4 device is currently in experimental state''', + values=('ch3', 'ch4'), + multi=False + ) + variant( + 'netmod', + default='tcp', + description='''Network module. Only single netmod builds are +supported. For ch3 device configurations, this presumes the +ch3:nemesis communication channel. ch3:sock is not supported by this +spack package at this time.''', + values=('tcp', 'mxm', 'ofi', 'ucx'), + multi=False + ) + + provides('mpi') + provides('mpi@:3.0', when='@3:') + provides('mpi@:1.3', when='@1:') + + filter_compiler_wrappers( + 'mpicc', 'mpicxx', 'mpif77', 'mpif90', 'mpifort', relative_root='bin' + ) + + # fix MPI_Barrier segmentation fault + # see https://lists.mpich.org/pipermail/discuss/2016-May/004764.html + # and https://lists.mpich.org/pipermail/discuss/2016-June/004768.html + patch('mpich32_clang.patch', when='@3.2:3.2.0%clang') + + depends_on('findutils', type='build') + + depends_on('libfabric', when='netmod=ofi') + + conflicts('device=ch4', when='@:3.2') + conflicts('netmod=ofi', when='@:3.1.4') + conflicts('netmod=ucx', when='device=ch3') + conflicts('netmod=mxm', when='device=ch4') + conflicts('netmod=mxm', when='@:3.1.3') + conflicts('netmod=tcp', when='device=ch4') + + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): + # TUTORIAL: set the following variables for dependents: + # + # MPICC=join_path(self.prefix.bin, 'mpicc') + # MPICXX=join_path(self.prefix.bin, 'mpic++') + # MPIF77=join_path(self.prefix.bin, 'mpif77') + # MPIF90=join_path(self.prefix.bin, 'mpif90') + # MPICH_CC=spack_cc + # MPICH_CXX=spack_cxx + # MPICH_F77=spack_f77 + # MPICH_F90=spack_fc + # MPICH_FC=spack_fc + pass + + def setup_dependent_package(self, module, dependent_spec): + if 'platform=cray' in self.spec: + self.spec.mpicc = spack_cc + self.spec.mpicxx = spack_cxx + self.spec.mpifc = spack_fc + self.spec.mpif77 = spack_f77 + else: + self.spec.mpicc = join_path(self.prefix.bin, 'mpicc') + self.spec.mpicxx = join_path(self.prefix.bin, 'mpic++') + self.spec.mpifc = join_path(self.prefix.bin, 'mpif90') + self.spec.mpif77 = join_path(self.prefix.bin, 'mpif77') + + self.spec.mpicxx_shared_libs = [ + join_path(self.prefix.lib, 'libmpicxx.{0}'.format(dso_suffix)), + join_path(self.prefix.lib, 'libmpi.{0}'.format(dso_suffix)) + ] + + def autoreconf(self, spec, prefix): + """Not needed usually, configure should be already there""" + # If configure exists nothing needs to be done + if os.path.exists(self.configure_abs_path): + return + # Else bootstrap with autotools + bash = which('bash') + bash('./autogen.sh') + + @run_before('autoreconf') + def die_without_fortran(self): + # Until we can pass variants such as +fortran through virtual + # dependencies depends_on('mpi'), require Fortran compiler to + # avoid delayed build errors in dependents. + if (self.compiler.f77 is None) or (self.compiler.fc is None): + raise InstallError( + 'Mpich requires both C and Fortran compilers!' + ) + + def configure_args(self): + spec = self.spec + config_args = [ + '--enable-shared', + '--with-pm={0}'.format('hydra' if '+hydra' in spec else 'no'), + '--with-pmi={0}'.format('yes' if '+pmi' in spec else 'no'), + '--{0}-romio'.format('enable' if '+romio' in spec else 'disable'), + '--{0}-ibverbs'.format('with' if '+verbs' in spec else 'without') + ] + + # setup device configuration + device_config = '' + if 'device=ch4' in spec: + device_config = '--with-device=ch4:' + elif 'device=ch3' in spec: + device_config = '--with-device=ch3:nemesis:' + + if 'netmod=ucx' in spec: + device_config += 'ucx' + elif 'netmod=ofi' in spec: + device_config += 'ofi' + elif 'netmod=mxm' in spec: + device_config += 'mxm' + elif 'netmod=tcp' in spec: + device_config += 'tcp' + + config_args.append(device_config) + + return config_args diff --git a/var/spack/repos/tutorial/packages/netlib-lapack/ibm-xl.patch b/var/spack/repos/tutorial/packages/netlib-lapack/ibm-xl.patch new file mode 100644 index 0000000000..c6fba2a028 --- /dev/null +++ b/var/spack/repos/tutorial/packages/netlib-lapack/ibm-xl.patch @@ -0,0 +1,42 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -62,7 +62,7 @@ + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fp-model strict") + endif() + if("${CMAKE_Fortran_COMPILER}" MATCHES "xlf") +- set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -qnosave -qstrict=none") ++ set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -qnosave -qstrict") + endif() + # Delete libmtsk in linking sequence for Sun/Oracle Fortran Compiler. + # This library is not present in the Sun package SolarisStudio12.3-linux-x86-bin + +--- a/CMAKE/CheckLAPACKCompilerFlags.cmake ++++ b/CMAKE/CheckLAPACKCompilerFlags.cmake +@@ -43,12 +43,6 @@ + if( "${CMAKE_Fortran_FLAGS}" MATCHES "-qflttrap=[a-zA-Z:]:enable" ) + set( FPE_EXIT TRUE ) + endif() +- +- if( NOT ("${CMAKE_Fortran_FLAGS}" MATCHES "-qfixed") ) +- message( STATUS "Enabling fixed format F90/F95 with -qfixed" ) +- set( CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -qfixed" +- CACHE STRING "Flags for Fortran compiler." FORCE ) +- endif() + + # HP Fortran + elseif( CMAKE_Fortran_COMPILER_ID STREQUAL "HP" ) + +--- a/CBLAS/CMakeLists.txt ++++ b/CBLAS/CMakeLists.txt +@@ -12,8 +12,8 @@ + SYMBOL_NAMESPACE "F77_") + if(NOT FortranCInterface_GLOBAL_FOUND OR NOT FortranCInterface_MODULE_FOUND) + message(WARNING "Reverting to pre-defined include/lapacke_mangling.h") +- configure_file(include/lapacke_mangling_with_flags.h.in +- ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h) ++ configure_file(include/cblas_mangling_with_flags.h.in ++ ${LAPACK_BINARY_DIR}/include/cblas_mangling.h) + endif() + + include_directories(include ${LAPACK_BINARY_DIR}/include) + diff --git a/var/spack/repos/tutorial/packages/netlib-lapack/package.py b/var/spack/repos/tutorial/packages/netlib-lapack/package.py new file mode 100644 index 0000000000..ef43b8a2e0 --- /dev/null +++ b/var/spack/repos/tutorial/packages/netlib-lapack/package.py @@ -0,0 +1,186 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class NetlibLapack(CMakePackage): + """LAPACK version 3.X is a comprehensive FORTRAN library that does + linear algebra operations including matrix inversions, least squared + solutions to linear sets of equations, eigenvector analysis, singular + value decomposition, etc. It is a very comprehensive and reputable + package that has found extensive use in the scientific community. + + """ + homepage = "http://www.netlib.org/lapack/" + url = "http://www.netlib.org/lapack/lapack-3.5.0.tgz" + + version('3.8.0', '96591affdbf58c450d45c1daa540dbd2', + url='http://www.netlib.org/lapack/lapack-3.8.0.tar.gz') + version('3.7.1', 'dcdeeed73de152c4643ccc5b1aeb453c') + version('3.7.0', '697bb8d67c7d336a0f339cc9dd0fa72f') + version('3.6.1', '421b2cb72e15f237e144428f9c460ee0') + version('3.6.0', 'f2f6c67134e851fe189bb3ca1fbb5101') + version('3.5.0', 'b1d3e3e425b2e44a06760ff173104bdf') + version('3.4.2', '61bf1a8a4469d4bdb7604f5897179478') + version('3.4.1', '44c3869c38c8335c2b9c2a8bb276eb55') + version('3.4.0', '02d5706ec03ba885fc246e5fa10d8c70') + version('3.3.1', 'd0d533ec9a5b74933c2a1e84eedc58b4') + + variant('shared', default=True, description="Build shared library version") + variant('external-blas', default=False, + description='Build lapack with an external blas') + + variant('lapacke', default=True, + description='Activates the build of the LAPACKE C interface') + variant('xblas', default=False, + description='Builds extended precision routines using XBLAS') + + patch('ibm-xl.patch', when='@3.7: %xl') + patch('ibm-xl.patch', when='@3.7: %xl_r') + + # https://github.com/Reference-LAPACK/lapack/issues/228 + # TODO: update 'when' once the version of lapack + # containing the fix is released and added to Spack. + patch('undefined_declarations.patch', when='@3.8.0:') + + # https://github.com/Reference-LAPACK/lapack/pull/268 + # TODO: update 'when' once the version of lapack + # containing the fix is released and added to Spack. + patch('testing.patch', when='@3.7.0:') + + # virtual dependency + provides('blas', when='~external-blas') + provides('lapack') + + depends_on('blas', when='+external-blas') + depends_on('netlib-xblas+fortran+plain_blas', when='+xblas') + depends_on('python@2.7:', type='test') + + # We need to run every phase twice in order to get static and shared + # versions of the libraries. When ~shared, we run the default + # implementations of the CMakePackage's phases and get only one building + # directory 'spack-build-static' with -DBUILD_SHARED_LIBS:BOOL=OFF (see + # implementations of self.build_directory and self.cmake_args() below). + # When +shared, we run the overridden methods for the phases, each + # running the default implementation twice with different values for + # self._building_shared. As a result, we get two building directories: + # 'spack-build-static' with -DBUILD_SHARED_LIBS:BOOL=OFF and + # 'spack-build-shared' with -DBUILD_SHARED_LIBS:BOOL=ON. + _building_shared = False + + def patch(self): + # Fix cblas CMakeLists.txt -- has wrong case for subdirectory name. + if self.spec.satisfies('@3.6.0:'): + filter_file( + '${CMAKE_CURRENT_SOURCE_DIR}/CMAKE/', + '${CMAKE_CURRENT_SOURCE_DIR}/cmake/', + 'CBLAS/CMakeLists.txt', string=True) + + @property + def blas_libs(self): + shared = True if '+shared' in self.spec else False + query_parameters = self.spec.last_query.extra_parameters + query2libraries = { + tuple(): ['libblas'], + ('c', 'fortran'): [ + 'libcblas', + 'libblas', + ], + ('c',): [ + 'libcblas', + ], + ('fortran',): [ + 'libblas', + ] + } + key = tuple(sorted(query_parameters)) + libraries = query2libraries[key] + return find_libraries( + libraries, root=self.prefix, shared=shared, recursive=True + ) + + # TUTORIAL: add a proper `lapack_lib` property, along the lines + # of the `blas_lib` property above. The library that provides + # the lapack API is called `liblapack`. + + @property + def headers(self): + include_dir = self.spec.prefix.include + cblas_h = join_path(include_dir, 'cblas.h') + lapacke_h = join_path(include_dir, 'lapacke.h') + return HeaderList([cblas_h, lapacke_h]) + + @property + def build_directory(self): + return join_path(self.stage.source_path, + 'spack-build-shared' if self._building_shared + else 'spack-build-static') + + def cmake_args(self): + args = ['-DBUILD_SHARED_LIBS:BOOL=' + + ('ON' if self._building_shared else 'OFF')] + + if self.spec.satisfies('+lapacke'): + args.extend(['-DLAPACKE:BOOL=ON', '-DLAPACKE_WITH_TMG:BOOL=ON']) + else: + args.extend(['-DLAPACKE:BOOL=OFF', '-DLAPACKE_WITH_TMG:BOOL=OFF']) + + if self.spec.satisfies('@3.6.0:'): + args.append('-DCBLAS=ON') # always build CBLAS + + if self.spec.satisfies('%intel'): + # Intel compiler finds serious syntax issues when trying to + # build CBLAS and LapackE + args.extend(['-DCBLAS=OFF', '-DLAPACKE:BOOL=OFF']) + + if self.spec.satisfies('%xl') or self.spec.satisfies('%xl_r'): + # use F77 compiler if IBM XL + args.extend(['-DCMAKE_Fortran_COMPILER=' + self.compiler.f77, + '-DCMAKE_Fortran_FLAGS=' + + (' '.join(self.spec.compiler_flags['fflags'])) + + " -O3 -qnohot"]) + + # deprecated routines are commonly needed by, for example, suitesparse + # Note that OpenBLAS spack is built with deprecated routines + args.append('-DBUILD_DEPRECATED:BOOL=ON') + + if self.spec.satisfies('+external-blas'): + args.extend(['-DUSE_OPTIMIZED_BLAS:BOOL=ON', + '-DBLAS_LIBRARIES:PATH=' + + self.spec['blas'].libs.joined(';')]) + + if self.spec.satisfies('+xblas'): + args.extend(['-DXBLAS_INCLUDE_DIR=' + + self.spec['netlib-xblas'].prefix.include, + '-DXBLAS_LIBRARY=' + + self.spec['netlib-xblas'].libs.joined(';')]) + + args.append('-DBUILD_TESTING:BOOL=' + + ('ON' if self.run_tests else 'OFF')) + + return args + + # Build, install, and check both static and shared versions of the + # libraries when +shared + @when('+shared') + def cmake(self, spec, prefix): + for self._building_shared in (False, True): + super(NetlibLapack, self).cmake(spec, prefix) + + @when('+shared') + def build(self, spec, prefix): + for self._building_shared in (False, True): + super(NetlibLapack, self).build(spec, prefix) + + @when('+shared') + def install(self, spec, prefix): + for self._building_shared in (False, True): + super(NetlibLapack, self).install(spec, prefix) + + @when('+shared') + def check(self): + for self._building_shared in (False, True): + super(NetlibLapack, self).check() diff --git a/var/spack/repos/tutorial/packages/netlib-lapack/testing.patch b/var/spack/repos/tutorial/packages/netlib-lapack/testing.patch new file mode 100644 index 0000000000..fce18548c4 --- /dev/null +++ b/var/spack/repos/tutorial/packages/netlib-lapack/testing.patch @@ -0,0 +1,13 @@ +diff --git a/TESTING/LIN/alahd.f b/TESTING/LIN/alahd.f +index 8f4cd58d..6a4946e0 100644 +--- a/TESTING/LIN/alahd.f ++++ b/TESTING/LIN/alahd.f +@@ -1036,7 +1036,7 @@ + 9929 FORMAT( ' Test ratios (1-3: ', A1, 'TZRZF):' ) + 9920 FORMAT( 3X, ' 7-10: same as 3-6', 3X, ' 11-14: same as 3-6' ) + 9921 FORMAT( ' Test ratios:', / ' (1-2: ', A1, 'GELS, 3-6: ', A1, +- $ 'GELSY, 7-10: ', A1, 'GELSS, 11-14: ', A1, 'GELSD, 15-16: ' ++ $ 'GELSY, 7-10: ', A1, 'GELSS, 11-14: ', A1, 'GELSD, 15-16: ', + $ A1, 'GETSLS)') + 9928 FORMAT( 7X, 'where ALPHA = ( 1 + SQRT( 17 ) ) / 8' ) + 9927 FORMAT( 3X, I2, ': ABS( Largest element in L )', / 12X, diff --git a/var/spack/repos/tutorial/packages/netlib-lapack/undefined_declarations.patch b/var/spack/repos/tutorial/packages/netlib-lapack/undefined_declarations.patch new file mode 100644 index 0000000000..9dac2562f7 --- /dev/null +++ b/var/spack/repos/tutorial/packages/netlib-lapack/undefined_declarations.patch @@ -0,0 +1,26 @@ +diff --git a/SRC/dsytrf_aa_2stage.f b/SRC/dsytrf_aa_2stage.f +index 2991305..f5f06cc 100644 +--- a/SRC/dsytrf_aa_2stage.f ++++ b/SRC/dsytrf_aa_2stage.f +@@ -191,7 +191,7 @@ + EXTERNAL LSAME, ILAENV + * .. + * .. External Subroutines .. +- EXTERNAL XERBLA, DCOPY, DLACGV, DLACPY, ++ EXTERNAL XERBLA, DCOPY, DLACPY, + $ DLASET, DGBTRF, DGEMM, DGETRF, + $ DSYGST, DSWAP, DTRSM + * .. +diff --git a/SRC/ssytrf_aa_2stage.f b/SRC/ssytrf_aa_2stage.f +index be6809d..a929749 100644 +--- a/SRC/ssytrf_aa_2stage.f ++++ b/SRC/ssytrf_aa_2stage.f +@@ -191,7 +191,7 @@ + EXTERNAL LSAME, ILAENV + * .. + * .. External Subroutines .. +- EXTERNAL XERBLA, SCOPY, SLACGV, SLACPY, ++ EXTERNAL XERBLA, SCOPY, SLACPY, + $ SLASET, SGBTRF, SGEMM, SGETRF, + $ SSYGST, SSWAP, STRSM + * .. diff --git a/var/spack/repos/tutorial/repo.yaml b/var/spack/repos/tutorial/repo.yaml new file mode 100644 index 0000000000..b43f511136 --- /dev/null +++ b/var/spack/repos/tutorial/repo.yaml @@ -0,0 +1,2 @@ +repo: + namespace: tutorial -- cgit v1.2.3-70-g09d2 From 768111c36541316b56ba3209f1833161b032f926 Mon Sep 17 00:00:00 2001 From: "Valentin Clement (バレンタイン クレメン)" Date: Wed, 7 Nov 2018 15:24:24 +0100 Subject: Use the raw compiler path for the preprocessing pass in CLAW driver (#9748) --- var/spack/repos/builtin/packages/claw/package.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/claw/package.py b/var/spack/repos/builtin/packages/claw/package.py index 1f14ee88a4..d905faf2bc 100644 --- a/var/spack/repos/builtin/packages/claw/package.py +++ b/var/spack/repos/builtin/packages/claw/package.py @@ -30,4 +30,7 @@ class Claw(CMakePackage): args.append('-DOMNI_CONF_OPTION=--with-libxml2={0}'. format(spec['libxml2'].prefix)) + args.append('-DCMAKE_Fortran_COMPILER={0}'. + format(self.compiler.fc)) + return args -- cgit v1.2.3-70-g09d2 From 55b6105af7556abbd663935e061e635632d4b189 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Wed, 7 Nov 2018 10:27:08 -0600 Subject: r-delayedarray: new dep in latest vers (#9731) --- var/spack/repos/builtin/packages/r-delayedarray/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/r-delayedarray/package.py b/var/spack/repos/builtin/packages/r-delayedarray/package.py index b1aa8e1975..c6c32aa888 100644 --- a/var/spack/repos/builtin/packages/r-delayedarray/package.py +++ b/var/spack/repos/builtin/packages/r-delayedarray/package.py @@ -30,6 +30,7 @@ class RDelayedarray(RPackage): version('0.4.1', commit='ffe932ef8c255614340e4856fc6e0b44128a27a1') version('0.2.7', commit='909c2ce1665ebae2543172ead50abbe10bd42bc4') + depends_on('r-biocparallel', when='@0.6.5:', type=('build', 'run')) depends_on('r-biocgenerics', type=('build', 'run')) depends_on('r-biocgenerics@0.25.1:', when='@0.6.5', type=('build', 'run')) depends_on('r-s4vectors@0.14.3:', when='@0.2.7', type=('build', 'run')) -- cgit v1.2.3-70-g09d2 From da193a07a32d76df595faf3d2e828480d409890f Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Thu, 8 Nov 2018 10:03:29 +0100 Subject: ncl: Add 6.5.0 (#9736) --- var/spack/repos/builtin/packages/ncl/package.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ncl/package.py b/var/spack/repos/builtin/packages/ncl/package.py index 4656e9cfb8..8a231761fd 100644 --- a/var/spack/repos/builtin/packages/ncl/package.py +++ b/var/spack/repos/builtin/packages/ncl/package.py @@ -19,12 +19,13 @@ class Ncl(Package): url = "https://github.com/NCAR/ncl/archive/6.4.0.tar.gz" + version('6.5.0', '133446f3302eddf237db56bf349e1ebf228240a7320699acc339a3d7ee414591') version('6.4.0', 'd891452cda7bb25afad9b6c876c73986') - patch('spack_ncl.patch', when="@6.4.0") - # Make ncl compile with hdf5 1.10 + patch('spack_ncl.patch') + # Make ncl compile with hdf5 1.10 (upstream as of 6.5.0) patch('hdf5.patch', when="@6.4.0") - # ymake-filter's buffer may overflow + # ymake-filter's buffer may overflow (upstream as of 6.5.0) patch('ymake-filter.patch', when="@6.4.0") # This installation script is implemented according to this manual: -- cgit v1.2.3-70-g09d2 From 8f4d6caf323dd2bb10847260ef30fe4a29e8a859 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Thu, 8 Nov 2018 09:05:52 +0000 Subject: muparser: minor fixes to 2.2.5 and add 2.2.6 with CMake (#9724) * muparser: minor fixes to 2.2.5 and add 2.2.6 with CMake * dealii: make muparser optional --- var/spack/repos/builtin/packages/dealii/package.py | 6 +++--- .../repos/builtin/packages/muparser/package.py | 25 +++++++++++++++++++++- 2 files changed, 27 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 753c9be1fb..55cd7cbd00 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -46,6 +46,7 @@ class Dealii(CMakePackage, CudaPackage): variant('hdf5', default=True, description='Compile with HDF5 (only with MPI)') variant('metis', default=True, description='Compile with Metis') + variant('muparser', default=True, description='Compile with muParser') variant('nanoflann', default=True, description='Compile with Nanoflann') variant('netcdf', default=True, description='Compile with Netcdf (only with MPI)') @@ -103,7 +104,6 @@ class Dealii(CMakePackage, CudaPackage): # bzip2 is not needed since 9.0 depends_on('bzip2', when='@:8.99') depends_on('lapack') - depends_on('muparser') depends_on('suite-sparse') depends_on('tbb') depends_on('zlib') @@ -127,6 +127,7 @@ class Dealii(CMakePackage, CudaPackage): # but we should not need it depends_on('metis@5:+int64+real64', when='+metis+int64') depends_on('metis@5:~int64+real64', when='+metis~int64') + depends_on('muparser', when='+muparser') depends_on('nanoflann', when='@9.0:+nanoflann') depends_on('netcdf+mpi', when='+netcdf+mpi') depends_on('netcdf-cxx', when='+netcdf+mpi') @@ -201,7 +202,6 @@ class Dealii(CMakePackage, CudaPackage): '-DLAPACK_INCLUDE_DIRS=%s;%s' % ( spec['lapack'].prefix.include, spec['blas'].prefix.include), '-DLAPACK_LIBRARIES=%s' % lapack_blas.joined(';'), - '-DMUPARSER_DIR=%s' % spec['muparser'].prefix, '-DUMFPACK_DIR=%s' % spec['suite-sparse'].prefix, '-DTBB_DIR=%s' % spec['tbb'].prefix, '-DZLIB_DIR=%s' % spec['zlib'].prefix, @@ -301,7 +301,7 @@ class Dealii(CMakePackage, CudaPackage): # variables: for library in ( 'gsl', 'hdf5', 'p4est', 'petsc', 'slepc', 'trilinos', 'metis', - 'sundials', 'nanoflann', 'assimp', 'gmsh'): + 'sundials', 'nanoflann', 'assimp', 'gmsh', 'muparser'): if ('+' + library) in spec: options.extend([ '-D%s_DIR=%s' % (library.upper(), spec[library].prefix), diff --git a/var/spack/repos/builtin/packages/muparser/package.py b/var/spack/repos/builtin/packages/muparser/package.py index 81ad5c3a82..fe16e5617e 100644 --- a/var/spack/repos/builtin/packages/muparser/package.py +++ b/var/spack/repos/builtin/packages/muparser/package.py @@ -11,6 +11,9 @@ class Muparser(Package): homepage = "http://muparser.beltoforion.de/" url = "https://github.com/beltoforion/muparser/archive/v2.2.5.tar.gz" + version('2.2.6.1', '410d29b4c58d1cdc2fc9ed1c1c7f67fe') + # 2.2.6 presents itself as 2.2.5, don't add it to Spack + # version('2.2.6', 'f197b2815ca0422b2091788a78f2dc8a') version('2.2.5', '02dae671aa5ad955fdcbcd3fee313fb7') # Replace std::auto_ptr by std::unique_ptr @@ -18,10 +21,30 @@ class Muparser(Package): patch('auto_ptr.patch', when='@2.2.5') + depends_on('cmake@3.1.0:', when='@2.2.6:', type='build') + + # Cmake build since 2.2.6 + @when('@2.2.6:') + def install(self, spec, prefix): + cmake_args = [ + '-DENABLE_SAMPLES=OFF', + '-DENABLE_OPENMP=OFF', + '-DBUILD_SHARED_LIBS=ON' + ] + + cmake_args.extend(std_cmake_args) + + with working_dir('spack-build', create=True): + cmake('..', *cmake_args) + make() + make('install') + + @when('@2.2.5') def install(self, spec, prefix): options = ['--disable-debug', + '--disable-samples', '--disable-dependency-tracking', - 'CXXFLAGS=-std=c++11', + 'CXXFLAGS={0}'.format(self.compiler.cxx11_flag), '--prefix=%s' % prefix] configure(*options) -- cgit v1.2.3-70-g09d2 From d1b17e820728f0e282f7bac880986da9c24daebe Mon Sep 17 00:00:00 2001 From: Justin Stanley Date: Thu, 8 Nov 2018 03:28:10 -0600 Subject: canu: use built-in makefile install (#9726) --- var/spack/repos/builtin/packages/canu/package.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/canu/package.py b/var/spack/repos/builtin/packages/canu/package.py index 2b99fe63fc..1aec3384df 100644 --- a/var/spack/repos/builtin/packages/canu/package.py +++ b/var/spack/repos/builtin/packages/canu/package.py @@ -21,6 +21,7 @@ class Canu(MakefilePackage): depends_on('perl', type='run') build_directory = 'src' + build_targets = ['clean'] def patch(self): # Use our perl, not whatever is in the environment @@ -29,14 +30,5 @@ class Canu(MakefilePackage): 'src/pipelines/canu.pl') def install(self, spec, prefix): - # replicate the Makefile logic here: - # https://github.com/marbl/canu/blob/master/src/Makefile#L344 - uname = which('uname') - ostype = uname(output=str).strip() - machinetype = uname('-m', output=str).strip() - if machinetype == 'x86_64': - machinetype = 'amd64' - target_dir = '{0}-{1}'.format(ostype, machinetype) - bin = join_path(target_dir, 'bin') - - install_tree(bin, prefix.bin) + with working_dir(self.build_directory): + make('all', 'TARGET_DIR={0}'.format(prefix)) -- cgit v1.2.3-70-g09d2 From 0e60fcccfb8996868a5f3275e567843fa7cdfb0d Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Mon, 30 Jul 2018 20:52:48 -0700 Subject: utils: merge spack.environment into spack.util.environment - `spack.util.environment` is the new home for routines that modify environment variables. - This is to make room for `spack.environment` to contain new routines for dealing with spack environments --- lib/spack/docs/tutorial_advanced_packaging.rst | 2 +- lib/spack/spack/build_environment.py | 4 +- lib/spack/spack/environment.py | 623 --------------------- lib/spack/spack/modules/common.py | 8 +- lib/spack/spack/test/environment_modifications.py | 8 +- lib/spack/spack/util/environment.py | 617 ++++++++++++++++++++ .../repos/builtin/packages/foam-extend/package.py | 2 +- var/spack/repos/builtin/packages/fsl/package.py | 2 +- .../repos/builtin/packages/openfoam-com/package.py | 2 +- 9 files changed, 631 insertions(+), 637 deletions(-) delete mode 100644 lib/spack/spack/environment.py (limited to 'var') diff --git a/lib/spack/docs/tutorial_advanced_packaging.rst b/lib/spack/docs/tutorial_advanced_packaging.rst index 9b41980a69..c7143db209 100644 --- a/lib/spack/docs/tutorial_advanced_packaging.rst +++ b/lib/spack/docs/tutorial_advanced_packaging.rst @@ -278,7 +278,7 @@ that spack does is not sufficient for python to import modules. To provide environment setup for a dependent, a package can implement the :py:func:`setup_dependent_environment ` -function. This function takes as a parameter a :py:class:`EnvironmentModifications ` +function. This function takes as a parameter a :py:class:`EnvironmentModifications ` object which includes convenience methods to update the environment. For example, an MPI implementation can set ``MPICC`` for packages that depend on it: diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py index 3476df89d9..9ef64a6f7e 100644 --- a/lib/spack/spack/build_environment.py +++ b/lib/spack/spack/build_environment.py @@ -53,8 +53,8 @@ import spack.main import spack.paths import spack.store from spack.util.string import plural -from spack.environment import EnvironmentModifications, validate -from spack.environment import preserve_environment +from spack.util.environment import EnvironmentModifications, validate +from spack.util.environment import preserve_environment from spack.util.environment import env_flag, filter_system_paths, get_path from spack.util.environment import system_dirs from spack.util.executable import Executable diff --git a/lib/spack/spack/environment.py b/lib/spack/spack/environment.py deleted file mode 100644 index 9fb1c39af0..0000000000 --- a/lib/spack/spack/environment.py +++ /dev/null @@ -1,623 +0,0 @@ -# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -import collections -import contextlib -import inspect -import json -import os -import re -import sys -import os.path -import subprocess - -import llnl.util.tty as tty - -from llnl.util.lang import dedupe - - -class NameModifier(object): - - def __init__(self, name, **kwargs): - self.name = name - self.args = {'name': name} - self.args.update(kwargs) - - def update_args(self, **kwargs): - self.__dict__.update(kwargs) - self.args.update(kwargs) - - -class NameValueModifier(object): - - def __init__(self, name, value, **kwargs): - self.name = name - self.value = value - self.separator = kwargs.get('separator', ':') - self.args = {'name': name, 'value': value, 'separator': self.separator} - self.args.update(kwargs) - - def update_args(self, **kwargs): - self.__dict__.update(kwargs) - self.args.update(kwargs) - - -class SetEnv(NameValueModifier): - - def execute(self): - os.environ[self.name] = str(self.value) - - -class AppendFlagsEnv(NameValueModifier): - - def execute(self): - if self.name in os.environ and os.environ[self.name]: - os.environ[self.name] += self.separator + str(self.value) - else: - os.environ[self.name] = str(self.value) - - -class UnsetEnv(NameModifier): - - def execute(self): - # Avoid throwing if the variable was not set - os.environ.pop(self.name, None) - - -class SetPath(NameValueModifier): - - def execute(self): - string_path = concatenate_paths(self.value, separator=self.separator) - os.environ[self.name] = string_path - - -class AppendPath(NameValueModifier): - - def execute(self): - environment_value = os.environ.get(self.name, '') - directories = environment_value.split( - self.separator) if environment_value else [] - directories.append(os.path.normpath(self.value)) - os.environ[self.name] = self.separator.join(directories) - - -class PrependPath(NameValueModifier): - - def execute(self): - environment_value = os.environ.get(self.name, '') - directories = environment_value.split( - self.separator) if environment_value else [] - directories = [os.path.normpath(self.value)] + directories - os.environ[self.name] = self.separator.join(directories) - - -class RemovePath(NameValueModifier): - - def execute(self): - environment_value = os.environ.get(self.name, '') - directories = environment_value.split( - self.separator) if environment_value else [] - directories = [os.path.normpath(x) for x in directories - if x != os.path.normpath(self.value)] - os.environ[self.name] = self.separator.join(directories) - - -class EnvironmentModifications(object): - """Keeps track of requests to modify the current environment. - - Each call to a method to modify the environment stores the extra - information on the caller in the request: - - * 'filename' : filename of the module where the caller is defined - * 'lineno': line number where the request occurred - * 'context' : line of code that issued the request that failed - """ - - def __init__(self, other=None): - """Initializes a new instance, copying commands from 'other' - if it is not None. - - Args: - other (EnvironmentModifications): list of environment modifications - to be extended (optional) - """ - self.env_modifications = [] - if other is not None: - self.extend(other) - - def __iter__(self): - return iter(self.env_modifications) - - def __len__(self): - return len(self.env_modifications) - - def extend(self, other): - self._check_other(other) - self.env_modifications.extend(other.env_modifications) - - @staticmethod - def _check_other(other): - if not isinstance(other, EnvironmentModifications): - raise TypeError( - 'other must be an instance of EnvironmentModifications') - - def _get_outside_caller_attributes(self): - stack = inspect.stack() - try: - _, filename, lineno, _, context, index = stack[2] - context = context[index].strip() - except Exception: - filename = 'unknown file' - lineno = 'unknown line' - context = 'unknown context' - args = {'filename': filename, 'lineno': lineno, 'context': context} - return args - - def set(self, name, value, **kwargs): - """Stores a request to set an environment variable. - - Args: - name: name of the environment variable to be set - value: value of the environment variable - """ - kwargs.update(self._get_outside_caller_attributes()) - item = SetEnv(name, value, **kwargs) - self.env_modifications.append(item) - - def append_flags(self, name, value, sep=' ', **kwargs): - """ - Stores in the current object a request to append to an env variable - - Args: - name: name of the environment variable to be appended to - value: value to append to the environment variable - Appends with spaces separating different additions to the variable - """ - kwargs.update(self._get_outside_caller_attributes()) - kwargs.update({'separator': sep}) - item = AppendFlagsEnv(name, value, **kwargs) - self.env_modifications.append(item) - - def unset(self, name, **kwargs): - """Stores a request to unset an environment variable. - - Args: - name: name of the environment variable to be set - """ - kwargs.update(self._get_outside_caller_attributes()) - item = UnsetEnv(name, **kwargs) - self.env_modifications.append(item) - - def set_path(self, name, elements, **kwargs): - """Stores a request to set a path generated from a list. - - Args: - name: name o the environment variable to be set. - elements: elements of the path to set. - """ - kwargs.update(self._get_outside_caller_attributes()) - item = SetPath(name, elements, **kwargs) - self.env_modifications.append(item) - - def append_path(self, name, path, **kwargs): - """Stores a request to append a path to a path list. - - Args: - name: name of the path list in the environment - path: path to be appended - """ - kwargs.update(self._get_outside_caller_attributes()) - item = AppendPath(name, path, **kwargs) - self.env_modifications.append(item) - - def prepend_path(self, name, path, **kwargs): - """Same as `append_path`, but the path is pre-pended. - - Args: - name: name of the path list in the environment - path: path to be pre-pended - """ - kwargs.update(self._get_outside_caller_attributes()) - item = PrependPath(name, path, **kwargs) - self.env_modifications.append(item) - - def remove_path(self, name, path, **kwargs): - """Stores a request to remove a path from a path list. - - Args: - name: name of the path list in the environment - path: path to be removed - """ - kwargs.update(self._get_outside_caller_attributes()) - item = RemovePath(name, path, **kwargs) - self.env_modifications.append(item) - - def group_by_name(self): - """Returns a dict of the modifications grouped by variable name. - - Returns: - dict mapping the environment variable name to the modifications to - be done on it - """ - modifications = collections.defaultdict(list) - for item in self: - modifications[item.name].append(item) - return modifications - - def clear(self): - """ - Clears the current list of modifications - """ - self.env_modifications.clear() - - def apply_modifications(self): - """Applies the modifications and clears the list.""" - modifications = self.group_by_name() - # Apply modifications one variable at a time - for name, actions in sorted(modifications.items()): - for x in actions: - x.execute() - - @staticmethod - def from_sourcing_file(filename, *args, **kwargs): - """Returns modifications that would be made by sourcing a file. - - Parameters: - filename (str): The file to source - *args (list of str): Arguments to pass on the command line - - Keyword Arguments: - shell (str): The shell to use (default: ``bash``) - shell_options (str): Options passed to the shell (default: ``-c``) - source_command (str): The command to run (default: ``source``) - suppress_output (str): Redirect used to suppress output of command - (default: ``&> /dev/null``) - concatenate_on_success (str): Operator used to execute a command - only when the previous command succeeds (default: ``&&``) - blacklist ([str or re]): Ignore any modifications of these - variables (default: []) - whitelist ([str or re]): Always respect modifications of these - variables (default: []). Has precedence over blacklist. - clean (bool): In addition to removing empty entries, - also remove duplicate entries (default: False). - - Returns: - EnvironmentModifications: an object that, if executed, has - the same effect on the environment as sourcing the file - """ - # Check if the file actually exists - if not os.path.isfile(filename): - msg = 'Trying to source non-existing file: {0}'.format(filename) - raise RuntimeError(msg) - - # Kwargs parsing and default values - shell = kwargs.get('shell', '/bin/bash') - shell_options = kwargs.get('shell_options', '-c') - source_command = kwargs.get('source_command', 'source') - suppress_output = kwargs.get('suppress_output', '&> /dev/null') - concatenate_on_success = kwargs.get('concatenate_on_success', '&&') - blacklist = kwargs.get('blacklist', []) - whitelist = kwargs.get('whitelist', []) - clean = kwargs.get('clean', False) - - source_file = [source_command, filename] - source_file.extend(args) - source_file = ' '.join(source_file) - - dump_cmd = 'import os, json; print(json.dumps(dict(os.environ)))' - dump_environment = 'python -c "{0}"'.format(dump_cmd) - - # Construct the command that will be executed - command = [ - shell, - shell_options, - ' '.join([ - source_file, suppress_output, - concatenate_on_success, dump_environment, - ]), - ] - - # Try to source the file - proc = subprocess.Popen( - command, stdout=subprocess.PIPE, env=os.environ) - proc.wait() - - if proc.returncode != 0: - msg = 'Sourcing file {0} returned a non-zero exit code'.format( - filename) - raise RuntimeError(msg) - - output = ''.join([line.decode('utf-8') for line in proc.stdout]) - - # Construct dictionaries of the environment before and after - # sourcing the file, so that we can diff them. - env_before = dict(os.environ) - env_after = json.loads(output) - - # If we're in python2, convert to str objects instead of unicode - # like json gives us. We can't put unicode in os.environ anyway. - if sys.version_info[0] < 3: - env_after = dict((k.encode('utf-8'), v.encode('utf-8')) - for k, v in env_after.items()) - - # Other variables unrelated to sourcing a file - blacklist.extend(['SHLVL', '_', 'PWD', 'OLDPWD', 'PS2']) - - def set_intersection(fullset, *args): - # A set intersection using string literals and regexs - meta = '[' + re.escape('[$()*?[]^{|}') + ']' - subset = fullset & set(args) # As literal - for name in args: - if re.search(meta, name): - pattern = re.compile(name) - for k in fullset: - if re.match(pattern, k): - subset.add(k) - return subset - - for d in env_after, env_before: - # Retain (whitelist) has priority over prune (blacklist) - prune = set_intersection(set(d), *blacklist) - prune -= set_intersection(prune, *whitelist) - for k in prune: - d.pop(k, None) - - # Fill the EnvironmentModifications instance - env = EnvironmentModifications() - - # New variables - new_variables = list(set(env_after) - set(env_before)) - # Variables that have been unset - unset_variables = list(set(env_before) - set(env_after)) - # Variables that have been modified - common_variables = set(env_before).intersection(set(env_after)) - - modified_variables = [x for x in common_variables - if env_before[x] != env_after[x]] - - # Consistent output order - looks nicer, easier comparison... - new_variables.sort() - unset_variables.sort() - modified_variables.sort() - - def return_separator_if_any(*args): - separators = ':', ';' - for separator in separators: - for arg in args: - if separator in arg: - return separator - return None - - # Add variables to env. - # Assume that variables with 'PATH' in the name or that contain - # separators like ':' or ';' are more likely to be paths - for x in new_variables: - sep = return_separator_if_any(env_after[x]) - if sep: - env.prepend_path(x, env_after[x], separator=sep) - elif 'PATH' in x: - env.prepend_path(x, env_after[x]) - else: - # We just need to set the variable to the new value - env.set(x, env_after[x]) - - for x in unset_variables: - env.unset(x) - - for x in modified_variables: - before = env_before[x] - after = env_after[x] - sep = return_separator_if_any(before, after) - if sep: - before_list = before.split(sep) - after_list = after.split(sep) - - # Filter out empty strings - before_list = list(filter(None, before_list)) - after_list = list(filter(None, after_list)) - - # Remove duplicate entries (worse matching, bloats env) - if clean: - before_list = list(dedupe(before_list)) - after_list = list(dedupe(after_list)) - # The reassembled cleaned entries - before = sep.join(before_list) - after = sep.join(after_list) - - # Paths that have been removed - remove_list = [ - ii for ii in before_list if ii not in after_list] - # Check that nothing has been added in the middle of - # before_list - remaining_list = [ - ii for ii in before_list if ii in after_list] - try: - start = after_list.index(remaining_list[0]) - end = after_list.index(remaining_list[-1]) - search = sep.join(after_list[start:end + 1]) - except IndexError: - env.prepend_path(x, after) - - if search not in before: - # We just need to set the variable to the new value - env.prepend_path(x, after) - else: - try: - prepend_list = after_list[:start] - prepend_list.reverse() # Preserve order after prepend - except KeyError: - prepend_list = [] - try: - append_list = after_list[end + 1:] - except KeyError: - append_list = [] - - for item in remove_list: - env.remove_path(x, item) - for item in append_list: - env.append_path(x, item) - for item in prepend_list: - env.prepend_path(x, item) - else: - # We just need to set the variable to the new value - env.set(x, after) - - return env - - -def concatenate_paths(paths, separator=':'): - """Concatenates an iterable of paths into a string of paths separated by - separator, defaulting to colon. - - Args: - paths: iterable of paths - separator: the separator to use, default ':' - - Returns: - string - """ - return separator.join(str(item) for item in paths) - - -def set_or_unset_not_first(variable, changes, errstream): - """Check if we are going to set or unset something after other - modifications have already been requested. - """ - indexes = [ii for ii, item in enumerate(changes) - if ii != 0 and - not item.args.get('force', False) and - type(item) in [SetEnv, UnsetEnv]] - if indexes: - good = '\t \t{context} at {filename}:{lineno}' - nogood = '\t--->\t{context} at {filename}:{lineno}' - message = "Suspicious requests to set or unset '{var}' found" - errstream(message.format(var=variable)) - for ii, item in enumerate(changes): - print_format = nogood if ii in indexes else good - errstream(print_format.format(**item.args)) - - -def validate(env, errstream): - """Validates the environment modifications to check for the presence of - suspicious patterns. Prompts a warning for everything that was found. - - Current checks: - - set or unset variables after other changes on the same variable - - Args: - env: list of environment modifications - """ - modifications = env.group_by_name() - for variable, list_of_changes in sorted(modifications.items()): - set_or_unset_not_first(variable, list_of_changes, errstream) - - -def filter_environment_blacklist(env, variables): - """Generator that filters out any change to environment variables present in - the input list. - - Args: - env: list of environment modifications - variables: list of variable names to be filtered - - Returns: - items in env if they are not in variables - """ - for item in env: - if item.name not in variables: - yield item - - -def inspect_path(root, inspections, exclude=None): - """Inspects ``root`` to search for the subdirectories in ``inspections``. - Adds every path found to a list of prepend-path commands and returns it. - - Args: - root (str): absolute path where to search for subdirectories - - inspections (dict): maps relative paths to a list of environment - variables that will be modified if the path exists. The - modifications are not performed immediately, but stored in a - command object that is returned to client - - exclude (callable): optional callable. If present it must accept an - absolute path and return True if it should be excluded from the - inspection - - Examples: - - The following lines execute an inspection in ``/usr`` to search for - ``/usr/include`` and ``/usr/lib64``. If found we want to prepend - ``/usr/include`` to ``CPATH`` and ``/usr/lib64`` to ``MY_LIB64_PATH``. - - .. code-block:: python - - # Set up the dictionary containing the inspection - inspections = { - 'include': ['CPATH'], - 'lib64': ['MY_LIB64_PATH'] - } - - # Get back the list of command needed to modify the environment - env = inspect_path('/usr', inspections) - - # Eventually execute the commands - env.apply_modifications() - - Returns: - instance of EnvironmentModifications containing the requested - modifications - """ - if exclude is None: - exclude = lambda x: False - - env = EnvironmentModifications() - # Inspect the prefix to check for the existence of common directories - for relative_path, variables in inspections.items(): - expected = os.path.join(root, relative_path) - - if os.path.isdir(expected) and not exclude(expected): - for variable in variables: - env.prepend_path(variable, expected) - - return env - - -@contextlib.contextmanager -def preserve_environment(*variables): - """Ensures that the value of the environment variables passed as - arguments is the same before entering to the context manager and after - exiting it. - - Variables that are unset before entering the context manager will be - explicitly unset on exit. - - Args: - variables (list of str): list of environment variables to be preserved - """ - cache = {} - for var in variables: - # The environment variable to be preserved might not be there. - # In that case store None as a placeholder. - cache[var] = os.environ.get(var, None) - - yield - - for var in variables: - value = cache[var] - msg = '[PRESERVE_ENVIRONMENT]' - if value is not None: - # Print a debug statement if the value changed - if var not in os.environ: - msg += ' {0} was unset, will be reset to "{1}"' - tty.debug(msg.format(var, value)) - elif os.environ[var] != value: - msg += ' {0} was set to "{1}", will be reset to "{2}"' - tty.debug(msg.format(var, os.environ[var], value)) - os.environ[var] = value - elif var in os.environ: - msg += ' {0} was set to "{1}", will be unset' - tty.debug(msg.format(var, os.environ[var])) - del os.environ[var] diff --git a/lib/spack/spack/modules/common.py b/lib/spack/spack/modules/common.py index 6e0d062156..3acc2b0dcf 100644 --- a/lib/spack/spack/modules/common.py +++ b/lib/spack/spack/modules/common.py @@ -40,7 +40,7 @@ import llnl.util.tty as tty import spack.paths import spack.build_environment as build_environment -import spack.environment +import spack.util.environment import spack.tengine as tengine import spack.util.path import spack.util.environment @@ -256,7 +256,7 @@ class BaseConfiguration(object): """List of environment modifications that should be done in the module. """ - env_mods = spack.environment.EnvironmentModifications() + env_mods = spack.util.environment.EnvironmentModifications() actions = self.conf.get('environment', {}) def process_arglist(arglist): @@ -500,14 +500,14 @@ class BaseContext(tengine.Context): def environment_modifications(self): """List of environment modifications to be processed.""" # Modifications guessed inspecting the spec prefix - env = spack.environment.inspect_path( + env = spack.util.environment.inspect_path( self.spec.prefix, prefix_inspections, exclude=spack.util.environment.is_system_path ) # Modifications that are coded at package level - _ = spack.environment.EnvironmentModifications() + _ = spack.util.environment.EnvironmentModifications() # TODO : the code down below is quite similar to # TODO : build_environment.setup_package and needs to be factored out # TODO : to a single place diff --git a/lib/spack/spack/test/environment_modifications.py b/lib/spack/spack/test/environment_modifications.py index 0451f00b5d..a7941a30cb 100644 --- a/lib/spack/spack/test/environment_modifications.py +++ b/lib/spack/spack/test/environment_modifications.py @@ -6,11 +6,11 @@ import os import pytest -import spack.environment as environment +import spack.util.environment as environment from spack.paths import spack_root -from spack.environment import EnvironmentModifications -from spack.environment import RemovePath, PrependPath, AppendPath -from spack.environment import SetEnv, UnsetEnv +from spack.util.environment import EnvironmentModifications +from spack.util.environment import RemovePath, PrependPath, AppendPath +from spack.util.environment import SetEnv, UnsetEnv from spack.util.environment import filter_system_paths, is_system_path diff --git a/lib/spack/spack/util/environment.py b/lib/spack/spack/util/environment.py index f8f5e23144..fc6d416e7e 100644 --- a/lib/spack/spack/util/environment.py +++ b/lib/spack/spack/util/environment.py @@ -3,8 +3,20 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +"""Utilities for setting and modifying environment variables.""" +import collections import contextlib +import inspect +import json import os +import re +import sys +import os.path +import subprocess + +import llnl.util.tty as tty + +from llnl.util.lang import dedupe system_paths = ['/', '/usr', '/usr/local'] @@ -96,3 +108,608 @@ def set_env(**kwargs): else: if var in os.environ: del os.environ[var] + + +class NameModifier(object): + + def __init__(self, name, **kwargs): + self.name = name + self.args = {'name': name} + self.args.update(kwargs) + + def update_args(self, **kwargs): + self.__dict__.update(kwargs) + self.args.update(kwargs) + + +class NameValueModifier(object): + + def __init__(self, name, value, **kwargs): + self.name = name + self.value = value + self.separator = kwargs.get('separator', ':') + self.args = {'name': name, 'value': value, 'separator': self.separator} + self.args.update(kwargs) + + def update_args(self, **kwargs): + self.__dict__.update(kwargs) + self.args.update(kwargs) + + +class SetEnv(NameValueModifier): + + def execute(self): + os.environ[self.name] = str(self.value) + + +class AppendFlagsEnv(NameValueModifier): + + def execute(self): + if self.name in os.environ and os.environ[self.name]: + os.environ[self.name] += self.separator + str(self.value) + else: + os.environ[self.name] = str(self.value) + + +class UnsetEnv(NameModifier): + + def execute(self): + # Avoid throwing if the variable was not set + os.environ.pop(self.name, None) + + +class SetPath(NameValueModifier): + + def execute(self): + string_path = concatenate_paths(self.value, separator=self.separator) + os.environ[self.name] = string_path + + +class AppendPath(NameValueModifier): + + def execute(self): + environment_value = os.environ.get(self.name, '') + directories = environment_value.split( + self.separator) if environment_value else [] + directories.append(os.path.normpath(self.value)) + os.environ[self.name] = self.separator.join(directories) + + +class PrependPath(NameValueModifier): + + def execute(self): + environment_value = os.environ.get(self.name, '') + directories = environment_value.split( + self.separator) if environment_value else [] + directories = [os.path.normpath(self.value)] + directories + os.environ[self.name] = self.separator.join(directories) + + +class RemovePath(NameValueModifier): + + def execute(self): + environment_value = os.environ.get(self.name, '') + directories = environment_value.split( + self.separator) if environment_value else [] + directories = [os.path.normpath(x) for x in directories + if x != os.path.normpath(self.value)] + os.environ[self.name] = self.separator.join(directories) + + +class EnvironmentModifications(object): + """Keeps track of requests to modify the current environment. + + Each call to a method to modify the environment stores the extra + information on the caller in the request: + + * 'filename' : filename of the module where the caller is defined + * 'lineno': line number where the request occurred + * 'context' : line of code that issued the request that failed + """ + + def __init__(self, other=None): + """Initializes a new instance, copying commands from 'other' + if it is not None. + + Args: + other (EnvironmentModifications): list of environment modifications + to be extended (optional) + """ + self.env_modifications = [] + if other is not None: + self.extend(other) + + def __iter__(self): + return iter(self.env_modifications) + + def __len__(self): + return len(self.env_modifications) + + def extend(self, other): + self._check_other(other) + self.env_modifications.extend(other.env_modifications) + + @staticmethod + def _check_other(other): + if not isinstance(other, EnvironmentModifications): + raise TypeError( + 'other must be an instance of EnvironmentModifications') + + def _get_outside_caller_attributes(self): + stack = inspect.stack() + try: + _, filename, lineno, _, context, index = stack[2] + context = context[index].strip() + except Exception: + filename = 'unknown file' + lineno = 'unknown line' + context = 'unknown context' + args = {'filename': filename, 'lineno': lineno, 'context': context} + return args + + def set(self, name, value, **kwargs): + """Stores a request to set an environment variable. + + Args: + name: name of the environment variable to be set + value: value of the environment variable + """ + kwargs.update(self._get_outside_caller_attributes()) + item = SetEnv(name, value, **kwargs) + self.env_modifications.append(item) + + def append_flags(self, name, value, sep=' ', **kwargs): + """ + Stores in the current object a request to append to an env variable + + Args: + name: name of the environment variable to be appended to + value: value to append to the environment variable + Appends with spaces separating different additions to the variable + """ + kwargs.update(self._get_outside_caller_attributes()) + kwargs.update({'separator': sep}) + item = AppendFlagsEnv(name, value, **kwargs) + self.env_modifications.append(item) + + def unset(self, name, **kwargs): + """Stores a request to unset an environment variable. + + Args: + name: name of the environment variable to be set + """ + kwargs.update(self._get_outside_caller_attributes()) + item = UnsetEnv(name, **kwargs) + self.env_modifications.append(item) + + def set_path(self, name, elements, **kwargs): + """Stores a request to set a path generated from a list. + + Args: + name: name o the environment variable to be set. + elements: elements of the path to set. + """ + kwargs.update(self._get_outside_caller_attributes()) + item = SetPath(name, elements, **kwargs) + self.env_modifications.append(item) + + def append_path(self, name, path, **kwargs): + """Stores a request to append a path to a path list. + + Args: + name: name of the path list in the environment + path: path to be appended + """ + kwargs.update(self._get_outside_caller_attributes()) + item = AppendPath(name, path, **kwargs) + self.env_modifications.append(item) + + def prepend_path(self, name, path, **kwargs): + """Same as `append_path`, but the path is pre-pended. + + Args: + name: name of the path list in the environment + path: path to be pre-pended + """ + kwargs.update(self._get_outside_caller_attributes()) + item = PrependPath(name, path, **kwargs) + self.env_modifications.append(item) + + def remove_path(self, name, path, **kwargs): + """Stores a request to remove a path from a path list. + + Args: + name: name of the path list in the environment + path: path to be removed + """ + kwargs.update(self._get_outside_caller_attributes()) + item = RemovePath(name, path, **kwargs) + self.env_modifications.append(item) + + def group_by_name(self): + """Returns a dict of the modifications grouped by variable name. + + Returns: + dict mapping the environment variable name to the modifications to + be done on it + """ + modifications = collections.defaultdict(list) + for item in self: + modifications[item.name].append(item) + return modifications + + def clear(self): + """ + Clears the current list of modifications + """ + self.env_modifications.clear() + + def apply_modifications(self): + """Applies the modifications and clears the list.""" + modifications = self.group_by_name() + # Apply modifications one variable at a time + for name, actions in sorted(modifications.items()): + for x in actions: + x.execute() + + @staticmethod + def from_sourcing_file(filename, *args, **kwargs): + """Returns modifications that would be made by sourcing a file. + + Parameters: + filename (str): The file to source + *args (list of str): Arguments to pass on the command line + + Keyword Arguments: + shell (str): The shell to use (default: ``bash``) + shell_options (str): Options passed to the shell (default: ``-c``) + source_command (str): The command to run (default: ``source``) + suppress_output (str): Redirect used to suppress output of command + (default: ``&> /dev/null``) + concatenate_on_success (str): Operator used to execute a command + only when the previous command succeeds (default: ``&&``) + blacklist ([str or re]): Ignore any modifications of these + variables (default: []) + whitelist ([str or re]): Always respect modifications of these + variables (default: []). Has precedence over blacklist. + clean (bool): In addition to removing empty entries, + also remove duplicate entries (default: False). + + Returns: + EnvironmentModifications: an object that, if executed, has + the same effect on the environment as sourcing the file + """ + # Check if the file actually exists + if not os.path.isfile(filename): + msg = 'Trying to source non-existing file: {0}'.format(filename) + raise RuntimeError(msg) + + # Kwargs parsing and default values + shell = kwargs.get('shell', '/bin/bash') + shell_options = kwargs.get('shell_options', '-c') + source_command = kwargs.get('source_command', 'source') + suppress_output = kwargs.get('suppress_output', '&> /dev/null') + concatenate_on_success = kwargs.get('concatenate_on_success', '&&') + blacklist = kwargs.get('blacklist', []) + whitelist = kwargs.get('whitelist', []) + clean = kwargs.get('clean', False) + + source_file = [source_command, filename] + source_file.extend(args) + source_file = ' '.join(source_file) + + dump_cmd = 'import os, json; print(json.dumps(dict(os.environ)))' + dump_environment = 'python -c "{0}"'.format(dump_cmd) + + # Construct the command that will be executed + command = [ + shell, + shell_options, + ' '.join([ + source_file, suppress_output, + concatenate_on_success, dump_environment, + ]), + ] + + # Try to source the file + proc = subprocess.Popen( + command, stdout=subprocess.PIPE, env=os.environ) + proc.wait() + + if proc.returncode != 0: + msg = 'Sourcing file {0} returned a non-zero exit code'.format( + filename) + raise RuntimeError(msg) + + output = ''.join([line.decode('utf-8') for line in proc.stdout]) + + # Construct dictionaries of the environment before and after + # sourcing the file, so that we can diff them. + env_before = dict(os.environ) + env_after = json.loads(output) + + # If we're in python2, convert to str objects instead of unicode + # like json gives us. We can't put unicode in os.environ anyway. + if sys.version_info[0] < 3: + env_after = dict((k.encode('utf-8'), v.encode('utf-8')) + for k, v in env_after.items()) + + # Other variables unrelated to sourcing a file + blacklist.extend(['SHLVL', '_', 'PWD', 'OLDPWD', 'PS2']) + + def set_intersection(fullset, *args): + # A set intersection using string literals and regexs + meta = '[' + re.escape('[$()*?[]^{|}') + ']' + subset = fullset & set(args) # As literal + for name in args: + if re.search(meta, name): + pattern = re.compile(name) + for k in fullset: + if re.match(pattern, k): + subset.add(k) + return subset + + for d in env_after, env_before: + # Retain (whitelist) has priority over prune (blacklist) + prune = set_intersection(set(d), *blacklist) + prune -= set_intersection(prune, *whitelist) + for k in prune: + d.pop(k, None) + + # Fill the EnvironmentModifications instance + env = EnvironmentModifications() + + # New variables + new_variables = list(set(env_after) - set(env_before)) + # Variables that have been unset + unset_variables = list(set(env_before) - set(env_after)) + # Variables that have been modified + common_variables = set(env_before).intersection(set(env_after)) + + modified_variables = [x for x in common_variables + if env_before[x] != env_after[x]] + + # Consistent output order - looks nicer, easier comparison... + new_variables.sort() + unset_variables.sort() + modified_variables.sort() + + def return_separator_if_any(*args): + separators = ':', ';' + for separator in separators: + for arg in args: + if separator in arg: + return separator + return None + + # Add variables to env. + # Assume that variables with 'PATH' in the name or that contain + # separators like ':' or ';' are more likely to be paths + for x in new_variables: + sep = return_separator_if_any(env_after[x]) + if sep: + env.prepend_path(x, env_after[x], separator=sep) + elif 'PATH' in x: + env.prepend_path(x, env_after[x]) + else: + # We just need to set the variable to the new value + env.set(x, env_after[x]) + + for x in unset_variables: + env.unset(x) + + for x in modified_variables: + before = env_before[x] + after = env_after[x] + sep = return_separator_if_any(before, after) + if sep: + before_list = before.split(sep) + after_list = after.split(sep) + + # Filter out empty strings + before_list = list(filter(None, before_list)) + after_list = list(filter(None, after_list)) + + # Remove duplicate entries (worse matching, bloats env) + if clean: + before_list = list(dedupe(before_list)) + after_list = list(dedupe(after_list)) + # The reassembled cleaned entries + before = sep.join(before_list) + after = sep.join(after_list) + + # Paths that have been removed + remove_list = [ + ii for ii in before_list if ii not in after_list] + # Check that nothing has been added in the middle of + # before_list + remaining_list = [ + ii for ii in before_list if ii in after_list] + try: + start = after_list.index(remaining_list[0]) + end = after_list.index(remaining_list[-1]) + search = sep.join(after_list[start:end + 1]) + except IndexError: + env.prepend_path(x, after) + + if search not in before: + # We just need to set the variable to the new value + env.prepend_path(x, after) + else: + try: + prepend_list = after_list[:start] + prepend_list.reverse() # Preserve order after prepend + except KeyError: + prepend_list = [] + try: + append_list = after_list[end + 1:] + except KeyError: + append_list = [] + + for item in remove_list: + env.remove_path(x, item) + for item in append_list: + env.append_path(x, item) + for item in prepend_list: + env.prepend_path(x, item) + else: + # We just need to set the variable to the new value + env.set(x, after) + + return env + + +def concatenate_paths(paths, separator=':'): + """Concatenates an iterable of paths into a string of paths separated by + separator, defaulting to colon. + + Args: + paths: iterable of paths + separator: the separator to use, default ':' + + Returns: + string + """ + return separator.join(str(item) for item in paths) + + +def set_or_unset_not_first(variable, changes, errstream): + """Check if we are going to set or unset something after other + modifications have already been requested. + """ + indexes = [ii for ii, item in enumerate(changes) + if ii != 0 and + not item.args.get('force', False) and + type(item) in [SetEnv, UnsetEnv]] + if indexes: + good = '\t \t{context} at {filename}:{lineno}' + nogood = '\t--->\t{context} at {filename}:{lineno}' + message = "Suspicious requests to set or unset '{var}' found" + errstream(message.format(var=variable)) + for ii, item in enumerate(changes): + print_format = nogood if ii in indexes else good + errstream(print_format.format(**item.args)) + + +def validate(env, errstream): + """Validates the environment modifications to check for the presence of + suspicious patterns. Prompts a warning for everything that was found. + + Current checks: + - set or unset variables after other changes on the same variable + + Args: + env: list of environment modifications + """ + modifications = env.group_by_name() + for variable, list_of_changes in sorted(modifications.items()): + set_or_unset_not_first(variable, list_of_changes, errstream) + + +def filter_environment_blacklist(env, variables): + """Generator that filters out any change to environment variables present in + the input list. + + Args: + env: list of environment modifications + variables: list of variable names to be filtered + + Returns: + items in env if they are not in variables + """ + for item in env: + if item.name not in variables: + yield item + + +def inspect_path(root, inspections, exclude=None): + """Inspects ``root`` to search for the subdirectories in ``inspections``. + Adds every path found to a list of prepend-path commands and returns it. + + Args: + root (str): absolute path where to search for subdirectories + + inspections (dict): maps relative paths to a list of environment + variables that will be modified if the path exists. The + modifications are not performed immediately, but stored in a + command object that is returned to client + + exclude (callable): optional callable. If present it must accept an + absolute path and return True if it should be excluded from the + inspection + + Examples: + + The following lines execute an inspection in ``/usr`` to search for + ``/usr/include`` and ``/usr/lib64``. If found we want to prepend + ``/usr/include`` to ``CPATH`` and ``/usr/lib64`` to ``MY_LIB64_PATH``. + + .. code-block:: python + + # Set up the dictionary containing the inspection + inspections = { + 'include': ['CPATH'], + 'lib64': ['MY_LIB64_PATH'] + } + + # Get back the list of command needed to modify the environment + env = inspect_path('/usr', inspections) + + # Eventually execute the commands + env.apply_modifications() + + Returns: + instance of EnvironmentModifications containing the requested + modifications + """ + if exclude is None: + exclude = lambda x: False + + env = EnvironmentModifications() + # Inspect the prefix to check for the existence of common directories + for relative_path, variables in inspections.items(): + expected = os.path.join(root, relative_path) + + if os.path.isdir(expected) and not exclude(expected): + for variable in variables: + env.prepend_path(variable, expected) + + return env + + +@contextlib.contextmanager +def preserve_environment(*variables): + """Ensures that the value of the environment variables passed as + arguments is the same before entering to the context manager and after + exiting it. + + Variables that are unset before entering the context manager will be + explicitly unset on exit. + + Args: + variables (list of str): list of environment variables to be preserved + """ + cache = {} + for var in variables: + # The environment variable to be preserved might not be there. + # In that case store None as a placeholder. + cache[var] = os.environ.get(var, None) + + yield + + for var in variables: + value = cache[var] + msg = '[PRESERVE_ENVIRONMENT]' + if value is not None: + # Print a debug statement if the value changed + if var not in os.environ: + msg += ' {0} was unset, will be reset to "{1}"' + tty.debug(msg.format(var, value)) + elif os.environ[var] != value: + msg += ' {0} was set to "{1}", will be reset to "{2}"' + tty.debug(msg.format(var, os.environ[var], value)) + os.environ[var] = value + elif var in os.environ: + msg += ' {0} was set to "{1}", will be unset' + tty.debug(msg.format(var, os.environ[var])) + del os.environ[var] diff --git a/var/spack/repos/builtin/packages/foam-extend/package.py b/var/spack/repos/builtin/packages/foam-extend/package.py index 4bd1aaaa04..e36fec1efb 100644 --- a/var/spack/repos/builtin/packages/foam-extend/package.py +++ b/var/spack/repos/builtin/packages/foam-extend/package.py @@ -36,7 +36,7 @@ import re import os from spack import * -from spack.environment import EnvironmentModifications +from spack.util.environment import EnvironmentModifications from spack.pkg.builtin.openfoam_com import OpenfoamArch from spack.pkg.builtin.openfoam_com import add_extra_files from spack.pkg.builtin.openfoam_com import write_environ diff --git a/var/spack/repos/builtin/packages/fsl/package.py b/var/spack/repos/builtin/packages/fsl/package.py index 1a0b3e054e..a0675ae6cf 100644 --- a/var/spack/repos/builtin/packages/fsl/package.py +++ b/var/spack/repos/builtin/packages/fsl/package.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * -from spack.environment import EnvironmentModifications +from spack.util.environment import EnvironmentModifications import os diff --git a/var/spack/repos/builtin/packages/openfoam-com/package.py b/var/spack/repos/builtin/packages/openfoam-com/package.py index 098d11e79d..cdb6ae1dac 100644 --- a/var/spack/repos/builtin/packages/openfoam-com/package.py +++ b/var/spack/repos/builtin/packages/openfoam-com/package.py @@ -43,7 +43,7 @@ import re import os from spack import * -from spack.environment import EnvironmentModifications +from spack.util.environment import EnvironmentModifications import llnl.util.tty as tty -- cgit v1.2.3-70-g09d2 From 236b34f3df38d0f44ada307ece354f92a96a6a91 Mon Sep 17 00:00:00 2001 From: "Nichols A. Romero" Date: Fri, 9 Nov 2018 10:16:11 -0600 Subject: Introduce fftw-api virtual package for Intel-MKL and FFTW (#9618) * Introduce FFTW2 and FFT3 providers for Intel-MKL and FFTW Spack packages. * make fftw default package for fftw-api virtual package * virtual package test assertion now provides location of default virtual packages. * Change name of virtual package to fftw-api and used versioned interface. --- etc/spack/defaults/packages.yaml | 1 + lib/spack/spack/test/package_sanity.py | 7 +++++-- var/spack/repos/builtin/packages/fftw/package.py | 3 +++ var/spack/repos/builtin/packages/intel-mkl/package.py | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml index 5c38ddb683..aaab12b3ef 100644 --- a/etc/spack/defaults/packages.yaml +++ b/etc/spack/defaults/packages.yaml @@ -22,6 +22,7 @@ packages: blas: [openblas] daal: [intel-daal] elf: [elfutils] + fftw-api: [fftw] gl: [mesa, opengl] glu: [mesa-glu, openglu] golang: [gcc] diff --git a/lib/spack/spack/test/package_sanity.py b/lib/spack/spack/test/package_sanity.py index f31209c702..a8c84bd70d 100644 --- a/lib/spack/spack/test/package_sanity.py +++ b/lib/spack/spack/test/package_sanity.py @@ -47,9 +47,12 @@ def test_all_virtual_packages_have_default_providers(): defaults = spack.config.get('packages', scope='defaults') default_providers = defaults['all']['providers'] providers = spack.repo.path.provider_index.providers - + default_providers_filename = \ + spack.config.config.scopes['defaults'].get_section_filename('packages') for provider in providers: - assert provider in default_providers + assert provider in default_providers, \ + "all providers must have a default in %s" \ + % default_providers_filename def test_package_version_consistency(): diff --git a/var/spack/repos/builtin/packages/fftw/package.py b/var/spack/repos/builtin/packages/fftw/package.py index 0d424ce029..d3d8795fee 100644 --- a/var/spack/repos/builtin/packages/fftw/package.py +++ b/var/spack/repos/builtin/packages/fftw/package.py @@ -72,6 +72,9 @@ class Fftw(AutotoolsPackage): # https://github.com/FFTW/fftw3/commit/902d0982522cdf6f0acd60f01f59203824e8e6f3 conflicts('%gcc@8:8.9999', when="@3.3.7") + provides('fftw-api@2', when='@2.1.5') + provides('fftw-api@3', when='@3:') + @property def libs(self): diff --git a/var/spack/repos/builtin/packages/intel-mkl/package.py b/var/spack/repos/builtin/packages/intel-mkl/package.py index e11b4c8e47..4b04e97d34 100644 --- a/var/spack/repos/builtin/packages/intel-mkl/package.py +++ b/var/spack/repos/builtin/packages/intel-mkl/package.py @@ -53,6 +53,7 @@ class IntelMkl(IntelPackage): provides('lapack') provides('scalapack') provides('mkl') + provides('fftw-api@3', when='@2017:') if sys.platform == 'darwin': # there is no libmkl_gnu_thread on macOS -- cgit v1.2.3-70-g09d2 From 5dc0b657194ee780d8aa7696169c57c8071f91e5 Mon Sep 17 00:00:00 2001 From: Jim Galarowicz Date: Fri, 9 Nov 2018 15:35:11 -0600 Subject: Update Dyninst package file for TBB dependency (#9728) * Update Dyninst package file for TBB dependency Dyninst master and 10.0 release versions require the tbb package. This mod updates the tbb versions adding the one that dyninst uses and adds the required spack package changes to dyninst/package.py. * Put new version of tbb in proper location, per reviewer comment. * Only depend on tbb if building the development version. * Changes for the release of Dyninst 10.0.0 --- var/spack/repos/builtin/packages/cbtf-krell/package.py | 3 +-- var/spack/repos/builtin/packages/dyninst/package.py | 9 ++++++++- var/spack/repos/builtin/packages/intel-tbb/package.py | 1 + var/spack/repos/builtin/packages/openspeedshop-utils/package.py | 3 +-- var/spack/repos/builtin/packages/openspeedshop/package.py | 3 +-- 5 files changed, 12 insertions(+), 7 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py index d800df4bfa..b30a4a6649 100644 --- a/var/spack/repos/builtin/packages/cbtf-krell/package.py +++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py @@ -57,8 +57,7 @@ class CbtfKrell(CMakePackage): # For Dyninst depends_on("dyninst@develop", when='@develop') - # This will change to dyninst@10.0 when it is released - depends_on("dyninst@develop", when='@1.9.1.0:9999') + depends_on("dyninst@10:", when='@1.9.1.0:9999') # For MRNet depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti', type=('build', 'link', 'run')) diff --git a/var/spack/repos/builtin/packages/dyninst/package.py b/var/spack/repos/builtin/packages/dyninst/package.py index 5b0aea454e..9d9ab52669 100644 --- a/var/spack/repos/builtin/packages/dyninst/package.py +++ b/var/spack/repos/builtin/packages/dyninst/package.py @@ -14,6 +14,7 @@ class Dyninst(Package): git = "https://github.com/dyninst/dyninst.git" version('develop', branch='master') + version('10.0.0', tag='v10.0.0') version('9.3.2', tag='v9.3.2') version('9.3.0', tag='v9.3.0') version('9.2.0', tag='v9.2.0') @@ -40,6 +41,8 @@ class Dyninst(Package): depends_on("libdwarf", when='@:9') depends_on("boost@1.42:") depends_on('libiberty+pic') + depends_on("tbb@2018.6:", when='@develop') + depends_on("tbb@2018.6:", when='@10:') depends_on('cmake', type='build') patch('stat_dysect.patch', when='+stat_dysect') @@ -72,7 +75,11 @@ class Dyninst(Package): libdwarf.lib, "libdwarf." + dso_suffix)) # For @develop + use elfutils libdw, libelf is an abstraction # we are really using elfutils here - if spec.satisfies('@develop'): + if spec.satisfies('@develop') or spec.satisfies('@10:'): + tbb = spec['tbb'].prefix + args.append('-DTBB_INCLUDE_DIRS=%s' % tbb.include) + args.append('-DTBB_LIBRARIES=%s' % join_path( + tbb.lib, "libtbb." + dso_suffix)) args.append('-DLIBDWARF_INCLUDE_DIR=%s' % libelf.include) args.append('-DLIBDWARF_LIBRARIES=%s' % join_path( libelf.lib, "libdw." + dso_suffix)) diff --git a/var/spack/repos/builtin/packages/intel-tbb/package.py b/var/spack/repos/builtin/packages/intel-tbb/package.py index a6a127ece2..55eaa995ac 100644 --- a/var/spack/repos/builtin/packages/intel-tbb/package.py +++ b/var/spack/repos/builtin/packages/intel-tbb/package.py @@ -19,6 +19,7 @@ class IntelTbb(Package): # See url_for_version() below. version('2019', '2119f1db2f905dc5b423482d7689b7d6') + version('2018.6', '9a0f78db4f72356068b00f29f54ee6bc') version('2018.5', 'ff3ae09f8c23892fbc3008c39f78288f') version('2018.4', '5e2e6ba0e25624a94331c945856551c2') version('2018.3', 'cd2e136598ffa5c136f077ee85a35b4c') diff --git a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py index afa480a8f3..c70013562c 100644 --- a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py @@ -93,8 +93,7 @@ class OpenspeedshopUtils(CMakePackage): depends_on("boost@1.66.0:") depends_on("dyninst@develop", when='@develop') - # This will change to version dyninst@10.0 when it is released - depends_on("dyninst@develop", when='@2.3.1.3:9999') + depends_on("dyninst@10:", when='@2.3.1.3:9999') depends_on("python", when='@develop', type=('build', 'run')) depends_on("python@2.7.14:2.7.15", when='@2.3.1.3:9999', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py index 90d55b168a..0d8957f0ac 100644 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop/package.py @@ -88,8 +88,7 @@ class Openspeedshop(CMakePackage): depends_on("boost@1.66.0:") depends_on("dyninst@develop", when='@develop') - # This will change to version dyninst@10.0 when it is released - depends_on("dyninst@develop", when='@2.3.1.3:9999') + depends_on("dyninst@10:", when='@2.3.1.3:9999') depends_on("python", when='@develop', type=('build', 'run')) depends_on("python@2.7.14:2.7.15", when='@2.3.1.3:9999', type=('build', 'run')) -- cgit v1.2.3-70-g09d2